From 14f611d15959e3e964650db0f10fb1c3a06053dc Mon Sep 17 00:00:00 2001
From: William Cheng <wing328hk@gmail.com>
Date: Wed, 10 Jul 2019 16:35:34 +0800
Subject: [PATCH 01/62] add wso2 to company list (#3330)

---
 README.md                             |   1 +
 website/dynamic/users.yml             |   5 +++++
 website/static/img/companies/wso2.png | Bin 0 -> 35921 bytes
 3 files changed, 6 insertions(+)
 create mode 100644 website/static/img/companies/wso2.png

diff --git a/README.md b/README.md
index 797a761f59..c385e05569 100644
--- a/README.md
+++ b/README.md
@@ -552,6 +552,7 @@ Here are some companies/projects (alphabetical order) using OpenAPI Generator in
 - [TUI InfoTec GmbH](http://www.tui-infotec.com/)
 - [unblu inc.](https://www.unblu.com/)
 - [Veamly](https://www.veamly.com/)
+- [WSO2](https://wso2.com/)
 - [Xero](https://www.xero.com/)
 - [Yelp](https://www.yelp.com/)
 - [Zalando](https://www.zalando.com)
diff --git a/website/dynamic/users.yml b/website/dynamic/users.yml
index 2af7b7f22e..670b02df59 100644
--- a/website/dynamic/users.yml
+++ b/website/dynamic/users.yml
@@ -113,6 +113,11 @@
   image: "img/companies/unblu.svg"
   infoLink: "https://www.unblu.com/"
   pinned: true
+-
+  caption: WSO2
+  image: "img/companies/wso2.png"
+  infoLink: "https://wso2.com/"
+  pinned: true
 -
   caption: Xero
   image: "img/companies/xero.png"
diff --git a/website/static/img/companies/wso2.png b/website/static/img/companies/wso2.png
new file mode 100644
index 0000000000000000000000000000000000000000..2cf18f9cfddc8a686d87e26ac26f92433e1b267e
GIT binary patch
literal 35921
zcmb??Wm6p86YnmIEbbQE9Ts<YCrEI2ceh>Kf+e^U++Bh#o}dAOJ3M%R1VV7Q{BPC$
z2DfTvdS>2DpEIZXCnsJ@LlG109U1@tz*JU}(*^*5>~Ht6VC1)J-JH#@w}9%QWate5
zaMJzn1O}8#`T+oFnvSxvT3Qb7KJMNQ?jF?2va-}3UhZ~|F17$bz*>Qhy{^s)k@)S_
zUm4Xn=x0@TZ9*`$woD?FAdQig1{Fsoj;3Ul@ckgJygVY=x8gWZaxyfD@I5<50@@17
ze>A1Zkze8xCLVW#zc?@T-X2cBv@c5>)m;~~&Z5A<7@11E@A;t^)iRX0JCWlfW4r%x
zO2N?RJpef1RvQ}cXF4F@E=){}jTVm54*&)%po0N$^*lI)JoXj)R3^s+2#o^5ebR(f
z!B7H#R8X=^1wcvx2rbBF)BzMD0xTx2t@Z(08~_WZ@WTZFwBRl$7zi-_OhX7PP6JTm
z+s4TO97F+ivmX-V0R|8Nft~7zFkpoP08!SrQvx(~0^l<^=q&&+1_1ItE}8{^7!0uZ
zMn@L_h{^#FC|v1_{b6gsIbwawR8EUnH@&bt%oxn!iK4I1Ny$8;Ow2|gV2NOvE5$h!
zm_y0~<HO#$o&o@h(+J<b_WC(s2CHFaMj*KZ%beqM0Qr^H%4+}RV7Asn3IN#k37dOi
z=W2Zi6-9=+zLYXtAUc?#7yI5O+O=RywF8Pz*7UDE{+Ap1lGN_i)r0^3TTvO2F}9r0
z4}Gy8GKcFwyWEF~J>A~y^zYHbcuZl6h<7_fQ-9UU$!F71qpUU#Qxu;%(O;h^7HCJ5
zt-1|Z3HIOPc_z!{CSCKC)5goBvy3v#zuN3=vp<3)w)p`~P7=W2G>$4$YtTPcCL9AF
z_}(o5aMj~J_>&n7f;vR*&icPzN<J$VGXS7=%ITf}fSDXUr|v|n<Tw}rkSm6<Hc6BH
z9VB6gBa;szZ49D6SqMbQ(2oqs;K-oaK*_x<Sn48Vm}91!C|E7Heo9gB!QVT?eDc8J
z9MbE;68FG<uml$lGWWtz5v9L@@hxfA;(%5O26V|_;+*I^nn5K*yhM8H?{Nh0X;sts
zmAJJNbgA`}D6Yi45QJk*6uzd3egp7CJjL`Xa({-kychq8(JtFvCHO8%p%ndxjSqKj
z3Q=+153ja&;z<G}M?Y#Eu-8%~WXB=!V-ghJ5f=#O*sx5q5IgE8>&a%?I*i(}cTFGa
zKt1s{*0at2h<Gr0IH~}mzYMh{rL>ZPnt{fOQWZ5hJs<8Gsvs&T>irNC?WZc$HpZ{G
z_ah`$JlwGcO6+t?cq#Z?IKgqUBZBmJ@v=Nj-Khx5&1Jgtc=HPLZrXGw?A3XEO7G}C
zeP6S2Zb1?L%udbrE&9KL|AznL{g3QFnk!?p0xK!cvOAqUX6*?l719Ho1HJ=f+iV_b
zy)U`in^h&cxcn(bGW8`L+KumHtMK`JbA_iPiIi2#>q|2h-Z>CE+&VTM`+UXS%%IfB
z`k_BRd7^lnbqxCJkAWFO7&#ti&rF&}f<j_X>QB;`tyV$0kVrbN3lZc#%Rb7%&T-c>
zVC`THAxxV<%TUQ+%phas(ygwksM)GP*Spr6)J>^2(+O=*(BswFuSWfuS*ur5pmnB0
zrej|%S`}MkU*)bVSr%sa9FJ@`tTwDETlT)V*?hluj2hjVv^9X8#u>9V#uvsv!q_~$
z8sf*=ll@H5lPF$OT_P;YtHP__s(t<0P7-B5+w(5pM+5bUxiafIEMbe_l4XyDtb$Li
zo7>jJxh69!)1X$V_I<75S)V||d1XOGpL~zuBMeJ=T!qPmNzp!K2C3jkXH{pj60MR*
zU0md*fwRWBoUEir&VRtI@*=yi-wax)=3coK*mv|m9?JEs`|SEqd83G7fZU2fkGzgC
zLn1cH@98c^!8N}A=e?}yu#{}MWrk(eZd6+LoY<E|g^vo@NsePC`}F&+W3FRg7?Bxi
z7**9z)h}|j)w?TLDn!*p)yAi%rc0-na`^MaxtDp4@{aPB^R_!Ji~@|<JE}UmY?WL7
zGpaDW=;(EeHWD^0H_$UOZB?i*sApK}sqd-8t?btLq)}VAWIx>Wr{jA^bth@l!3y$v
zLx*cesHMFXv3=)g!|=tYzE7cFLq9%?qhQ9aV%1U@QG|K7c@c<w5ZTI|$-j^c9sQem
z!ewtTi!-~zyWfF7$ui<tpp&<tXise4?Hzd?ml&@aG0B-F!I?)kw)w5^KNX)FPt)C?
z`I~~g*1Vzfs`bVTfeXir*o~qoz9N=FLtgJ6!{20g-XF|Kq8DXAoVV-3G-Wkm_U%V>
zT-ID^`t{3Ao#p;Dx0aX068|K;iuNV;#RRu_whYau1mT_EIwv)U-3!g5w`IfWUTt23
zUgrRnPzInqC>|yaGe&s43ksnbNR|{?xBb_$dM=$*+$~Kgof1(WaWGg<<M8cQYCX;E
zQT9yQj3ZXGR@m{<4;0Ho%f#U@45sMVX#E(;WREz5cXQlX{Qh$rvfkTr4|17uTY2`}
zn!=47D*UVxHJnajYl2_-zDka9+8ItQ8Wb2PyQq>2bFwxFxViLiKb>F4?iK8z?*|iS
zbA2=Q2rQWy`WszIRLzOUE|Mvw7N;Tf`L{F<YZXxv!xg?iLo!<65XF!^E!UjDT-=JR
z2`i<>l@hCZQ2MX5Uj9J(QQmU)gYGD%>eOB}OtsBCkwT(eKWbMVagjdm$n>;SPnjAT
z^-mr4r}l?-ev@^!(Je2dZi$^-lo=@Bom*4ukPJD{I%F!2b&Z&pSy5W-ZT0O2rsF4s
zGiwXkrq8EZC)QI1^Dm2D&+&%vcGEk`V^sAyC=3q!>YRjI#5@Dn(e??E*kV2)*NJr{
zbg;TEYSy0XXElWNF$SqS!^{RJA_m)m&S&U)Xa~`uXB*4srkVy^hTH9y4>1K~5`^&y
z4Fv1NS%l#$%o_m*WU=lO134R?+p23vx@~6d=Iu@nw>S!ou`+A24zsY_Fjv>wFt<On
zo!|VEU+2o2W?t`!?2zsLG9cE~Yg_q!W?EEIw@ml1?t`wt#r$Tw<?@}|+yz;1??1j@
zi|fX{x6cya``7h=dg_aIi?)x-kFB?o4e>Q6cbSi_ru7=Gp6BDBdC)To9ahJ3_s>O&
zd2wCslqI$^MXYhE{+EJFe-2CmOudi!V|#QSa)JMy+@fyZQeuj%`6UI{?V>DD`BB(Y
za5>53Ugav}>Eu2dTN!`VoRXMZI^7C-Qe3CP&gT;|3{<(+{qDGS60z{f{%SU<Afq5O
zjPriOV!gB@_{e%@+X>tK@+*$d?!5eK;*n^t=#0r#m(Nwp`T@Rvmws-eh`H;j&#BnU
zrv=UNp8THNhHew*?u($l_F%i)6S6|Vna#g_fq#fzmlg|!#W(w|gWPXNZ*R7VHp9G_
zo@XX|R{fbS>U%YN&HqZBORvgq#x6=4zig~rZiG9*{fn>XHWY7>qa$Zu(r!|)Wsy>H
zQYK?CW6lbNB!q?cB)y(bo+@Q$ZDtt@iC;=zCL4%}xWeuh&z5KAvgb;&uChK2xQ3KJ
zpTf^b8`sB%#wh#02k>&6{r&KGKIp&UPjUHW8(Z_g5bAK|SBLxN8=W7OkDo|CeR@R%
zWnVv8^Kz`e^_$ezO4{lGKoA1}0F49y?qA>H2>{>=0RT=d005C}0D#y%-F#F50Dy%k
z%Sr17to`cq4Iy8?k$Bn=ZR)KhY;~EON?pMc#;UY*t5RlJ;Zx>zRbg4^+<@?_gD|}*
zJmB%%b{#H;7Tg>QaPdp3)^rYM{Y+a1_3fgW%1>)oPJV|&-q;ecxVQ?ox^Kq|aa0P{
zU{%sYRT9F|{|yt&79Zc9{$Ke2|K2iAEZ<z^DdeG^cAh`BdIk}aS{O4#;TL$NZ2WWb
z<%LNl3c#a?V`U3KwBEnQDe;3Wa(mq}BG4lxsmiO}l)(*f=oS1%+7S&7Op1%&{n(=m
zutxAch*)#>(w^OTaJGAgN08^a!$iUjjf_{aPZm2H3RlI~42iee1b`uYO?%2XAIYEr
zfI1(>C<uJdRO(CvoJTevg-@L;2=zo!Eb|p17#CXU-T!E+s*3CAAIY{PmxpZsas?@B
zswym{$TJXY$zipRVNj%$8+TK}PX_V3#>90*9wh_SFu&Et7+wPd+(^rEj(`nfQks-k
z^$a;B&5DY~BT?#h06^Y!On_K&_{+6t@9hf@1o>D2P2VI;IOr?r`1E3sv`7?_EwfS1
z%#HKk(xT<ioidJ0Y$-Ds5n-j*5uacYSw7QqFFvu^_ROxVjez7kSTVAyfif|D@2X~;
zGT7ybf!N%j-*X{z;v<;=0l%PNFoPjclHsh?ajveeE_n{Gy~bmkqfTDo%PsFCXV2gH
znB3gWo|^F#*)TIoMADUJZ(^%Ck}+MqlJaswtXK*p`RJ7nS293MwN9nXf;Ips{6fxd
z+<~EQ=E<<OF8cfB@p8YR=!vA=H~77l7WB`4P05*vLas;xH!=;P(Yn!}7nIBWXkxPw
z$IASe-iVNpyImgUgoM*S`w;&b6Z(CY-rsxZ*%G1e8t#YMf8Tqhsxdxnx-Zp{7GYT^
zXI%GLU89>L3Ij5CL0D8%|4bo*15fnc#BHC5$PBfBaJCd=eHW->@_$KC;gBEZ&vWMY
zBctvU=#7C<5z}<&2I&Y<#;_&Vr6NTa6GReg$eF%5OzG(3Z$j)RFr5@wDjj}RdlA`#
zvx5hxhkC+uP{6I*2E2=?LeEel|HPQ~BK-RGnNp=Ald%;7Tqhk8kdh}t3q>9AhAkoO
z214_bG^7Vxt>ZkJ(v*d~o2%)`lZ)FQM!gz?D~X|C5QXC*M9$323|&4OEnM5gx0?H}
zbY|us5}BY&{v=7Qo1^3O{rzlsA+jc6%Y3+ot-O4&J=0deK7a3@G3TB12&SSSR?3ud
zXOW(@&im)?+VPae7cITTk5j`tJ|cs{<II|yU<4voyC>ZC%k3ClF{%kE%-Cu_Eq#iq
zOjq*{$pbIT$JLzzBVb2707wWWio4}Yi4atG#7&^C55r_a`X)jV#|212_8!jA0JSN{
z4pBT@J+~+!$~HFZL0xUrK-MZlpTCp8{H}K`S?nQ7k|m`uG@n04VgFHD46tHi(SlhT
zcA$G&^W1V=)fdsG#1aLtA+#XhxIo5*afkirF_5H-#l}JSoRBQLnd`|&s^1)ODqbc}
zxzo@)FnFOFp$ffUUCYn+7AnB%5|?Oe@0ba?S=8q;=y5y0pPruf=2JgIX=|~Hq+f?;
zm%|M92Oj{j+{p3X9;3(za8g-k)lc{qt@`yQ!ens0noZbKZ?9{2V7IDE!g-*)-iL?h
zuoV}9RBFhKLfWYkAaQc0OIP5?{4lxG?I;1CI>I6}ct|9N!YuAVZ#f<{F${BtqdlA+
zliJI0ZBWTIh!zryeYjT1sYr{_8aQcnS~Y7QsAu{aOxwyTEXIKqgKSr(fHk5F6@J2*
z&P&0CRgg9XBa@u6Kbzw*8qAFhpjA?pjRH9%S52gj+|B~OAzo(!;<YFj>w70xZZ0@*
zM2dxgiv?kJ2<0is&lVaep+z^|d+Gd|El!~VKlru`UXCxbD}UQb?B0nQxE=7)C#4}>
zS~}_=8fK<t6``0eFMfT9VbiYusqf_UFaO8c{7yQ8;Rm=d)ev86Sh&RR%bICVcnh5a
z3ns_3`hrnzUd8!F|Cw=jw{UHW#6#8ixMu!un`B8QoR4D){0($KcAC|<U*R&gY(s;-
z4qu?p0u=)TaU~RoB6v)@=|neh{`;j?RiKSPXwaTKD;AG79XkDYNLAmVz{;kSSlPQ9
z=Z1{ugK(T`gKcCnFB5u?QB*r`n8H-&IGm6vDfiY5S_m+C0Rp5fq-YVV1Dx{2{*373
zIwCFXL(8B9NDyu4G}6UHY;*AHk^EVQq;^yFXW?h)v@bk{bZxA}<*;`e-40)hRYbuh
z{A_!y|0D6lxY?tg*S+=g)SRYr95~<m^JfA&a@3VAla~J~)X4<H`}+IcOd4~Tluw!d
zJtuKj)vR?Q`>M+-Dn3Rmn}>%=&m?U0j3twKn;ROgnqOaCi3A6IO;amV0G>55EMk7(
zwq|O~ek`eay+iEse&o_ahLXS;ve&ahKHjr!(Qv@hOj6SqtP9qx=rt%2u8D>>Znnr<
zU-nmj69E1IrpDTrS-iO(K>kOd3JICR7!2H#2ykbF^3^wtm^~=2%M`z;Q-jUS##ALY
zh?x*&mg>5xOhgT>9iau2B%FP!K|!h+6ojWRJU+lHIB-RAcoi9#0GFZ*`TD6{;1?&H
z&!S`5g!6->uzsQMuKbjK%lX1zXI$K?t1BEZVw2B_s9?QG_g?a0MW`O2xC#prqp9CY
zqdIA=2E&Q6C}s*D{#r<NQN8NjT3R*GSXXyvs*$YuH1KQxUE#v!A(H<glu-9oZ@p&^
z(ds!x*O?u)sfR}7U%vgAEa8-KZ%X<u-Ev&efU0W5#~m5VWP+sR+&mf#)pf7`q<oe&
zc{=-iOLh5gK?z6-ayfL;P$v}cKn|2UC8(<g>QuX?xvcmj!6BEXqAhlifjH{L1cT!R
z19q+-6*FZ^q3rS7qB3<7`!Yji4l(XD{q}TF3{o4ARUen$8U@ZOqC9<mI80^NnKMV8
z>vt~w^Rm6H<jpApBh+hrEt{65ji{+%W@jCmp%6_8w?7dbsNHNmB0;bE1)AzE+46pc
zLe9c}h9kz7mfwa^9o5bHB*_hRb4k2DHF|qJEt`2R9&A(a+Wo3+VSklGH5x`>U-)Se
zV?0<x+&guq@2}m|4RyJ|@b{OJTNB>Cnc<(`m<)52M?X=zt+d6PNH_?fidSy!hGn`+
zG(Qfrb&1YuuL+_2rJqX9H7;|k3<dBgd@DOB*2N&eHs1CeVa>xp%%w5%+km??w8>^;
zLi|}sV|0aY)ekuxaCSACBAl9f(IBJ935u33AqVo!?)ykn`Wr`;B5hn6ol{1%Qi(t#
zya=G0Z^Y`xlD9|TZ%cf}>`K6Au<*y5*|6e5k4@S`wpFR2Z)h;XUPM{EVaU$yV+kwT
zR^VCvHv8-G7g4}u;7s}OZ9EzRMkJO{2s0@E5}QC7FVZJ_p<yi_5*=>=f!q&1Qia(*
zMV-bnX%<}h7A<ETA0I!3qjkkNeuA(Sz|+1AoBsi~U-n0?ij$%wv-oLg4r6`>zu;8}
zSlN}xA&dyG;A#@VRzo3c&J8&6sfj)4^LFR}ea@*0b>ci<Dq^p2d6aTm#bkXsD19VB
z?7^9+_Vf=OK&#~@?b{IZcpuo^QlR3893tJO56r7ngZZFo$Sp@w;g7feiDM~T7B2}B
zn*UiGOT|N|F+BVw088KVg@d~r%TOAgs8MB0m4Yd6ezDoa2&5%_#tb6YGKJFHBO}s6
z6tS3>&X@F`tXaqg99SFkmldk-QfJ~y0+8as>GUO~r3k9qq2W&x8Eh}@|MvOONwR1r
zRf1-)L+K&`CAa|Zfh~IP|GF6nx)}m=v5GzpRzv79WrXD8$`IGAqAt3i)p?M|v8+fI
za<p-pzq%14!t{9{Bi85wQNNJ#`g+&7r$EK<X6gZpQP}(M@8J`OL{ks^c6cjgpD5M&
z>w08K-mO4;Y0)v{9xu?|cka0a&hIU=tclC?Q#;y}MwuY+rsLc=yS0U=pj7>C!34MS
zoYo8!601K($Hk@ywT#mvvCjhw!IXiNM7RO8h^=ln%W;2vK3^99MexvK#V8c4$b6hM
zm$t{uu8TNRZn9uX!n`$i2zmND&EAP;BkbDZ6r-d7|Axp$G7!7Ek<$9)d8t&sAdt|<
zwm<(1o#vw?ux!-AEfh4?@d`cq@Il-D+|%aRytH9$K}oZMpX;3iYdT=#9;bw8;NQqi
zW3~DH?fc#kM&^w|z36n3NE$?17R(l(s+%Fp*3}=YbG}=7s%GJ6&;_1u1BKKT_X)$-
zhRT1Dy2+}ebG8EHIyDwXB}vNnJSv-bPpq-*AT1JVUN+NVfKMcj3Tm62+D~NlU#CBs
zOAW_s>@W)~LAe>f0jp!4#WaQAqjX&b08$W~?BCZ#uOau%<COlY@`0n9emxX2ac_Aq
z{Zc`kgH>qUpGce(I_|O+#A*^qs%bw4z&-6+giI|fljV3wEPqWgkp%*JP=2-q(jev8
zaracd?lB<zG9&S2YqX8V4+AculEl*uXUpOB2GDjj5<t=wJ?Nm_PdFUwX!7gH=-H=J
z0D%)5WSv-Df&KSr0<a<1)P%}NLe1#owS8W{{%5cl(&}Ilw<=q*PsD*9zem=q;(S|c
z5jCF7Up@d9my%|Lm3Xlhx>8~!p7bPN#-f7VE#Fl$dQs`W0{etbs^^dCyMLw*FHk-_
zPY+wg6@CpIi@kl3HVv8VWL`nc^vy*AlSi>aSpae$2DGH5fo9>)AKgQL54OBon?#gW
zk*ak?n&koLY;!6&W0SlYzk0sVqi9rVX%#YoI{u0*Ar>3g6yiYB=)rh97^y;$Q?L+X
z#eU7PDNl?Y#4_+X5T7lVzt`x~h^lBhSk4!K*X8s)V=-ymE}W(`((H4x9&X<BJ6ol5
zJv4UtEZQ;m3zXlY@$W-z93Wh{tlECVS)fjo{~C<HGlg_+?4Qe=t2O4unwy3})r_CG
zaeu<Ri>r}Z2{`QNbZ6v1v-8JZX;brzC^g-e=LtZ*B^*$mo1s&oXHZ5~16DXw?}KSm
zY!F)TO9R(^3C?wQ8>d1Hz!dbN7-l>-+;-lPNBW>3gr9mK>+^wdPP`KGL$(>L4;4TX
zWhLt)Nfvd<$DlUXL>fY*oUeq!(;p;c5wnrMDIrt~?MxZc7I{6oc<)cXLdcfQhRB5t
z$J6fFEJB|C6BO1rOSdb$rC|ta2~k8t^`be@rs19VI%vvCY-GG1-t0X7j|u>tzKFuH
z(u)0>NdQ2sxpwVxYrrom+8xQ(9<AyBi0a@8<YmMH)Bch?3!)mPmy(2=*($eQvVSJg
z`Y+96SB#ibY$Dpc<0Qb%7y-NPqqVa!!aE@wy_gZ?{>+SgCs?NCu|c2Hf&ajLy?fSn
z(E4)YRe;#*0CN2<@Pk))HKwm1g75*?@7|gZBOnGX)8fe8XwNtU>{ghY9<fO%$_*dJ
zHf)+>(|r4dQBGex+luOCoz0JW<?u_gY1VMsCw_`IxgytAkT>s9Jpn0(TzI03w7tvr
zp@|Ni1hR-Z*H3o1v^;=jud%dmFcO(slM<S7^qG(5C-Rj(!i!4W#aEeD&&}n4j$339
zQv{d~mN9+TA2PojPA75(l|!5|^$B><z>}f{3x#lh;Ca?wGQAa&7iq97l#z;)*r1Id
zG_uZYoOIcIF#fC|O7utSFp_OC-eHh7yM`=*lDw&c1eCAAWMpg{-qGndi!GE@QsrbW
z@E{e!Sf-6Y4WsQ$xa9KNkNL9EbmT>?qJ)f*P5ULWdLTu7z2EXV)KWnkfU1hm_DALJ
z;lwN?6o!uNuC&uRIkd7_J_tozoOyWW5v4ZNe@~E|zklAj)!R~AyKwV+7~3?ps3@hQ
zql3<<a@92Z7k>986Pm$Pn3S9rSjm=GdOtZ>&HVZ9mOgL%N|F56q}PMxub@k|`L6v-
zn}lKV4q=;mr>2@O)VAJxSU2J!3=qk#M<c{sg1brHt;B3XA)L*dqo%!TLY392&^W(0
zIWR#E@EHS`&Ns!416@FO+VVk;HX4K26WNP`<q*71{thVjYlFWd^HL&$EH2FcF{mI4
zT@%=n$|6Ls(@@>qORA2Cod_x+!W@opv#&9f<Of3-QV-4kA$dQhTlp*(O_+2Sw_Qea
zL)++;j(4nyUvzQ<x2WW3g{V=IVHOKA$5(1Hwf?Lwc6Hk!e-YAWk7S*V&t~79I)#rg
zASIMyoaSpV)cd5aCtvT5C-!~g_zY``SIUF+pJu0R)lTu)SbG9-@qe$7^m~<}EYEoD
zbyCUy9`={{k&bMmH(lfE$tnH8Wu+<X`QCry&ofhD&{ce`*K-(RgtW()!tWB)bb8tJ
zGK}D-)?dRa|57sFdr$>@|M}Q0`Wif>gh0v@nX`%Rw4Gt!;nri28+^j6SY`_Y;#eqZ
zUknpc<3>5Gg^;l%*TKi*fGwB=8{;3(-OadyRm0?9p^8nOs7aL+{~i8zq9NUvqQwZk
zX6yXBcx4+=Cr8rjV<et26QFsvg@P6F>o+hR<BRW^?M_Es1+{z+{F%@>qc!X=<_8|a
z!!hEz+0#G6MS`5tay``CsPlX407mKDhwf_~Y?CJ9cn@51Gq{p;nU%%XUZ~e#*SewG
z0lHWt+Rsf3hAv9Tt$=vaMMU6=aR3kfJp7}ah&u*E9sjLTMMp=keDz(g$MkKN+%uWL
z`Y@%UiW38iM-mY8vE<aqc0(y;v~qn%Vtv=9axVnhdna}N&IAipQb-WxNUdZ4FbiZb
zmmNj(y@>@wj{UsR8U+xK2#@L94!WLL(2)Fcy*%)6aBfR@07jCfi_ypG0o?>U&n>Q^
zcCJ4TfDFVct)vi@3m>|JyqD(%r%W#kqx0vJ9%EUsviUDJhbHaCWrIQjUMjarwR@H)
z{*WTi<AXPjV!LnJ<x3rhg#yq}p6mFHC9;DvL!)Pfj_juj8jZ>P1Ktra$WU`&jm1`4
zru}c+Oc_O-XJNyMFy9bIUXw)G8L~(J!wIA`ATJ?`BdS(!yY@)Xp^UFxgD}0NttnUU
zKj+V2X_o-p9lX12B%IA)m<_loFea{noZu`**OxEAjPOS{Iu0^@xUz}(?pH2{%cpw|
z5@ji0sTzqFN;9!P!R(~*U=E;){NuDRH&zdkjP|s2=x%(fg$%dOhcdxuUx7T#nwq^A
z6iTt@`=g>q^dmfi#U-jbB?AVVd}-Aj0IG@b`bR~snds9!CBI_`BK!_ABr;W#XZr_d
zXNFAdD%Z7-JH|mqN(DUi?u*quNA%rHt>x2ptaO<g)*@#)ue(F|w4I2nEEtJwsj=rg
zo~dZ<VZZ3<cZr56S@UO<MLSu2ePRR{{Kc#E6$y?vH!~I7yjS%&B~Dei=-h$n(|-hA
z^Dm^f+WZuF^0$DGe1Ww<c`BV-iaz!LU@vD8gjQ-hE=c`QLxn<|heF`OQnGnjG|7~I
zhafK!>+gk%-xLhgmvG1if-X2<&Aa!F)bm(}jZ+wFM&x3Zx}PeF?y(ttJd}|Fy#eMd
zBNfCc<w~O2mCT=pvEu$g^=F<*_LB{*W7g}3eA9t>=-FN|H#tkLjvYy|7!lQ=B-wYZ
zfGHg?+PUg_n8;g=@8?)-c&d#<naQ#%xFx)pFjW!%NTlU?V9`h5$BS$^D;@ehC)I|q
z1{d`G6u5;7YqqZab2Zuc`DJJ3asX^WZE%x&pCqlC3jhxY52uJq9D(+t3@Wk4R)6oa
zRsbtRXfkGFR=coLV~?zDlVDPDexx3v3{NlGk`;vC@8-S5f21?&247nCg*W0FN^pSS
z`>!Ft1|uROFqcgpqkVmEe0LN{a+qklOgMl3YJjP?(=ag|g?~G_nEKt6AE_yHf!XnA
zl`+95bGT62_A`N29g5YNv!GY(rQc+ZO01|?Ch_nAh``q19g+9pkjtu;!^QoM$suRc
zMPL=-1PL`pTxg#A=OdG+h>UB#q{~AdW=enz#|PR2NEnq7L8<G}$EHAD2@p_<2dz8c
zG;zxGC#E<Mg38{7t>#c{;}9bsm3<=keO}6Y!pwSCAhD;`zxfkDH)}MF&<Pl4KT~&k
zBmtIX%|Rg09ZvEET|7O%X6m4wd|r36#v}`)&X`R~7;AS7CnN)W5U3c8io$jvqAd`~
zSHJ{pbq2+O!@{uyTvni>;lH1=077~_yxu&#`=J&$E9LiHhls>g<8mgdd1u4wS(X?C
zPBCJSv{m|>DgRxj0HZ|#iZhT4M|pAK&L`s<jk~>gO5Hp9{1+wSwz5LxdKjFR4NXmF
zoDN&^X(Ga!NH-(nGikkRy<@BAUAmgnN`EMd-E1yD{aC_mvT`<ylkBF&i<i#3f#dhq
z2iB5SSVe@U!@%emL@D105vP8siWgHMueOpV6+3MNH4fCK-8v9L>m$vYUucFlH|og|
z`TS+~74@2bzTHJoI5}6{mTLU4<}5W%oHCRLBO@35n`m(3<?#OJ*S@HG6<#dB7e3|f
zzpWQE!B}yC{poG#pLIZQQJ{ZVH(?1cZ+NU#tk~|zjn^M~u)do@rKEWX8}+)SKs`#7
zM3l1V-7HGf(qFmHdxPv@(#WL9*_7i>)_6|V2$Zcvs7nJ0Y1~)?+p$G2e=8*$8rOr{
zN^Snlaxa~kpqPFA3OJ(Lm#LYCx*1g?@ToPOa-_&jMDg8PK`N<2CP*RM4{TivMO)~x
z!kZWXAvkKTG-S;upJzS(wsCTNFIKdKL4D=dJan0!wn_jcVo>VDJ?v&Z_Oj=--}#Nj
z_|a}zF$aO4ds*LJY~BUjyvq-n-+MK(d;VP-^^!34x-%2YcawyYG~KwR9Hed4QvW)H
z2wN4$fn}OBpY<h{u~bT`SMT0OWS5qyCk}^Nll^E-i7&Ve&sgn?CAR&nr`3e|vt!>*
zz;Cd#1Uqso##@UOYhK&Y{(kpfk(mhUuo{H_DZ_;&rC66>!@NB*I5CUnZ5DS#&WaJ&
z*@$HGqS#Fb3q<ACdF5aX%yuERdde0kjUpo&JWOPEAu_T-g5Lpq+*9kGeT+c1Rqb?^
zj=GVKH8wJth(_L;QV}0VF%n>O1L3C_sGl=3cgyw7a_;`EyT5$)WT|Jd1+WzWz+!%$
z5;Nw<GA(+s(uy;4N=cwyKP78BncUFkc9Z01+9Yf$0BJRb9(8PqV|nZxB98ll=a3K6
z*4GZ4N{M-xt~T86h%~F2zWS{ZIp?1hf1I*DGWXc(@%3%j`fqsqDgu#}m9@Fk4g0Hz
z=<b_GBxU@?AE3JaFh*^p<o4;a<UhT+ulop-VUlr*EEJ2S4Sk)T(n8+ZIc1~MPuF-D
zC}~1Bfo;FUB57T%IrN?(?Yyy6Z#<v5)Z*NB%yh=#e<Jz8U`Rv6_vB%HYzhf2&1WH}
z%`oI&k=dkwaPB;px4HBvkmfo-9!Js=*H}=trRG1!i%53Y$kfXjp8MQA#1Fx@sszZ8
z6$xHo1;YH4^&kLJxsAYSY4BtOYO5XIt`%q~ktMMBWQf(6k0|wgz54x1r`(6)cEfvH
z5-9cFg*pyc&Jp8ypB?7cLbc59C+jT8e)OR9vkipPO!E1<|ED4uea0+|&yjoT+#T4h
zCp16wy0v0ax(R3TCJ%T@7Yo_#<~&A@q-_NnOKaO?SHvh%2L5fXnV3k3h@g!c-W?7z
zr<Ec>a9U$6ex+@{`K>0SZ}t!K{5#4=bDyGBGjHIxUzLZqACv}9Vjb4np!^Ma8id{*
zb{ZJuAq<lV#3mwY37BJmMf7^hXLZQmVY^`JGW9hN<C5d*0h4#UuZ|Ay$v<4v%s}OE
z%9tM0En=VU?9i-kTga4D0i47<nWe|5aQ(XLC+?ISSkPH@<VPGTx3)IgMN~At7>iq5
zRHf|V0D_L|aOQwf6Y8x`qbb>xiArz$$n5aO3o;Hi)P)mb&$%<9&MSh!wLR0KhT7bP
zuX&MCa>8a|Z#VFtD*7wx0ikWcdAlIzYPa<|g7OC#sMH>1rl9()%c6!%QiKadAqB|c
ziku8KVL(VlW22#XEPo+$86>uFG2^ky(ZYZ#N9o2U*An+MSIZB-)`JIk(C7s`a0nM+
z7Y#F4zGs4=N5lh9_m}<`8-WH`0SGW&RC)P(gPsfPr%u}djoZNxqGsxEC&8b(ubpwR
zbw8bwcb$`>pn?dTdJI_w-79o|Iz>TjRxEIWM2|f}4QlXzn(0WJ`W|t2hG+W;f%efH
zZczkv+(s8ZpsJky_A7M)d3Rwikn6$0JU2hXVc%KnM80BZY&$Uh_k}b3LvDzQ7Gf@(
zjZr%MTJXnKFO}FV3N6s?R$+Hy(k%fMc-UBFH>%U2-StfE{o~4$+YpFn*|fphbjTq!
zu959qD?Nl*6eMz&eQ(k1mO6}GrE!*UgP~kN16k1nX2Y$G)qnc>Q)}|$&gx>+F+0?`
zkDN93zlZ|9jo^=x6f<CczSk4;%%M^O)2Bz_UX$@6<ASBcZ;>I2uaQ!@zBB==1X@j_
zRuL3Ajgf8$DscGa?CfChN0vHg73mi2U-)og5Xtz0rsRDq68fR|=e#^(aBNIr-l(u5
zZJHFb?pCGc^DHov&!8$3(IAW;a<QVA)UNqDfA#4HoZ;lRG+$k}3@gdCtKId8atZ~q
z1#rmJ=Kf2JQHch^Hx{IGQ(uaqb14nw%ra#x`r%B+FG4&nP6)av%o~9S>3^y>jGGGZ
zc1w&U($S)fq~hVwAJ4_srxTHL?YAblZfurV?wKv>2)ayV`7M%KlYZ1oNC`etR|GQR
z{}3Q~WNN-czZz0V9tCXO(#C|cabvq5hrbxOEl$!F&`-`wh}qrBv|UCxY-2fXV+KAL
zW};RJ!A-g|W0>ZBV`QNBDwa$22y6v*^5Ee01Y1&w6$Vc^fM&Pc6yD)h{BuTn2NWg?
zhV7N&^*+yt>ihfpC1nsAkI5=6*B6P0g<<6j^H`mWDDZtNmmd@}`!;Sa=pm$s@}Dp<
z-OUvjd^3=4i6xGknv$uD0z=dEzwxr3^%6$}f%Yt?L%1#q8Q!1l=bPmh@9~uItNqJ2
zksAA?*ghZTjVjvVE=!vO$hv=Jw7?8f;X!@FsMq6S0R0Oti!ze`Fut*~6iewOYl)j{
zB@gU|oz{@$@|G+ot#u$C*T_~hh#Q7;;YQ7MJWu}j8)IkgRJ}uv7ST-X9&;WqgTSpo
z<GG~{+oOLxh}v)9RZmUiK9AspB<L`h70vPK&kn-^l;+BrTe-buq3CtSwX72GD7Bal
zeB&g{L|l3ARhGy;IuFK4*+7ZaBl!G)7G-cR6`CdSp7_OH>^HFs_hw;{`8l+-^`DH#
zKe|J<X0&`)H;6d0&p8q=hKDANTo*6qDaxm%=Khc0=?P11MgL}nBRbAurjAi!qP5$X
z<ugK<?a(&%;UbPS|3<GppZNSmm{3XE**KN&j=voE-#CF#@_0u8mhbL{$gwqY_oJ4o
zQw$z0kP)&GagU*1Ls{_a@p4=q)U+gM@SEj%BEq?N;8wp@MXDoZ<<OQ~>F;qiWGlId
z<KM2LDhLwo;`{r1ld0t0@8QPtmF|7cF+-jlC9JS-6^4-o8pL?jQML+U$jqHF#0)-^
zA{^%Lymhm52Mz<RkLFdg8wUgy1T|_vR*&h8?+@PJeo7Onqm0yE6jMciHxVyyvxwOc
zd`Nz}VLH~!V5ml;%A2a$|4cjA_Q&XXdV8ZN4G9KLC5*FJ$oj8&{3$gsVNcescn6Oe
z7YgR1_U6<j8n8H9ax8USj%PP6;kC~EvMzb(w#%usd{jP2w+13Q@6cAGEdb~*LG&rJ
zt0S?3kddMJVOqnvj&|oY*FSXz9?{Zi-pE<%HD{<tY{s3FKgOJ~IuWKu7rxbrIsDKJ
zL*Q9$veWm+h9{2D!uv>;mAr6v#)_}hp86jqyL;;}xcZ*1a?~H+)i4;6YW<u79JAnS
z#3o4=Tp;Zsnpz;90T(ulZBVaD$!<k&I|opozdY{V<r3yw$>US2i-I23><7`uk{x2H
zKLH7NJdWZi#hPehLd8MXt#RNMCq<!^{jk4tiv0nHr1l%ji;MinQjnQcm2$Xn?B?$A
z{_ex}UrPpB*`_s{-x2ZtU;IWHaGqtkL#<CHq8-+RWPN@a!N-f5a%JjeCD-GiCG)Li
zj@nb9WCOB4Rg(moI5OgHpjp!<!)%8Ya!m*P6<^;ppkL(rrc#>LSmy!P*CB`ZDcZ%3
z4rJK?#&Wi;*cJUWnDqA3gFZ7ZVDdv*{pg_A_{c%?by2Z_putx<?DFn~`0`1849ws9
zE;bFl$hc1RRsy%sBRdS}CTM@ZlG3tp$jR+CDizJ})z06zz6Z;G!Enx6N>j=u1a<1?
zAQK1j_2GGn5N;%G^!r-Ey)8y6uYbKrHvqR8wfP@Ep!P+<yF`Fg9z=^ccJ<3V^uBLw
z`e_bx^KC!rP)G<IB6#*)l=QA|K}(1FmJN5<$1O%p5vR{HxBRoo0iwLfF#-8IteL+P
z@%y^|jcSlEN*|)Mld8T3np<CU$jgu32KGs08#);ZA1RgdfoY1*-XRR`*vHKI1e6Qs
z+^zFQ@vd~;UtXJD{;DXfK%F|6gmc+f=ZqzHy1%~~Yp9^H?XTqBJQvQyK2Ci{1S~|b
zSbnsYKfjWn(n;kOPL;A4iZTg(3XN-v)Tde>Vq$-Qul)HJFIG^jjKV>XPC&v>wZX0~
z`uJWbL>5HN2>cExmgjhvAscT6`ub1g&Cg<PnVdg0JWRq&3e%N1;x3dFP-v$7`+(J5
zCNl!EFq)b_#sD62ARp*Ua*5oAEU4rYq8KB5sJ+utE&Nwx-pe-IcSqm-&;@Z+rskh|
zBEy58wlTNnb--QLG4I>f2Ti)EO(RPg=e`8~>BRJun*(z?=P19-TeYsvHTShTtarHD
z->d~Zx3eLu3+{T?+$|vp;&5Af3GkGqp!9zN{D=R~S)afydgY2W4)jnnUR?Od>-<Gs
zk}PD(MeEV+%`{5y&y6xw4ClWlzdP_kaT3wC@C$^8S(}U%ZuV4ig!-T4b6bzQ#3|5z
z)0MGD1IBK`()X<7tk=RhYQ-mOvG%i)MoJoW-y}Ebn%rBcUg8*!X#ATeW9giDQ0cI_
zmldMVnJwy`%C`Lwo(5P5f+zjh$)ZGz#hU9sca}-9_4WBggyh8*>9S_{$~cO|$g*?L
z`ZBu)%IU=NK8z6Yr?UO^Vv+m<A15tY)_l+oj1a|3HFQDo)Dj5obvh2#H)R!Z>Lsez
zj45|JwGhC*i^8X*=df!Id#9|$gMi0a);unq8-iSh$|Ri|fL3;jPs7o5Xm<D;!H5W1
z&oZL>3a;JUZFSV+{ARde@^nv=&lTEO$gBf%UlT!xTp>#mpt%-86;DDDHS7yRO$XI)
z-_o>khExo{`Jn2+_x(!x8!kdPGAvYLWK4hv-$wKgMbdOiX>s`#Gf88(waO?$p14!(
z^83tt9*!-w^icv}#A6Tk^?x(|?y}GJkQ03TXhHn<Ib97EPPd!+<qiBO#CV&$XaBI&
z*X~<nkD$cBSC(EKrq7cm!;CW&^#@-|+>Jc_JH3P|Pp=re`=1|&KX+qILN}}rmly_U
zWp$|S0qBcBG=HJ#dUq3=X_42<&*e=)Q0&P=Wcu|Ie)b-+pYPcgX3EX~TMhU^0`j2{
zt9*LjeDp<Vw5J}NYZLzQK+~bbA@~Gd=TVD}#xRUCP3HcgqA-lY5{!k%3H*b@yd@DO
z#*T~->9FdDKB)p5hU#LlcRFDPCJKPXfv5GPIxbL3q$!dv-cGLX8Ep`Q(IoL+r@`$v
zq!C8((o&aiFqMIh>yksi)$?eY8#F;xHg70tq2Zq(clr%FnFEsRk*4UOQO`+na0W|v
zd2V35(sX|p&f2*S{PTBV*6fG#5V=ds@mE{4@W2X?5^DAiU6pA$ex|kZxACyRa5+vw
zSpNezq=?w#P@3;Ns{5Ys+cl@E=yqd7|6gn=R;Tj7q&ioy9AZPh-8lA^4o*C}QpXg0
zWqv-WVe{gyaQTP=;+9T7$cGp)NIfw*(UMN_q6y3-#l}33Y{toM?EREd@EXzmJUu(C
zFXEAg5Bg*i_b)e(!74oV7kR!P<9Qff1VBVC(VG^Mg>E-~sw!8;mJ*1@<HT&^VBshD
zHaDsE8cb51KsIFAjU>IUYr}_!;*t?-<~=1_`SkjfBmE!s7q&7wd9x%l^{j<=a+E#*
z7Q>X9Y%dUg^!v8T?LU0kr382MZIR6Hr&bn)cIxsWmD*Ev1p(H{t&1}$AlPcUZ>lDx
z(tgTogTvDuo=TKT_As`B-GHvHj7aTj4yc03(j{=;*lzd%{XfH_(AXpWzBoF|U<OO>
z{xuVb(K|?k6#^q4nL&poZ^F}sbfw;V!e8|Z-tTVt3qMy|W2idEF?|q))XyV}yF@gX
zv}2H=aRLxWf}{@csi}NN!_H6lD{20n1KG%&F$;$*>%w}mn+!CB%TDZvpMFzG{aL}i
zwJ*m*2pnbQ%y$`=Tvn_LQ4|rfVlL^f_N-Yr&*!n9`9&cPD-6RoGct-OdcD#IN6Q*O
zUXN!93^3Q}>GS;KvQTVp-=wFnOnnc$MSED1a*s1CcIPeD+0&K`RtfA`j;0^J<zj|?
zM^j3K*BJ(R`?<y#sw?!#Pi9Z|nUbKUIzsWpi!XwH_fDYX^iT&M*)O8vI<({!^fcP`
z<E7R`5Ew6^`!Pj1!quWIDy$;SzeAEj$=ng+lkB39KA=L}JyRbiixk>GCdU>Pnf=;O
zN|5(KB(VnKESa_Gy)}IEeg|JeZK5*tRxHs?XhSg~i_}CH;xECBTO}Y7c8V0bIACTo
zls~$8|Doyy+;xMb56DaSgQVdTyLWtYDnpGk6~utA{Bv=U3Low73U7PbCDJB3lQ4j+
z7*~Or@7u$aC@z+)X#i&S^rE1`Sb`$_jS(q6WQ*zEr--Xie;o81BxaYnwM-Yps!=Kn
zJmAW<L4jNRec6%1lz(6B_)frWC4d$7FE8Rdf!czcu`x=A`}%6-_pl|K07uN&-2mHy
zV493+Q%2UqU)<|{N%k|a)&3D-i!v$kkDblROpR@P*oC3fki=Rs>)8FU!(!~xK06-Y
z<sv{V*W*zV!Cja2MQkG&+#az?Zn1#^g=Ojg!VlK(v%4@3#}bPs<&#5b?S6wTy;y|2
zm(3Sh;z8e)04*Ss8#?1G;?%{Y&v-N`4qG8eE*H`{(&b;c!V~nS7v=mxKe$Lgv)duX
z5`P$3`1QJB5~1t+*C;o1S9t8<$SktN@OwcdEM*g&L`3ef0iAip3yAwnNFO$8(tZ9R
zckFi?G7tUKEmL#xS8zwEXOr~oyPS#HS;gswHESR;BW8ZMDU(#X#~KNtQgRv5C#<_N
zT8r-c)RgriW+#_W&|#t8PPAU=?6eITb6QmYgXhYGy&>ar*{8wU6xeDL5qqTzB3&lN
z2skcJs9HOEnS+j;A0<1w@10I)=rA|nF|We#$(*{lsR_rlU^7l`$U~%{=(}0$@U<mo
z#@il<?_!mRr8W=da>L`{k!;vWSgdR`2pdQcr!4bt=!_4BW_oX?Ln4UEV|;I4&V`+y
z_YZxH=9@*bHv-yg0)@bpr)&Y(J6bShe8nd(vhWKi1a(e?rI>njuJ+#NM=tO_Tv&U<
zg5KF(D=o`Z2TZUg_}OZD?(j?*V9T*uc^cc2@mEr<T+baDwv8*gg^&5FR{$@5!-zk=
ziqf82<QQlv8x%N)*gl4Gh4!dLg4>~wDrWi`U4Qtj7uYm)in&wDNexblSx$K!8Av@2
zU>KMWW5n(UGaI#mf9@o`^#{$fH_0fycrIbBPLP0K%K2u}0Trr|DYQ!p?{Ls@eh2h|
z-!j3ojA5j1U75AY-L4d)l>EEG8UySjBXL6nxeP;)3tbh5`e?Z;wPd@F#vDo8zphw)
zN1~n`cy~BMXb~pBzLxXL0?mO%Mx!CgdQy*ll@v7T_4{(G&;DOcMlHv*T6U@}lBU=_
z0nt=Z%KZHNtV_!9uI*PUEL;-YD56NdXYW@Yzk$c#vQj^1=~f^asgV?6b8@4~=%+Bv
zcsTVO0YYM1B+2AjYqAXzxO1i2bv$eL+xK5wRv4ebQaN60)>kXh5fSQuNt84wH65lC
z0&~t4<2B*(`?g?qo^l^0o>V?dx8Q5L74HveMAH{VIEYn#9{SRLR7CsGY0NJ@7mT%L
zJUVmqpi)zd#c_`Ph1qS+Js|w-o6F310d(@4fEaGuVhi4~lcQcxPjF`Qzimye;(Iwe
zZ%j&DdIb8>i9>;pCar;IvvS2Z$b~w7T(eZST!+8;;XeRqSgtt`WEDnkfo?L&af5GP
z5riZE*>tY{nA=LA5be;Ua=GSYP6KvE+026T%z_Z6PNKY|N~;WCxkoxW;k-y(`NBB$
zzK~@J(EVMbQQk$>WHHx0VJaBtHybBW$OzE06sk}gO)u~S%P43(NKr%Fc8Bf*ZEedp
z=NvHdd3$fSdX6tngsn;kW($?SVSz$P0d#1G)7V!Le`a%fB){g?Hej4G!m6?2zUrA<
zBH@Q?8s_mCICYna4AQeWpLxIOT5r8Lp`CxEp!2r44#@uic97C-j`&WxZ$lF!HON}!
zJ9B^ri{*xAiW8OO4X@oTMi((Ij0G!B>x^OQr<-jJTXsgaR^}ky<_AL!M$AOSoxdPg
z<D=qQw+7n@yOUe+8-Ef=#V}N?MD*2h44|Xh%KV=VrOuf29H&%=Ae*9T|4P;U4(D9|
zHPh#$vQWNA24fzGAu>JbXYl8Eha)aI|4nSe-6+NKp?H7ZSbs9@v|kc%5XZFxUb*$;
z?~K)=;jIq9l_}3u<in50UNgQ<zO0vv+gJVc17;8$(kCUMMMXt(o*;{8L_-ytqi3}E
zxIwjnIj^30oq+uC(L%qtF|-A{DVq&@;um^J-?Ly7-esJ~wqb6h-G`D5e+fzqgCu1@
z_Brvu-RMs_+CL>FWL>*4XK6)QC_U$`o6<pV8Z8z+OdWxq>AxJ}4W?6lbM>KbQ!~Xv
zQl`O7%6`i^AxqJ!KNf_3w5f<9OjEeS5DE;PQ0vv5I$Q<{S^oX{p4kitICy_~#eIFN
z#cqK+S1wBNsrozxHHXn)YXzn2^Z`{(wiIJVNt>eBqer&p`8TV;MOP0?Zh5~}BJ86v
z*o<!#&D}nL^Kd5e-&KlRx!ekmAg^r))9?<`e$RpM(E#9$24f|C`iW!Z@k2>xP>U7$
z1J6C@s`)>vxwZqYpY8rY76HiOVkPdpG^4@xK8r>wnpEPt<K;wNmFtoEhWQ_Q;oflA
zo)JhS%GxXwSV7x;f*JCd^%_CX=27*W#e77bf9)hqZ|}5cS)rQF_@B`ZcPTgL0>JvX
z(loxoh=j}>(JPVXN)8uyhYe<UEiv^q<BiU-J}-_o2S^0Lul!Z6zFjy)LKqbz%9J3O
z2tQxG6j!mP$CD(es3gvc?eqEg`dY93Jqb9!c{LD-#(7)azs=6ZuDco%ba!_jU)?_(
z?hFu$lbbmv``r1;myHf4FmfsmMq!qIvBUDVb8vR2k({c3?KWgB{2FB?PO3q5cBy?Z
zSDch{fq2Lg(S256__IHh#`}(EVXLBGrZ;4)Pf5OB19DPonywoM>X9N-Zt_H5FCX)5
zBwf$SpY0t5U1lFf6T=RTGf>C3)lDWg2o2Mr4mdyi{dZ&-YX8bd`5k6I3YdP+-<rxl
zNiwWZb~}hHt(1s%xTQfhhmypah#{p?MB4mUxh=T_`o3#CJx0~3bvGH#oGZ8~AKx_M
z!g<zJA^pURm>8zeUfNe0dX%A6pg)vxi{X9rN~-ZXF*r{nmk+V6!5;st9N_4T{e)G$
z{m7OOAw`{C>HO|L3?C*NK*GfPlTXmJHe}Mbnj%#g!c!K{bUq&QrtCxyTa*W`@-uLP
zkOvL^q)5Q`^b}=tyGRaa%B9>!zf}kwM|m|y$#h07NgYb#42|@DIm|Q*ywN*$aE{GX
zgK;CrZX&0Q>-?CX-!mTw3-z>?{eptA(qik}@`lwiRK<Sz_2d%h!8YCAcI2E$ME_ky
zVt;c*SQh64t_h@B^L?;=e}zG6-6wKTytf}(KU#Q`vXN}7HBY%t<TyfYnKKz_;Ms_+
zjthcsR=#c?4*Eoe?7+meGSoyfI{|D1t}k*%!>8jq8hF_w76eI;WZ6Dp0zm|aQ!s~3
z;rG8xzGi<EKMa*y<1PF@0Bk{%zPL<r0uB!bXdDDEZvl+;&t646^(u15SW(3crYv*i
zTU7*+&a|e+1|NH20=j0k=Q>mg5#yj##A;koee5sfirLSbn_l{{=-ziZBhxZj4?%uN
zL|~E%l2mXZK%wT#%t*&&6c0YZ?e3p3)m3BBD)+yKVHi-O5&ZJTi*dgHWVl44-)0y)
zW(@AW=ic1k{Q6f=ZH|nXnd@XIa5AgC@<>X`fO5kA$RNc7FxEZ|?mq;#8VN98KFrN8
zgU<aaSUT}qo_{5bO>buP!}jxOng%G+ZmrEjWXcN}$YX>;m7#Tzb+K~A$|9Sp;DYnc
zhhdr}^$m4D+Ol=a99=i2ZrrfJ`|?XKgQxvjmYGPf+wIzKe*L?>9<OIxEE;>)FpT%@
zcKddx%Lzj_KXKq1o-Ue=)BRA9Ak_g@HSamLcljSlPk1t&v`kSULOtBvzT|rO=qrDM
zXh(muus3Av%C)$q4&2ZLaCZ*GzK`u<$6J>$S3%~aLI$v87<|S#j|#hAr(g>X?3d0s
z2TwCs_T4%fgf!{YrRJUw_lowKad74i)DXD@m`Uh+mfxgKKJ9&rubu|_LG(Bfj|^OR
zTmprfVYY6&ja2u*Xln2Cr(!^U^*hX4Qb&3cR#NLB9En;SBGha(L>Nl<4#q8DONIeg
z-VW}syn>g_dWd4(cba=woXmvfYh#S3`|M=)%L9O598g>!GC|#YuQEd|m$SkNKb5?T
zenmEqX^nk)UKxWhWcU+J@Oyg@;y$<}eLprz46-8m26MRkY!Y(p(ue^T13-}u$YW+e
zo^$Dba9#N*sJ#)aWb6S&m|5;&_rPqagR$mGD5rkYdX+gBgO~jRBGQ3O={{_KXw*s$
zo^Ya-wsI(cpezBZ1n(Qmf%X8hr3f`OHRWvBumPJlZN;{2Tc_>VzWt`&Z<b^g=7H%s
zL|~ExAxPc6ZR=zJlL3D5<BvaqvWn6r`FVMNFDNX0-Rt#y1_3J(7~aGu17Hq+kQYyW
z#;jfb6{wD^4s2@K`bBX56Xq*EfFJz8&zTlkT)&?QFu4$BN6nWI3%HO|3YKXz2?J2<
z;AJx&;Ia&|JNGY--gaJks=v}=Y8HP~!T9^pwDq?c_dJo+Z?JjGrDE^$+nKMdb%39W
zgvIAB*$*NgBrs1Y%xy~+iN<vkn6D&zbPj+r<<z^m%Ws{!Lt$%Wb}+?;1HoZvTh)q;
zQM?DzxP?o3!MLT&TXd1=sJ)50_MA$l(HDgrJV2lBP;K{u>6%2X+kR#QTQ2A2GjHXU
zM=d>&EYV;xR26Xa)Z*V8gD7<D&t~7XYZq#2cKZf<YMTVuWd<=)r#)k!NDT71U+VLr
zlBq*q`553H8gncWz}yZP>z{#g$~P=urRuWC{a*b|+7ieV$(BIvwUFjt0{eB(9-dzD
z@`XUnOUOpdZyKf&kH_)S3oijc)b4OY9FQg?9q9Twpm{~FX3H2uBoe~T?ZGn{m(DCJ
zD}CGPwEyVXV~$(h(bn;aIPZs*>CSAP;a!Rcu=&7?r`|UpC+I+NdLg>&E5+9Te2%5!
z76((`)eeL^Kw1jIG$0JU?;<9Fy6Pb|zw$M*IkRufXgB!SW8RgDC)cy?dazUsEETn`
zcmQ0OkiEr_-G%)w$?k(X=hDZRr$9rNZa+-1fr8CUv~2$(D;RIp%(-&+U!Eds(Whd4
zS^L(dS;TK`+iuz)?#bkzNP;=@nz^s!Wo9J7Bo&M+hrU#or7cA}4{H5B^avRxf>xlS
zc+v~<!mCf?r87=|xA^(qLyS!QkQ6)ASDNGkV%<~4j<?@2cD((21`ezBm;nZYNC`}-
zE<}-&p|+tJ-QC^j?(RlMM?0d?=%6nkdP}!Ph_9UzLGa>A$j9vGYd1GM4^g)n%v~^4
zp9r|S5Mu9Ym^<Iz?~^;`OW<x-cJBLB3}m-KJ^xpS{p7y9f<rtJnSuykxb|9{a>^-W
z=-Od{jMYxe4%O}i=MtLs?K|y>$DdgB#_Ml<N0MbY9F7q;5r@g?KKwEaigtn(PhHE(
zW~@icmbpkf-~0F0VIW~bbnL!Oo_fZAGPaN+6YRjjB?7bMKs0Y&D1t51U~^|l2Cy_J
zUN-YjaOQ)wgS$tk*)mfZ>Lv9!n8V%9OD4Z!?Edf)ZgYasLG0>8mM^Pr)%8?$^sg=d
zgWg{YRGr|8+Apfa96pH7nnJT~^~G@KWi523L;%wCvmT>@i6nX&helD;cRZzuhKId~
zEbWXEK`Vr>x;|ogV?N@gQ|D4Fcq6rJ`zm7HjM+T>a=0>wO#nE&fN4PNUH)xNXs1ZU
z)2`t;rCW(h&{H~W4h82OI|VPwPWYYH8Yn3##;#qvV~2nkuw)M)1ZX52@9hyNmtAkA
zh4e0k5AO%;^5G?Y@-&^&s((P5a=P`bMH3-UJ01G^m%#JK^wUy_aZpbi)X#kbyl_H)
z3&BWc*Q^->BpLD0;K7)#&Q5vi)XDhgKmLKY-+srtbm`J`GBX2_fN5y`MzuG{!5Hfw
zB_x6*NswhHQpqG9dho&DtzW-!*5pYOuU1ucL_uqKneOhq;eR6$n6DI6H2LpF<Jw0u
zcIqOsx-;)ve}>Vprji#=ZKOnSpudP6n1^NENbFpCGxVgT*<@;@nFxTDPH*8;PkVzB
zJsBc(=|oF=?!X8g2_UB&%Iu5oF=|&_0%0Chf0s75>|Th@+A(H#{h7S__$3r>+YgFN
zvg-C?U7!PtkwGx`uKW^GQH6O5GN&>K9o&%vo>zH4O9o+iYY*e_5C)J8g83^z20s`+
z4iC79EUhpV2lEuH=Vi05mx?F-)o9&*8@28FDiRUE=1gy@L6T3o1m-J+XxcP~>ONjA
zFS_wsCflB4vI2@EFuAM{=bktpw)}FqZ5$<q#b{_~?E1$bdV^pxME*o@MTV3-GQ=Vy
z3HU`nzIJohyD)dY50+nfc;iO|<P^i$@*gPO4d8iImgzPBYUt};M88U9#(-E4cwRBo
zGw<C0-Ax;jy8jX|yC-WeNLA*L>@s?`?!aJu+Db}FqSe*a*tBU2)~;KZZ>=!{hA`lA
zd*SgEgd|Ba075FIdAmA0mHp*pd;klnrE%Gy>pIr2`}nHvt}f>nzjW<IcKgWXb`4L%
zN`;SX5d`ZYRn7ai*t_CyBG&E7NVOp=K&%U*XWxyy@~As0*4^Jp9q;K6C|2U8-|X0P
zC3ECtMs;RUu}DP|9^!Vlpm6&@t3j4PsVI!@z3J~e=o4LaU<~hZfB7~<I;X*LVB%kT
z!4U(v1hMC%n|R^GCCo_e_g9e#*jx}Uf8WnYQoy(b(X#c+7VUEu<tEw*HtEzi<VmMB
zif|j4tMKp+3cCj)(gxbM9&qP_6-)rLdo6z;4Zl4*j1(vy0C#w|N)u1IPUMvT9nG7+
zXLi?JP9(q%)&G$Mm@^O1lTPj9C!Upi8h<EN9ra6-DUekO`DPpL`rT7-DnM>t0hTRW
z7Uo<+CZ+~JM^y1cyM75AUN;<ud1O08m{xw^0XbjBhxe!VtbABaB?tgloiMxFps#)m
zwzGb00oKg(AXUtS=-O-5a`x(pfgseY{s6f0_rKk%KZaRf3zqNA3YJV_fJBHy^+BV@
zbLPzp&7M6QOP0Kj4eK|QmXwq>Or19M-)^_-!!294HePkrRc(2Bc{-868*lt4Cmf0t
zm6w+<Sif%FDP7$?XGOw63E)ue_I~R}QB{}*M?*v1g>Sz3)?;7!@>i}^RXakVAdb{d
zAD+`)b{yFvAOPNiILobk3_bNX!{*9dRP6LY)V%jakvHx~%;7UhkM_+G_vEI{4y&s$
z%PEJk_UUUW&?H$j!Xl&p2cAN(nHN4{3QC((Y~Z`aLZHst^a;iWYGB?XNR>xDU~YN!
zFPZ4xtq!1WP<P!qJQ=Fwo`Ob7hOK*X6(Si1h1<}Z_{bbSn9Z9{G6PK$ncX|UdCmH~
zwlY}Z#J?Gd5a>{;3<nN2k;SwS?SN?B0v_)HFPRLpV;6|Y7OA0;I>NJ$S;T>Q3e4`^
z#PY{of$~`oQrF&}in>+DGrJdLb7$S)l<r2vv^dOdZ~TH2aX#gwpOa)m!B`c0H?6?i
zAFi=BxNM84HaiT{1kd0z>*@}mTR2e8)WI9U9;Pu20HS3(jLolr<(3Si0}g{A0p@W-
ztbZ0b<9mRlf^iwrQJ2Ad_J`n}LaSkFs1?%K$xu%E`hM+d+Y%V-Uj?tM95l6os|=AO
zp)=KiOa=D6=3IVmUh~}9bI{b-gyQ0&r!Ktk;=kqR`?XLwjLloN9KeOekVwP>Wo4yx
zvu4g(#lZifDDv2j&d!^bE&JeBEg84Tip@%aAWEBv7PPEdx#F7dfB()cH{X2Y|JBvi
z_j`_s6RSTRr#qR(kzIxk(lxLNiywl`lRZo;+kr%=gc5-Z;P6<hM&bbH5Lz4}5r#-c
zAoLW>o<@k~tv4{6D|_8wJOoxe<z=2**}(J!n52M7a{r4lFx3g>D+BYEf_Y2&U%oQH
z;Ri3A@B~v`F$gX5vnzH`Jjji0OTHxH0f<;PM63%U+-9}EQoVrW03-*P>IJp$z72W;
z+4@gWA`D(IzEPU~xg}Qdajw<p?ogK}AIPf&B5e?xUjfCsz<foP*3iBiwC6*hcrsY!
zTp-+LalQ|m5i`B5jT9)}170%qU3td2C&+Uz{TkeP?TEBnbCb<6Pr?E%XC91Q@BGa8
z_~|S3&NfJ0d-1n#UWKc^`gQ#D=fA=?Zoj=vk|Y?KmSLJD#G@fJ)olJm!s_~ae+DI!
z;KS;ElRk*t`7j%|!rc7o{-r+uYOtI<kQTEVh{O|6&bh0f*{8jJ7of_AZeF4=v_wp_
zM>A_+LI|ifJDz{;h1Sb1yBr%fY(RN=d5dA{T6cFh!r?H82!>%m*LCQ+rK!c^2?T>d
zghC-Gic&X!{`~KrbMCpbX3m<m%+OQNHSGZ3mgU!CjN^$X9{>F_&pbQb<8dRAh$EFu
zAeBsfiaspcNU$XeNcoi;gui^X*|m28bNGSGSw|4HAKk$6#ywA_iC!-%vpLgk(M>Q<
z0nCPVi$wdb$;_37RW!XBc;48*i<<X9@t(|hO~PtgYI9}J<4J|Ue8t_Uockixyni)3
z`I%E3WECRZcAen-r%=<xgpve`27qKV-HF)^5o{_l+jpJMoc=7P83(jDSmm4tnPRhm
zWvD(ASp{S}MD21b|IFsz&v0S)Sdl~31(eMIPembiE(ImS7T6t$-yt1U1Q_`AGw<OA
zWB+aJ{_wYE!@93PQotPEtaYGJR1i5~EPLQFS@pgzDrUD%99N2~&Z|OLV+aSjY6MXf
zAosv1tpd`39rxXgg^krnbi_s`SjZ(n2#BVQVEJW7#tOq2ATelb{sqUJi>=$|RzaR|
z7W9>mgCrU9ltqx|ety3hy7Ez&yH<mjjJ2u}2D`t?Q6DyuOqyUBdI{=U3T}@Npa1-2
zO^h+*_<Ud-NTpIx71t0RpFz_!w6(P%H`l-Gyl;Nv#NYnrclYevvHd1PXOI=EgAoBx
zRXb9tI9_`B)hEt5_ncYz1^Li4eb^nhhgbZpx{i4Mi3GU60@Adz?h$YQegSj%!46Vj
zt=8~vh>ks{DV~B!e8xGukfu;Jw=V%A?SO0tPlRCBt^OLZgXlf_V2=UG2$-*=mXA5=
z9TKLM@ttikk!dB(F=R2jtSoN$%kL(}ug;dK%<LYBuG%tDyYehvHscM7b^=-)y!u$M
z!YNi=p|1qSo4>gZq1JRlZU)dcl3>mpQ<`?>!`$ux8QM@nxnQ0Gh<zJi)~^Fo-Bx|%
zz|I7gIT-5!pLmk>_qOezNC(&fzLQ~VTtuKyJD6naR%T!DRjF*wOXiL@|4Nbev81}J
zd?Xx9Wg`I91&VemRKMz8amqI?kX;_Mueuk1e&`8QmKKJ5KJUI{JT~RvZ<H8=0LO+6
z>+z+EZ7_R8+Shf&E7tNsc?zuq;0Pk+AOg!Nfw}!Hh}La=h1BxGFF;@ZH~<661;5<?
zc`XL*^`C-ytPV%nqHe6$CBcEMokm*A8JLQ|7+@G$(B@FK733Ep91fwgwG+u?3SN(U
z=orp9l8FS`+FCJd=B%6DE>CLh+SRwSbgiM)Pm&-jHZ;`N&iuze{&D5S7hm+G)ne?^
zbh_(_kvOwJ;WqG`(x;iP_%Ea<ax&JK$qEpS!QAr7P0UwvJB3@VQ@d&&AjwubK+Cp5
z(YE6PraH5-nv$tQDw_Bxv}C$vdUhu(Q|(Zk{=t0|dK?&k+$z0g+g77#^K_Q24Y{F%
zBAwrorl0!;CBx}<V%;#?_gGqDDlVCg>u*N31{1JKK;%h_Uzc3Dt<<*b(2*%3Fj=*T
zGS)r`6iowDoj{^zP*aY&>%hxqKsoKZpw*9qdK!S-$`Nn?r5*Fp6r_sTuQ7kwNBWv4
z9%R9$OQ2-xZ^+W+ETu5_Z91QSc>gTqmu@=0T7mof-@~|Z<8a4!zO$vRrFlxGUW5R!
zI^+TDg>dGXNSGtaH+n?us(qVXwn4<>&{sYN+eN>#z;^O!;J!StvKf%7kMAo0)876+
zh?WMh@^OdMdSwQ{B&=!H0FdS5qyE|v0hlm;!cIdsw5?mWK+`momzQHv^?2;uxdX;w
z^ao8O5>QkXxw(E!n|97OdV)RU_U_qzo}%vG%aSC)(1GR4SN!CZlTUh*gn((9pCVw5
z5P?1k1H5XU#>b!Vl=1P?H?d4bphRGHFU<NiSIcuRyOX&K;?Uw?reSq5_LM+0Z@W%J
zJ5}b-9A+jfOI_zx^B;lB4>m}3yw&BKrF}`#;O+>;36@*=H)>dWKg*DxL4ehJao_rr
z&6@Ydviz}i6zc)0b})zCA{boz?=wa7mJ;NYW{ay^lRoX7zq6vLfYNyA{)dbKjvVM4
zo`>1A5%SpMhuEHrK(PR%@>w8HA&fVF0}3>yd+Uu%bw0&=07gNUQ+6p5f#*a#crkP4
zA|sQ7q=F)y5WC*F0af3=+3z$!T`@E?G@-b-crAd-GEN}l*wCV*u~S23p$f!IeAa{r
zU>-lrjW2-C`AMJEqMY$P@X~4fHKt$_^mqOQmYWaOn+!Y1d1X@=l0g$6?$ZHS%{ls!
z9H!T(*XLV1cI-HK+#ahBp{Aj=tra~zJ#Y^}%VLZnrD;eclBgb6joCA1!KSLHt{!*U
zb=O_LFCLE<*z8u~C=o%D6x7%4o%r%AuP!PrEm;<g#y&m3Vp??MW-ihWUNrvi+~K>4
z%q&eyZ61hVOP<*FpG&0aXZ@2R9adQ0;Rki>hPn0iuV(Ft41f|L@Cl1w=6PdUDb{%i
z1%=W;m8Sb0?6au^<cTLgW!A6x6D7h<raA_GT(&`Ux4^7haf5BbiQgk8gHj<-tjF?S
zwQRc`jAvhmS`sXO%r2ot-xh2Bb;!cy-ZTP=_rTontW~2n<i2uNk8=t(1I`@CXMP`|
zZZ$;XTB{7|NZV5}21<m%d_~~LUJImRm(bgP*n^&iYPfPU999C%=7NZIUuGmC-;^CJ
zX|~tkqc(yp%gX@<(=;I;P&NX_AS(>IX5gKA4PUNOf!N`cBYjGM1p-`th?ZIy>z{+N
z@LKB(Jnh^475UeH282UES+$k0O^0ylyE#7El0a*~0GIgyMplvTt>E|Ptk}ABD?*`g
z-*20yz>FC)uzSyLbaZy~(a0P;Eu3>iqcMybHx?%@Iv!dog|0*rLI_lisY-qR^3VV9
z(MKM+-!#p>o`#Yv!!&iYwzhwM{P;=BB9Y-)X~T;Wddo)a5{e6a`uW>g#hec<{}jur
zjvH+|ZzN|9$X5h14G75wvup1e6mA{E1}OmMM39On-b*$oNVb7gd)5o86Oa{<&_JXQ
zerXZF=7{jTs;8mFGCw;BtFunS+UrIAYL%kxR-K}+5@y5tG3K6+PKBo+d#Zq*03W;X
zA$SV_SWf%w7YDPu0W%3v^Nz(pA=?f=$BJ<v9t0F8q?zY|S08U}uy|kyt;w=DthG2O
z+G)`a3SpHL`AWgZ9DQ9MEp?_xv3Y==#yoTH>Uq#pm{^*Ff`S4pT(EFmaY<>X$Pi(c
z(yRJ~niQY|3j6GFllS>TZ4!*tPwdyI4uDp3-v;Q*9{~zWhGd3v5FjzUT%!RHP~?H@
z(KL0qJzjJA^l9&vmX=~nRb~3B!uaZOFijIaUk*+_>10Hs(E<K4&N)J%5G0vn!Tfn}
zd))|zLI_2|h{U3(YpBQKlTLgnH@~3S&{O?<X8_RA(Q(R|XPl0&-F)MxXcEQ)BRg+g
z0V|t%FKRzJA=AobNVn5!-F}R*ZOIH?He-t*0!sv7ZhG<S7T0<fR?I{QtaMsEN~XU{
z-SvmgoiPoN-3{avr*pgxp^bS9!DpU#k7!u;Wn^h<&+HzE_T7H7ef!1oyi1;<mR%rS
zgJ{`uJ@iEO!dIbz+1x4SEq)k!Dr;tQzwm-12clsOkc?U2JKX###sMt~(i4!TpKWEV
z*RKLayD{VtPr7E3!tLPx3UFU3ASoa{2_EhM6g#9@7rdvnZrdSRcTCC1Sil$rmw`aT
zLaL?ZQxq3Er=19&KQ}dT!h|>5TAQyvIDynM>p9-sokByij;dlAT2z32=J1NZyd@C3
z--D=M1wLkBKVO;l$`3)p1Xr9xDu=VH9Pus#&uven&B1|VNy0=`)tJ>sAANLNC=`Oo
z=|ASCFi|~z0w#=~fW7s5p=lZvMeYNuU@(A+$_gw#X%V8a7^2Z=zs}H+NCcIYmE!p0
zkNd|fFTM1GgXgBby?s(^TT9j0F;xwp8es8k4(4II{uRhmPkTvhd9_Q#1NrPA-gE-2
z9H~eI)UoI5Y{CiGGc67Z?JG078_s5qfmy#Sz3C_w0WX~NSMIL@g<6NW*$6BV8QQZ4
zS|E7}*O>*?>#1Y++>Ep{1aQRxvv$>usF?Q@clp8euwvAH^d++UvTH!m9`NaBy~xKM
z7ocD>VD}HQ_6f|D2ebAAh#hZ%c}qs1!>|=Gr9dO3i6?@p=0R+F8Pv5moxMKDSPH`;
z8O*N+^A&>Ul!G~Q_p_{~4;bdJgfwCCKh3%|zs@vv#2AnWg21ZTysKc>LWr(yMr&6W
zX3d%P+_GiwUv20HB)R`VA*&olO2Z?Y<M?T{A3S1O_xh}ftU#m;=&K%wZOp>H5jD0i
zfw}Pwu)@kAffW(Jd@`Q>AdI$93S1d@xQR5~bai$0EA8!FXl-rH$Q;_#)B>B$2ERWK
znwEsBDlknG?d|QTC@)7i8b(b`4Z6CzGV;II*VltFysN0T9~g!SNwQ2!S+PL~f$x6z
zd(#<X4K2<4J{`b1B*Wz}?#H}E30`&d6Jq^yw;>yEy2}qyx9Tz)Gw)Vu(y2*p!%JU9
zq{B)F$fTiYaWH>{#;1PnvHcnfJH!^Xm_u3mR5_&Ug9KP!6{LxaAJFz~ypK6^Gizeb
z98lZNMJ&`Z9p$sP8e87D0O5{e=E}|ZC5!|}wnOrl{*7xPkkAHAxMZpmlnTOZ-)Xht
zVtj=BHt7grq!Vy>!Ka-CcnX1zooQZrWk7TfTEf!EBHbXx4rat*?Au^zdk2H4!v~6W
zuVSt|WMp6`vJxeQQ7z&f;IR(aC4nAO!Gifmzx}V={79gu%Of3BeIbFtfP@Fv$MJ(j
zZa5qgV#&{@mc@N}FgL#fI{Pj#kJX$+d*w%fO&N0ek3(TVQs8fEEfx_aL%RcAPl0h6
z^XAQY+HRAPpO-Tz0Lrq2a8w`~jlt{nVBvyeaphH)W9P12NF`H{<;?B@yTgt|Jhf-p
z2OsHyo-Rd_9DUKkR4Rc}Pranz(n~J>^h`p@Up4Z!ytfFLdHy}-wk5a0)DGGR>18b2
zK#@+Lh;*I9!mZCy)217l-J5Yjtp*YiNX1iL<W7GNCBvE7I|n`qn9u>Ox6K$k<Zn=i
z2A*5_FYd4SGwE@AMxJ>tL+Ejc?QdT#m(Tv5Xxn)mgptns%D{-42!R((-odLEtq@vl
z&~hloWsuzqbKR4mo(3>a(J;zJ4(%{UA_S;TNK;P-`O9I}uLpHE0KP)Y$C3<L-JHDz
z;Q5u-Bt$zwJ&oCYU(p_LN$G?;A4mp)O!V6}Hz?GSqpyDnO0pdlj`@h@pNLtNx$%=v
zKIw_)pL_Pk0cIfxlFHE<(s1v`aol#M4=f>o&!CdU99~ds9gMY4K{@GG=*u4h)vN_8
z9Xq6XBmqc%3IF*xj&=JIV6rrjH<DS0$+5>B_wHqvUfR&z-38Me{N9{%=$ek&`n|B(
z?9lZTUU}s;EAlr;dWGHLKqwe$HVnO!bE&kSABzZ6r%v&lamMMN9$*=}-u)z|4RCmB
zcwzP1)VcdK*mDkQc97o4iXEbU&1Fc2V<OO4oY4dWz{mtiGNc)2-NS4)P|D2Q?<j+2
z1FnKxIYW0=6M<Jxj!CsE9yQiKdlPc2GO&fFi3#I9XN%n*yh@$5i!w&W`kV<mSkZ)g
zdimQ2)$klXnDwh+cI?jX4;zsw;ue{okpe580_B2V!(9Fl5NHIv9IWbS@Pcs`1$4T`
z6YLNT3v5mx+TDp=?`bd$bpT+c(@dCY$Vf!Nxq#HV6;Hmh8*h8<&{C;C0l3lPc<+D6
zNenQ-@zW0?xNe>cE*D2EZsN0qS}gsJ<gmfq@fPHxuY&RZ-vO^D%V9R~z;xO<kRW_>
zsddQ85<e&rm-_Oajyvwy-v@dEXlrXfWFra27z*+WuxaBayz<h^c;%&+4@(P?WL2m(
z$ABc;NHj{V?d=#-S@r1v7AeZe&m0Lby9>PfxckkH-KS;dO(!b~7HqjxgxW5F&1F%n
zWUBB;M!<5bwj+P+GE<9NbjpY03{AwXc7Q_^5$OT1I_e&_<E@)u>IZ2QR{V$CJP_fw
z>0<T2-UUb<K=IuB^?D54T@Y8Mp7kU-ynO|z8OO|(57D&;#`f326o>V_LjqdM^o3%#
z{84rfV5ma|Y0~0Wg5#VEL7QIzl}rU2w-C(G(vJQi4xVfWB%44w;?4%1Aiah<7z9XX
zsC1+-f9gbpb%yyz&#9?zY<z#qrj3h%gJ`V*$f|@uOvm@%3E?l7=R!`15vO`TGTXv>
zJMJxpXs<!)!HYrR4p<aJhdy|?VBmfUcfT3N&bAaJMZ&>*hcOP*NTR5?WVfm+OaA@r
zGegSMCnBh-4K`K9cfRu-Fg~<q6Ly;okw^p&J^U~di8!Q#f<-o)jeCYkr93<z7JU*Y
zlmtq~0cZY8aOSi^OO#|Ztr&+eQeeVhOmSqHR0br%kWM)3K~_4$qU}g`-5t`Ym(I^)
z>@eO{;^5<s+iDa}Tq9bx%;)aH0knkF>m1PHs+DdavY1{G@JUBKPpYGbdYUr(qKE*+
z2E>CfxBVymcgLZ%D=vZA++glPuwV;Bxcwy2w6TiiRsAD-x9!YeN8S5C-3?&A60lSd
zV(V*ZlP>Ld8j251vH@Bw2PEt)g9De+j(;Y}26OtLCjh%$#^no7M%Y=7@uhjtQ~LLB
zx#eps4gFv(i-9wXi~O%EqxjM+2WC%lK<_Y)JRULP%Buv@<1ic64OvSjL2&pLv^DAY
z&O2d%aY&qHC~LLuHDku~ABICAbai!u4IwvA2ov#m99La=6=u$yiAZE<fhd>LiD)dA
z`_IS!l^>0S`v9v~ql?92!B9^Sc{#bC4q&lQDz8P4g6CJ7H161c8XI4{gDDwkj?<)X
z#HH+$Y9zpXrG}I@?orm=2q_smoR<TU0ExpSeoK@4NfQ>`Yc_3~Psot<4l4_LP>Ny_
zR&DI$Q~wTsg~b4wMRjMMA{d*VhiKktMFlgaMwpfsMX>7gNVr6>=>%%o`Z=?s_GId+
zosQ-$;JH=LF~t$3Yz<%!enw9L%<XT1**#$XGV8}J+aaReV0JH9y6euN0ZRtysT?aM
zM9ye3Q8EhnD}sF9r4X@hC=`d#lL!Vv*cI)@`RAXv>R(Shxop+S<%_`fYl$rVUsYj9
znFc=pLJ+%dx54e^h{i;E1O4~aE$Rgot^n?Q9J+bEWhy%C9FT#lUkD(PGNIb!1KxYT
zS*N8E$S)|YnK5JfGl_TtF4xd%fi+D-)#OUFw6tLF-r504sM*Bl^I_Ze?bWeZ%+3#}
zDlv2&HoF5Ke(*ut=8YS%WXY0GNyAcXpWMs|6Fhg!J<R60142JEl}0AOiFQJo_xWe}
zghe3)o2|A~hw~6zvUtaFnCsc$0iSyM(|q&Gf23%)KVw__!F(A2DAogBK6?u<oV13z
z>$4^dGDi-~Ew8{_{TN{Pf)b&O4@;>i5Na7CQt@M{Y2z7`ik)I4LuHf*gDG|}n+Fy-
zA{I%LPJV-e`wpRH5m-(+#HJS^S~gobT4}!@gaJgmA<sMq#0W@)`?F|f5>FvS?TRYe
z-T~&$AMg&;t99zB8kR~xN+tlAV2^jAHIP6LGr=VZr=E7oEvr^8-)tJjfKWRTAgK~+
zI#T$`b3r_OZ653?Ldu}eq!a#-4@Cr-15&PxU%nK?(mip=O6GlH7}mkN_@u?(DJd&O
zS7+CdnxG0HKt!mh8iSIeVx%-}h`KkSvZ4Z;wrri3O2(nu_t*EDrVd3_%`30Ga%)*x
z>8EEBlEeRrO%(xP<4<Um8rQ#R?*8Bmc#CnkG_*{1fcY!_&*<C*M7s{p$to$JcnH+p
z8`(OH-?e%#CYitL5d>SlMH$jF277PLI4BhZAG`2w6pjbF>$0aZ*gRmW9n#dZtd?h4
zv`yypL+pC*k4Ei^3t@9vT<nr!u~;&zw4aO=%(_(<Ni)uVgCu#-MyX6zLCGMD+K)it
z_H+%L=+hpV(+`*?%+{^o<BzwB#51Kc^v;#T3z3W-V?94*G|%D80U4=%+M1^UBMAo*
zFsT@A;yBp2iT2h`%s*<umQznX<H2{{dGos7FnWKBoq=Q-kE{>ls8R(to#BDmu0t0L
z>@x{k+1H5-z*Z#VKOe{N!=*uhOV(1&5E(QL4KrrVe)k7Ixbu~sKmdke3?c3fsEUF_
zB7rrl*I;+eZm2`_TN4QN_4Qb`?8CGBPKyJisHkX{Bq=Q&o!y@zU?swz?5uDZ$RG1}
z>|JpN+phr+>0F|C0K9DGChjX;PmSxd^*kK}?*tfEAmt1rHGlx-a6pVd{t>-p>$hNN
zL&#3=uMP2n@hPcl-jme66VT$>PrzsgP&x<FxDyAhFJw7o5b^MbsQKW+gBx>DZ!o}}
z57D^(658?hEs&KYwB*1s6T%`TWHLlxpVc4F?zJ?)1Ea5!1d4V6&D(&yF@U!i%$<`N
zcx4+P3{dlyvsspLA_gECg)(u`20mdC5a|FoP$hr~bwEhxuyFxzju)3*e(Bdg_~6~k
zv{b@3pvfu$ip-EQCEWa456b)!&RgJuXw@Oo@dx@0163c@y8!IPGS=@%;oK*>0WjFq
z%+BysDggj=*(H};6AT2<)73R3vyK3`TrTX{vl~s#O>nuKNNPhXAa^<)XlZTEudUsC
zI?IsCGG)q?_X-LN(A?bo=>ZnAxjxz1A%Zl1(HmmVhfNe}D`$4^(6lVZtaO09s(Z*)
z05Sy*|M;}J>X4oogb!;lFb@K%eLM3ME)#*qMNCqMtRYgY2h!BD{vnNB6roTHFxW6F
z4v41pp!yXS0be#z9pJL^BJ-90kxV@^fGRFf&pw}CyYeb|_IVGBc%!8e^}2W%0Gr#&
zscPO~IoY#mk3`mYI6R=;%fKq;fxM-lz&?vvwpY_icLJwS(_GQBZ!#QNf+Bhx%v%&=
zzS1=m3jl@=lUXJn5&_gShLB^I(a>0r@{01*<yT&D<>Qb2^L5iSAj`^tk{z2(LMlnP
z;E680sW6;2$AMIvVMPu<!<rTW-~>2|WUQ}AVevy9Fiio~E@uQQAuOK$lTSJ2*2>EA
z<_|wuHY95kWF>fNx`uExiu{6n4As*oOcT}B)p+*V=f9pzL}lfGL&Hp)re)<NFEqC_
zArK6FdVs~X<R?5mNicW5kV>XMYIN28$ZGU36fa>M%wLh@rPH58pb^Z}4*#o#38p&0
zeZx$?Bm(mlgQlH!xAES+i<q5;29hMeoIWts{&!>D)9GflgHQ=eDxfNs&17WP#K=eh
zc6UAV6|WQ>yN_WGUj{8kfGKu}=FQ)uITt>Rg7JVB>jQhnC5yDKeV3)pIeb98<IwM<
zIDk;I<wWKHRJR4_jDx8Tz)Zr}_Qq|N4@}CKK+9r5urUkY$AsfUi1q+vLI99lD#k{<
zsEf5A*Qr>JYm@MWFMQ#R+C6m-tXTfx^}UTM`cDr*wR31m6Q@7Yfj6!##OIE3fp=<1
z8Td?^heQ_7mAzQTx|$SDc(4-*O+d9vS@(sZYnV2D=G))?_ILiCh{rKz?6@KMuD}3A
zQ4xtmkW3{ZOGASQQ<x|!Dnd<7jcdj772n{TAJ71Z!8CQ0S5)p>ym;}ureO}*@jo(7
z_nhKSev(|d;8RX{5WC*}(U43l#z3hEq|)h+NqJ+U6z>6OID<kU#$oFE@E<<X1Nh3G
z;l7f;AsH%UsxvFzvfg7Y9t10&xt3SW-AeHQ;K~_%1%p8Dd@GNM23Oaarw}aA^cZW|
zdQ8UCk^pk%fSNXq7dzj(Q9k!)_feoReLAIqWcLSP(Jqke7&?$MW|@wP!#V^i=U6^3
zQwO}oFg83thq~&n$<~q$%+eHW#Z#V?5>Zg7eLsjt4HVj4STJucRBmNZ6A}Eme%$l-
zzus{AnV&nRqrGj0YI9m<e!o6?3^u!hRMNm%k9FYwP%f@N*$X9XA{w(AThM0!xLEpZ
za@!e@C*!p>QC#$|9_WH#v&$K%<E-x5n$_gD^Um*o?~<7_XQRHMzF&dzVBg0j387F3
zoJ+`)hXxNq2>5(H6ciNT_rLwW`=gPt=RlLZH=};;+&O=cxP-2r&S7h_!!rrvJ)it+
zB?91{{C!fz>^DU1^0VMML`y3}2UHLElvD2~Nd`&sFm-$ZFd33$$FRK`B*03hfyOTQ
zr@sD~Z?jBYf%Y%S^sz30obta2;-EwA7A9FB)wy@@rVhPeWCakOU{3!ZU>YuDIyDJk
z?gE$}KlvAB`dKeYlTU3!xCKz%(APWxL|QGgFfk0`HD?aQ=GVX^8PZW#0;UP-u7mO3
zU;fD?3E&DSLw6UXqTmJN!pu|rf?2!LYLL;Z<%<;DsvnMm3afEy8bp(cBnpd)aLX;X
zoblry{cyLIio4VdUBHP5HoJsW(!>ofbz?`njz696hdWO}qQ}To)%dBKfDi;%js(aY
zzkVf%JKqWdU|G#T&N))aI3!udJ@?#m=JCfL7w+n8gVQmzs6OW$rYR5%bRnswAe%#j
z2gVsvS{#4+(;v=Qvu5R0(g8`@j4>E`0uHCUXU^Q&_wK6Mg=8{0G;MF>d{~}OVa5o|
zT?Dym-o2@s_s<%fYSC&jCFNFp%-#7LC>ie4LJs@g7z3Fa%pteY%5onvfxOE5xik0M
zWM)gxNM~myBjEnB9(l&u&w$Gox7857n|X_dh`|DE+_6z3(DH=2>80ygZbgO#Pk_S<
z5o}Slm+yR9(PE34k%HM-4@&fa%SylAe1{F-4lkg^V61oqq&i@(f9_EVwNLLY_RX*h
zK;cfvb1wP|pL<b~dK&rxGl8HGhm=SmWim*t_cXUy1-^dE*ILWUN>BOfSH8MROT}Tc
zI|sZo5iIjiXZZ8VFxE7s@W6$+m^Q%<1WiQKwTGWJa1jA+)zYe(n{?dxayMSv83ULE
z)y6Y72xbhaR1yHg)mLA0=|vY_xIPkzfH4L|8cLQd>r;v+Oq>YL`608~i3o}!WAfxF
zxc8p>{Ez+PA5Q^*tjG|;(rSAfs9tsT72jUC@EC31zJ1_FkhMEZKCJMkGjZB(u;OX2
z@zQCnW_M!=%ix&p<0LQ=;FC_ipSg=b!4@z!%*`bTOtPb|i_dVCEXE;?U$lqztXOI`
ztT~0eMPS+5&+AFBys=M6Ff|eF20PT33KNiR;6;<u?avQwqA^z<FzxhTid{>uhn~!w
zyedp^UkQxn%_q{b`|ej}oPC4Yy3HzNmeoO{mWMvRWq?UA+iM^i*Z$1hx8aM-Tawul
zOcz?SoU(v2|C--2#s@TGWnfUafK6wJ>7rk=1;!XUJ3Dd4>8G#0{hPO+{ii?t@%2<P
zjscOwUh`09FlCMv`%;+xw+`HOvIlpb=!LsT0RjeMDT_CrKB0u^-rEug4w-}dB_K(-
z`>hCm@OBWPqzOq?AoFaBIzuXz0!U!WwCOjDudaTsp`ih8w>y1a4XsqGxB9i$d_0sE
z)Z4~u^{Ul)_@Reh1K_tz@HEdpW6)CxR91~y`~5racobkLD=8heb~S9kGP5#degaxn
zP8nF)%)8ON<rkK(Lk!SS$Vh;B3WF@C>|bU))QA4V)&@veobgBGe=xvEfR8!)ZnJUi
zDJ<Lb2m?&9Lz=Mo0oXiXhJI-6DxI?=7$9tJi(TSSqQ}8zoYlzouKcsP{L$N4!MMyo
zM*`ee3emXkdV@@Zk3Ift%;5x*ks})q)oRN|owa|a)}6O;SApdx${1+`L^1?*{<+`a
zKupwsjLbP&IvmIc<Pw1TkAZ2L*tc&VrcImn#@Xkdd*$n|zWSt=N@Uiw(g&YnlcA>s
z?phka(_0hx{_!4sVYU;lVhIQnVo4Jt9Zc+f5|@nuUKvOVys|ciUws(C>c%9j&dPFc
zKirHfO-sfBFie^<<wn0h=Ye1_I1EP!_47#`%4emjD#nc)htAGUoO|}Uf8V>e_E@X&
z1oeTPma>9#ci#EEE5I09np=(ttcDF(lBwg<5*81FO+M`*bJx4SfSwqr888NlbU`}$
zil?LrC#FPCJz#f^*g`sz<QxLP#vJ_`-}q8HC4xm{JGe8BMI$4X&G?Yzlx;Pm-9zli
zVs)Wm;Z8`Vu-bPG1^h{ZI$`nmQk!4BhT?%-Wa|thDPXD#X5H$W$<QmM>SJ!^d1LmW
zyYBEJr|EWG%v}I7w5i7Xci%6<ZO1daC(ZMeVQ{$w(OC;=?80U8nRh;B#(S&)#6b&P
z0Fb!}o8|x|&CF!q3}|m_$N2HpPu+UkZQ=XxyZ<#y({g5=SjENxCShm0hHIbi!f#jD
zar1l^u9)UPZh>rlaZDhk2^d76As4J1G{g+BD-3XPK;}sH7<hg~1oy6uV|ks$&LOF?
zmGDZG@jDn}NF^<;_vrZxuICaSOe7M+U+Y5@RaFrQNATgY5Aob{&tJcHZ|&D)MeS!s
znx+XNfv;Y7!!4J8{>nXj_UwVG+VEd$Rd4&$0E<iwEN@IZFBt!_s9$qFJVpJ6m`oGQ
z;R7$MzK0_17J1weAtbYsBu(weW8Co`Fkh+8$1Ql&Soh5LdUKcPAkBx5Kj9u$JQ?U|
z9P)P(m%x)z@a_iCP<;ZSHn5!Xlyc0MKd*gw@7v7KtXjT<7cU8`g_@@b)Vl2)qkHcn
zntH~sn9cPNbLDk2y9d-;yv?}v%)NwxlGTKksZKCw4k+3=QGEQ=*UZ}Gw?c~oc3=8=
zGcm+6P_zr&l^0PK-+BRjC0VNtEPgZ&IhukLkAV&dqaQq-O-;?X=Ble+pE7y!vA5oO
z+Y4GMUMwqi@Pp`v`k;p_$F?be?X4Pac{z!nzo+8-Np_q+$&TYH75MxzYzhZ70q6u6
zfN2tpw04p<uKJpl%Mz^I1epOU1583HB(P#@60h%0;>BG_?Cr7+9;V1prF8QL$_$A_
zfR>8G@6R<qf5qh&w=}i9yleL^IGw{dtg`@OHnA%zq73-akA8C6$7@#I&zJ;B>K_O&
z^c1E|pYi<dx7~JkEE<C($xsyai1A=pfF;Z%K0U+|V6GfU)6cq(8rGc;G7s3G42X4s
zR~@xV8h_GOB!Xb-kp=_^#MsEt=@Nk)KCm$h?!)HS?jTcV2WJ0LDgs_m9pw4d&r|D;
z!{T3OrVeuDLF7+3WG9_|k0dFO=6?PiUcdTxRP(`iQ82a_r7}PQfjRvkJ>k_iy!adL
z%KZ+@DSwFzZ7GX~RzY=iLUBZy#4KKZo10U(BUgmlCW%1Pbn34E9ChwF56LiN4j<sm
zO*02%iI}Eh0GUwE|IL|v<~afCsv8`@b->L5yTYLf^f}%KM!y)^J33HWR=V=!Q%*jr
zqrLOl4I9=S10bV`*z3EL7$Dgs2ynEAO+4^%7!Q0LMY&(b{4xa#%50cjC}T{nghGde
z90!ABm(z3~Z2t*h2t*Tv_8t>WAp;vabZl%h@KKY7+73OfFLFpKhm>C1`yYu7(5iIZ
zfG{;UovvNK{r&GQ&Ck!<@{6DUYFOshP+TWO1X-40x7*=#I#F6$ik1IbJ$37r&98!S
zs5V=_`)F2%{oZ@;z3+;m;$rM;Y)ork;=cn}+*5>4Rb)G)F$<O$1>^QmPs4chYim!C
zOQ+q-wOG3S{0M|-WW^$uJMwnHR<qd3xee0z<KHoNymK0S#rsX!cn|oL(;s3Lb9E7H
zIxLNjOcUJZ0C)R<tRRrtoMeg(wu^svhxX!~GtHe#&qTqPbPdcv%0wbzb=Q_vz)0nZ
zmd#%goi$%!Trru$+hMN$XSZR!kARkRQnaJM*tgLKQ@5%PR42$&U^$i#TCjcJ$T%n!
z1v3rEGtWPtmrPqh(as^!Jkt>4B8)M#wzR_U_cvd5+2zOHf8V`-T(f4)H?lh84+`uk
zHU<U-h9EQrOf&^_ys$L}K!VNAQ0|dX;NtM847qj=o6Mk@gg}xI)d^j36Z=8}@q~%}
zRL~4iIF!R^!`5p89)H3Kk4>LG<0gmAmIwtyV22rb>tl!*f^H>A5@PW<8XFrCi^UKM
zhx6{Z<NNO=5^>vsfN!<1Pr>1En&0{Ecg`p*$k#hN+S8is$OJ5g$2hv>^-mYDNPu~Z
zAr(%z$LOm2W8cqH5inm_H=B9xv%-<HpJCyMEJ6knhLs_Xk<qfCsNf}2|6*=``?Nkf
zIzxx#%7-+5(LEFoSj2aS^PHv$#u=Duvo`kObR%W}FPQ@M{9k-78Sj3N8aFOx1!D##
zBKG&jrAuyd0AYd{lPDf6L7=Imw<eKEik01tG*_2m?^E8gCZuo)6zv9+RY;Rhx`25K
zU!iC>SWel9FC$5k5Rb>PZ(k!Wy6D1he(tQ#Eq&<0hyL2!+%yirAi%ZXD3dt@Yz)0!
zX>>tIrGVO`j@r%xM~xly=kz6WD3UZZ=7YYj))o+eOt@U0u49gwfBWK-PkN%QtplB%
zoyhU~hkVwtw1eI3GXoC|B$6T{&=SCwEnD&4viIz7zOm$e0EN9^)tj)IN+tmaTzA8D
z7yb0EyY_6~z8$GlYDh_|pR5ndUx80s$mRmZ9`h9H*8B!WQib9GCBu-Woc09Cj)drL
z7^!cvQX;rIVy6NHJHRHLx`gjs+A6yCmcW@~Ior!;zbltbtD|Jh(&!HNzIqB2>9q2(
z4hygt(A@x#fbHC$pKL6<??q$R((~c;519neTFD%6`iBkc1Og%*;J%UopL6NwnHG7Q
zVxMeMvSm`~2nKqvc=6)bZ@T&BrB6To)KB*At-B*0i!v|?wu4NZ!G=+lSh_*D^ocyH
zX__z%4U#P5=%bH$aN@*CKaeHf+11sJSS*&YYt5kU91z4|`m7AYfZy+jFUN=NTerUh
zV7h8^^wX?N(*Phad+wau7R+DpO5NT%7=|&TU^RTeO7wi{fQ4iLu({iK!MK;qeH$)g
zY359M)&=+SyfGlfF+%ZXtFG^`3H%OahWScOUN!F?vuV@MnIp$ad6;_oJtjCP85~wi
zF4B_#<wN2FX>kv2*ITR#%$Y~>Nw;1g;yu5luDUxZ)(yDwhMjmjwBg`DDhig01Kz?F
z^08mO5@oX+#EOS-I2>X}0t5ii-QA5qAecP%*kiwc$t9OO{^E--{c!vC?N?Z4m*t!J
zZ;6&l0T5tZLU~2y8?$E3_}Pgkp18VZ_a1b2cEaQH9=6Yl(qMHsVwxrj3k%U<wB!E!
zAAD_JW8-o1L40^Z2$+V3bIv{go(Jx~_pgy~7@=_Jh*KCw&WC05{uic@z+44j6?5(t
zjq5IhmH^MKT8ggSJI&?|Bf7T;!ip4**bND=xxj3m2f450=M?J#&mY&!CoO&+4iCU9
zhqv*Ftn70=IXv@~OQ2K~6xau8$|*k}@DI$j&-@MH)`?IYRtKB`=Haj*JMDYZ0WAvd
z%+=WBQ+~z^s((pfR=L-w%v;>2Z3TmvHf`GWQ%^hX%IVW*{9)&g?YGqK-Fta3&||lT
zNl7P3elj`lM3$3Ym;z=x@Zxm3QBhg>tkdcEo6nc?q0i?-S63I3iR58xEd$NK!JkEv
zB+J3>a3U{151N+3cfb3+r#5a_cebM1vA;u+bvHv#A;+Kl(v??U`86Q~4AcC?=4^Nx
zmXXANLnzb=mN({oUN~X5*|cSXRDJw?%<cyn=E#-Vldv4jcK3)l-46sUUO2JcY}xXX
z*!<Q7eBzh~QMVi-+;P|r)BTTXT8&O;Uj&w0wZBQ};fiU1qTS%t$G^oFUOnC1{?<1{
zxcycNwUjX~0X8o(GQ<sWw=iM#Dim5A+?7YHaMC}eIT!w#<yP(zb*qM7l`uk}#TY|0
z8bx<kH(XBVy7Mo%@Jq{AEW4|{t>c>RuI`IFIyz^ixupO|P*i2az)RQlK5d?H8I_e)
zjX8e*Q}d3R_cWQbv8JX5(P$LOq_3ZLc(@LBA!vV}g24bmR*+02(9qC;=9XqiT*C9u
zy>Rb4Z@+c9tk^6r__S}02+*|z^70Ely8MbOF65jc6bki~<$QJk%UkkaT3!MyryQ(k
z(u=%h+qdB@dC5$3m5-$PM#2E=^QDa3z?&d&Ptg;??YV%Dng0y4=YT;P_IGd)gcbv7
zi39k_*>HBPwXowsFw@jo(WKugg%j=*WPVY!?Yf)-O~;TPw}3|&R)-xDY5HS+KnR~K
zUz#KXrfzlC0RS$8<&-wa#Z#Z>uKWi9+R0QGDAr?r{xibq!Wcs$kwBoQ2fCp*Oq@9J
z=a|5L-rdu+u&b-<+@9{h8R2kfUMLjozljt(gb)y>0WL}XG$0{FU*@=?D9{h0X7YHv
z$ji&$K56pAckDL%ThpdZd%K~rL325sXl-eOrfEZJ7%`aXE5rc}WDjxXD6))DB8A<%
zc4Pg<b$I^y7k`mTByQ~0GWYxT7<4U;F=NMVd+FsDPtVWKM|XEO^xg^){uu%+3b+6F
zR#hSb<|})NAAMzvxpNJ~daQc75yM0Ql2wp1P0c)#ZX8Jl8#8~Uq{V&>!`LCBJx64E
zlI84xXx|N9FfPsFAdY0mT7Z-Yfg~j?PdV+cX7%xZ72DsO$%3uNlEjZ?hCZ7j?Um3H
zJ}~J3uwm)u2@K5C!8}E+Om*&ruXqhFnzWPz-j_<J>Y{B2sH+}KPXMYDpH(422!%qB
zxD30)v1-zkDXa2x3w{s@2PP&Gi8;w+YTou8J7(D(j&b$%^=0u`%z?DFmI*jWm|zV0
zlxfqO;<4D?(z3D|x68Fk;%xoYsnfU4m^B^CK3IliGKpw3I=lqXgG_KDI%Jv6z~wI>
z$r8qn8-q8N{O8-LMB)crlA$O{zlflgild;gu;IS@?prir{Deg9-dY^o%r=|J$vKB@
znEt_G0hU}j`@gu70I6ikDxoJ<GA@Dq<s*B4NdZfSt!~AVJhJyTQveyw%ED{zgzB_>
zPe-a<kd<@@J&}%Vj)<yZ1s)=ufZYWs_RW%~WV4xHdLPdj1F_=aeEEdyib(Yq(%$8M
z#JcSS2JS9M@M&jui`wNaqPww8nRi)K#5=)!<uLcGunxMBc;`=1;{vSiF=i+XuiFPf
zRCB@!C)9NJ1pdA7*o7E7ZVdn87rt2h#V>u)cieHulrCHLp?h~ttuO7cW)mh<hiA;1
z5zg`Dbp7NfKk2#d`Y*S2w0G*wO)aRXD#zN@YmrK&(AL(5csvfD*LTFvtZ5ny(>&~Y
z+Ft)vMMXItd;IY)zWdHQzh_K>qNx3Itx|Eg-0tqLfBn|Q#YIIub#--z1jgRq&&$gN
zmn1YdeTo#x|K()_Fis${I>qo2_J45M+I^jOTvN#w#}kT(i*yt*bP!gl(pja1j+CVr
zAp{U<E1?CHE};nsK9!CVbtwX&J*o<XmINUx1`&`T2yUp-458<Zx_`g>$Nk*@=FUAc
z=boAKoAW)8;Z}A+Rt40^LI$`IDyPf`%&uwgZ8Ax)MbY59w*!;DYhz_`75v7Y@}=(v
zoYpjhK5<)W*?j#L2jok)4Wx~SxbHn?8^9!e=}nlfXId|oTdG<M{5(?3DM2j51gM{j
z^h7<ct_~{F2p-Fsoa|f(Sc8i+faOB+pu@Rm?G3_B3evC~i6SdW7`L?W@$I5)>DjH>
z(r1;G9Adc~Iy!n;J+r(Ly}}ssbqqBG+|2?5e?M9$>LYG4;~9D<8WP-AI$N@`uRM3K
z)j|J<xLSuoq0Ic8WU~!PEGfLCp|=>yZ2ynwiLhKRDahr0WM`IWnPkHBdy(K>vD-7j
zlp1F-J@GJ8^cK~(%$o!)Va3Z){nsF`lZ=J0-Dh{M7*O$sI^tur2)V<T4#n@W9y$Pb
zN~Jo7Jgf+ePZG)+;NxO@Vs7cRtRQKc;2~oHr*y>^b|ay6?VDROrB_A6k8Q{T{7d0E
zAhzQ@kvbc$voY^rTekTKmAK4~xBUCEa4iHmwla}bszlok)m9Jaw?7Uo7)pKm6#f_W
z#mV|to9FdzCZ2)!h`}^a)65GZKS9PYF6WbUdZ8}*{Ly+k6QlnzcYB+A-H4YlSe@)R
zg>Sv_snKspv(~+HX@S11ca+QSynjZKo2^Fwa95dD+Pu@R0jvayOMrOfoyJKH`&2rM
z69ORyFhd*l#4<cM(v;rXstGpWv49ts<Gr_F3JrEN{hH{iO$!JK?D>1}0k8p+5Aa(8
zf`ZZ%czT@RY!r1n5Bn5Q#oKDS(Rbe-Vu{+KAUJL**MHzi+<Z`j>ZAwPw`sQZF4N&3
z(L>$-#qsANl>bCWM$SC1WZng9`?D{jR^i|+2-#;?`&4qw`(W&~c4zXK-kfRhA2TXp
z>yy{B_9|X7*@*3etE^UedHHw~I(Q@k)Uvme65E2g4iD?3*9A-Pw*zems%zyvP_(xM
zYeicBah!47rc!`?cNY|v=>uuwyRxV*;Ju^!mg!HMnwo64bnValYRpbe1$IKR$m+|m
zntnP`C8M=<+i2`mwWbiD#{goDtjU1u%P1V}&D!UVi^2<oe~kN=FYBfRBA1$rqQ%go
zuVPDzOYGbbBL!U&DM{22GdpidcX#kr<;r?Lp}H~Dmkj)B6dfvb7yC9=u;B-!nwX-R
zHa6yLRi?w5m7@>sF@VgP_XmA5m`F@FSXfzryST{tGzx3e4l1J$<J@9nKe?Kqzu&%6
z--jsFB{=0W$#!Psef0Tqy2-^@iuh~GD}1&x>+=-bIb7RxPo1a6ddy{cW#zMBSdm{n
zG{o}5vE?m7Agb*5JMG0%Nx1_y^+-+GJyQLp5yuS!s!(`h@JHlan)S{?pC1ZZ7%zd#
z`LHzPlcCKx_)Tngxs17UXrOzTta{A57^K5e0#C#>$FU<~fGE+ckwr&GrwX7q`;&tH
z?H}HfqRxhqEDhURY+vvFO~QgdCME_1uK|2;Jox@tEJRUJQ5m8=5Cj`xs-->d4I_#(
zr!YKI452sL{G2tp$dC{vb?d%Np_+zyvR31DGLbh~<@#`;Ev)L_acQhg%OK8W7(dls
zu2l;I323YwuYtOV=*0*l6q~Y~90&8(oPO>qjvDdg>Exblt^2^Rg;j}a{Gw+x6&)zU
zZ*sB7*f2rN$^p5XDdgHTZ(WNx3@eVRn8EJ#+9G~6qQ>nE&R)pNllsaFJdy(`6;E)T
zqA%*i`D<k?lB?zK39$p01x6WI<%%Y{wS<4wX!2pD?f0Z*V1q3Lg$imrcD`i2eRonc
z>g7qX+_Qj$jlVC8@}?JSs94`lPL3lrO}Sj%3H-$-k2_^;;F>ym<Hilr25n~9i>Z5^
zTzUrpxg-lVWgb|t85sfqE?@$;Gp6^~V!nPY2>E*dBKE%##U?(>4}X7P8#OLkL9Xzj
zFXaMEoqer)i^vOaYy%e3q`>f7VQO9bX&Sv?<bW_21^;-`eYi|t{PXUcHai3&4YZ<%
zTmIAi3}jSm)R($PA9rxb5~^{Te(&nS5Fq%GnpmVpi0t{6gjoiy<?`WLrHzvEg)ESG
zp8ep0ApWtYz>eQ5N+>gS8~KS_Kgi9Lu{eGV!z&X?K3zv(KV8a`-gkR!Y|MM(+5Vvp
z@E|W*8|%KIAnDcB9O`Wlki81u+LRvByNR0J*$~hbPuSsmbwo%6wTqIIn@#DTRSy5P
zh(c$FEl@O*$mBjJ7sMSCIan@IJ|#cj+5EkC>xLBE0{krgdu=dPJid8F+?i>xZ%DS$
zc$lBRdN9`3-LgK{vJC%xuq_%85@HG%;g(mf==0rpEhQj$uY9(#_7^kWA5!~eLmNKJ
z`;U0Mx>EZLOFI=%6<Xa>VvHac2w+;ylwwrV8hwdh))><f?=d`=c32?ee{CmpDNC{m
z(|#;)wwA|miU&7W_jEdrJOob*0d@6k^DBKWd{enP?iBv99bP2QZdaU-fYU^XK6(_|
z4r|}cybwxQ^q0u9eA3z3$rHzIRs$w&ZL?r~_tD<eS|TH-%_5`g+Ze}mmKt{`r?{e5
zLVCrbe#69H0h1rU-|3F19|NUb){cb^{jva0hQc7&t;rbhDU5a$QtDWM&(mnq!dzle
zTXrV-BfHF&=)@XpOc;#NedB(f4^zRnL_*NEbVjJk?BbN7D^I3e40P+*KNBg4;Zf0>
ztQe=aHIJ)mOCqHdae@95XYY53jlLF)6gF3!+nq9ykm1=)osWMhs`0stLS%?X9(2T`
z{b>^jn8}+7CTk+DT*j?PC46;!>3gK+*&!>8U$4ptl=GCz&<4;UaT$pw=)PaQs^x^6
zcECAPLbXQ&)a_wJ=0W)7l0lNNv~M;yw|hZ!beWcnXR(sN79&(Qa0MD0(%?a~XuhP>
z!*X5q=x~QeWk-aB_Qc^lDRX4&TaPP2n#fJ`J5Pygsa&S7qH;Ycg8C)lS)<(IYq%1V
z>2l0wZt&q1PV?R8=S%WbO%D^iY{o{OrSmu{<z2&lK&li@WrQ?c4Z9>3?1y$D|5Fm)
ziAemg8rPxZm!R}QEAbqk20><0H5Cc{U5!BU`c99G1uQTv$MdJ?tMkU^xCG*_qMelr
z9O^$_ot%u>+-#?I*~#bA_B^c2df`v*EtGI3v;VE2{v_`6$Gt~rc0;UlP2SCeeNVkI
zmrBaULHWSp(&5r?D9O_kI%4d&mZI!Dhv$w6IT73{duasJ<K0HF10)Fvh4io(H2l8@
bq*xqBedhc0uE|9w2)HavY>eyR$mIV4D+mpo

literal 0
HcmV?d00001


From 15f8c2c78b098ac6109adecf0048a538c071a3c7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A9r=C3=A9mie=20Bresson?= <dev@jmini.fr>
Date: Thu, 11 Jul 2019 05:14:27 +0200
Subject: [PATCH 02/62] [code] indicate replacement methods in the javadoc
 (#3329)

See PR #2946
---
 .../java/org/openapitools/codegen/ClientOptInput.java    | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/ClientOptInput.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/ClientOptInput.java
index 8453c1c905..71716ba25c 100644
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/ClientOptInput.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/ClientOptInput.java
@@ -19,6 +19,7 @@ package org.openapitools.codegen;
 
 import io.swagger.v3.oas.models.OpenAPI;
 import io.swagger.v3.parser.core.models.AuthorizationValue;
+
 import org.openapitools.codegen.auth.AuthParser;
 
 import java.util.List;
@@ -64,6 +65,10 @@ public class ClientOptInput {
         return config;
     }
 
+    /**
+     * @deprecated use {@link #config(CodegenConfig)} instead
+     * @param config codegen config
+     */
     @Deprecated
     public void setConfig(CodegenConfig config) {
         this.config = config;
@@ -74,6 +79,10 @@ public class ClientOptInput {
         return openAPI;
     }
 
+    /**
+     * @deprecated use {@link #openAPI(OpenAPI)} instead
+     * @param openAPI the specification
+     */
     @Deprecated
     public void setOpenAPI(OpenAPI openAPI) {
         this.openAPI = openAPI;

From 99ee68128d5401a5f50b1a974b3d448f49c1b31c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A9r=C3=A9mie=20Bresson?= <dev@jmini.fr>
Date: Fri, 12 Jul 2019 06:55:23 +0200
Subject: [PATCH 03/62] [java-client][okhttp-gson] add missing import for
 bearer authentication (#3343)

---
 .../main/resources/Java/libraries/okhttp-gson/ApiClient.mustache | 1 +
 .../src/main/java/org/openapitools/client/ApiClient.java         | 1 +
 .../src/main/java/org/openapitools/client/ApiClient.java         | 1 +
 3 files changed, 3 insertions(+)

diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/okhttp-gson/ApiClient.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/okhttp-gson/ApiClient.mustache
index a5617334a8..cd173326c1 100644
--- a/modules/openapi-generator/src/main/resources/Java/libraries/okhttp-gson/ApiClient.mustache
+++ b/modules/openapi-generator/src/main/resources/Java/libraries/okhttp-gson/ApiClient.mustache
@@ -52,6 +52,7 @@ import java.util.regex.Pattern;
 
 import {{invokerPackage}}.auth.Authentication;
 import {{invokerPackage}}.auth.HttpBasicAuth;
+import {{invokerPackage}}.auth.HttpBearerAuth;
 import {{invokerPackage}}.auth.ApiKeyAuth;
 {{#hasOAuthMethods}}
 import {{invokerPackage}}.auth.OAuth;
diff --git a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/ApiClient.java b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/ApiClient.java
index 781acbe492..0934b6f1aa 100644
--- a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/ApiClient.java
+++ b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/ApiClient.java
@@ -49,6 +49,7 @@ import java.util.regex.Pattern;
 
 import org.openapitools.client.auth.Authentication;
 import org.openapitools.client.auth.HttpBasicAuth;
+import org.openapitools.client.auth.HttpBearerAuth;
 import org.openapitools.client.auth.ApiKeyAuth;
 import org.openapitools.client.auth.OAuth;
 import org.openapitools.client.auth.RetryingOAuth;
diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/ApiClient.java b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/ApiClient.java
index 781acbe492..0934b6f1aa 100644
--- a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/ApiClient.java
+++ b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/ApiClient.java
@@ -49,6 +49,7 @@ import java.util.regex.Pattern;
 
 import org.openapitools.client.auth.Authentication;
 import org.openapitools.client.auth.HttpBasicAuth;
+import org.openapitools.client.auth.HttpBearerAuth;
 import org.openapitools.client.auth.ApiKeyAuth;
 import org.openapitools.client.auth.OAuth;
 import org.openapitools.client.auth.RetryingOAuth;

From 09b4bbc1e1414b7d403f608848ebf8ba64568021 Mon Sep 17 00:00:00 2001
From: Shunsuke Tadokoro <shunsuke.tadokoro@bizreach.co.jp>
Date: Sat, 13 Jul 2019 00:59:12 +0900
Subject: [PATCH 04/62] Correct CLI option (#3340)

---
 .../codegen/languages/ScalaPlayFrameworkServerCodegen.java      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/ScalaPlayFrameworkServerCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/ScalaPlayFrameworkServerCodegen.java
index 881b2cb6dc..a30f0bd797 100644
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/ScalaPlayFrameworkServerCodegen.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/ScalaPlayFrameworkServerCodegen.java
@@ -84,7 +84,7 @@ public class ScalaPlayFrameworkServerCodegen extends AbstractScalaCodegen implem
         importMapping.put("TemporaryFile", "play.api.libs.Files.TemporaryFile");
 
         cliOptions.add(new CliOption(ROUTES_FILE_NAME, "Name of the routes file to generate.").defaultValue(routesFileName));
-        cliOptions.add(new CliOption(ROUTES_FILE_NAME, "Base package in which supporting classes are generated.").defaultValue(basePackage));
+        cliOptions.add(new CliOption(BASE_PACKAGE, "Base package in which supporting classes are generated.").defaultValue(basePackage));
 
         addCliOptionWithDefault(SKIP_STUBS, "If set, skips generation of stub classes.", skipStubs);
         addCliOptionWithDefault(SUPPORT_ASYNC, "If set, wraps API return types with Futures and generates async actions.", supportAsync);

From e81e650627af79f2e35c825e306da0f1c0eb1c93 Mon Sep 17 00:00:00 2001
From: Michal Foksa <mail@michalfoksa.net>
Date: Fri, 12 Jul 2019 18:41:26 +0200
Subject: [PATCH 05/62] 1. Operations are grouped together by resourcePath so
 that operation s with same resourcePath can be rendered one after the other.
 (#3202)

2. Lambdas registered: lowercase, uppercase, onchnage, etc.
---
 .../languages/OpenAPIYamlGenerator.java       | 72 +++++++++++++++++++
 1 file changed, 72 insertions(+)

diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/OpenAPIYamlGenerator.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/OpenAPIYamlGenerator.java
index e0d2a98294..5c46567fd9 100644
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/OpenAPIYamlGenerator.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/OpenAPIYamlGenerator.java
@@ -18,9 +18,23 @@
 package org.openapitools.codegen.languages;
 
 import org.openapitools.codegen.*;
+import org.openapitools.codegen.templating.mustache.CamelCaseLambda;
+import org.openapitools.codegen.templating.mustache.IndentedLambda;
+import org.openapitools.codegen.templating.mustache.LowercaseLambda;
+import org.openapitools.codegen.templating.mustache.TitlecaseLambda;
+import org.openapitools.codegen.templating.mustache.UppercaseLambda;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import com.google.common.collect.ImmutableMap;
+import com.samskivert.mustache.Mustache;
+import com.samskivert.mustache.Template;
+import io.swagger.v3.oas.models.Operation;
+
+import java.io.IOException;
+import java.io.Writer;
+import java.util.ArrayList;
+import java.util.List;
 import java.util.Map;
 
 public class OpenAPIYamlGenerator extends DefaultCodegen implements CodegenConfig {
@@ -61,6 +75,44 @@ public class OpenAPIYamlGenerator extends DefaultCodegen implements CodegenConfi
         }
         LOGGER.info("Output file [outputFile={}]", outputFile);
         supportingFiles.add(new SupportingFile("openapi.mustache", outputFile));
+
+        addMustacheLambdas(additionalProperties);
+    }
+
+    private void addMustacheLambdas(Map<String, Object> objs) {
+
+        Map<String, Mustache.Lambda> lambdas = new ImmutableMap.Builder<String, Mustache.Lambda>()
+                .put("lowercase", new LowercaseLambda().generator(this))
+                .put("uppercase", new UppercaseLambda())
+                .put("titlecase", new TitlecaseLambda())
+                .put("camelcase", new CamelCaseLambda().generator(this))
+                .put("indented", new IndentedLambda())
+                .put("indented_8", new IndentedLambda(8, " "))
+                .put("indented_12", new IndentedLambda(12, " "))
+                .put("indented_16", new IndentedLambda(16, " "))
+                .put("onchange",  new OnChangeLambda())
+                .build();
+
+        if (objs.containsKey("lambda")) {
+            LOGGER.warn("A property named 'lambda' already exists. Mustache lambdas renamed from 'lambda' to '_lambda'. " +
+                    "You'll likely need to use a custom template, " +
+                    "see https://github.com/OpenAPITools/openapi-generator/blob/master/docs/templating.md. ");
+            objs.put("_lambda", lambdas);
+        } else {
+            objs.put("lambda", lambdas);
+        }
+    }
+
+    /**
+     * Group operations by resourcePath so that operations with same path and
+     * different http method can be rendered one after the other.
+     */
+    @Override
+    public void addOperationToGroup(String tag, String resourcePath, Operation operation, CodegenOperation
+            co, Map<String, List<CodegenOperation>> operations) {
+        List<CodegenOperation> opList = operations.computeIfAbsent(resourcePath,
+                k -> new ArrayList<>());
+        opList.add(co);
     }
 
     @Override
@@ -81,4 +133,24 @@ public class OpenAPIYamlGenerator extends DefaultCodegen implements CodegenConfi
         return input;
     }
 
+    /**
+     * Lambda writes current fragment to the output when it is different than
+     * previous fragment.
+     */
+    public static class OnChangeLambda implements Mustache.Lambda {
+        private static final Logger LOGGER = LoggerFactory.getLogger(OnChangeLambda.class);
+
+        private String lastVal = null;
+
+        @Override
+        public void execute(Template.Fragment frag, Writer out) throws IOException {
+            String curVal = frag.execute();
+            LOGGER.debug("[lastVal={}, curVal={}]", lastVal, curVal);
+            if (curVal != null && !curVal.equals(lastVal)) {
+                out.write(curVal);
+                lastVal = curVal;
+            }
+        }
+    }
+
 }

From a5f92ad150cda1bbac0e5398b5b2109bba6a11a5 Mon Sep 17 00:00:00 2001
From: William Cheng <wing328hk@gmail.com>
Date: Sat, 13 Jul 2019 01:20:15 +0800
Subject: [PATCH 06/62] update doc

---
 docs/generators/scala-play-server.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/generators/scala-play-server.md b/docs/generators/scala-play-server.md
index 6aaa4d1017..e7b3a46bf6 100644
--- a/docs/generators/scala-play-server.md
+++ b/docs/generators/scala-play-server.md
@@ -15,7 +15,7 @@ sidebar_label: scala-play-server
 |apiPackage|package for generated api classes| |null|
 |sourceFolder|source folder for generated code| |null|
 |routesFileName|Name of the routes file to generate.| |routes|
-|routesFileName|Base package in which supporting classes are generated.| |org.openapitools|
+|basePackage|Base package in which supporting classes are generated.| |org.openapitools|
 |skipStubs|If set, skips generation of stub classes.| |false|
 |supportAsync|If set, wraps API return types with Futures and generates async actions.| |false|
 |generateCustomExceptions|If set, generates custom exception types.| |true|

From 40a6e639d497685db4cb2201e8f3f62a917a96a3 Mon Sep 17 00:00:00 2001
From: William Cheng <wing328hk@gmail.com>
Date: Sat, 13 Jul 2019 10:39:58 +0800
Subject: [PATCH 07/62] Add links to Codewind OpenAPI Tools (#3350)

---
 README.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/README.md b/README.md
index c385e05569..bf3009ef6b 100644
--- a/README.md
+++ b/README.md
@@ -592,6 +592,8 @@ Here are some companies/projects (alphabetical order) using OpenAPI Generator in
 - 2019-05-22 - [REST APIs代码生成指南(OpenAPI Generator)](https://gum.co/openapi_generator_ebook_gb) by [William Cheng](https://twitter.com/wing328), [Xin Meng](https://github.com/xmeng1)
 - 2019-05-24 - [REST API 代碼生成指南 (OpenAPI Generator)](https://gum.co/openapi_generator_ebook_big5) by [William Cheng](https://twitter.com/wing328)
 - 2019-06-24 - [Kubernetes Clients and OpenAPI Generator](https://speakerdeck.com/wing328/kubernetes-clients-and-openapi-generator) by [William Cheng](https://twitter.com/wing328) at [Kubernetes Contributor Summits Shanghai 2019](https://www.lfasiallc.com/events/contributors-summit-china-2019/)
+- 2019-06-28 [Codewind OpenAPI Tools](https://marketplace.eclipse.org/content/codewind-openapi-tools) in [Eclipse Marketplace](https://marketplace.eclipse.org/) by IBM
+- 2019-06-29 [Codewind OpenAPI Tools](https://marketplace.visualstudio.com/items?itemName=IBM.codewind-openapi-tools) in [Visual Studio Marketplace](https://marketplace.visualstudio.com/) by IBM
 - 2019-07-04 - [REST API のためのコード生成入門 (OpenAPI Generator)](https://gum.co/openapi_generator_ebook_big5) by [William Cheng](https://twitter.com/wing328), [中野暁人](https://github.com/ackintosh), [和田拓朗](https://github.com/taxpon)
 
 ## [6 - About Us](#table-of-contents)

From f04ef76d0763984c2c37056d94c4d500e627baf0 Mon Sep 17 00:00:00 2001
From: Josh Burton <athor3d@gmail.com>
Date: Sat, 13 Jul 2019 16:32:24 +1200
Subject: [PATCH 08/62] [dart-jaguar] Adds option to customise the generated
 API client name (#3234)

* [dart=-jaguar] Adds option to customise the generated API client name

* [dart-jaguar] Removes explicit clientName CLI property and derives client name from pub name

* [dart-jaguar] Updates samples

* Reverts import changes
---
 .../codegen/languages/DartJaguarClientCodegen.java          | 6 +++---
 .../src/main/resources/dart-jaguar/README.mustache          | 2 +-
 .../src/main/resources/dart-jaguar/apilib.mustache          | 4 ++--
 .../petstore/dart-jaguar/flutter_petstore/openapi/README.md | 4 ++--
 .../dart-jaguar/flutter_petstore/openapi/lib/api.dart       | 4 ++--
 .../dart-jaguar/flutter_proto_petstore/openapi/README.md    | 4 ++--
 .../dart-jaguar/flutter_proto_petstore/openapi/lib/api.dart | 4 ++--
 samples/client/petstore/dart-jaguar/openapi/README.md       | 4 ++--
 samples/client/petstore/dart-jaguar/openapi/lib/api.dart    | 4 ++--
 samples/client/petstore/dart-jaguar/openapi_proto/README.md | 4 ++--
 .../client/petstore/dart-jaguar/openapi_proto/lib/api.dart  | 4 ++--
 11 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/DartJaguarClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/DartJaguarClientCodegen.java
index 5e60619cd9..cc2516fee7 100644
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/DartJaguarClientCodegen.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/DartJaguarClientCodegen.java
@@ -16,15 +16,12 @@
 
 package org.openapitools.codegen.languages;
 
-import org.apache.commons.io.FilenameUtils;
 import org.openapitools.codegen.*;
 import org.openapitools.codegen.utils.ModelUtils;
 
 import io.swagger.v3.oas.models.media.*;
 
 import org.apache.commons.lang3.StringUtils;
-import org.openapitools.codegen.*;
-import org.openapitools.codegen.utils.ModelUtils;
 import org.openapitools.codegen.utils.ProcessUtils;
 
 import java.io.File;
@@ -37,6 +34,8 @@ public class DartJaguarClientCodegen extends DartClientCodegen {
     private static final String SERIALIZATION_FORMAT = "serialization";
     private static final String IS_FORMAT_JSON = "jsonFormat";
     private static final String IS_FORMAT_PROTO = "protoFormat";
+    private static final String CLIENT_NAME = "clientName";
+
     private static Set<String> modelToIgnore = new HashSet<>();
     private HashMap<String, String> protoTypeMapping = new HashMap<>();
 
@@ -141,6 +140,7 @@ public class DartJaguarClientCodegen extends DartClientCodegen {
             //not set, use to be passed to template
             additionalProperties.put(PUB_NAME, pubName);
         }
+        additionalProperties.put(CLIENT_NAME, org.openapitools.codegen.utils.StringUtils.camelize(pubName));
 
         if (additionalProperties.containsKey(PUB_VERSION)) {
             this.setPubVersion((String) additionalProperties.get(PUB_VERSION));
diff --git a/modules/openapi-generator/src/main/resources/dart-jaguar/README.mustache b/modules/openapi-generator/src/main/resources/dart-jaguar/README.mustache
index f3e63b485e..93cdde77b2 100644
--- a/modules/openapi-generator/src/main/resources/dart-jaguar/README.mustache
+++ b/modules/openapi-generator/src/main/resources/dart-jaguar/README.mustache
@@ -82,7 +82,7 @@ import 'package:{{pubName}}/api.dart';
 {{/authMethods}}
 {{/hasAuthMethods}}
 
-final jaguarApiGen = JaguarApiGen();
+final jaguarApiGen = {{clientName}}();
 var api_instance = jaguarApiGen.get{{classname}}();
 {{#allParams}}
 var {{paramName}} = {{#isListContainer}}[{{/isListContainer}}{{#isBodyParam}}new {{dataType}}(){{/isBodyParam}}{{^isBodyParam}}{{{example}}}{{/isBodyParam}}{{#isListContainer}}]{{/isListContainer}}; // {{{dataType}}} | {{{description}}}
diff --git a/modules/openapi-generator/src/main/resources/dart-jaguar/apilib.mustache b/modules/openapi-generator/src/main/resources/dart-jaguar/apilib.mustache
index cb41c5243a..8571ea0a19 100644
--- a/modules/openapi-generator/src/main/resources/dart-jaguar/apilib.mustache
+++ b/modules/openapi-generator/src/main/resources/dart-jaguar/apilib.mustache
@@ -42,7 +42,7 @@ final Map<String, CodecRepo> converters = {
 
 final _defaultInterceptors = [OAuthInterceptor(), BasicAuthInterceptor(), ApiKeyAuthInterceptor()];
 
-class JaguarApiGen {
+class {{clientName}} {
     List<Interceptor> interceptors;
     String basePath = "{{basePath}}";
     Route _baseRoute;
@@ -51,7 +51,7 @@ class JaguarApiGen {
     /**
     * Add custom global interceptors, put overrideInterceptors to true to set your interceptors only (auth interceptors will not be added)
     */
-    JaguarApiGen({List<Interceptor> interceptors, bool overrideInterceptors = false, String baseUrl, this.timeout = const Duration(minutes: 2)}) {
+    {{clientName}}({List<Interceptor> interceptors, bool overrideInterceptors = false, String baseUrl, this.timeout = const Duration(minutes: 2)}) {
         _baseRoute = Route(baseUrl ?? basePath).withClient(globalClient ?? IOClient());
         if(interceptors == null) {
             this.interceptors = _defaultInterceptors;
diff --git a/samples/client/petstore/dart-jaguar/flutter_petstore/openapi/README.md b/samples/client/petstore/dart-jaguar/flutter_petstore/openapi/README.md
index 0d0008ed4f..291b60d7e6 100644
--- a/samples/client/petstore/dart-jaguar/flutter_petstore/openapi/README.md
+++ b/samples/client/petstore/dart-jaguar/flutter_petstore/openapi/README.md
@@ -4,7 +4,7 @@ This is a sample server Petstore server. For this sample, you can use the api ke
 This Dart package is automatically generated by the [Open API Codegen](https://github.com/OpenAPITools/openapi-generator) project:
 
 - API version: 1.0.0
-- Build date: 2019-06-29T11:26:01.157+12:00[Pacific/Auckland]
+- Build date: 2019-06-29T09:47:15.495+12:00[Pacific/Auckland]
 - Build package: org.openapitools.codegen.languages.DartJaguarClientCodegen
 
 ## Requirements
@@ -55,7 +55,7 @@ import 'package:openapi/api.dart';
 // TODO Configure OAuth2 access token for authorization: petstore_auth
 //openapi.api.Configuration.accessToken = 'YOUR_ACCESS_TOKEN';
 
-final jaguarApiGen = JaguarApiGen();
+final jaguarApiGen = Openapi();
 var api_instance = jaguarApiGen.getPetApi();
 var body = new Pet(); // Pet | Pet object that needs to be added to the store
 
diff --git a/samples/client/petstore/dart-jaguar/flutter_petstore/openapi/lib/api.dart b/samples/client/petstore/dart-jaguar/flutter_petstore/openapi/lib/api.dart
index 23e4217515..b787b0405d 100644
--- a/samples/client/petstore/dart-jaguar/flutter_petstore/openapi/lib/api.dart
+++ b/samples/client/petstore/dart-jaguar/flutter_petstore/openapi/lib/api.dart
@@ -37,7 +37,7 @@ final Map<String, CodecRepo> converters = {
 
 final _defaultInterceptors = [OAuthInterceptor(), BasicAuthInterceptor(), ApiKeyAuthInterceptor()];
 
-class JaguarApiGen {
+class Openapi {
     List<Interceptor> interceptors;
     String basePath = "http://petstore.swagger.io/v2";
     Route _baseRoute;
@@ -46,7 +46,7 @@ class JaguarApiGen {
     /**
     * Add custom global interceptors, put overrideInterceptors to true to set your interceptors only (auth interceptors will not be added)
     */
-    JaguarApiGen({List<Interceptor> interceptors, bool overrideInterceptors = false, String baseUrl, this.timeout = const Duration(minutes: 2)}) {
+    Openapi({List<Interceptor> interceptors, bool overrideInterceptors = false, String baseUrl, this.timeout = const Duration(minutes: 2)}) {
         _baseRoute = Route(baseUrl ?? basePath).withClient(globalClient ?? IOClient());
         if(interceptors == null) {
             this.interceptors = _defaultInterceptors;
diff --git a/samples/client/petstore/dart-jaguar/flutter_proto_petstore/openapi/README.md b/samples/client/petstore/dart-jaguar/flutter_proto_petstore/openapi/README.md
index e50b342433..8277867842 100644
--- a/samples/client/petstore/dart-jaguar/flutter_proto_petstore/openapi/README.md
+++ b/samples/client/petstore/dart-jaguar/flutter_proto_petstore/openapi/README.md
@@ -4,7 +4,7 @@ This is a sample server Petstore server. For this sample, you can use the api ke
 This Dart package is automatically generated by the [Open API Codegen](https://github.com/OpenAPITools/openapi-generator) project:
 
 - API version: 1.0.0
-- Build date: 2019-06-29T11:26:04.013+12:00[Pacific/Auckland]
+- Build date: 2019-06-29T09:47:16.421+12:00[Pacific/Auckland]
 - Build package: org.openapitools.codegen.languages.DartJaguarClientCodegen
 
 ## Requirements
@@ -55,7 +55,7 @@ import 'package:openapi/api.dart';
 // TODO Configure OAuth2 access token for authorization: petstore_auth
 //openapi.api.Configuration.accessToken = 'YOUR_ACCESS_TOKEN';
 
-final jaguarApiGen = JaguarApiGen();
+final jaguarApiGen = Openapi();
 var api_instance = jaguarApiGen.getPetApi();
 var body = new Pet(); // Pet | Pet object that needs to be added to the store
 
diff --git a/samples/client/petstore/dart-jaguar/flutter_proto_petstore/openapi/lib/api.dart b/samples/client/petstore/dart-jaguar/flutter_proto_petstore/openapi/lib/api.dart
index bed06dd13d..12dcdff72f 100644
--- a/samples/client/petstore/dart-jaguar/flutter_proto_petstore/openapi/lib/api.dart
+++ b/samples/client/petstore/dart-jaguar/flutter_proto_petstore/openapi/lib/api.dart
@@ -47,7 +47,7 @@ final Map<String, CodecRepo> converters = {
 
 final _defaultInterceptors = [OAuthInterceptor(), BasicAuthInterceptor(), ApiKeyAuthInterceptor()];
 
-class JaguarApiGen {
+class Openapi {
     List<Interceptor> interceptors;
     String basePath = "http://petstore.swagger.io/v2";
     Route _baseRoute;
@@ -56,7 +56,7 @@ class JaguarApiGen {
     /**
     * Add custom global interceptors, put overrideInterceptors to true to set your interceptors only (auth interceptors will not be added)
     */
-    JaguarApiGen({List<Interceptor> interceptors, bool overrideInterceptors = false, String baseUrl, this.timeout = const Duration(minutes: 2)}) {
+    Openapi({List<Interceptor> interceptors, bool overrideInterceptors = false, String baseUrl, this.timeout = const Duration(minutes: 2)}) {
         _baseRoute = Route(baseUrl ?? basePath).withClient(globalClient ?? IOClient());
         if(interceptors == null) {
             this.interceptors = _defaultInterceptors;
diff --git a/samples/client/petstore/dart-jaguar/openapi/README.md b/samples/client/petstore/dart-jaguar/openapi/README.md
index 2b99d076a7..7f45064333 100644
--- a/samples/client/petstore/dart-jaguar/openapi/README.md
+++ b/samples/client/petstore/dart-jaguar/openapi/README.md
@@ -4,7 +4,7 @@ This is a sample server Petstore server. For this sample, you can use the api ke
 This Dart package is automatically generated by the [Open API Codegen](https://github.com/OpenAPITools/openapi-generator) project:
 
 - API version: 1.0.0
-- Build date: 2019-06-29T11:25:59.502+12:00[Pacific/Auckland]
+- Build date: 2019-06-29T09:47:14.533+12:00[Pacific/Auckland]
 - Build package: org.openapitools.codegen.languages.DartJaguarClientCodegen
 
 ## Requirements
@@ -55,7 +55,7 @@ import 'package:openapi/api.dart';
 // TODO Configure OAuth2 access token for authorization: petstore_auth
 //openapi.api.Configuration.accessToken = 'YOUR_ACCESS_TOKEN';
 
-final jaguarApiGen = JaguarApiGen();
+final jaguarApiGen = Openapi();
 var api_instance = jaguarApiGen.getPetApi();
 var body = new Pet(); // Pet | Pet object that needs to be added to the store
 
diff --git a/samples/client/petstore/dart-jaguar/openapi/lib/api.dart b/samples/client/petstore/dart-jaguar/openapi/lib/api.dart
index 23e4217515..b787b0405d 100644
--- a/samples/client/petstore/dart-jaguar/openapi/lib/api.dart
+++ b/samples/client/petstore/dart-jaguar/openapi/lib/api.dart
@@ -37,7 +37,7 @@ final Map<String, CodecRepo> converters = {
 
 final _defaultInterceptors = [OAuthInterceptor(), BasicAuthInterceptor(), ApiKeyAuthInterceptor()];
 
-class JaguarApiGen {
+class Openapi {
     List<Interceptor> interceptors;
     String basePath = "http://petstore.swagger.io/v2";
     Route _baseRoute;
@@ -46,7 +46,7 @@ class JaguarApiGen {
     /**
     * Add custom global interceptors, put overrideInterceptors to true to set your interceptors only (auth interceptors will not be added)
     */
-    JaguarApiGen({List<Interceptor> interceptors, bool overrideInterceptors = false, String baseUrl, this.timeout = const Duration(minutes: 2)}) {
+    Openapi({List<Interceptor> interceptors, bool overrideInterceptors = false, String baseUrl, this.timeout = const Duration(minutes: 2)}) {
         _baseRoute = Route(baseUrl ?? basePath).withClient(globalClient ?? IOClient());
         if(interceptors == null) {
             this.interceptors = _defaultInterceptors;
diff --git a/samples/client/petstore/dart-jaguar/openapi_proto/README.md b/samples/client/petstore/dart-jaguar/openapi_proto/README.md
index 761fc689ef..84be8a47c9 100644
--- a/samples/client/petstore/dart-jaguar/openapi_proto/README.md
+++ b/samples/client/petstore/dart-jaguar/openapi_proto/README.md
@@ -4,7 +4,7 @@ This is a sample server Petstore server. For this sample, you can use the api ke
 This Dart package is automatically generated by the [Open API Codegen](https://github.com/OpenAPITools/openapi-generator) project:
 
 - API version: 1.0.0
-- Build date: 2019-06-29T11:26:07.058+12:00[Pacific/Auckland]
+- Build date: 2019-06-29T09:47:17.358+12:00[Pacific/Auckland]
 - Build package: org.openapitools.codegen.languages.DartJaguarClientCodegen
 
 ## Requirements
@@ -55,7 +55,7 @@ import 'package:openapi/api.dart';
 // TODO Configure OAuth2 access token for authorization: petstore_auth
 //openapi.api.Configuration.accessToken = 'YOUR_ACCESS_TOKEN';
 
-final jaguarApiGen = JaguarApiGen();
+final jaguarApiGen = Openapi();
 var api_instance = jaguarApiGen.getPetApi();
 var body = new Pet(); // Pet | Pet object that needs to be added to the store
 
diff --git a/samples/client/petstore/dart-jaguar/openapi_proto/lib/api.dart b/samples/client/petstore/dart-jaguar/openapi_proto/lib/api.dart
index bed06dd13d..12dcdff72f 100644
--- a/samples/client/petstore/dart-jaguar/openapi_proto/lib/api.dart
+++ b/samples/client/petstore/dart-jaguar/openapi_proto/lib/api.dart
@@ -47,7 +47,7 @@ final Map<String, CodecRepo> converters = {
 
 final _defaultInterceptors = [OAuthInterceptor(), BasicAuthInterceptor(), ApiKeyAuthInterceptor()];
 
-class JaguarApiGen {
+class Openapi {
     List<Interceptor> interceptors;
     String basePath = "http://petstore.swagger.io/v2";
     Route _baseRoute;
@@ -56,7 +56,7 @@ class JaguarApiGen {
     /**
     * Add custom global interceptors, put overrideInterceptors to true to set your interceptors only (auth interceptors will not be added)
     */
-    JaguarApiGen({List<Interceptor> interceptors, bool overrideInterceptors = false, String baseUrl, this.timeout = const Duration(minutes: 2)}) {
+    Openapi({List<Interceptor> interceptors, bool overrideInterceptors = false, String baseUrl, this.timeout = const Duration(minutes: 2)}) {
         _baseRoute = Route(baseUrl ?? basePath).withClient(globalClient ?? IOClient());
         if(interceptors == null) {
             this.interceptors = _defaultInterceptors;

From 4843dfc24444f2399ff8a4475112c981991a8c08 Mon Sep 17 00:00:00 2001
From: Jim Schubert <james.schubert@gmail.com>
Date: Sat, 13 Jul 2019 04:43:05 -0400
Subject: [PATCH 09/62] Updates to address recent lodash Object prototype
 vulnerability (#3348)

---
 .../Javascript-Flowtyped/package.mustache     |    3 +-
 .../.openapi-generator/VERSION                |    2 +-
 .../javascript-flowtyped/package-lock.json    |  332 +-
 .../javascript-flowtyped/package.json         |    3 +-
 website/i18n/en.json                          |   15 +
 website/package.json                          |    6 +-
 website/yarn.lock                             | 3794 +++++++++--------
 7 files changed, 2349 insertions(+), 1806 deletions(-)

diff --git a/modules/openapi-generator/src/main/resources/Javascript-Flowtyped/package.mustache b/modules/openapi-generator/src/main/resources/Javascript-Flowtyped/package.mustache
index 4f2598fa34..f2a1f86966 100644
--- a/modules/openapi-generator/src/main/resources/Javascript-Flowtyped/package.mustache
+++ b/modules/openapi-generator/src/main/resources/Javascript-Flowtyped/package.mustache
@@ -33,6 +33,7 @@
     "@babel/preset-flow": "^7.0.0",
     "babel-preset-react-app": "^7.0.0",
     "flow-copy-source": "^2.0.0",
-    "rimraf": "^2.6.2"
+    "rimraf": "^2.6.2",
+    "lodash": ">=4.17.13"
   }
 }
diff --git a/samples/client/petstore/javascript-flowtyped/.openapi-generator/VERSION b/samples/client/petstore/javascript-flowtyped/.openapi-generator/VERSION
index 479c313e87..83a328a922 100644
--- a/samples/client/petstore/javascript-flowtyped/.openapi-generator/VERSION
+++ b/samples/client/petstore/javascript-flowtyped/.openapi-generator/VERSION
@@ -1 +1 @@
-4.0.3-SNAPSHOT
\ No newline at end of file
+4.1.0-SNAPSHOT
\ No newline at end of file
diff --git a/samples/client/petstore/javascript-flowtyped/package-lock.json b/samples/client/petstore/javascript-flowtyped/package-lock.json
index 2207ddfeef..7e63013475 100644
--- a/samples/client/petstore/javascript-flowtyped/package-lock.json
+++ b/samples/client/petstore/javascript-flowtyped/package-lock.json
@@ -1078,31 +1078,36 @@
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-4.0.0.tgz",
       "integrity": "sha1-1kYQdP6/7HHn4VI1dhoyml3HxSA=",
-      "dev": true
+      "dev": true,
+      "optional": true
     },
     "arr-flatten": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/arr-flatten/-/arr-flatten-1.1.0.tgz",
       "integrity": "sha512-L3hKV5R/p5o81R7O02IGnwpDmkp6E982XhtbuwSe3O4qOtMMMtodicASA1Cny2U+aCXcNpml+m4dPsvsJ3jatg==",
-      "dev": true
+      "dev": true,
+      "optional": true
     },
     "arr-union": {
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/arr-union/-/arr-union-3.1.0.tgz",
       "integrity": "sha1-45sJrqne+Gao8gbiiK9jkZuuOcQ=",
-      "dev": true
+      "dev": true,
+      "optional": true
     },
     "array-unique": {
       "version": "0.3.2",
       "resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.3.2.tgz",
       "integrity": "sha1-qJS3XUvE9s1nnvMkSp/Y9Gri1Cg=",
-      "dev": true
+      "dev": true,
+      "optional": true
     },
     "assign-symbols": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/assign-symbols/-/assign-symbols-1.0.0.tgz",
       "integrity": "sha1-WWZ/QfrdTyDMvCu5a41Pf3jsA2c=",
-      "dev": true
+      "dev": true,
+      "optional": true
     },
     "async-each": {
       "version": "1.0.3",
@@ -1115,7 +1120,8 @@
       "version": "2.1.2",
       "resolved": "https://registry.npmjs.org/atob/-/atob-2.1.2.tgz",
       "integrity": "sha512-Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg==",
-      "dev": true
+      "dev": true,
+      "optional": true
     },
     "babel-loader": {
       "version": "8.0.5",
@@ -1241,6 +1247,7 @@
       "resolved": "https://registry.npmjs.org/base/-/base-0.11.2.tgz",
       "integrity": "sha512-5T6P4xPgpp0YDFvSWwEZ4NoE3aM4QBQXDzmVbraCkFj8zHM+mba8SyqB5DbZWyR7mYHo6Y7BdQo3MoA4m0TeQg==",
       "dev": true,
+      "optional": true,
       "requires": {
         "cache-base": "^1.0.1",
         "class-utils": "^0.3.5",
@@ -1256,6 +1263,7 @@
           "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz",
           "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=",
           "dev": true,
+          "optional": true,
           "requires": {
             "is-descriptor": "^1.0.0"
           }
@@ -1265,6 +1273,7 @@
           "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz",
           "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
           "dev": true,
+          "optional": true,
           "requires": {
             "kind-of": "^6.0.0"
           }
@@ -1274,6 +1283,7 @@
           "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz",
           "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
           "dev": true,
+          "optional": true,
           "requires": {
             "kind-of": "^6.0.0"
           }
@@ -1283,6 +1293,7 @@
           "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz",
           "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
           "dev": true,
+          "optional": true,
           "requires": {
             "is-accessor-descriptor": "^1.0.0",
             "is-data-descriptor": "^1.0.0",
@@ -1319,6 +1330,7 @@
       "resolved": "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz",
       "integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==",
       "dev": true,
+      "optional": true,
       "requires": {
         "arr-flatten": "^1.1.0",
         "array-unique": "^0.3.2",
@@ -1337,6 +1349,7 @@
           "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
           "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
           "dev": true,
+          "optional": true,
           "requires": {
             "is-extendable": "^0.1.0"
           }
@@ -1359,6 +1372,7 @@
       "resolved": "https://registry.npmjs.org/cache-base/-/cache-base-1.0.1.tgz",
       "integrity": "sha512-AKcdTnFSWATd5/GCPRxr2ChwIJ85CeyrEyjRHlKxQ56d4XJMGym0uAiKn0xbLOGOl3+yRpOTi484dVCEc5AUzQ==",
       "dev": true,
+      "optional": true,
       "requires": {
         "collection-visit": "^1.0.0",
         "component-emitter": "^1.2.1",
@@ -1444,6 +1458,7 @@
       "resolved": "https://registry.npmjs.org/class-utils/-/class-utils-0.3.6.tgz",
       "integrity": "sha512-qOhPa/Fj7s6TY8H8esGu5QNpMMQxz79h+urzrNYN6mn+9BnxlDGf5QZ+XeCDsxSjPqsSR56XOZOJmpeurnLMeg==",
       "dev": true,
+      "optional": true,
       "requires": {
         "arr-union": "^3.1.0",
         "define-property": "^0.2.5",
@@ -1456,6 +1471,7 @@
           "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
           "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
           "dev": true,
+          "optional": true,
           "requires": {
             "is-descriptor": "^0.1.0"
           }
@@ -1478,6 +1494,7 @@
       "resolved": "https://registry.npmjs.org/collection-visit/-/collection-visit-1.0.0.tgz",
       "integrity": "sha1-S8A3PBZLwykbTTaMgpzxqApZ3KA=",
       "dev": true,
+      "optional": true,
       "requires": {
         "map-visit": "^1.0.0",
         "object-visit": "^1.0.0"
@@ -1514,7 +1531,8 @@
       "version": "1.3.0",
       "resolved": "https://registry.npmjs.org/component-emitter/-/component-emitter-1.3.0.tgz",
       "integrity": "sha512-Rd3se6QB+sO1TwqZjscQrurpEPIfO0/yYnSin6Q/rD3mOutHvUrCAhJub3r90uNb+SESBuE0QYoB90YdfatsRg==",
-      "dev": true
+      "dev": true,
+      "optional": true
     },
     "concat-map": {
       "version": "0.0.1",
@@ -1535,7 +1553,8 @@
       "version": "0.1.1",
       "resolved": "https://registry.npmjs.org/copy-descriptor/-/copy-descriptor-0.1.1.tgz",
       "integrity": "sha1-Z29us8OZl8LuGsOpJP1hJHSPV40=",
-      "dev": true
+      "dev": true,
+      "optional": true
     },
     "core-util-is": {
       "version": "1.0.2",
@@ -1574,6 +1593,7 @@
       "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
       "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
       "dev": true,
+      "optional": true,
       "requires": {
         "ms": "2.0.0"
       }
@@ -1588,7 +1608,8 @@
       "version": "0.2.0",
       "resolved": "https://registry.npmjs.org/decode-uri-component/-/decode-uri-component-0.2.0.tgz",
       "integrity": "sha1-6zkTMzRYd1y4TNGh+uBiEGu4dUU=",
-      "dev": true
+      "dev": true,
+      "optional": true
     },
     "define-properties": {
       "version": "1.1.3",
@@ -1604,6 +1625,7 @@
       "resolved": "https://registry.npmjs.org/define-property/-/define-property-2.0.2.tgz",
       "integrity": "sha512-jwK2UV4cnPpbcG7+VRARKTZPUWowwXA8bzH5NP6ud0oeAxyYPuGZUAC7hMugpCdz4BeSZl2Dl9k66CHJ/46ZYQ==",
       "dev": true,
+      "optional": true,
       "requires": {
         "is-descriptor": "^1.0.2",
         "isobject": "^3.0.1"
@@ -1614,6 +1636,7 @@
           "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz",
           "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
           "dev": true,
+          "optional": true,
           "requires": {
             "kind-of": "^6.0.0"
           }
@@ -1623,6 +1646,7 @@
           "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz",
           "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
           "dev": true,
+          "optional": true,
           "requires": {
             "kind-of": "^6.0.0"
           }
@@ -1632,6 +1656,7 @@
           "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz",
           "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
           "dev": true,
+          "optional": true,
           "requires": {
             "is-accessor-descriptor": "^1.0.0",
             "is-data-descriptor": "^1.0.0",
@@ -1747,6 +1772,7 @@
       "resolved": "https://registry.npmjs.org/expand-brackets/-/expand-brackets-2.1.4.tgz",
       "integrity": "sha1-t3c14xXOMPa27/D4OwQVGiJEliI=",
       "dev": true,
+      "optional": true,
       "requires": {
         "debug": "^2.3.3",
         "define-property": "^0.2.5",
@@ -1762,6 +1788,7 @@
           "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
           "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
           "dev": true,
+          "optional": true,
           "requires": {
             "is-descriptor": "^0.1.0"
           }
@@ -1771,6 +1798,7 @@
           "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
           "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
           "dev": true,
+          "optional": true,
           "requires": {
             "is-extendable": "^0.1.0"
           }
@@ -1782,6 +1810,7 @@
       "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-3.0.2.tgz",
       "integrity": "sha1-Jqcarwc7OfshJxcnRhMcJwQCjbg=",
       "dev": true,
+      "optional": true,
       "requires": {
         "assign-symbols": "^1.0.0",
         "is-extendable": "^1.0.1"
@@ -1792,6 +1821,7 @@
           "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-1.0.1.tgz",
           "integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==",
           "dev": true,
+          "optional": true,
           "requires": {
             "is-plain-object": "^2.0.4"
           }
@@ -1803,6 +1833,7 @@
       "resolved": "https://registry.npmjs.org/extglob/-/extglob-2.0.4.tgz",
       "integrity": "sha512-Nmb6QXkELsuBr24CJSkilo6UHHgbekK5UiZgfE6UHD3Eb27YC6oD+bhcT+tJ6cl8dmsgdQxnWlcry8ksBIBLpw==",
       "dev": true,
+      "optional": true,
       "requires": {
         "array-unique": "^0.3.2",
         "define-property": "^1.0.0",
@@ -1819,6 +1850,7 @@
           "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz",
           "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=",
           "dev": true,
+          "optional": true,
           "requires": {
             "is-descriptor": "^1.0.0"
           }
@@ -1828,6 +1860,7 @@
           "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
           "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
           "dev": true,
+          "optional": true,
           "requires": {
             "is-extendable": "^0.1.0"
           }
@@ -1837,6 +1870,7 @@
           "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz",
           "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
           "dev": true,
+          "optional": true,
           "requires": {
             "kind-of": "^6.0.0"
           }
@@ -1846,6 +1880,7 @@
           "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz",
           "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
           "dev": true,
+          "optional": true,
           "requires": {
             "kind-of": "^6.0.0"
           }
@@ -1855,6 +1890,7 @@
           "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz",
           "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
           "dev": true,
+          "optional": true,
           "requires": {
             "is-accessor-descriptor": "^1.0.0",
             "is-data-descriptor": "^1.0.0",
@@ -1868,6 +1904,7 @@
       "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz",
       "integrity": "sha1-1USBHUKPmOsGpj3EAtJAPDKMOPc=",
       "dev": true,
+      "optional": true,
       "requires": {
         "extend-shallow": "^2.0.1",
         "is-number": "^3.0.0",
@@ -1880,6 +1917,7 @@
           "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
           "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
           "dev": true,
+          "optional": true,
           "requires": {
             "is-extendable": "^0.1.0"
           }
@@ -2024,13 +2062,15 @@
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/for-in/-/for-in-1.0.2.tgz",
       "integrity": "sha1-gQaNKVqBQuwKxybG4iAMMPttXoA=",
-      "dev": true
+      "dev": true,
+      "optional": true
     },
     "fragment-cache": {
       "version": "0.2.1",
       "resolved": "https://registry.npmjs.org/fragment-cache/-/fragment-cache-0.2.1.tgz",
       "integrity": "sha1-QpD60n8T6Jvn8zeZxrxaCr//DRk=",
       "dev": true,
+      "optional": true,
       "requires": {
         "map-cache": "^0.2.2"
       }
@@ -2071,27 +2111,28 @@
       "dependencies": {
         "abbrev": {
           "version": "1.1.1",
-          "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz",
+          "resolved": false,
           "integrity": "sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==",
           "dev": true,
           "optional": true
         },
         "ansi-regex": {
           "version": "2.1.1",
-          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
+          "resolved": false,
           "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=",
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "aproba": {
           "version": "1.2.0",
-          "resolved": "https://registry.npmjs.org/aproba/-/aproba-1.2.0.tgz",
+          "resolved": false,
           "integrity": "sha512-Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw==",
           "dev": true,
           "optional": true
         },
         "are-we-there-yet": {
           "version": "1.1.5",
-          "resolved": "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-1.1.5.tgz",
+          "resolved": false,
           "integrity": "sha512-5hYdAkZlcG8tOLujVDTgCT+uPX0VnpAH28gWsLfzpXYm7wP6mp5Q/gYyR7YQ0cKVJcXJnl3j2kpBan13PtQf6w==",
           "dev": true,
           "optional": true,
@@ -2102,15 +2143,17 @@
         },
         "balanced-match": {
           "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz",
+          "resolved": false,
           "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c=",
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "brace-expansion": {
           "version": "1.1.11",
-          "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
+          "resolved": false,
           "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
           "dev": true,
+          "optional": true,
           "requires": {
             "balanced-match": "^1.0.0",
             "concat-map": "0.0.1"
@@ -2118,32 +2161,35 @@
         },
         "chownr": {
           "version": "1.1.1",
-          "resolved": "https://registry.npmjs.org/chownr/-/chownr-1.1.1.tgz",
+          "resolved": false,
           "integrity": "sha512-j38EvO5+LHX84jlo6h4UzmOwi0UgW61WRyPtJz4qaadK5eY3BTS5TY/S1Stc3Uk2lIM6TPevAlULiEJwie860g==",
           "dev": true,
           "optional": true
         },
         "code-point-at": {
           "version": "1.1.0",
-          "resolved": "https://registry.npmjs.org/code-point-at/-/code-point-at-1.1.0.tgz",
+          "resolved": false,
           "integrity": "sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c=",
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "concat-map": {
           "version": "0.0.1",
-          "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
+          "resolved": false,
           "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=",
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "console-control-strings": {
           "version": "1.1.0",
-          "resolved": "https://registry.npmjs.org/console-control-strings/-/console-control-strings-1.1.0.tgz",
+          "resolved": false,
           "integrity": "sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4=",
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "core-util-is": {
           "version": "1.0.2",
-          "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz",
+          "resolved": false,
           "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=",
           "dev": true,
           "optional": true
@@ -2160,28 +2206,28 @@
         },
         "deep-extend": {
           "version": "0.6.0",
-          "resolved": "https://registry.npmjs.org/deep-extend/-/deep-extend-0.6.0.tgz",
+          "resolved": false,
           "integrity": "sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA==",
           "dev": true,
           "optional": true
         },
         "delegates": {
           "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/delegates/-/delegates-1.0.0.tgz",
+          "resolved": false,
           "integrity": "sha1-hMbhWbgZBP3KWaDvRM2HDTElD5o=",
           "dev": true,
           "optional": true
         },
         "detect-libc": {
           "version": "1.0.3",
-          "resolved": "https://registry.npmjs.org/detect-libc/-/detect-libc-1.0.3.tgz",
+          "resolved": false,
           "integrity": "sha1-+hN8S9aY7fVc1c0CrFWfkaTEups=",
           "dev": true,
           "optional": true
         },
         "fs-minipass": {
           "version": "1.2.5",
-          "resolved": "https://registry.npmjs.org/fs-minipass/-/fs-minipass-1.2.5.tgz",
+          "resolved": false,
           "integrity": "sha512-JhBl0skXjUPCFH7x6x61gQxrKyXsxB5gcgePLZCwfyCGGsTISMoIeObbrvVeP6Xmyaudw4TT43qV2Gz+iyd2oQ==",
           "dev": true,
           "optional": true,
@@ -2191,14 +2237,14 @@
         },
         "fs.realpath": {
           "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
+          "resolved": false,
           "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=",
           "dev": true,
           "optional": true
         },
         "gauge": {
           "version": "2.7.4",
-          "resolved": "https://registry.npmjs.org/gauge/-/gauge-2.7.4.tgz",
+          "resolved": false,
           "integrity": "sha1-LANAXHU4w51+s3sxcCLjJfsBi/c=",
           "dev": true,
           "optional": true,
@@ -2215,7 +2261,7 @@
         },
         "glob": {
           "version": "7.1.3",
-          "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.3.tgz",
+          "resolved": false,
           "integrity": "sha512-vcfuiIxogLV4DlGBHIUOwI0IbrJ8HWPc4MU7HzviGeNho/UJDfi6B5p3sHeWIQ0KGIU0Jpxi5ZHxemQfLkkAwQ==",
           "dev": true,
           "optional": true,
@@ -2230,14 +2276,14 @@
         },
         "has-unicode": {
           "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/has-unicode/-/has-unicode-2.0.1.tgz",
+          "resolved": false,
           "integrity": "sha1-4Ob+aijPUROIVeCG0Wkedx3iqLk=",
           "dev": true,
           "optional": true
         },
         "iconv-lite": {
           "version": "0.4.24",
-          "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz",
+          "resolved": false,
           "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==",
           "dev": true,
           "optional": true,
@@ -2247,7 +2293,7 @@
         },
         "ignore-walk": {
           "version": "3.0.1",
-          "resolved": "https://registry.npmjs.org/ignore-walk/-/ignore-walk-3.0.1.tgz",
+          "resolved": false,
           "integrity": "sha512-DTVlMx3IYPe0/JJcYP7Gxg7ttZZu3IInhuEhbchuqneY9wWe5Ojy2mXLBaQFUQmo0AW2r3qG7m1mg86js+gnlQ==",
           "dev": true,
           "optional": true,
@@ -2257,7 +2303,7 @@
         },
         "inflight": {
           "version": "1.0.6",
-          "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
+          "resolved": false,
           "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=",
           "dev": true,
           "optional": true,
@@ -2268,53 +2314,58 @@
         },
         "inherits": {
           "version": "2.0.3",
-          "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
+          "resolved": false,
           "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=",
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "ini": {
           "version": "1.3.5",
-          "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.5.tgz",
+          "resolved": false,
           "integrity": "sha512-RZY5huIKCMRWDUqZlEi72f/lmXKMvuszcMBduliQ3nnWbx9X/ZBQO7DijMEYS9EhHBb2qacRUMtC7svLwe0lcw==",
           "dev": true,
           "optional": true
         },
         "is-fullwidth-code-point": {
           "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz",
+          "resolved": false,
           "integrity": "sha1-754xOG8DGn8NZDr4L95QxFfvAMs=",
           "dev": true,
+          "optional": true,
           "requires": {
             "number-is-nan": "^1.0.0"
           }
         },
         "isarray": {
           "version": "1.0.0",
-          "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
+          "resolved": false,
           "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
           "dev": true,
           "optional": true
         },
         "minimatch": {
           "version": "3.0.4",
-          "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
+          "resolved": false,
           "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==",
           "dev": true,
+          "optional": true,
           "requires": {
             "brace-expansion": "^1.1.7"
           }
         },
         "minimist": {
           "version": "0.0.8",
-          "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz",
+          "resolved": false,
           "integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=",
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "minipass": {
           "version": "2.3.5",
-          "resolved": "https://registry.npmjs.org/minipass/-/minipass-2.3.5.tgz",
+          "resolved": false,
           "integrity": "sha512-Gi1W4k059gyRbyVUZQ4mEqLm0YIUiGYfvxhF6SIlk3ui1WVxMTGfGdQ2SInh3PDrRTVvPKgULkpJtT4RH10+VA==",
           "dev": true,
+          "optional": true,
           "requires": {
             "safe-buffer": "^5.1.2",
             "yallist": "^3.0.0"
@@ -2322,7 +2373,7 @@
         },
         "minizlib": {
           "version": "1.2.1",
-          "resolved": "https://registry.npmjs.org/minizlib/-/minizlib-1.2.1.tgz",
+          "resolved": false,
           "integrity": "sha512-7+4oTUOWKg7AuL3vloEWekXY2/D20cevzsrNT2kGWm+39J9hGTCBv8VI5Pm5lXZ/o3/mdR4f8rflAPhnQb8mPA==",
           "dev": true,
           "optional": true,
@@ -2332,9 +2383,10 @@
         },
         "mkdirp": {
           "version": "0.5.1",
-          "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz",
+          "resolved": false,
           "integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=",
           "dev": true,
+          "optional": true,
           "requires": {
             "minimist": "0.0.8"
           }
@@ -2379,7 +2431,7 @@
         },
         "nopt": {
           "version": "4.0.1",
-          "resolved": "https://registry.npmjs.org/nopt/-/nopt-4.0.1.tgz",
+          "resolved": false,
           "integrity": "sha1-0NRoWv1UFRk8jHUFYC0NF81kR00=",
           "dev": true,
           "optional": true,
@@ -2408,7 +2460,7 @@
         },
         "npmlog": {
           "version": "4.1.2",
-          "resolved": "https://registry.npmjs.org/npmlog/-/npmlog-4.1.2.tgz",
+          "resolved": false,
           "integrity": "sha512-2uUqazuKlTaSI/dC8AzicUck7+IrEaOnN/e0jd3Xtt1KcGpwx30v50mL7oPyr/h9bL3E4aZccVwpwP+5W9Vjkg==",
           "dev": true,
           "optional": true,
@@ -2421,43 +2473,45 @@
         },
         "number-is-nan": {
           "version": "1.0.1",
-          "resolved": "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz",
+          "resolved": false,
           "integrity": "sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0=",
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "object-assign": {
           "version": "4.1.1",
-          "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
+          "resolved": false,
           "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=",
           "dev": true,
           "optional": true
         },
         "once": {
           "version": "1.4.0",
-          "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
+          "resolved": false,
           "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=",
           "dev": true,
+          "optional": true,
           "requires": {
             "wrappy": "1"
           }
         },
         "os-homedir": {
           "version": "1.0.2",
-          "resolved": "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.2.tgz",
+          "resolved": false,
           "integrity": "sha1-/7xJiDNuDoM94MFox+8VISGqf7M=",
           "dev": true,
           "optional": true
         },
         "os-tmpdir": {
           "version": "1.0.2",
-          "resolved": "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz",
+          "resolved": false,
           "integrity": "sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ=",
           "dev": true,
           "optional": true
         },
         "osenv": {
           "version": "0.1.5",
-          "resolved": "https://registry.npmjs.org/osenv/-/osenv-0.1.5.tgz",
+          "resolved": false,
           "integrity": "sha512-0CWcCECdMVc2Rw3U5w9ZjqX6ga6ubk1xDVKxtBQPK7wis/0F2r9T6k4ydGYhecl7YUBxBVxhL5oisPsNxAPe2g==",
           "dev": true,
           "optional": true,
@@ -2468,21 +2522,21 @@
         },
         "path-is-absolute": {
           "version": "1.0.1",
-          "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
+          "resolved": false,
           "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18=",
           "dev": true,
           "optional": true
         },
         "process-nextick-args": {
           "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.0.tgz",
+          "resolved": false,
           "integrity": "sha512-MtEC1TqN0EU5nephaJ4rAtThHtC86dNN9qCuEhtshvpVBkAW5ZO7BASN9REnF9eoXGcRub+pFuKEpOHE+HbEMw==",
           "dev": true,
           "optional": true
         },
         "rc": {
           "version": "1.2.8",
-          "resolved": "https://registry.npmjs.org/rc/-/rc-1.2.8.tgz",
+          "resolved": false,
           "integrity": "sha512-y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw==",
           "dev": true,
           "optional": true,
@@ -2495,7 +2549,7 @@
           "dependencies": {
             "minimist": {
               "version": "1.2.0",
-              "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
+              "resolved": false,
               "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=",
               "dev": true,
               "optional": true
@@ -2504,7 +2558,7 @@
         },
         "readable-stream": {
           "version": "2.3.6",
-          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
+          "resolved": false,
           "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
           "dev": true,
           "optional": true,
@@ -2520,7 +2574,7 @@
         },
         "rimraf": {
           "version": "2.6.3",
-          "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.6.3.tgz",
+          "resolved": false,
           "integrity": "sha512-mwqeW5XsA2qAejG46gYdENaxXjx9onRNCfn7L0duuP4hCuTIi/QO7PDK07KJfp1d+izWPrzEJDcSqBa0OZQriA==",
           "dev": true,
           "optional": true,
@@ -2530,20 +2584,21 @@
         },
         "safe-buffer": {
           "version": "5.1.2",
-          "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
+          "resolved": false,
           "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==",
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "safer-buffer": {
           "version": "2.1.2",
-          "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz",
+          "resolved": false,
           "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==",
           "dev": true,
           "optional": true
         },
         "sax": {
           "version": "1.2.4",
-          "resolved": "https://registry.npmjs.org/sax/-/sax-1.2.4.tgz",
+          "resolved": false,
           "integrity": "sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw==",
           "dev": true,
           "optional": true
@@ -2557,23 +2612,24 @@
         },
         "set-blocking": {
           "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz",
+          "resolved": false,
           "integrity": "sha1-BF+XgtARrppoA93TgrJDkrPYkPc=",
           "dev": true,
           "optional": true
         },
         "signal-exit": {
           "version": "3.0.2",
-          "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.2.tgz",
+          "resolved": false,
           "integrity": "sha1-tf3AjxKH6hF4Yo5BXiUTK3NkbG0=",
           "dev": true,
           "optional": true
         },
         "string-width": {
           "version": "1.0.2",
-          "resolved": "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz",
+          "resolved": false,
           "integrity": "sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=",
           "dev": true,
+          "optional": true,
           "requires": {
             "code-point-at": "^1.0.0",
             "is-fullwidth-code-point": "^1.0.0",
@@ -2582,7 +2638,7 @@
         },
         "string_decoder": {
           "version": "1.1.1",
-          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
+          "resolved": false,
           "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
           "dev": true,
           "optional": true,
@@ -2592,23 +2648,24 @@
         },
         "strip-ansi": {
           "version": "3.0.1",
-          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
+          "resolved": false,
           "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
           "dev": true,
+          "optional": true,
           "requires": {
             "ansi-regex": "^2.0.0"
           }
         },
         "strip-json-comments": {
           "version": "2.0.1",
-          "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-2.0.1.tgz",
+          "resolved": false,
           "integrity": "sha1-PFMZQukIwml8DsNEhYwobHygpgo=",
           "dev": true,
           "optional": true
         },
         "tar": {
           "version": "4.4.8",
-          "resolved": "https://registry.npmjs.org/tar/-/tar-4.4.8.tgz",
+          "resolved": false,
           "integrity": "sha512-LzHF64s5chPQQS0IYBn9IN5h3i98c12bo4NCO7e0sGM2llXQ3p2FGC5sdENN4cTW48O915Sh+x+EXx7XW96xYQ==",
           "dev": true,
           "optional": true,
@@ -2624,14 +2681,14 @@
         },
         "util-deprecate": {
           "version": "1.0.2",
-          "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
+          "resolved": false,
           "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=",
           "dev": true,
           "optional": true
         },
         "wide-align": {
           "version": "1.1.3",
-          "resolved": "https://registry.npmjs.org/wide-align/-/wide-align-1.1.3.tgz",
+          "resolved": false,
           "integrity": "sha512-QGkOQc8XL6Bt5PwnsExKBPuMKBxnGxWWW3fU55Xt4feHozMUhdUMaBCk290qpm/wG5u/RSKzwdAC4i51YigihA==",
           "dev": true,
           "optional": true,
@@ -2641,15 +2698,17 @@
         },
         "wrappy": {
           "version": "1.0.2",
-          "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
+          "resolved": false,
           "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=",
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "yallist": {
           "version": "3.0.3",
-          "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.0.3.tgz",
+          "resolved": false,
           "integrity": "sha512-S+Zk8DEWE6oKpV+vI3qWkaK+jSbIK86pCwe2IF/xwIpQ8jEuxpw9NyaGjmp9+BoJv5FV2piqCDcoCtStppiq2A==",
-          "dev": true
+          "dev": true,
+          "optional": true
         }
       }
     },
@@ -2678,7 +2737,8 @@
       "version": "2.0.6",
       "resolved": "https://registry.npmjs.org/get-value/-/get-value-2.0.6.tgz",
       "integrity": "sha1-3BXKHGcjh8p2vTesCjlbogQqLCg=",
-      "dev": true
+      "dev": true,
+      "optional": true
     },
     "glob": {
       "version": "7.1.4",
@@ -2755,6 +2815,7 @@
       "resolved": "https://registry.npmjs.org/has-value/-/has-value-1.0.0.tgz",
       "integrity": "sha1-GLKB2lhbHFxR3vJMkw7SmgvmsXc=",
       "dev": true,
+      "optional": true,
       "requires": {
         "get-value": "^2.0.6",
         "has-values": "^1.0.0",
@@ -2766,6 +2827,7 @@
       "resolved": "https://registry.npmjs.org/has-values/-/has-values-1.0.0.tgz",
       "integrity": "sha1-lbC2P+whRmGab+V/51Yo1aOe/k8=",
       "dev": true,
+      "optional": true,
       "requires": {
         "is-number": "^3.0.0",
         "kind-of": "^4.0.0"
@@ -2776,6 +2838,7 @@
           "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-4.0.0.tgz",
           "integrity": "sha1-IIE989cSkosgc3hpGkUGb65y3Vc=",
           "dev": true,
+          "optional": true,
           "requires": {
             "is-buffer": "^1.1.5"
           }
@@ -2836,6 +2899,7 @@
       "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz",
       "integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=",
       "dev": true,
+      "optional": true,
       "requires": {
         "kind-of": "^3.0.2"
       },
@@ -2845,6 +2909,7 @@
           "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
           "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
           "dev": true,
+          "optional": true,
           "requires": {
             "is-buffer": "^1.1.5"
           }
@@ -2871,7 +2936,8 @@
       "version": "1.1.6",
       "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz",
       "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==",
-      "dev": true
+      "dev": true,
+      "optional": true
     },
     "is-callable": {
       "version": "1.1.4",
@@ -2884,6 +2950,7 @@
       "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz",
       "integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=",
       "dev": true,
+      "optional": true,
       "requires": {
         "kind-of": "^3.0.2"
       },
@@ -2893,6 +2960,7 @@
           "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
           "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
           "dev": true,
+          "optional": true,
           "requires": {
             "is-buffer": "^1.1.5"
           }
@@ -2910,6 +2978,7 @@
       "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz",
       "integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==",
       "dev": true,
+      "optional": true,
       "requires": {
         "is-accessor-descriptor": "^0.1.6",
         "is-data-descriptor": "^0.1.4",
@@ -2920,7 +2989,8 @@
           "version": "5.1.0",
           "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz",
           "integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==",
-          "dev": true
+          "dev": true,
+          "optional": true
         }
       }
     },
@@ -2934,7 +3004,8 @@
       "version": "0.1.1",
       "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz",
       "integrity": "sha1-YrEQ4omkcUGOPsNqYX1HLjAd/Ik=",
-      "dev": true
+      "dev": true,
+      "optional": true
     },
     "is-extglob": {
       "version": "2.1.1",
@@ -2962,6 +3033,7 @@
       "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz",
       "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=",
       "dev": true,
+      "optional": true,
       "requires": {
         "kind-of": "^3.0.2"
       },
@@ -2971,6 +3043,7 @@
           "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
           "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
           "dev": true,
+          "optional": true,
           "requires": {
             "is-buffer": "^1.1.5"
           }
@@ -2988,6 +3061,7 @@
       "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz",
       "integrity": "sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==",
       "dev": true,
+      "optional": true,
       "requires": {
         "isobject": "^3.0.1"
       }
@@ -3019,13 +3093,15 @@
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/is-windows/-/is-windows-1.0.2.tgz",
       "integrity": "sha512-eXK1UInq2bPmjyX6e3VHIzMLobc4J94i4AWn+Hpq3OU5KkrRC96OAcR3PRJ/pGu6m8TRnBHP9dkXQVsT/COVIA==",
-      "dev": true
+      "dev": true,
+      "optional": true
     },
     "isarray": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
       "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
-      "dev": true
+      "dev": true,
+      "optional": true
     },
     "isexe": {
       "version": "2.0.0",
@@ -3037,7 +3113,8 @@
       "version": "3.0.1",
       "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
       "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=",
-      "dev": true
+      "dev": true,
+      "optional": true
     },
     "js-levenshtein": {
       "version": "1.1.6",
@@ -3112,7 +3189,8 @@
       "version": "6.0.2",
       "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz",
       "integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==",
-      "dev": true
+      "dev": true,
+      "optional": true
     },
     "lcid": {
       "version": "2.0.0",
@@ -3162,9 +3240,9 @@
       }
     },
     "lodash": {
-      "version": "4.17.11",
-      "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.11.tgz",
-      "integrity": "sha512-cQKh8igo5QUhZ7lg38DYWAxMvjSAKG0A8wGSVimP07SIUEK2UO+arSRKbRZWtelMtN5V0Hkwh5ryOto/SshYIg==",
+      "version": "4.17.14",
+      "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.14.tgz",
+      "integrity": "sha512-mmKYbW3GLuJeX+iGP+Y7Gp1AiGHGbXHCOh/jZmrawMmsE7MS4znI3RL2FsjbqOyMayHInjOeykW7PEajUk1/xw==",
       "dev": true
     },
     "loose-envify": {
@@ -3199,13 +3277,15 @@
       "version": "0.2.2",
       "resolved": "https://registry.npmjs.org/map-cache/-/map-cache-0.2.2.tgz",
       "integrity": "sha1-wyq9C9ZSXZsFFkW7TyasXcmKDb8=",
-      "dev": true
+      "dev": true,
+      "optional": true
     },
     "map-visit": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/map-visit/-/map-visit-1.0.0.tgz",
       "integrity": "sha1-7Nyo8TFE5mDxtb1B8S80edmN+48=",
       "dev": true,
+      "optional": true,
       "requires": {
         "object-visit": "^1.0.0"
       }
@@ -3226,6 +3306,7 @@
       "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz",
       "integrity": "sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==",
       "dev": true,
+      "optional": true,
       "requires": {
         "arr-diff": "^4.0.0",
         "array-unique": "^0.3.2",
@@ -3268,6 +3349,7 @@
       "resolved": "https://registry.npmjs.org/mixin-deep/-/mixin-deep-1.3.2.tgz",
       "integrity": "sha512-WRoDn//mXBiJ1H40rqa3vH0toePwSsGb45iInWlTySa+Uu4k3tYUSxa2v1KqAiLtvlrSzaExqS1gtk96A9zvEA==",
       "dev": true,
+      "optional": true,
       "requires": {
         "for-in": "^1.0.2",
         "is-extendable": "^1.0.1"
@@ -3278,6 +3360,7 @@
           "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-1.0.1.tgz",
           "integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==",
           "dev": true,
+          "optional": true,
           "requires": {
             "is-plain-object": "^2.0.4"
           }
@@ -3297,7 +3380,8 @@
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
       "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
-      "dev": true
+      "dev": true,
+      "optional": true
     },
     "nan": {
       "version": "2.14.0",
@@ -3311,6 +3395,7 @@
       "resolved": "https://registry.npmjs.org/nanomatch/-/nanomatch-1.2.13.tgz",
       "integrity": "sha512-fpoe2T0RbHwBTBUOftAfBPaDEi06ufaUai0mE6Yn1kacc3SnTErfb/h+X94VXzI64rKFHYImXSvdwGGCmwOqCA==",
       "dev": true,
+      "optional": true,
       "requires": {
         "arr-diff": "^4.0.0",
         "array-unique": "^0.3.2",
@@ -3369,6 +3454,7 @@
       "resolved": "https://registry.npmjs.org/object-copy/-/object-copy-0.1.0.tgz",
       "integrity": "sha1-fn2Fi3gb18mRpBupde04EnVOmYw=",
       "dev": true,
+      "optional": true,
       "requires": {
         "copy-descriptor": "^0.1.0",
         "define-property": "^0.2.5",
@@ -3380,6 +3466,7 @@
           "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
           "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
           "dev": true,
+          "optional": true,
           "requires": {
             "is-descriptor": "^0.1.0"
           }
@@ -3389,6 +3476,7 @@
           "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
           "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
           "dev": true,
+          "optional": true,
           "requires": {
             "is-buffer": "^1.1.5"
           }
@@ -3406,6 +3494,7 @@
       "resolved": "https://registry.npmjs.org/object-visit/-/object-visit-1.0.1.tgz",
       "integrity": "sha1-95xEk68MU3e1n+OdOV5BBC3QRbs=",
       "dev": true,
+      "optional": true,
       "requires": {
         "isobject": "^3.0.0"
       }
@@ -3437,6 +3526,7 @@
       "resolved": "https://registry.npmjs.org/object.pick/-/object.pick-1.3.0.tgz",
       "integrity": "sha1-h6EKxMFpS9Lhy/U1kaZhQftd10c=",
       "dev": true,
+      "optional": true,
       "requires": {
         "isobject": "^3.0.1"
       }
@@ -3528,7 +3618,8 @@
       "version": "0.1.1",
       "resolved": "https://registry.npmjs.org/pascalcase/-/pascalcase-0.1.1.tgz",
       "integrity": "sha1-s2PlXoAGym/iF4TS2yK9FdeRfxQ=",
-      "dev": true
+      "dev": true,
+      "optional": true
     },
     "path-dirname": {
       "version": "1.0.2",
@@ -3595,7 +3686,8 @@
       "version": "0.1.1",
       "resolved": "https://registry.npmjs.org/posix-character-classes/-/posix-character-classes-0.1.1.tgz",
       "integrity": "sha1-AerA/jta9xoqbAL+q7jB/vfgDqs=",
-      "dev": true
+      "dev": true,
+      "optional": true
     },
     "private": {
       "version": "0.1.8",
@@ -3683,6 +3775,7 @@
       "resolved": "https://registry.npmjs.org/regex-not/-/regex-not-1.0.2.tgz",
       "integrity": "sha512-J6SDjUgDxQj5NusnOtdFxDwN/+HWykR8GELwctJ7mdqhcyy1xEc4SRFHUXvxTp661YaVKAjfRLZ9cCqS6tn32A==",
       "dev": true,
+      "optional": true,
       "requires": {
         "extend-shallow": "^3.0.2",
         "safe-regex": "^1.1.0"
@@ -3742,13 +3835,15 @@
       "version": "1.1.3",
       "resolved": "https://registry.npmjs.org/repeat-element/-/repeat-element-1.1.3.tgz",
       "integrity": "sha512-ahGq0ZnV5m5XtZLMb+vP76kcAM5nkLqk0lpqAuojSKGgQtn4eRi4ZZGm2olo2zKFH+sMsWaqOCW1dqAnOru72g==",
-      "dev": true
+      "dev": true,
+      "optional": true
     },
     "repeat-string": {
       "version": "1.6.1",
       "resolved": "https://registry.npmjs.org/repeat-string/-/repeat-string-1.6.1.tgz",
       "integrity": "sha1-jcrkcOHIirwtYA//Sndihtp15jc=",
-      "dev": true
+      "dev": true,
+      "optional": true
     },
     "require-directory": {
       "version": "2.1.1",
@@ -3781,13 +3876,15 @@
       "version": "0.2.1",
       "resolved": "https://registry.npmjs.org/resolve-url/-/resolve-url-0.2.1.tgz",
       "integrity": "sha1-LGN/53yJOv0qZj/iGqkIAGjiBSo=",
-      "dev": true
+      "dev": true,
+      "optional": true
     },
     "ret": {
       "version": "0.1.15",
       "resolved": "https://registry.npmjs.org/ret/-/ret-0.1.15.tgz",
       "integrity": "sha512-TTlYpa+OL+vMMNG24xSlQGEJ3B/RzEfUlLct7b5G/ytav+wPrplCpVMFuwzXbkecJrb6IYo1iFb0S9v37754mg==",
-      "dev": true
+      "dev": true,
+      "optional": true
     },
     "rimraf": {
       "version": "2.6.3",
@@ -3809,6 +3906,7 @@
       "resolved": "https://registry.npmjs.org/safe-regex/-/safe-regex-1.1.0.tgz",
       "integrity": "sha1-QKNmnzsHfR6UPURinhV91IAjvy4=",
       "dev": true,
+      "optional": true,
       "requires": {
         "ret": "~0.1.10"
       }
@@ -3835,6 +3933,7 @@
       "resolved": "https://registry.npmjs.org/set-value/-/set-value-2.0.1.tgz",
       "integrity": "sha512-JxHc1weCN68wRY0fhCoXpyK55m/XPHafOmK4UWD7m2CI14GMcFypt4w/0+NV5f/ZMby2F6S2wwA7fgynh9gWSw==",
       "dev": true,
+      "optional": true,
       "requires": {
         "extend-shallow": "^2.0.1",
         "is-extendable": "^0.1.1",
@@ -3847,6 +3946,7 @@
           "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
           "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
           "dev": true,
+          "optional": true,
           "requires": {
             "is-extendable": "^0.1.0"
           }
@@ -3885,6 +3985,7 @@
       "resolved": "https://registry.npmjs.org/snapdragon/-/snapdragon-0.8.2.tgz",
       "integrity": "sha512-FtyOnWN/wCHTVXOMwvSv26d+ko5vWlIDD6zoUJ7LW8vh+ZBC8QdljveRP+crNrtBwioEUWy/4dMtbBjA4ioNlg==",
       "dev": true,
+      "optional": true,
       "requires": {
         "base": "^0.11.1",
         "debug": "^2.2.0",
@@ -3901,6 +4002,7 @@
           "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
           "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
           "dev": true,
+          "optional": true,
           "requires": {
             "is-descriptor": "^0.1.0"
           }
@@ -3910,6 +4012,7 @@
           "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
           "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=",
           "dev": true,
+          "optional": true,
           "requires": {
             "is-extendable": "^0.1.0"
           }
@@ -3921,6 +4024,7 @@
       "resolved": "https://registry.npmjs.org/snapdragon-node/-/snapdragon-node-2.1.1.tgz",
       "integrity": "sha512-O27l4xaMYt/RSQ5TR3vpWCAB5Kb/czIcqUFOM/C4fYcLnbZUc1PkjTAMjof2pBWaSTwOUd6qUHcFGVGj7aIwnw==",
       "dev": true,
+      "optional": true,
       "requires": {
         "define-property": "^1.0.0",
         "isobject": "^3.0.0",
@@ -3932,6 +4036,7 @@
           "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz",
           "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=",
           "dev": true,
+          "optional": true,
           "requires": {
             "is-descriptor": "^1.0.0"
           }
@@ -3941,6 +4046,7 @@
           "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz",
           "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==",
           "dev": true,
+          "optional": true,
           "requires": {
             "kind-of": "^6.0.0"
           }
@@ -3950,6 +4056,7 @@
           "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz",
           "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==",
           "dev": true,
+          "optional": true,
           "requires": {
             "kind-of": "^6.0.0"
           }
@@ -3959,6 +4066,7 @@
           "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz",
           "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==",
           "dev": true,
+          "optional": true,
           "requires": {
             "is-accessor-descriptor": "^1.0.0",
             "is-data-descriptor": "^1.0.0",
@@ -3972,6 +4080,7 @@
       "resolved": "https://registry.npmjs.org/snapdragon-util/-/snapdragon-util-3.0.1.tgz",
       "integrity": "sha512-mbKkMdQKsjX4BAL4bRYTj21edOf8cN7XHdYUJEe+Zn99hVEYcMvKPct1IqNe7+AZPirn8BCDOQBHQZknqmKlZQ==",
       "dev": true,
+      "optional": true,
       "requires": {
         "kind-of": "^3.2.0"
       },
@@ -3981,6 +4090,7 @@
           "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
           "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
           "dev": true,
+          "optional": true,
           "requires": {
             "is-buffer": "^1.1.5"
           }
@@ -3998,6 +4108,7 @@
       "resolved": "https://registry.npmjs.org/source-map-resolve/-/source-map-resolve-0.5.2.tgz",
       "integrity": "sha512-MjqsvNwyz1s0k81Goz/9vRBe9SZdB09Bdw+/zYyO+3CuPk6fouTaxscHkgtE8jKvf01kVfl8riHzERQ/kefaSA==",
       "dev": true,
+      "optional": true,
       "requires": {
         "atob": "^2.1.1",
         "decode-uri-component": "^0.2.0",
@@ -4010,13 +4121,15 @@
       "version": "0.4.0",
       "resolved": "https://registry.npmjs.org/source-map-url/-/source-map-url-0.4.0.tgz",
       "integrity": "sha1-PpNdfd1zYxuXZZlW1VEo6HtQhKM=",
-      "dev": true
+      "dev": true,
+      "optional": true
     },
     "split-string": {
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/split-string/-/split-string-3.1.0.tgz",
       "integrity": "sha512-NzNVhJDYpwceVVii8/Hu6DKfD2G+NrQHlS/V/qgv763EYudVwEcMQNxd2lh+0VrUByXN/oJkl5grOhYWvQUYiw==",
       "dev": true,
+      "optional": true,
       "requires": {
         "extend-shallow": "^3.0.0"
       }
@@ -4032,6 +4145,7 @@
       "resolved": "https://registry.npmjs.org/static-extend/-/static-extend-0.1.2.tgz",
       "integrity": "sha1-YICcOcv/VTNyJv1eC1IPNB8ftcY=",
       "dev": true,
+      "optional": true,
       "requires": {
         "define-property": "^0.2.5",
         "object-copy": "^0.1.0"
@@ -4042,6 +4156,7 @@
           "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
           "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=",
           "dev": true,
+          "optional": true,
           "requires": {
             "is-descriptor": "^0.1.0"
           }
@@ -4110,6 +4225,7 @@
       "resolved": "https://registry.npmjs.org/to-object-path/-/to-object-path-0.3.0.tgz",
       "integrity": "sha1-KXWIt7Dn4KwI4E5nL4XB9JmeF68=",
       "dev": true,
+      "optional": true,
       "requires": {
         "kind-of": "^3.0.2"
       },
@@ -4119,6 +4235,7 @@
           "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
           "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
           "dev": true,
+          "optional": true,
           "requires": {
             "is-buffer": "^1.1.5"
           }
@@ -4130,6 +4247,7 @@
       "resolved": "https://registry.npmjs.org/to-regex/-/to-regex-3.0.2.tgz",
       "integrity": "sha512-FWtleNAtZ/Ki2qtqej2CXTOayOH9bHDQF+Q48VpWyDXjbYxA4Yz8iDB31zXOBUlOHHKidDbqGVrTUvQMPmBGBw==",
       "dev": true,
+      "optional": true,
       "requires": {
         "define-property": "^2.0.2",
         "extend-shallow": "^3.0.2",
@@ -4142,6 +4260,7 @@
       "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-2.1.1.tgz",
       "integrity": "sha1-fIDBe53+vlmeJzZ+DU3VWQFB2zg=",
       "dev": true,
+      "optional": true,
       "requires": {
         "is-number": "^3.0.0",
         "repeat-string": "^1.6.1"
@@ -4186,6 +4305,7 @@
       "resolved": "https://registry.npmjs.org/union-value/-/union-value-1.0.1.tgz",
       "integrity": "sha512-tJfXmxMeWYnczCVs7XAEvIV7ieppALdyepWMkHkwciRpZraG/xwT+s2JN8+pr1+8jCRf80FFzvr+MpQeeoF4Xg==",
       "dev": true,
+      "optional": true,
       "requires": {
         "arr-union": "^3.1.0",
         "get-value": "^2.0.6",
@@ -4204,6 +4324,7 @@
       "resolved": "https://registry.npmjs.org/unset-value/-/unset-value-1.0.0.tgz",
       "integrity": "sha1-g3aHP30jNRef+x5vw6jtDfyKtVk=",
       "dev": true,
+      "optional": true,
       "requires": {
         "has-value": "^0.3.1",
         "isobject": "^3.0.0"
@@ -4214,6 +4335,7 @@
           "resolved": "https://registry.npmjs.org/has-value/-/has-value-0.3.1.tgz",
           "integrity": "sha1-ex9YutpiyoJ+wKIHgCVlSEWZXh8=",
           "dev": true,
+          "optional": true,
           "requires": {
             "get-value": "^2.0.3",
             "has-values": "^0.1.4",
@@ -4225,6 +4347,7 @@
               "resolved": "https://registry.npmjs.org/isobject/-/isobject-2.1.0.tgz",
               "integrity": "sha1-8GVWEJaj8dou9GJy+BXIQNh+DIk=",
               "dev": true,
+              "optional": true,
               "requires": {
                 "isarray": "1.0.0"
               }
@@ -4235,7 +4358,8 @@
           "version": "0.1.4",
           "resolved": "https://registry.npmjs.org/has-values/-/has-values-0.1.4.tgz",
           "integrity": "sha1-bWHeldkd/Km5oCCJrThL/49it3E=",
-          "dev": true
+          "dev": true,
+          "optional": true
         }
       }
     },
@@ -4250,13 +4374,15 @@
       "version": "0.1.0",
       "resolved": "https://registry.npmjs.org/urix/-/urix-0.1.0.tgz",
       "integrity": "sha1-2pN/emLiH+wf0Y1Js1wpNQZ6bHI=",
-      "dev": true
+      "dev": true,
+      "optional": true
     },
     "use": {
       "version": "3.1.1",
       "resolved": "https://registry.npmjs.org/use/-/use-3.1.1.tgz",
       "integrity": "sha512-cwESVXlO3url9YWlFW/TA9cshCEhtu7IKJ/p5soJ/gGpj7vbvFrAY/eIioQ6Dw23KjZhYgiIo8HOs1nQ2vr/oQ==",
-      "dev": true
+      "dev": true,
+      "optional": true
     },
     "util-deprecate": {
       "version": "1.0.2",
diff --git a/samples/client/petstore/javascript-flowtyped/package.json b/samples/client/petstore/javascript-flowtyped/package.json
index 39ff710060..7b108518c7 100644
--- a/samples/client/petstore/javascript-flowtyped/package.json
+++ b/samples/client/petstore/javascript-flowtyped/package.json
@@ -28,6 +28,7 @@
     "@babel/preset-flow": "^7.0.0",
     "babel-preset-react-app": "^7.0.0",
     "flow-copy-source": "^2.0.0",
-    "rimraf": "^2.6.2"
+    "rimraf": "^2.6.2",
+    "lodash": ">=4.17.13"
   }
 }
diff --git a/website/i18n/en.json b/website/i18n/en.json
index 096838689d..a42620c4a4 100644
--- a/website/i18n/en.json
+++ b/website/i18n/en.json
@@ -136,6 +136,15 @@
       "generators/flash": {
         "title": "generators/flash"
       },
+      "generators/fsharp-giraffe-server": {
+        "title": "generators/fsharp-giraffe-server"
+      },
+      "generators/fsharp-giraffe": {
+        "title": "generators/fsharp-giraffe"
+      },
+      "generators/go-experimental": {
+        "title": "generators/go-experimental"
+      },
       "generators/go-gin-server": {
         "title": "generators/go-gin-server"
       },
@@ -241,6 +250,9 @@
       "generators/mysql-schema": {
         "title": "generators/mysql-schema"
       },
+      "generators/nodejs-server-deprecated": {
+        "title": "generators/nodejs-server-deprecated"
+      },
       "generators/nodejs-server": {
         "title": "generators/nodejs-server"
       },
@@ -286,6 +298,9 @@
       "generators/python-blueplanet": {
         "title": "generators/python-blueplanet"
       },
+      "generators/python-experimental": {
+        "title": "generators/python-experimental"
+      },
       "generators/python-flask": {
         "title": "generators/python-flask"
       },
diff --git a/website/package.json b/website/package.json
index 0a32df0c13..f7df0effef 100644
--- a/website/package.json
+++ b/website/package.json
@@ -9,9 +9,11 @@
     "rename-version": "docusaurus-rename-version"
   },
   "devDependencies": {
-    "docusaurus": "^1.6.2"
+    "docusaurus": "^1.11.1"
   },
   "dependencies": {
-    "js-yaml": "^3.12.0"
+    "js-yaml": "^3.12.0",
+    "lodash.template": "^4.5.0",
+    "lodash.merge": "^4.6.2"
   }
 }
diff --git a/website/yarn.lock b/website/yarn.lock
index 696ec9f4a4..db52f3b285 100644
--- a/website/yarn.lock
+++ b/website/yarn.lock
@@ -681,6 +681,24 @@
     lodash "^4.17.10"
     to-fast-properties "^2.0.0"
 
+"@mrmlnc/readdir-enhanced@^2.2.1":
+  version "2.2.1"
+  resolved "https://registry.yarnpkg.com/@mrmlnc/readdir-enhanced/-/readdir-enhanced-2.2.1.tgz#524af240d1a360527b730475ecfa1344aa540dde"
+  integrity sha512-bPHp6Ji8b41szTOcaP63VlnbbO5Ny6dwAATtY6JTjh5N2OLrb5Qk/Th5cRkRQhkWCt+EJsYrNB0MiL+Gpn6e3g==
+  dependencies:
+    call-me-maybe "^1.0.1"
+    glob-to-regexp "^0.3.0"
+
+"@nodelib/fs.stat@^1.1.2":
+  version "1.1.3"
+  resolved "https://registry.yarnpkg.com/@nodelib/fs.stat/-/fs.stat-1.1.3.tgz#2b5a3ab3f918cca48a8c754c08168e3f03eba61b"
+  integrity sha512-shAmDyaQC4H92APFoIaVDHCx5bStIocgvbwQyxPRrbUY20V1EYTbSDchWbuwlMG3V17cprZhA6+78JfB+3DTPw==
+
+"@sindresorhus/is@^0.7.0":
+  version "0.7.0"
+  resolved "https://registry.yarnpkg.com/@sindresorhus/is/-/is-0.7.0.tgz#9a06f4f137ee84d7df0460c1fdb1135ffa6c50fd"
+  integrity sha512-ONhaKPIufzzrlNbqtWFFd+jlnemX6lJAgq9ZeiZtS7I1PIf/la7CW4m83rTXRnVnsMbW2k56pGYu7AUFJD9Pow==
+
 "@types/cheerio@^0.22.8":
   version "0.22.10"
   resolved "https://registry.yarnpkg.com/@types/cheerio/-/cheerio-0.22.10.tgz#780d552467824be4a241b29510a7873a7432c4a6"
@@ -691,13 +709,13 @@
   resolved "https://registry.yarnpkg.com/@types/q/-/q-1.5.1.tgz#48fd98c1561fe718b61733daed46ff115b496e18"
   integrity sha512-eqz8c/0kwNi/OEHQfvIuJVLTst3in0e7uTKeuY+WL/zfKn0xVujOTp42bS/vUUokhK5P2BppLd9JXMOMHcgbjA==
 
-accepts@~1.3.5:
-  version "1.3.5"
-  resolved "https://registry.yarnpkg.com/accepts/-/accepts-1.3.5.tgz#eb777df6011723a3b14e8a72c0805c8e86746bd2"
-  integrity sha1-63d99gEXI6OxTopywIBcjoZ0a9I=
+accepts@~1.3.7:
+  version "1.3.7"
+  resolved "https://registry.yarnpkg.com/accepts/-/accepts-1.3.7.tgz#531bc726517a3b2b41f850021c6cc15eaab507cd"
+  integrity sha512-Il80Qs2WjYlJIBNzNkK6KYqlVMTbZLXgHx2oT0pU/fjRHyEp+PEfEPY0R3WCwAGVOtauxh1hOxNgIf5bv7dQpA==
   dependencies:
-    mime-types "~2.1.18"
-    negotiator "0.6.1"
+    mime-types "~2.1.24"
+    negotiator "0.6.2"
 
 address@1.0.3, address@^1.0.1:
   version "1.0.3"
@@ -714,7 +732,7 @@ ajv@^6.5.5:
     json-schema-traverse "^0.4.1"
     uri-js "^4.2.2"
 
-alphanum-sort@^1.0.1, alphanum-sort@^1.0.2:
+alphanum-sort@^1.0.0:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/alphanum-sort/-/alphanum-sort-1.0.2.tgz#97a1119649b211ad33691d9f9f486a8ec9fbe0a3"
   integrity sha1-l6ERlkmyEa0zaR2fn0hqjsn74KM=
@@ -724,13 +742,6 @@ ansi-escapes@^3.0.0:
   resolved "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-3.1.0.tgz#f73207bb81207d75fd6c83f125af26eea378ca30"
   integrity sha512-UgAb8H9D41AQnu/PbWlCofQVcnV4Gs2bBJi9eZPxfU/hgglFh3SMDMENRIqdr7H6XFnXdoknctFByVsCOotTVw==
 
-ansi-gray@^0.1.1:
-  version "0.1.1"
-  resolved "https://registry.yarnpkg.com/ansi-gray/-/ansi-gray-0.1.1.tgz#2962cf54ec9792c48510a3deb524436861ef7251"
-  integrity sha1-KWLPVOyXksSFEKPetSRDaGHvclE=
-  dependencies:
-    ansi-wrap "0.1.0"
-
 ansi-red@^0.1.1:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/ansi-red/-/ansi-red-0.1.1.tgz#8c638f9d1080800a353c9c28c8a81ca4705d946c"
@@ -765,12 +776,25 @@ ansi-wrap@0.1.0:
   resolved "https://registry.yarnpkg.com/ansi-wrap/-/ansi-wrap-0.1.0.tgz#a82250ddb0015e9a27ca82e82ea603bbfa45efaf"
   integrity sha1-qCJQ3bABXponyoLoLqYDu/pF768=
 
-archive-type@^3.0.0, archive-type@^3.0.1:
-  version "3.2.0"
-  resolved "https://registry.yarnpkg.com/archive-type/-/archive-type-3.2.0.tgz#9cd9c006957ebe95fadad5bd6098942a813737f6"
-  integrity sha1-nNnABpV+vpX62tW9YJiUKoE3N/Y=
+anymatch@^3.0.1:
+  version "3.0.3"
+  resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-3.0.3.tgz#2fb624fe0e84bccab00afee3d0006ed310f22f09"
+  integrity sha512-c6IvoeBECQlMVuYUjSwimnhmztImpErfxJzWZhIQinIvQWoGOnB0dLIgifbPHQt5heS6mNlaZG16f06H3C8t1g==
   dependencies:
-    file-type "^3.1.0"
+    normalize-path "^3.0.0"
+    picomatch "^2.0.4"
+
+arch@^2.1.0:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/arch/-/arch-2.1.1.tgz#8f5c2731aa35a30929221bb0640eed65175ec84e"
+  integrity sha512-BLM56aPo9vLLFVa8+/+pJLnrZ7QGGTVHWsCwieAWT9o9K8UeGaQbzZbGoabWLOo2ksBCztoXdqBZBplqLDDCSg==
+
+archive-type@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/archive-type/-/archive-type-4.0.0.tgz#f92e72233056dfc6969472749c267bdb046b1d70"
+  integrity sha1-+S5yIzBW38aWlHJ0nCZ72wRrHXA=
+  dependencies:
+    file-type "^4.2.0"
 
 argparse@^1.0.7:
   version "1.0.10"
@@ -787,22 +811,20 @@ argparse@~0.1.15:
     underscore "~1.7.0"
     underscore.string "~2.4.0"
 
-arr-diff@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/arr-diff/-/arr-diff-2.0.0.tgz#8f3b827f955a8bd669697e4a4256ac3ceae356cf"
-  integrity sha1-jzuCf5Vai9ZpaX5KQlasPOrjVs8=
-  dependencies:
-    arr-flatten "^1.0.1"
+arr-diff@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/arr-diff/-/arr-diff-4.0.0.tgz#d6461074febfec71e7e15235761a329a5dc7c520"
+  integrity sha1-1kYQdP6/7HHn4VI1dhoyml3HxSA=
 
-arr-flatten@^1.0.1:
+arr-flatten@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/arr-flatten/-/arr-flatten-1.1.0.tgz#36048bbff4e7b47e136644316c99669ea5ae91f1"
   integrity sha512-L3hKV5R/p5o81R7O02IGnwpDmkp6E982XhtbuwSe3O4qOtMMMtodicASA1Cny2U+aCXcNpml+m4dPsvsJ3jatg==
 
-array-differ@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/array-differ/-/array-differ-1.0.0.tgz#eff52e3758249d33be402b8bb8e564bb2b5d4031"
-  integrity sha1-7/UuN1gknTO+QCuLuOVkuytdQDE=
+arr-union@^3.1.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/arr-union/-/arr-union-3.1.0.tgz#e39b09aea9def866a8f206e288af63919bae39c4"
+  integrity sha1-45sJrqne+Gao8gbiiK9jkZuuOcQ=
 
 array-filter@~0.0.0:
   version "0.0.1"
@@ -836,15 +858,25 @@ array-union@^1.0.1:
   dependencies:
     array-uniq "^1.0.1"
 
-array-uniq@^1.0.0, array-uniq@^1.0.1, array-uniq@^1.0.2:
+array-uniq@^1.0.1:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/array-uniq/-/array-uniq-1.0.3.tgz#af6ac877a25cc7f74e058894753858dfdb24fdb6"
   integrity sha1-r2rId6Jcx/dOBYiUdThY39sk/bY=
 
-array-unique@^0.2.1:
-  version "0.2.1"
-  resolved "https://registry.yarnpkg.com/array-unique/-/array-unique-0.2.1.tgz#a1d97ccafcbc2625cc70fadceb36a50c58b01a53"
-  integrity sha1-odl8yvy8JiXMcPrc6zalDFiwGlM=
+array-uniq@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/array-uniq/-/array-uniq-2.1.0.tgz#46603d5e28e79bfd02b046fcc1d77c6820bd8e98"
+  integrity sha512-bdHxtev7FN6+MXI1YFW0Q8mQ8dTJc2S8AMfju+ZR77pbg2yAdVyDlwkaUI7Har0LyOMRFPHrJ9lYdyjZZswdlQ==
+
+array-unique@^0.3.2:
+  version "0.3.2"
+  resolved "https://registry.yarnpkg.com/array-unique/-/array-unique-0.3.2.tgz#a894b75d4bc4f6cd679ef3244a9fd8f46ae2d428"
+  integrity sha1-qJS3XUvE9s1nnvMkSp/Y9Gri1Cg=
+
+arrify@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/arrify/-/arrify-1.0.1.tgz#898508da2226f380df904728456849c1501a4b0d"
+  integrity sha1-iYUI2iIm84DfkEcoRWhJwVAaSw0=
 
 asn1@~0.2.3:
   version "0.2.4"
@@ -858,10 +890,10 @@ assert-plus@1.0.0, assert-plus@^1.0.0:
   resolved "https://registry.yarnpkg.com/assert-plus/-/assert-plus-1.0.0.tgz#f12e0f3c5d77b0b1cdd9146942e4e96c1e4dd525"
   integrity sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=
 
-async-each-series@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/async-each-series/-/async-each-series-1.1.0.tgz#f42fd8155d38f21a5b8ea07c28e063ed1700b138"
-  integrity sha1-9C/YFV048hpbjqB8KOBj7RcAsTg=
+assign-symbols@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/assign-symbols/-/assign-symbols-1.0.0.tgz#59667f41fadd4f20ccbc2bb96b8d4f7f78ec0367"
+  integrity sha1-WWZ/QfrdTyDMvCu5a41Pf3jsA2c=
 
 async@^1.5.2:
   version "1.5.2"
@@ -873,34 +905,28 @@ asynckit@^0.4.0:
   resolved "https://registry.yarnpkg.com/asynckit/-/asynckit-0.4.0.tgz#c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79"
   integrity sha1-x57Zf380y48robyXkLzDZkdLS3k=
 
+atob@^2.1.1:
+  version "2.1.2"
+  resolved "https://registry.yarnpkg.com/atob/-/atob-2.1.2.tgz#6d9517eb9e030d2436666651e86bd9f6f13533c9"
+  integrity sha512-Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg==
+
 autolinker@~0.15.0:
   version "0.15.3"
   resolved "https://registry.yarnpkg.com/autolinker/-/autolinker-0.15.3.tgz#342417d8f2f3461b14cf09088d5edf8791dc9832"
   integrity sha1-NCQX2PLzRhsUzwkIjV7fh5HcmDI=
 
-autoprefixer@^6.3.1:
-  version "6.7.7"
-  resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-6.7.7.tgz#1dbd1c835658e35ce3f9984099db00585c782014"
-  integrity sha1-Hb0cg1ZY41zj+ZhAmdsAWFx4IBQ=
+autoprefixer@^9.6.0:
+  version "9.6.1"
+  resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-9.6.1.tgz#51967a02d2d2300bb01866c1611ec8348d355a47"
+  integrity sha512-aVo5WxR3VyvyJxcJC3h4FKfwCQvQWb1tSI5VHNibddCVWrcD1NvlxEweg3TSgiPztMnWfjpy2FURKA2kvDE+Tw==
   dependencies:
-    browserslist "^1.7.6"
-    caniuse-db "^1.0.30000634"
+    browserslist "^4.6.3"
+    caniuse-lite "^1.0.30000980"
+    chalk "^2.4.2"
     normalize-range "^0.1.2"
     num2fraction "^1.2.2"
-    postcss "^5.2.16"
-    postcss-value-parser "^3.2.3"
-
-autoprefixer@^9.1.5:
-  version "9.4.3"
-  resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-9.4.3.tgz#c97384a8fd80477b78049163a91bbc725d9c41d9"
-  integrity sha512-/XSnzDepRkAU//xLcXA/lUWxpsBuw0WiriAHOqnxkuCtzLhaz+fL4it4gp20BQ8n5SyLzK/FOc7A0+u/rti2FQ==
-  dependencies:
-    browserslist "^4.3.6"
-    caniuse-lite "^1.0.30000921"
-    normalize-range "^0.1.2"
-    num2fraction "^1.2.2"
-    postcss "^7.0.6"
-    postcss-value-parser "^3.3.1"
+    postcss "^7.0.17"
+    postcss-value-parser "^4.0.0"
 
 aws-sign2@~0.7.0:
   version "0.7.0"
@@ -926,16 +952,29 @@ babylon@^6.17.4:
   resolved "https://registry.yarnpkg.com/babylon/-/babylon-6.18.0.tgz#af2f3b88fa6f5c1e4c634d1a0f8eac4f55b395e3"
   integrity sha512-q/UEjfGJ2Cm3oKV71DJz9d25TPnq5rhBVL2Q4fA5wcC3jcrdn7+SssEybFIxwAvvP+YCsCYNKughoF33GxgycQ==
 
-balanced-match@^0.4.2:
-  version "0.4.2"
-  resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-0.4.2.tgz#cb3f3e3c732dc0f01ee70b403f302e61d7709838"
-  integrity sha1-yz8+PHMtwPAe5wtAPzAuYddwmDg=
-
 balanced-match@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.0.tgz#89b4d199ab2bee49de164ea02b89ce462d71b767"
   integrity sha1-ibTRmasr7kneFk6gK4nORi1xt2c=
 
+base64-js@^1.0.2:
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/base64-js/-/base64-js-1.3.0.tgz#cab1e6118f051095e58b5281aea8c1cd22bfc0e3"
+  integrity sha512-ccav/yGvoa80BQDljCxsmmQ3Xvx60/UpBIij5QN21W3wBi/hhIC9OoO+KLpu9IJTS9j4DRVJ3aDDF9cMSoa2lw==
+
+base@^0.11.1:
+  version "0.11.2"
+  resolved "https://registry.yarnpkg.com/base/-/base-0.11.2.tgz#7bde5ced145b6d551a90db87f83c558b4eb48a8f"
+  integrity sha512-5T6P4xPgpp0YDFvSWwEZ4NoE3aM4QBQXDzmVbraCkFj8zHM+mba8SyqB5DbZWyR7mYHo6Y7BdQo3MoA4m0TeQg==
+  dependencies:
+    cache-base "^1.0.1"
+    class-utils "^0.3.5"
+    component-emitter "^1.2.1"
+    define-property "^1.0.0"
+    isobject "^3.0.1"
+    mixin-deep "^1.2.0"
+    pascalcase "^0.1.1"
+
 bcrypt-pbkdf@^1.0.0:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz#a4301d389b6a43f9b67ff3ca11a3f6637e360e9e"
@@ -943,59 +982,58 @@ bcrypt-pbkdf@^1.0.0:
   dependencies:
     tweetnacl "^0.14.3"
 
-beeper@^1.0.0:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/beeper/-/beeper-1.1.1.tgz#e6d5ea8c5dad001304a70b22638447f69cb2f809"
-  integrity sha1-5tXqjF2tABMEpwsiY4RH9pyy+Ak=
-
-bin-build@^2.0.0:
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/bin-build/-/bin-build-2.2.0.tgz#11f8dd61f70ffcfa2bdcaa5b46f5e8fedd4221cc"
-  integrity sha1-EfjdYfcP/Por3KpbRvXo/t1CIcw=
+bin-build@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/bin-build/-/bin-build-3.0.0.tgz#c5780a25a8a9f966d8244217e6c1f5082a143861"
+  integrity sha512-jcUOof71/TNAI2uM5uoUaDq2ePcVBQ3R/qhxAz1rX7UfvduAL/RXD3jXzvn8cVcDJdGVkiR1shal3OH0ImpuhA==
   dependencies:
-    archive-type "^3.0.1"
-    decompress "^3.0.0"
-    download "^4.1.2"
-    exec-series "^1.0.0"
-    rimraf "^2.2.6"
-    tempfile "^1.0.0"
-    url-regex "^3.0.0"
+    decompress "^4.0.0"
+    download "^6.2.2"
+    execa "^0.7.0"
+    p-map-series "^1.0.0"
+    tempfile "^2.0.0"
 
-bin-check@^2.0.0:
+bin-check@^4.1.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/bin-check/-/bin-check-4.1.0.tgz#fc495970bdc88bb1d5a35fc17e65c4a149fc4a49"
+  integrity sha512-b6weQyEUKsDGFlACWSIOfveEnImkJyK/FGW6FAG42loyoquvjdtOIqO6yBFzHyqyVVhNgNkQxxx09SFLK28YnA==
+  dependencies:
+    execa "^0.7.0"
+    executable "^4.1.0"
+
+bin-version-check@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/bin-version-check/-/bin-version-check-4.0.0.tgz#7d819c62496991f80d893e6e02a3032361608f71"
+  integrity sha512-sR631OrhC+1f8Cvs8WyVWOA33Y8tgwjETNPyyD/myRBXLkfS/vl74FmH/lFcRl9KY3zwGh7jFhvyk9vV3/3ilQ==
+  dependencies:
+    bin-version "^3.0.0"
+    semver "^5.6.0"
+    semver-truncate "^1.1.2"
+
+bin-version@^3.0.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/bin-version/-/bin-version-3.1.0.tgz#5b09eb280752b1bd28f0c9db3f96f2f43b6c0839"
+  integrity sha512-Mkfm4iE1VFt4xd4vH+gx+0/71esbfus2LsnCGe8Pi4mndSPyT+NGES/Eg99jx8/lUGWfu3z2yuB/bt5UB+iVbQ==
+  dependencies:
+    execa "^1.0.0"
+    find-versions "^3.0.0"
+
+bin-wrapper@^4.0.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/bin-wrapper/-/bin-wrapper-4.1.0.tgz#99348f2cf85031e3ef7efce7e5300aeaae960605"
+  integrity sha512-hfRmo7hWIXPkbpi0ZltboCMVrU+0ClXR/JgbCKKjlDjQf6igXa7OwdqNcFWQZPZTgiY7ZpzE3+LjjkLiTN2T7Q==
+  dependencies:
+    bin-check "^4.1.0"
+    bin-version-check "^4.0.0"
+    download "^7.1.0"
+    import-lazy "^3.1.0"
+    os-filter-obj "^2.0.0"
+    pify "^4.0.1"
+
+binary-extensions@^2.0.0:
   version "2.0.0"
-  resolved "https://registry.yarnpkg.com/bin-check/-/bin-check-2.0.0.tgz#86f8e6f4253893df60dc316957f5af02acb05930"
-  integrity sha1-hvjm9CU4k99g3DFpV/WvAqywWTA=
-  dependencies:
-    executable "^1.0.0"
-
-bin-version-check@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/bin-version-check/-/bin-version-check-2.1.0.tgz#e4e5df290b9069f7d111324031efc13fdd11a5b0"
-  integrity sha1-5OXfKQuQaffRETJAMe/BP90RpbA=
-  dependencies:
-    bin-version "^1.0.0"
-    minimist "^1.1.0"
-    semver "^4.0.3"
-    semver-truncate "^1.0.0"
-
-bin-version@^1.0.0:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/bin-version/-/bin-version-1.0.4.tgz#9eb498ee6fd76f7ab9a7c160436f89579435d78e"
-  integrity sha1-nrSY7m/Xb3q5p8FgQ2+JV5Q1144=
-  dependencies:
-    find-versions "^1.0.0"
-
-bin-wrapper@^3.0.0:
-  version "3.0.2"
-  resolved "https://registry.yarnpkg.com/bin-wrapper/-/bin-wrapper-3.0.2.tgz#67d3306262e4b1a5f2f88ee23464f6a655677aeb"
-  integrity sha1-Z9MwYmLksaXy+I7iNGT2plVneus=
-  dependencies:
-    bin-check "^2.0.0"
-    bin-version-check "^2.1.0"
-    download "^4.0.0"
-    each-async "^1.1.1"
-    lazy-req "^1.0.0"
-    os-filter-obj "^1.0.0"
+  resolved "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-2.0.0.tgz#23c0df14f6a88077f5f986c0d167ec03c3d5537c"
+  integrity sha512-Phlt0plgpIIBOGTT/ehfFnbNlfsDEiqmzE2KRXoX1bLIlir4X/MR+zSyBEkL05ffWgnRSf/DXv+WrUAVr93/ow==
 
 bl@^1.0.0:
   version "1.2.2"
@@ -1005,21 +1043,21 @@ bl@^1.0.0:
     readable-stream "^2.3.5"
     safe-buffer "^5.1.1"
 
-body-parser@1.18.3:
-  version "1.18.3"
-  resolved "https://registry.yarnpkg.com/body-parser/-/body-parser-1.18.3.tgz#5b292198ffdd553b3a0f20ded0592b956955c8b4"
-  integrity sha1-WykhmP/dVTs6DyDe0FkrlWlVyLQ=
+body-parser@1.19.0:
+  version "1.19.0"
+  resolved "https://registry.yarnpkg.com/body-parser/-/body-parser-1.19.0.tgz#96b2709e57c9c4e09a6fd66a8fd979844f69f08a"
+  integrity sha512-dhEPs72UPbDnAQJ9ZKMNTP6ptJaionhP5cBb541nXPlW60Jepo9RV/a4fX4XWW9CuFNK22krhrj1+rgzifNCsw==
   dependencies:
-    bytes "3.0.0"
+    bytes "3.1.0"
     content-type "~1.0.4"
     debug "2.6.9"
     depd "~1.1.2"
-    http-errors "~1.6.3"
-    iconv-lite "0.4.23"
+    http-errors "1.7.2"
+    iconv-lite "0.4.24"
     on-finished "~2.3.0"
-    qs "6.5.2"
-    raw-body "2.3.3"
-    type-is "~1.6.16"
+    qs "6.7.0"
+    raw-body "2.4.0"
+    type-is "~1.6.17"
 
 body@^5.1.0:
   version "5.1.0"
@@ -1044,24 +1082,39 @@ brace-expansion@^1.0.0, brace-expansion@^1.1.7:
     balanced-match "^1.0.0"
     concat-map "0.0.1"
 
-braces@^1.8.2:
-  version "1.8.5"
-  resolved "https://registry.yarnpkg.com/braces/-/braces-1.8.5.tgz#ba77962e12dff969d6b76711e914b737857bf6a7"
-  integrity sha1-uneWLhLf+WnWt2cR6RS3N4V79qc=
+braces@^2.3.1:
+  version "2.3.2"
+  resolved "https://registry.yarnpkg.com/braces/-/braces-2.3.2.tgz#5979fd3f14cd531565e5fa2df1abfff1dfaee729"
+  integrity sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==
   dependencies:
-    expand-range "^1.8.1"
-    preserve "^0.2.0"
+    arr-flatten "^1.1.0"
+    array-unique "^0.3.2"
+    extend-shallow "^2.0.1"
+    fill-range "^4.0.0"
+    isobject "^3.0.1"
     repeat-element "^1.1.2"
+    snapdragon "^0.8.1"
+    snapdragon-node "^2.0.1"
+    split-string "^3.0.2"
+    to-regex "^3.0.1"
 
-browserslist@^1.3.6, browserslist@^1.5.2, browserslist@^1.7.6:
-  version "1.7.7"
-  resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-1.7.7.tgz#0bd76704258be829b2398bb50e4b62d1a166b0b9"
-  integrity sha1-C9dnBCWL6CmyOYu1Dkti0aFmsLk=
+braces@^3.0.2:
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/braces/-/braces-3.0.2.tgz#3454e1a462ee8d599e236df336cd9ea4f8afe107"
+  integrity sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==
   dependencies:
-    caniuse-db "^1.0.30000639"
-    electron-to-chromium "^1.2.7"
+    fill-range "^7.0.1"
 
-browserslist@^4.3.4, browserslist@^4.3.6:
+browserslist@^4.0.0, browserslist@^4.6.3:
+  version "4.6.4"
+  resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.6.4.tgz#fd0638b3f8867fec2c604ed0ed9300379f8ec7c2"
+  integrity sha512-ErJT8qGfRt/VWHSr1HeqZzz50DvxHtr1fVL1m5wf20aGrG8e1ce8fpZ2EjZEfs09DDZYSvtRaDlMpWslBf8Low==
+  dependencies:
+    caniuse-lite "^1.0.30000981"
+    electron-to-chromium "^1.3.188"
+    node-releases "^1.1.25"
+
+browserslist@^4.3.4:
   version "4.3.6"
   resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.3.6.tgz#0f9d9081afc66b36f477c6bdf3813f784f42396a"
   integrity sha512-kMGKs4BTzRWviZ8yru18xBpx+CyHG9eqgRbj9XbE3IMgtczf4aiA0Y1YCpVdvUieKGZ03kolSPXqTcscBCb9qw==
@@ -1093,25 +1146,18 @@ buffer-fill@^1.0.0:
   resolved "https://registry.yarnpkg.com/buffer-fill/-/buffer-fill-1.0.0.tgz#f8f78b76789888ef39f205cd637f68e702122b2c"
   integrity sha1-+PeLdniYiO858gXNY39o5wISKyw=
 
-buffer-from@^0.1.1:
-  version "0.1.2"
-  resolved "https://registry.yarnpkg.com/buffer-from/-/buffer-from-0.1.2.tgz#15f4b9bcef012044df31142c14333caf6e0260d0"
-  integrity sha512-RiWIenusJsmI2KcvqQABB83tLxCByE3upSP8QU3rJDMVFGPWLvPQJt/O1Su9moRWeH7d+Q2HYb68f6+v+tw2vg==
-
 buffer-from@^1.0.0:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/buffer-from/-/buffer-from-1.1.1.tgz#32713bc028f75c02fdb710d7c7bcec1f2c6070ef"
   integrity sha512-MQcXEUbCKtEo7bhqEs6560Hyd4XaovZlO/k9V3hjVUF/zwW7KBVdSK4gIt/bzwS9MbR5qob+F5jusZsb0YQK2A==
 
-buffer-to-vinyl@^1.0.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/buffer-to-vinyl/-/buffer-to-vinyl-1.1.0.tgz#00f15faee3ab7a1dda2cde6d9121bffdd07b2262"
-  integrity sha1-APFfruOreh3aLN5tkSG//dB7ImI=
+buffer@^5.2.1:
+  version "5.2.1"
+  resolved "https://registry.yarnpkg.com/buffer/-/buffer-5.2.1.tgz#dd57fa0f109ac59c602479044dca7b8b3d0b71d6"
+  integrity sha512-c+Ko0loDaFfuPWiL02ls9Xd3GO3cPVmUobQ6t3rXNUk304u6hGq+8N/kFi+QEIKhzK3uwolVhLzszmfLmMLnqg==
   dependencies:
-    file-type "^3.1.0"
-    readable-stream "^2.0.2"
-    uuid "^2.0.1"
-    vinyl "^1.0.0"
+    base64-js "^1.0.2"
+    ieee754 "^1.1.4"
 
 builtin-modules@^1.0.0:
   version "1.1.1"
@@ -1123,10 +1169,62 @@ bytes@1:
   resolved "https://registry.yarnpkg.com/bytes/-/bytes-1.0.0.tgz#3569ede8ba34315fab99c3e92cb04c7220de1fa8"
   integrity sha1-NWnt6Lo0MV+rmcPpLLBMciDeH6g=
 
-bytes@3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/bytes/-/bytes-3.0.0.tgz#d32815404d689699f85a4ea4fa8755dd13a96048"
-  integrity sha1-0ygVQE1olpn4Wk6k+odV3ROpYEg=
+bytes@3.1.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/bytes/-/bytes-3.1.0.tgz#f6cf7933a360e0588fa9fde85651cdc7f805d1f6"
+  integrity sha512-zauLjrfCG+xvoyaqLoV8bLVXXNGC4JqlxFCutSDWA6fJrTo2ZuvLYTqZ7aHBLZSMOopbzwv8f+wZcVzfVTI2Dg==
+
+cache-base@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/cache-base/-/cache-base-1.0.1.tgz#0a7f46416831c8b662ee36fe4e7c59d76f666ab2"
+  integrity sha512-AKcdTnFSWATd5/GCPRxr2ChwIJ85CeyrEyjRHlKxQ56d4XJMGym0uAiKn0xbLOGOl3+yRpOTi484dVCEc5AUzQ==
+  dependencies:
+    collection-visit "^1.0.0"
+    component-emitter "^1.2.1"
+    get-value "^2.0.6"
+    has-value "^1.0.0"
+    isobject "^3.0.1"
+    set-value "^2.0.0"
+    to-object-path "^0.3.0"
+    union-value "^1.0.0"
+    unset-value "^1.0.0"
+
+cacheable-request@^2.1.1:
+  version "2.1.4"
+  resolved "https://registry.yarnpkg.com/cacheable-request/-/cacheable-request-2.1.4.tgz#0d808801b6342ad33c91df9d0b44dc09b91e5c3d"
+  integrity sha1-DYCIAbY0KtM8kd+dC0TcCbkeXD0=
+  dependencies:
+    clone-response "1.0.2"
+    get-stream "3.0.0"
+    http-cache-semantics "3.8.1"
+    keyv "3.0.0"
+    lowercase-keys "1.0.0"
+    normalize-url "2.0.1"
+    responselike "1.0.2"
+
+call-me-maybe@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/call-me-maybe/-/call-me-maybe-1.0.1.tgz#26d208ea89e37b5cbde60250a15f031c16a4d66b"
+  integrity sha1-JtII6onje1y95gJQoV8DHBak1ms=
+
+caller-callsite@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/caller-callsite/-/caller-callsite-2.0.0.tgz#847e0fce0a223750a9a027c54b33731ad3154134"
+  integrity sha1-hH4PzgoiN1CpoCfFSzNzGtMVQTQ=
+  dependencies:
+    callsites "^2.0.0"
+
+caller-path@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/caller-path/-/caller-path-2.0.0.tgz#468f83044e369ab2010fac5f06ceee15bb2cb1f4"
+  integrity sha1-Ro+DBE42mrIBD6xfBs7uFbsssfQ=
+  dependencies:
+    caller-callsite "^2.0.0"
+
+callsites@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/callsites/-/callsites-2.0.0.tgz#06eb84f00eea413da86affefacbffb36093b3c50"
+  integrity sha1-BuuE8A7qQT2oav/vrL/7Ngk7PFA=
 
 camelcase-keys@^2.0.0:
   version "2.1.0"
@@ -1141,45 +1239,40 @@ camelcase@^2.0.0:
   resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-2.1.1.tgz#7c1d16d679a1bbe59ca02cacecfb011e201f5a1f"
   integrity sha1-fB0W1nmhu+WcoCys7PsBHiAfWh8=
 
-caniuse-api@^1.5.2:
-  version "1.6.1"
-  resolved "https://registry.yarnpkg.com/caniuse-api/-/caniuse-api-1.6.1.tgz#b534e7c734c4f81ec5fbe8aca2ad24354b962c6c"
-  integrity sha1-tTTnxzTE+B7F++isoq0kNUuWLGw=
+caniuse-api@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/caniuse-api/-/caniuse-api-3.0.0.tgz#5e4d90e2274961d46291997df599e3ed008ee4c0"
+  integrity sha512-bsTwuIg/BZZK/vreVTYYbSWoe2F+71P7K5QGEX+pT250DZbfU1MQ5prOKpPR+LL6uWKK3KMwMCAS74QB3Um1uw==
   dependencies:
-    browserslist "^1.3.6"
-    caniuse-db "^1.0.30000529"
+    browserslist "^4.0.0"
+    caniuse-lite "^1.0.0"
     lodash.memoize "^4.1.2"
     lodash.uniq "^4.5.0"
 
-caniuse-db@^1.0.30000529, caniuse-db@^1.0.30000634, caniuse-db@^1.0.30000639:
-  version "1.0.30000923"
-  resolved "https://registry.yarnpkg.com/caniuse-db/-/caniuse-db-1.0.30000923.tgz#0724b5fbd7f9fe424060b788b11e6b8d77102deb"
-  integrity sha512-PlFnZSgXcf/Z1kuNhTRq9vV4FnzizSDHpcgs5b/EY9sN60F3aBpkJwvEsHNeACHZi56/L8Cm3VsONdY1bOus/g==
+caniuse-lite@^1.0.0, caniuse-lite@^1.0.30000980, caniuse-lite@^1.0.30000981:
+  version "1.0.30000983"
+  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000983.tgz#ab3c70061ca2a3467182a10ac75109b199b647f8"
+  integrity sha512-/llD1bZ6qwNkt41AsvjsmwNOoA4ZB+8iqmf5LVyeSXuBODT/hAMFNVOh84NdUzoiYiSKqo5vQ3ZzeYHSi/olDQ==
 
 caniuse-lite@^1.0.30000921:
   version "1.0.30000923"
   resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000923.tgz#148f9bda508024b5ce957b463ae2e8302b451bb2"
   integrity sha512-j5ur7eeluOFjjPUkydtXP4KFAsmH3XaQNch5tvWSO+dLHYt5PE+VgJZLWtbVOodfWij6m6zas28T4gB/cLYq1w==
 
-capture-stack-trace@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/capture-stack-trace/-/capture-stack-trace-1.0.1.tgz#a6c0bbe1f38f3aa0b92238ecb6ff42c344d4135d"
-  integrity sha512-mYQLZnx5Qt1JgB1WEiMCf2647plpGeQ2NMR/5L0HNZzGQo4fuSPnK+wjfPnKZV0aiJDgzmWqqkV/g7JD+DW0qw==
-
 caseless@~0.12.0:
   version "0.12.0"
   resolved "https://registry.yarnpkg.com/caseless/-/caseless-0.12.0.tgz#1b681c21ff84033c826543090689420d187151dc"
   integrity sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw=
 
-caw@^1.0.1:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/caw/-/caw-1.2.0.tgz#ffb226fe7efc547288dc62ee3e97073c212d1034"
-  integrity sha1-/7Im/n78VHKI3GLuPpcHPCEtEDQ=
+caw@^2.0.0, caw@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/caw/-/caw-2.0.1.tgz#6c3ca071fc194720883c2dc5da9b074bfc7e9e95"
+  integrity sha512-Cg8/ZSBEa8ZVY9HspcGUYaK63d/bN7rqS3CYCzEGUxuYv6UlmcjzDUz2fCFFHyTvUW5Pk0I+3hkA3iXlIj6guA==
   dependencies:
-    get-proxy "^1.0.1"
-    is-obj "^1.0.0"
-    object-assign "^3.0.0"
-    tunnel-agent "^0.4.0"
+    get-proxy "^2.0.0"
+    isurl "^1.0.0-alpha5"
+    tunnel-agent "^0.6.0"
+    url-to-options "^1.0.1"
 
 chalk@1.1.3, chalk@^1.0.0, chalk@^1.1.3:
   version "1.1.3"
@@ -1192,7 +1285,7 @@ chalk@1.1.3, chalk@^1.0.0, chalk@^1.1.3:
     strip-ansi "^3.0.0"
     supports-color "^2.0.0"
 
-chalk@^2.0.0, chalk@^2.1.0, chalk@^2.4.1:
+chalk@^2.0.0, chalk@^2.4.1:
   version "2.4.1"
   resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.4.1.tgz#18c49ab16a037b6eb0152cc83e3471338215b66e"
   integrity sha512-ObN6h1v2fTJSmUXoS3nMQ92LbDK9be4TV+6G+omQlGJFdcUX5heKi1LZ1YnRMIgwTLEj3E24bT6tYni50rlCfQ==
@@ -1201,6 +1294,15 @@ chalk@^2.0.0, chalk@^2.1.0, chalk@^2.4.1:
     escape-string-regexp "^1.0.5"
     supports-color "^5.3.0"
 
+chalk@^2.4.2:
+  version "2.4.2"
+  resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.4.2.tgz#cd42541677a54333cf541a49108c1432b44c9424"
+  integrity sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==
+  dependencies:
+    ansi-styles "^3.2.1"
+    escape-string-regexp "^1.0.5"
+    supports-color "^5.3.0"
+
 chardet@^0.4.0:
   version "0.4.2"
   resolved "https://registry.yarnpkg.com/chardet/-/chardet-0.4.2.tgz#b5473b33dc97c424e5d98dc87d55d4d8a29c8bf2"
@@ -1228,12 +1330,30 @@ cheerio@0.22.0:
     lodash.reject "^4.4.0"
     lodash.some "^4.4.0"
 
-clap@^1.0.9:
-  version "1.2.3"
-  resolved "https://registry.yarnpkg.com/clap/-/clap-1.2.3.tgz#4f36745b32008492557f46412d66d50cb99bce51"
-  integrity sha512-4CoL/A3hf90V3VIEjeuhSvlGFEHKzOz+Wfc2IVZc+FaUgU0ZQafJTP49fvnULipOPcAfqhyI2duwQyns6xqjYA==
+chokidar@^3.0.1:
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-3.0.2.tgz#0d1cd6d04eb2df0327446188cd13736a3367d681"
+  integrity sha512-c4PR2egjNjI1um6bamCQ6bUNPDiyofNQruHvKgHQ4gDUP/ITSVSzNsiI5OWtHOsX323i5ha/kk4YmOZ1Ktg7KA==
   dependencies:
-    chalk "^1.1.3"
+    anymatch "^3.0.1"
+    braces "^3.0.2"
+    glob-parent "^5.0.0"
+    is-binary-path "^2.1.0"
+    is-glob "^4.0.1"
+    normalize-path "^3.0.0"
+    readdirp "^3.1.1"
+  optionalDependencies:
+    fsevents "^2.0.6"
+
+class-utils@^0.3.5:
+  version "0.3.6"
+  resolved "https://registry.yarnpkg.com/class-utils/-/class-utils-0.3.6.tgz#f93369ae8b9a7ce02fd41faad0ca83033190c463"
+  integrity sha512-qOhPa/Fj7s6TY8H8esGu5QNpMMQxz79h+urzrNYN6mn+9BnxlDGf5QZ+XeCDsxSjPqsSR56XOZOJmpeurnLMeg==
+  dependencies:
+    arr-union "^3.1.0"
+    define-property "^0.2.5"
+    isobject "^3.0.0"
+    static-extend "^0.1.1"
 
 classnames@^2.2.6:
   version "2.2.6"
@@ -1261,34 +1381,14 @@ clipboard@^2.0.0:
     select "^1.1.2"
     tiny-emitter "^2.0.0"
 
-clone-stats@^0.0.1:
-  version "0.0.1"
-  resolved "https://registry.yarnpkg.com/clone-stats/-/clone-stats-0.0.1.tgz#b88f94a82cf38b8791d58046ea4029ad88ca99d1"
-  integrity sha1-uI+UqCzzi4eR1YBG6kAprYjKmdE=
-
-clone@^0.2.0:
-  version "0.2.0"
-  resolved "https://registry.yarnpkg.com/clone/-/clone-0.2.0.tgz#c6126a90ad4f72dbf5acdb243cc37724fe93fc1f"
-  integrity sha1-xhJqkK1Pctv1rNskPMN3JP6T/B8=
-
-clone@^1.0.0, clone@^1.0.2:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/clone/-/clone-1.0.4.tgz#da309cc263df15994c688ca902179ca3c7cd7c7e"
-  integrity sha1-2jCcwmPfFZlMaIypAheco8fNfH4=
-
-co@3.1.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/co/-/co-3.1.0.tgz#4ea54ea5a08938153185e15210c68d9092bc1b78"
-  integrity sha1-TqVOpaCJOBUxheFSEMaNkJK8G3g=
-
-coa@~1.0.1:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/coa/-/coa-1.0.4.tgz#a9ef153660d6a86a8bdec0289a5c684d217432fd"
-  integrity sha1-qe8VNmDWqGqL3sAomlxoTSF0Mv0=
+clone-response@1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/clone-response/-/clone-response-1.0.2.tgz#d1dc973920314df67fbeb94223b4ee350239e96b"
+  integrity sha1-0dyXOSAxTfZ/vrlCI7TuNQI56Ws=
   dependencies:
-    q "^1.1.2"
+    mimic-response "^1.0.0"
 
-coa@~2.0.1:
+coa@^2.0.2, coa@~2.0.1:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/coa/-/coa-2.0.2.tgz#43f6c21151b4ef2bf57187db0d73de229e3e7ec3"
   integrity sha512-q5/jG+YQnSy4nRTV4F7lPepBJZ8qBNJJDBuJdoejDyLXgmL7IEo+Le2JDZudFTFt7mrCqIRaSjws4ygRCTCAXA==
@@ -1302,7 +1402,15 @@ coffee-script@^1.12.4:
   resolved "https://registry.yarnpkg.com/coffee-script/-/coffee-script-1.12.7.tgz#c05dae0cb79591d05b3070a8433a98c9a89ccc53"
   integrity sha512-fLeEhqwymYat/MpTPUjSKHVYYl0ec2mOyALEMLmzr5i1isuG+6jfI2j2d5oBO3VIzgUXgBVIcOT9uH1TFxBckw==
 
-color-convert@^1.3.0, color-convert@^1.9.0, color-convert@^1.9.1:
+collection-visit@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/collection-visit/-/collection-visit-1.0.0.tgz#4bc0373c164bc3291b4d368c829cf1a80a59dca0"
+  integrity sha1-S8A3PBZLwykbTTaMgpzxqApZ3KA=
+  dependencies:
+    map-visit "^1.0.0"
+    object-visit "^1.0.0"
+
+color-convert@^1.9.0, color-convert@^1.9.1:
   version "1.9.3"
   resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-1.9.3.tgz#bb71850690e1f136567de629d2d5471deda4c1e8"
   integrity sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==
@@ -1319,13 +1427,6 @@ color-name@^1.0.0:
   resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.4.tgz#c2a09a87acbde69543de6f63fa3995c826c536a2"
   integrity sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==
 
-color-string@^0.3.0:
-  version "0.3.0"
-  resolved "https://registry.yarnpkg.com/color-string/-/color-string-0.3.0.tgz#27d46fb67025c5c2fa25993bfbf579e47841b991"
-  integrity sha1-J9RvtnAlxcL6JZk7+/V55HhBuZE=
-  dependencies:
-    color-name "^1.0.0"
-
 color-string@^1.5.2:
   version "1.5.3"
   resolved "https://registry.yarnpkg.com/color-string/-/color-string-1.5.3.tgz#c9bbc5f01b58b5492f3d6857459cb6590ce204cc"
@@ -1334,20 +1435,6 @@ color-string@^1.5.2:
     color-name "^1.0.0"
     simple-swizzle "^0.2.2"
 
-color-support@^1.1.3:
-  version "1.1.3"
-  resolved "https://registry.yarnpkg.com/color-support/-/color-support-1.1.3.tgz#93834379a1cc9a0c61f82f52f0d04322251bd5a2"
-  integrity sha512-qiBjkpbMLO/HL68y+lh4q0/O1MZFj2RX6X/KmMa3+gJD3z+WwI1ZzDHysvqHGS3mP6mznPckpXmw1nI9cJjyRg==
-
-color@^0.11.0:
-  version "0.11.4"
-  resolved "https://registry.yarnpkg.com/color/-/color-0.11.4.tgz#6d7b5c74fb65e841cd48792ad1ed5e07b904d764"
-  integrity sha1-bXtcdPtl6EHNSHkq0e1eB7kE12Q=
-  dependencies:
-    clone "^1.0.2"
-    color-convert "^1.3.0"
-    color-string "^0.3.0"
-
 color@^2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/color/-/color-2.0.1.tgz#e4ed78a3c4603d0891eba5430b04b86314f4c839"
@@ -1356,14 +1443,13 @@ color@^2.0.1:
     color-convert "^1.9.1"
     color-string "^1.5.2"
 
-colormin@^1.0.5:
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/colormin/-/colormin-1.1.2.tgz#ea2f7420a72b96881a38aae59ec124a6f7298133"
-  integrity sha1-6i90IKcrlogaOKrlnsEkpvcpgTM=
+color@^3.0.0:
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/color/-/color-3.1.2.tgz#68148e7f85d41ad7649c5fa8c8106f098d229e10"
+  integrity sha512-vXTJhHebByxZn3lDvDJYw4lR5+uB3vuoHsuYA5AKuxRVn5wzzIfQKGLBmgdVRHKTJYeK5rvJcHnrd0Li49CFpg==
   dependencies:
-    color "^0.11.0"
-    css-color-names "0.0.4"
-    has "^1.0.1"
+    color-convert "^1.9.1"
+    color-string "^1.5.2"
 
 colors@~1.1.2:
   version "1.1.2"
@@ -1377,11 +1463,16 @@ combined-stream@^1.0.6, combined-stream@~1.0.6:
   dependencies:
     delayed-stream "~1.0.0"
 
-commander@^2.15.1, commander@^2.18.0:
+commander@^2.15.1:
   version "2.19.0"
   resolved "https://registry.yarnpkg.com/commander/-/commander-2.19.0.tgz#f6198aa84e5b83c46054b94ddedbfed5ee9ff12a"
   integrity sha512-6tvAOO+D6OENvRAh524Dh9jcfKTYDQAqvqezbCW82xj5X0pSrcpxtvRKHLG0yBY6SD7PSDrJaj+0AiOcKVd1Xg==
 
+commander@^2.20.0:
+  version "2.20.0"
+  resolved "https://registry.yarnpkg.com/commander/-/commander-2.20.0.tgz#d58bb2b5c1ee8f87b0d340027e9e94e222c5a422"
+  integrity sha512-7j2y+40w61zy6YC2iRNpUe/NwhNyoXrYpHMrSunaMG64nRnaf96zO/KMQR4OyN/UnE5KLyEBnKHd4aG3rskjpQ==
+
 commander@~2.8.1:
   version "2.8.1"
   resolved "https://registry.yarnpkg.com/commander/-/commander-2.8.1.tgz#06be367febfda0c330aa1e2a072d3dc9762425d4"
@@ -1394,12 +1485,17 @@ commondir@^1.0.1:
   resolved "https://registry.yarnpkg.com/commondir/-/commondir-1.0.1.tgz#ddd800da0c66127393cca5950ea968a3aaf1253b"
   integrity sha1-3dgA2gxmEnOTzKWVDqloo6rxJTs=
 
+component-emitter@^1.2.1:
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/component-emitter/-/component-emitter-1.3.0.tgz#16e4070fba8ae29b679f2215853ee181ab2eabc0"
+  integrity sha512-Rd3se6QB+sO1TwqZjscQrurpEPIfO0/yYnSin6Q/rD3mOutHvUrCAhJub3r90uNb+SESBuE0QYoB90YdfatsRg==
+
 concat-map@0.0.1:
   version "0.0.1"
   resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b"
   integrity sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=
 
-concat-stream@^1.4.6, concat-stream@^1.4.7, concat-stream@^1.5.2:
+concat-stream@^1.5.2:
   version "1.6.2"
   resolved "https://registry.yarnpkg.com/concat-stream/-/concat-stream-1.6.2.tgz#904bdf194cd3122fc675c77fc4ac3d4ff0fd1a34"
   integrity sha512-27HBghJxjiZtIk3Ycvn/4kbJk/1uZuJFfuPEns6LaEvpvG1f0hTea8lilrouyo9mVc2GWdcEZ8OLoGmSADlrCw==
@@ -1409,15 +1505,25 @@ concat-stream@^1.4.6, concat-stream@^1.4.7, concat-stream@^1.5.2:
     readable-stream "^2.2.2"
     typedarray "^0.0.6"
 
+config-chain@^1.1.11:
+  version "1.1.12"
+  resolved "https://registry.yarnpkg.com/config-chain/-/config-chain-1.1.12.tgz#0fde8d091200eb5e808caf25fe618c02f48e4efa"
+  integrity sha512-a1eOIcu8+7lUInge4Rpf/n4Krkf3Dd9lqhljRzII1/Zno/kRtUWnznPO3jOKBmTEktkt3fkxisUcivoj0ebzoA==
+  dependencies:
+    ini "^1.3.4"
+    proto-list "~1.2.1"
+
 console-stream@^0.1.1:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/console-stream/-/console-stream-0.1.1.tgz#a095fe07b20465955f2fafd28b5d72bccd949d44"
   integrity sha1-oJX+B7IEZZVfL6/Si11yvM2UnUQ=
 
-content-disposition@0.5.2:
-  version "0.5.2"
-  resolved "https://registry.yarnpkg.com/content-disposition/-/content-disposition-0.5.2.tgz#0cf68bb9ddf5f2be7961c3a85178cb85dba78cb4"
-  integrity sha1-DPaLud318r55YcOoUXjLhdunjLQ=
+content-disposition@0.5.3, content-disposition@^0.5.2:
+  version "0.5.3"
+  resolved "https://registry.yarnpkg.com/content-disposition/-/content-disposition-0.5.3.tgz#e130caf7e7279087c5616c2007d0485698984fbd"
+  integrity sha512-ExO0774ikEObIAEV9kDo50o+79VCUdEB6n6lzKgGwupcVeRlhrj3qGAfwq8G6uBJjkqLrhT0qEYFcWng8z1z0g==
+  dependencies:
+    safe-buffer "5.1.2"
 
 content-type@~1.0.4:
   version "1.0.4"
@@ -1429,7 +1535,7 @@ continuable-cache@^0.3.1:
   resolved "https://registry.yarnpkg.com/continuable-cache/-/continuable-cache-0.3.1.tgz#bd727a7faed77e71ff3985ac93351a912733ad0f"
   integrity sha1-vXJ6f67XfnH/OYWskzUakSczrQ8=
 
-convert-source-map@^1.1.0, convert-source-map@^1.1.1:
+convert-source-map@^1.1.0:
   version "1.6.0"
   resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.6.0.tgz#51b537a8c43e0f04dec1993bffcdd504e758ac20"
   integrity sha512-eFu7XigvxdZ1ETfbgPBohgyQ/Z++C0eEhTor0qRwBw9unw+L0/6V8wkSuGgzdThkiS5lSpdptOQPD8Ak40a+7A==
@@ -1441,10 +1547,15 @@ cookie-signature@1.0.6:
   resolved "https://registry.yarnpkg.com/cookie-signature/-/cookie-signature-1.0.6.tgz#e303a882b342cc3ee8ca513a79999734dab3ae2c"
   integrity sha1-4wOogrNCzD7oylE6eZmXNNqzriw=
 
-cookie@0.3.1:
-  version "0.3.1"
-  resolved "https://registry.yarnpkg.com/cookie/-/cookie-0.3.1.tgz#e7e0a1f9ef43b4c8ba925c5c5a96e806d16873bb"
-  integrity sha1-5+Ch+e9DtMi6klxcWpboBtFoc7s=
+cookie@0.4.0:
+  version "0.4.0"
+  resolved "https://registry.yarnpkg.com/cookie/-/cookie-0.4.0.tgz#beb437e7022b3b6d49019d088665303ebe9c14ba"
+  integrity sha512-+Hp8fLp57wnUSt0tY0tHEXh4voZRDnoIrZPqlo3DPiI4y9lwg/jqx+1Om94/W6ZaPDOUbnjOt/99w66zk+l1Xg==
+
+copy-descriptor@^0.1.0:
+  version "0.1.1"
+  resolved "https://registry.yarnpkg.com/copy-descriptor/-/copy-descriptor-0.1.1.tgz#676f6eb3c39997c2ee1ac3a924fd6124748f578d"
+  integrity sha1-Z29us8OZl8LuGsOpJP1hJHSPV40=
 
 core-js@^2.5.7:
   version "2.6.1"
@@ -1456,12 +1567,15 @@ core-util-is@1.0.2, core-util-is@~1.0.0:
   resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.2.tgz#b5fd54220aa2bc5ab57aab7140c940754503c1a7"
   integrity sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=
 
-create-error-class@^3.0.1:
-  version "3.0.2"
-  resolved "https://registry.yarnpkg.com/create-error-class/-/create-error-class-3.0.2.tgz#06be7abef947a3f14a30fd610671d401bca8b7b6"
-  integrity sha1-Br56vvlHo/FKMP1hBnHUAbyot7Y=
+cosmiconfig@^5.0.0:
+  version "5.2.1"
+  resolved "https://registry.yarnpkg.com/cosmiconfig/-/cosmiconfig-5.2.1.tgz#040f726809c591e77a17c0a3626ca45b4f168b1a"
+  integrity sha512-H65gsXo1SKjf8zmrJ67eJk8aIRKV5ff2D4uKZIBZShbhGSpEmsQOPW/SKMKYhSTrqR7ufy6RP69rPogdaPh/kA==
   dependencies:
-    capture-stack-trace "^1.0.0"
+    import-fresh "^2.0.0"
+    is-directory "^0.3.1"
+    js-yaml "^3.13.1"
+    parse-json "^4.0.0"
 
 cross-spawn@5.1.0, cross-spawn@^5.0.1:
   version "5.1.0"
@@ -1472,7 +1586,7 @@ cross-spawn@5.1.0, cross-spawn@^5.0.1:
     shebang-command "^1.2.0"
     which "^1.2.9"
 
-cross-spawn@^6.0.5:
+cross-spawn@^6.0.0, cross-spawn@^6.0.5:
   version "6.0.5"
   resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-6.0.5.tgz#4a5ec7c64dfae22c3a14124dbacdee846d80cbc4"
   integrity sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==
@@ -1492,12 +1606,20 @@ crowdin-cli@^0.3.0:
     yamljs "^0.2.1"
     yargs "^2.3.0"
 
-css-color-names@0.0.4:
+css-color-names@0.0.4, css-color-names@^0.0.4:
   version "0.0.4"
   resolved "https://registry.yarnpkg.com/css-color-names/-/css-color-names-0.0.4.tgz#808adc2e79cf84738069b646cb20ec27beb629e0"
   integrity sha1-gIrcLnnPhHOAabZGyyDsJ762KeA=
 
-css-select-base-adapter@~0.1.0:
+css-declaration-sorter@^4.0.1:
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/css-declaration-sorter/-/css-declaration-sorter-4.0.1.tgz#c198940f63a76d7e36c1e71018b001721054cb22"
+  integrity sha512-BcxQSKTSEEQUftYpBVnsH4SF05NTuBokb19/sBt6asXGKZ/6VP7PLG1CBCkFDYOnhXhPh0jMhO6xZ71oYHXHBA==
+  dependencies:
+    postcss "^7.0.1"
+    timsort "^0.3.0"
+
+css-select-base-adapter@^0.1.1, css-select-base-adapter@~0.1.0:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/css-select-base-adapter/-/css-select-base-adapter-0.1.1.tgz#3b2ff4972cc362ab88561507a95408a1432135d7"
   integrity sha512-jQVeeRG70QI08vSTwf1jHxp74JoZsr2XSgETae8/xC8ovSnL2WF87GTLO86Sbwdt2lK4Umg4HnnwMO4YF3Ce7w==
@@ -1538,6 +1660,11 @@ css-tree@1.0.0-alpha.29:
     mdn-data "~1.1.0"
     source-map "^0.5.3"
 
+css-unit-converter@^1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/css-unit-converter/-/css-unit-converter-1.1.1.tgz#d9b9281adcfd8ced935bdbaba83786897f64e996"
+  integrity sha1-2bkoGtz9jO2TW9urqDeGiX9k6ZY=
+
 css-url-regex@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/css-url-regex/-/css-url-regex-1.1.0.tgz#83834230cc9f74c457de59eebd1543feeb83b7ec"
@@ -1548,59 +1675,86 @@ css-what@2.1, css-what@^2.1.2:
   resolved "https://registry.yarnpkg.com/css-what/-/css-what-2.1.2.tgz#c0876d9d0480927d7d4920dcd72af3595649554d"
   integrity sha512-wan8dMWQ0GUeF7DGEPVjhHemVW/vy6xUYmFzRY8RYqgA0JtXC9rJmbScBjqSu6dg9q0lwPQy6ZAmJVr3PPTvqQ==
 
-cssnano@^3.10.0:
-  version "3.10.0"
-  resolved "https://registry.yarnpkg.com/cssnano/-/cssnano-3.10.0.tgz#4f38f6cea2b9b17fa01490f23f1dc68ea65c1c38"
-  integrity sha1-Tzj2zqK5sX+gFJDyPx3GjqZcHDg=
-  dependencies:
-    autoprefixer "^6.3.1"
-    decamelize "^1.1.2"
-    defined "^1.0.0"
-    has "^1.0.1"
-    object-assign "^4.0.1"
-    postcss "^5.0.14"
-    postcss-calc "^5.2.0"
-    postcss-colormin "^2.1.8"
-    postcss-convert-values "^2.3.4"
-    postcss-discard-comments "^2.0.4"
-    postcss-discard-duplicates "^2.0.1"
-    postcss-discard-empty "^2.0.1"
-    postcss-discard-overridden "^0.1.1"
-    postcss-discard-unused "^2.2.1"
-    postcss-filter-plugins "^2.0.0"
-    postcss-merge-idents "^2.1.5"
-    postcss-merge-longhand "^2.0.1"
-    postcss-merge-rules "^2.0.3"
-    postcss-minify-font-values "^1.0.2"
-    postcss-minify-gradients "^1.0.1"
-    postcss-minify-params "^1.0.4"
-    postcss-minify-selectors "^2.0.4"
-    postcss-normalize-charset "^1.1.0"
-    postcss-normalize-url "^3.0.7"
-    postcss-ordered-values "^2.1.0"
-    postcss-reduce-idents "^2.2.2"
-    postcss-reduce-initial "^1.0.0"
-    postcss-reduce-transforms "^1.0.3"
-    postcss-svgo "^2.1.1"
-    postcss-unique-selectors "^2.0.2"
-    postcss-value-parser "^3.2.3"
-    postcss-zindex "^2.0.1"
+cssesc@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/cssesc/-/cssesc-2.0.0.tgz#3b13bd1bb1cb36e1bcb5a4dcd27f54c5dcb35703"
+  integrity sha512-MsCAG1z9lPdoO/IUMLSBWBSVxVtJ1395VGIQ+Fc2gNdkQ1hNDnQdw3YhA71WJCBW1vdwA0cAnk/DnW6bqoEUYg==
 
-csso@^3.5.0:
+cssnano-preset-default@^4.0.7:
+  version "4.0.7"
+  resolved "https://registry.yarnpkg.com/cssnano-preset-default/-/cssnano-preset-default-4.0.7.tgz#51ec662ccfca0f88b396dcd9679cdb931be17f76"
+  integrity sha512-x0YHHx2h6p0fCl1zY9L9roD7rnlltugGu7zXSKQx6k2rYw0Hi3IqxcoAGF7u9Q5w1nt7vK0ulxV8Lo+EvllGsA==
+  dependencies:
+    css-declaration-sorter "^4.0.1"
+    cssnano-util-raw-cache "^4.0.1"
+    postcss "^7.0.0"
+    postcss-calc "^7.0.1"
+    postcss-colormin "^4.0.3"
+    postcss-convert-values "^4.0.1"
+    postcss-discard-comments "^4.0.2"
+    postcss-discard-duplicates "^4.0.2"
+    postcss-discard-empty "^4.0.1"
+    postcss-discard-overridden "^4.0.1"
+    postcss-merge-longhand "^4.0.11"
+    postcss-merge-rules "^4.0.3"
+    postcss-minify-font-values "^4.0.2"
+    postcss-minify-gradients "^4.0.2"
+    postcss-minify-params "^4.0.2"
+    postcss-minify-selectors "^4.0.2"
+    postcss-normalize-charset "^4.0.1"
+    postcss-normalize-display-values "^4.0.2"
+    postcss-normalize-positions "^4.0.2"
+    postcss-normalize-repeat-style "^4.0.2"
+    postcss-normalize-string "^4.0.2"
+    postcss-normalize-timing-functions "^4.0.2"
+    postcss-normalize-unicode "^4.0.1"
+    postcss-normalize-url "^4.0.1"
+    postcss-normalize-whitespace "^4.0.2"
+    postcss-ordered-values "^4.1.2"
+    postcss-reduce-initial "^4.0.3"
+    postcss-reduce-transforms "^4.0.2"
+    postcss-svgo "^4.0.2"
+    postcss-unique-selectors "^4.0.1"
+
+cssnano-util-get-arguments@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/cssnano-util-get-arguments/-/cssnano-util-get-arguments-4.0.0.tgz#ed3a08299f21d75741b20f3b81f194ed49cc150f"
+  integrity sha1-7ToIKZ8h11dBsg87gfGU7UnMFQ8=
+
+cssnano-util-get-match@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/cssnano-util-get-match/-/cssnano-util-get-match-4.0.0.tgz#c0e4ca07f5386bb17ec5e52250b4f5961365156d"
+  integrity sha1-wOTKB/U4a7F+xeUiULT1lhNlFW0=
+
+cssnano-util-raw-cache@^4.0.1:
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/cssnano-util-raw-cache/-/cssnano-util-raw-cache-4.0.1.tgz#b26d5fd5f72a11dfe7a7846fb4c67260f96bf282"
+  integrity sha512-qLuYtWK2b2Dy55I8ZX3ky1Z16WYsx544Q0UWViebptpwn/xDBmog2TLg4f+DBMg1rJ6JDWtn96WHbOKDWt1WQA==
+  dependencies:
+    postcss "^7.0.0"
+
+cssnano-util-same-parent@^4.0.0:
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/cssnano-util-same-parent/-/cssnano-util-same-parent-4.0.1.tgz#574082fb2859d2db433855835d9a8456ea18bbf3"
+  integrity sha512-WcKx5OY+KoSIAxBW6UBBRay1U6vkYheCdjyVNDm85zt5K9mHoGOfsOsqIszfAqrQQFIIKgjh2+FDgIj/zsl21Q==
+
+cssnano@^4.1.0:
+  version "4.1.10"
+  resolved "https://registry.yarnpkg.com/cssnano/-/cssnano-4.1.10.tgz#0ac41f0b13d13d465487e111b778d42da631b8b2"
+  integrity sha512-5wny+F6H4/8RgNlaqab4ktc3e0/blKutmq8yNlBFXA//nSFFAqAngjNVRzUvCgYROULmZZUoosL/KSoZo5aUaQ==
+  dependencies:
+    cosmiconfig "^5.0.0"
+    cssnano-preset-default "^4.0.7"
+    is-resolvable "^1.0.0"
+    postcss "^7.0.0"
+
+csso@^3.5.0, csso@^3.5.1:
   version "3.5.1"
   resolved "https://registry.yarnpkg.com/csso/-/csso-3.5.1.tgz#7b9eb8be61628973c1b261e169d2f024008e758b"
   integrity sha512-vrqULLffYU1Q2tLdJvaCYbONStnfkfimRxXNaGjxMldI0C7JPBC4rB1RyjhfdZ4m1frm8pM9uRPKH3d2knZ8gg==
   dependencies:
     css-tree "1.0.0-alpha.29"
 
-csso@~2.3.1:
-  version "2.3.2"
-  resolved "https://registry.yarnpkg.com/csso/-/csso-2.3.2.tgz#ddd52c587033f49e94b71fc55569f252e8ff5f85"
-  integrity sha1-3dUsWHAz9J6Utx/FVWnyUuj/X4U=
-  dependencies:
-    clap "^1.0.9"
-    source-map "^0.5.3"
-
 currently-unhandled@^0.4.1:
   version "0.4.1"
   resolved "https://registry.yarnpkg.com/currently-unhandled/-/currently-unhandled-0.4.1.tgz#988df33feab191ef799a61369dd76c17adf957ea"
@@ -1615,17 +1769,12 @@ dashdash@^1.12.0:
   dependencies:
     assert-plus "^1.0.0"
 
-dateformat@^2.0.0:
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/dateformat/-/dateformat-2.2.0.tgz#4065e2013cf9fb916ddfd82efb506ad4c6769062"
-  integrity sha1-QGXiATz5+5Ft39gu+1Bq1MZ2kGI=
-
 debug@0.7.4:
   version "0.7.4"
   resolved "https://registry.yarnpkg.com/debug/-/debug-0.7.4.tgz#06e1ea8082c2cb14e39806e22e2f6f757f92af39"
   integrity sha1-BuHqgILCyxTjmAbiLi9vdX+Srzk=
 
-debug@2.6.9, debug@^2.2.0, debug@^2.6.0, debug@^2.6.6:
+debug@2.6.9, debug@^2.2.0, debug@^2.3.3, debug@^2.6.0, debug@^2.6.6:
   version "2.6.9"
   resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.9.tgz#5d128515df134ff327e90a4c93f4e077a536341f"
   integrity sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==
@@ -1651,97 +1800,104 @@ decamelize@^1.1.2:
   resolved "https://registry.yarnpkg.com/decamelize/-/decamelize-1.2.0.tgz#f6534d15148269b20352e7bee26f501f9a191290"
   integrity sha1-9lNNFRSCabIDUue+4m9QH5oZEpA=
 
-decompress-tar@^3.0.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/decompress-tar/-/decompress-tar-3.1.0.tgz#217c789f9b94450efaadc5c5e537978fc333c466"
-  integrity sha1-IXx4n5uURQ76rcXF5TeXj8MzxGY=
-  dependencies:
-    is-tar "^1.0.0"
-    object-assign "^2.0.0"
-    strip-dirs "^1.0.0"
-    tar-stream "^1.1.1"
-    through2 "^0.6.1"
-    vinyl "^0.4.3"
+decode-uri-component@^0.2.0:
+  version "0.2.0"
+  resolved "https://registry.yarnpkg.com/decode-uri-component/-/decode-uri-component-0.2.0.tgz#eb3913333458775cb84cd1a1fae062106bb87545"
+  integrity sha1-6zkTMzRYd1y4TNGh+uBiEGu4dUU=
 
-decompress-tarbz2@^3.0.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/decompress-tarbz2/-/decompress-tarbz2-3.1.0.tgz#8b23935681355f9f189d87256a0f8bdd96d9666d"
-  integrity sha1-iyOTVoE1X58YnYclag+L3ZbZZm0=
+decompress-response@^3.2.0, decompress-response@^3.3.0:
+  version "3.3.0"
+  resolved "https://registry.yarnpkg.com/decompress-response/-/decompress-response-3.3.0.tgz#80a4dd323748384bfa248083622aedec982adff3"
+  integrity sha1-gKTdMjdIOEv6JICDYirt7Jgq3/M=
   dependencies:
-    is-bzip2 "^1.0.0"
-    object-assign "^2.0.0"
-    seek-bzip "^1.0.3"
-    strip-dirs "^1.0.0"
-    tar-stream "^1.1.1"
-    through2 "^0.6.1"
-    vinyl "^0.4.3"
+    mimic-response "^1.0.0"
 
-decompress-targz@^3.0.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/decompress-targz/-/decompress-targz-3.1.0.tgz#b2c13df98166268991b715d6447f642e9696f5a0"
-  integrity sha1-ssE9+YFmJomRtxXWRH9kLpaW9aA=
+decompress-tar@^4.0.0, decompress-tar@^4.1.0, decompress-tar@^4.1.1:
+  version "4.1.1"
+  resolved "https://registry.yarnpkg.com/decompress-tar/-/decompress-tar-4.1.1.tgz#718cbd3fcb16209716e70a26b84e7ba4592e5af1"
+  integrity sha512-JdJMaCrGpB5fESVyxwpCx4Jdj2AagLmv3y58Qy4GE6HMVjWz1FeVQk1Ct4Kye7PftcdOo/7U7UKzYBJgqnGeUQ==
   dependencies:
-    is-gzip "^1.0.0"
-    object-assign "^2.0.0"
-    strip-dirs "^1.0.0"
-    tar-stream "^1.1.1"
-    through2 "^0.6.1"
-    vinyl "^0.4.3"
+    file-type "^5.2.0"
+    is-stream "^1.1.0"
+    tar-stream "^1.5.2"
 
-decompress-unzip@^3.0.0:
-  version "3.4.0"
-  resolved "https://registry.yarnpkg.com/decompress-unzip/-/decompress-unzip-3.4.0.tgz#61475b4152066bbe3fee12f9d629d15fe6478eeb"
-  integrity sha1-YUdbQVIGa74/7hL51inRX+ZHjus=
+decompress-tarbz2@^4.0.0:
+  version "4.1.1"
+  resolved "https://registry.yarnpkg.com/decompress-tarbz2/-/decompress-tarbz2-4.1.1.tgz#3082a5b880ea4043816349f378b56c516be1a39b"
+  integrity sha512-s88xLzf1r81ICXLAVQVzaN6ZmX4A6U4z2nMbOwobxkLoIIfjVMBg7TeguTUXkKeXni795B6y5rnvDw7rxhAq9A==
   dependencies:
-    is-zip "^1.0.0"
-    read-all-stream "^3.0.0"
-    stat-mode "^0.2.0"
-    strip-dirs "^1.0.0"
-    through2 "^2.0.0"
-    vinyl "^1.0.0"
-    yauzl "^2.2.1"
+    decompress-tar "^4.1.0"
+    file-type "^6.1.0"
+    is-stream "^1.1.0"
+    seek-bzip "^1.0.5"
+    unbzip2-stream "^1.0.9"
 
-decompress@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/decompress/-/decompress-3.0.0.tgz#af1dd50d06e3bfc432461d37de11b38c0d991bed"
-  integrity sha1-rx3VDQbjv8QyRh033hGzjA2ZG+0=
+decompress-targz@^4.0.0:
+  version "4.1.1"
+  resolved "https://registry.yarnpkg.com/decompress-targz/-/decompress-targz-4.1.1.tgz#c09bc35c4d11f3de09f2d2da53e9de23e7ce1eee"
+  integrity sha512-4z81Znfr6chWnRDNfFNqLwPvm4db3WuZkqV+UgXQzSngG3CEKdBkw5jrv3axjjL96glyiiKjsxJG3X6WBZwX3w==
   dependencies:
-    buffer-to-vinyl "^1.0.0"
-    concat-stream "^1.4.6"
-    decompress-tar "^3.0.0"
-    decompress-tarbz2 "^3.0.0"
-    decompress-targz "^3.0.0"
-    decompress-unzip "^3.0.0"
-    stream-combiner2 "^1.1.1"
-    vinyl-assign "^1.0.1"
-    vinyl-fs "^2.2.0"
+    decompress-tar "^4.1.1"
+    file-type "^5.2.0"
+    is-stream "^1.1.0"
 
-deep-extend@^0.6.0:
-  version "0.6.0"
-  resolved "https://registry.yarnpkg.com/deep-extend/-/deep-extend-0.6.0.tgz#c4fa7c95404a17a9c3e8ca7e1537312b736330ac"
-  integrity sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA==
+decompress-unzip@^4.0.1:
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/decompress-unzip/-/decompress-unzip-4.0.1.tgz#deaaccdfd14aeaf85578f733ae8210f9b4848f69"
+  integrity sha1-3qrM39FK6vhVePczroIQ+bSEj2k=
+  dependencies:
+    file-type "^3.8.0"
+    get-stream "^2.2.0"
+    pify "^2.3.0"
+    yauzl "^2.4.2"
+
+decompress@^4.0.0, decompress@^4.2.0:
+  version "4.2.0"
+  resolved "https://registry.yarnpkg.com/decompress/-/decompress-4.2.0.tgz#7aedd85427e5a92dacfe55674a7c505e96d01f9d"
+  integrity sha1-eu3YVCflqS2s/lVnSnxQXpbQH50=
+  dependencies:
+    decompress-tar "^4.0.0"
+    decompress-tarbz2 "^4.0.0"
+    decompress-targz "^4.0.0"
+    decompress-unzip "^4.0.1"
+    graceful-fs "^4.1.10"
+    make-dir "^1.0.0"
+    pify "^2.3.0"
+    strip-dirs "^2.0.0"
 
 deep-is@0.1.2:
   version "0.1.2"
   resolved "https://registry.yarnpkg.com/deep-is/-/deep-is-0.1.2.tgz#9ced65ea0bc0b09f42a6d79c1b1903f9d913cc18"
   integrity sha1-nO1l6gvAsJ9CptecGxkD+dkTzBg=
 
-deepmerge@^2.1.1:
-  version "2.2.1"
-  resolved "https://registry.yarnpkg.com/deepmerge/-/deepmerge-2.2.1.tgz#5d3ff22a01c00f645405a2fbc17d0778a1801170"
-  integrity sha512-R9hc1Xa/NOBi9WRVUWg19rl1UB7Tt4kuPd+thNJgFZoxXsTz7ncaPaeIm+40oSGuP33DfMb4sZt1QIGiJzC4EA==
-
-define-properties@^1.1.2:
+define-properties@^1.1.2, define-properties@^1.1.3:
   version "1.1.3"
   resolved "https://registry.yarnpkg.com/define-properties/-/define-properties-1.1.3.tgz#cf88da6cbee26fe6db7094f61d870cbd84cee9f1"
   integrity sha512-3MqfYKj2lLzdMSf8ZIZE/V+Zuy+BgD6f164e8K2w7dgnpKArBDerGYpM46IYYcjnkdPNMjPk9A6VFB8+3SKlXQ==
   dependencies:
     object-keys "^1.0.12"
 
-defined@^1.0.0:
+define-property@^0.2.5:
+  version "0.2.5"
+  resolved "https://registry.yarnpkg.com/define-property/-/define-property-0.2.5.tgz#c35b1ef918ec3c990f9a5bc57be04aacec5c8116"
+  integrity sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=
+  dependencies:
+    is-descriptor "^0.1.0"
+
+define-property@^1.0.0:
   version "1.0.0"
-  resolved "https://registry.yarnpkg.com/defined/-/defined-1.0.0.tgz#c98d9bcef75674188e110969151199e39b1fa693"
-  integrity sha1-yY2bzvdWdBiOEQlpFRGZ45sfppM=
+  resolved "https://registry.yarnpkg.com/define-property/-/define-property-1.0.0.tgz#769ebaaf3f4a63aad3af9e8d304c9bbe79bfb0e6"
+  integrity sha1-dp66rz9KY6rTr56NMEybvnm/sOY=
+  dependencies:
+    is-descriptor "^1.0.0"
+
+define-property@^2.0.2:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/define-property/-/define-property-2.0.2.tgz#d459689e8d654ba77e02a817f8710d702cb16e9d"
+  integrity sha512-jwK2UV4cnPpbcG7+VRARKTZPUWowwXA8bzH5NP6ud0oeAxyYPuGZUAC7hMugpCdz4BeSZl2Dl9k66CHJ/46ZYQ==
+  dependencies:
+    is-descriptor "^1.0.2"
+    isobject "^3.0.1"
 
 delayed-stream@~1.0.0:
   version "1.0.0"
@@ -1776,10 +1932,18 @@ diacritics-map@^0.1.0:
   resolved "https://registry.yarnpkg.com/diacritics-map/-/diacritics-map-0.1.0.tgz#6dfc0ff9d01000a2edf2865371cac316e94977af"
   integrity sha1-bfwP+dAQAKLt8oZTccrDFulJd68=
 
-docusaurus@^1.6.2:
-  version "1.6.2"
-  resolved "https://registry.yarnpkg.com/docusaurus/-/docusaurus-1.6.2.tgz#60d581955fb9f28afb6e9cdea17c5c0cbf1784ec"
-  integrity sha512-I7ku328iQ3BAvnxVzVef8LR+Ek4BEWvao0W3JjnGrz/ZS3p+mIV2A9rF3B3yxvkTW4gofRpH+A8fN/UKi2r+1w==
+dir-glob@2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/dir-glob/-/dir-glob-2.0.0.tgz#0b205d2b6aef98238ca286598a8204d29d0a0034"
+  integrity sha512-37qirFDz8cA5fimp9feo43fSuRo2gHwaIn6dXL8Ber1dGwUosDrGZeCCXq57WnIqE4aQ+u3eQZzsk1yOzhdwag==
+  dependencies:
+    arrify "^1.0.1"
+    path-type "^3.0.0"
+
+docusaurus@^1.11.1:
+  version "1.11.1"
+  resolved "https://registry.yarnpkg.com/docusaurus/-/docusaurus-1.11.1.tgz#786bae93946bc21ab7ef457c5672e2e2bd930b25"
+  integrity sha512-oIdftD4E8dnzXcNohTdE6MICsiJIR1pAmKa/sRHDiG3T3v8f2eiq9nt88CidSIPpyEw50TbCr3bOoExHS90UGg==
   dependencies:
     "@babel/core" "^7.0.0"
     "@babel/plugin-proposal-class-properties" "^7.0.0"
@@ -1790,28 +1954,28 @@ docusaurus@^1.6.2:
     "@babel/register" "^7.0.0"
     "@babel/traverse" "^7.0.0"
     "@babel/types" "^7.1.2"
-    autoprefixer "^9.1.5"
+    autoprefixer "^9.6.0"
     babylon "^6.17.4"
-    chalk "^2.1.0"
+    chalk "^2.4.2"
+    chokidar "^3.0.1"
     classnames "^2.2.6"
     color "^2.0.1"
-    commander "^2.18.0"
+    commander "^2.20.0"
     cross-spawn "^6.0.5"
     crowdin-cli "^0.3.0"
-    cssnano "^3.10.0"
-    deepmerge "^2.1.1"
+    cssnano "^4.1.0"
     escape-string-regexp "^1.0.5"
-    express "^4.15.3"
+    express "^4.17.1"
     feed "^1.1.0"
     fs-extra "^5.0.0"
     gaze "^1.1.2"
     glob "^7.1.3"
     highlight.js "^9.12.0"
-    imagemin "^5.3.1"
-    imagemin-gifsicle "^5.2.0"
-    imagemin-jpegtran "^5.0.2"
-    imagemin-optipng "^5.2.1"
-    imagemin-svgo "^6.0.0"
+    imagemin "^6.0.0"
+    imagemin-gifsicle "^6.0.1"
+    imagemin-jpegtran "^6.0.0"
+    imagemin-optipng "^6.0.0"
+    imagemin-svgo "^7.0.0"
     lodash "^4.17.11"
     markdown-toc "^1.2.0"
     mkdirp "^0.5.1"
@@ -1823,7 +1987,7 @@ docusaurus@^1.6.2:
     react-dom "^16.5.0"
     remarkable "^1.7.1"
     request "^2.87.0"
-    shelljs "^0.7.8"
+    shelljs "^0.8.3"
     sitemap "^1.13.0"
     tcp-port-used "^0.1.2"
     tiny-lr "^1.1.1"
@@ -1871,64 +2035,58 @@ domutils@^1.5.1, domutils@^1.7.0:
     dom-serializer "0"
     domelementtype "1"
 
-download@^4.0.0, download@^4.1.2:
-  version "4.4.3"
-  resolved "https://registry.yarnpkg.com/download/-/download-4.4.3.tgz#aa55fdad392d95d4b68e8c2be03e0c2aa21ba9ac"
-  integrity sha1-qlX9rTktldS2jowr4D4MKqIbqaw=
+dot-prop@^4.1.1:
+  version "4.2.0"
+  resolved "https://registry.yarnpkg.com/dot-prop/-/dot-prop-4.2.0.tgz#1f19e0c2e1aa0e32797c49799f2837ac6af69c57"
+  integrity sha512-tUMXrxlExSW6U2EXiiKGSBVdYgtV8qlHL+C10TsW4PURY/ic+eaysnSkwB4kA/mBlCyy/IKDJ+Lc3wbWeaXtuQ==
   dependencies:
-    caw "^1.0.1"
-    concat-stream "^1.4.7"
-    each-async "^1.0.0"
-    filenamify "^1.0.1"
-    got "^5.0.0"
-    gulp-decompress "^1.2.0"
-    gulp-rename "^1.2.0"
-    is-url "^1.2.0"
-    object-assign "^4.0.1"
-    read-all-stream "^3.0.0"
-    readable-stream "^2.0.2"
-    stream-combiner2 "^1.1.1"
-    vinyl "^1.0.0"
-    vinyl-fs "^2.2.0"
-    ware "^1.2.0"
+    is-obj "^1.0.0"
 
-duplexer2@0.0.2:
-  version "0.0.2"
-  resolved "https://registry.yarnpkg.com/duplexer2/-/duplexer2-0.0.2.tgz#c614dcf67e2fb14995a91711e5a617e8a60a31db"
-  integrity sha1-xhTc9n4vsUmVqRcR5aYX6KYKMds=
+download@^6.2.2:
+  version "6.2.5"
+  resolved "https://registry.yarnpkg.com/download/-/download-6.2.5.tgz#acd6a542e4cd0bb42ca70cfc98c9e43b07039714"
+  integrity sha512-DpO9K1sXAST8Cpzb7kmEhogJxymyVUd5qz/vCOSyvwtp2Klj2XcDt5YUuasgxka44SxF0q5RriKIwJmQHG2AuA==
   dependencies:
-    readable-stream "~1.1.9"
+    caw "^2.0.0"
+    content-disposition "^0.5.2"
+    decompress "^4.0.0"
+    ext-name "^5.0.0"
+    file-type "5.2.0"
+    filenamify "^2.0.0"
+    get-stream "^3.0.0"
+    got "^7.0.0"
+    make-dir "^1.0.0"
+    p-event "^1.0.0"
+    pify "^3.0.0"
 
-duplexer2@^0.1.4, duplexer2@~0.1.0:
+download@^7.1.0:
+  version "7.1.0"
+  resolved "https://registry.yarnpkg.com/download/-/download-7.1.0.tgz#9059aa9d70b503ee76a132897be6dec8e5587233"
+  integrity sha512-xqnBTVd/E+GxJVrX5/eUJiLYjCGPwMpdL+jGhGU57BvtcA7wwhtHVbXBeUk51kOpW3S7Jn3BQbN9Q1R1Km2qDQ==
+  dependencies:
+    archive-type "^4.0.0"
+    caw "^2.0.1"
+    content-disposition "^0.5.2"
+    decompress "^4.2.0"
+    ext-name "^5.0.0"
+    file-type "^8.1.0"
+    filenamify "^2.0.0"
+    get-stream "^3.0.0"
+    got "^8.3.1"
+    make-dir "^1.2.0"
+    p-event "^2.1.0"
+    pify "^3.0.0"
+
+duplexer3@^0.1.4:
   version "0.1.4"
-  resolved "https://registry.yarnpkg.com/duplexer2/-/duplexer2-0.1.4.tgz#8b12dab878c0d69e3e7891051662a32fc6bddcc1"
-  integrity sha1-ixLauHjA1p4+eJEFFmKjL8a93ME=
-  dependencies:
-    readable-stream "^2.0.2"
+  resolved "https://registry.yarnpkg.com/duplexer3/-/duplexer3-0.1.4.tgz#ee01dd1cac0ed3cbc7fdbea37dc0a8f1ce002ce2"
+  integrity sha1-7gHdHKwO08vH/b6jfcCo8c4ALOI=
 
 duplexer@^0.1.1:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/duplexer/-/duplexer-0.1.1.tgz#ace6ff808c1ce66b57d1ebf97977acb02334cfc1"
   integrity sha1-rOb/gIwc5mtX0ev5eXessCM0z8E=
 
-duplexify@^3.2.0:
-  version "3.6.1"
-  resolved "https://registry.yarnpkg.com/duplexify/-/duplexify-3.6.1.tgz#b1a7a29c4abfd639585efaecce80d666b1e34125"
-  integrity sha512-vM58DwdnKmty+FSPzT14K9JXb90H+j5emaR4KYbr2KTIz00WHGbWOe5ghQTx233ZCLZtrGDALzKwcjEtSt35mA==
-  dependencies:
-    end-of-stream "^1.0.0"
-    inherits "^2.0.1"
-    readable-stream "^2.0.0"
-    stream-shift "^1.0.0"
-
-each-async@^1.0.0, each-async@^1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/each-async/-/each-async-1.1.1.tgz#dee5229bdf0ab6ba2012a395e1b869abf8813473"
-  integrity sha1-3uUim98KtrogEqOV4bhpq/iBNHM=
-  dependencies:
-    onetime "^1.0.0"
-    set-immediate-shim "^1.0.0"
-
 ecc-jsbn@~0.1.1:
   version "0.1.2"
   resolved "https://registry.yarnpkg.com/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz#3a83a904e54353287874c564b7549386849a98c9"
@@ -1942,7 +2100,12 @@ ee-first@1.1.1:
   resolved "https://registry.yarnpkg.com/ee-first/-/ee-first-1.1.1.tgz#590c61156b0ae2f4f0255732a158b266bc56b21d"
   integrity sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0=
 
-electron-to-chromium@^1.2.7, electron-to-chromium@^1.3.92:
+electron-to-chromium@^1.3.188:
+  version "1.3.190"
+  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.190.tgz#5bf599519983bfffd9d4387817039a3ed7ca085f"
+  integrity sha512-cs9WnTnGBGnYYVFMCtLmr9jXNTOkdp95RLz5VhwzDn7dErg1Lnt9o4d01gEH69XlmRKWUr91Yu1hA+Hi8qW0PA==
+
+electron-to-chromium@^1.3.92:
   version "1.3.96"
   resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.96.tgz#25770ec99b8b07706dedf3a5f43fa50cb54c4f9a"
   integrity sha512-ZUXBUyGLeoJxp4Nt6G/GjBRLnyz8IKQGexZ2ndWaoegThgMGFO1tdDYID5gBV32/1S83osjJHyfzvanE/8HY4Q==
@@ -1952,7 +2115,7 @@ encodeurl@~1.0.2:
   resolved "https://registry.yarnpkg.com/encodeurl/-/encodeurl-1.0.2.tgz#ad3ff4c86ec2d029322f5a02c3a9a606c95b3f59"
   integrity sha1-rT/0yG7C0CkyL1oCw6mmBslbP1k=
 
-end-of-stream@^1.0.0:
+end-of-stream@^1.0.0, end-of-stream@^1.1.0:
   version "1.4.1"
   resolved "https://registry.yarnpkg.com/end-of-stream/-/end-of-stream-1.4.1.tgz#ed29634d19baba463b6ce6b80a37213eab71ec43"
   integrity sha512-1MkrZNvWTKCaigbn+W15elq2BB/L22nqrSY5DKlo3X6+vclJm8Bb5djXJBmEX6fS3+zCh/F4VBK5Z2KxJt4s2Q==
@@ -1964,7 +2127,7 @@ entities@^1.1.1, entities@~1.1.1:
   resolved "https://registry.yarnpkg.com/entities/-/entities-1.1.2.tgz#bdfa735299664dfafd34529ed4f8522a275fea56"
   integrity sha512-f2LZMYl1Fzu7YSBKg+RoROelpOaNrcGmE9AZubeDfrCEia483oW4MI4VyFd5VNHIgQ/7qm1I0wUHK1eJnn2y2w==
 
-error-ex@^1.2.0:
+error-ex@^1.2.0, error-ex@^1.3.1:
   version "1.3.2"
   resolved "https://registry.yarnpkg.com/error-ex/-/error-ex-1.3.2.tgz#b4ac40648107fdcdcfae242f428bea8a14d4f1bf"
   integrity sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==
@@ -1979,6 +2142,18 @@ error@^7.0.0:
     string-template "~0.2.1"
     xtend "~4.0.0"
 
+es-abstract@^1.12.0:
+  version "1.13.0"
+  resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.13.0.tgz#ac86145fdd5099d8dd49558ccba2eaf9b88e24e9"
+  integrity sha512-vDZfg/ykNxQVwup/8E1BZhVzFfBxs9NqMzGcvIJrqg5k2/5Za2bWo40dK2J1pgLngZ7c+Shh8lwYtLGyrwPutg==
+  dependencies:
+    es-to-primitive "^1.2.0"
+    function-bind "^1.1.1"
+    has "^1.0.3"
+    is-callable "^1.1.4"
+    is-regex "^1.0.4"
+    object-keys "^1.0.12"
+
 es-abstract@^1.5.1, es-abstract@^1.6.1:
   version "1.12.0"
   resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.12.0.tgz#9dbbdd27c6856f0001421ca18782d786bf8a6165"
@@ -1990,7 +2165,7 @@ es-abstract@^1.5.1, es-abstract@^1.6.1:
     is-callable "^1.1.3"
     is-regex "^1.0.4"
 
-es-to-primitive@^1.1.1:
+es-to-primitive@^1.1.1, es-to-primitive@^1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/es-to-primitive/-/es-to-primitive-1.2.0.tgz#edf72478033456e8dda8ef09e00ad9650707f377"
   integrity sha512-qZryBOJjV//LaxLTV6UC//WewneB3LcXOL9NP++ozKVXsIIIpm/2c13UDiD9Jp2eThsecw9m3jPqDwTyobcdbg==
@@ -2009,11 +2184,6 @@ escape-string-regexp@1.0.5, escape-string-regexp@^1.0.2, escape-string-regexp@^1
   resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4"
   integrity sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=
 
-esprima@^2.6.0:
-  version "2.7.3"
-  resolved "https://registry.yarnpkg.com/esprima/-/esprima-2.7.3.tgz#96e3b70d5779f6ad49cd032673d1c312767ba581"
-  integrity sha1-luO3DVd59q1JzQMmc9HDEnZ7pYE=
-
 esprima@^4.0.0:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/esprima/-/esprima-4.0.1.tgz#13b04cdb3e6c5d19df91ab6987a8695619b0aa71"
@@ -2047,14 +2217,6 @@ exec-buffer@^3.0.0:
     rimraf "^2.5.4"
     tempfile "^2.0.0"
 
-exec-series@^1.0.0:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/exec-series/-/exec-series-1.0.3.tgz#6d257a9beac482a872c7783bc8615839fc77143a"
-  integrity sha1-bSV6m+rEgqhyx3g7yGFYOfx3FDo=
-  dependencies:
-    async-each-series "^1.1.0"
-    object-assign "^4.1.0"
-
 execa@^0.7.0:
   version "0.7.0"
   resolved "https://registry.yarnpkg.com/execa/-/execa-0.7.0.tgz#944becd34cc41ee32a63a9faf27ad5a65fc59777"
@@ -2068,19 +2230,38 @@ execa@^0.7.0:
     signal-exit "^3.0.0"
     strip-eof "^1.0.0"
 
-executable@^1.0.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/executable/-/executable-1.1.0.tgz#877980e9112f3391066da37265de7ad8434ab4d9"
-  integrity sha1-h3mA6REvM5EGbaNyZd562ENKtNk=
+execa@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/execa/-/execa-1.0.0.tgz#c6236a5bb4df6d6f15e88e7f017798216749ddd8"
+  integrity sha512-adbxcyWV46qiHyvSp50TKt05tB4tK3HcmF7/nxfAdhnox83seTDbwnaqKO4sXRy7roHAIFqJP/Rw/AuEbX61LA==
   dependencies:
-    meow "^3.1.0"
+    cross-spawn "^6.0.0"
+    get-stream "^4.0.0"
+    is-stream "^1.1.0"
+    npm-run-path "^2.0.0"
+    p-finally "^1.0.0"
+    signal-exit "^3.0.0"
+    strip-eof "^1.0.0"
 
-expand-brackets@^0.1.4:
-  version "0.1.5"
-  resolved "https://registry.yarnpkg.com/expand-brackets/-/expand-brackets-0.1.5.tgz#df07284e342a807cd733ac5af72411e581d1177b"
-  integrity sha1-3wcoTjQqgHzXM6xa9yQR5YHRF3s=
+executable@^4.1.0:
+  version "4.1.1"
+  resolved "https://registry.yarnpkg.com/executable/-/executable-4.1.1.tgz#41532bff361d3e57af4d763b70582db18f5d133c"
+  integrity sha512-8iA79xD3uAch729dUG8xaaBBFGaEa0wdD2VkYLFHwlqosEj/jT66AzcreRDSgV7ehnNLBW2WR5jIXwGKjVdTLg==
   dependencies:
-    is-posix-bracket "^0.1.0"
+    pify "^2.2.0"
+
+expand-brackets@^2.1.4:
+  version "2.1.4"
+  resolved "https://registry.yarnpkg.com/expand-brackets/-/expand-brackets-2.1.4.tgz#b77735e315ce30f6b6eff0f83b04151a22449622"
+  integrity sha1-t3c14xXOMPa27/D4OwQVGiJEliI=
+  dependencies:
+    debug "^2.3.3"
+    define-property "^0.2.5"
+    extend-shallow "^2.0.1"
+    posix-character-classes "^0.1.0"
+    regex-not "^1.0.0"
+    snapdragon "^0.8.1"
+    to-regex "^3.0.1"
 
 expand-range@^1.8.1:
   version "1.8.2"
@@ -2096,42 +2277,57 @@ expand-tilde@^2.0.0, expand-tilde@^2.0.2:
   dependencies:
     homedir-polyfill "^1.0.1"
 
-express@^4.15.3:
-  version "4.16.4"
-  resolved "https://registry.yarnpkg.com/express/-/express-4.16.4.tgz#fddef61926109e24c515ea97fd2f1bdbf62df12e"
-  integrity sha512-j12Uuyb4FMrd/qQAm6uCHAkPtO8FDTRJZBDd5D2KOL2eLaz1yUNdUB/NOIyq0iU4q4cFarsUCrnFDPBcnksuOg==
+express@^4.17.1:
+  version "4.17.1"
+  resolved "https://registry.yarnpkg.com/express/-/express-4.17.1.tgz#4491fc38605cf51f8629d39c2b5d026f98a4c134"
+  integrity sha512-mHJ9O79RqluphRrcw2X/GTh3k9tVv8YcoyY4Kkh4WDMUYKRZUq0h1o0w2rrrxBqM7VoeUVqgb27xlEMXTnYt4g==
   dependencies:
-    accepts "~1.3.5"
+    accepts "~1.3.7"
     array-flatten "1.1.1"
-    body-parser "1.18.3"
-    content-disposition "0.5.2"
+    body-parser "1.19.0"
+    content-disposition "0.5.3"
     content-type "~1.0.4"
-    cookie "0.3.1"
+    cookie "0.4.0"
     cookie-signature "1.0.6"
     debug "2.6.9"
     depd "~1.1.2"
     encodeurl "~1.0.2"
     escape-html "~1.0.3"
     etag "~1.8.1"
-    finalhandler "1.1.1"
+    finalhandler "~1.1.2"
     fresh "0.5.2"
     merge-descriptors "1.0.1"
     methods "~1.1.2"
     on-finished "~2.3.0"
-    parseurl "~1.3.2"
+    parseurl "~1.3.3"
     path-to-regexp "0.1.7"
-    proxy-addr "~2.0.4"
-    qs "6.5.2"
-    range-parser "~1.2.0"
+    proxy-addr "~2.0.5"
+    qs "6.7.0"
+    range-parser "~1.2.1"
     safe-buffer "5.1.2"
-    send "0.16.2"
-    serve-static "1.13.2"
-    setprototypeof "1.1.0"
-    statuses "~1.4.0"
-    type-is "~1.6.16"
+    send "0.17.1"
+    serve-static "1.14.1"
+    setprototypeof "1.1.1"
+    statuses "~1.5.0"
+    type-is "~1.6.18"
     utils-merge "1.0.1"
     vary "~1.1.2"
 
+ext-list@^2.0.0:
+  version "2.2.2"
+  resolved "https://registry.yarnpkg.com/ext-list/-/ext-list-2.2.2.tgz#0b98e64ed82f5acf0f2931babf69212ef52ddd37"
+  integrity sha512-u+SQgsubraE6zItfVA0tBuCBhfU9ogSRnsvygI7wht9TS510oLkBRXBsqopeUG/GBOIQyKZO9wjTqIu/sf5zFA==
+  dependencies:
+    mime-db "^1.28.0"
+
+ext-name@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/ext-name/-/ext-name-5.0.0.tgz#70781981d183ee15d13993c8822045c506c8f0a6"
+  integrity sha512-yblEwXAbGv1VQDmow7s38W77hzAgJAO50ztBLMcUyUBfxv1HC+LGwtiEN+Co6LtlqT/5uwVOxsD4TNIilWhwdQ==
+  dependencies:
+    ext-list "^2.0.0"
+    sort-keys-length "^1.0.0"
+
 extend-shallow@^2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/extend-shallow/-/extend-shallow-2.0.1.tgz#51af7d614ad9a9f610ea1bafbb989d6b1c56890f"
@@ -2139,7 +2335,15 @@ extend-shallow@^2.0.1:
   dependencies:
     is-extendable "^0.1.0"
 
-extend@^3.0.0, extend@~3.0.2:
+extend-shallow@^3.0.0, extend-shallow@^3.0.2:
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/extend-shallow/-/extend-shallow-3.0.2.tgz#26a71aaf073b39fb2127172746131c2704028db8"
+  integrity sha1-Jqcarwc7OfshJxcnRhMcJwQCjbg=
+  dependencies:
+    assign-symbols "^1.0.0"
+    is-extendable "^1.0.1"
+
+extend@~3.0.2:
   version "3.0.2"
   resolved "https://registry.yarnpkg.com/extend/-/extend-3.0.2.tgz#f8b1136b4071fbd8eb140aff858b1019ec2915fa"
   integrity sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==
@@ -2153,12 +2357,19 @@ external-editor@^2.0.4:
     iconv-lite "^0.4.17"
     tmp "^0.0.33"
 
-extglob@^0.3.1:
-  version "0.3.2"
-  resolved "https://registry.yarnpkg.com/extglob/-/extglob-0.3.2.tgz#2e18ff3d2f49ab2765cec9023f011daa8d8349a1"
-  integrity sha1-Lhj/PS9JqydlzskCPwEdqo2DSaE=
+extglob@^2.0.4:
+  version "2.0.4"
+  resolved "https://registry.yarnpkg.com/extglob/-/extglob-2.0.4.tgz#ad00fe4dc612a9232e8718711dc5cb5ab0285543"
+  integrity sha512-Nmb6QXkELsuBr24CJSkilo6UHHgbekK5UiZgfE6UHD3Eb27YC6oD+bhcT+tJ6cl8dmsgdQxnWlcry8ksBIBLpw==
   dependencies:
-    is-extglob "^1.0.0"
+    array-unique "^0.3.2"
+    define-property "^1.0.0"
+    expand-brackets "^2.1.4"
+    extend-shallow "^2.0.1"
+    fragment-cache "^0.2.1"
+    regex-not "^1.0.0"
+    snapdragon "^0.8.1"
+    to-regex "^3.0.1"
 
 extsprintf@1.3.0:
   version "1.3.0"
@@ -2170,21 +2381,23 @@ extsprintf@^1.2.0:
   resolved "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.4.0.tgz#e2689f8f356fad62cca65a3a91c5df5f9551692f"
   integrity sha1-4mifjzVvrWLMplo6kcXfX5VRaS8=
 
-fancy-log@^1.1.0:
-  version "1.3.3"
-  resolved "https://registry.yarnpkg.com/fancy-log/-/fancy-log-1.3.3.tgz#dbc19154f558690150a23953a0adbd035be45fc7"
-  integrity sha512-k9oEhlyc0FrVh25qYuSELjr8oxsCoc4/LEZfg2iJJrfEk/tZL9bCoJE47gqAvI2m/AUjluCS4+3I0eTx8n3AEw==
-  dependencies:
-    ansi-gray "^0.1.1"
-    color-support "^1.1.3"
-    parse-node-version "^1.0.0"
-    time-stamp "^1.0.0"
-
 fast-deep-equal@^2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-2.0.1.tgz#7b05218ddf9667bf7f370bf7fdb2cb15fdd0aa49"
   integrity sha1-ewUhjd+WZ79/Nwv3/bLLFf3Qqkk=
 
+fast-glob@^2.0.2:
+  version "2.2.7"
+  resolved "https://registry.yarnpkg.com/fast-glob/-/fast-glob-2.2.7.tgz#6953857c3afa475fff92ee6015d52da70a4cd39d"
+  integrity sha512-g1KuQwHOZAmOZMuBtHdxDtju+T2RT8jgCC9aANsbpdiDDTSnjgfuVsIBNKbUeJI3oKMRExcfNDtJl4OhbffMsw==
+  dependencies:
+    "@mrmlnc/readdir-enhanced" "^2.2.1"
+    "@nodelib/fs.stat" "^1.1.2"
+    glob-parent "^3.1.0"
+    is-glob "^4.0.0"
+    merge2 "^1.2.3"
+    micromatch "^3.1.10"
+
 fast-json-stable-stringify@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/fast-json-stable-stringify/-/fast-json-stable-stringify-2.0.0.tgz#d5142c0caee6b1189f87d3a76111064f86c8bbf2"
@@ -2233,32 +2446,47 @@ figures@^2.0.0:
   dependencies:
     escape-string-regexp "^1.0.5"
 
-file-type@^3.1.0:
+file-type@5.2.0, file-type@^5.2.0:
+  version "5.2.0"
+  resolved "https://registry.yarnpkg.com/file-type/-/file-type-5.2.0.tgz#2ddbea7c73ffe36368dfae49dc338c058c2b8ad6"
+  integrity sha1-LdvqfHP/42No365J3DOMBYwritY=
+
+file-type@^10.4.0, file-type@^10.7.0:
+  version "10.11.0"
+  resolved "https://registry.yarnpkg.com/file-type/-/file-type-10.11.0.tgz#2961d09e4675b9fb9a3ee6b69e9cd23f43fd1890"
+  integrity sha512-uzk64HRpUZyTGZtVuvrjP0FYxzQrBf4rojot6J65YMEbwBLB0CWm0CLojVpwpmFmxcE/lkvYICgfcGozbBq6rw==
+
+file-type@^3.8.0:
   version "3.9.0"
   resolved "https://registry.yarnpkg.com/file-type/-/file-type-3.9.0.tgz#257a078384d1db8087bc449d107d52a52672b9e9"
   integrity sha1-JXoHg4TR24CHvESdEH1SpSZyuek=
 
-file-type@^4.1.0:
+file-type@^4.2.0:
   version "4.4.0"
   resolved "https://registry.yarnpkg.com/file-type/-/file-type-4.4.0.tgz#1b600e5fca1fbdc6e80c0a70c71c8dba5f7906c5"
   integrity sha1-G2AOX8ofvcboDApwxxyNul95BsU=
 
-filename-regex@^2.0.0:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/filename-regex/-/filename-regex-2.0.1.tgz#c1c4b9bee3e09725ddb106b75c1e301fe2f18b26"
-  integrity sha1-wcS5vuPglyXdsQa3XB4wH+LxiyY=
+file-type@^6.1.0:
+  version "6.2.0"
+  resolved "https://registry.yarnpkg.com/file-type/-/file-type-6.2.0.tgz#e50cd75d356ffed4e306dc4f5bcf52a79903a919"
+  integrity sha512-YPcTBDV+2Tm0VqjybVd32MHdlEGAtuxS3VAYsumFokDSMG+ROT5wawGlnHDoz7bfMcMDt9hxuXvXwoKUx2fkOg==
 
-filename-reserved-regex@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/filename-reserved-regex/-/filename-reserved-regex-1.0.0.tgz#e61cf805f0de1c984567d0386dc5df50ee5af7e4"
-  integrity sha1-5hz4BfDeHJhFZ9A4bcXfUO5a9+Q=
+file-type@^8.1.0:
+  version "8.1.0"
+  resolved "https://registry.yarnpkg.com/file-type/-/file-type-8.1.0.tgz#244f3b7ef641bbe0cca196c7276e4b332399f68c"
+  integrity sha512-qyQ0pzAy78gVoJsmYeNgl8uH8yKhr1lVhW7JbzJmnlRi0I4R2eEDEJZVKG8agpDnLpacwNbDhLNG/LMdxHD2YQ==
 
-filenamify@^1.0.1:
-  version "1.2.1"
-  resolved "https://registry.yarnpkg.com/filenamify/-/filenamify-1.2.1.tgz#a9f2ffd11c503bed300015029272378f1f1365a5"
-  integrity sha1-qfL/0RxQO+0wABUCknI3jx8TZaU=
+filename-reserved-regex@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/filename-reserved-regex/-/filename-reserved-regex-2.0.0.tgz#abf73dfab735d045440abfea2d91f389ebbfa229"
+  integrity sha1-q/c9+rc10EVECr/qLZHzieu/oik=
+
+filenamify@^2.0.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/filenamify/-/filenamify-2.1.0.tgz#88faf495fb1b47abfd612300002a16228c677ee9"
+  integrity sha512-ICw7NTT6RsDp2rnYKVd8Fu4cr6ITzGy3+u4vUujPkabyaz+03F24NWEX7fs5fp+kBonlaqPH8fAO2NM+SXt/JA==
   dependencies:
-    filename-reserved-regex "^1.0.0"
+    filename-reserved-regex "^2.0.0"
     strip-outer "^1.0.0"
     trim-repeated "^1.0.0"
 
@@ -2278,17 +2506,34 @@ fill-range@^2.1.0:
     repeat-element "^1.1.2"
     repeat-string "^1.5.2"
 
-finalhandler@1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/finalhandler/-/finalhandler-1.1.1.tgz#eebf4ed840079c83f4249038c9d703008301b105"
-  integrity sha512-Y1GUDo39ez4aHAw7MysnUD5JzYX+WaIj8I57kO3aEPT1fFRL4sr7mjei97FgnwhAyyzRYmQZaTHb2+9uZ1dPtg==
+fill-range@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-4.0.0.tgz#d544811d428f98eb06a63dc402d2403c328c38f7"
+  integrity sha1-1USBHUKPmOsGpj3EAtJAPDKMOPc=
+  dependencies:
+    extend-shallow "^2.0.1"
+    is-number "^3.0.0"
+    repeat-string "^1.6.1"
+    to-regex-range "^2.1.0"
+
+fill-range@^7.0.1:
+  version "7.0.1"
+  resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-7.0.1.tgz#1919a6a7c75fe38b2c7c77e5198535da9acdda40"
+  integrity sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==
+  dependencies:
+    to-regex-range "^5.0.1"
+
+finalhandler@~1.1.2:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/finalhandler/-/finalhandler-1.1.2.tgz#b7e7d000ffd11938d0fdb053506f6ebabe9f587d"
+  integrity sha512-aAWcW57uxVNrQZqFXjITpW3sIUQmHGG3qSb9mUah9MgMC4NeWhNOlNjXEYq3HjRAvL6arUviZGGJsBg6z0zsWA==
   dependencies:
     debug "2.6.9"
     encodeurl "~1.0.2"
     escape-html "~1.0.3"
     on-finished "~2.3.0"
-    parseurl "~1.3.2"
-    statuses "~1.4.0"
+    parseurl "~1.3.3"
+    statuses "~1.5.0"
     unpipe "~1.0.0"
 
 find-cache-dir@^1.0.0:
@@ -2315,38 +2560,19 @@ find-up@^2.1.0:
   dependencies:
     locate-path "^2.0.0"
 
-find-versions@^1.0.0:
-  version "1.2.1"
-  resolved "https://registry.yarnpkg.com/find-versions/-/find-versions-1.2.1.tgz#cbde9f12e38575a0af1be1b9a2c5d5fd8f186b62"
-  integrity sha1-y96fEuOFdaCvG+G5osXV/Y8Ya2I=
+find-versions@^3.0.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/find-versions/-/find-versions-3.1.0.tgz#10161f29cf3eb4350dec10a29bdde75bff0df32d"
+  integrity sha512-NCTfNiVzeE/xL+roNDffGuRbrWI6atI18lTJ22vKp7rs2OhYzMK3W1dIdO2TUndH/QMcacM4d1uWwgcZcHK69Q==
   dependencies:
-    array-uniq "^1.0.0"
-    get-stdin "^4.0.1"
-    meow "^3.5.0"
-    semver-regex "^1.0.0"
+    array-uniq "^2.1.0"
+    semver-regex "^2.0.0"
 
-first-chunk-stream@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/first-chunk-stream/-/first-chunk-stream-1.0.0.tgz#59bfb50cd905f60d7c394cd3d9acaab4e6ad934e"
-  integrity sha1-Wb+1DNkF9g18OUzT2ayqtOatk04=
-
-flatten@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/flatten/-/flatten-1.0.2.tgz#dae46a9d78fbe25292258cc1e780a41d95c03782"
-  integrity sha1-2uRqnXj74lKSJYzB54CkHZXAN4I=
-
-for-in@^1.0.1, for-in@^1.0.2:
+for-in@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/for-in/-/for-in-1.0.2.tgz#81068d295a8142ec0ac726c6e2200c30fb6d5e80"
   integrity sha1-gQaNKVqBQuwKxybG4iAMMPttXoA=
 
-for-own@^0.1.4:
-  version "0.1.5"
-  resolved "https://registry.yarnpkg.com/for-own/-/for-own-0.1.5.tgz#5265c681a4f294dabbf17c9509b6763aa84510ce"
-  integrity sha1-UmXGgaTylNq78XyVCbZ2OqhFEM4=
-  dependencies:
-    for-in "^1.0.1"
-
 forever-agent@~0.6.1:
   version "0.6.1"
   resolved "https://registry.yarnpkg.com/forever-agent/-/forever-agent-0.6.1.tgz#fbc71f0c41adeb37f96c577ad1ed42d8fdacca91"
@@ -2366,11 +2592,26 @@ forwarded@~0.1.2:
   resolved "https://registry.yarnpkg.com/forwarded/-/forwarded-0.1.2.tgz#98c23dab1175657b8c0573e8ceccd91b0ff18c84"
   integrity sha1-mMI9qxF1ZXuMBXPozszZGw/xjIQ=
 
+fragment-cache@^0.2.1:
+  version "0.2.1"
+  resolved "https://registry.yarnpkg.com/fragment-cache/-/fragment-cache-0.2.1.tgz#4290fad27f13e89be7f33799c6bc5a0abfff0d19"
+  integrity sha1-QpD60n8T6Jvn8zeZxrxaCr//DRk=
+  dependencies:
+    map-cache "^0.2.2"
+
 fresh@0.5.2:
   version "0.5.2"
   resolved "https://registry.yarnpkg.com/fresh/-/fresh-0.5.2.tgz#3d8cadd90d976569fa835ab1f8e4b23a105605a7"
   integrity sha1-PYyt2Q2XZWn6g1qx+OSyOhBWBac=
 
+from2@^2.1.1:
+  version "2.3.0"
+  resolved "https://registry.yarnpkg.com/from2/-/from2-2.3.0.tgz#8bfb5502bde4a4d36cfdeea007fcca21d7e382af"
+  integrity sha1-i/tVAr3kpNNs/e6gB/zKIdfjgq8=
+  dependencies:
+    inherits "^2.0.1"
+    readable-stream "^2.0.0"
+
 fs-constants@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/fs-constants/-/fs-constants-1.0.0.tgz#6be0de9be998ce16af8afc24497b9ee9b7ccd9ad"
@@ -2390,6 +2631,11 @@ fs.realpath@^1.0.0:
   resolved "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f"
   integrity sha1-FQStJSMVjKpA20onh8sBQRmU6k8=
 
+fsevents@^2.0.6:
+  version "2.0.7"
+  resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-2.0.7.tgz#382c9b443c6cbac4c57187cdda23aa3bf1ccfc2a"
+  integrity sha512-a7YT0SV3RB+DjYcppwVDLtn13UQnmg0SWZS7ezZD0UjnLwXmy8Zm21GMVGLaFGimIqcvyMQaOJBrop8MyOp1kQ==
+
 function-bind@^1.1.0, function-bind@^1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.1.tgz#a56899d3ea3c9bab874bb9773b7c5ede92f4895d"
@@ -2402,23 +2648,43 @@ gaze@^1.1.2:
   dependencies:
     globule "^1.0.0"
 
-get-proxy@^1.0.1:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/get-proxy/-/get-proxy-1.1.0.tgz#894854491bc591b0f147d7ae570f5c678b7256eb"
-  integrity sha1-iUhUSRvFkbDxR9euVw9cZ4tyVus=
+get-proxy@^2.0.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/get-proxy/-/get-proxy-2.1.0.tgz#349f2b4d91d44c4d4d4e9cba2ad90143fac5ef93"
+  integrity sha512-zmZIaQTWnNQb4R4fJUEp/FC51eZsc6EkErspy3xtIYStaq8EB/hDIWipxsal+E8rz0qD7f2sL/NA9Xee4RInJw==
   dependencies:
-    rc "^1.1.2"
+    npm-conf "^1.1.0"
 
 get-stdin@^4.0.1:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/get-stdin/-/get-stdin-4.0.1.tgz#b968c6b0a04384324902e8bf1a5df32579a450fe"
   integrity sha1-uWjGsKBDhDJJAui/Gl3zJXmkUP4=
 
-get-stream@^3.0.0:
+get-stream@3.0.0, get-stream@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-3.0.0.tgz#8e943d1358dc37555054ecbe2edb05aa174ede14"
   integrity sha1-jpQ9E1jcN1VQVOy+LtsFqhdO3hQ=
 
+get-stream@^2.2.0:
+  version "2.3.1"
+  resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-2.3.1.tgz#5f38f93f346009666ee0150a054167f91bdd95de"
+  integrity sha1-Xzj5PzRgCWZu4BUKBUFn+Rvdld4=
+  dependencies:
+    object-assign "^4.0.1"
+    pinkie-promise "^2.0.0"
+
+get-stream@^4.0.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-4.1.0.tgz#c1b255575f3dc21d59bfc79cd3d2b46b1c3a54b5"
+  integrity sha512-GMat4EJ5161kIy2HevLlr4luNjBgvmj413KaQA7jt4V8B4RDsfpHk7WQ9GVqfYyyx8OS/L66Kox+rJRNklLK7w==
+  dependencies:
+    pump "^3.0.0"
+
+get-value@^2.0.3, get-value@^2.0.6:
+  version "2.0.6"
+  resolved "https://registry.yarnpkg.com/get-value/-/get-value-2.0.6.tgz#dc15ca1c672387ca76bd37ac0a395ba2042a2c28"
+  integrity sha1-3BXKHGcjh8p2vTesCjlbogQqLCg=
+
 getpass@^0.1.1:
   version "0.1.7"
   resolved "https://registry.yarnpkg.com/getpass/-/getpass-0.1.7.tgz#5eff8e3e684d569ae4cb2b1282604e8ba62149fa"
@@ -2426,31 +2692,17 @@ getpass@^0.1.1:
   dependencies:
     assert-plus "^1.0.0"
 
-gifsicle@^3.0.0:
-  version "3.0.4"
-  resolved "https://registry.yarnpkg.com/gifsicle/-/gifsicle-3.0.4.tgz#f45cb5ed10165b665dc929e0e9328b6c821dfa3b"
-  integrity sha1-9Fy17RAWW2ZdySng6TKLbIId+js=
+gifsicle@^4.0.0:
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/gifsicle/-/gifsicle-4.0.1.tgz#30e1e61e3ee4884ef702641b2e98a15c2127b2e2"
+  integrity sha512-A/kiCLfDdV+ERV/UB+2O41mifd+RxH8jlRG8DMxZO84Bma/Fw0htqZ+hY2iaalLRNyUu7tYZQslqUBJxBggxbg==
   dependencies:
-    bin-build "^2.0.0"
-    bin-wrapper "^3.0.0"
+    bin-build "^3.0.0"
+    bin-wrapper "^4.0.0"
+    execa "^1.0.0"
     logalot "^2.0.0"
 
-glob-base@^0.3.0:
-  version "0.3.0"
-  resolved "https://registry.yarnpkg.com/glob-base/-/glob-base-0.3.0.tgz#dbb164f6221b1c0b1ccf82aea328b497df0ea3c4"
-  integrity sha1-27Fk9iIbHAscz4Kuoyi0l98Oo8Q=
-  dependencies:
-    glob-parent "^2.0.0"
-    is-glob "^2.0.0"
-
-glob-parent@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-2.0.0.tgz#81383d72db054fcccf5336daa902f182f6edbb28"
-  integrity sha1-gTg9ctsFT8zPUzbaqQLxgvbtuyg=
-  dependencies:
-    is-glob "^2.0.0"
-
-glob-parent@^3.0.0:
+glob-parent@^3.1.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-3.1.0.tgz#9e6af6299d8d3bd2bd40430832bd113df906c5ae"
   integrity sha1-nmr2KZ2NO9K9QEMIMr0RPfkGxa4=
@@ -2458,32 +2710,19 @@ glob-parent@^3.0.0:
     is-glob "^3.1.0"
     path-dirname "^1.0.0"
 
-glob-stream@^5.3.2:
-  version "5.3.5"
-  resolved "https://registry.yarnpkg.com/glob-stream/-/glob-stream-5.3.5.tgz#a55665a9a8ccdc41915a87c701e32d4e016fad22"
-  integrity sha1-pVZlqajM3EGRWofHAeMtTgFvrSI=
+glob-parent@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-5.0.0.tgz#1dc99f0f39b006d3e92c2c284068382f0c20e954"
+  integrity sha512-Z2RwiujPRGluePM6j699ktJYxmPpJKCfpGA13jz2hmFZC7gKetzrWvg5KN3+OsIFmydGyZ1AVwERCq1w/ZZwRg==
   dependencies:
-    extend "^3.0.0"
-    glob "^5.0.3"
-    glob-parent "^3.0.0"
-    micromatch "^2.3.7"
-    ordered-read-streams "^0.3.0"
-    through2 "^0.6.0"
-    to-absolute-glob "^0.1.1"
-    unique-stream "^2.0.2"
+    is-glob "^4.0.1"
 
-glob@^5.0.3:
-  version "5.0.15"
-  resolved "https://registry.yarnpkg.com/glob/-/glob-5.0.15.tgz#1bc936b9e02f4a603fcc222ecf7633d30b8b93b1"
-  integrity sha1-G8k2ueAvSmA/zCIuz3Yz0wuLk7E=
-  dependencies:
-    inflight "^1.0.4"
-    inherits "2"
-    minimatch "2 || 3"
-    once "^1.3.0"
-    path-is-absolute "^1.0.0"
+glob-to-regexp@^0.3.0:
+  version "0.3.0"
+  resolved "https://registry.yarnpkg.com/glob-to-regexp/-/glob-to-regexp-0.3.0.tgz#8c5a1494d2066c570cc3bfe4496175acc4d502ab"
+  integrity sha1-jFoUlNIGbFcMw7/kSWF1rMTVAqs=
 
-glob@^7.0.0, glob@^7.0.3, glob@^7.0.5, glob@^7.1.3, glob@~7.1.1:
+glob@^7.0.0, glob@^7.0.5, glob@^7.1.3, glob@~7.1.1:
   version "7.1.3"
   resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.3.tgz#3960832d3f1574108342dafd3a67b332c0969df1"
   integrity sha512-vcfuiIxogLV4DlGBHIUOwI0IbrJ8HWPc4MU7HzviGeNho/UJDfi6B5p3sHeWIQ0KGIU0Jpxi5ZHxemQfLkkAwQ==
@@ -2495,6 +2734,18 @@ glob@^7.0.0, glob@^7.0.3, glob@^7.0.5, glob@^7.1.3, glob@~7.1.1:
     once "^1.3.0"
     path-is-absolute "^1.0.0"
 
+glob@^7.1.2:
+  version "7.1.4"
+  resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.4.tgz#aa608a2f6c577ad357e1ae5a5c26d9a8d1969255"
+  integrity sha512-hkLPepehmnKk41pUGm3sYxoFs/umurYfYJCerbXEyFIWcAzvpipAgVkBqqT9RBKMGjnq6kMuyYwha6csxbiM1A==
+  dependencies:
+    fs.realpath "^1.0.0"
+    inflight "^1.0.4"
+    inherits "2"
+    minimatch "^3.0.4"
+    once "^1.3.0"
+    path-is-absolute "^1.0.0"
+
 global-modules@1.0.0, global-modules@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/global-modules/-/global-modules-1.0.0.tgz#6d770f0eb523ac78164d72b5e71a8877265cc3ea"
@@ -2520,16 +2771,18 @@ globals@^11.1.0:
   resolved "https://registry.yarnpkg.com/globals/-/globals-11.9.0.tgz#bde236808e987f290768a93d065060d78e6ab249"
   integrity sha512-5cJVtyXWH8PiJPVLZzzoIizXx944O4OmRro5MWKx5fT4MgcN7OfaMutPeaTdJCCURwbWdhhcCWcKIffPnmTzBg==
 
-globby@^6.1.0:
-  version "6.1.0"
-  resolved "https://registry.yarnpkg.com/globby/-/globby-6.1.0.tgz#f5a6d70e8395e21c858fb0489d64df02424d506c"
-  integrity sha1-9abXDoOV4hyFj7BInWTfAkJNUGw=
+globby@^8.0.1:
+  version "8.0.2"
+  resolved "https://registry.yarnpkg.com/globby/-/globby-8.0.2.tgz#5697619ccd95c5275dbb2d6faa42087c1a941d8d"
+  integrity sha512-yTzMmKygLp8RUpG1Ymu2VXPSJQZjNAZPD4ywgYEaG7e4tBJeUQBO8OpXrf1RCNcEs5alsoJYPAMiIHP0cmeC7w==
   dependencies:
     array-union "^1.0.1"
-    glob "^7.0.3"
-    object-assign "^4.0.1"
-    pify "^2.0.0"
-    pinkie-promise "^2.0.0"
+    dir-glob "2.0.0"
+    fast-glob "^2.0.2"
+    glob "^7.1.2"
+    ignore "^3.3.5"
+    pify "^3.0.0"
+    slash "^1.0.0"
 
 globule@^1.0.0:
   version "1.2.1"
@@ -2540,13 +2793,6 @@ globule@^1.0.0:
     lodash "~4.17.10"
     minimatch "~3.0.2"
 
-glogg@^1.0.0:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/glogg/-/glogg-1.0.2.tgz#2d7dd702beda22eb3bffadf880696da6d846313f"
-  integrity sha512-5mwUoSuBk44Y4EshyiqcH95ZntbDdTQqA3QYSrxmzj28Ai0vXBGMH1ApSANH14j2sIRtqCEyg6PfsuP7ElOEDA==
-  dependencies:
-    sparkles "^1.0.0"
-
 good-listener@^1.2.2:
   version "1.2.2"
   resolved "https://registry.yarnpkg.com/good-listener/-/good-listener-1.2.2.tgz#d53b30cdf9313dffb7dc9a0d477096aa6d145c50"
@@ -2554,28 +2800,55 @@ good-listener@^1.2.2:
   dependencies:
     delegate "^3.1.2"
 
-got@^5.0.0:
-  version "5.7.1"
-  resolved "https://registry.yarnpkg.com/got/-/got-5.7.1.tgz#5f81635a61e4a6589f180569ea4e381680a51f35"
-  integrity sha1-X4FjWmHkplifGAVp6k44FoClHzU=
+got@^7.0.0:
+  version "7.1.0"
+  resolved "https://registry.yarnpkg.com/got/-/got-7.1.0.tgz#05450fd84094e6bbea56f451a43a9c289166385a"
+  integrity sha512-Y5WMo7xKKq1muPsxD+KmrR8DH5auG7fBdDVueZwETwV6VytKyU9OX/ddpq2/1hp1vIPvVb4T81dKQz3BivkNLw==
   dependencies:
-    create-error-class "^3.0.1"
-    duplexer2 "^0.1.4"
-    is-redirect "^1.0.0"
+    decompress-response "^3.2.0"
+    duplexer3 "^0.1.4"
+    get-stream "^3.0.0"
+    is-plain-obj "^1.1.0"
     is-retry-allowed "^1.0.0"
     is-stream "^1.0.0"
+    isurl "^1.0.0-alpha5"
     lowercase-keys "^1.0.0"
-    node-status-codes "^1.0.0"
-    object-assign "^4.0.1"
-    parse-json "^2.1.0"
-    pinkie-promise "^2.0.0"
-    read-all-stream "^3.0.0"
-    readable-stream "^2.0.5"
-    timed-out "^3.0.0"
-    unzip-response "^1.0.2"
+    p-cancelable "^0.3.0"
+    p-timeout "^1.1.1"
+    safe-buffer "^5.0.1"
+    timed-out "^4.0.0"
     url-parse-lax "^1.0.0"
+    url-to-options "^1.0.1"
 
-graceful-fs@^4.0.0, graceful-fs@^4.1.2, graceful-fs@^4.1.6:
+got@^8.3.1:
+  version "8.3.2"
+  resolved "https://registry.yarnpkg.com/got/-/got-8.3.2.tgz#1d23f64390e97f776cac52e5b936e5f514d2e937"
+  integrity sha512-qjUJ5U/hawxosMryILofZCkm3C84PLJS/0grRIpjAwu+Lkxxj5cxeCU25BG0/3mDSpXKTyZr8oh8wIgLaH0QCw==
+  dependencies:
+    "@sindresorhus/is" "^0.7.0"
+    cacheable-request "^2.1.1"
+    decompress-response "^3.3.0"
+    duplexer3 "^0.1.4"
+    get-stream "^3.0.0"
+    into-stream "^3.1.0"
+    is-retry-allowed "^1.1.0"
+    isurl "^1.0.0-alpha5"
+    lowercase-keys "^1.0.0"
+    mimic-response "^1.0.0"
+    p-cancelable "^0.4.0"
+    p-timeout "^2.0.1"
+    pify "^3.0.0"
+    safe-buffer "^5.1.1"
+    timed-out "^4.0.1"
+    url-parse-lax "^3.0.0"
+    url-to-options "^1.0.1"
+
+graceful-fs@^4.1.10:
+  version "4.2.0"
+  resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.0.tgz#8d8fdc73977cb04104721cb53666c1ca64cd328b"
+  integrity sha512-jpSvDPV4Cq/bgtpndIWbI5hmYxhQGHPC4d4cqBPb4DLniCfhJokdXhwhaDuLBGLQdvvRum/UiX6ECVIPvDXqdg==
+
+graceful-fs@^4.1.2, graceful-fs@^4.1.6:
   version "4.1.15"
   resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.1.15.tgz#ffb703e1066e8a0eeaa4c8b80ba9253eeefbfb00"
   integrity sha512-6uHUhOPEBgQ24HM+r6b/QwWfZq+yiFcipKFrOFiBEnWdy5sdzYoi+pJeQaPI5qOLRFqWmAXUPQNsielzdLoecA==
@@ -2596,63 +2869,6 @@ gray-matter@^2.1.0:
     js-yaml "^3.8.1"
     toml "^2.3.2"
 
-gulp-decompress@^1.2.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/gulp-decompress/-/gulp-decompress-1.2.0.tgz#8eeb65a5e015f8ed8532cafe28454960626f0dc7"
-  integrity sha1-jutlpeAV+O2FMsr+KEVJYGJvDcc=
-  dependencies:
-    archive-type "^3.0.0"
-    decompress "^3.0.0"
-    gulp-util "^3.0.1"
-    readable-stream "^2.0.2"
-
-gulp-rename@^1.2.0:
-  version "1.4.0"
-  resolved "https://registry.yarnpkg.com/gulp-rename/-/gulp-rename-1.4.0.tgz#de1c718e7c4095ae861f7296ef4f3248648240bd"
-  integrity sha512-swzbIGb/arEoFK89tPY58vg3Ok1bw+d35PfUNwWqdo7KM4jkmuGA78JiDNqR+JeZFaeeHnRg9N7aihX3YPmsyg==
-
-gulp-sourcemaps@1.6.0:
-  version "1.6.0"
-  resolved "https://registry.yarnpkg.com/gulp-sourcemaps/-/gulp-sourcemaps-1.6.0.tgz#b86ff349d801ceb56e1d9e7dc7bbcb4b7dee600c"
-  integrity sha1-uG/zSdgBzrVuHZ59x7vLS33uYAw=
-  dependencies:
-    convert-source-map "^1.1.1"
-    graceful-fs "^4.1.2"
-    strip-bom "^2.0.0"
-    through2 "^2.0.0"
-    vinyl "^1.0.0"
-
-gulp-util@^3.0.1:
-  version "3.0.8"
-  resolved "https://registry.yarnpkg.com/gulp-util/-/gulp-util-3.0.8.tgz#0054e1e744502e27c04c187c3ecc505dd54bbb4f"
-  integrity sha1-AFTh50RQLifATBh8PsxQXdVLu08=
-  dependencies:
-    array-differ "^1.0.0"
-    array-uniq "^1.0.2"
-    beeper "^1.0.0"
-    chalk "^1.0.0"
-    dateformat "^2.0.0"
-    fancy-log "^1.1.0"
-    gulplog "^1.0.0"
-    has-gulplog "^0.1.0"
-    lodash._reescape "^3.0.0"
-    lodash._reevaluate "^3.0.0"
-    lodash._reinterpolate "^3.0.0"
-    lodash.template "^3.0.0"
-    minimist "^1.1.0"
-    multipipe "^0.1.2"
-    object-assign "^3.0.0"
-    replace-ext "0.0.1"
-    through2 "^2.0.0"
-    vinyl "^0.5.0"
-
-gulplog@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/gulplog/-/gulplog-1.0.0.tgz#e28c4d45d05ecbbed818363ce8f9c5926229ffe5"
-  integrity sha1-4oxNRdBey77YGDY86PnFkmIp/+U=
-  dependencies:
-    glogg "^1.0.0"
-
 gzip-size@3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/gzip-size/-/gzip-size-3.0.0.tgz#546188e9bdc337f673772f81660464b389dce520"
@@ -2680,35 +2896,71 @@ has-ansi@^2.0.0:
   dependencies:
     ansi-regex "^2.0.0"
 
-has-flag@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-1.0.0.tgz#9d9e793165ce017a00f00418c43f942a7b1d11fa"
-  integrity sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo=
-
 has-flag@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-3.0.0.tgz#b5d454dc2199ae225699f3467e5a07f3b955bafd"
   integrity sha1-tdRU3CGZriJWmfNGfloH87lVuv0=
 
-has-gulplog@^0.1.0:
-  version "0.1.0"
-  resolved "https://registry.yarnpkg.com/has-gulplog/-/has-gulplog-0.1.0.tgz#6414c82913697da51590397dafb12f22967811ce"
-  integrity sha1-ZBTIKRNpfaUVkDl9r7EvIpZ4Ec4=
-  dependencies:
-    sparkles "^1.0.0"
+has-symbol-support-x@^1.4.1:
+  version "1.4.2"
+  resolved "https://registry.yarnpkg.com/has-symbol-support-x/-/has-symbol-support-x-1.4.2.tgz#1409f98bc00247da45da67cee0a36f282ff26455"
+  integrity sha512-3ToOva++HaW+eCpgqZrCfN51IPB+7bJNVT6CUATzueB5Heb8o6Nam0V3HG5dlDvZU1Gn5QLcbahiKw/XVk5JJw==
 
 has-symbols@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/has-symbols/-/has-symbols-1.0.0.tgz#ba1a8f1af2a0fc39650f5c850367704122063b44"
   integrity sha1-uhqPGvKg/DllD1yFA2dwQSIGO0Q=
 
-has@^1.0.1:
+has-to-string-tag-x@^1.2.0:
+  version "1.4.1"
+  resolved "https://registry.yarnpkg.com/has-to-string-tag-x/-/has-to-string-tag-x-1.4.1.tgz#a045ab383d7b4b2012a00148ab0aa5f290044d4d"
+  integrity sha512-vdbKfmw+3LoOYVr+mtxHaX5a96+0f3DljYd8JOqvOLsf5mw2Otda2qCDT9qRqLAhrjyQ0h7ual5nOiASpsGNFw==
+  dependencies:
+    has-symbol-support-x "^1.4.1"
+
+has-value@^0.3.1:
+  version "0.3.1"
+  resolved "https://registry.yarnpkg.com/has-value/-/has-value-0.3.1.tgz#7b1f58bada62ca827ec0a2078025654845995e1f"
+  integrity sha1-ex9YutpiyoJ+wKIHgCVlSEWZXh8=
+  dependencies:
+    get-value "^2.0.3"
+    has-values "^0.1.4"
+    isobject "^2.0.0"
+
+has-value@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/has-value/-/has-value-1.0.0.tgz#18b281da585b1c5c51def24c930ed29a0be6b177"
+  integrity sha1-GLKB2lhbHFxR3vJMkw7SmgvmsXc=
+  dependencies:
+    get-value "^2.0.6"
+    has-values "^1.0.0"
+    isobject "^3.0.0"
+
+has-values@^0.1.4:
+  version "0.1.4"
+  resolved "https://registry.yarnpkg.com/has-values/-/has-values-0.1.4.tgz#6d61de95d91dfca9b9a02089ad384bff8f62b771"
+  integrity sha1-bWHeldkd/Km5oCCJrThL/49it3E=
+
+has-values@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/has-values/-/has-values-1.0.0.tgz#95b0b63fec2146619a6fe57fe75628d5a39efe4f"
+  integrity sha1-lbC2P+whRmGab+V/51Yo1aOe/k8=
+  dependencies:
+    is-number "^3.0.0"
+    kind-of "^4.0.0"
+
+has@^1.0.0, has@^1.0.1, has@^1.0.3:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/has/-/has-1.0.3.tgz#722d7cbfc1f6aa8241f16dd814e011e1f41e8796"
   integrity sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==
   dependencies:
     function-bind "^1.1.1"
 
+hex-color-regex@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/hex-color-regex/-/hex-color-regex-1.1.0.tgz#4c06fccb4602fe2602b3c93df82d7e7dbf1a8a8e"
+  integrity sha512-l9sfDFsuqtOqKDsQdqrMRk0U85RZc0RtOR9yPI7mRVOa4FsR/BVnZ0shmQRM96Ji99kYZP/7hn1cedc1+ApsTQ==
+
 highlight.js@^9.12.0:
   version "9.13.1"
   resolved "https://registry.yarnpkg.com/highlight.js/-/highlight.js-9.13.1.tgz#054586d53a6863311168488a0f58d6c505ce641e"
@@ -2731,6 +2983,16 @@ hosted-git-info@^2.1.4:
   resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.7.1.tgz#97f236977bd6e125408930ff6de3eec6281ec047"
   integrity sha512-7T/BxH19zbcCTa8XkMlbK5lTo1WtgkFi3GvdWEyNuc4Vex7/9Dqbnpsf4JMydcfj9HCg4zUWFTL3Za6lapg5/w==
 
+hsl-regex@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/hsl-regex/-/hsl-regex-1.0.0.tgz#d49330c789ed819e276a4c0d272dffa30b18fe6e"
+  integrity sha1-1JMwx4ntgZ4nakwNJy3/owsY/m4=
+
+hsla-regex@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/hsla-regex/-/hsla-regex-1.0.0.tgz#c1ce7a3168c8c6614033a4b5f7877f3b225f9c38"
+  integrity sha1-wc56MWjIxmFAM6S194d/OyJfnDg=
+
 html-comment-regex@^1.1.0:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/html-comment-regex/-/html-comment-regex-1.1.2.tgz#97d4688aeb5c81886a364faa0cad1dda14d433a7"
@@ -2748,15 +3010,32 @@ htmlparser2@^3.9.1:
     inherits "^2.0.1"
     readable-stream "^3.0.6"
 
-http-errors@1.6.3, http-errors@~1.6.2, http-errors@~1.6.3:
-  version "1.6.3"
-  resolved "https://registry.yarnpkg.com/http-errors/-/http-errors-1.6.3.tgz#8b55680bb4be283a0b5bf4ea2e38580be1d9320d"
-  integrity sha1-i1VoC7S+KDoLW/TqLjhYC+HZMg0=
+http-cache-semantics@3.8.1:
+  version "3.8.1"
+  resolved "https://registry.yarnpkg.com/http-cache-semantics/-/http-cache-semantics-3.8.1.tgz#39b0e16add9b605bf0a9ef3d9daaf4843b4cacd2"
+  integrity sha512-5ai2iksyV8ZXmnZhHH4rWPoxxistEexSi5936zIQ1bnNTW5VnA85B6P/VpXiRM017IgRvb2kKo1a//y+0wSp3w==
+
+http-errors@1.7.2:
+  version "1.7.2"
+  resolved "https://registry.yarnpkg.com/http-errors/-/http-errors-1.7.2.tgz#4f5029cf13239f31036e5b2e55292bcfbcc85c8f"
+  integrity sha512-uUQBt3H/cSIVfch6i1EuPNy/YsRSOUBXTVfZ+yR7Zjez3qjBz6i9+i4zjNaoqcoFVI4lQJ5plg63TvGfRSDCRg==
   dependencies:
     depd "~1.1.2"
     inherits "2.0.3"
-    setprototypeof "1.1.0"
-    statuses ">= 1.4.0 < 2"
+    setprototypeof "1.1.1"
+    statuses ">= 1.5.0 < 2"
+    toidentifier "1.0.0"
+
+http-errors@~1.7.2:
+  version "1.7.3"
+  resolved "https://registry.yarnpkg.com/http-errors/-/http-errors-1.7.3.tgz#6c619e4f9c60308c38519498c14fbb10aacebb06"
+  integrity sha512-ZTTX0MWrsQ2ZAhA1cejAwDLycFsd7I7nVtnkT3Ol0aqodaKW+0CTZDQ1uBv5whptCnc8e8HeRRJxRs0kmm/Qfw==
+  dependencies:
+    depd "~1.1.2"
+    inherits "2.0.4"
+    setprototypeof "1.1.1"
+    statuses ">= 1.5.0 < 2"
+    toidentifier "1.0.0"
 
 http-parser-js@>=0.4.0:
   version "0.5.0"
@@ -2772,68 +3051,83 @@ http-signature@~1.2.0:
     jsprim "^1.2.2"
     sshpk "^1.7.0"
 
-iconv-lite@0.4.23:
-  version "0.4.23"
-  resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.23.tgz#297871f63be507adcfbfca715d0cd0eed84e9a63"
-  integrity sha512-neyTUVFtahjf0mB3dZT77u+8O0QB89jFdnBkd5P1JgYPbPaia3gXXOVL2fq8VyU2gMMD7SaN7QukTB/pmXYvDA==
-  dependencies:
-    safer-buffer ">= 2.1.2 < 3"
-
-iconv-lite@^0.4.17:
+iconv-lite@0.4.24, iconv-lite@^0.4.17:
   version "0.4.24"
   resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.24.tgz#2022b4b25fbddc21d2f524974a474aafe733908b"
   integrity sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==
   dependencies:
     safer-buffer ">= 2.1.2 < 3"
 
-imagemin-gifsicle@^5.2.0:
-  version "5.2.0"
-  resolved "https://registry.yarnpkg.com/imagemin-gifsicle/-/imagemin-gifsicle-5.2.0.tgz#3781524c457612ef04916af34241a2b42bfcb40a"
-  integrity sha512-K01m5QuPK+0en8oVhiOOAicF7KjrHlCZxS++mfLI2mV/Ksfq/Y9nCXCWDz6jRv13wwlqe5T7hXT+ji2DnLc2yQ==
+ieee754@^1.1.4:
+  version "1.1.13"
+  resolved "https://registry.yarnpkg.com/ieee754/-/ieee754-1.1.13.tgz#ec168558e95aa181fd87d37f55c32bbcb6708b84"
+  integrity sha512-4vf7I2LYV/HaWerSo3XmlMkp5eZ83i+/CDluXi/IGTs/O1sejBNhTtnxzmRZfvOUqj7lZjqHkeTvpgSFDlWZTg==
+
+ignore@^3.3.5:
+  version "3.3.10"
+  resolved "https://registry.yarnpkg.com/ignore/-/ignore-3.3.10.tgz#0a97fb876986e8081c631160f8f9f389157f0043"
+  integrity sha512-Pgs951kaMm5GXP7MOvxERINe3gsaVjUWFm+UZPSq9xYriQAksyhg0csnS0KXSNRD5NmNdapXEpjxG49+AKh/ug==
+
+imagemin-gifsicle@^6.0.1:
+  version "6.0.1"
+  resolved "https://registry.yarnpkg.com/imagemin-gifsicle/-/imagemin-gifsicle-6.0.1.tgz#6abad4e95566d52e5a104aba1c24b4f3b48581b3"
+  integrity sha512-kuu47c6iKDQ6R9J10xCwL0lgs0+sMz3LRHqRcJ2CRBWdcNmo3T5hUaM8hSZfksptZXJLGKk8heSAvwtSdB1Fng==
   dependencies:
     exec-buffer "^3.0.0"
-    gifsicle "^3.0.0"
-    is-gif "^1.0.0"
+    gifsicle "^4.0.0"
+    is-gif "^3.0.0"
 
-imagemin-jpegtran@^5.0.2:
-  version "5.0.2"
-  resolved "https://registry.yarnpkg.com/imagemin-jpegtran/-/imagemin-jpegtran-5.0.2.tgz#e6882263b8f7916fddb800640cf75d2e970d2ad6"
-  integrity sha1-5ogiY7j3kW/duABkDPddLpcNKtY=
+imagemin-jpegtran@^6.0.0:
+  version "6.0.0"
+  resolved "https://registry.yarnpkg.com/imagemin-jpegtran/-/imagemin-jpegtran-6.0.0.tgz#c8d3bcfb6ec9c561c20a987142854be70d90b04f"
+  integrity sha512-Ih+NgThzqYfEWv9t58EItncaaXIHR0u9RuhKa8CtVBlMBvY0dCIxgQJQCfwImA4AV1PMfmUKlkyIHJjb7V4z1g==
   dependencies:
     exec-buffer "^3.0.0"
-    is-jpg "^1.0.0"
-    jpegtran-bin "^3.0.0"
+    is-jpg "^2.0.0"
+    jpegtran-bin "^4.0.0"
 
-imagemin-optipng@^5.2.1:
-  version "5.2.1"
-  resolved "https://registry.yarnpkg.com/imagemin-optipng/-/imagemin-optipng-5.2.1.tgz#d22da412c09f5ff00a4339960b98a88b1dbe8695"
-  integrity sha1-0i2kEsCfX/AKQzmWC5ioix2+hpU=
+imagemin-optipng@^6.0.0:
+  version "6.0.0"
+  resolved "https://registry.yarnpkg.com/imagemin-optipng/-/imagemin-optipng-6.0.0.tgz#a6bfc7b542fc08fc687e83dfb131249179a51a68"
+  integrity sha512-FoD2sMXvmoNm/zKPOWdhKpWdFdF9qiJmKC17MxZJPH42VMAp17/QENI/lIuP7LCUnLVAloO3AUoTSNzfhpyd8A==
   dependencies:
     exec-buffer "^3.0.0"
     is-png "^1.0.0"
-    optipng-bin "^3.0.0"
+    optipng-bin "^5.0.0"
 
-imagemin-svgo@^6.0.0:
-  version "6.0.0"
-  resolved "https://registry.yarnpkg.com/imagemin-svgo/-/imagemin-svgo-6.0.0.tgz#2dd8c82946be42a8e2cbcae3c5bf007bc2b8b9e8"
-  integrity sha512-xwjBZQKpbkklHtJYnCOwRJjTRJA/nR0hQzKMh+CUZRvm/L0QwKKPJQ9tkPWQHrg+cydPu2i1vLgHuy2E0hKEkg==
+imagemin-svgo@^7.0.0:
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/imagemin-svgo/-/imagemin-svgo-7.0.0.tgz#a22d0a5917a0d0f37e436932c30f5e000fa91b1c"
+  integrity sha512-+iGJFaPIMx8TjFW6zN+EkOhlqcemdL7F3N3Y0wODvV2kCUBuUtZK7DRZc1+Zfu4U2W/lTMUyx2G8YMOrZntIWg==
   dependencies:
-    buffer-from "^0.1.1"
-    is-svg "^2.0.0"
-    svgo "^1.0.0"
+    is-svg "^3.0.0"
+    svgo "^1.0.5"
 
-imagemin@^5.3.1:
-  version "5.3.1"
-  resolved "https://registry.yarnpkg.com/imagemin/-/imagemin-5.3.1.tgz#f19c2eee1e71ba6c6558c515f9fc96680189a6d4"
-  integrity sha1-8Zwu7h5xumxlWMUV+fyWaAGJptQ=
+imagemin@^6.0.0:
+  version "6.1.0"
+  resolved "https://registry.yarnpkg.com/imagemin/-/imagemin-6.1.0.tgz#62508b465728fea36c03cdc07d915fe2d8cf9e13"
+  integrity sha512-8ryJBL1CN5uSHpiBMX0rJw79C9F9aJqMnjGnrd/1CafegpNuA81RBAAru/jQQEOWlOJJlpRnlcVFF6wq+Ist0A==
   dependencies:
-    file-type "^4.1.0"
-    globby "^6.1.0"
+    file-type "^10.7.0"
+    globby "^8.0.1"
     make-dir "^1.0.0"
     p-pipe "^1.1.0"
-    pify "^2.3.0"
+    pify "^4.0.1"
     replace-ext "^1.0.0"
 
+import-fresh@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/import-fresh/-/import-fresh-2.0.0.tgz#d81355c15612d386c61f9ddd3922d4304822a546"
+  integrity sha1-2BNVwVYS04bGH53dOSLUMEgipUY=
+  dependencies:
+    caller-path "^2.0.0"
+    resolve-from "^3.0.0"
+
+import-lazy@^3.1.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/import-lazy/-/import-lazy-3.1.0.tgz#891279202c8a2280fdbd6674dbd8da1a1dfc67cc"
+  integrity sha512-8/gvXvX2JMn0F+CDlSC4l6kOmVaLOO3XLkksI7CI3Ud95KDYJuYur2b9P/PUt/i/pDAMd/DulQsNbbbmRRsDIQ==
+
 indent-string@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/indent-string/-/indent-string-2.1.0.tgz#8e2d48348742121b4a8218b7a137e9a52049dc80"
@@ -2854,12 +3148,17 @@ inflight@^1.0.4:
     once "^1.3.0"
     wrappy "1"
 
-inherits@2, inherits@2.0.3, inherits@^2.0.1, inherits@^2.0.3, inherits@~2.0.1, inherits@~2.0.3:
+inherits@2, inherits@2.0.3, inherits@^2.0.1, inherits@^2.0.3, inherits@~2.0.3:
   version "2.0.3"
   resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.3.tgz#633c2c83e3da42a502f52466022480f4208261de"
   integrity sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=
 
-ini@^1.3.4, ini@~1.3.0:
+inherits@2.0.4:
+  version "2.0.4"
+  resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.4.tgz#0fa2c64f932917c3433a0ded55363aae37416b7c"
+  integrity sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==
+
+ini@^1.3.4:
   version "1.3.5"
   resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.5.tgz#eee25f56db1c9ec6085e0c22778083f596abf927"
   integrity sha512-RZY5huIKCMRWDUqZlEi72f/lmXKMvuszcMBduliQ3nnWbx9X/ZBQO7DijMEYS9EhHBb2qacRUMtC7svLwe0lcw==
@@ -2889,6 +3188,14 @@ interpret@^1.0.0:
   resolved "https://registry.yarnpkg.com/interpret/-/interpret-1.1.0.tgz#7ed1b1410c6a0e0f78cf95d3b8440c63f78b8614"
   integrity sha1-ftGxQQxqDg94z5XTuEQMY/eLhhQ=
 
+into-stream@^3.1.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/into-stream/-/into-stream-3.1.0.tgz#96fb0a936c12babd6ff1752a17d05616abd094c6"
+  integrity sha1-lvsKk2wSur1v8XUqF9BWFqvQlMY=
+  dependencies:
+    from2 "^2.1.1"
+    p-is-promise "^1.1.0"
+
 invariant@^2.2.2:
   version "2.2.4"
   resolved "https://registry.yarnpkg.com/invariant/-/invariant-2.2.4.tgz#610f3c92c9359ce1db616e538008d23ff35158e6"
@@ -2896,27 +3203,29 @@ invariant@^2.2.2:
   dependencies:
     loose-envify "^1.0.0"
 
-ip-regex@^1.0.1:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/ip-regex/-/ip-regex-1.0.3.tgz#dc589076f659f419c222039a33316f1c7387effd"
-  integrity sha1-3FiQdvZZ9BnCIgOaMzFvHHOH7/0=
-
-ipaddr.js@1.8.0:
-  version "1.8.0"
-  resolved "https://registry.yarnpkg.com/ipaddr.js/-/ipaddr.js-1.8.0.tgz#eaa33d6ddd7ace8f7f6fe0c9ca0440e706738b1e"
-  integrity sha1-6qM9bd16zo9/b+DJygRA5wZzix4=
+ipaddr.js@1.9.0:
+  version "1.9.0"
+  resolved "https://registry.yarnpkg.com/ipaddr.js/-/ipaddr.js-1.9.0.tgz#37df74e430a0e47550fe54a2defe30d8acd95f65"
+  integrity sha512-M4Sjn6N/+O6/IXSJseKqHoFc+5FdGJ22sXqnjTpdZweHK64MzEPAyQZyEU3R/KRv2GLoa7nNtg/C2Ev6m7z+eA==
 
 is-absolute-url@^2.0.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/is-absolute-url/-/is-absolute-url-2.1.0.tgz#50530dfb84fcc9aa7dbe7852e83a37b93b9f2aa6"
   integrity sha1-UFMN+4T8yap9vnhS6Do3uTufKqY=
 
-is-absolute@^0.1.5:
-  version "0.1.7"
-  resolved "https://registry.yarnpkg.com/is-absolute/-/is-absolute-0.1.7.tgz#847491119fccb5fb436217cc737f7faad50f603f"
-  integrity sha1-hHSREZ/MtftDYhfMc39/qtUPYD8=
+is-accessor-descriptor@^0.1.6:
+  version "0.1.6"
+  resolved "https://registry.yarnpkg.com/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz#a9e12cb3ae8d876727eeef3843f8a0897b5c98d6"
+  integrity sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=
   dependencies:
-    is-relative "^0.1.0"
+    kind-of "^3.0.2"
+
+is-accessor-descriptor@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz#169c2f6d3df1f992618072365c9b0ea1f6878656"
+  integrity sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==
+  dependencies:
+    kind-of "^6.0.0"
 
 is-arrayish@^0.2.1:
   version "0.2.1"
@@ -2928,6 +3237,13 @@ is-arrayish@^0.3.1:
   resolved "https://registry.yarnpkg.com/is-arrayish/-/is-arrayish-0.3.2.tgz#4574a2ae56f7ab206896fb431eaeed066fdf8f03"
   integrity sha512-eVRqCvVlZbuw3GrM63ovNSNAeA1K16kaR/LRY/92w0zxQ5/1YzwblUX652i4Xs9RwAGjW9d9y6X88t8OaAJfWQ==
 
+is-binary-path@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/is-binary-path/-/is-binary-path-2.1.0.tgz#ea1f7f3b80f064236e83470f86c09c254fb45b09"
+  integrity sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==
+  dependencies:
+    binary-extensions "^2.0.0"
+
 is-buffer@^1.1.5:
   version "1.1.6"
   resolved "https://registry.yarnpkg.com/is-buffer/-/is-buffer-1.1.6.tgz#efaa2ea9daa0d7ab2ea13a97b2b8ad51fefbe8be"
@@ -2940,32 +3256,64 @@ is-builtin-module@^1.0.0:
   dependencies:
     builtin-modules "^1.0.0"
 
-is-bzip2@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/is-bzip2/-/is-bzip2-1.0.0.tgz#5ee58eaa5a2e9c80e21407bedf23ae5ac091b3fc"
-  integrity sha1-XuWOqlounIDiFAe+3yOuWsCRs/w=
-
 is-callable@^1.1.3, is-callable@^1.1.4:
   version "1.1.4"
   resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.1.4.tgz#1e1adf219e1eeb684d691f9d6a05ff0d30a24d75"
   integrity sha512-r5p9sxJjYnArLjObpjA4xu5EKI3CuKHkJXMhT7kwbpUyIFD1n5PMAsoPvWnvtZiNz7LjkYDRZhd7FlI0eMijEA==
 
+is-color-stop@^1.0.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/is-color-stop/-/is-color-stop-1.1.0.tgz#cfff471aee4dd5c9e158598fbe12967b5cdad345"
+  integrity sha1-z/9HGu5N1cnhWFmPvhKWe1za00U=
+  dependencies:
+    css-color-names "^0.0.4"
+    hex-color-regex "^1.1.0"
+    hsl-regex "^1.0.0"
+    hsla-regex "^1.0.0"
+    rgb-regex "^1.0.1"
+    rgba-regex "^1.0.0"
+
+is-data-descriptor@^0.1.4:
+  version "0.1.4"
+  resolved "https://registry.yarnpkg.com/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz#0b5ee648388e2c860282e793f1856fec3f301b56"
+  integrity sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=
+  dependencies:
+    kind-of "^3.0.2"
+
+is-data-descriptor@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz#d84876321d0e7add03990406abbbbd36ba9268c7"
+  integrity sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==
+  dependencies:
+    kind-of "^6.0.0"
+
 is-date-object@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/is-date-object/-/is-date-object-1.0.1.tgz#9aa20eb6aeebbff77fbd33e74ca01b33581d3a16"
   integrity sha1-mqIOtq7rv/d/vTPnTKAbM1gdOhY=
 
-is-dotfile@^1.0.0:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/is-dotfile/-/is-dotfile-1.0.3.tgz#a6a2f32ffd2dfb04f5ca25ecd0f6b83cf798a1e1"
-  integrity sha1-pqLzL/0t+wT1yiXs0Pa4PPeYoeE=
-
-is-equal-shallow@^0.1.3:
-  version "0.1.3"
-  resolved "https://registry.yarnpkg.com/is-equal-shallow/-/is-equal-shallow-0.1.3.tgz#2238098fc221de0bcfa5d9eac4c45d638aa1c534"
-  integrity sha1-IjgJj8Ih3gvPpdnqxMRdY4qhxTQ=
+is-descriptor@^0.1.0:
+  version "0.1.6"
+  resolved "https://registry.yarnpkg.com/is-descriptor/-/is-descriptor-0.1.6.tgz#366d8240dde487ca51823b1ab9f07a10a78251ca"
+  integrity sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==
   dependencies:
-    is-primitive "^2.0.0"
+    is-accessor-descriptor "^0.1.6"
+    is-data-descriptor "^0.1.4"
+    kind-of "^5.0.0"
+
+is-descriptor@^1.0.0, is-descriptor@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/is-descriptor/-/is-descriptor-1.0.2.tgz#3b159746a66604b04f8c81524ba365c5f14d86ec"
+  integrity sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==
+  dependencies:
+    is-accessor-descriptor "^1.0.0"
+    is-data-descriptor "^1.0.0"
+    kind-of "^6.0.2"
+
+is-directory@^0.3.1:
+  version "0.3.1"
+  resolved "https://registry.yarnpkg.com/is-directory/-/is-directory-0.3.1.tgz#61339b6f2475fc772fd9c9d83f5c8575dc154ae1"
+  integrity sha1-YTObbyR1/Hcv2cnYP1yFddwVSuE=
 
 is-extendable@^0.1.0, is-extendable@^0.1.1:
   version "0.1.1"
@@ -2979,12 +3327,7 @@ is-extendable@^1.0.1:
   dependencies:
     is-plain-object "^2.0.4"
 
-is-extglob@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/is-extglob/-/is-extglob-1.0.0.tgz#ac468177c4943405a092fc8f29760c6ffc6206c0"
-  integrity sha1-rEaBd8SUNAWgkvyPKXYMb/xiBsA=
-
-is-extglob@^2.1.0:
+is-extglob@^2.1.0, is-extglob@^2.1.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/is-extglob/-/is-extglob-2.1.1.tgz#a88c02535791f02ed37c76a1b9ea9773c833f8c2"
   integrity sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=
@@ -3001,17 +3344,12 @@ is-fullwidth-code-point@^2.0.0:
   resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz#a3b30a5c4f199183167aaab93beefae3ddfb654f"
   integrity sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=
 
-is-gif@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/is-gif/-/is-gif-1.0.0.tgz#a6d2ae98893007bffa97a1d8c01d63205832097e"
-  integrity sha1-ptKumIkwB7/6l6HYwB1jIFgyCX4=
-
-is-glob@^2.0.0, is-glob@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-2.0.1.tgz#d096f926a3ded5600f3fdfd91198cb0888c2d863"
-  integrity sha1-0Jb5JqPe1WAPP9/ZEZjLCIjC2GM=
+is-gif@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/is-gif/-/is-gif-3.0.0.tgz#c4be60b26a301d695bb833b20d9b5d66c6cf83b1"
+  integrity sha512-IqJ/jlbw5WJSNfwQ/lHEDXF8rxhRgF6ythk2oiEvhpG29F704eX9NO6TvPfMiq9DrbwgcEDnETYNcZDPewQoVw==
   dependencies:
-    is-extglob "^1.0.0"
+    file-type "^10.4.0"
 
 is-glob@^3.1.0:
   version "3.1.0"
@@ -3020,20 +3358,22 @@ is-glob@^3.1.0:
   dependencies:
     is-extglob "^2.1.0"
 
-is-gzip@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/is-gzip/-/is-gzip-1.0.0.tgz#6ca8b07b99c77998025900e555ced8ed80879a83"
-  integrity sha1-bKiwe5nHeZgCWQDlVc7Y7YCHmoM=
+is-glob@^4.0.0, is-glob@^4.0.1:
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-4.0.1.tgz#7567dbe9f2f5e2467bc77ab83c4a29482407a5dc"
+  integrity sha512-5G0tKtBTFImOqDnLB2hG6Bp2qcKEFduo4tZu9MT/H6NQv/ghhy30o55ufafxJ/LdH79LLs2Kfrn85TLKyA7BUg==
+  dependencies:
+    is-extglob "^2.1.1"
 
-is-jpg@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/is-jpg/-/is-jpg-1.0.1.tgz#296d57fdd99ce010434a7283e346ab9a1035e975"
-  integrity sha1-KW1X/dmc4BBDSnKD40armhA16XU=
+is-jpg@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/is-jpg/-/is-jpg-2.0.0.tgz#2e1997fa6e9166eaac0242daae443403e4ef1d97"
+  integrity sha1-LhmX+m6RZuqsAkLarkQ0A+TvHZc=
 
-is-natural-number@^2.0.0:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/is-natural-number/-/is-natural-number-2.1.1.tgz#7d4c5728377ef386c3e194a9911bf57c6dc335e7"
-  integrity sha1-fUxXKDd+84bD4ZSpkRv1fG3DNec=
+is-natural-number@^4.0.1:
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/is-natural-number/-/is-natural-number-4.0.1.tgz#ab9d76e1db4ced51e35de0c72ebecf09f734cde8"
+  integrity sha1-q5124dtM7VHjXeDHLr7PCfc0zeg=
 
 is-number@^2.1.0:
   version "2.1.0"
@@ -3042,22 +3382,39 @@ is-number@^2.1.0:
   dependencies:
     kind-of "^3.0.2"
 
+is-number@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/is-number/-/is-number-3.0.0.tgz#24fd6201a4782cf50561c810276afc7d12d71195"
+  integrity sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=
+  dependencies:
+    kind-of "^3.0.2"
+
 is-number@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/is-number/-/is-number-4.0.0.tgz#0026e37f5454d73e356dfe6564699867c6a7f0ff"
   integrity sha512-rSklcAIlf1OmFdyAqbnWTLVelsQ58uvZ66S/ZyawjWqIviTWCjg2PzVGw8WUA+nNuPTqb4wgA+NszrJ+08LlgQ==
 
+is-number@^7.0.0:
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/is-number/-/is-number-7.0.0.tgz#7535345b896734d5f80c4d06c50955527a14f12b"
+  integrity sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==
+
 is-obj@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/is-obj/-/is-obj-1.0.1.tgz#3e4729ac1f5fde025cd7d83a896dab9f4f67db0f"
   integrity sha1-PkcprB9f3gJc19g6iW2rn09n2w8=
 
-is-plain-obj@^1.0.0:
+is-object@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/is-object/-/is-object-1.0.1.tgz#8952688c5ec2ffd6b03ecc85e769e02903083470"
+  integrity sha1-iVJojF7C/9awPsyF52ngKQMINHA=
+
+is-plain-obj@^1.0.0, is-plain-obj@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/is-plain-obj/-/is-plain-obj-1.1.0.tgz#71a50c8429dfca773c92a390a4a03b39fcd51d3e"
   integrity sha1-caUMhCnfync8kqOQpKA7OfzVHT4=
 
-is-plain-object@^2.0.4:
+is-plain-object@^2.0.3, is-plain-object@^2.0.4:
   version "2.0.4"
   resolved "https://registry.yarnpkg.com/is-plain-object/-/is-plain-object-2.0.4.tgz#2c163b3fafb1b606d9d17928f05c2a1c38e07677"
   integrity sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==
@@ -3069,26 +3426,11 @@ is-png@^1.0.0:
   resolved "https://registry.yarnpkg.com/is-png/-/is-png-1.1.0.tgz#d574b12bf275c0350455570b0e5b57ab062077ce"
   integrity sha1-1XSxK/J1wDUEVVcLDltXqwYgd84=
 
-is-posix-bracket@^0.1.0:
-  version "0.1.1"
-  resolved "https://registry.yarnpkg.com/is-posix-bracket/-/is-posix-bracket-0.1.1.tgz#3334dc79774368e92f016e6fbc0a88f5cd6e6bc4"
-  integrity sha1-MzTceXdDaOkvAW5vvAqI9c1ua8Q=
-
-is-primitive@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/is-primitive/-/is-primitive-2.0.0.tgz#207bab91638499c07b2adf240a41a87210034575"
-  integrity sha1-IHurkWOEmcB7Kt8kCkGochADRXU=
-
 is-promise@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/is-promise/-/is-promise-2.1.0.tgz#79a2a9ece7f096e80f36d2b2f3bc16c1ff4bf3fa"
   integrity sha1-eaKp7OfwlugPNtKy87wWwf9L8/o=
 
-is-redirect@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/is-redirect/-/is-redirect-1.0.0.tgz#1d03dded53bd8db0f30c26e4f95d36fc7c87dc24"
-  integrity sha1-HQPd7VO9jbDzDCbk+V02/HyH3CQ=
-
 is-regex@^1.0.4:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/is-regex/-/is-regex-1.0.4.tgz#5517489b547091b0930e095654ced25ee97e9491"
@@ -3096,12 +3438,12 @@ is-regex@^1.0.4:
   dependencies:
     has "^1.0.1"
 
-is-relative@^0.1.0:
-  version "0.1.3"
-  resolved "https://registry.yarnpkg.com/is-relative/-/is-relative-0.1.3.tgz#905fee8ae86f45b3ec614bc3c15c869df0876e82"
-  integrity sha1-kF/uiuhvRbPsYUvDwVyGnfCHboI=
+is-resolvable@^1.0.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/is-resolvable/-/is-resolvable-1.1.0.tgz#fb18f87ce1feb925169c9a407c19318a3206ed88"
+  integrity sha512-qgDYXFSR5WvEfuS5dMj6oTMEbrrSaM0CrFk2Yiq/gXnBvD9pMa2jGXxyhGLfvhZpuMZe18CJpFxAt3CRs42NMg==
 
-is-retry-allowed@^1.0.0:
+is-retry-allowed@^1.0.0, is-retry-allowed@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/is-retry-allowed/-/is-retry-allowed-1.1.0.tgz#11a060568b67339444033d0125a61a20d564fb34"
   integrity sha1-EaBgVotnM5REAz0BJaYaINVk+zQ=
@@ -3111,15 +3453,15 @@ is-root@1.0.0:
   resolved "https://registry.yarnpkg.com/is-root/-/is-root-1.0.0.tgz#07b6c233bc394cd9d02ba15c966bd6660d6342d5"
   integrity sha1-B7bCM7w5TNnQK6FclmvWZg1jQtU=
 
-is-stream@^1.0.0, is-stream@^1.0.1, is-stream@^1.1.0:
+is-stream@^1.0.0, is-stream@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-1.1.0.tgz#12d4a3dd4e68e0b79ceb8dbc84173ae80d91ca44"
   integrity sha1-EtSj3U5o4Lec6428hBc66A2RykQ=
 
-is-svg@^2.0.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/is-svg/-/is-svg-2.1.0.tgz#cf61090da0d9efbcab8722deba6f032208dbb0e9"
-  integrity sha1-z2EJDaDZ77yrhyLeum8DIgjbsOk=
+is-svg@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/is-svg/-/is-svg-3.0.0.tgz#9321dbd29c212e5ca99c4fa9794c714bcafa2f75"
+  integrity sha512-gi4iHK53LR2ujhLVVj+37Ykh9GLqYHX6JOVXbLAucaG/Cqw9xwdFOjDM2qeifLs1sF1npXXFvDu0r5HNgCMrzQ==
   dependencies:
     html-comment-regex "^1.1.0"
 
@@ -3130,32 +3472,17 @@ is-symbol@^1.0.2:
   dependencies:
     has-symbols "^1.0.0"
 
-is-tar@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/is-tar/-/is-tar-1.0.0.tgz#2f6b2e1792c1f5bb36519acaa9d65c0d26fe853d"
-  integrity sha1-L2suF5LB9bs2UZrKqdZcDSb+hT0=
-
 is-typedarray@~1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/is-typedarray/-/is-typedarray-1.0.0.tgz#e479c80858df0c1b11ddda6940f96011fcda4a9a"
   integrity sha1-5HnICFjfDBsR3dppQPlgEfzaSpo=
 
-is-url@^1.2.0:
-  version "1.2.4"
-  resolved "https://registry.yarnpkg.com/is-url/-/is-url-1.2.4.tgz#04a4df46d28c4cff3d73d01ff06abeb318a1aa52"
-  integrity sha512-ITvGim8FhRiYe4IQ5uHSkj7pVaPDrCTkNd3yq3cV7iZAcJdHTUMPMEHcqSOy9xZ9qFenQCvi+2wjH9a1nXqHww==
-
 is-utf8@^0.2.0:
   version "0.2.1"
   resolved "https://registry.yarnpkg.com/is-utf8/-/is-utf8-0.2.1.tgz#4b0da1442104d1b336340e80797e865cf39f7d72"
   integrity sha1-Sw2hRCEE0bM2NA6AeX6GXPOffXI=
 
-is-valid-glob@^0.3.0:
-  version "0.3.0"
-  resolved "https://registry.yarnpkg.com/is-valid-glob/-/is-valid-glob-0.3.0.tgz#d4b55c69f51886f9b65c70d6c2622d37e29f48fe"
-  integrity sha1-1LVcafUYhvm2XHDWwmItN+KfSP4=
-
-is-windows@^1.0.1:
+is-windows@^1.0.1, is-windows@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/is-windows/-/is-windows-1.0.2.tgz#d1850eb9791ecd18e6182ce12a30f396634bb19d"
   integrity sha512-eXK1UInq2bPmjyX6e3VHIzMLobc4J94i4AWn+Hpq3OU5KkrRC96OAcR3PRJ/pGu6m8TRnBHP9dkXQVsT/COVIA==
@@ -3165,11 +3492,6 @@ is-wsl@^1.1.0:
   resolved "https://registry.yarnpkg.com/is-wsl/-/is-wsl-1.1.0.tgz#1f16e4aa22b04d1336b66188a66af3c600c3a66d"
   integrity sha1-HxbkqiKwTRM2tmGIpmrzxgDDpm0=
 
-is-zip@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/is-zip/-/is-zip-1.0.0.tgz#47b0a8ff4d38a76431ccfd99a8e15a4c86ba2325"
-  integrity sha1-R7Co/004p2QxzP2ZqOFaTIa6IyU=
-
 is2@0.0.9:
   version "0.0.9"
   resolved "https://registry.yarnpkg.com/is2/-/is2-0.0.9.tgz#119556d1d1651a41ba105af803267c80b299f629"
@@ -3177,11 +3499,6 @@ is2@0.0.9:
   dependencies:
     deep-is "0.1.2"
 
-isarray@0.0.1:
-  version "0.0.1"
-  resolved "https://registry.yarnpkg.com/isarray/-/isarray-0.0.1.tgz#8a18acfca9a8f4177e09abfc6038939b05d1eedf"
-  integrity sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=
-
 isarray@1.0.0, isarray@~1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/isarray/-/isarray-1.0.0.tgz#bb935d48582cba168c06834957a54a3e07124f11"
@@ -3199,7 +3516,7 @@ isobject@^2.0.0:
   dependencies:
     isarray "1.0.0"
 
-isobject@^3.0.1:
+isobject@^3.0.0, isobject@^3.0.1:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/isobject/-/isobject-3.0.1.tgz#4e431e92b11a9731636aa1f9c8d1ccbcfdab78df"
   integrity sha1-TkMekrEalzFjaqH5yNHMvP2reN8=
@@ -3209,19 +3526,22 @@ isstream@~0.1.2:
   resolved "https://registry.yarnpkg.com/isstream/-/isstream-0.1.2.tgz#47e63f7af55afa6f92e1500e690eb8b8529c099a"
   integrity sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo=
 
-jpegtran-bin@^3.0.0:
-  version "3.2.0"
-  resolved "https://registry.yarnpkg.com/jpegtran-bin/-/jpegtran-bin-3.2.0.tgz#f60ecf4ae999c0bdad2e9fbcdf2b6f0981e7a29b"
-  integrity sha1-9g7PSumZwL2tLp+83ytvCYHnops=
+isurl@^1.0.0-alpha5:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/isurl/-/isurl-1.0.0.tgz#b27f4f49f3cdaa3ea44a0a5b7f3462e6edc39d67"
+  integrity sha512-1P/yWsxPlDtn7QeRD+ULKQPaIaN6yF368GZ2vDfv0AL0NwpStafjWCDDdn0k8wgFMWpVAqG7oJhxHnlud42i9w==
   dependencies:
-    bin-build "^2.0.0"
-    bin-wrapper "^3.0.0"
-    logalot "^2.0.0"
+    has-to-string-tag-x "^1.2.0"
+    is-object "^1.0.1"
 
-js-base64@^2.1.9:
-  version "2.5.0"
-  resolved "https://registry.yarnpkg.com/js-base64/-/js-base64-2.5.0.tgz#42255ba183ab67ce59a0dee640afdc00ab5ae93e"
-  integrity sha512-wlEBIZ5LP8usDylWbDNhKPEFVFdI5hCHpnVoT/Ysvoi/PRhJENm/Rlh9TvjYB38HFfKZN7OzEbRjmjvLkFw11g==
+jpegtran-bin@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/jpegtran-bin/-/jpegtran-bin-4.0.0.tgz#d00aed809fba7aa6f30817e59eee4ddf198f8f10"
+  integrity sha512-2cRl1ism+wJUoYAYFt6O/rLBfpXNWG2dUWbgcEkTt5WGMnqI46eEro8T4C5zGROxKRqyKpCBSdHPvt5UYCtxaQ==
+  dependencies:
+    bin-build "^3.0.0"
+    bin-wrapper "^4.0.0"
+    logalot "^2.0.0"
 
 js-levenshtein@^1.1.3:
   version "1.1.4"
@@ -3246,13 +3566,13 @@ js-yaml@^3.12.0, js-yaml@^3.8.1:
     argparse "^1.0.7"
     esprima "^4.0.0"
 
-js-yaml@~3.7.0:
-  version "3.7.0"
-  resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.7.0.tgz#5c967ddd837a9bfdca5f2de84253abe8a1c03b80"
-  integrity sha1-XJZ93YN6m/3KXy3oQlOr6KHAO4A=
+js-yaml@^3.13.1:
+  version "3.13.1"
+  resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.13.1.tgz#aff151b30bfdfa8e49e05da22e7415e9dfa37847"
+  integrity sha512-YfbcO7jXDdyj0DGxYVSlSeQNHbD7XPWvrVWeVUujrQEoZzWJIRrCPoyk6kL6IAjAG2IolMK4T0hNUe0HOUs5Jw==
   dependencies:
     argparse "^1.0.7"
-    esprima "^2.6.0"
+    esprima "^4.0.0"
 
 jsbn@~0.1.0:
   version "0.1.1"
@@ -3269,6 +3589,16 @@ jsesc@~0.5.0:
   resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-0.5.0.tgz#e7dee66e35d6fc16f710fe91d5cf69f70f08911d"
   integrity sha1-597mbjXW/Bb3EP6R1c9p9w8IkR0=
 
+json-buffer@3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/json-buffer/-/json-buffer-3.0.0.tgz#5b1f397afc75d677bde8bcfc0e47e1f9a3d9a898"
+  integrity sha1-Wx85evx11ne96Lz8Dkfh+aPZqJg=
+
+json-parse-better-errors@^1.0.1:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz#bb867cfb3450e69107c131d1c514bab3dc8bcaa9"
+  integrity sha512-mrqyZKfX5EhL7hvqcV6WG1yYjnjeuYDzDhhcAAUrq8Po85NBQBJP+ZDUT75qZQ98IkUoBqdkExkukOU7Ts2wrw==
+
 json-schema-traverse@^0.4.1:
   version "0.4.1"
   resolved "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz#69f6a87d9513ab8bb8fe63bdb0979c448e684660"
@@ -3279,11 +3609,6 @@ json-schema@0.2.3:
   resolved "https://registry.yarnpkg.com/json-schema/-/json-schema-0.2.3.tgz#b480c892e59a2f05954ce727bd3f2a4e882f9e13"
   integrity sha1-tIDIkuWaLwWVTOcnvT8qTogvnhM=
 
-json-stable-stringify-without-jsonify@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz#9db7b59496ad3f3cfef30a75142d2d930ad72651"
-  integrity sha1-nbe1lJatPzz+8wp1FC0tkwrXJlE=
-
 json-stringify-safe@~5.0.1:
   version "5.0.1"
   resolved "https://registry.yarnpkg.com/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz#1296a2d58fd45f19a0f6ce01d65701e2c735b6eb"
@@ -3323,14 +3648,33 @@ jsprim@^1.2.2:
     json-schema "0.2.3"
     verror "1.10.0"
 
-kind-of@^3.0.2:
+keyv@3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/keyv/-/keyv-3.0.0.tgz#44923ba39e68b12a7cec7df6c3268c031f2ef373"
+  integrity sha512-eguHnq22OE3uVoSYG0LVWNP+4ppamWr9+zWBe1bsNcovIMy6huUJFPgy4mGwCd/rnl3vOLGW1MTlu4c57CT1xA==
+  dependencies:
+    json-buffer "3.0.0"
+
+kind-of@^3.0.2, kind-of@^3.0.3, kind-of@^3.2.0:
   version "3.2.2"
   resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-3.2.2.tgz#31ea21a734bab9bbb0f32466d893aea51e4a3c64"
   integrity sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=
   dependencies:
     is-buffer "^1.1.5"
 
-kind-of@^6.0.0:
+kind-of@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-4.0.0.tgz#20813df3d712928b207378691a45066fae72dd57"
+  integrity sha1-IIE989cSkosgc3hpGkUGb65y3Vc=
+  dependencies:
+    is-buffer "^1.1.5"
+
+kind-of@^5.0.0:
+  version "5.1.0"
+  resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-5.1.0.tgz#729c91e2d857b7a419a1f9aa65685c4c33f5845d"
+  integrity sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==
+
+kind-of@^6.0.0, kind-of@^6.0.2:
   version "6.0.2"
   resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-6.0.2.tgz#01146b36a6218e64e58f3a8d66de5d7fc6f6d051"
   integrity sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==
@@ -3342,18 +3686,6 @@ lazy-cache@^2.0.2:
   dependencies:
     set-getter "^0.1.0"
 
-lazy-req@^1.0.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/lazy-req/-/lazy-req-1.1.0.tgz#bdaebead30f8d824039ce0ce149d4daa07ba1fac"
-  integrity sha1-va6+rTD42CQDnODOFJ1Nqge6H6w=
-
-lazystream@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/lazystream/-/lazystream-1.0.0.tgz#f6995fe0f820392f61396be89462407bb77168e4"
-  integrity sha1-9plf4PggOS9hOWvolGJAe7dxaOQ=
-  dependencies:
-    readable-stream "^2.0.5"
-
 list-item@^1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/list-item/-/list-item-1.1.1.tgz#0c65d00e287cb663ccb3cb3849a77e89ec268a56"
@@ -3388,51 +3720,11 @@ locate-path@^2.0.0:
     p-locate "^2.0.0"
     path-exists "^3.0.0"
 
-lodash._basecopy@^3.0.0:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/lodash._basecopy/-/lodash._basecopy-3.0.1.tgz#8da0e6a876cf344c0ad8a54882111dd3c5c7ca36"
-  integrity sha1-jaDmqHbPNEwK2KVIghEd08XHyjY=
-
-lodash._basetostring@^3.0.0:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/lodash._basetostring/-/lodash._basetostring-3.0.1.tgz#d1861d877f824a52f669832dcaf3ee15566a07d5"
-  integrity sha1-0YYdh3+CSlL2aYMtyvPuFVZqB9U=
-
-lodash._basevalues@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/lodash._basevalues/-/lodash._basevalues-3.0.0.tgz#5b775762802bde3d3297503e26300820fdf661b7"
-  integrity sha1-W3dXYoAr3j0yl1A+JjAIIP32Ybc=
-
-lodash._getnative@^3.0.0:
-  version "3.9.1"
-  resolved "https://registry.yarnpkg.com/lodash._getnative/-/lodash._getnative-3.9.1.tgz#570bc7dede46d61cdcde687d65d3eecbaa3aaff5"
-  integrity sha1-VwvH3t5G1hzc3mh9ZdPuy6o6r/U=
-
-lodash._isiterateecall@^3.0.0:
-  version "3.0.9"
-  resolved "https://registry.yarnpkg.com/lodash._isiterateecall/-/lodash._isiterateecall-3.0.9.tgz#5203ad7ba425fae842460e696db9cf3e6aac057c"
-  integrity sha1-UgOte6Ql+uhCRg5pbbnPPmqsBXw=
-
-lodash._reescape@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/lodash._reescape/-/lodash._reescape-3.0.0.tgz#2b1d6f5dfe07c8a355753e5f27fac7f1cde1616a"
-  integrity sha1-Kx1vXf4HyKNVdT5fJ/rH8c3hYWo=
-
-lodash._reevaluate@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/lodash._reevaluate/-/lodash._reevaluate-3.0.0.tgz#58bc74c40664953ae0b124d806996daca431e2ed"
-  integrity sha1-WLx0xAZklTrgsSTYBpltrKQx4u0=
-
 lodash._reinterpolate@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/lodash._reinterpolate/-/lodash._reinterpolate-3.0.0.tgz#0ccf2d89166af03b3663c796538b75ac6e114d9d"
   integrity sha1-DM8tiRZq8Ds2Y8eWU4t1rG4RTZ0=
 
-lodash._root@^3.0.0:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/lodash._root/-/lodash._root-3.0.1.tgz#fba1c4524c19ee9a5f8136b4609f017cf4ded692"
-  integrity sha1-+6HEUkwZ7ppfgTa0YJ8BfPTe1pI=
-
 lodash.assignin@^4.0.9:
   version "4.2.0"
   resolved "https://registry.yarnpkg.com/lodash.assignin/-/lodash.assignin-4.2.0.tgz#ba8df5fb841eb0a3e8044232b0e263a8dc6a28a2"
@@ -3448,13 +3740,6 @@ lodash.defaults@^4.0.1:
   resolved "https://registry.yarnpkg.com/lodash.defaults/-/lodash.defaults-4.2.0.tgz#d09178716ffea4dde9e5fb7b37f6f0802274580c"
   integrity sha1-0JF4cW/+pN3p5ft7N/bwgCJ0WAw=
 
-lodash.escape@^3.0.0:
-  version "3.2.0"
-  resolved "https://registry.yarnpkg.com/lodash.escape/-/lodash.escape-3.2.0.tgz#995ee0dc18c1b48cc92effae71a10aab5b487698"
-  integrity sha1-mV7g3BjBtIzJLv+ucaEKq1tIdpg=
-  dependencies:
-    lodash._root "^3.0.0"
-
 lodash.filter@^4.4.0:
   version "4.6.0"
   resolved "https://registry.yarnpkg.com/lodash.filter/-/lodash.filter-4.6.0.tgz#668b1d4981603ae1cc5a6fa760143e480b4c4ace"
@@ -3470,30 +3755,6 @@ lodash.foreach@^4.3.0:
   resolved "https://registry.yarnpkg.com/lodash.foreach/-/lodash.foreach-4.5.0.tgz#1a6a35eace401280c7f06dddec35165ab27e3e53"
   integrity sha1-Gmo16s5AEoDH8G3d7DUWWrJ+PlM=
 
-lodash.isarguments@^3.0.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/lodash.isarguments/-/lodash.isarguments-3.1.0.tgz#2f573d85c6a24289ff00663b491c1d338ff3458a"
-  integrity sha1-L1c9hcaiQon/AGY7SRwdM4/zRYo=
-
-lodash.isarray@^3.0.0:
-  version "3.0.4"
-  resolved "https://registry.yarnpkg.com/lodash.isarray/-/lodash.isarray-3.0.4.tgz#79e4eb88c36a8122af86f844aa9bcd851b5fbb55"
-  integrity sha1-eeTriMNqgSKvhvhEqpvNhRtfu1U=
-
-lodash.isequal@^4.0.0:
-  version "4.5.0"
-  resolved "https://registry.yarnpkg.com/lodash.isequal/-/lodash.isequal-4.5.0.tgz#415c4478f2bcc30120c22ce10ed3226f7d3e18e0"
-  integrity sha1-QVxEePK8wwEgwizhDtMib30+GOA=
-
-lodash.keys@^3.0.0:
-  version "3.1.2"
-  resolved "https://registry.yarnpkg.com/lodash.keys/-/lodash.keys-3.1.2.tgz#4dbc0472b156be50a0b286855d1bd0b0c656098a"
-  integrity sha1-TbwEcrFWvlCgsoaFXRvQsMZWCYo=
-  dependencies:
-    lodash._getnative "^3.0.0"
-    lodash.isarguments "^3.0.0"
-    lodash.isarray "^3.0.0"
-
 lodash.map@^4.4.0:
   version "4.6.0"
   resolved "https://registry.yarnpkg.com/lodash.map/-/lodash.map-4.6.0.tgz#771ec7839e3473d9c4cde28b19394c3562f4f6d3"
@@ -3509,6 +3770,11 @@ lodash.merge@^4.4.0:
   resolved "https://registry.yarnpkg.com/lodash.merge/-/lodash.merge-4.6.1.tgz#adc25d9cb99b9391c59624f379fbba60d7111d54"
   integrity sha512-AOYza4+Hf5z1/0Hztxpm2/xiPZgi/cjMqdnKTUWTBSKchJlxXXuUSxCCl8rJlf4g6yww/j6mA8nC8Hw/EZWxKQ==
 
+lodash.merge@^4.6.2:
+  version "4.6.2"
+  resolved "https://registry.yarnpkg.com/lodash.merge/-/lodash.merge-4.6.2.tgz#558aa53b43b661e1925a0afdfa36a9a1085fe57a"
+  integrity sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==
+
 lodash.pick@^4.2.1:
   version "4.4.0"
   resolved "https://registry.yarnpkg.com/lodash.pick/-/lodash.pick-4.4.0.tgz#52f05610fff9ded422611441ed1fc123a03001b3"
@@ -3524,38 +3790,25 @@ lodash.reject@^4.4.0:
   resolved "https://registry.yarnpkg.com/lodash.reject/-/lodash.reject-4.6.0.tgz#80d6492dc1470864bbf583533b651f42a9f52415"
   integrity sha1-gNZJLcFHCGS79YNTO2UfQqn1JBU=
 
-lodash.restparam@^3.0.0:
-  version "3.6.1"
-  resolved "https://registry.yarnpkg.com/lodash.restparam/-/lodash.restparam-3.6.1.tgz#936a4e309ef330a7645ed4145986c85ae5b20805"
-  integrity sha1-k2pOMJ7zMKdkXtQUWYbIWuWyCAU=
-
 lodash.some@^4.4.0:
   version "4.6.0"
   resolved "https://registry.yarnpkg.com/lodash.some/-/lodash.some-4.6.0.tgz#1bb9f314ef6b8baded13b549169b2a945eb68e4d"
   integrity sha1-G7nzFO9ri63tE7VJFpsqlF62jk0=
 
-lodash.template@^3.0.0:
-  version "3.6.2"
-  resolved "https://registry.yarnpkg.com/lodash.template/-/lodash.template-3.6.2.tgz#f8cdecc6169a255be9098ae8b0c53d378931d14f"
-  integrity sha1-+M3sxhaaJVvpCYrosMU9N4kx0U8=
+lodash.template@^4.5.0:
+  version "4.5.0"
+  resolved "https://registry.yarnpkg.com/lodash.template/-/lodash.template-4.5.0.tgz#f976195cf3f347d0d5f52483569fe8031ccce8ab"
+  integrity sha512-84vYFxIkmidUiFxidA/KjjH9pAycqW+h980j7Fuz5qxRtO9pgB7MDFTdys1N7A5mcucRiDyEq4fusljItR1T/A==
   dependencies:
-    lodash._basecopy "^3.0.0"
-    lodash._basetostring "^3.0.0"
-    lodash._basevalues "^3.0.0"
-    lodash._isiterateecall "^3.0.0"
     lodash._reinterpolate "^3.0.0"
-    lodash.escape "^3.0.0"
-    lodash.keys "^3.0.0"
-    lodash.restparam "^3.0.0"
-    lodash.templatesettings "^3.0.0"
+    lodash.templatesettings "^4.0.0"
 
-lodash.templatesettings@^3.0.0:
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/lodash.templatesettings/-/lodash.templatesettings-3.1.1.tgz#fb307844753b66b9f1afa54e262c745307dba8e5"
-  integrity sha1-+zB4RHU7Zrnxr6VOJix0UwfbqOU=
+lodash.templatesettings@^4.0.0:
+  version "4.2.0"
+  resolved "https://registry.yarnpkg.com/lodash.templatesettings/-/lodash.templatesettings-4.2.0.tgz#e481310f049d3cf6d47e912ad09313b154f0fb33"
+  integrity sha512-stgLz+i3Aa9mZgnjr/O+v9ruKZsPsndy7qPZOchbqk2cnTU1ZaldKK+v7m54WoKIyxiuMZTKT2H81F8BeAc3ZQ==
   dependencies:
     lodash._reinterpolate "^3.0.0"
-    lodash.escape "^3.0.0"
 
 lodash.uniq@^4.5.0:
   version "4.5.0"
@@ -3595,6 +3848,11 @@ loud-rejection@^1.0.0:
     currently-unhandled "^0.4.1"
     signal-exit "^3.0.0"
 
+lowercase-keys@1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/lowercase-keys/-/lowercase-keys-1.0.0.tgz#4e3366b39e7f5457e35f1324bdf6f88d0bfc7306"
+  integrity sha1-TjNms55/VFfjXxMkvfb4jQv8cwY=
+
 lowercase-keys@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/lowercase-keys/-/lowercase-keys-1.0.1.tgz#6f9e30b47084d971a7c820ff15a6c5167b74c26f"
@@ -3618,18 +3876,30 @@ lru-cache@^4.0.1:
     pseudomap "^1.0.2"
     yallist "^2.1.2"
 
-make-dir@^1.0.0:
+make-dir@^1.0.0, make-dir@^1.2.0:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/make-dir/-/make-dir-1.3.0.tgz#79c1033b80515bd6d24ec9933e860ca75ee27f0c"
   integrity sha512-2w31R7SJtieJJnQtGc7RVL2StM2vGYVfqUOvUDxH6bC6aJTxPxTF0GnIgCyu7tjockiUWAYQRbxa7vKn34s5sQ==
   dependencies:
     pify "^3.0.0"
 
+map-cache@^0.2.2:
+  version "0.2.2"
+  resolved "https://registry.yarnpkg.com/map-cache/-/map-cache-0.2.2.tgz#c32abd0bd6525d9b051645bb4f26ac5dc98a0dbf"
+  integrity sha1-wyq9C9ZSXZsFFkW7TyasXcmKDb8=
+
 map-obj@^1.0.0, map-obj@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/map-obj/-/map-obj-1.0.1.tgz#d933ceb9205d82bdcf4886f6742bdc2b4dea146d"
   integrity sha1-2TPOuSBdgr3PSIb2dCvcK03qFG0=
 
+map-visit@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/map-visit/-/map-visit-1.0.0.tgz#ecdca8f13144e660f1b5bd41f12f3479d98dfb8f"
+  integrity sha1-7Nyo8TFE5mDxtb1B8S80edmN+48=
+  dependencies:
+    object-visit "^1.0.0"
+
 markdown-link@^0.1.1:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/markdown-link/-/markdown-link-0.1.1.tgz#32c5c65199a6457316322d1e4229d13407c8c7cf"
@@ -3653,11 +3923,6 @@ markdown-toc@^1.2.0:
     repeat-string "^1.6.1"
     strip-color "^0.1.0"
 
-math-expression-evaluator@^1.2.14:
-  version "1.2.17"
-  resolved "https://registry.yarnpkg.com/math-expression-evaluator/-/math-expression-evaluator-1.2.17.tgz#de819fdbcd84dccd8fae59c6aeb79615b9d266ac"
-  integrity sha1-3oGf282E3M2PrlnGrreWFbnSZqw=
-
 math-random@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/math-random/-/math-random-1.0.1.tgz#8b3aac588b8a66e4975e3cdea67f7bb329601fac"
@@ -3673,7 +3938,7 @@ media-typer@0.3.0:
   resolved "https://registry.yarnpkg.com/media-typer/-/media-typer-0.3.0.tgz#8710d7af0aa626f8fffa1ce00168545263255748"
   integrity sha1-hxDXrwqmJvj/+hzgAWhUUmMlV0g=
 
-meow@^3.1.0, meow@^3.3.0, meow@^3.5.0:
+meow@^3.3.0:
   version "3.7.0"
   resolved "https://registry.yarnpkg.com/meow/-/meow-3.7.0.tgz#72cb668b425228290abbfa856892587308a801fb"
   integrity sha1-cstmi0JSKCkKu/qFaJJYcwioAfs=
@@ -3694,65 +3959,73 @@ merge-descriptors@1.0.1:
   resolved "https://registry.yarnpkg.com/merge-descriptors/-/merge-descriptors-1.0.1.tgz#b00aaa556dd8b44568150ec9d1b953f3f90cbb61"
   integrity sha1-sAqqVW3YtEVoFQ7J0blT8/kMu2E=
 
-merge-stream@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/merge-stream/-/merge-stream-1.0.1.tgz#4041202d508a342ba00174008df0c251b8c135e1"
-  integrity sha1-QEEgLVCKNCugAXQAjfDCUbjBNeE=
-  dependencies:
-    readable-stream "^2.0.1"
+merge2@^1.2.3:
+  version "1.2.3"
+  resolved "https://registry.yarnpkg.com/merge2/-/merge2-1.2.3.tgz#7ee99dbd69bb6481689253f018488a1b902b0ed5"
+  integrity sha512-gdUU1Fwj5ep4kplwcmftruWofEFt6lfpkkr3h860CXbAB9c3hGb55EOL2ali0Td5oebvW0E1+3Sr+Ur7XfKpRA==
 
 methods@~1.1.2:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/methods/-/methods-1.1.2.tgz#5529a4d67654134edcc5266656835b0f851afcee"
   integrity sha1-VSmk1nZUE07cxSZmVoNbD4Ua/O4=
 
-micromatch@^2.3.7:
-  version "2.3.11"
-  resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-2.3.11.tgz#86677c97d1720b363431d04d0d15293bd38c1565"
-  integrity sha1-hmd8l9FyCzY0MdBNDRUpO9OMFWU=
+micromatch@^3.1.10:
+  version "3.1.10"
+  resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-3.1.10.tgz#70859bc95c9840952f359a068a3fc49f9ecfac23"
+  integrity sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==
   dependencies:
-    arr-diff "^2.0.0"
-    array-unique "^0.2.1"
-    braces "^1.8.2"
-    expand-brackets "^0.1.4"
-    extglob "^0.3.1"
-    filename-regex "^2.0.0"
-    is-extglob "^1.0.0"
-    is-glob "^2.0.1"
-    kind-of "^3.0.2"
-    normalize-path "^2.0.1"
-    object.omit "^2.0.0"
-    parse-glob "^3.0.4"
-    regex-cache "^0.4.2"
+    arr-diff "^4.0.0"
+    array-unique "^0.3.2"
+    braces "^2.3.1"
+    define-property "^2.0.2"
+    extend-shallow "^3.0.2"
+    extglob "^2.0.4"
+    fragment-cache "^0.2.1"
+    kind-of "^6.0.2"
+    nanomatch "^1.2.9"
+    object.pick "^1.3.0"
+    regex-not "^1.0.0"
+    snapdragon "^0.8.1"
+    to-regex "^3.0.2"
+
+mime-db@1.40.0, mime-db@^1.28.0:
+  version "1.40.0"
+  resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.40.0.tgz#a65057e998db090f732a68f6c276d387d4126c32"
+  integrity sha512-jYdeOMPy9vnxEqFRRo6ZvTZ8d9oPb+k18PKoYNYUe2stVEBPPwsln/qWzdbmaIvnhZ9v2P+CuecK+fpUfsV2mA==
 
 mime-db@~1.37.0:
   version "1.37.0"
   resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.37.0.tgz#0b6a0ce6fdbe9576e25f1f2d2fde8830dc0ad0d8"
   integrity sha512-R3C4db6bgQhlIhPU48fUtdVmKnflq+hRdad7IyKhtFj06VPNVdk2RhiYL3UjQIlso8L+YxAtFkobT0VK+S/ybg==
 
-mime-types@^2.1.12, mime-types@~2.1.18, mime-types@~2.1.19:
+mime-types@^2.1.12, mime-types@~2.1.19:
   version "2.1.21"
   resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.21.tgz#28995aa1ecb770742fe6ae7e58f9181c744b3f96"
   integrity sha512-3iL6DbwpyLzjR3xHSFNFeb9Nz/M8WDkX33t1GFQnFOllWk8pOrh/LSrB5OXlnlW5P9LH73X6loW/eogc+F5lJg==
   dependencies:
     mime-db "~1.37.0"
 
-mime@1.4.1:
-  version "1.4.1"
-  resolved "https://registry.yarnpkg.com/mime/-/mime-1.4.1.tgz#121f9ebc49e3766f311a76e1fa1c8003c4b03aa6"
-  integrity sha512-KI1+qOZu5DcW6wayYHSzR/tXKCDC5Om4s1z2QJjDULzLcmf3DvzS7oluY4HCTrc+9FiKmWUgeNLg7W3uIQvxtQ==
+mime-types@~2.1.24:
+  version "2.1.24"
+  resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.24.tgz#b6f8d0b3e951efb77dedeca194cff6d16f676f81"
+  integrity sha512-WaFHS3MCl5fapm3oLxU4eYDw77IQM2ACcxQ9RIxfaC3ooc6PFuBMGZZsYpvoXS5D5QTWPieo1jjLdAm3TBP3cQ==
+  dependencies:
+    mime-db "1.40.0"
+
+mime@1.6.0:
+  version "1.6.0"
+  resolved "https://registry.yarnpkg.com/mime/-/mime-1.6.0.tgz#32cd9e5c64553bd58d19a568af452acff04981b1"
+  integrity sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==
 
 mimic-fn@^1.0.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-1.2.0.tgz#820c86a39334640e99516928bd03fca88057d022"
   integrity sha512-jf84uxzwiuiIVKiOLpfYk7N46TSy8ubTonmneY9vrpHNAnp0QBt2BxWV9dO3/j+BoVAb+a5G6YDPW3M5HOdMWQ==
 
-"minimatch@2 || 3", minimatch@^3.0.4, minimatch@~3.0.2:
-  version "3.0.4"
-  resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.4.tgz#5166e286457f03306064be5497e8dbb0c3d32083"
-  integrity sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==
-  dependencies:
-    brace-expansion "^1.1.7"
+mimic-response@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/mimic-response/-/mimic-response-1.0.1.tgz#4923538878eef42063cb8a3e3b0798781487ab1b"
+  integrity sha512-j5EctnkH7amfV/q5Hgmoal1g2QHFJRraOtmx0JpIqkxhBhI/lJSl1nMpQ45hVarwNETOoWEimndZ4QK0RHxuxQ==
 
 minimatch@3.0.3:
   version "3.0.3"
@@ -3761,12 +4034,19 @@ minimatch@3.0.3:
   dependencies:
     brace-expansion "^1.0.0"
 
+minimatch@^3.0.4, minimatch@~3.0.2:
+  version "3.0.4"
+  resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.4.tgz#5166e286457f03306064be5497e8dbb0c3d32083"
+  integrity sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==
+  dependencies:
+    brace-expansion "^1.1.7"
+
 minimist@0.0.8:
   version "0.0.8"
   resolved "https://registry.yarnpkg.com/minimist/-/minimist-0.0.8.tgz#857fcabfc3397d2625b8228262e86aa7a011b05d"
   integrity sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=
 
-minimist@^1.1.0, minimist@^1.1.3, minimist@^1.2.0:
+minimist@^1.1.3, minimist@^1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.0.tgz#a35008b20f41383eec1fb914f4cd5df79a264284"
   integrity sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=
@@ -3779,7 +4059,15 @@ mixin-deep@^1.1.3:
     for-in "^1.0.2"
     is-extendable "^1.0.1"
 
-mkdirp@0.5.x, mkdirp@^0.5.0, mkdirp@^0.5.1, mkdirp@~0.5.1:
+mixin-deep@^1.2.0:
+  version "1.3.2"
+  resolved "https://registry.yarnpkg.com/mixin-deep/-/mixin-deep-1.3.2.tgz#1120b43dc359a785dce65b55b82e257ccf479566"
+  integrity sha512-WRoDn//mXBiJ1H40rqa3vH0toePwSsGb45iInWlTySa+Uu4k3tYUSxa2v1KqAiLtvlrSzaExqS1gtk96A9zvEA==
+  dependencies:
+    for-in "^1.0.2"
+    is-extendable "^1.0.1"
+
+mkdirp@0.5.x, mkdirp@^0.5.1, mkdirp@~0.5.1:
   version "0.5.1"
   resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.1.tgz#30057438eac6cf7f8c4767f38648d6697d75c903"
   integrity sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=
@@ -3791,27 +4079,37 @@ ms@2.0.0:
   resolved "https://registry.yarnpkg.com/ms/-/ms-2.0.0.tgz#5608aeadfc00be6c2901df5f9861788de0d597c8"
   integrity sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=
 
-ms@^2.1.1:
+ms@2.1.1, ms@^2.1.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.1.tgz#30a5864eb3ebb0a66f2ebe6d727af06a09d86e0a"
   integrity sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==
 
-multipipe@^0.1.2:
-  version "0.1.2"
-  resolved "https://registry.yarnpkg.com/multipipe/-/multipipe-0.1.2.tgz#2a8f2ddf70eed564dff2d57f1e1a137d9f05078b"
-  integrity sha1-Ko8t33Du1WTf8tV/HhoTfZ8FB4s=
-  dependencies:
-    duplexer2 "0.0.2"
-
 mute-stream@0.0.7:
   version "0.0.7"
   resolved "https://registry.yarnpkg.com/mute-stream/-/mute-stream-0.0.7.tgz#3075ce93bc21b8fab43e1bc4da7e8115ed1e7bab"
   integrity sha1-MHXOk7whuPq0PhvE2n6BFe0ee6s=
 
-negotiator@0.6.1:
-  version "0.6.1"
-  resolved "https://registry.yarnpkg.com/negotiator/-/negotiator-0.6.1.tgz#2b327184e8992101177b28563fb5e7102acd0ca9"
-  integrity sha1-KzJxhOiZIQEXeyhWP7XnECrNDKk=
+nanomatch@^1.2.9:
+  version "1.2.13"
+  resolved "https://registry.yarnpkg.com/nanomatch/-/nanomatch-1.2.13.tgz#b87a8aa4fc0de8fe6be88895b38983ff265bd119"
+  integrity sha512-fpoe2T0RbHwBTBUOftAfBPaDEi06ufaUai0mE6Yn1kacc3SnTErfb/h+X94VXzI64rKFHYImXSvdwGGCmwOqCA==
+  dependencies:
+    arr-diff "^4.0.0"
+    array-unique "^0.3.2"
+    define-property "^2.0.2"
+    extend-shallow "^3.0.2"
+    fragment-cache "^0.2.1"
+    is-windows "^1.0.2"
+    kind-of "^6.0.2"
+    object.pick "^1.3.0"
+    regex-not "^1.0.0"
+    snapdragon "^0.8.1"
+    to-regex "^3.0.1"
+
+negotiator@0.6.2:
+  version "0.6.2"
+  resolved "https://registry.yarnpkg.com/negotiator/-/negotiator-0.6.2.tgz#feacf7ccf525a77ae9634436a64883ffeca346fb"
+  integrity sha512-hZXc7K2e+PgeI1eDBe/10Ard4ekbfrrqG8Ep+8Jmf4JID2bNg7NvCPOZN+kfF574pFQI7mum2AUqDidoKqcTOw==
 
 nice-try@^1.0.4:
   version "1.0.5"
@@ -3830,10 +4128,12 @@ node-releases@^1.1.1:
   dependencies:
     semver "^5.3.0"
 
-node-status-codes@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/node-status-codes/-/node-status-codes-1.0.0.tgz#5ae5541d024645d32a58fcddc9ceecea7ae3ac2f"
-  integrity sha1-WuVUHQJGRdMqWPzdyc7s6nrjrC8=
+node-releases@^1.1.25:
+  version "1.1.25"
+  resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.25.tgz#0c2d7dbc7fed30fbe02a9ee3007b8c90bf0133d3"
+  integrity sha512-fI5BXuk83lKEoZDdH3gRhtsNgh05/wZacuXkgbiYkceE7+QIMXOg98n9ZV7mz27B+kFHnqHcUpscZZlGRSmTpQ==
+  dependencies:
+    semver "^5.3.0"
 
 normalize-package-data@^2.3.2, normalize-package-data@^2.3.4:
   version "2.4.0"
@@ -3845,27 +4145,37 @@ normalize-package-data@^2.3.2, normalize-package-data@^2.3.4:
     semver "2 || 3 || 4 || 5"
     validate-npm-package-license "^3.0.1"
 
-normalize-path@^2.0.1:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/normalize-path/-/normalize-path-2.1.1.tgz#1ab28b556e198363a8c1a6f7e6fa20137fe6aed9"
-  integrity sha1-GrKLVW4Zg2Oowab35vogE3/mrtk=
-  dependencies:
-    remove-trailing-separator "^1.0.1"
+normalize-path@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/normalize-path/-/normalize-path-3.0.0.tgz#0dcd69ff23a1c9b11fd0978316644a0388216a65"
+  integrity sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==
 
 normalize-range@^0.1.2:
   version "0.1.2"
   resolved "https://registry.yarnpkg.com/normalize-range/-/normalize-range-0.1.2.tgz#2d10c06bdfd312ea9777695a4d28439456b75942"
   integrity sha1-LRDAa9/TEuqXd2laTShDlFa3WUI=
 
-normalize-url@^1.4.0:
-  version "1.9.1"
-  resolved "https://registry.yarnpkg.com/normalize-url/-/normalize-url-1.9.1.tgz#2cc0d66b31ea23036458436e3620d85954c66c3c"
-  integrity sha1-LMDWazHqIwNkWENuNiDYWVTGbDw=
+normalize-url@2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/normalize-url/-/normalize-url-2.0.1.tgz#835a9da1551fa26f70e92329069a23aa6574d7e6"
+  integrity sha512-D6MUW4K/VzoJ4rJ01JFKxDrtY1v9wrgzCX5f2qj/lzH1m/lW6MhUZFKerVsnyjOhOsYzI9Kqqak+10l4LvLpMw==
   dependencies:
-    object-assign "^4.0.1"
-    prepend-http "^1.0.0"
-    query-string "^4.1.0"
-    sort-keys "^1.0.0"
+    prepend-http "^2.0.0"
+    query-string "^5.0.1"
+    sort-keys "^2.0.0"
+
+normalize-url@^3.0.0:
+  version "3.3.0"
+  resolved "https://registry.yarnpkg.com/normalize-url/-/normalize-url-3.3.0.tgz#b2e1c4dc4f7c6d57743df733a4f5978d18650559"
+  integrity sha512-U+JJi7duF1o+u2pynbp2zXDW2/PADgC30f0GsHZtRh+HOcXHnw137TrNlyxxRvWW5fjKd3bcLHPxofWuCjaeZg==
+
+npm-conf@^1.1.0:
+  version "1.1.3"
+  resolved "https://registry.yarnpkg.com/npm-conf/-/npm-conf-1.1.3.tgz#256cc47bd0e218c259c4e9550bf413bc2192aff9"
+  integrity sha512-Yic4bZHJOt9RCFbRP3GgpqhScOY4HH3V2P8yBj6CeYq118Qr+BLXqT2JvpJ00mryLESpgOxf5XlFv4ZjXxLScw==
+  dependencies:
+    config-chain "^1.1.11"
+    pify "^3.0.0"
 
 npm-run-path@^2.0.0:
   version "2.0.2"
@@ -3896,26 +4206,32 @@ oauth-sign@~0.9.0:
   resolved "https://registry.yarnpkg.com/oauth-sign/-/oauth-sign-0.9.0.tgz#47a7b016baa68b5fa0ecf3dee08a85c679ac6455"
   integrity sha512-fexhUFFPTGV8ybAtSIGbV6gOkSv8UtRbDBnAyLQw4QPKkgNlsH2ByPGtMUqdWkos6YCRmAqViwgZrJc/mRDzZQ==
 
-object-assign@^2.0.0:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-2.1.1.tgz#43c36e5d569ff8e4816c4efa8be02d26967c18aa"
-  integrity sha1-Q8NuXVaf+OSBbE76i+AtJpZ8GKo=
-
-object-assign@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-3.0.0.tgz#9bedd5ca0897949bca47e7ff408062d549f587f2"
-  integrity sha1-m+3VygiXlJvKR+f/QIBi1Un1h/I=
-
-object-assign@^4.0.0, object-assign@^4.0.1, object-assign@^4.1.0, object-assign@^4.1.1:
+object-assign@^4.0.1, object-assign@^4.1.0, object-assign@^4.1.1:
   version "4.1.1"
   resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863"
   integrity sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=
 
+object-copy@^0.1.0:
+  version "0.1.0"
+  resolved "https://registry.yarnpkg.com/object-copy/-/object-copy-0.1.0.tgz#7e7d858b781bd7c991a41ba975ed3812754e998c"
+  integrity sha1-fn2Fi3gb18mRpBupde04EnVOmYw=
+  dependencies:
+    copy-descriptor "^0.1.0"
+    define-property "^0.2.5"
+    kind-of "^3.0.3"
+
 object-keys@^1.0.12:
   version "1.0.12"
   resolved "https://registry.yarnpkg.com/object-keys/-/object-keys-1.0.12.tgz#09c53855377575310cca62f55bb334abff7b3ed2"
   integrity sha512-FTMyFUm2wBcGHnH2eXmz7tC6IwlqQZ6mVZ+6dm6vZ4IQIHjs6FdNsQBuKGPuUUUY6NfJw2PshC08Tn6LzLDOag==
 
+object-visit@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/object-visit/-/object-visit-1.0.1.tgz#f79c4493af0c5377b59fe39d395e41042dd045bb"
+  integrity sha1-95xEk68MU3e1n+OdOV5BBC3QRbs=
+  dependencies:
+    isobject "^3.0.0"
+
 object.getownpropertydescriptors@^2.0.3:
   version "2.0.3"
   resolved "https://registry.yarnpkg.com/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.0.3.tgz#8758c846f5b407adab0f236e0986f14b051caa16"
@@ -3924,15 +4240,7 @@ object.getownpropertydescriptors@^2.0.3:
     define-properties "^1.1.2"
     es-abstract "^1.5.1"
 
-object.omit@^2.0.0:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/object.omit/-/object.omit-2.0.1.tgz#1a9c744829f39dbb858c76ca3579ae2a54ebd1fa"
-  integrity sha1-Gpx0SCnznbuFjHbKNXmuKlTr0fo=
-  dependencies:
-    for-own "^0.1.4"
-    is-extendable "^0.1.1"
-
-object.pick@^1.2.0:
+object.pick@^1.2.0, object.pick@^1.3.0:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/object.pick/-/object.pick-1.3.0.tgz#87a10ac4c1694bd2e1cbf53591a66141fb5dd747"
   integrity sha1-h6EKxMFpS9Lhy/U1kaZhQftd10c=
@@ -3949,6 +4257,16 @@ object.values@^1.0.4:
     function-bind "^1.1.0"
     has "^1.0.1"
 
+object.values@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/object.values/-/object.values-1.1.0.tgz#bf6810ef5da3e5325790eaaa2be213ea84624da9"
+  integrity sha512-8mf0nKLAoFX6VlNVdhGj31SVYpaNFtUnuoOXWyFEstsWRgU837AK+JYM0iAxwkSzGRbwn8cbFmgbyxj1j4VbXg==
+  dependencies:
+    define-properties "^1.1.3"
+    es-abstract "^1.12.0"
+    function-bind "^1.1.1"
+    has "^1.0.3"
+
 on-finished@~2.3.0:
   version "2.3.0"
   resolved "https://registry.yarnpkg.com/on-finished/-/on-finished-2.3.0.tgz#20f1336481b083cd75337992a16971aa2d906947"
@@ -3956,18 +4274,13 @@ on-finished@~2.3.0:
   dependencies:
     ee-first "1.1.1"
 
-once@^1.3.0, once@^1.4.0:
+once@^1.3.0, once@^1.3.1, once@^1.4.0:
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz#583b1aa775961d4b113ac17d9c50baef9dd76bd1"
   integrity sha1-WDsap3WWHUsROsF9nFC6753Xa9E=
   dependencies:
     wrappy "1"
 
-onetime@^1.0.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/onetime/-/onetime-1.1.0.tgz#a1f7838f8314c516f05ecefcbc4ccfe04b4ed789"
-  integrity sha1-ofeDj4MUxRbwXs78vEzP4EtO14k=
-
 onetime@^2.0.0:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/onetime/-/onetime-2.0.1.tgz#067428230fd67443b2794b22bba528b6867962d4"
@@ -3982,23 +4295,15 @@ opn@5.2.0:
   dependencies:
     is-wsl "^1.1.0"
 
-optipng-bin@^3.0.0:
-  version "3.1.4"
-  resolved "https://registry.yarnpkg.com/optipng-bin/-/optipng-bin-3.1.4.tgz#95d34f2c488704f6fd70606bfea0c659f1d95d84"
-  integrity sha1-ldNPLEiHBPb9cGBr/qDGWfHZXYQ=
+optipng-bin@^5.0.0:
+  version "5.1.0"
+  resolved "https://registry.yarnpkg.com/optipng-bin/-/optipng-bin-5.1.0.tgz#a7c7ab600a3ab5a177dae2f94c2d800aa386b5a9"
+  integrity sha512-9baoqZTNNmXQjq/PQTWEXbVV3AMO2sI/GaaqZJZ8SExfAzjijeAP7FEeT+TtyumSw7gr0PZtSUYB/Ke7iHQVKA==
   dependencies:
-    bin-build "^2.0.0"
-    bin-wrapper "^3.0.0"
+    bin-build "^3.0.0"
+    bin-wrapper "^4.0.0"
     logalot "^2.0.0"
 
-ordered-read-streams@^0.3.0:
-  version "0.3.0"
-  resolved "https://registry.yarnpkg.com/ordered-read-streams/-/ordered-read-streams-0.3.0.tgz#7137e69b3298bb342247a1bbee3881c80e2fd78b"
-  integrity sha1-cTfmmzKYuzQiR6G77jiByA4v14s=
-  dependencies:
-    is-stream "^1.0.1"
-    readable-stream "^2.0.1"
-
 original@>=0.0.5:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/original/-/original-1.0.2.tgz#e442a61cffe1c5fd20a65f3261c26663b303f25f"
@@ -4006,21 +4311,52 @@ original@>=0.0.5:
   dependencies:
     url-parse "^1.4.3"
 
-os-filter-obj@^1.0.0:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/os-filter-obj/-/os-filter-obj-1.0.3.tgz#5915330d90eced557d2d938a31c6dd214d9c63ad"
-  integrity sha1-WRUzDZDs7VV9LZOKMcbdIU2cY60=
+os-filter-obj@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/os-filter-obj/-/os-filter-obj-2.0.0.tgz#1c0b62d5f3a2442749a2d139e6dddee6e81d8d16"
+  integrity sha512-uksVLsqG3pVdzzPvmAHpBK0wKxYItuzZr7SziusRPoz67tGV8rL1szZ6IdeUrbqLjGDwApBtN29eEE3IqGHOjg==
+  dependencies:
+    arch "^2.1.0"
 
-os-tmpdir@^1.0.0, os-tmpdir@~1.0.2:
+os-tmpdir@~1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/os-tmpdir/-/os-tmpdir-1.0.2.tgz#bbe67406c79aa85c5cfec766fe5734555dfa1274"
   integrity sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ=
 
+p-cancelable@^0.3.0:
+  version "0.3.0"
+  resolved "https://registry.yarnpkg.com/p-cancelable/-/p-cancelable-0.3.0.tgz#b9e123800bcebb7ac13a479be195b507b98d30fa"
+  integrity sha512-RVbZPLso8+jFeq1MfNvgXtCRED2raz/dKpacfTNxsx6pLEpEomM7gah6VeHSYV3+vo0OAi4MkArtQcWWXuQoyw==
+
+p-cancelable@^0.4.0:
+  version "0.4.1"
+  resolved "https://registry.yarnpkg.com/p-cancelable/-/p-cancelable-0.4.1.tgz#35f363d67d52081c8d9585e37bcceb7e0bbcb2a0"
+  integrity sha512-HNa1A8LvB1kie7cERyy21VNeHb2CWJJYqyyC2o3klWFfMGlFmWv2Z7sFgZH8ZiaYL95ydToKTFVXgMV/Os0bBQ==
+
+p-event@^1.0.0:
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/p-event/-/p-event-1.3.0.tgz#8e6b4f4f65c72bc5b6fe28b75eda874f96a4a085"
+  integrity sha1-jmtPT2XHK8W2/ii3XtqHT5akoIU=
+  dependencies:
+    p-timeout "^1.1.1"
+
+p-event@^2.1.0:
+  version "2.3.1"
+  resolved "https://registry.yarnpkg.com/p-event/-/p-event-2.3.1.tgz#596279ef169ab2c3e0cae88c1cfbb08079993ef6"
+  integrity sha512-NQCqOFhbpVTMX4qMe8PF8lbGtzZ+LCiN7pcNrb/413Na7+TRoe1xkKUzuWa/YEJdGQ0FvKtj35EEbDoVPO2kbA==
+  dependencies:
+    p-timeout "^2.0.1"
+
 p-finally@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/p-finally/-/p-finally-1.0.0.tgz#3fbcfb15b899a44123b34b6dcc18b724336a2cae"
   integrity sha1-P7z7FbiZpEEjs0ttzBi3JDNqLK4=
 
+p-is-promise@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/p-is-promise/-/p-is-promise-1.1.0.tgz#9c9456989e9f6588017b0434d56097675c3da05e"
+  integrity sha1-nJRWmJ6fZYgBewQ01WCXZ1w9oF4=
+
 p-limit@^1.1.0:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-1.3.0.tgz#b86bd5f0c25690911c7590fcbfc2010d54b3ccb8"
@@ -4035,47 +4371,71 @@ p-locate@^2.0.0:
   dependencies:
     p-limit "^1.1.0"
 
+p-map-series@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/p-map-series/-/p-map-series-1.0.0.tgz#bf98fe575705658a9e1351befb85ae4c1f07bdca"
+  integrity sha1-v5j+V1cFZYqeE1G++4WuTB8Hvco=
+  dependencies:
+    p-reduce "^1.0.0"
+
 p-pipe@^1.1.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/p-pipe/-/p-pipe-1.2.0.tgz#4b1a11399a11520a67790ee5a0c1d5881d6befe9"
   integrity sha1-SxoROZoRUgpneQ7loMHViB1r7+k=
 
+p-reduce@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/p-reduce/-/p-reduce-1.0.0.tgz#18c2b0dd936a4690a529f8231f58a0fdb6a47dfa"
+  integrity sha1-GMKw3ZNqRpClKfgjH1ig/bakffo=
+
+p-timeout@^1.1.1:
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/p-timeout/-/p-timeout-1.2.1.tgz#5eb3b353b7fce99f101a1038880bb054ebbea386"
+  integrity sha1-XrOzU7f86Z8QGhA4iAuwVOu+o4Y=
+  dependencies:
+    p-finally "^1.0.0"
+
+p-timeout@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/p-timeout/-/p-timeout-2.0.1.tgz#d8dd1979595d2dc0139e1fe46b8b646cb3cdf038"
+  integrity sha512-88em58dDVB/KzPEx1X0N3LwFfYZPyDc4B6eF38M1rk9VTZMbxXXgjugz8mmwpS9Ox4BDZ+t6t3QP5+/gazweIA==
+  dependencies:
+    p-finally "^1.0.0"
+
 p-try@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/p-try/-/p-try-1.0.0.tgz#cbc79cdbaf8fd4228e13f621f2b1a237c1b207b3"
   integrity sha1-y8ec26+P1CKOE/Yh8rGiN8GyB7M=
 
-parse-glob@^3.0.4:
-  version "3.0.4"
-  resolved "https://registry.yarnpkg.com/parse-glob/-/parse-glob-3.0.4.tgz#b2c376cfb11f35513badd173ef0bb6e3a388391c"
-  integrity sha1-ssN2z7EfNVE7rdFz7wu246OIORw=
-  dependencies:
-    glob-base "^0.3.0"
-    is-dotfile "^1.0.0"
-    is-extglob "^1.0.0"
-    is-glob "^2.0.0"
-
-parse-json@^2.1.0, parse-json@^2.2.0:
+parse-json@^2.2.0:
   version "2.2.0"
   resolved "https://registry.yarnpkg.com/parse-json/-/parse-json-2.2.0.tgz#f480f40434ef80741f8469099f8dea18f55a4dc9"
   integrity sha1-9ID0BDTvgHQfhGkJn43qGPVaTck=
   dependencies:
     error-ex "^1.2.0"
 
-parse-node-version@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/parse-node-version/-/parse-node-version-1.0.0.tgz#33d9aa8920dcc3c0d33658ec18ce237009a56d53"
-  integrity sha512-02GTVHD1u0nWc20n2G7WX/PgdhNFG04j5fi1OkaJzPWLTcf6vh6229Lta1wTmXG/7Dg42tCssgkccVt7qvd8Kg==
+parse-json@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/parse-json/-/parse-json-4.0.0.tgz#be35f5425be1f7f6c747184f98a788cb99477ee0"
+  integrity sha1-vjX1Qlvh9/bHRxhPmKeIy5lHfuA=
+  dependencies:
+    error-ex "^1.3.1"
+    json-parse-better-errors "^1.0.1"
 
 parse-passwd@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/parse-passwd/-/parse-passwd-1.0.0.tgz#6d5b934a456993b23d37f40a382d6f1666a8e5c6"
   integrity sha1-bVuTSkVpk7I9N/QKOC1vFmao5cY=
 
-parseurl@~1.3.2:
-  version "1.3.2"
-  resolved "https://registry.yarnpkg.com/parseurl/-/parseurl-1.3.2.tgz#fc289d4ed8993119460c156253262cdc8de65bf3"
-  integrity sha1-/CidTtiZMRlGDBViUyYs3I3mW/M=
+parseurl@~1.3.3:
+  version "1.3.3"
+  resolved "https://registry.yarnpkg.com/parseurl/-/parseurl-1.3.3.tgz#9da19e7bee8d12dff0513ed5b76957793bc2e8d4"
+  integrity sha512-CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ==
+
+pascalcase@^0.1.1:
+  version "0.1.1"
+  resolved "https://registry.yarnpkg.com/pascalcase/-/pascalcase-0.1.1.tgz#b363e55e8006ca6fe21784d2db22bd15d7917f14"
+  integrity sha1-s2PlXoAGym/iF4TS2yK9FdeRfxQ=
 
 path-dirname@^1.0.0:
   version "1.0.2"
@@ -4123,6 +4483,13 @@ path-type@^1.0.0:
     pify "^2.0.0"
     pinkie-promise "^2.0.0"
 
+path-type@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/path-type/-/path-type-3.0.0.tgz#cef31dc8e0a1a3bb0d105c0cd97cf3bf47f4e36f"
+  integrity sha512-T2ZUsdZFHgA3u4e5PfPbjd7HDDpxPnQb5jN0SrDsjNSuVXHJqtwTnWqG0B1jZrgmJ/7lj1EmVIByWt1gxGkWvg==
+  dependencies:
+    pify "^3.0.0"
+
 pend@~1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/pend/-/pend-1.2.0.tgz#7a57eb550a6783f9115331fcf4663d5c8e007a50"
@@ -4133,7 +4500,12 @@ performance-now@^2.1.0:
   resolved "https://registry.yarnpkg.com/performance-now/-/performance-now-2.1.0.tgz#6309f4e0e5fa913ec1c69307ae364b4b377c9e7b"
   integrity sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns=
 
-pify@^2.0.0, pify@^2.3.0:
+picomatch@^2.0.4:
+  version "2.0.7"
+  resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.0.7.tgz#514169d8c7cd0bdbeecc8a2609e34a7163de69f6"
+  integrity sha512-oLHIdio3tZ0qH76NybpeneBhYVj0QFTfXEFTc/B3zKQspYfYYkWYgFsmzo+4kvId/bQRcNkVeguI3y+CD22BtA==
+
+pify@^2.0.0, pify@^2.2.0, pify@^2.3.0:
   version "2.3.0"
   resolved "https://registry.yarnpkg.com/pify/-/pify-2.3.0.tgz#ed141a6ac043a849ea588498e7dca8b15330e90c"
   integrity sha1-7RQaasBDqEnqWISY59yosVMw6Qw=
@@ -4143,6 +4515,11 @@ pify@^3.0.0:
   resolved "https://registry.yarnpkg.com/pify/-/pify-3.0.0.tgz#e5a4acd2c101fdf3d9a4d07f0dbc4db49dd28176"
   integrity sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=
 
+pify@^4.0.1:
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/pify/-/pify-4.0.1.tgz#4b2cd25c50d598735c50292224fd8c6df41e3231"
+  integrity sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g==
+
 pinkie-promise@^2.0.0:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/pinkie-promise/-/pinkie-promise-2.0.1.tgz#2135d6dfa7a358c069ac9b178776288228450ffa"
@@ -4178,246 +4555,297 @@ portfinder@^1.0.17:
     debug "^2.2.0"
     mkdirp "0.5.x"
 
-postcss-calc@^5.2.0:
-  version "5.3.1"
-  resolved "https://registry.yarnpkg.com/postcss-calc/-/postcss-calc-5.3.1.tgz#77bae7ca928ad85716e2fda42f261bf7c1d65b5e"
-  integrity sha1-d7rnypKK2FcW4v2kLyYb98HWW14=
-  dependencies:
-    postcss "^5.0.2"
-    postcss-message-helpers "^2.0.0"
-    reduce-css-calc "^1.2.6"
-
-postcss-colormin@^2.1.8:
-  version "2.2.2"
-  resolved "https://registry.yarnpkg.com/postcss-colormin/-/postcss-colormin-2.2.2.tgz#6631417d5f0e909a3d7ec26b24c8a8d1e4f96e4b"
-  integrity sha1-ZjFBfV8OkJo9fsJrJMio0eT5bks=
-  dependencies:
-    colormin "^1.0.5"
-    postcss "^5.0.13"
-    postcss-value-parser "^3.2.3"
-
-postcss-convert-values@^2.3.4:
-  version "2.6.1"
-  resolved "https://registry.yarnpkg.com/postcss-convert-values/-/postcss-convert-values-2.6.1.tgz#bbd8593c5c1fd2e3d1c322bb925dcae8dae4d62d"
-  integrity sha1-u9hZPFwf0uPRwyK7kl3K6Nrk1i0=
-  dependencies:
-    postcss "^5.0.11"
-    postcss-value-parser "^3.1.2"
-
-postcss-discard-comments@^2.0.4:
-  version "2.0.4"
-  resolved "https://registry.yarnpkg.com/postcss-discard-comments/-/postcss-discard-comments-2.0.4.tgz#befe89fafd5b3dace5ccce51b76b81514be00e3d"
-  integrity sha1-vv6J+v1bPazlzM5Rt2uBUUvgDj0=
-  dependencies:
-    postcss "^5.0.14"
-
-postcss-discard-duplicates@^2.0.1:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/postcss-discard-duplicates/-/postcss-discard-duplicates-2.1.0.tgz#b9abf27b88ac188158a5eb12abcae20263b91932"
-  integrity sha1-uavye4isGIFYpesSq8riAmO5GTI=
-  dependencies:
-    postcss "^5.0.4"
-
-postcss-discard-empty@^2.0.1:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/postcss-discard-empty/-/postcss-discard-empty-2.1.0.tgz#d2b4bd9d5ced5ebd8dcade7640c7d7cd7f4f92b5"
-  integrity sha1-0rS9nVztXr2Nyt52QMfXzX9PkrU=
-  dependencies:
-    postcss "^5.0.14"
-
-postcss-discard-overridden@^0.1.1:
+posix-character-classes@^0.1.0:
   version "0.1.1"
-  resolved "https://registry.yarnpkg.com/postcss-discard-overridden/-/postcss-discard-overridden-0.1.1.tgz#8b1eaf554f686fb288cd874c55667b0aa3668d58"
-  integrity sha1-ix6vVU9ob7KIzYdMVWZ7CqNmjVg=
-  dependencies:
-    postcss "^5.0.16"
+  resolved "https://registry.yarnpkg.com/posix-character-classes/-/posix-character-classes-0.1.1.tgz#01eac0fe3b5af71a2a6c02feabb8c1fef7e00eab"
+  integrity sha1-AerA/jta9xoqbAL+q7jB/vfgDqs=
 
-postcss-discard-unused@^2.2.1:
-  version "2.2.3"
-  resolved "https://registry.yarnpkg.com/postcss-discard-unused/-/postcss-discard-unused-2.2.3.tgz#bce30b2cc591ffc634322b5fb3464b6d934f4433"
-  integrity sha1-vOMLLMWR/8Y0Mitfs0ZLbZNPRDM=
+postcss-calc@^7.0.1:
+  version "7.0.1"
+  resolved "https://registry.yarnpkg.com/postcss-calc/-/postcss-calc-7.0.1.tgz#36d77bab023b0ecbb9789d84dcb23c4941145436"
+  integrity sha512-oXqx0m6tb4N3JGdmeMSc/i91KppbYsFZKdH0xMOqK8V1rJlzrKlTdokz8ozUXLVejydRN6u2IddxpcijRj2FqQ==
   dependencies:
-    postcss "^5.0.14"
-    uniqs "^2.0.0"
+    css-unit-converter "^1.1.1"
+    postcss "^7.0.5"
+    postcss-selector-parser "^5.0.0-rc.4"
+    postcss-value-parser "^3.3.1"
 
-postcss-filter-plugins@^2.0.0:
-  version "2.0.3"
-  resolved "https://registry.yarnpkg.com/postcss-filter-plugins/-/postcss-filter-plugins-2.0.3.tgz#82245fdf82337041645e477114d8e593aa18b8ec"
-  integrity sha512-T53GVFsdinJhgwm7rg1BzbeBRomOg9y5MBVhGcsV0CxurUdVj1UlPdKtn7aqYA/c/QVkzKMjq2bSV5dKG5+AwQ==
+postcss-colormin@^4.0.3:
+  version "4.0.3"
+  resolved "https://registry.yarnpkg.com/postcss-colormin/-/postcss-colormin-4.0.3.tgz#ae060bce93ed794ac71264f08132d550956bd381"
+  integrity sha512-WyQFAdDZpExQh32j0U0feWisZ0dmOtPl44qYmJKkq9xFWY3p+4qnRzCHeNrkeRhwPHz9bQ3mo0/yVkaply0MNw==
   dependencies:
-    postcss "^5.0.4"
+    browserslist "^4.0.0"
+    color "^3.0.0"
+    has "^1.0.0"
+    postcss "^7.0.0"
+    postcss-value-parser "^3.0.0"
 
-postcss-merge-idents@^2.1.5:
-  version "2.1.7"
-  resolved "https://registry.yarnpkg.com/postcss-merge-idents/-/postcss-merge-idents-2.1.7.tgz#4c5530313c08e1d5b3bbf3d2bbc747e278eea270"
-  integrity sha1-TFUwMTwI4dWzu/PSu8dH4njuonA=
+postcss-convert-values@^4.0.1:
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/postcss-convert-values/-/postcss-convert-values-4.0.1.tgz#ca3813ed4da0f812f9d43703584e449ebe189a7f"
+  integrity sha512-Kisdo1y77KUC0Jmn0OXU/COOJbzM8cImvw1ZFsBgBgMgb1iL23Zs/LXRe3r+EZqM3vGYKdQ2YJVQ5VkJI+zEJQ==
   dependencies:
-    has "^1.0.1"
-    postcss "^5.0.10"
-    postcss-value-parser "^3.1.1"
+    postcss "^7.0.0"
+    postcss-value-parser "^3.0.0"
 
-postcss-merge-longhand@^2.0.1:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/postcss-merge-longhand/-/postcss-merge-longhand-2.0.2.tgz#23d90cd127b0a77994915332739034a1a4f3d658"
-  integrity sha1-I9kM0Sewp3mUkVMyc5A0oaTz1lg=
+postcss-discard-comments@^4.0.2:
+  version "4.0.2"
+  resolved "https://registry.yarnpkg.com/postcss-discard-comments/-/postcss-discard-comments-4.0.2.tgz#1fbabd2c246bff6aaad7997b2b0918f4d7af4033"
+  integrity sha512-RJutN259iuRf3IW7GZyLM5Sw4GLTOH8FmsXBnv8Ab/Tc2k4SR4qbV4DNbyyY4+Sjo362SyDmW2DQ7lBSChrpkg==
   dependencies:
-    postcss "^5.0.4"
+    postcss "^7.0.0"
 
-postcss-merge-rules@^2.0.3:
-  version "2.1.2"
-  resolved "https://registry.yarnpkg.com/postcss-merge-rules/-/postcss-merge-rules-2.1.2.tgz#d1df5dfaa7b1acc3be553f0e9e10e87c61b5f721"
-  integrity sha1-0d9d+qexrMO+VT8OnhDofGG19yE=
+postcss-discard-duplicates@^4.0.2:
+  version "4.0.2"
+  resolved "https://registry.yarnpkg.com/postcss-discard-duplicates/-/postcss-discard-duplicates-4.0.2.tgz#3fe133cd3c82282e550fc9b239176a9207b784eb"
+  integrity sha512-ZNQfR1gPNAiXZhgENFfEglF93pciw0WxMkJeVmw8eF+JZBbMD7jp6C67GqJAXVZP2BWbOztKfbsdmMp/k8c6oQ==
   dependencies:
-    browserslist "^1.5.2"
-    caniuse-api "^1.5.2"
-    postcss "^5.0.4"
-    postcss-selector-parser "^2.2.2"
+    postcss "^7.0.0"
+
+postcss-discard-empty@^4.0.1:
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/postcss-discard-empty/-/postcss-discard-empty-4.0.1.tgz#c8c951e9f73ed9428019458444a02ad90bb9f765"
+  integrity sha512-B9miTzbznhDjTfjvipfHoqbWKwd0Mj+/fL5s1QOz06wufguil+Xheo4XpOnc4NqKYBCNqqEzgPv2aPBIJLox0w==
+  dependencies:
+    postcss "^7.0.0"
+
+postcss-discard-overridden@^4.0.1:
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/postcss-discard-overridden/-/postcss-discard-overridden-4.0.1.tgz#652aef8a96726f029f5e3e00146ee7a4e755ff57"
+  integrity sha512-IYY2bEDD7g1XM1IDEsUT4//iEYCxAmP5oDSFMVU/JVvT7gh+l4fmjciLqGgwjdWpQIdb0Che2VX00QObS5+cTg==
+  dependencies:
+    postcss "^7.0.0"
+
+postcss-merge-longhand@^4.0.11:
+  version "4.0.11"
+  resolved "https://registry.yarnpkg.com/postcss-merge-longhand/-/postcss-merge-longhand-4.0.11.tgz#62f49a13e4a0ee04e7b98f42bb16062ca2549e24"
+  integrity sha512-alx/zmoeXvJjp7L4mxEMjh8lxVlDFX1gqWHzaaQewwMZiVhLo42TEClKaeHbRf6J7j82ZOdTJ808RtN0ZOZwvw==
+  dependencies:
+    css-color-names "0.0.4"
+    postcss "^7.0.0"
+    postcss-value-parser "^3.0.0"
+    stylehacks "^4.0.0"
+
+postcss-merge-rules@^4.0.3:
+  version "4.0.3"
+  resolved "https://registry.yarnpkg.com/postcss-merge-rules/-/postcss-merge-rules-4.0.3.tgz#362bea4ff5a1f98e4075a713c6cb25aefef9a650"
+  integrity sha512-U7e3r1SbvYzO0Jr3UT/zKBVgYYyhAz0aitvGIYOYK5CPmkNih+WDSsS5tvPrJ8YMQYlEMvsZIiqmn7HdFUaeEQ==
+  dependencies:
+    browserslist "^4.0.0"
+    caniuse-api "^3.0.0"
+    cssnano-util-same-parent "^4.0.0"
+    postcss "^7.0.0"
+    postcss-selector-parser "^3.0.0"
     vendors "^1.0.0"
 
-postcss-message-helpers@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/postcss-message-helpers/-/postcss-message-helpers-2.0.0.tgz#a4f2f4fab6e4fe002f0aed000478cdf52f9ba60e"
-  integrity sha1-pPL0+rbk/gAvCu0ABHjN9S+bpg4=
-
-postcss-minify-font-values@^1.0.2:
-  version "1.0.5"
-  resolved "https://registry.yarnpkg.com/postcss-minify-font-values/-/postcss-minify-font-values-1.0.5.tgz#4b58edb56641eba7c8474ab3526cafd7bbdecb69"
-  integrity sha1-S1jttWZB66fIR0qzUmyv17vey2k=
+postcss-minify-font-values@^4.0.2:
+  version "4.0.2"
+  resolved "https://registry.yarnpkg.com/postcss-minify-font-values/-/postcss-minify-font-values-4.0.2.tgz#cd4c344cce474343fac5d82206ab2cbcb8afd5a6"
+  integrity sha512-j85oO6OnRU9zPf04+PZv1LYIYOprWm6IA6zkXkrJXyRveDEuQggG6tvoy8ir8ZwjLxLuGfNkCZEQG7zan+Hbtg==
   dependencies:
-    object-assign "^4.0.1"
-    postcss "^5.0.4"
-    postcss-value-parser "^3.0.2"
+    postcss "^7.0.0"
+    postcss-value-parser "^3.0.0"
 
-postcss-minify-gradients@^1.0.1:
-  version "1.0.5"
-  resolved "https://registry.yarnpkg.com/postcss-minify-gradients/-/postcss-minify-gradients-1.0.5.tgz#5dbda11373703f83cfb4a3ea3881d8d75ff5e6e1"
-  integrity sha1-Xb2hE3NwP4PPtKPqOIHY11/15uE=
+postcss-minify-gradients@^4.0.2:
+  version "4.0.2"
+  resolved "https://registry.yarnpkg.com/postcss-minify-gradients/-/postcss-minify-gradients-4.0.2.tgz#93b29c2ff5099c535eecda56c4aa6e665a663471"
+  integrity sha512-qKPfwlONdcf/AndP1U8SJ/uzIJtowHlMaSioKzebAXSG4iJthlWC9iSWznQcX4f66gIWX44RSA841HTHj3wK+Q==
   dependencies:
-    postcss "^5.0.12"
-    postcss-value-parser "^3.3.0"
+    cssnano-util-get-arguments "^4.0.0"
+    is-color-stop "^1.0.0"
+    postcss "^7.0.0"
+    postcss-value-parser "^3.0.0"
 
-postcss-minify-params@^1.0.4:
-  version "1.2.2"
-  resolved "https://registry.yarnpkg.com/postcss-minify-params/-/postcss-minify-params-1.2.2.tgz#ad2ce071373b943b3d930a3fa59a358c28d6f1f3"
-  integrity sha1-rSzgcTc7lDs9kwo/pZo1jCjW8fM=
+postcss-minify-params@^4.0.2:
+  version "4.0.2"
+  resolved "https://registry.yarnpkg.com/postcss-minify-params/-/postcss-minify-params-4.0.2.tgz#6b9cef030c11e35261f95f618c90036d680db874"
+  integrity sha512-G7eWyzEx0xL4/wiBBJxJOz48zAKV2WG3iZOqVhPet/9geefm/Px5uo1fzlHu+DOjT+m0Mmiz3jkQzVHe6wxAWg==
   dependencies:
-    alphanum-sort "^1.0.1"
-    postcss "^5.0.2"
-    postcss-value-parser "^3.0.2"
+    alphanum-sort "^1.0.0"
+    browserslist "^4.0.0"
+    cssnano-util-get-arguments "^4.0.0"
+    postcss "^7.0.0"
+    postcss-value-parser "^3.0.0"
     uniqs "^2.0.0"
 
-postcss-minify-selectors@^2.0.4:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/postcss-minify-selectors/-/postcss-minify-selectors-2.1.1.tgz#b2c6a98c0072cf91b932d1a496508114311735bf"
-  integrity sha1-ssapjAByz5G5MtGkllCBFDEXNb8=
+postcss-minify-selectors@^4.0.2:
+  version "4.0.2"
+  resolved "https://registry.yarnpkg.com/postcss-minify-selectors/-/postcss-minify-selectors-4.0.2.tgz#e2e5eb40bfee500d0cd9243500f5f8ea4262fbd8"
+  integrity sha512-D5S1iViljXBj9kflQo4YutWnJmwm8VvIsU1GeXJGiG9j8CIg9zs4voPMdQDUmIxetUOh60VilsNzCiAFTOqu3g==
   dependencies:
-    alphanum-sort "^1.0.2"
-    has "^1.0.1"
-    postcss "^5.0.14"
-    postcss-selector-parser "^2.0.0"
+    alphanum-sort "^1.0.0"
+    has "^1.0.0"
+    postcss "^7.0.0"
+    postcss-selector-parser "^3.0.0"
 
-postcss-normalize-charset@^1.1.0:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/postcss-normalize-charset/-/postcss-normalize-charset-1.1.1.tgz#ef9ee71212d7fe759c78ed162f61ed62b5cb93f1"
-  integrity sha1-757nEhLX/nWceO0WL2HtYrXLk/E=
+postcss-normalize-charset@^4.0.1:
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/postcss-normalize-charset/-/postcss-normalize-charset-4.0.1.tgz#8b35add3aee83a136b0471e0d59be58a50285dd4"
+  integrity sha512-gMXCrrlWh6G27U0hF3vNvR3w8I1s2wOBILvA87iNXaPvSNo5uZAMYsZG7XjCUf1eVxuPfyL4TJ7++SGZLc9A3g==
   dependencies:
-    postcss "^5.0.5"
+    postcss "^7.0.0"
 
-postcss-normalize-url@^3.0.7:
-  version "3.0.8"
-  resolved "https://registry.yarnpkg.com/postcss-normalize-url/-/postcss-normalize-url-3.0.8.tgz#108f74b3f2fcdaf891a2ffa3ea4592279fc78222"
-  integrity sha1-EI90s/L82viRov+j6kWSJ5/HgiI=
+postcss-normalize-display-values@^4.0.2:
+  version "4.0.2"
+  resolved "https://registry.yarnpkg.com/postcss-normalize-display-values/-/postcss-normalize-display-values-4.0.2.tgz#0dbe04a4ce9063d4667ed2be476bb830c825935a"
+  integrity sha512-3F2jcsaMW7+VtRMAqf/3m4cPFhPD3EFRgNs18u+k3lTJJlVe7d0YPO+bnwqo2xg8YiRpDXJI2u8A0wqJxMsQuQ==
+  dependencies:
+    cssnano-util-get-match "^4.0.0"
+    postcss "^7.0.0"
+    postcss-value-parser "^3.0.0"
+
+postcss-normalize-positions@^4.0.2:
+  version "4.0.2"
+  resolved "https://registry.yarnpkg.com/postcss-normalize-positions/-/postcss-normalize-positions-4.0.2.tgz#05f757f84f260437378368a91f8932d4b102917f"
+  integrity sha512-Dlf3/9AxpxE+NF1fJxYDeggi5WwV35MXGFnnoccP/9qDtFrTArZ0D0R+iKcg5WsUd8nUYMIl8yXDCtcrT8JrdA==
+  dependencies:
+    cssnano-util-get-arguments "^4.0.0"
+    has "^1.0.0"
+    postcss "^7.0.0"
+    postcss-value-parser "^3.0.0"
+
+postcss-normalize-repeat-style@^4.0.2:
+  version "4.0.2"
+  resolved "https://registry.yarnpkg.com/postcss-normalize-repeat-style/-/postcss-normalize-repeat-style-4.0.2.tgz#c4ebbc289f3991a028d44751cbdd11918b17910c"
+  integrity sha512-qvigdYYMpSuoFs3Is/f5nHdRLJN/ITA7huIoCyqqENJe9PvPmLhNLMu7QTjPdtnVf6OcYYO5SHonx4+fbJE1+Q==
+  dependencies:
+    cssnano-util-get-arguments "^4.0.0"
+    cssnano-util-get-match "^4.0.0"
+    postcss "^7.0.0"
+    postcss-value-parser "^3.0.0"
+
+postcss-normalize-string@^4.0.2:
+  version "4.0.2"
+  resolved "https://registry.yarnpkg.com/postcss-normalize-string/-/postcss-normalize-string-4.0.2.tgz#cd44c40ab07a0c7a36dc5e99aace1eca4ec2690c"
+  integrity sha512-RrERod97Dnwqq49WNz8qo66ps0swYZDSb6rM57kN2J+aoyEAJfZ6bMx0sx/F9TIEX0xthPGCmeyiam/jXif0eA==
+  dependencies:
+    has "^1.0.0"
+    postcss "^7.0.0"
+    postcss-value-parser "^3.0.0"
+
+postcss-normalize-timing-functions@^4.0.2:
+  version "4.0.2"
+  resolved "https://registry.yarnpkg.com/postcss-normalize-timing-functions/-/postcss-normalize-timing-functions-4.0.2.tgz#8e009ca2a3949cdaf8ad23e6b6ab99cb5e7d28d9"
+  integrity sha512-acwJY95edP762e++00Ehq9L4sZCEcOPyaHwoaFOhIwWCDfik6YvqsYNxckee65JHLKzuNSSmAdxwD2Cud1Z54A==
+  dependencies:
+    cssnano-util-get-match "^4.0.0"
+    postcss "^7.0.0"
+    postcss-value-parser "^3.0.0"
+
+postcss-normalize-unicode@^4.0.1:
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/postcss-normalize-unicode/-/postcss-normalize-unicode-4.0.1.tgz#841bd48fdcf3019ad4baa7493a3d363b52ae1cfb"
+  integrity sha512-od18Uq2wCYn+vZ/qCOeutvHjB5jm57ToxRaMeNuf0nWVHaP9Hua56QyMF6fs/4FSUnVIw0CBPsU0K4LnBPwYwg==
+  dependencies:
+    browserslist "^4.0.0"
+    postcss "^7.0.0"
+    postcss-value-parser "^3.0.0"
+
+postcss-normalize-url@^4.0.1:
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/postcss-normalize-url/-/postcss-normalize-url-4.0.1.tgz#10e437f86bc7c7e58f7b9652ed878daaa95faae1"
+  integrity sha512-p5oVaF4+IHwu7VpMan/SSpmpYxcJMtkGppYf0VbdH5B6hN8YNmVyJLuY9FmLQTzY3fag5ESUUHDqM+heid0UVA==
   dependencies:
     is-absolute-url "^2.0.0"
-    normalize-url "^1.4.0"
-    postcss "^5.0.14"
-    postcss-value-parser "^3.2.3"
+    normalize-url "^3.0.0"
+    postcss "^7.0.0"
+    postcss-value-parser "^3.0.0"
 
-postcss-ordered-values@^2.1.0:
-  version "2.2.3"
-  resolved "https://registry.yarnpkg.com/postcss-ordered-values/-/postcss-ordered-values-2.2.3.tgz#eec6c2a67b6c412a8db2042e77fe8da43f95c11d"
-  integrity sha1-7sbCpntsQSqNsgQud/6NpD+VwR0=
+postcss-normalize-whitespace@^4.0.2:
+  version "4.0.2"
+  resolved "https://registry.yarnpkg.com/postcss-normalize-whitespace/-/postcss-normalize-whitespace-4.0.2.tgz#bf1d4070fe4fcea87d1348e825d8cc0c5faa7d82"
+  integrity sha512-tO8QIgrsI3p95r8fyqKV+ufKlSHh9hMJqACqbv2XknufqEDhDvbguXGBBqxw9nsQoXWf0qOqppziKJKHMD4GtA==
   dependencies:
-    postcss "^5.0.4"
-    postcss-value-parser "^3.0.1"
+    postcss "^7.0.0"
+    postcss-value-parser "^3.0.0"
 
-postcss-reduce-idents@^2.2.2:
-  version "2.4.0"
-  resolved "https://registry.yarnpkg.com/postcss-reduce-idents/-/postcss-reduce-idents-2.4.0.tgz#c2c6d20cc958284f6abfbe63f7609bf409059ad3"
-  integrity sha1-wsbSDMlYKE9qv75j92Cb9AkFmtM=
+postcss-ordered-values@^4.1.2:
+  version "4.1.2"
+  resolved "https://registry.yarnpkg.com/postcss-ordered-values/-/postcss-ordered-values-4.1.2.tgz#0cf75c820ec7d5c4d280189559e0b571ebac0eee"
+  integrity sha512-2fCObh5UanxvSxeXrtLtlwVThBvHn6MQcu4ksNT2tsaV2Fg76R2CV98W7wNSlX+5/pFwEyaDwKLLoEV7uRybAw==
   dependencies:
-    postcss "^5.0.4"
-    postcss-value-parser "^3.0.2"
+    cssnano-util-get-arguments "^4.0.0"
+    postcss "^7.0.0"
+    postcss-value-parser "^3.0.0"
 
-postcss-reduce-initial@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/postcss-reduce-initial/-/postcss-reduce-initial-1.0.1.tgz#68f80695f045d08263a879ad240df8dd64f644ea"
-  integrity sha1-aPgGlfBF0IJjqHmtJA343WT2ROo=
+postcss-reduce-initial@^4.0.3:
+  version "4.0.3"
+  resolved "https://registry.yarnpkg.com/postcss-reduce-initial/-/postcss-reduce-initial-4.0.3.tgz#7fd42ebea5e9c814609639e2c2e84ae270ba48df"
+  integrity sha512-gKWmR5aUulSjbzOfD9AlJiHCGH6AEVLaM0AV+aSioxUDd16qXP1PCh8d1/BGVvpdWn8k/HiK7n6TjeoXN1F7DA==
   dependencies:
-    postcss "^5.0.4"
+    browserslist "^4.0.0"
+    caniuse-api "^3.0.0"
+    has "^1.0.0"
+    postcss "^7.0.0"
 
-postcss-reduce-transforms@^1.0.3:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/postcss-reduce-transforms/-/postcss-reduce-transforms-1.0.4.tgz#ff76f4d8212437b31c298a42d2e1444025771ae1"
-  integrity sha1-/3b02CEkN7McKYpC0uFEQCV3GuE=
+postcss-reduce-transforms@^4.0.2:
+  version "4.0.2"
+  resolved "https://registry.yarnpkg.com/postcss-reduce-transforms/-/postcss-reduce-transforms-4.0.2.tgz#17efa405eacc6e07be3414a5ca2d1074681d4e29"
+  integrity sha512-EEVig1Q2QJ4ELpJXMZR8Vt5DQx8/mo+dGWSR7vWXqcob2gQLyQGsionYcGKATXvQzMPn6DSN1vTN7yFximdIAg==
   dependencies:
-    has "^1.0.1"
-    postcss "^5.0.8"
-    postcss-value-parser "^3.0.1"
+    cssnano-util-get-match "^4.0.0"
+    has "^1.0.0"
+    postcss "^7.0.0"
+    postcss-value-parser "^3.0.0"
 
-postcss-selector-parser@^2.0.0, postcss-selector-parser@^2.2.2:
-  version "2.2.3"
-  resolved "https://registry.yarnpkg.com/postcss-selector-parser/-/postcss-selector-parser-2.2.3.tgz#f9437788606c3c9acee16ffe8d8b16297f27bb90"
-  integrity sha1-+UN3iGBsPJrO4W/+jYsWKX8nu5A=
+postcss-selector-parser@^3.0.0:
+  version "3.1.1"
+  resolved "https://registry.yarnpkg.com/postcss-selector-parser/-/postcss-selector-parser-3.1.1.tgz#4f875f4afb0c96573d5cf4d74011aee250a7e865"
+  integrity sha1-T4dfSvsMllc9XPTXQBGu4lCn6GU=
   dependencies:
-    flatten "^1.0.2"
+    dot-prop "^4.1.1"
     indexes-of "^1.0.1"
     uniq "^1.0.1"
 
-postcss-svgo@^2.1.1:
-  version "2.1.6"
-  resolved "https://registry.yarnpkg.com/postcss-svgo/-/postcss-svgo-2.1.6.tgz#b6df18aa613b666e133f08adb5219c2684ac108d"
-  integrity sha1-tt8YqmE7Zm4TPwittSGcJoSsEI0=
+postcss-selector-parser@^5.0.0-rc.4:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/postcss-selector-parser/-/postcss-selector-parser-5.0.0.tgz#249044356697b33b64f1a8f7c80922dddee7195c"
+  integrity sha512-w+zLE5Jhg6Liz8+rQOWEAwtwkyqpfnmsinXjXg6cY7YIONZZtgvE0v2O0uhQBs0peNomOJwWRKt6JBfTdTd3OQ==
   dependencies:
-    is-svg "^2.0.0"
-    postcss "^5.0.14"
-    postcss-value-parser "^3.2.3"
-    svgo "^0.7.0"
+    cssesc "^2.0.0"
+    indexes-of "^1.0.1"
+    uniq "^1.0.1"
 
-postcss-unique-selectors@^2.0.2:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/postcss-unique-selectors/-/postcss-unique-selectors-2.0.2.tgz#981d57d29ddcb33e7b1dfe1fd43b8649f933ca1d"
-  integrity sha1-mB1X0p3csz57Hf4f1DuGSfkzyh0=
+postcss-svgo@^4.0.2:
+  version "4.0.2"
+  resolved "https://registry.yarnpkg.com/postcss-svgo/-/postcss-svgo-4.0.2.tgz#17b997bc711b333bab143aaed3b8d3d6e3d38258"
+  integrity sha512-C6wyjo3VwFm0QgBy+Fu7gCYOkCmgmClghO+pjcxvrcBKtiKt0uCF+hvbMO1fyv5BMImRK90SMb+dwUnfbGd+jw==
   dependencies:
-    alphanum-sort "^1.0.1"
-    postcss "^5.0.4"
+    is-svg "^3.0.0"
+    postcss "^7.0.0"
+    postcss-value-parser "^3.0.0"
+    svgo "^1.0.0"
+
+postcss-unique-selectors@^4.0.1:
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/postcss-unique-selectors/-/postcss-unique-selectors-4.0.1.tgz#9446911f3289bfd64c6d680f073c03b1f9ee4bac"
+  integrity sha512-+JanVaryLo9QwZjKrmJgkI4Fn8SBgRO6WXQBJi7KiAVPlmxikB5Jzc4EvXMT2H0/m0RjrVVm9rGNhZddm/8Spg==
+  dependencies:
+    alphanum-sort "^1.0.0"
+    postcss "^7.0.0"
     uniqs "^2.0.0"
 
-postcss-value-parser@^3.0.1, postcss-value-parser@^3.0.2, postcss-value-parser@^3.1.1, postcss-value-parser@^3.1.2, postcss-value-parser@^3.2.3, postcss-value-parser@^3.3.0, postcss-value-parser@^3.3.1:
+postcss-value-parser@^3.0.0, postcss-value-parser@^3.3.1:
   version "3.3.1"
   resolved "https://registry.yarnpkg.com/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz#9ff822547e2893213cf1c30efa51ac5fd1ba8281"
   integrity sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==
 
-postcss-zindex@^2.0.1:
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/postcss-zindex/-/postcss-zindex-2.2.0.tgz#d2109ddc055b91af67fc4cb3b025946639d2af22"
-  integrity sha1-0hCd3AVbka9n/EyzsCWUZjnSryI=
-  dependencies:
-    has "^1.0.1"
-    postcss "^5.0.4"
-    uniqs "^2.0.0"
+postcss-value-parser@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/postcss-value-parser/-/postcss-value-parser-4.0.0.tgz#99a983d365f7b2ad8d0f9b8c3094926eab4b936d"
+  integrity sha512-ESPktioptiSUchCKgggAkzdmkgzKfmp0EU8jXH+5kbIUB+unr0Y4CY9SRMvibuvYUBjNh1ACLbxqYNpdTQOteQ==
 
-postcss@^5.0.10, postcss@^5.0.11, postcss@^5.0.12, postcss@^5.0.13, postcss@^5.0.14, postcss@^5.0.16, postcss@^5.0.2, postcss@^5.0.4, postcss@^5.0.5, postcss@^5.0.8, postcss@^5.2.16:
-  version "5.2.18"
-  resolved "https://registry.yarnpkg.com/postcss/-/postcss-5.2.18.tgz#badfa1497d46244f6390f58b319830d9107853c5"
-  integrity sha512-zrUjRRe1bpXKsX1qAJNJjqZViErVuyEkMTRrwu4ud4sbTtIBRmtaYDrHmcGgmrbsW3MHfmtIf+vJumgQn+PrXg==
+postcss@^7.0.0, postcss@^7.0.17, postcss@^7.0.5:
+  version "7.0.17"
+  resolved "https://registry.yarnpkg.com/postcss/-/postcss-7.0.17.tgz#4da1bdff5322d4a0acaab4d87f3e782436bad31f"
+  integrity sha512-546ZowA+KZ3OasvQZHsbuEpysvwTZNGJv9EfyCQdsIDltPSWHAeTQ5fQy/Npi2ZDtLI3zs7Ps/p6wThErhm9fQ==
   dependencies:
-    chalk "^1.1.3"
-    js-base64 "^2.1.9"
-    source-map "^0.5.6"
-    supports-color "^3.2.3"
+    chalk "^2.4.2"
+    source-map "^0.6.1"
+    supports-color "^6.1.0"
 
-postcss@^7.0.1, postcss@^7.0.6:
+postcss@^7.0.1:
   version "7.0.7"
   resolved "https://registry.yarnpkg.com/postcss/-/postcss-7.0.7.tgz#2754d073f77acb4ef08f1235c36c5721a7201614"
   integrity sha512-HThWSJEPkupqew2fnuQMEI2YcTj/8gMV3n80cMdJsKxfIh5tHf7nM5JigNX6LxVMqo6zkgQNAI88hyFvBk41Pg==
@@ -4426,15 +4854,15 @@ postcss@^7.0.1, postcss@^7.0.6:
     source-map "^0.6.1"
     supports-color "^5.5.0"
 
-prepend-http@^1.0.0, prepend-http@^1.0.1:
+prepend-http@^1.0.1:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/prepend-http/-/prepend-http-1.0.4.tgz#d4f4562b0ce3696e41ac52d0e002e57a635dc6dc"
   integrity sha1-1PRWKwzjaW5BrFLQ4ALlemNdxtw=
 
-preserve@^0.2.0:
-  version "0.2.0"
-  resolved "https://registry.yarnpkg.com/preserve/-/preserve-0.2.0.tgz#815ed1f6ebc65926f865b310c0713bcb3315ce4b"
-  integrity sha1-gV7R9uvGWSb4ZbMQwHE7yzMVzks=
+prepend-http@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/prepend-http/-/prepend-http-2.0.0.tgz#e92434bfa5ea8c19f41cdfd401d741a3c819d897"
+  integrity sha1-6SQ0v6XqjBn0HN/UAddBo8gZ2Jc=
 
 prismjs@^1.15.0:
   version "1.15.0"
@@ -4461,13 +4889,18 @@ prop-types@^15.6.2:
     loose-envify "^1.3.1"
     object-assign "^4.1.1"
 
-proxy-addr@~2.0.4:
-  version "2.0.4"
-  resolved "https://registry.yarnpkg.com/proxy-addr/-/proxy-addr-2.0.4.tgz#ecfc733bf22ff8c6f407fa275327b9ab67e48b93"
-  integrity sha512-5erio2h9jp5CHGwcybmxmVqHmnCBZeewlfJ0pex+UW7Qny7OOZXTtH56TGNyBizkgiOwhJtMKrVzDTeKcySZwA==
+proto-list@~1.2.1:
+  version "1.2.4"
+  resolved "https://registry.yarnpkg.com/proto-list/-/proto-list-1.2.4.tgz#212d5bfe1318306a420f6402b8e26ff39647a849"
+  integrity sha1-IS1b/hMYMGpCD2QCuOJv85ZHqEk=
+
+proxy-addr@~2.0.5:
+  version "2.0.5"
+  resolved "https://registry.yarnpkg.com/proxy-addr/-/proxy-addr-2.0.5.tgz#34cbd64a2d81f4b1fd21e76f9f06c8a45299ee34"
+  integrity sha512-t/7RxHXPH6cJtP0pRG6smSr9QJidhB+3kXu0KgXnbGYMgzEnUxRQ4/LDdfOwZEMyIh3/xHb8PX3t+lfL9z+YVQ==
   dependencies:
     forwarded "~0.1.2"
-    ipaddr.js "1.8.0"
+    ipaddr.js "1.9.0"
 
 pseudomap@^1.0.2:
   version "1.0.2"
@@ -4479,6 +4912,14 @@ psl@^1.1.24:
   resolved "https://registry.yarnpkg.com/psl/-/psl-1.1.31.tgz#e9aa86d0101b5b105cbe93ac6b784cd547276184"
   integrity sha512-/6pt4+C+T+wZUieKR620OpzN/LlnNKuWjy1iFLQ/UG35JqHlR/89MP1d96dUfkf6Dne3TuLQzOYEYshJ+Hx8mw==
 
+pump@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/pump/-/pump-3.0.0.tgz#b4a2116815bde2f4e1ea602354e8c75565107a64"
+  integrity sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==
+  dependencies:
+    end-of-stream "^1.1.0"
+    once "^1.3.1"
+
 punycode@^1.4.1:
   version "1.4.1"
   resolved "https://registry.yarnpkg.com/punycode/-/punycode-1.4.1.tgz#c0d5a63b2718800ad8e1eb0fa5269c84dd41845e"
@@ -4499,21 +4940,27 @@ q@^1.1.2:
   resolved "https://registry.yarnpkg.com/q/-/q-1.5.1.tgz#7e32f75b41381291d04611f1bf14109ac00651d7"
   integrity sha1-fjL3W0E4EpHQRhHxvxQQmsAGUdc=
 
-qs@6.5.2, qs@~6.5.2:
-  version "6.5.2"
-  resolved "https://registry.yarnpkg.com/qs/-/qs-6.5.2.tgz#cb3ae806e8740444584ef154ce8ee98d403f3e36"
-  integrity sha512-N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA==
+qs@6.7.0:
+  version "6.7.0"
+  resolved "https://registry.yarnpkg.com/qs/-/qs-6.7.0.tgz#41dc1a015e3d581f1621776be31afb2876a9b1bc"
+  integrity sha512-VCdBRNFTX1fyE7Nb6FYoURo/SPe62QCaAyzJvUjwRaIsc+NePBEniHlvxFmmX56+HZphIGtV0XeCirBtpDrTyQ==
 
 qs@^6.4.0:
   version "6.6.0"
   resolved "https://registry.yarnpkg.com/qs/-/qs-6.6.0.tgz#a99c0f69a8d26bf7ef012f871cdabb0aee4424c2"
   integrity sha512-KIJqT9jQJDQx5h5uAVPimw6yVg2SekOKu959OCtktD3FjzbpvaPr8i4zzg07DOMz+igA4W/aNM7OV8H37pFYfA==
 
-query-string@^4.1.0:
-  version "4.3.4"
-  resolved "https://registry.yarnpkg.com/query-string/-/query-string-4.3.4.tgz#bbb693b9ca915c232515b228b1a02b609043dbeb"
-  integrity sha1-u7aTucqRXCMlFbIosaArYJBD2+s=
+qs@~6.5.2:
+  version "6.5.2"
+  resolved "https://registry.yarnpkg.com/qs/-/qs-6.5.2.tgz#cb3ae806e8740444584ef154ce8ee98d403f3e36"
+  integrity sha512-N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA==
+
+query-string@^5.0.1:
+  version "5.1.1"
+  resolved "https://registry.yarnpkg.com/query-string/-/query-string-5.1.1.tgz#a78c012b71c17e05f2e3fa2319dd330682efb3cb"
+  integrity sha512-gjWOsm2SoGlgLEdAGt7a6slVOk9mGiXmPFMqrEhLQ68rhQuBnpfs3+EmlvqKyxnCo9/PPlF+9MtY02S1aFg+Jw==
   dependencies:
+    decode-uri-component "^0.2.0"
     object-assign "^4.1.0"
     strict-uri-encode "^1.0.0"
 
@@ -4531,19 +4978,19 @@ randomatic@^3.0.0:
     kind-of "^6.0.0"
     math-random "^1.0.1"
 
-range-parser@~1.2.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/range-parser/-/range-parser-1.2.0.tgz#f49be6b487894ddc40dcc94a322f611092e00d5e"
-  integrity sha1-9JvmtIeJTdxA3MlKMi9hEJLgDV4=
+range-parser@~1.2.1:
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/range-parser/-/range-parser-1.2.1.tgz#3cf37023d199e1c24d1a55b84800c2f3e6468031"
+  integrity sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg==
 
-raw-body@2.3.3:
-  version "2.3.3"
-  resolved "https://registry.yarnpkg.com/raw-body/-/raw-body-2.3.3.tgz#1b324ece6b5706e153855bc1148c65bb7f6ea0c3"
-  integrity sha512-9esiElv1BrZoI3rCDuOuKCBRbuApGGaDPQfjSflGxdy4oyzqghxu6klEkkVIvBje+FF0BX9coEv8KqW6X/7njw==
+raw-body@2.4.0:
+  version "2.4.0"
+  resolved "https://registry.yarnpkg.com/raw-body/-/raw-body-2.4.0.tgz#a1ce6fb9c9bc356ca52e89256ab59059e13d0332"
+  integrity sha512-4Oz8DUIwdvoa5qMJelxipzi/iJIi40O5cGV1wNYp5hvZP8ZN0T+jiNkL0QepXs+EsQ9XJ8ipEDoiH70ySUJP3Q==
   dependencies:
-    bytes "3.0.0"
-    http-errors "1.6.3"
-    iconv-lite "0.4.23"
+    bytes "3.1.0"
+    http-errors "1.7.2"
+    iconv-lite "0.4.24"
     unpipe "1.0.0"
 
 raw-body@~1.1.0:
@@ -4554,16 +5001,6 @@ raw-body@~1.1.0:
     bytes "1"
     string_decoder "0.10"
 
-rc@^1.1.2:
-  version "1.2.8"
-  resolved "https://registry.yarnpkg.com/rc/-/rc-1.2.8.tgz#cd924bf5200a075b83c188cd6b9e211b7fc0d3ed"
-  integrity sha512-y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw==
-  dependencies:
-    deep-extend "^0.6.0"
-    ini "~1.3.0"
-    minimist "^1.2.0"
-    strip-json-comments "~2.0.1"
-
 react-dev-utils@^5.0.2:
   version "5.0.3"
   resolved "https://registry.yarnpkg.com/react-dev-utils/-/react-dev-utils-5.0.3.tgz#92f97668f03deb09d7fa11ea288832a8c756e35e"
@@ -4613,14 +5050,6 @@ react@^16.5.0:
     prop-types "^15.6.2"
     scheduler "^0.12.0"
 
-read-all-stream@^3.0.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/read-all-stream/-/read-all-stream-3.1.0.tgz#35c3e177f2078ef789ee4bfafa4373074eaef4fa"
-  integrity sha1-NcPhd/IHjveJ7kv6+kNzB06u9Po=
-  dependencies:
-    pinkie-promise "^2.0.0"
-    readable-stream "^2.0.0"
-
 read-pkg-up@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/read-pkg-up/-/read-pkg-up-1.0.1.tgz#9d63c13276c065918d57f002a57f40a1b643fb02"
@@ -4638,17 +5067,7 @@ read-pkg@^1.0.0:
     normalize-package-data "^2.3.2"
     path-type "^1.0.0"
 
-"readable-stream@>=1.0.33-1 <1.1.0-0":
-  version "1.0.34"
-  resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-1.0.34.tgz#125820e34bc842d2f2aaafafe4c2916ee32c157c"
-  integrity sha1-Elgg40vIQtLyqq+v5MKRbuMsFXw=
-  dependencies:
-    core-util-is "~1.0.0"
-    inherits "~2.0.1"
-    isarray "0.0.1"
-    string_decoder "~0.10.x"
-
-readable-stream@^2.0.0, readable-stream@^2.0.1, readable-stream@^2.0.2, readable-stream@^2.0.4, readable-stream@^2.0.5, readable-stream@^2.2.2, readable-stream@^2.3.0, readable-stream@^2.3.5, readable-stream@~2.3.6:
+readable-stream@^2.0.0, readable-stream@^2.2.2, readable-stream@^2.3.0, readable-stream@^2.3.5:
   version "2.3.6"
   resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.6.tgz#b11c27d88b8ff1fbe070643cf94b0c79ae1b0aaf"
   integrity sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==
@@ -4670,15 +5089,12 @@ readable-stream@^3.0.6:
     string_decoder "^1.1.1"
     util-deprecate "^1.0.1"
 
-readable-stream@~1.1.9:
-  version "1.1.14"
-  resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-1.1.14.tgz#7cf4c54ef648e3813084c636dd2079e166c081d9"
-  integrity sha1-fPTFTvZI44EwhMY23SB54WbAgdk=
+readdirp@^3.1.1:
+  version "3.1.1"
+  resolved "https://registry.yarnpkg.com/readdirp/-/readdirp-3.1.1.tgz#b158123ac343c8b0f31d65680269cc0fc1025db1"
+  integrity sha512-XXdSXZrQuvqoETj50+JAitxz1UPdt5dupjT6T5nVB+WvjMv2XKYj+s7hPeAVCXvmJrL36O4YYyWlIC3an2ePiQ==
   dependencies:
-    core-util-is "~1.0.0"
-    inherits "~2.0.1"
-    isarray "0.0.1"
-    string_decoder "~0.10.x"
+    picomatch "^2.0.4"
 
 rechoir@^0.6.2:
   version "0.6.2"
@@ -4702,22 +5118,6 @@ redent@^1.0.0:
     indent-string "^2.1.0"
     strip-indent "^1.0.1"
 
-reduce-css-calc@^1.2.6:
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/reduce-css-calc/-/reduce-css-calc-1.3.0.tgz#747c914e049614a4c9cfbba629871ad1d2927716"
-  integrity sha1-dHyRTgSWFKTJz7umKYca0dKSdxY=
-  dependencies:
-    balanced-match "^0.4.2"
-    math-expression-evaluator "^1.2.14"
-    reduce-function-call "^1.0.1"
-
-reduce-function-call@^1.0.1:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/reduce-function-call/-/reduce-function-call-1.0.2.tgz#5a200bf92e0e37751752fe45b0ab330fd4b6be99"
-  integrity sha1-WiAL+S4ON3UXUv5FsKszD9S2vpk=
-  dependencies:
-    balanced-match "^0.4.2"
-
 regenerate-unicode-properties@^7.0.0:
   version "7.0.0"
   resolved "https://registry.yarnpkg.com/regenerate-unicode-properties/-/regenerate-unicode-properties-7.0.0.tgz#107405afcc4a190ec5ed450ecaa00ed0cafa7a4c"
@@ -4742,12 +5142,13 @@ regenerator-transform@^0.13.3:
   dependencies:
     private "^0.1.6"
 
-regex-cache@^0.4.2:
-  version "0.4.4"
-  resolved "https://registry.yarnpkg.com/regex-cache/-/regex-cache-0.4.4.tgz#75bdc58a2a1496cec48a12835bc54c8d562336dd"
-  integrity sha512-nVIZwtCjkC9YgvWkpM55B5rBhBYRZhAaJbgcFYXXsHnbZ9UZI9nnVWYZpBlCqv9ho2eZryPnWrZGsOdPwVWXWQ==
+regex-not@^1.0.0, regex-not@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/regex-not/-/regex-not-1.0.2.tgz#1f4ece27e00b0b65e0247a6810e6a85d83a5752c"
+  integrity sha512-J6SDjUgDxQj5NusnOtdFxDwN/+HWykR8GELwctJ7mdqhcyy1xEc4SRFHUXvxTp661YaVKAjfRLZ9cCqS6tn32A==
   dependencies:
-    is-equal-shallow "^0.1.3"
+    extend-shallow "^3.0.2"
+    safe-regex "^1.1.0"
 
 regexpu-core@^4.1.3, regexpu-core@^4.2.0:
   version "4.4.0"
@@ -4781,11 +5182,6 @@ remarkable@^1.7.1:
     argparse "~0.1.15"
     autolinker "~0.15.0"
 
-remove-trailing-separator@^1.0.1:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/remove-trailing-separator/-/remove-trailing-separator-1.1.0.tgz#c24bce2a283adad5bc3f58e0d48249b92379d8ef"
-  integrity sha1-wkvOKig62tW8P1jg1IJJuSN52O8=
-
 repeat-element@^1.1.2:
   version "1.1.3"
   resolved "https://registry.yarnpkg.com/repeat-element/-/repeat-element-1.1.3.tgz#782e0d825c0c5a3bb39731f84efee6b742e6b1ce"
@@ -4803,11 +5199,6 @@ repeating@^2.0.0:
   dependencies:
     is-finite "^1.0.0"
 
-replace-ext@0.0.1:
-  version "0.0.1"
-  resolved "https://registry.yarnpkg.com/replace-ext/-/replace-ext-0.0.1.tgz#29bbd92078a739f0bcce2b4ee41e837953522924"
-  integrity sha1-KbvZIHinOfC8zitO5B6DeVNSKSQ=
-
 replace-ext@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/replace-ext/-/replace-ext-1.0.0.tgz#de63128373fcbf7c3ccfa4de5a480c45a67958eb"
@@ -4852,6 +5243,16 @@ resolve-dir@^1.0.0:
     expand-tilde "^2.0.0"
     global-modules "^1.0.0"
 
+resolve-from@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-3.0.0.tgz#b22c7af7d9d6881bc8b6e653335eebcb0a188748"
+  integrity sha1-six699nWiBvItuZTM17rywoYh0g=
+
+resolve-url@^0.2.1:
+  version "0.2.1"
+  resolved "https://registry.yarnpkg.com/resolve-url/-/resolve-url-0.2.1.tgz#2c637fe77c893afd2a663fe21aa9080068e2052a"
+  integrity sha1-LGN/53yJOv0qZj/iGqkIAGjiBSo=
+
 resolve@^1.1.6, resolve@^1.3.2:
   version "1.9.0"
   resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.9.0.tgz#a14c6fdfa8f92a7df1d996cb7105fa744658ea06"
@@ -4859,6 +5260,13 @@ resolve@^1.1.6, resolve@^1.3.2:
   dependencies:
     path-parse "^1.0.6"
 
+responselike@1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/responselike/-/responselike-1.0.2.tgz#918720ef3b631c5642be068f15ade5a46f4ba1e7"
+  integrity sha1-kYcg7ztjHFZCvgaPFa3lpG9Loec=
+  dependencies:
+    lowercase-keys "^1.0.0"
+
 restore-cursor@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/restore-cursor/-/restore-cursor-2.0.0.tgz#9f7ee287f82fd326d4fd162923d62129eee0dfaf"
@@ -4867,7 +5275,22 @@ restore-cursor@^2.0.0:
     onetime "^2.0.0"
     signal-exit "^3.0.2"
 
-rimraf@^2.2.6, rimraf@^2.5.4:
+ret@~0.1.10:
+  version "0.1.15"
+  resolved "https://registry.yarnpkg.com/ret/-/ret-0.1.15.tgz#b8a4825d5bdb1fc3f6f53c2bc33f81388681c7bc"
+  integrity sha512-TTlYpa+OL+vMMNG24xSlQGEJ3B/RzEfUlLct7b5G/ytav+wPrplCpVMFuwzXbkecJrb6IYo1iFb0S9v37754mg==
+
+rgb-regex@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/rgb-regex/-/rgb-regex-1.0.1.tgz#c0e0d6882df0e23be254a475e8edd41915feaeb1"
+  integrity sha1-wODWiC3w4jviVKR16O3UGRX+rrE=
+
+rgba-regex@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/rgba-regex/-/rgba-regex-1.0.0.tgz#43374e2e2ca0968b0ef1523460b7d730ff22eeb3"
+  integrity sha1-QzdOLiyglosO8VI0YLfXMP8i7rM=
+
+rimraf@^2.5.4:
   version "2.6.2"
   resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.6.2.tgz#2ed8150d24a16ea8651e6d6ef0f47c4158ce7a36"
   integrity sha512-lreewLK/BlghmxtfH36YYVg1i8IAce4TI7oao75I1g245+6BctqTVQiBP3YUJ9C6DQOXJmkYR9X9fCLtCOJc5w==
@@ -4903,12 +5326,19 @@ safe-json-parse@~1.0.1:
   resolved "https://registry.yarnpkg.com/safe-json-parse/-/safe-json-parse-1.0.1.tgz#3e76723e38dfdda13c9b1d29a1e07ffee4b30b57"
   integrity sha1-PnZyPjjf3aE8mx0poeB//uSzC1c=
 
+safe-regex@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/safe-regex/-/safe-regex-1.1.0.tgz#40a3669f3b077d1e943d44629e157dd48023bf2e"
+  integrity sha1-QKNmnzsHfR6UPURinhV91IAjvy4=
+  dependencies:
+    ret "~0.1.10"
+
 "safer-buffer@>= 2.1.2 < 3", safer-buffer@^2.0.2, safer-buffer@^2.1.0, safer-buffer@~2.1.0:
   version "2.1.2"
   resolved "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz#44fa161b0187b9549dd84bb91802f9bd8385cd6a"
   integrity sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==
 
-sax@~1.2.1, sax@~1.2.4:
+sax@~1.2.4:
   version "1.2.4"
   resolved "https://registry.yarnpkg.com/sax/-/sax-1.2.4.tgz#2816234e2378bddc4e5354fab5caa895df7100d9"
   integrity sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw==
@@ -4921,7 +5351,7 @@ scheduler@^0.12.0:
     loose-envify "^1.1.0"
     object-assign "^4.1.1"
 
-seek-bzip@^1.0.3:
+seek-bzip@^1.0.5:
   version "1.0.5"
   resolved "https://registry.yarnpkg.com/seek-bzip/-/seek-bzip-1.0.5.tgz#cfe917cb3d274bcffac792758af53173eb1fabdc"
   integrity sha1-z+kXyz0nS8/6x5J1ivUxc+sfq9w=
@@ -4933,12 +5363,12 @@ select@^1.1.2:
   resolved "https://registry.yarnpkg.com/select/-/select-1.1.2.tgz#0e7350acdec80b1108528786ec1d4418d11b396d"
   integrity sha1-DnNQrN7ICxEIUoeG7B1EGNEbOW0=
 
-semver-regex@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/semver-regex/-/semver-regex-1.0.0.tgz#92a4969065f9c70c694753d55248fc68f8f652c9"
-  integrity sha1-kqSWkGX5xwxpR1PVUkj8aPj2Usk=
+semver-regex@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/semver-regex/-/semver-regex-2.0.0.tgz#a93c2c5844539a770233379107b38c7b4ac9d338"
+  integrity sha512-mUdIBBvdn0PLOeP3TEkMH7HHeUP3GjsXCwKarjv/kGmUFOYg1VqEemKhoQpWMu6X2I8kHeuVdGibLGkVK+/5Qw==
 
-semver-truncate@^1.0.0:
+semver-truncate@^1.1.2:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/semver-truncate/-/semver-truncate-1.1.2.tgz#57f41de69707a62709a7e0104ba2117109ea47e8"
   integrity sha1-V/Qd5pcHpicJp+AQS6IRcQnqR+g=
@@ -4950,15 +5380,15 @@ semver-truncate@^1.0.0:
   resolved "https://registry.yarnpkg.com/semver/-/semver-5.6.0.tgz#7e74256fbaa49c75aa7c7a205cc22799cac80004"
   integrity sha512-RS9R6R35NYgQn++fkDWaOmqGoj4Ek9gGs+DPxNUZKuwE183xjJroKvyo1IzVFeXvUrvmALy6FWD5xrdJT25gMg==
 
-semver@^4.0.3:
-  version "4.3.6"
-  resolved "https://registry.yarnpkg.com/semver/-/semver-4.3.6.tgz#300bc6e0e86374f7ba61068b5b1ecd57fc6532da"
-  integrity sha1-MAvG4OhjdPe6YQaLWx7NV/xlMto=
+semver@^5.6.0:
+  version "5.7.0"
+  resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.0.tgz#790a7cf6fea5459bac96110b29b60412dc8ff96b"
+  integrity sha512-Ya52jSX2u7QKghxeoFGpLwCtGlt7j0oY9DYb5apt9nPlJ42ID+ulTXESnt/qAQcoSERyZ5sl3LDIOw0nAn/5DA==
 
-send@0.16.2:
-  version "0.16.2"
-  resolved "https://registry.yarnpkg.com/send/-/send-0.16.2.tgz#6ecca1e0f8c156d141597559848df64730a6bbc1"
-  integrity sha512-E64YFPUssFHEFBvpbbjr44NCLtI1AohxQ8ZSiJjQLskAdKuriYEP6VyGEsRDH8ScozGpkaX1BGvhanqCwkcEZw==
+send@0.17.1:
+  version "0.17.1"
+  resolved "https://registry.yarnpkg.com/send/-/send-0.17.1.tgz#c1d8b059f7900f7466dd4938bdc44e11ddb376c8"
+  integrity sha512-BsVKsiGcQMFwT8UxypobUKyv7irCNRHk1T0G680vk88yf6LBByGcZJOTJCrTP2xVN6yI+XjPJcNuE3V4fT9sAg==
   dependencies:
     debug "2.6.9"
     depd "~1.1.2"
@@ -4967,22 +5397,22 @@ send@0.16.2:
     escape-html "~1.0.3"
     etag "~1.8.1"
     fresh "0.5.2"
-    http-errors "~1.6.2"
-    mime "1.4.1"
-    ms "2.0.0"
+    http-errors "~1.7.2"
+    mime "1.6.0"
+    ms "2.1.1"
     on-finished "~2.3.0"
-    range-parser "~1.2.0"
-    statuses "~1.4.0"
+    range-parser "~1.2.1"
+    statuses "~1.5.0"
 
-serve-static@1.13.2:
-  version "1.13.2"
-  resolved "https://registry.yarnpkg.com/serve-static/-/serve-static-1.13.2.tgz#095e8472fd5b46237db50ce486a43f4b86c6cec1"
-  integrity sha512-p/tdJrO4U387R9oMjb1oj7qSMaMfmOyd4j9hOFoxZe2baQszgHcSWjuya/CiT5kgZZKRudHNOA0pYXOl8rQ5nw==
+serve-static@1.14.1:
+  version "1.14.1"
+  resolved "https://registry.yarnpkg.com/serve-static/-/serve-static-1.14.1.tgz#666e636dc4f010f7ef29970a88a674320898b2f9"
+  integrity sha512-JMrvUwE54emCYWlTI+hGrGv5I8dEwmco/00EvkzIIsR7MqrHonbD9pO2MOfFnpFntl7ecpZs+3mW+XbQZu9QCg==
   dependencies:
     encodeurl "~1.0.2"
     escape-html "~1.0.3"
-    parseurl "~1.3.2"
-    send "0.16.2"
+    parseurl "~1.3.3"
+    send "0.17.1"
 
 set-getter@^0.1.0:
   version "0.1.0"
@@ -4991,15 +5421,20 @@ set-getter@^0.1.0:
   dependencies:
     to-object-path "^0.3.0"
 
-set-immediate-shim@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/set-immediate-shim/-/set-immediate-shim-1.0.1.tgz#4b2b1b27eb808a9f8dcc481a58e5e56f599f3f61"
-  integrity sha1-SysbJ+uAip+NzEgaWOXlb1mfP2E=
+set-value@^2.0.0, set-value@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/set-value/-/set-value-2.0.1.tgz#a18d40530e6f07de4228c7defe4227af8cad005b"
+  integrity sha512-JxHc1weCN68wRY0fhCoXpyK55m/XPHafOmK4UWD7m2CI14GMcFypt4w/0+NV5f/ZMby2F6S2wwA7fgynh9gWSw==
+  dependencies:
+    extend-shallow "^2.0.1"
+    is-extendable "^0.1.1"
+    is-plain-object "^2.0.3"
+    split-string "^3.0.1"
 
-setprototypeof@1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/setprototypeof/-/setprototypeof-1.1.0.tgz#d0bd85536887b6fe7c0d818cb962d9d91c54e656"
-  integrity sha512-BvE/TwpZX4FXExxOxZyRGQQv651MSwmWKZGqvmPcRIjDqWub67kTKuIMx43cZZrS/cBBzwBcNDWoFxt2XEFIpQ==
+setprototypeof@1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/setprototypeof/-/setprototypeof-1.1.1.tgz#7e95acb24aa92f5885e0abef5ba131330d4ae683"
+  integrity sha512-JvdAWfbXeIGaZ9cILp38HntZSFSo3mWg6xGcJJsd+d4aRMOqauag1C63dJfDw7OaMYwEbHMOxEZ1lqVRYP2OAw==
 
 shebang-command@^1.2.0:
   version "1.2.0"
@@ -5023,10 +5458,10 @@ shell-quote@1.6.1:
     array-reduce "~0.0.0"
     jsonify "~0.0.0"
 
-shelljs@^0.7.8:
-  version "0.7.8"
-  resolved "https://registry.yarnpkg.com/shelljs/-/shelljs-0.7.8.tgz#decbcf874b0d1e5fb72e14b164a9683048e9acb3"
-  integrity sha1-3svPh0sNHl+3LhSxZKloMEjprLM=
+shelljs@^0.8.3:
+  version "0.8.3"
+  resolved "https://registry.yarnpkg.com/shelljs/-/shelljs-0.8.3.tgz#a7f3319520ebf09ee81275b2368adb286659b097"
+  integrity sha512-fc0BKlAWiLpwZljmOvAOTE/gXawtCoNrP5oaY7KIaQbbyHeQVg01pSEuEGvGh3HEdBU4baCD7wQBwADmM/7f7A==
   dependencies:
     glob "^7.0.0"
     interpret "^1.0.0"
@@ -5052,6 +5487,41 @@ sitemap@^1.13.0:
     underscore "^1.7.0"
     url-join "^1.1.0"
 
+slash@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/slash/-/slash-1.0.0.tgz#c41f2f6c39fc16d1cd17ad4b5d896114ae470d55"
+  integrity sha1-xB8vbDn8FtHNF61LXYlhFK5HDVU=
+
+snapdragon-node@^2.0.1:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/snapdragon-node/-/snapdragon-node-2.1.1.tgz#6c175f86ff14bdb0724563e8f3c1b021a286853b"
+  integrity sha512-O27l4xaMYt/RSQ5TR3vpWCAB5Kb/czIcqUFOM/C4fYcLnbZUc1PkjTAMjof2pBWaSTwOUd6qUHcFGVGj7aIwnw==
+  dependencies:
+    define-property "^1.0.0"
+    isobject "^3.0.0"
+    snapdragon-util "^3.0.1"
+
+snapdragon-util@^3.0.1:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/snapdragon-util/-/snapdragon-util-3.0.1.tgz#f956479486f2acd79700693f6f7b805e45ab56e2"
+  integrity sha512-mbKkMdQKsjX4BAL4bRYTj21edOf8cN7XHdYUJEe+Zn99hVEYcMvKPct1IqNe7+AZPirn8BCDOQBHQZknqmKlZQ==
+  dependencies:
+    kind-of "^3.2.0"
+
+snapdragon@^0.8.1:
+  version "0.8.2"
+  resolved "https://registry.yarnpkg.com/snapdragon/-/snapdragon-0.8.2.tgz#64922e7c565b0e14204ba1aa7d6964278d25182d"
+  integrity sha512-FtyOnWN/wCHTVXOMwvSv26d+ko5vWlIDD6zoUJ7LW8vh+ZBC8QdljveRP+crNrtBwioEUWy/4dMtbBjA4ioNlg==
+  dependencies:
+    base "^0.11.1"
+    debug "^2.2.0"
+    define-property "^0.2.5"
+    extend-shallow "^2.0.1"
+    map-cache "^0.2.2"
+    source-map "^0.5.6"
+    source-map-resolve "^0.5.0"
+    use "^3.1.0"
+
 sockjs-client@1.1.5:
   version "1.1.5"
   resolved "https://registry.yarnpkg.com/sockjs-client/-/sockjs-client-1.1.5.tgz#1bb7c0f7222c40f42adf14f4442cbd1269771a83"
@@ -5064,6 +5534,13 @@ sockjs-client@1.1.5:
     json3 "^3.3.2"
     url-parse "^1.1.8"
 
+sort-keys-length@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/sort-keys-length/-/sort-keys-length-1.0.1.tgz#9cb6f4f4e9e48155a6aa0671edd336ff1479a188"
+  integrity sha1-nLb09OnkgVWmqgZx7dM2/xR5oYg=
+  dependencies:
+    sort-keys "^1.0.0"
+
 sort-keys@^1.0.0:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/sort-keys/-/sort-keys-1.1.2.tgz#441b6d4d346798f1b4e49e8920adfba0e543f9ad"
@@ -5071,6 +5548,24 @@ sort-keys@^1.0.0:
   dependencies:
     is-plain-obj "^1.0.0"
 
+sort-keys@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/sort-keys/-/sort-keys-2.0.0.tgz#658535584861ec97d730d6cf41822e1f56684128"
+  integrity sha1-ZYU1WEhh7JfXMNbPQYIuH1ZoQSg=
+  dependencies:
+    is-plain-obj "^1.0.0"
+
+source-map-resolve@^0.5.0:
+  version "0.5.2"
+  resolved "https://registry.yarnpkg.com/source-map-resolve/-/source-map-resolve-0.5.2.tgz#72e2cc34095543e43b2c62b2c4c10d4a9054f259"
+  integrity sha512-MjqsvNwyz1s0k81Goz/9vRBe9SZdB09Bdw+/zYyO+3CuPk6fouTaxscHkgtE8jKvf01kVfl8riHzERQ/kefaSA==
+  dependencies:
+    atob "^2.1.1"
+    decode-uri-component "^0.2.0"
+    resolve-url "^0.2.1"
+    source-map-url "^0.4.0"
+    urix "^0.1.0"
+
 source-map-support@^0.5.9:
   version "0.5.9"
   resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.9.tgz#41bc953b2534267ea2d605bccfa7bfa3111ced5f"
@@ -5079,6 +5574,11 @@ source-map-support@^0.5.9:
     buffer-from "^1.0.0"
     source-map "^0.6.0"
 
+source-map-url@^0.4.0:
+  version "0.4.0"
+  resolved "https://registry.yarnpkg.com/source-map-url/-/source-map-url-0.4.0.tgz#3e935d7ddd73631b97659956d55128e87b5084a3"
+  integrity sha1-PpNdfd1zYxuXZZlW1VEo6HtQhKM=
+
 source-map@^0.5.0, source-map@^0.5.3, source-map@^0.5.6:
   version "0.5.7"
   resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.5.7.tgz#8a039d2d1021d22d1ea14c80d8ea468ba2ef3fcc"
@@ -5089,11 +5589,6 @@ source-map@^0.6.0, source-map@^0.6.1:
   resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.6.1.tgz#74722af32e9614e9c287a8d0bbde48b5e2f1a263"
   integrity sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==
 
-sparkles@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/sparkles/-/sparkles-1.0.1.tgz#008db65edce6c50eec0c5e228e1945061dd0437c"
-  integrity sha512-dSO0DDYUahUt/0/pD/Is3VIm5TGJjludZ0HVymmhYF6eNA53PVLhnUk0znSYbH8IYBuJdCE+1luR22jNLMaQdw==
-
 spdx-correct@^3.0.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/spdx-correct/-/spdx-correct-3.1.0.tgz#fb83e504445268f154b074e218c87c003cd31df4"
@@ -5120,6 +5615,13 @@ spdx-license-ids@^3.0.0:
   resolved "https://registry.yarnpkg.com/spdx-license-ids/-/spdx-license-ids-3.0.3.tgz#81c0ce8f21474756148bbb5f3bfc0f36bf15d76e"
   integrity sha512-uBIcIl3Ih6Phe3XHK1NqboJLdGfwr1UN3k6wSD1dZpmPsIkb8AGNbZYJ1fOBk834+Gxy8rpfDxrS6XLEMZMY2g==
 
+split-string@^3.0.1, split-string@^3.0.2:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/split-string/-/split-string-3.1.0.tgz#7cb09dda3a86585705c64b39a6466038682e8fe2"
+  integrity sha512-NzNVhJDYpwceVVii8/Hu6DKfD2G+NrQHlS/V/qgv763EYudVwEcMQNxd2lh+0VrUByXN/oJkl5grOhYWvQUYiw==
+  dependencies:
+    extend-shallow "^3.0.0"
+
 sprintf-js@~1.0.2:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.0.3.tgz#04e6926f662895354f3dd015203633b857297e2c"
@@ -5149,39 +5651,24 @@ sshpk@^1.7.0:
     safer-buffer "^2.0.2"
     tweetnacl "~0.14.0"
 
-stable@~0.1.6:
+stable@^0.1.8, stable@~0.1.6:
   version "0.1.8"
   resolved "https://registry.yarnpkg.com/stable/-/stable-0.1.8.tgz#836eb3c8382fe2936feaf544631017ce7d47a3cf"
   integrity sha512-ji9qxRnOVfcuLDySj9qzhGSEFVobyt1kIOSkj1qZzYLzq7Tos/oUUWvotUPQLlrsidqsK6tBH89Bc9kL5zHA6w==
 
-stat-mode@^0.2.0:
-  version "0.2.2"
-  resolved "https://registry.yarnpkg.com/stat-mode/-/stat-mode-0.2.2.tgz#e6c80b623123d7d80cf132ce538f346289072502"
-  integrity sha1-5sgLYjEj19gM8TLOU480YokHJQI=
+static-extend@^0.1.1:
+  version "0.1.2"
+  resolved "https://registry.yarnpkg.com/static-extend/-/static-extend-0.1.2.tgz#60809c39cbff55337226fd5e0b520f341f1fb5c6"
+  integrity sha1-YICcOcv/VTNyJv1eC1IPNB8ftcY=
+  dependencies:
+    define-property "^0.2.5"
+    object-copy "^0.1.0"
 
-"statuses@>= 1.4.0 < 2":
+"statuses@>= 1.5.0 < 2", statuses@~1.5.0:
   version "1.5.0"
   resolved "https://registry.yarnpkg.com/statuses/-/statuses-1.5.0.tgz#161c7dac177659fd9811f43771fa99381478628c"
   integrity sha1-Fhx9rBd2Wf2YEfQ3cfqZOBR4Yow=
 
-statuses@~1.4.0:
-  version "1.4.0"
-  resolved "https://registry.yarnpkg.com/statuses/-/statuses-1.4.0.tgz#bb73d446da2796106efcc1b601a253d6c46bd087"
-  integrity sha512-zhSCtt8v2NDrRlPQpCNtw/heZLtfUDqxBM1udqikb/Hbk52LK4nQSwr10u77iopCW5LsyHpuXS0GnEc48mLeew==
-
-stream-combiner2@^1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/stream-combiner2/-/stream-combiner2-1.1.1.tgz#fb4d8a1420ea362764e21ad4780397bebcb41cbe"
-  integrity sha1-+02KFCDqNidk4hrUeAOXvry0HL4=
-  dependencies:
-    duplexer2 "~0.1.0"
-    readable-stream "^2.0.2"
-
-stream-shift@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/stream-shift/-/stream-shift-1.0.0.tgz#d5c752825e5367e786f78e18e445ea223a155952"
-  integrity sha1-1cdSgl5TZ+eG944Y5EXqIjoVWVI=
-
 strict-uri-encode@^1.0.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/strict-uri-encode/-/strict-uri-encode-1.1.0.tgz#279b225df1d582b1f54e65addd4352e18faa0713"
@@ -5200,7 +5687,7 @@ string-width@^2.1.0:
     is-fullwidth-code-point "^2.0.0"
     strip-ansi "^4.0.0"
 
-string_decoder@0.10, string_decoder@~0.10.x:
+string_decoder@0.10:
   version "0.10.31"
   resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-0.10.31.tgz#62e203bc41766c6c28c9fc84301dab1c5310fa94"
   integrity sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=
@@ -5233,14 +5720,6 @@ strip-ansi@^4.0.0:
   dependencies:
     ansi-regex "^3.0.0"
 
-strip-bom-stream@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/strip-bom-stream/-/strip-bom-stream-1.0.0.tgz#e7144398577d51a6bed0fa1994fa05f43fd988ee"
-  integrity sha1-5xRDmFd9Uaa+0PoZlPoF9D/ZiO4=
-  dependencies:
-    first-chunk-stream "^1.0.0"
-    strip-bom "^2.0.0"
-
 strip-bom@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/strip-bom/-/strip-bom-2.0.0.tgz#6219a85616520491f35788bdbf1447a99c7e6b0e"
@@ -5253,17 +5732,12 @@ strip-color@^0.1.0:
   resolved "https://registry.yarnpkg.com/strip-color/-/strip-color-0.1.0.tgz#106f65d3d3e6a2d9401cac0eb0ce8b8a702b4f7b"
   integrity sha1-EG9l09PmotlAHKwOsM6LinArT3s=
 
-strip-dirs@^1.0.0:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/strip-dirs/-/strip-dirs-1.1.1.tgz#960bbd1287844f3975a4558aa103a8255e2456a0"
-  integrity sha1-lgu9EoeETzl1pFWKoQOoJV4kVqA=
+strip-dirs@^2.0.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/strip-dirs/-/strip-dirs-2.1.0.tgz#4987736264fc344cf20f6c34aca9d13d1d4ed6c5"
+  integrity sha512-JOCxOeKLm2CAS73y/U4ZeZPTkE+gNVCzKt7Eox84Iej1LT/2pTWYpZKJuxwQpvX1LiZb1xokNR7RLfuBAa7T3g==
   dependencies:
-    chalk "^1.0.0"
-    get-stdin "^4.0.1"
-    is-absolute "^0.1.5"
-    is-natural-number "^2.0.0"
-    minimist "^1.1.0"
-    sum-up "^1.0.1"
+    is-natural-number "^4.0.1"
 
 strip-eof@^1.0.0:
   version "1.0.0"
@@ -5277,11 +5751,6 @@ strip-indent@^1.0.1:
   dependencies:
     get-stdin "^4.0.1"
 
-strip-json-comments@~2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-2.0.1.tgz#3c531942e908c2697c0ec344858c286c7ca0a60a"
-  integrity sha1-PFMZQukIwml8DsNEhYwobHygpgo=
-
 strip-outer@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/strip-outer/-/strip-outer-1.0.1.tgz#b2fd2abf6604b9d1e6013057195df836b8a9d631"
@@ -5289,25 +5758,20 @@ strip-outer@^1.0.0:
   dependencies:
     escape-string-regexp "^1.0.2"
 
-sum-up@^1.0.1:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/sum-up/-/sum-up-1.0.3.tgz#1c661f667057f63bcb7875aa1438bc162525156e"
-  integrity sha1-HGYfZnBX9jvLeHWqFDi8FiUlFW4=
+stylehacks@^4.0.0:
+  version "4.0.3"
+  resolved "https://registry.yarnpkg.com/stylehacks/-/stylehacks-4.0.3.tgz#6718fcaf4d1e07d8a1318690881e8d96726a71d5"
+  integrity sha512-7GlLk9JwlElY4Y6a/rmbH2MhVlTyVmiJd1PfTCqFaIBEGMYNsrO/v3SeGTdhBThLg4Z+NbOk/qFMwCa+J+3p/g==
   dependencies:
-    chalk "^1.0.0"
+    browserslist "^4.0.0"
+    postcss "^7.0.0"
+    postcss-selector-parser "^3.0.0"
 
 supports-color@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-2.0.0.tgz#535d045ce6b6363fa40117084629995e9df324c7"
   integrity sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=
 
-supports-color@^3.2.3:
-  version "3.2.3"
-  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-3.2.3.tgz#65ac0504b3954171d8a64946b2ae3cbb8a5f54f6"
-  integrity sha1-ZawFBLOVQXHYpklGsq48u4pfVPY=
-  dependencies:
-    has-flag "^1.0.0"
-
 supports-color@^5.3.0, supports-color@^5.5.0:
   version "5.5.0"
   resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-5.5.0.tgz#e2e69a44ac8772f78a1ec0b35b689df6530efc8f"
@@ -5315,18 +5779,12 @@ supports-color@^5.3.0, supports-color@^5.5.0:
   dependencies:
     has-flag "^3.0.0"
 
-svgo@^0.7.0:
-  version "0.7.2"
-  resolved "https://registry.yarnpkg.com/svgo/-/svgo-0.7.2.tgz#9f5772413952135c6fefbf40afe6a4faa88b4bb5"
-  integrity sha1-n1dyQTlSE1xv779Ar+ak+qiLS7U=
+supports-color@^6.1.0:
+  version "6.1.0"
+  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-6.1.0.tgz#0764abc69c63d5ac842dd4867e8d025e880df8f3"
+  integrity sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ==
   dependencies:
-    coa "~1.0.1"
-    colors "~1.1.2"
-    csso "~2.3.1"
-    js-yaml "~3.7.0"
-    mkdirp "~0.5.1"
-    sax "~1.2.1"
-    whet.extend "~0.9.9"
+    has-flag "^3.0.0"
 
 svgo@^1.0.0:
   version "1.1.1"
@@ -5348,7 +5806,27 @@ svgo@^1.0.0:
     unquote "~1.1.1"
     util.promisify "~1.0.0"
 
-tar-stream@^1.1.1:
+svgo@^1.0.5:
+  version "1.2.2"
+  resolved "https://registry.yarnpkg.com/svgo/-/svgo-1.2.2.tgz#0253d34eccf2aed4ad4f283e11ee75198f9d7316"
+  integrity sha512-rAfulcwp2D9jjdGu+0CuqlrAUin6bBWrpoqXWwKDZZZJfXcUXQSxLJOFJCQCSA0x0pP2U0TxSlJu2ROq5Bq6qA==
+  dependencies:
+    chalk "^2.4.1"
+    coa "^2.0.2"
+    css-select "^2.0.0"
+    css-select-base-adapter "^0.1.1"
+    css-tree "1.0.0-alpha.28"
+    css-url-regex "^1.1.0"
+    csso "^3.5.1"
+    js-yaml "^3.13.1"
+    mkdirp "~0.5.1"
+    object.values "^1.1.0"
+    sax "~1.2.4"
+    stable "^0.1.8"
+    unquote "~1.1.1"
+    util.promisify "~1.0.0"
+
+tar-stream@^1.5.2:
   version "1.6.2"
   resolved "https://registry.yarnpkg.com/tar-stream/-/tar-stream-1.6.2.tgz#8ea55dab37972253d9a9af90fdcd559ae435c555"
   integrity sha512-rzS0heiNf8Xn7/mpdSVVSMAWAoy9bfb1WOTYC78Z0UQKeKa/CWS8FOq0lKGNa8DWKAn9gxjCvMLYc5PGXYlK2A==
@@ -5375,14 +5853,6 @@ temp-dir@^1.0.0:
   resolved "https://registry.yarnpkg.com/temp-dir/-/temp-dir-1.0.0.tgz#0a7c0ea26d3a39afa7e0ebea9c1fc0bc4daa011d"
   integrity sha1-CnwOom06Oa+n4OvqnB/AvE2qAR0=
 
-tempfile@^1.0.0:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/tempfile/-/tempfile-1.1.1.tgz#5bcc4eaecc4ab2c707d8bc11d99ccc9a2cb287f2"
-  integrity sha1-W8xOrsxKsscH2LwR2ZzMmiyyh/I=
-  dependencies:
-    os-tmpdir "^1.0.0"
-    uuid "^2.0.1"
-
 tempfile@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/tempfile/-/tempfile-2.0.0.tgz#6b0446856a9b1114d1856ffcbe509cccb0977265"
@@ -5396,52 +5866,20 @@ text-table@0.2.0:
   resolved "https://registry.yarnpkg.com/text-table/-/text-table-0.2.0.tgz#7f5ee823ae805207c00af2df4a84ec3fcfa570b4"
   integrity sha1-f17oI66AUgfACvLfSoTsP8+lcLQ=
 
-through2-filter@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/through2-filter/-/through2-filter-2.0.0.tgz#60bc55a0dacb76085db1f9dae99ab43f83d622ec"
-  integrity sha1-YLxVoNrLdghdsfna6Zq0P4PWIuw=
-  dependencies:
-    through2 "~2.0.0"
-    xtend "~4.0.0"
-
-through2-filter@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/through2-filter/-/through2-filter-3.0.0.tgz#700e786df2367c2c88cd8aa5be4cf9c1e7831254"
-  integrity sha512-jaRjI2WxN3W1V8/FMZ9HKIBXixtiqs3SQSX4/YGIiP3gL6djW48VoZq9tDqeCWs3MT8YY5wb/zli8VW8snY1CA==
-  dependencies:
-    through2 "~2.0.0"
-    xtend "~4.0.0"
-
-through2@^0.6.0, through2@^0.6.1:
-  version "0.6.5"
-  resolved "https://registry.yarnpkg.com/through2/-/through2-0.6.5.tgz#41ab9c67b29d57209071410e1d7a7a968cd3ad48"
-  integrity sha1-QaucZ7KdVyCQcUEOHXp6lozTrUg=
-  dependencies:
-    readable-stream ">=1.0.33-1 <1.1.0-0"
-    xtend ">=4.0.0 <4.1.0-0"
-
-through2@^2.0.0, through2@~2.0.0:
-  version "2.0.5"
-  resolved "https://registry.yarnpkg.com/through2/-/through2-2.0.5.tgz#01c1e39eb31d07cb7d03a96a70823260b23132cd"
-  integrity sha512-/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ==
-  dependencies:
-    readable-stream "~2.3.6"
-    xtend "~4.0.1"
-
-through@^2.3.6:
+through@^2.3.6, through@^2.3.8:
   version "2.3.8"
   resolved "https://registry.yarnpkg.com/through/-/through-2.3.8.tgz#0dd4c9ffaabc357960b1b724115d7e0e86a2e1f5"
   integrity sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU=
 
-time-stamp@^1.0.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/time-stamp/-/time-stamp-1.1.0.tgz#764a5a11af50561921b133f3b44e618687e0f5c3"
-  integrity sha1-dkpaEa9QVhkhsTPztE5hhofg9cM=
+timed-out@^4.0.0, timed-out@^4.0.1:
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/timed-out/-/timed-out-4.0.1.tgz#f32eacac5a175bea25d7fab565ab3ed8741ef56f"
+  integrity sha1-8y6srFoXW+ol1/q1Zas+2HQe9W8=
 
-timed-out@^3.0.0:
-  version "3.1.3"
-  resolved "https://registry.yarnpkg.com/timed-out/-/timed-out-3.1.3.tgz#95860bfcc5c76c277f8f8326fd0f5b2e20eba217"
-  integrity sha1-lYYL/MXHbCd/j4Mm/Q9bLiDrohc=
+timsort@^0.3.0:
+  version "0.3.0"
+  resolved "https://registry.yarnpkg.com/timsort/-/timsort-0.3.0.tgz#405411a8e7e6339fe64db9a234de11dc31e02bd4"
+  integrity sha1-QFQRqOfmM5/mTbmiNN4R3DHgK9Q=
 
 tiny-emitter@^2.0.0:
   version "2.0.2"
@@ -5467,13 +5905,6 @@ tmp@^0.0.33:
   dependencies:
     os-tmpdir "~1.0.2"
 
-to-absolute-glob@^0.1.1:
-  version "0.1.1"
-  resolved "https://registry.yarnpkg.com/to-absolute-glob/-/to-absolute-glob-0.1.1.tgz#1cdfa472a9ef50c239ee66999b662ca0eb39937f"
-  integrity sha1-HN+kcqnvUMI57maZm2YsoOs5k38=
-  dependencies:
-    extend-shallow "^2.0.1"
-
 to-buffer@^1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/to-buffer/-/to-buffer-1.1.1.tgz#493bd48f62d7c43fcded313a03dcadb2e1213a80"
@@ -5491,6 +5922,36 @@ to-object-path@^0.3.0:
   dependencies:
     kind-of "^3.0.2"
 
+to-regex-range@^2.1.0:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/to-regex-range/-/to-regex-range-2.1.1.tgz#7c80c17b9dfebe599e27367e0d4dd5590141db38"
+  integrity sha1-fIDBe53+vlmeJzZ+DU3VWQFB2zg=
+  dependencies:
+    is-number "^3.0.0"
+    repeat-string "^1.6.1"
+
+to-regex-range@^5.0.1:
+  version "5.0.1"
+  resolved "https://registry.yarnpkg.com/to-regex-range/-/to-regex-range-5.0.1.tgz#1648c44aae7c8d988a326018ed72f5b4dd0392e4"
+  integrity sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==
+  dependencies:
+    is-number "^7.0.0"
+
+to-regex@^3.0.1, to-regex@^3.0.2:
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/to-regex/-/to-regex-3.0.2.tgz#13cfdd9b336552f30b51f33a8ae1b42a7a7599ce"
+  integrity sha512-FWtleNAtZ/Ki2qtqej2CXTOayOH9bHDQF+Q48VpWyDXjbYxA4Yz8iDB31zXOBUlOHHKidDbqGVrTUvQMPmBGBw==
+  dependencies:
+    define-property "^2.0.2"
+    extend-shallow "^3.0.2"
+    regex-not "^1.0.2"
+    safe-regex "^1.1.0"
+
+toidentifier@1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/toidentifier/-/toidentifier-1.0.0.tgz#7e1be3470f1e77948bc43d94a3c8f4d7752ba553"
+  integrity sha512-yaOH/Pk/VEhBWWTlhI+qXxDFXlejDGcQipMlyxda9nthulaxLZUNcUqFxokp0vcYnvteJln5FNQDRrxj3YcbVw==
+
 toml@^2.3.2:
   version "2.3.3"
   resolved "https://registry.yarnpkg.com/toml/-/toml-2.3.3.tgz#8d683d729577cb286231dfc7a8affe58d31728fb"
@@ -5536,11 +5997,6 @@ truncate-html@^1.0.1:
     "@types/cheerio" "^0.22.8"
     cheerio "0.22.0"
 
-tunnel-agent@^0.4.0:
-  version "0.4.3"
-  resolved "https://registry.yarnpkg.com/tunnel-agent/-/tunnel-agent-0.4.3.tgz#6373db76909fe570e08d73583365ed828a74eeeb"
-  integrity sha1-Y3PbdpCf5XDgjXNYM2Xtgop07us=
-
 tunnel-agent@^0.6.0:
   version "0.6.0"
   resolved "https://registry.yarnpkg.com/tunnel-agent/-/tunnel-agent-0.6.0.tgz#27a5dea06b36b04a0a9966774b290868f0fc40fd"
@@ -5553,19 +6009,27 @@ tweetnacl@^0.14.3, tweetnacl@~0.14.0:
   resolved "https://registry.yarnpkg.com/tweetnacl/-/tweetnacl-0.14.5.tgz#5ae68177f192d4456269d108afa93ff8743f4f64"
   integrity sha1-WuaBd/GS1EViadEIr6k/+HQ/T2Q=
 
-type-is@~1.6.16:
-  version "1.6.16"
-  resolved "https://registry.yarnpkg.com/type-is/-/type-is-1.6.16.tgz#f89ce341541c672b25ee7ae3c73dee3b2be50194"
-  integrity sha512-HRkVv/5qY2G6I8iab9cI7v1bOIdhm94dVjQCPFElW9W+3GeDOSHmy2EBYe4VTApuzolPcmgFTN3ftVJRKR2J9Q==
+type-is@~1.6.17, type-is@~1.6.18:
+  version "1.6.18"
+  resolved "https://registry.yarnpkg.com/type-is/-/type-is-1.6.18.tgz#4e552cd05df09467dcbc4ef739de89f2cf37c131"
+  integrity sha512-TkRKr9sUTxEH8MdfuCSP7VizJyzRNMjj2J2do2Jr3Kym598JVdEksuzPQCnlFPW4ky9Q+iA+ma9BGm06XQBy8g==
   dependencies:
     media-typer "0.3.0"
-    mime-types "~2.1.18"
+    mime-types "~2.1.24"
 
 typedarray@^0.0.6:
   version "0.0.6"
   resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777"
   integrity sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c=
 
+unbzip2-stream@^1.0.9:
+  version "1.3.3"
+  resolved "https://registry.yarnpkg.com/unbzip2-stream/-/unbzip2-stream-1.3.3.tgz#d156d205e670d8d8c393e1c02ebd506422873f6a"
+  integrity sha512-fUlAF7U9Ah1Q6EieQ4x4zLNejrRvDWUYmxXUpN3uziFYCHapjWFaCAnreY9bGgxzaMCFAPPpYNng57CypwJVhg==
+  dependencies:
+    buffer "^5.2.1"
+    through "^2.3.8"
+
 underscore.string@~2.4.0:
   version "2.4.0"
   resolved "https://registry.yarnpkg.com/underscore.string/-/underscore.string-2.4.0.tgz#8cdd8fbac4e2d2ea1e7e2e8097c42f442280f85b"
@@ -5604,6 +6068,16 @@ unicode-property-aliases-ecmascript@^1.0.4:
   resolved "https://registry.yarnpkg.com/unicode-property-aliases-ecmascript/-/unicode-property-aliases-ecmascript-1.0.4.tgz#5a533f31b4317ea76f17d807fa0d116546111dd0"
   integrity sha512-2WSLa6OdYd2ng8oqiGIWnJqyFArvhn+5vgx5GTxMbUYjCYKUcuKS62YLFF0R/BDGlB1yzXjQOLtPAfHsgirEpg==
 
+union-value@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/union-value/-/union-value-1.0.1.tgz#0b6fe7b835aecda61c6ea4d4f02c14221e109847"
+  integrity sha512-tJfXmxMeWYnczCVs7XAEvIV7ieppALdyepWMkHkwciRpZraG/xwT+s2JN8+pr1+8jCRf80FFzvr+MpQeeoF4Xg==
+  dependencies:
+    arr-union "^3.1.0"
+    get-value "^2.0.6"
+    is-extendable "^0.1.1"
+    set-value "^2.0.1"
+
 uniq@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/uniq/-/uniq-1.0.1.tgz#b31c5ae8254844a3a8281541ce2b04b865a734ff"
@@ -5614,14 +6088,6 @@ uniqs@^2.0.0:
   resolved "https://registry.yarnpkg.com/uniqs/-/uniqs-2.0.0.tgz#ffede4b36b25290696e6e165d4a59edb998e6b02"
   integrity sha1-/+3ks2slKQaW5uFl1KWe25mOawI=
 
-unique-stream@^2.0.2:
-  version "2.3.1"
-  resolved "https://registry.yarnpkg.com/unique-stream/-/unique-stream-2.3.1.tgz#c65d110e9a4adf9a6c5948b28053d9a8d04cbeac"
-  integrity sha512-2nY4TnBE70yoxHkDli7DMazpWiP7xMdCYqU2nBRO0UB+ZpEkGsSija7MvmvnZFUeC+mrgiUfcHSr3LmRFIg4+A==
-  dependencies:
-    json-stable-stringify-without-jsonify "^1.0.1"
-    through2-filter "^3.0.0"
-
 universalify@^0.1.0:
   version "0.1.2"
   resolved "https://registry.yarnpkg.com/universalify/-/universalify-0.1.2.tgz#b646f69be3942dabcecc9d6639c80dc105efaa66"
@@ -5637,10 +6103,13 @@ unquote@~1.1.1:
   resolved "https://registry.yarnpkg.com/unquote/-/unquote-1.1.1.tgz#8fded7324ec6e88a0ff8b905e7c098cdc086d544"
   integrity sha1-j97XMk7G6IoP+LkF58CYzcCG1UQ=
 
-unzip-response@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/unzip-response/-/unzip-response-1.0.2.tgz#b984f0877fc0a89c2c773cc1ef7b5b232b5b06fe"
-  integrity sha1-uYTwh3/AqJwsdzzB73tbIytbBv4=
+unset-value@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/unset-value/-/unset-value-1.0.0.tgz#8376873f7d2335179ffb1e6fc3a8ed0dfc8ab559"
+  integrity sha1-g3aHP30jNRef+x5vw6jtDfyKtVk=
+  dependencies:
+    has-value "^0.3.1"
+    isobject "^3.0.0"
 
 uri-js@^4.2.2:
   version "4.2.2"
@@ -5649,6 +6118,11 @@ uri-js@^4.2.2:
   dependencies:
     punycode "^2.1.0"
 
+urix@^0.1.0:
+  version "0.1.0"
+  resolved "https://registry.yarnpkg.com/urix/-/urix-0.1.0.tgz#da937f7a62e21fec1fd18d49b35c2935067a6c72"
+  integrity sha1-2pN/emLiH+wf0Y1Js1wpNQZ6bHI=
+
 url-join@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/url-join/-/url-join-1.1.0.tgz#741c6c2f4596c4830d6718460920d0c92202dc78"
@@ -5661,6 +6135,13 @@ url-parse-lax@^1.0.0:
   dependencies:
     prepend-http "^1.0.1"
 
+url-parse-lax@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/url-parse-lax/-/url-parse-lax-3.0.0.tgz#16b5cafc07dbe3676c1b1999177823d6503acb0c"
+  integrity sha1-FrXK/Afb42dsGxmZF3gj1lA6yww=
+  dependencies:
+    prepend-http "^2.0.0"
+
 url-parse@^1.1.8, url-parse@^1.4.3:
   version "1.4.4"
   resolved "https://registry.yarnpkg.com/url-parse/-/url-parse-1.4.4.tgz#cac1556e95faa0303691fec5cf9d5a1bc34648f8"
@@ -5669,12 +6150,15 @@ url-parse@^1.1.8, url-parse@^1.4.3:
     querystringify "^2.0.0"
     requires-port "^1.0.0"
 
-url-regex@^3.0.0:
-  version "3.2.0"
-  resolved "https://registry.yarnpkg.com/url-regex/-/url-regex-3.2.0.tgz#dbad1e0c9e29e105dd0b1f09f6862f7fdb482724"
-  integrity sha1-260eDJ4p4QXdCx8J9oYvf9tIJyQ=
-  dependencies:
-    ip-regex "^1.0.1"
+url-to-options@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/url-to-options/-/url-to-options-1.0.1.tgz#1505a03a289a48cbd7a434efbaeec5055f5633a9"
+  integrity sha1-FQWgOiiaSMvXpDTvuu7FBV9WM6k=
+
+use@^3.1.0:
+  version "3.1.1"
+  resolved "https://registry.yarnpkg.com/use/-/use-3.1.1.tgz#d50c8cac79a19fbc20f2911f56eb973f4e10070f"
+  integrity sha512-cwESVXlO3url9YWlFW/TA9cshCEhtu7IKJ/p5soJ/gGpj7vbvFrAY/eIioQ6Dw23KjZhYgiIo8HOs1nQ2vr/oQ==
 
 util-deprecate@^1.0.1, util-deprecate@~1.0.1:
   version "1.0.2"
@@ -5694,21 +6178,11 @@ utils-merge@1.0.1:
   resolved "https://registry.yarnpkg.com/utils-merge/-/utils-merge-1.0.1.tgz#9f95710f50a267947b2ccc124741c1028427e713"
   integrity sha1-n5VxD1CiZ5R7LMwSR0HBAoQn5xM=
 
-uuid@^2.0.1:
-  version "2.0.3"
-  resolved "https://registry.yarnpkg.com/uuid/-/uuid-2.0.3.tgz#67e2e863797215530dff318e5bf9dcebfd47b21a"
-  integrity sha1-Z+LoY3lyFVMN/zGOW/nc6/1Hsho=
-
 uuid@^3.0.1, uuid@^3.3.2:
   version "3.3.2"
   resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.3.2.tgz#1b4af4955eb3077c501c23872fc6513811587131"
   integrity sha512-yXJmeNaw3DnnKAOKJE51sL/ZaYfWJRl1pK9dr19YFCu0ObS231AB1/LbqTKRAQ5kw8A90rA6fr4riOUpTZvQZA==
 
-vali-date@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/vali-date/-/vali-date-1.0.0.tgz#1b904a59609fb328ef078138420934f6b86709a6"
-  integrity sha1-G5BKWWCfsyjvB4E4Qgk09rhnCaY=
-
 validate-npm-package-license@^3.0.1:
   version "3.0.4"
   resolved "https://registry.yarnpkg.com/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz#fc91f6b9c7ba15c857f4cb2c5defeec39d4f410a"
@@ -5736,70 +6210,6 @@ verror@1.10.0:
     core-util-is "1.0.2"
     extsprintf "^1.2.0"
 
-vinyl-assign@^1.0.1:
-  version "1.2.1"
-  resolved "https://registry.yarnpkg.com/vinyl-assign/-/vinyl-assign-1.2.1.tgz#4d198891b5515911d771a8cd9c5480a46a074a45"
-  integrity sha1-TRmIkbVRWRHXcajNnFSApGoHSkU=
-  dependencies:
-    object-assign "^4.0.1"
-    readable-stream "^2.0.0"
-
-vinyl-fs@^2.2.0:
-  version "2.4.4"
-  resolved "https://registry.yarnpkg.com/vinyl-fs/-/vinyl-fs-2.4.4.tgz#be6ff3270cb55dfd7d3063640de81f25d7532239"
-  integrity sha1-vm/zJwy1Xf19MGNkDegfJddTIjk=
-  dependencies:
-    duplexify "^3.2.0"
-    glob-stream "^5.3.2"
-    graceful-fs "^4.0.0"
-    gulp-sourcemaps "1.6.0"
-    is-valid-glob "^0.3.0"
-    lazystream "^1.0.0"
-    lodash.isequal "^4.0.0"
-    merge-stream "^1.0.0"
-    mkdirp "^0.5.0"
-    object-assign "^4.0.0"
-    readable-stream "^2.0.4"
-    strip-bom "^2.0.0"
-    strip-bom-stream "^1.0.0"
-    through2 "^2.0.0"
-    through2-filter "^2.0.0"
-    vali-date "^1.0.0"
-    vinyl "^1.0.0"
-
-vinyl@^0.4.3:
-  version "0.4.6"
-  resolved "https://registry.yarnpkg.com/vinyl/-/vinyl-0.4.6.tgz#2f356c87a550a255461f36bbeb2a5ba8bf784847"
-  integrity sha1-LzVsh6VQolVGHza76ypbqL94SEc=
-  dependencies:
-    clone "^0.2.0"
-    clone-stats "^0.0.1"
-
-vinyl@^0.5.0:
-  version "0.5.3"
-  resolved "https://registry.yarnpkg.com/vinyl/-/vinyl-0.5.3.tgz#b0455b38fc5e0cf30d4325132e461970c2091cde"
-  integrity sha1-sEVbOPxeDPMNQyUTLkYZcMIJHN4=
-  dependencies:
-    clone "^1.0.0"
-    clone-stats "^0.0.1"
-    replace-ext "0.0.1"
-
-vinyl@^1.0.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/vinyl/-/vinyl-1.2.0.tgz#5c88036cf565e5df05558bfc911f8656df218884"
-  integrity sha1-XIgDbPVl5d8FVYv8kR+GVt8hiIQ=
-  dependencies:
-    clone "^1.0.0"
-    clone-stats "^0.0.1"
-    replace-ext "0.0.1"
-
-ware@^1.2.0:
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/ware/-/ware-1.3.0.tgz#d1b14f39d2e2cb4ab8c4098f756fe4b164e473d4"
-  integrity sha1-0bFPOdLiy0q4xAmPdW/ksWTkc9Q=
-  dependencies:
-    wrap-fn "^0.1.0"
-
 websocket-driver@>=0.5.1:
   version "0.7.0"
   resolved "https://registry.yarnpkg.com/websocket-driver/-/websocket-driver-0.7.0.tgz#0caf9d2d755d93aee049d4bdd0d3fe2cca2a24eb"
@@ -5813,11 +6223,6 @@ websocket-extensions@>=0.1.1:
   resolved "https://registry.yarnpkg.com/websocket-extensions/-/websocket-extensions-0.1.3.tgz#5d2ff22977003ec687a4b87073dfbbac146ccf29"
   integrity sha512-nqHUnMXmBzT0w570r2JpJxfiSD1IzoI+HGVdd3aZ0yNi3ngvQ4jv1dtHt5VGxfI2yj5yqImPhOK4vmIh2xMbGg==
 
-whet.extend@~0.9.9:
-  version "0.9.9"
-  resolved "https://registry.yarnpkg.com/whet.extend/-/whet.extend-0.9.9.tgz#f877d5bf648c97e5aa542fadc16d6a259b9c11a1"
-  integrity sha1-+HfVv2SMl+WqVC+twW1qJZucEaE=
-
 which@^1.2.14, which@^1.2.9:
   version "1.3.1"
   resolved "https://registry.yarnpkg.com/which/-/which-1.3.1.tgz#a45043d54f5805316da8d62f9f50918d3da70b0a"
@@ -5830,13 +6235,6 @@ wordwrap@0.0.2:
   resolved "https://registry.yarnpkg.com/wordwrap/-/wordwrap-0.0.2.tgz#b79669bb42ecb409f83d583cad52ca17eaa1643f"
   integrity sha1-t5Zpu0LstAn4PVg8rVLKF+qhZD8=
 
-wrap-fn@^0.1.0:
-  version "0.1.5"
-  resolved "https://registry.yarnpkg.com/wrap-fn/-/wrap-fn-0.1.5.tgz#f21b6e41016ff4a7e31720dbc63a09016bdf9845"
-  integrity sha1-8htuQQFv9KfjFyDbxjoJAWvfmEU=
-  dependencies:
-    co "3.1.0"
-
 wrappy@1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"
@@ -5847,7 +6245,7 @@ xml@^1.0.1:
   resolved "https://registry.yarnpkg.com/xml/-/xml-1.0.1.tgz#78ba72020029c5bc87b8a81a3cfcd74b4a2fc1e5"
   integrity sha1-eLpyAgApxbyHuKgaPPzXS0ovweU=
 
-"xtend@>=4.0.0 <4.1.0-0", xtend@^4.0.0, xtend@~4.0.0, xtend@~4.0.1:
+xtend@^4.0.0, xtend@~4.0.0:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/xtend/-/xtend-4.0.1.tgz#a5c6d532be656e23db820efb943a1f04998d63af"
   integrity sha1-pcbVMr5lbiPbgg77lDofBJmNY68=
@@ -5872,7 +6270,7 @@ yargs@^2.3.0:
   dependencies:
     wordwrap "0.0.2"
 
-yauzl@^2.2.1:
+yauzl@^2.4.2:
   version "2.10.0"
   resolved "https://registry.yarnpkg.com/yauzl/-/yauzl-2.10.0.tgz#c7eb17c93e112cb1086fa6d8e51fb0667b79a5f9"
   integrity sha1-x+sXyT4RLLEIb6bY5R+wZnt5pfk=

From c1df082d65a070c73072cb22cb45d3ca9947a3ac Mon Sep 17 00:00:00 2001
From: "Mateusz Szychowski (Muttley)" <muttleyxd@users.noreply.github.com>
Date: Sat, 13 Jul 2019 13:31:14 +0200
Subject: [PATCH 10/62] [C++][Pistache] Add compatibility for nlohmann-json
 3.5.0 (#3306)

* [C++][Pistache] Replace contains with find on json object

This makes generator compatible with nlohmann-json 3.5.0

* [C++][Pistache] Update Petstore sample
---
 .../cpp-pistache-server/model-source.mustache    |  2 +-
 .../petstore/cpp-pistache/model/ApiResponse.cpp  |  6 +++---
 .../petstore/cpp-pistache/model/Category.cpp     |  4 ++--
 .../cpp-pistache/model/Inline_object.cpp         |  4 ++--
 .../cpp-pistache/model/Inline_object_1.cpp       |  4 ++--
 .../server/petstore/cpp-pistache/model/Order.cpp | 12 ++++++------
 .../server/petstore/cpp-pistache/model/Pet.cpp   |  8 ++++----
 .../server/petstore/cpp-pistache/model/Tag.cpp   |  4 ++--
 .../server/petstore/cpp-pistache/model/User.cpp  | 16 ++++++++--------
 9 files changed, 30 insertions(+), 30 deletions(-)

diff --git a/modules/openapi-generator/src/main/resources/cpp-pistache-server/model-source.mustache b/modules/openapi-generator/src/main/resources/cpp-pistache-server/model-source.mustache
index c58a2fc79a..e69d65cafc 100644
--- a/modules/openapi-generator/src/main/resources/cpp-pistache-server/model-source.mustache
+++ b/modules/openapi-generator/src/main/resources/cpp-pistache-server/model-source.mustache
@@ -37,7 +37,7 @@ void to_json(nlohmann::json& j, const {{classname}}& o)
 void from_json(const nlohmann::json& j, {{classname}}& o)
 {
     {{#vars}}
-    {{#required}}j.at("{{baseName}}").get_to(o.m_{{name}});{{/required}}{{^required}}if(j.contains("{{baseName}}"))
+    {{#required}}j.at("{{baseName}}").get_to(o.m_{{name}});{{/required}}{{^required}}if(j.find("{{baseName}}") != j.end())
     {
         j.at("{{baseName}}").get_to(o.m_{{name}});
         o.m_{{name}}IsSet = true;
diff --git a/samples/server/petstore/cpp-pistache/model/ApiResponse.cpp b/samples/server/petstore/cpp-pistache/model/ApiResponse.cpp
index a78fb1cc7f..77cd466e14 100644
--- a/samples/server/petstore/cpp-pistache/model/ApiResponse.cpp
+++ b/samples/server/petstore/cpp-pistache/model/ApiResponse.cpp
@@ -51,17 +51,17 @@ void to_json(nlohmann::json& j, const ApiResponse& o)
 
 void from_json(const nlohmann::json& j, ApiResponse& o)
 {
-    if(j.contains("code"))
+    if(j.find("code") != j.end())
     {
         j.at("code").get_to(o.m_Code);
         o.m_CodeIsSet = true;
     } 
-    if(j.contains("type"))
+    if(j.find("type") != j.end())
     {
         j.at("type").get_to(o.m_Type);
         o.m_TypeIsSet = true;
     } 
-    if(j.contains("message"))
+    if(j.find("message") != j.end())
     {
         j.at("message").get_to(o.m_Message);
         o.m_MessageIsSet = true;
diff --git a/samples/server/petstore/cpp-pistache/model/Category.cpp b/samples/server/petstore/cpp-pistache/model/Category.cpp
index 2abb0c3c5e..43ff1d4900 100644
--- a/samples/server/petstore/cpp-pistache/model/Category.cpp
+++ b/samples/server/petstore/cpp-pistache/model/Category.cpp
@@ -47,12 +47,12 @@ void to_json(nlohmann::json& j, const Category& o)
 
 void from_json(const nlohmann::json& j, Category& o)
 {
-    if(j.contains("id"))
+    if(j.find("id") != j.end())
     {
         j.at("id").get_to(o.m_Id);
         o.m_IdIsSet = true;
     } 
-    if(j.contains("name"))
+    if(j.find("name") != j.end())
     {
         j.at("name").get_to(o.m_Name);
         o.m_NameIsSet = true;
diff --git a/samples/server/petstore/cpp-pistache/model/Inline_object.cpp b/samples/server/petstore/cpp-pistache/model/Inline_object.cpp
index ebb3130390..89638a8456 100644
--- a/samples/server/petstore/cpp-pistache/model/Inline_object.cpp
+++ b/samples/server/petstore/cpp-pistache/model/Inline_object.cpp
@@ -47,12 +47,12 @@ void to_json(nlohmann::json& j, const Inline_object& o)
 
 void from_json(const nlohmann::json& j, Inline_object& o)
 {
-    if(j.contains("name"))
+    if(j.find("name") != j.end())
     {
         j.at("name").get_to(o.m_Name);
         o.m_NameIsSet = true;
     } 
-    if(j.contains("status"))
+    if(j.find("status") != j.end())
     {
         j.at("status").get_to(o.m_Status);
         o.m_StatusIsSet = true;
diff --git a/samples/server/petstore/cpp-pistache/model/Inline_object_1.cpp b/samples/server/petstore/cpp-pistache/model/Inline_object_1.cpp
index d5ffe1fef8..0da3bdba2b 100644
--- a/samples/server/petstore/cpp-pistache/model/Inline_object_1.cpp
+++ b/samples/server/petstore/cpp-pistache/model/Inline_object_1.cpp
@@ -46,12 +46,12 @@ void to_json(nlohmann::json& j, const Inline_object_1& o)
 
 void from_json(const nlohmann::json& j, Inline_object_1& o)
 {
-    if(j.contains("additionalMetadata"))
+    if(j.find("additionalMetadata") != j.end())
     {
         j.at("additionalMetadata").get_to(o.m_AdditionalMetadata);
         o.m_AdditionalMetadataIsSet = true;
     } 
-    if(j.contains("file"))
+    if(j.find("file") != j.end())
     {
         j.at("file").get_to(o.m_file);
         o.m_fileIsSet = true;
diff --git a/samples/server/petstore/cpp-pistache/model/Order.cpp b/samples/server/petstore/cpp-pistache/model/Order.cpp
index b24cc0fce9..82efbce6cb 100644
--- a/samples/server/petstore/cpp-pistache/model/Order.cpp
+++ b/samples/server/petstore/cpp-pistache/model/Order.cpp
@@ -63,32 +63,32 @@ void to_json(nlohmann::json& j, const Order& o)
 
 void from_json(const nlohmann::json& j, Order& o)
 {
-    if(j.contains("id"))
+    if(j.find("id") != j.end())
     {
         j.at("id").get_to(o.m_Id);
         o.m_IdIsSet = true;
     } 
-    if(j.contains("petId"))
+    if(j.find("petId") != j.end())
     {
         j.at("petId").get_to(o.m_PetId);
         o.m_PetIdIsSet = true;
     } 
-    if(j.contains("quantity"))
+    if(j.find("quantity") != j.end())
     {
         j.at("quantity").get_to(o.m_Quantity);
         o.m_QuantityIsSet = true;
     } 
-    if(j.contains("shipDate"))
+    if(j.find("shipDate") != j.end())
     {
         j.at("shipDate").get_to(o.m_ShipDate);
         o.m_ShipDateIsSet = true;
     } 
-    if(j.contains("status"))
+    if(j.find("status") != j.end())
     {
         j.at("status").get_to(o.m_Status);
         o.m_StatusIsSet = true;
     } 
-    if(j.contains("complete"))
+    if(j.find("complete") != j.end())
     {
         j.at("complete").get_to(o.m_Complete);
         o.m_CompleteIsSet = true;
diff --git a/samples/server/petstore/cpp-pistache/model/Pet.cpp b/samples/server/petstore/cpp-pistache/model/Pet.cpp
index 7781e283ce..1bceb861ad 100644
--- a/samples/server/petstore/cpp-pistache/model/Pet.cpp
+++ b/samples/server/petstore/cpp-pistache/model/Pet.cpp
@@ -56,24 +56,24 @@ void to_json(nlohmann::json& j, const Pet& o)
 
 void from_json(const nlohmann::json& j, Pet& o)
 {
-    if(j.contains("id"))
+    if(j.find("id") != j.end())
     {
         j.at("id").get_to(o.m_Id);
         o.m_IdIsSet = true;
     } 
-    if(j.contains("category"))
+    if(j.find("category") != j.end())
     {
         j.at("category").get_to(o.m_Category);
         o.m_CategoryIsSet = true;
     } 
     j.at("name").get_to(o.m_Name);
     j.at("photoUrls").get_to(o.m_PhotoUrls);
-    if(j.contains("tags"))
+    if(j.find("tags") != j.end())
     {
         j.at("tags").get_to(o.m_Tags);
         o.m_TagsIsSet = true;
     } 
-    if(j.contains("status"))
+    if(j.find("status") != j.end())
     {
         j.at("status").get_to(o.m_Status);
         o.m_StatusIsSet = true;
diff --git a/samples/server/petstore/cpp-pistache/model/Tag.cpp b/samples/server/petstore/cpp-pistache/model/Tag.cpp
index b81cb82572..7f56fb2bcc 100644
--- a/samples/server/petstore/cpp-pistache/model/Tag.cpp
+++ b/samples/server/petstore/cpp-pistache/model/Tag.cpp
@@ -47,12 +47,12 @@ void to_json(nlohmann::json& j, const Tag& o)
 
 void from_json(const nlohmann::json& j, Tag& o)
 {
-    if(j.contains("id"))
+    if(j.find("id") != j.end())
     {
         j.at("id").get_to(o.m_Id);
         o.m_IdIsSet = true;
     } 
-    if(j.contains("name"))
+    if(j.find("name") != j.end())
     {
         j.at("name").get_to(o.m_Name);
         o.m_NameIsSet = true;
diff --git a/samples/server/petstore/cpp-pistache/model/User.cpp b/samples/server/petstore/cpp-pistache/model/User.cpp
index 66a026e9c7..20ae06352f 100644
--- a/samples/server/petstore/cpp-pistache/model/User.cpp
+++ b/samples/server/petstore/cpp-pistache/model/User.cpp
@@ -71,42 +71,42 @@ void to_json(nlohmann::json& j, const User& o)
 
 void from_json(const nlohmann::json& j, User& o)
 {
-    if(j.contains("id"))
+    if(j.find("id") != j.end())
     {
         j.at("id").get_to(o.m_Id);
         o.m_IdIsSet = true;
     } 
-    if(j.contains("username"))
+    if(j.find("username") != j.end())
     {
         j.at("username").get_to(o.m_Username);
         o.m_UsernameIsSet = true;
     } 
-    if(j.contains("firstName"))
+    if(j.find("firstName") != j.end())
     {
         j.at("firstName").get_to(o.m_FirstName);
         o.m_FirstNameIsSet = true;
     } 
-    if(j.contains("lastName"))
+    if(j.find("lastName") != j.end())
     {
         j.at("lastName").get_to(o.m_LastName);
         o.m_LastNameIsSet = true;
     } 
-    if(j.contains("email"))
+    if(j.find("email") != j.end())
     {
         j.at("email").get_to(o.m_Email);
         o.m_EmailIsSet = true;
     } 
-    if(j.contains("password"))
+    if(j.find("password") != j.end())
     {
         j.at("password").get_to(o.m_Password);
         o.m_PasswordIsSet = true;
     } 
-    if(j.contains("phone"))
+    if(j.find("phone") != j.end())
     {
         j.at("phone").get_to(o.m_Phone);
         o.m_PhoneIsSet = true;
     } 
-    if(j.contains("userStatus"))
+    if(j.find("userStatus") != j.end())
     {
         j.at("userStatus").get_to(o.m_UserStatus);
         o.m_UserStatusIsSet = true;

From ee27a1ec2bbc8128858e3c8fd1313ec03bf5c6e6 Mon Sep 17 00:00:00 2001
From: yuji38kwmt <yuji38kwmt@yahoo.co.jp>
Date: Sun, 14 Jul 2019 15:22:24 +0900
Subject: [PATCH 11/62] Update README.md (#3353)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

add "OpenAPI GeneratorでPythonのクライアントライブラリを作成した by yuji38kwmt" to "Presentations/Videos/Tutorials/Books"
---
 README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.md b/README.md
index bf3009ef6b..ab8bce4e67 100644
--- a/README.md
+++ b/README.md
@@ -595,6 +595,7 @@ Here are some companies/projects (alphabetical order) using OpenAPI Generator in
 - 2019-06-28 [Codewind OpenAPI Tools](https://marketplace.eclipse.org/content/codewind-openapi-tools) in [Eclipse Marketplace](https://marketplace.eclipse.org/) by IBM
 - 2019-06-29 [Codewind OpenAPI Tools](https://marketplace.visualstudio.com/items?itemName=IBM.codewind-openapi-tools) in [Visual Studio Marketplace](https://marketplace.visualstudio.com/) by IBM
 - 2019-07-04 - [REST API のためのコード生成入門 (OpenAPI Generator)](https://gum.co/openapi_generator_ebook_big5) by [William Cheng](https://twitter.com/wing328), [中野暁人](https://github.com/ackintosh), [和田拓朗](https://github.com/taxpon)
+- 2019-07-14 - [OpenAPI GeneratorでPythonのクライアントライブラリを作成した](https://qiita.com/yuji38kwmt/items/dfb929316a1335a161c0) by [yuji38kwmt](https://qiita.com/yuji38kwmt)
 
 ## [6 - About Us](#table-of-contents)
 

From 41d5750ddb6f22d90b959ad9c6cb4305a1933366 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A9r=C3=A9mie=20Bresson?= <dev@jmini.fr>
Date: Sun, 14 Jul 2019 12:06:44 +0200
Subject: [PATCH 12/62] [JaxRS-Spec] add openApiSpecFileLocation parameter
 (#3344)

* [JaxRS-Spec] add openApiSpecFileLocation parameter

* Update samples
---
 docs/generators/jaxrs-cxf-cdi.md              |   1 +
 docs/generators/jaxrs-spec.md                 |   1 +
 .../languages/JavaJAXRSSpecServerCodegen.java |  37 +++-
 .../org/openapitools/codegen/TestUtils.java   |  11 +
 .../jaxrs/JavaJAXRSSpecServerCodegenTest.java | 203 ++++++++++++++++--
 5 files changed, 236 insertions(+), 17 deletions(-)

diff --git a/docs/generators/jaxrs-cxf-cdi.md b/docs/generators/jaxrs-cxf-cdi.md
index ae4443c496..78d31c8573 100644
--- a/docs/generators/jaxrs-cxf-cdi.md
+++ b/docs/generators/jaxrs-cxf-cdi.md
@@ -51,4 +51,5 @@ sidebar_label: jaxrs-cxf-cdi
 |interfaceOnly|Whether to generate only API interface stubs without the server files.| |false|
 |returnResponse|Whether generate API interface should return javax.ws.rs.core.Response instead of a deserialized entity. Only useful if interfaceOnly is true.| |false|
 |useSwaggerAnnotations|Whether to generate Swagger annotations.| |true|
+|openApiSpecFileLocation|Location where the file containing the spec will be generated in the output folder. No file generated when set to null or empty string.| |null|
 |useBeanValidation|Use BeanValidation API annotations| |true|
diff --git a/docs/generators/jaxrs-spec.md b/docs/generators/jaxrs-spec.md
index 9ea4207189..8d338ebfef 100644
--- a/docs/generators/jaxrs-spec.md
+++ b/docs/generators/jaxrs-spec.md
@@ -51,3 +51,4 @@ sidebar_label: jaxrs-spec
 |interfaceOnly|Whether to generate only API interface stubs without the server files.| |false|
 |returnResponse|Whether generate API interface should return javax.ws.rs.core.Response instead of a deserialized entity. Only useful if interfaceOnly is true.| |false|
 |useSwaggerAnnotations|Whether to generate Swagger annotations.| |true|
+|openApiSpecFileLocation|Location where the file containing the spec will be generated in the output folder. No file generated when set to null or empty string.| |null|
diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaJAXRSSpecServerCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaJAXRSSpecServerCodegen.java
index 776915734a..8b7736fce3 100644
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaJAXRSSpecServerCodegen.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaJAXRSSpecServerCodegen.java
@@ -37,12 +37,14 @@ public class JavaJAXRSSpecServerCodegen extends AbstractJavaJAXRSServerCodegen {
     public static final String GENERATE_POM = "generatePom";
     public static final String USE_SWAGGER_ANNOTATIONS = "useSwaggerAnnotations";
     public static final String JACKSON = "jackson";
+    public static final String OPEN_API_SPEC_FILE_LOCATION = "openApiSpecFileLocation";
 
     private boolean interfaceOnly = false;
     private boolean returnResponse = false;
     private boolean generatePom = true;
     private boolean useSwaggerAnnotations = true;
     private boolean useJackson = false;
+    private String openApiSpecFileLocation = "src/main/openapi/openapi.yaml";
 
     private String primaryResourceName;
 
@@ -91,6 +93,7 @@ public class JavaJAXRSSpecServerCodegen extends AbstractJavaJAXRSServerCodegen {
         cliOptions.add(CliOption.newBoolean(INTERFACE_ONLY, "Whether to generate only API interface stubs without the server files.").defaultValue(String.valueOf(interfaceOnly)));
         cliOptions.add(CliOption.newBoolean(RETURN_RESPONSE, "Whether generate API interface should return javax.ws.rs.core.Response instead of a deserialized entity. Only useful if interfaceOnly is true.").defaultValue(String.valueOf(returnResponse)));
         cliOptions.add(CliOption.newBoolean(USE_SWAGGER_ANNOTATIONS, "Whether to generate Swagger annotations.", useSwaggerAnnotations));
+        cliOptions.add(CliOption.newString(OPEN_API_SPEC_FILE_LOCATION, "Location where the file containing the spec will be generated in the output folder. No file generated when set to null or empty string."));
     }
 
     @Override
@@ -114,6 +117,10 @@ public class JavaJAXRSSpecServerCodegen extends AbstractJavaJAXRSServerCodegen {
             useSwaggerAnnotations = Boolean.valueOf(additionalProperties.get(USE_SWAGGER_ANNOTATIONS).toString());
         }
         writePropertyBack(USE_SWAGGER_ANNOTATIONS, useSwaggerAnnotations);
+        if (additionalProperties.containsKey(OPEN_API_SPEC_FILE_LOCATION)) {
+            openApiSpecFileLocation = additionalProperties.get(OPEN_API_SPEC_FILE_LOCATION).toString();
+        }
+        additionalProperties.put(OPEN_API_SPEC_FILE_LOCATION, openApiSpecFileLocation);
 
         useJackson = convertPropertyToBoolean(JACKSON);
 
@@ -134,18 +141,38 @@ public class JavaJAXRSSpecServerCodegen extends AbstractJavaJAXRSServerCodegen {
                     (sourceFolder + '/' + invokerPackage).replace(".", "/"), "RestApplication.java"));
         }
 
-        supportingFiles.add(new SupportingFile("openapi.mustache",
-                "src/main/openapi",
-                "openapi.yaml")
-        );
+        if(StringUtils.isNotEmpty(openApiSpecFileLocation)) {
+            int index = openApiSpecFileLocation.lastIndexOf('/');
+            String fileFolder;
+            String fileName;
+            if(index >= 0) {
+                fileFolder = openApiSpecFileLocation.substring(0, index);
+                fileName = openApiSpecFileLocation.substring(index + 1);
+            } else {
+                fileFolder = "";
+                fileName = openApiSpecFileLocation;
+            }
+            supportingFiles.add(new SupportingFile("openapi.mustache", fileFolder, fileName));
+        }
     }
 
-
     @Override
     public String getName() {
         return "jaxrs-spec";
     }
 
+    public String getOpenApiSpecFileLocation() {
+        return openApiSpecFileLocation;
+    }
+
+    /**
+     * Location where the file containing the spec will be generated in the output folder.
+     * @param location location inside the output folder. No file generated when set to null or empty string.
+     */
+    public void setOpenApiSpecFileLocation(String location) {
+        this.openApiSpecFileLocation = location;
+    }
+
     @Override
     public void addOperationToGroup(String tag, String resourcePath, Operation operation, CodegenOperation co, Map<String, List<CodegenOperation>> operations) {
         String basePath = resourcePath;
diff --git a/modules/openapi-generator/src/test/java/org/openapitools/codegen/TestUtils.java b/modules/openapi-generator/src/test/java/org/openapitools/codegen/TestUtils.java
index 65614c7e51..188d7d2b90 100644
--- a/modules/openapi-generator/src/test/java/org/openapitools/codegen/TestUtils.java
+++ b/modules/openapi-generator/src/test/java/org/openapitools/codegen/TestUtils.java
@@ -1,5 +1,6 @@
 package org.openapitools.codegen;
 
+import static org.testng.Assert.assertFalse;
 import static org.testng.Assert.assertTrue;
 
 import io.swagger.parser.OpenAPIParser;
@@ -70,4 +71,14 @@ public class TestUtils {
         }
         assertTrue(generatedFiles.containsKey(absoluteFilename), "File '" + absoluteFilename + "' was not fould in the list of generated files");
     }
+
+    public static void ensureDoesNotContainsFile(Map<String, String> generatedFiles, File root, String filename) {
+        File file = new File(root, filename);
+        String absoluteFilename = file.getAbsolutePath().replace("\\", "/");
+        if (generatedFiles.containsKey(absoluteFilename)) {
+            Assert.fail("File '" + absoluteFilename + "' exists in file in list:\n" +
+                    generatedFiles.keySet().stream().sorted().collect(Collectors.joining(",\n")));
+        }
+        assertFalse(generatedFiles.containsKey(absoluteFilename), "File '" + absoluteFilename + "' was fould in the list of generated files");
+    }
 }
diff --git a/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/jaxrs/JavaJAXRSSpecServerCodegenTest.java b/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/jaxrs/JavaJAXRSSpecServerCodegenTest.java
index 341d2456f4..e5a13ce839 100644
--- a/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/jaxrs/JavaJAXRSSpecServerCodegenTest.java
+++ b/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/jaxrs/JavaJAXRSSpecServerCodegenTest.java
@@ -1,12 +1,24 @@
 package org.openapitools.codegen.java.jaxrs;
 
+import io.swagger.v3.oas.models.OpenAPI;
 import io.swagger.v3.oas.models.Operation;
+import io.swagger.v3.oas.models.servers.Server;
+
+import org.openapitools.codegen.ClientOptInput;
+import org.openapitools.codegen.CodegenConstants;
 import org.openapitools.codegen.CodegenOperation;
+import org.openapitools.codegen.MockDefaultGenerator;
+import org.openapitools.codegen.TestUtils;
+import org.openapitools.codegen.config.CodegenConfigurator;
+import org.openapitools.codegen.languages.AbstractJavaJAXRSServerCodegen;
+import org.openapitools.codegen.languages.JavaClientCodegen;
 import org.openapitools.codegen.languages.JavaJAXRSSpecServerCodegen;
 import org.testng.Assert;
 import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.Test;
 
+import java.io.File;
+import java.nio.file.Files;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -22,7 +34,79 @@ public class JavaJAXRSSpecServerCodegenTest extends JavaJaxrsBaseTest {
     public void before() {
         codegen = new JavaJAXRSSpecServerCodegen();
     }
-    
+
+    @Test
+    public void testInitialConfigValues() throws Exception {
+        final JavaJAXRSSpecServerCodegen codegen = new JavaJAXRSSpecServerCodegen();
+        codegen.processOpts();
+
+        OpenAPI openAPI = new OpenAPI();
+        openAPI.addServersItem(new Server().url("https://api.abcde.xy:8082/v2"));
+        codegen.preprocessOpenAPI(openAPI);
+
+        Assert.assertEquals(codegen.additionalProperties().get(CodegenConstants.HIDE_GENERATION_TIMESTAMP), Boolean.FALSE);
+        Assert.assertEquals(codegen.isHideGenerationTimestamp(), false);
+        Assert.assertEquals(codegen.modelPackage(), "org.openapitools.model");
+        Assert.assertEquals(codegen.additionalProperties().get(CodegenConstants.MODEL_PACKAGE), "org.openapitools.model");
+        Assert.assertEquals(codegen.apiPackage(), "org.openapitools.api");
+        Assert.assertEquals(codegen.additionalProperties().get(CodegenConstants.API_PACKAGE), "org.openapitools.api");
+        Assert.assertEquals(codegen.getInvokerPackage(), "org.openapitools.api");
+        Assert.assertEquals(codegen.additionalProperties().get(CodegenConstants.INVOKER_PACKAGE), "org.openapitools.api");
+        Assert.assertEquals(codegen.additionalProperties().get(JavaJAXRSSpecServerCodegen.SERVER_PORT), "8082");
+        Assert.assertEquals(codegen.getOpenApiSpecFileLocation(), "src/main/openapi/openapi.yaml");
+        Assert.assertEquals(codegen.additionalProperties().get(JavaJAXRSSpecServerCodegen.OPEN_API_SPEC_FILE_LOCATION), "src/main/openapi/openapi.yaml");
+    }
+
+    @Test
+    public void testSettersForConfigValues() throws Exception {
+        final JavaJAXRSSpecServerCodegen codegen = new JavaJAXRSSpecServerCodegen();
+        codegen.setHideGenerationTimestamp(true);
+        codegen.setModelPackage("xx.yyyyyyyy.model");
+        codegen.setApiPackage("xx.yyyyyyyy.api");
+        codegen.setInvokerPackage("xx.yyyyyyyy.invoker");
+        codegen.setOpenApiSpecFileLocation("src/main/resources/META-INF/openapi.yaml");
+        codegen.processOpts();
+
+        Assert.assertEquals(codegen.additionalProperties().get(CodegenConstants.HIDE_GENERATION_TIMESTAMP), Boolean.TRUE);
+        Assert.assertEquals(codegen.isHideGenerationTimestamp(), true);
+        Assert.assertEquals(codegen.modelPackage(), "xx.yyyyyyyy.model");
+        Assert.assertEquals(codegen.additionalProperties().get(CodegenConstants.MODEL_PACKAGE), "xx.yyyyyyyy.model");
+        Assert.assertEquals(codegen.apiPackage(), "xx.yyyyyyyy.api");
+        Assert.assertEquals(codegen.additionalProperties().get(CodegenConstants.API_PACKAGE), "xx.yyyyyyyy.api");
+        Assert.assertEquals(codegen.getInvokerPackage(), "xx.yyyyyyyy.invoker");
+        Assert.assertEquals(codegen.additionalProperties().get(CodegenConstants.INVOKER_PACKAGE), "xx.yyyyyyyy.invoker");
+        Assert.assertEquals(codegen.getOpenApiSpecFileLocation(), "src/main/resources/META-INF/openapi.yaml");
+        Assert.assertEquals(codegen.additionalProperties().get(JavaJAXRSSpecServerCodegen.OPEN_API_SPEC_FILE_LOCATION), "src/main/resources/META-INF/openapi.yaml");
+    }
+
+    @Test
+    public void testAdditionalPropertiesPutForConfigValues() throws Exception {
+        final JavaJAXRSSpecServerCodegen codegen = new JavaJAXRSSpecServerCodegen();
+        codegen.additionalProperties().put(CodegenConstants.HIDE_GENERATION_TIMESTAMP, "true");
+        codegen.additionalProperties().put(CodegenConstants.MODEL_PACKAGE, "xyz.yyyyy.mmmmm.model");
+        codegen.additionalProperties().put(CodegenConstants.API_PACKAGE, "xyz.yyyyy.aaaaa.api");
+        codegen.additionalProperties().put(CodegenConstants.INVOKER_PACKAGE, "xyz.yyyyy.iiii.invoker");
+        codegen.additionalProperties().put("serverPort", "8088");
+        codegen.additionalProperties().put(JavaJAXRSSpecServerCodegen.OPEN_API_SPEC_FILE_LOCATION, "openapi.yml");
+        codegen.processOpts();
+
+        OpenAPI openAPI = new OpenAPI();
+        openAPI.addServersItem(new Server().url("https://api.abcde.xy:8082/v2"));
+        codegen.preprocessOpenAPI(openAPI);
+
+        Assert.assertEquals(codegen.additionalProperties().get(CodegenConstants.HIDE_GENERATION_TIMESTAMP), Boolean.TRUE);
+        Assert.assertEquals(codegen.isHideGenerationTimestamp(), true);
+        Assert.assertEquals(codegen.modelPackage(), "xyz.yyyyy.mmmmm.model");
+        Assert.assertEquals(codegen.additionalProperties().get(CodegenConstants.MODEL_PACKAGE), "xyz.yyyyy.mmmmm.model");
+        Assert.assertEquals(codegen.apiPackage(), "xyz.yyyyy.aaaaa.api");
+        Assert.assertEquals(codegen.additionalProperties().get(CodegenConstants.API_PACKAGE), "xyz.yyyyy.aaaaa.api");
+        Assert.assertEquals(codegen.getInvokerPackage(), "xyz.yyyyy.iiii.invoker");
+        Assert.assertEquals(codegen.additionalProperties().get(CodegenConstants.INVOKER_PACKAGE), "xyz.yyyyy.iiii.invoker");
+        Assert.assertEquals(codegen.additionalProperties().get(AbstractJavaJAXRSServerCodegen.SERVER_PORT), "8088");
+        Assert.assertEquals(codegen.getOpenApiSpecFileLocation(), "openapi.yml");
+        Assert.assertEquals(codegen.additionalProperties().get(JavaJAXRSSpecServerCodegen.OPEN_API_SPEC_FILE_LOCATION), "openapi.yml");
+    }
+
     /**
      * Test
      * {@link JavaJAXRSSpecServerCodegen#addOperationToGroup(String, String, Operation, CodegenOperation, Map)} for Resource with path "/" and set tag.
@@ -33,14 +117,14 @@ public class JavaJAXRSSpecServerCodegenTest extends JavaJaxrsBaseTest {
         codegenOperation.operationId = "findPrimaryresource";
         Operation operation = new Operation();
         Map<String, List<CodegenOperation>> operationList = new HashMap<>();
-        
+
         codegen.addOperationToGroup("Primaryresource", "/", operation, codegenOperation, operationList);
-        
+
         Assert.assertEquals(operationList.size(), 1);
         Assert.assertTrue(operationList.containsKey(""));
         Assert.assertEquals(codegenOperation.baseName, "Primaryresource");
     }
-    
+
     /**
      * Test
      * {@link JavaJAXRSSpecServerCodegen#addOperationToGroup(String, String, Operation, CodegenOperation, Map)} for Resource with path param.
@@ -51,14 +135,14 @@ public class JavaJAXRSSpecServerCodegenTest extends JavaJaxrsBaseTest {
         codegenOperation.operationId = "getPrimaryresource";
         Operation operation = new Operation();
         Map<String, List<CodegenOperation>> operationList = new HashMap<>();
-        
+
         codegen.addOperationToGroup("Primaryresource", "/{uuid}", operation, codegenOperation, operationList);
-        
+
         Assert.assertEquals(operationList.size(), 1);
         Assert.assertTrue(operationList.containsKey(""));
         Assert.assertEquals(codegenOperation.baseName, "Primaryresource");
     }
-    
+
     /**
      * Test
      * {@link JavaJAXRSSpecServerCodegen#addOperationToGroup(String, String,
@@ -70,14 +154,14 @@ public class JavaJAXRSSpecServerCodegenTest extends JavaJaxrsBaseTest {
         codegenOperation.path = "/subresource";
         Operation operation = new Operation();
         Map<String, List<CodegenOperation>> operationList = new HashMap<>();
-        
+
         codegen.addOperationToGroup("Default", "/subresource", operation, codegenOperation, operationList);
-        
+
         Assert.assertEquals(codegenOperation.baseName, "subresource");
         Assert.assertEquals(operationList.size(), 1);
         Assert.assertTrue(operationList.containsKey("subresource"));
     }
-    
+
     /**
      * Test {@link JavaJAXRSSpecServerCodegen#toApiName(String)} with subresource.
      */
@@ -86,7 +170,7 @@ public class JavaJAXRSSpecServerCodegenTest extends JavaJaxrsBaseTest {
         final String subresource = codegen.toApiName("subresource");
         Assert.assertEquals(subresource, "SubresourceApi");
     }
-    
+
     /**
      * Test {@link JavaJAXRSSpecServerCodegen#toApiName(String)} with primary resource.
      */
@@ -97,8 +181,103 @@ public class JavaJAXRSSpecServerCodegenTest extends JavaJaxrsBaseTest {
         Operation operation = new Operation();
         Map<String, List<CodegenOperation>> operationList = new HashMap<>();
         codegen.addOperationToGroup("Primaryresource", "/", operation, codegenOperation, operationList);
-        
+
         final String subresource = codegen.toApiName("");
         Assert.assertEquals(subresource, "PrimaryresourceApi");
     }
+
+    @Test
+    public void testGeneratePingDefaultLocation() throws Exception {
+        Map<String, Object> properties = new HashMap<>();
+        properties.put(JavaClientCodegen.JAVA8_MODE, true);
+
+        File output = Files.createTempDirectory("test").toFile();
+
+        final CodegenConfigurator configurator = new CodegenConfigurator()
+                .setGeneratorName("jaxrs-spec")
+                .setAdditionalProperties(properties)
+                .setInputSpec("src/test/resources/3_0/ping.yaml")
+                .setOutputDir(output.getAbsolutePath().replace("\\", "/"));
+
+        final ClientOptInput clientOptInput = configurator.toClientOptInput();
+        MockDefaultGenerator generator = new MockDefaultGenerator();
+        generator.opts(clientOptInput).generate();
+
+        Map<String, String> generatedFiles = generator.getFiles();
+        TestUtils.ensureContainsFile(generatedFiles, output, "src/main/openapi/openapi.yaml");
+
+        output.deleteOnExit();
+    }
+
+    @Test
+    public void testGeneratePingNoSpecFile() throws Exception {
+        Map<String, Object> properties = new HashMap<>();
+        properties.put(JavaClientCodegen.JAVA8_MODE, true);
+        properties.put(JavaJAXRSSpecServerCodegen.OPEN_API_SPEC_FILE_LOCATION, "");
+
+        File output = Files.createTempDirectory("test").toFile();
+
+        final CodegenConfigurator configurator = new CodegenConfigurator()
+                .setGeneratorName("jaxrs-spec")
+                .setAdditionalProperties(properties)
+                .setInputSpec("src/test/resources/3_0/ping.yaml")
+                .setOutputDir(output.getAbsolutePath().replace("\\", "/"));
+
+        final ClientOptInput clientOptInput = configurator.toClientOptInput();
+        MockDefaultGenerator generator = new MockDefaultGenerator();
+        generator.opts(clientOptInput).generate();
+
+        Map<String, String> generatedFiles = generator.getFiles();
+        TestUtils.ensureDoesNotContainsFile(generatedFiles, output, "src/main/openapi/openapi.yaml");
+
+        output.deleteOnExit();
+    }
+
+    @Test
+    public void testGeneratePingAlternativeLocation1() throws Exception {
+        Map<String, Object> properties = new HashMap<>();
+        properties.put(JavaClientCodegen.JAVA8_MODE, true);
+        properties.put(JavaJAXRSSpecServerCodegen.OPEN_API_SPEC_FILE_LOCATION, "src/main/resources/META-INF/openapi.yaml");
+
+        File output = Files.createTempDirectory("test").toFile();
+
+        final CodegenConfigurator configurator = new CodegenConfigurator()
+                .setGeneratorName("jaxrs-spec")
+                .setAdditionalProperties(properties)
+                .setInputSpec("src/test/resources/3_0/ping.yaml")
+                .setOutputDir(output.getAbsolutePath().replace("\\", "/"));
+
+        final ClientOptInput clientOptInput = configurator.toClientOptInput();
+        MockDefaultGenerator generator = new MockDefaultGenerator();
+        generator.opts(clientOptInput).generate();
+
+        Map<String, String> generatedFiles = generator.getFiles();
+        TestUtils.ensureContainsFile(generatedFiles, output, "src/main/resources/META-INF/openapi.yaml");
+
+        output.deleteOnExit();
+    }
+
+    @Test
+    public void testGeneratePingAlternativeLocation2() throws Exception {
+        Map<String, Object> properties = new HashMap<>();
+        properties.put(JavaClientCodegen.JAVA8_MODE, true);
+        properties.put(JavaJAXRSSpecServerCodegen.OPEN_API_SPEC_FILE_LOCATION, "openapi.yml");
+
+        File output = Files.createTempDirectory("test").toFile();
+
+        final CodegenConfigurator configurator = new CodegenConfigurator()
+                .setGeneratorName("jaxrs-spec")
+                .setAdditionalProperties(properties)
+                .setInputSpec("src/test/resources/3_0/ping.yaml")
+                .setOutputDir(output.getAbsolutePath().replace("\\", "/"));
+
+        final ClientOptInput clientOptInput = configurator.toClientOptInput();
+        MockDefaultGenerator generator = new MockDefaultGenerator();
+        generator.opts(clientOptInput).generate();
+
+        Map<String, String> generatedFiles = generator.getFiles();
+        TestUtils.ensureContainsFile(generatedFiles, output, "openapi.yml");
+
+        output.deleteOnExit();
+    }
 }

From d117506b8a8a072cf99f9b6a90dcc17ba929cbfe Mon Sep 17 00:00:00 2001
From: hello-brsd <hello.brsd@gmail.com>
Date: Mon, 15 Jul 2019 07:57:07 +0200
Subject: [PATCH 13/62] [typescript-fetch] fix collection formats reference
 (#3324)

---
 .../src/main/resources/typescript-fetch/apis.mustache           | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/openapi-generator/src/main/resources/typescript-fetch/apis.mustache b/modules/openapi-generator/src/main/resources/typescript-fetch/apis.mustache
index f91cf183d7..8d0daf61ca 100644
--- a/modules/openapi-generator/src/main/resources/typescript-fetch/apis.mustache
+++ b/modules/openapi-generator/src/main/resources/typescript-fetch/apis.mustache
@@ -161,7 +161,7 @@ export class {{classname}} extends runtime.BaseAPI {
             })
             {{/isCollectionFormatMulti}}
             {{^isCollectionFormatMulti}}
-            formData.append('{{baseName}}', requestParameters.{{paramName}}.join(COLLECTION_FORMATS["{{collectionFormat}}"]));
+            formData.append('{{baseName}}', requestParameters.{{paramName}}.join(runtime.COLLECTION_FORMATS["{{collectionFormat}}"]));
             {{/isCollectionFormatMulti}}
         }
 

From 3eac8391f5d79a3e738b0380dc16e77d546ce435 Mon Sep 17 00:00:00 2001
From: hello-brsd <hello.brsd@gmail.com>
Date: Mon, 15 Jul 2019 07:58:08 +0200
Subject: [PATCH 14/62] [typescript-fetch] support custom stringify for query
 string (#3327)

* [typescript-fetch] support custom query stringify

* [typescript-fetch] support custom query stringify
---
 .../src/main/resources/typescript-fetch/runtime.mustache   | 7 ++++++-
 .../petstore/typescript-fetch/builds/default/runtime.ts    | 7 ++++++-
 .../petstore/typescript-fetch/builds/es6-target/runtime.ts | 7 ++++++-
 .../typescript-fetch/builds/with-interfaces/runtime.ts     | 7 ++++++-
 .../typescript-fetch/builds/with-npm-version/runtime.ts    | 7 ++++++-
 5 files changed, 30 insertions(+), 5 deletions(-)

diff --git a/modules/openapi-generator/src/main/resources/typescript-fetch/runtime.mustache b/modules/openapi-generator/src/main/resources/typescript-fetch/runtime.mustache
index cb7f747ea4..6878fd8495 100644
--- a/modules/openapi-generator/src/main/resources/typescript-fetch/runtime.mustache
+++ b/modules/openapi-generator/src/main/resources/typescript-fetch/runtime.mustache
@@ -47,7 +47,7 @@ export class BaseAPI {
             // only add the querystring to the URL if there are query parameters.
             // this is done to avoid urls ending with a "?" character which buggy webservers
             // do not handle correctly sometimes.
-            url += '?' + querystring(context.query);
+            url += '?' + this.configuration.queryParamsStringify(context.query);
         }
         const body = (context.body instanceof FormData || isBlob(context.body))
 	    ? context.body
@@ -116,6 +116,7 @@ export interface ConfigurationParameters {
     basePath?: string; // override base path
     fetchApi?: FetchAPI; // override for fetch implementation
     middleware?: Middleware[]; // middleware to apply before/after fetch requests
+    queryParamsStringify?: (params: HTTPQuery) => string; // stringify function for query strings
     username?: string; // parameter for basic security
     password?: string; // parameter for basic security
     apiKey?: string | ((name: string) => string); // parameter for apiKey security
@@ -137,6 +138,10 @@ export class Configuration {
         return this.configuration.middleware || [];
     }
 
+    get queryParamsStringify(): (params: HTTPQuery) => string {
+        return this.configuration.queryParamsStringify || querystring;
+    }
+
     get username(): string | undefined {
         return this.configuration.username;
     }
diff --git a/samples/client/petstore/typescript-fetch/builds/default/runtime.ts b/samples/client/petstore/typescript-fetch/builds/default/runtime.ts
index 5b07f81118..c95a101fba 100644
--- a/samples/client/petstore/typescript-fetch/builds/default/runtime.ts
+++ b/samples/client/petstore/typescript-fetch/builds/default/runtime.ts
@@ -58,7 +58,7 @@ export class BaseAPI {
             // only add the querystring to the URL if there are query parameters.
             // this is done to avoid urls ending with a "?" character which buggy webservers
             // do not handle correctly sometimes.
-            url += '?' + querystring(context.query);
+            url += '?' + this.configuration.queryParamsStringify(context.query);
         }
         const body = (context.body instanceof FormData || isBlob(context.body))
 	    ? context.body
@@ -127,6 +127,7 @@ export interface ConfigurationParameters {
     basePath?: string; // override base path
     fetchApi?: FetchAPI; // override for fetch implementation
     middleware?: Middleware[]; // middleware to apply before/after fetch requests
+    queryParamsStringify?: (params: HTTPQuery) => string; // stringify function for query strings
     username?: string; // parameter for basic security
     password?: string; // parameter for basic security
     apiKey?: string | ((name: string) => string); // parameter for apiKey security
@@ -148,6 +149,10 @@ export class Configuration {
         return this.configuration.middleware || [];
     }
 
+    get queryParamsStringify(): (params: HTTPQuery) => string {
+        return this.configuration.queryParamsStringify || querystring;
+    }
+
     get username(): string | undefined {
         return this.configuration.username;
     }
diff --git a/samples/client/petstore/typescript-fetch/builds/es6-target/runtime.ts b/samples/client/petstore/typescript-fetch/builds/es6-target/runtime.ts
index 5b07f81118..c95a101fba 100644
--- a/samples/client/petstore/typescript-fetch/builds/es6-target/runtime.ts
+++ b/samples/client/petstore/typescript-fetch/builds/es6-target/runtime.ts
@@ -58,7 +58,7 @@ export class BaseAPI {
             // only add the querystring to the URL if there are query parameters.
             // this is done to avoid urls ending with a "?" character which buggy webservers
             // do not handle correctly sometimes.
-            url += '?' + querystring(context.query);
+            url += '?' + this.configuration.queryParamsStringify(context.query);
         }
         const body = (context.body instanceof FormData || isBlob(context.body))
 	    ? context.body
@@ -127,6 +127,7 @@ export interface ConfigurationParameters {
     basePath?: string; // override base path
     fetchApi?: FetchAPI; // override for fetch implementation
     middleware?: Middleware[]; // middleware to apply before/after fetch requests
+    queryParamsStringify?: (params: HTTPQuery) => string; // stringify function for query strings
     username?: string; // parameter for basic security
     password?: string; // parameter for basic security
     apiKey?: string | ((name: string) => string); // parameter for apiKey security
@@ -148,6 +149,10 @@ export class Configuration {
         return this.configuration.middleware || [];
     }
 
+    get queryParamsStringify(): (params: HTTPQuery) => string {
+        return this.configuration.queryParamsStringify || querystring;
+    }
+
     get username(): string | undefined {
         return this.configuration.username;
     }
diff --git a/samples/client/petstore/typescript-fetch/builds/with-interfaces/runtime.ts b/samples/client/petstore/typescript-fetch/builds/with-interfaces/runtime.ts
index 5b07f81118..c95a101fba 100644
--- a/samples/client/petstore/typescript-fetch/builds/with-interfaces/runtime.ts
+++ b/samples/client/petstore/typescript-fetch/builds/with-interfaces/runtime.ts
@@ -58,7 +58,7 @@ export class BaseAPI {
             // only add the querystring to the URL if there are query parameters.
             // this is done to avoid urls ending with a "?" character which buggy webservers
             // do not handle correctly sometimes.
-            url += '?' + querystring(context.query);
+            url += '?' + this.configuration.queryParamsStringify(context.query);
         }
         const body = (context.body instanceof FormData || isBlob(context.body))
 	    ? context.body
@@ -127,6 +127,7 @@ export interface ConfigurationParameters {
     basePath?: string; // override base path
     fetchApi?: FetchAPI; // override for fetch implementation
     middleware?: Middleware[]; // middleware to apply before/after fetch requests
+    queryParamsStringify?: (params: HTTPQuery) => string; // stringify function for query strings
     username?: string; // parameter for basic security
     password?: string; // parameter for basic security
     apiKey?: string | ((name: string) => string); // parameter for apiKey security
@@ -148,6 +149,10 @@ export class Configuration {
         return this.configuration.middleware || [];
     }
 
+    get queryParamsStringify(): (params: HTTPQuery) => string {
+        return this.configuration.queryParamsStringify || querystring;
+    }
+
     get username(): string | undefined {
         return this.configuration.username;
     }
diff --git a/samples/client/petstore/typescript-fetch/builds/with-npm-version/runtime.ts b/samples/client/petstore/typescript-fetch/builds/with-npm-version/runtime.ts
index 5b07f81118..c95a101fba 100644
--- a/samples/client/petstore/typescript-fetch/builds/with-npm-version/runtime.ts
+++ b/samples/client/petstore/typescript-fetch/builds/with-npm-version/runtime.ts
@@ -58,7 +58,7 @@ export class BaseAPI {
             // only add the querystring to the URL if there are query parameters.
             // this is done to avoid urls ending with a "?" character which buggy webservers
             // do not handle correctly sometimes.
-            url += '?' + querystring(context.query);
+            url += '?' + this.configuration.queryParamsStringify(context.query);
         }
         const body = (context.body instanceof FormData || isBlob(context.body))
 	    ? context.body
@@ -127,6 +127,7 @@ export interface ConfigurationParameters {
     basePath?: string; // override base path
     fetchApi?: FetchAPI; // override for fetch implementation
     middleware?: Middleware[]; // middleware to apply before/after fetch requests
+    queryParamsStringify?: (params: HTTPQuery) => string; // stringify function for query strings
     username?: string; // parameter for basic security
     password?: string; // parameter for basic security
     apiKey?: string | ((name: string) => string); // parameter for apiKey security
@@ -148,6 +149,10 @@ export class Configuration {
         return this.configuration.middleware || [];
     }
 
+    get queryParamsStringify(): (params: HTTPQuery) => string {
+        return this.configuration.queryParamsStringify || querystring;
+    }
+
     get username(): string | undefined {
         return this.configuration.username;
     }

From 2fbf0f33b3016422779990f81126ef129fed738f Mon Sep 17 00:00:00 2001
From: hello-brsd <hello.brsd@gmail.com>
Date: Mon, 15 Jul 2019 07:59:01 +0200
Subject: [PATCH 15/62] [typescript-fetch] support additional properties
 (#3325)

---
 .../main/resources/typescript-fetch/modelGeneric.mustache   | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/modules/openapi-generator/src/main/resources/typescript-fetch/modelGeneric.mustache b/modules/openapi-generator/src/main/resources/typescript-fetch/modelGeneric.mustache
index 8711fc7e59..af08282fac 100644
--- a/modules/openapi-generator/src/main/resources/typescript-fetch/modelGeneric.mustache
+++ b/modules/openapi-generator/src/main/resources/typescript-fetch/modelGeneric.mustache
@@ -31,6 +31,9 @@ export interface {{classname}} {{#parent}}extends {{{parent}}} {{/parent}}{
 export function {{classname}}FromJSON(json: any): {{classname}} {
     {{#hasVars}}
     return {
+        {{#additionalPropertiesType}}
+            ...json,
+        {{/additionalPropertiesType}}
         {{#vars}}
         {{#isPrimitiveType}}
         {{#isDate}}
@@ -77,6 +80,9 @@ export function {{classname}}ToJSON(value?: {{classname}}): any {
         return undefined;
     }
     return {
+        {{#additionalPropertiesType}}
+            ...value,
+        {{/additionalPropertiesType}}
         {{#vars}}
         {{^isReadOnly}}
         {{#isPrimitiveType}}

From 81e073df2cc8446865d4eb9355b45686f7cfb7af Mon Sep 17 00:00:00 2001
From: hello-brsd <hello.brsd@gmail.com>
Date: Mon, 15 Jul 2019 08:03:09 +0200
Subject: [PATCH 16/62] [typescript-fetch] fix access token type (#3323)

---
 .../src/main/resources/typescript-fetch/apis.mustache         | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/openapi-generator/src/main/resources/typescript-fetch/apis.mustache b/modules/openapi-generator/src/main/resources/typescript-fetch/apis.mustache
index 8d0daf61ca..b903769d8a 100644
--- a/modules/openapi-generator/src/main/resources/typescript-fetch/apis.mustache
+++ b/modules/openapi-generator/src/main/resources/typescript-fetch/apis.mustache
@@ -113,8 +113,8 @@ export class {{classname}} extends runtime.BaseAPI {
         }
         {{/isBasicBasic}}
         {{#isBasicBearer}}
-        if (this.configuration && (this.configuration.accessToken || this.configuration.apiKey)) {
-            const token = this.configuration.accessToken || this.configuration.apiKey;
+        if (this.configuration && this.configuration.accessToken) {
+            const token = this.configuration.accessToken;
             const tokenString = typeof token === 'function' ? token("{{name}}", [{{#scopes}}"{{{scope}}}"{{^-last}}, {{/-last}}{{/scopes}}]) : token;
 
             if (tokenString) {

From a8185483fdaeb13a16c36091fe0c5c4f76a851e7 Mon Sep 17 00:00:00 2001
From: Akihito Nakano <sora.akatsuki@gmail.com>
Date: Mon, 15 Jul 2019 17:46:01 +0900
Subject: [PATCH 17/62] Add Kurusugawa Computer Inc. (#3362)

---
 website/dynamic/users.yml                   |   5 +++++
 website/static/img/companies/kurusugawa.png | Bin 0 -> 19252 bytes
 2 files changed, 5 insertions(+)
 create mode 100644 website/static/img/companies/kurusugawa.png

diff --git a/website/dynamic/users.yml b/website/dynamic/users.yml
index 670b02df59..e2f6017fa2 100644
--- a/website/dynamic/users.yml
+++ b/website/dynamic/users.yml
@@ -53,6 +53,11 @@
   image: "img/companies/klarna.svg"
   infoLink: "https://www.klarna.com/us/"
   pinned: false
+-
+  caption: "Kurusugawa Computer Inc."
+  image: "img/companies/kurusugawa.png"
+  infoLink: "https://www.kurusugawa.jp/"
+  pinned: false
 -
   caption: Metaswitch
   image: "img/companies/metaswitch.svg"
diff --git a/website/static/img/companies/kurusugawa.png b/website/static/img/companies/kurusugawa.png
new file mode 100644
index 0000000000000000000000000000000000000000..49cb94bba131cc115a0871b3e1ff339cd38ee418
GIT binary patch
literal 19252
zcmdSB_g7O-)IJ&zqzHo2qz9E2q)HK_2c<&@2`E)5(u-6np-GV<AVqo!y$DE`V1kH%
z^iJqekQSQK0z}}(&-Z=rTKBGX|A70`$vJ1vp1o(D*)y~EGl_*5XwuVi&;kGedTlKY
zC;)Ip4FDj!Mtzm^gctet3;+NEv^CUVudH?!EeE-$5PN^}Xmvj|-zb}r^aRFSxtan9
zSSZ<0bxm7arcOJ&t}$0#sIfzDB2vos=+|vFwZo!!W}W)Q8hvmM3V&@%Jf+~*NLWB+
z0f6tp)lyZm-d{h2{9JS&_s@2?y+`LC4Sr~T@nR@j<~}Z|DQb4)U|UJt<;8R;`Y)Ck
z(%MAQ2@sZbqC}wo_bXE>0{HLRsLn`1x;!(Xj`(*wNUO$3x`aLDqb4U^B}6Dl76AY+
zqJY$-%a;#~6lA1pCd>cNKK{Jtue+O*`M$W^K-{|A<kCvzB8Psj<7kN}dF+bA%(SdV
zOm(zcdUh_)?aY&2x7)>>yO0c39ixsAushFNiO(?1wa5)7EOsMTJC1Os?=K4mH2o|-
z)21-r6IPu=`);+V(vUt7qEs8z5}uJ%8+peh*l_iszVHL+vnId3?twx_qSOP_=s63i
z6p%Bb@STL(2y&%2<MMoHxnl`|Jx?Edbty$X*KXSj5}IpuS$B5iCKXM-rUvQEmp?w<
zKiY!-IH)!*U*t9Hk(qB5Jr;k>N2x(qaD}8Mjyi(Ymb~Egz-3}vYq{vr%^h5u_sd?E
zj2n!k{widnP@^1$wDwvf5G~<`+((Ry0jKuWVQ=`nNi}Fi0Ud$;3uRUXz3)2>`?TqG
z{`|4b5ZlGzb;e(kgcshAC>(5(O$tQhzd8^NM3{|wwguI-Wk>$Qz2jS;5R<)M(Ed>I
z0M>jrY4j`ay(@+7DxRy$wX5;Z{((lHk>W_Nb41SSbalDBH+1EKnnvi>_-EvZRgg^Q
zKd=>%3Pk=86c3Ch-7v-jg(QbgPuHYQp3lrnQ2+N#oiXiA16ufJI607R<SyjX%KpFt
zFUhcHYt#`pA$22N;@o`m=Hbc>E6d&CoVB(;;Ur19V8+StXpGX~*Z4sqd-#Zzw+#3f
z>G?->#>tduv=efo{_w)05it(}d~)5I?%u6ot6ehQ(@HJ;v9UQ({lzdb_d)%GfVIW$
z0YQVrwOfvF7S4GufY)kC17na&4Faw@tR}3duZHTD#9<<Gl;&H-r%8yQdo@g@gn-H_
zGTr4iyJ-LQW23gZ_HL;xY4jxAppYs2Mx_&E30<{PQY8BCSWqhCe+pIF)P*^opZu{8
zJIo>BD>U@TN*qe#v#{Io2Rz6^sxFf+qL8}(Z`o489xt((SiC(s(dgfs*p0EwU}Zau
z6cP$to0+c;tBAA}CRlbj$e8|X_X9OX=ECQe3?EeF9L1x_3(g<<i|u||Zs<F-5c&vH
z_3=FAPyn8tNEO2BMl;EENMAH*GX6sT^hn}TUdH6To&IE$G=i~wxX7y?NAo8C)k;mL
z)Q<3Iu;<QNA4L|ac!ee-Y-P{t<kb1RU;)P7L97xnMJs!6XN@MyQx+KBOG50nnTCE;
zT%vNH=_0QteZfSk08;nO`g{Y|=ny(llusaa%4QC(_~7?1P7hI@pq-;_@Qrk(U5vd1
z$t#69-KK7!lf2YKU-!4b<oxIbD|z+zXAnONF=pF(aFJSc@&*N3lPozf%!|GgI+7%?
zvi_vY0pvvm)+s(u3jM1|q5iK{Fk{mL^R{WOLatlK(|N;K5?uOjegrW>zfweykP^0;
ziC|0<0YJZAp;XaB8G^l|(^P-v)cqYlH}cZSEac&n>Lr0quj|9>LJP7{hm6i7)?ao{
z;DP-D<x#FggBpDxNm&W*M*0XZ3RMoB(f}1$E-}OQ4Och`-e05#rKtOF04fQZ;=hXd
zyzne%7xmWdDmu}sq+WXV_XQip5jS9rc>gmdD2h6gq;HR#i5dh)#u)GV9_$^}v}SA_
zzXTfV#(JQm0<1{y??~qWwYC6=3n~>KoPoO16$0+0lY|9QPd$H@^x4Pm&xuQ2yN6(>
z!awU*q~n1VBT*3c3lofTOz-C3YR!M>SdlyhYNf8K5MJ|&h4|u|h{eOon5}U*K*Lb=
z^o%aD`FH}ibfQLZBb8-#9#=~y2f~AinQZFa{=sMW80@Z)Oum(b^TuV~9HQDR{#yMb
z2H+SxX<II@$UFP8o+J))+Aq#F!WA@+;3UbQ%yu;#U8%!hUj6!ggRnEq{I`Ow!iR(0
zkz94i{15%?d?SKrGyndqfLH#d&C7kga|tPWnfqOXn9qI_LN_&pbPLyLOEvJWr0#l|
zX~#HeD)6bELUlhj6w!|miI=3mwsnW`wk-)0s;2^STm}cqP0D&Y&Oa~bYFZNn0P4BQ
z5oSjir&|IfRr+PxfE!3QE4_T0L_ULwDNSI>Qt70U9_f{q15_<}jSO))Q@7aq(1<?^
z;5c_i9oZx{HukOa0ja=v=3s82@^tuSu~%+<;O+cZwzeMM#wN;Bk5im73%P-ywy&93
zeH|rDt*0B4@uY?hYtR#*ZfHc7N~{6C3&N)rxpRo_Gxz7h$_?;d(q$SqNJ70OV}E*@
z74zG7!&&|cUsX-9al{c@tv=D-EN2D82D+#H6lF=*KZ24xK_OQ$Lxl9+a=odwKhAw;
zrCrRPZ!&C=&1wT9!%n-+W6>TUGbx@PV|^AyWF?8dDt!jjn*9MCx&mbgTWfl@<mZ9*
zWT#&Ig;|_4OuBp_L-$Vs`&+(@CED9n&&mqlUn&b8x$N8$eU=?aUn~#Z!<FX;1|I!$
zFuO^qPulHzmoZy}PadtuZ%sqm%)0(f0$rSLj3u<C<Ba8Ap(B+a88C>JhFa#OtvxRP
zkT?P9k;mxJz$1CwS}lV`8wXETL`(W37->NDOUwbay5gbquiLk(MA(RaJ0v(e?<I1t
zU({HUH5FR{AHMZ12(Pa2hr|M*qkc>P(riTMk*1am`iiI5QacDs!?$_(*;|57ptYL!
z1sQmkGVOklCUCjGq0RzE>L7|Q|0!qBm<9r*Si~|e@LZ!`<=o=BAsVMZaa82^0Ey(`
z;FsLU8Mdry4q*lmWRm{P;V&PvQB>Z}tzvt`VlMY!GhSeBUOH_rN4)&nn%CTf_ns~b
zWdg(b_B!X%fbXt`J^$318iU}I5C58b=dBpEj!do=%N(qRSihiixKf86=6a_^dn?oz
ze;7^hqOz?Fq;KY}Bo82YjC*f?j|%ZmZR&8Y7Vkjwibph{wnrG8Xq(4-ov5w4(BSWg
z_Vl{NK;7wl3L`%WN@dy7wUEQ(`9R&F9i5kSEQ)J%K;J(Xi`O`V!hi89xA+?~nB#oz
zYfEw&gHL%DLvx6-w<{DKt)AsIbF(>!v)PudoPOgxQadHhkpm%hk=7fzeHO#>|J?Cn
zt1QI!X<|S}W^2%O<#r^}WaO1)C@3^gz%pp;*!4)!9DcreXJBW{k96NM^%*a}Ac#+>
z5)^`qLx!Jw%CbDji0<AL$gf^iWn0dySS=D`Ib$RiHKg7)=R&LPRPH-Oj8$O+i<-OE
z)X7TMs;1Be`SL3lG*?*_9K01gc0=0h?g$!u3MIc=+GFou5_e(koq41O?K(&ee;kj2
z$-Lh{L0*53D2CkmI{8+B8p<~jyQRbOq~=m85~cT|?w-h5+jKH}5r2^=r7B9b8j5sr
z{0Sj?UB;+vV5W4c3VBG#S&?*zG)%{2Jg+QLfK@Dg4h`D@^*Kg&3ESw8d0n*1g?PT~
zUCn6oa5(tSt88)k8YzDwtSyNUFm7+&**?e>2i(j9=M5kgKVB?E>-oCTTk`a3t$y{l
z9WhcazbpOC`_1$6-`Dc)ZxTO8VN|dmCr1zTMy5jluBdq7h7IW34xw`8bRYRu?o5dg
zvtEy&JUj{?VU5L_Z-|sFDSn$wPD!{;9Vcujsq=|F8swRM$7e67>*$OF%n|4qc?j>D
z3{VclPwp2faeVgNYY!QDrW7buDkU$Abg8J@mxm*1eJi98e&6vuN9}9RzRSxYy#<g5
z)9?-Xlr051H%(!}Os04AkdAz)uMPQIOkFn!B_8_U9I_PF)^~>{qUt7Xlca{4kMArS
zrIs)c3PWp`Fm<NL=2yTrVgIlvM9htUdmxjMqLig7H>%$u&Q8RZSwRdzOENf!sNShr
zyCu=YT?#9*9cGsmS^W!-rIC)FyBPI`-ijq{HneE2>;|08&OJA(j|RP|t<vLm+zq;1
zPu(@2Ed}L(8Fn~xMu(J4S6x8r>5UNkY@krbsC+7>Rh&8a7wS5A-l)G(Wi9u4BXrn0
zeYCN{!?*YGCaUAp#b=_Qk=G)xdYoZGVd`viig4xhtIaAgdGh79Em8VMV3s`tiM!%y
z`|JQf8hB)f?@FP9bFRJG@vCkswIuW$;?p~`IhnRv3gPI+A<NxIP=vI&b{BIy?OS2e
zF0RX*k|Rs%Ocvh!Q4!C=P2u#pbX?Qlw|BLDvGr=Hm|l}96qr>dw?Xr7KNLq8y(TWe
zj!esbY*3n6t|<6ugeI;JbptB*!b@v+=Es7X5msyg7JI{{a;p1!w65-ECdk+VXL~X)
z^pa0TCh>$vwQa!R1JtzEe^0X((q?A>2_f|%!o%88%%E2C61gK(di_~L!Fym@IDFPr
zH=xITzM(YJ?On>6@4UVF>Xx_436e1TB*lUdlU($=&`{~fXPs$|@cLPTI>Xy!D6NM!
zlwzA-Kx@Oy#M4SRUDC8dof{QXX7FyurR0yyEp8<Q%I}sIZ@8pz!#N?^VkCCdFD-D9
zUKkc~Cic*l#jHa@&bVa?@?l3u(hHRFuNIrvh0L>}-@~m$4@aqmOMkz=D*%7-W{vfH
zK+wY<#{<JQL>%bUB&3`0?WfCIn`q%e^mg)B=S_?E4%QwTrfg-#v=mQnxoaW!C;VsG
z?@)5!ohn@%*&~GKg*l#k5BP>s3(HdLyoAPBK^kGmn8#YeQLWO#<Mtr|J7xc^cv`6@
znm_#b3>C30g}({5PXun<!(liO1#-B66pLO(5+1Gm!L;cGn1SIL=}o7XNtP8>qrMbc
zu9l~yxzkedlV2n8SZCvY*#Z*c%9v&&wBWB2Ky+SKkfl|UR`*g`=n?3C^0QX%+a&5e
zORlN2{f8#ncXfj|DDwWFR@hc-8F;Vi$dt*e!O!kt;p%D;FR^e__iO_DeTN1&OPMug
zAcy__#!l;0i00tuwQ&wdV__+39ZBZerhYr^fBj>@&?<@N_?#hox7OupX8;)9qpr>{
zjuDv<v(CChtuWA9_ZYW6<ez^RE6L#23&C1CwvXoTDJPq`0!ogqb%bn*?#_!4?p>k7
zNuXr0{r|1C?s_Q|X4*lKJk`kBVhl^xZDN*fhab+_6<4df*xCSTt-KvNbYt_ivbi{7
z1h(<Sso?C1MAP2E&pBLusRkLWPxK9Gv!h0;p=W^T@i&=xEbni<TJV0%Czj65l=OHw
z3<9`IxEdirsfCyvi#D+{ga|obXZQNMd`FzSa%h4l2l-u}#<Elww$vO|rC<FhFS98T
z)%nfh+p<gF_pv<Ai6d_4RH<@Wtv%(sZ`%tZGakOtuGzUN;*DW_h6^eA?2!KD|I6|S
z{4=v_8^m|?`?S*1XB7thKVM)J%BnZtR6rKnOHkUNZb~)b23PukB6Z6+;b!y=AGCaV
z@TXF04x7>i_kz*4cfVn4^37w>PzGM*Ww*PdZ#$YOQ%akT#1bG;sJ;HC0sqkb#e-nt
zyREsA?*E4tRBEG#C%acHWwaxJ^+)<L$7jm-WuF<TmI6d!BZvIz6-*p9a&}Z;>$qzX
z>VkZa2Tyu2j1)5WyMYzjy83w@;vUlNt<gdB>q0(nR~1J1of}^yc_6rrAXak7X|1Py
zhl>Tl1V!s-63tRS=S^ReU>#Ao`Dc*|^@csm#s%6E>}$SgE0c!lJ6dk1+Bj&kL=szc
z$$pd<1kNFXWH=mlQsPbLH@5z86fdt)a4Rg;thV)y3Kud6uNBw$f4;6$NZUsKRd~>v
zbKuEFs>ARH@^1p-)_}XtXrId-1lgCF%Ab;cR(0fWsR%uUrWx=e%uq&2#rgN-_ap(b
z<PE~qkGh?Y&Gca!p~XCR$JQ${bl(c=OqW=dR#K`$Ees*pZL@mII0Q{Iw0zwDI}FQO
zl_nZ29IevR-{w9!Gw_lvTkGr_r$=7<b?AFG8cW;CjuE@+Nl4iL?on+x&Ag63%t2cQ
z&vp$ldw-e}%EXw!2RqejhNDmQ&9;nb-Ar-oy@Ifi=!KTdpiI&*P#5A;pH~H=)f8%l
z3wWLF{;mylSiDtsYPXb~_#v0^PUsN{44`lIsRL(42uP{6L4JV$%U|DUJfcM3gP!$E
z*ofsXnzy!yl^}DxweT@HiCJbJ`I|!2?oHhJL_l-4xszH9NVBK`?vXt<kuzBQk-pkP
zf1&QeES>(4x=JCV^s0s=%NymA4{0a=sSMwSX2c>-kEb@;Z*TpNuX_!2Y=oS$d(GSI
zKF1JMLB3lTv*FSCk4hm*I=)|FBeN}}XcUi(W)(9@S&U?A{hXM>l;9&gZ33qL^JZjp
zKFlae7p+`*EaKyReUtdp#Qz}nxj;9A?-e=J_G=@Xr?vZE&b&MCDF_ef?E-}+tIM~H
z!IV1G(KaAPgw|8xKO|J)R;p)8|4(C%`9GTeAAdr^^9$tu{a-EJ3thp4@U(^XPxBKu
z6?(m;Cy%C0jJzXIwW~Mphx=2{3BZS^8tV9-I<tGIiw^Venp*pO$mY3|7xXr1im?Id
zzSPppz1WKUHs}g(vHsYNa7pd8LLkz-Ur)aJc`ZzXp3^PJo(y2$5L4<>tA|Ct5Hd7U
zQbRIF@U@xcqsB-1n)7>iU0i8<o>-cTdvUD`%x9jRl#I*3{SsGl)m<Ow!HB7if<k2(
z)%u`u%(teZ<4*T18Sk%i`+4TgQqzCz+u|*Yht`KhCI>8fzWspcVh$Ixc~P3>pRXg-
z=OtkSK922G!-j(aZdJ~gV4QKY8<ObG37=>6W*C@avUAK?Sm8r@D{8{mo9rGPQFLFW
z^wqhQcoSUH!?9G>AC&Ogqae>#nyp?5h!-8_`grpSaCW|4ZUge`<*n@ggT)&MH9gau
zC2sVTsyB1=9mSZL+h<p@KL;=1nyr0FBgbKPPY&^x9}Em@sv-yKfhE--uH9G%S4w!g
zKYSSs?l=TsgDcxcZ8G_s-A3(*e5ubOedznA8kATiwFM`Q5A9-jA{J~~rb-k<qjtlc
z`Q7%tj6a|zLE9H^iR6H1u5s+w*9}x%oLy&|T<g15s!$d48*@?f>k=_ldKR_H9V(^F
zv)6lJoeA>(!nG5l9}{4!cV4{O%{0!^U0i<EQbx!dh2+%hz-ysz<a_i-%#D%jTD2=I
zbBW04^~jcL{NHc6*s`i)l|v;`o1ykvjGEo}ug6p~c_)^C_YbKWcIu1Uq`@mp7P?du
zlWk&pl|Ehsum8HiKk+piqtnEG@qVQ<TRl!Ht0+b~BlDohN<UQ{W2dl-1Zdd=e$kOF
z+o#ma!;@EOlm!dhzob3mA~d#Rpl;@s%vuJ2Wca%eDSX}Rzfa*O<tWJ*#9xP_wAW}U
znC<;5pT(GotDilXM&^H+!VkL0C5c@#)$@o*3S`&eaA&zW!8s}OPIbfTT~Tn)b_~z5
zt@EF%qG&47hV=>QKUx*(0Uw}g)i9gHmvEO5o&VcpQUm!NAwq)HR~^2)<v<M~!t+_#
z9vv~Lr8!WUV8vGCW;6HE)7Q|k?n>HBE6di_M9^oDs_)7n3zyS|g*8qk5(2PG)Q$sa
ztwX|NG2*?F+jHYn%`wt)HDk<0c31fKGFn8L0kI8HZx@j(Kl6d2VL2;iWB_2fO+=ws
z&1yr?mI<Ne*L01Z8bSaB5l;f0J4@CT@jXIZwULh^2OdRkq=V!x!79Ylst=n%))zZ8
zgx)@1`h~>YjZjWw=+<*ffJZ!yRP?e7pNw>?lb(_foO!!@!GG#^%6>?B^Z4Yr1!4bX
zC^qDDI3{H60z(}4BLl1zzX1w8vd6gC-;X}$MwAobrPknRd^A(VzSOa*mNytr4x}ee
zESF>A^o^@t%{%$jp)1VA^%KOpSXX~#{mH{+`pn`jg^YZ}Az!`Z(~jO)0q?Ayj?4T^
zluY9G*uAJd-&eYFc%ML6G{w5GZ0Hbp-<oKh>c}KLDOd^d!<tsPiKMr87zgNU-|&v`
zfq-pQ5tI8LzL6um8xgA<2irM<B?u2xT)l^)16^~bUmjzvZ6&bQz2GeK(pKCmyL!+^
zbY8fja<%Ns-~94|8pT#w$~HGpK4O?AF6&wez;bgo$HJRG?kV*&>qC{At>7!T^FFzr
zB?4N~{<cp|Pw-<g3_?b|w@u`~MWjd*H+aa1+Rb$8G*-S&AHEa15meP8>VtDDcAi(q
zB1y{t`KaMPT=2Y!6qYfjNqBAl8}sKA`geO5uHF|cb5=s~1x7BcjHZbLbmT94%e?Ig
z<i2^;Oaq8y=~Z(;0}RDu%gXrnX^fztQZSe-xuRSIt5hytf30&4^RrT#Z00++`zFRK
zLF3jPZZ^V`HgRD3?Fisd^X75`-9b3rqqde9t5+|(E(wpqW6TPw*UW_&1AmNq@6JEk
zr&R4%Pxrb=LaM^M*xW3y$e(oI)p~H^_q4LXmUR;j*1%eg-fYq~R&ITi6E3#!^Zl;K
zk+(a@$6~>D6%z)FqmDr7EV}$?#I^y51}V=bhSbn^-GKsgiKtVV(%+P-v?19gKi$;B
ztB85>9wqQ_7baV-*VQZ4$YA9vSca5<g_5eIHu?2?0~^dBaVm2PwW6iMT=XyiaA<#1
z4PpRSq9(<fQ);9f$dOg`r${{)aMiW2$p)T>*g|^x*VP=o7QQ@0sVE(9PNM%=%(u-2
zUM1gtL=dCPL%$D!x2vObIcQ%HLFMwz?6eLg!^~7a6j^mC_d&NM)d%hD3dHLcn`YP~
zsrV@AYt9Bc9Tr<nYnHMd3mU&xM_sRm3b~x$w6?F=vQvKB=QfwxU^ZWIdt#Op8rc#B
zjwKg}*Q)Gc(5Tb3+)r3vb*G#aOLDn)Z;%ab9@x^Fy4le`+fsbyWD)&uqYY6?U^gcD
zG=WF9eXRtX$@~@Ei}B_m(%Mn~%`w75FN<3Ld*W$=MKIAhGSS-<b8xpU(bVyw7jCZ?
z_}|vb_y#D*IIrVZyJ6x^pvY}%TDY^im-WYjK>Vh@634iJ@jRnCo4eNT%Hm_ok<^Or
zjyj}29Ch{7_Q8^`-ecv(TP(REzc&LBk-Kb_AZrIEelE+rc38nva#7aptFQD=d3-EI
zo?wVfYNJp8U%<vR(E5-n#}KD7PmhCKv7B8$%_>~zd2SnX${O33i2+hv#H*A;5tS~I
zNmDW}zbEfr{-!cTUwuLCfCUH%!htd{<N1POsf^bgRH&<}<5-LDT(h!d0LF+y)`efx
zvT%u}$8ly!G|~G|N*yr8RJJ)ApszUrJp4FZ0}J$Yw8e#(_kVe$eG^J0S~_^+3P6wd
zp9VQDP|dDib1h*m%RgE~cP?5C9B(~(V|Hk4N+;7=={yWcC@wdYGcy$QXY(B#Wht=e
z(ka<$xox%Ub*uf28xtJNt8V|@zvGx*`<kfdHgPG_<vU^V<^g-#$??>0?sev1u+3fU
zA6hp}I6JqFqj~+)U7{Tm^5E%yi~rC0y_DM4TNG-d6;gjT%k%wkJ=AnB!+T&)g1z7Z
z|ECrzyLs>G#|*e!+1B7_OfRXTbGMDTqw|{fw{Yr+>_70x|0BI(;TQ9qiR*i!@~p;2
zaLO%YFiC6{4enOPg7%HOWnY(5tEKoXTUq{isVr>WL`7~~oQ;lz?4ohA><Zxj3^?EE
z^|wU5^4xhr*zpby<@BZ}rI47a0BZ_Xq-a1Tl=XkaQ>=S8{!@F9#<`Ld`sjcEP?#J-
ze)Ow}CM+T7O8RV!)k#1~^Z4}u)~he{Zva$vNQ(SX<q;H(qZxdga%*zTB8QPacEZfj
zm-$(xW`|1=g*7lekY_p5SBW%QBMPTUnXPS1)YtP)N;b&5uiK>9y}M9OZS48G`041t
z*UZ#W(T=ATHhWt&a|k|c?H>~jR<w(F5%M}9IFku>i{BEG?SRwxCH%YQfr^ae3IWk%
z^44tGdjnPTCd2kakkFmnzQc`&>&NF)a%@nt^oG{WB^F|U?0Ft5Ywf|J;nMC<!=^~P
z<biRIw4l&h)~x?2?NH2j-_PpvM&n#jqb<{xoRz1wEPc(~NEd@Mv0lr_;dQQbA9Q!2
zU<FVI?KXWY8%6SxV+faqw2Ss@W?#nMPg9b7%`Z|&dK0r++U>DbQC^|j)pPdnC_RwA
z`+!mv0O6QmlxW7LF^@5o<R|r7yL7y<9)7=%si16f`d$3q^r0HK!v3SQ-{VT*c&Fy0
zzA2C?#}LC<{Q-PA=hp4}Ka!<CZ<8W2&v*V9W8<Mi|H}n<_GjZ_o}-o4G~J>7sBUwe
z9b;7ndGX*6!eg-O;UtLrA4(I`$NaAaR<J1k2U2a(38Y(1yDap;QY6LYp*lAA&@!=|
zI&UPU6@3jCl0h<4sED*0u_?68zgzVaR0Wf!36p;Jl<Zqa@cuFU`F(Lq&p_)aPr5WC
z9U{XgnAoKG6Vq@HFukaLZDYMLf3N@FUDsJppUbzrbH6X06JFw6bja%JpdA^J0-PjW
zPEwu#0K=f$)Y&3TfVP?{W&EG<Pec?CGrBHJOH^L+X+d;Tw$`~9!etW1rL<G`G17Iu
zfwb`7=Xr3ru*_mu_OXR0Wb=*Om04ItlnnFl<{c$$vRr#q$Cku{fPMPQmNm!p{F~9E
z<f>0@s6nt)j#zm%un}Ogq^MjcKKh~?QmWPonU6CNbIvOWER~*g=9Frcsg#y(((Y1a
z5=cKt8(64f+i^IexvJ4MfLidE$<RX6<9*!~>MHt~^23I>k01IQi?suijoH;8y(ZPE
z4)~bhG#wT+X)6ojtS3uG#(uNS6qi}OOG8I+c?|xfu5^p9>IYGX5t@~QZ!?mLg#17d
z;EUvJi{{dr<s_|XM1P_D`W{3R*1Yxy*$FlJV)Lje#I-wx08{iQM2EUDwU-+enNqZg
zh7E-!9kTDGva|5y-^_Xl|LVIg&4pGpsw{1qVpBlP)SZ;C71WORazed#qj#G8-78OB
zs>OOAH-t4VL7JgV)C)>&tCz-w?YZNHJp}k7-UX)kOpIKkr%81C{tq&D&qwRyPZPLo
zYE!x9@i|<g@-1rr28G7XXp2o_O6oPzKzOp|Ah+6X{l7TryV4R@$5JmHI4VmYrdL`U
ze+64U5Len?OpA&bfi)E&Dtw(26h^3YUM1+V8rK^K1bNn}fHRRg-WAIq9+Sbpl#kzG
zzE5YM9-qHfLPYL`gM1Hob4ESeD|6R{mjuIw$I)(ab;828sddyCCdN1U{(d<-*qyhk
zIw{@YGb+pi8AXtT9-ZM4#<D2p&Sdi07>3KQh@eB1$&)pS5Bvgvlrpp|UX42aRG3oT
z%o!+6XMlB%E4<Aj6LR9{Xq)P7rP;eWVW@;w!1~t3aLO9c^RMMM$d0i(0<<bKffX*T
z&#|louDO!Giya?6mQ+x@Q5KO&eJd74%AFqxMa&9Z_gyHcRSGMOrw?NuZOY=RYhc%5
zQ%qOgs4*^IXq9avUNIGDFYqb#=5>baAx6B+rFTsGx}w}9*VzG#CVGt0N6itiHdFqN
zN@ld`;~X73I)r;wJx;PKpr^#ea|tUiLJF8M-*2i(%=*HMugO&h`mD2D*rrvP%2RSX
zl!_3>j$4%Wj9F>9O1Buj0hzCF-@Nn21L~46E@<2R;rEW0poBk5_6g@e-pswKNug8q
z3B-pK7j-wBkDfF|c|0j0G;sF{a%Ri23(5R#MxAN1y5G=sme;!>5)x3YAa+xM4UTO$
z99&mAp4;ktj706!Fr6*cX1g2mPR<arRvW(wnids~mi)HpB`t0Fr|8w^vsYflJ{CIJ
zMLGw6m!wr&l~1Gh8H~NLR#CDg`dCtJ^nUM>RdD^!V0QCb&QQ*J(WP2}E%NR+HPq3Q
z@HkXH*c|KnieKyHXWbA$Q>hEz;g3{QScyL4-Fhq%V;YXVHGsRaH3GlNhEh=uB)a7!
zmPSUzptjHk8wa~6eE-zhGiA(9O|egV!DT1IVry!ph^c({f~_}PU7h92e_FOBY9@@f
ztf6o*wPR)2U~|cl?-so!^f*a68p<$GYfz9P71GTkXb0aWU&iy-Cc0~9_W_xOx0??4
zO}6a6<_@k(fNb7LU-t~jsOHzxN-RgWklN?A-m;S4y_YyUjMxCaH|8q}kuUL6Tq_)`
zzTS@47d{GZ)^Dpb^o{=hChMKy)1l{kDGb-k$^}cY6jBI`dK}PB?WJ{3oady~F%k&2
z*0!`^C7D1W7|`Ye@186Tn!&lv<)OyCZppr#FZ9?pkLIHHA>8ef551Nni6(b~T1fG6
z4pA9M1yy-f#@A9>FFfG;n>_21$1H9hdS6UZss=qcOgI}y+BPs{2j*<lzFF-h%y{GL
zkv2DL68^N24Gv|l7Z_+uswMj%Ue$C=)U2Wz%nFKXYSFgf(JK$&QM$q|y}`vBW<2H4
ztg+;nneIR$U0A|Qw;T(#(}{)SjH<TJf^<^9-(^e}+PdwO94U)djlM7_sGdA`zh=L|
zVk{8NI>98JPP{5%Z^^0s?y(WcH^1KlM;%dAlJidNTRJ3o-_&4<tLoP`#;Xz6239J=
z=3q~qvac`7MD-8;3qNxlaC_g=1Ekq@*k0i?Vw5f$eCcmSEDaOtow<;$BIl!jJ$YU%
za`dK6&0yodoJx|g&bHF(Ts%rilk8A@vd{>R2y%|2jhGhOoMtM~@zy?w=uytC7NzuX
z9@1B1ssPKy-z<Hy=Qt>*cK>qy-FHeM@2jehQ&qLP?)OR=YLSH{mRpg?5qyN+M=!4+
z$6NiiBuAJi-?;^i0e&F^o#&lyYE@@$d)`dFxc`fk)o$W3%r|po{h(0USQH7}=oyEk
zR<%*dBCtw^Dx6bZ>`<s*!4o9i3qIQg2QXRTbWj|+PmVrJy?454yVp4|PxkyTpJT!C
z4odn}o(^8m$W7U>v$TIGnXn5ft3r+h4JMDz{Nfdkl*(KEZ~eAu#W6QMIr3M*t#(W~
zvR1y&S1)0-UQMBG#4Wuj0_fD3pIGB;`3~u`n4wIowIRTD=lCaUPRfJF+MRA%anFpM
zBKO*#ClUSrWGk!A*@f$JQ)o}9YO#nMnWZV%!RdAC=SkUBeG!dH74Zy6)Cc`G9sZW^
zkJ@`LOpy-S{{?j<Db;2^Bn2iLZd^q9coocp9?{37q93A^xMZlx)9Q(q<b}ecT~D$q
zp^)r9&|w#?!H?<5wP3Kfu`b4}Do0UqjzSgTWELRZwIaP<sZmeH*u!_6-!T2>lm_4p
zwO~vu+Gitv*)Wci=QH;FaVCvs=P)6B*L``Q8|^2db{fy#1EZx>HY<^mhV{NMbI_#@
zqoY*UkG@&c|Lf<S>ikN{L6)zty6xEEubDc<0pCPO*>$5+T_c(u=X+>Ygl=0{RkTPt
zkA>e5wNPcEDNYZ+C4g2b;>j2%2X+lsI;Jc_(CW10EG6EHcVsAMB<bmh{(hl;<fTT%
ze%ds35~8F8LDem%Og%P!y4Yg-6UCa~+&F=SjC+s7e_c?}lOe{NOXa1rRc;u|H#)hS
zrY^nb%LLYF1Ml|RRoDUb*I3E;>cL{h2}J;%gVFt`#iyRxwl&cLcoVJ4Pe3gwjNBOZ
zI7Ze7m=PzSR*qkMQo}v@ah<Q68J#Q~2qqTU;>wEZ!qlHq_NFYTXW=oV6wX^tyFv15
zJf8>}dvkT-K5)%!;t0NvxZ*fqmpRpFO|OslHB~Jk-XlEmfm`@JFe<5wSc(FPSAC-^
zb!w>uA?%EF-sP3)PZ!K=Kd#51FI$#-I?87>-)@Eaw0V>oJvH%)lkHRX5e221xzcVY
zD>rma8S%qvlHBU-DKGIf`UviF=Kko(L*=xy12198hZY-8IOL6OIsX?hDGgoeP^VB5
z-ES!<J8;{0v95jJGL=7XJ~>n2`S5lRa;q$I&`q9smZ>DZ&c#HMeuCYLYty{kpv_|_
zoBX}NY^yp?;Lk^dn$9S9Pe~n4tjF5<#?>VOfE0K@C!kQa^k<vEbM=XzFN>b(GrXj9
zFNK9kTn`LUVwGp!O&suV_du%BUg*Ax;$Zac@Vk8R2HVW$<}c@#W<w5aBUZgkNXtyQ
z{Tirk#Gb&dYgy%M=t8(v>dFFJm0BxHG1j|Up8T*@i%rN6N!t$Ebz3{X_2R-XmWDA~
zs?&m0XEZmR{__g4vvQuo%<i(OXBD(}BxJ-dk0XiGSA$wIc<**!RmD>-D-74o{0opl
z(#Iu7s@WR^s~IYTUh{|vab~!CxdrODRt?fE+7_KdMv_3=7(NGOT4s#jmS}O-C6n&@
z<M3qG1~=W_!}zU{x}K)3CmGNXBUTypZ?N3RX<I$`#>FQ$-8OpHs*cU49Nye6Y2ncc
zcRFld1K|(mT2LI$kAn8!dXn9nddGBOk}L`JfaE-X1lKWpxDiXSx;-38W@8*Uli641
z78IgE_BAu6BdWr53&VN*VXfJRy`ehnX>Ya_A1vU+a{-}G7-y!BR*jv;{gL|?6@5gn
zHUd3bb`J5}ZanO4&JmEbu}O%dkGT7&^mjeB=iyxgHb@1(ovY6T>fv*SaI>e;`7X#k
zk9ijx-C5n~H1{u-(S=n~WnWauzH+&*akLbE6R`}8lCJds?wu%ANzP&(Fpl=Qj^*43
z@zWo5ww}M$XcxaHNG;Ww)KK1Y_r9dGUG8(wE@1^~ow2W_tk}%m?@)Tn&b`;s+NF5<
zn>F0hb{{J~I9XPzEBaJVJJg|3@V#ize$rCN{I>fq%b=+13!ZsI))xi@;tXxtF4CCO
zD^4m+g4x;|1qKi5YULI#1s~x<&nnA{*Z;87hB;Dmn!FQka3j$pTh0D9#q*6{FQ0MO
z&O4J%W0iayH(6d^X>D8i$cklr0b0`i9_k*gKR&UALS1&9n%8@keRo%1eLDNuh9?4?
zjs+oI>Ya49M%UlMajVWUcaJt5iu;oe(Mo*(hRx13x8BTgq4k^IZ}B{((QUcl9AEkk
zb{`=dpKit@g|Xwx`sL9-D|z@=V3h+fcE|#1$Hq$$HSPW;z5Pq~f}KqXW)w`R@;ENW
ze1a+@p)9?b8A{RaJa(Qz+81M#GBX>h59&-d_@bB7I4EKxY`7m<?==p$1`bC*@Pn(b
zw{QBgoPDmxw_C`xWt4=7H6clg4vUBl><`i_O;AV3=6sdOMumTh!xzv7`dDMR+;HB4
z?{_cx2Xp8x<-BPk;&`qL2A;IAJ1^@<+EvEFSh#$t%5xQKsMKkEf}z9oH}wUE<?k8D
zeV@^ZH^i@urh@`~wYAfFjIT}M{h{f9gpCF&c?M~@@U=3c`Tg~;x0YNkGKeOkM_;b%
zv&iE_Gy##PbFIOwNBZC$-lx+dJfS;Bcgd3T3!DL*3V^QxB%Vf*4%oD9{c7pGUn6%b
z95aNDUis+@T&xY8Ml8a@ePh!pOShWV-73}V;?O3IJb}C8w<`WTX6gJF07Tx<?6k*w
zB{_}Wzf)#!-j$YpI7n8Tc9hDuk&p5)C2A<wLnoCU&Aa3mNQb4{Gpi-j2F1l5%45^D
z<)0gNn$s|`7*7lVeF256IcZ7`zR(wuB9axOU?>A%@iY9LX;glksW-~sX(k2Ks_>qw
zR@|0{v7eb^xfp0hqZcOTBW`F^&Y@HF<E{qQHshVvnYrai;ML!M?@b6r6vDve(w7?S
znqH%_SbAY++wB$qt-~7t#lx>7K_gY=?)%I-yDXzEn`?Q+-EMdj_QO|<x796ycC4@x
zes;@BI&Pu6lDftyWvE>KSrg5t?H_{cEk$ic6ly7;nuds23p6Omzohzi37(WdVq(>O
z`V4CPvD%KqOiQL)(z}u_3hLi8%Gg-XpbJRO2N~>gz^a<OI#fXdGX_R={g1qjsyV37
zCQIbBI;x+0P^hdJ1^Ye70X1{%l0w|BlKSKHy;}8)$ONDy%1#@~_#$w{W}HMI<dL5U
ztm5ewQ{tqpQf^f&7jBr78A3%h>I`3(dyLdG(jTY{e2!IGcla><o`4hR<)f@oDY`1r
z?}Hw_FWT+x-G8Vz&A9)10NZzePb@KCIj`iMIAvbDo4ME%8KJGV#oq7lZlSLFilUfR
zYc0M0*j#$eHz92CrT@U%cU`UuC}eN8Y9ZVRf1YT0{;&su-E&fk)af<67U(;*8qQVa
zc~s+~fERFbMZA(|)nrUF*~oU~px_gQfALbR?g7EFR;=QgcjZsEK@VWX_}RkkaU&cX
z7)!4PL8>!sKWUrBSGcHcEW5NWjXOVyGz-G~M?tc+1Z7nYTeG=|@4|WwE1ncF;};bJ
z@o6N&gwFmr0dW(cQ%3v+Q8GeM59Q?Rp4&-#M<l>VNzt4`5@`tKA&9k8bh_6Z=~7{7
zY&OKRQ^BTB!v-BSBlB+SEDR3(SgkmXrVaxPE~b$KU+x|3x`>fTilzO`f*jLnwmXHB
z*XD)8jDeGO^HZFwoaz)ERM(X<>~58DeY#K}h?0njcG9Syo<$}BL(STf0fuND>yD%M
zOT~X--r5!%d%-`Vx13{oE3XlLc6Df-Em}r*RbDg6nz!)VkAPJPyqYd8I5N6TRl|`N
zA*H-1H$GWHl4va1Pg>#(Hycq}ghL9LKUES0>{BRmvObjSfgW4WVx@C+MR-Tl`sqU3
z){rE&=NFGAwdBYK4VibvQC2L@Zr)YT;ovOYmb^5j#Bu&cUXsXh_QhOaPIP!_(NRqH
zV7(I<Jk6|FqO~n?m(sgb6g5Z1Kdi+9s4PzekchQ~bj8;rm|;zMIndRg8Hr8(sOd<W
zNT@?XJo3lZfQww4hg@0yJ$~8^;uCspr_aX2#i+|3hBl9X#|D7KB%f9pb8j`f6}e*q
zeCPbY`c2?%*bP%gR<pa+@v^a0I;mcmtY5dBNqo?-SH-(DHz`GgjUhRQ69@*vxL>uV
z)`7+u4^R1$6n{v?05D_RJpU0}uPWLce?#w)Qb++>*3yHYWD$xJ!FbnfM!ROGQs{L~
zpp)0A;*BFkVTd+2U8U*TJaHsM_UoCJ1rmVXvwB1-FMU52s5LoP%V%Bbm}%C}XQW(p
zR|F#23CTEBr!8S-1f7h1Y{Fnwvg4+He>?KIRunhfm1|-}VyfMW9~+@*D7BdAzU7=4
zf4rJy>!De5RQ$tZ<aj3@L83Zg{7@=OB_r}`wt5ANy&MMe)A=MmvFgKA+K69&Os%aI
zy&f#)US|g}HgGHX2A<9-;>z?5UrQCl1{P)yGMUxU^!yKFB6g}{550yrA(3L0Nh!!4
zVMbRkS5m7ckNk=Nj(sdk+k9IZsY>m1bOR9EAKQP8WLCd)mb{v5X~eEnU6~HPsqdDF
zHCb{5FFEiZKU%**Q0wgbA^#!u+k*b+z-z`eqV|qF$<dwqqMQq@A*cA|YE7%B=S0KH
z-qm>V;Ek*6a<V}Ola<}p7xPK1g2TD!3+1zzjC&ZLgSYWJ=4HOFVQr^<mq89MPg(_8
zRRY#e@VMHJ8SkNe1zZEl6yQC*HXHj{V3z4_cGAnj7)sF8os#aSL@Q0|bBWHEc!1VH
z*gqPz7a4?;Huz$#cWa%za7%2?06>wj;D2#2)Lp>)w{!WL%2R9jHYtZcHiFq-){R#=
z?=Td{5UOo=lgJ8hrP4=epk;-z3{ujOIxJ57B41t!h3ypkLng0iDC{?4ey4(~^MP%_
zq+=%;%IYM^=^Xc&PlP^7Vtwh(EiDTpH^)v*MtZIP&L?rCGd<Hvy&mz4w2C{F(gcSm
z2S!fg<aaNqDWQ)Qhc@wd0OP;4q&o9T<Hp59f@F;g$$3ecxkx}l68kj%>iy7=BPtVc
z5QY${-1hTm>hip|`lqMG!9j7p$`N@sQAOfvDno=uIHW%cMh~yJJnM}yacVOXXr!*v
zzLuZO+PZV+JI|eFa_8>}NIp*vTB>Kk%mAk+)r(bi0ra$f%p0(w)3Kvkz@|CT!%`;9
z;;{rp;j>2S2x&ubS2~G0ud#KrvS>&V+2DAQ6u1Q~*Og=bD@6U(M&=l&2ViNwDZ)-3
z_VR4p(0YauAY9=jRZnEv!!^^s0TjYWQZ&Mo1!`T$gLq+MCQ;@r9(0Ci?*i-mq)8e^
zx(15;@}CS<670S;-vB*oXw>mX0ZJ8GXTUR^7fckf0=3ne6?LTTusi%Sks~llqLHM)
z`k6YwC*Le?2cXr-P}A|{)A>Q@=fGVYs?2E;An_>GQt*3uolK-FM_~CQ^DK#ik$;gd
z#YyA+E4EcGWTz+73J?L{gw2Pa9@eKDb8Q9P<BGTWVaYQiqkB20n)rY?n$KxVSh~Hj
zTuS|=>C4MTnGEedF3f>o>wKu6LG6yT^fyujx))bEGWItfvK74R#>zdh$F0<Ivb%qO
z`zK6cslW<eQTK$~!Jg|r({8h+ezak>ZBai;yW71Y0pF<J+arcmc%MDFXM2fBj7`+%
zc1snAi$6AB6}{W7T>317T@tG!c6QPFezmM>p)N)2@5Qu9FA{%-Jvv&kXK#wxkHf4p
zwfnoxdAQ~Df5<yCw?7@ZSf?6J-+BU{Z#*M-byQD38<$16KE0Yf*tmUghCSZoNW2k5
z|EB+f1pc?)1eGqX^{RtqW8d7I1w#98rH6>BmRT+~0>*jwnk6U5=QHl_o^d*X7tyOJ
zK0Ed)A*u62U<4hd0OFWBwxM@SBrOJ-?qV>_hAj{T^lK@puJM&pc@JJ`xjW})k7-Di
z|0H+G=h)6{fj=>UQ`p0eKoaL4c}@buwmRIiEzU3T>m!Quf%8ZH1t-{YlY(MWR(||+
zvi=%;^iWmKXRum%;Du>0%dgXl2AhiUwN$SH=*N+_AX9x%uI0uF$P>o@xpraeBy;7*
z`?@kc1qV66P2<F&`i~Ql?Jm5V4rLbpeF<fIQdonjBP3y~#UBJ4-f9@kdpJB`3o})=
zNejdgB(aaD5ODiPs|`Eo&XA?a#n40U>H>67&-vKKkQ8+aS9r1zHER7wW6Ah#Y@$a&
z9|IkI_#J?Pp`3;>JA{8zgm-c4@8ekmF^@ykrs?AEm=dbo>8DaGfacvw{!s()2O7LH
zauH)6e}L`sdM)c#Y-YN1*jEM1p<Ok<T>N}9=mfn|Bvn3wb(rgYELu}mIu5&z-ym$8
z92I<SY+H76%-PY&8csFWZk$!Q*1S-@P|m!)!Z>#fgSl^S8KD_=UyjyG&KIu~#(mi1
zI;oJcBuJ!d63@Jh&q6ob8tIi#0!MkyH(FbD=~Z6jH0`+U2|IMGxIS}e*vi@)?btC1
zY4?AwrNDZ8THi+akZA?n$q=3g?J3}PPvx-T#~u1W7#@Msq!*iek*+HzieBV&BTpAN
zl-qT@Zh7U{e}kuX&uQFPMSyf#>Kldn-d?~v-60kz$nD7F;}>TRS`do`h#KEW&>Z9f
zk{32kM!eur4HP;*@11^(eT2cES(`k7(KLw2SjI5>98Fp0dc@v$ssAMUM_}u{#{(00
z5Q87&gHBS*m>65ty*c)t1=gV_XF&(2?);YPBiFyfO%OO+hU$HI#SmteSo|F3s|Q5l
zlGst{UIi$~Y@^5<j*uz2c4*y-{WOPH(rcQ8L76%JjZuI6!9t<tI=<jN?)lPv9I^pf
zFsqi7%Wcy_SlHY8JcACaKjc2f%+K3_I_6A@C-Z-_Y)ciMPsw}6{M@|s{jj6@-G9hL
z_z1ICd=AT+kbK!Xk@g(iD|x*1jNAjfYOp$ww%&YIpmgk#lmEzAVhgCnOpQ37HV@P-
za5MJkc6iT1(6mxeSJ-*a{MS)ABcdN8)iJ9T@$sEm&CYwrc5(@Us)~&lbyROGD`UAE
z7unibtPUJ{R9PMc-A0?&`}k%#*2TQs@K|hvVvsI={5V2T+1JxCT`_r6n(FGXO@y%|
zb}y!6sa#B&t#_KBppw&X@NLcp^>}EniC#gk&YUIBnm9M%zkx;ty(SWUS8sn?ssok%
z={lJX{ruwG=d)}&*~mG#SMwkup$x57x<o+0FimJ*`nPku?HK|jD+Q(Zht9K6vs7y1
z1O@flUh5#l%aI9(AW7=z<;(yT+K`aIzjC`tK}eY}>M&U^5pBWY1pfrjSO$!2%^cXc
z`>Sg!&v#5*?jHvw70(?v&w&s69S*I_rtoLY9s&=h_Hw?Ixu4`Ng44XHwYQahe_D<B
zvedyA8kmAUZ`0;Px5%(KKl2RwqR#Yn2UjP;rd+QrzP)4eOu2^`H6V7ynT~o<WxFld
zEzviYfZ*Nnu!J}YIfWbfGI-CT`_8u8uBxgt9`aDC<8MF*La%dtZO#@yw37HH(dJyX
zuBqgR7$MdRpFHQA96Bs);hlal_;)4}Bm=H*t<+z2r#{yB1GxzRGb};u%i{$OO1Ir=
zIhM=frrYAqb`R8+Ko6=;5X8VYl`}og4TiR3W!rBOtJ_TQ5vB!OSL{bbbNu)l;}&hF
z1te$?n4ea1ZV_SQGxk6M>gj;i7!g@{!oTKTXn4{sHX_;ebK7>w|21rrI)bZBq(k5q
zl>d@+LQ_7z2D9ELhf|Q-7BwA75;E$+N?q-;wPTo<uwAot|I8m7@R6>Q8~?ogomjdh
zO)UF`eM!~i)`P5!XlKwwwvye!km{9GOV%n7Z0#h+s`zcq1t-(eC-h@C5erK~r6?iy
zFu<~%Wk$eWv$lPs$oo>ZkKe}fn0WEt*K~uhc(5SN=oOS7EDL*OewR&HdtT~UL6U%d
z(<BjNIN@fpAHzt@+8<L%xb~$y4p<QpQApajPX?_$$N*jFRM+%(Tqw!m>F>`TGBd8x
zg=lo~O>usoGYHweWv>)DX8_^RaeUPYk-pctt2ElB6P~Pn&3sPMPXy?0|B<0eI_t|9
z1JRm{ykpt-i`9^+26r?4p#Y=OZ!o=u{9=0aWBR~w=$^6pE>~eyp#)2iRzYIuM1yx*
z`sjD=9=WEn%E(rk1wy4~j4z13sqJd8c>7J<uly%?go+>`Ux{F=&Iq%`)#g22r<sMF
znlk>bEYG((_wV0qmJ!q;D_A2|$myv;5+kX^Qptn-N3zJv)je-O%K!k{m4E*WAZMU&
zBMW;vKKiL%sBQeYRK+ZVpwcH8pX^qJbii*ypMiJY%JVAQ!n9hyXN6%JOhH4sv-#PH
zL^;t>h1z4tjfZ{Vi)J1dZkG#xJ8sOQa9HK$pI7f7uB!R{XgH6MMn{mCCY>&QgmVio
zT%#`O@a=P`BZG{z4tSLr=%|$$sF?<LrzLyGeG+_zRux|l=FJHtN>ijT&kQ;JZD}`9
z!?|P*Mm^=#B6~MqT-fi0jbiWpPRGCmpVap(gtg+;?$^m~w^1LzY@P_2?}Fmj>@)NE
z2!yS}Hbb{raEi@+{pRNkXqP$f2q(`N>$$CoZy5C~7NexCM4*rsi><Ntu#)0%+0qUB
zbYoS!z&FfV3H->2H3g*${8lwG1WctI9e5f|=T-itrexNI8u>7F7|sy%@Q1W_ee~`P
z=ZCV^*)8Plm1)LTsr(9^7+&7L^b_2fuWT3^<q8V<=cdjU%3HSGRB|Fv1wUW8ONE!&
z&*roF20R-cPMbL>SOD6%F63vG*#m}V3EQ&R#YskrN6<%44<3=uk=qb7XR~;2Q{LoI
zf3Y?y^j(OrJ|Zx1(zX=ohTkz7Eo(FQ$6Q0?8|JmwqEb#(Vk^AdTTA5fdPiTlUNXw<
zB3q4F?2Z_3NxGCAqK9@p;{?#gyTJh7pqZ?QBnWHe3_|8Gt8Bd|IOD?QxOZr&c`lj|
zsHf-gZt)KD#I;F+a&u|esB)dP(!SRUKrZ^>VXd?B`w{UF;=K1|VjjdA6!az~iQ7?E
zXuuMO4K)QhSoQ<5S28^`7$?Kl;w#pH4#%Hv;rXGE5+JxUTHtz!`>8eMV_FT;KMDAW
zcWvl>EZ&<YRAgw9W&LLrVUpCrHOza~`CXwWGfUkFx$T#sk=G~V+)Q(&?}^D)XDv#x
z7)wrr1K)7^)67@)H$PMy7VMRsPxqHIQst(+t`9Qz+iJ~Y`H+~?EZP$t$vj~D?6_1+
zRWdxWGBbO>7MCQiDSup9)A7mOwr&OY_Z2!r)v+sE{GI*()y<i|vz_g6Jhn0vooSVu
zE|$(9x&)J=me_($uaqJTwX{i<QZiR8ZAg)8!b~kK(j{pKvA2R!TZZImi)k&fmIy*y
zrV)|OAQ^((ubJomc>jU>`#C>+p7Wf~IiJ__eqLTHe=u-kuv)hp=w?1|ZDK|BSW-f$
z!jq4?qTYyn3!26iNd|!6hL$F=*s~)myv)AgiQVlpcAM|F)}GQ|UkkjHQIX*RJ!t-8
z`0|KVI>W`Q6hj13G|P+sFsTL7`|{?)9i}Spg-U<Q3@`IP8wHeSJ^Hz5*19sgafjZ3
zhB6=eL-@Rk=l3yGv3eaTrRT|7!|r=M*=Z=tgTJa&Q=W~ds>?~^ll|<J=9e8a8$S+6
z`lJ^=PF1(IaHYeJv@!N}o1t2N0g`<L4335F*3NyHDnZC`)s|+6N#sD1jC({XPXh&;
z^=)9M-ke5{!j4EcoArN3q_4clq=csU17}wF9pwkXM(RG=$#IhM*J`Kmk6j?^eg*lP
z)It@S1x3!Fqq>~GcK%dAwHj(M>T?Vbt9L^6TH@b<<86!KZT`9nU-TDkCI^c$pK;?3
zqtM<^I@|#kR6E$|m+bRX>i(Ni1q)YYV)Nww&Lu#Du~rvu)Kp|x^RRaXH!EQ!toZA%
zS_a|b$!{($)+`^TaJ+)|Z?MYd)Q`D4Ol`gN(NQ~jt<!U8unVu~?V<Kv=nIsuvf_&^
z1V?dX*3^81L?mcTtwg70c|;Dtv#q-Ft4@{EY$n5MZr0rIt+3NQd#5<dsD{CU16qg?
zJ{FTe$UOAK;(X+)4?Mot&S@a=-`XQ4WmP?XwwRr~Fvz&Ok8L1|vrIBu9F`^5p@tk0
zGuegReN1zq@nNve2?DlxO5`bY7>}JF(i&5U9M)&I@=XN{ZtF=x9jHS$WQW}y6v>S1
znNlU=>7w>$`PtP`eY=DcQWj3^ufI3CRY}g0BkRK!nSye{Fn8Hv8kNYl>~l@8wl3%X
z(9ec2szPhGYi5v{Obl+eJ(3e@Ta{Z6rh->e@<kCVY=7<p0y4{DSXv0O5M2+0*&2){
zQ!AC1!P*D<;y-GHr7WfWxm}br8$`HRJ11j(BSW?@HmwA=u-_YyD$B5?UD6o*ov(%m
zxsI;`f`1BbK(Mg_80x;JQ~RLGbWkQR3~2K$$;Pt-nCCG<&-mkY7o6j`S7XW>#4ufj
zK^Zq;<Hev2!OI(30MUx!+30<PYQ<PYNCo2~QL)a*1`0f=)X=@OUSjFC7^r8(@(3XZ
zJKXlj?Uq5*#$Jt8pc$Cz4v(hE$8SSx%*Lbr&g4~1vWfPL0zpcfmpj5;FO?<(NXyoI
z6brbDenAg5c+*~naa59T&<=q-70YoNLKcMS$Cc1V6RBc(;6PI=k8e<Zsxs*if+tg-
zRmXsZBu^h-H%e@|aY95m>&96n!%afkWaV9~gq>H0Rl#MCep)zQH~)#WSx;!I-+k95
z6h+}9Y-MHGXN0(F_&;@Zb_f#!N_eYe`;9oy!gO@fh94+s+TJglIf9Rn|E6W(79hOj
z@ls6l)oMLwv&y9mC-ZU4I_aw_$@6sfV2Z5E2l7dtwAxaiwCEpjX3$3D$ch~FA|r}4
zyO-NjAPNlqL*<9dX9tk-*gJC{AA!#?)2$X?b(_8}k)yoQ8Eo6qOFhL({)b0sZyzvg
zJ4N`3M@`$0p`b!`%TVfU6gj7ae*8vv9-h=|lYKq6xZ?d>EYnn|WcgKc|HAhn+L-~A
zR;kMQg1uEG!wfn0^68cfTwiAZe=NSh&ue64{N89b$k&Qe2HjI}_1%|j8ITYnwi>ZQ
z_1Y2*ucVEuTw5}$QUCQAT;(sni?v@*7&&<(^d6FVE;4ltjHIkFG759C96KH)5i^>m
z0=fsr5%(poj|(S$DKmQjUDBTLm+)vop`P;^-Wf}-=6a37FVJw+rJQrFoX>zTrfhxM
zr~7u|zdld#?<(+Z@Vv#)Xq^e#!&2?E<Znwg%_-Ij$X#DlAe3rBkfL+mn!tLzBV06G
z4_G=9>B>&c`?G-8M8s1=Xr@UeGac<8e(pC|-j|zGJAC6#0nxbL56fK}vHy#}kzOz;
z&!|e?+JA3;S(|-cX#}v}=mWi6xO;0IHXf&7((V%a^_}2AL3*7Ans@5nxhpLZjWi67
zyAJ0>>x^t!8-%3)X8V*Lox7HEXnlp(O=tqdI!`(399T4Y^I+7_sczOb7UfcL6&u2N
zw15S<9`IEr(!X@rTxC5iDc>{r91Yo(0df})HP6YLf>zC2uofiLFL+OKqpIq9uz~~p
zbnyBA^}e9!<9*vEYW6X+6X<O4P}P+v*&l)dA%HqvYBh-0&$|{Pl?w6XW%G6(VPSLA
zp5J=Y_}4ws9sT9smLxKu#{lRjC<Aih|H`KHKO|5<qZ90`rmj-=YPLiv3?(1e&WNv`
R1TZrQ^qt2=1k>#b@joX~6GQ+2

literal 0
HcmV?d00001


From 244eefcec428809351c5401a0843afe5d5d087c9 Mon Sep 17 00:00:00 2001
From: Akihito Nakano <sora.akatsuki@gmail.com>
Date: Mon, 15 Jul 2019 17:46:26 +0900
Subject: [PATCH 18/62] Add a link to the article by CAM, Inc. (#3355)

---
 README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.md b/README.md
index ab8bce4e67..8c56937a88 100644
--- a/README.md
+++ b/README.md
@@ -595,6 +595,7 @@ Here are some companies/projects (alphabetical order) using OpenAPI Generator in
 - 2019-06-28 [Codewind OpenAPI Tools](https://marketplace.eclipse.org/content/codewind-openapi-tools) in [Eclipse Marketplace](https://marketplace.eclipse.org/) by IBM
 - 2019-06-29 [Codewind OpenAPI Tools](https://marketplace.visualstudio.com/items?itemName=IBM.codewind-openapi-tools) in [Visual Studio Marketplace](https://marketplace.visualstudio.com/) by IBM
 - 2019-07-04 - [REST API のためのコード生成入門 (OpenAPI Generator)](https://gum.co/openapi_generator_ebook_big5) by [William Cheng](https://twitter.com/wing328), [中野暁人](https://github.com/ackintosh), [和田拓朗](https://github.com/taxpon)
+- 2019-07-08 - [OpenAPI Generator にコントリビュートしたら社名が載った話。(CAM) - CAM TECH BLOG](https://tech.cam-inc.co.jp/entry/2019/07/08/140000) by [CAM, Inc.](https://www.cam-inc.co.jp/)
 - 2019-07-14 - [OpenAPI GeneratorでPythonのクライアントライブラリを作成した](https://qiita.com/yuji38kwmt/items/dfb929316a1335a161c0) by [yuji38kwmt](https://qiita.com/yuji38kwmt)
 
 ## [6 - About Us](#table-of-contents)

From 8417c5bed0e23764dc841816c2322cf7dc4e9b0d Mon Sep 17 00:00:00 2001
From: christof-vollrath-spring-media
 <38937331+christof-vollrath-spring-media@users.noreply.github.com>
Date: Mon, 15 Jul 2019 15:41:40 +0200
Subject: [PATCH 19/62] [typescript-node] fixed enum generator for top level
 enums #665 (#2266)

* [typescript-node] fixed enum generator for top level enums #665

* [typescript-node] fixed enum generator for top level enums in models.mustache #665

* Remove wrong copyright line
---
 .../resources/typescript-node/model.mustache  |  11 +
 .../resources/typescript-node/models.mustache |   5 +
 .../TypescriptNodeEnumIntegrationTest.java    |  50 +++++
 .../objectsWithEnums-expected/.gitignore      |   3 +
 .../.openapi-generator-ignore                 |  23 +++
 .../.openapi-generator/VERSION                |   1 +
 .../objectsWithEnums-expected/api.ts          |   3 +
 .../objectsWithEnums-expected/api/apis.ts     |   3 +
 .../api/defaultApi.ts                         | 171 ++++++++++++++++
 .../objectsWithEnums-expected/git_push.sh     |  52 +++++
 .../model/externalEnum.ts                     |  17 ++
 .../objectsWithEnums-expected/model/models.ts | 191 ++++++++++++++++++
 .../model/objectWithEnums.ts                  |  43 ++++
 .../objectsWithEnums-expected/package.json    |  26 +++
 .../objectsWithEnums-expected/tsconfig.json   |  20 ++
 .../typescript/objectsWithEnums-spec.json     |  91 +++++++++
 16 files changed, 710 insertions(+)
 create mode 100644 modules/openapi-generator/src/test/java/org/openapitools/codegen/typescript/typescriptnode/TypescriptNodeEnumIntegrationTest.java
 create mode 100644 modules/openapi-generator/src/test/resources/integrationtests/typescript/objectsWithEnums-expected/.gitignore
 create mode 100644 modules/openapi-generator/src/test/resources/integrationtests/typescript/objectsWithEnums-expected/.openapi-generator-ignore
 create mode 100644 modules/openapi-generator/src/test/resources/integrationtests/typescript/objectsWithEnums-expected/.openapi-generator/VERSION
 create mode 100644 modules/openapi-generator/src/test/resources/integrationtests/typescript/objectsWithEnums-expected/api.ts
 create mode 100644 modules/openapi-generator/src/test/resources/integrationtests/typescript/objectsWithEnums-expected/api/apis.ts
 create mode 100644 modules/openapi-generator/src/test/resources/integrationtests/typescript/objectsWithEnums-expected/api/defaultApi.ts
 create mode 100644 modules/openapi-generator/src/test/resources/integrationtests/typescript/objectsWithEnums-expected/git_push.sh
 create mode 100644 modules/openapi-generator/src/test/resources/integrationtests/typescript/objectsWithEnums-expected/model/externalEnum.ts
 create mode 100644 modules/openapi-generator/src/test/resources/integrationtests/typescript/objectsWithEnums-expected/model/models.ts
 create mode 100644 modules/openapi-generator/src/test/resources/integrationtests/typescript/objectsWithEnums-expected/model/objectWithEnums.ts
 create mode 100644 modules/openapi-generator/src/test/resources/integrationtests/typescript/objectsWithEnums-expected/package.json
 create mode 100644 modules/openapi-generator/src/test/resources/integrationtests/typescript/objectsWithEnums-expected/tsconfig.json
 create mode 100644 modules/openapi-generator/src/test/resources/integrationtests/typescript/objectsWithEnums-spec.json

diff --git a/modules/openapi-generator/src/main/resources/typescript-node/model.mustache b/modules/openapi-generator/src/main/resources/typescript-node/model.mustache
index 0b3ca75891..c9ef8ebbc0 100644
--- a/modules/openapi-generator/src/main/resources/typescript-node/model.mustache
+++ b/modules/openapi-generator/src/main/resources/typescript-node/model.mustache
@@ -10,6 +10,7 @@ import { {{classname}} } from './{{filename}}';
 * {{{description}}}
 */
 {{/description}}
+{{^isEnum}}
 export class {{classname}} {{#parent}}extends {{{parent}}} {{/parent}}{
 {{#vars}}
 {{#description}}
@@ -65,5 +66,15 @@ export namespace {{classname}} {
 {{/vars}}
 }
 {{/hasEnums}}
+{{/isEnum}}
+{{#isEnum}}
+export enum {{classname}} {
+    {{#allowableValues}}
+    {{#enumVars}}
+    {{name}} = <any> {{{value}}}{{^-last}},{{/-last}}
+    {{/enumVars}}
+    {{/allowableValues}}
+}
+{{/isEnum}}
 {{/model}}
 {{/models}}
\ No newline at end of file
diff --git a/modules/openapi-generator/src/main/resources/typescript-node/models.mustache b/modules/openapi-generator/src/main/resources/typescript-node/models.mustache
index f7f1d2e0a8..39c7da727e 100644
--- a/modules/openapi-generator/src/main/resources/typescript-node/models.mustache
+++ b/modules/openapi-generator/src/main/resources/typescript-node/models.mustache
@@ -34,6 +34,9 @@ let enumsMap: {[index: string]: any} = {
                     {{/isEnum}}
                 {{/vars}}
             {{/hasEnums}}
+            {{#isEnum}}
+        "{{classname}}": {{classname}},
+            {{/isEnum}}
         {{/model}}
     {{/models}}
 }
@@ -41,7 +44,9 @@ let enumsMap: {[index: string]: any} = {
 let typeMap: {[index: string]: any} = {
     {{#models}}
         {{#model}}
+            {{^isEnum}}
     "{{classname}}": {{classname}},
+            {{/isEnum}}
         {{/model}}
     {{/models}}
 }
diff --git a/modules/openapi-generator/src/test/java/org/openapitools/codegen/typescript/typescriptnode/TypescriptNodeEnumIntegrationTest.java b/modules/openapi-generator/src/test/java/org/openapitools/codegen/typescript/typescriptnode/TypescriptNodeEnumIntegrationTest.java
new file mode 100644
index 0000000000..dbba7f0427
--- /dev/null
+++ b/modules/openapi-generator/src/test/java/org/openapitools/codegen/typescript/typescriptnode/TypescriptNodeEnumIntegrationTest.java
@@ -0,0 +1,50 @@
+/*
+ * Copyright 2018 OpenAPI-Generator Contributors (https://openapi-generator.tech)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.openapitools.codegen.typescript.typescriptnode;
+
+import org.openapitools.codegen.AbstractIntegrationTest;
+import org.openapitools.codegen.CodegenConfig;
+import org.openapitools.codegen.languages.TypeScriptFetchClientCodegen;
+import org.openapitools.codegen.languages.TypeScriptNodeClientCodegen;
+import org.openapitools.codegen.testutils.IntegrationTestPathsConfig;
+
+import java.util.HashMap;
+import java.util.Map;
+
+public class TypescriptNodeEnumIntegrationTest extends AbstractIntegrationTest {
+
+    @Override
+    protected CodegenConfig getCodegenConfig() {
+        return new TypeScriptNodeClientCodegen();
+    }
+
+    @Override
+    protected Map<String, String> configProperties() {
+        Map<String, String> properties = new HashMap<>();
+        properties.put("npmName", "node-es6-test");
+        properties.put("npmVersion", "1.0.3");
+        properties.put("snapshot", "false");
+        properties.put("supportsES6", "false");
+
+        return properties;
+    }
+
+    @Override
+    protected IntegrationTestPathsConfig getIntegrationTestPathsConfig() {
+        return new IntegrationTestPathsConfig("typescript/objectsWithEnums");
+    }
+}
diff --git a/modules/openapi-generator/src/test/resources/integrationtests/typescript/objectsWithEnums-expected/.gitignore b/modules/openapi-generator/src/test/resources/integrationtests/typescript/objectsWithEnums-expected/.gitignore
new file mode 100644
index 0000000000..35e2fb2b02
--- /dev/null
+++ b/modules/openapi-generator/src/test/resources/integrationtests/typescript/objectsWithEnums-expected/.gitignore
@@ -0,0 +1,3 @@
+wwwroot/*.js
+node_modules
+typings
diff --git a/modules/openapi-generator/src/test/resources/integrationtests/typescript/objectsWithEnums-expected/.openapi-generator-ignore b/modules/openapi-generator/src/test/resources/integrationtests/typescript/objectsWithEnums-expected/.openapi-generator-ignore
new file mode 100644
index 0000000000..7484ee590a
--- /dev/null
+++ b/modules/openapi-generator/src/test/resources/integrationtests/typescript/objectsWithEnums-expected/.openapi-generator-ignore
@@ -0,0 +1,23 @@
+# OpenAPI Generator Ignore
+# Generated by openapi-generator https://github.com/openapitools/openapi-generator
+
+# Use this file to prevent files from being overwritten by the generator.
+# The patterns follow closely to .gitignore or .dockerignore.
+
+# As an example, the C# client generator defines ApiClient.cs.
+# You can make changes and tell OpenAPI Generator to ignore just this file by uncommenting the following line:
+#ApiClient.cs
+
+# You can match any string of characters against a directory, file or extension with a single asterisk (*):
+#foo/*/qux
+# The above matches foo/bar/qux and foo/baz/qux, but not foo/bar/baz/qux
+
+# You can recursively match patterns against a directory, file or extension with a double asterisk (**):
+#foo/**/qux
+# This matches foo/bar/qux, foo/baz/qux, and foo/bar/baz/qux
+
+# You can also negate patterns with an exclamation (!).
+# For example, you can ignore all files in a docs folder with the file extension .md:
+#docs/*.md
+# Then explicitly reverse the ignore rule for a single file:
+#!docs/README.md
diff --git a/modules/openapi-generator/src/test/resources/integrationtests/typescript/objectsWithEnums-expected/.openapi-generator/VERSION b/modules/openapi-generator/src/test/resources/integrationtests/typescript/objectsWithEnums-expected/.openapi-generator/VERSION
new file mode 100644
index 0000000000..717311e32e
--- /dev/null
+++ b/modules/openapi-generator/src/test/resources/integrationtests/typescript/objectsWithEnums-expected/.openapi-generator/VERSION
@@ -0,0 +1 @@
+unset
\ No newline at end of file
diff --git a/modules/openapi-generator/src/test/resources/integrationtests/typescript/objectsWithEnums-expected/api.ts b/modules/openapi-generator/src/test/resources/integrationtests/typescript/objectsWithEnums-expected/api.ts
new file mode 100644
index 0000000000..4b76122d80
--- /dev/null
+++ b/modules/openapi-generator/src/test/resources/integrationtests/typescript/objectsWithEnums-expected/api.ts
@@ -0,0 +1,3 @@
+// This is the entrypoint for the package
+export * from './api/apis';
+export * from './model/models';
\ No newline at end of file
diff --git a/modules/openapi-generator/src/test/resources/integrationtests/typescript/objectsWithEnums-expected/api/apis.ts b/modules/openapi-generator/src/test/resources/integrationtests/typescript/objectsWithEnums-expected/api/apis.ts
new file mode 100644
index 0000000000..8a6789d357
--- /dev/null
+++ b/modules/openapi-generator/src/test/resources/integrationtests/typescript/objectsWithEnums-expected/api/apis.ts
@@ -0,0 +1,3 @@
+export * from './defaultApi';
+import { DefaultApi } from './defaultApi';
+export const APIS = [DefaultApi];
diff --git a/modules/openapi-generator/src/test/resources/integrationtests/typescript/objectsWithEnums-expected/api/defaultApi.ts b/modules/openapi-generator/src/test/resources/integrationtests/typescript/objectsWithEnums-expected/api/defaultApi.ts
new file mode 100644
index 0000000000..899c76592a
--- /dev/null
+++ b/modules/openapi-generator/src/test/resources/integrationtests/typescript/objectsWithEnums-expected/api/defaultApi.ts
@@ -0,0 +1,171 @@
+/**
+ * OpenAPI enums
+ * Tests generation of enums with open opi
+ *
+ * OpenAPI spec version: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+import localVarRequest = require('request');
+import http = require('http');
+import Promise = require('bluebird');
+
+/* tslint:disable:no-unused-locals */
+import { ObjectWithEnums } from '../model/objectWithEnums';
+
+import { ObjectSerializer, Authentication, HttpBasicAuth, ApiKeyAuth, OAuth, VoidAuth } from '../model/models';
+
+let defaultBasePath = 'http://enums.openapi3';
+
+// ===============================================
+// This file is autogenerated - Please do not edit
+// ===============================================
+
+export enum DefaultApiApiKeys {
+}
+
+export class DefaultApi {
+    protected _basePath = defaultBasePath;
+    protected defaultHeaders : any = {};
+    protected _useQuerystring : boolean = false;
+
+    protected authentications = {
+        'default': <Authentication>new VoidAuth(),
+    }
+
+    constructor(basePath?: string);
+    constructor(basePathOrUsername: string, password?: string, basePath?: string) {
+        if (password) {
+            if (basePath) {
+                this.basePath = basePath;
+            }
+        } else {
+            if (basePathOrUsername) {
+                this.basePath = basePathOrUsername
+            }
+        }
+    }
+
+    set useQuerystring(value: boolean) {
+        this._useQuerystring = value;
+    }
+
+    set basePath(basePath: string) {
+        this._basePath = basePath;
+    }
+
+    get basePath() {
+        return this._basePath;
+    }
+
+    public setDefaultAuthentication(auth: Authentication) {
+        this.authentications.default = auth;
+    }
+
+    public setApiKey(key: DefaultApiApiKeys, value: string) {
+        (this.authentications as any)[DefaultApiApiKeys[key]].apiKey = value;
+    }
+
+    /**
+     * 
+     */
+    public getObjectWithEnums (options: {headers: {[name: string]: string}} = {headers: {}}) : Promise<{ response: http.ClientResponse; body: Array<ObjectWithEnums>;  }> {
+        const localVarPath = this.basePath + '/getobjectwithenums';
+        let localVarQueryParameters: any = {};
+        let localVarHeaderParams: any = (<any>Object).assign({}, this.defaultHeaders);
+        let localVarFormParams: any = {};
+
+        (<any>Object).assign(localVarHeaderParams, options.headers);
+
+        let localVarUseFormData = false;
+
+        let localVarRequestOptions: localVarRequest.Options = {
+            method: 'GET',
+            qs: localVarQueryParameters,
+            headers: localVarHeaderParams,
+            uri: localVarPath,
+            useQuerystring: this._useQuerystring,
+            json: true,
+        };
+
+        this.authentications.default.applyToRequest(localVarRequestOptions);
+
+        if (Object.keys(localVarFormParams).length) {
+            if (localVarUseFormData) {
+                (<any>localVarRequestOptions).formData = localVarFormParams;
+            } else {
+                localVarRequestOptions.form = localVarFormParams;
+            }
+        }
+        return new Promise<{ response: http.ClientResponse; body: Array<ObjectWithEnums>;  }>((resolve, reject) => {
+            localVarRequest(localVarRequestOptions, (error, response, body) => {
+                if (error) {
+                    reject(error);
+                } else {
+                    body = ObjectSerializer.deserialize(body, "Array<ObjectWithEnums>");
+                    if (response.statusCode && response.statusCode >= 200 && response.statusCode <= 299) {
+                        resolve({ response: response, body: body });
+                    } else {
+                        reject({ response: response, body: body });
+                    }
+                }
+            });
+        });
+    }
+    /**
+     * 
+     * @param objectWithEnums 
+     */
+    public postObjectWithEnums (objectWithEnums: ObjectWithEnums, options: {headers: {[name: string]: string}} = {headers: {}}) : Promise<{ response: http.ClientResponse; body?: any;  }> {
+        const localVarPath = this.basePath + '/postobjectwithenums';
+        let localVarQueryParameters: any = {};
+        let localVarHeaderParams: any = (<any>Object).assign({}, this.defaultHeaders);
+        let localVarFormParams: any = {};
+
+        // verify required parameter 'objectWithEnums' is not null or undefined
+        if (objectWithEnums === null || objectWithEnums === undefined) {
+            throw new Error('Required parameter objectWithEnums was null or undefined when calling postObjectWithEnums.');
+        }
+
+        (<any>Object).assign(localVarHeaderParams, options.headers);
+
+        let localVarUseFormData = false;
+
+        let localVarRequestOptions: localVarRequest.Options = {
+            method: 'POST',
+            qs: localVarQueryParameters,
+            headers: localVarHeaderParams,
+            uri: localVarPath,
+            useQuerystring: this._useQuerystring,
+            json: true,
+            body: ObjectSerializer.serialize(objectWithEnums, "ObjectWithEnums")
+        };
+
+        this.authentications.default.applyToRequest(localVarRequestOptions);
+
+        if (Object.keys(localVarFormParams).length) {
+            if (localVarUseFormData) {
+                (<any>localVarRequestOptions).formData = localVarFormParams;
+            } else {
+                localVarRequestOptions.form = localVarFormParams;
+            }
+        }
+        return new Promise<{ response: http.ClientResponse; body?: any;  }>((resolve, reject) => {
+            localVarRequest(localVarRequestOptions, (error, response, body) => {
+                if (error) {
+                    reject(error);
+                } else {
+                    if (response.statusCode && response.statusCode >= 200 && response.statusCode <= 299) {
+                        resolve({ response: response, body: body });
+                    } else {
+                        reject({ response: response, body: body });
+                    }
+                }
+            });
+        });
+    }
+}
diff --git a/modules/openapi-generator/src/test/resources/integrationtests/typescript/objectsWithEnums-expected/git_push.sh b/modules/openapi-generator/src/test/resources/integrationtests/typescript/objectsWithEnums-expected/git_push.sh
new file mode 100644
index 0000000000..26bdd7ca69
--- /dev/null
+++ b/modules/openapi-generator/src/test/resources/integrationtests/typescript/objectsWithEnums-expected/git_push.sh
@@ -0,0 +1,52 @@
+#!/bin/sh
+# ref: https://help.github.com/articles/adding-an-existing-project-to-github-using-the-command-line/
+#
+# Usage example: /bin/sh ./git_push.sh wing328 openapi-pestore-perl "minor update"
+
+git_user_id=$1
+git_repo_id=$2
+release_note=$3
+
+if [ "$git_user_id" = "" ]; then
+    git_user_id=""
+    echo "[INFO] No command line input provided. Set \$git_user_id to $git_user_id"
+fi
+
+if [ "$git_repo_id" = "" ]; then
+    git_repo_id=""
+    echo "[INFO] No command line input provided. Set \$git_repo_id to $git_repo_id"
+fi
+
+if [ "$release_note" = "" ]; then
+    release_note=""
+    echo "[INFO] No command line input provided. Set \$release_note to $release_note"
+fi
+
+# Initialize the local directory as a Git repository
+git init
+
+# Adds the files in the local repository and stages them for commit.
+git add .
+
+# Commits the tracked changes and prepares them to be pushed to a remote repository. 
+git commit -m "$release_note"
+
+# Sets the new remote
+git_remote=`git remote`
+if [ "$git_remote" = "" ]; then # git remote not defined
+
+    if [ "$GIT_TOKEN" = "" ]; then
+        echo "[INFO] \$GIT_TOKEN (environment variable) is not set. Using the git credential in your environment."
+        git remote add origin https://github.com/${git_user_id}/${git_repo_id}.git
+    else
+        git remote add origin https://${git_user_id}:${GIT_TOKEN}@github.com/${git_user_id}/${git_repo_id}.git
+    fi
+
+fi
+
+git pull origin master
+
+# Pushes (Forces) the changes in the local repository up to the remote repository
+echo "Git pushing to https://github.com/${git_user_id}/${git_repo_id}.git"
+git push origin master 2>&1 | grep -v 'To https'
+
diff --git a/modules/openapi-generator/src/test/resources/integrationtests/typescript/objectsWithEnums-expected/model/externalEnum.ts b/modules/openapi-generator/src/test/resources/integrationtests/typescript/objectsWithEnums-expected/model/externalEnum.ts
new file mode 100644
index 0000000000..39d91b9163
--- /dev/null
+++ b/modules/openapi-generator/src/test/resources/integrationtests/typescript/objectsWithEnums-expected/model/externalEnum.ts
@@ -0,0 +1,17 @@
+/**
+ * OpenAPI enums
+ * Tests generation of enums with open opi
+ *
+ * OpenAPI spec version: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+
+export enum ExternalEnum {
+    Green = <any> 'green',
+    Yellow = <any> 'yellow'
+}
diff --git a/modules/openapi-generator/src/test/resources/integrationtests/typescript/objectsWithEnums-expected/model/models.ts b/modules/openapi-generator/src/test/resources/integrationtests/typescript/objectsWithEnums-expected/model/models.ts
new file mode 100644
index 0000000000..896cb58875
--- /dev/null
+++ b/modules/openapi-generator/src/test/resources/integrationtests/typescript/objectsWithEnums-expected/model/models.ts
@@ -0,0 +1,191 @@
+export * from './externalEnum';
+export * from './objectWithEnums';
+
+import localVarRequest = require('request');
+
+import { ExternalEnum } from './externalEnum';
+import { ObjectWithEnums } from './objectWithEnums';
+
+/* tslint:disable:no-unused-variable */
+let primitives = [
+                    "string",
+                    "boolean",
+                    "double",
+                    "integer",
+                    "long",
+                    "float",
+                    "number",
+                    "any"
+                 ];
+                 
+let enumsMap: {[index: string]: any} = {
+        "ExternalEnum": ExternalEnum,
+        "ObjectWithEnums.EnumInObjectEnum": ObjectWithEnums.EnumInObjectEnum,
+}
+
+let typeMap: {[index: string]: any} = {
+    "ObjectWithEnums": ObjectWithEnums,
+}
+
+export class ObjectSerializer {
+    public static findCorrectType(data: any, expectedType: string) {
+        if (data == undefined) {
+            return expectedType;
+        } else if (primitives.indexOf(expectedType.toLowerCase()) !== -1) {
+            return expectedType;
+        } else if (expectedType === "Date") {
+            return expectedType;
+        } else {
+            if (enumsMap[expectedType]) {
+                return expectedType;
+            }
+
+            if (!typeMap[expectedType]) {
+                return expectedType; // w/e we don't know the type
+            }
+
+            // Check the discriminator
+            let discriminatorProperty = typeMap[expectedType].discriminator;
+            if (discriminatorProperty == null) {
+                return expectedType; // the type does not have a discriminator. use it.
+            } else {
+                if (data[discriminatorProperty]) {
+                    var discriminatorType = data[discriminatorProperty];
+                    if(typeMap[discriminatorType]){
+                        return discriminatorType; // use the type given in the discriminator
+                    } else {
+                        return expectedType; // discriminator did not map to a type
+                    }
+                } else {
+                    return expectedType; // discriminator was not present (or an empty string)
+                }
+            }
+        }
+    }
+
+    public static serialize(data: any, type: string) {
+        if (data == undefined) {
+            return data;
+        } else if (primitives.indexOf(type.toLowerCase()) !== -1) {
+            return data;
+        } else if (type.lastIndexOf("Array<", 0) === 0) { // string.startsWith pre es6
+            let subType: string = type.replace("Array<", ""); // Array<Type> => Type>
+            subType = subType.substring(0, subType.length - 1); // Type> => Type
+            let transformedData: any[] = [];
+            for (let index in data) {
+                let date = data[index];
+                transformedData.push(ObjectSerializer.serialize(date, subType));
+            }
+            return transformedData;
+        } else if (type === "Date") {
+            return data.toISOString();
+        } else {
+            if (enumsMap[type]) {
+                return data;
+            }
+            if (!typeMap[type]) { // in case we dont know the type
+                return data;
+            }
+            
+            // Get the actual type of this object
+            type = this.findCorrectType(data, type);
+
+            // get the map for the correct type.
+            let attributeTypes = typeMap[type].getAttributeTypeMap();
+            let instance: {[index: string]: any} = {};
+            for (let index in attributeTypes) {
+                let attributeType = attributeTypes[index];
+                instance[attributeType.baseName] = ObjectSerializer.serialize(data[attributeType.name], attributeType.type);
+            }
+            return instance;
+        }
+    }
+
+    public static deserialize(data: any, type: string) {
+        // polymorphism may change the actual type.
+        type = ObjectSerializer.findCorrectType(data, type);
+        if (data == undefined) {
+            return data;
+        } else if (primitives.indexOf(type.toLowerCase()) !== -1) {
+            return data;
+        } else if (type.lastIndexOf("Array<", 0) === 0) { // string.startsWith pre es6
+            let subType: string = type.replace("Array<", ""); // Array<Type> => Type>
+            subType = subType.substring(0, subType.length - 1); // Type> => Type
+            let transformedData: any[] = [];
+            for (let index in data) {
+                let date = data[index];
+                transformedData.push(ObjectSerializer.deserialize(date, subType));
+            }
+            return transformedData;
+        } else if (type === "Date") {
+            return new Date(data);
+        } else {
+            if (enumsMap[type]) {// is Enum
+                return data;
+            }
+
+            if (!typeMap[type]) { // dont know the type
+                return data;
+            }
+            let instance = new typeMap[type]();
+            let attributeTypes = typeMap[type].getAttributeTypeMap();
+            for (let index in attributeTypes) {
+                let attributeType = attributeTypes[index];
+                instance[attributeType.name] = ObjectSerializer.deserialize(data[attributeType.baseName], attributeType.type);
+            }
+            return instance;
+        }
+    }
+}
+
+export interface Authentication {
+    /**
+    * Apply authentication settings to header and query params.
+    */
+    applyToRequest(requestOptions: localVarRequest.Options): void;
+}
+
+export class HttpBasicAuth implements Authentication {
+    public username: string = '';
+    public password: string = '';
+
+    applyToRequest(requestOptions: localVarRequest.Options): void {
+        requestOptions.auth = {
+            username: this.username, password: this.password
+        }
+    }
+}
+
+export class ApiKeyAuth implements Authentication {
+    public apiKey: string = '';
+
+    constructor(private location: string, private paramName: string) {
+    }
+
+    applyToRequest(requestOptions: localVarRequest.Options): void {
+        if (this.location == "query") {
+            (<any>requestOptions.qs)[this.paramName] = this.apiKey;
+        } else if (this.location == "header" && requestOptions && requestOptions.headers) {
+            requestOptions.headers[this.paramName] = this.apiKey;
+        }
+    }
+}
+
+export class OAuth implements Authentication {
+    public accessToken: string = '';
+
+    applyToRequest(requestOptions: localVarRequest.Options): void {
+        if (requestOptions && requestOptions.headers) {
+            requestOptions.headers["Authorization"] = "Bearer " + this.accessToken;
+        }
+    }
+}
+
+export class VoidAuth implements Authentication {
+    public username: string = '';
+    public password: string = '';
+
+    applyToRequest(_: localVarRequest.Options): void {
+        // Do nothing
+    }
+}
\ No newline at end of file
diff --git a/modules/openapi-generator/src/test/resources/integrationtests/typescript/objectsWithEnums-expected/model/objectWithEnums.ts b/modules/openapi-generator/src/test/resources/integrationtests/typescript/objectsWithEnums-expected/model/objectWithEnums.ts
new file mode 100644
index 0000000000..c6675fdafd
--- /dev/null
+++ b/modules/openapi-generator/src/test/resources/integrationtests/typescript/objectsWithEnums-expected/model/objectWithEnums.ts
@@ -0,0 +1,43 @@
+/**
+ * OpenAPI enums
+ * Tests generation of enums with open opi
+ *
+ * OpenAPI spec version: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+import { ExternalEnum } from './externalEnum';
+
+export class ObjectWithEnums {
+    'enumInObject'?: ObjectWithEnums.EnumInObjectEnum;
+    'externalEnum'?: ExternalEnum;
+
+    static discriminator: string | undefined = undefined;
+
+    static attributeTypeMap: Array<{name: string, baseName: string, type: string}> = [
+        {
+            "name": "enumInObject",
+            "baseName": "enumInObject",
+            "type": "ObjectWithEnums.EnumInObjectEnum"
+        },
+        {
+            "name": "externalEnum",
+            "baseName": "externalEnum",
+            "type": "ExternalEnum"
+        }    ];
+
+    static getAttributeTypeMap() {
+        return ObjectWithEnums.attributeTypeMap;
+    }
+}
+
+export namespace ObjectWithEnums {
+    export enum EnumInObjectEnum {
+        Red = <any> 'red',
+        Blue = <any> 'blue'
+    }
+}
diff --git a/modules/openapi-generator/src/test/resources/integrationtests/typescript/objectsWithEnums-expected/package.json b/modules/openapi-generator/src/test/resources/integrationtests/typescript/objectsWithEnums-expected/package.json
new file mode 100644
index 0000000000..18383fe4b8
--- /dev/null
+++ b/modules/openapi-generator/src/test/resources/integrationtests/typescript/objectsWithEnums-expected/package.json
@@ -0,0 +1,26 @@
+{
+    "name": "node-es6-test",
+    "version": "1.0.3",
+    "description": "NodeJS client for node-es6-test",
+    "repository": "/",
+    "main": "dist/api.js",
+    "types": "dist/api.d.ts",
+    "scripts": {
+        "clean": "rm -Rf node_modules/ *.js",
+        "build": "tsc",
+        "test": "npm run build && node dist/client.js"
+    },
+    "author": "OpenAPI-Generator Contributors",
+    "license": "Unlicense",
+    "dependencies": {
+        "bluebird": "^3.5.0",
+        "request": "^2.81.0",
+        "@types/bluebird": "*",
+        "@types/request": "*",
+        "rewire": "^3.0.2"
+    },
+    "devDependencies": {
+        "typescript": "^2.4.2",
+        "@types/node": "8.10.34"
+    }
+}
diff --git a/modules/openapi-generator/src/test/resources/integrationtests/typescript/objectsWithEnums-expected/tsconfig.json b/modules/openapi-generator/src/test/resources/integrationtests/typescript/objectsWithEnums-expected/tsconfig.json
new file mode 100644
index 0000000000..ba2570a4be
--- /dev/null
+++ b/modules/openapi-generator/src/test/resources/integrationtests/typescript/objectsWithEnums-expected/tsconfig.json
@@ -0,0 +1,20 @@
+{
+    "compilerOptions": {
+        "module": "commonjs",
+        "noImplicitAny": false,
+        "suppressImplicitAnyIndexErrors": true,
+        "target": "ES5",
+        "strict": true,
+        "moduleResolution": "node",
+        "removeComments": true,
+        "sourceMap": true,
+        "noLib": false,
+        "declaration": true,
+        "lib": ["dom", "es6", "es5", "dom.iterable", "scripthost"],
+        "outDir": "dist"
+    },
+    "exclude": [
+        "dist",
+        "node_modules"
+    ]
+}
diff --git a/modules/openapi-generator/src/test/resources/integrationtests/typescript/objectsWithEnums-spec.json b/modules/openapi-generator/src/test/resources/integrationtests/typescript/objectsWithEnums-spec.json
new file mode 100644
index 0000000000..cf5b2ddd75
--- /dev/null
+++ b/modules/openapi-generator/src/test/resources/integrationtests/typescript/objectsWithEnums-spec.json
@@ -0,0 +1,91 @@
+{
+  "openapi" : "3.0.0",
+  "info" : {
+    "title" : "OpenAPI enums",
+    "description" : "Tests generation of enums with open opi",
+    "version" : "1.0.0"
+  },
+  "servers" : [ {
+    "url" : "http://enums.openapi3"
+  } ],
+  "paths" : {
+    "/postobjectwithenums" : {
+      "post" : {
+        "operationId" : "postObjectWithEnums",
+        "requestBody" : {
+          "$ref" : "#/components/requestBodies/ObjectWithEnums"
+        },
+        "responses" : {
+          "405" : {
+            "description" : "Invalid input"
+          }
+        }
+      }
+    },
+    "/getobjectwithenums" : {
+      "get" : {
+        "operationId" : "getObjectWithEnums",
+        "responses" : {
+          "200" : {
+            "description" : "successful operation",
+            "content" : {
+              "application/xml" : {
+                "schema" : {
+                  "type" : "array",
+                  "items" : {
+                    "$ref" : "#/components/schemas/ObjectWithEnums"
+                  }
+                }
+              },
+              "application/json" : {
+                "schema" : {
+                  "type" : "array",
+                  "items" : {
+                    "$ref" : "#/components/schemas/ObjectWithEnums"
+                  }
+                }
+              }
+            }
+          }
+        }
+      }
+    }
+  },
+  "components" : {
+    "schemas" : {
+      "ObjectWithEnums" : {
+        "type" : "object",
+        "properties" : {
+          "enumInObject" : {
+            "type" : "string",
+            "enum" : [ "red", "blue" ]
+          },
+          "externalEnum" : {
+            "$ref" : "#/components/schemas/ExternalEnum"
+          }
+        }
+      },
+      "ExternalEnum" : {
+        "type" : "string",
+        "enum" : [ "green", "yellow" ]
+      }
+    },
+    "requestBodies" : {
+      "ObjectWithEnums" : {
+        "content" : {
+          "application/json" : {
+            "schema" : {
+              "$ref" : "#/components/schemas/ObjectWithEnums"
+            }
+          },
+          "application/xml" : {
+            "schema" : {
+              "$ref" : "#/components/schemas/ObjectWithEnums"
+            }
+          }
+        },
+        "required" : true
+      }
+    }
+  }
+}
\ No newline at end of file

From 610ca28681c4dc1b1a6a002c87c6ab12fef5fda7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jean-Fran=C3=A7ois=20C=C3=B4t=C3=A9?= <jcote@stingray.com>
Date: Wed, 17 Jul 2019 16:30:27 -0400
Subject: [PATCH 20/62] Fix #3349 : [typescript-fetch] Proposition to follow
 spec (#3351)

* Fix 3349 : Proposition to follow spec closely

* Fix #3349 : Changes suggested by code review. Add an option for the single request parameter.

* Fix #3349 : Add sample with the use of the single request parameter

* Fix #3349 : Small fix that wasn't passing the tests

* Fix #3349 : Remove cariage return that might create an error

* Fix #3349 : Add chmod to make new sh file executable and fix the CircleCI issue

* Fix #3349 : Add windows sample generation

* Fix #3349 : Rename everything because of default value change

* Fix #3349 : Indentation fix

* Fix #3349 : Add 755 to typescript-fetch-petstore-multiple-parameters.sh

* Fix #3349 : Auto generation of the documentations

* Fix #3349 : Revert back a change that was auto-generated.
---
 .../builds/multiple-parameters/pom.xml        |   26 +
 bin/typescript-fetch-petstore-all.sh          |    1 +
 ...pt-fetch-petstore-multiple-parameters.json |    4 +
 ...ript-fetch-petstore-multiple-parameters.sh |   34 +
 bin/windows/typescript-fetch-petstore-all.bat |    1 +
 ...ipt-fetch-petstore-multiple-parameters.bat |   12 +
 docs/generators/typescript-fetch.md           |    1 +
 .../TypeScriptFetchClientCodegen.java         |   20 +-
 .../resources/typescript-fetch/apis.mustache  |   29 +-
 .../TypeScriptFetchClientOptionsProvider.java |    1 +
 .../typescript-fetch/builds/default/api.ts    | 1928 -----------------
 .../builds/default/apis/PetApi.ts             |   54 +-
 .../builds/default/apis/StoreApi.ts           |   30 +-
 .../builds/default/apis/UserApi.ts            |   54 +-
 .../builds/default/models/ApiResponse.ts      |   60 -
 .../builds/default/models/InlineObject.ts     |   52 -
 .../builds/default/models/InlineObject1.ts    |   52 -
 .../builds/es6-target/apis/PetApi.ts          |   54 +-
 .../builds/es6-target/apis/StoreApi.ts        |   30 +-
 .../builds/es6-target/apis/UserApi.ts         |   54 +-
 .../builds/es6-target/models/InlineObject1.ts |   52 -
 .../builds/multiple-parameters/.gitignore     |    4 +
 .../.openapi-generator-ignore                 |   23 +
 .../.openapi-generator/VERSION                |    1 +
 .../builds/multiple-parameters/apis/PetApi.ts |  424 ++++
 .../multiple-parameters/apis/StoreApi.ts      |  167 ++
 .../multiple-parameters/apis/UserApi.ts       |  321 +++
 .../builds/multiple-parameters/apis/index.ts  |    3 +
 .../builds/multiple-parameters/index.ts       |    3 +
 .../models/Category.ts}                       |   30 +-
 .../models/ModelApiResponse.ts}               |   18 +-
 .../multiple-parameters/models/Order.ts       |   94 +
 .../builds/multiple-parameters/models/Pet.ts  |  103 +
 .../models/Tag.ts}                            |   30 +-
 .../builds/multiple-parameters/models/User.ts |  100 +
 .../multiple-parameters/models/index.ts       |    6 +
 .../builds/multiple-parameters/pom.xml        |   26 +
 .../builds/multiple-parameters/runtime.ts     |  284 +++
 .../builds/multiple-parameters/tsconfig.json  |   21 +
 .../builds/with-interfaces/apis/PetApi.ts     |   54 +-
 .../builds/with-interfaces/apis/StoreApi.ts   |   30 +-
 .../builds/with-interfaces/apis/UserApi.ts    |   54 +-
 .../with-interfaces/models/ApiResponse.ts     |   60 -
 .../with-interfaces/models/InlineObject1.ts   |   52 -
 .../builds/with-npm-version/apis/PetApi.ts    |   54 +-
 .../builds/with-npm-version/apis/StoreApi.ts  |   30 +-
 .../builds/with-npm-version/apis/UserApi.ts   |   54 +-
 .../with-npm-version/models/ApiResponse.ts    |   60 -
 .../with-npm-version/models/InlineObject.ts   |   52 -
 .../with-npm-version/models/InlineObject1.ts  |   52 -
 .../builds/with-npm-version/package-lock.json |   14 -
 .../tests/default/package-lock.json           |   52 +-
 .../tests/default/package.json                |    1 +
 53 files changed, 2048 insertions(+), 2778 deletions(-)
 create mode 100644 CI/samples.ci/client/petstore/typescript-fetch/builds/multiple-parameters/pom.xml
 create mode 100644 bin/typescript-fetch-petstore-multiple-parameters.json
 create mode 100755 bin/typescript-fetch-petstore-multiple-parameters.sh
 create mode 100644 bin/windows/typescript-fetch-petstore-multiple-parameters.bat
 delete mode 100644 samples/client/petstore/typescript-fetch/builds/default/api.ts
 delete mode 100644 samples/client/petstore/typescript-fetch/builds/default/models/ApiResponse.ts
 delete mode 100644 samples/client/petstore/typescript-fetch/builds/default/models/InlineObject.ts
 delete mode 100644 samples/client/petstore/typescript-fetch/builds/default/models/InlineObject1.ts
 delete mode 100644 samples/client/petstore/typescript-fetch/builds/es6-target/models/InlineObject1.ts
 create mode 100644 samples/client/petstore/typescript-fetch/builds/multiple-parameters/.gitignore
 create mode 100644 samples/client/petstore/typescript-fetch/builds/multiple-parameters/.openapi-generator-ignore
 create mode 100644 samples/client/petstore/typescript-fetch/builds/multiple-parameters/.openapi-generator/VERSION
 create mode 100644 samples/client/petstore/typescript-fetch/builds/multiple-parameters/apis/PetApi.ts
 create mode 100644 samples/client/petstore/typescript-fetch/builds/multiple-parameters/apis/StoreApi.ts
 create mode 100644 samples/client/petstore/typescript-fetch/builds/multiple-parameters/apis/UserApi.ts
 create mode 100644 samples/client/petstore/typescript-fetch/builds/multiple-parameters/apis/index.ts
 create mode 100644 samples/client/petstore/typescript-fetch/builds/multiple-parameters/index.ts
 rename samples/client/petstore/typescript-fetch/builds/{es6-target/models/InlineObject.ts => multiple-parameters/models/Category.ts} (61%)
 rename samples/client/petstore/typescript-fetch/builds/{es6-target/models/ApiResponse.ts => multiple-parameters/models/ModelApiResponse.ts} (71%)
 create mode 100644 samples/client/petstore/typescript-fetch/builds/multiple-parameters/models/Order.ts
 create mode 100644 samples/client/petstore/typescript-fetch/builds/multiple-parameters/models/Pet.ts
 rename samples/client/petstore/typescript-fetch/builds/{with-interfaces/models/InlineObject.ts => multiple-parameters/models/Tag.ts} (61%)
 create mode 100644 samples/client/petstore/typescript-fetch/builds/multiple-parameters/models/User.ts
 create mode 100644 samples/client/petstore/typescript-fetch/builds/multiple-parameters/models/index.ts
 create mode 100644 samples/client/petstore/typescript-fetch/builds/multiple-parameters/pom.xml
 create mode 100644 samples/client/petstore/typescript-fetch/builds/multiple-parameters/runtime.ts
 create mode 100644 samples/client/petstore/typescript-fetch/builds/multiple-parameters/tsconfig.json
 delete mode 100644 samples/client/petstore/typescript-fetch/builds/with-interfaces/models/ApiResponse.ts
 delete mode 100644 samples/client/petstore/typescript-fetch/builds/with-interfaces/models/InlineObject1.ts
 delete mode 100644 samples/client/petstore/typescript-fetch/builds/with-npm-version/models/ApiResponse.ts
 delete mode 100644 samples/client/petstore/typescript-fetch/builds/with-npm-version/models/InlineObject.ts
 delete mode 100644 samples/client/petstore/typescript-fetch/builds/with-npm-version/models/InlineObject1.ts
 delete mode 100644 samples/client/petstore/typescript-fetch/builds/with-npm-version/package-lock.json

diff --git a/CI/samples.ci/client/petstore/typescript-fetch/builds/multiple-parameters/pom.xml b/CI/samples.ci/client/petstore/typescript-fetch/builds/multiple-parameters/pom.xml
new file mode 100644
index 0000000000..a6fc39c4f0
--- /dev/null
+++ b/CI/samples.ci/client/petstore/typescript-fetch/builds/multiple-parameters/pom.xml
@@ -0,0 +1,26 @@
+<project>
+    <modelVersion>4.0.0</modelVersion>
+    <groupId>org.openapitools</groupId>
+    <artifactId>TypeScriptAngularBuildPestoreClientTests</artifactId>
+    <packaging>pom</packaging>
+    <version>1.0-SNAPSHOT</version>
+    <name>TS Fetch Multiple Parameters Petstore Client</name>
+    <build>
+        <plugins>
+            <plugin>
+                <artifactId>maven-dependency-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>copy-dependencies</goal>
+                        </goals>
+                        <configuration>
+                            <outputDirectory>${project.build.directory}</outputDirectory>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+</project>
diff --git a/bin/typescript-fetch-petstore-all.sh b/bin/typescript-fetch-petstore-all.sh
index 27cd5f104b..5611d4c6eb 100755
--- a/bin/typescript-fetch-petstore-all.sh
+++ b/bin/typescript-fetch-petstore-all.sh
@@ -4,3 +4,4 @@
 ./bin/typescript-fetch-petstore-with-npm-version.sh
 ./bin/typescript-fetch-petstore-interfaces.sh
 ./bin/typescript-fetch-petstore.sh
+./bin/typescript-fetch-petstore-multiple-parameters.sh
\ No newline at end of file
diff --git a/bin/typescript-fetch-petstore-multiple-parameters.json b/bin/typescript-fetch-petstore-multiple-parameters.json
new file mode 100644
index 0000000000..c165a82a50
--- /dev/null
+++ b/bin/typescript-fetch-petstore-multiple-parameters.json
@@ -0,0 +1,4 @@
+{
+  "snapshot" : false,
+  "useSingleRequestParameter": false
+}
\ No newline at end of file
diff --git a/bin/typescript-fetch-petstore-multiple-parameters.sh b/bin/typescript-fetch-petstore-multiple-parameters.sh
new file mode 100755
index 0000000000..6dfa018ef3
--- /dev/null
+++ b/bin/typescript-fetch-petstore-multiple-parameters.sh
@@ -0,0 +1,34 @@
+#!/bin/sh
+
+SCRIPT="$0"
+echo "# START SCRIPT: $SCRIPT"
+
+while [ -h "$SCRIPT" ] ; do
+  ls=`ls -ld "$SCRIPT"`
+  link=`expr "$ls" : '.*-> \(.*\)$'`
+  if expr "$link" : '/.*' > /dev/null; then
+    SCRIPT="$link"
+  else
+    SCRIPT=`dirname "$SCRIPT"`/"$link"
+  fi
+done
+
+if [ ! -d "${APP_DIR}" ]; then
+  APP_DIR=`dirname "$SCRIPT"`/..
+  APP_DIR=`cd "${APP_DIR}"; pwd`
+fi
+
+executable="./modules/openapi-generator-cli/target/openapi-generator-cli.jar"
+
+if [ ! -f "$executable" ]
+then
+  mvn -B clean package
+fi
+
+# if you've executed sbt assembly previously it will use that instead.
+export JAVA_OPTS="${JAVA_OPTS} -Xmx1024M -DloggerPath=conf/log4j.properties"
+ags="generate -i modules/openapi-generator/src/test/resources/2_0/petstore.yaml -g typescript-fetch -c bin/typescript-fetch-petstore-multiple-parameters.json -o samples/client/petstore/typescript-fetch/builds/multiple-parameters $@"
+
+java $JAVA_OPTS -jar $executable $ags
+cp CI/samples.ci/client/petstore/typescript-fetch/builds/multiple-parameters/pom.xml samples/client/petstore/typescript-fetch/builds/multiple-parameters/pom.xml
+cp CI/samples.ci/client/petstore/typescript-fetch/tests/default/pom.xml samples/client/petstore/typescript-fetch/tests/default/pom.xml
\ No newline at end of file
diff --git a/bin/windows/typescript-fetch-petstore-all.bat b/bin/windows/typescript-fetch-petstore-all.bat
index 69af38cf6a..c07605f175 100644
--- a/bin/windows/typescript-fetch-petstore-all.bat
+++ b/bin/windows/typescript-fetch-petstore-all.bat
@@ -4,3 +4,4 @@ call bin\windows\typescript-fetch-petstore.bat
 call bin\windows\typescript-fetch-petstore-target-es6.bat
 call bin\windows\typescript-fetch-petstore-with-npm-version.bat
 call bin\windows\typescript-fetch-petstore-interfaces.bat
+call bin\windows\typescript-fetch-petstore-multiple-parameters.bat
diff --git a/bin/windows/typescript-fetch-petstore-multiple-parameters.bat b/bin/windows/typescript-fetch-petstore-multiple-parameters.bat
new file mode 100644
index 0000000000..095fdb3e5d
--- /dev/null
+++ b/bin/windows/typescript-fetch-petstore-multiple-parameters.bat
@@ -0,0 +1,12 @@
+@ECHO OFF
+
+set executable=.\modules\openapi-generator-cli\target\openapi-generator-cli.jar
+
+If Not Exist %executable% (
+  mvn clean package
+)
+
+REM set JAVA_OPTS=%JAVA_OPTS% -Xmx1024M
+set ags=generate -i modules\openapi-generator\src\test\resources\2_0\petstore.yaml -g typescript-fetch -c bin\typescript-fetch-petstore-multiple-parameters.json -o samples\client\petstore\typescript-fetch\builds\multiple-parameters
+
+java %JAVA_OPTS% -jar %executable% %ags%
diff --git a/docs/generators/typescript-fetch.md b/docs/generators/typescript-fetch.md
index 1ccb820eee..af45a95161 100644
--- a/docs/generators/typescript-fetch.md
+++ b/docs/generators/typescript-fetch.md
@@ -18,3 +18,4 @@ sidebar_label: typescript-fetch
 |snapshot|When setting this property to true, the version will be suffixed with -SNAPSHOT.yyyyMMddHHmm| |false|
 |npmRepository|Use this property to set an url your private npmRepo in the package.json| |null|
 |withInterfaces|Setting this property to true will generate interfaces next to the default class implementations.| |false|
+|useSingleRequestParameter|Setting this property to true will generate functions with a single argument containing all API endpoint parameters instead of one argument per parameter.| |true|
diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/TypeScriptFetchClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/TypeScriptFetchClientCodegen.java
index 4d80efd6a7..5521d72e7b 100644
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/TypeScriptFetchClientCodegen.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/TypeScriptFetchClientCodegen.java
@@ -24,19 +24,18 @@ import org.openapitools.codegen.*;
 import org.openapitools.codegen.utils.ModelUtils;
 
 import java.io.File;
-import java.text.SimpleDateFormat;
 import java.util.TreeSet;
-import java.util.Date;
 import java.util.List;
-import java.util.Locale;
 import java.util.Map;
 
 public class TypeScriptFetchClientCodegen extends AbstractTypeScriptClientCodegen {
 
     public static final String NPM_REPOSITORY = "npmRepository";
     public static final String WITH_INTERFACES = "withInterfaces";
+    public static final String USE_SINGLE_REQUEST_PARAMETER = "useSingleRequestParameter";
 
     protected String npmRepository = null;
+    private boolean useSingleRequestParameter = true;
 
     public TypeScriptFetchClientCodegen() {
         super();
@@ -56,6 +55,7 @@ public class TypeScriptFetchClientCodegen extends AbstractTypeScriptClientCodege
 
         this.cliOptions.add(new CliOption(NPM_REPOSITORY, "Use this property to set an url your private npmRepo in the package.json"));
         this.cliOptions.add(new CliOption(WITH_INTERFACES, "Setting this property to true will generate interfaces next to the default class implementations.", SchemaTypeUtil.BOOLEAN_TYPE).defaultValue(Boolean.FALSE.toString()));
+        this.cliOptions.add(new CliOption(USE_SINGLE_REQUEST_PARAMETER, "Setting this property to true will generate functions with a single argument containing all API endpoint parameters instead of one argument per parameter.", SchemaTypeUtil.BOOLEAN_TYPE).defaultValue(Boolean.TRUE.toString()));
     }
 
     @Override
@@ -87,6 +87,12 @@ public class TypeScriptFetchClientCodegen extends AbstractTypeScriptClientCodege
         supportingFiles.add(new SupportingFile("models.index.mustache", modelPackage().replace('.', File.separatorChar), "index.ts"));
         supportingFiles.add(new SupportingFile("tsconfig.mustache", "", "tsconfig.json"));
         supportingFiles.add(new SupportingFile("gitignore", "", ".gitignore"));
+
+        if (additionalProperties.containsKey(USE_SINGLE_REQUEST_PARAMETER)) {
+            this.setUseSingleRequestParameter(convertPropertyToBoolean(USE_SINGLE_REQUEST_PARAMETER));
+        }
+        writePropertyBack(USE_SINGLE_REQUEST_PARAMETER, getUseSingleRequestParameter());
+
         if (additionalProperties.containsKey(NPM_NAME)) {
             addNpmPackageGeneration();
         }
@@ -245,4 +251,12 @@ public class TypeScriptFetchClientCodegen extends AbstractTypeScriptClientCodege
         this.reservedWords.add("BlobApiResponse");
         this.reservedWords.add("TextApiResponse");
     }
+
+    private boolean getUseSingleRequestParameter() {
+        return useSingleRequestParameter;
+    }
+
+    private void setUseSingleRequestParameter(boolean useSingleRequestParameter) {
+        this.useSingleRequestParameter = useSingleRequestParameter;
+    }
 }
diff --git a/modules/openapi-generator/src/main/resources/typescript-fetch/apis.mustache b/modules/openapi-generator/src/main/resources/typescript-fetch/apis.mustache
index b903769d8a..662ec63b5b 100644
--- a/modules/openapi-generator/src/main/resources/typescript-fetch/apis.mustache
+++ b/modules/openapi-generator/src/main/resources/typescript-fetch/apis.mustache
@@ -229,14 +229,26 @@ export class {{classname}} extends runtime.BaseAPI {
         {{/returnType}}
     }
 
-    /**
-     {{#notes}}
-     * {{&notes}}
-     {{/notes}}
-     {{#summary}}
-     * {{&summary}}
-     {{/summary}}
-     */
+   /**
+    {{#notes}}
+    * {{&notes}}
+    {{/notes}}
+    {{#summary}}
+    * {{&summary}}
+    {{/summary}}
+    */
+    {{^useSingleRequestParameter}}
+    async {{nickname}}({{#allParams}}{{paramName}}{{^required}}?{{/required}}: {{#isEnum}}{{{datatypeWithEnum}}}{{/isEnum}}{{^isEnum}}{{{dataType}}}{{/isEnum}}{{#hasMore}}, {{/hasMore}}{{/allParams}}): Promise<{{#returnType}}{{{returnType}}}{{/returnType}}{{^returnType}}void{{/returnType}}> {
+        {{#returnType}}
+        const response = await this.{{nickname}}Raw({{#allParams.0}}{ {{#allParams}}{{paramName}}: {{paramName}}{{#hasMore}}, {{/hasMore}}{{/allParams}} }{{/allParams.0}});
+        return await response.value();
+        {{/returnType}}
+        {{^returnType}}
+        await this.{{nickname}}Raw({{#allParams.0}}{ {{#allParams}}{{paramName}}: {{paramName}}{{#hasMore}}, {{/hasMore}}{{/allParams}} }{{/allParams.0}});
+        {{/returnType}}
+    }
+    {{/useSingleRequestParameter}}
+    {{#useSingleRequestParameter}}
     async {{nickname}}({{#allParams.0}}requestParameters: {{operationIdCamelCase}}Request{{/allParams.0}}): Promise<{{#returnType}}{{{returnType}}}{{/returnType}}{{^returnType}}void{{/returnType}}> {
         {{#returnType}}
         const response = await this.{{nickname}}Raw({{#allParams.0}}requestParameters{{/allParams.0}});
@@ -246,6 +258,7 @@ export class {{classname}} extends runtime.BaseAPI {
         await this.{{nickname}}Raw({{#allParams.0}}requestParameters{{/allParams.0}});
         {{/returnType}}
     }
+    {{/useSingleRequestParameter}}
 
     {{/operation}}
 }
diff --git a/modules/openapi-generator/src/test/java/org/openapitools/codegen/options/TypeScriptFetchClientOptionsProvider.java b/modules/openapi-generator/src/test/java/org/openapitools/codegen/options/TypeScriptFetchClientOptionsProvider.java
index 46d991e03c..28cb997208 100644
--- a/modules/openapi-generator/src/test/java/org/openapitools/codegen/options/TypeScriptFetchClientOptionsProvider.java
+++ b/modules/openapi-generator/src/test/java/org/openapitools/codegen/options/TypeScriptFetchClientOptionsProvider.java
@@ -51,6 +51,7 @@ public class TypeScriptFetchClientOptionsProvider implements OptionsProvider {
                 .put(TypeScriptFetchClientCodegen.NPM_REPOSITORY, NPM_REPOSITORY)
                 .put(TypeScriptFetchClientCodegen.SNAPSHOT, Boolean.FALSE.toString())
                 .put(TypeScriptFetchClientCodegen.WITH_INTERFACES, Boolean.FALSE.toString())
+                .put(TypeScriptFetchClientCodegen.USE_SINGLE_REQUEST_PARAMETER, Boolean.FALSE.toString())
                 .put(CodegenConstants.ALLOW_UNICODE_IDENTIFIERS, ALLOW_UNICODE_IDENTIFIERS_VALUE)
                 .put(CodegenConstants.PREPEND_FORM_OR_BODY_PARAMETERS, PREPEND_FORM_OR_BODY_PARAMETERS_VALUE)
                 .build();
diff --git a/samples/client/petstore/typescript-fetch/builds/default/api.ts b/samples/client/petstore/typescript-fetch/builds/default/api.ts
deleted file mode 100644
index 4a39a9c8b5..0000000000
--- a/samples/client/petstore/typescript-fetch/builds/default/api.ts
+++ /dev/null
@@ -1,1928 +0,0 @@
-/// <reference path="./custom.d.ts" />
-// tslint:disable
-/**
- * OpenAPI Petstore
- * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters.
- *
- * OpenAPI spec version: 1.0.0
- * 
- *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-
-export const BASE_PATH = "http://petstore.swagger.io/v2".replace(/\/+$/, "");
-
-/**
- * Describes the result of uploading an image resource
- * @export
- * @interface ApiResponse
- */
-export interface ApiResponse {
-    /**
-     * 
-     * @type {number}
-     * @memberof ApiResponse
-     */
-    code?: number;
-    /**
-     * 
-     * @type {string}
-     * @memberof ApiResponse
-     */
-    type?: string;
-    /**
-     * 
-     * @type {string}
-     * @memberof ApiResponse
-     */
-    message?: string;
-}
-
-/**
- * A category for a pet
- * @export
- * @interface Category
- */
-export interface Category {
-    /**
-     * 
-     * @type {number}
-     * @memberof Category
-     */
-    id?: number;
-    /**
-     * 
-     * @type {string}
-     * @memberof Category
-     */
-    name?: string;
-}
-
-/**
- * An order for a pets from the pet store
- * @export
- * @interface Order
- */
-export interface Order {
-    /**
-     * 
-     * @type {number}
-     * @memberof Order
-     */
-    id?: number;
-    /**
-     * 
-     * @type {number}
-     * @memberof Order
-     */
-    petId?: number;
-    /**
-     * 
-     * @type {number}
-     * @memberof Order
-     */
-    quantity?: number;
-    /**
-     * 
-     * @type {Date}
-     * @memberof Order
-     */
-    shipDate?: Date;
-    /**
-     * Order Status
-     * @type {string}
-     * @memberof Order
-     */
-    status?: Order.StatusEnum;
-    /**
-     * 
-     * @type {boolean}
-     * @memberof Order
-     */
-    complete?: boolean;
-}
-
-/**
- * @export
- * @namespace Order
- */
-export namespace Order {
-    /**
-     * @export
-     * @enum {string}
-     */
-    export enum StatusEnum {
-        Placed = 'placed',
-        Approved = 'approved',
-        Delivered = 'delivered'
-    }
-}
-
-/**
- * A pet for sale in the pet store
- * @export
- * @interface Pet
- */
-export interface Pet {
-    /**
-     * 
-     * @type {number}
-     * @memberof Pet
-     */
-    id?: number;
-    /**
-     * 
-     * @type {Category}
-     * @memberof Pet
-     */
-    category?: Category;
-    /**
-     * 
-     * @type {string}
-     * @memberof Pet
-     */
-    name: string;
-    /**
-     * 
-     * @type {Array<string>}
-     * @memberof Pet
-     */
-    photoUrls: Array<string>;
-    /**
-     * 
-     * @type {Array<Tag>}
-     * @memberof Pet
-     */
-    tags?: Array<Tag>;
-    /**
-     * pet status in the store
-     * @type {string}
-     * @memberof Pet
-     */
-    status?: Pet.StatusEnum;
-}
-
-/**
- * @export
- * @namespace Pet
- */
-export namespace Pet {
-    /**
-     * @export
-     * @enum {string}
-     */
-    export enum StatusEnum {
-        Available = 'available',
-        Pending = 'pending',
-        Sold = 'sold'
-    }
-}
-
-/**
- * A tag for a pet
- * @export
- * @interface Tag
- */
-export interface Tag {
-    /**
-     * 
-     * @type {number}
-     * @memberof Tag
-     */
-    id?: number;
-    /**
-     * 
-     * @type {string}
-     * @memberof Tag
-     */
-    name?: string;
-}
-
-/**
- * A User who is purchasing from the pet store
- * @export
- * @interface User
- */
-export interface User {
-    /**
-     * 
-     * @type {number}
-     * @memberof User
-     */
-    id?: number;
-    /**
-     * 
-     * @type {string}
-     * @memberof User
-     */
-    username?: string;
-    /**
-     * 
-     * @type {string}
-     * @memberof User
-     */
-    firstName?: string;
-    /**
-     * 
-     * @type {string}
-     * @memberof User
-     */
-    lastName?: string;
-    /**
-     * 
-     * @type {string}
-     * @memberof User
-     */
-    email?: string;
-    /**
-     * 
-     * @type {string}
-     * @memberof User
-     */
-    password?: string;
-    /**
-     * 
-     * @type {string}
-     * @memberof User
-     */
-    phone?: string;
-    /**
-     * User Status
-     * @type {number}
-     * @memberof User
-     */
-    userStatus?: number;
-}
-
-
-/**
- * PetApi - fetch parameter creator
- * @export
- */
-export const PetApiFetchParamCreator = function (configuration?: Configuration) {
-    return {
-        /**
-         * 
-         * @summary Add a new pet to the store
-         * @param {Pet} pet Pet object that needs to be added to the store
-         * @param {*} [options] Override http request option.
-         * @throws {RequiredError}
-         */
-        addPet(pet: Pet, options: any = {}): FetchArgs {
-            // verify required parameter 'pet' is not null or undefined
-            if (pet === null || pet === undefined) {
-                throw new RequiredError('pet','Required parameter pet was null or undefined when calling addPet.');
-            }
-            const localVarPath = `/pet`;
-            const localVarUrlObj = url.parse(localVarPath, true);
-            const localVarRequestOptions = Object.assign({ method: 'POST' }, options);
-            const localVarHeaderParameter = {} as any;
-            const localVarQueryParameter = {} as any;
-
-            // authentication petstore_auth required
-            // oauth required
-            if (configuration && configuration.accessToken) {
-				const localVarAccessTokenValue = typeof configuration.accessToken === 'function'
-					? configuration.accessToken("petstore_auth", ["write:pets", "read:pets"])
-					: configuration.accessToken;
-                localVarHeaderParameter["Authorization"] = "Bearer " + localVarAccessTokenValue;
-            }
-
-            localVarHeaderParameter['Content-Type'] = 'application/json';
-
-            localVarUrlObj.query = Object.assign({}, localVarUrlObj.query, localVarQueryParameter, options.query);
-            // fix override query string Detail: https://stackoverflow.com/a/7517673/1077943
-            delete localVarUrlObj.search;
-            localVarRequestOptions.headers = Object.assign({}, localVarHeaderParameter, options.headers);
-            const needsSerialization = (<any>"Pet" !== "string") || localVarRequestOptions.headers['Content-Type'] === 'application/json';
-            localVarRequestOptions.body =  needsSerialization ? JSON.stringify(pet || {}) : (pet || "");
-
-            return {
-                url: url.format(localVarUrlObj),
-                options: localVarRequestOptions,
-            };
-        },
-        /**
-         * 
-         * @summary Deletes a pet
-         * @param {number} petId Pet id to delete
-         * @param {string} [apiKey] 
-         * @param {*} [options] Override http request option.
-         * @throws {RequiredError}
-         */
-        deletePet(petId: number, apiKey?: string, options: any = {}): FetchArgs {
-            // verify required parameter 'petId' is not null or undefined
-            if (petId === null || petId === undefined) {
-                throw new RequiredError('petId','Required parameter petId was null or undefined when calling deletePet.');
-            }
-            const localVarPath = `/pet/{petId}`
-                .replace(`{${"petId"}}`, encodeURIComponent(String(petId)));
-            const localVarUrlObj = url.parse(localVarPath, true);
-            const localVarRequestOptions = Object.assign({ method: 'DELETE' }, options);
-            const localVarHeaderParameter = {} as any;
-            const localVarQueryParameter = {} as any;
-
-            // authentication petstore_auth required
-            // oauth required
-            if (configuration && configuration.accessToken) {
-				const localVarAccessTokenValue = typeof configuration.accessToken === 'function'
-					? configuration.accessToken("petstore_auth", ["write:pets", "read:pets"])
-					: configuration.accessToken;
-                localVarHeaderParameter["Authorization"] = "Bearer " + localVarAccessTokenValue;
-            }
-
-            if (apiKey !== undefined && apiKey !== null) {
-                localVarHeaderParameter['api_key'] = String(apiKey);
-            }
-
-            localVarUrlObj.query = Object.assign({}, localVarUrlObj.query, localVarQueryParameter, options.query);
-            // fix override query string Detail: https://stackoverflow.com/a/7517673/1077943
-            delete localVarUrlObj.search;
-            localVarRequestOptions.headers = Object.assign({}, localVarHeaderParameter, options.headers);
-
-            return {
-                url: url.format(localVarUrlObj),
-                options: localVarRequestOptions,
-            };
-        },
-        /**
-         * Multiple status values can be provided with comma separated strings
-         * @summary Finds Pets by status
-         * @param {Array<'available' | 'pending' | 'sold'>} status Status values that need to be considered for filter
-         * @param {*} [options] Override http request option.
-         * @throws {RequiredError}
-         */
-        findPetsByStatus(status: Array<'available' | 'pending' | 'sold'>, options: any = {}): FetchArgs {
-            // verify required parameter 'status' is not null or undefined
-            if (status === null || status === undefined) {
-                throw new RequiredError('status','Required parameter status was null or undefined when calling findPetsByStatus.');
-            }
-            const localVarPath = `/pet/findByStatus`;
-            const localVarUrlObj = url.parse(localVarPath, true);
-            const localVarRequestOptions = Object.assign({ method: 'GET' }, options);
-            const localVarHeaderParameter = {} as any;
-            const localVarQueryParameter = {} as any;
-
-            // authentication petstore_auth required
-            // oauth required
-            if (configuration && configuration.accessToken) {
-				const localVarAccessTokenValue = typeof configuration.accessToken === 'function'
-					? configuration.accessToken("petstore_auth", ["write:pets", "read:pets"])
-					: configuration.accessToken;
-                localVarHeaderParameter["Authorization"] = "Bearer " + localVarAccessTokenValue;
-            }
-
-            if (status) {
-                localVarQueryParameter['status'] = status.join(COLLECTION_FORMATS["csv"]);
-            }
-
-            localVarUrlObj.query = Object.assign({}, localVarUrlObj.query, localVarQueryParameter, options.query);
-            // fix override query string Detail: https://stackoverflow.com/a/7517673/1077943
-            delete localVarUrlObj.search;
-            localVarRequestOptions.headers = Object.assign({}, localVarHeaderParameter, options.headers);
-
-            return {
-                url: url.format(localVarUrlObj),
-                options: localVarRequestOptions,
-            };
-        },
-        /**
-         * Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3 for testing.
-         * @summary Finds Pets by tags
-         * @param {Array<string>} tags Tags to filter by
-         * @param {*} [options] Override http request option.
-         * @throws {RequiredError}
-         */
-        findPetsByTags(tags: Array<string>, options: any = {}): FetchArgs {
-            // verify required parameter 'tags' is not null or undefined
-            if (tags === null || tags === undefined) {
-                throw new RequiredError('tags','Required parameter tags was null or undefined when calling findPetsByTags.');
-            }
-            const localVarPath = `/pet/findByTags`;
-            const localVarUrlObj = url.parse(localVarPath, true);
-            const localVarRequestOptions = Object.assign({ method: 'GET' }, options);
-            const localVarHeaderParameter = {} as any;
-            const localVarQueryParameter = {} as any;
-
-            // authentication petstore_auth required
-            // oauth required
-            if (configuration && configuration.accessToken) {
-				const localVarAccessTokenValue = typeof configuration.accessToken === 'function'
-					? configuration.accessToken("petstore_auth", ["write:pets", "read:pets"])
-					: configuration.accessToken;
-                localVarHeaderParameter["Authorization"] = "Bearer " + localVarAccessTokenValue;
-            }
-
-            if (tags) {
-                localVarQueryParameter['tags'] = tags.join(COLLECTION_FORMATS["csv"]);
-            }
-
-            localVarUrlObj.query = Object.assign({}, localVarUrlObj.query, localVarQueryParameter, options.query);
-            // fix override query string Detail: https://stackoverflow.com/a/7517673/1077943
-            delete localVarUrlObj.search;
-            localVarRequestOptions.headers = Object.assign({}, localVarHeaderParameter, options.headers);
-
-            return {
-                url: url.format(localVarUrlObj),
-                options: localVarRequestOptions,
-            };
-        },
-        /**
-         * Returns a single pet
-         * @summary Find pet by ID
-         * @param {number} petId ID of pet to return
-         * @param {*} [options] Override http request option.
-         * @throws {RequiredError}
-         */
-        getPetById(petId: number, options: any = {}): FetchArgs {
-            // verify required parameter 'petId' is not null or undefined
-            if (petId === null || petId === undefined) {
-                throw new RequiredError('petId','Required parameter petId was null or undefined when calling getPetById.');
-            }
-            const localVarPath = `/pet/{petId}`
-                .replace(`{${"petId"}}`, encodeURIComponent(String(petId)));
-            const localVarUrlObj = url.parse(localVarPath, true);
-            const localVarRequestOptions = Object.assign({ method: 'GET' }, options);
-            const localVarHeaderParameter = {} as any;
-            const localVarQueryParameter = {} as any;
-
-            // authentication api_key required
-            if (configuration && configuration.apiKey) {
-                const localVarApiKeyValue = typeof configuration.apiKey === 'function'
-					? configuration.apiKey("api_key")
-					: configuration.apiKey;
-                localVarHeaderParameter["api_key"] = localVarApiKeyValue;
-            }
-
-            localVarUrlObj.query = Object.assign({}, localVarUrlObj.query, localVarQueryParameter, options.query);
-            // fix override query string Detail: https://stackoverflow.com/a/7517673/1077943
-            delete localVarUrlObj.search;
-            localVarRequestOptions.headers = Object.assign({}, localVarHeaderParameter, options.headers);
-
-            return {
-                url: url.format(localVarUrlObj),
-                options: localVarRequestOptions,
-            };
-        },
-        /**
-         * 
-         * @summary Update an existing pet
-         * @param {Pet} pet Pet object that needs to be added to the store
-         * @param {*} [options] Override http request option.
-         * @throws {RequiredError}
-         */
-        updatePet(pet: Pet, options: any = {}): FetchArgs {
-            // verify required parameter 'pet' is not null or undefined
-            if (pet === null || pet === undefined) {
-                throw new RequiredError('pet','Required parameter pet was null or undefined when calling updatePet.');
-            }
-            const localVarPath = `/pet`;
-            const localVarUrlObj = url.parse(localVarPath, true);
-            const localVarRequestOptions = Object.assign({ method: 'PUT' }, options);
-            const localVarHeaderParameter = {} as any;
-            const localVarQueryParameter = {} as any;
-
-            // authentication petstore_auth required
-            // oauth required
-            if (configuration && configuration.accessToken) {
-				const localVarAccessTokenValue = typeof configuration.accessToken === 'function'
-					? configuration.accessToken("petstore_auth", ["write:pets", "read:pets"])
-					: configuration.accessToken;
-                localVarHeaderParameter["Authorization"] = "Bearer " + localVarAccessTokenValue;
-            }
-
-            localVarHeaderParameter['Content-Type'] = 'application/json';
-
-            localVarUrlObj.query = Object.assign({}, localVarUrlObj.query, localVarQueryParameter, options.query);
-            // fix override query string Detail: https://stackoverflow.com/a/7517673/1077943
-            delete localVarUrlObj.search;
-            localVarRequestOptions.headers = Object.assign({}, localVarHeaderParameter, options.headers);
-            const needsSerialization = (<any>"Pet" !== "string") || localVarRequestOptions.headers['Content-Type'] === 'application/json';
-            localVarRequestOptions.body =  needsSerialization ? JSON.stringify(pet || {}) : (pet || "");
-
-            return {
-                url: url.format(localVarUrlObj),
-                options: localVarRequestOptions,
-            };
-        },
-        /**
-         * 
-         * @summary Updates a pet in the store with form data
-         * @param {number} petId ID of pet that needs to be updated
-         * @param {string} [name] Updated name of the pet
-         * @param {string} [status] Updated status of the pet
-         * @param {*} [options] Override http request option.
-         * @throws {RequiredError}
-         */
-        updatePetWithForm(petId: number, name?: string, status?: string, options: any = {}): FetchArgs {
-            // verify required parameter 'petId' is not null or undefined
-            if (petId === null || petId === undefined) {
-                throw new RequiredError('petId','Required parameter petId was null or undefined when calling updatePetWithForm.');
-            }
-            const localVarPath = `/pet/{petId}`
-                .replace(`{${"petId"}}`, encodeURIComponent(String(petId)));
-            const localVarUrlObj = url.parse(localVarPath, true);
-            const localVarRequestOptions = Object.assign({ method: 'POST' }, options);
-            const localVarHeaderParameter = {} as any;
-            const localVarQueryParameter = {} as any;
-            const localVarFormParams = new url.URLSearchParams();
-
-            // authentication petstore_auth required
-            // oauth required
-            if (configuration && configuration.accessToken) {
-				const localVarAccessTokenValue = typeof configuration.accessToken === 'function'
-					? configuration.accessToken("petstore_auth", ["write:pets", "read:pets"])
-					: configuration.accessToken;
-                localVarHeaderParameter["Authorization"] = "Bearer " + localVarAccessTokenValue;
-            }
-
-            if (name !== undefined) {
-                localVarFormParams.set('name', name as any);
-            }
-
-            if (status !== undefined) {
-                localVarFormParams.set('status', status as any);
-            }
-
-            localVarHeaderParameter['Content-Type'] = 'application/x-www-form-urlencoded';
-
-            localVarUrlObj.query = Object.assign({}, localVarUrlObj.query, localVarQueryParameter, options.query);
-            // fix override query string Detail: https://stackoverflow.com/a/7517673/1077943
-            delete localVarUrlObj.search;
-            localVarRequestOptions.headers = Object.assign({}, localVarHeaderParameter, options.headers);
-            localVarRequestOptions.body = localVarFormParams.toString();
-
-            return {
-                url: url.format(localVarUrlObj),
-                options: localVarRequestOptions,
-            };
-        },
-        /**
-         * 
-         * @summary uploads an image
-         * @param {number} petId ID of pet to update
-         * @param {string} [additionalMetadata] Additional data to pass to server
-         * @param {any} [file] file to upload
-         * @param {*} [options] Override http request option.
-         * @throws {RequiredError}
-         */
-        uploadFile(petId: number, additionalMetadata?: string, file?: any, options: any = {}): FetchArgs {
-            // verify required parameter 'petId' is not null or undefined
-            if (petId === null || petId === undefined) {
-                throw new RequiredError('petId','Required parameter petId was null or undefined when calling uploadFile.');
-            }
-            const localVarPath = `/pet/{petId}/uploadImage`
-                .replace(`{${"petId"}}`, encodeURIComponent(String(petId)));
-            const localVarUrlObj = url.parse(localVarPath, true);
-            const localVarRequestOptions = Object.assign({ method: 'POST' }, options);
-            const localVarHeaderParameter = {} as any;
-            const localVarQueryParameter = {} as any;
-            const localVarFormParams = new url.URLSearchParams();
-
-            // authentication petstore_auth required
-            // oauth required
-            if (configuration && configuration.accessToken) {
-				const localVarAccessTokenValue = typeof configuration.accessToken === 'function'
-					? configuration.accessToken("petstore_auth", ["write:pets", "read:pets"])
-					: configuration.accessToken;
-                localVarHeaderParameter["Authorization"] = "Bearer " + localVarAccessTokenValue;
-            }
-
-            if (additionalMetadata !== undefined) {
-                localVarFormParams.set('additionalMetadata', additionalMetadata as any);
-            }
-
-            if (file !== undefined) {
-                localVarFormParams.set('file', file as any);
-            }
-
-            localVarHeaderParameter['Content-Type'] = 'application/x-www-form-urlencoded';
-
-            localVarUrlObj.query = Object.assign({}, localVarUrlObj.query, localVarQueryParameter, options.query);
-            // fix override query string Detail: https://stackoverflow.com/a/7517673/1077943
-            delete localVarUrlObj.search;
-            localVarRequestOptions.headers = Object.assign({}, localVarHeaderParameter, options.headers);
-            localVarRequestOptions.body = localVarFormParams.toString();
-
-            return {
-                url: url.format(localVarUrlObj),
-                options: localVarRequestOptions,
-            };
-        },
-    }
-};
-
-/**
- * PetApi - functional programming interface
- * @export
- */
-export const PetApiFp = function(configuration?: Configuration) {
-    return {
-        /**
-         * 
-         * @summary Add a new pet to the store
-         * @param {Pet} pet Pet object that needs to be added to the store
-         * @param {*} [options] Override http request option.
-         * @throws {RequiredError}
-         */
-        addPet(pet: Pet, options?: any): (fetch?: FetchAPI, basePath?: string) => Promise<Response> {
-            const localVarFetchArgs = PetApiFetchParamCreator(configuration).addPet(pet, options);
-            return (fetch: FetchAPI = portableFetch, basePath: string = BASE_PATH) => {
-                return fetch(basePath + localVarFetchArgs.url, localVarFetchArgs.options).then((response) => {
-                    if (response.status >= 200 && response.status < 300) {
-                        return response;
-                    } else {
-                        throw response;
-                    }
-                });
-            };
-        },
-        /**
-         * 
-         * @summary Deletes a pet
-         * @param {number} petId Pet id to delete
-         * @param {string} [apiKey] 
-         * @param {*} [options] Override http request option.
-         * @throws {RequiredError}
-         */
-        deletePet(petId: number, apiKey?: string, options?: any): (fetch?: FetchAPI, basePath?: string) => Promise<Response> {
-            const localVarFetchArgs = PetApiFetchParamCreator(configuration).deletePet(petId, apiKey, options);
-            return (fetch: FetchAPI = portableFetch, basePath: string = BASE_PATH) => {
-                return fetch(basePath + localVarFetchArgs.url, localVarFetchArgs.options).then((response) => {
-                    if (response.status >= 200 && response.status < 300) {
-                        return response;
-                    } else {
-                        throw response;
-                    }
-                });
-            };
-        },
-        /**
-         * Multiple status values can be provided with comma separated strings
-         * @summary Finds Pets by status
-         * @param {Array<'available' | 'pending' | 'sold'>} status Status values that need to be considered for filter
-         * @param {*} [options] Override http request option.
-         * @throws {RequiredError}
-         */
-        findPetsByStatus(status: Array<'available' | 'pending' | 'sold'>, options?: any): (fetch?: FetchAPI, basePath?: string) => Promise<Array<Pet>> {
-            const localVarFetchArgs = PetApiFetchParamCreator(configuration).findPetsByStatus(status, options);
-            return (fetch: FetchAPI = portableFetch, basePath: string = BASE_PATH) => {
-                return fetch(basePath + localVarFetchArgs.url, localVarFetchArgs.options).then((response) => {
-                    if (response.status >= 200 && response.status < 300) {
-                        return response.json();
-                    } else {
-                        throw response;
-                    }
-                });
-            };
-        },
-        /**
-         * Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3 for testing.
-         * @summary Finds Pets by tags
-         * @param {Array<string>} tags Tags to filter by
-         * @param {*} [options] Override http request option.
-         * @throws {RequiredError}
-         */
-        findPetsByTags(tags: Array<string>, options?: any): (fetch?: FetchAPI, basePath?: string) => Promise<Array<Pet>> {
-            const localVarFetchArgs = PetApiFetchParamCreator(configuration).findPetsByTags(tags, options);
-            return (fetch: FetchAPI = portableFetch, basePath: string = BASE_PATH) => {
-                return fetch(basePath + localVarFetchArgs.url, localVarFetchArgs.options).then((response) => {
-                    if (response.status >= 200 && response.status < 300) {
-                        return response.json();
-                    } else {
-                        throw response;
-                    }
-                });
-            };
-        },
-        /**
-         * Returns a single pet
-         * @summary Find pet by ID
-         * @param {number} petId ID of pet to return
-         * @param {*} [options] Override http request option.
-         * @throws {RequiredError}
-         */
-        getPetById(petId: number, options?: any): (fetch?: FetchAPI, basePath?: string) => Promise<Pet> {
-            const localVarFetchArgs = PetApiFetchParamCreator(configuration).getPetById(petId, options);
-            return (fetch: FetchAPI = portableFetch, basePath: string = BASE_PATH) => {
-                return fetch(basePath + localVarFetchArgs.url, localVarFetchArgs.options).then((response) => {
-                    if (response.status >= 200 && response.status < 300) {
-                        return response.json();
-                    } else {
-                        throw response;
-                    }
-                });
-            };
-        },
-        /**
-         * 
-         * @summary Update an existing pet
-         * @param {Pet} pet Pet object that needs to be added to the store
-         * @param {*} [options] Override http request option.
-         * @throws {RequiredError}
-         */
-        updatePet(pet: Pet, options?: any): (fetch?: FetchAPI, basePath?: string) => Promise<Response> {
-            const localVarFetchArgs = PetApiFetchParamCreator(configuration).updatePet(pet, options);
-            return (fetch: FetchAPI = portableFetch, basePath: string = BASE_PATH) => {
-                return fetch(basePath + localVarFetchArgs.url, localVarFetchArgs.options).then((response) => {
-                    if (response.status >= 200 && response.status < 300) {
-                        return response;
-                    } else {
-                        throw response;
-                    }
-                });
-            };
-        },
-        /**
-         * 
-         * @summary Updates a pet in the store with form data
-         * @param {number} petId ID of pet that needs to be updated
-         * @param {string} [name] Updated name of the pet
-         * @param {string} [status] Updated status of the pet
-         * @param {*} [options] Override http request option.
-         * @throws {RequiredError}
-         */
-        updatePetWithForm(petId: number, name?: string, status?: string, options?: any): (fetch?: FetchAPI, basePath?: string) => Promise<Response> {
-            const localVarFetchArgs = PetApiFetchParamCreator(configuration).updatePetWithForm(petId, name, status, options);
-            return (fetch: FetchAPI = portableFetch, basePath: string = BASE_PATH) => {
-                return fetch(basePath + localVarFetchArgs.url, localVarFetchArgs.options).then((response) => {
-                    if (response.status >= 200 && response.status < 300) {
-                        return response;
-                    } else {
-                        throw response;
-                    }
-                });
-            };
-        },
-        /**
-         * 
-         * @summary uploads an image
-         * @param {number} petId ID of pet to update
-         * @param {string} [additionalMetadata] Additional data to pass to server
-         * @param {any} [file] file to upload
-         * @param {*} [options] Override http request option.
-         * @throws {RequiredError}
-         */
-        uploadFile(petId: number, additionalMetadata?: string, file?: any, options?: any): (fetch?: FetchAPI, basePath?: string) => Promise<ApiResponse> {
-            const localVarFetchArgs = PetApiFetchParamCreator(configuration).uploadFile(petId, additionalMetadata, file, options);
-            return (fetch: FetchAPI = portableFetch, basePath: string = BASE_PATH) => {
-                return fetch(basePath + localVarFetchArgs.url, localVarFetchArgs.options).then((response) => {
-                    if (response.status >= 200 && response.status < 300) {
-                        return response.json();
-                    } else {
-                        throw response;
-                    }
-                });
-            };
-        },
-    }
-};
-
-/**
- * PetApi - factory interface
- * @export
- */
-export const PetApiFactory = function (configuration?: Configuration, fetch?: FetchAPI, basePath?: string) {
-    return {
-        /**
-         * 
-         * @summary Add a new pet to the store
-         * @param {Pet} pet Pet object that needs to be added to the store
-         * @param {*} [options] Override http request option.
-         * @throws {RequiredError}
-         */
-        addPet(pet: Pet, options?: any) {
-            return PetApiFp(configuration).addPet(pet, options)(fetch, basePath);
-        },
-        /**
-         * 
-         * @summary Deletes a pet
-         * @param {number} petId Pet id to delete
-         * @param {string} [apiKey] 
-         * @param {*} [options] Override http request option.
-         * @throws {RequiredError}
-         */
-        deletePet(petId: number, apiKey?: string, options?: any) {
-            return PetApiFp(configuration).deletePet(petId, apiKey, options)(fetch, basePath);
-        },
-        /**
-         * Multiple status values can be provided with comma separated strings
-         * @summary Finds Pets by status
-         * @param {Array<'available' | 'pending' | 'sold'>} status Status values that need to be considered for filter
-         * @param {*} [options] Override http request option.
-         * @throws {RequiredError}
-         */
-        findPetsByStatus(status: Array<'available' | 'pending' | 'sold'>, options?: any) {
-            return PetApiFp(configuration).findPetsByStatus(status, options)(fetch, basePath);
-        },
-        /**
-         * Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3 for testing.
-         * @summary Finds Pets by tags
-         * @param {Array<string>} tags Tags to filter by
-         * @param {*} [options] Override http request option.
-         * @throws {RequiredError}
-         */
-        findPetsByTags(tags: Array<string>, options?: any) {
-            return PetApiFp(configuration).findPetsByTags(tags, options)(fetch, basePath);
-        },
-        /**
-         * Returns a single pet
-         * @summary Find pet by ID
-         * @param {number} petId ID of pet to return
-         * @param {*} [options] Override http request option.
-         * @throws {RequiredError}
-         */
-        getPetById(petId: number, options?: any) {
-            return PetApiFp(configuration).getPetById(petId, options)(fetch, basePath);
-        },
-        /**
-         * 
-         * @summary Update an existing pet
-         * @param {Pet} pet Pet object that needs to be added to the store
-         * @param {*} [options] Override http request option.
-         * @throws {RequiredError}
-         */
-        updatePet(pet: Pet, options?: any) {
-            return PetApiFp(configuration).updatePet(pet, options)(fetch, basePath);
-        },
-        /**
-         * 
-         * @summary Updates a pet in the store with form data
-         * @param {number} petId ID of pet that needs to be updated
-         * @param {string} [name] Updated name of the pet
-         * @param {string} [status] Updated status of the pet
-         * @param {*} [options] Override http request option.
-         * @throws {RequiredError}
-         */
-        updatePetWithForm(petId: number, name?: string, status?: string, options?: any) {
-            return PetApiFp(configuration).updatePetWithForm(petId, name, status, options)(fetch, basePath);
-        },
-        /**
-         * 
-         * @summary uploads an image
-         * @param {number} petId ID of pet to update
-         * @param {string} [additionalMetadata] Additional data to pass to server
-         * @param {any} [file] file to upload
-         * @param {*} [options] Override http request option.
-         * @throws {RequiredError}
-         */
-        uploadFile(petId: number, additionalMetadata?: string, file?: any, options?: any) {
-            return PetApiFp(configuration).uploadFile(petId, additionalMetadata, file, options)(fetch, basePath);
-        },
-    };
-};
-
-/**
- * PetApi - object-oriented interface
- * @export
- * @class PetApi
- * @extends {BaseAPI}
- */
-export class PetApi extends BaseAPI {
-    /**
-     * 
-     * @summary Add a new pet to the store
-     * @param {Pet} pet Pet object that needs to be added to the store
-     * @param {*} [options] Override http request option.
-     * @throws {RequiredError}
-     * @memberof PetApi
-     */
-    public addPet(pet: Pet, options?: any) {
-        return PetApiFp(this.configuration).addPet(pet, options)(this.fetch, this.basePath);
-    }
-
-    /**
-     * 
-     * @summary Deletes a pet
-     * @param {number} petId Pet id to delete
-     * @param {string} [apiKey] 
-     * @param {*} [options] Override http request option.
-     * @throws {RequiredError}
-     * @memberof PetApi
-     */
-    public deletePet(petId: number, apiKey?: string, options?: any) {
-        return PetApiFp(this.configuration).deletePet(petId, apiKey, options)(this.fetch, this.basePath);
-    }
-
-    /**
-     * Multiple status values can be provided with comma separated strings
-     * @summary Finds Pets by status
-     * @param {Array<'available' | 'pending' | 'sold'>} status Status values that need to be considered for filter
-     * @param {*} [options] Override http request option.
-     * @throws {RequiredError}
-     * @memberof PetApi
-     */
-    public findPetsByStatus(status: Array<'available' | 'pending' | 'sold'>, options?: any) {
-        return PetApiFp(this.configuration).findPetsByStatus(status, options)(this.fetch, this.basePath);
-    }
-
-    /**
-     * Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3 for testing.
-     * @summary Finds Pets by tags
-     * @param {Array<string>} tags Tags to filter by
-     * @param {*} [options] Override http request option.
-     * @throws {RequiredError}
-     * @memberof PetApi
-     */
-    public findPetsByTags(tags: Array<string>, options?: any) {
-        return PetApiFp(this.configuration).findPetsByTags(tags, options)(this.fetch, this.basePath);
-    }
-
-    /**
-     * Returns a single pet
-     * @summary Find pet by ID
-     * @param {number} petId ID of pet to return
-     * @param {*} [options] Override http request option.
-     * @throws {RequiredError}
-     * @memberof PetApi
-     */
-    public getPetById(petId: number, options?: any) {
-        return PetApiFp(this.configuration).getPetById(petId, options)(this.fetch, this.basePath);
-    }
-
-    /**
-     * 
-     * @summary Update an existing pet
-     * @param {Pet} pet Pet object that needs to be added to the store
-     * @param {*} [options] Override http request option.
-     * @throws {RequiredError}
-     * @memberof PetApi
-     */
-    public updatePet(pet: Pet, options?: any) {
-        return PetApiFp(this.configuration).updatePet(pet, options)(this.fetch, this.basePath);
-    }
-
-    /**
-     * 
-     * @summary Updates a pet in the store with form data
-     * @param {number} petId ID of pet that needs to be updated
-     * @param {string} [name] Updated name of the pet
-     * @param {string} [status] Updated status of the pet
-     * @param {*} [options] Override http request option.
-     * @throws {RequiredError}
-     * @memberof PetApi
-     */
-    public updatePetWithForm(petId: number, name?: string, status?: string, options?: any) {
-        return PetApiFp(this.configuration).updatePetWithForm(petId, name, status, options)(this.fetch, this.basePath);
-    }
-
-    /**
-     * 
-     * @summary uploads an image
-     * @param {number} petId ID of pet to update
-     * @param {string} [additionalMetadata] Additional data to pass to server
-     * @param {any} [file] file to upload
-     * @param {*} [options] Override http request option.
-     * @throws {RequiredError}
-     * @memberof PetApi
-     */
-    public uploadFile(petId: number, additionalMetadata?: string, file?: any, options?: any) {
-        return PetApiFp(this.configuration).uploadFile(petId, additionalMetadata, file, options)(this.fetch, this.basePath);
-    }
-
-}
-
-/**
- * StoreApi - fetch parameter creator
- * @export
- */
-export const StoreApiFetchParamCreator = function (configuration?: Configuration) {
-    return {
-        /**
-         * For valid response try integer IDs with value < 1000. Anything above 1000 or nonintegers will generate API errors
-         * @summary Delete purchase order by ID
-         * @param {string} orderId ID of the order that needs to be deleted
-         * @param {*} [options] Override http request option.
-         * @throws {RequiredError}
-         */
-        deleteOrder(orderId: string, options: any = {}): FetchArgs {
-            // verify required parameter 'orderId' is not null or undefined
-            if (orderId === null || orderId === undefined) {
-                throw new RequiredError('orderId','Required parameter orderId was null or undefined when calling deleteOrder.');
-            }
-            const localVarPath = `/store/order/{orderId}`
-                .replace(`{${"orderId"}}`, encodeURIComponent(String(orderId)));
-            const localVarUrlObj = url.parse(localVarPath, true);
-            const localVarRequestOptions = Object.assign({ method: 'DELETE' }, options);
-            const localVarHeaderParameter = {} as any;
-            const localVarQueryParameter = {} as any;
-
-            localVarUrlObj.query = Object.assign({}, localVarUrlObj.query, localVarQueryParameter, options.query);
-            // fix override query string Detail: https://stackoverflow.com/a/7517673/1077943
-            delete localVarUrlObj.search;
-            localVarRequestOptions.headers = Object.assign({}, localVarHeaderParameter, options.headers);
-
-            return {
-                url: url.format(localVarUrlObj),
-                options: localVarRequestOptions,
-            };
-        },
-        /**
-         * Returns a map of status codes to quantities
-         * @summary Returns pet inventories by status
-         * @param {*} [options] Override http request option.
-         * @throws {RequiredError}
-         */
-        getInventory(options: any = {}): FetchArgs {
-            const localVarPath = `/store/inventory`;
-            const localVarUrlObj = url.parse(localVarPath, true);
-            const localVarRequestOptions = Object.assign({ method: 'GET' }, options);
-            const localVarHeaderParameter = {} as any;
-            const localVarQueryParameter = {} as any;
-
-            // authentication api_key required
-            if (configuration && configuration.apiKey) {
-                const localVarApiKeyValue = typeof configuration.apiKey === 'function'
-					? configuration.apiKey("api_key")
-					: configuration.apiKey;
-                localVarHeaderParameter["api_key"] = localVarApiKeyValue;
-            }
-
-            localVarUrlObj.query = Object.assign({}, localVarUrlObj.query, localVarQueryParameter, options.query);
-            // fix override query string Detail: https://stackoverflow.com/a/7517673/1077943
-            delete localVarUrlObj.search;
-            localVarRequestOptions.headers = Object.assign({}, localVarHeaderParameter, options.headers);
-
-            return {
-                url: url.format(localVarUrlObj),
-                options: localVarRequestOptions,
-            };
-        },
-        /**
-         * For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
-         * @summary Find purchase order by ID
-         * @param {number} orderId ID of pet that needs to be fetched
-         * @param {*} [options] Override http request option.
-         * @throws {RequiredError}
-         */
-        getOrderById(orderId: number, options: any = {}): FetchArgs {
-            // verify required parameter 'orderId' is not null or undefined
-            if (orderId === null || orderId === undefined) {
-                throw new RequiredError('orderId','Required parameter orderId was null or undefined when calling getOrderById.');
-            }
-            const localVarPath = `/store/order/{orderId}`
-                .replace(`{${"orderId"}}`, encodeURIComponent(String(orderId)));
-            const localVarUrlObj = url.parse(localVarPath, true);
-            const localVarRequestOptions = Object.assign({ method: 'GET' }, options);
-            const localVarHeaderParameter = {} as any;
-            const localVarQueryParameter = {} as any;
-
-            localVarUrlObj.query = Object.assign({}, localVarUrlObj.query, localVarQueryParameter, options.query);
-            // fix override query string Detail: https://stackoverflow.com/a/7517673/1077943
-            delete localVarUrlObj.search;
-            localVarRequestOptions.headers = Object.assign({}, localVarHeaderParameter, options.headers);
-
-            return {
-                url: url.format(localVarUrlObj),
-                options: localVarRequestOptions,
-            };
-        },
-        /**
-         * 
-         * @summary Place an order for a pet
-         * @param {Order} order order placed for purchasing the pet
-         * @param {*} [options] Override http request option.
-         * @throws {RequiredError}
-         */
-        placeOrder(order: Order, options: any = {}): FetchArgs {
-            // verify required parameter 'order' is not null or undefined
-            if (order === null || order === undefined) {
-                throw new RequiredError('order','Required parameter order was null or undefined when calling placeOrder.');
-            }
-            const localVarPath = `/store/order`;
-            const localVarUrlObj = url.parse(localVarPath, true);
-            const localVarRequestOptions = Object.assign({ method: 'POST' }, options);
-            const localVarHeaderParameter = {} as any;
-            const localVarQueryParameter = {} as any;
-
-            localVarHeaderParameter['Content-Type'] = 'application/json';
-
-            localVarUrlObj.query = Object.assign({}, localVarUrlObj.query, localVarQueryParameter, options.query);
-            // fix override query string Detail: https://stackoverflow.com/a/7517673/1077943
-            delete localVarUrlObj.search;
-            localVarRequestOptions.headers = Object.assign({}, localVarHeaderParameter, options.headers);
-            const needsSerialization = (<any>"Order" !== "string") || localVarRequestOptions.headers['Content-Type'] === 'application/json';
-            localVarRequestOptions.body =  needsSerialization ? JSON.stringify(order || {}) : (order || "");
-
-            return {
-                url: url.format(localVarUrlObj),
-                options: localVarRequestOptions,
-            };
-        },
-    }
-};
-
-/**
- * StoreApi - functional programming interface
- * @export
- */
-export const StoreApiFp = function(configuration?: Configuration) {
-    return {
-        /**
-         * For valid response try integer IDs with value < 1000. Anything above 1000 or nonintegers will generate API errors
-         * @summary Delete purchase order by ID
-         * @param {string} orderId ID of the order that needs to be deleted
-         * @param {*} [options] Override http request option.
-         * @throws {RequiredError}
-         */
-        deleteOrder(orderId: string, options?: any): (fetch?: FetchAPI, basePath?: string) => Promise<Response> {
-            const localVarFetchArgs = StoreApiFetchParamCreator(configuration).deleteOrder(orderId, options);
-            return (fetch: FetchAPI = portableFetch, basePath: string = BASE_PATH) => {
-                return fetch(basePath + localVarFetchArgs.url, localVarFetchArgs.options).then((response) => {
-                    if (response.status >= 200 && response.status < 300) {
-                        return response;
-                    } else {
-                        throw response;
-                    }
-                });
-            };
-        },
-        /**
-         * Returns a map of status codes to quantities
-         * @summary Returns pet inventories by status
-         * @param {*} [options] Override http request option.
-         * @throws {RequiredError}
-         */
-        getInventory(options?: any): (fetch?: FetchAPI, basePath?: string) => Promise<{ [key: string]: number; }> {
-            const localVarFetchArgs = StoreApiFetchParamCreator(configuration).getInventory(options);
-            return (fetch: FetchAPI = portableFetch, basePath: string = BASE_PATH) => {
-                return fetch(basePath + localVarFetchArgs.url, localVarFetchArgs.options).then((response) => {
-                    if (response.status >= 200 && response.status < 300) {
-                        return response.json();
-                    } else {
-                        throw response;
-                    }
-                });
-            };
-        },
-        /**
-         * For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
-         * @summary Find purchase order by ID
-         * @param {number} orderId ID of pet that needs to be fetched
-         * @param {*} [options] Override http request option.
-         * @throws {RequiredError}
-         */
-        getOrderById(orderId: number, options?: any): (fetch?: FetchAPI, basePath?: string) => Promise<Order> {
-            const localVarFetchArgs = StoreApiFetchParamCreator(configuration).getOrderById(orderId, options);
-            return (fetch: FetchAPI = portableFetch, basePath: string = BASE_PATH) => {
-                return fetch(basePath + localVarFetchArgs.url, localVarFetchArgs.options).then((response) => {
-                    if (response.status >= 200 && response.status < 300) {
-                        return response.json();
-                    } else {
-                        throw response;
-                    }
-                });
-            };
-        },
-        /**
-         * 
-         * @summary Place an order for a pet
-         * @param {Order} order order placed for purchasing the pet
-         * @param {*} [options] Override http request option.
-         * @throws {RequiredError}
-         */
-        placeOrder(order: Order, options?: any): (fetch?: FetchAPI, basePath?: string) => Promise<Order> {
-            const localVarFetchArgs = StoreApiFetchParamCreator(configuration).placeOrder(order, options);
-            return (fetch: FetchAPI = portableFetch, basePath: string = BASE_PATH) => {
-                return fetch(basePath + localVarFetchArgs.url, localVarFetchArgs.options).then((response) => {
-                    if (response.status >= 200 && response.status < 300) {
-                        return response.json();
-                    } else {
-                        throw response;
-                    }
-                });
-            };
-        },
-    }
-};
-
-/**
- * StoreApi - factory interface
- * @export
- */
-export const StoreApiFactory = function (configuration?: Configuration, fetch?: FetchAPI, basePath?: string) {
-    return {
-        /**
-         * For valid response try integer IDs with value < 1000. Anything above 1000 or nonintegers will generate API errors
-         * @summary Delete purchase order by ID
-         * @param {string} orderId ID of the order that needs to be deleted
-         * @param {*} [options] Override http request option.
-         * @throws {RequiredError}
-         */
-        deleteOrder(orderId: string, options?: any) {
-            return StoreApiFp(configuration).deleteOrder(orderId, options)(fetch, basePath);
-        },
-        /**
-         * Returns a map of status codes to quantities
-         * @summary Returns pet inventories by status
-         * @param {*} [options] Override http request option.
-         * @throws {RequiredError}
-         */
-        getInventory(options?: any) {
-            return StoreApiFp(configuration).getInventory(options)(fetch, basePath);
-        },
-        /**
-         * For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
-         * @summary Find purchase order by ID
-         * @param {number} orderId ID of pet that needs to be fetched
-         * @param {*} [options] Override http request option.
-         * @throws {RequiredError}
-         */
-        getOrderById(orderId: number, options?: any) {
-            return StoreApiFp(configuration).getOrderById(orderId, options)(fetch, basePath);
-        },
-        /**
-         * 
-         * @summary Place an order for a pet
-         * @param {Order} order order placed for purchasing the pet
-         * @param {*} [options] Override http request option.
-         * @throws {RequiredError}
-         */
-        placeOrder(order: Order, options?: any) {
-            return StoreApiFp(configuration).placeOrder(order, options)(fetch, basePath);
-        },
-    };
-};
-
-/**
- * StoreApi - object-oriented interface
- * @export
- * @class StoreApi
- * @extends {BaseAPI}
- */
-export class StoreApi extends BaseAPI {
-    /**
-     * For valid response try integer IDs with value < 1000. Anything above 1000 or nonintegers will generate API errors
-     * @summary Delete purchase order by ID
-     * @param {string} orderId ID of the order that needs to be deleted
-     * @param {*} [options] Override http request option.
-     * @throws {RequiredError}
-     * @memberof StoreApi
-     */
-    public deleteOrder(orderId: string, options?: any) {
-        return StoreApiFp(this.configuration).deleteOrder(orderId, options)(this.fetch, this.basePath);
-    }
-
-    /**
-     * Returns a map of status codes to quantities
-     * @summary Returns pet inventories by status
-     * @param {*} [options] Override http request option.
-     * @throws {RequiredError}
-     * @memberof StoreApi
-     */
-    public getInventory(options?: any) {
-        return StoreApiFp(this.configuration).getInventory(options)(this.fetch, this.basePath);
-    }
-
-    /**
-     * For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
-     * @summary Find purchase order by ID
-     * @param {number} orderId ID of pet that needs to be fetched
-     * @param {*} [options] Override http request option.
-     * @throws {RequiredError}
-     * @memberof StoreApi
-     */
-    public getOrderById(orderId: number, options?: any) {
-        return StoreApiFp(this.configuration).getOrderById(orderId, options)(this.fetch, this.basePath);
-    }
-
-    /**
-     * 
-     * @summary Place an order for a pet
-     * @param {Order} order order placed for purchasing the pet
-     * @param {*} [options] Override http request option.
-     * @throws {RequiredError}
-     * @memberof StoreApi
-     */
-    public placeOrder(order: Order, options?: any) {
-        return StoreApiFp(this.configuration).placeOrder(order, options)(this.fetch, this.basePath);
-    }
-
-}
-
-/**
- * UserApi - fetch parameter creator
- * @export
- */
-export const UserApiFetchParamCreator = function (configuration?: Configuration) {
-    return {
-        /**
-         * This can only be done by the logged in user.
-         * @summary Create user
-         * @param {User} user Created user object
-         * @param {*} [options] Override http request option.
-         * @throws {RequiredError}
-         */
-        createUser(user: User, options: any = {}): FetchArgs {
-            // verify required parameter 'user' is not null or undefined
-            if (user === null || user === undefined) {
-                throw new RequiredError('user','Required parameter user was null or undefined when calling createUser.');
-            }
-            const localVarPath = `/user`;
-            const localVarUrlObj = url.parse(localVarPath, true);
-            const localVarRequestOptions = Object.assign({ method: 'POST' }, options);
-            const localVarHeaderParameter = {} as any;
-            const localVarQueryParameter = {} as any;
-
-            localVarHeaderParameter['Content-Type'] = 'application/json';
-
-            localVarUrlObj.query = Object.assign({}, localVarUrlObj.query, localVarQueryParameter, options.query);
-            // fix override query string Detail: https://stackoverflow.com/a/7517673/1077943
-            delete localVarUrlObj.search;
-            localVarRequestOptions.headers = Object.assign({}, localVarHeaderParameter, options.headers);
-            const needsSerialization = (<any>"User" !== "string") || localVarRequestOptions.headers['Content-Type'] === 'application/json';
-            localVarRequestOptions.body =  needsSerialization ? JSON.stringify(user || {}) : (user || "");
-
-            return {
-                url: url.format(localVarUrlObj),
-                options: localVarRequestOptions,
-            };
-        },
-        /**
-         * 
-         * @summary Creates list of users with given input array
-         * @param {Array<User>} user List of user object
-         * @param {*} [options] Override http request option.
-         * @throws {RequiredError}
-         */
-        createUsersWithArrayInput(user: Array<User>, options: any = {}): FetchArgs {
-            // verify required parameter 'user' is not null or undefined
-            if (user === null || user === undefined) {
-                throw new RequiredError('user','Required parameter user was null or undefined when calling createUsersWithArrayInput.');
-            }
-            const localVarPath = `/user/createWithArray`;
-            const localVarUrlObj = url.parse(localVarPath, true);
-            const localVarRequestOptions = Object.assign({ method: 'POST' }, options);
-            const localVarHeaderParameter = {} as any;
-            const localVarQueryParameter = {} as any;
-
-            localVarHeaderParameter['Content-Type'] = 'application/json';
-
-            localVarUrlObj.query = Object.assign({}, localVarUrlObj.query, localVarQueryParameter, options.query);
-            // fix override query string Detail: https://stackoverflow.com/a/7517673/1077943
-            delete localVarUrlObj.search;
-            localVarRequestOptions.headers = Object.assign({}, localVarHeaderParameter, options.headers);
-            const needsSerialization = (<any>"Array&lt;User&gt;" !== "string") || localVarRequestOptions.headers['Content-Type'] === 'application/json';
-            localVarRequestOptions.body =  needsSerialization ? JSON.stringify(user || {}) : (user || "");
-
-            return {
-                url: url.format(localVarUrlObj),
-                options: localVarRequestOptions,
-            };
-        },
-        /**
-         * 
-         * @summary Creates list of users with given input array
-         * @param {Array<User>} user List of user object
-         * @param {*} [options] Override http request option.
-         * @throws {RequiredError}
-         */
-        createUsersWithListInput(user: Array<User>, options: any = {}): FetchArgs {
-            // verify required parameter 'user' is not null or undefined
-            if (user === null || user === undefined) {
-                throw new RequiredError('user','Required parameter user was null or undefined when calling createUsersWithListInput.');
-            }
-            const localVarPath = `/user/createWithList`;
-            const localVarUrlObj = url.parse(localVarPath, true);
-            const localVarRequestOptions = Object.assign({ method: 'POST' }, options);
-            const localVarHeaderParameter = {} as any;
-            const localVarQueryParameter = {} as any;
-
-            localVarHeaderParameter['Content-Type'] = 'application/json';
-
-            localVarUrlObj.query = Object.assign({}, localVarUrlObj.query, localVarQueryParameter, options.query);
-            // fix override query string Detail: https://stackoverflow.com/a/7517673/1077943
-            delete localVarUrlObj.search;
-            localVarRequestOptions.headers = Object.assign({}, localVarHeaderParameter, options.headers);
-            const needsSerialization = (<any>"Array&lt;User&gt;" !== "string") || localVarRequestOptions.headers['Content-Type'] === 'application/json';
-            localVarRequestOptions.body =  needsSerialization ? JSON.stringify(user || {}) : (user || "");
-
-            return {
-                url: url.format(localVarUrlObj),
-                options: localVarRequestOptions,
-            };
-        },
-        /**
-         * This can only be done by the logged in user.
-         * @summary Delete user
-         * @param {string} username The name that needs to be deleted
-         * @param {*} [options] Override http request option.
-         * @throws {RequiredError}
-         */
-        deleteUser(username: string, options: any = {}): FetchArgs {
-            // verify required parameter 'username' is not null or undefined
-            if (username === null || username === undefined) {
-                throw new RequiredError('username','Required parameter username was null or undefined when calling deleteUser.');
-            }
-            const localVarPath = `/user/{username}`
-                .replace(`{${"username"}}`, encodeURIComponent(String(username)));
-            const localVarUrlObj = url.parse(localVarPath, true);
-            const localVarRequestOptions = Object.assign({ method: 'DELETE' }, options);
-            const localVarHeaderParameter = {} as any;
-            const localVarQueryParameter = {} as any;
-
-            localVarUrlObj.query = Object.assign({}, localVarUrlObj.query, localVarQueryParameter, options.query);
-            // fix override query string Detail: https://stackoverflow.com/a/7517673/1077943
-            delete localVarUrlObj.search;
-            localVarRequestOptions.headers = Object.assign({}, localVarHeaderParameter, options.headers);
-
-            return {
-                url: url.format(localVarUrlObj),
-                options: localVarRequestOptions,
-            };
-        },
-        /**
-         * 
-         * @summary Get user by user name
-         * @param {string} username The name that needs to be fetched. Use user1 for testing.
-         * @param {*} [options] Override http request option.
-         * @throws {RequiredError}
-         */
-        getUserByName(username: string, options: any = {}): FetchArgs {
-            // verify required parameter 'username' is not null or undefined
-            if (username === null || username === undefined) {
-                throw new RequiredError('username','Required parameter username was null or undefined when calling getUserByName.');
-            }
-            const localVarPath = `/user/{username}`
-                .replace(`{${"username"}}`, encodeURIComponent(String(username)));
-            const localVarUrlObj = url.parse(localVarPath, true);
-            const localVarRequestOptions = Object.assign({ method: 'GET' }, options);
-            const localVarHeaderParameter = {} as any;
-            const localVarQueryParameter = {} as any;
-
-            localVarUrlObj.query = Object.assign({}, localVarUrlObj.query, localVarQueryParameter, options.query);
-            // fix override query string Detail: https://stackoverflow.com/a/7517673/1077943
-            delete localVarUrlObj.search;
-            localVarRequestOptions.headers = Object.assign({}, localVarHeaderParameter, options.headers);
-
-            return {
-                url: url.format(localVarUrlObj),
-                options: localVarRequestOptions,
-            };
-        },
-        /**
-         * 
-         * @summary Logs user into the system
-         * @param {string} username The user name for login
-         * @param {string} password The password for login in clear text
-         * @param {*} [options] Override http request option.
-         * @throws {RequiredError}
-         */
-        loginUser(username: string, password: string, options: any = {}): FetchArgs {
-            // verify required parameter 'username' is not null or undefined
-            if (username === null || username === undefined) {
-                throw new RequiredError('username','Required parameter username was null or undefined when calling loginUser.');
-            }
-            // verify required parameter 'password' is not null or undefined
-            if (password === null || password === undefined) {
-                throw new RequiredError('password','Required parameter password was null or undefined when calling loginUser.');
-            }
-            const localVarPath = `/user/login`;
-            const localVarUrlObj = url.parse(localVarPath, true);
-            const localVarRequestOptions = Object.assign({ method: 'GET' }, options);
-            const localVarHeaderParameter = {} as any;
-            const localVarQueryParameter = {} as any;
-
-            if (username !== undefined) {
-                localVarQueryParameter['username'] = username;
-            }
-
-            if (password !== undefined) {
-                localVarQueryParameter['password'] = password;
-            }
-
-            localVarUrlObj.query = Object.assign({}, localVarUrlObj.query, localVarQueryParameter, options.query);
-            // fix override query string Detail: https://stackoverflow.com/a/7517673/1077943
-            delete localVarUrlObj.search;
-            localVarRequestOptions.headers = Object.assign({}, localVarHeaderParameter, options.headers);
-
-            return {
-                url: url.format(localVarUrlObj),
-                options: localVarRequestOptions,
-            };
-        },
-        /**
-         * 
-         * @summary Logs out current logged in user session
-         * @param {*} [options] Override http request option.
-         * @throws {RequiredError}
-         */
-        logoutUser(options: any = {}): FetchArgs {
-            const localVarPath = `/user/logout`;
-            const localVarUrlObj = url.parse(localVarPath, true);
-            const localVarRequestOptions = Object.assign({ method: 'GET' }, options);
-            const localVarHeaderParameter = {} as any;
-            const localVarQueryParameter = {} as any;
-
-            localVarUrlObj.query = Object.assign({}, localVarUrlObj.query, localVarQueryParameter, options.query);
-            // fix override query string Detail: https://stackoverflow.com/a/7517673/1077943
-            delete localVarUrlObj.search;
-            localVarRequestOptions.headers = Object.assign({}, localVarHeaderParameter, options.headers);
-
-            return {
-                url: url.format(localVarUrlObj),
-                options: localVarRequestOptions,
-            };
-        },
-        /**
-         * This can only be done by the logged in user.
-         * @summary Updated user
-         * @param {string} username name that need to be deleted
-         * @param {User} user Updated user object
-         * @param {*} [options] Override http request option.
-         * @throws {RequiredError}
-         */
-        updateUser(username: string, user: User, options: any = {}): FetchArgs {
-            // verify required parameter 'username' is not null or undefined
-            if (username === null || username === undefined) {
-                throw new RequiredError('username','Required parameter username was null or undefined when calling updateUser.');
-            }
-            // verify required parameter 'user' is not null or undefined
-            if (user === null || user === undefined) {
-                throw new RequiredError('user','Required parameter user was null or undefined when calling updateUser.');
-            }
-            const localVarPath = `/user/{username}`
-                .replace(`{${"username"}}`, encodeURIComponent(String(username)));
-            const localVarUrlObj = url.parse(localVarPath, true);
-            const localVarRequestOptions = Object.assign({ method: 'PUT' }, options);
-            const localVarHeaderParameter = {} as any;
-            const localVarQueryParameter = {} as any;
-
-            localVarHeaderParameter['Content-Type'] = 'application/json';
-
-            localVarUrlObj.query = Object.assign({}, localVarUrlObj.query, localVarQueryParameter, options.query);
-            // fix override query string Detail: https://stackoverflow.com/a/7517673/1077943
-            delete localVarUrlObj.search;
-            localVarRequestOptions.headers = Object.assign({}, localVarHeaderParameter, options.headers);
-            const needsSerialization = (<any>"User" !== "string") || localVarRequestOptions.headers['Content-Type'] === 'application/json';
-            localVarRequestOptions.body =  needsSerialization ? JSON.stringify(user || {}) : (user || "");
-
-            return {
-                url: url.format(localVarUrlObj),
-                options: localVarRequestOptions,
-            };
-        },
-    }
-};
-
-/**
- * UserApi - functional programming interface
- * @export
- */
-export const UserApiFp = function(configuration?: Configuration) {
-    return {
-        /**
-         * This can only be done by the logged in user.
-         * @summary Create user
-         * @param {User} user Created user object
-         * @param {*} [options] Override http request option.
-         * @throws {RequiredError}
-         */
-        createUser(user: User, options?: any): (fetch?: FetchAPI, basePath?: string) => Promise<Response> {
-            const localVarFetchArgs = UserApiFetchParamCreator(configuration).createUser(user, options);
-            return (fetch: FetchAPI = portableFetch, basePath: string = BASE_PATH) => {
-                return fetch(basePath + localVarFetchArgs.url, localVarFetchArgs.options).then((response) => {
-                    if (response.status >= 200 && response.status < 300) {
-                        return response;
-                    } else {
-                        throw response;
-                    }
-                });
-            };
-        },
-        /**
-         * 
-         * @summary Creates list of users with given input array
-         * @param {Array<User>} user List of user object
-         * @param {*} [options] Override http request option.
-         * @throws {RequiredError}
-         */
-        createUsersWithArrayInput(user: Array<User>, options?: any): (fetch?: FetchAPI, basePath?: string) => Promise<Response> {
-            const localVarFetchArgs = UserApiFetchParamCreator(configuration).createUsersWithArrayInput(user, options);
-            return (fetch: FetchAPI = portableFetch, basePath: string = BASE_PATH) => {
-                return fetch(basePath + localVarFetchArgs.url, localVarFetchArgs.options).then((response) => {
-                    if (response.status >= 200 && response.status < 300) {
-                        return response;
-                    } else {
-                        throw response;
-                    }
-                });
-            };
-        },
-        /**
-         * 
-         * @summary Creates list of users with given input array
-         * @param {Array<User>} user List of user object
-         * @param {*} [options] Override http request option.
-         * @throws {RequiredError}
-         */
-        createUsersWithListInput(user: Array<User>, options?: any): (fetch?: FetchAPI, basePath?: string) => Promise<Response> {
-            const localVarFetchArgs = UserApiFetchParamCreator(configuration).createUsersWithListInput(user, options);
-            return (fetch: FetchAPI = portableFetch, basePath: string = BASE_PATH) => {
-                return fetch(basePath + localVarFetchArgs.url, localVarFetchArgs.options).then((response) => {
-                    if (response.status >= 200 && response.status < 300) {
-                        return response;
-                    } else {
-                        throw response;
-                    }
-                });
-            };
-        },
-        /**
-         * This can only be done by the logged in user.
-         * @summary Delete user
-         * @param {string} username The name that needs to be deleted
-         * @param {*} [options] Override http request option.
-         * @throws {RequiredError}
-         */
-        deleteUser(username: string, options?: any): (fetch?: FetchAPI, basePath?: string) => Promise<Response> {
-            const localVarFetchArgs = UserApiFetchParamCreator(configuration).deleteUser(username, options);
-            return (fetch: FetchAPI = portableFetch, basePath: string = BASE_PATH) => {
-                return fetch(basePath + localVarFetchArgs.url, localVarFetchArgs.options).then((response) => {
-                    if (response.status >= 200 && response.status < 300) {
-                        return response;
-                    } else {
-                        throw response;
-                    }
-                });
-            };
-        },
-        /**
-         * 
-         * @summary Get user by user name
-         * @param {string} username The name that needs to be fetched. Use user1 for testing.
-         * @param {*} [options] Override http request option.
-         * @throws {RequiredError}
-         */
-        getUserByName(username: string, options?: any): (fetch?: FetchAPI, basePath?: string) => Promise<User> {
-            const localVarFetchArgs = UserApiFetchParamCreator(configuration).getUserByName(username, options);
-            return (fetch: FetchAPI = portableFetch, basePath: string = BASE_PATH) => {
-                return fetch(basePath + localVarFetchArgs.url, localVarFetchArgs.options).then((response) => {
-                    if (response.status >= 200 && response.status < 300) {
-                        return response.json();
-                    } else {
-                        throw response;
-                    }
-                });
-            };
-        },
-        /**
-         * 
-         * @summary Logs user into the system
-         * @param {string} username The user name for login
-         * @param {string} password The password for login in clear text
-         * @param {*} [options] Override http request option.
-         * @throws {RequiredError}
-         */
-        loginUser(username: string, password: string, options?: any): (fetch?: FetchAPI, basePath?: string) => Promise<string> {
-            const localVarFetchArgs = UserApiFetchParamCreator(configuration).loginUser(username, password, options);
-            return (fetch: FetchAPI = portableFetch, basePath: string = BASE_PATH) => {
-                return fetch(basePath + localVarFetchArgs.url, localVarFetchArgs.options).then((response) => {
-                    if (response.status >= 200 && response.status < 300) {
-                        return response.json();
-                    } else {
-                        throw response;
-                    }
-                });
-            };
-        },
-        /**
-         * 
-         * @summary Logs out current logged in user session
-         * @param {*} [options] Override http request option.
-         * @throws {RequiredError}
-         */
-        logoutUser(options?: any): (fetch?: FetchAPI, basePath?: string) => Promise<Response> {
-            const localVarFetchArgs = UserApiFetchParamCreator(configuration).logoutUser(options);
-            return (fetch: FetchAPI = portableFetch, basePath: string = BASE_PATH) => {
-                return fetch(basePath + localVarFetchArgs.url, localVarFetchArgs.options).then((response) => {
-                    if (response.status >= 200 && response.status < 300) {
-                        return response;
-                    } else {
-                        throw response;
-                    }
-                });
-            };
-        },
-        /**
-         * This can only be done by the logged in user.
-         * @summary Updated user
-         * @param {string} username name that need to be deleted
-         * @param {User} user Updated user object
-         * @param {*} [options] Override http request option.
-         * @throws {RequiredError}
-         */
-        updateUser(username: string, user: User, options?: any): (fetch?: FetchAPI, basePath?: string) => Promise<Response> {
-            const localVarFetchArgs = UserApiFetchParamCreator(configuration).updateUser(username, user, options);
-            return (fetch: FetchAPI = portableFetch, basePath: string = BASE_PATH) => {
-                return fetch(basePath + localVarFetchArgs.url, localVarFetchArgs.options).then((response) => {
-                    if (response.status >= 200 && response.status < 300) {
-                        return response;
-                    } else {
-                        throw response;
-                    }
-                });
-            };
-        },
-    }
-};
-
-/**
- * UserApi - factory interface
- * @export
- */
-export const UserApiFactory = function (configuration?: Configuration, fetch?: FetchAPI, basePath?: string) {
-    return {
-        /**
-         * This can only be done by the logged in user.
-         * @summary Create user
-         * @param {User} user Created user object
-         * @param {*} [options] Override http request option.
-         * @throws {RequiredError}
-         */
-        createUser(user: User, options?: any) {
-            return UserApiFp(configuration).createUser(user, options)(fetch, basePath);
-        },
-        /**
-         * 
-         * @summary Creates list of users with given input array
-         * @param {Array<User>} user List of user object
-         * @param {*} [options] Override http request option.
-         * @throws {RequiredError}
-         */
-        createUsersWithArrayInput(user: Array<User>, options?: any) {
-            return UserApiFp(configuration).createUsersWithArrayInput(user, options)(fetch, basePath);
-        },
-        /**
-         * 
-         * @summary Creates list of users with given input array
-         * @param {Array<User>} user List of user object
-         * @param {*} [options] Override http request option.
-         * @throws {RequiredError}
-         */
-        createUsersWithListInput(user: Array<User>, options?: any) {
-            return UserApiFp(configuration).createUsersWithListInput(user, options)(fetch, basePath);
-        },
-        /**
-         * This can only be done by the logged in user.
-         * @summary Delete user
-         * @param {string} username The name that needs to be deleted
-         * @param {*} [options] Override http request option.
-         * @throws {RequiredError}
-         */
-        deleteUser(username: string, options?: any) {
-            return UserApiFp(configuration).deleteUser(username, options)(fetch, basePath);
-        },
-        /**
-         * 
-         * @summary Get user by user name
-         * @param {string} username The name that needs to be fetched. Use user1 for testing.
-         * @param {*} [options] Override http request option.
-         * @throws {RequiredError}
-         */
-        getUserByName(username: string, options?: any) {
-            return UserApiFp(configuration).getUserByName(username, options)(fetch, basePath);
-        },
-        /**
-         * 
-         * @summary Logs user into the system
-         * @param {string} username The user name for login
-         * @param {string} password The password for login in clear text
-         * @param {*} [options] Override http request option.
-         * @throws {RequiredError}
-         */
-        loginUser(username: string, password: string, options?: any) {
-            return UserApiFp(configuration).loginUser(username, password, options)(fetch, basePath);
-        },
-        /**
-         * 
-         * @summary Logs out current logged in user session
-         * @param {*} [options] Override http request option.
-         * @throws {RequiredError}
-         */
-        logoutUser(options?: any) {
-            return UserApiFp(configuration).logoutUser(options)(fetch, basePath);
-        },
-        /**
-         * This can only be done by the logged in user.
-         * @summary Updated user
-         * @param {string} username name that need to be deleted
-         * @param {User} user Updated user object
-         * @param {*} [options] Override http request option.
-         * @throws {RequiredError}
-         */
-        updateUser(username: string, user: User, options?: any) {
-            return UserApiFp(configuration).updateUser(username, user, options)(fetch, basePath);
-        },
-    };
-};
-
-/**
- * UserApi - object-oriented interface
- * @export
- * @class UserApi
- * @extends {BaseAPI}
- */
-export class UserApi extends BaseAPI {
-    /**
-     * This can only be done by the logged in user.
-     * @summary Create user
-     * @param {User} user Created user object
-     * @param {*} [options] Override http request option.
-     * @throws {RequiredError}
-     * @memberof UserApi
-     */
-    public createUser(user: User, options?: any) {
-        return UserApiFp(this.configuration).createUser(user, options)(this.fetch, this.basePath);
-    }
-
-    /**
-     * 
-     * @summary Creates list of users with given input array
-     * @param {Array<User>} user List of user object
-     * @param {*} [options] Override http request option.
-     * @throws {RequiredError}
-     * @memberof UserApi
-     */
-    public createUsersWithArrayInput(user: Array<User>, options?: any) {
-        return UserApiFp(this.configuration).createUsersWithArrayInput(user, options)(this.fetch, this.basePath);
-    }
-
-    /**
-     * 
-     * @summary Creates list of users with given input array
-     * @param {Array<User>} user List of user object
-     * @param {*} [options] Override http request option.
-     * @throws {RequiredError}
-     * @memberof UserApi
-     */
-    public createUsersWithListInput(user: Array<User>, options?: any) {
-        return UserApiFp(this.configuration).createUsersWithListInput(user, options)(this.fetch, this.basePath);
-    }
-
-    /**
-     * This can only be done by the logged in user.
-     * @summary Delete user
-     * @param {string} username The name that needs to be deleted
-     * @param {*} [options] Override http request option.
-     * @throws {RequiredError}
-     * @memberof UserApi
-     */
-    public deleteUser(username: string, options?: any) {
-        return UserApiFp(this.configuration).deleteUser(username, options)(this.fetch, this.basePath);
-    }
-
-    /**
-     * 
-     * @summary Get user by user name
-     * @param {string} username The name that needs to be fetched. Use user1 for testing.
-     * @param {*} [options] Override http request option.
-     * @throws {RequiredError}
-     * @memberof UserApi
-     */
-    public getUserByName(username: string, options?: any) {
-        return UserApiFp(this.configuration).getUserByName(username, options)(this.fetch, this.basePath);
-    }
-
-    /**
-     * 
-     * @summary Logs user into the system
-     * @param {string} username The user name for login
-     * @param {string} password The password for login in clear text
-     * @param {*} [options] Override http request option.
-     * @throws {RequiredError}
-     * @memberof UserApi
-     */
-    public loginUser(username: string, password: string, options?: any) {
-        return UserApiFp(this.configuration).loginUser(username, password, options)(this.fetch, this.basePath);
-    }
-
-    /**
-     * 
-     * @summary Logs out current logged in user session
-     * @param {*} [options] Override http request option.
-     * @throws {RequiredError}
-     * @memberof UserApi
-     */
-    public logoutUser(options?: any) {
-        return UserApiFp(this.configuration).logoutUser(options)(this.fetch, this.basePath);
-    }
-
-    /**
-     * This can only be done by the logged in user.
-     * @summary Updated user
-     * @param {string} username name that need to be deleted
-     * @param {User} user Updated user object
-     * @param {*} [options] Override http request option.
-     * @throws {RequiredError}
-     * @memberof UserApi
-     */
-    public updateUser(username: string, user: User, options?: any) {
-        return UserApiFp(this.configuration).updateUser(username, user, options)(this.fetch, this.basePath);
-    }
-
-}
-
diff --git a/samples/client/petstore/typescript-fetch/builds/default/apis/PetApi.ts b/samples/client/petstore/typescript-fetch/builds/default/apis/PetApi.ts
index 1fcb27ef1c..e43896cc29 100644
--- a/samples/client/petstore/typescript-fetch/builds/default/apis/PetApi.ts
+++ b/samples/client/petstore/typescript-fetch/builds/default/apis/PetApi.ts
@@ -98,9 +98,9 @@ export class PetApi extends runtime.BaseAPI {
         return new runtime.VoidApiResponse(response);
     }
 
-    /**
-     * Add a new pet to the store
-     */
+   /**
+    * Add a new pet to the store
+    */
     async addPet(requestParameters: AddPetRequest): Promise<void> {
         await this.addPetRaw(requestParameters);
     }
@@ -140,9 +140,9 @@ export class PetApi extends runtime.BaseAPI {
         return new runtime.VoidApiResponse(response);
     }
 
-    /**
-     * Deletes a pet
-     */
+   /**
+    * Deletes a pet
+    */
     async deletePet(requestParameters: DeletePetRequest): Promise<void> {
         await this.deletePetRaw(requestParameters);
     }
@@ -183,10 +183,10 @@ export class PetApi extends runtime.BaseAPI {
         return new runtime.JSONApiResponse(response, (jsonValue) => jsonValue.map(PetFromJSON));
     }
 
-    /**
-     * Multiple status values can be provided with comma separated strings
-     * Finds Pets by status
-     */
+   /**
+    * Multiple status values can be provided with comma separated strings
+    * Finds Pets by status
+    */
     async findPetsByStatus(requestParameters: FindPetsByStatusRequest): Promise<Array<Pet>> {
         const response = await this.findPetsByStatusRaw(requestParameters);
         return await response.value();
@@ -228,10 +228,10 @@ export class PetApi extends runtime.BaseAPI {
         return new runtime.JSONApiResponse(response, (jsonValue) => jsonValue.map(PetFromJSON));
     }
 
-    /**
-     * Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3 for testing.
-     * Finds Pets by tags
-     */
+   /**
+    * Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3 for testing.
+    * Finds Pets by tags
+    */
     async findPetsByTags(requestParameters: FindPetsByTagsRequest): Promise<Array<Pet>> {
         const response = await this.findPetsByTagsRaw(requestParameters);
         return await response.value();
@@ -264,10 +264,10 @@ export class PetApi extends runtime.BaseAPI {
         return new runtime.JSONApiResponse(response, (jsonValue) => PetFromJSON(jsonValue));
     }
 
-    /**
-     * Returns a single pet
-     * Find pet by ID
-     */
+   /**
+    * Returns a single pet
+    * Find pet by ID
+    */
     async getPetById(requestParameters: GetPetByIdRequest): Promise<Pet> {
         const response = await this.getPetByIdRaw(requestParameters);
         return await response.value();
@@ -307,9 +307,9 @@ export class PetApi extends runtime.BaseAPI {
         return new runtime.VoidApiResponse(response);
     }
 
-    /**
-     * Update an existing pet
-     */
+   /**
+    * Update an existing pet
+    */
     async updatePet(requestParameters: UpdatePetRequest): Promise<void> {
         await this.updatePetRaw(requestParameters);
     }
@@ -355,9 +355,9 @@ export class PetApi extends runtime.BaseAPI {
         return new runtime.VoidApiResponse(response);
     }
 
-    /**
-     * Updates a pet in the store with form data
-     */
+   /**
+    * Updates a pet in the store with form data
+    */
     async updatePetWithForm(requestParameters: UpdatePetWithFormRequest): Promise<void> {
         await this.updatePetWithFormRaw(requestParameters);
     }
@@ -403,9 +403,9 @@ export class PetApi extends runtime.BaseAPI {
         return new runtime.JSONApiResponse(response, (jsonValue) => ModelApiResponseFromJSON(jsonValue));
     }
 
-    /**
-     * uploads an image
-     */
+   /**
+    * uploads an image
+    */
     async uploadFile(requestParameters: UploadFileRequest): Promise<ModelApiResponse> {
         const response = await this.uploadFileRaw(requestParameters);
         return await response.value();
diff --git a/samples/client/petstore/typescript-fetch/builds/default/apis/StoreApi.ts b/samples/client/petstore/typescript-fetch/builds/default/apis/StoreApi.ts
index 4b645dea98..9166609816 100644
--- a/samples/client/petstore/typescript-fetch/builds/default/apis/StoreApi.ts
+++ b/samples/client/petstore/typescript-fetch/builds/default/apis/StoreApi.ts
@@ -59,10 +59,10 @@ export class StoreApi extends runtime.BaseAPI {
         return new runtime.VoidApiResponse(response);
     }
 
-    /**
-     * For valid response try integer IDs with value < 1000. Anything above 1000 or nonintegers will generate API errors
-     * Delete purchase order by ID
-     */
+   /**
+    * For valid response try integer IDs with value < 1000. Anything above 1000 or nonintegers will generate API errors
+    * Delete purchase order by ID
+    */
     async deleteOrder(requestParameters: DeleteOrderRequest): Promise<void> {
         await this.deleteOrderRaw(requestParameters);
     }
@@ -90,10 +90,10 @@ export class StoreApi extends runtime.BaseAPI {
         return new runtime.JSONApiResponse<any>(response);
     }
 
-    /**
-     * Returns a map of status codes to quantities
-     * Returns pet inventories by status
-     */
+   /**
+    * Returns a map of status codes to quantities
+    * Returns pet inventories by status
+    */
     async getInventory(): Promise<{ [key: string]: number; }> {
         const response = await this.getInventoryRaw();
         return await response.value();
@@ -122,10 +122,10 @@ export class StoreApi extends runtime.BaseAPI {
         return new runtime.JSONApiResponse(response, (jsonValue) => OrderFromJSON(jsonValue));
     }
 
-    /**
-     * For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
-     * Find purchase order by ID
-     */
+   /**
+    * For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+    * Find purchase order by ID
+    */
     async getOrderById(requestParameters: GetOrderByIdRequest): Promise<Order> {
         const response = await this.getOrderByIdRaw(requestParameters);
         return await response.value();
@@ -156,9 +156,9 @@ export class StoreApi extends runtime.BaseAPI {
         return new runtime.JSONApiResponse(response, (jsonValue) => OrderFromJSON(jsonValue));
     }
 
-    /**
-     * Place an order for a pet
-     */
+   /**
+    * Place an order for a pet
+    */
     async placeOrder(requestParameters: PlaceOrderRequest): Promise<Order> {
         const response = await this.placeOrderRaw(requestParameters);
         return await response.value();
diff --git a/samples/client/petstore/typescript-fetch/builds/default/apis/UserApi.ts b/samples/client/petstore/typescript-fetch/builds/default/apis/UserApi.ts
index 4126b817ee..1696b600f5 100644
--- a/samples/client/petstore/typescript-fetch/builds/default/apis/UserApi.ts
+++ b/samples/client/petstore/typescript-fetch/builds/default/apis/UserApi.ts
@@ -80,10 +80,10 @@ export class UserApi extends runtime.BaseAPI {
         return new runtime.VoidApiResponse(response);
     }
 
-    /**
-     * This can only be done by the logged in user.
-     * Create user
-     */
+   /**
+    * This can only be done by the logged in user.
+    * Create user
+    */
     async createUser(requestParameters: CreateUserRequest): Promise<void> {
         await this.createUserRaw(requestParameters);
     }
@@ -113,9 +113,9 @@ export class UserApi extends runtime.BaseAPI {
         return new runtime.VoidApiResponse(response);
     }
 
-    /**
-     * Creates list of users with given input array
-     */
+   /**
+    * Creates list of users with given input array
+    */
     async createUsersWithArrayInput(requestParameters: CreateUsersWithArrayInputRequest): Promise<void> {
         await this.createUsersWithArrayInputRaw(requestParameters);
     }
@@ -145,9 +145,9 @@ export class UserApi extends runtime.BaseAPI {
         return new runtime.VoidApiResponse(response);
     }
 
-    /**
-     * Creates list of users with given input array
-     */
+   /**
+    * Creates list of users with given input array
+    */
     async createUsersWithListInput(requestParameters: CreateUsersWithListInputRequest): Promise<void> {
         await this.createUsersWithListInputRaw(requestParameters);
     }
@@ -175,10 +175,10 @@ export class UserApi extends runtime.BaseAPI {
         return new runtime.VoidApiResponse(response);
     }
 
-    /**
-     * This can only be done by the logged in user.
-     * Delete user
-     */
+   /**
+    * This can only be done by the logged in user.
+    * Delete user
+    */
     async deleteUser(requestParameters: DeleteUserRequest): Promise<void> {
         await this.deleteUserRaw(requestParameters);
     }
@@ -205,9 +205,9 @@ export class UserApi extends runtime.BaseAPI {
         return new runtime.JSONApiResponse(response, (jsonValue) => UserFromJSON(jsonValue));
     }
 
-    /**
-     * Get user by user name
-     */
+   /**
+    * Get user by user name
+    */
     async getUserByName(requestParameters: GetUserByNameRequest): Promise<User> {
         const response = await this.getUserByNameRaw(requestParameters);
         return await response.value();
@@ -247,9 +247,9 @@ export class UserApi extends runtime.BaseAPI {
         return new runtime.TextApiResponse(response);
     }
 
-    /**
-     * Logs user into the system
-     */
+   /**
+    * Logs user into the system
+    */
     async loginUser(requestParameters: LoginUserRequest): Promise<string> {
         const response = await this.loginUserRaw(requestParameters);
         return await response.value();
@@ -273,9 +273,9 @@ export class UserApi extends runtime.BaseAPI {
         return new runtime.VoidApiResponse(response);
     }
 
-    /**
-     * Logs out current logged in user session
-     */
+   /**
+    * Logs out current logged in user session
+    */
     async logoutUser(): Promise<void> {
         await this.logoutUserRaw();
     }
@@ -310,10 +310,10 @@ export class UserApi extends runtime.BaseAPI {
         return new runtime.VoidApiResponse(response);
     }
 
-    /**
-     * This can only be done by the logged in user.
-     * Updated user
-     */
+   /**
+    * This can only be done by the logged in user.
+    * Updated user
+    */
     async updateUser(requestParameters: UpdateUserRequest): Promise<void> {
         await this.updateUserRaw(requestParameters);
     }
diff --git a/samples/client/petstore/typescript-fetch/builds/default/models/ApiResponse.ts b/samples/client/petstore/typescript-fetch/builds/default/models/ApiResponse.ts
deleted file mode 100644
index 2275473e61..0000000000
--- a/samples/client/petstore/typescript-fetch/builds/default/models/ApiResponse.ts
+++ /dev/null
@@ -1,60 +0,0 @@
-// tslint:disable
-/**
- * OpenAPI Petstore
- * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters.
- *
- * OpenAPI spec version: 1.0.0
- * 
- *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-import { exists } from '../runtime';
-/**
- * Describes the result of uploading an image resource
- * @export
- * @interface ApiResponse
- */
-export interface ApiResponse {
-    /**
-     * 
-     * @type {number}
-     * @memberof ApiResponse
-     */
-    code?: number;
-    /**
-     * 
-     * @type {string}
-     * @memberof ApiResponse
-     */
-    type?: string;
-    /**
-     * 
-     * @type {string}
-     * @memberof ApiResponse
-     */
-    message?: string;
-}
-
-export function ApiResponseFromJSON(json: any): ApiResponse {
-    return {
-        'code': !exists(json, 'code') ? undefined : json['code'],
-        'type': !exists(json, 'type') ? undefined : json['type'],
-        'message': !exists(json, 'message') ? undefined : json['message'],
-    };
-}
-
-export function ApiResponseToJSON(value?: ApiResponse): any {
-    if (value === undefined) {
-        return undefined;
-    }
-    return {
-        'code': value.code,
-        'type': value.type,
-        'message': value.message,
-    };
-}
-
-
diff --git a/samples/client/petstore/typescript-fetch/builds/default/models/InlineObject.ts b/samples/client/petstore/typescript-fetch/builds/default/models/InlineObject.ts
deleted file mode 100644
index 2998b1463c..0000000000
--- a/samples/client/petstore/typescript-fetch/builds/default/models/InlineObject.ts
+++ /dev/null
@@ -1,52 +0,0 @@
-// tslint:disable
-/**
- * OpenAPI Petstore
- * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters.
- *
- * The version of the OpenAPI document: 1.0.0
- * 
- *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-import { exists, mapValues } from '../runtime';
-/**
- * 
- * @export
- * @interface InlineObject
- */
-export interface InlineObject {
-    /**
-     * Updated name of the pet
-     * @type {string}
-     * @memberof InlineObject
-     */
-    name?: string;
-    /**
-     * Updated status of the pet
-     * @type {string}
-     * @memberof InlineObject
-     */
-    status?: string;
-}
-
-export function InlineObjectFromJSON(json: any): InlineObject {
-    return {
-        'name': !exists(json, 'name') ? undefined : json['name'],
-        'status': !exists(json, 'status') ? undefined : json['status'],
-    };
-}
-
-export function InlineObjectToJSON(value?: InlineObject): any {
-    if (value === undefined) {
-        return undefined;
-    }
-    return {
-        'name': value.name,
-        'status': value.status,
-    };
-}
-
-
diff --git a/samples/client/petstore/typescript-fetch/builds/default/models/InlineObject1.ts b/samples/client/petstore/typescript-fetch/builds/default/models/InlineObject1.ts
deleted file mode 100644
index 4cd90b1379..0000000000
--- a/samples/client/petstore/typescript-fetch/builds/default/models/InlineObject1.ts
+++ /dev/null
@@ -1,52 +0,0 @@
-// tslint:disable
-/**
- * OpenAPI Petstore
- * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters.
- *
- * The version of the OpenAPI document: 1.0.0
- * 
- *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-import { exists, mapValues } from '../runtime';
-/**
- * 
- * @export
- * @interface InlineObject1
- */
-export interface InlineObject1 {
-    /**
-     * Additional data to pass to server
-     * @type {string}
-     * @memberof InlineObject1
-     */
-    additionalMetadata?: string;
-    /**
-     * file to upload
-     * @type {Blob}
-     * @memberof InlineObject1
-     */
-    file?: Blob;
-}
-
-export function InlineObject1FromJSON(json: any): InlineObject1 {
-    return {
-        'additionalMetadata': !exists(json, 'additionalMetadata') ? undefined : json['additionalMetadata'],
-        'file': !exists(json, 'file') ? undefined : json['file'],
-    };
-}
-
-export function InlineObject1ToJSON(value?: InlineObject1): any {
-    if (value === undefined) {
-        return undefined;
-    }
-    return {
-        'additionalMetadata': value.additionalMetadata,
-        'file': value.file,
-    };
-}
-
-
diff --git a/samples/client/petstore/typescript-fetch/builds/es6-target/apis/PetApi.ts b/samples/client/petstore/typescript-fetch/builds/es6-target/apis/PetApi.ts
index 1fcb27ef1c..e43896cc29 100644
--- a/samples/client/petstore/typescript-fetch/builds/es6-target/apis/PetApi.ts
+++ b/samples/client/petstore/typescript-fetch/builds/es6-target/apis/PetApi.ts
@@ -98,9 +98,9 @@ export class PetApi extends runtime.BaseAPI {
         return new runtime.VoidApiResponse(response);
     }
 
-    /**
-     * Add a new pet to the store
-     */
+   /**
+    * Add a new pet to the store
+    */
     async addPet(requestParameters: AddPetRequest): Promise<void> {
         await this.addPetRaw(requestParameters);
     }
@@ -140,9 +140,9 @@ export class PetApi extends runtime.BaseAPI {
         return new runtime.VoidApiResponse(response);
     }
 
-    /**
-     * Deletes a pet
-     */
+   /**
+    * Deletes a pet
+    */
     async deletePet(requestParameters: DeletePetRequest): Promise<void> {
         await this.deletePetRaw(requestParameters);
     }
@@ -183,10 +183,10 @@ export class PetApi extends runtime.BaseAPI {
         return new runtime.JSONApiResponse(response, (jsonValue) => jsonValue.map(PetFromJSON));
     }
 
-    /**
-     * Multiple status values can be provided with comma separated strings
-     * Finds Pets by status
-     */
+   /**
+    * Multiple status values can be provided with comma separated strings
+    * Finds Pets by status
+    */
     async findPetsByStatus(requestParameters: FindPetsByStatusRequest): Promise<Array<Pet>> {
         const response = await this.findPetsByStatusRaw(requestParameters);
         return await response.value();
@@ -228,10 +228,10 @@ export class PetApi extends runtime.BaseAPI {
         return new runtime.JSONApiResponse(response, (jsonValue) => jsonValue.map(PetFromJSON));
     }
 
-    /**
-     * Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3 for testing.
-     * Finds Pets by tags
-     */
+   /**
+    * Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3 for testing.
+    * Finds Pets by tags
+    */
     async findPetsByTags(requestParameters: FindPetsByTagsRequest): Promise<Array<Pet>> {
         const response = await this.findPetsByTagsRaw(requestParameters);
         return await response.value();
@@ -264,10 +264,10 @@ export class PetApi extends runtime.BaseAPI {
         return new runtime.JSONApiResponse(response, (jsonValue) => PetFromJSON(jsonValue));
     }
 
-    /**
-     * Returns a single pet
-     * Find pet by ID
-     */
+   /**
+    * Returns a single pet
+    * Find pet by ID
+    */
     async getPetById(requestParameters: GetPetByIdRequest): Promise<Pet> {
         const response = await this.getPetByIdRaw(requestParameters);
         return await response.value();
@@ -307,9 +307,9 @@ export class PetApi extends runtime.BaseAPI {
         return new runtime.VoidApiResponse(response);
     }
 
-    /**
-     * Update an existing pet
-     */
+   /**
+    * Update an existing pet
+    */
     async updatePet(requestParameters: UpdatePetRequest): Promise<void> {
         await this.updatePetRaw(requestParameters);
     }
@@ -355,9 +355,9 @@ export class PetApi extends runtime.BaseAPI {
         return new runtime.VoidApiResponse(response);
     }
 
-    /**
-     * Updates a pet in the store with form data
-     */
+   /**
+    * Updates a pet in the store with form data
+    */
     async updatePetWithForm(requestParameters: UpdatePetWithFormRequest): Promise<void> {
         await this.updatePetWithFormRaw(requestParameters);
     }
@@ -403,9 +403,9 @@ export class PetApi extends runtime.BaseAPI {
         return new runtime.JSONApiResponse(response, (jsonValue) => ModelApiResponseFromJSON(jsonValue));
     }
 
-    /**
-     * uploads an image
-     */
+   /**
+    * uploads an image
+    */
     async uploadFile(requestParameters: UploadFileRequest): Promise<ModelApiResponse> {
         const response = await this.uploadFileRaw(requestParameters);
         return await response.value();
diff --git a/samples/client/petstore/typescript-fetch/builds/es6-target/apis/StoreApi.ts b/samples/client/petstore/typescript-fetch/builds/es6-target/apis/StoreApi.ts
index 4b645dea98..9166609816 100644
--- a/samples/client/petstore/typescript-fetch/builds/es6-target/apis/StoreApi.ts
+++ b/samples/client/petstore/typescript-fetch/builds/es6-target/apis/StoreApi.ts
@@ -59,10 +59,10 @@ export class StoreApi extends runtime.BaseAPI {
         return new runtime.VoidApiResponse(response);
     }
 
-    /**
-     * For valid response try integer IDs with value < 1000. Anything above 1000 or nonintegers will generate API errors
-     * Delete purchase order by ID
-     */
+   /**
+    * For valid response try integer IDs with value < 1000. Anything above 1000 or nonintegers will generate API errors
+    * Delete purchase order by ID
+    */
     async deleteOrder(requestParameters: DeleteOrderRequest): Promise<void> {
         await this.deleteOrderRaw(requestParameters);
     }
@@ -90,10 +90,10 @@ export class StoreApi extends runtime.BaseAPI {
         return new runtime.JSONApiResponse<any>(response);
     }
 
-    /**
-     * Returns a map of status codes to quantities
-     * Returns pet inventories by status
-     */
+   /**
+    * Returns a map of status codes to quantities
+    * Returns pet inventories by status
+    */
     async getInventory(): Promise<{ [key: string]: number; }> {
         const response = await this.getInventoryRaw();
         return await response.value();
@@ -122,10 +122,10 @@ export class StoreApi extends runtime.BaseAPI {
         return new runtime.JSONApiResponse(response, (jsonValue) => OrderFromJSON(jsonValue));
     }
 
-    /**
-     * For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
-     * Find purchase order by ID
-     */
+   /**
+    * For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+    * Find purchase order by ID
+    */
     async getOrderById(requestParameters: GetOrderByIdRequest): Promise<Order> {
         const response = await this.getOrderByIdRaw(requestParameters);
         return await response.value();
@@ -156,9 +156,9 @@ export class StoreApi extends runtime.BaseAPI {
         return new runtime.JSONApiResponse(response, (jsonValue) => OrderFromJSON(jsonValue));
     }
 
-    /**
-     * Place an order for a pet
-     */
+   /**
+    * Place an order for a pet
+    */
     async placeOrder(requestParameters: PlaceOrderRequest): Promise<Order> {
         const response = await this.placeOrderRaw(requestParameters);
         return await response.value();
diff --git a/samples/client/petstore/typescript-fetch/builds/es6-target/apis/UserApi.ts b/samples/client/petstore/typescript-fetch/builds/es6-target/apis/UserApi.ts
index 4126b817ee..1696b600f5 100644
--- a/samples/client/petstore/typescript-fetch/builds/es6-target/apis/UserApi.ts
+++ b/samples/client/petstore/typescript-fetch/builds/es6-target/apis/UserApi.ts
@@ -80,10 +80,10 @@ export class UserApi extends runtime.BaseAPI {
         return new runtime.VoidApiResponse(response);
     }
 
-    /**
-     * This can only be done by the logged in user.
-     * Create user
-     */
+   /**
+    * This can only be done by the logged in user.
+    * Create user
+    */
     async createUser(requestParameters: CreateUserRequest): Promise<void> {
         await this.createUserRaw(requestParameters);
     }
@@ -113,9 +113,9 @@ export class UserApi extends runtime.BaseAPI {
         return new runtime.VoidApiResponse(response);
     }
 
-    /**
-     * Creates list of users with given input array
-     */
+   /**
+    * Creates list of users with given input array
+    */
     async createUsersWithArrayInput(requestParameters: CreateUsersWithArrayInputRequest): Promise<void> {
         await this.createUsersWithArrayInputRaw(requestParameters);
     }
@@ -145,9 +145,9 @@ export class UserApi extends runtime.BaseAPI {
         return new runtime.VoidApiResponse(response);
     }
 
-    /**
-     * Creates list of users with given input array
-     */
+   /**
+    * Creates list of users with given input array
+    */
     async createUsersWithListInput(requestParameters: CreateUsersWithListInputRequest): Promise<void> {
         await this.createUsersWithListInputRaw(requestParameters);
     }
@@ -175,10 +175,10 @@ export class UserApi extends runtime.BaseAPI {
         return new runtime.VoidApiResponse(response);
     }
 
-    /**
-     * This can only be done by the logged in user.
-     * Delete user
-     */
+   /**
+    * This can only be done by the logged in user.
+    * Delete user
+    */
     async deleteUser(requestParameters: DeleteUserRequest): Promise<void> {
         await this.deleteUserRaw(requestParameters);
     }
@@ -205,9 +205,9 @@ export class UserApi extends runtime.BaseAPI {
         return new runtime.JSONApiResponse(response, (jsonValue) => UserFromJSON(jsonValue));
     }
 
-    /**
-     * Get user by user name
-     */
+   /**
+    * Get user by user name
+    */
     async getUserByName(requestParameters: GetUserByNameRequest): Promise<User> {
         const response = await this.getUserByNameRaw(requestParameters);
         return await response.value();
@@ -247,9 +247,9 @@ export class UserApi extends runtime.BaseAPI {
         return new runtime.TextApiResponse(response);
     }
 
-    /**
-     * Logs user into the system
-     */
+   /**
+    * Logs user into the system
+    */
     async loginUser(requestParameters: LoginUserRequest): Promise<string> {
         const response = await this.loginUserRaw(requestParameters);
         return await response.value();
@@ -273,9 +273,9 @@ export class UserApi extends runtime.BaseAPI {
         return new runtime.VoidApiResponse(response);
     }
 
-    /**
-     * Logs out current logged in user session
-     */
+   /**
+    * Logs out current logged in user session
+    */
     async logoutUser(): Promise<void> {
         await this.logoutUserRaw();
     }
@@ -310,10 +310,10 @@ export class UserApi extends runtime.BaseAPI {
         return new runtime.VoidApiResponse(response);
     }
 
-    /**
-     * This can only be done by the logged in user.
-     * Updated user
-     */
+   /**
+    * This can only be done by the logged in user.
+    * Updated user
+    */
     async updateUser(requestParameters: UpdateUserRequest): Promise<void> {
         await this.updateUserRaw(requestParameters);
     }
diff --git a/samples/client/petstore/typescript-fetch/builds/es6-target/models/InlineObject1.ts b/samples/client/petstore/typescript-fetch/builds/es6-target/models/InlineObject1.ts
deleted file mode 100644
index 4cd90b1379..0000000000
--- a/samples/client/petstore/typescript-fetch/builds/es6-target/models/InlineObject1.ts
+++ /dev/null
@@ -1,52 +0,0 @@
-// tslint:disable
-/**
- * OpenAPI Petstore
- * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters.
- *
- * The version of the OpenAPI document: 1.0.0
- * 
- *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-import { exists, mapValues } from '../runtime';
-/**
- * 
- * @export
- * @interface InlineObject1
- */
-export interface InlineObject1 {
-    /**
-     * Additional data to pass to server
-     * @type {string}
-     * @memberof InlineObject1
-     */
-    additionalMetadata?: string;
-    /**
-     * file to upload
-     * @type {Blob}
-     * @memberof InlineObject1
-     */
-    file?: Blob;
-}
-
-export function InlineObject1FromJSON(json: any): InlineObject1 {
-    return {
-        'additionalMetadata': !exists(json, 'additionalMetadata') ? undefined : json['additionalMetadata'],
-        'file': !exists(json, 'file') ? undefined : json['file'],
-    };
-}
-
-export function InlineObject1ToJSON(value?: InlineObject1): any {
-    if (value === undefined) {
-        return undefined;
-    }
-    return {
-        'additionalMetadata': value.additionalMetadata,
-        'file': value.file,
-    };
-}
-
-
diff --git a/samples/client/petstore/typescript-fetch/builds/multiple-parameters/.gitignore b/samples/client/petstore/typescript-fetch/builds/multiple-parameters/.gitignore
new file mode 100644
index 0000000000..149b576547
--- /dev/null
+++ b/samples/client/petstore/typescript-fetch/builds/multiple-parameters/.gitignore
@@ -0,0 +1,4 @@
+wwwroot/*.js
+node_modules
+typings
+dist
diff --git a/samples/client/petstore/typescript-fetch/builds/multiple-parameters/.openapi-generator-ignore b/samples/client/petstore/typescript-fetch/builds/multiple-parameters/.openapi-generator-ignore
new file mode 100644
index 0000000000..7484ee590a
--- /dev/null
+++ b/samples/client/petstore/typescript-fetch/builds/multiple-parameters/.openapi-generator-ignore
@@ -0,0 +1,23 @@
+# OpenAPI Generator Ignore
+# Generated by openapi-generator https://github.com/openapitools/openapi-generator
+
+# Use this file to prevent files from being overwritten by the generator.
+# The patterns follow closely to .gitignore or .dockerignore.
+
+# As an example, the C# client generator defines ApiClient.cs.
+# You can make changes and tell OpenAPI Generator to ignore just this file by uncommenting the following line:
+#ApiClient.cs
+
+# You can match any string of characters against a directory, file or extension with a single asterisk (*):
+#foo/*/qux
+# The above matches foo/bar/qux and foo/baz/qux, but not foo/bar/baz/qux
+
+# You can recursively match patterns against a directory, file or extension with a double asterisk (**):
+#foo/**/qux
+# This matches foo/bar/qux, foo/baz/qux, and foo/bar/baz/qux
+
+# You can also negate patterns with an exclamation (!).
+# For example, you can ignore all files in a docs folder with the file extension .md:
+#docs/*.md
+# Then explicitly reverse the ignore rule for a single file:
+#!docs/README.md
diff --git a/samples/client/petstore/typescript-fetch/builds/multiple-parameters/.openapi-generator/VERSION b/samples/client/petstore/typescript-fetch/builds/multiple-parameters/.openapi-generator/VERSION
new file mode 100644
index 0000000000..83a328a922
--- /dev/null
+++ b/samples/client/petstore/typescript-fetch/builds/multiple-parameters/.openapi-generator/VERSION
@@ -0,0 +1 @@
+4.1.0-SNAPSHOT
\ No newline at end of file
diff --git a/samples/client/petstore/typescript-fetch/builds/multiple-parameters/apis/PetApi.ts b/samples/client/petstore/typescript-fetch/builds/multiple-parameters/apis/PetApi.ts
new file mode 100644
index 0000000000..e3501ab3f2
--- /dev/null
+++ b/samples/client/petstore/typescript-fetch/builds/multiple-parameters/apis/PetApi.ts
@@ -0,0 +1,424 @@
+// tslint:disable
+/**
+ * OpenAPI Petstore
+ * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters.
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+
+import * as runtime from '../runtime';
+import {
+    ModelApiResponse,
+    ModelApiResponseFromJSON,
+    ModelApiResponseToJSON,
+    Pet,
+    PetFromJSON,
+    PetToJSON,
+} from '../models';
+
+export interface AddPetRequest {
+    body: Pet;
+}
+
+export interface DeletePetRequest {
+    petId: number;
+    apiKey?: string;
+}
+
+export interface FindPetsByStatusRequest {
+    status: Array<FindPetsByStatusStatusEnum>;
+}
+
+export interface FindPetsByTagsRequest {
+    tags: Array<string>;
+}
+
+export interface GetPetByIdRequest {
+    petId: number;
+}
+
+export interface UpdatePetRequest {
+    body: Pet;
+}
+
+export interface UpdatePetWithFormRequest {
+    petId: number;
+    name?: string;
+    status?: string;
+}
+
+export interface UploadFileRequest {
+    petId: number;
+    additionalMetadata?: string;
+    file?: Blob;
+}
+
+/**
+ * no description
+ */
+export class PetApi extends runtime.BaseAPI {
+
+    /**
+     * Add a new pet to the store
+     */
+    async addPetRaw(requestParameters: AddPetRequest): Promise<runtime.ApiResponse<void>> {
+        if (requestParameters.body === null || requestParameters.body === undefined) {
+            throw new runtime.RequiredError('body','Required parameter requestParameters.body was null or undefined when calling addPet.');
+        }
+
+        const queryParameters: runtime.HTTPQuery = {};
+
+        const headerParameters: runtime.HTTPHeaders = {};
+
+        headerParameters['Content-Type'] = 'application/json';
+
+        if (this.configuration && this.configuration.accessToken) {
+            // oauth required
+            if (typeof this.configuration.accessToken === 'function') {
+                headerParameters["Authorization"] = this.configuration.accessToken("petstore_auth", ["write:pets", "read:pets"]);
+            } else {
+                headerParameters["Authorization"] = this.configuration.accessToken;
+            }
+        }
+
+        const response = await this.request({
+            path: `/pet`,
+            method: 'POST',
+            headers: headerParameters,
+            query: queryParameters,
+            body: PetToJSON(requestParameters.body),
+        });
+
+        return new runtime.VoidApiResponse(response);
+    }
+
+   /**
+    * Add a new pet to the store
+    */
+    async addPet(body: Pet): Promise<void> {
+        await this.addPetRaw({ body: body });
+    }
+
+    /**
+     * Deletes a pet
+     */
+    async deletePetRaw(requestParameters: DeletePetRequest): Promise<runtime.ApiResponse<void>> {
+        if (requestParameters.petId === null || requestParameters.petId === undefined) {
+            throw new runtime.RequiredError('petId','Required parameter requestParameters.petId was null or undefined when calling deletePet.');
+        }
+
+        const queryParameters: runtime.HTTPQuery = {};
+
+        const headerParameters: runtime.HTTPHeaders = {};
+
+        if (requestParameters.apiKey !== undefined && requestParameters.apiKey !== null) {
+            headerParameters['api_key'] = String(requestParameters.apiKey);
+        }
+
+        if (this.configuration && this.configuration.accessToken) {
+            // oauth required
+            if (typeof this.configuration.accessToken === 'function') {
+                headerParameters["Authorization"] = this.configuration.accessToken("petstore_auth", ["write:pets", "read:pets"]);
+            } else {
+                headerParameters["Authorization"] = this.configuration.accessToken;
+            }
+        }
+
+        const response = await this.request({
+            path: `/pet/{petId}`.replace(`{${"petId"}}`, encodeURIComponent(String(requestParameters.petId))),
+            method: 'DELETE',
+            headers: headerParameters,
+            query: queryParameters,
+        });
+
+        return new runtime.VoidApiResponse(response);
+    }
+
+   /**
+    * Deletes a pet
+    */
+    async deletePet(petId: number, apiKey?: string): Promise<void> {
+        await this.deletePetRaw({ petId: petId, apiKey: apiKey });
+    }
+
+    /**
+     * Multiple status values can be provided with comma separated strings
+     * Finds Pets by status
+     */
+    async findPetsByStatusRaw(requestParameters: FindPetsByStatusRequest): Promise<runtime.ApiResponse<Array<Pet>>> {
+        if (requestParameters.status === null || requestParameters.status === undefined) {
+            throw new runtime.RequiredError('status','Required parameter requestParameters.status was null or undefined when calling findPetsByStatus.');
+        }
+
+        const queryParameters: runtime.HTTPQuery = {};
+
+        if (requestParameters.status) {
+            queryParameters['status'] = requestParameters.status.join(runtime.COLLECTION_FORMATS["csv"]);
+        }
+
+        const headerParameters: runtime.HTTPHeaders = {};
+
+        if (this.configuration && this.configuration.accessToken) {
+            // oauth required
+            if (typeof this.configuration.accessToken === 'function') {
+                headerParameters["Authorization"] = this.configuration.accessToken("petstore_auth", ["write:pets", "read:pets"]);
+            } else {
+                headerParameters["Authorization"] = this.configuration.accessToken;
+            }
+        }
+
+        const response = await this.request({
+            path: `/pet/findByStatus`,
+            method: 'GET',
+            headers: headerParameters,
+            query: queryParameters,
+        });
+
+        return new runtime.JSONApiResponse(response, (jsonValue) => jsonValue.map(PetFromJSON));
+    }
+
+   /**
+    * Multiple status values can be provided with comma separated strings
+    * Finds Pets by status
+    */
+    async findPetsByStatus(status: Array<FindPetsByStatusStatusEnum>): Promise<Array<Pet>> {
+        const response = await this.findPetsByStatusRaw({ status: status });
+        return await response.value();
+    }
+
+    /**
+     * Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3 for testing.
+     * Finds Pets by tags
+     */
+    async findPetsByTagsRaw(requestParameters: FindPetsByTagsRequest): Promise<runtime.ApiResponse<Array<Pet>>> {
+        if (requestParameters.tags === null || requestParameters.tags === undefined) {
+            throw new runtime.RequiredError('tags','Required parameter requestParameters.tags was null or undefined when calling findPetsByTags.');
+        }
+
+        const queryParameters: runtime.HTTPQuery = {};
+
+        if (requestParameters.tags) {
+            queryParameters['tags'] = requestParameters.tags.join(runtime.COLLECTION_FORMATS["csv"]);
+        }
+
+        const headerParameters: runtime.HTTPHeaders = {};
+
+        if (this.configuration && this.configuration.accessToken) {
+            // oauth required
+            if (typeof this.configuration.accessToken === 'function') {
+                headerParameters["Authorization"] = this.configuration.accessToken("petstore_auth", ["write:pets", "read:pets"]);
+            } else {
+                headerParameters["Authorization"] = this.configuration.accessToken;
+            }
+        }
+
+        const response = await this.request({
+            path: `/pet/findByTags`,
+            method: 'GET',
+            headers: headerParameters,
+            query: queryParameters,
+        });
+
+        return new runtime.JSONApiResponse(response, (jsonValue) => jsonValue.map(PetFromJSON));
+    }
+
+   /**
+    * Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3 for testing.
+    * Finds Pets by tags
+    */
+    async findPetsByTags(tags: Array<string>): Promise<Array<Pet>> {
+        const response = await this.findPetsByTagsRaw({ tags: tags });
+        return await response.value();
+    }
+
+    /**
+     * Returns a single pet
+     * Find pet by ID
+     */
+    async getPetByIdRaw(requestParameters: GetPetByIdRequest): Promise<runtime.ApiResponse<Pet>> {
+        if (requestParameters.petId === null || requestParameters.petId === undefined) {
+            throw new runtime.RequiredError('petId','Required parameter requestParameters.petId was null or undefined when calling getPetById.');
+        }
+
+        const queryParameters: runtime.HTTPQuery = {};
+
+        const headerParameters: runtime.HTTPHeaders = {};
+
+        if (this.configuration && this.configuration.apiKey) {
+            headerParameters["api_key"] = this.configuration.apiKey("api_key"); // api_key authentication
+        }
+
+        const response = await this.request({
+            path: `/pet/{petId}`.replace(`{${"petId"}}`, encodeURIComponent(String(requestParameters.petId))),
+            method: 'GET',
+            headers: headerParameters,
+            query: queryParameters,
+        });
+
+        return new runtime.JSONApiResponse(response, (jsonValue) => PetFromJSON(jsonValue));
+    }
+
+   /**
+    * Returns a single pet
+    * Find pet by ID
+    */
+    async getPetById(petId: number): Promise<Pet> {
+        const response = await this.getPetByIdRaw({ petId: petId });
+        return await response.value();
+    }
+
+    /**
+     * Update an existing pet
+     */
+    async updatePetRaw(requestParameters: UpdatePetRequest): Promise<runtime.ApiResponse<void>> {
+        if (requestParameters.body === null || requestParameters.body === undefined) {
+            throw new runtime.RequiredError('body','Required parameter requestParameters.body was null or undefined when calling updatePet.');
+        }
+
+        const queryParameters: runtime.HTTPQuery = {};
+
+        const headerParameters: runtime.HTTPHeaders = {};
+
+        headerParameters['Content-Type'] = 'application/json';
+
+        if (this.configuration && this.configuration.accessToken) {
+            // oauth required
+            if (typeof this.configuration.accessToken === 'function') {
+                headerParameters["Authorization"] = this.configuration.accessToken("petstore_auth", ["write:pets", "read:pets"]);
+            } else {
+                headerParameters["Authorization"] = this.configuration.accessToken;
+            }
+        }
+
+        const response = await this.request({
+            path: `/pet`,
+            method: 'PUT',
+            headers: headerParameters,
+            query: queryParameters,
+            body: PetToJSON(requestParameters.body),
+        });
+
+        return new runtime.VoidApiResponse(response);
+    }
+
+   /**
+    * Update an existing pet
+    */
+    async updatePet(body: Pet): Promise<void> {
+        await this.updatePetRaw({ body: body });
+    }
+
+    /**
+     * Updates a pet in the store with form data
+     */
+    async updatePetWithFormRaw(requestParameters: UpdatePetWithFormRequest): Promise<runtime.ApiResponse<void>> {
+        if (requestParameters.petId === null || requestParameters.petId === undefined) {
+            throw new runtime.RequiredError('petId','Required parameter requestParameters.petId was null or undefined when calling updatePetWithForm.');
+        }
+
+        const queryParameters: runtime.HTTPQuery = {};
+
+        const headerParameters: runtime.HTTPHeaders = {};
+
+        if (this.configuration && this.configuration.accessToken) {
+            // oauth required
+            if (typeof this.configuration.accessToken === 'function') {
+                headerParameters["Authorization"] = this.configuration.accessToken("petstore_auth", ["write:pets", "read:pets"]);
+            } else {
+                headerParameters["Authorization"] = this.configuration.accessToken;
+            }
+        }
+
+        const formData = new FormData();
+        if (requestParameters.name !== undefined) {
+            formData.append('name', requestParameters.name as any);
+        }
+
+        if (requestParameters.status !== undefined) {
+            formData.append('status', requestParameters.status as any);
+        }
+
+        const response = await this.request({
+            path: `/pet/{petId}`.replace(`{${"petId"}}`, encodeURIComponent(String(requestParameters.petId))),
+            method: 'POST',
+            headers: headerParameters,
+            query: queryParameters,
+            body: formData,
+        });
+
+        return new runtime.VoidApiResponse(response);
+    }
+
+   /**
+    * Updates a pet in the store with form data
+    */
+    async updatePetWithForm(petId: number, name?: string, status?: string): Promise<void> {
+        await this.updatePetWithFormRaw({ petId: petId, name: name, status: status });
+    }
+
+    /**
+     * uploads an image
+     */
+    async uploadFileRaw(requestParameters: UploadFileRequest): Promise<runtime.ApiResponse<ModelApiResponse>> {
+        if (requestParameters.petId === null || requestParameters.petId === undefined) {
+            throw new runtime.RequiredError('petId','Required parameter requestParameters.petId was null or undefined when calling uploadFile.');
+        }
+
+        const queryParameters: runtime.HTTPQuery = {};
+
+        const headerParameters: runtime.HTTPHeaders = {};
+
+        if (this.configuration && this.configuration.accessToken) {
+            // oauth required
+            if (typeof this.configuration.accessToken === 'function') {
+                headerParameters["Authorization"] = this.configuration.accessToken("petstore_auth", ["write:pets", "read:pets"]);
+            } else {
+                headerParameters["Authorization"] = this.configuration.accessToken;
+            }
+        }
+
+        const formData = new FormData();
+        if (requestParameters.additionalMetadata !== undefined) {
+            formData.append('additionalMetadata', requestParameters.additionalMetadata as any);
+        }
+
+        if (requestParameters.file !== undefined) {
+            formData.append('file', requestParameters.file as any);
+        }
+
+        const response = await this.request({
+            path: `/pet/{petId}/uploadImage`.replace(`{${"petId"}}`, encodeURIComponent(String(requestParameters.petId))),
+            method: 'POST',
+            headers: headerParameters,
+            query: queryParameters,
+            body: formData,
+        });
+
+        return new runtime.JSONApiResponse(response, (jsonValue) => ModelApiResponseFromJSON(jsonValue));
+    }
+
+   /**
+    * uploads an image
+    */
+    async uploadFile(petId: number, additionalMetadata?: string, file?: Blob): Promise<ModelApiResponse> {
+        const response = await this.uploadFileRaw({ petId: petId, additionalMetadata: additionalMetadata, file: file });
+        return await response.value();
+    }
+
+}
+
+/**
+    * @export
+    * @enum {string}
+    */
+export enum FindPetsByStatusStatusEnum {
+    Available = 'available',
+    Pending = 'pending',
+    Sold = 'sold'
+}
diff --git a/samples/client/petstore/typescript-fetch/builds/multiple-parameters/apis/StoreApi.ts b/samples/client/petstore/typescript-fetch/builds/multiple-parameters/apis/StoreApi.ts
new file mode 100644
index 0000000000..5b3424aafb
--- /dev/null
+++ b/samples/client/petstore/typescript-fetch/builds/multiple-parameters/apis/StoreApi.ts
@@ -0,0 +1,167 @@
+// tslint:disable
+/**
+ * OpenAPI Petstore
+ * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters.
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+
+import * as runtime from '../runtime';
+import {
+    Order,
+    OrderFromJSON,
+    OrderToJSON,
+} from '../models';
+
+export interface DeleteOrderRequest {
+    orderId: string;
+}
+
+export interface GetOrderByIdRequest {
+    orderId: number;
+}
+
+export interface PlaceOrderRequest {
+    body: Order;
+}
+
+/**
+ * no description
+ */
+export class StoreApi extends runtime.BaseAPI {
+
+    /**
+     * For valid response try integer IDs with value < 1000. Anything above 1000 or nonintegers will generate API errors
+     * Delete purchase order by ID
+     */
+    async deleteOrderRaw(requestParameters: DeleteOrderRequest): Promise<runtime.ApiResponse<void>> {
+        if (requestParameters.orderId === null || requestParameters.orderId === undefined) {
+            throw new runtime.RequiredError('orderId','Required parameter requestParameters.orderId was null or undefined when calling deleteOrder.');
+        }
+
+        const queryParameters: runtime.HTTPQuery = {};
+
+        const headerParameters: runtime.HTTPHeaders = {};
+
+        const response = await this.request({
+            path: `/store/order/{orderId}`.replace(`{${"orderId"}}`, encodeURIComponent(String(requestParameters.orderId))),
+            method: 'DELETE',
+            headers: headerParameters,
+            query: queryParameters,
+        });
+
+        return new runtime.VoidApiResponse(response);
+    }
+
+   /**
+    * For valid response try integer IDs with value < 1000. Anything above 1000 or nonintegers will generate API errors
+    * Delete purchase order by ID
+    */
+    async deleteOrder(orderId: string): Promise<void> {
+        await this.deleteOrderRaw({ orderId: orderId });
+    }
+
+    /**
+     * Returns a map of status codes to quantities
+     * Returns pet inventories by status
+     */
+    async getInventoryRaw(): Promise<runtime.ApiResponse<{ [key: string]: number; }>> {
+        const queryParameters: runtime.HTTPQuery = {};
+
+        const headerParameters: runtime.HTTPHeaders = {};
+
+        if (this.configuration && this.configuration.apiKey) {
+            headerParameters["api_key"] = this.configuration.apiKey("api_key"); // api_key authentication
+        }
+
+        const response = await this.request({
+            path: `/store/inventory`,
+            method: 'GET',
+            headers: headerParameters,
+            query: queryParameters,
+        });
+
+        return new runtime.JSONApiResponse<any>(response);
+    }
+
+   /**
+    * Returns a map of status codes to quantities
+    * Returns pet inventories by status
+    */
+    async getInventory(): Promise<{ [key: string]: number; }> {
+        const response = await this.getInventoryRaw();
+        return await response.value();
+    }
+
+    /**
+     * For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+     * Find purchase order by ID
+     */
+    async getOrderByIdRaw(requestParameters: GetOrderByIdRequest): Promise<runtime.ApiResponse<Order>> {
+        if (requestParameters.orderId === null || requestParameters.orderId === undefined) {
+            throw new runtime.RequiredError('orderId','Required parameter requestParameters.orderId was null or undefined when calling getOrderById.');
+        }
+
+        const queryParameters: runtime.HTTPQuery = {};
+
+        const headerParameters: runtime.HTTPHeaders = {};
+
+        const response = await this.request({
+            path: `/store/order/{orderId}`.replace(`{${"orderId"}}`, encodeURIComponent(String(requestParameters.orderId))),
+            method: 'GET',
+            headers: headerParameters,
+            query: queryParameters,
+        });
+
+        return new runtime.JSONApiResponse(response, (jsonValue) => OrderFromJSON(jsonValue));
+    }
+
+   /**
+    * For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+    * Find purchase order by ID
+    */
+    async getOrderById(orderId: number): Promise<Order> {
+        const response = await this.getOrderByIdRaw({ orderId: orderId });
+        return await response.value();
+    }
+
+    /**
+     * Place an order for a pet
+     */
+    async placeOrderRaw(requestParameters: PlaceOrderRequest): Promise<runtime.ApiResponse<Order>> {
+        if (requestParameters.body === null || requestParameters.body === undefined) {
+            throw new runtime.RequiredError('body','Required parameter requestParameters.body was null or undefined when calling placeOrder.');
+        }
+
+        const queryParameters: runtime.HTTPQuery = {};
+
+        const headerParameters: runtime.HTTPHeaders = {};
+
+        headerParameters['Content-Type'] = 'application/json';
+
+        const response = await this.request({
+            path: `/store/order`,
+            method: 'POST',
+            headers: headerParameters,
+            query: queryParameters,
+            body: OrderToJSON(requestParameters.body),
+        });
+
+        return new runtime.JSONApiResponse(response, (jsonValue) => OrderFromJSON(jsonValue));
+    }
+
+   /**
+    * Place an order for a pet
+    */
+    async placeOrder(body: Order): Promise<Order> {
+        const response = await this.placeOrderRaw({ body: body });
+        return await response.value();
+    }
+
+}
diff --git a/samples/client/petstore/typescript-fetch/builds/multiple-parameters/apis/UserApi.ts b/samples/client/petstore/typescript-fetch/builds/multiple-parameters/apis/UserApi.ts
new file mode 100644
index 0000000000..443e52fe2c
--- /dev/null
+++ b/samples/client/petstore/typescript-fetch/builds/multiple-parameters/apis/UserApi.ts
@@ -0,0 +1,321 @@
+// tslint:disable
+/**
+ * OpenAPI Petstore
+ * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters.
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+
+import * as runtime from '../runtime';
+import {
+    User,
+    UserFromJSON,
+    UserToJSON,
+} from '../models';
+
+export interface CreateUserRequest {
+    body: User;
+}
+
+export interface CreateUsersWithArrayInputRequest {
+    body: Array<User>;
+}
+
+export interface CreateUsersWithListInputRequest {
+    body: Array<User>;
+}
+
+export interface DeleteUserRequest {
+    username: string;
+}
+
+export interface GetUserByNameRequest {
+    username: string;
+}
+
+export interface LoginUserRequest {
+    username: string;
+    password: string;
+}
+
+export interface UpdateUserRequest {
+    username: string;
+    body: User;
+}
+
+/**
+ * no description
+ */
+export class UserApi extends runtime.BaseAPI {
+
+    /**
+     * This can only be done by the logged in user.
+     * Create user
+     */
+    async createUserRaw(requestParameters: CreateUserRequest): Promise<runtime.ApiResponse<void>> {
+        if (requestParameters.body === null || requestParameters.body === undefined) {
+            throw new runtime.RequiredError('body','Required parameter requestParameters.body was null or undefined when calling createUser.');
+        }
+
+        const queryParameters: runtime.HTTPQuery = {};
+
+        const headerParameters: runtime.HTTPHeaders = {};
+
+        headerParameters['Content-Type'] = 'application/json';
+
+        const response = await this.request({
+            path: `/user`,
+            method: 'POST',
+            headers: headerParameters,
+            query: queryParameters,
+            body: UserToJSON(requestParameters.body),
+        });
+
+        return new runtime.VoidApiResponse(response);
+    }
+
+   /**
+    * This can only be done by the logged in user.
+    * Create user
+    */
+    async createUser(body: User): Promise<void> {
+        await this.createUserRaw({ body: body });
+    }
+
+    /**
+     * Creates list of users with given input array
+     */
+    async createUsersWithArrayInputRaw(requestParameters: CreateUsersWithArrayInputRequest): Promise<runtime.ApiResponse<void>> {
+        if (requestParameters.body === null || requestParameters.body === undefined) {
+            throw new runtime.RequiredError('body','Required parameter requestParameters.body was null or undefined when calling createUsersWithArrayInput.');
+        }
+
+        const queryParameters: runtime.HTTPQuery = {};
+
+        const headerParameters: runtime.HTTPHeaders = {};
+
+        headerParameters['Content-Type'] = 'application/json';
+
+        const response = await this.request({
+            path: `/user/createWithArray`,
+            method: 'POST',
+            headers: headerParameters,
+            query: queryParameters,
+            body: requestParameters.body.map(UserToJSON),
+        });
+
+        return new runtime.VoidApiResponse(response);
+    }
+
+   /**
+    * Creates list of users with given input array
+    */
+    async createUsersWithArrayInput(body: Array<User>): Promise<void> {
+        await this.createUsersWithArrayInputRaw({ body: body });
+    }
+
+    /**
+     * Creates list of users with given input array
+     */
+    async createUsersWithListInputRaw(requestParameters: CreateUsersWithListInputRequest): Promise<runtime.ApiResponse<void>> {
+        if (requestParameters.body === null || requestParameters.body === undefined) {
+            throw new runtime.RequiredError('body','Required parameter requestParameters.body was null or undefined when calling createUsersWithListInput.');
+        }
+
+        const queryParameters: runtime.HTTPQuery = {};
+
+        const headerParameters: runtime.HTTPHeaders = {};
+
+        headerParameters['Content-Type'] = 'application/json';
+
+        const response = await this.request({
+            path: `/user/createWithList`,
+            method: 'POST',
+            headers: headerParameters,
+            query: queryParameters,
+            body: requestParameters.body.map(UserToJSON),
+        });
+
+        return new runtime.VoidApiResponse(response);
+    }
+
+   /**
+    * Creates list of users with given input array
+    */
+    async createUsersWithListInput(body: Array<User>): Promise<void> {
+        await this.createUsersWithListInputRaw({ body: body });
+    }
+
+    /**
+     * This can only be done by the logged in user.
+     * Delete user
+     */
+    async deleteUserRaw(requestParameters: DeleteUserRequest): Promise<runtime.ApiResponse<void>> {
+        if (requestParameters.username === null || requestParameters.username === undefined) {
+            throw new runtime.RequiredError('username','Required parameter requestParameters.username was null or undefined when calling deleteUser.');
+        }
+
+        const queryParameters: runtime.HTTPQuery = {};
+
+        const headerParameters: runtime.HTTPHeaders = {};
+
+        const response = await this.request({
+            path: `/user/{username}`.replace(`{${"username"}}`, encodeURIComponent(String(requestParameters.username))),
+            method: 'DELETE',
+            headers: headerParameters,
+            query: queryParameters,
+        });
+
+        return new runtime.VoidApiResponse(response);
+    }
+
+   /**
+    * This can only be done by the logged in user.
+    * Delete user
+    */
+    async deleteUser(username: string): Promise<void> {
+        await this.deleteUserRaw({ username: username });
+    }
+
+    /**
+     * Get user by user name
+     */
+    async getUserByNameRaw(requestParameters: GetUserByNameRequest): Promise<runtime.ApiResponse<User>> {
+        if (requestParameters.username === null || requestParameters.username === undefined) {
+            throw new runtime.RequiredError('username','Required parameter requestParameters.username was null or undefined when calling getUserByName.');
+        }
+
+        const queryParameters: runtime.HTTPQuery = {};
+
+        const headerParameters: runtime.HTTPHeaders = {};
+
+        const response = await this.request({
+            path: `/user/{username}`.replace(`{${"username"}}`, encodeURIComponent(String(requestParameters.username))),
+            method: 'GET',
+            headers: headerParameters,
+            query: queryParameters,
+        });
+
+        return new runtime.JSONApiResponse(response, (jsonValue) => UserFromJSON(jsonValue));
+    }
+
+   /**
+    * Get user by user name
+    */
+    async getUserByName(username: string): Promise<User> {
+        const response = await this.getUserByNameRaw({ username: username });
+        return await response.value();
+    }
+
+    /**
+     * Logs user into the system
+     */
+    async loginUserRaw(requestParameters: LoginUserRequest): Promise<runtime.ApiResponse<string>> {
+        if (requestParameters.username === null || requestParameters.username === undefined) {
+            throw new runtime.RequiredError('username','Required parameter requestParameters.username was null or undefined when calling loginUser.');
+        }
+
+        if (requestParameters.password === null || requestParameters.password === undefined) {
+            throw new runtime.RequiredError('password','Required parameter requestParameters.password was null or undefined when calling loginUser.');
+        }
+
+        const queryParameters: runtime.HTTPQuery = {};
+
+        if (requestParameters.username !== undefined) {
+            queryParameters['username'] = requestParameters.username;
+        }
+
+        if (requestParameters.password !== undefined) {
+            queryParameters['password'] = requestParameters.password;
+        }
+
+        const headerParameters: runtime.HTTPHeaders = {};
+
+        const response = await this.request({
+            path: `/user/login`,
+            method: 'GET',
+            headers: headerParameters,
+            query: queryParameters,
+        });
+
+        return new runtime.TextApiResponse(response);
+    }
+
+   /**
+    * Logs user into the system
+    */
+    async loginUser(username: string, password: string): Promise<string> {
+        const response = await this.loginUserRaw({ username: username, password: password });
+        return await response.value();
+    }
+
+    /**
+     * Logs out current logged in user session
+     */
+    async logoutUserRaw(): Promise<runtime.ApiResponse<void>> {
+        const queryParameters: runtime.HTTPQuery = {};
+
+        const headerParameters: runtime.HTTPHeaders = {};
+
+        const response = await this.request({
+            path: `/user/logout`,
+            method: 'GET',
+            headers: headerParameters,
+            query: queryParameters,
+        });
+
+        return new runtime.VoidApiResponse(response);
+    }
+
+   /**
+    * Logs out current logged in user session
+    */
+    async logoutUser(): Promise<void> {
+        await this.logoutUserRaw();
+    }
+
+    /**
+     * This can only be done by the logged in user.
+     * Updated user
+     */
+    async updateUserRaw(requestParameters: UpdateUserRequest): Promise<runtime.ApiResponse<void>> {
+        if (requestParameters.username === null || requestParameters.username === undefined) {
+            throw new runtime.RequiredError('username','Required parameter requestParameters.username was null or undefined when calling updateUser.');
+        }
+
+        if (requestParameters.body === null || requestParameters.body === undefined) {
+            throw new runtime.RequiredError('body','Required parameter requestParameters.body was null or undefined when calling updateUser.');
+        }
+
+        const queryParameters: runtime.HTTPQuery = {};
+
+        const headerParameters: runtime.HTTPHeaders = {};
+
+        headerParameters['Content-Type'] = 'application/json';
+
+        const response = await this.request({
+            path: `/user/{username}`.replace(`{${"username"}}`, encodeURIComponent(String(requestParameters.username))),
+            method: 'PUT',
+            headers: headerParameters,
+            query: queryParameters,
+            body: UserToJSON(requestParameters.body),
+        });
+
+        return new runtime.VoidApiResponse(response);
+    }
+
+   /**
+    * This can only be done by the logged in user.
+    * Updated user
+    */
+    async updateUser(username: string, body: User): Promise<void> {
+        await this.updateUserRaw({ username: username, body: body });
+    }
+
+}
diff --git a/samples/client/petstore/typescript-fetch/builds/multiple-parameters/apis/index.ts b/samples/client/petstore/typescript-fetch/builds/multiple-parameters/apis/index.ts
new file mode 100644
index 0000000000..056206bfac
--- /dev/null
+++ b/samples/client/petstore/typescript-fetch/builds/multiple-parameters/apis/index.ts
@@ -0,0 +1,3 @@
+export * from './PetApi';
+export * from './StoreApi';
+export * from './UserApi';
diff --git a/samples/client/petstore/typescript-fetch/builds/multiple-parameters/index.ts b/samples/client/petstore/typescript-fetch/builds/multiple-parameters/index.ts
new file mode 100644
index 0000000000..848ecfa4d1
--- /dev/null
+++ b/samples/client/petstore/typescript-fetch/builds/multiple-parameters/index.ts
@@ -0,0 +1,3 @@
+export * from './runtime';
+export * from './apis';
+export * from './models';
diff --git a/samples/client/petstore/typescript-fetch/builds/es6-target/models/InlineObject.ts b/samples/client/petstore/typescript-fetch/builds/multiple-parameters/models/Category.ts
similarity index 61%
rename from samples/client/petstore/typescript-fetch/builds/es6-target/models/InlineObject.ts
rename to samples/client/petstore/typescript-fetch/builds/multiple-parameters/models/Category.ts
index 2998b1463c..f8809dccbe 100644
--- a/samples/client/petstore/typescript-fetch/builds/es6-target/models/InlineObject.ts
+++ b/samples/client/petstore/typescript-fetch/builds/multiple-parameters/models/Category.ts
@@ -13,39 +13,39 @@
 
 import { exists, mapValues } from '../runtime';
 /**
- * 
+ * A category for a pet
  * @export
- * @interface InlineObject
+ * @interface Category
  */
-export interface InlineObject {
+export interface Category {
     /**
-     * Updated name of the pet
+     * 
+     * @type {number}
+     * @memberof Category
+     */
+    id?: number;
+    /**
+     * 
      * @type {string}
-     * @memberof InlineObject
+     * @memberof Category
      */
     name?: string;
-    /**
-     * Updated status of the pet
-     * @type {string}
-     * @memberof InlineObject
-     */
-    status?: string;
 }
 
-export function InlineObjectFromJSON(json: any): InlineObject {
+export function CategoryFromJSON(json: any): Category {
     return {
+        'id': !exists(json, 'id') ? undefined : json['id'],
         'name': !exists(json, 'name') ? undefined : json['name'],
-        'status': !exists(json, 'status') ? undefined : json['status'],
     };
 }
 
-export function InlineObjectToJSON(value?: InlineObject): any {
+export function CategoryToJSON(value?: Category): any {
     if (value === undefined) {
         return undefined;
     }
     return {
+        'id': value.id,
         'name': value.name,
-        'status': value.status,
     };
 }
 
diff --git a/samples/client/petstore/typescript-fetch/builds/es6-target/models/ApiResponse.ts b/samples/client/petstore/typescript-fetch/builds/multiple-parameters/models/ModelApiResponse.ts
similarity index 71%
rename from samples/client/petstore/typescript-fetch/builds/es6-target/models/ApiResponse.ts
rename to samples/client/petstore/typescript-fetch/builds/multiple-parameters/models/ModelApiResponse.ts
index 2275473e61..8b8e2c45fe 100644
--- a/samples/client/petstore/typescript-fetch/builds/es6-target/models/ApiResponse.ts
+++ b/samples/client/petstore/typescript-fetch/builds/multiple-parameters/models/ModelApiResponse.ts
@@ -3,7 +3,7 @@
  * OpenAPI Petstore
  * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters.
  *
- * OpenAPI spec version: 1.0.0
+ * The version of the OpenAPI document: 1.0.0
  * 
  *
  * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
@@ -11,34 +11,34 @@
  * Do not edit the class manually.
  */
 
-import { exists } from '../runtime';
+import { exists, mapValues } from '../runtime';
 /**
  * Describes the result of uploading an image resource
  * @export
- * @interface ApiResponse
+ * @interface ModelApiResponse
  */
-export interface ApiResponse {
+export interface ModelApiResponse {
     /**
      * 
      * @type {number}
-     * @memberof ApiResponse
+     * @memberof ModelApiResponse
      */
     code?: number;
     /**
      * 
      * @type {string}
-     * @memberof ApiResponse
+     * @memberof ModelApiResponse
      */
     type?: string;
     /**
      * 
      * @type {string}
-     * @memberof ApiResponse
+     * @memberof ModelApiResponse
      */
     message?: string;
 }
 
-export function ApiResponseFromJSON(json: any): ApiResponse {
+export function ModelApiResponseFromJSON(json: any): ModelApiResponse {
     return {
         'code': !exists(json, 'code') ? undefined : json['code'],
         'type': !exists(json, 'type') ? undefined : json['type'],
@@ -46,7 +46,7 @@ export function ApiResponseFromJSON(json: any): ApiResponse {
     };
 }
 
-export function ApiResponseToJSON(value?: ApiResponse): any {
+export function ModelApiResponseToJSON(value?: ModelApiResponse): any {
     if (value === undefined) {
         return undefined;
     }
diff --git a/samples/client/petstore/typescript-fetch/builds/multiple-parameters/models/Order.ts b/samples/client/petstore/typescript-fetch/builds/multiple-parameters/models/Order.ts
new file mode 100644
index 0000000000..6ce0496794
--- /dev/null
+++ b/samples/client/petstore/typescript-fetch/builds/multiple-parameters/models/Order.ts
@@ -0,0 +1,94 @@
+// tslint:disable
+/**
+ * OpenAPI Petstore
+ * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters.
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+import { exists, mapValues } from '../runtime';
+/**
+ * An order for a pets from the pet store
+ * @export
+ * @interface Order
+ */
+export interface Order {
+    /**
+     * 
+     * @type {number}
+     * @memberof Order
+     */
+    id?: number;
+    /**
+     * 
+     * @type {number}
+     * @memberof Order
+     */
+    petId?: number;
+    /**
+     * 
+     * @type {number}
+     * @memberof Order
+     */
+    quantity?: number;
+    /**
+     * 
+     * @type {Date}
+     * @memberof Order
+     */
+    shipDate?: Date;
+    /**
+     * Order Status
+     * @type {string}
+     * @memberof Order
+     */
+    status?: OrderStatusEnum;
+    /**
+     * 
+     * @type {boolean}
+     * @memberof Order
+     */
+    complete?: boolean;
+}
+
+export function OrderFromJSON(json: any): Order {
+    return {
+        'id': !exists(json, 'id') ? undefined : json['id'],
+        'petId': !exists(json, 'petId') ? undefined : json['petId'],
+        'quantity': !exists(json, 'quantity') ? undefined : json['quantity'],
+        'shipDate': !exists(json, 'shipDate') ? undefined : new Date(json['shipDate']),
+        'status': !exists(json, 'status') ? undefined : json['status'],
+        'complete': !exists(json, 'complete') ? undefined : json['complete'],
+    };
+}
+
+export function OrderToJSON(value?: Order): any {
+    if (value === undefined) {
+        return undefined;
+    }
+    return {
+        'id': value.id,
+        'petId': value.petId,
+        'quantity': value.quantity,
+        'shipDate': value.shipDate === undefined ? undefined : value.shipDate.toISOString(),
+        'status': value.status,
+        'complete': value.complete,
+    };
+}
+
+/**
+* @export
+* @enum {string}
+*/
+export enum OrderStatusEnum {
+    Placed = 'placed',
+    Approved = 'approved',
+    Delivered = 'delivered'
+}
+
+
diff --git a/samples/client/petstore/typescript-fetch/builds/multiple-parameters/models/Pet.ts b/samples/client/petstore/typescript-fetch/builds/multiple-parameters/models/Pet.ts
new file mode 100644
index 0000000000..770f991b89
--- /dev/null
+++ b/samples/client/petstore/typescript-fetch/builds/multiple-parameters/models/Pet.ts
@@ -0,0 +1,103 @@
+// tslint:disable
+/**
+ * OpenAPI Petstore
+ * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters.
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+import { exists, mapValues } from '../runtime';
+import {
+    Category,
+    CategoryFromJSON,
+    CategoryToJSON,
+    Tag,
+    TagFromJSON,
+    TagToJSON,
+} from './';
+
+/**
+ * A pet for sale in the pet store
+ * @export
+ * @interface Pet
+ */
+export interface Pet {
+    /**
+     * 
+     * @type {number}
+     * @memberof Pet
+     */
+    id?: number;
+    /**
+     * 
+     * @type {Category}
+     * @memberof Pet
+     */
+    category?: Category;
+    /**
+     * 
+     * @type {string}
+     * @memberof Pet
+     */
+    name: string;
+    /**
+     * 
+     * @type {Array<string>}
+     * @memberof Pet
+     */
+    photoUrls: Array<string>;
+    /**
+     * 
+     * @type {Array<Tag>}
+     * @memberof Pet
+     */
+    tags?: Array<Tag>;
+    /**
+     * pet status in the store
+     * @type {string}
+     * @memberof Pet
+     */
+    status?: PetStatusEnum;
+}
+
+export function PetFromJSON(json: any): Pet {
+    return {
+        'id': !exists(json, 'id') ? undefined : json['id'],
+        'category': !exists(json, 'category') ? undefined : CategoryFromJSON(json['category']),
+        'name': json['name'],
+        'photoUrls': json['photoUrls'],
+        'tags': !exists(json, 'tags') ? undefined : (json['tags'] as Array<any>).map(TagFromJSON),
+        'status': !exists(json, 'status') ? undefined : json['status'],
+    };
+}
+
+export function PetToJSON(value?: Pet): any {
+    if (value === undefined) {
+        return undefined;
+    }
+    return {
+        'id': value.id,
+        'category': CategoryToJSON(value.category),
+        'name': value.name,
+        'photoUrls': value.photoUrls,
+        'tags': value.tags === undefined ? undefined : (value.tags as Array<any>).map(TagToJSON),
+        'status': value.status,
+    };
+}
+
+/**
+* @export
+* @enum {string}
+*/
+export enum PetStatusEnum {
+    Available = 'available',
+    Pending = 'pending',
+    Sold = 'sold'
+}
+
+
diff --git a/samples/client/petstore/typescript-fetch/builds/with-interfaces/models/InlineObject.ts b/samples/client/petstore/typescript-fetch/builds/multiple-parameters/models/Tag.ts
similarity index 61%
rename from samples/client/petstore/typescript-fetch/builds/with-interfaces/models/InlineObject.ts
rename to samples/client/petstore/typescript-fetch/builds/multiple-parameters/models/Tag.ts
index 2998b1463c..7c8098f6dc 100644
--- a/samples/client/petstore/typescript-fetch/builds/with-interfaces/models/InlineObject.ts
+++ b/samples/client/petstore/typescript-fetch/builds/multiple-parameters/models/Tag.ts
@@ -13,39 +13,39 @@
 
 import { exists, mapValues } from '../runtime';
 /**
- * 
+ * A tag for a pet
  * @export
- * @interface InlineObject
+ * @interface Tag
  */
-export interface InlineObject {
+export interface Tag {
     /**
-     * Updated name of the pet
+     * 
+     * @type {number}
+     * @memberof Tag
+     */
+    id?: number;
+    /**
+     * 
      * @type {string}
-     * @memberof InlineObject
+     * @memberof Tag
      */
     name?: string;
-    /**
-     * Updated status of the pet
-     * @type {string}
-     * @memberof InlineObject
-     */
-    status?: string;
 }
 
-export function InlineObjectFromJSON(json: any): InlineObject {
+export function TagFromJSON(json: any): Tag {
     return {
+        'id': !exists(json, 'id') ? undefined : json['id'],
         'name': !exists(json, 'name') ? undefined : json['name'],
-        'status': !exists(json, 'status') ? undefined : json['status'],
     };
 }
 
-export function InlineObjectToJSON(value?: InlineObject): any {
+export function TagToJSON(value?: Tag): any {
     if (value === undefined) {
         return undefined;
     }
     return {
+        'id': value.id,
         'name': value.name,
-        'status': value.status,
     };
 }
 
diff --git a/samples/client/petstore/typescript-fetch/builds/multiple-parameters/models/User.ts b/samples/client/petstore/typescript-fetch/builds/multiple-parameters/models/User.ts
new file mode 100644
index 0000000000..fd7430063f
--- /dev/null
+++ b/samples/client/petstore/typescript-fetch/builds/multiple-parameters/models/User.ts
@@ -0,0 +1,100 @@
+// tslint:disable
+/**
+ * OpenAPI Petstore
+ * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters.
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+import { exists, mapValues } from '../runtime';
+/**
+ * A User who is purchasing from the pet store
+ * @export
+ * @interface User
+ */
+export interface User {
+    /**
+     * 
+     * @type {number}
+     * @memberof User
+     */
+    id?: number;
+    /**
+     * 
+     * @type {string}
+     * @memberof User
+     */
+    username?: string;
+    /**
+     * 
+     * @type {string}
+     * @memberof User
+     */
+    firstName?: string;
+    /**
+     * 
+     * @type {string}
+     * @memberof User
+     */
+    lastName?: string;
+    /**
+     * 
+     * @type {string}
+     * @memberof User
+     */
+    email?: string;
+    /**
+     * 
+     * @type {string}
+     * @memberof User
+     */
+    password?: string;
+    /**
+     * 
+     * @type {string}
+     * @memberof User
+     */
+    phone?: string;
+    /**
+     * User Status
+     * @type {number}
+     * @memberof User
+     */
+    userStatus?: number;
+}
+
+export function UserFromJSON(json: any): User {
+    return {
+        'id': !exists(json, 'id') ? undefined : json['id'],
+        'username': !exists(json, 'username') ? undefined : json['username'],
+        'firstName': !exists(json, 'firstName') ? undefined : json['firstName'],
+        'lastName': !exists(json, 'lastName') ? undefined : json['lastName'],
+        'email': !exists(json, 'email') ? undefined : json['email'],
+        'password': !exists(json, 'password') ? undefined : json['password'],
+        'phone': !exists(json, 'phone') ? undefined : json['phone'],
+        'userStatus': !exists(json, 'userStatus') ? undefined : json['userStatus'],
+    };
+}
+
+export function UserToJSON(value?: User): any {
+    if (value === undefined) {
+        return undefined;
+    }
+    return {
+        'id': value.id,
+        'username': value.username,
+        'firstName': value.firstName,
+        'lastName': value.lastName,
+        'email': value.email,
+        'password': value.password,
+        'phone': value.phone,
+        'userStatus': value.userStatus,
+    };
+}
+
+
diff --git a/samples/client/petstore/typescript-fetch/builds/multiple-parameters/models/index.ts b/samples/client/petstore/typescript-fetch/builds/multiple-parameters/models/index.ts
new file mode 100644
index 0000000000..b07ddc8446
--- /dev/null
+++ b/samples/client/petstore/typescript-fetch/builds/multiple-parameters/models/index.ts
@@ -0,0 +1,6 @@
+export * from './Category';
+export * from './ModelApiResponse';
+export * from './Order';
+export * from './Pet';
+export * from './Tag';
+export * from './User';
diff --git a/samples/client/petstore/typescript-fetch/builds/multiple-parameters/pom.xml b/samples/client/petstore/typescript-fetch/builds/multiple-parameters/pom.xml
new file mode 100644
index 0000000000..a6fc39c4f0
--- /dev/null
+++ b/samples/client/petstore/typescript-fetch/builds/multiple-parameters/pom.xml
@@ -0,0 +1,26 @@
+<project>
+    <modelVersion>4.0.0</modelVersion>
+    <groupId>org.openapitools</groupId>
+    <artifactId>TypeScriptAngularBuildPestoreClientTests</artifactId>
+    <packaging>pom</packaging>
+    <version>1.0-SNAPSHOT</version>
+    <name>TS Fetch Multiple Parameters Petstore Client</name>
+    <build>
+        <plugins>
+            <plugin>
+                <artifactId>maven-dependency-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>copy-dependencies</goal>
+                        </goals>
+                        <configuration>
+                            <outputDirectory>${project.build.directory}</outputDirectory>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+</project>
diff --git a/samples/client/petstore/typescript-fetch/builds/multiple-parameters/runtime.ts b/samples/client/petstore/typescript-fetch/builds/multiple-parameters/runtime.ts
new file mode 100644
index 0000000000..5b07f81118
--- /dev/null
+++ b/samples/client/petstore/typescript-fetch/builds/multiple-parameters/runtime.ts
@@ -0,0 +1,284 @@
+// tslint:disable
+/**
+ * OpenAPI Petstore
+ * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters.
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+
+export const BASE_PATH = "http://petstore.swagger.io/v2".replace(/\/+$/, "");
+
+const isBlob = (value: any) => typeof Blob !== 'undefined' && value instanceof Blob;
+
+/**
+ * This is the base class for all generated API classes.
+ */
+export class BaseAPI {
+
+    private middleware: Middleware[];
+
+    constructor(protected configuration = new Configuration()) {
+        this.middleware = configuration.middleware;
+    }
+
+    withMiddleware<T extends BaseAPI>(this: T, ...middlewares: Middleware[]) {
+        const next = this.clone<T>();
+        next.middleware = next.middleware.concat(...middlewares);
+        return next;
+    }
+
+    withPreMiddleware<T extends BaseAPI>(this: T, ...preMiddlewares: Array<Middleware['pre']>) {
+        const middlewares = preMiddlewares.map((pre) => ({ pre }));
+        return this.withMiddleware<T>(...middlewares);
+    }
+
+    withPostMiddleware<T extends BaseAPI>(this: T, ...postMiddlewares: Array<Middleware['post']>) {
+        const middlewares = postMiddlewares.map((post) => ({ post }));
+        return this.withMiddleware<T>(...middlewares);
+    }
+
+    protected async request(context: RequestOpts): Promise<Response> {
+        const { url, init } = this.createFetchParams(context);
+        const response = await this.fetchApi(url, init);
+        if (response.status >= 200 && response.status < 300) {
+            return response;
+        }
+        throw response;
+    }
+
+    private createFetchParams(context: RequestOpts) {
+        let url = this.configuration.basePath + context.path;
+        if (context.query !== undefined && Object.keys(context.query).length !== 0) {
+            // only add the querystring to the URL if there are query parameters.
+            // this is done to avoid urls ending with a "?" character which buggy webservers
+            // do not handle correctly sometimes.
+            url += '?' + querystring(context.query);
+        }
+        const body = (context.body instanceof FormData || isBlob(context.body))
+	    ? context.body
+	    : JSON.stringify(context.body);
+        const init = {
+            method: context.method,
+            headers: context.headers,
+            body,
+        };
+        return { url, init };
+    }
+
+    private fetchApi = async (url: string, init: RequestInit) => {
+        let fetchParams = { url, init };
+        for (const middleware of this.middleware) {
+            if (middleware.pre) {
+                fetchParams = await middleware.pre({
+                    fetch: this.fetchApi,
+                    ...fetchParams,
+                }) || fetchParams;
+            }
+        }
+        let response = await this.configuration.fetchApi(fetchParams.url, fetchParams.init);
+        for (const middleware of this.middleware) {
+            if (middleware.post) {
+                response = await middleware.post({
+                    fetch: this.fetchApi,
+                    url,
+                    init,
+                    response: response.clone(),
+                }) || response;
+            }
+        }
+        return response;
+    }
+
+    /**
+     * Create a shallow clone of `this` by constructing a new instance
+     * and then shallow cloning data members.
+     */
+    private clone<T extends BaseAPI>(this: T): T {
+        const constructor = this.constructor as any;
+        const next = new constructor(this.configuration);
+        next.middleware = this.middleware.slice();
+        return next;
+    }
+};
+
+export class RequiredError extends Error {
+    name: "RequiredError" = "RequiredError";
+    constructor(public field: string, msg?: string) {
+        super(msg);
+    }
+}
+
+export const COLLECTION_FORMATS = {
+    csv: ",",
+    ssv: " ",
+    tsv: "\t",
+    pipes: "|",
+};
+
+export type FetchAPI = GlobalFetch['fetch'];
+
+export interface ConfigurationParameters {
+    basePath?: string; // override base path
+    fetchApi?: FetchAPI; // override for fetch implementation
+    middleware?: Middleware[]; // middleware to apply before/after fetch requests
+    username?: string; // parameter for basic security
+    password?: string; // parameter for basic security
+    apiKey?: string | ((name: string) => string); // parameter for apiKey security
+    accessToken?: string | ((name: string, scopes?: string[]) => string); // parameter for oauth2 security
+}
+
+export class Configuration {
+    constructor(private configuration: ConfigurationParameters = {}) {}
+
+    get basePath(): string {
+        return this.configuration.basePath || BASE_PATH;
+    }
+
+    get fetchApi(): FetchAPI {
+        return this.configuration.fetchApi || window.fetch.bind(window);
+    }
+
+    get middleware(): Middleware[] {
+        return this.configuration.middleware || [];
+    }
+
+    get username(): string | undefined {
+        return this.configuration.username;
+    }
+
+    get password(): string | undefined {
+        return this.configuration.password;
+    }
+
+    get apiKey(): ((name: string) => string) | undefined {
+        const apiKey = this.configuration.apiKey;
+        if (apiKey) {
+            return typeof apiKey === 'function' ? apiKey : () => apiKey;
+        }
+        return undefined;
+    }
+
+    get accessToken(): ((name: string, scopes?: string[]) => string) | undefined {
+        const accessToken = this.configuration.accessToken;
+        if (accessToken) {
+            return typeof accessToken === 'function' ? accessToken : () => accessToken;
+        }
+        return undefined;
+    }
+}
+
+export type Json = any;
+export type HTTPMethod = 'GET' | 'POST' | 'PUT' | 'PATCH' | 'DELETE' | 'OPTIONS';
+export type HTTPHeaders = { [key: string]: string };
+export type HTTPQuery = { [key: string]: string | number | null | boolean | Array<string | number | null | boolean> | HTTPQuery };
+export type HTTPBody = Json | FormData;
+export type ModelPropertyNaming = 'camelCase' | 'snake_case' | 'PascalCase' | 'original';
+
+export interface FetchParams {
+    url: string;
+    init: RequestInit;
+}
+
+export interface RequestOpts {
+    path: string;
+    method: HTTPMethod;
+    headers: HTTPHeaders;
+    query?: HTTPQuery;
+    body?: HTTPBody;
+}
+
+export function exists(json: any, key: string) {
+    const value = json[key];
+    return value !== null && value !== undefined;
+}
+
+export function querystring(params: HTTPQuery, prefix: string = ''): string {
+    return Object.keys(params)
+        .map((key) => {
+            const fullKey = prefix + (prefix.length ? `[${key}]` : key);
+            const value = params[key];
+            if (value instanceof Array) {
+                const multiValue = value.map(singleValue => encodeURIComponent(String(singleValue)))
+                    .join(`&${encodeURIComponent(fullKey)}=`);
+                return `${encodeURIComponent(fullKey)}=${multiValue}`;
+            }
+            if (value instanceof Object) {
+                return querystring(value as HTTPQuery, fullKey);
+            }
+            return `${encodeURIComponent(fullKey)}=${encodeURIComponent(String(value))}`;
+        })
+        .filter(part => part.length > 0)
+        .join('&');
+}
+
+export function mapValues(data: any, fn: (item: any) => any) {
+  return Object.keys(data).reduce(
+    (acc, key) => ({ ...acc, [key]: fn(data[key]) }),
+    {}
+  );
+}
+
+export interface RequestContext {
+    fetch: FetchAPI;
+    url: string;
+    init: RequestInit;
+}
+
+export interface ResponseContext {
+    fetch: FetchAPI;
+    url: string;
+    init: RequestInit;
+    response: Response;
+}
+
+export interface Middleware {
+    pre?(context: RequestContext): Promise<FetchParams | void>;
+    post?(context: ResponseContext): Promise<Response | void>;
+}
+
+export interface ApiResponse<T> {
+    raw: Response;
+    value(): Promise<T>;
+}
+
+export interface ResponseTransformer<T> {
+    (json: any): T;
+}
+
+export class JSONApiResponse<T> {
+    constructor(public raw: Response, private transformer: ResponseTransformer<T> = (jsonValue: any) => jsonValue) {}
+
+    async value() {
+        return this.transformer(await this.raw.json());
+    }
+}
+
+export class VoidApiResponse {
+    constructor(public raw: Response) {}
+
+    async value() {
+        return undefined;
+    }
+}
+
+export class BlobApiResponse {
+    constructor(public raw: Response) {}
+
+    async value() {
+        return await this.raw.blob();
+    };
+}
+
+export class TextApiResponse {
+    constructor(public raw: Response) {}
+
+    async value() {
+        return await this.raw.text();
+    };
+}
diff --git a/samples/client/petstore/typescript-fetch/builds/multiple-parameters/tsconfig.json b/samples/client/petstore/typescript-fetch/builds/multiple-parameters/tsconfig.json
new file mode 100644
index 0000000000..d65f2a95af
--- /dev/null
+++ b/samples/client/petstore/typescript-fetch/builds/multiple-parameters/tsconfig.json
@@ -0,0 +1,21 @@
+{
+  "compilerOptions": {
+    "declaration": true,
+    "target": "es5",
+    "module": "commonjs",
+    "moduleResolution": "node",
+    "outDir": "dist",
+    "rootDir": ".",
+    "lib": [
+      "es6",
+      "dom"
+    ],
+    "typeRoots": [
+      "node_modules/@types"
+    ]
+  },
+  "exclude": [
+    "dist",
+    "node_modules"
+  ]
+}
diff --git a/samples/client/petstore/typescript-fetch/builds/with-interfaces/apis/PetApi.ts b/samples/client/petstore/typescript-fetch/builds/with-interfaces/apis/PetApi.ts
index 1fcb27ef1c..e43896cc29 100644
--- a/samples/client/petstore/typescript-fetch/builds/with-interfaces/apis/PetApi.ts
+++ b/samples/client/petstore/typescript-fetch/builds/with-interfaces/apis/PetApi.ts
@@ -98,9 +98,9 @@ export class PetApi extends runtime.BaseAPI {
         return new runtime.VoidApiResponse(response);
     }
 
-    /**
-     * Add a new pet to the store
-     */
+   /**
+    * Add a new pet to the store
+    */
     async addPet(requestParameters: AddPetRequest): Promise<void> {
         await this.addPetRaw(requestParameters);
     }
@@ -140,9 +140,9 @@ export class PetApi extends runtime.BaseAPI {
         return new runtime.VoidApiResponse(response);
     }
 
-    /**
-     * Deletes a pet
-     */
+   /**
+    * Deletes a pet
+    */
     async deletePet(requestParameters: DeletePetRequest): Promise<void> {
         await this.deletePetRaw(requestParameters);
     }
@@ -183,10 +183,10 @@ export class PetApi extends runtime.BaseAPI {
         return new runtime.JSONApiResponse(response, (jsonValue) => jsonValue.map(PetFromJSON));
     }
 
-    /**
-     * Multiple status values can be provided with comma separated strings
-     * Finds Pets by status
-     */
+   /**
+    * Multiple status values can be provided with comma separated strings
+    * Finds Pets by status
+    */
     async findPetsByStatus(requestParameters: FindPetsByStatusRequest): Promise<Array<Pet>> {
         const response = await this.findPetsByStatusRaw(requestParameters);
         return await response.value();
@@ -228,10 +228,10 @@ export class PetApi extends runtime.BaseAPI {
         return new runtime.JSONApiResponse(response, (jsonValue) => jsonValue.map(PetFromJSON));
     }
 
-    /**
-     * Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3 for testing.
-     * Finds Pets by tags
-     */
+   /**
+    * Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3 for testing.
+    * Finds Pets by tags
+    */
     async findPetsByTags(requestParameters: FindPetsByTagsRequest): Promise<Array<Pet>> {
         const response = await this.findPetsByTagsRaw(requestParameters);
         return await response.value();
@@ -264,10 +264,10 @@ export class PetApi extends runtime.BaseAPI {
         return new runtime.JSONApiResponse(response, (jsonValue) => PetFromJSON(jsonValue));
     }
 
-    /**
-     * Returns a single pet
-     * Find pet by ID
-     */
+   /**
+    * Returns a single pet
+    * Find pet by ID
+    */
     async getPetById(requestParameters: GetPetByIdRequest): Promise<Pet> {
         const response = await this.getPetByIdRaw(requestParameters);
         return await response.value();
@@ -307,9 +307,9 @@ export class PetApi extends runtime.BaseAPI {
         return new runtime.VoidApiResponse(response);
     }
 
-    /**
-     * Update an existing pet
-     */
+   /**
+    * Update an existing pet
+    */
     async updatePet(requestParameters: UpdatePetRequest): Promise<void> {
         await this.updatePetRaw(requestParameters);
     }
@@ -355,9 +355,9 @@ export class PetApi extends runtime.BaseAPI {
         return new runtime.VoidApiResponse(response);
     }
 
-    /**
-     * Updates a pet in the store with form data
-     */
+   /**
+    * Updates a pet in the store with form data
+    */
     async updatePetWithForm(requestParameters: UpdatePetWithFormRequest): Promise<void> {
         await this.updatePetWithFormRaw(requestParameters);
     }
@@ -403,9 +403,9 @@ export class PetApi extends runtime.BaseAPI {
         return new runtime.JSONApiResponse(response, (jsonValue) => ModelApiResponseFromJSON(jsonValue));
     }
 
-    /**
-     * uploads an image
-     */
+   /**
+    * uploads an image
+    */
     async uploadFile(requestParameters: UploadFileRequest): Promise<ModelApiResponse> {
         const response = await this.uploadFileRaw(requestParameters);
         return await response.value();
diff --git a/samples/client/petstore/typescript-fetch/builds/with-interfaces/apis/StoreApi.ts b/samples/client/petstore/typescript-fetch/builds/with-interfaces/apis/StoreApi.ts
index 4b645dea98..9166609816 100644
--- a/samples/client/petstore/typescript-fetch/builds/with-interfaces/apis/StoreApi.ts
+++ b/samples/client/petstore/typescript-fetch/builds/with-interfaces/apis/StoreApi.ts
@@ -59,10 +59,10 @@ export class StoreApi extends runtime.BaseAPI {
         return new runtime.VoidApiResponse(response);
     }
 
-    /**
-     * For valid response try integer IDs with value < 1000. Anything above 1000 or nonintegers will generate API errors
-     * Delete purchase order by ID
-     */
+   /**
+    * For valid response try integer IDs with value < 1000. Anything above 1000 or nonintegers will generate API errors
+    * Delete purchase order by ID
+    */
     async deleteOrder(requestParameters: DeleteOrderRequest): Promise<void> {
         await this.deleteOrderRaw(requestParameters);
     }
@@ -90,10 +90,10 @@ export class StoreApi extends runtime.BaseAPI {
         return new runtime.JSONApiResponse<any>(response);
     }
 
-    /**
-     * Returns a map of status codes to quantities
-     * Returns pet inventories by status
-     */
+   /**
+    * Returns a map of status codes to quantities
+    * Returns pet inventories by status
+    */
     async getInventory(): Promise<{ [key: string]: number; }> {
         const response = await this.getInventoryRaw();
         return await response.value();
@@ -122,10 +122,10 @@ export class StoreApi extends runtime.BaseAPI {
         return new runtime.JSONApiResponse(response, (jsonValue) => OrderFromJSON(jsonValue));
     }
 
-    /**
-     * For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
-     * Find purchase order by ID
-     */
+   /**
+    * For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+    * Find purchase order by ID
+    */
     async getOrderById(requestParameters: GetOrderByIdRequest): Promise<Order> {
         const response = await this.getOrderByIdRaw(requestParameters);
         return await response.value();
@@ -156,9 +156,9 @@ export class StoreApi extends runtime.BaseAPI {
         return new runtime.JSONApiResponse(response, (jsonValue) => OrderFromJSON(jsonValue));
     }
 
-    /**
-     * Place an order for a pet
-     */
+   /**
+    * Place an order for a pet
+    */
     async placeOrder(requestParameters: PlaceOrderRequest): Promise<Order> {
         const response = await this.placeOrderRaw(requestParameters);
         return await response.value();
diff --git a/samples/client/petstore/typescript-fetch/builds/with-interfaces/apis/UserApi.ts b/samples/client/petstore/typescript-fetch/builds/with-interfaces/apis/UserApi.ts
index 4126b817ee..1696b600f5 100644
--- a/samples/client/petstore/typescript-fetch/builds/with-interfaces/apis/UserApi.ts
+++ b/samples/client/petstore/typescript-fetch/builds/with-interfaces/apis/UserApi.ts
@@ -80,10 +80,10 @@ export class UserApi extends runtime.BaseAPI {
         return new runtime.VoidApiResponse(response);
     }
 
-    /**
-     * This can only be done by the logged in user.
-     * Create user
-     */
+   /**
+    * This can only be done by the logged in user.
+    * Create user
+    */
     async createUser(requestParameters: CreateUserRequest): Promise<void> {
         await this.createUserRaw(requestParameters);
     }
@@ -113,9 +113,9 @@ export class UserApi extends runtime.BaseAPI {
         return new runtime.VoidApiResponse(response);
     }
 
-    /**
-     * Creates list of users with given input array
-     */
+   /**
+    * Creates list of users with given input array
+    */
     async createUsersWithArrayInput(requestParameters: CreateUsersWithArrayInputRequest): Promise<void> {
         await this.createUsersWithArrayInputRaw(requestParameters);
     }
@@ -145,9 +145,9 @@ export class UserApi extends runtime.BaseAPI {
         return new runtime.VoidApiResponse(response);
     }
 
-    /**
-     * Creates list of users with given input array
-     */
+   /**
+    * Creates list of users with given input array
+    */
     async createUsersWithListInput(requestParameters: CreateUsersWithListInputRequest): Promise<void> {
         await this.createUsersWithListInputRaw(requestParameters);
     }
@@ -175,10 +175,10 @@ export class UserApi extends runtime.BaseAPI {
         return new runtime.VoidApiResponse(response);
     }
 
-    /**
-     * This can only be done by the logged in user.
-     * Delete user
-     */
+   /**
+    * This can only be done by the logged in user.
+    * Delete user
+    */
     async deleteUser(requestParameters: DeleteUserRequest): Promise<void> {
         await this.deleteUserRaw(requestParameters);
     }
@@ -205,9 +205,9 @@ export class UserApi extends runtime.BaseAPI {
         return new runtime.JSONApiResponse(response, (jsonValue) => UserFromJSON(jsonValue));
     }
 
-    /**
-     * Get user by user name
-     */
+   /**
+    * Get user by user name
+    */
     async getUserByName(requestParameters: GetUserByNameRequest): Promise<User> {
         const response = await this.getUserByNameRaw(requestParameters);
         return await response.value();
@@ -247,9 +247,9 @@ export class UserApi extends runtime.BaseAPI {
         return new runtime.TextApiResponse(response);
     }
 
-    /**
-     * Logs user into the system
-     */
+   /**
+    * Logs user into the system
+    */
     async loginUser(requestParameters: LoginUserRequest): Promise<string> {
         const response = await this.loginUserRaw(requestParameters);
         return await response.value();
@@ -273,9 +273,9 @@ export class UserApi extends runtime.BaseAPI {
         return new runtime.VoidApiResponse(response);
     }
 
-    /**
-     * Logs out current logged in user session
-     */
+   /**
+    * Logs out current logged in user session
+    */
     async logoutUser(): Promise<void> {
         await this.logoutUserRaw();
     }
@@ -310,10 +310,10 @@ export class UserApi extends runtime.BaseAPI {
         return new runtime.VoidApiResponse(response);
     }
 
-    /**
-     * This can only be done by the logged in user.
-     * Updated user
-     */
+   /**
+    * This can only be done by the logged in user.
+    * Updated user
+    */
     async updateUser(requestParameters: UpdateUserRequest): Promise<void> {
         await this.updateUserRaw(requestParameters);
     }
diff --git a/samples/client/petstore/typescript-fetch/builds/with-interfaces/models/ApiResponse.ts b/samples/client/petstore/typescript-fetch/builds/with-interfaces/models/ApiResponse.ts
deleted file mode 100644
index 2275473e61..0000000000
--- a/samples/client/petstore/typescript-fetch/builds/with-interfaces/models/ApiResponse.ts
+++ /dev/null
@@ -1,60 +0,0 @@
-// tslint:disable
-/**
- * OpenAPI Petstore
- * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters.
- *
- * OpenAPI spec version: 1.0.0
- * 
- *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-import { exists } from '../runtime';
-/**
- * Describes the result of uploading an image resource
- * @export
- * @interface ApiResponse
- */
-export interface ApiResponse {
-    /**
-     * 
-     * @type {number}
-     * @memberof ApiResponse
-     */
-    code?: number;
-    /**
-     * 
-     * @type {string}
-     * @memberof ApiResponse
-     */
-    type?: string;
-    /**
-     * 
-     * @type {string}
-     * @memberof ApiResponse
-     */
-    message?: string;
-}
-
-export function ApiResponseFromJSON(json: any): ApiResponse {
-    return {
-        'code': !exists(json, 'code') ? undefined : json['code'],
-        'type': !exists(json, 'type') ? undefined : json['type'],
-        'message': !exists(json, 'message') ? undefined : json['message'],
-    };
-}
-
-export function ApiResponseToJSON(value?: ApiResponse): any {
-    if (value === undefined) {
-        return undefined;
-    }
-    return {
-        'code': value.code,
-        'type': value.type,
-        'message': value.message,
-    };
-}
-
-
diff --git a/samples/client/petstore/typescript-fetch/builds/with-interfaces/models/InlineObject1.ts b/samples/client/petstore/typescript-fetch/builds/with-interfaces/models/InlineObject1.ts
deleted file mode 100644
index 4cd90b1379..0000000000
--- a/samples/client/petstore/typescript-fetch/builds/with-interfaces/models/InlineObject1.ts
+++ /dev/null
@@ -1,52 +0,0 @@
-// tslint:disable
-/**
- * OpenAPI Petstore
- * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters.
- *
- * The version of the OpenAPI document: 1.0.0
- * 
- *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-import { exists, mapValues } from '../runtime';
-/**
- * 
- * @export
- * @interface InlineObject1
- */
-export interface InlineObject1 {
-    /**
-     * Additional data to pass to server
-     * @type {string}
-     * @memberof InlineObject1
-     */
-    additionalMetadata?: string;
-    /**
-     * file to upload
-     * @type {Blob}
-     * @memberof InlineObject1
-     */
-    file?: Blob;
-}
-
-export function InlineObject1FromJSON(json: any): InlineObject1 {
-    return {
-        'additionalMetadata': !exists(json, 'additionalMetadata') ? undefined : json['additionalMetadata'],
-        'file': !exists(json, 'file') ? undefined : json['file'],
-    };
-}
-
-export function InlineObject1ToJSON(value?: InlineObject1): any {
-    if (value === undefined) {
-        return undefined;
-    }
-    return {
-        'additionalMetadata': value.additionalMetadata,
-        'file': value.file,
-    };
-}
-
-
diff --git a/samples/client/petstore/typescript-fetch/builds/with-npm-version/apis/PetApi.ts b/samples/client/petstore/typescript-fetch/builds/with-npm-version/apis/PetApi.ts
index 1fcb27ef1c..e43896cc29 100644
--- a/samples/client/petstore/typescript-fetch/builds/with-npm-version/apis/PetApi.ts
+++ b/samples/client/petstore/typescript-fetch/builds/with-npm-version/apis/PetApi.ts
@@ -98,9 +98,9 @@ export class PetApi extends runtime.BaseAPI {
         return new runtime.VoidApiResponse(response);
     }
 
-    /**
-     * Add a new pet to the store
-     */
+   /**
+    * Add a new pet to the store
+    */
     async addPet(requestParameters: AddPetRequest): Promise<void> {
         await this.addPetRaw(requestParameters);
     }
@@ -140,9 +140,9 @@ export class PetApi extends runtime.BaseAPI {
         return new runtime.VoidApiResponse(response);
     }
 
-    /**
-     * Deletes a pet
-     */
+   /**
+    * Deletes a pet
+    */
     async deletePet(requestParameters: DeletePetRequest): Promise<void> {
         await this.deletePetRaw(requestParameters);
     }
@@ -183,10 +183,10 @@ export class PetApi extends runtime.BaseAPI {
         return new runtime.JSONApiResponse(response, (jsonValue) => jsonValue.map(PetFromJSON));
     }
 
-    /**
-     * Multiple status values can be provided with comma separated strings
-     * Finds Pets by status
-     */
+   /**
+    * Multiple status values can be provided with comma separated strings
+    * Finds Pets by status
+    */
     async findPetsByStatus(requestParameters: FindPetsByStatusRequest): Promise<Array<Pet>> {
         const response = await this.findPetsByStatusRaw(requestParameters);
         return await response.value();
@@ -228,10 +228,10 @@ export class PetApi extends runtime.BaseAPI {
         return new runtime.JSONApiResponse(response, (jsonValue) => jsonValue.map(PetFromJSON));
     }
 
-    /**
-     * Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3 for testing.
-     * Finds Pets by tags
-     */
+   /**
+    * Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3 for testing.
+    * Finds Pets by tags
+    */
     async findPetsByTags(requestParameters: FindPetsByTagsRequest): Promise<Array<Pet>> {
         const response = await this.findPetsByTagsRaw(requestParameters);
         return await response.value();
@@ -264,10 +264,10 @@ export class PetApi extends runtime.BaseAPI {
         return new runtime.JSONApiResponse(response, (jsonValue) => PetFromJSON(jsonValue));
     }
 
-    /**
-     * Returns a single pet
-     * Find pet by ID
-     */
+   /**
+    * Returns a single pet
+    * Find pet by ID
+    */
     async getPetById(requestParameters: GetPetByIdRequest): Promise<Pet> {
         const response = await this.getPetByIdRaw(requestParameters);
         return await response.value();
@@ -307,9 +307,9 @@ export class PetApi extends runtime.BaseAPI {
         return new runtime.VoidApiResponse(response);
     }
 
-    /**
-     * Update an existing pet
-     */
+   /**
+    * Update an existing pet
+    */
     async updatePet(requestParameters: UpdatePetRequest): Promise<void> {
         await this.updatePetRaw(requestParameters);
     }
@@ -355,9 +355,9 @@ export class PetApi extends runtime.BaseAPI {
         return new runtime.VoidApiResponse(response);
     }
 
-    /**
-     * Updates a pet in the store with form data
-     */
+   /**
+    * Updates a pet in the store with form data
+    */
     async updatePetWithForm(requestParameters: UpdatePetWithFormRequest): Promise<void> {
         await this.updatePetWithFormRaw(requestParameters);
     }
@@ -403,9 +403,9 @@ export class PetApi extends runtime.BaseAPI {
         return new runtime.JSONApiResponse(response, (jsonValue) => ModelApiResponseFromJSON(jsonValue));
     }
 
-    /**
-     * uploads an image
-     */
+   /**
+    * uploads an image
+    */
     async uploadFile(requestParameters: UploadFileRequest): Promise<ModelApiResponse> {
         const response = await this.uploadFileRaw(requestParameters);
         return await response.value();
diff --git a/samples/client/petstore/typescript-fetch/builds/with-npm-version/apis/StoreApi.ts b/samples/client/petstore/typescript-fetch/builds/with-npm-version/apis/StoreApi.ts
index 4b645dea98..9166609816 100644
--- a/samples/client/petstore/typescript-fetch/builds/with-npm-version/apis/StoreApi.ts
+++ b/samples/client/petstore/typescript-fetch/builds/with-npm-version/apis/StoreApi.ts
@@ -59,10 +59,10 @@ export class StoreApi extends runtime.BaseAPI {
         return new runtime.VoidApiResponse(response);
     }
 
-    /**
-     * For valid response try integer IDs with value < 1000. Anything above 1000 or nonintegers will generate API errors
-     * Delete purchase order by ID
-     */
+   /**
+    * For valid response try integer IDs with value < 1000. Anything above 1000 or nonintegers will generate API errors
+    * Delete purchase order by ID
+    */
     async deleteOrder(requestParameters: DeleteOrderRequest): Promise<void> {
         await this.deleteOrderRaw(requestParameters);
     }
@@ -90,10 +90,10 @@ export class StoreApi extends runtime.BaseAPI {
         return new runtime.JSONApiResponse<any>(response);
     }
 
-    /**
-     * Returns a map of status codes to quantities
-     * Returns pet inventories by status
-     */
+   /**
+    * Returns a map of status codes to quantities
+    * Returns pet inventories by status
+    */
     async getInventory(): Promise<{ [key: string]: number; }> {
         const response = await this.getInventoryRaw();
         return await response.value();
@@ -122,10 +122,10 @@ export class StoreApi extends runtime.BaseAPI {
         return new runtime.JSONApiResponse(response, (jsonValue) => OrderFromJSON(jsonValue));
     }
 
-    /**
-     * For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
-     * Find purchase order by ID
-     */
+   /**
+    * For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+    * Find purchase order by ID
+    */
     async getOrderById(requestParameters: GetOrderByIdRequest): Promise<Order> {
         const response = await this.getOrderByIdRaw(requestParameters);
         return await response.value();
@@ -156,9 +156,9 @@ export class StoreApi extends runtime.BaseAPI {
         return new runtime.JSONApiResponse(response, (jsonValue) => OrderFromJSON(jsonValue));
     }
 
-    /**
-     * Place an order for a pet
-     */
+   /**
+    * Place an order for a pet
+    */
     async placeOrder(requestParameters: PlaceOrderRequest): Promise<Order> {
         const response = await this.placeOrderRaw(requestParameters);
         return await response.value();
diff --git a/samples/client/petstore/typescript-fetch/builds/with-npm-version/apis/UserApi.ts b/samples/client/petstore/typescript-fetch/builds/with-npm-version/apis/UserApi.ts
index 4126b817ee..1696b600f5 100644
--- a/samples/client/petstore/typescript-fetch/builds/with-npm-version/apis/UserApi.ts
+++ b/samples/client/petstore/typescript-fetch/builds/with-npm-version/apis/UserApi.ts
@@ -80,10 +80,10 @@ export class UserApi extends runtime.BaseAPI {
         return new runtime.VoidApiResponse(response);
     }
 
-    /**
-     * This can only be done by the logged in user.
-     * Create user
-     */
+   /**
+    * This can only be done by the logged in user.
+    * Create user
+    */
     async createUser(requestParameters: CreateUserRequest): Promise<void> {
         await this.createUserRaw(requestParameters);
     }
@@ -113,9 +113,9 @@ export class UserApi extends runtime.BaseAPI {
         return new runtime.VoidApiResponse(response);
     }
 
-    /**
-     * Creates list of users with given input array
-     */
+   /**
+    * Creates list of users with given input array
+    */
     async createUsersWithArrayInput(requestParameters: CreateUsersWithArrayInputRequest): Promise<void> {
         await this.createUsersWithArrayInputRaw(requestParameters);
     }
@@ -145,9 +145,9 @@ export class UserApi extends runtime.BaseAPI {
         return new runtime.VoidApiResponse(response);
     }
 
-    /**
-     * Creates list of users with given input array
-     */
+   /**
+    * Creates list of users with given input array
+    */
     async createUsersWithListInput(requestParameters: CreateUsersWithListInputRequest): Promise<void> {
         await this.createUsersWithListInputRaw(requestParameters);
     }
@@ -175,10 +175,10 @@ export class UserApi extends runtime.BaseAPI {
         return new runtime.VoidApiResponse(response);
     }
 
-    /**
-     * This can only be done by the logged in user.
-     * Delete user
-     */
+   /**
+    * This can only be done by the logged in user.
+    * Delete user
+    */
     async deleteUser(requestParameters: DeleteUserRequest): Promise<void> {
         await this.deleteUserRaw(requestParameters);
     }
@@ -205,9 +205,9 @@ export class UserApi extends runtime.BaseAPI {
         return new runtime.JSONApiResponse(response, (jsonValue) => UserFromJSON(jsonValue));
     }
 
-    /**
-     * Get user by user name
-     */
+   /**
+    * Get user by user name
+    */
     async getUserByName(requestParameters: GetUserByNameRequest): Promise<User> {
         const response = await this.getUserByNameRaw(requestParameters);
         return await response.value();
@@ -247,9 +247,9 @@ export class UserApi extends runtime.BaseAPI {
         return new runtime.TextApiResponse(response);
     }
 
-    /**
-     * Logs user into the system
-     */
+   /**
+    * Logs user into the system
+    */
     async loginUser(requestParameters: LoginUserRequest): Promise<string> {
         const response = await this.loginUserRaw(requestParameters);
         return await response.value();
@@ -273,9 +273,9 @@ export class UserApi extends runtime.BaseAPI {
         return new runtime.VoidApiResponse(response);
     }
 
-    /**
-     * Logs out current logged in user session
-     */
+   /**
+    * Logs out current logged in user session
+    */
     async logoutUser(): Promise<void> {
         await this.logoutUserRaw();
     }
@@ -310,10 +310,10 @@ export class UserApi extends runtime.BaseAPI {
         return new runtime.VoidApiResponse(response);
     }
 
-    /**
-     * This can only be done by the logged in user.
-     * Updated user
-     */
+   /**
+    * This can only be done by the logged in user.
+    * Updated user
+    */
     async updateUser(requestParameters: UpdateUserRequest): Promise<void> {
         await this.updateUserRaw(requestParameters);
     }
diff --git a/samples/client/petstore/typescript-fetch/builds/with-npm-version/models/ApiResponse.ts b/samples/client/petstore/typescript-fetch/builds/with-npm-version/models/ApiResponse.ts
deleted file mode 100644
index 2275473e61..0000000000
--- a/samples/client/petstore/typescript-fetch/builds/with-npm-version/models/ApiResponse.ts
+++ /dev/null
@@ -1,60 +0,0 @@
-// tslint:disable
-/**
- * OpenAPI Petstore
- * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters.
- *
- * OpenAPI spec version: 1.0.0
- * 
- *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-import { exists } from '../runtime';
-/**
- * Describes the result of uploading an image resource
- * @export
- * @interface ApiResponse
- */
-export interface ApiResponse {
-    /**
-     * 
-     * @type {number}
-     * @memberof ApiResponse
-     */
-    code?: number;
-    /**
-     * 
-     * @type {string}
-     * @memberof ApiResponse
-     */
-    type?: string;
-    /**
-     * 
-     * @type {string}
-     * @memberof ApiResponse
-     */
-    message?: string;
-}
-
-export function ApiResponseFromJSON(json: any): ApiResponse {
-    return {
-        'code': !exists(json, 'code') ? undefined : json['code'],
-        'type': !exists(json, 'type') ? undefined : json['type'],
-        'message': !exists(json, 'message') ? undefined : json['message'],
-    };
-}
-
-export function ApiResponseToJSON(value?: ApiResponse): any {
-    if (value === undefined) {
-        return undefined;
-    }
-    return {
-        'code': value.code,
-        'type': value.type,
-        'message': value.message,
-    };
-}
-
-
diff --git a/samples/client/petstore/typescript-fetch/builds/with-npm-version/models/InlineObject.ts b/samples/client/petstore/typescript-fetch/builds/with-npm-version/models/InlineObject.ts
deleted file mode 100644
index 2998b1463c..0000000000
--- a/samples/client/petstore/typescript-fetch/builds/with-npm-version/models/InlineObject.ts
+++ /dev/null
@@ -1,52 +0,0 @@
-// tslint:disable
-/**
- * OpenAPI Petstore
- * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters.
- *
- * The version of the OpenAPI document: 1.0.0
- * 
- *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-import { exists, mapValues } from '../runtime';
-/**
- * 
- * @export
- * @interface InlineObject
- */
-export interface InlineObject {
-    /**
-     * Updated name of the pet
-     * @type {string}
-     * @memberof InlineObject
-     */
-    name?: string;
-    /**
-     * Updated status of the pet
-     * @type {string}
-     * @memberof InlineObject
-     */
-    status?: string;
-}
-
-export function InlineObjectFromJSON(json: any): InlineObject {
-    return {
-        'name': !exists(json, 'name') ? undefined : json['name'],
-        'status': !exists(json, 'status') ? undefined : json['status'],
-    };
-}
-
-export function InlineObjectToJSON(value?: InlineObject): any {
-    if (value === undefined) {
-        return undefined;
-    }
-    return {
-        'name': value.name,
-        'status': value.status,
-    };
-}
-
-
diff --git a/samples/client/petstore/typescript-fetch/builds/with-npm-version/models/InlineObject1.ts b/samples/client/petstore/typescript-fetch/builds/with-npm-version/models/InlineObject1.ts
deleted file mode 100644
index 4cd90b1379..0000000000
--- a/samples/client/petstore/typescript-fetch/builds/with-npm-version/models/InlineObject1.ts
+++ /dev/null
@@ -1,52 +0,0 @@
-// tslint:disable
-/**
- * OpenAPI Petstore
- * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters.
- *
- * The version of the OpenAPI document: 1.0.0
- * 
- *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-import { exists, mapValues } from '../runtime';
-/**
- * 
- * @export
- * @interface InlineObject1
- */
-export interface InlineObject1 {
-    /**
-     * Additional data to pass to server
-     * @type {string}
-     * @memberof InlineObject1
-     */
-    additionalMetadata?: string;
-    /**
-     * file to upload
-     * @type {Blob}
-     * @memberof InlineObject1
-     */
-    file?: Blob;
-}
-
-export function InlineObject1FromJSON(json: any): InlineObject1 {
-    return {
-        'additionalMetadata': !exists(json, 'additionalMetadata') ? undefined : json['additionalMetadata'],
-        'file': !exists(json, 'file') ? undefined : json['file'],
-    };
-}
-
-export function InlineObject1ToJSON(value?: InlineObject1): any {
-    if (value === undefined) {
-        return undefined;
-    }
-    return {
-        'additionalMetadata': value.additionalMetadata,
-        'file': value.file,
-    };
-}
-
-
diff --git a/samples/client/petstore/typescript-fetch/builds/with-npm-version/package-lock.json b/samples/client/petstore/typescript-fetch/builds/with-npm-version/package-lock.json
deleted file mode 100644
index e8dc0d00b2..0000000000
--- a/samples/client/petstore/typescript-fetch/builds/with-npm-version/package-lock.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-  "name": "@swagger/typescript-fetch-petstore",
-  "version": "1.0.0",
-  "lockfileVersion": 1,
-  "requires": true,
-  "dependencies": {
-    "typescript": {
-      "version": "2.9.2",
-      "resolved": "https://registry.npmjs.org/typescript/-/typescript-2.9.2.tgz",
-      "integrity": "sha512-Gr4p6nFNaoufRIY4NMdpQRNmgxVIGMs4Fcu/ujdYk3nAZqk7supzBE9idmvfZIlH/Cuj//dvi+019qEue9lV0w==",
-      "dev": true
-    }
-  }
-}
diff --git a/samples/client/petstore/typescript-fetch/tests/default/package-lock.json b/samples/client/petstore/typescript-fetch/tests/default/package-lock.json
index 5310ef1dfb..400cf1276d 100644
--- a/samples/client/petstore/typescript-fetch/tests/default/package-lock.json
+++ b/samples/client/petstore/typescript-fetch/tests/default/package-lock.json
@@ -4,14 +4,11 @@
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
+    "@openapitools/typescript-fetch-petstore": {
+      "version": "file:../../builds/with-npm-version"
+    },
     "@swagger/typescript-fetch-petstore": {
-      "version": "file:../../builds/with-npm-version",
-      "dependencies": {
-        "typescript": {
-          "version": "2.9.2",
-          "bundled": true
-        }
-      }
+      "version": "file:../../builds/with-npm-version"
     },
     "@types/chai": {
       "version": "4.1.6",
@@ -1505,7 +1502,8 @@
         "ansi-regex": {
           "version": "2.1.1",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "aproba": {
           "version": "1.2.0",
@@ -1526,12 +1524,14 @@
         "balanced-match": {
           "version": "1.0.0",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "brace-expansion": {
           "version": "1.1.11",
           "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
             "balanced-match": "^1.0.0",
             "concat-map": "0.0.1"
@@ -1546,17 +1546,20 @@
         "code-point-at": {
           "version": "1.1.0",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "concat-map": {
           "version": "0.0.1",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "console-control-strings": {
           "version": "1.1.0",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "core-util-is": {
           "version": "1.0.2",
@@ -1673,7 +1676,8 @@
         "inherits": {
           "version": "2.0.3",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "ini": {
           "version": "1.3.5",
@@ -1685,6 +1689,7 @@
           "version": "1.0.0",
           "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
             "number-is-nan": "^1.0.0"
           }
@@ -1699,6 +1704,7 @@
           "version": "3.0.4",
           "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
             "brace-expansion": "^1.1.7"
           }
@@ -1706,12 +1712,14 @@
         "minimist": {
           "version": "0.0.8",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "minipass": {
           "version": "2.2.4",
           "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
             "safe-buffer": "^5.1.1",
             "yallist": "^3.0.0"
@@ -1730,6 +1738,7 @@
           "version": "0.5.1",
           "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
             "minimist": "0.0.8"
           }
@@ -1810,7 +1819,8 @@
         "number-is-nan": {
           "version": "1.0.1",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "object-assign": {
           "version": "4.1.1",
@@ -1822,6 +1832,7 @@
           "version": "1.4.0",
           "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
             "wrappy": "1"
           }
@@ -1907,7 +1918,8 @@
         "safe-buffer": {
           "version": "5.1.1",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "safer-buffer": {
           "version": "2.1.2",
@@ -1943,6 +1955,7 @@
           "version": "1.0.2",
           "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
             "code-point-at": "^1.0.0",
             "is-fullwidth-code-point": "^1.0.0",
@@ -1962,6 +1975,7 @@
           "version": "3.0.1",
           "bundled": true,
           "dev": true,
+          "optional": true,
           "requires": {
             "ansi-regex": "^2.0.0"
           }
@@ -2005,12 +2019,14 @@
         "wrappy": {
           "version": "1.0.2",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         },
         "yallist": {
           "version": "3.0.2",
           "bundled": true,
-          "dev": true
+          "dev": true,
+          "optional": true
         }
       }
     },
diff --git a/samples/client/petstore/typescript-fetch/tests/default/package.json b/samples/client/petstore/typescript-fetch/tests/default/package.json
index fee4a03b85..906804784f 100644
--- a/samples/client/petstore/typescript-fetch/tests/default/package.json
+++ b/samples/client/petstore/typescript-fetch/tests/default/package.json
@@ -1,6 +1,7 @@
 {
   "private": true,
   "dependencies": {
+    "@openapitools/typescript-fetch-petstore": "file:../../builds/with-npm-version",
     "@swagger/typescript-fetch-petstore": "file:../../builds/with-npm-version",
     "chai": "^4.1.0",
     "ts-node": "^3.3.0"

From a85bd0f8f9785b6d7f215da56085bafb8c647016 Mon Sep 17 00:00:00 2001
From: Michal Foksa <mail@michalfoksa.net>
Date: Thu, 18 Jul 2019 06:28:40 +0200
Subject: [PATCH 21/62] Include common lambdas in generators (#3368)

* Include commonly used Mustache lambdas in DefaultCodegen.
* Use or extend common Mustache lambdas from DefaultCodegen.
* Extract OnChangeLambda to own file.
* Javadoc fixed in addMustacheLambdas().
---
 .../openapitools/codegen/DefaultCodegen.java  | 55 +++++++++++++++-
 .../languages/AbstractCSharpCodegen.java      | 33 +++-------
 .../codegen/languages/AbstractCppCodegen.java | 31 +++-------
 .../languages/AbstractFSharpCodegen.java      | 35 +++--------
 .../languages/KotlinServerCodegen.java        | 27 --------
 .../languages/KotlinSpringServerCodegen.java  | 21 +++----
 .../languages/OpenAPIYamlGenerator.java       | 62 +++----------------
 .../ScalaPlayFrameworkServerCodegen.java      | 16 +++--
 .../templating/mustache/OnChangeLambda.java   | 40 ++++++++++++
 9 files changed, 141 insertions(+), 179 deletions(-)
 create mode 100644 modules/openapi-generator/src/main/java/org/openapitools/codegen/templating/mustache/OnChangeLambda.java

diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/DefaultCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/DefaultCodegen.java
index 5373b99e93..639f8448c3 100644
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/DefaultCodegen.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/DefaultCodegen.java
@@ -19,7 +19,11 @@ package org.openapitools.codegen;
 
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.google.common.base.CaseFormat;
+import com.google.common.collect.ImmutableMap;
+import com.samskivert.mustache.Mustache;
 import com.samskivert.mustache.Mustache.Compiler;
+import com.samskivert.mustache.Mustache.Lambda;
+
 import io.swagger.v3.core.util.Json;
 import io.swagger.v3.oas.models.OpenAPI;
 import io.swagger.v3.oas.models.Operation;
@@ -48,6 +52,11 @@ import org.openapitools.codegen.meta.GeneratorMetadata;
 import org.openapitools.codegen.meta.Stability;
 import org.openapitools.codegen.serializer.SerializerUtils;
 import org.openapitools.codegen.templating.MustacheEngineAdapter;
+import org.openapitools.codegen.templating.mustache.CamelCaseLambda;
+import org.openapitools.codegen.templating.mustache.IndentedLambda;
+import org.openapitools.codegen.templating.mustache.LowercaseLambda;
+import org.openapitools.codegen.templating.mustache.TitlecaseLambda;
+import org.openapitools.codegen.templating.mustache.UppercaseLambda;
 import org.openapitools.codegen.utils.ModelUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -199,6 +208,47 @@ public class DefaultCodegen implements CodegenConfig {
         }
     }
 
+    /***
+     * Preset map builder with commonly used Mustache lambdas.
+     *
+     * To extend the map, override addMustacheLambdas(), call parent method
+     * first and then add additional lambdas to the returned builder.
+     *
+     * If common lambdas are not desired, override addMustacheLambdas() method
+     * and return empty builder.
+     *
+     * @return preinitialized map builder with common lambdas
+     */
+    protected ImmutableMap.Builder<String, Lambda> addMustacheLambdas() {
+
+        return new ImmutableMap.Builder<String, Mustache.Lambda>()
+                .put("lowercase", new LowercaseLambda().generator(this))
+                .put("uppercase", new UppercaseLambda())
+                .put("titlecase", new TitlecaseLambda())
+                .put("camelcase", new CamelCaseLambda().generator(this))
+                .put("indented", new IndentedLambda())
+                .put("indented_8", new IndentedLambda(8, " "))
+                .put("indented_12", new IndentedLambda(12, " "))
+                .put("indented_16", new IndentedLambda(16, " "));
+    }
+
+    private void registerMustacheLambdas() {
+        ImmutableMap<String, Lambda> lambdas = addMustacheLambdas().build();
+
+        if (lambdas.size() == 0) {
+            return;
+        }
+
+        if (additionalProperties.containsKey("lambda")) {
+            LOGGER.warn("A property named 'lambda' already exists. Mustache lambdas renamed from 'lambda' to '_lambda'. " +
+                    "You'll likely need to use a custom template, " +
+                    "see https://github.com/OpenAPITools/openapi-generator/blob/master/docs/templating.md. ");
+            additionalProperties.put("_lambda", lambdas);
+        } else {
+            additionalProperties.put("lambda", lambdas);
+        }
+    }
+
     // override with any special post-processing for all models
     @SuppressWarnings({"static-method", "unchecked"})
     public Map<String, Object> postProcessAllModels(Map<String, Object> objs) {
@@ -1060,6 +1110,9 @@ public class DefaultCodegen implements CodegenConfig {
 
         // initialize special character mapping
         initalizeSpecialCharacterMapping();
+
+        // Register common Mustache lambdas.
+        registerMustacheLambdas();
     }
 
     /**
@@ -1523,7 +1576,7 @@ public class DefaultCodegen implements CodegenConfig {
                 // If the format matches a typeMapping (supplied with the --typeMappings flag)
                 // then treat the format as a primitive type.
                 // This allows the typeMapping flag to add a new custom type which can then
-                // be used in the format field.   
+                // be used in the format field.
                 return schema.getFormat();
             }
             return "string";
diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractCSharpCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractCSharpCodegen.java
index 1e7a454007..d39c6c07ab 100644
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractCSharpCodegen.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractCSharpCodegen.java
@@ -17,8 +17,9 @@
 
 package org.openapitools.codegen.languages;
 
-import com.google.common.collect.ImmutableMap;
-import com.samskivert.mustache.Mustache;
+import com.google.common.collect.ImmutableMap.Builder;
+import com.samskivert.mustache.Mustache.Lambda;
+
 import io.swagger.v3.core.util.Json;
 import io.swagger.v3.oas.models.media.ArraySchema;
 import io.swagger.v3.oas.models.media.Schema;
@@ -359,32 +360,12 @@ public abstract class AbstractCSharpCodegen extends DefaultCodegen implements Co
 
         // This either updates additionalProperties with the above fixes, or sets the default if the option was not specified.
         additionalProperties.put(CodegenConstants.INTERFACE_PREFIX, interfacePrefix);
-
-        addMustacheLambdas(additionalProperties);
     }
 
-    private void addMustacheLambdas(Map<String, Object> objs) {
-
-        Map<String, Mustache.Lambda> lambdas = new ImmutableMap.Builder<String, Mustache.Lambda>()
-                .put("lowercase", new LowercaseLambda().generator(this))
-                .put("uppercase", new UppercaseLambda())
-                .put("titlecase", new TitlecaseLambda())
-                .put("camelcase", new CamelCaseLambda().generator(this))
-                .put("camelcase_param", new CamelCaseLambda().generator(this).escapeAsParamName(true))
-                .put("indented", new IndentedLambda())
-                .put("indented_8", new IndentedLambda(8, " "))
-                .put("indented_12", new IndentedLambda(12, " "))
-                .put("indented_16", new IndentedLambda(16, " "))
-                .build();
-
-        if (objs.containsKey("lambda")) {
-            LOGGER.warn("A property named 'lambda' already exists. Mustache lambdas renamed from 'lambda' to '_lambda'. " +
-                    "You'll likely need to use a custom template, " +
-                    "see https://github.com/swagger-api/swagger-codegen#modifying-the-client-library-format. ");
-            objs.put("_lambda", lambdas);
-        } else {
-            objs.put("lambda", lambdas);
-        }
+    @Override
+    protected Builder<String, Lambda> addMustacheLambdas() {
+        return super.addMustacheLambdas()
+                .put("camelcase_param", new CamelCaseLambda().generator(this).escapeAsParamName(true));
     }
 
     @Override
diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractCppCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractCppCodegen.java
index 65105e467a..afbbae6684 100644
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractCppCodegen.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractCppCodegen.java
@@ -17,8 +17,8 @@
 
 package org.openapitools.codegen.languages;
 
-import com.google.common.collect.ImmutableMap;
-import com.samskivert.mustache.Mustache;
+import com.google.common.collect.ImmutableMap.Builder;
+import com.samskivert.mustache.Mustache.Lambda;
 
 import io.swagger.v3.oas.models.OpenAPI;
 import io.swagger.v3.oas.models.media.Schema;
@@ -35,7 +35,6 @@ import org.slf4j.LoggerFactory;
 import java.io.File;
 import java.net.URL;
 import java.util.Arrays;
-import java.util.Map;
 
 abstract public class AbstractCppCodegen extends DefaultCodegen implements CodegenConfig {
     private static final Logger LOGGER = LoggerFactory.getLogger(AbstractCppCodegen.class);
@@ -260,22 +259,12 @@ abstract public class AbstractCppCodegen extends DefaultCodegen implements Codeg
             LOGGER.info("Environment variable CPP_POST_PROCESS_FILE not defined so the C++ code may not be properly formatted. To define it, try 'export CPP_POST_PROCESS_FILE=\"/usr/local/bin/clang-format -i\"' (Linux/Mac)");
             LOGGER.info("NOTE: To enable file post-processing, 'enablePostProcessFile' must be set to `true` (--enable-post-process-file for CLI).");
         }
-
-        addMustacheLambdas(additionalProperties);
     }
 
-    private void addMustacheLambdas(Map<String, Object> objs) {
-
-        Map<String, Mustache.Lambda> lambdas = new ImmutableMap.Builder<String, Mustache.Lambda>()
-                .put("multiline_comment_4", new IndentedLambda(4, " ", "///"))
-                .build();
-
-        if (objs.containsKey("lambda")) {
-            LOGGER.warn("A property named 'lambda' already exists. Mustache lambdas renamed from 'lambda' to '_lambda'.");
-            objs.put("_lambda", lambdas);
-        } else {
-            objs.put("lambda", lambdas);
-        }
+    @Override
+    protected Builder<String, Lambda> addMustacheLambdas() {
+        return super.addMustacheLambdas()
+                .put("multiline_comment_4", new IndentedLambda(4, " ", "///"));
     }
 
     @Override
@@ -304,17 +293,17 @@ abstract public class AbstractCppCodegen extends DefaultCodegen implements Codeg
             }
         }
     }
-    
+
     @Override
     public void preprocessOpenAPI(OpenAPI openAPI) {
         URL url = URLPathUtils.getServerURL(openAPI);
         String port = URLPathUtils.getPort(url, "");
         String host = url.getHost();
         if(!port.isEmpty()) {
-            this.additionalProperties.put("serverPort", port);          
+            this.additionalProperties.put("serverPort", port);
         }
         if(!host.isEmpty()) {
-            this.additionalProperties.put("serverHost", host);          
-        }        
+            this.additionalProperties.put("serverHost", host);
+        }
     }
 }
diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractFSharpCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractFSharpCodegen.java
index 9d82448ffb..04a626eac7 100644
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractFSharpCodegen.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractFSharpCodegen.java
@@ -16,8 +16,9 @@
 
 package org.openapitools.codegen.languages;
 
-import com.google.common.collect.ImmutableMap;
-import com.samskivert.mustache.Mustache;
+import com.google.common.collect.ImmutableMap.Builder;
+import com.samskivert.mustache.Mustache.Lambda;
+
 import io.swagger.v3.core.util.Json;
 import io.swagger.v3.oas.models.media.ArraySchema;
 import io.swagger.v3.oas.models.media.Schema;
@@ -67,7 +68,7 @@ public abstract class AbstractFSharpCodegen extends DefaultCodegen implements Co
     protected Set<String> collectionTypes;
     protected Set<String> mapTypes;
 
-    // true if nullable types will be supported (as option) 
+    // true if nullable types will be supported (as option)
     protected boolean supportNullable = Boolean.TRUE;
 
     protected Set<String> nullableType = new HashSet<String>();
@@ -329,32 +330,12 @@ public abstract class AbstractFSharpCodegen extends DefaultCodegen implements Co
 
         // This either updates additionalProperties with the above fixes, or sets the default if the option was not specified.
         additionalProperties.put(CodegenConstants.INTERFACE_PREFIX, interfacePrefix);
-
-        addMustacheLambdas(additionalProperties);
     }
 
-    private void addMustacheLambdas(Map<String, Object> objs) {
-
-        Map<String, Mustache.Lambda> lambdas = new ImmutableMap.Builder<String, Mustache.Lambda>()
-                .put("lowercase", new LowercaseLambda().generator(this))
-                .put("uppercase", new UppercaseLambda())
-                .put("titlecase", new TitlecaseLambda())
-                .put("camelcase", new CamelCaseLambda().generator(this))
-                .put("camelcase_param", new CamelCaseLambda().generator(this).escapeAsParamName(true))
-                .put("indented", new IndentedLambda())
-                .put("indented_8", new IndentedLambda(8, " "))
-                .put("indented_12", new IndentedLambda(12, " "))
-                .put("indented_16", new IndentedLambda(16, " "))
-                .build();
-
-        if (objs.containsKey("lambda")) {
-            LOGGER.warn("A property named 'lambda' already exists. Mustache lambdas renamed from 'lambda' to '_lambda'. " +
-                    "You'll likely need to use a custom template, " +
-                    "see https://github.com/swagger-api/swagger-codegen#modifying-the-client-library-format. ");
-            objs.put("_lambda", lambdas);
-        } else {
-            objs.put("lambda", lambdas);
-        }
+    @Override
+    protected Builder<String, Lambda> addMustacheLambdas() {
+        return super.addMustacheLambdas()
+                .put("camelcase_param", new CamelCaseLambda().generator(this).escapeAsParamName(true));
     }
 
     @Override
diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/KotlinServerCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/KotlinServerCodegen.java
index 80e48bf0bc..4bd48eb218 100644
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/KotlinServerCodegen.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/KotlinServerCodegen.java
@@ -18,13 +18,11 @@
 package org.openapitools.codegen.languages;
 
 import com.google.common.collect.ImmutableMap;
-import com.samskivert.mustache.Mustache;
 import org.apache.commons.lang3.StringUtils;
 import org.openapitools.codegen.CliOption;
 import org.openapitools.codegen.CodegenConstants;
 import org.openapitools.codegen.CodegenType;
 import org.openapitools.codegen.SupportingFile;
-import org.openapitools.codegen.templating.mustache.*;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -211,31 +209,6 @@ public class KotlinServerCodegen extends AbstractKotlinCodegen {
         final String infrastructureFolder = (sourceFolder + File.separator + packageName + File.separator + "infrastructure").replace(".", File.separator);
 
         supportingFiles.add(new SupportingFile("ApiKeyAuth.kt.mustache", infrastructureFolder, "ApiKeyAuth.kt"));
-
-        addMustacheLambdas(additionalProperties);
-    }
-
-    private void addMustacheLambdas(Map<String, Object> objs) {
-
-        Map<String, Mustache.Lambda> lambdas = new ImmutableMap.Builder<String, Mustache.Lambda>()
-                .put("lowercase", new LowercaseLambda().generator(this))
-                .put("uppercase", new UppercaseLambda())
-                .put("titlecase", new TitlecaseLambda())
-                .put("camelcase", new CamelCaseLambda().generator(this))
-                .put("indented", new IndentedLambda())
-                .put("indented_8", new IndentedLambda(8, " "))
-                .put("indented_12", new IndentedLambda(12, " "))
-                .put("indented_16", new IndentedLambda(16, " "))
-                .build();
-
-        if (objs.containsKey("lambda")) {
-            LOGGER.warn("A property named 'lambda' already exists. Mustache lambdas renamed from 'lambda' to '_lambda'. " +
-                    "You'll likely need to use a custom template, " +
-                    "see https://github.com/OpenAPITools/openapi-generator/blob/master/docs/templating.md. ");
-            objs.put("_lambda", lambdas);
-        } else {
-            objs.put("lambda", lambdas);
-        }
     }
 
     public static class Constants {
diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/KotlinSpringServerCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/KotlinSpringServerCodegen.java
index 28e45eb7af..36c99c39a7 100644
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/KotlinSpringServerCodegen.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/KotlinSpringServerCodegen.java
@@ -16,9 +16,11 @@
 
 package org.openapitools.codegen.languages;
 
-import com.google.common.collect.ImmutableMap;
+import com.google.common.collect.ImmutableMap.Builder;
 import com.samskivert.mustache.Mustache;
 import com.samskivert.mustache.Template;
+import com.samskivert.mustache.Mustache.Lambda;
+
 import io.swagger.v3.oas.models.OpenAPI;
 import io.swagger.v3.oas.models.media.Schema;
 import org.openapitools.codegen.*;
@@ -51,7 +53,6 @@ public class KotlinSpringServerCodegen extends AbstractKotlinCodegen
             ));
 
     public static final String TITLE = "title";
-    public static final String LAMBDA = "lambda";
     public static final String SERVER_PORT = "serverPort";
     public static final String BASE_PACKAGE = "basePackage";
     public static final String SPRING_BOOT = "spring-boot";
@@ -370,22 +371,14 @@ public class KotlinSpringServerCodegen extends AbstractKotlinCodegen
                     sanitizeDirectory(sourceFolder + File.separator + basePackage), "Application.kt"));
         }
 
-        addMustacheLambdas(additionalProperties);
-
         // spring uses the jackson lib, and we disallow configuration.
         additionalProperties.put("jackson", "true");
     }
 
-    private void addMustacheLambdas(final Map<String, Object> objs) {
-        Map<String, Mustache.Lambda> lambdas =
-                new ImmutableMap.Builder<String, Mustache.Lambda>()
-                        .put("escapeDoubleQuote", new EscapeLambda("\"", "\\\""))
-                        .build();
-
-        if (objs.containsKey(LAMBDA)) {
-            LOGGER.warn("The lambda property is a reserved word, and will be overwritten!");
-        }
-        objs.put(LAMBDA, lambdas);
+    @Override
+    protected Builder<String, Lambda> addMustacheLambdas() {
+        return super.addMustacheLambdas()
+                .put("escapeDoubleQuote", new EscapeLambda("\"", "\\\""));
     }
 
     @Override
diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/OpenAPIYamlGenerator.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/OpenAPIYamlGenerator.java
index 5c46567fd9..ca1e910266 100644
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/OpenAPIYamlGenerator.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/OpenAPIYamlGenerator.java
@@ -18,21 +18,15 @@
 package org.openapitools.codegen.languages;
 
 import org.openapitools.codegen.*;
-import org.openapitools.codegen.templating.mustache.CamelCaseLambda;
-import org.openapitools.codegen.templating.mustache.IndentedLambda;
-import org.openapitools.codegen.templating.mustache.LowercaseLambda;
-import org.openapitools.codegen.templating.mustache.TitlecaseLambda;
-import org.openapitools.codegen.templating.mustache.UppercaseLambda;
+import org.openapitools.codegen.templating.mustache.OnChangeLambda;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.google.common.collect.ImmutableMap;
-import com.samskivert.mustache.Mustache;
-import com.samskivert.mustache.Template;
+import com.google.common.collect.ImmutableMap.Builder;
+import com.samskivert.mustache.Mustache.Lambda;
+
 import io.swagger.v3.oas.models.Operation;
 
-import java.io.IOException;
-import java.io.Writer;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
@@ -75,32 +69,12 @@ public class OpenAPIYamlGenerator extends DefaultCodegen implements CodegenConfi
         }
         LOGGER.info("Output file [outputFile={}]", outputFile);
         supportingFiles.add(new SupportingFile("openapi.mustache", outputFile));
-
-        addMustacheLambdas(additionalProperties);
     }
 
-    private void addMustacheLambdas(Map<String, Object> objs) {
-
-        Map<String, Mustache.Lambda> lambdas = new ImmutableMap.Builder<String, Mustache.Lambda>()
-                .put("lowercase", new LowercaseLambda().generator(this))
-                .put("uppercase", new UppercaseLambda())
-                .put("titlecase", new TitlecaseLambda())
-                .put("camelcase", new CamelCaseLambda().generator(this))
-                .put("indented", new IndentedLambda())
-                .put("indented_8", new IndentedLambda(8, " "))
-                .put("indented_12", new IndentedLambda(12, " "))
-                .put("indented_16", new IndentedLambda(16, " "))
-                .put("onchange",  new OnChangeLambda())
-                .build();
-
-        if (objs.containsKey("lambda")) {
-            LOGGER.warn("A property named 'lambda' already exists. Mustache lambdas renamed from 'lambda' to '_lambda'. " +
-                    "You'll likely need to use a custom template, " +
-                    "see https://github.com/OpenAPITools/openapi-generator/blob/master/docs/templating.md. ");
-            objs.put("_lambda", lambdas);
-        } else {
-            objs.put("lambda", lambdas);
-        }
+    @Override
+    protected Builder<String, Lambda> addMustacheLambdas() {
+        return super.addMustacheLambdas()
+                .put("onchange", new OnChangeLambda());
     }
 
     /**
@@ -133,24 +107,4 @@ public class OpenAPIYamlGenerator extends DefaultCodegen implements CodegenConfi
         return input;
     }
 
-    /**
-     * Lambda writes current fragment to the output when it is different than
-     * previous fragment.
-     */
-    public static class OnChangeLambda implements Mustache.Lambda {
-        private static final Logger LOGGER = LoggerFactory.getLogger(OnChangeLambda.class);
-
-        private String lastVal = null;
-
-        @Override
-        public void execute(Template.Fragment frag, Writer out) throws IOException {
-            String curVal = frag.execute();
-            LOGGER.debug("[lastVal={}, curVal={}]", lastVal, curVal);
-            if (curVal != null && !curVal.equals(lastVal)) {
-                out.write(curVal);
-                lastVal = curVal;
-            }
-        }
-    }
-
 }
diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/ScalaPlayFrameworkServerCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/ScalaPlayFrameworkServerCodegen.java
index a30f0bd797..1f02cc989f 100644
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/ScalaPlayFrameworkServerCodegen.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/ScalaPlayFrameworkServerCodegen.java
@@ -16,8 +16,9 @@
 
 package org.openapitools.codegen.languages;
 
-import com.google.common.collect.ImmutableMap;
-import com.samskivert.mustache.Mustache;
+import com.google.common.collect.ImmutableMap.Builder;
+import com.samskivert.mustache.Mustache.Lambda;
+
 import io.swagger.v3.oas.models.media.ArraySchema;
 import io.swagger.v3.oas.models.media.Schema;
 import org.openapitools.codegen.*;
@@ -192,15 +193,12 @@ public class ScalaPlayFrameworkServerCodegen extends AbstractScalaCodegen implem
             supportingFiles.add(new SupportingFile("public/openapi.json.mustache", "public", "openapi.json"));
             supportingFiles.add(new SupportingFile("app/apiDocController.scala.mustache", String.format(Locale.ROOT, "app/%s", apiPackage.replace(".", File.separator)), "ApiDocController.scala"));
         }
-        addMustacheLambdas(additionalProperties);
     }
 
-    private void addMustacheLambdas(Map<String, Object> objs) {
-        Map<String, Mustache.Lambda> lambdas = new ImmutableMap.Builder<String, Mustache.Lambda>()
-                .put("indented_4", new IndentedLambda(4, " "))
-                .put("indented_8", new IndentedLambda(8, " "))
-                .build();
-        objs.put("lambda", lambdas);
+    @Override
+    protected Builder<String, Lambda> addMustacheLambdas() {
+        return super.addMustacheLambdas()
+                .put("indented_4", new IndentedLambda(4, " "));
     }
 
     @SuppressWarnings("unchecked")
diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/templating/mustache/OnChangeLambda.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/templating/mustache/OnChangeLambda.java
new file mode 100644
index 0000000000..11efbfae5b
--- /dev/null
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/templating/mustache/OnChangeLambda.java
@@ -0,0 +1,40 @@
+package org.openapitools.codegen.templating.mustache;
+
+import java.io.IOException;
+import java.io.Writer;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.samskivert.mustache.Mustache;
+import com.samskivert.mustache.Template;
+
+/**
+ * Lambda writes current fragment to the output when it is different than
+ * the previous fragment.
+ *
+ * Register:
+ * <pre>
+ * additionalProperties.put("onchange", new OnChangeLambda());
+ * </pre>
+ *
+ * Use:
+ * <pre>
+ * {{#onchange}}{{name}}{{/onchange}}
+ * </pre>
+ */
+public class OnChangeLambda implements Mustache.Lambda {
+    private static final Logger LOGGER = LoggerFactory.getLogger(OnChangeLambda.class);
+
+    private String lastVal = null;
+
+    @Override
+    public void execute(Template.Fragment frag, Writer out) throws IOException {
+        String curVal = frag.execute();
+        LOGGER.debug("[lastVal={}, curVal={}]", lastVal, curVal);
+        if (curVal != null && !curVal.equals(lastVal)) {
+            out.write(curVal);
+            lastVal = curVal;
+        }
+    }
+}
\ No newline at end of file

From 29a85d54a287dfae06fea83aa1c2ebc56f3ef702 Mon Sep 17 00:00:00 2001
From: james-beer <48411570+james-beer@users.noreply.github.com>
Date: Thu, 18 Jul 2019 06:22:12 +0100
Subject: [PATCH 22/62] Adds default property values in ASP .NET Core models
 (#3369)

* Fixes docker-entrypoint.sh

* Adds default property values to C# model templates (#3359).
---
 docker-entrypoint.sh                                          | 2 +-
 .../src/main/resources/aspnetcore/2.0/model.mustache          | 4 ++--
 .../src/main/resources/aspnetcore/2.1/model.mustache          | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/docker-entrypoint.sh b/docker-entrypoint.sh
index 4decc3de64..3b993a1be3 100755
--- a/docker-entrypoint.sh
+++ b/docker-entrypoint.sh
@@ -19,7 +19,7 @@ if [[ -f "${codegen}" && -n "$(java ${JAVA_OPTS} -jar "${codegen}" completion |
     command=$1
     shift
     exec java ${JAVA_OPTS} -jar "${codegen}" "${command}" "$@"
-elif [[ -n "$(echo commands | tr ',' '\n' | grep "^$1\$" )" ]]; then
+elif [[ -n "$(echo $commands | tr ',' '\n' | grep "^$1\$" )" ]]; then
     # If CLI jar does not exist, and $1 is a known CLI command, build the CLI jar and run that command.
     if [[ ! -f "${codegen}" ]]; then
         (cd "${GEN_DIR}" && exec mvn -am -pl "modules/openapi-generator-cli" -Duser.home=$(dirname $MAVEN_CONFIG) package)
diff --git a/modules/openapi-generator/src/main/resources/aspnetcore/2.0/model.mustache b/modules/openapi-generator/src/main/resources/aspnetcore/2.0/model.mustache
index 8cbfaf0efd..101e95cbfc 100644
--- a/modules/openapi-generator/src/main/resources/aspnetcore/2.0/model.mustache
+++ b/modules/openapi-generator/src/main/resources/aspnetcore/2.0/model.mustache
@@ -28,10 +28,10 @@ namespace {{packageName}}.Models
         {{/required}}
         [DataMember(Name="{{baseName}}", EmitDefaultValue={{#isNullable}}true{{/isNullable}}{{^isNullable}}false{{/isNullable}})]
         {{#isEnum}}
-        public {{{datatypeWithEnum}}}{{#isEnum}}{{^isContainer}}?{{/isContainer}}{{/isEnum}} {{name}} { get; set; }
+        public {{{datatypeWithEnum}}}{{#isEnum}}{{^isContainer}}?{{/isContainer}}{{/isEnum}} {{name}} { get; set; }{{#defaultValue}} = {{{defaultValue}}};{{/defaultValue}}
         {{/isEnum}}
         {{^isEnum}}
-        public {{{dataType}}} {{name}} { get; {{#isReadOnly}}private {{/isReadOnly}}set; }
+        public {{{dataType}}} {{name}} { get; {{#isReadOnly}}private {{/isReadOnly}}set; }{{#defaultValue}} = {{{defaultValue}}};{{/defaultValue}}
         {{/isEnum}}
         {{#hasMore}}
         {{/hasMore}}
diff --git a/modules/openapi-generator/src/main/resources/aspnetcore/2.1/model.mustache b/modules/openapi-generator/src/main/resources/aspnetcore/2.1/model.mustache
index e4be72baec..e198e2447e 100644
--- a/modules/openapi-generator/src/main/resources/aspnetcore/2.1/model.mustache
+++ b/modules/openapi-generator/src/main/resources/aspnetcore/2.1/model.mustache
@@ -31,10 +31,10 @@ namespace {{modelPackage}}
         {{/pattern}}
         [DataMember(Name="{{baseName}}", EmitDefaultValue={{#isNullable}}true{{/isNullable}}{{^isNullable}}false{{/isNullable}})]
         {{#isEnum}}
-        public {{{datatypeWithEnum}}}{{#isEnum}}{{^isContainer}}?{{/isContainer}}{{/isEnum}} {{name}} { get; set; }
+        public {{{datatypeWithEnum}}}{{#isEnum}}{{^isContainer}}?{{/isContainer}}{{/isEnum}} {{name}} { get; set; }{{#defaultValue}} = {{{defaultValue}}};{{/defaultValue}}
         {{/isEnum}}
         {{^isEnum}}
-        public {{{dataType}}} {{name}} { get; {{#isReadOnly}}private {{/isReadOnly}}set; }
+        public {{{dataType}}} {{name}} { get; {{#isReadOnly}}private {{/isReadOnly}}set; }{{#defaultValue}} = {{{defaultValue}}};{{/defaultValue}}
         {{/isEnum}}
         {{#hasMore}}
         {{/hasMore}}

From 4223743ee0c628eba162894166cf400b849e7c42 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A9r=C3=A9mie=20Bresson?= <dev@jmini.fr>
Date: Thu, 18 Jul 2019 07:46:44 +0200
Subject: [PATCH 23/62] [java rest-assured] prevent reqSpec reuse between
 requests (#3375)

* [java rest-assured] prevent reqSpec reuse between requests

* Update sample
---
 .../libraries/rest-assured/ApiClient.mustache |   6 +-
 .../Java/libraries/rest-assured/api.mustache  |  45 +--
 .../org/openapitools/client/ApiClient.java    |  16 +-
 .../client/api/AnotherFakeApi.java            |  45 +--
 .../org/openapitools/client/api/FakeApi.java  | 261 +++++++++---------
 .../client/api/FakeClassnameTags123Api.java   |  45 +--
 .../org/openapitools/client/api/PetApi.java   | 189 +++++++------
 .../org/openapitools/client/api/StoreApi.java |  99 ++++---
 .../org/openapitools/client/api/UserApi.java  | 171 ++++++------
 9 files changed, 470 insertions(+), 407 deletions(-)

diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/rest-assured/ApiClient.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/rest-assured/ApiClient.mustache
index 42bdf68613..19ab0fa98c 100644
--- a/modules/openapi-generator/src/main/resources/Java/libraries/rest-assured/ApiClient.mustache
+++ b/modules/openapi-generator/src/main/resources/Java/libraries/rest-assured/ApiClient.mustache
@@ -34,13 +34,13 @@ public class ApiClient {
      {{#apiInfo}}
      {{#apis}}
     public {{classname}} {{classVarName}}() {
-        return {{classname}}.{{classVarName}}(config.baseReqSpec.get());
+        return {{classname}}.{{classVarName}}(config.reqSpecSupplier);
     }
      {{/apis}}
      {{/apiInfo}}
 
     public static class Config {
-        private Supplier<RequestSpecBuilder> baseReqSpec = () -> new RequestSpecBuilder()
+        private Supplier<RequestSpecBuilder> reqSpecSupplier = () -> new RequestSpecBuilder()
                 {{#basePath}}.setBaseUri(BASE_URI){{/basePath}}
                 .setConfig(config().objectMapperConfig(objectMapperConfig().defaultObjectMapper(gson())));
 
@@ -50,7 +50,7 @@ public class ApiClient {
          * @return configuration
          */
         public Config reqSpecSupplier(Supplier<RequestSpecBuilder> supplier) {
-            this.baseReqSpec = supplier;
+            this.reqSpecSupplier = supplier;
             return this;
         }
 
diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/rest-assured/api.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/rest-assured/api.mustache
index 75c3a373ae..75ea07db60 100644
--- a/modules/openapi-generator/src/main/resources/Java/libraries/rest-assured/api.mustache
+++ b/modules/openapi-generator/src/main/resources/Java/libraries/rest-assured/api.mustache
@@ -31,14 +31,23 @@ import static io.restassured.http.Method.*;
 @Api(value = "{{{baseName}}}")
 public class {{classname}} {
 
-    private RequestSpecBuilder reqSpec;
+    private Supplier<RequestSpecBuilder> reqSpecSupplier;
+    private Consumer<RequestSpecBuilder> reqSpecCustomizer;
 
-    private {{classname}}(RequestSpecBuilder reqSpec) {
-        this.reqSpec = reqSpec;
+    private {{classname}}(Supplier<RequestSpecBuilder> reqSpecSupplier) {
+        this.reqSpecSupplier = reqSpecSupplier;
     }
 
-    public static {{classname}} {{classVarName}}(RequestSpecBuilder reqSpec) {
-        return new {{classname}}(reqSpec);
+    public static {{classname}} {{classVarName}}(Supplier<RequestSpecBuilder> reqSpecSupplier) {
+        return new {{classname}}(reqSpecSupplier);
+    }
+
+    private RequestSpecBuilder createReqSpec() {
+        RequestSpecBuilder reqSpec = reqSpecSupplier.get();
+        if(reqSpecCustomizer != null) {
+            reqSpecCustomizer.accept(reqSpec);
+        }
+        return reqSpec;
     }
 
 {{#operations}}
@@ -54,18 +63,18 @@ public class {{classname}} {
     @Deprecated
     {{/isDeprecated}}
     public {{operationIdCamelCase}}Oper {{operationId}}() {
-        return new {{operationIdCamelCase}}Oper(reqSpec);
+        return new {{operationIdCamelCase}}Oper(createReqSpec());
     }
 {{/operation}}
 {{/operations}}
 
     /**
-     * Customise request specification
-     * @param consumer consumer
+     * Customize request specification
+     * @param reqSpecCustomizer consumer to modify the RequestSpecBuilder
      * @return api
      */
-    public {{classname}} reqSpec(Consumer<RequestSpecBuilder> consumer) {
-        consumer.accept(reqSpec);
+    public {{classname}} reqSpec(Consumer<RequestSpecBuilder> reqSpecCustomizer) {
+        this.reqSpecCustomizer = reqSpecCustomizer;
         return this;
     }
 
@@ -216,22 +225,22 @@ public class {{classname}} {
         {{/formParams}}
 
         /**
-         * Customise request specification
-         * @param consumer consumer
+         * Customize request specification
+         * @param reqSpecCustomizer consumer to modify the RequestSpecBuilder
          * @return operation
          */
-        public {{operationIdCamelCase}}Oper reqSpec(Consumer<RequestSpecBuilder> consumer) {
-            consumer.accept(reqSpec);
+        public {{operationIdCamelCase}}Oper reqSpec(Consumer<RequestSpecBuilder> reqSpecCustomizer) {
+            reqSpecCustomizer.accept(reqSpec);
             return this;
         }
 
         /**
-         * Customise response specification
-         * @param consumer consumer
+         * Customize response specification
+         * @param respSpecCustomizer consumer to modify the ResponseSpecBuilder
          * @return operation
          */
-        public {{operationIdCamelCase}}Oper respSpec(Consumer<ResponseSpecBuilder> consumer) {
-            consumer.accept(respSpec);
+        public {{operationIdCamelCase}}Oper respSpec(Consumer<ResponseSpecBuilder> respSpecCustomizer) {
+            respSpecCustomizer.accept(respSpec);
             return this;
         }
     }
diff --git a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/ApiClient.java b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/ApiClient.java
index f5cc4b49c8..ec1d9a433c 100644
--- a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/ApiClient.java
+++ b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/ApiClient.java
@@ -37,26 +37,26 @@ public class ApiClient {
     }
 
     public AnotherFakeApi anotherFake() {
-        return AnotherFakeApi.anotherFake(config.baseReqSpec.get());
+        return AnotherFakeApi.anotherFake(config.reqSpecSupplier);
     }
     public FakeApi fake() {
-        return FakeApi.fake(config.baseReqSpec.get());
+        return FakeApi.fake(config.reqSpecSupplier);
     }
     public FakeClassnameTags123Api fakeClassnameTags123() {
-        return FakeClassnameTags123Api.fakeClassnameTags123(config.baseReqSpec.get());
+        return FakeClassnameTags123Api.fakeClassnameTags123(config.reqSpecSupplier);
     }
     public PetApi pet() {
-        return PetApi.pet(config.baseReqSpec.get());
+        return PetApi.pet(config.reqSpecSupplier);
     }
     public StoreApi store() {
-        return StoreApi.store(config.baseReqSpec.get());
+        return StoreApi.store(config.reqSpecSupplier);
     }
     public UserApi user() {
-        return UserApi.user(config.baseReqSpec.get());
+        return UserApi.user(config.reqSpecSupplier);
     }
 
     public static class Config {
-        private Supplier<RequestSpecBuilder> baseReqSpec = () -> new RequestSpecBuilder()
+        private Supplier<RequestSpecBuilder> reqSpecSupplier = () -> new RequestSpecBuilder()
                 .setBaseUri(BASE_URI)
                 .setConfig(config().objectMapperConfig(objectMapperConfig().defaultObjectMapper(gson())));
 
@@ -66,7 +66,7 @@ public class ApiClient {
          * @return configuration
          */
         public Config reqSpecSupplier(Supplier<RequestSpecBuilder> supplier) {
-            this.baseReqSpec = supplier;
+            this.reqSpecSupplier = supplier;
             return this;
         }
 
diff --git a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/api/AnotherFakeApi.java b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/api/AnotherFakeApi.java
index 719824b840..13de1523a6 100644
--- a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/api/AnotherFakeApi.java
+++ b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/api/AnotherFakeApi.java
@@ -39,14 +39,23 @@ import static io.restassured.http.Method.*;
 @Api(value = "AnotherFake")
 public class AnotherFakeApi {
 
-    private RequestSpecBuilder reqSpec;
+    private Supplier<RequestSpecBuilder> reqSpecSupplier;
+    private Consumer<RequestSpecBuilder> reqSpecCustomizer;
 
-    private AnotherFakeApi(RequestSpecBuilder reqSpec) {
-        this.reqSpec = reqSpec;
+    private AnotherFakeApi(Supplier<RequestSpecBuilder> reqSpecSupplier) {
+        this.reqSpecSupplier = reqSpecSupplier;
     }
 
-    public static AnotherFakeApi anotherFake(RequestSpecBuilder reqSpec) {
-        return new AnotherFakeApi(reqSpec);
+    public static AnotherFakeApi anotherFake(Supplier<RequestSpecBuilder> reqSpecSupplier) {
+        return new AnotherFakeApi(reqSpecSupplier);
+    }
+
+    private RequestSpecBuilder createReqSpec() {
+        RequestSpecBuilder reqSpec = reqSpecSupplier.get();
+        if(reqSpecCustomizer != null) {
+            reqSpecCustomizer.accept(reqSpec);
+        }
+        return reqSpec;
     }
 
 
@@ -57,16 +66,16 @@ public class AnotherFakeApi {
     @ApiResponses(value = { 
             @ApiResponse(code = 200, message = "successful operation")  })
     public Call123testSpecialTagsOper call123testSpecialTags() {
-        return new Call123testSpecialTagsOper(reqSpec);
+        return new Call123testSpecialTagsOper(createReqSpec());
     }
 
     /**
-     * Customise request specification
-     * @param consumer consumer
+     * Customize request specification
+     * @param reqSpecCustomizer consumer to modify the RequestSpecBuilder
      * @return api
      */
-    public AnotherFakeApi reqSpec(Consumer<RequestSpecBuilder> consumer) {
-        consumer.accept(reqSpec);
+    public AnotherFakeApi reqSpec(Consumer<RequestSpecBuilder> reqSpecCustomizer) {
+        this.reqSpecCustomizer = reqSpecCustomizer;
         return this;
     }
 
@@ -122,22 +131,22 @@ public class AnotherFakeApi {
         }
 
         /**
-         * Customise request specification
-         * @param consumer consumer
+         * Customize request specification
+         * @param reqSpecCustomizer consumer to modify the RequestSpecBuilder
          * @return operation
          */
-        public Call123testSpecialTagsOper reqSpec(Consumer<RequestSpecBuilder> consumer) {
-            consumer.accept(reqSpec);
+        public Call123testSpecialTagsOper reqSpec(Consumer<RequestSpecBuilder> reqSpecCustomizer) {
+            reqSpecCustomizer.accept(reqSpec);
             return this;
         }
 
         /**
-         * Customise response specification
-         * @param consumer consumer
+         * Customize response specification
+         * @param respSpecCustomizer consumer to modify the ResponseSpecBuilder
          * @return operation
          */
-        public Call123testSpecialTagsOper respSpec(Consumer<ResponseSpecBuilder> consumer) {
-            consumer.accept(respSpec);
+        public Call123testSpecialTagsOper respSpec(Consumer<ResponseSpecBuilder> respSpecCustomizer) {
+            respSpecCustomizer.accept(respSpec);
             return this;
         }
     }
diff --git a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/api/FakeApi.java b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/api/FakeApi.java
index c6b7bd7615..7ba6b4294a 100644
--- a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/api/FakeApi.java
+++ b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/api/FakeApi.java
@@ -47,14 +47,23 @@ import static io.restassured.http.Method.*;
 @Api(value = "Fake")
 public class FakeApi {
 
-    private RequestSpecBuilder reqSpec;
+    private Supplier<RequestSpecBuilder> reqSpecSupplier;
+    private Consumer<RequestSpecBuilder> reqSpecCustomizer;
 
-    private FakeApi(RequestSpecBuilder reqSpec) {
-        this.reqSpec = reqSpec;
+    private FakeApi(Supplier<RequestSpecBuilder> reqSpecSupplier) {
+        this.reqSpecSupplier = reqSpecSupplier;
     }
 
-    public static FakeApi fake(RequestSpecBuilder reqSpec) {
-        return new FakeApi(reqSpec);
+    public static FakeApi fake(Supplier<RequestSpecBuilder> reqSpecSupplier) {
+        return new FakeApi(reqSpecSupplier);
+    }
+
+    private RequestSpecBuilder createReqSpec() {
+        RequestSpecBuilder reqSpec = reqSpecSupplier.get();
+        if(reqSpecCustomizer != null) {
+            reqSpecCustomizer.accept(reqSpec);
+        }
+        return reqSpec;
     }
 
 
@@ -65,7 +74,7 @@ public class FakeApi {
     @ApiResponses(value = { 
             @ApiResponse(code = 200, message = "successful operation")  })
     public CreateXmlItemOper createXmlItem() {
-        return new CreateXmlItemOper(reqSpec);
+        return new CreateXmlItemOper(createReqSpec());
     }
 
     @ApiOperation(value = "",
@@ -75,7 +84,7 @@ public class FakeApi {
     @ApiResponses(value = { 
             @ApiResponse(code = 200, message = "Output boolean")  })
     public FakeOuterBooleanSerializeOper fakeOuterBooleanSerialize() {
-        return new FakeOuterBooleanSerializeOper(reqSpec);
+        return new FakeOuterBooleanSerializeOper(createReqSpec());
     }
 
     @ApiOperation(value = "",
@@ -85,7 +94,7 @@ public class FakeApi {
     @ApiResponses(value = { 
             @ApiResponse(code = 200, message = "Output composite")  })
     public FakeOuterCompositeSerializeOper fakeOuterCompositeSerialize() {
-        return new FakeOuterCompositeSerializeOper(reqSpec);
+        return new FakeOuterCompositeSerializeOper(createReqSpec());
     }
 
     @ApiOperation(value = "",
@@ -95,7 +104,7 @@ public class FakeApi {
     @ApiResponses(value = { 
             @ApiResponse(code = 200, message = "Output number")  })
     public FakeOuterNumberSerializeOper fakeOuterNumberSerialize() {
-        return new FakeOuterNumberSerializeOper(reqSpec);
+        return new FakeOuterNumberSerializeOper(createReqSpec());
     }
 
     @ApiOperation(value = "",
@@ -105,7 +114,7 @@ public class FakeApi {
     @ApiResponses(value = { 
             @ApiResponse(code = 200, message = "Output string")  })
     public FakeOuterStringSerializeOper fakeOuterStringSerialize() {
-        return new FakeOuterStringSerializeOper(reqSpec);
+        return new FakeOuterStringSerializeOper(createReqSpec());
     }
 
     @ApiOperation(value = "",
@@ -115,7 +124,7 @@ public class FakeApi {
     @ApiResponses(value = { 
             @ApiResponse(code = 200, message = "Success")  })
     public TestBodyWithFileSchemaOper testBodyWithFileSchema() {
-        return new TestBodyWithFileSchemaOper(reqSpec);
+        return new TestBodyWithFileSchemaOper(createReqSpec());
     }
 
     @ApiOperation(value = "",
@@ -125,7 +134,7 @@ public class FakeApi {
     @ApiResponses(value = { 
             @ApiResponse(code = 200, message = "Success")  })
     public TestBodyWithQueryParamsOper testBodyWithQueryParams() {
-        return new TestBodyWithQueryParamsOper(reqSpec);
+        return new TestBodyWithQueryParamsOper(createReqSpec());
     }
 
     @ApiOperation(value = "To test \"client\" model",
@@ -135,7 +144,7 @@ public class FakeApi {
     @ApiResponses(value = { 
             @ApiResponse(code = 200, message = "successful operation")  })
     public TestClientModelOper testClientModel() {
-        return new TestClientModelOper(reqSpec);
+        return new TestClientModelOper(createReqSpec());
     }
 
     @ApiOperation(value = "Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 ",
@@ -146,7 +155,7 @@ public class FakeApi {
             @ApiResponse(code = 400, message = "Invalid username supplied") ,
             @ApiResponse(code = 404, message = "User not found")  })
     public TestEndpointParametersOper testEndpointParameters() {
-        return new TestEndpointParametersOper(reqSpec);
+        return new TestEndpointParametersOper(createReqSpec());
     }
 
     @ApiOperation(value = "To test enum parameters",
@@ -157,7 +166,7 @@ public class FakeApi {
             @ApiResponse(code = 400, message = "Invalid request") ,
             @ApiResponse(code = 404, message = "Not found")  })
     public TestEnumParametersOper testEnumParameters() {
-        return new TestEnumParametersOper(reqSpec);
+        return new TestEnumParametersOper(createReqSpec());
     }
 
     @ApiOperation(value = "Fake endpoint to test group parameters (optional)",
@@ -167,7 +176,7 @@ public class FakeApi {
     @ApiResponses(value = { 
             @ApiResponse(code = 400, message = "Someting wrong")  })
     public TestGroupParametersOper testGroupParameters() {
-        return new TestGroupParametersOper(reqSpec);
+        return new TestGroupParametersOper(createReqSpec());
     }
 
     @ApiOperation(value = "test inline additionalProperties",
@@ -177,7 +186,7 @@ public class FakeApi {
     @ApiResponses(value = { 
             @ApiResponse(code = 200, message = "successful operation")  })
     public TestInlineAdditionalPropertiesOper testInlineAdditionalProperties() {
-        return new TestInlineAdditionalPropertiesOper(reqSpec);
+        return new TestInlineAdditionalPropertiesOper(createReqSpec());
     }
 
     @ApiOperation(value = "test json serialization of form data",
@@ -187,16 +196,16 @@ public class FakeApi {
     @ApiResponses(value = { 
             @ApiResponse(code = 200, message = "successful operation")  })
     public TestJsonFormDataOper testJsonFormData() {
-        return new TestJsonFormDataOper(reqSpec);
+        return new TestJsonFormDataOper(createReqSpec());
     }
 
     /**
-     * Customise request specification
-     * @param consumer consumer
+     * Customize request specification
+     * @param reqSpecCustomizer consumer to modify the RequestSpecBuilder
      * @return api
      */
-    public FakeApi reqSpec(Consumer<RequestSpecBuilder> consumer) {
-        consumer.accept(reqSpec);
+    public FakeApi reqSpec(Consumer<RequestSpecBuilder> reqSpecCustomizer) {
+        this.reqSpecCustomizer = reqSpecCustomizer;
         return this;
     }
 
@@ -241,22 +250,22 @@ public class FakeApi {
         }
 
         /**
-         * Customise request specification
-         * @param consumer consumer
+         * Customize request specification
+         * @param reqSpecCustomizer consumer to modify the RequestSpecBuilder
          * @return operation
          */
-        public CreateXmlItemOper reqSpec(Consumer<RequestSpecBuilder> consumer) {
-            consumer.accept(reqSpec);
+        public CreateXmlItemOper reqSpec(Consumer<RequestSpecBuilder> reqSpecCustomizer) {
+            reqSpecCustomizer.accept(reqSpec);
             return this;
         }
 
         /**
-         * Customise response specification
-         * @param consumer consumer
+         * Customize response specification
+         * @param respSpecCustomizer consumer to modify the ResponseSpecBuilder
          * @return operation
          */
-        public CreateXmlItemOper respSpec(Consumer<ResponseSpecBuilder> consumer) {
-            consumer.accept(respSpec);
+        public CreateXmlItemOper respSpec(Consumer<ResponseSpecBuilder> respSpecCustomizer) {
+            respSpecCustomizer.accept(respSpec);
             return this;
         }
     }
@@ -312,22 +321,22 @@ public class FakeApi {
         }
 
         /**
-         * Customise request specification
-         * @param consumer consumer
+         * Customize request specification
+         * @param reqSpecCustomizer consumer to modify the RequestSpecBuilder
          * @return operation
          */
-        public FakeOuterBooleanSerializeOper reqSpec(Consumer<RequestSpecBuilder> consumer) {
-            consumer.accept(reqSpec);
+        public FakeOuterBooleanSerializeOper reqSpec(Consumer<RequestSpecBuilder> reqSpecCustomizer) {
+            reqSpecCustomizer.accept(reqSpec);
             return this;
         }
 
         /**
-         * Customise response specification
-         * @param consumer consumer
+         * Customize response specification
+         * @param respSpecCustomizer consumer to modify the ResponseSpecBuilder
          * @return operation
          */
-        public FakeOuterBooleanSerializeOper respSpec(Consumer<ResponseSpecBuilder> consumer) {
-            consumer.accept(respSpec);
+        public FakeOuterBooleanSerializeOper respSpec(Consumer<ResponseSpecBuilder> respSpecCustomizer) {
+            respSpecCustomizer.accept(respSpec);
             return this;
         }
     }
@@ -383,22 +392,22 @@ public class FakeApi {
         }
 
         /**
-         * Customise request specification
-         * @param consumer consumer
+         * Customize request specification
+         * @param reqSpecCustomizer consumer to modify the RequestSpecBuilder
          * @return operation
          */
-        public FakeOuterCompositeSerializeOper reqSpec(Consumer<RequestSpecBuilder> consumer) {
-            consumer.accept(reqSpec);
+        public FakeOuterCompositeSerializeOper reqSpec(Consumer<RequestSpecBuilder> reqSpecCustomizer) {
+            reqSpecCustomizer.accept(reqSpec);
             return this;
         }
 
         /**
-         * Customise response specification
-         * @param consumer consumer
+         * Customize response specification
+         * @param respSpecCustomizer consumer to modify the ResponseSpecBuilder
          * @return operation
          */
-        public FakeOuterCompositeSerializeOper respSpec(Consumer<ResponseSpecBuilder> consumer) {
-            consumer.accept(respSpec);
+        public FakeOuterCompositeSerializeOper respSpec(Consumer<ResponseSpecBuilder> respSpecCustomizer) {
+            respSpecCustomizer.accept(respSpec);
             return this;
         }
     }
@@ -454,22 +463,22 @@ public class FakeApi {
         }
 
         /**
-         * Customise request specification
-         * @param consumer consumer
+         * Customize request specification
+         * @param reqSpecCustomizer consumer to modify the RequestSpecBuilder
          * @return operation
          */
-        public FakeOuterNumberSerializeOper reqSpec(Consumer<RequestSpecBuilder> consumer) {
-            consumer.accept(reqSpec);
+        public FakeOuterNumberSerializeOper reqSpec(Consumer<RequestSpecBuilder> reqSpecCustomizer) {
+            reqSpecCustomizer.accept(reqSpec);
             return this;
         }
 
         /**
-         * Customise response specification
-         * @param consumer consumer
+         * Customize response specification
+         * @param respSpecCustomizer consumer to modify the ResponseSpecBuilder
          * @return operation
          */
-        public FakeOuterNumberSerializeOper respSpec(Consumer<ResponseSpecBuilder> consumer) {
-            consumer.accept(respSpec);
+        public FakeOuterNumberSerializeOper respSpec(Consumer<ResponseSpecBuilder> respSpecCustomizer) {
+            respSpecCustomizer.accept(respSpec);
             return this;
         }
     }
@@ -525,22 +534,22 @@ public class FakeApi {
         }
 
         /**
-         * Customise request specification
-         * @param consumer consumer
+         * Customize request specification
+         * @param reqSpecCustomizer consumer to modify the RequestSpecBuilder
          * @return operation
          */
-        public FakeOuterStringSerializeOper reqSpec(Consumer<RequestSpecBuilder> consumer) {
-            consumer.accept(reqSpec);
+        public FakeOuterStringSerializeOper reqSpec(Consumer<RequestSpecBuilder> reqSpecCustomizer) {
+            reqSpecCustomizer.accept(reqSpec);
             return this;
         }
 
         /**
-         * Customise response specification
-         * @param consumer consumer
+         * Customize response specification
+         * @param respSpecCustomizer consumer to modify the ResponseSpecBuilder
          * @return operation
          */
-        public FakeOuterStringSerializeOper respSpec(Consumer<ResponseSpecBuilder> consumer) {
-            consumer.accept(respSpec);
+        public FakeOuterStringSerializeOper respSpec(Consumer<ResponseSpecBuilder> respSpecCustomizer) {
+            respSpecCustomizer.accept(respSpec);
             return this;
         }
     }
@@ -585,22 +594,22 @@ public class FakeApi {
         }
 
         /**
-         * Customise request specification
-         * @param consumer consumer
+         * Customize request specification
+         * @param reqSpecCustomizer consumer to modify the RequestSpecBuilder
          * @return operation
          */
-        public TestBodyWithFileSchemaOper reqSpec(Consumer<RequestSpecBuilder> consumer) {
-            consumer.accept(reqSpec);
+        public TestBodyWithFileSchemaOper reqSpec(Consumer<RequestSpecBuilder> reqSpecCustomizer) {
+            reqSpecCustomizer.accept(reqSpec);
             return this;
         }
 
         /**
-         * Customise response specification
-         * @param consumer consumer
+         * Customize response specification
+         * @param respSpecCustomizer consumer to modify the ResponseSpecBuilder
          * @return operation
          */
-        public TestBodyWithFileSchemaOper respSpec(Consumer<ResponseSpecBuilder> consumer) {
-            consumer.accept(respSpec);
+        public TestBodyWithFileSchemaOper respSpec(Consumer<ResponseSpecBuilder> respSpecCustomizer) {
+            respSpecCustomizer.accept(respSpec);
             return this;
         }
     }
@@ -657,22 +666,22 @@ public class FakeApi {
         }
 
         /**
-         * Customise request specification
-         * @param consumer consumer
+         * Customize request specification
+         * @param reqSpecCustomizer consumer to modify the RequestSpecBuilder
          * @return operation
          */
-        public TestBodyWithQueryParamsOper reqSpec(Consumer<RequestSpecBuilder> consumer) {
-            consumer.accept(reqSpec);
+        public TestBodyWithQueryParamsOper reqSpec(Consumer<RequestSpecBuilder> reqSpecCustomizer) {
+            reqSpecCustomizer.accept(reqSpec);
             return this;
         }
 
         /**
-         * Customise response specification
-         * @param consumer consumer
+         * Customize response specification
+         * @param respSpecCustomizer consumer to modify the ResponseSpecBuilder
          * @return operation
          */
-        public TestBodyWithQueryParamsOper respSpec(Consumer<ResponseSpecBuilder> consumer) {
-            consumer.accept(respSpec);
+        public TestBodyWithQueryParamsOper respSpec(Consumer<ResponseSpecBuilder> respSpecCustomizer) {
+            respSpecCustomizer.accept(respSpec);
             return this;
         }
     }
@@ -728,22 +737,22 @@ public class FakeApi {
         }
 
         /**
-         * Customise request specification
-         * @param consumer consumer
+         * Customize request specification
+         * @param reqSpecCustomizer consumer to modify the RequestSpecBuilder
          * @return operation
          */
-        public TestClientModelOper reqSpec(Consumer<RequestSpecBuilder> consumer) {
-            consumer.accept(reqSpec);
+        public TestClientModelOper reqSpec(Consumer<RequestSpecBuilder> reqSpecCustomizer) {
+            reqSpecCustomizer.accept(reqSpec);
             return this;
         }
 
         /**
-         * Customise response specification
-         * @param consumer consumer
+         * Customize response specification
+         * @param respSpecCustomizer consumer to modify the ResponseSpecBuilder
          * @return operation
          */
-        public TestClientModelOper respSpec(Consumer<ResponseSpecBuilder> consumer) {
-            consumer.accept(respSpec);
+        public TestClientModelOper respSpec(Consumer<ResponseSpecBuilder> respSpecCustomizer) {
+            respSpecCustomizer.accept(respSpec);
             return this;
         }
     }
@@ -946,22 +955,22 @@ public class FakeApi {
          }
 
         /**
-         * Customise request specification
-         * @param consumer consumer
+         * Customize request specification
+         * @param reqSpecCustomizer consumer to modify the RequestSpecBuilder
          * @return operation
          */
-        public TestEndpointParametersOper reqSpec(Consumer<RequestSpecBuilder> consumer) {
-            consumer.accept(reqSpec);
+        public TestEndpointParametersOper reqSpec(Consumer<RequestSpecBuilder> reqSpecCustomizer) {
+            reqSpecCustomizer.accept(reqSpec);
             return this;
         }
 
         /**
-         * Customise response specification
-         * @param consumer consumer
+         * Customize response specification
+         * @param respSpecCustomizer consumer to modify the ResponseSpecBuilder
          * @return operation
          */
-        public TestEndpointParametersOper respSpec(Consumer<ResponseSpecBuilder> consumer) {
-            consumer.accept(respSpec);
+        public TestEndpointParametersOper respSpec(Consumer<ResponseSpecBuilder> respSpecCustomizer) {
+            respSpecCustomizer.accept(respSpec);
             return this;
         }
     }
@@ -1092,22 +1101,22 @@ public class FakeApi {
          }
 
         /**
-         * Customise request specification
-         * @param consumer consumer
+         * Customize request specification
+         * @param reqSpecCustomizer consumer to modify the RequestSpecBuilder
          * @return operation
          */
-        public TestEnumParametersOper reqSpec(Consumer<RequestSpecBuilder> consumer) {
-            consumer.accept(reqSpec);
+        public TestEnumParametersOper reqSpec(Consumer<RequestSpecBuilder> reqSpecCustomizer) {
+            reqSpecCustomizer.accept(reqSpec);
             return this;
         }
 
         /**
-         * Customise response specification
-         * @param consumer consumer
+         * Customize response specification
+         * @param respSpecCustomizer consumer to modify the ResponseSpecBuilder
          * @return operation
          */
-        public TestEnumParametersOper respSpec(Consumer<ResponseSpecBuilder> consumer) {
-            consumer.accept(respSpec);
+        public TestEnumParametersOper respSpec(Consumer<ResponseSpecBuilder> respSpecCustomizer) {
+            respSpecCustomizer.accept(respSpec);
             return this;
         }
     }
@@ -1213,22 +1222,22 @@ public class FakeApi {
         }
 
         /**
-         * Customise request specification
-         * @param consumer consumer
+         * Customize request specification
+         * @param reqSpecCustomizer consumer to modify the RequestSpecBuilder
          * @return operation
          */
-        public TestGroupParametersOper reqSpec(Consumer<RequestSpecBuilder> consumer) {
-            consumer.accept(reqSpec);
+        public TestGroupParametersOper reqSpec(Consumer<RequestSpecBuilder> reqSpecCustomizer) {
+            reqSpecCustomizer.accept(reqSpec);
             return this;
         }
 
         /**
-         * Customise response specification
-         * @param consumer consumer
+         * Customize response specification
+         * @param respSpecCustomizer consumer to modify the ResponseSpecBuilder
          * @return operation
          */
-        public TestGroupParametersOper respSpec(Consumer<ResponseSpecBuilder> consumer) {
-            consumer.accept(respSpec);
+        public TestGroupParametersOper respSpec(Consumer<ResponseSpecBuilder> respSpecCustomizer) {
+            respSpecCustomizer.accept(respSpec);
             return this;
         }
     }
@@ -1273,22 +1282,22 @@ public class FakeApi {
         }
 
         /**
-         * Customise request specification
-         * @param consumer consumer
+         * Customize request specification
+         * @param reqSpecCustomizer consumer to modify the RequestSpecBuilder
          * @return operation
          */
-        public TestInlineAdditionalPropertiesOper reqSpec(Consumer<RequestSpecBuilder> consumer) {
-            consumer.accept(reqSpec);
+        public TestInlineAdditionalPropertiesOper reqSpec(Consumer<RequestSpecBuilder> reqSpecCustomizer) {
+            reqSpecCustomizer.accept(reqSpec);
             return this;
         }
 
         /**
-         * Customise response specification
-         * @param consumer consumer
+         * Customize response specification
+         * @param respSpecCustomizer consumer to modify the ResponseSpecBuilder
          * @return operation
          */
-        public TestInlineAdditionalPropertiesOper respSpec(Consumer<ResponseSpecBuilder> consumer) {
-            consumer.accept(respSpec);
+        public TestInlineAdditionalPropertiesOper respSpec(Consumer<ResponseSpecBuilder> respSpecCustomizer) {
+            respSpecCustomizer.accept(respSpec);
             return this;
         }
     }
@@ -1347,22 +1356,22 @@ public class FakeApi {
          }
 
         /**
-         * Customise request specification
-         * @param consumer consumer
+         * Customize request specification
+         * @param reqSpecCustomizer consumer to modify the RequestSpecBuilder
          * @return operation
          */
-        public TestJsonFormDataOper reqSpec(Consumer<RequestSpecBuilder> consumer) {
-            consumer.accept(reqSpec);
+        public TestJsonFormDataOper reqSpec(Consumer<RequestSpecBuilder> reqSpecCustomizer) {
+            reqSpecCustomizer.accept(reqSpec);
             return this;
         }
 
         /**
-         * Customise response specification
-         * @param consumer consumer
+         * Customize response specification
+         * @param respSpecCustomizer consumer to modify the ResponseSpecBuilder
          * @return operation
          */
-        public TestJsonFormDataOper respSpec(Consumer<ResponseSpecBuilder> consumer) {
-            consumer.accept(respSpec);
+        public TestJsonFormDataOper respSpec(Consumer<ResponseSpecBuilder> respSpecCustomizer) {
+            respSpecCustomizer.accept(respSpec);
             return this;
         }
     }
diff --git a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/api/FakeClassnameTags123Api.java b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/api/FakeClassnameTags123Api.java
index 69ae6841c0..f7130fef3c 100644
--- a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/api/FakeClassnameTags123Api.java
+++ b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/api/FakeClassnameTags123Api.java
@@ -39,14 +39,23 @@ import static io.restassured.http.Method.*;
 @Api(value = "FakeClassnameTags123")
 public class FakeClassnameTags123Api {
 
-    private RequestSpecBuilder reqSpec;
+    private Supplier<RequestSpecBuilder> reqSpecSupplier;
+    private Consumer<RequestSpecBuilder> reqSpecCustomizer;
 
-    private FakeClassnameTags123Api(RequestSpecBuilder reqSpec) {
-        this.reqSpec = reqSpec;
+    private FakeClassnameTags123Api(Supplier<RequestSpecBuilder> reqSpecSupplier) {
+        this.reqSpecSupplier = reqSpecSupplier;
     }
 
-    public static FakeClassnameTags123Api fakeClassnameTags123(RequestSpecBuilder reqSpec) {
-        return new FakeClassnameTags123Api(reqSpec);
+    public static FakeClassnameTags123Api fakeClassnameTags123(Supplier<RequestSpecBuilder> reqSpecSupplier) {
+        return new FakeClassnameTags123Api(reqSpecSupplier);
+    }
+
+    private RequestSpecBuilder createReqSpec() {
+        RequestSpecBuilder reqSpec = reqSpecSupplier.get();
+        if(reqSpecCustomizer != null) {
+            reqSpecCustomizer.accept(reqSpec);
+        }
+        return reqSpec;
     }
 
 
@@ -57,16 +66,16 @@ public class FakeClassnameTags123Api {
     @ApiResponses(value = { 
             @ApiResponse(code = 200, message = "successful operation")  })
     public TestClassnameOper testClassname() {
-        return new TestClassnameOper(reqSpec);
+        return new TestClassnameOper(createReqSpec());
     }
 
     /**
-     * Customise request specification
-     * @param consumer consumer
+     * Customize request specification
+     * @param reqSpecCustomizer consumer to modify the RequestSpecBuilder
      * @return api
      */
-    public FakeClassnameTags123Api reqSpec(Consumer<RequestSpecBuilder> consumer) {
-        consumer.accept(reqSpec);
+    public FakeClassnameTags123Api reqSpec(Consumer<RequestSpecBuilder> reqSpecCustomizer) {
+        this.reqSpecCustomizer = reqSpecCustomizer;
         return this;
     }
 
@@ -122,22 +131,22 @@ public class FakeClassnameTags123Api {
         }
 
         /**
-         * Customise request specification
-         * @param consumer consumer
+         * Customize request specification
+         * @param reqSpecCustomizer consumer to modify the RequestSpecBuilder
          * @return operation
          */
-        public TestClassnameOper reqSpec(Consumer<RequestSpecBuilder> consumer) {
-            consumer.accept(reqSpec);
+        public TestClassnameOper reqSpec(Consumer<RequestSpecBuilder> reqSpecCustomizer) {
+            reqSpecCustomizer.accept(reqSpec);
             return this;
         }
 
         /**
-         * Customise response specification
-         * @param consumer consumer
+         * Customize response specification
+         * @param respSpecCustomizer consumer to modify the ResponseSpecBuilder
          * @return operation
          */
-        public TestClassnameOper respSpec(Consumer<ResponseSpecBuilder> consumer) {
-            consumer.accept(respSpec);
+        public TestClassnameOper respSpec(Consumer<ResponseSpecBuilder> respSpecCustomizer) {
+            respSpecCustomizer.accept(respSpec);
             return this;
         }
     }
diff --git a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/api/PetApi.java b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/api/PetApi.java
index d64370cf3d..cc8a389d94 100644
--- a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/api/PetApi.java
+++ b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/api/PetApi.java
@@ -41,14 +41,23 @@ import static io.restassured.http.Method.*;
 @Api(value = "Pet")
 public class PetApi {
 
-    private RequestSpecBuilder reqSpec;
+    private Supplier<RequestSpecBuilder> reqSpecSupplier;
+    private Consumer<RequestSpecBuilder> reqSpecCustomizer;
 
-    private PetApi(RequestSpecBuilder reqSpec) {
-        this.reqSpec = reqSpec;
+    private PetApi(Supplier<RequestSpecBuilder> reqSpecSupplier) {
+        this.reqSpecSupplier = reqSpecSupplier;
     }
 
-    public static PetApi pet(RequestSpecBuilder reqSpec) {
-        return new PetApi(reqSpec);
+    public static PetApi pet(Supplier<RequestSpecBuilder> reqSpecSupplier) {
+        return new PetApi(reqSpecSupplier);
+    }
+
+    private RequestSpecBuilder createReqSpec() {
+        RequestSpecBuilder reqSpec = reqSpecSupplier.get();
+        if(reqSpecCustomizer != null) {
+            reqSpecCustomizer.accept(reqSpec);
+        }
+        return reqSpec;
     }
 
 
@@ -60,7 +69,7 @@ public class PetApi {
             @ApiResponse(code = 200, message = "successful operation") ,
             @ApiResponse(code = 405, message = "Invalid input")  })
     public AddPetOper addPet() {
-        return new AddPetOper(reqSpec);
+        return new AddPetOper(createReqSpec());
     }
 
     @ApiOperation(value = "Deletes a pet",
@@ -71,7 +80,7 @@ public class PetApi {
             @ApiResponse(code = 200, message = "successful operation") ,
             @ApiResponse(code = 400, message = "Invalid pet value")  })
     public DeletePetOper deletePet() {
-        return new DeletePetOper(reqSpec);
+        return new DeletePetOper(createReqSpec());
     }
 
     @ApiOperation(value = "Finds Pets by status",
@@ -82,7 +91,7 @@ public class PetApi {
             @ApiResponse(code = 200, message = "successful operation") ,
             @ApiResponse(code = 400, message = "Invalid status value")  })
     public FindPetsByStatusOper findPetsByStatus() {
-        return new FindPetsByStatusOper(reqSpec);
+        return new FindPetsByStatusOper(createReqSpec());
     }
 
     @ApiOperation(value = "Finds Pets by tags",
@@ -94,7 +103,7 @@ public class PetApi {
             @ApiResponse(code = 400, message = "Invalid tag value")  })
     @Deprecated
     public FindPetsByTagsOper findPetsByTags() {
-        return new FindPetsByTagsOper(reqSpec);
+        return new FindPetsByTagsOper(createReqSpec());
     }
 
     @ApiOperation(value = "Find pet by ID",
@@ -106,7 +115,7 @@ public class PetApi {
             @ApiResponse(code = 400, message = "Invalid ID supplied") ,
             @ApiResponse(code = 404, message = "Pet not found")  })
     public GetPetByIdOper getPetById() {
-        return new GetPetByIdOper(reqSpec);
+        return new GetPetByIdOper(createReqSpec());
     }
 
     @ApiOperation(value = "Update an existing pet",
@@ -119,7 +128,7 @@ public class PetApi {
             @ApiResponse(code = 404, message = "Pet not found") ,
             @ApiResponse(code = 405, message = "Validation exception")  })
     public UpdatePetOper updatePet() {
-        return new UpdatePetOper(reqSpec);
+        return new UpdatePetOper(createReqSpec());
     }
 
     @ApiOperation(value = "Updates a pet in the store with form data",
@@ -129,7 +138,7 @@ public class PetApi {
     @ApiResponses(value = { 
             @ApiResponse(code = 405, message = "Invalid input")  })
     public UpdatePetWithFormOper updatePetWithForm() {
-        return new UpdatePetWithFormOper(reqSpec);
+        return new UpdatePetWithFormOper(createReqSpec());
     }
 
     @ApiOperation(value = "uploads an image",
@@ -139,7 +148,7 @@ public class PetApi {
     @ApiResponses(value = { 
             @ApiResponse(code = 200, message = "successful operation")  })
     public UploadFileOper uploadFile() {
-        return new UploadFileOper(reqSpec);
+        return new UploadFileOper(createReqSpec());
     }
 
     @ApiOperation(value = "uploads an image (required)",
@@ -149,16 +158,16 @@ public class PetApi {
     @ApiResponses(value = { 
             @ApiResponse(code = 200, message = "successful operation")  })
     public UploadFileWithRequiredFileOper uploadFileWithRequiredFile() {
-        return new UploadFileWithRequiredFileOper(reqSpec);
+        return new UploadFileWithRequiredFileOper(createReqSpec());
     }
 
     /**
-     * Customise request specification
-     * @param consumer consumer
+     * Customize request specification
+     * @param reqSpecCustomizer consumer to modify the RequestSpecBuilder
      * @return api
      */
-    public PetApi reqSpec(Consumer<RequestSpecBuilder> consumer) {
-        consumer.accept(reqSpec);
+    public PetApi reqSpec(Consumer<RequestSpecBuilder> reqSpecCustomizer) {
+        this.reqSpecCustomizer = reqSpecCustomizer;
         return this;
     }
 
@@ -203,22 +212,22 @@ public class PetApi {
         }
 
         /**
-         * Customise request specification
-         * @param consumer consumer
+         * Customize request specification
+         * @param reqSpecCustomizer consumer to modify the RequestSpecBuilder
          * @return operation
          */
-        public AddPetOper reqSpec(Consumer<RequestSpecBuilder> consumer) {
-            consumer.accept(reqSpec);
+        public AddPetOper reqSpec(Consumer<RequestSpecBuilder> reqSpecCustomizer) {
+            reqSpecCustomizer.accept(reqSpec);
             return this;
         }
 
         /**
-         * Customise response specification
-         * @param consumer consumer
+         * Customize response specification
+         * @param respSpecCustomizer consumer to modify the ResponseSpecBuilder
          * @return operation
          */
-        public AddPetOper respSpec(Consumer<ResponseSpecBuilder> consumer) {
-            consumer.accept(respSpec);
+        public AddPetOper respSpec(Consumer<ResponseSpecBuilder> respSpecCustomizer) {
+            respSpecCustomizer.accept(respSpec);
             return this;
         }
     }
@@ -276,22 +285,22 @@ public class PetApi {
         }
 
         /**
-         * Customise request specification
-         * @param consumer consumer
+         * Customize request specification
+         * @param reqSpecCustomizer consumer to modify the RequestSpecBuilder
          * @return operation
          */
-        public DeletePetOper reqSpec(Consumer<RequestSpecBuilder> consumer) {
-            consumer.accept(reqSpec);
+        public DeletePetOper reqSpec(Consumer<RequestSpecBuilder> reqSpecCustomizer) {
+            reqSpecCustomizer.accept(reqSpec);
             return this;
         }
 
         /**
-         * Customise response specification
-         * @param consumer consumer
+         * Customize response specification
+         * @param respSpecCustomizer consumer to modify the ResponseSpecBuilder
          * @return operation
          */
-        public DeletePetOper respSpec(Consumer<ResponseSpecBuilder> consumer) {
-            consumer.accept(respSpec);
+        public DeletePetOper respSpec(Consumer<ResponseSpecBuilder> respSpecCustomizer) {
+            respSpecCustomizer.accept(respSpec);
             return this;
         }
     }
@@ -348,22 +357,22 @@ public class PetApi {
         }
 
         /**
-         * Customise request specification
-         * @param consumer consumer
+         * Customize request specification
+         * @param reqSpecCustomizer consumer to modify the RequestSpecBuilder
          * @return operation
          */
-        public FindPetsByStatusOper reqSpec(Consumer<RequestSpecBuilder> consumer) {
-            consumer.accept(reqSpec);
+        public FindPetsByStatusOper reqSpec(Consumer<RequestSpecBuilder> reqSpecCustomizer) {
+            reqSpecCustomizer.accept(reqSpec);
             return this;
         }
 
         /**
-         * Customise response specification
-         * @param consumer consumer
+         * Customize response specification
+         * @param respSpecCustomizer consumer to modify the ResponseSpecBuilder
          * @return operation
          */
-        public FindPetsByStatusOper respSpec(Consumer<ResponseSpecBuilder> consumer) {
-            consumer.accept(respSpec);
+        public FindPetsByStatusOper respSpec(Consumer<ResponseSpecBuilder> respSpecCustomizer) {
+            respSpecCustomizer.accept(respSpec);
             return this;
         }
     }
@@ -422,22 +431,22 @@ public class PetApi {
         }
 
         /**
-         * Customise request specification
-         * @param consumer consumer
+         * Customize request specification
+         * @param reqSpecCustomizer consumer to modify the RequestSpecBuilder
          * @return operation
          */
-        public FindPetsByTagsOper reqSpec(Consumer<RequestSpecBuilder> consumer) {
-            consumer.accept(reqSpec);
+        public FindPetsByTagsOper reqSpec(Consumer<RequestSpecBuilder> reqSpecCustomizer) {
+            reqSpecCustomizer.accept(reqSpec);
             return this;
         }
 
         /**
-         * Customise response specification
-         * @param consumer consumer
+         * Customize response specification
+         * @param respSpecCustomizer consumer to modify the ResponseSpecBuilder
          * @return operation
          */
-        public FindPetsByTagsOper respSpec(Consumer<ResponseSpecBuilder> consumer) {
-            consumer.accept(respSpec);
+        public FindPetsByTagsOper respSpec(Consumer<ResponseSpecBuilder> respSpecCustomizer) {
+            respSpecCustomizer.accept(respSpec);
             return this;
         }
     }
@@ -494,22 +503,22 @@ public class PetApi {
         }
 
         /**
-         * Customise request specification
-         * @param consumer consumer
+         * Customize request specification
+         * @param reqSpecCustomizer consumer to modify the RequestSpecBuilder
          * @return operation
          */
-        public GetPetByIdOper reqSpec(Consumer<RequestSpecBuilder> consumer) {
-            consumer.accept(reqSpec);
+        public GetPetByIdOper reqSpec(Consumer<RequestSpecBuilder> reqSpecCustomizer) {
+            reqSpecCustomizer.accept(reqSpec);
             return this;
         }
 
         /**
-         * Customise response specification
-         * @param consumer consumer
+         * Customize response specification
+         * @param respSpecCustomizer consumer to modify the ResponseSpecBuilder
          * @return operation
          */
-        public GetPetByIdOper respSpec(Consumer<ResponseSpecBuilder> consumer) {
-            consumer.accept(respSpec);
+        public GetPetByIdOper respSpec(Consumer<ResponseSpecBuilder> respSpecCustomizer) {
+            respSpecCustomizer.accept(respSpec);
             return this;
         }
     }
@@ -554,22 +563,22 @@ public class PetApi {
         }
 
         /**
-         * Customise request specification
-         * @param consumer consumer
+         * Customize request specification
+         * @param reqSpecCustomizer consumer to modify the RequestSpecBuilder
          * @return operation
          */
-        public UpdatePetOper reqSpec(Consumer<RequestSpecBuilder> consumer) {
-            consumer.accept(reqSpec);
+        public UpdatePetOper reqSpec(Consumer<RequestSpecBuilder> reqSpecCustomizer) {
+            reqSpecCustomizer.accept(reqSpec);
             return this;
         }
 
         /**
-         * Customise response specification
-         * @param consumer consumer
+         * Customize response specification
+         * @param respSpecCustomizer consumer to modify the ResponseSpecBuilder
          * @return operation
          */
-        public UpdatePetOper respSpec(Consumer<ResponseSpecBuilder> consumer) {
-            consumer.accept(respSpec);
+        public UpdatePetOper respSpec(Consumer<ResponseSpecBuilder> respSpecCustomizer) {
+            respSpecCustomizer.accept(respSpec);
             return this;
         }
     }
@@ -640,22 +649,22 @@ public class PetApi {
          }
 
         /**
-         * Customise request specification
-         * @param consumer consumer
+         * Customize request specification
+         * @param reqSpecCustomizer consumer to modify the RequestSpecBuilder
          * @return operation
          */
-        public UpdatePetWithFormOper reqSpec(Consumer<RequestSpecBuilder> consumer) {
-            consumer.accept(reqSpec);
+        public UpdatePetWithFormOper reqSpec(Consumer<RequestSpecBuilder> reqSpecCustomizer) {
+            reqSpecCustomizer.accept(reqSpec);
             return this;
         }
 
         /**
-         * Customise response specification
-         * @param consumer consumer
+         * Customize response specification
+         * @param respSpecCustomizer consumer to modify the ResponseSpecBuilder
          * @return operation
          */
-        public UpdatePetWithFormOper respSpec(Consumer<ResponseSpecBuilder> consumer) {
-            consumer.accept(respSpec);
+        public UpdatePetWithFormOper respSpec(Consumer<ResponseSpecBuilder> respSpecCustomizer) {
+            respSpecCustomizer.accept(respSpec);
             return this;
         }
     }
@@ -737,22 +746,22 @@ public class PetApi {
          }
 
         /**
-         * Customise request specification
-         * @param consumer consumer
+         * Customize request specification
+         * @param reqSpecCustomizer consumer to modify the RequestSpecBuilder
          * @return operation
          */
-        public UploadFileOper reqSpec(Consumer<RequestSpecBuilder> consumer) {
-            consumer.accept(reqSpec);
+        public UploadFileOper reqSpec(Consumer<RequestSpecBuilder> reqSpecCustomizer) {
+            reqSpecCustomizer.accept(reqSpec);
             return this;
         }
 
         /**
-         * Customise response specification
-         * @param consumer consumer
+         * Customize response specification
+         * @param respSpecCustomizer consumer to modify the ResponseSpecBuilder
          * @return operation
          */
-        public UploadFileOper respSpec(Consumer<ResponseSpecBuilder> consumer) {
-            consumer.accept(respSpec);
+        public UploadFileOper respSpec(Consumer<ResponseSpecBuilder> respSpecCustomizer) {
+            respSpecCustomizer.accept(respSpec);
             return this;
         }
     }
@@ -834,22 +843,22 @@ public class PetApi {
          }
 
         /**
-         * Customise request specification
-         * @param consumer consumer
+         * Customize request specification
+         * @param reqSpecCustomizer consumer to modify the RequestSpecBuilder
          * @return operation
          */
-        public UploadFileWithRequiredFileOper reqSpec(Consumer<RequestSpecBuilder> consumer) {
-            consumer.accept(reqSpec);
+        public UploadFileWithRequiredFileOper reqSpec(Consumer<RequestSpecBuilder> reqSpecCustomizer) {
+            reqSpecCustomizer.accept(reqSpec);
             return this;
         }
 
         /**
-         * Customise response specification
-         * @param consumer consumer
+         * Customize response specification
+         * @param respSpecCustomizer consumer to modify the ResponseSpecBuilder
          * @return operation
          */
-        public UploadFileWithRequiredFileOper respSpec(Consumer<ResponseSpecBuilder> consumer) {
-            consumer.accept(respSpec);
+        public UploadFileWithRequiredFileOper respSpec(Consumer<ResponseSpecBuilder> respSpecCustomizer) {
+            respSpecCustomizer.accept(respSpec);
             return this;
         }
     }
diff --git a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/api/StoreApi.java b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/api/StoreApi.java
index b1426680b6..83591c7169 100644
--- a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/api/StoreApi.java
+++ b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/api/StoreApi.java
@@ -39,14 +39,23 @@ import static io.restassured.http.Method.*;
 @Api(value = "Store")
 public class StoreApi {
 
-    private RequestSpecBuilder reqSpec;
+    private Supplier<RequestSpecBuilder> reqSpecSupplier;
+    private Consumer<RequestSpecBuilder> reqSpecCustomizer;
 
-    private StoreApi(RequestSpecBuilder reqSpec) {
-        this.reqSpec = reqSpec;
+    private StoreApi(Supplier<RequestSpecBuilder> reqSpecSupplier) {
+        this.reqSpecSupplier = reqSpecSupplier;
     }
 
-    public static StoreApi store(RequestSpecBuilder reqSpec) {
-        return new StoreApi(reqSpec);
+    public static StoreApi store(Supplier<RequestSpecBuilder> reqSpecSupplier) {
+        return new StoreApi(reqSpecSupplier);
+    }
+
+    private RequestSpecBuilder createReqSpec() {
+        RequestSpecBuilder reqSpec = reqSpecSupplier.get();
+        if(reqSpecCustomizer != null) {
+            reqSpecCustomizer.accept(reqSpec);
+        }
+        return reqSpec;
     }
 
 
@@ -58,7 +67,7 @@ public class StoreApi {
             @ApiResponse(code = 400, message = "Invalid ID supplied") ,
             @ApiResponse(code = 404, message = "Order not found")  })
     public DeleteOrderOper deleteOrder() {
-        return new DeleteOrderOper(reqSpec);
+        return new DeleteOrderOper(createReqSpec());
     }
 
     @ApiOperation(value = "Returns pet inventories by status",
@@ -68,7 +77,7 @@ public class StoreApi {
     @ApiResponses(value = { 
             @ApiResponse(code = 200, message = "successful operation")  })
     public GetInventoryOper getInventory() {
-        return new GetInventoryOper(reqSpec);
+        return new GetInventoryOper(createReqSpec());
     }
 
     @ApiOperation(value = "Find purchase order by ID",
@@ -80,7 +89,7 @@ public class StoreApi {
             @ApiResponse(code = 400, message = "Invalid ID supplied") ,
             @ApiResponse(code = 404, message = "Order not found")  })
     public GetOrderByIdOper getOrderById() {
-        return new GetOrderByIdOper(reqSpec);
+        return new GetOrderByIdOper(createReqSpec());
     }
 
     @ApiOperation(value = "Place an order for a pet",
@@ -91,16 +100,16 @@ public class StoreApi {
             @ApiResponse(code = 200, message = "successful operation") ,
             @ApiResponse(code = 400, message = "Invalid Order")  })
     public PlaceOrderOper placeOrder() {
-        return new PlaceOrderOper(reqSpec);
+        return new PlaceOrderOper(createReqSpec());
     }
 
     /**
-     * Customise request specification
-     * @param consumer consumer
+     * Customize request specification
+     * @param reqSpecCustomizer consumer to modify the RequestSpecBuilder
      * @return api
      */
-    public StoreApi reqSpec(Consumer<RequestSpecBuilder> consumer) {
-        consumer.accept(reqSpec);
+    public StoreApi reqSpec(Consumer<RequestSpecBuilder> reqSpecCustomizer) {
+        this.reqSpecCustomizer = reqSpecCustomizer;
         return this;
     }
 
@@ -146,22 +155,22 @@ public class StoreApi {
         }
 
         /**
-         * Customise request specification
-         * @param consumer consumer
+         * Customize request specification
+         * @param reqSpecCustomizer consumer to modify the RequestSpecBuilder
          * @return operation
          */
-        public DeleteOrderOper reqSpec(Consumer<RequestSpecBuilder> consumer) {
-            consumer.accept(reqSpec);
+        public DeleteOrderOper reqSpec(Consumer<RequestSpecBuilder> reqSpecCustomizer) {
+            reqSpecCustomizer.accept(reqSpec);
             return this;
         }
 
         /**
-         * Customise response specification
-         * @param consumer consumer
+         * Customize response specification
+         * @param respSpecCustomizer consumer to modify the ResponseSpecBuilder
          * @return operation
          */
-        public DeleteOrderOper respSpec(Consumer<ResponseSpecBuilder> consumer) {
-            consumer.accept(respSpec);
+        public DeleteOrderOper respSpec(Consumer<ResponseSpecBuilder> respSpecCustomizer) {
+            respSpecCustomizer.accept(respSpec);
             return this;
         }
     }
@@ -206,22 +215,22 @@ public class StoreApi {
         }
 
         /**
-         * Customise request specification
-         * @param consumer consumer
+         * Customize request specification
+         * @param reqSpecCustomizer consumer to modify the RequestSpecBuilder
          * @return operation
          */
-        public GetInventoryOper reqSpec(Consumer<RequestSpecBuilder> consumer) {
-            consumer.accept(reqSpec);
+        public GetInventoryOper reqSpec(Consumer<RequestSpecBuilder> reqSpecCustomizer) {
+            reqSpecCustomizer.accept(reqSpec);
             return this;
         }
 
         /**
-         * Customise response specification
-         * @param consumer consumer
+         * Customize response specification
+         * @param respSpecCustomizer consumer to modify the ResponseSpecBuilder
          * @return operation
          */
-        public GetInventoryOper respSpec(Consumer<ResponseSpecBuilder> consumer) {
-            consumer.accept(respSpec);
+        public GetInventoryOper respSpec(Consumer<ResponseSpecBuilder> respSpecCustomizer) {
+            respSpecCustomizer.accept(respSpec);
             return this;
         }
     }
@@ -278,22 +287,22 @@ public class StoreApi {
         }
 
         /**
-         * Customise request specification
-         * @param consumer consumer
+         * Customize request specification
+         * @param reqSpecCustomizer consumer to modify the RequestSpecBuilder
          * @return operation
          */
-        public GetOrderByIdOper reqSpec(Consumer<RequestSpecBuilder> consumer) {
-            consumer.accept(reqSpec);
+        public GetOrderByIdOper reqSpec(Consumer<RequestSpecBuilder> reqSpecCustomizer) {
+            reqSpecCustomizer.accept(reqSpec);
             return this;
         }
 
         /**
-         * Customise response specification
-         * @param consumer consumer
+         * Customize response specification
+         * @param respSpecCustomizer consumer to modify the ResponseSpecBuilder
          * @return operation
          */
-        public GetOrderByIdOper respSpec(Consumer<ResponseSpecBuilder> consumer) {
-            consumer.accept(respSpec);
+        public GetOrderByIdOper respSpec(Consumer<ResponseSpecBuilder> respSpecCustomizer) {
+            respSpecCustomizer.accept(respSpec);
             return this;
         }
     }
@@ -349,22 +358,22 @@ public class StoreApi {
         }
 
         /**
-         * Customise request specification
-         * @param consumer consumer
+         * Customize request specification
+         * @param reqSpecCustomizer consumer to modify the RequestSpecBuilder
          * @return operation
          */
-        public PlaceOrderOper reqSpec(Consumer<RequestSpecBuilder> consumer) {
-            consumer.accept(reqSpec);
+        public PlaceOrderOper reqSpec(Consumer<RequestSpecBuilder> reqSpecCustomizer) {
+            reqSpecCustomizer.accept(reqSpec);
             return this;
         }
 
         /**
-         * Customise response specification
-         * @param consumer consumer
+         * Customize response specification
+         * @param respSpecCustomizer consumer to modify the ResponseSpecBuilder
          * @return operation
          */
-        public PlaceOrderOper respSpec(Consumer<ResponseSpecBuilder> consumer) {
-            consumer.accept(respSpec);
+        public PlaceOrderOper respSpec(Consumer<ResponseSpecBuilder> respSpecCustomizer) {
+            respSpecCustomizer.accept(respSpec);
             return this;
         }
     }
diff --git a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/api/UserApi.java b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/api/UserApi.java
index e132c70e18..3ab3025c92 100644
--- a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/api/UserApi.java
+++ b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/api/UserApi.java
@@ -39,14 +39,23 @@ import static io.restassured.http.Method.*;
 @Api(value = "User")
 public class UserApi {
 
-    private RequestSpecBuilder reqSpec;
+    private Supplier<RequestSpecBuilder> reqSpecSupplier;
+    private Consumer<RequestSpecBuilder> reqSpecCustomizer;
 
-    private UserApi(RequestSpecBuilder reqSpec) {
-        this.reqSpec = reqSpec;
+    private UserApi(Supplier<RequestSpecBuilder> reqSpecSupplier) {
+        this.reqSpecSupplier = reqSpecSupplier;
     }
 
-    public static UserApi user(RequestSpecBuilder reqSpec) {
-        return new UserApi(reqSpec);
+    public static UserApi user(Supplier<RequestSpecBuilder> reqSpecSupplier) {
+        return new UserApi(reqSpecSupplier);
+    }
+
+    private RequestSpecBuilder createReqSpec() {
+        RequestSpecBuilder reqSpec = reqSpecSupplier.get();
+        if(reqSpecCustomizer != null) {
+            reqSpecCustomizer.accept(reqSpec);
+        }
+        return reqSpec;
     }
 
 
@@ -57,7 +66,7 @@ public class UserApi {
     @ApiResponses(value = { 
             @ApiResponse(code = 0, message = "successful operation")  })
     public CreateUserOper createUser() {
-        return new CreateUserOper(reqSpec);
+        return new CreateUserOper(createReqSpec());
     }
 
     @ApiOperation(value = "Creates list of users with given input array",
@@ -67,7 +76,7 @@ public class UserApi {
     @ApiResponses(value = { 
             @ApiResponse(code = 0, message = "successful operation")  })
     public CreateUsersWithArrayInputOper createUsersWithArrayInput() {
-        return new CreateUsersWithArrayInputOper(reqSpec);
+        return new CreateUsersWithArrayInputOper(createReqSpec());
     }
 
     @ApiOperation(value = "Creates list of users with given input array",
@@ -77,7 +86,7 @@ public class UserApi {
     @ApiResponses(value = { 
             @ApiResponse(code = 0, message = "successful operation")  })
     public CreateUsersWithListInputOper createUsersWithListInput() {
-        return new CreateUsersWithListInputOper(reqSpec);
+        return new CreateUsersWithListInputOper(createReqSpec());
     }
 
     @ApiOperation(value = "Delete user",
@@ -88,7 +97,7 @@ public class UserApi {
             @ApiResponse(code = 400, message = "Invalid username supplied") ,
             @ApiResponse(code = 404, message = "User not found")  })
     public DeleteUserOper deleteUser() {
-        return new DeleteUserOper(reqSpec);
+        return new DeleteUserOper(createReqSpec());
     }
 
     @ApiOperation(value = "Get user by user name",
@@ -100,7 +109,7 @@ public class UserApi {
             @ApiResponse(code = 400, message = "Invalid username supplied") ,
             @ApiResponse(code = 404, message = "User not found")  })
     public GetUserByNameOper getUserByName() {
-        return new GetUserByNameOper(reqSpec);
+        return new GetUserByNameOper(createReqSpec());
     }
 
     @ApiOperation(value = "Logs user into the system",
@@ -111,7 +120,7 @@ public class UserApi {
             @ApiResponse(code = 200, message = "successful operation") ,
             @ApiResponse(code = 400, message = "Invalid username/password supplied")  })
     public LoginUserOper loginUser() {
-        return new LoginUserOper(reqSpec);
+        return new LoginUserOper(createReqSpec());
     }
 
     @ApiOperation(value = "Logs out current logged in user session",
@@ -121,7 +130,7 @@ public class UserApi {
     @ApiResponses(value = { 
             @ApiResponse(code = 0, message = "successful operation")  })
     public LogoutUserOper logoutUser() {
-        return new LogoutUserOper(reqSpec);
+        return new LogoutUserOper(createReqSpec());
     }
 
     @ApiOperation(value = "Updated user",
@@ -132,16 +141,16 @@ public class UserApi {
             @ApiResponse(code = 400, message = "Invalid user supplied") ,
             @ApiResponse(code = 404, message = "User not found")  })
     public UpdateUserOper updateUser() {
-        return new UpdateUserOper(reqSpec);
+        return new UpdateUserOper(createReqSpec());
     }
 
     /**
-     * Customise request specification
-     * @param consumer consumer
+     * Customize request specification
+     * @param reqSpecCustomizer consumer to modify the RequestSpecBuilder
      * @return api
      */
-    public UserApi reqSpec(Consumer<RequestSpecBuilder> consumer) {
-        consumer.accept(reqSpec);
+    public UserApi reqSpec(Consumer<RequestSpecBuilder> reqSpecCustomizer) {
+        this.reqSpecCustomizer = reqSpecCustomizer;
         return this;
     }
 
@@ -186,22 +195,22 @@ public class UserApi {
         }
 
         /**
-         * Customise request specification
-         * @param consumer consumer
+         * Customize request specification
+         * @param reqSpecCustomizer consumer to modify the RequestSpecBuilder
          * @return operation
          */
-        public CreateUserOper reqSpec(Consumer<RequestSpecBuilder> consumer) {
-            consumer.accept(reqSpec);
+        public CreateUserOper reqSpec(Consumer<RequestSpecBuilder> reqSpecCustomizer) {
+            reqSpecCustomizer.accept(reqSpec);
             return this;
         }
 
         /**
-         * Customise response specification
-         * @param consumer consumer
+         * Customize response specification
+         * @param respSpecCustomizer consumer to modify the ResponseSpecBuilder
          * @return operation
          */
-        public CreateUserOper respSpec(Consumer<ResponseSpecBuilder> consumer) {
-            consumer.accept(respSpec);
+        public CreateUserOper respSpec(Consumer<ResponseSpecBuilder> respSpecCustomizer) {
+            respSpecCustomizer.accept(respSpec);
             return this;
         }
     }
@@ -246,22 +255,22 @@ public class UserApi {
         }
 
         /**
-         * Customise request specification
-         * @param consumer consumer
+         * Customize request specification
+         * @param reqSpecCustomizer consumer to modify the RequestSpecBuilder
          * @return operation
          */
-        public CreateUsersWithArrayInputOper reqSpec(Consumer<RequestSpecBuilder> consumer) {
-            consumer.accept(reqSpec);
+        public CreateUsersWithArrayInputOper reqSpec(Consumer<RequestSpecBuilder> reqSpecCustomizer) {
+            reqSpecCustomizer.accept(reqSpec);
             return this;
         }
 
         /**
-         * Customise response specification
-         * @param consumer consumer
+         * Customize response specification
+         * @param respSpecCustomizer consumer to modify the ResponseSpecBuilder
          * @return operation
          */
-        public CreateUsersWithArrayInputOper respSpec(Consumer<ResponseSpecBuilder> consumer) {
-            consumer.accept(respSpec);
+        public CreateUsersWithArrayInputOper respSpec(Consumer<ResponseSpecBuilder> respSpecCustomizer) {
+            respSpecCustomizer.accept(respSpec);
             return this;
         }
     }
@@ -306,22 +315,22 @@ public class UserApi {
         }
 
         /**
-         * Customise request specification
-         * @param consumer consumer
+         * Customize request specification
+         * @param reqSpecCustomizer consumer to modify the RequestSpecBuilder
          * @return operation
          */
-        public CreateUsersWithListInputOper reqSpec(Consumer<RequestSpecBuilder> consumer) {
-            consumer.accept(reqSpec);
+        public CreateUsersWithListInputOper reqSpec(Consumer<RequestSpecBuilder> reqSpecCustomizer) {
+            reqSpecCustomizer.accept(reqSpec);
             return this;
         }
 
         /**
-         * Customise response specification
-         * @param consumer consumer
+         * Customize response specification
+         * @param respSpecCustomizer consumer to modify the ResponseSpecBuilder
          * @return operation
          */
-        public CreateUsersWithListInputOper respSpec(Consumer<ResponseSpecBuilder> consumer) {
-            consumer.accept(respSpec);
+        public CreateUsersWithListInputOper respSpec(Consumer<ResponseSpecBuilder> respSpecCustomizer) {
+            respSpecCustomizer.accept(respSpec);
             return this;
         }
     }
@@ -367,22 +376,22 @@ public class UserApi {
         }
 
         /**
-         * Customise request specification
-         * @param consumer consumer
+         * Customize request specification
+         * @param reqSpecCustomizer consumer to modify the RequestSpecBuilder
          * @return operation
          */
-        public DeleteUserOper reqSpec(Consumer<RequestSpecBuilder> consumer) {
-            consumer.accept(reqSpec);
+        public DeleteUserOper reqSpec(Consumer<RequestSpecBuilder> reqSpecCustomizer) {
+            reqSpecCustomizer.accept(reqSpec);
             return this;
         }
 
         /**
-         * Customise response specification
-         * @param consumer consumer
+         * Customize response specification
+         * @param respSpecCustomizer consumer to modify the ResponseSpecBuilder
          * @return operation
          */
-        public DeleteUserOper respSpec(Consumer<ResponseSpecBuilder> consumer) {
-            consumer.accept(respSpec);
+        public DeleteUserOper respSpec(Consumer<ResponseSpecBuilder> respSpecCustomizer) {
+            respSpecCustomizer.accept(respSpec);
             return this;
         }
     }
@@ -439,22 +448,22 @@ public class UserApi {
         }
 
         /**
-         * Customise request specification
-         * @param consumer consumer
+         * Customize request specification
+         * @param reqSpecCustomizer consumer to modify the RequestSpecBuilder
          * @return operation
          */
-        public GetUserByNameOper reqSpec(Consumer<RequestSpecBuilder> consumer) {
-            consumer.accept(reqSpec);
+        public GetUserByNameOper reqSpec(Consumer<RequestSpecBuilder> reqSpecCustomizer) {
+            reqSpecCustomizer.accept(reqSpec);
             return this;
         }
 
         /**
-         * Customise response specification
-         * @param consumer consumer
+         * Customize response specification
+         * @param respSpecCustomizer consumer to modify the ResponseSpecBuilder
          * @return operation
          */
-        public GetUserByNameOper respSpec(Consumer<ResponseSpecBuilder> consumer) {
-            consumer.accept(respSpec);
+        public GetUserByNameOper respSpec(Consumer<ResponseSpecBuilder> respSpecCustomizer) {
+            respSpecCustomizer.accept(respSpec);
             return this;
         }
     }
@@ -523,22 +532,22 @@ public class UserApi {
         }
 
         /**
-         * Customise request specification
-         * @param consumer consumer
+         * Customize request specification
+         * @param reqSpecCustomizer consumer to modify the RequestSpecBuilder
          * @return operation
          */
-        public LoginUserOper reqSpec(Consumer<RequestSpecBuilder> consumer) {
-            consumer.accept(reqSpec);
+        public LoginUserOper reqSpec(Consumer<RequestSpecBuilder> reqSpecCustomizer) {
+            reqSpecCustomizer.accept(reqSpec);
             return this;
         }
 
         /**
-         * Customise response specification
-         * @param consumer consumer
+         * Customize response specification
+         * @param respSpecCustomizer consumer to modify the ResponseSpecBuilder
          * @return operation
          */
-        public LoginUserOper respSpec(Consumer<ResponseSpecBuilder> consumer) {
-            consumer.accept(respSpec);
+        public LoginUserOper respSpec(Consumer<ResponseSpecBuilder> respSpecCustomizer) {
+            respSpecCustomizer.accept(respSpec);
             return this;
         }
     }
@@ -572,22 +581,22 @@ public class UserApi {
         }
 
         /**
-         * Customise request specification
-         * @param consumer consumer
+         * Customize request specification
+         * @param reqSpecCustomizer consumer to modify the RequestSpecBuilder
          * @return operation
          */
-        public LogoutUserOper reqSpec(Consumer<RequestSpecBuilder> consumer) {
-            consumer.accept(reqSpec);
+        public LogoutUserOper reqSpec(Consumer<RequestSpecBuilder> reqSpecCustomizer) {
+            reqSpecCustomizer.accept(reqSpec);
             return this;
         }
 
         /**
-         * Customise response specification
-         * @param consumer consumer
+         * Customize response specification
+         * @param respSpecCustomizer consumer to modify the ResponseSpecBuilder
          * @return operation
          */
-        public LogoutUserOper respSpec(Consumer<ResponseSpecBuilder> consumer) {
-            consumer.accept(respSpec);
+        public LogoutUserOper respSpec(Consumer<ResponseSpecBuilder> respSpecCustomizer) {
+            respSpecCustomizer.accept(respSpec);
             return this;
         }
     }
@@ -644,22 +653,22 @@ public class UserApi {
         }
 
         /**
-         * Customise request specification
-         * @param consumer consumer
+         * Customize request specification
+         * @param reqSpecCustomizer consumer to modify the RequestSpecBuilder
          * @return operation
          */
-        public UpdateUserOper reqSpec(Consumer<RequestSpecBuilder> consumer) {
-            consumer.accept(reqSpec);
+        public UpdateUserOper reqSpec(Consumer<RequestSpecBuilder> reqSpecCustomizer) {
+            reqSpecCustomizer.accept(reqSpec);
             return this;
         }
 
         /**
-         * Customise response specification
-         * @param consumer consumer
+         * Customize response specification
+         * @param respSpecCustomizer consumer to modify the ResponseSpecBuilder
          * @return operation
          */
-        public UpdateUserOper respSpec(Consumer<ResponseSpecBuilder> consumer) {
-            consumer.accept(respSpec);
+        public UpdateUserOper respSpec(Consumer<ResponseSpecBuilder> respSpecCustomizer) {
+            respSpecCustomizer.accept(respSpec);
             return this;
         }
     }

From 1e735c69faccf00c7b600d6fc797966bd82383d5 Mon Sep 17 00:00:00 2001
From: Akihito Nakano <sora.akatsuki@gmail.com>
Date: Thu, 18 Jul 2019 15:04:27 +0900
Subject: [PATCH 24/62] Add `Logs` section to the Debugging page. (#3357)

---
 docs/debugging.md | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/docs/debugging.md b/docs/debugging.md
index 99c47c658e..783a6012be 100644
--- a/docs/debugging.md
+++ b/docs/debugging.md
@@ -62,3 +62,26 @@ The steps are shown here for a specific version of the generator, but apply the
   Listening for transport dt_socket at address: 5005
   ```
 * Set breakpoints in code, and then attach your remote debugger from your IDE (see above). The generator will automatically unblock once the remote debugger is attached. You can now step through the code.
+
+## Logs
+
+You can try to enable debugging log with `-Dlog.level=debug` option to the `JAVA_OPTS` environment variable to see more information:
+
+```bash
+export JAVA_OPTS="${JAVA_OPTS} -Dlog.level=debug"
+```
+
+Set the option then DEBUG logs are printed out:
+
+```bash
+openapi-generator generate -g go ...
+
+...
+...
+[main] DEBUG o.o.codegen.DefaultCodegen - debugging fromProperty for files : class Schema {
+    type: null
+    format: null
+    $ref: #/components/schemas/File
+...
+...
+```

From 1aa8a2bec4c6f49626f58db96cb44e38a9b886e9 Mon Sep 17 00:00:00 2001
From: Josh Burton <athor3d@gmail.com>
Date: Thu, 18 Jul 2019 18:28:15 +1200
Subject: [PATCH 25/62] [dart-jaguar] Fixes error accessing default converters
 (#3361)

`this.converters` was causing errors as the default converters are declared outside of the API client.
---
 .../src/main/resources/dart-jaguar/apilib.mustache        | 6 +++---
 .../flutter_petstore/openapi/.openapi-generator/VERSION   | 2 +-
 .../dart-jaguar/flutter_petstore/openapi/README.md        | 1 -
 .../dart-jaguar/flutter_petstore/openapi/lib/api.dart     | 8 ++++----
 .../openapi/.openapi-generator/VERSION                    | 2 +-
 .../dart-jaguar/flutter_proto_petstore/openapi/README.md  | 1 -
 .../flutter_proto_petstore/openapi/lib/api.dart           | 8 ++++----
 .../dart-jaguar/openapi/.openapi-generator/VERSION        | 2 +-
 samples/client/petstore/dart-jaguar/openapi/README.md     | 1 -
 samples/client/petstore/dart-jaguar/openapi/lib/api.dart  | 8 ++++----
 .../dart-jaguar/openapi_proto/.openapi-generator/VERSION  | 2 +-
 .../client/petstore/dart-jaguar/openapi_proto/README.md   | 1 -
 .../petstore/dart-jaguar/openapi_proto/lib/api.dart       | 8 ++++----
 13 files changed, 23 insertions(+), 27 deletions(-)

diff --git a/modules/openapi-generator/src/main/resources/dart-jaguar/apilib.mustache b/modules/openapi-generator/src/main/resources/dart-jaguar/apilib.mustache
index 8571ea0a19..1fd657ea1d 100644
--- a/modules/openapi-generator/src/main/resources/dart-jaguar/apilib.mustache
+++ b/modules/openapi-generator/src/main/resources/dart-jaguar/apilib.mustache
@@ -21,7 +21,7 @@ import 'package:jaguar_mimetype/jaguar_mimetype.dart';
 final _jsonJaguarRepo = JsonRepo()
 {{#models}}{{#model}}..add({{classname}}Serializer())
 {{/model}}{{/models}};
-final Map<String, CodecRepo> converters = {
+final Map<String, CodecRepo> defaultConverters = {
     MimeTypes.json: _jsonJaguarRepo,
 };
 {{/jsonFormat}}
@@ -33,7 +33,7 @@ final _protoJaguarRepo = ProtoCodecRepo()
 final _jsonJaguarRepo = ProtoCodecRepo(isJsonFormatEnabled: true)
 {{#models}}{{#model}}..add((data) => {{classname}}.fromBuffer(List<int>.from(data)))
 {{/model}}{{/models}};
-final Map<String, CodecRepo> converters = {
+final Map<String, CodecRepo> defaultConverters = {
     MimeTypes.json: _jsonJaguarRepo,
     MimeTypes.binary: _protoJaguarRepo,
 };
@@ -91,7 +91,7 @@ class {{clientName}} {
             base = _baseRoute;
         }
         if(converters == null) {
-            converters = this.converters;
+            converters = defaultConverters;
         }
         return {{classname}}(base: base, converters: converters, timeout: timeout);
     }
diff --git a/samples/client/petstore/dart-jaguar/flutter_petstore/openapi/.openapi-generator/VERSION b/samples/client/petstore/dart-jaguar/flutter_petstore/openapi/.openapi-generator/VERSION
index 479c313e87..83a328a922 100644
--- a/samples/client/petstore/dart-jaguar/flutter_petstore/openapi/.openapi-generator/VERSION
+++ b/samples/client/petstore/dart-jaguar/flutter_petstore/openapi/.openapi-generator/VERSION
@@ -1 +1 @@
-4.0.3-SNAPSHOT
\ No newline at end of file
+4.1.0-SNAPSHOT
\ No newline at end of file
diff --git a/samples/client/petstore/dart-jaguar/flutter_petstore/openapi/README.md b/samples/client/petstore/dart-jaguar/flutter_petstore/openapi/README.md
index 291b60d7e6..693df464eb 100644
--- a/samples/client/petstore/dart-jaguar/flutter_petstore/openapi/README.md
+++ b/samples/client/petstore/dart-jaguar/flutter_petstore/openapi/README.md
@@ -4,7 +4,6 @@ This is a sample server Petstore server. For this sample, you can use the api ke
 This Dart package is automatically generated by the [Open API Codegen](https://github.com/OpenAPITools/openapi-generator) project:
 
 - API version: 1.0.0
-- Build date: 2019-06-29T09:47:15.495+12:00[Pacific/Auckland]
 - Build package: org.openapitools.codegen.languages.DartJaguarClientCodegen
 
 ## Requirements
diff --git a/samples/client/petstore/dart-jaguar/flutter_petstore/openapi/lib/api.dart b/samples/client/petstore/dart-jaguar/flutter_petstore/openapi/lib/api.dart
index b787b0405d..d077b86fe9 100644
--- a/samples/client/petstore/dart-jaguar/flutter_petstore/openapi/lib/api.dart
+++ b/samples/client/petstore/dart-jaguar/flutter_petstore/openapi/lib/api.dart
@@ -29,7 +29,7 @@ final _jsonJaguarRepo = JsonRepo()
 ..add(TagSerializer())
 ..add(UserSerializer())
 ;
-final Map<String, CodecRepo> converters = {
+final Map<String, CodecRepo> defaultConverters = {
     MimeTypes.json: _jsonJaguarRepo,
 };
 
@@ -86,7 +86,7 @@ class Openapi {
             base = _baseRoute;
         }
         if(converters == null) {
-            converters = this.converters;
+            converters = defaultConverters;
         }
         return PetApi(base: base, converters: converters, timeout: timeout);
     }
@@ -101,7 +101,7 @@ class Openapi {
             base = _baseRoute;
         }
         if(converters == null) {
-            converters = this.converters;
+            converters = defaultConverters;
         }
         return StoreApi(base: base, converters: converters, timeout: timeout);
     }
@@ -116,7 +116,7 @@ class Openapi {
             base = _baseRoute;
         }
         if(converters == null) {
-            converters = this.converters;
+            converters = defaultConverters;
         }
         return UserApi(base: base, converters: converters, timeout: timeout);
     }
diff --git a/samples/client/petstore/dart-jaguar/flutter_proto_petstore/openapi/.openapi-generator/VERSION b/samples/client/petstore/dart-jaguar/flutter_proto_petstore/openapi/.openapi-generator/VERSION
index 479c313e87..83a328a922 100644
--- a/samples/client/petstore/dart-jaguar/flutter_proto_petstore/openapi/.openapi-generator/VERSION
+++ b/samples/client/petstore/dart-jaguar/flutter_proto_petstore/openapi/.openapi-generator/VERSION
@@ -1 +1 @@
-4.0.3-SNAPSHOT
\ No newline at end of file
+4.1.0-SNAPSHOT
\ No newline at end of file
diff --git a/samples/client/petstore/dart-jaguar/flutter_proto_petstore/openapi/README.md b/samples/client/petstore/dart-jaguar/flutter_proto_petstore/openapi/README.md
index 8277867842..693df464eb 100644
--- a/samples/client/petstore/dart-jaguar/flutter_proto_petstore/openapi/README.md
+++ b/samples/client/petstore/dart-jaguar/flutter_proto_petstore/openapi/README.md
@@ -4,7 +4,6 @@ This is a sample server Petstore server. For this sample, you can use the api ke
 This Dart package is automatically generated by the [Open API Codegen](https://github.com/OpenAPITools/openapi-generator) project:
 
 - API version: 1.0.0
-- Build date: 2019-06-29T09:47:16.421+12:00[Pacific/Auckland]
 - Build package: org.openapitools.codegen.languages.DartJaguarClientCodegen
 
 ## Requirements
diff --git a/samples/client/petstore/dart-jaguar/flutter_proto_petstore/openapi/lib/api.dart b/samples/client/petstore/dart-jaguar/flutter_proto_petstore/openapi/lib/api.dart
index 12dcdff72f..60148b8f58 100644
--- a/samples/client/petstore/dart-jaguar/flutter_proto_petstore/openapi/lib/api.dart
+++ b/samples/client/petstore/dart-jaguar/flutter_proto_petstore/openapi/lib/api.dart
@@ -39,7 +39,7 @@ final _jsonJaguarRepo = ProtoCodecRepo(isJsonFormatEnabled: true)
 ..add((data) => Tag.fromBuffer(List<int>.from(data)))
 ..add((data) => User.fromBuffer(List<int>.from(data)))
 ;
-final Map<String, CodecRepo> converters = {
+final Map<String, CodecRepo> defaultConverters = {
     MimeTypes.json: _jsonJaguarRepo,
     MimeTypes.binary: _protoJaguarRepo,
 };
@@ -96,7 +96,7 @@ class Openapi {
             base = _baseRoute;
         }
         if(converters == null) {
-            converters = this.converters;
+            converters = defaultConverters;
         }
         return PetApi(base: base, converters: converters, timeout: timeout);
     }
@@ -111,7 +111,7 @@ class Openapi {
             base = _baseRoute;
         }
         if(converters == null) {
-            converters = this.converters;
+            converters = defaultConverters;
         }
         return StoreApi(base: base, converters: converters, timeout: timeout);
     }
@@ -126,7 +126,7 @@ class Openapi {
             base = _baseRoute;
         }
         if(converters == null) {
-            converters = this.converters;
+            converters = defaultConverters;
         }
         return UserApi(base: base, converters: converters, timeout: timeout);
     }
diff --git a/samples/client/petstore/dart-jaguar/openapi/.openapi-generator/VERSION b/samples/client/petstore/dart-jaguar/openapi/.openapi-generator/VERSION
index 479c313e87..83a328a922 100644
--- a/samples/client/petstore/dart-jaguar/openapi/.openapi-generator/VERSION
+++ b/samples/client/petstore/dart-jaguar/openapi/.openapi-generator/VERSION
@@ -1 +1 @@
-4.0.3-SNAPSHOT
\ No newline at end of file
+4.1.0-SNAPSHOT
\ No newline at end of file
diff --git a/samples/client/petstore/dart-jaguar/openapi/README.md b/samples/client/petstore/dart-jaguar/openapi/README.md
index 7f45064333..693df464eb 100644
--- a/samples/client/petstore/dart-jaguar/openapi/README.md
+++ b/samples/client/petstore/dart-jaguar/openapi/README.md
@@ -4,7 +4,6 @@ This is a sample server Petstore server. For this sample, you can use the api ke
 This Dart package is automatically generated by the [Open API Codegen](https://github.com/OpenAPITools/openapi-generator) project:
 
 - API version: 1.0.0
-- Build date: 2019-06-29T09:47:14.533+12:00[Pacific/Auckland]
 - Build package: org.openapitools.codegen.languages.DartJaguarClientCodegen
 
 ## Requirements
diff --git a/samples/client/petstore/dart-jaguar/openapi/lib/api.dart b/samples/client/petstore/dart-jaguar/openapi/lib/api.dart
index b787b0405d..d077b86fe9 100644
--- a/samples/client/petstore/dart-jaguar/openapi/lib/api.dart
+++ b/samples/client/petstore/dart-jaguar/openapi/lib/api.dart
@@ -29,7 +29,7 @@ final _jsonJaguarRepo = JsonRepo()
 ..add(TagSerializer())
 ..add(UserSerializer())
 ;
-final Map<String, CodecRepo> converters = {
+final Map<String, CodecRepo> defaultConverters = {
     MimeTypes.json: _jsonJaguarRepo,
 };
 
@@ -86,7 +86,7 @@ class Openapi {
             base = _baseRoute;
         }
         if(converters == null) {
-            converters = this.converters;
+            converters = defaultConverters;
         }
         return PetApi(base: base, converters: converters, timeout: timeout);
     }
@@ -101,7 +101,7 @@ class Openapi {
             base = _baseRoute;
         }
         if(converters == null) {
-            converters = this.converters;
+            converters = defaultConverters;
         }
         return StoreApi(base: base, converters: converters, timeout: timeout);
     }
@@ -116,7 +116,7 @@ class Openapi {
             base = _baseRoute;
         }
         if(converters == null) {
-            converters = this.converters;
+            converters = defaultConverters;
         }
         return UserApi(base: base, converters: converters, timeout: timeout);
     }
diff --git a/samples/client/petstore/dart-jaguar/openapi_proto/.openapi-generator/VERSION b/samples/client/petstore/dart-jaguar/openapi_proto/.openapi-generator/VERSION
index 479c313e87..83a328a922 100644
--- a/samples/client/petstore/dart-jaguar/openapi_proto/.openapi-generator/VERSION
+++ b/samples/client/petstore/dart-jaguar/openapi_proto/.openapi-generator/VERSION
@@ -1 +1 @@
-4.0.3-SNAPSHOT
\ No newline at end of file
+4.1.0-SNAPSHOT
\ No newline at end of file
diff --git a/samples/client/petstore/dart-jaguar/openapi_proto/README.md b/samples/client/petstore/dart-jaguar/openapi_proto/README.md
index 84be8a47c9..693df464eb 100644
--- a/samples/client/petstore/dart-jaguar/openapi_proto/README.md
+++ b/samples/client/petstore/dart-jaguar/openapi_proto/README.md
@@ -4,7 +4,6 @@ This is a sample server Petstore server. For this sample, you can use the api ke
 This Dart package is automatically generated by the [Open API Codegen](https://github.com/OpenAPITools/openapi-generator) project:
 
 - API version: 1.0.0
-- Build date: 2019-06-29T09:47:17.358+12:00[Pacific/Auckland]
 - Build package: org.openapitools.codegen.languages.DartJaguarClientCodegen
 
 ## Requirements
diff --git a/samples/client/petstore/dart-jaguar/openapi_proto/lib/api.dart b/samples/client/petstore/dart-jaguar/openapi_proto/lib/api.dart
index 12dcdff72f..60148b8f58 100644
--- a/samples/client/petstore/dart-jaguar/openapi_proto/lib/api.dart
+++ b/samples/client/petstore/dart-jaguar/openapi_proto/lib/api.dart
@@ -39,7 +39,7 @@ final _jsonJaguarRepo = ProtoCodecRepo(isJsonFormatEnabled: true)
 ..add((data) => Tag.fromBuffer(List<int>.from(data)))
 ..add((data) => User.fromBuffer(List<int>.from(data)))
 ;
-final Map<String, CodecRepo> converters = {
+final Map<String, CodecRepo> defaultConverters = {
     MimeTypes.json: _jsonJaguarRepo,
     MimeTypes.binary: _protoJaguarRepo,
 };
@@ -96,7 +96,7 @@ class Openapi {
             base = _baseRoute;
         }
         if(converters == null) {
-            converters = this.converters;
+            converters = defaultConverters;
         }
         return PetApi(base: base, converters: converters, timeout: timeout);
     }
@@ -111,7 +111,7 @@ class Openapi {
             base = _baseRoute;
         }
         if(converters == null) {
-            converters = this.converters;
+            converters = defaultConverters;
         }
         return StoreApi(base: base, converters: converters, timeout: timeout);
     }
@@ -126,7 +126,7 @@ class Openapi {
             base = _baseRoute;
         }
         if(converters == null) {
-            converters = this.converters;
+            converters = defaultConverters;
         }
         return UserApi(base: base, converters: converters, timeout: timeout);
     }

From 0fec25e92e933114a34245c2ceaf4a9e9677c6f4 Mon Sep 17 00:00:00 2001
From: Slavek Kabrda <slavek.kabrda@datadoghq.com>
Date: Thu, 18 Jul 2019 02:52:37 -0400
Subject: [PATCH 26/62] [Go][experimental-client]: make struct members
 pointers, provide custom marshalling (#3371)

* [Go][experimental-client] Properly define packageName for go-experimental sample client

* [Go][experimental-client] make structure members pointers, provide custom marshalling.
---
 bin/go-experimental-petstore.sh               |    2 +-
 .../GoClientExperimentalCodegen.java          |   39 +
 .../resources/go-experimental/README.mustache |   16 +
 .../resources/go-experimental/model.mustache  |   88 +-
 .../go-experimental/model_doc.mustache        |   43 +-
 .../resources/go-experimental/utils.mustache  |   31 +
 .../petstore/go-experimental/auth_test.go     |   30 +-
 .../petstore/go-experimental/fake_api_test.go |    4 +-
 .../go-petstore/.openapi-generator/VERSION    |    2 +-
 .../go-experimental/go-petstore/README.md     |   16 +
 .../docs/AdditionalPropertiesAnyType.md       |   30 +-
 .../docs/AdditionalPropertiesArray.md         |   30 +-
 .../docs/AdditionalPropertiesBoolean.md       |   30 +-
 .../docs/AdditionalPropertiesClass.md         |  300 ++++-
 .../docs/AdditionalPropertiesInteger.md       |   30 +-
 .../docs/AdditionalPropertiesNumber.md        |   30 +-
 .../docs/AdditionalPropertiesObject.md        |   30 +-
 .../docs/AdditionalPropertiesString.md        |   30 +-
 .../go-petstore/docs/Animal.md                |   57 +-
 .../go-petstore/docs/ApiResponse.md           |   84 +-
 .../docs/ArrayOfArrayOfNumberOnly.md          |   30 +-
 .../go-petstore/docs/ArrayOfNumberOnly.md     |   30 +-
 .../go-petstore/docs/ArrayTest.md             |   84 +-
 .../go-petstore/docs/Capitalization.md        |  165 ++-
 .../go-experimental/go-petstore/docs/Cat.md   |   84 +-
 .../go-petstore/docs/CatAllOf.md              |   30 +-
 .../go-petstore/docs/Category.md              |   57 +-
 .../go-petstore/docs/ClassModel.md            |   30 +-
 .../go-petstore/docs/Client.md                |   30 +-
 .../go-experimental/go-petstore/docs/Dog.md   |   84 +-
 .../go-petstore/docs/DogAllOf.md              |   30 +-
 .../go-petstore/docs/EnumArrays.md            |   57 +-
 .../go-petstore/docs/EnumClass.md             |    1 +
 .../go-petstore/docs/EnumTest.md              |  138 +-
 .../go-experimental/go-petstore/docs/File.md  |   30 +-
 .../go-petstore/docs/FileSchemaTestClass.md   |   57 +-
 .../go-petstore/docs/FormatTest.md            |  354 ++++-
 .../go-petstore/docs/HasOnlyReadOnly.md       |   57 +-
 .../go-experimental/go-petstore/docs/List.md  |   30 +-
 .../go-petstore/docs/MapTest.md               |  111 +-
 ...dPropertiesAndAdditionalPropertiesClass.md |   84 +-
 .../go-petstore/docs/Model200Response.md      |   57 +-
 .../go-experimental/go-petstore/docs/Name.md  |  111 +-
 .../go-petstore/docs/NumberOnly.md            |   30 +-
 .../go-experimental/go-petstore/docs/Order.md |  165 ++-
 .../go-petstore/docs/OuterComposite.md        |   84 +-
 .../go-petstore/docs/OuterEnum.md             |    1 +
 .../go-experimental/go-petstore/docs/Pet.md   |  165 ++-
 .../go-petstore/docs/ReadOnlyFirst.md         |   57 +-
 .../go-petstore/docs/Return.md                |   30 +-
 .../go-petstore/docs/SpecialModelName.md      |   30 +-
 .../go-experimental/go-petstore/docs/Tag.md   |   57 +-
 .../go-petstore/docs/TypeHolderDefault.md     |  138 +-
 .../go-petstore/docs/TypeHolderExample.md     |  138 +-
 .../go-experimental/go-petstore/docs/User.md  |  219 +++-
 .../go-petstore/docs/XmlItem.md               |  786 +++++++++++-
 .../go-petstore/model_200_response.go         |   89 +-
 .../model_additional_properties_any_type.go   |   50 +-
 .../model_additional_properties_array.go      |   50 +-
 .../model_additional_properties_boolean.go    |   50 +-
 .../model_additional_properties_class.go      |  440 ++++++-
 .../model_additional_properties_integer.go    |   50 +-
 .../model_additional_properties_number.go     |   50 +-
 .../model_additional_properties_object.go     |   50 +-
 .../model_additional_properties_string.go     |   50 +-
 .../go-petstore/model_animal.go               |   93 +-
 .../go-petstore/model_api_response.go         |  128 +-
 .../model_array_of_array_of_number_only.go    |   50 +-
 .../go-petstore/model_array_of_number_only.go |   50 +-
 .../go-petstore/model_array_test_.go          |  128 +-
 .../go-petstore/model_capitalization.go       |  245 +++-
 .../go-experimental/go-petstore/model_cat.go  |  132 +-
 .../go-petstore/model_cat_all_of.go           |   50 +-
 .../go-petstore/model_category.go             |   93 +-
 .../go-petstore/model_class_model.go          |   50 +-
 .../go-petstore/model_client.go               |   50 +-
 .../go-experimental/go-petstore/model_dog.go  |  132 +-
 .../go-petstore/model_dog_all_of.go           |   50 +-
 .../go-petstore/model_enum_arrays.go          |   89 +-
 .../go-petstore/model_enum_class.go           |    3 +-
 .../go-petstore/model_enum_test_.go           |  210 ++-
 .../go-experimental/go-petstore/model_file.go |   50 +-
 .../model_file_schema_test_class.go           |   89 +-
 .../go-petstore/model_format_test_.go         |  529 +++++++-
 .../go-petstore/model_has_only_read_only.go   |   89 +-
 .../go-experimental/go-petstore/model_list.go |   50 +-
 .../go-petstore/model_map_test_.go            |  167 ++-
 ...perties_and_additional_properties_class.go |  126 +-
 .../go-experimental/go-petstore/model_name.go |  171 ++-
 .../go-petstore/model_number_only.go          |   50 +-
 .../go-petstore/model_order.go                |  243 +++-
 .../go-petstore/model_outer_composite.go      |  128 +-
 .../go-petstore/model_outer_enum.go           |    3 +-
 .../go-experimental/go-petstore/model_pet.go  |  252 +++-
 .../go-petstore/model_read_only_first.go      |   89 +-
 .../go-petstore/model_return.go               |   50 +-
 .../go-petstore/model_special_model_name.go   |   50 +-
 .../go-experimental/go-petstore/model_tag.go  |   89 +-
 .../go-petstore/model_type_holder_default.go  |  222 +++-
 .../go-petstore/model_type_holder_example.go  |  222 +++-
 .../go-experimental/go-petstore/model_user.go |  323 ++++-
 .../go-petstore/model_xml_item.go             | 1142 ++++++++++++++++-
 .../go-experimental/go-petstore/utils.go      |   39 +
 .../petstore/go-experimental/pet_api_test.go  |   22 +-
 .../go-experimental/store_api_test.go         |   12 +-
 .../petstore/go-experimental/user_api_test.go |   76 +-
 106 files changed, 10895 insertions(+), 383 deletions(-)
 create mode 100644 modules/openapi-generator/src/main/resources/go-experimental/utils.mustache
 create mode 100644 samples/client/petstore/go-experimental/go-petstore/utils.go

diff --git a/bin/go-experimental-petstore.sh b/bin/go-experimental-petstore.sh
index d4eabb177c..ea7d839795 100755
--- a/bin/go-experimental-petstore.sh
+++ b/bin/go-experimental-petstore.sh
@@ -34,6 +34,6 @@ rm -rf $STUB_DIR
 
 # if you've executed sbt assembly previously it will use that instead.
 export JAVA_OPTS="${JAVA_OPTS} -Xmx1024M -DloggerPath=conf/log4j.properties"
-ags="generate -t modules/openapi-generator/src/main/resources/$GENERATOR -i $SPEC -g $GENERATOR -o $STUB_DIR -DpackageName=petstore $@"
+ags="generate -t modules/openapi-generator/src/main/resources/$GENERATOR -i $SPEC -g $GENERATOR -o $STUB_DIR --additional-properties packageName=petstore $@"
 
 java $JAVA_OPTS -jar $executable $ags
diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/GoClientExperimentalCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/GoClientExperimentalCodegen.java
index 14148714e6..ff0aafe24c 100644
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/GoClientExperimentalCodegen.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/GoClientExperimentalCodegen.java
@@ -16,15 +16,23 @@
 
 package org.openapitools.codegen.languages;
 
+import org.openapitools.codegen.CodegenModel;
+import org.openapitools.codegen.CodegenProperty;
+import org.openapitools.codegen.SupportingFile;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.util.List;
+import java.util.Map;
+
 public class GoClientExperimentalCodegen extends GoClientCodegen {
 
     private static final Logger LOGGER = LoggerFactory.getLogger(GoClientExperimentalCodegen.class);
 
     public GoClientExperimentalCodegen() {
         super();
+        outputFolder = "generated-code/go-experimental";
+        embeddedTemplateDir = templateDir = "go-experimental";
     }
 
     /**
@@ -49,4 +57,35 @@ public class GoClientExperimentalCodegen extends GoClientCodegen {
         return "Generates a Go client library (experimental and may subject to breaking changes without further notice).";
     }
 
+    @Override
+    public void processOpts() {
+        super.processOpts();
+        supportingFiles.add(new SupportingFile("utils.mustache", "", "utils.go"));
+    }
+
+    @Override
+     public Map<String, Object> postProcessModels(Map<String, Object> objs) {
+        objs = super.postProcessModels(objs);
+        List<Map<String, String>> imports = (List<Map<String, String>>) objs.get("imports");
+
+        boolean addedErrorsImport = false;
+        List<Map<String, Object>> models = (List<Map<String, Object>>) objs.get("models");
+        for (Map<String, Object> m : models) {
+            Object v = m.get("model");
+            if (v instanceof CodegenModel) {
+                CodegenModel model = (CodegenModel) v;
+                if (!model.isEnum) {
+                    imports.add(createMapping("import", "encoding/json"));
+                }
+                for (CodegenProperty param : model.vars) {
+                    if (!addedErrorsImport && param.required) {
+                        imports.add(createMapping("import", "errors"));
+                        addedErrorsImport = true;
+                    }
+                }
+            }
+        }
+
+        return objs;
+    }
 }
diff --git a/modules/openapi-generator/src/main/resources/go-experimental/README.mustache b/modules/openapi-generator/src/main/resources/go-experimental/README.mustache
index 5c9639022a..869443a26e 100644
--- a/modules/openapi-generator/src/main/resources/go-experimental/README.mustache
+++ b/modules/openapi-generator/src/main/resources/go-experimental/README.mustache
@@ -113,6 +113,22 @@ r, err := client.Service.Operation(auth, args)
 {{/isOAuth}}
 {{/authMethods}}
 
+## Documentation for Utility Methods
+
+Due to the fact that model structure members are all pointers, this package contains
+a number of utility functions to easily obtain pointers to values of basic types.
+Each of these functions takes a value of the given basic type and returns a pointer to it:
+
+* `PtrBool`
+* `PtrInt`
+* `PtrInt32`
+* `PtrInt64`
+* `PtrFloat`
+* `PtrFloat32`
+* `PtrFloat64`
+* `PtrString`
+* `PtrTime`
+
 ## Author
 
 {{#apiInfo}}{{#apis}}{{^hasMore}}{{infoEmail}}
diff --git a/modules/openapi-generator/src/main/resources/go-experimental/model.mustache b/modules/openapi-generator/src/main/resources/go-experimental/model.mustache
index 1a9f8d1c5a..17833f918b 100644
--- a/modules/openapi-generator/src/main/resources/go-experimental/model.mustache
+++ b/modules/openapi-generator/src/main/resources/go-experimental/model.mustache
@@ -35,9 +35,95 @@ type {{classname}} struct {
 {{#description}}
 	// {{{description}}}
 {{/description}}
-	{{name}} {{#isNullable}}*{{/isNullable}}{{{dataType}}} `json:"{{baseName}}{{^required}},omitempty{{/required}}"{{#withXml}} xml:"{{baseName}}{{#isXmlAttribute}},attr{{/isXmlAttribute}}"{{/withXml}}{{#vendorExtensions.x-go-custom-tag}} {{{.}}}{{/vendorExtensions.x-go-custom-tag}}`
+	{{name}} *{{{dataType}}} `json:"{{baseName}},omitempty"{{#withXml}} xml:"{{baseName}}{{#isXmlAttribute}},attr{{/isXmlAttribute}}"{{/withXml}}{{#vendorExtensions.x-go-custom-tag}} {{{.}}}{{/vendorExtensions.x-go-custom-tag}}`
+{{#isNullable}}    isExplicitNull{{name}} bool `json:"-"{{#withXml}} xml:"-"{{/withXml}}`{{/isNullable}}
 {{/vars}}
 }
 {{/isEnum}}
+
+{{^isEnum}}
+{{#vars}}
+// Get{{name}} returns the {{name}} field if non-nil, zero value otherwise.
+func (o *{{classname}}) Get{{name}}() {{dataType}} {
+	if o == nil || o.{{name}} == nil {
+		var ret {{dataType}}
+		return ret
+	}
+	return *o.{{name}}
+}
+
+// Get{{name}}Ok returns a tuple with the {{name}} field if it's non-nil, zero value otherwise
+// and a boolean to check if the value has been set.
+func (o *{{classname}}) Get{{name}}Ok() ({{dataType}}, bool) {
+	if o == nil || o.{{name}} == nil {
+		var ret {{dataType}}
+		return ret, false
+	}
+	return *o.{{name}}, true
+}
+
+// Has{{name}} returns a boolean if a field has been set.
+func (o *{{classname}}) Has{{name}}() bool {
+	if o != nil && o.{{name}} != nil {
+		return true
+	}
+
+	return false
+}
+
+// Set{{name}} gets a reference to the given {{dataType}} and assigns it to the {{name}} field.
+func (o *{{classname}}) Set{{name}}(v {{dataType}}) {
+	o.{{name}} = &v
+}
+
+{{#isNullable}}
+// Set{{name}}ExplicitNull (un)sets {{name}} to be considered as explicit "null" value
+// when serializing to JSON (pass true as argument to set this, false to unset)
+// The {{name}} value is set to nil even if false is passed
+func (o *{{classname}}) Set{{name}}ExplicitNull(b bool) {
+	o.{{name}} = nil
+	o.isExplicitNull{{name}} = b
+}
+{{/isNullable}}
+{{/vars}}
+
+func (o {{classname}}) MarshalJSON() ([]byte, error) {
+	toSerialize := map[string]interface{}{}
+	{{#vars}}
+	{{#required}}
+	{{! if argument is required and not nullable, it can't be nil}}
+	{{^isNullable}}
+	if o.{{name}} == nil {
+		return nil, errors.New("{{name}} is required and not nullable, but was not set on {{classname}}")
+	}{{/isNullable}}
+	{{! if argument is required and nullable, it *must* have isExplicitNull<name> set to true when it's nil}}
+	{{#isNullable}}
+	if o.{{name}} == nil && !o.isExplicitNull{{name}} {
+		return nil, errors.New("{{name}} is required and nullable, but it wasn't set to be explicit null")
+	}
+	{{/isNullable}}
+	{{/required}}
+	{{! if argument is nullable, only serialize it if it is nil *and* was explicitly set to nil}}
+	{{#isNullable}}
+	if o.{{name}} == nil {
+		if o.isExplicitNull{{name}} {
+			toSerialize["{{baseName}}"] = o.{{name}}
+		}
+	} else {
+		toSerialize["{{baseName}}"] = o.{{name}}
+	}
+	{{/isNullable}}
+	{{! if argument is not nullable, don't set it if it is nil}}
+	{{^isNullable}}
+	if o.{{name}} != nil {
+		toSerialize["{{baseName}}"] = o.{{name}}
+	}
+	{{/isNullable}}
+	{{/vars}}
+	return json.Marshal(toSerialize)
+}
+
+{{/isEnum}}
+
 {{/model}}
 {{/models}}
diff --git a/modules/openapi-generator/src/main/resources/go-experimental/model_doc.mustache b/modules/openapi-generator/src/main/resources/go-experimental/model_doc.mustache
index 546238243b..98040dcb25 100644
--- a/modules/openapi-generator/src/main/resources/go-experimental/model_doc.mustache
+++ b/modules/openapi-generator/src/main/resources/go-experimental/model_doc.mustache
@@ -4,9 +4,50 @@
 
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-{{#vars}}**{{name}}** | {{#isNullable}}Pointer to {{/isNullable}}{{#isPrimitiveType}}**{{{dataType}}}**{{/isPrimitiveType}}{{^isPrimitiveType}}[**{{{dataType}}}**]({{complexType}}.md){{/isPrimitiveType}} | {{description}} | {{^required}}[optional] {{/required}}{{#readOnly}}[readonly] {{/readOnly}}{{#defaultValue}}[default to {{{.}}}]{{/defaultValue}}
+{{#vars}}**{{name}}** | Pointer to {{#isPrimitiveType}}**{{{dataType}}}**{{/isPrimitiveType}}{{^isPrimitiveType}}[**{{{dataType}}}**]({{complexType}}.md){{/isPrimitiveType}} | {{description}} | {{^required}}[optional] {{/required}}{{#readOnly}}[readonly] {{/readOnly}}{{#defaultValue}}[default to {{{.}}}]{{/defaultValue}}
 {{/vars}}
 
+{{^isEnum}}
+## Methods
+
+{{#vars}}
+### Get{{name}}
+
+`func (o *{{classname}}) Get{{name}}() {{dataType}}`
+
+Get{{name}} returns the {{name}} field if non-nil, zero value otherwise.
+
+### Get{{name}}Ok
+
+`func (o *{{classname}}) Get{{name}}Ok() ({{dataType}}, bool)`
+
+Get{{name}}Ok returns a tuple with the {{name}} field if it's non-nil, zero value otherwise
+and a boolean to check if the value has been set.
+
+### Has{{name}}
+
+`func (o *{{classname}}) Has{{name}}() bool`
+
+Has{{name}} returns a boolean if a field has been set.
+
+### Set{{name}}
+
+`func (o *{{classname}}) Set{{name}}(v {{dataType}})`
+
+Set{{name}} gets a reference to the given {{dataType}} and assigns it to the {{name}} field.
+
+{{#isNullable}}
+### Set{{name}}ExplicitNull
+
+`func (o *{{classname}}) Set{{name}}ExplicitNull(b bool)`
+
+Set{{name}}ExplicitNull (un)sets {{name}} to be considered as explicit "null" value
+when serializing to JSON (pass true as argument to set this, false to unset)
+The {{name}} value is set to nil even if false is passed
+{{/isNullable}}
+{{/vars}}
+{{/isEnum}}
+
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
 {{/model}}{{/models}}
diff --git a/modules/openapi-generator/src/main/resources/go-experimental/utils.mustache b/modules/openapi-generator/src/main/resources/go-experimental/utils.mustache
new file mode 100644
index 0000000000..e3598373cb
--- /dev/null
+++ b/modules/openapi-generator/src/main/resources/go-experimental/utils.mustache
@@ -0,0 +1,31 @@
+{{>partial_header}}
+package {{packageName}}
+
+import "time"
+
+// PtrBool is a helper routine that returns a pointer to given integer value.
+func PtrBool(v bool) *bool { return &v }
+
+// PtrInt is a helper routine that returns a pointer to given integer value.
+func PtrInt(v int) *int { return &v }
+
+// PtrInt32 is a helper routine that returns a pointer to given integer value.
+func PtrInt32(v int32) *int32 { return &v }
+
+// PtrInt64 is a helper routine that returns a pointer to given integer value.
+func PtrInt64(v int64) *int64 { return &v }
+
+// PtrFloat is a helper routine that returns a pointer to given float value.
+func PtrFloat(v float32) *float32 { return &v }
+
+// PtrFloat32 is a helper routine that returns a pointer to given float value.
+func PtrFloat32(v float32) *float32 { return &v }
+
+// PtrFloat64 is a helper routine that returns a pointer to given float value.
+func PtrFloat64(v float64) *float64 { return &v }
+
+// PtrString is a helper routine that returns a pointer to given string value.
+func PtrString(v string) *string { return &v }
+
+// PtrTime is helper routine that returns a pointer to given Time value.
+func PtrTime(v time.Time) *time.Time { return &v }
\ No newline at end of file
diff --git a/samples/client/petstore/go-experimental/auth_test.go b/samples/client/petstore/go-experimental/auth_test.go
index 5f817703a8..7da448adce 100644
--- a/samples/client/petstore/go-experimental/auth_test.go
+++ b/samples/client/petstore/go-experimental/auth_test.go
@@ -37,8 +37,9 @@ func TestOAuth2(t *testing.T) {
 	tokenSource := cfg.TokenSource(createContext(nil), &tok)
 	auth := context.WithValue(context.Background(), sw.ContextOAuth2, tokenSource)
 
-	newPet := (sw.Pet{Id: 12992, Name: "gopher",
-		PhotoUrls: []string{"http://1.com", "http://2.com"}, Status: "pending", Tags: []sw.Tag{sw.Tag{Id: 1, Name: "tag2"}}})
+	newPet := (sw.Pet{Id: sw.PtrInt64(12992), Name: sw.PtrString("gopher"),
+		PhotoUrls: &[]string{"http://1.com", "http://2.com"}, Status: sw.PtrString("pending"),
+		Tags: &[]sw.Tag{sw.Tag{Id: sw.PtrInt64(1), Name: sw.PtrString("tag2")}}})
 
 	r, err := client.PetApi.AddPet(context.Background(), newPet)
 
@@ -71,8 +72,9 @@ func TestBasicAuth(t *testing.T) {
 		Password: "f4k3p455",
 	})
 
-	newPet := (sw.Pet{Id: 12992, Name: "gopher",
-		PhotoUrls: []string{"http://1.com", "http://2.com"}, Status: "pending", Tags: []sw.Tag{sw.Tag{Id: 1, Name: "tag2"}}})
+	newPet := (sw.Pet{Id: sw.PtrInt64(12992), Name: sw.PtrString("gopher"),
+		PhotoUrls: &[]string{"http://1.com", "http://2.com"}, Status: sw.PtrString("pending"),
+		Tags: &[]sw.Tag{sw.Tag{Id: sw.PtrInt64(1), Name: sw.PtrString("tag2")}}})
 
 	r, err := client.PetApi.AddPet(auth, newPet)
 
@@ -100,8 +102,9 @@ func TestBasicAuth(t *testing.T) {
 func TestAccessToken(t *testing.T) {
 	auth := context.WithValue(context.Background(), sw.ContextAccessToken, "TESTFAKEACCESSTOKENISFAKE")
 
-	newPet := (sw.Pet{Id: 12992, Name: "gopher",
-		PhotoUrls: []string{"http://1.com", "http://2.com"}, Status: "pending", Tags: []sw.Tag{sw.Tag{Id: 1, Name: "tag2"}}})
+	newPet := (sw.Pet{Id: sw.PtrInt64(12992), Name: sw.PtrString("gopher"),
+		PhotoUrls: &[]string{"http://1.com", "http://2.com"}, Status: sw.PtrString("pending"),
+		Tags: &[]sw.Tag{sw.Tag{Id: sw.PtrInt64(1), Name: sw.PtrString("tag2")}}})
 
 	r, err := client.PetApi.AddPet(nil, newPet)
 
@@ -129,8 +132,9 @@ func TestAccessToken(t *testing.T) {
 func TestAPIKeyNoPrefix(t *testing.T) {
 	auth := context.WithValue(context.Background(), sw.ContextAPIKey, sw.APIKey{Key: "TEST123"})
 
-	newPet := (sw.Pet{Id: 12992, Name: "gopher",
-		PhotoUrls: []string{"http://1.com", "http://2.com"}, Status: "pending", Tags: []sw.Tag{sw.Tag{Id: 1, Name: "tag2"}}})
+	newPet := (sw.Pet{Id: sw.PtrInt64(12992), Name: sw.PtrString("gopher"),
+		PhotoUrls: &[]string{"http://1.com", "http://2.com"}, Status: sw.PtrString("pending"),
+		Tags: &[]sw.Tag{sw.Tag{Id: sw.PtrInt64(1), Name: sw.PtrString("tag2")}}})
 
 	r, err := client.PetApi.AddPet(context.Background(), newPet)
 
@@ -163,8 +167,9 @@ func TestAPIKeyNoPrefix(t *testing.T) {
 func TestAPIKeyWithPrefix(t *testing.T) {
 	auth := context.WithValue(context.Background(), sw.ContextAPIKey, sw.APIKey{Key: "TEST123", Prefix: "Bearer"})
 
-	newPet := (sw.Pet{Id: 12992, Name: "gopher",
-		PhotoUrls: []string{"http://1.com", "http://2.com"}, Status: "pending", Tags: []sw.Tag{sw.Tag{Id: 1, Name: "tag2"}}})
+	newPet := (sw.Pet{Id: sw.PtrInt64(12992), Name: sw.PtrString("gopher"),
+		PhotoUrls: &[]string{"http://1.com", "http://2.com"}, Status: sw.PtrString("pending"),
+		Tags: &[]sw.Tag{sw.Tag{Id: sw.PtrInt64(1), Name: sw.PtrString("tag2")}}})
 
 	r, err := client.PetApi.AddPet(nil, newPet)
 
@@ -196,8 +201,9 @@ func TestAPIKeyWithPrefix(t *testing.T) {
 
 func TestDefaultHeader(t *testing.T) {
 
-	newPet := (sw.Pet{Id: 12992, Name: "gopher",
-		PhotoUrls: []string{"http://1.com", "http://2.com"}, Status: "pending", Tags: []sw.Tag{sw.Tag{Id: 1, Name: "tag2"}}})
+	newPet := (sw.Pet{Id: sw.PtrInt64(12992), Name: sw.PtrString("gopher"),
+		PhotoUrls: &[]string{"http://1.com", "http://2.com"}, Status: sw.PtrString("pending"),
+		Tags: &[]sw.Tag{sw.Tag{Id: sw.PtrInt64(1), Name: sw.PtrString("tag2")}}})
 
 	r, err := client.PetApi.AddPet(context.Background(), newPet)
 
diff --git a/samples/client/petstore/go-experimental/fake_api_test.go b/samples/client/petstore/go-experimental/fake_api_test.go
index f4242b5048..e97bcb4846 100644
--- a/samples/client/petstore/go-experimental/fake_api_test.go
+++ b/samples/client/petstore/go-experimental/fake_api_test.go
@@ -14,8 +14,8 @@ func TestPutBodyWithFileSchema(t *testing.T) {
 	return // early return to test compilation
 
 	schema := sw.FileSchemaTestClass{
-		File:  sw.File{SourceURI: "https://example.com/image.png"},
-		Files: []sw.File{{SourceURI: "https://example.com/image.png"}}}
+		File:  &sw.File{SourceURI: sw.PtrString("https://example.com/image.png")},
+		Files: &[]sw.File{{SourceURI: sw.PtrString("https://example.com/image.png")}}}
 
 	r, err := client.FakeApi.TestBodyWithFileSchema(context.Background(), schema)
 
diff --git a/samples/client/petstore/go-experimental/go-petstore/.openapi-generator/VERSION b/samples/client/petstore/go-experimental/go-petstore/.openapi-generator/VERSION
index 479c313e87..83a328a922 100644
--- a/samples/client/petstore/go-experimental/go-petstore/.openapi-generator/VERSION
+++ b/samples/client/petstore/go-experimental/go-petstore/.openapi-generator/VERSION
@@ -1 +1 @@
-4.0.3-SNAPSHOT
\ No newline at end of file
+4.1.0-SNAPSHOT
\ No newline at end of file
diff --git a/samples/client/petstore/go-experimental/go-petstore/README.md b/samples/client/petstore/go-experimental/go-petstore/README.md
index 025ee80f2e..f9cf57d259 100644
--- a/samples/client/petstore/go-experimental/go-petstore/README.md
+++ b/samples/client/petstore/go-experimental/go-petstore/README.md
@@ -199,6 +199,22 @@ r, err := client.Service.Operation(auth, args)
 ```
 
 
+## Documentation for Utility Methods
+
+Due to the fact that model structure members are all pointers, this package contains
+a number of utility functions to easily obtain pointers to values of basic types.
+Each of these functions takes a value of the given basic type and returns a pointer to it:
+
+* `PtrBool`
+* `PtrInt`
+* `PtrInt32`
+* `PtrInt64`
+* `PtrFloat`
+* `PtrFloat32`
+* `PtrFloat64`
+* `PtrString`
+* `PtrTime`
+
 ## Author
 
 
diff --git a/samples/client/petstore/go-experimental/go-petstore/docs/AdditionalPropertiesAnyType.md b/samples/client/petstore/go-experimental/go-petstore/docs/AdditionalPropertiesAnyType.md
index eadec3142c..47b71f2a71 100644
--- a/samples/client/petstore/go-experimental/go-petstore/docs/AdditionalPropertiesAnyType.md
+++ b/samples/client/petstore/go-experimental/go-petstore/docs/AdditionalPropertiesAnyType.md
@@ -4,7 +4,35 @@
 
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**Name** | **string** |  | [optional] 
+**Name** | Pointer to **string** |  | [optional]
+
+## Methods
+
+### GetName
+
+`func (o *AdditionalPropertiesAnyType) GetName() string`
+
+GetName returns the Name field if non-nil, zero value otherwise.
+
+### GetNameOk
+
+`func (o *AdditionalPropertiesAnyType) GetNameOk() (string, bool)`
+
+GetNameOk returns a tuple with the Name field if it's non-nil, zero value otherwise
+and a boolean to check if the value has been set.
+
+### HasName
+
+`func (o *AdditionalPropertiesAnyType) HasName() bool`
+
+HasName returns a boolean if a field has been set.
+
+### SetName
+
+`func (o *AdditionalPropertiesAnyType) SetName(v string)`
+
+SetName gets a reference to the given string and assigns it to the Name field.
+
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/samples/client/petstore/go-experimental/go-petstore/docs/AdditionalPropertiesArray.md b/samples/client/petstore/go-experimental/go-petstore/docs/AdditionalPropertiesArray.md
index 0c37598aeb..b8d3d2e343 100644
--- a/samples/client/petstore/go-experimental/go-petstore/docs/AdditionalPropertiesArray.md
+++ b/samples/client/petstore/go-experimental/go-petstore/docs/AdditionalPropertiesArray.md
@@ -4,7 +4,35 @@
 
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**Name** | **string** |  | [optional] 
+**Name** | Pointer to **string** |  | [optional]
+
+## Methods
+
+### GetName
+
+`func (o *AdditionalPropertiesArray) GetName() string`
+
+GetName returns the Name field if non-nil, zero value otherwise.
+
+### GetNameOk
+
+`func (o *AdditionalPropertiesArray) GetNameOk() (string, bool)`
+
+GetNameOk returns a tuple with the Name field if it's non-nil, zero value otherwise
+and a boolean to check if the value has been set.
+
+### HasName
+
+`func (o *AdditionalPropertiesArray) HasName() bool`
+
+HasName returns a boolean if a field has been set.
+
+### SetName
+
+`func (o *AdditionalPropertiesArray) SetName(v string)`
+
+SetName gets a reference to the given string and assigns it to the Name field.
+
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/samples/client/petstore/go-experimental/go-petstore/docs/AdditionalPropertiesBoolean.md b/samples/client/petstore/go-experimental/go-petstore/docs/AdditionalPropertiesBoolean.md
index 7190fe8429..2c27fcebb9 100644
--- a/samples/client/petstore/go-experimental/go-petstore/docs/AdditionalPropertiesBoolean.md
+++ b/samples/client/petstore/go-experimental/go-petstore/docs/AdditionalPropertiesBoolean.md
@@ -4,7 +4,35 @@
 
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**Name** | **string** |  | [optional] 
+**Name** | Pointer to **string** |  | [optional]
+
+## Methods
+
+### GetName
+
+`func (o *AdditionalPropertiesBoolean) GetName() string`
+
+GetName returns the Name field if non-nil, zero value otherwise.
+
+### GetNameOk
+
+`func (o *AdditionalPropertiesBoolean) GetNameOk() (string, bool)`
+
+GetNameOk returns a tuple with the Name field if it's non-nil, zero value otherwise
+and a boolean to check if the value has been set.
+
+### HasName
+
+`func (o *AdditionalPropertiesBoolean) HasName() bool`
+
+HasName returns a boolean if a field has been set.
+
+### SetName
+
+`func (o *AdditionalPropertiesBoolean) SetName(v string)`
+
+SetName gets a reference to the given string and assigns it to the Name field.
+
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/samples/client/petstore/go-experimental/go-petstore/docs/AdditionalPropertiesClass.md b/samples/client/petstore/go-experimental/go-petstore/docs/AdditionalPropertiesClass.md
index 877a5d45a3..a676667ed7 100644
--- a/samples/client/petstore/go-experimental/go-petstore/docs/AdditionalPropertiesClass.md
+++ b/samples/client/petstore/go-experimental/go-petstore/docs/AdditionalPropertiesClass.md
@@ -4,17 +4,295 @@
 
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**MapString** | **map[string]string** |  | [optional] 
-**MapNumber** | **map[string]float32** |  | [optional] 
-**MapInteger** | **map[string]int32** |  | [optional] 
-**MapBoolean** | **map[string]bool** |  | [optional] 
-**MapArrayInteger** | [**map[string][]int32**](array.md) |  | [optional] 
-**MapArrayAnytype** | [**map[string][]map[string]interface{}**](array.md) |  | [optional] 
-**MapMapString** | [**map[string]map[string]string**](map.md) |  | [optional] 
-**MapMapAnytype** | [**map[string]map[string]map[string]interface{}**](map.md) |  | [optional] 
-**Anytype1** | [**map[string]interface{}**](.md) |  | [optional] 
-**Anytype2** | [**map[string]interface{}**](.md) |  | [optional] 
-**Anytype3** | [**map[string]interface{}**](.md) |  | [optional] 
+**MapString** | Pointer to **map[string]string** |  | [optional]
+**MapNumber** | Pointer to **map[string]float32** |  | [optional]
+**MapInteger** | Pointer to **map[string]int32** |  | [optional]
+**MapBoolean** | Pointer to **map[string]bool** |  | [optional]
+**MapArrayInteger** | Pointer to [**map[string][]int32**](array.md) |  | [optional]
+**MapArrayAnytype** | Pointer to [**map[string][]map[string]interface{}**](array.md) |  | [optional]
+**MapMapString** | Pointer to [**map[string]map[string]string**](map.md) |  | [optional]
+**MapMapAnytype** | Pointer to [**map[string]map[string]map[string]interface{}**](map.md) |  | [optional]
+**Anytype1** | Pointer to [**map[string]interface{}**](.md) |  | [optional]
+**Anytype2** | Pointer to [**map[string]interface{}**](.md) |  | [optional]
+**Anytype3** | Pointer to [**map[string]interface{}**](.md) |  | [optional]
+
+## Methods
+
+### GetMapString
+
+`func (o *AdditionalPropertiesClass) GetMapString() map[string]string`
+
+GetMapString returns the MapString field if non-nil, zero value otherwise.
+
+### GetMapStringOk
+
+`func (o *AdditionalPropertiesClass) GetMapStringOk() (map[string]string, bool)`
+
+GetMapStringOk returns a tuple with the MapString field if it's non-nil, zero value otherwise
+and a boolean to check if the value has been set.
+
+### HasMapString
+
+`func (o *AdditionalPropertiesClass) HasMapString() bool`
+
+HasMapString returns a boolean if a field has been set.
+
+### SetMapString
+
+`func (o *AdditionalPropertiesClass) SetMapString(v map[string]string)`
+
+SetMapString gets a reference to the given map[string]string and assigns it to the MapString field.
+
+### GetMapNumber
+
+`func (o *AdditionalPropertiesClass) GetMapNumber() map[string]float32`
+
+GetMapNumber returns the MapNumber field if non-nil, zero value otherwise.
+
+### GetMapNumberOk
+
+`func (o *AdditionalPropertiesClass) GetMapNumberOk() (map[string]float32, bool)`
+
+GetMapNumberOk returns a tuple with the MapNumber field if it's non-nil, zero value otherwise
+and a boolean to check if the value has been set.
+
+### HasMapNumber
+
+`func (o *AdditionalPropertiesClass) HasMapNumber() bool`
+
+HasMapNumber returns a boolean if a field has been set.
+
+### SetMapNumber
+
+`func (o *AdditionalPropertiesClass) SetMapNumber(v map[string]float32)`
+
+SetMapNumber gets a reference to the given map[string]float32 and assigns it to the MapNumber field.
+
+### GetMapInteger
+
+`func (o *AdditionalPropertiesClass) GetMapInteger() map[string]int32`
+
+GetMapInteger returns the MapInteger field if non-nil, zero value otherwise.
+
+### GetMapIntegerOk
+
+`func (o *AdditionalPropertiesClass) GetMapIntegerOk() (map[string]int32, bool)`
+
+GetMapIntegerOk returns a tuple with the MapInteger field if it's non-nil, zero value otherwise
+and a boolean to check if the value has been set.
+
+### HasMapInteger
+
+`func (o *AdditionalPropertiesClass) HasMapInteger() bool`
+
+HasMapInteger returns a boolean if a field has been set.
+
+### SetMapInteger
+
+`func (o *AdditionalPropertiesClass) SetMapInteger(v map[string]int32)`
+
+SetMapInteger gets a reference to the given map[string]int32 and assigns it to the MapInteger field.
+
+### GetMapBoolean
+
+`func (o *AdditionalPropertiesClass) GetMapBoolean() map[string]bool`
+
+GetMapBoolean returns the MapBoolean field if non-nil, zero value otherwise.
+
+### GetMapBooleanOk
+
+`func (o *AdditionalPropertiesClass) GetMapBooleanOk() (map[string]bool, bool)`
+
+GetMapBooleanOk returns a tuple with the MapBoolean field if it's non-nil, zero value otherwise
+and a boolean to check if the value has been set.
+
+### HasMapBoolean
+
+`func (o *AdditionalPropertiesClass) HasMapBoolean() bool`
+
+HasMapBoolean returns a boolean if a field has been set.
+
+### SetMapBoolean
+
+`func (o *AdditionalPropertiesClass) SetMapBoolean(v map[string]bool)`
+
+SetMapBoolean gets a reference to the given map[string]bool and assigns it to the MapBoolean field.
+
+### GetMapArrayInteger
+
+`func (o *AdditionalPropertiesClass) GetMapArrayInteger() map[string][]int32`
+
+GetMapArrayInteger returns the MapArrayInteger field if non-nil, zero value otherwise.
+
+### GetMapArrayIntegerOk
+
+`func (o *AdditionalPropertiesClass) GetMapArrayIntegerOk() (map[string][]int32, bool)`
+
+GetMapArrayIntegerOk returns a tuple with the MapArrayInteger field if it's non-nil, zero value otherwise
+and a boolean to check if the value has been set.
+
+### HasMapArrayInteger
+
+`func (o *AdditionalPropertiesClass) HasMapArrayInteger() bool`
+
+HasMapArrayInteger returns a boolean if a field has been set.
+
+### SetMapArrayInteger
+
+`func (o *AdditionalPropertiesClass) SetMapArrayInteger(v map[string][]int32)`
+
+SetMapArrayInteger gets a reference to the given map[string][]int32 and assigns it to the MapArrayInteger field.
+
+### GetMapArrayAnytype
+
+`func (o *AdditionalPropertiesClass) GetMapArrayAnytype() map[string][]map[string]interface{}`
+
+GetMapArrayAnytype returns the MapArrayAnytype field if non-nil, zero value otherwise.
+
+### GetMapArrayAnytypeOk
+
+`func (o *AdditionalPropertiesClass) GetMapArrayAnytypeOk() (map[string][]map[string]interface{}, bool)`
+
+GetMapArrayAnytypeOk returns a tuple with the MapArrayAnytype field if it's non-nil, zero value otherwise
+and a boolean to check if the value has been set.
+
+### HasMapArrayAnytype
+
+`func (o *AdditionalPropertiesClass) HasMapArrayAnytype() bool`
+
+HasMapArrayAnytype returns a boolean if a field has been set.
+
+### SetMapArrayAnytype
+
+`func (o *AdditionalPropertiesClass) SetMapArrayAnytype(v map[string][]map[string]interface{})`
+
+SetMapArrayAnytype gets a reference to the given map[string][]map[string]interface{} and assigns it to the MapArrayAnytype field.
+
+### GetMapMapString
+
+`func (o *AdditionalPropertiesClass) GetMapMapString() map[string]map[string]string`
+
+GetMapMapString returns the MapMapString field if non-nil, zero value otherwise.
+
+### GetMapMapStringOk
+
+`func (o *AdditionalPropertiesClass) GetMapMapStringOk() (map[string]map[string]string, bool)`
+
+GetMapMapStringOk returns a tuple with the MapMapString field if it's non-nil, zero value otherwise
+and a boolean to check if the value has been set.
+
+### HasMapMapString
+
+`func (o *AdditionalPropertiesClass) HasMapMapString() bool`
+
+HasMapMapString returns a boolean if a field has been set.
+
+### SetMapMapString
+
+`func (o *AdditionalPropertiesClass) SetMapMapString(v map[string]map[string]string)`
+
+SetMapMapString gets a reference to the given map[string]map[string]string and assigns it to the MapMapString field.
+
+### GetMapMapAnytype
+
+`func (o *AdditionalPropertiesClass) GetMapMapAnytype() map[string]map[string]map[string]interface{}`
+
+GetMapMapAnytype returns the MapMapAnytype field if non-nil, zero value otherwise.
+
+### GetMapMapAnytypeOk
+
+`func (o *AdditionalPropertiesClass) GetMapMapAnytypeOk() (map[string]map[string]map[string]interface{}, bool)`
+
+GetMapMapAnytypeOk returns a tuple with the MapMapAnytype field if it's non-nil, zero value otherwise
+and a boolean to check if the value has been set.
+
+### HasMapMapAnytype
+
+`func (o *AdditionalPropertiesClass) HasMapMapAnytype() bool`
+
+HasMapMapAnytype returns a boolean if a field has been set.
+
+### SetMapMapAnytype
+
+`func (o *AdditionalPropertiesClass) SetMapMapAnytype(v map[string]map[string]map[string]interface{})`
+
+SetMapMapAnytype gets a reference to the given map[string]map[string]map[string]interface{} and assigns it to the MapMapAnytype field.
+
+### GetAnytype1
+
+`func (o *AdditionalPropertiesClass) GetAnytype1() map[string]interface{}`
+
+GetAnytype1 returns the Anytype1 field if non-nil, zero value otherwise.
+
+### GetAnytype1Ok
+
+`func (o *AdditionalPropertiesClass) GetAnytype1Ok() (map[string]interface{}, bool)`
+
+GetAnytype1Ok returns a tuple with the Anytype1 field if it's non-nil, zero value otherwise
+and a boolean to check if the value has been set.
+
+### HasAnytype1
+
+`func (o *AdditionalPropertiesClass) HasAnytype1() bool`
+
+HasAnytype1 returns a boolean if a field has been set.
+
+### SetAnytype1
+
+`func (o *AdditionalPropertiesClass) SetAnytype1(v map[string]interface{})`
+
+SetAnytype1 gets a reference to the given map[string]interface{} and assigns it to the Anytype1 field.
+
+### GetAnytype2
+
+`func (o *AdditionalPropertiesClass) GetAnytype2() map[string]interface{}`
+
+GetAnytype2 returns the Anytype2 field if non-nil, zero value otherwise.
+
+### GetAnytype2Ok
+
+`func (o *AdditionalPropertiesClass) GetAnytype2Ok() (map[string]interface{}, bool)`
+
+GetAnytype2Ok returns a tuple with the Anytype2 field if it's non-nil, zero value otherwise
+and a boolean to check if the value has been set.
+
+### HasAnytype2
+
+`func (o *AdditionalPropertiesClass) HasAnytype2() bool`
+
+HasAnytype2 returns a boolean if a field has been set.
+
+### SetAnytype2
+
+`func (o *AdditionalPropertiesClass) SetAnytype2(v map[string]interface{})`
+
+SetAnytype2 gets a reference to the given map[string]interface{} and assigns it to the Anytype2 field.
+
+### GetAnytype3
+
+`func (o *AdditionalPropertiesClass) GetAnytype3() map[string]interface{}`
+
+GetAnytype3 returns the Anytype3 field if non-nil, zero value otherwise.
+
+### GetAnytype3Ok
+
+`func (o *AdditionalPropertiesClass) GetAnytype3Ok() (map[string]interface{}, bool)`
+
+GetAnytype3Ok returns a tuple with the Anytype3 field if it's non-nil, zero value otherwise
+and a boolean to check if the value has been set.
+
+### HasAnytype3
+
+`func (o *AdditionalPropertiesClass) HasAnytype3() bool`
+
+HasAnytype3 returns a boolean if a field has been set.
+
+### SetAnytype3
+
+`func (o *AdditionalPropertiesClass) SetAnytype3(v map[string]interface{})`
+
+SetAnytype3 gets a reference to the given map[string]interface{} and assigns it to the Anytype3 field.
+
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/samples/client/petstore/go-experimental/go-petstore/docs/AdditionalPropertiesInteger.md b/samples/client/petstore/go-experimental/go-petstore/docs/AdditionalPropertiesInteger.md
index 34e6fca8fb..5db6d8671d 100644
--- a/samples/client/petstore/go-experimental/go-petstore/docs/AdditionalPropertiesInteger.md
+++ b/samples/client/petstore/go-experimental/go-petstore/docs/AdditionalPropertiesInteger.md
@@ -4,7 +4,35 @@
 
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**Name** | **string** |  | [optional] 
+**Name** | Pointer to **string** |  | [optional]
+
+## Methods
+
+### GetName
+
+`func (o *AdditionalPropertiesInteger) GetName() string`
+
+GetName returns the Name field if non-nil, zero value otherwise.
+
+### GetNameOk
+
+`func (o *AdditionalPropertiesInteger) GetNameOk() (string, bool)`
+
+GetNameOk returns a tuple with the Name field if it's non-nil, zero value otherwise
+and a boolean to check if the value has been set.
+
+### HasName
+
+`func (o *AdditionalPropertiesInteger) HasName() bool`
+
+HasName returns a boolean if a field has been set.
+
+### SetName
+
+`func (o *AdditionalPropertiesInteger) SetName(v string)`
+
+SetName gets a reference to the given string and assigns it to the Name field.
+
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/samples/client/petstore/go-experimental/go-petstore/docs/AdditionalPropertiesNumber.md b/samples/client/petstore/go-experimental/go-petstore/docs/AdditionalPropertiesNumber.md
index 6d41fd2315..585ee57005 100644
--- a/samples/client/petstore/go-experimental/go-petstore/docs/AdditionalPropertiesNumber.md
+++ b/samples/client/petstore/go-experimental/go-petstore/docs/AdditionalPropertiesNumber.md
@@ -4,7 +4,35 @@
 
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**Name** | **string** |  | [optional] 
+**Name** | Pointer to **string** |  | [optional]
+
+## Methods
+
+### GetName
+
+`func (o *AdditionalPropertiesNumber) GetName() string`
+
+GetName returns the Name field if non-nil, zero value otherwise.
+
+### GetNameOk
+
+`func (o *AdditionalPropertiesNumber) GetNameOk() (string, bool)`
+
+GetNameOk returns a tuple with the Name field if it's non-nil, zero value otherwise
+and a boolean to check if the value has been set.
+
+### HasName
+
+`func (o *AdditionalPropertiesNumber) HasName() bool`
+
+HasName returns a boolean if a field has been set.
+
+### SetName
+
+`func (o *AdditionalPropertiesNumber) SetName(v string)`
+
+SetName gets a reference to the given string and assigns it to the Name field.
+
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/samples/client/petstore/go-experimental/go-petstore/docs/AdditionalPropertiesObject.md b/samples/client/petstore/go-experimental/go-petstore/docs/AdditionalPropertiesObject.md
index b856de693b..d71afb4943 100644
--- a/samples/client/petstore/go-experimental/go-petstore/docs/AdditionalPropertiesObject.md
+++ b/samples/client/petstore/go-experimental/go-petstore/docs/AdditionalPropertiesObject.md
@@ -4,7 +4,35 @@
 
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**Name** | **string** |  | [optional] 
+**Name** | Pointer to **string** |  | [optional]
+
+## Methods
+
+### GetName
+
+`func (o *AdditionalPropertiesObject) GetName() string`
+
+GetName returns the Name field if non-nil, zero value otherwise.
+
+### GetNameOk
+
+`func (o *AdditionalPropertiesObject) GetNameOk() (string, bool)`
+
+GetNameOk returns a tuple with the Name field if it's non-nil, zero value otherwise
+and a boolean to check if the value has been set.
+
+### HasName
+
+`func (o *AdditionalPropertiesObject) HasName() bool`
+
+HasName returns a boolean if a field has been set.
+
+### SetName
+
+`func (o *AdditionalPropertiesObject) SetName(v string)`
+
+SetName gets a reference to the given string and assigns it to the Name field.
+
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/samples/client/petstore/go-experimental/go-petstore/docs/AdditionalPropertiesString.md b/samples/client/petstore/go-experimental/go-petstore/docs/AdditionalPropertiesString.md
index 69ad206568..72bbc5d7fd 100644
--- a/samples/client/petstore/go-experimental/go-petstore/docs/AdditionalPropertiesString.md
+++ b/samples/client/petstore/go-experimental/go-petstore/docs/AdditionalPropertiesString.md
@@ -4,7 +4,35 @@
 
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**Name** | **string** |  | [optional] 
+**Name** | Pointer to **string** |  | [optional]
+
+## Methods
+
+### GetName
+
+`func (o *AdditionalPropertiesString) GetName() string`
+
+GetName returns the Name field if non-nil, zero value otherwise.
+
+### GetNameOk
+
+`func (o *AdditionalPropertiesString) GetNameOk() (string, bool)`
+
+GetNameOk returns a tuple with the Name field if it's non-nil, zero value otherwise
+and a boolean to check if the value has been set.
+
+### HasName
+
+`func (o *AdditionalPropertiesString) HasName() bool`
+
+HasName returns a boolean if a field has been set.
+
+### SetName
+
+`func (o *AdditionalPropertiesString) SetName(v string)`
+
+SetName gets a reference to the given string and assigns it to the Name field.
+
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/samples/client/petstore/go-experimental/go-petstore/docs/Animal.md b/samples/client/petstore/go-experimental/go-petstore/docs/Animal.md
index 02d23377da..55133b2974 100644
--- a/samples/client/petstore/go-experimental/go-petstore/docs/Animal.md
+++ b/samples/client/petstore/go-experimental/go-petstore/docs/Animal.md
@@ -4,8 +4,61 @@
 
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**ClassName** | **string** |  | 
-**Color** | **string** |  | [optional] [default to red]
+**ClassName** | Pointer to **string** |  | 
+**Color** | Pointer to **string** |  | [optional] [default to red]
+
+## Methods
+
+### GetClassName
+
+`func (o *Animal) GetClassName() string`
+
+GetClassName returns the ClassName field if non-nil, zero value otherwise.
+
+### GetClassNameOk
+
+`func (o *Animal) GetClassNameOk() (string, bool)`
+
+GetClassNameOk returns a tuple with the ClassName field if it's non-nil, zero value otherwise
+and a boolean to check if the value has been set.
+
+### HasClassName
+
+`func (o *Animal) HasClassName() bool`
+
+HasClassName returns a boolean if a field has been set.
+
+### SetClassName
+
+`func (o *Animal) SetClassName(v string)`
+
+SetClassName gets a reference to the given string and assigns it to the ClassName field.
+
+### GetColor
+
+`func (o *Animal) GetColor() string`
+
+GetColor returns the Color field if non-nil, zero value otherwise.
+
+### GetColorOk
+
+`func (o *Animal) GetColorOk() (string, bool)`
+
+GetColorOk returns a tuple with the Color field if it's non-nil, zero value otherwise
+and a boolean to check if the value has been set.
+
+### HasColor
+
+`func (o *Animal) HasColor() bool`
+
+HasColor returns a boolean if a field has been set.
+
+### SetColor
+
+`func (o *Animal) SetColor(v string)`
+
+SetColor gets a reference to the given string and assigns it to the Color field.
+
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/samples/client/petstore/go-experimental/go-petstore/docs/ApiResponse.md b/samples/client/petstore/go-experimental/go-petstore/docs/ApiResponse.md
index 41d28fb578..3dd402a331 100644
--- a/samples/client/petstore/go-experimental/go-petstore/docs/ApiResponse.md
+++ b/samples/client/petstore/go-experimental/go-petstore/docs/ApiResponse.md
@@ -4,9 +4,87 @@
 
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**Code** | **int32** |  | [optional] 
-**Type** | **string** |  | [optional] 
-**Message** | **string** |  | [optional] 
+**Code** | Pointer to **int32** |  | [optional]
+**Type** | Pointer to **string** |  | [optional]
+**Message** | Pointer to **string** |  | [optional]
+
+## Methods
+
+### GetCode
+
+`func (o *ApiResponse) GetCode() int32`
+
+GetCode returns the Code field if non-nil, zero value otherwise.
+
+### GetCodeOk
+
+`func (o *ApiResponse) GetCodeOk() (int32, bool)`
+
+GetCodeOk returns a tuple with the Code field if it's non-nil, zero value otherwise
+and a boolean to check if the value has been set.
+
+### HasCode
+
+`func (o *ApiResponse) HasCode() bool`
+
+HasCode returns a boolean if a field has been set.
+
+### SetCode
+
+`func (o *ApiResponse) SetCode(v int32)`
+
+SetCode gets a reference to the given int32 and assigns it to the Code field.
+
+### GetType
+
+`func (o *ApiResponse) GetType() string`
+
+GetType returns the Type field if non-nil, zero value otherwise.
+
+### GetTypeOk
+
+`func (o *ApiResponse) GetTypeOk() (string, bool)`
+
+GetTypeOk returns a tuple with the Type field if it's non-nil, zero value otherwise
+and a boolean to check if the value has been set.
+
+### HasType
+
+`func (o *ApiResponse) HasType() bool`
+
+HasType returns a boolean if a field has been set.
+
+### SetType
+
+`func (o *ApiResponse) SetType(v string)`
+
+SetType gets a reference to the given string and assigns it to the Type field.
+
+### GetMessage
+
+`func (o *ApiResponse) GetMessage() string`
+
+GetMessage returns the Message field if non-nil, zero value otherwise.
+
+### GetMessageOk
+
+`func (o *ApiResponse) GetMessageOk() (string, bool)`
+
+GetMessageOk returns a tuple with the Message field if it's non-nil, zero value otherwise
+and a boolean to check if the value has been set.
+
+### HasMessage
+
+`func (o *ApiResponse) HasMessage() bool`
+
+HasMessage returns a boolean if a field has been set.
+
+### SetMessage
+
+`func (o *ApiResponse) SetMessage(v string)`
+
+SetMessage gets a reference to the given string and assigns it to the Message field.
+
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/samples/client/petstore/go-experimental/go-petstore/docs/ArrayOfArrayOfNumberOnly.md b/samples/client/petstore/go-experimental/go-petstore/docs/ArrayOfArrayOfNumberOnly.md
index 555213013b..6e776c78ba 100644
--- a/samples/client/petstore/go-experimental/go-petstore/docs/ArrayOfArrayOfNumberOnly.md
+++ b/samples/client/petstore/go-experimental/go-petstore/docs/ArrayOfArrayOfNumberOnly.md
@@ -4,7 +4,35 @@
 
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**ArrayArrayNumber** | [**[][]float32**](array.md) |  | [optional] 
+**ArrayArrayNumber** | Pointer to [**[][]float32**](array.md) |  | [optional]
+
+## Methods
+
+### GetArrayArrayNumber
+
+`func (o *ArrayOfArrayOfNumberOnly) GetArrayArrayNumber() [][]float32`
+
+GetArrayArrayNumber returns the ArrayArrayNumber field if non-nil, zero value otherwise.
+
+### GetArrayArrayNumberOk
+
+`func (o *ArrayOfArrayOfNumberOnly) GetArrayArrayNumberOk() ([][]float32, bool)`
+
+GetArrayArrayNumberOk returns a tuple with the ArrayArrayNumber field if it's non-nil, zero value otherwise
+and a boolean to check if the value has been set.
+
+### HasArrayArrayNumber
+
+`func (o *ArrayOfArrayOfNumberOnly) HasArrayArrayNumber() bool`
+
+HasArrayArrayNumber returns a boolean if a field has been set.
+
+### SetArrayArrayNumber
+
+`func (o *ArrayOfArrayOfNumberOnly) SetArrayArrayNumber(v [][]float32)`
+
+SetArrayArrayNumber gets a reference to the given [][]float32 and assigns it to the ArrayArrayNumber field.
+
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/samples/client/petstore/go-experimental/go-petstore/docs/ArrayOfNumberOnly.md b/samples/client/petstore/go-experimental/go-petstore/docs/ArrayOfNumberOnly.md
index 56618756dd..af74787e38 100644
--- a/samples/client/petstore/go-experimental/go-petstore/docs/ArrayOfNumberOnly.md
+++ b/samples/client/petstore/go-experimental/go-petstore/docs/ArrayOfNumberOnly.md
@@ -4,7 +4,35 @@
 
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**ArrayNumber** | **[]float32** |  | [optional] 
+**ArrayNumber** | Pointer to **[]float32** |  | [optional]
+
+## Methods
+
+### GetArrayNumber
+
+`func (o *ArrayOfNumberOnly) GetArrayNumber() []float32`
+
+GetArrayNumber returns the ArrayNumber field if non-nil, zero value otherwise.
+
+### GetArrayNumberOk
+
+`func (o *ArrayOfNumberOnly) GetArrayNumberOk() ([]float32, bool)`
+
+GetArrayNumberOk returns a tuple with the ArrayNumber field if it's non-nil, zero value otherwise
+and a boolean to check if the value has been set.
+
+### HasArrayNumber
+
+`func (o *ArrayOfNumberOnly) HasArrayNumber() bool`
+
+HasArrayNumber returns a boolean if a field has been set.
+
+### SetArrayNumber
+
+`func (o *ArrayOfNumberOnly) SetArrayNumber(v []float32)`
+
+SetArrayNumber gets a reference to the given []float32 and assigns it to the ArrayNumber field.
+
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/samples/client/petstore/go-experimental/go-petstore/docs/ArrayTest.md b/samples/client/petstore/go-experimental/go-petstore/docs/ArrayTest.md
index 0da0bc52d2..7c25df85ff 100644
--- a/samples/client/petstore/go-experimental/go-petstore/docs/ArrayTest.md
+++ b/samples/client/petstore/go-experimental/go-petstore/docs/ArrayTest.md
@@ -4,9 +4,87 @@
 
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**ArrayOfString** | **[]string** |  | [optional] 
-**ArrayArrayOfInteger** | [**[][]int64**](array.md) |  | [optional] 
-**ArrayArrayOfModel** | [**[][]ReadOnlyFirst**](array.md) |  | [optional] 
+**ArrayOfString** | Pointer to **[]string** |  | [optional]
+**ArrayArrayOfInteger** | Pointer to [**[][]int64**](array.md) |  | [optional]
+**ArrayArrayOfModel** | Pointer to [**[][]ReadOnlyFirst**](array.md) |  | [optional]
+
+## Methods
+
+### GetArrayOfString
+
+`func (o *ArrayTest) GetArrayOfString() []string`
+
+GetArrayOfString returns the ArrayOfString field if non-nil, zero value otherwise.
+
+### GetArrayOfStringOk
+
+`func (o *ArrayTest) GetArrayOfStringOk() ([]string, bool)`
+
+GetArrayOfStringOk returns a tuple with the ArrayOfString field if it's non-nil, zero value otherwise
+and a boolean to check if the value has been set.
+
+### HasArrayOfString
+
+`func (o *ArrayTest) HasArrayOfString() bool`
+
+HasArrayOfString returns a boolean if a field has been set.
+
+### SetArrayOfString
+
+`func (o *ArrayTest) SetArrayOfString(v []string)`
+
+SetArrayOfString gets a reference to the given []string and assigns it to the ArrayOfString field.
+
+### GetArrayArrayOfInteger
+
+`func (o *ArrayTest) GetArrayArrayOfInteger() [][]int64`
+
+GetArrayArrayOfInteger returns the ArrayArrayOfInteger field if non-nil, zero value otherwise.
+
+### GetArrayArrayOfIntegerOk
+
+`func (o *ArrayTest) GetArrayArrayOfIntegerOk() ([][]int64, bool)`
+
+GetArrayArrayOfIntegerOk returns a tuple with the ArrayArrayOfInteger field if it's non-nil, zero value otherwise
+and a boolean to check if the value has been set.
+
+### HasArrayArrayOfInteger
+
+`func (o *ArrayTest) HasArrayArrayOfInteger() bool`
+
+HasArrayArrayOfInteger returns a boolean if a field has been set.
+
+### SetArrayArrayOfInteger
+
+`func (o *ArrayTest) SetArrayArrayOfInteger(v [][]int64)`
+
+SetArrayArrayOfInteger gets a reference to the given [][]int64 and assigns it to the ArrayArrayOfInteger field.
+
+### GetArrayArrayOfModel
+
+`func (o *ArrayTest) GetArrayArrayOfModel() [][]ReadOnlyFirst`
+
+GetArrayArrayOfModel returns the ArrayArrayOfModel field if non-nil, zero value otherwise.
+
+### GetArrayArrayOfModelOk
+
+`func (o *ArrayTest) GetArrayArrayOfModelOk() ([][]ReadOnlyFirst, bool)`
+
+GetArrayArrayOfModelOk returns a tuple with the ArrayArrayOfModel field if it's non-nil, zero value otherwise
+and a boolean to check if the value has been set.
+
+### HasArrayArrayOfModel
+
+`func (o *ArrayTest) HasArrayArrayOfModel() bool`
+
+HasArrayArrayOfModel returns a boolean if a field has been set.
+
+### SetArrayArrayOfModel
+
+`func (o *ArrayTest) SetArrayArrayOfModel(v [][]ReadOnlyFirst)`
+
+SetArrayArrayOfModel gets a reference to the given [][]ReadOnlyFirst and assigns it to the ArrayArrayOfModel field.
+
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/samples/client/petstore/go-experimental/go-petstore/docs/Capitalization.md b/samples/client/petstore/go-experimental/go-petstore/docs/Capitalization.md
index 426b8eabd9..fd856f743e 100644
--- a/samples/client/petstore/go-experimental/go-petstore/docs/Capitalization.md
+++ b/samples/client/petstore/go-experimental/go-petstore/docs/Capitalization.md
@@ -4,12 +4,165 @@
 
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**SmallCamel** | **string** |  | [optional] 
-**CapitalCamel** | **string** |  | [optional] 
-**SmallSnake** | **string** |  | [optional] 
-**CapitalSnake** | **string** |  | [optional] 
-**SCAETHFlowPoints** | **string** |  | [optional] 
-**ATT_NAME** | **string** | Name of the pet  | [optional] 
+**SmallCamel** | Pointer to **string** |  | [optional]
+**CapitalCamel** | Pointer to **string** |  | [optional]
+**SmallSnake** | Pointer to **string** |  | [optional]
+**CapitalSnake** | Pointer to **string** |  | [optional]
+**SCAETHFlowPoints** | Pointer to **string** |  | [optional]
+**ATT_NAME** | Pointer to **string** | Name of the pet  | [optional]
+
+## Methods
+
+### GetSmallCamel
+
+`func (o *Capitalization) GetSmallCamel() string`
+
+GetSmallCamel returns the SmallCamel field if non-nil, zero value otherwise.
+
+### GetSmallCamelOk
+
+`func (o *Capitalization) GetSmallCamelOk() (string, bool)`
+
+GetSmallCamelOk returns a tuple with the SmallCamel field if it's non-nil, zero value otherwise
+and a boolean to check if the value has been set.
+
+### HasSmallCamel
+
+`func (o *Capitalization) HasSmallCamel() bool`
+
+HasSmallCamel returns a boolean if a field has been set.
+
+### SetSmallCamel
+
+`func (o *Capitalization) SetSmallCamel(v string)`
+
+SetSmallCamel gets a reference to the given string and assigns it to the SmallCamel field.
+
+### GetCapitalCamel
+
+`func (o *Capitalization) GetCapitalCamel() string`
+
+GetCapitalCamel returns the CapitalCamel field if non-nil, zero value otherwise.
+
+### GetCapitalCamelOk
+
+`func (o *Capitalization) GetCapitalCamelOk() (string, bool)`
+
+GetCapitalCamelOk returns a tuple with the CapitalCamel field if it's non-nil, zero value otherwise
+and a boolean to check if the value has been set.
+
+### HasCapitalCamel
+
+`func (o *Capitalization) HasCapitalCamel() bool`
+
+HasCapitalCamel returns a boolean if a field has been set.
+
+### SetCapitalCamel
+
+`func (o *Capitalization) SetCapitalCamel(v string)`
+
+SetCapitalCamel gets a reference to the given string and assigns it to the CapitalCamel field.
+
+### GetSmallSnake
+
+`func (o *Capitalization) GetSmallSnake() string`
+
+GetSmallSnake returns the SmallSnake field if non-nil, zero value otherwise.
+
+### GetSmallSnakeOk
+
+`func (o *Capitalization) GetSmallSnakeOk() (string, bool)`
+
+GetSmallSnakeOk returns a tuple with the SmallSnake field if it's non-nil, zero value otherwise
+and a boolean to check if the value has been set.
+
+### HasSmallSnake
+
+`func (o *Capitalization) HasSmallSnake() bool`
+
+HasSmallSnake returns a boolean if a field has been set.
+
+### SetSmallSnake
+
+`func (o *Capitalization) SetSmallSnake(v string)`
+
+SetSmallSnake gets a reference to the given string and assigns it to the SmallSnake field.
+
+### GetCapitalSnake
+
+`func (o *Capitalization) GetCapitalSnake() string`
+
+GetCapitalSnake returns the CapitalSnake field if non-nil, zero value otherwise.
+
+### GetCapitalSnakeOk
+
+`func (o *Capitalization) GetCapitalSnakeOk() (string, bool)`
+
+GetCapitalSnakeOk returns a tuple with the CapitalSnake field if it's non-nil, zero value otherwise
+and a boolean to check if the value has been set.
+
+### HasCapitalSnake
+
+`func (o *Capitalization) HasCapitalSnake() bool`
+
+HasCapitalSnake returns a boolean if a field has been set.
+
+### SetCapitalSnake
+
+`func (o *Capitalization) SetCapitalSnake(v string)`
+
+SetCapitalSnake gets a reference to the given string and assigns it to the CapitalSnake field.
+
+### GetSCAETHFlowPoints
+
+`func (o *Capitalization) GetSCAETHFlowPoints() string`
+
+GetSCAETHFlowPoints returns the SCAETHFlowPoints field if non-nil, zero value otherwise.
+
+### GetSCAETHFlowPointsOk
+
+`func (o *Capitalization) GetSCAETHFlowPointsOk() (string, bool)`
+
+GetSCAETHFlowPointsOk returns a tuple with the SCAETHFlowPoints field if it's non-nil, zero value otherwise
+and a boolean to check if the value has been set.
+
+### HasSCAETHFlowPoints
+
+`func (o *Capitalization) HasSCAETHFlowPoints() bool`
+
+HasSCAETHFlowPoints returns a boolean if a field has been set.
+
+### SetSCAETHFlowPoints
+
+`func (o *Capitalization) SetSCAETHFlowPoints(v string)`
+
+SetSCAETHFlowPoints gets a reference to the given string and assigns it to the SCAETHFlowPoints field.
+
+### GetATT_NAME
+
+`func (o *Capitalization) GetATT_NAME() string`
+
+GetATT_NAME returns the ATT_NAME field if non-nil, zero value otherwise.
+
+### GetATT_NAMEOk
+
+`func (o *Capitalization) GetATT_NAMEOk() (string, bool)`
+
+GetATT_NAMEOk returns a tuple with the ATT_NAME field if it's non-nil, zero value otherwise
+and a boolean to check if the value has been set.
+
+### HasATT_NAME
+
+`func (o *Capitalization) HasATT_NAME() bool`
+
+HasATT_NAME returns a boolean if a field has been set.
+
+### SetATT_NAME
+
+`func (o *Capitalization) SetATT_NAME(v string)`
+
+SetATT_NAME gets a reference to the given string and assigns it to the ATT_NAME field.
+
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/samples/client/petstore/go-experimental/go-petstore/docs/Cat.md b/samples/client/petstore/go-experimental/go-petstore/docs/Cat.md
index 1ef1f095e9..262e3d04f6 100644
--- a/samples/client/petstore/go-experimental/go-petstore/docs/Cat.md
+++ b/samples/client/petstore/go-experimental/go-petstore/docs/Cat.md
@@ -4,9 +4,87 @@
 
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**ClassName** | **string** |  | 
-**Color** | **string** |  | [optional] [default to red]
-**Declawed** | **bool** |  | [optional] 
+**ClassName** | Pointer to **string** |  | 
+**Color** | Pointer to **string** |  | [optional] [default to red]
+**Declawed** | Pointer to **bool** |  | [optional]
+
+## Methods
+
+### GetClassName
+
+`func (o *Cat) GetClassName() string`
+
+GetClassName returns the ClassName field if non-nil, zero value otherwise.
+
+### GetClassNameOk
+
+`func (o *Cat) GetClassNameOk() (string, bool)`
+
+GetClassNameOk returns a tuple with the ClassName field if it's non-nil, zero value otherwise
+and a boolean to check if the value has been set.
+
+### HasClassName
+
+`func (o *Cat) HasClassName() bool`
+
+HasClassName returns a boolean if a field has been set.
+
+### SetClassName
+
+`func (o *Cat) SetClassName(v string)`
+
+SetClassName gets a reference to the given string and assigns it to the ClassName field.
+
+### GetColor
+
+`func (o *Cat) GetColor() string`
+
+GetColor returns the Color field if non-nil, zero value otherwise.
+
+### GetColorOk
+
+`func (o *Cat) GetColorOk() (string, bool)`
+
+GetColorOk returns a tuple with the Color field if it's non-nil, zero value otherwise
+and a boolean to check if the value has been set.
+
+### HasColor
+
+`func (o *Cat) HasColor() bool`
+
+HasColor returns a boolean if a field has been set.
+
+### SetColor
+
+`func (o *Cat) SetColor(v string)`
+
+SetColor gets a reference to the given string and assigns it to the Color field.
+
+### GetDeclawed
+
+`func (o *Cat) GetDeclawed() bool`
+
+GetDeclawed returns the Declawed field if non-nil, zero value otherwise.
+
+### GetDeclawedOk
+
+`func (o *Cat) GetDeclawedOk() (bool, bool)`
+
+GetDeclawedOk returns a tuple with the Declawed field if it's non-nil, zero value otherwise
+and a boolean to check if the value has been set.
+
+### HasDeclawed
+
+`func (o *Cat) HasDeclawed() bool`
+
+HasDeclawed returns a boolean if a field has been set.
+
+### SetDeclawed
+
+`func (o *Cat) SetDeclawed(v bool)`
+
+SetDeclawed gets a reference to the given bool and assigns it to the Declawed field.
+
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/samples/client/petstore/go-experimental/go-petstore/docs/CatAllOf.md b/samples/client/petstore/go-experimental/go-petstore/docs/CatAllOf.md
index c978cee041..a89f0b29fa 100644
--- a/samples/client/petstore/go-experimental/go-petstore/docs/CatAllOf.md
+++ b/samples/client/petstore/go-experimental/go-petstore/docs/CatAllOf.md
@@ -4,7 +4,35 @@
 
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**Declawed** | **bool** |  | [optional] 
+**Declawed** | Pointer to **bool** |  | [optional]
+
+## Methods
+
+### GetDeclawed
+
+`func (o *CatAllOf) GetDeclawed() bool`
+
+GetDeclawed returns the Declawed field if non-nil, zero value otherwise.
+
+### GetDeclawedOk
+
+`func (o *CatAllOf) GetDeclawedOk() (bool, bool)`
+
+GetDeclawedOk returns a tuple with the Declawed field if it's non-nil, zero value otherwise
+and a boolean to check if the value has been set.
+
+### HasDeclawed
+
+`func (o *CatAllOf) HasDeclawed() bool`
+
+HasDeclawed returns a boolean if a field has been set.
+
+### SetDeclawed
+
+`func (o *CatAllOf) SetDeclawed(v bool)`
+
+SetDeclawed gets a reference to the given bool and assigns it to the Declawed field.
+
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/samples/client/petstore/go-experimental/go-petstore/docs/Category.md b/samples/client/petstore/go-experimental/go-petstore/docs/Category.md
index 01e8344bd0..b8ef18163b 100644
--- a/samples/client/petstore/go-experimental/go-petstore/docs/Category.md
+++ b/samples/client/petstore/go-experimental/go-petstore/docs/Category.md
@@ -4,8 +4,61 @@
 
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**Id** | **int64** |  | [optional] 
-**Name** | **string** |  | [default to default-name]
+**Id** | Pointer to **int64** |  | [optional]
+**Name** | Pointer to **string** |  |  [default to default-name]
+
+## Methods
+
+### GetId
+
+`func (o *Category) GetId() int64`
+
+GetId returns the Id field if non-nil, zero value otherwise.
+
+### GetIdOk
+
+`func (o *Category) GetIdOk() (int64, bool)`
+
+GetIdOk returns a tuple with the Id field if it's non-nil, zero value otherwise
+and a boolean to check if the value has been set.
+
+### HasId
+
+`func (o *Category) HasId() bool`
+
+HasId returns a boolean if a field has been set.
+
+### SetId
+
+`func (o *Category) SetId(v int64)`
+
+SetId gets a reference to the given int64 and assigns it to the Id field.
+
+### GetName
+
+`func (o *Category) GetName() string`
+
+GetName returns the Name field if non-nil, zero value otherwise.
+
+### GetNameOk
+
+`func (o *Category) GetNameOk() (string, bool)`
+
+GetNameOk returns a tuple with the Name field if it's non-nil, zero value otherwise
+and a boolean to check if the value has been set.
+
+### HasName
+
+`func (o *Category) HasName() bool`
+
+HasName returns a boolean if a field has been set.
+
+### SetName
+
+`func (o *Category) SetName(v string)`
+
+SetName gets a reference to the given string and assigns it to the Name field.
+
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/samples/client/petstore/go-experimental/go-petstore/docs/ClassModel.md b/samples/client/petstore/go-experimental/go-petstore/docs/ClassModel.md
index 0b925cebb1..9ceae1f3d0 100644
--- a/samples/client/petstore/go-experimental/go-petstore/docs/ClassModel.md
+++ b/samples/client/petstore/go-experimental/go-petstore/docs/ClassModel.md
@@ -4,7 +4,35 @@
 
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**Class** | **string** |  | [optional] 
+**Class** | Pointer to **string** |  | [optional]
+
+## Methods
+
+### GetClass
+
+`func (o *ClassModel) GetClass() string`
+
+GetClass returns the Class field if non-nil, zero value otherwise.
+
+### GetClassOk
+
+`func (o *ClassModel) GetClassOk() (string, bool)`
+
+GetClassOk returns a tuple with the Class field if it's non-nil, zero value otherwise
+and a boolean to check if the value has been set.
+
+### HasClass
+
+`func (o *ClassModel) HasClass() bool`
+
+HasClass returns a boolean if a field has been set.
+
+### SetClass
+
+`func (o *ClassModel) SetClass(v string)`
+
+SetClass gets a reference to the given string and assigns it to the Class field.
+
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/samples/client/petstore/go-experimental/go-petstore/docs/Client.md b/samples/client/petstore/go-experimental/go-petstore/docs/Client.md
index 551da852ee..9787127b16 100644
--- a/samples/client/petstore/go-experimental/go-petstore/docs/Client.md
+++ b/samples/client/petstore/go-experimental/go-petstore/docs/Client.md
@@ -4,7 +4,35 @@
 
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**Client** | **string** |  | [optional] 
+**Client** | Pointer to **string** |  | [optional]
+
+## Methods
+
+### GetClient
+
+`func (o *Client) GetClient() string`
+
+GetClient returns the Client field if non-nil, zero value otherwise.
+
+### GetClientOk
+
+`func (o *Client) GetClientOk() (string, bool)`
+
+GetClientOk returns a tuple with the Client field if it's non-nil, zero value otherwise
+and a boolean to check if the value has been set.
+
+### HasClient
+
+`func (o *Client) HasClient() bool`
+
+HasClient returns a boolean if a field has been set.
+
+### SetClient
+
+`func (o *Client) SetClient(v string)`
+
+SetClient gets a reference to the given string and assigns it to the Client field.
+
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/samples/client/petstore/go-experimental/go-petstore/docs/Dog.md b/samples/client/petstore/go-experimental/go-petstore/docs/Dog.md
index ff35dd5cdc..591ab03c6a 100644
--- a/samples/client/petstore/go-experimental/go-petstore/docs/Dog.md
+++ b/samples/client/petstore/go-experimental/go-petstore/docs/Dog.md
@@ -4,9 +4,87 @@
 
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**ClassName** | **string** |  | 
-**Color** | **string** |  | [optional] [default to red]
-**Breed** | **string** |  | [optional] 
+**ClassName** | Pointer to **string** |  | 
+**Color** | Pointer to **string** |  | [optional] [default to red]
+**Breed** | Pointer to **string** |  | [optional]
+
+## Methods
+
+### GetClassName
+
+`func (o *Dog) GetClassName() string`
+
+GetClassName returns the ClassName field if non-nil, zero value otherwise.
+
+### GetClassNameOk
+
+`func (o *Dog) GetClassNameOk() (string, bool)`
+
+GetClassNameOk returns a tuple with the ClassName field if it's non-nil, zero value otherwise
+and a boolean to check if the value has been set.
+
+### HasClassName
+
+`func (o *Dog) HasClassName() bool`
+
+HasClassName returns a boolean if a field has been set.
+
+### SetClassName
+
+`func (o *Dog) SetClassName(v string)`
+
+SetClassName gets a reference to the given string and assigns it to the ClassName field.
+
+### GetColor
+
+`func (o *Dog) GetColor() string`
+
+GetColor returns the Color field if non-nil, zero value otherwise.
+
+### GetColorOk
+
+`func (o *Dog) GetColorOk() (string, bool)`
+
+GetColorOk returns a tuple with the Color field if it's non-nil, zero value otherwise
+and a boolean to check if the value has been set.
+
+### HasColor
+
+`func (o *Dog) HasColor() bool`
+
+HasColor returns a boolean if a field has been set.
+
+### SetColor
+
+`func (o *Dog) SetColor(v string)`
+
+SetColor gets a reference to the given string and assigns it to the Color field.
+
+### GetBreed
+
+`func (o *Dog) GetBreed() string`
+
+GetBreed returns the Breed field if non-nil, zero value otherwise.
+
+### GetBreedOk
+
+`func (o *Dog) GetBreedOk() (string, bool)`
+
+GetBreedOk returns a tuple with the Breed field if it's non-nil, zero value otherwise
+and a boolean to check if the value has been set.
+
+### HasBreed
+
+`func (o *Dog) HasBreed() bool`
+
+HasBreed returns a boolean if a field has been set.
+
+### SetBreed
+
+`func (o *Dog) SetBreed(v string)`
+
+SetBreed gets a reference to the given string and assigns it to the Breed field.
+
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/samples/client/petstore/go-experimental/go-petstore/docs/DogAllOf.md b/samples/client/petstore/go-experimental/go-petstore/docs/DogAllOf.md
index b87153e926..e5103c4975 100644
--- a/samples/client/petstore/go-experimental/go-petstore/docs/DogAllOf.md
+++ b/samples/client/petstore/go-experimental/go-petstore/docs/DogAllOf.md
@@ -4,7 +4,35 @@
 
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**Breed** | **string** |  | [optional] 
+**Breed** | Pointer to **string** |  | [optional]
+
+## Methods
+
+### GetBreed
+
+`func (o *DogAllOf) GetBreed() string`
+
+GetBreed returns the Breed field if non-nil, zero value otherwise.
+
+### GetBreedOk
+
+`func (o *DogAllOf) GetBreedOk() (string, bool)`
+
+GetBreedOk returns a tuple with the Breed field if it's non-nil, zero value otherwise
+and a boolean to check if the value has been set.
+
+### HasBreed
+
+`func (o *DogAllOf) HasBreed() bool`
+
+HasBreed returns a boolean if a field has been set.
+
+### SetBreed
+
+`func (o *DogAllOf) SetBreed(v string)`
+
+SetBreed gets a reference to the given string and assigns it to the Breed field.
+
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/samples/client/petstore/go-experimental/go-petstore/docs/EnumArrays.md b/samples/client/petstore/go-experimental/go-petstore/docs/EnumArrays.md
index 3021f88183..6d6028e966 100644
--- a/samples/client/petstore/go-experimental/go-petstore/docs/EnumArrays.md
+++ b/samples/client/petstore/go-experimental/go-petstore/docs/EnumArrays.md
@@ -4,8 +4,61 @@
 
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**JustSymbol** | **string** |  | [optional] 
-**ArrayEnum** | **[]string** |  | [optional] 
+**JustSymbol** | Pointer to **string** |  | [optional]
+**ArrayEnum** | Pointer to **[]string** |  | [optional]
+
+## Methods
+
+### GetJustSymbol
+
+`func (o *EnumArrays) GetJustSymbol() string`
+
+GetJustSymbol returns the JustSymbol field if non-nil, zero value otherwise.
+
+### GetJustSymbolOk
+
+`func (o *EnumArrays) GetJustSymbolOk() (string, bool)`
+
+GetJustSymbolOk returns a tuple with the JustSymbol field if it's non-nil, zero value otherwise
+and a boolean to check if the value has been set.
+
+### HasJustSymbol
+
+`func (o *EnumArrays) HasJustSymbol() bool`
+
+HasJustSymbol returns a boolean if a field has been set.
+
+### SetJustSymbol
+
+`func (o *EnumArrays) SetJustSymbol(v string)`
+
+SetJustSymbol gets a reference to the given string and assigns it to the JustSymbol field.
+
+### GetArrayEnum
+
+`func (o *EnumArrays) GetArrayEnum() []string`
+
+GetArrayEnum returns the ArrayEnum field if non-nil, zero value otherwise.
+
+### GetArrayEnumOk
+
+`func (o *EnumArrays) GetArrayEnumOk() ([]string, bool)`
+
+GetArrayEnumOk returns a tuple with the ArrayEnum field if it's non-nil, zero value otherwise
+and a boolean to check if the value has been set.
+
+### HasArrayEnum
+
+`func (o *EnumArrays) HasArrayEnum() bool`
+
+HasArrayEnum returns a boolean if a field has been set.
+
+### SetArrayEnum
+
+`func (o *EnumArrays) SetArrayEnum(v []string)`
+
+SetArrayEnum gets a reference to the given []string and assigns it to the ArrayEnum field.
+
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/samples/client/petstore/go-experimental/go-petstore/docs/EnumClass.md b/samples/client/petstore/go-experimental/go-petstore/docs/EnumClass.md
index c6932388c0..e231f94bd7 100644
--- a/samples/client/petstore/go-experimental/go-petstore/docs/EnumClass.md
+++ b/samples/client/petstore/go-experimental/go-petstore/docs/EnumClass.md
@@ -5,6 +5,7 @@
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
 
+
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
 
diff --git a/samples/client/petstore/go-experimental/go-petstore/docs/EnumTest.md b/samples/client/petstore/go-experimental/go-petstore/docs/EnumTest.md
index eeec09b66b..f396e0e32a 100644
--- a/samples/client/petstore/go-experimental/go-petstore/docs/EnumTest.md
+++ b/samples/client/petstore/go-experimental/go-petstore/docs/EnumTest.md
@@ -4,11 +4,139 @@
 
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**EnumString** | **string** |  | [optional] 
-**EnumStringRequired** | **string** |  | 
-**EnumInteger** | **int32** |  | [optional] 
-**EnumNumber** | **float64** |  | [optional] 
-**OuterEnum** | [**OuterEnum**](OuterEnum.md) |  | [optional] 
+**EnumString** | Pointer to **string** |  | [optional]
+**EnumStringRequired** | Pointer to **string** |  | 
+**EnumInteger** | Pointer to **int32** |  | [optional]
+**EnumNumber** | Pointer to **float64** |  | [optional]
+**OuterEnum** | Pointer to [**OuterEnum**](OuterEnum.md) |  | [optional]
+
+## Methods
+
+### GetEnumString
+
+`func (o *EnumTest) GetEnumString() string`
+
+GetEnumString returns the EnumString field if non-nil, zero value otherwise.
+
+### GetEnumStringOk
+
+`func (o *EnumTest) GetEnumStringOk() (string, bool)`
+
+GetEnumStringOk returns a tuple with the EnumString field if it's non-nil, zero value otherwise
+and a boolean to check if the value has been set.
+
+### HasEnumString
+
+`func (o *EnumTest) HasEnumString() bool`
+
+HasEnumString returns a boolean if a field has been set.
+
+### SetEnumString
+
+`func (o *EnumTest) SetEnumString(v string)`
+
+SetEnumString gets a reference to the given string and assigns it to the EnumString field.
+
+### GetEnumStringRequired
+
+`func (o *EnumTest) GetEnumStringRequired() string`
+
+GetEnumStringRequired returns the EnumStringRequired field if non-nil, zero value otherwise.
+
+### GetEnumStringRequiredOk
+
+`func (o *EnumTest) GetEnumStringRequiredOk() (string, bool)`
+
+GetEnumStringRequiredOk returns a tuple with the EnumStringRequired field if it's non-nil, zero value otherwise
+and a boolean to check if the value has been set.
+
+### HasEnumStringRequired
+
+`func (o *EnumTest) HasEnumStringRequired() bool`
+
+HasEnumStringRequired returns a boolean if a field has been set.
+
+### SetEnumStringRequired
+
+`func (o *EnumTest) SetEnumStringRequired(v string)`
+
+SetEnumStringRequired gets a reference to the given string and assigns it to the EnumStringRequired field.
+
+### GetEnumInteger
+
+`func (o *EnumTest) GetEnumInteger() int32`
+
+GetEnumInteger returns the EnumInteger field if non-nil, zero value otherwise.
+
+### GetEnumIntegerOk
+
+`func (o *EnumTest) GetEnumIntegerOk() (int32, bool)`
+
+GetEnumIntegerOk returns a tuple with the EnumInteger field if it's non-nil, zero value otherwise
+and a boolean to check if the value has been set.
+
+### HasEnumInteger
+
+`func (o *EnumTest) HasEnumInteger() bool`
+
+HasEnumInteger returns a boolean if a field has been set.
+
+### SetEnumInteger
+
+`func (o *EnumTest) SetEnumInteger(v int32)`
+
+SetEnumInteger gets a reference to the given int32 and assigns it to the EnumInteger field.
+
+### GetEnumNumber
+
+`func (o *EnumTest) GetEnumNumber() float64`
+
+GetEnumNumber returns the EnumNumber field if non-nil, zero value otherwise.
+
+### GetEnumNumberOk
+
+`func (o *EnumTest) GetEnumNumberOk() (float64, bool)`
+
+GetEnumNumberOk returns a tuple with the EnumNumber field if it's non-nil, zero value otherwise
+and a boolean to check if the value has been set.
+
+### HasEnumNumber
+
+`func (o *EnumTest) HasEnumNumber() bool`
+
+HasEnumNumber returns a boolean if a field has been set.
+
+### SetEnumNumber
+
+`func (o *EnumTest) SetEnumNumber(v float64)`
+
+SetEnumNumber gets a reference to the given float64 and assigns it to the EnumNumber field.
+
+### GetOuterEnum
+
+`func (o *EnumTest) GetOuterEnum() OuterEnum`
+
+GetOuterEnum returns the OuterEnum field if non-nil, zero value otherwise.
+
+### GetOuterEnumOk
+
+`func (o *EnumTest) GetOuterEnumOk() (OuterEnum, bool)`
+
+GetOuterEnumOk returns a tuple with the OuterEnum field if it's non-nil, zero value otherwise
+and a boolean to check if the value has been set.
+
+### HasOuterEnum
+
+`func (o *EnumTest) HasOuterEnum() bool`
+
+HasOuterEnum returns a boolean if a field has been set.
+
+### SetOuterEnum
+
+`func (o *EnumTest) SetOuterEnum(v OuterEnum)`
+
+SetOuterEnum gets a reference to the given OuterEnum and assigns it to the OuterEnum field.
+
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/samples/client/petstore/go-experimental/go-petstore/docs/File.md b/samples/client/petstore/go-experimental/go-petstore/docs/File.md
index a113b0312c..07d269cd88 100644
--- a/samples/client/petstore/go-experimental/go-petstore/docs/File.md
+++ b/samples/client/petstore/go-experimental/go-petstore/docs/File.md
@@ -4,7 +4,35 @@
 
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**SourceURI** | **string** | Test capitalization | [optional] 
+**SourceURI** | Pointer to **string** | Test capitalization | [optional]
+
+## Methods
+
+### GetSourceURI
+
+`func (o *File) GetSourceURI() string`
+
+GetSourceURI returns the SourceURI field if non-nil, zero value otherwise.
+
+### GetSourceURIOk
+
+`func (o *File) GetSourceURIOk() (string, bool)`
+
+GetSourceURIOk returns a tuple with the SourceURI field if it's non-nil, zero value otherwise
+and a boolean to check if the value has been set.
+
+### HasSourceURI
+
+`func (o *File) HasSourceURI() bool`
+
+HasSourceURI returns a boolean if a field has been set.
+
+### SetSourceURI
+
+`func (o *File) SetSourceURI(v string)`
+
+SetSourceURI gets a reference to the given string and assigns it to the SourceURI field.
+
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/samples/client/petstore/go-experimental/go-petstore/docs/FileSchemaTestClass.md b/samples/client/petstore/go-experimental/go-petstore/docs/FileSchemaTestClass.md
index ae51414dd6..4a12b7f6d5 100644
--- a/samples/client/petstore/go-experimental/go-petstore/docs/FileSchemaTestClass.md
+++ b/samples/client/petstore/go-experimental/go-petstore/docs/FileSchemaTestClass.md
@@ -4,8 +4,61 @@
 
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**File** | [**File**](File.md) |  | [optional] 
-**Files** | [**[]File**](File.md) |  | [optional] 
+**File** | Pointer to [**File**](File.md) |  | [optional]
+**Files** | Pointer to [**[]File**](File.md) |  | [optional]
+
+## Methods
+
+### GetFile
+
+`func (o *FileSchemaTestClass) GetFile() File`
+
+GetFile returns the File field if non-nil, zero value otherwise.
+
+### GetFileOk
+
+`func (o *FileSchemaTestClass) GetFileOk() (File, bool)`
+
+GetFileOk returns a tuple with the File field if it's non-nil, zero value otherwise
+and a boolean to check if the value has been set.
+
+### HasFile
+
+`func (o *FileSchemaTestClass) HasFile() bool`
+
+HasFile returns a boolean if a field has been set.
+
+### SetFile
+
+`func (o *FileSchemaTestClass) SetFile(v File)`
+
+SetFile gets a reference to the given File and assigns it to the File field.
+
+### GetFiles
+
+`func (o *FileSchemaTestClass) GetFiles() []File`
+
+GetFiles returns the Files field if non-nil, zero value otherwise.
+
+### GetFilesOk
+
+`func (o *FileSchemaTestClass) GetFilesOk() ([]File, bool)`
+
+GetFilesOk returns a tuple with the Files field if it's non-nil, zero value otherwise
+and a boolean to check if the value has been set.
+
+### HasFiles
+
+`func (o *FileSchemaTestClass) HasFiles() bool`
+
+HasFiles returns a boolean if a field has been set.
+
+### SetFiles
+
+`func (o *FileSchemaTestClass) SetFiles(v []File)`
+
+SetFiles gets a reference to the given []File and assigns it to the Files field.
+
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/samples/client/petstore/go-experimental/go-petstore/docs/FormatTest.md b/samples/client/petstore/go-experimental/go-petstore/docs/FormatTest.md
index ee089a03cd..7b0c3d451c 100644
--- a/samples/client/petstore/go-experimental/go-petstore/docs/FormatTest.md
+++ b/samples/client/petstore/go-experimental/go-petstore/docs/FormatTest.md
@@ -4,19 +4,347 @@
 
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**Integer** | **int32** |  | [optional] 
-**Int32** | **int32** |  | [optional] 
-**Int64** | **int64** |  | [optional] 
-**Number** | **float32** |  | 
-**Float** | **float32** |  | [optional] 
-**Double** | **float64** |  | [optional] 
-**String** | **string** |  | [optional] 
-**Byte** | **string** |  | 
-**Binary** | [***os.File**](*os.File.md) |  | [optional] 
-**Date** | **string** |  | 
-**DateTime** | [**time.Time**](time.Time.md) |  | [optional] 
-**Uuid** | **string** |  | [optional] 
-**Password** | **string** |  | 
+**Integer** | Pointer to **int32** |  | [optional]
+**Int32** | Pointer to **int32** |  | [optional]
+**Int64** | Pointer to **int64** |  | [optional]
+**Number** | Pointer to **float32** |  | 
+**Float** | Pointer to **float32** |  | [optional]
+**Double** | Pointer to **float64** |  | [optional]
+**String** | Pointer to **string** |  | [optional]
+**Byte** | Pointer to **string** |  | 
+**Binary** | Pointer to [***os.File**](*os.File.md) |  | [optional]
+**Date** | Pointer to **string** |  | 
+**DateTime** | Pointer to [**time.Time**](time.Time.md) |  | [optional]
+**Uuid** | Pointer to **string** |  | [optional]
+**Password** | Pointer to **string** |  | 
+
+## Methods
+
+### GetInteger
+
+`func (o *FormatTest) GetInteger() int32`
+
+GetInteger returns the Integer field if non-nil, zero value otherwise.
+
+### GetIntegerOk
+
+`func (o *FormatTest) GetIntegerOk() (int32, bool)`
+
+GetIntegerOk returns a tuple with the Integer field if it's non-nil, zero value otherwise
+and a boolean to check if the value has been set.
+
+### HasInteger
+
+`func (o *FormatTest) HasInteger() bool`
+
+HasInteger returns a boolean if a field has been set.
+
+### SetInteger
+
+`func (o *FormatTest) SetInteger(v int32)`
+
+SetInteger gets a reference to the given int32 and assigns it to the Integer field.
+
+### GetInt32
+
+`func (o *FormatTest) GetInt32() int32`
+
+GetInt32 returns the Int32 field if non-nil, zero value otherwise.
+
+### GetInt32Ok
+
+`func (o *FormatTest) GetInt32Ok() (int32, bool)`
+
+GetInt32Ok returns a tuple with the Int32 field if it's non-nil, zero value otherwise
+and a boolean to check if the value has been set.
+
+### HasInt32
+
+`func (o *FormatTest) HasInt32() bool`
+
+HasInt32 returns a boolean if a field has been set.
+
+### SetInt32
+
+`func (o *FormatTest) SetInt32(v int32)`
+
+SetInt32 gets a reference to the given int32 and assigns it to the Int32 field.
+
+### GetInt64
+
+`func (o *FormatTest) GetInt64() int64`
+
+GetInt64 returns the Int64 field if non-nil, zero value otherwise.
+
+### GetInt64Ok
+
+`func (o *FormatTest) GetInt64Ok() (int64, bool)`
+
+GetInt64Ok returns a tuple with the Int64 field if it's non-nil, zero value otherwise
+and a boolean to check if the value has been set.
+
+### HasInt64
+
+`func (o *FormatTest) HasInt64() bool`
+
+HasInt64 returns a boolean if a field has been set.
+
+### SetInt64
+
+`func (o *FormatTest) SetInt64(v int64)`
+
+SetInt64 gets a reference to the given int64 and assigns it to the Int64 field.
+
+### GetNumber
+
+`func (o *FormatTest) GetNumber() float32`
+
+GetNumber returns the Number field if non-nil, zero value otherwise.
+
+### GetNumberOk
+
+`func (o *FormatTest) GetNumberOk() (float32, bool)`
+
+GetNumberOk returns a tuple with the Number field if it's non-nil, zero value otherwise
+and a boolean to check if the value has been set.
+
+### HasNumber
+
+`func (o *FormatTest) HasNumber() bool`
+
+HasNumber returns a boolean if a field has been set.
+
+### SetNumber
+
+`func (o *FormatTest) SetNumber(v float32)`
+
+SetNumber gets a reference to the given float32 and assigns it to the Number field.
+
+### GetFloat
+
+`func (o *FormatTest) GetFloat() float32`
+
+GetFloat returns the Float field if non-nil, zero value otherwise.
+
+### GetFloatOk
+
+`func (o *FormatTest) GetFloatOk() (float32, bool)`
+
+GetFloatOk returns a tuple with the Float field if it's non-nil, zero value otherwise
+and a boolean to check if the value has been set.
+
+### HasFloat
+
+`func (o *FormatTest) HasFloat() bool`
+
+HasFloat returns a boolean if a field has been set.
+
+### SetFloat
+
+`func (o *FormatTest) SetFloat(v float32)`
+
+SetFloat gets a reference to the given float32 and assigns it to the Float field.
+
+### GetDouble
+
+`func (o *FormatTest) GetDouble() float64`
+
+GetDouble returns the Double field if non-nil, zero value otherwise.
+
+### GetDoubleOk
+
+`func (o *FormatTest) GetDoubleOk() (float64, bool)`
+
+GetDoubleOk returns a tuple with the Double field if it's non-nil, zero value otherwise
+and a boolean to check if the value has been set.
+
+### HasDouble
+
+`func (o *FormatTest) HasDouble() bool`
+
+HasDouble returns a boolean if a field has been set.
+
+### SetDouble
+
+`func (o *FormatTest) SetDouble(v float64)`
+
+SetDouble gets a reference to the given float64 and assigns it to the Double field.
+
+### GetString
+
+`func (o *FormatTest) GetString() string`
+
+GetString returns the String field if non-nil, zero value otherwise.
+
+### GetStringOk
+
+`func (o *FormatTest) GetStringOk() (string, bool)`
+
+GetStringOk returns a tuple with the String field if it's non-nil, zero value otherwise
+and a boolean to check if the value has been set.
+
+### HasString
+
+`func (o *FormatTest) HasString() bool`
+
+HasString returns a boolean if a field has been set.
+
+### SetString
+
+`func (o *FormatTest) SetString(v string)`
+
+SetString gets a reference to the given string and assigns it to the String field.
+
+### GetByte
+
+`func (o *FormatTest) GetByte() string`
+
+GetByte returns the Byte field if non-nil, zero value otherwise.
+
+### GetByteOk
+
+`func (o *FormatTest) GetByteOk() (string, bool)`
+
+GetByteOk returns a tuple with the Byte field if it's non-nil, zero value otherwise
+and a boolean to check if the value has been set.
+
+### HasByte
+
+`func (o *FormatTest) HasByte() bool`
+
+HasByte returns a boolean if a field has been set.
+
+### SetByte
+
+`func (o *FormatTest) SetByte(v string)`
+
+SetByte gets a reference to the given string and assigns it to the Byte field.
+
+### GetBinary
+
+`func (o *FormatTest) GetBinary() *os.File`
+
+GetBinary returns the Binary field if non-nil, zero value otherwise.
+
+### GetBinaryOk
+
+`func (o *FormatTest) GetBinaryOk() (*os.File, bool)`
+
+GetBinaryOk returns a tuple with the Binary field if it's non-nil, zero value otherwise
+and a boolean to check if the value has been set.
+
+### HasBinary
+
+`func (o *FormatTest) HasBinary() bool`
+
+HasBinary returns a boolean if a field has been set.
+
+### SetBinary
+
+`func (o *FormatTest) SetBinary(v *os.File)`
+
+SetBinary gets a reference to the given *os.File and assigns it to the Binary field.
+
+### GetDate
+
+`func (o *FormatTest) GetDate() string`
+
+GetDate returns the Date field if non-nil, zero value otherwise.
+
+### GetDateOk
+
+`func (o *FormatTest) GetDateOk() (string, bool)`
+
+GetDateOk returns a tuple with the Date field if it's non-nil, zero value otherwise
+and a boolean to check if the value has been set.
+
+### HasDate
+
+`func (o *FormatTest) HasDate() bool`
+
+HasDate returns a boolean if a field has been set.
+
+### SetDate
+
+`func (o *FormatTest) SetDate(v string)`
+
+SetDate gets a reference to the given string and assigns it to the Date field.
+
+### GetDateTime
+
+`func (o *FormatTest) GetDateTime() time.Time`
+
+GetDateTime returns the DateTime field if non-nil, zero value otherwise.
+
+### GetDateTimeOk
+
+`func (o *FormatTest) GetDateTimeOk() (time.Time, bool)`
+
+GetDateTimeOk returns a tuple with the DateTime field if it's non-nil, zero value otherwise
+and a boolean to check if the value has been set.
+
+### HasDateTime
+
+`func (o *FormatTest) HasDateTime() bool`
+
+HasDateTime returns a boolean if a field has been set.
+
+### SetDateTime
+
+`func (o *FormatTest) SetDateTime(v time.Time)`
+
+SetDateTime gets a reference to the given time.Time and assigns it to the DateTime field.
+
+### GetUuid
+
+`func (o *FormatTest) GetUuid() string`
+
+GetUuid returns the Uuid field if non-nil, zero value otherwise.
+
+### GetUuidOk
+
+`func (o *FormatTest) GetUuidOk() (string, bool)`
+
+GetUuidOk returns a tuple with the Uuid field if it's non-nil, zero value otherwise
+and a boolean to check if the value has been set.
+
+### HasUuid
+
+`func (o *FormatTest) HasUuid() bool`
+
+HasUuid returns a boolean if a field has been set.
+
+### SetUuid
+
+`func (o *FormatTest) SetUuid(v string)`
+
+SetUuid gets a reference to the given string and assigns it to the Uuid field.
+
+### GetPassword
+
+`func (o *FormatTest) GetPassword() string`
+
+GetPassword returns the Password field if non-nil, zero value otherwise.
+
+### GetPasswordOk
+
+`func (o *FormatTest) GetPasswordOk() (string, bool)`
+
+GetPasswordOk returns a tuple with the Password field if it's non-nil, zero value otherwise
+and a boolean to check if the value has been set.
+
+### HasPassword
+
+`func (o *FormatTest) HasPassword() bool`
+
+HasPassword returns a boolean if a field has been set.
+
+### SetPassword
+
+`func (o *FormatTest) SetPassword(v string)`
+
+SetPassword gets a reference to the given string and assigns it to the Password field.
+
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/samples/client/petstore/go-experimental/go-petstore/docs/HasOnlyReadOnly.md b/samples/client/petstore/go-experimental/go-petstore/docs/HasOnlyReadOnly.md
index 9e2f495735..33cc010f3a 100644
--- a/samples/client/petstore/go-experimental/go-petstore/docs/HasOnlyReadOnly.md
+++ b/samples/client/petstore/go-experimental/go-petstore/docs/HasOnlyReadOnly.md
@@ -4,8 +4,61 @@
 
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**Bar** | **string** |  | [optional] 
-**Foo** | **string** |  | [optional] 
+**Bar** | Pointer to **string** |  | [optional]
+**Foo** | Pointer to **string** |  | [optional]
+
+## Methods
+
+### GetBar
+
+`func (o *HasOnlyReadOnly) GetBar() string`
+
+GetBar returns the Bar field if non-nil, zero value otherwise.
+
+### GetBarOk
+
+`func (o *HasOnlyReadOnly) GetBarOk() (string, bool)`
+
+GetBarOk returns a tuple with the Bar field if it's non-nil, zero value otherwise
+and a boolean to check if the value has been set.
+
+### HasBar
+
+`func (o *HasOnlyReadOnly) HasBar() bool`
+
+HasBar returns a boolean if a field has been set.
+
+### SetBar
+
+`func (o *HasOnlyReadOnly) SetBar(v string)`
+
+SetBar gets a reference to the given string and assigns it to the Bar field.
+
+### GetFoo
+
+`func (o *HasOnlyReadOnly) GetFoo() string`
+
+GetFoo returns the Foo field if non-nil, zero value otherwise.
+
+### GetFooOk
+
+`func (o *HasOnlyReadOnly) GetFooOk() (string, bool)`
+
+GetFooOk returns a tuple with the Foo field if it's non-nil, zero value otherwise
+and a boolean to check if the value has been set.
+
+### HasFoo
+
+`func (o *HasOnlyReadOnly) HasFoo() bool`
+
+HasFoo returns a boolean if a field has been set.
+
+### SetFoo
+
+`func (o *HasOnlyReadOnly) SetFoo(v string)`
+
+SetFoo gets a reference to the given string and assigns it to the Foo field.
+
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/samples/client/petstore/go-experimental/go-petstore/docs/List.md b/samples/client/petstore/go-experimental/go-petstore/docs/List.md
index bba2e52990..53784dd47a 100644
--- a/samples/client/petstore/go-experimental/go-petstore/docs/List.md
+++ b/samples/client/petstore/go-experimental/go-petstore/docs/List.md
@@ -4,7 +4,35 @@
 
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**Var123List** | **string** |  | [optional] 
+**Var123List** | Pointer to **string** |  | [optional]
+
+## Methods
+
+### GetVar123List
+
+`func (o *List) GetVar123List() string`
+
+GetVar123List returns the Var123List field if non-nil, zero value otherwise.
+
+### GetVar123ListOk
+
+`func (o *List) GetVar123ListOk() (string, bool)`
+
+GetVar123ListOk returns a tuple with the Var123List field if it's non-nil, zero value otherwise
+and a boolean to check if the value has been set.
+
+### HasVar123List
+
+`func (o *List) HasVar123List() bool`
+
+HasVar123List returns a boolean if a field has been set.
+
+### SetVar123List
+
+`func (o *List) SetVar123List(v string)`
+
+SetVar123List gets a reference to the given string and assigns it to the Var123List field.
+
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/samples/client/petstore/go-experimental/go-petstore/docs/MapTest.md b/samples/client/petstore/go-experimental/go-petstore/docs/MapTest.md
index 6645e04465..6994b17ec5 100644
--- a/samples/client/petstore/go-experimental/go-petstore/docs/MapTest.md
+++ b/samples/client/petstore/go-experimental/go-petstore/docs/MapTest.md
@@ -4,10 +4,113 @@
 
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**MapMapOfString** | [**map[string]map[string]string**](map.md) |  | [optional] 
-**MapOfEnumString** | **map[string]string** |  | [optional] 
-**DirectMap** | **map[string]bool** |  | [optional] 
-**IndirectMap** | **map[string]bool** |  | [optional] 
+**MapMapOfString** | Pointer to [**map[string]map[string]string**](map.md) |  | [optional]
+**MapOfEnumString** | Pointer to **map[string]string** |  | [optional]
+**DirectMap** | Pointer to **map[string]bool** |  | [optional]
+**IndirectMap** | Pointer to **map[string]bool** |  | [optional]
+
+## Methods
+
+### GetMapMapOfString
+
+`func (o *MapTest) GetMapMapOfString() map[string]map[string]string`
+
+GetMapMapOfString returns the MapMapOfString field if non-nil, zero value otherwise.
+
+### GetMapMapOfStringOk
+
+`func (o *MapTest) GetMapMapOfStringOk() (map[string]map[string]string, bool)`
+
+GetMapMapOfStringOk returns a tuple with the MapMapOfString field if it's non-nil, zero value otherwise
+and a boolean to check if the value has been set.
+
+### HasMapMapOfString
+
+`func (o *MapTest) HasMapMapOfString() bool`
+
+HasMapMapOfString returns a boolean if a field has been set.
+
+### SetMapMapOfString
+
+`func (o *MapTest) SetMapMapOfString(v map[string]map[string]string)`
+
+SetMapMapOfString gets a reference to the given map[string]map[string]string and assigns it to the MapMapOfString field.
+
+### GetMapOfEnumString
+
+`func (o *MapTest) GetMapOfEnumString() map[string]string`
+
+GetMapOfEnumString returns the MapOfEnumString field if non-nil, zero value otherwise.
+
+### GetMapOfEnumStringOk
+
+`func (o *MapTest) GetMapOfEnumStringOk() (map[string]string, bool)`
+
+GetMapOfEnumStringOk returns a tuple with the MapOfEnumString field if it's non-nil, zero value otherwise
+and a boolean to check if the value has been set.
+
+### HasMapOfEnumString
+
+`func (o *MapTest) HasMapOfEnumString() bool`
+
+HasMapOfEnumString returns a boolean if a field has been set.
+
+### SetMapOfEnumString
+
+`func (o *MapTest) SetMapOfEnumString(v map[string]string)`
+
+SetMapOfEnumString gets a reference to the given map[string]string and assigns it to the MapOfEnumString field.
+
+### GetDirectMap
+
+`func (o *MapTest) GetDirectMap() map[string]bool`
+
+GetDirectMap returns the DirectMap field if non-nil, zero value otherwise.
+
+### GetDirectMapOk
+
+`func (o *MapTest) GetDirectMapOk() (map[string]bool, bool)`
+
+GetDirectMapOk returns a tuple with the DirectMap field if it's non-nil, zero value otherwise
+and a boolean to check if the value has been set.
+
+### HasDirectMap
+
+`func (o *MapTest) HasDirectMap() bool`
+
+HasDirectMap returns a boolean if a field has been set.
+
+### SetDirectMap
+
+`func (o *MapTest) SetDirectMap(v map[string]bool)`
+
+SetDirectMap gets a reference to the given map[string]bool and assigns it to the DirectMap field.
+
+### GetIndirectMap
+
+`func (o *MapTest) GetIndirectMap() map[string]bool`
+
+GetIndirectMap returns the IndirectMap field if non-nil, zero value otherwise.
+
+### GetIndirectMapOk
+
+`func (o *MapTest) GetIndirectMapOk() (map[string]bool, bool)`
+
+GetIndirectMapOk returns a tuple with the IndirectMap field if it's non-nil, zero value otherwise
+and a boolean to check if the value has been set.
+
+### HasIndirectMap
+
+`func (o *MapTest) HasIndirectMap() bool`
+
+HasIndirectMap returns a boolean if a field has been set.
+
+### SetIndirectMap
+
+`func (o *MapTest) SetIndirectMap(v map[string]bool)`
+
+SetIndirectMap gets a reference to the given map[string]bool and assigns it to the IndirectMap field.
+
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/samples/client/petstore/go-experimental/go-petstore/docs/MixedPropertiesAndAdditionalPropertiesClass.md b/samples/client/petstore/go-experimental/go-petstore/docs/MixedPropertiesAndAdditionalPropertiesClass.md
index a2ce1068b2..f12ed969af 100644
--- a/samples/client/petstore/go-experimental/go-petstore/docs/MixedPropertiesAndAdditionalPropertiesClass.md
+++ b/samples/client/petstore/go-experimental/go-petstore/docs/MixedPropertiesAndAdditionalPropertiesClass.md
@@ -4,9 +4,87 @@
 
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**Uuid** | **string** |  | [optional] 
-**DateTime** | [**time.Time**](time.Time.md) |  | [optional] 
-**Map** | [**map[string]Animal**](Animal.md) |  | [optional] 
+**Uuid** | Pointer to **string** |  | [optional]
+**DateTime** | Pointer to [**time.Time**](time.Time.md) |  | [optional]
+**Map** | Pointer to [**map[string]Animal**](Animal.md) |  | [optional]
+
+## Methods
+
+### GetUuid
+
+`func (o *MixedPropertiesAndAdditionalPropertiesClass) GetUuid() string`
+
+GetUuid returns the Uuid field if non-nil, zero value otherwise.
+
+### GetUuidOk
+
+`func (o *MixedPropertiesAndAdditionalPropertiesClass) GetUuidOk() (string, bool)`
+
+GetUuidOk returns a tuple with the Uuid field if it's non-nil, zero value otherwise
+and a boolean to check if the value has been set.
+
+### HasUuid
+
+`func (o *MixedPropertiesAndAdditionalPropertiesClass) HasUuid() bool`
+
+HasUuid returns a boolean if a field has been set.
+
+### SetUuid
+
+`func (o *MixedPropertiesAndAdditionalPropertiesClass) SetUuid(v string)`
+
+SetUuid gets a reference to the given string and assigns it to the Uuid field.
+
+### GetDateTime
+
+`func (o *MixedPropertiesAndAdditionalPropertiesClass) GetDateTime() time.Time`
+
+GetDateTime returns the DateTime field if non-nil, zero value otherwise.
+
+### GetDateTimeOk
+
+`func (o *MixedPropertiesAndAdditionalPropertiesClass) GetDateTimeOk() (time.Time, bool)`
+
+GetDateTimeOk returns a tuple with the DateTime field if it's non-nil, zero value otherwise
+and a boolean to check if the value has been set.
+
+### HasDateTime
+
+`func (o *MixedPropertiesAndAdditionalPropertiesClass) HasDateTime() bool`
+
+HasDateTime returns a boolean if a field has been set.
+
+### SetDateTime
+
+`func (o *MixedPropertiesAndAdditionalPropertiesClass) SetDateTime(v time.Time)`
+
+SetDateTime gets a reference to the given time.Time and assigns it to the DateTime field.
+
+### GetMap
+
+`func (o *MixedPropertiesAndAdditionalPropertiesClass) GetMap() map[string]Animal`
+
+GetMap returns the Map field if non-nil, zero value otherwise.
+
+### GetMapOk
+
+`func (o *MixedPropertiesAndAdditionalPropertiesClass) GetMapOk() (map[string]Animal, bool)`
+
+GetMapOk returns a tuple with the Map field if it's non-nil, zero value otherwise
+and a boolean to check if the value has been set.
+
+### HasMap
+
+`func (o *MixedPropertiesAndAdditionalPropertiesClass) HasMap() bool`
+
+HasMap returns a boolean if a field has been set.
+
+### SetMap
+
+`func (o *MixedPropertiesAndAdditionalPropertiesClass) SetMap(v map[string]Animal)`
+
+SetMap gets a reference to the given map[string]Animal and assigns it to the Map field.
+
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/samples/client/petstore/go-experimental/go-petstore/docs/Model200Response.md b/samples/client/petstore/go-experimental/go-petstore/docs/Model200Response.md
index 27b93bd154..b0fbf5369e 100644
--- a/samples/client/petstore/go-experimental/go-petstore/docs/Model200Response.md
+++ b/samples/client/petstore/go-experimental/go-petstore/docs/Model200Response.md
@@ -4,8 +4,61 @@
 
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**Name** | **int32** |  | [optional] 
-**Class** | **string** |  | [optional] 
+**Name** | Pointer to **int32** |  | [optional]
+**Class** | Pointer to **string** |  | [optional]
+
+## Methods
+
+### GetName
+
+`func (o *Model200Response) GetName() int32`
+
+GetName returns the Name field if non-nil, zero value otherwise.
+
+### GetNameOk
+
+`func (o *Model200Response) GetNameOk() (int32, bool)`
+
+GetNameOk returns a tuple with the Name field if it's non-nil, zero value otherwise
+and a boolean to check if the value has been set.
+
+### HasName
+
+`func (o *Model200Response) HasName() bool`
+
+HasName returns a boolean if a field has been set.
+
+### SetName
+
+`func (o *Model200Response) SetName(v int32)`
+
+SetName gets a reference to the given int32 and assigns it to the Name field.
+
+### GetClass
+
+`func (o *Model200Response) GetClass() string`
+
+GetClass returns the Class field if non-nil, zero value otherwise.
+
+### GetClassOk
+
+`func (o *Model200Response) GetClassOk() (string, bool)`
+
+GetClassOk returns a tuple with the Class field if it's non-nil, zero value otherwise
+and a boolean to check if the value has been set.
+
+### HasClass
+
+`func (o *Model200Response) HasClass() bool`
+
+HasClass returns a boolean if a field has been set.
+
+### SetClass
+
+`func (o *Model200Response) SetClass(v string)`
+
+SetClass gets a reference to the given string and assigns it to the Class field.
+
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/samples/client/petstore/go-experimental/go-petstore/docs/Name.md b/samples/client/petstore/go-experimental/go-petstore/docs/Name.md
index 453e54d985..3b1d29f518 100644
--- a/samples/client/petstore/go-experimental/go-petstore/docs/Name.md
+++ b/samples/client/petstore/go-experimental/go-petstore/docs/Name.md
@@ -4,10 +4,113 @@
 
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**Name** | **int32** |  | 
-**SnakeCase** | **int32** |  | [optional] 
-**Property** | **string** |  | [optional] 
-**Var123Number** | **int32** |  | [optional] 
+**Name** | Pointer to **int32** |  | 
+**SnakeCase** | Pointer to **int32** |  | [optional]
+**Property** | Pointer to **string** |  | [optional]
+**Var123Number** | Pointer to **int32** |  | [optional]
+
+## Methods
+
+### GetName
+
+`func (o *Name) GetName() int32`
+
+GetName returns the Name field if non-nil, zero value otherwise.
+
+### GetNameOk
+
+`func (o *Name) GetNameOk() (int32, bool)`
+
+GetNameOk returns a tuple with the Name field if it's non-nil, zero value otherwise
+and a boolean to check if the value has been set.
+
+### HasName
+
+`func (o *Name) HasName() bool`
+
+HasName returns a boolean if a field has been set.
+
+### SetName
+
+`func (o *Name) SetName(v int32)`
+
+SetName gets a reference to the given int32 and assigns it to the Name field.
+
+### GetSnakeCase
+
+`func (o *Name) GetSnakeCase() int32`
+
+GetSnakeCase returns the SnakeCase field if non-nil, zero value otherwise.
+
+### GetSnakeCaseOk
+
+`func (o *Name) GetSnakeCaseOk() (int32, bool)`
+
+GetSnakeCaseOk returns a tuple with the SnakeCase field if it's non-nil, zero value otherwise
+and a boolean to check if the value has been set.
+
+### HasSnakeCase
+
+`func (o *Name) HasSnakeCase() bool`
+
+HasSnakeCase returns a boolean if a field has been set.
+
+### SetSnakeCase
+
+`func (o *Name) SetSnakeCase(v int32)`
+
+SetSnakeCase gets a reference to the given int32 and assigns it to the SnakeCase field.
+
+### GetProperty
+
+`func (o *Name) GetProperty() string`
+
+GetProperty returns the Property field if non-nil, zero value otherwise.
+
+### GetPropertyOk
+
+`func (o *Name) GetPropertyOk() (string, bool)`
+
+GetPropertyOk returns a tuple with the Property field if it's non-nil, zero value otherwise
+and a boolean to check if the value has been set.
+
+### HasProperty
+
+`func (o *Name) HasProperty() bool`
+
+HasProperty returns a boolean if a field has been set.
+
+### SetProperty
+
+`func (o *Name) SetProperty(v string)`
+
+SetProperty gets a reference to the given string and assigns it to the Property field.
+
+### GetVar123Number
+
+`func (o *Name) GetVar123Number() int32`
+
+GetVar123Number returns the Var123Number field if non-nil, zero value otherwise.
+
+### GetVar123NumberOk
+
+`func (o *Name) GetVar123NumberOk() (int32, bool)`
+
+GetVar123NumberOk returns a tuple with the Var123Number field if it's non-nil, zero value otherwise
+and a boolean to check if the value has been set.
+
+### HasVar123Number
+
+`func (o *Name) HasVar123Number() bool`
+
+HasVar123Number returns a boolean if a field has been set.
+
+### SetVar123Number
+
+`func (o *Name) SetVar123Number(v int32)`
+
+SetVar123Number gets a reference to the given int32 and assigns it to the Var123Number field.
+
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/samples/client/petstore/go-experimental/go-petstore/docs/NumberOnly.md b/samples/client/petstore/go-experimental/go-petstore/docs/NumberOnly.md
index 604cf37eed..3521b8b2d0 100644
--- a/samples/client/petstore/go-experimental/go-petstore/docs/NumberOnly.md
+++ b/samples/client/petstore/go-experimental/go-petstore/docs/NumberOnly.md
@@ -4,7 +4,35 @@
 
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**JustNumber** | **float32** |  | [optional] 
+**JustNumber** | Pointer to **float32** |  | [optional]
+
+## Methods
+
+### GetJustNumber
+
+`func (o *NumberOnly) GetJustNumber() float32`
+
+GetJustNumber returns the JustNumber field if non-nil, zero value otherwise.
+
+### GetJustNumberOk
+
+`func (o *NumberOnly) GetJustNumberOk() (float32, bool)`
+
+GetJustNumberOk returns a tuple with the JustNumber field if it's non-nil, zero value otherwise
+and a boolean to check if the value has been set.
+
+### HasJustNumber
+
+`func (o *NumberOnly) HasJustNumber() bool`
+
+HasJustNumber returns a boolean if a field has been set.
+
+### SetJustNumber
+
+`func (o *NumberOnly) SetJustNumber(v float32)`
+
+SetJustNumber gets a reference to the given float32 and assigns it to the JustNumber field.
+
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/samples/client/petstore/go-experimental/go-petstore/docs/Order.md b/samples/client/petstore/go-experimental/go-petstore/docs/Order.md
index eeef097100..982f9f591c 100644
--- a/samples/client/petstore/go-experimental/go-petstore/docs/Order.md
+++ b/samples/client/petstore/go-experimental/go-petstore/docs/Order.md
@@ -4,12 +4,165 @@
 
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**Id** | **int64** |  | [optional] 
-**PetId** | **int64** |  | [optional] 
-**Quantity** | **int32** |  | [optional] 
-**ShipDate** | [**time.Time**](time.Time.md) |  | [optional] 
-**Status** | **string** | Order Status | [optional] 
-**Complete** | **bool** |  | [optional] [default to false]
+**Id** | Pointer to **int64** |  | [optional]
+**PetId** | Pointer to **int64** |  | [optional]
+**Quantity** | Pointer to **int32** |  | [optional]
+**ShipDate** | Pointer to [**time.Time**](time.Time.md) |  | [optional]
+**Status** | Pointer to **string** | Order Status | [optional]
+**Complete** | Pointer to **bool** |  | [optional] [default to false]
+
+## Methods
+
+### GetId
+
+`func (o *Order) GetId() int64`
+
+GetId returns the Id field if non-nil, zero value otherwise.
+
+### GetIdOk
+
+`func (o *Order) GetIdOk() (int64, bool)`
+
+GetIdOk returns a tuple with the Id field if it's non-nil, zero value otherwise
+and a boolean to check if the value has been set.
+
+### HasId
+
+`func (o *Order) HasId() bool`
+
+HasId returns a boolean if a field has been set.
+
+### SetId
+
+`func (o *Order) SetId(v int64)`
+
+SetId gets a reference to the given int64 and assigns it to the Id field.
+
+### GetPetId
+
+`func (o *Order) GetPetId() int64`
+
+GetPetId returns the PetId field if non-nil, zero value otherwise.
+
+### GetPetIdOk
+
+`func (o *Order) GetPetIdOk() (int64, bool)`
+
+GetPetIdOk returns a tuple with the PetId field if it's non-nil, zero value otherwise
+and a boolean to check if the value has been set.
+
+### HasPetId
+
+`func (o *Order) HasPetId() bool`
+
+HasPetId returns a boolean if a field has been set.
+
+### SetPetId
+
+`func (o *Order) SetPetId(v int64)`
+
+SetPetId gets a reference to the given int64 and assigns it to the PetId field.
+
+### GetQuantity
+
+`func (o *Order) GetQuantity() int32`
+
+GetQuantity returns the Quantity field if non-nil, zero value otherwise.
+
+### GetQuantityOk
+
+`func (o *Order) GetQuantityOk() (int32, bool)`
+
+GetQuantityOk returns a tuple with the Quantity field if it's non-nil, zero value otherwise
+and a boolean to check if the value has been set.
+
+### HasQuantity
+
+`func (o *Order) HasQuantity() bool`
+
+HasQuantity returns a boolean if a field has been set.
+
+### SetQuantity
+
+`func (o *Order) SetQuantity(v int32)`
+
+SetQuantity gets a reference to the given int32 and assigns it to the Quantity field.
+
+### GetShipDate
+
+`func (o *Order) GetShipDate() time.Time`
+
+GetShipDate returns the ShipDate field if non-nil, zero value otherwise.
+
+### GetShipDateOk
+
+`func (o *Order) GetShipDateOk() (time.Time, bool)`
+
+GetShipDateOk returns a tuple with the ShipDate field if it's non-nil, zero value otherwise
+and a boolean to check if the value has been set.
+
+### HasShipDate
+
+`func (o *Order) HasShipDate() bool`
+
+HasShipDate returns a boolean if a field has been set.
+
+### SetShipDate
+
+`func (o *Order) SetShipDate(v time.Time)`
+
+SetShipDate gets a reference to the given time.Time and assigns it to the ShipDate field.
+
+### GetStatus
+
+`func (o *Order) GetStatus() string`
+
+GetStatus returns the Status field if non-nil, zero value otherwise.
+
+### GetStatusOk
+
+`func (o *Order) GetStatusOk() (string, bool)`
+
+GetStatusOk returns a tuple with the Status field if it's non-nil, zero value otherwise
+and a boolean to check if the value has been set.
+
+### HasStatus
+
+`func (o *Order) HasStatus() bool`
+
+HasStatus returns a boolean if a field has been set.
+
+### SetStatus
+
+`func (o *Order) SetStatus(v string)`
+
+SetStatus gets a reference to the given string and assigns it to the Status field.
+
+### GetComplete
+
+`func (o *Order) GetComplete() bool`
+
+GetComplete returns the Complete field if non-nil, zero value otherwise.
+
+### GetCompleteOk
+
+`func (o *Order) GetCompleteOk() (bool, bool)`
+
+GetCompleteOk returns a tuple with the Complete field if it's non-nil, zero value otherwise
+and a boolean to check if the value has been set.
+
+### HasComplete
+
+`func (o *Order) HasComplete() bool`
+
+HasComplete returns a boolean if a field has been set.
+
+### SetComplete
+
+`func (o *Order) SetComplete(v bool)`
+
+SetComplete gets a reference to the given bool and assigns it to the Complete field.
+
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/samples/client/petstore/go-experimental/go-petstore/docs/OuterComposite.md b/samples/client/petstore/go-experimental/go-petstore/docs/OuterComposite.md
index df9bce1bd9..30a345dc8d 100644
--- a/samples/client/petstore/go-experimental/go-petstore/docs/OuterComposite.md
+++ b/samples/client/petstore/go-experimental/go-petstore/docs/OuterComposite.md
@@ -4,9 +4,87 @@
 
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**MyNumber** | **float32** |  | [optional] 
-**MyString** | **string** |  | [optional] 
-**MyBoolean** | **bool** |  | [optional] 
+**MyNumber** | Pointer to **float32** |  | [optional]
+**MyString** | Pointer to **string** |  | [optional]
+**MyBoolean** | Pointer to **bool** |  | [optional]
+
+## Methods
+
+### GetMyNumber
+
+`func (o *OuterComposite) GetMyNumber() float32`
+
+GetMyNumber returns the MyNumber field if non-nil, zero value otherwise.
+
+### GetMyNumberOk
+
+`func (o *OuterComposite) GetMyNumberOk() (float32, bool)`
+
+GetMyNumberOk returns a tuple with the MyNumber field if it's non-nil, zero value otherwise
+and a boolean to check if the value has been set.
+
+### HasMyNumber
+
+`func (o *OuterComposite) HasMyNumber() bool`
+
+HasMyNumber returns a boolean if a field has been set.
+
+### SetMyNumber
+
+`func (o *OuterComposite) SetMyNumber(v float32)`
+
+SetMyNumber gets a reference to the given float32 and assigns it to the MyNumber field.
+
+### GetMyString
+
+`func (o *OuterComposite) GetMyString() string`
+
+GetMyString returns the MyString field if non-nil, zero value otherwise.
+
+### GetMyStringOk
+
+`func (o *OuterComposite) GetMyStringOk() (string, bool)`
+
+GetMyStringOk returns a tuple with the MyString field if it's non-nil, zero value otherwise
+and a boolean to check if the value has been set.
+
+### HasMyString
+
+`func (o *OuterComposite) HasMyString() bool`
+
+HasMyString returns a boolean if a field has been set.
+
+### SetMyString
+
+`func (o *OuterComposite) SetMyString(v string)`
+
+SetMyString gets a reference to the given string and assigns it to the MyString field.
+
+### GetMyBoolean
+
+`func (o *OuterComposite) GetMyBoolean() bool`
+
+GetMyBoolean returns the MyBoolean field if non-nil, zero value otherwise.
+
+### GetMyBooleanOk
+
+`func (o *OuterComposite) GetMyBooleanOk() (bool, bool)`
+
+GetMyBooleanOk returns a tuple with the MyBoolean field if it's non-nil, zero value otherwise
+and a boolean to check if the value has been set.
+
+### HasMyBoolean
+
+`func (o *OuterComposite) HasMyBoolean() bool`
+
+HasMyBoolean returns a boolean if a field has been set.
+
+### SetMyBoolean
+
+`func (o *OuterComposite) SetMyBoolean(v bool)`
+
+SetMyBoolean gets a reference to the given bool and assigns it to the MyBoolean field.
+
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/samples/client/petstore/go-experimental/go-petstore/docs/OuterEnum.md b/samples/client/petstore/go-experimental/go-petstore/docs/OuterEnum.md
index c97466159c..13bed2d17f 100644
--- a/samples/client/petstore/go-experimental/go-petstore/docs/OuterEnum.md
+++ b/samples/client/petstore/go-experimental/go-petstore/docs/OuterEnum.md
@@ -5,6 +5,7 @@
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
 
+
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
 
diff --git a/samples/client/petstore/go-experimental/go-petstore/docs/Pet.md b/samples/client/petstore/go-experimental/go-petstore/docs/Pet.md
index c48104c639..81a4ec294e 100644
--- a/samples/client/petstore/go-experimental/go-petstore/docs/Pet.md
+++ b/samples/client/petstore/go-experimental/go-petstore/docs/Pet.md
@@ -4,12 +4,165 @@
 
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**Id** | **int64** |  | [optional] 
-**Category** | [**Category**](Category.md) |  | [optional] 
-**Name** | **string** |  | 
-**PhotoUrls** | **[]string** |  | 
-**Tags** | [**[]Tag**](Tag.md) |  | [optional] 
-**Status** | **string** | pet status in the store | [optional] 
+**Id** | Pointer to **int64** |  | [optional]
+**Category** | Pointer to [**Category**](Category.md) |  | [optional]
+**Name** | Pointer to **string** |  | 
+**PhotoUrls** | Pointer to **[]string** |  | 
+**Tags** | Pointer to [**[]Tag**](Tag.md) |  | [optional]
+**Status** | Pointer to **string** | pet status in the store | [optional]
+
+## Methods
+
+### GetId
+
+`func (o *Pet) GetId() int64`
+
+GetId returns the Id field if non-nil, zero value otherwise.
+
+### GetIdOk
+
+`func (o *Pet) GetIdOk() (int64, bool)`
+
+GetIdOk returns a tuple with the Id field if it's non-nil, zero value otherwise
+and a boolean to check if the value has been set.
+
+### HasId
+
+`func (o *Pet) HasId() bool`
+
+HasId returns a boolean if a field has been set.
+
+### SetId
+
+`func (o *Pet) SetId(v int64)`
+
+SetId gets a reference to the given int64 and assigns it to the Id field.
+
+### GetCategory
+
+`func (o *Pet) GetCategory() Category`
+
+GetCategory returns the Category field if non-nil, zero value otherwise.
+
+### GetCategoryOk
+
+`func (o *Pet) GetCategoryOk() (Category, bool)`
+
+GetCategoryOk returns a tuple with the Category field if it's non-nil, zero value otherwise
+and a boolean to check if the value has been set.
+
+### HasCategory
+
+`func (o *Pet) HasCategory() bool`
+
+HasCategory returns a boolean if a field has been set.
+
+### SetCategory
+
+`func (o *Pet) SetCategory(v Category)`
+
+SetCategory gets a reference to the given Category and assigns it to the Category field.
+
+### GetName
+
+`func (o *Pet) GetName() string`
+
+GetName returns the Name field if non-nil, zero value otherwise.
+
+### GetNameOk
+
+`func (o *Pet) GetNameOk() (string, bool)`
+
+GetNameOk returns a tuple with the Name field if it's non-nil, zero value otherwise
+and a boolean to check if the value has been set.
+
+### HasName
+
+`func (o *Pet) HasName() bool`
+
+HasName returns a boolean if a field has been set.
+
+### SetName
+
+`func (o *Pet) SetName(v string)`
+
+SetName gets a reference to the given string and assigns it to the Name field.
+
+### GetPhotoUrls
+
+`func (o *Pet) GetPhotoUrls() []string`
+
+GetPhotoUrls returns the PhotoUrls field if non-nil, zero value otherwise.
+
+### GetPhotoUrlsOk
+
+`func (o *Pet) GetPhotoUrlsOk() ([]string, bool)`
+
+GetPhotoUrlsOk returns a tuple with the PhotoUrls field if it's non-nil, zero value otherwise
+and a boolean to check if the value has been set.
+
+### HasPhotoUrls
+
+`func (o *Pet) HasPhotoUrls() bool`
+
+HasPhotoUrls returns a boolean if a field has been set.
+
+### SetPhotoUrls
+
+`func (o *Pet) SetPhotoUrls(v []string)`
+
+SetPhotoUrls gets a reference to the given []string and assigns it to the PhotoUrls field.
+
+### GetTags
+
+`func (o *Pet) GetTags() []Tag`
+
+GetTags returns the Tags field if non-nil, zero value otherwise.
+
+### GetTagsOk
+
+`func (o *Pet) GetTagsOk() ([]Tag, bool)`
+
+GetTagsOk returns a tuple with the Tags field if it's non-nil, zero value otherwise
+and a boolean to check if the value has been set.
+
+### HasTags
+
+`func (o *Pet) HasTags() bool`
+
+HasTags returns a boolean if a field has been set.
+
+### SetTags
+
+`func (o *Pet) SetTags(v []Tag)`
+
+SetTags gets a reference to the given []Tag and assigns it to the Tags field.
+
+### GetStatus
+
+`func (o *Pet) GetStatus() string`
+
+GetStatus returns the Status field if non-nil, zero value otherwise.
+
+### GetStatusOk
+
+`func (o *Pet) GetStatusOk() (string, bool)`
+
+GetStatusOk returns a tuple with the Status field if it's non-nil, zero value otherwise
+and a boolean to check if the value has been set.
+
+### HasStatus
+
+`func (o *Pet) HasStatus() bool`
+
+HasStatus returns a boolean if a field has been set.
+
+### SetStatus
+
+`func (o *Pet) SetStatus(v string)`
+
+SetStatus gets a reference to the given string and assigns it to the Status field.
+
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/samples/client/petstore/go-experimental/go-petstore/docs/ReadOnlyFirst.md b/samples/client/petstore/go-experimental/go-petstore/docs/ReadOnlyFirst.md
index 3fee799f29..e490a0fc96 100644
--- a/samples/client/petstore/go-experimental/go-petstore/docs/ReadOnlyFirst.md
+++ b/samples/client/petstore/go-experimental/go-petstore/docs/ReadOnlyFirst.md
@@ -4,8 +4,61 @@
 
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**Bar** | **string** |  | [optional] 
-**Baz** | **string** |  | [optional] 
+**Bar** | Pointer to **string** |  | [optional]
+**Baz** | Pointer to **string** |  | [optional]
+
+## Methods
+
+### GetBar
+
+`func (o *ReadOnlyFirst) GetBar() string`
+
+GetBar returns the Bar field if non-nil, zero value otherwise.
+
+### GetBarOk
+
+`func (o *ReadOnlyFirst) GetBarOk() (string, bool)`
+
+GetBarOk returns a tuple with the Bar field if it's non-nil, zero value otherwise
+and a boolean to check if the value has been set.
+
+### HasBar
+
+`func (o *ReadOnlyFirst) HasBar() bool`
+
+HasBar returns a boolean if a field has been set.
+
+### SetBar
+
+`func (o *ReadOnlyFirst) SetBar(v string)`
+
+SetBar gets a reference to the given string and assigns it to the Bar field.
+
+### GetBaz
+
+`func (o *ReadOnlyFirst) GetBaz() string`
+
+GetBaz returns the Baz field if non-nil, zero value otherwise.
+
+### GetBazOk
+
+`func (o *ReadOnlyFirst) GetBazOk() (string, bool)`
+
+GetBazOk returns a tuple with the Baz field if it's non-nil, zero value otherwise
+and a boolean to check if the value has been set.
+
+### HasBaz
+
+`func (o *ReadOnlyFirst) HasBaz() bool`
+
+HasBaz returns a boolean if a field has been set.
+
+### SetBaz
+
+`func (o *ReadOnlyFirst) SetBaz(v string)`
+
+SetBaz gets a reference to the given string and assigns it to the Baz field.
+
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/samples/client/petstore/go-experimental/go-petstore/docs/Return.md b/samples/client/petstore/go-experimental/go-petstore/docs/Return.md
index 11be0b27c5..5c586fcbc6 100644
--- a/samples/client/petstore/go-experimental/go-petstore/docs/Return.md
+++ b/samples/client/petstore/go-experimental/go-petstore/docs/Return.md
@@ -4,7 +4,35 @@
 
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**Return** | **int32** |  | [optional] 
+**Return** | Pointer to **int32** |  | [optional]
+
+## Methods
+
+### GetReturn
+
+`func (o *Return) GetReturn() int32`
+
+GetReturn returns the Return field if non-nil, zero value otherwise.
+
+### GetReturnOk
+
+`func (o *Return) GetReturnOk() (int32, bool)`
+
+GetReturnOk returns a tuple with the Return field if it's non-nil, zero value otherwise
+and a boolean to check if the value has been set.
+
+### HasReturn
+
+`func (o *Return) HasReturn() bool`
+
+HasReturn returns a boolean if a field has been set.
+
+### SetReturn
+
+`func (o *Return) SetReturn(v int32)`
+
+SetReturn gets a reference to the given int32 and assigns it to the Return field.
+
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/samples/client/petstore/go-experimental/go-petstore/docs/SpecialModelName.md b/samples/client/petstore/go-experimental/go-petstore/docs/SpecialModelName.md
index 96d7a28a40..9e7d3f377d 100644
--- a/samples/client/petstore/go-experimental/go-petstore/docs/SpecialModelName.md
+++ b/samples/client/petstore/go-experimental/go-petstore/docs/SpecialModelName.md
@@ -4,7 +4,35 @@
 
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**SpecialPropertyName** | **int64** |  | [optional] 
+**SpecialPropertyName** | Pointer to **int64** |  | [optional]
+
+## Methods
+
+### GetSpecialPropertyName
+
+`func (o *SpecialModelName) GetSpecialPropertyName() int64`
+
+GetSpecialPropertyName returns the SpecialPropertyName field if non-nil, zero value otherwise.
+
+### GetSpecialPropertyNameOk
+
+`func (o *SpecialModelName) GetSpecialPropertyNameOk() (int64, bool)`
+
+GetSpecialPropertyNameOk returns a tuple with the SpecialPropertyName field if it's non-nil, zero value otherwise
+and a boolean to check if the value has been set.
+
+### HasSpecialPropertyName
+
+`func (o *SpecialModelName) HasSpecialPropertyName() bool`
+
+HasSpecialPropertyName returns a boolean if a field has been set.
+
+### SetSpecialPropertyName
+
+`func (o *SpecialModelName) SetSpecialPropertyName(v int64)`
+
+SetSpecialPropertyName gets a reference to the given int64 and assigns it to the SpecialPropertyName field.
+
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/samples/client/petstore/go-experimental/go-petstore/docs/Tag.md b/samples/client/petstore/go-experimental/go-petstore/docs/Tag.md
index d6b3cc117b..570126bd5f 100644
--- a/samples/client/petstore/go-experimental/go-petstore/docs/Tag.md
+++ b/samples/client/petstore/go-experimental/go-petstore/docs/Tag.md
@@ -4,8 +4,61 @@
 
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**Id** | **int64** |  | [optional] 
-**Name** | **string** |  | [optional] 
+**Id** | Pointer to **int64** |  | [optional]
+**Name** | Pointer to **string** |  | [optional]
+
+## Methods
+
+### GetId
+
+`func (o *Tag) GetId() int64`
+
+GetId returns the Id field if non-nil, zero value otherwise.
+
+### GetIdOk
+
+`func (o *Tag) GetIdOk() (int64, bool)`
+
+GetIdOk returns a tuple with the Id field if it's non-nil, zero value otherwise
+and a boolean to check if the value has been set.
+
+### HasId
+
+`func (o *Tag) HasId() bool`
+
+HasId returns a boolean if a field has been set.
+
+### SetId
+
+`func (o *Tag) SetId(v int64)`
+
+SetId gets a reference to the given int64 and assigns it to the Id field.
+
+### GetName
+
+`func (o *Tag) GetName() string`
+
+GetName returns the Name field if non-nil, zero value otherwise.
+
+### GetNameOk
+
+`func (o *Tag) GetNameOk() (string, bool)`
+
+GetNameOk returns a tuple with the Name field if it's non-nil, zero value otherwise
+and a boolean to check if the value has been set.
+
+### HasName
+
+`func (o *Tag) HasName() bool`
+
+HasName returns a boolean if a field has been set.
+
+### SetName
+
+`func (o *Tag) SetName(v string)`
+
+SetName gets a reference to the given string and assigns it to the Name field.
+
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/samples/client/petstore/go-experimental/go-petstore/docs/TypeHolderDefault.md b/samples/client/petstore/go-experimental/go-petstore/docs/TypeHolderDefault.md
index 1b9f077c30..09347e6175 100644
--- a/samples/client/petstore/go-experimental/go-petstore/docs/TypeHolderDefault.md
+++ b/samples/client/petstore/go-experimental/go-petstore/docs/TypeHolderDefault.md
@@ -4,11 +4,139 @@
 
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**StringItem** | **string** |  | [default to what]
-**NumberItem** | **float32** |  | 
-**IntegerItem** | **int32** |  | 
-**BoolItem** | **bool** |  | [default to true]
-**ArrayItem** | **[]int32** |  | 
+**StringItem** | Pointer to **string** |  |  [default to what]
+**NumberItem** | Pointer to **float32** |  | 
+**IntegerItem** | Pointer to **int32** |  | 
+**BoolItem** | Pointer to **bool** |  |  [default to true]
+**ArrayItem** | Pointer to **[]int32** |  | 
+
+## Methods
+
+### GetStringItem
+
+`func (o *TypeHolderDefault) GetStringItem() string`
+
+GetStringItem returns the StringItem field if non-nil, zero value otherwise.
+
+### GetStringItemOk
+
+`func (o *TypeHolderDefault) GetStringItemOk() (string, bool)`
+
+GetStringItemOk returns a tuple with the StringItem field if it's non-nil, zero value otherwise
+and a boolean to check if the value has been set.
+
+### HasStringItem
+
+`func (o *TypeHolderDefault) HasStringItem() bool`
+
+HasStringItem returns a boolean if a field has been set.
+
+### SetStringItem
+
+`func (o *TypeHolderDefault) SetStringItem(v string)`
+
+SetStringItem gets a reference to the given string and assigns it to the StringItem field.
+
+### GetNumberItem
+
+`func (o *TypeHolderDefault) GetNumberItem() float32`
+
+GetNumberItem returns the NumberItem field if non-nil, zero value otherwise.
+
+### GetNumberItemOk
+
+`func (o *TypeHolderDefault) GetNumberItemOk() (float32, bool)`
+
+GetNumberItemOk returns a tuple with the NumberItem field if it's non-nil, zero value otherwise
+and a boolean to check if the value has been set.
+
+### HasNumberItem
+
+`func (o *TypeHolderDefault) HasNumberItem() bool`
+
+HasNumberItem returns a boolean if a field has been set.
+
+### SetNumberItem
+
+`func (o *TypeHolderDefault) SetNumberItem(v float32)`
+
+SetNumberItem gets a reference to the given float32 and assigns it to the NumberItem field.
+
+### GetIntegerItem
+
+`func (o *TypeHolderDefault) GetIntegerItem() int32`
+
+GetIntegerItem returns the IntegerItem field if non-nil, zero value otherwise.
+
+### GetIntegerItemOk
+
+`func (o *TypeHolderDefault) GetIntegerItemOk() (int32, bool)`
+
+GetIntegerItemOk returns a tuple with the IntegerItem field if it's non-nil, zero value otherwise
+and a boolean to check if the value has been set.
+
+### HasIntegerItem
+
+`func (o *TypeHolderDefault) HasIntegerItem() bool`
+
+HasIntegerItem returns a boolean if a field has been set.
+
+### SetIntegerItem
+
+`func (o *TypeHolderDefault) SetIntegerItem(v int32)`
+
+SetIntegerItem gets a reference to the given int32 and assigns it to the IntegerItem field.
+
+### GetBoolItem
+
+`func (o *TypeHolderDefault) GetBoolItem() bool`
+
+GetBoolItem returns the BoolItem field if non-nil, zero value otherwise.
+
+### GetBoolItemOk
+
+`func (o *TypeHolderDefault) GetBoolItemOk() (bool, bool)`
+
+GetBoolItemOk returns a tuple with the BoolItem field if it's non-nil, zero value otherwise
+and a boolean to check if the value has been set.
+
+### HasBoolItem
+
+`func (o *TypeHolderDefault) HasBoolItem() bool`
+
+HasBoolItem returns a boolean if a field has been set.
+
+### SetBoolItem
+
+`func (o *TypeHolderDefault) SetBoolItem(v bool)`
+
+SetBoolItem gets a reference to the given bool and assigns it to the BoolItem field.
+
+### GetArrayItem
+
+`func (o *TypeHolderDefault) GetArrayItem() []int32`
+
+GetArrayItem returns the ArrayItem field if non-nil, zero value otherwise.
+
+### GetArrayItemOk
+
+`func (o *TypeHolderDefault) GetArrayItemOk() ([]int32, bool)`
+
+GetArrayItemOk returns a tuple with the ArrayItem field if it's non-nil, zero value otherwise
+and a boolean to check if the value has been set.
+
+### HasArrayItem
+
+`func (o *TypeHolderDefault) HasArrayItem() bool`
+
+HasArrayItem returns a boolean if a field has been set.
+
+### SetArrayItem
+
+`func (o *TypeHolderDefault) SetArrayItem(v []int32)`
+
+SetArrayItem gets a reference to the given []int32 and assigns it to the ArrayItem field.
+
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/samples/client/petstore/go-experimental/go-petstore/docs/TypeHolderExample.md b/samples/client/petstore/go-experimental/go-petstore/docs/TypeHolderExample.md
index abe85f9799..f9a276c529 100644
--- a/samples/client/petstore/go-experimental/go-petstore/docs/TypeHolderExample.md
+++ b/samples/client/petstore/go-experimental/go-petstore/docs/TypeHolderExample.md
@@ -4,11 +4,139 @@
 
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**StringItem** | **string** |  | 
-**NumberItem** | **float32** |  | 
-**IntegerItem** | **int32** |  | 
-**BoolItem** | **bool** |  | 
-**ArrayItem** | **[]int32** |  | 
+**StringItem** | Pointer to **string** |  | 
+**NumberItem** | Pointer to **float32** |  | 
+**IntegerItem** | Pointer to **int32** |  | 
+**BoolItem** | Pointer to **bool** |  | 
+**ArrayItem** | Pointer to **[]int32** |  | 
+
+## Methods
+
+### GetStringItem
+
+`func (o *TypeHolderExample) GetStringItem() string`
+
+GetStringItem returns the StringItem field if non-nil, zero value otherwise.
+
+### GetStringItemOk
+
+`func (o *TypeHolderExample) GetStringItemOk() (string, bool)`
+
+GetStringItemOk returns a tuple with the StringItem field if it's non-nil, zero value otherwise
+and a boolean to check if the value has been set.
+
+### HasStringItem
+
+`func (o *TypeHolderExample) HasStringItem() bool`
+
+HasStringItem returns a boolean if a field has been set.
+
+### SetStringItem
+
+`func (o *TypeHolderExample) SetStringItem(v string)`
+
+SetStringItem gets a reference to the given string and assigns it to the StringItem field.
+
+### GetNumberItem
+
+`func (o *TypeHolderExample) GetNumberItem() float32`
+
+GetNumberItem returns the NumberItem field if non-nil, zero value otherwise.
+
+### GetNumberItemOk
+
+`func (o *TypeHolderExample) GetNumberItemOk() (float32, bool)`
+
+GetNumberItemOk returns a tuple with the NumberItem field if it's non-nil, zero value otherwise
+and a boolean to check if the value has been set.
+
+### HasNumberItem
+
+`func (o *TypeHolderExample) HasNumberItem() bool`
+
+HasNumberItem returns a boolean if a field has been set.
+
+### SetNumberItem
+
+`func (o *TypeHolderExample) SetNumberItem(v float32)`
+
+SetNumberItem gets a reference to the given float32 and assigns it to the NumberItem field.
+
+### GetIntegerItem
+
+`func (o *TypeHolderExample) GetIntegerItem() int32`
+
+GetIntegerItem returns the IntegerItem field if non-nil, zero value otherwise.
+
+### GetIntegerItemOk
+
+`func (o *TypeHolderExample) GetIntegerItemOk() (int32, bool)`
+
+GetIntegerItemOk returns a tuple with the IntegerItem field if it's non-nil, zero value otherwise
+and a boolean to check if the value has been set.
+
+### HasIntegerItem
+
+`func (o *TypeHolderExample) HasIntegerItem() bool`
+
+HasIntegerItem returns a boolean if a field has been set.
+
+### SetIntegerItem
+
+`func (o *TypeHolderExample) SetIntegerItem(v int32)`
+
+SetIntegerItem gets a reference to the given int32 and assigns it to the IntegerItem field.
+
+### GetBoolItem
+
+`func (o *TypeHolderExample) GetBoolItem() bool`
+
+GetBoolItem returns the BoolItem field if non-nil, zero value otherwise.
+
+### GetBoolItemOk
+
+`func (o *TypeHolderExample) GetBoolItemOk() (bool, bool)`
+
+GetBoolItemOk returns a tuple with the BoolItem field if it's non-nil, zero value otherwise
+and a boolean to check if the value has been set.
+
+### HasBoolItem
+
+`func (o *TypeHolderExample) HasBoolItem() bool`
+
+HasBoolItem returns a boolean if a field has been set.
+
+### SetBoolItem
+
+`func (o *TypeHolderExample) SetBoolItem(v bool)`
+
+SetBoolItem gets a reference to the given bool and assigns it to the BoolItem field.
+
+### GetArrayItem
+
+`func (o *TypeHolderExample) GetArrayItem() []int32`
+
+GetArrayItem returns the ArrayItem field if non-nil, zero value otherwise.
+
+### GetArrayItemOk
+
+`func (o *TypeHolderExample) GetArrayItemOk() ([]int32, bool)`
+
+GetArrayItemOk returns a tuple with the ArrayItem field if it's non-nil, zero value otherwise
+and a boolean to check if the value has been set.
+
+### HasArrayItem
+
+`func (o *TypeHolderExample) HasArrayItem() bool`
+
+HasArrayItem returns a boolean if a field has been set.
+
+### SetArrayItem
+
+`func (o *TypeHolderExample) SetArrayItem(v []int32)`
+
+SetArrayItem gets a reference to the given []int32 and assigns it to the ArrayItem field.
+
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/samples/client/petstore/go-experimental/go-petstore/docs/User.md b/samples/client/petstore/go-experimental/go-petstore/docs/User.md
index 7675d7ff70..4f05d3b473 100644
--- a/samples/client/petstore/go-experimental/go-petstore/docs/User.md
+++ b/samples/client/petstore/go-experimental/go-petstore/docs/User.md
@@ -4,14 +4,217 @@
 
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**Id** | **int64** |  | [optional] 
-**Username** | **string** |  | [optional] 
-**FirstName** | **string** |  | [optional] 
-**LastName** | **string** |  | [optional] 
-**Email** | **string** |  | [optional] 
-**Password** | **string** |  | [optional] 
-**Phone** | **string** |  | [optional] 
-**UserStatus** | **int32** | User Status | [optional] 
+**Id** | Pointer to **int64** |  | [optional]
+**Username** | Pointer to **string** |  | [optional]
+**FirstName** | Pointer to **string** |  | [optional]
+**LastName** | Pointer to **string** |  | [optional]
+**Email** | Pointer to **string** |  | [optional]
+**Password** | Pointer to **string** |  | [optional]
+**Phone** | Pointer to **string** |  | [optional]
+**UserStatus** | Pointer to **int32** | User Status | [optional]
+
+## Methods
+
+### GetId
+
+`func (o *User) GetId() int64`
+
+GetId returns the Id field if non-nil, zero value otherwise.
+
+### GetIdOk
+
+`func (o *User) GetIdOk() (int64, bool)`
+
+GetIdOk returns a tuple with the Id field if it's non-nil, zero value otherwise
+and a boolean to check if the value has been set.
+
+### HasId
+
+`func (o *User) HasId() bool`
+
+HasId returns a boolean if a field has been set.
+
+### SetId
+
+`func (o *User) SetId(v int64)`
+
+SetId gets a reference to the given int64 and assigns it to the Id field.
+
+### GetUsername
+
+`func (o *User) GetUsername() string`
+
+GetUsername returns the Username field if non-nil, zero value otherwise.
+
+### GetUsernameOk
+
+`func (o *User) GetUsernameOk() (string, bool)`
+
+GetUsernameOk returns a tuple with the Username field if it's non-nil, zero value otherwise
+and a boolean to check if the value has been set.
+
+### HasUsername
+
+`func (o *User) HasUsername() bool`
+
+HasUsername returns a boolean if a field has been set.
+
+### SetUsername
+
+`func (o *User) SetUsername(v string)`
+
+SetUsername gets a reference to the given string and assigns it to the Username field.
+
+### GetFirstName
+
+`func (o *User) GetFirstName() string`
+
+GetFirstName returns the FirstName field if non-nil, zero value otherwise.
+
+### GetFirstNameOk
+
+`func (o *User) GetFirstNameOk() (string, bool)`
+
+GetFirstNameOk returns a tuple with the FirstName field if it's non-nil, zero value otherwise
+and a boolean to check if the value has been set.
+
+### HasFirstName
+
+`func (o *User) HasFirstName() bool`
+
+HasFirstName returns a boolean if a field has been set.
+
+### SetFirstName
+
+`func (o *User) SetFirstName(v string)`
+
+SetFirstName gets a reference to the given string and assigns it to the FirstName field.
+
+### GetLastName
+
+`func (o *User) GetLastName() string`
+
+GetLastName returns the LastName field if non-nil, zero value otherwise.
+
+### GetLastNameOk
+
+`func (o *User) GetLastNameOk() (string, bool)`
+
+GetLastNameOk returns a tuple with the LastName field if it's non-nil, zero value otherwise
+and a boolean to check if the value has been set.
+
+### HasLastName
+
+`func (o *User) HasLastName() bool`
+
+HasLastName returns a boolean if a field has been set.
+
+### SetLastName
+
+`func (o *User) SetLastName(v string)`
+
+SetLastName gets a reference to the given string and assigns it to the LastName field.
+
+### GetEmail
+
+`func (o *User) GetEmail() string`
+
+GetEmail returns the Email field if non-nil, zero value otherwise.
+
+### GetEmailOk
+
+`func (o *User) GetEmailOk() (string, bool)`
+
+GetEmailOk returns a tuple with the Email field if it's non-nil, zero value otherwise
+and a boolean to check if the value has been set.
+
+### HasEmail
+
+`func (o *User) HasEmail() bool`
+
+HasEmail returns a boolean if a field has been set.
+
+### SetEmail
+
+`func (o *User) SetEmail(v string)`
+
+SetEmail gets a reference to the given string and assigns it to the Email field.
+
+### GetPassword
+
+`func (o *User) GetPassword() string`
+
+GetPassword returns the Password field if non-nil, zero value otherwise.
+
+### GetPasswordOk
+
+`func (o *User) GetPasswordOk() (string, bool)`
+
+GetPasswordOk returns a tuple with the Password field if it's non-nil, zero value otherwise
+and a boolean to check if the value has been set.
+
+### HasPassword
+
+`func (o *User) HasPassword() bool`
+
+HasPassword returns a boolean if a field has been set.
+
+### SetPassword
+
+`func (o *User) SetPassword(v string)`
+
+SetPassword gets a reference to the given string and assigns it to the Password field.
+
+### GetPhone
+
+`func (o *User) GetPhone() string`
+
+GetPhone returns the Phone field if non-nil, zero value otherwise.
+
+### GetPhoneOk
+
+`func (o *User) GetPhoneOk() (string, bool)`
+
+GetPhoneOk returns a tuple with the Phone field if it's non-nil, zero value otherwise
+and a boolean to check if the value has been set.
+
+### HasPhone
+
+`func (o *User) HasPhone() bool`
+
+HasPhone returns a boolean if a field has been set.
+
+### SetPhone
+
+`func (o *User) SetPhone(v string)`
+
+SetPhone gets a reference to the given string and assigns it to the Phone field.
+
+### GetUserStatus
+
+`func (o *User) GetUserStatus() int32`
+
+GetUserStatus returns the UserStatus field if non-nil, zero value otherwise.
+
+### GetUserStatusOk
+
+`func (o *User) GetUserStatusOk() (int32, bool)`
+
+GetUserStatusOk returns a tuple with the UserStatus field if it's non-nil, zero value otherwise
+and a boolean to check if the value has been set.
+
+### HasUserStatus
+
+`func (o *User) HasUserStatus() bool`
+
+HasUserStatus returns a boolean if a field has been set.
+
+### SetUserStatus
+
+`func (o *User) SetUserStatus(v int32)`
+
+SetUserStatus gets a reference to the given int32 and assigns it to the UserStatus field.
+
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/samples/client/petstore/go-experimental/go-petstore/docs/XmlItem.md b/samples/client/petstore/go-experimental/go-petstore/docs/XmlItem.md
index 8a9c2dc0b5..cdee2ad0dd 100644
--- a/samples/client/petstore/go-experimental/go-petstore/docs/XmlItem.md
+++ b/samples/client/petstore/go-experimental/go-petstore/docs/XmlItem.md
@@ -4,35 +4,763 @@
 
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**AttributeString** | **string** |  | [optional] 
-**AttributeNumber** | **float32** |  | [optional] 
-**AttributeInteger** | **int32** |  | [optional] 
-**AttributeBoolean** | **bool** |  | [optional] 
-**WrappedArray** | **[]int32** |  | [optional] 
-**NameString** | **string** |  | [optional] 
-**NameNumber** | **float32** |  | [optional] 
-**NameInteger** | **int32** |  | [optional] 
-**NameBoolean** | **bool** |  | [optional] 
-**NameArray** | **[]int32** |  | [optional] 
-**NameWrappedArray** | **[]int32** |  | [optional] 
-**PrefixString** | **string** |  | [optional] 
-**PrefixNumber** | **float32** |  | [optional] 
-**PrefixInteger** | **int32** |  | [optional] 
-**PrefixBoolean** | **bool** |  | [optional] 
-**PrefixArray** | **[]int32** |  | [optional] 
-**PrefixWrappedArray** | **[]int32** |  | [optional] 
-**NamespaceString** | **string** |  | [optional] 
-**NamespaceNumber** | **float32** |  | [optional] 
-**NamespaceInteger** | **int32** |  | [optional] 
-**NamespaceBoolean** | **bool** |  | [optional] 
-**NamespaceArray** | **[]int32** |  | [optional] 
-**NamespaceWrappedArray** | **[]int32** |  | [optional] 
-**PrefixNsString** | **string** |  | [optional] 
-**PrefixNsNumber** | **float32** |  | [optional] 
-**PrefixNsInteger** | **int32** |  | [optional] 
-**PrefixNsBoolean** | **bool** |  | [optional] 
-**PrefixNsArray** | **[]int32** |  | [optional] 
-**PrefixNsWrappedArray** | **[]int32** |  | [optional] 
+**AttributeString** | Pointer to **string** |  | [optional]
+**AttributeNumber** | Pointer to **float32** |  | [optional]
+**AttributeInteger** | Pointer to **int32** |  | [optional]
+**AttributeBoolean** | Pointer to **bool** |  | [optional]
+**WrappedArray** | Pointer to **[]int32** |  | [optional]
+**NameString** | Pointer to **string** |  | [optional]
+**NameNumber** | Pointer to **float32** |  | [optional]
+**NameInteger** | Pointer to **int32** |  | [optional]
+**NameBoolean** | Pointer to **bool** |  | [optional]
+**NameArray** | Pointer to **[]int32** |  | [optional]
+**NameWrappedArray** | Pointer to **[]int32** |  | [optional]
+**PrefixString** | Pointer to **string** |  | [optional]
+**PrefixNumber** | Pointer to **float32** |  | [optional]
+**PrefixInteger** | Pointer to **int32** |  | [optional]
+**PrefixBoolean** | Pointer to **bool** |  | [optional]
+**PrefixArray** | Pointer to **[]int32** |  | [optional]
+**PrefixWrappedArray** | Pointer to **[]int32** |  | [optional]
+**NamespaceString** | Pointer to **string** |  | [optional]
+**NamespaceNumber** | Pointer to **float32** |  | [optional]
+**NamespaceInteger** | Pointer to **int32** |  | [optional]
+**NamespaceBoolean** | Pointer to **bool** |  | [optional]
+**NamespaceArray** | Pointer to **[]int32** |  | [optional]
+**NamespaceWrappedArray** | Pointer to **[]int32** |  | [optional]
+**PrefixNsString** | Pointer to **string** |  | [optional]
+**PrefixNsNumber** | Pointer to **float32** |  | [optional]
+**PrefixNsInteger** | Pointer to **int32** |  | [optional]
+**PrefixNsBoolean** | Pointer to **bool** |  | [optional]
+**PrefixNsArray** | Pointer to **[]int32** |  | [optional]
+**PrefixNsWrappedArray** | Pointer to **[]int32** |  | [optional]
+
+## Methods
+
+### GetAttributeString
+
+`func (o *XmlItem) GetAttributeString() string`
+
+GetAttributeString returns the AttributeString field if non-nil, zero value otherwise.
+
+### GetAttributeStringOk
+
+`func (o *XmlItem) GetAttributeStringOk() (string, bool)`
+
+GetAttributeStringOk returns a tuple with the AttributeString field if it's non-nil, zero value otherwise
+and a boolean to check if the value has been set.
+
+### HasAttributeString
+
+`func (o *XmlItem) HasAttributeString() bool`
+
+HasAttributeString returns a boolean if a field has been set.
+
+### SetAttributeString
+
+`func (o *XmlItem) SetAttributeString(v string)`
+
+SetAttributeString gets a reference to the given string and assigns it to the AttributeString field.
+
+### GetAttributeNumber
+
+`func (o *XmlItem) GetAttributeNumber() float32`
+
+GetAttributeNumber returns the AttributeNumber field if non-nil, zero value otherwise.
+
+### GetAttributeNumberOk
+
+`func (o *XmlItem) GetAttributeNumberOk() (float32, bool)`
+
+GetAttributeNumberOk returns a tuple with the AttributeNumber field if it's non-nil, zero value otherwise
+and a boolean to check if the value has been set.
+
+### HasAttributeNumber
+
+`func (o *XmlItem) HasAttributeNumber() bool`
+
+HasAttributeNumber returns a boolean if a field has been set.
+
+### SetAttributeNumber
+
+`func (o *XmlItem) SetAttributeNumber(v float32)`
+
+SetAttributeNumber gets a reference to the given float32 and assigns it to the AttributeNumber field.
+
+### GetAttributeInteger
+
+`func (o *XmlItem) GetAttributeInteger() int32`
+
+GetAttributeInteger returns the AttributeInteger field if non-nil, zero value otherwise.
+
+### GetAttributeIntegerOk
+
+`func (o *XmlItem) GetAttributeIntegerOk() (int32, bool)`
+
+GetAttributeIntegerOk returns a tuple with the AttributeInteger field if it's non-nil, zero value otherwise
+and a boolean to check if the value has been set.
+
+### HasAttributeInteger
+
+`func (o *XmlItem) HasAttributeInteger() bool`
+
+HasAttributeInteger returns a boolean if a field has been set.
+
+### SetAttributeInteger
+
+`func (o *XmlItem) SetAttributeInteger(v int32)`
+
+SetAttributeInteger gets a reference to the given int32 and assigns it to the AttributeInteger field.
+
+### GetAttributeBoolean
+
+`func (o *XmlItem) GetAttributeBoolean() bool`
+
+GetAttributeBoolean returns the AttributeBoolean field if non-nil, zero value otherwise.
+
+### GetAttributeBooleanOk
+
+`func (o *XmlItem) GetAttributeBooleanOk() (bool, bool)`
+
+GetAttributeBooleanOk returns a tuple with the AttributeBoolean field if it's non-nil, zero value otherwise
+and a boolean to check if the value has been set.
+
+### HasAttributeBoolean
+
+`func (o *XmlItem) HasAttributeBoolean() bool`
+
+HasAttributeBoolean returns a boolean if a field has been set.
+
+### SetAttributeBoolean
+
+`func (o *XmlItem) SetAttributeBoolean(v bool)`
+
+SetAttributeBoolean gets a reference to the given bool and assigns it to the AttributeBoolean field.
+
+### GetWrappedArray
+
+`func (o *XmlItem) GetWrappedArray() []int32`
+
+GetWrappedArray returns the WrappedArray field if non-nil, zero value otherwise.
+
+### GetWrappedArrayOk
+
+`func (o *XmlItem) GetWrappedArrayOk() ([]int32, bool)`
+
+GetWrappedArrayOk returns a tuple with the WrappedArray field if it's non-nil, zero value otherwise
+and a boolean to check if the value has been set.
+
+### HasWrappedArray
+
+`func (o *XmlItem) HasWrappedArray() bool`
+
+HasWrappedArray returns a boolean if a field has been set.
+
+### SetWrappedArray
+
+`func (o *XmlItem) SetWrappedArray(v []int32)`
+
+SetWrappedArray gets a reference to the given []int32 and assigns it to the WrappedArray field.
+
+### GetNameString
+
+`func (o *XmlItem) GetNameString() string`
+
+GetNameString returns the NameString field if non-nil, zero value otherwise.
+
+### GetNameStringOk
+
+`func (o *XmlItem) GetNameStringOk() (string, bool)`
+
+GetNameStringOk returns a tuple with the NameString field if it's non-nil, zero value otherwise
+and a boolean to check if the value has been set.
+
+### HasNameString
+
+`func (o *XmlItem) HasNameString() bool`
+
+HasNameString returns a boolean if a field has been set.
+
+### SetNameString
+
+`func (o *XmlItem) SetNameString(v string)`
+
+SetNameString gets a reference to the given string and assigns it to the NameString field.
+
+### GetNameNumber
+
+`func (o *XmlItem) GetNameNumber() float32`
+
+GetNameNumber returns the NameNumber field if non-nil, zero value otherwise.
+
+### GetNameNumberOk
+
+`func (o *XmlItem) GetNameNumberOk() (float32, bool)`
+
+GetNameNumberOk returns a tuple with the NameNumber field if it's non-nil, zero value otherwise
+and a boolean to check if the value has been set.
+
+### HasNameNumber
+
+`func (o *XmlItem) HasNameNumber() bool`
+
+HasNameNumber returns a boolean if a field has been set.
+
+### SetNameNumber
+
+`func (o *XmlItem) SetNameNumber(v float32)`
+
+SetNameNumber gets a reference to the given float32 and assigns it to the NameNumber field.
+
+### GetNameInteger
+
+`func (o *XmlItem) GetNameInteger() int32`
+
+GetNameInteger returns the NameInteger field if non-nil, zero value otherwise.
+
+### GetNameIntegerOk
+
+`func (o *XmlItem) GetNameIntegerOk() (int32, bool)`
+
+GetNameIntegerOk returns a tuple with the NameInteger field if it's non-nil, zero value otherwise
+and a boolean to check if the value has been set.
+
+### HasNameInteger
+
+`func (o *XmlItem) HasNameInteger() bool`
+
+HasNameInteger returns a boolean if a field has been set.
+
+### SetNameInteger
+
+`func (o *XmlItem) SetNameInteger(v int32)`
+
+SetNameInteger gets a reference to the given int32 and assigns it to the NameInteger field.
+
+### GetNameBoolean
+
+`func (o *XmlItem) GetNameBoolean() bool`
+
+GetNameBoolean returns the NameBoolean field if non-nil, zero value otherwise.
+
+### GetNameBooleanOk
+
+`func (o *XmlItem) GetNameBooleanOk() (bool, bool)`
+
+GetNameBooleanOk returns a tuple with the NameBoolean field if it's non-nil, zero value otherwise
+and a boolean to check if the value has been set.
+
+### HasNameBoolean
+
+`func (o *XmlItem) HasNameBoolean() bool`
+
+HasNameBoolean returns a boolean if a field has been set.
+
+### SetNameBoolean
+
+`func (o *XmlItem) SetNameBoolean(v bool)`
+
+SetNameBoolean gets a reference to the given bool and assigns it to the NameBoolean field.
+
+### GetNameArray
+
+`func (o *XmlItem) GetNameArray() []int32`
+
+GetNameArray returns the NameArray field if non-nil, zero value otherwise.
+
+### GetNameArrayOk
+
+`func (o *XmlItem) GetNameArrayOk() ([]int32, bool)`
+
+GetNameArrayOk returns a tuple with the NameArray field if it's non-nil, zero value otherwise
+and a boolean to check if the value has been set.
+
+### HasNameArray
+
+`func (o *XmlItem) HasNameArray() bool`
+
+HasNameArray returns a boolean if a field has been set.
+
+### SetNameArray
+
+`func (o *XmlItem) SetNameArray(v []int32)`
+
+SetNameArray gets a reference to the given []int32 and assigns it to the NameArray field.
+
+### GetNameWrappedArray
+
+`func (o *XmlItem) GetNameWrappedArray() []int32`
+
+GetNameWrappedArray returns the NameWrappedArray field if non-nil, zero value otherwise.
+
+### GetNameWrappedArrayOk
+
+`func (o *XmlItem) GetNameWrappedArrayOk() ([]int32, bool)`
+
+GetNameWrappedArrayOk returns a tuple with the NameWrappedArray field if it's non-nil, zero value otherwise
+and a boolean to check if the value has been set.
+
+### HasNameWrappedArray
+
+`func (o *XmlItem) HasNameWrappedArray() bool`
+
+HasNameWrappedArray returns a boolean if a field has been set.
+
+### SetNameWrappedArray
+
+`func (o *XmlItem) SetNameWrappedArray(v []int32)`
+
+SetNameWrappedArray gets a reference to the given []int32 and assigns it to the NameWrappedArray field.
+
+### GetPrefixString
+
+`func (o *XmlItem) GetPrefixString() string`
+
+GetPrefixString returns the PrefixString field if non-nil, zero value otherwise.
+
+### GetPrefixStringOk
+
+`func (o *XmlItem) GetPrefixStringOk() (string, bool)`
+
+GetPrefixStringOk returns a tuple with the PrefixString field if it's non-nil, zero value otherwise
+and a boolean to check if the value has been set.
+
+### HasPrefixString
+
+`func (o *XmlItem) HasPrefixString() bool`
+
+HasPrefixString returns a boolean if a field has been set.
+
+### SetPrefixString
+
+`func (o *XmlItem) SetPrefixString(v string)`
+
+SetPrefixString gets a reference to the given string and assigns it to the PrefixString field.
+
+### GetPrefixNumber
+
+`func (o *XmlItem) GetPrefixNumber() float32`
+
+GetPrefixNumber returns the PrefixNumber field if non-nil, zero value otherwise.
+
+### GetPrefixNumberOk
+
+`func (o *XmlItem) GetPrefixNumberOk() (float32, bool)`
+
+GetPrefixNumberOk returns a tuple with the PrefixNumber field if it's non-nil, zero value otherwise
+and a boolean to check if the value has been set.
+
+### HasPrefixNumber
+
+`func (o *XmlItem) HasPrefixNumber() bool`
+
+HasPrefixNumber returns a boolean if a field has been set.
+
+### SetPrefixNumber
+
+`func (o *XmlItem) SetPrefixNumber(v float32)`
+
+SetPrefixNumber gets a reference to the given float32 and assigns it to the PrefixNumber field.
+
+### GetPrefixInteger
+
+`func (o *XmlItem) GetPrefixInteger() int32`
+
+GetPrefixInteger returns the PrefixInteger field if non-nil, zero value otherwise.
+
+### GetPrefixIntegerOk
+
+`func (o *XmlItem) GetPrefixIntegerOk() (int32, bool)`
+
+GetPrefixIntegerOk returns a tuple with the PrefixInteger field if it's non-nil, zero value otherwise
+and a boolean to check if the value has been set.
+
+### HasPrefixInteger
+
+`func (o *XmlItem) HasPrefixInteger() bool`
+
+HasPrefixInteger returns a boolean if a field has been set.
+
+### SetPrefixInteger
+
+`func (o *XmlItem) SetPrefixInteger(v int32)`
+
+SetPrefixInteger gets a reference to the given int32 and assigns it to the PrefixInteger field.
+
+### GetPrefixBoolean
+
+`func (o *XmlItem) GetPrefixBoolean() bool`
+
+GetPrefixBoolean returns the PrefixBoolean field if non-nil, zero value otherwise.
+
+### GetPrefixBooleanOk
+
+`func (o *XmlItem) GetPrefixBooleanOk() (bool, bool)`
+
+GetPrefixBooleanOk returns a tuple with the PrefixBoolean field if it's non-nil, zero value otherwise
+and a boolean to check if the value has been set.
+
+### HasPrefixBoolean
+
+`func (o *XmlItem) HasPrefixBoolean() bool`
+
+HasPrefixBoolean returns a boolean if a field has been set.
+
+### SetPrefixBoolean
+
+`func (o *XmlItem) SetPrefixBoolean(v bool)`
+
+SetPrefixBoolean gets a reference to the given bool and assigns it to the PrefixBoolean field.
+
+### GetPrefixArray
+
+`func (o *XmlItem) GetPrefixArray() []int32`
+
+GetPrefixArray returns the PrefixArray field if non-nil, zero value otherwise.
+
+### GetPrefixArrayOk
+
+`func (o *XmlItem) GetPrefixArrayOk() ([]int32, bool)`
+
+GetPrefixArrayOk returns a tuple with the PrefixArray field if it's non-nil, zero value otherwise
+and a boolean to check if the value has been set.
+
+### HasPrefixArray
+
+`func (o *XmlItem) HasPrefixArray() bool`
+
+HasPrefixArray returns a boolean if a field has been set.
+
+### SetPrefixArray
+
+`func (o *XmlItem) SetPrefixArray(v []int32)`
+
+SetPrefixArray gets a reference to the given []int32 and assigns it to the PrefixArray field.
+
+### GetPrefixWrappedArray
+
+`func (o *XmlItem) GetPrefixWrappedArray() []int32`
+
+GetPrefixWrappedArray returns the PrefixWrappedArray field if non-nil, zero value otherwise.
+
+### GetPrefixWrappedArrayOk
+
+`func (o *XmlItem) GetPrefixWrappedArrayOk() ([]int32, bool)`
+
+GetPrefixWrappedArrayOk returns a tuple with the PrefixWrappedArray field if it's non-nil, zero value otherwise
+and a boolean to check if the value has been set.
+
+### HasPrefixWrappedArray
+
+`func (o *XmlItem) HasPrefixWrappedArray() bool`
+
+HasPrefixWrappedArray returns a boolean if a field has been set.
+
+### SetPrefixWrappedArray
+
+`func (o *XmlItem) SetPrefixWrappedArray(v []int32)`
+
+SetPrefixWrappedArray gets a reference to the given []int32 and assigns it to the PrefixWrappedArray field.
+
+### GetNamespaceString
+
+`func (o *XmlItem) GetNamespaceString() string`
+
+GetNamespaceString returns the NamespaceString field if non-nil, zero value otherwise.
+
+### GetNamespaceStringOk
+
+`func (o *XmlItem) GetNamespaceStringOk() (string, bool)`
+
+GetNamespaceStringOk returns a tuple with the NamespaceString field if it's non-nil, zero value otherwise
+and a boolean to check if the value has been set.
+
+### HasNamespaceString
+
+`func (o *XmlItem) HasNamespaceString() bool`
+
+HasNamespaceString returns a boolean if a field has been set.
+
+### SetNamespaceString
+
+`func (o *XmlItem) SetNamespaceString(v string)`
+
+SetNamespaceString gets a reference to the given string and assigns it to the NamespaceString field.
+
+### GetNamespaceNumber
+
+`func (o *XmlItem) GetNamespaceNumber() float32`
+
+GetNamespaceNumber returns the NamespaceNumber field if non-nil, zero value otherwise.
+
+### GetNamespaceNumberOk
+
+`func (o *XmlItem) GetNamespaceNumberOk() (float32, bool)`
+
+GetNamespaceNumberOk returns a tuple with the NamespaceNumber field if it's non-nil, zero value otherwise
+and a boolean to check if the value has been set.
+
+### HasNamespaceNumber
+
+`func (o *XmlItem) HasNamespaceNumber() bool`
+
+HasNamespaceNumber returns a boolean if a field has been set.
+
+### SetNamespaceNumber
+
+`func (o *XmlItem) SetNamespaceNumber(v float32)`
+
+SetNamespaceNumber gets a reference to the given float32 and assigns it to the NamespaceNumber field.
+
+### GetNamespaceInteger
+
+`func (o *XmlItem) GetNamespaceInteger() int32`
+
+GetNamespaceInteger returns the NamespaceInteger field if non-nil, zero value otherwise.
+
+### GetNamespaceIntegerOk
+
+`func (o *XmlItem) GetNamespaceIntegerOk() (int32, bool)`
+
+GetNamespaceIntegerOk returns a tuple with the NamespaceInteger field if it's non-nil, zero value otherwise
+and a boolean to check if the value has been set.
+
+### HasNamespaceInteger
+
+`func (o *XmlItem) HasNamespaceInteger() bool`
+
+HasNamespaceInteger returns a boolean if a field has been set.
+
+### SetNamespaceInteger
+
+`func (o *XmlItem) SetNamespaceInteger(v int32)`
+
+SetNamespaceInteger gets a reference to the given int32 and assigns it to the NamespaceInteger field.
+
+### GetNamespaceBoolean
+
+`func (o *XmlItem) GetNamespaceBoolean() bool`
+
+GetNamespaceBoolean returns the NamespaceBoolean field if non-nil, zero value otherwise.
+
+### GetNamespaceBooleanOk
+
+`func (o *XmlItem) GetNamespaceBooleanOk() (bool, bool)`
+
+GetNamespaceBooleanOk returns a tuple with the NamespaceBoolean field if it's non-nil, zero value otherwise
+and a boolean to check if the value has been set.
+
+### HasNamespaceBoolean
+
+`func (o *XmlItem) HasNamespaceBoolean() bool`
+
+HasNamespaceBoolean returns a boolean if a field has been set.
+
+### SetNamespaceBoolean
+
+`func (o *XmlItem) SetNamespaceBoolean(v bool)`
+
+SetNamespaceBoolean gets a reference to the given bool and assigns it to the NamespaceBoolean field.
+
+### GetNamespaceArray
+
+`func (o *XmlItem) GetNamespaceArray() []int32`
+
+GetNamespaceArray returns the NamespaceArray field if non-nil, zero value otherwise.
+
+### GetNamespaceArrayOk
+
+`func (o *XmlItem) GetNamespaceArrayOk() ([]int32, bool)`
+
+GetNamespaceArrayOk returns a tuple with the NamespaceArray field if it's non-nil, zero value otherwise
+and a boolean to check if the value has been set.
+
+### HasNamespaceArray
+
+`func (o *XmlItem) HasNamespaceArray() bool`
+
+HasNamespaceArray returns a boolean if a field has been set.
+
+### SetNamespaceArray
+
+`func (o *XmlItem) SetNamespaceArray(v []int32)`
+
+SetNamespaceArray gets a reference to the given []int32 and assigns it to the NamespaceArray field.
+
+### GetNamespaceWrappedArray
+
+`func (o *XmlItem) GetNamespaceWrappedArray() []int32`
+
+GetNamespaceWrappedArray returns the NamespaceWrappedArray field if non-nil, zero value otherwise.
+
+### GetNamespaceWrappedArrayOk
+
+`func (o *XmlItem) GetNamespaceWrappedArrayOk() ([]int32, bool)`
+
+GetNamespaceWrappedArrayOk returns a tuple with the NamespaceWrappedArray field if it's non-nil, zero value otherwise
+and a boolean to check if the value has been set.
+
+### HasNamespaceWrappedArray
+
+`func (o *XmlItem) HasNamespaceWrappedArray() bool`
+
+HasNamespaceWrappedArray returns a boolean if a field has been set.
+
+### SetNamespaceWrappedArray
+
+`func (o *XmlItem) SetNamespaceWrappedArray(v []int32)`
+
+SetNamespaceWrappedArray gets a reference to the given []int32 and assigns it to the NamespaceWrappedArray field.
+
+### GetPrefixNsString
+
+`func (o *XmlItem) GetPrefixNsString() string`
+
+GetPrefixNsString returns the PrefixNsString field if non-nil, zero value otherwise.
+
+### GetPrefixNsStringOk
+
+`func (o *XmlItem) GetPrefixNsStringOk() (string, bool)`
+
+GetPrefixNsStringOk returns a tuple with the PrefixNsString field if it's non-nil, zero value otherwise
+and a boolean to check if the value has been set.
+
+### HasPrefixNsString
+
+`func (o *XmlItem) HasPrefixNsString() bool`
+
+HasPrefixNsString returns a boolean if a field has been set.
+
+### SetPrefixNsString
+
+`func (o *XmlItem) SetPrefixNsString(v string)`
+
+SetPrefixNsString gets a reference to the given string and assigns it to the PrefixNsString field.
+
+### GetPrefixNsNumber
+
+`func (o *XmlItem) GetPrefixNsNumber() float32`
+
+GetPrefixNsNumber returns the PrefixNsNumber field if non-nil, zero value otherwise.
+
+### GetPrefixNsNumberOk
+
+`func (o *XmlItem) GetPrefixNsNumberOk() (float32, bool)`
+
+GetPrefixNsNumberOk returns a tuple with the PrefixNsNumber field if it's non-nil, zero value otherwise
+and a boolean to check if the value has been set.
+
+### HasPrefixNsNumber
+
+`func (o *XmlItem) HasPrefixNsNumber() bool`
+
+HasPrefixNsNumber returns a boolean if a field has been set.
+
+### SetPrefixNsNumber
+
+`func (o *XmlItem) SetPrefixNsNumber(v float32)`
+
+SetPrefixNsNumber gets a reference to the given float32 and assigns it to the PrefixNsNumber field.
+
+### GetPrefixNsInteger
+
+`func (o *XmlItem) GetPrefixNsInteger() int32`
+
+GetPrefixNsInteger returns the PrefixNsInteger field if non-nil, zero value otherwise.
+
+### GetPrefixNsIntegerOk
+
+`func (o *XmlItem) GetPrefixNsIntegerOk() (int32, bool)`
+
+GetPrefixNsIntegerOk returns a tuple with the PrefixNsInteger field if it's non-nil, zero value otherwise
+and a boolean to check if the value has been set.
+
+### HasPrefixNsInteger
+
+`func (o *XmlItem) HasPrefixNsInteger() bool`
+
+HasPrefixNsInteger returns a boolean if a field has been set.
+
+### SetPrefixNsInteger
+
+`func (o *XmlItem) SetPrefixNsInteger(v int32)`
+
+SetPrefixNsInteger gets a reference to the given int32 and assigns it to the PrefixNsInteger field.
+
+### GetPrefixNsBoolean
+
+`func (o *XmlItem) GetPrefixNsBoolean() bool`
+
+GetPrefixNsBoolean returns the PrefixNsBoolean field if non-nil, zero value otherwise.
+
+### GetPrefixNsBooleanOk
+
+`func (o *XmlItem) GetPrefixNsBooleanOk() (bool, bool)`
+
+GetPrefixNsBooleanOk returns a tuple with the PrefixNsBoolean field if it's non-nil, zero value otherwise
+and a boolean to check if the value has been set.
+
+### HasPrefixNsBoolean
+
+`func (o *XmlItem) HasPrefixNsBoolean() bool`
+
+HasPrefixNsBoolean returns a boolean if a field has been set.
+
+### SetPrefixNsBoolean
+
+`func (o *XmlItem) SetPrefixNsBoolean(v bool)`
+
+SetPrefixNsBoolean gets a reference to the given bool and assigns it to the PrefixNsBoolean field.
+
+### GetPrefixNsArray
+
+`func (o *XmlItem) GetPrefixNsArray() []int32`
+
+GetPrefixNsArray returns the PrefixNsArray field if non-nil, zero value otherwise.
+
+### GetPrefixNsArrayOk
+
+`func (o *XmlItem) GetPrefixNsArrayOk() ([]int32, bool)`
+
+GetPrefixNsArrayOk returns a tuple with the PrefixNsArray field if it's non-nil, zero value otherwise
+and a boolean to check if the value has been set.
+
+### HasPrefixNsArray
+
+`func (o *XmlItem) HasPrefixNsArray() bool`
+
+HasPrefixNsArray returns a boolean if a field has been set.
+
+### SetPrefixNsArray
+
+`func (o *XmlItem) SetPrefixNsArray(v []int32)`
+
+SetPrefixNsArray gets a reference to the given []int32 and assigns it to the PrefixNsArray field.
+
+### GetPrefixNsWrappedArray
+
+`func (o *XmlItem) GetPrefixNsWrappedArray() []int32`
+
+GetPrefixNsWrappedArray returns the PrefixNsWrappedArray field if non-nil, zero value otherwise.
+
+### GetPrefixNsWrappedArrayOk
+
+`func (o *XmlItem) GetPrefixNsWrappedArrayOk() ([]int32, bool)`
+
+GetPrefixNsWrappedArrayOk returns a tuple with the PrefixNsWrappedArray field if it's non-nil, zero value otherwise
+and a boolean to check if the value has been set.
+
+### HasPrefixNsWrappedArray
+
+`func (o *XmlItem) HasPrefixNsWrappedArray() bool`
+
+HasPrefixNsWrappedArray returns a boolean if a field has been set.
+
+### SetPrefixNsWrappedArray
+
+`func (o *XmlItem) SetPrefixNsWrappedArray(v []int32)`
+
+SetPrefixNsWrappedArray gets a reference to the given []int32 and assigns it to the PrefixNsWrappedArray field.
+
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
 
diff --git a/samples/client/petstore/go-experimental/go-petstore/model_200_response.go b/samples/client/petstore/go-experimental/go-petstore/model_200_response.go
index f918cabaaa..97ced8c6d1 100644
--- a/samples/client/petstore/go-experimental/go-petstore/model_200_response.go
+++ b/samples/client/petstore/go-experimental/go-petstore/model_200_response.go
@@ -8,9 +8,94 @@
  */
 
 package petstore
+import (
+	"encoding/json"
+)
 
 // Model for testing model name starting with number
 type Model200Response struct {
-	Name int32 `json:"name,omitempty"`
-	Class string `json:"class,omitempty"`
+	Name *int32 `json:"name,omitempty"`
+
+	Class *string `json:"class,omitempty"`
+
 }
+
+// GetName returns the Name field if non-nil, zero value otherwise.
+func (o *Model200Response) GetName() int32 {
+	if o == nil || o.Name == nil {
+		var ret int32
+		return ret
+	}
+	return *o.Name
+}
+
+// GetNameOk returns a tuple with the Name field if it's non-nil, zero value otherwise
+// and a boolean to check if the value has been set.
+func (o *Model200Response) GetNameOk() (int32, bool) {
+	if o == nil || o.Name == nil {
+		var ret int32
+		return ret, false
+	}
+	return *o.Name, true
+}
+
+// HasName returns a boolean if a field has been set.
+func (o *Model200Response) HasName() bool {
+	if o != nil && o.Name != nil {
+		return true
+	}
+
+	return false
+}
+
+// SetName gets a reference to the given int32 and assigns it to the Name field.
+func (o *Model200Response) SetName(v int32) {
+	o.Name = &v
+}
+
+// GetClass returns the Class field if non-nil, zero value otherwise.
+func (o *Model200Response) GetClass() string {
+	if o == nil || o.Class == nil {
+		var ret string
+		return ret
+	}
+	return *o.Class
+}
+
+// GetClassOk returns a tuple with the Class field if it's non-nil, zero value otherwise
+// and a boolean to check if the value has been set.
+func (o *Model200Response) GetClassOk() (string, bool) {
+	if o == nil || o.Class == nil {
+		var ret string
+		return ret, false
+	}
+	return *o.Class, true
+}
+
+// HasClass returns a boolean if a field has been set.
+func (o *Model200Response) HasClass() bool {
+	if o != nil && o.Class != nil {
+		return true
+	}
+
+	return false
+}
+
+// SetClass gets a reference to the given string and assigns it to the Class field.
+func (o *Model200Response) SetClass(v string) {
+	o.Class = &v
+}
+
+
+func (o Model200Response) MarshalJSON() ([]byte, error) {
+	toSerialize := map[string]interface{}{}
+	if o.Name != nil {
+		toSerialize["name"] = o.Name
+	}
+	if o.Class != nil {
+		toSerialize["class"] = o.Class
+	}
+	return json.Marshal(toSerialize)
+}
+
+
diff --git a/samples/client/petstore/go-experimental/go-petstore/model_additional_properties_any_type.go b/samples/client/petstore/go-experimental/go-petstore/model_additional_properties_any_type.go
index ca06584a72..baa81b92e5 100644
--- a/samples/client/petstore/go-experimental/go-petstore/model_additional_properties_any_type.go
+++ b/samples/client/petstore/go-experimental/go-petstore/model_additional_properties_any_type.go
@@ -8,7 +8,55 @@
  */
 
 package petstore
+import (
+	"encoding/json"
+)
 
 type AdditionalPropertiesAnyType struct {
-	Name string `json:"name,omitempty"`
+	Name *string `json:"name,omitempty"`
+
 }
+
+// GetName returns the Name field if non-nil, zero value otherwise.
+func (o *AdditionalPropertiesAnyType) GetName() string {
+	if o == nil || o.Name == nil {
+		var ret string
+		return ret
+	}
+	return *o.Name
+}
+
+// GetNameOk returns a tuple with the Name field if it's non-nil, zero value otherwise
+// and a boolean to check if the value has been set.
+func (o *AdditionalPropertiesAnyType) GetNameOk() (string, bool) {
+	if o == nil || o.Name == nil {
+		var ret string
+		return ret, false
+	}
+	return *o.Name, true
+}
+
+// HasName returns a boolean if a field has been set.
+func (o *AdditionalPropertiesAnyType) HasName() bool {
+	if o != nil && o.Name != nil {
+		return true
+	}
+
+	return false
+}
+
+// SetName gets a reference to the given string and assigns it to the Name field.
+func (o *AdditionalPropertiesAnyType) SetName(v string) {
+	o.Name = &v
+}
+
+
+func (o AdditionalPropertiesAnyType) MarshalJSON() ([]byte, error) {
+	toSerialize := map[string]interface{}{}
+	if o.Name != nil {
+		toSerialize["name"] = o.Name
+	}
+	return json.Marshal(toSerialize)
+}
+
+
diff --git a/samples/client/petstore/go-experimental/go-petstore/model_additional_properties_array.go b/samples/client/petstore/go-experimental/go-petstore/model_additional_properties_array.go
index 2e71585506..0ccbf37442 100644
--- a/samples/client/petstore/go-experimental/go-petstore/model_additional_properties_array.go
+++ b/samples/client/petstore/go-experimental/go-petstore/model_additional_properties_array.go
@@ -8,7 +8,55 @@
  */
 
 package petstore
+import (
+	"encoding/json"
+)
 
 type AdditionalPropertiesArray struct {
-	Name string `json:"name,omitempty"`
+	Name *string `json:"name,omitempty"`
+
 }
+
+// GetName returns the Name field if non-nil, zero value otherwise.
+func (o *AdditionalPropertiesArray) GetName() string {
+	if o == nil || o.Name == nil {
+		var ret string
+		return ret
+	}
+	return *o.Name
+}
+
+// GetNameOk returns a tuple with the Name field if it's non-nil, zero value otherwise
+// and a boolean to check if the value has been set.
+func (o *AdditionalPropertiesArray) GetNameOk() (string, bool) {
+	if o == nil || o.Name == nil {
+		var ret string
+		return ret, false
+	}
+	return *o.Name, true
+}
+
+// HasName returns a boolean if a field has been set.
+func (o *AdditionalPropertiesArray) HasName() bool {
+	if o != nil && o.Name != nil {
+		return true
+	}
+
+	return false
+}
+
+// SetName gets a reference to the given string and assigns it to the Name field.
+func (o *AdditionalPropertiesArray) SetName(v string) {
+	o.Name = &v
+}
+
+
+func (o AdditionalPropertiesArray) MarshalJSON() ([]byte, error) {
+	toSerialize := map[string]interface{}{}
+	if o.Name != nil {
+		toSerialize["name"] = o.Name
+	}
+	return json.Marshal(toSerialize)
+}
+
+
diff --git a/samples/client/petstore/go-experimental/go-petstore/model_additional_properties_boolean.go b/samples/client/petstore/go-experimental/go-petstore/model_additional_properties_boolean.go
index 09f1ac3b32..efa95a8767 100644
--- a/samples/client/petstore/go-experimental/go-petstore/model_additional_properties_boolean.go
+++ b/samples/client/petstore/go-experimental/go-petstore/model_additional_properties_boolean.go
@@ -8,7 +8,55 @@
  */
 
 package petstore
+import (
+	"encoding/json"
+)
 
 type AdditionalPropertiesBoolean struct {
-	Name string `json:"name,omitempty"`
+	Name *string `json:"name,omitempty"`
+
 }
+
+// GetName returns the Name field if non-nil, zero value otherwise.
+func (o *AdditionalPropertiesBoolean) GetName() string {
+	if o == nil || o.Name == nil {
+		var ret string
+		return ret
+	}
+	return *o.Name
+}
+
+// GetNameOk returns a tuple with the Name field if it's non-nil, zero value otherwise
+// and a boolean to check if the value has been set.
+func (o *AdditionalPropertiesBoolean) GetNameOk() (string, bool) {
+	if o == nil || o.Name == nil {
+		var ret string
+		return ret, false
+	}
+	return *o.Name, true
+}
+
+// HasName returns a boolean if a field has been set.
+func (o *AdditionalPropertiesBoolean) HasName() bool {
+	if o != nil && o.Name != nil {
+		return true
+	}
+
+	return false
+}
+
+// SetName gets a reference to the given string and assigns it to the Name field.
+func (o *AdditionalPropertiesBoolean) SetName(v string) {
+	o.Name = &v
+}
+
+
+func (o AdditionalPropertiesBoolean) MarshalJSON() ([]byte, error) {
+	toSerialize := map[string]interface{}{}
+	if o.Name != nil {
+		toSerialize["name"] = o.Name
+	}
+	return json.Marshal(toSerialize)
+}
+
+
diff --git a/samples/client/petstore/go-experimental/go-petstore/model_additional_properties_class.go b/samples/client/petstore/go-experimental/go-petstore/model_additional_properties_class.go
index 2e1845e194..534148d11d 100644
--- a/samples/client/petstore/go-experimental/go-petstore/model_additional_properties_class.go
+++ b/samples/client/petstore/go-experimental/go-petstore/model_additional_properties_class.go
@@ -8,17 +8,435 @@
  */
 
 package petstore
+import (
+	"encoding/json"
+)
 
 type AdditionalPropertiesClass struct {
-	MapString map[string]string `json:"map_string,omitempty"`
-	MapNumber map[string]float32 `json:"map_number,omitempty"`
-	MapInteger map[string]int32 `json:"map_integer,omitempty"`
-	MapBoolean map[string]bool `json:"map_boolean,omitempty"`
-	MapArrayInteger map[string][]int32 `json:"map_array_integer,omitempty"`
-	MapArrayAnytype map[string][]map[string]interface{} `json:"map_array_anytype,omitempty"`
-	MapMapString map[string]map[string]string `json:"map_map_string,omitempty"`
-	MapMapAnytype map[string]map[string]map[string]interface{} `json:"map_map_anytype,omitempty"`
-	Anytype1 map[string]interface{} `json:"anytype_1,omitempty"`
-	Anytype2 map[string]interface{} `json:"anytype_2,omitempty"`
-	Anytype3 map[string]interface{} `json:"anytype_3,omitempty"`
+	MapString *map[string]string `json:"map_string,omitempty"`
+
+	MapNumber *map[string]float32 `json:"map_number,omitempty"`
+
+	MapInteger *map[string]int32 `json:"map_integer,omitempty"`
+
+	MapBoolean *map[string]bool `json:"map_boolean,omitempty"`
+
+	MapArrayInteger *map[string][]int32 `json:"map_array_integer,omitempty"`
+
+	MapArrayAnytype *map[string][]map[string]interface{} `json:"map_array_anytype,omitempty"`
+
+	MapMapString *map[string]map[string]string `json:"map_map_string,omitempty"`
+
+	MapMapAnytype *map[string]map[string]map[string]interface{} `json:"map_map_anytype,omitempty"`
+
+	Anytype1 *map[string]interface{} `json:"anytype_1,omitempty"`
+
+	Anytype2 *map[string]interface{} `json:"anytype_2,omitempty"`
+
+	Anytype3 *map[string]interface{} `json:"anytype_3,omitempty"`
+
 }
+
+// GetMapString returns the MapString field if non-nil, zero value otherwise.
+func (o *AdditionalPropertiesClass) GetMapString() map[string]string {
+	if o == nil || o.MapString == nil {
+		var ret map[string]string
+		return ret
+	}
+	return *o.MapString
+}
+
+// GetMapStringOk returns a tuple with the MapString field if it's non-nil, zero value otherwise
+// and a boolean to check if the value has been set.
+func (o *AdditionalPropertiesClass) GetMapStringOk() (map[string]string, bool) {
+	if o == nil || o.MapString == nil {
+		var ret map[string]string
+		return ret, false
+	}
+	return *o.MapString, true
+}
+
+// HasMapString returns a boolean if a field has been set.
+func (o *AdditionalPropertiesClass) HasMapString() bool {
+	if o != nil && o.MapString != nil {
+		return true
+	}
+
+	return false
+}
+
+// SetMapString gets a reference to the given map[string]string and assigns it to the MapString field.
+func (o *AdditionalPropertiesClass) SetMapString(v map[string]string) {
+	o.MapString = &v
+}
+
+// GetMapNumber returns the MapNumber field if non-nil, zero value otherwise.
+func (o *AdditionalPropertiesClass) GetMapNumber() map[string]float32 {
+	if o == nil || o.MapNumber == nil {
+		var ret map[string]float32
+		return ret
+	}
+	return *o.MapNumber
+}
+
+// GetMapNumberOk returns a tuple with the MapNumber field if it's non-nil, zero value otherwise
+// and a boolean to check if the value has been set.
+func (o *AdditionalPropertiesClass) GetMapNumberOk() (map[string]float32, bool) {
+	if o == nil || o.MapNumber == nil {
+		var ret map[string]float32
+		return ret, false
+	}
+	return *o.MapNumber, true
+}
+
+// HasMapNumber returns a boolean if a field has been set.
+func (o *AdditionalPropertiesClass) HasMapNumber() bool {
+	if o != nil && o.MapNumber != nil {
+		return true
+	}
+
+	return false
+}
+
+// SetMapNumber gets a reference to the given map[string]float32 and assigns it to the MapNumber field.
+func (o *AdditionalPropertiesClass) SetMapNumber(v map[string]float32) {
+	o.MapNumber = &v
+}
+
+// GetMapInteger returns the MapInteger field if non-nil, zero value otherwise.
+func (o *AdditionalPropertiesClass) GetMapInteger() map[string]int32 {
+	if o == nil || o.MapInteger == nil {
+		var ret map[string]int32
+		return ret
+	}
+	return *o.MapInteger
+}
+
+// GetMapIntegerOk returns a tuple with the MapInteger field if it's non-nil, zero value otherwise
+// and a boolean to check if the value has been set.
+func (o *AdditionalPropertiesClass) GetMapIntegerOk() (map[string]int32, bool) {
+	if o == nil || o.MapInteger == nil {
+		var ret map[string]int32
+		return ret, false
+	}
+	return *o.MapInteger, true
+}
+
+// HasMapInteger returns a boolean if a field has been set.
+func (o *AdditionalPropertiesClass) HasMapInteger() bool {
+	if o != nil && o.MapInteger != nil {
+		return true
+	}
+
+	return false
+}
+
+// SetMapInteger gets a reference to the given map[string]int32 and assigns it to the MapInteger field.
+func (o *AdditionalPropertiesClass) SetMapInteger(v map[string]int32) {
+	o.MapInteger = &v
+}
+
+// GetMapBoolean returns the MapBoolean field if non-nil, zero value otherwise.
+func (o *AdditionalPropertiesClass) GetMapBoolean() map[string]bool {
+	if o == nil || o.MapBoolean == nil {
+		var ret map[string]bool
+		return ret
+	}
+	return *o.MapBoolean
+}
+
+// GetMapBooleanOk returns a tuple with the MapBoolean field if it's non-nil, zero value otherwise
+// and a boolean to check if the value has been set.
+func (o *AdditionalPropertiesClass) GetMapBooleanOk() (map[string]bool, bool) {
+	if o == nil || o.MapBoolean == nil {
+		var ret map[string]bool
+		return ret, false
+	}
+	return *o.MapBoolean, true
+}
+
+// HasMapBoolean returns a boolean if a field has been set.
+func (o *AdditionalPropertiesClass) HasMapBoolean() bool {
+	if o != nil && o.MapBoolean != nil {
+		return true
+	}
+
+	return false
+}
+
+// SetMapBoolean gets a reference to the given map[string]bool and assigns it to the MapBoolean field.
+func (o *AdditionalPropertiesClass) SetMapBoolean(v map[string]bool) {
+	o.MapBoolean = &v
+}
+
+// GetMapArrayInteger returns the MapArrayInteger field if non-nil, zero value otherwise.
+func (o *AdditionalPropertiesClass) GetMapArrayInteger() map[string][]int32 {
+	if o == nil || o.MapArrayInteger == nil {
+		var ret map[string][]int32
+		return ret
+	}
+	return *o.MapArrayInteger
+}
+
+// GetMapArrayIntegerOk returns a tuple with the MapArrayInteger field if it's non-nil, zero value otherwise
+// and a boolean to check if the value has been set.
+func (o *AdditionalPropertiesClass) GetMapArrayIntegerOk() (map[string][]int32, bool) {
+	if o == nil || o.MapArrayInteger == nil {
+		var ret map[string][]int32
+		return ret, false
+	}
+	return *o.MapArrayInteger, true
+}
+
+// HasMapArrayInteger returns a boolean if a field has been set.
+func (o *AdditionalPropertiesClass) HasMapArrayInteger() bool {
+	if o != nil && o.MapArrayInteger != nil {
+		return true
+	}
+
+	return false
+}
+
+// SetMapArrayInteger gets a reference to the given map[string][]int32 and assigns it to the MapArrayInteger field.
+func (o *AdditionalPropertiesClass) SetMapArrayInteger(v map[string][]int32) {
+	o.MapArrayInteger = &v
+}
+
+// GetMapArrayAnytype returns the MapArrayAnytype field if non-nil, zero value otherwise.
+func (o *AdditionalPropertiesClass) GetMapArrayAnytype() map[string][]map[string]interface{} {
+	if o == nil || o.MapArrayAnytype == nil {
+		var ret map[string][]map[string]interface{}
+		return ret
+	}
+	return *o.MapArrayAnytype
+}
+
+// GetMapArrayAnytypeOk returns a tuple with the MapArrayAnytype field if it's non-nil, zero value otherwise
+// and a boolean to check if the value has been set.
+func (o *AdditionalPropertiesClass) GetMapArrayAnytypeOk() (map[string][]map[string]interface{}, bool) {
+	if o == nil || o.MapArrayAnytype == nil {
+		var ret map[string][]map[string]interface{}
+		return ret, false
+	}
+	return *o.MapArrayAnytype, true
+}
+
+// HasMapArrayAnytype returns a boolean if a field has been set.
+func (o *AdditionalPropertiesClass) HasMapArrayAnytype() bool {
+	if o != nil && o.MapArrayAnytype != nil {
+		return true
+	}
+
+	return false
+}
+
+// SetMapArrayAnytype gets a reference to the given map[string][]map[string]interface{} and assigns it to the MapArrayAnytype field.
+func (o *AdditionalPropertiesClass) SetMapArrayAnytype(v map[string][]map[string]interface{}) {
+	o.MapArrayAnytype = &v
+}
+
+// GetMapMapString returns the MapMapString field if non-nil, zero value otherwise.
+func (o *AdditionalPropertiesClass) GetMapMapString() map[string]map[string]string {
+	if o == nil || o.MapMapString == nil {
+		var ret map[string]map[string]string
+		return ret
+	}
+	return *o.MapMapString
+}
+
+// GetMapMapStringOk returns a tuple with the MapMapString field if it's non-nil, zero value otherwise
+// and a boolean to check if the value has been set.
+func (o *AdditionalPropertiesClass) GetMapMapStringOk() (map[string]map[string]string, bool) {
+	if o == nil || o.MapMapString == nil {
+		var ret map[string]map[string]string
+		return ret, false
+	}
+	return *o.MapMapString, true
+}
+
+// HasMapMapString returns a boolean if a field has been set.
+func (o *AdditionalPropertiesClass) HasMapMapString() bool {
+	if o != nil && o.MapMapString != nil {
+		return true
+	}
+
+	return false
+}
+
+// SetMapMapString gets a reference to the given map[string]map[string]string and assigns it to the MapMapString field.
+func (o *AdditionalPropertiesClass) SetMapMapString(v map[string]map[string]string) {
+	o.MapMapString = &v
+}
+
+// GetMapMapAnytype returns the MapMapAnytype field if non-nil, zero value otherwise.
+func (o *AdditionalPropertiesClass) GetMapMapAnytype() map[string]map[string]map[string]interface{} {
+	if o == nil || o.MapMapAnytype == nil {
+		var ret map[string]map[string]map[string]interface{}
+		return ret
+	}
+	return *o.MapMapAnytype
+}
+
+// GetMapMapAnytypeOk returns a tuple with the MapMapAnytype field if it's non-nil, zero value otherwise
+// and a boolean to check if the value has been set.
+func (o *AdditionalPropertiesClass) GetMapMapAnytypeOk() (map[string]map[string]map[string]interface{}, bool) {
+	if o == nil || o.MapMapAnytype == nil {
+		var ret map[string]map[string]map[string]interface{}
+		return ret, false
+	}
+	return *o.MapMapAnytype, true
+}
+
+// HasMapMapAnytype returns a boolean if a field has been set.
+func (o *AdditionalPropertiesClass) HasMapMapAnytype() bool {
+	if o != nil && o.MapMapAnytype != nil {
+		return true
+	}
+
+	return false
+}
+
+// SetMapMapAnytype gets a reference to the given map[string]map[string]map[string]interface{} and assigns it to the MapMapAnytype field.
+func (o *AdditionalPropertiesClass) SetMapMapAnytype(v map[string]map[string]map[string]interface{}) {
+	o.MapMapAnytype = &v
+}
+
+// GetAnytype1 returns the Anytype1 field if non-nil, zero value otherwise.
+func (o *AdditionalPropertiesClass) GetAnytype1() map[string]interface{} {
+	if o == nil || o.Anytype1 == nil {
+		var ret map[string]interface{}
+		return ret
+	}
+	return *o.Anytype1
+}
+
+// GetAnytype1Ok returns a tuple with the Anytype1 field if it's non-nil, zero value otherwise
+// and a boolean to check if the value has been set.
+func (o *AdditionalPropertiesClass) GetAnytype1Ok() (map[string]interface{}, bool) {
+	if o == nil || o.Anytype1 == nil {
+		var ret map[string]interface{}
+		return ret, false
+	}
+	return *o.Anytype1, true
+}
+
+// HasAnytype1 returns a boolean if a field has been set.
+func (o *AdditionalPropertiesClass) HasAnytype1() bool {
+	if o != nil && o.Anytype1 != nil {
+		return true
+	}
+
+	return false
+}
+
+// SetAnytype1 gets a reference to the given map[string]interface{} and assigns it to the Anytype1 field.
+func (o *AdditionalPropertiesClass) SetAnytype1(v map[string]interface{}) {
+	o.Anytype1 = &v
+}
+
+// GetAnytype2 returns the Anytype2 field if non-nil, zero value otherwise.
+func (o *AdditionalPropertiesClass) GetAnytype2() map[string]interface{} {
+	if o == nil || o.Anytype2 == nil {
+		var ret map[string]interface{}
+		return ret
+	}
+	return *o.Anytype2
+}
+
+// GetAnytype2Ok returns a tuple with the Anytype2 field if it's non-nil, zero value otherwise
+// and a boolean to check if the value has been set.
+func (o *AdditionalPropertiesClass) GetAnytype2Ok() (map[string]interface{}, bool) {
+	if o == nil || o.Anytype2 == nil {
+		var ret map[string]interface{}
+		return ret, false
+	}
+	return *o.Anytype2, true
+}
+
+// HasAnytype2 returns a boolean if a field has been set.
+func (o *AdditionalPropertiesClass) HasAnytype2() bool {
+	if o != nil && o.Anytype2 != nil {
+		return true
+	}
+
+	return false
+}
+
+// SetAnytype2 gets a reference to the given map[string]interface{} and assigns it to the Anytype2 field.
+func (o *AdditionalPropertiesClass) SetAnytype2(v map[string]interface{}) {
+	o.Anytype2 = &v
+}
+
+// GetAnytype3 returns the Anytype3 field if non-nil, zero value otherwise.
+func (o *AdditionalPropertiesClass) GetAnytype3() map[string]interface{} {
+	if o == nil || o.Anytype3 == nil {
+		var ret map[string]interface{}
+		return ret
+	}
+	return *o.Anytype3
+}
+
+// GetAnytype3Ok returns a tuple with the Anytype3 field if it's non-nil, zero value otherwise
+// and a boolean to check if the value has been set.
+func (o *AdditionalPropertiesClass) GetAnytype3Ok() (map[string]interface{}, bool) {
+	if o == nil || o.Anytype3 == nil {
+		var ret map[string]interface{}
+		return ret, false
+	}
+	return *o.Anytype3, true
+}
+
+// HasAnytype3 returns a boolean if a field has been set.
+func (o *AdditionalPropertiesClass) HasAnytype3() bool {
+	if o != nil && o.Anytype3 != nil {
+		return true
+	}
+
+	return false
+}
+
+// SetAnytype3 gets a reference to the given map[string]interface{} and assigns it to the Anytype3 field.
+func (o *AdditionalPropertiesClass) SetAnytype3(v map[string]interface{}) {
+	o.Anytype3 = &v
+}
+
+
+func (o AdditionalPropertiesClass) MarshalJSON() ([]byte, error) {
+	toSerialize := map[string]interface{}{}
+	if o.MapString != nil {
+		toSerialize["map_string"] = o.MapString
+	}
+	if o.MapNumber != nil {
+		toSerialize["map_number"] = o.MapNumber
+	}
+	if o.MapInteger != nil {
+		toSerialize["map_integer"] = o.MapInteger
+	}
+	if o.MapBoolean != nil {
+		toSerialize["map_boolean"] = o.MapBoolean
+	}
+	if o.MapArrayInteger != nil {
+		toSerialize["map_array_integer"] = o.MapArrayInteger
+	}
+	if o.MapArrayAnytype != nil {
+		toSerialize["map_array_anytype"] = o.MapArrayAnytype
+	}
+	if o.MapMapString != nil {
+		toSerialize["map_map_string"] = o.MapMapString
+	}
+	if o.MapMapAnytype != nil {
+		toSerialize["map_map_anytype"] = o.MapMapAnytype
+	}
+	if o.Anytype1 != nil {
+		toSerialize["anytype_1"] = o.Anytype1
+	}
+	if o.Anytype2 != nil {
+		toSerialize["anytype_2"] = o.Anytype2
+	}
+	if o.Anytype3 != nil {
+		toSerialize["anytype_3"] = o.Anytype3
+	}
+	return json.Marshal(toSerialize)
+}
+
+
diff --git a/samples/client/petstore/go-experimental/go-petstore/model_additional_properties_integer.go b/samples/client/petstore/go-experimental/go-petstore/model_additional_properties_integer.go
index 2f69fe4b01..05dea42d51 100644
--- a/samples/client/petstore/go-experimental/go-petstore/model_additional_properties_integer.go
+++ b/samples/client/petstore/go-experimental/go-petstore/model_additional_properties_integer.go
@@ -8,7 +8,55 @@
  */
 
 package petstore
+import (
+	"encoding/json"
+)
 
 type AdditionalPropertiesInteger struct {
-	Name string `json:"name,omitempty"`
+	Name *string `json:"name,omitempty"`
+
 }
+
+// GetName returns the Name field if non-nil, zero value otherwise.
+func (o *AdditionalPropertiesInteger) GetName() string {
+	if o == nil || o.Name == nil {
+		var ret string
+		return ret
+	}
+	return *o.Name
+}
+
+// GetNameOk returns a tuple with the Name field if it's non-nil, zero value otherwise
+// and a boolean to check if the value has been set.
+func (o *AdditionalPropertiesInteger) GetNameOk() (string, bool) {
+	if o == nil || o.Name == nil {
+		var ret string
+		return ret, false
+	}
+	return *o.Name, true
+}
+
+// HasName returns a boolean if a field has been set.
+func (o *AdditionalPropertiesInteger) HasName() bool {
+	if o != nil && o.Name != nil {
+		return true
+	}
+
+	return false
+}
+
+// SetName gets a reference to the given string and assigns it to the Name field.
+func (o *AdditionalPropertiesInteger) SetName(v string) {
+	o.Name = &v
+}
+
+
+func (o AdditionalPropertiesInteger) MarshalJSON() ([]byte, error) {
+	toSerialize := map[string]interface{}{}
+	if o.Name != nil {
+		toSerialize["name"] = o.Name
+	}
+	return json.Marshal(toSerialize)
+}
+
+
diff --git a/samples/client/petstore/go-experimental/go-petstore/model_additional_properties_number.go b/samples/client/petstore/go-experimental/go-petstore/model_additional_properties_number.go
index 900b2ec32c..484c9d79ad 100644
--- a/samples/client/petstore/go-experimental/go-petstore/model_additional_properties_number.go
+++ b/samples/client/petstore/go-experimental/go-petstore/model_additional_properties_number.go
@@ -8,7 +8,55 @@
  */
 
 package petstore
+import (
+	"encoding/json"
+)
 
 type AdditionalPropertiesNumber struct {
-	Name string `json:"name,omitempty"`
+	Name *string `json:"name,omitempty"`
+
 }
+
+// GetName returns the Name field if non-nil, zero value otherwise.
+func (o *AdditionalPropertiesNumber) GetName() string {
+	if o == nil || o.Name == nil {
+		var ret string
+		return ret
+	}
+	return *o.Name
+}
+
+// GetNameOk returns a tuple with the Name field if it's non-nil, zero value otherwise
+// and a boolean to check if the value has been set.
+func (o *AdditionalPropertiesNumber) GetNameOk() (string, bool) {
+	if o == nil || o.Name == nil {
+		var ret string
+		return ret, false
+	}
+	return *o.Name, true
+}
+
+// HasName returns a boolean if a field has been set.
+func (o *AdditionalPropertiesNumber) HasName() bool {
+	if o != nil && o.Name != nil {
+		return true
+	}
+
+	return false
+}
+
+// SetName gets a reference to the given string and assigns it to the Name field.
+func (o *AdditionalPropertiesNumber) SetName(v string) {
+	o.Name = &v
+}
+
+
+func (o AdditionalPropertiesNumber) MarshalJSON() ([]byte, error) {
+	toSerialize := map[string]interface{}{}
+	if o.Name != nil {
+		toSerialize["name"] = o.Name
+	}
+	return json.Marshal(toSerialize)
+}
+
+
diff --git a/samples/client/petstore/go-experimental/go-petstore/model_additional_properties_object.go b/samples/client/petstore/go-experimental/go-petstore/model_additional_properties_object.go
index 99fa6d02fd..0482ad8ef1 100644
--- a/samples/client/petstore/go-experimental/go-petstore/model_additional_properties_object.go
+++ b/samples/client/petstore/go-experimental/go-petstore/model_additional_properties_object.go
@@ -8,7 +8,55 @@
  */
 
 package petstore
+import (
+	"encoding/json"
+)
 
 type AdditionalPropertiesObject struct {
-	Name string `json:"name,omitempty"`
+	Name *string `json:"name,omitempty"`
+
 }
+
+// GetName returns the Name field if non-nil, zero value otherwise.
+func (o *AdditionalPropertiesObject) GetName() string {
+	if o == nil || o.Name == nil {
+		var ret string
+		return ret
+	}
+	return *o.Name
+}
+
+// GetNameOk returns a tuple with the Name field if it's non-nil, zero value otherwise
+// and a boolean to check if the value has been set.
+func (o *AdditionalPropertiesObject) GetNameOk() (string, bool) {
+	if o == nil || o.Name == nil {
+		var ret string
+		return ret, false
+	}
+	return *o.Name, true
+}
+
+// HasName returns a boolean if a field has been set.
+func (o *AdditionalPropertiesObject) HasName() bool {
+	if o != nil && o.Name != nil {
+		return true
+	}
+
+	return false
+}
+
+// SetName gets a reference to the given string and assigns it to the Name field.
+func (o *AdditionalPropertiesObject) SetName(v string) {
+	o.Name = &v
+}
+
+
+func (o AdditionalPropertiesObject) MarshalJSON() ([]byte, error) {
+	toSerialize := map[string]interface{}{}
+	if o.Name != nil {
+		toSerialize["name"] = o.Name
+	}
+	return json.Marshal(toSerialize)
+}
+
+
diff --git a/samples/client/petstore/go-experimental/go-petstore/model_additional_properties_string.go b/samples/client/petstore/go-experimental/go-petstore/model_additional_properties_string.go
index 82fe0e4ed3..561cd08191 100644
--- a/samples/client/petstore/go-experimental/go-petstore/model_additional_properties_string.go
+++ b/samples/client/petstore/go-experimental/go-petstore/model_additional_properties_string.go
@@ -8,7 +8,55 @@
  */
 
 package petstore
+import (
+	"encoding/json"
+)
 
 type AdditionalPropertiesString struct {
-	Name string `json:"name,omitempty"`
+	Name *string `json:"name,omitempty"`
+
 }
+
+// GetName returns the Name field if non-nil, zero value otherwise.
+func (o *AdditionalPropertiesString) GetName() string {
+	if o == nil || o.Name == nil {
+		var ret string
+		return ret
+	}
+	return *o.Name
+}
+
+// GetNameOk returns a tuple with the Name field if it's non-nil, zero value otherwise
+// and a boolean to check if the value has been set.
+func (o *AdditionalPropertiesString) GetNameOk() (string, bool) {
+	if o == nil || o.Name == nil {
+		var ret string
+		return ret, false
+	}
+	return *o.Name, true
+}
+
+// HasName returns a boolean if a field has been set.
+func (o *AdditionalPropertiesString) HasName() bool {
+	if o != nil && o.Name != nil {
+		return true
+	}
+
+	return false
+}
+
+// SetName gets a reference to the given string and assigns it to the Name field.
+func (o *AdditionalPropertiesString) SetName(v string) {
+	o.Name = &v
+}
+
+
+func (o AdditionalPropertiesString) MarshalJSON() ([]byte, error) {
+	toSerialize := map[string]interface{}{}
+	if o.Name != nil {
+		toSerialize["name"] = o.Name
+	}
+	return json.Marshal(toSerialize)
+}
+
+
diff --git a/samples/client/petstore/go-experimental/go-petstore/model_animal.go b/samples/client/petstore/go-experimental/go-petstore/model_animal.go
index 39d0d2d1ec..897cac1f45 100644
--- a/samples/client/petstore/go-experimental/go-petstore/model_animal.go
+++ b/samples/client/petstore/go-experimental/go-petstore/model_animal.go
@@ -8,8 +8,97 @@
  */
 
 package petstore
+import (
+	"encoding/json"
+	"errors"
+)
 
 type Animal struct {
-	ClassName string `json:"className"`
-	Color string `json:"color,omitempty"`
+	ClassName *string `json:"className,omitempty"`
+
+	Color *string `json:"color,omitempty"`
+
 }
+
+// GetClassName returns the ClassName field if non-nil, zero value otherwise.
+func (o *Animal) GetClassName() string {
+	if o == nil || o.ClassName == nil {
+		var ret string
+		return ret
+	}
+	return *o.ClassName
+}
+
+// GetClassNameOk returns a tuple with the ClassName field if it's non-nil, zero value otherwise
+// and a boolean to check if the value has been set.
+func (o *Animal) GetClassNameOk() (string, bool) {
+	if o == nil || o.ClassName == nil {
+		var ret string
+		return ret, false
+	}
+	return *o.ClassName, true
+}
+
+// HasClassName returns a boolean if a field has been set.
+func (o *Animal) HasClassName() bool {
+	if o != nil && o.ClassName != nil {
+		return true
+	}
+
+	return false
+}
+
+// SetClassName gets a reference to the given string and assigns it to the ClassName field.
+func (o *Animal) SetClassName(v string) {
+	o.ClassName = &v
+}
+
+// GetColor returns the Color field if non-nil, zero value otherwise.
+func (o *Animal) GetColor() string {
+	if o == nil || o.Color == nil {
+		var ret string
+		return ret
+	}
+	return *o.Color
+}
+
+// GetColorOk returns a tuple with the Color field if it's non-nil, zero value otherwise
+// and a boolean to check if the value has been set.
+func (o *Animal) GetColorOk() (string, bool) {
+	if o == nil || o.Color == nil {
+		var ret string
+		return ret, false
+	}
+	return *o.Color, true
+}
+
+// HasColor returns a boolean if a field has been set.
+func (o *Animal) HasColor() bool {
+	if o != nil && o.Color != nil {
+		return true
+	}
+
+	return false
+}
+
+// SetColor gets a reference to the given string and assigns it to the Color field.
+func (o *Animal) SetColor(v string) {
+	o.Color = &v
+}
+
+
+func (o Animal) MarshalJSON() ([]byte, error) {
+	toSerialize := map[string]interface{}{}
+	if o.ClassName == nil {
+		return nil, errors.New("ClassName is required and not nullable, but was not set on Animal")
+	}
+	if o.ClassName != nil {
+		toSerialize["className"] = o.ClassName
+	}
+	if o.Color != nil {
+		toSerialize["color"] = o.Color
+	}
+	return json.Marshal(toSerialize)
+}
+
+
diff --git a/samples/client/petstore/go-experimental/go-petstore/model_api_response.go b/samples/client/petstore/go-experimental/go-petstore/model_api_response.go
index 12732fa32c..009e991072 100644
--- a/samples/client/petstore/go-experimental/go-petstore/model_api_response.go
+++ b/samples/client/petstore/go-experimental/go-petstore/model_api_response.go
@@ -8,9 +8,131 @@
  */
 
 package petstore
+import (
+	"encoding/json"
+)
 
 type ApiResponse struct {
-	Code int32 `json:"code,omitempty"`
-	Type string `json:"type,omitempty"`
-	Message string `json:"message,omitempty"`
+	Code *int32 `json:"code,omitempty"`
+
+	Type *string `json:"type,omitempty"`
+
+	Message *string `json:"message,omitempty"`
+
 }
+
+// GetCode returns the Code field if non-nil, zero value otherwise.
+func (o *ApiResponse) GetCode() int32 {
+	if o == nil || o.Code == nil {
+		var ret int32
+		return ret
+	}
+	return *o.Code
+}
+
+// GetCodeOk returns a tuple with the Code field if it's non-nil, zero value otherwise
+// and a boolean to check if the value has been set.
+func (o *ApiResponse) GetCodeOk() (int32, bool) {
+	if o == nil || o.Code == nil {
+		var ret int32
+		return ret, false
+	}
+	return *o.Code, true
+}
+
+// HasCode returns a boolean if a field has been set.
+func (o *ApiResponse) HasCode() bool {
+	if o != nil && o.Code != nil {
+		return true
+	}
+
+	return false
+}
+
+// SetCode gets a reference to the given int32 and assigns it to the Code field.
+func (o *ApiResponse) SetCode(v int32) {
+	o.Code = &v
+}
+
+// GetType returns the Type field if non-nil, zero value otherwise.
+func (o *ApiResponse) GetType() string {
+	if o == nil || o.Type == nil {
+		var ret string
+		return ret
+	}
+	return *o.Type
+}
+
+// GetTypeOk returns a tuple with the Type field if it's non-nil, zero value otherwise
+// and a boolean to check if the value has been set.
+func (o *ApiResponse) GetTypeOk() (string, bool) {
+	if o == nil || o.Type == nil {
+		var ret string
+		return ret, false
+	}
+	return *o.Type, true
+}
+
+// HasType returns a boolean if a field has been set.
+func (o *ApiResponse) HasType() bool {
+	if o != nil && o.Type != nil {
+		return true
+	}
+
+	return false
+}
+
+// SetType gets a reference to the given string and assigns it to the Type field.
+func (o *ApiResponse) SetType(v string) {
+	o.Type = &v
+}
+
+// GetMessage returns the Message field if non-nil, zero value otherwise.
+func (o *ApiResponse) GetMessage() string {
+	if o == nil || o.Message == nil {
+		var ret string
+		return ret
+	}
+	return *o.Message
+}
+
+// GetMessageOk returns a tuple with the Message field if it's non-nil, zero value otherwise
+// and a boolean to check if the value has been set.
+func (o *ApiResponse) GetMessageOk() (string, bool) {
+	if o == nil || o.Message == nil {
+		var ret string
+		return ret, false
+	}
+	return *o.Message, true
+}
+
+// HasMessage returns a boolean if a field has been set.
+func (o *ApiResponse) HasMessage() bool {
+	if o != nil && o.Message != nil {
+		return true
+	}
+
+	return false
+}
+
+// SetMessage gets a reference to the given string and assigns it to the Message field.
+func (o *ApiResponse) SetMessage(v string) {
+	o.Message = &v
+}
+
+
+func (o ApiResponse) MarshalJSON() ([]byte, error) {
+	toSerialize := map[string]interface{}{}
+	if o.Code != nil {
+		toSerialize["code"] = o.Code
+	}
+	if o.Type != nil {
+		toSerialize["type"] = o.Type
+	}
+	if o.Message != nil {
+		toSerialize["message"] = o.Message
+	}
+	return json.Marshal(toSerialize)
+}
+
+
diff --git a/samples/client/petstore/go-experimental/go-petstore/model_array_of_array_of_number_only.go b/samples/client/petstore/go-experimental/go-petstore/model_array_of_array_of_number_only.go
index 8bf700c7eb..aadebc92a4 100644
--- a/samples/client/petstore/go-experimental/go-petstore/model_array_of_array_of_number_only.go
+++ b/samples/client/petstore/go-experimental/go-petstore/model_array_of_array_of_number_only.go
@@ -8,7 +8,55 @@
  */
 
 package petstore
+import (
+	"encoding/json"
+)
 
 type ArrayOfArrayOfNumberOnly struct {
-	ArrayArrayNumber [][]float32 `json:"ArrayArrayNumber,omitempty"`
+	ArrayArrayNumber *[][]float32 `json:"ArrayArrayNumber,omitempty"`
+
 }
+
+// GetArrayArrayNumber returns the ArrayArrayNumber field if non-nil, zero value otherwise.
+func (o *ArrayOfArrayOfNumberOnly) GetArrayArrayNumber() [][]float32 {
+	if o == nil || o.ArrayArrayNumber == nil {
+		var ret [][]float32
+		return ret
+	}
+	return *o.ArrayArrayNumber
+}
+
+// GetArrayArrayNumberOk returns a tuple with the ArrayArrayNumber field if it's non-nil, zero value otherwise
+// and a boolean to check if the value has been set.
+func (o *ArrayOfArrayOfNumberOnly) GetArrayArrayNumberOk() ([][]float32, bool) {
+	if o == nil || o.ArrayArrayNumber == nil {
+		var ret [][]float32
+		return ret, false
+	}
+	return *o.ArrayArrayNumber, true
+}
+
+// HasArrayArrayNumber returns a boolean if a field has been set.
+func (o *ArrayOfArrayOfNumberOnly) HasArrayArrayNumber() bool {
+	if o != nil && o.ArrayArrayNumber != nil {
+		return true
+	}
+
+	return false
+}
+
+// SetArrayArrayNumber gets a reference to the given [][]float32 and assigns it to the ArrayArrayNumber field.
+func (o *ArrayOfArrayOfNumberOnly) SetArrayArrayNumber(v [][]float32) {
+	o.ArrayArrayNumber = &v
+}
+
+
+func (o ArrayOfArrayOfNumberOnly) MarshalJSON() ([]byte, error) {
+	toSerialize := map[string]interface{}{}
+	if o.ArrayArrayNumber != nil {
+		toSerialize["ArrayArrayNumber"] = o.ArrayArrayNumber
+	}
+	return json.Marshal(toSerialize)
+}
+
+
diff --git a/samples/client/petstore/go-experimental/go-petstore/model_array_of_number_only.go b/samples/client/petstore/go-experimental/go-petstore/model_array_of_number_only.go
index ccb473355c..418a07d7d6 100644
--- a/samples/client/petstore/go-experimental/go-petstore/model_array_of_number_only.go
+++ b/samples/client/petstore/go-experimental/go-petstore/model_array_of_number_only.go
@@ -8,7 +8,55 @@
  */
 
 package petstore
+import (
+	"encoding/json"
+)
 
 type ArrayOfNumberOnly struct {
-	ArrayNumber []float32 `json:"ArrayNumber,omitempty"`
+	ArrayNumber *[]float32 `json:"ArrayNumber,omitempty"`
+
 }
+
+// GetArrayNumber returns the ArrayNumber field if non-nil, zero value otherwise.
+func (o *ArrayOfNumberOnly) GetArrayNumber() []float32 {
+	if o == nil || o.ArrayNumber == nil {
+		var ret []float32
+		return ret
+	}
+	return *o.ArrayNumber
+}
+
+// GetArrayNumberOk returns a tuple with the ArrayNumber field if it's non-nil, zero value otherwise
+// and a boolean to check if the value has been set.
+func (o *ArrayOfNumberOnly) GetArrayNumberOk() ([]float32, bool) {
+	if o == nil || o.ArrayNumber == nil {
+		var ret []float32
+		return ret, false
+	}
+	return *o.ArrayNumber, true
+}
+
+// HasArrayNumber returns a boolean if a field has been set.
+func (o *ArrayOfNumberOnly) HasArrayNumber() bool {
+	if o != nil && o.ArrayNumber != nil {
+		return true
+	}
+
+	return false
+}
+
+// SetArrayNumber gets a reference to the given []float32 and assigns it to the ArrayNumber field.
+func (o *ArrayOfNumberOnly) SetArrayNumber(v []float32) {
+	o.ArrayNumber = &v
+}
+
+
+func (o ArrayOfNumberOnly) MarshalJSON() ([]byte, error) {
+	toSerialize := map[string]interface{}{}
+	if o.ArrayNumber != nil {
+		toSerialize["ArrayNumber"] = o.ArrayNumber
+	}
+	return json.Marshal(toSerialize)
+}
+
+
diff --git a/samples/client/petstore/go-experimental/go-petstore/model_array_test_.go b/samples/client/petstore/go-experimental/go-petstore/model_array_test_.go
index f881980093..8fa143ded8 100644
--- a/samples/client/petstore/go-experimental/go-petstore/model_array_test_.go
+++ b/samples/client/petstore/go-experimental/go-petstore/model_array_test_.go
@@ -8,9 +8,131 @@
  */
 
 package petstore
+import (
+	"encoding/json"
+)
 
 type ArrayTest struct {
-	ArrayOfString []string `json:"array_of_string,omitempty"`
-	ArrayArrayOfInteger [][]int64 `json:"array_array_of_integer,omitempty"`
-	ArrayArrayOfModel [][]ReadOnlyFirst `json:"array_array_of_model,omitempty"`
+	ArrayOfString *[]string `json:"array_of_string,omitempty"`
+
+	ArrayArrayOfInteger *[][]int64 `json:"array_array_of_integer,omitempty"`
+
+	ArrayArrayOfModel *[][]ReadOnlyFirst `json:"array_array_of_model,omitempty"`
+
 }
+
+// GetArrayOfString returns the ArrayOfString field if non-nil, zero value otherwise.
+func (o *ArrayTest) GetArrayOfString() []string {
+	if o == nil || o.ArrayOfString == nil {
+		var ret []string
+		return ret
+	}
+	return *o.ArrayOfString
+}
+
+// GetArrayOfStringOk returns a tuple with the ArrayOfString field if it's non-nil, zero value otherwise
+// and a boolean to check if the value has been set.
+func (o *ArrayTest) GetArrayOfStringOk() ([]string, bool) {
+	if o == nil || o.ArrayOfString == nil {
+		var ret []string
+		return ret, false
+	}
+	return *o.ArrayOfString, true
+}
+
+// HasArrayOfString returns a boolean if a field has been set.
+func (o *ArrayTest) HasArrayOfString() bool {
+	if o != nil && o.ArrayOfString != nil {
+		return true
+	}
+
+	return false
+}
+
+// SetArrayOfString gets a reference to the given []string and assigns it to the ArrayOfString field.
+func (o *ArrayTest) SetArrayOfString(v []string) {
+	o.ArrayOfString = &v
+}
+
+// GetArrayArrayOfInteger returns the ArrayArrayOfInteger field if non-nil, zero value otherwise.
+func (o *ArrayTest) GetArrayArrayOfInteger() [][]int64 {
+	if o == nil || o.ArrayArrayOfInteger == nil {
+		var ret [][]int64
+		return ret
+	}
+	return *o.ArrayArrayOfInteger
+}
+
+// GetArrayArrayOfIntegerOk returns a tuple with the ArrayArrayOfInteger field if it's non-nil, zero value otherwise
+// and a boolean to check if the value has been set.
+func (o *ArrayTest) GetArrayArrayOfIntegerOk() ([][]int64, bool) {
+	if o == nil || o.ArrayArrayOfInteger == nil {
+		var ret [][]int64
+		return ret, false
+	}
+	return *o.ArrayArrayOfInteger, true
+}
+
+// HasArrayArrayOfInteger returns a boolean if a field has been set.
+func (o *ArrayTest) HasArrayArrayOfInteger() bool {
+	if o != nil && o.ArrayArrayOfInteger != nil {
+		return true
+	}
+
+	return false
+}
+
+// SetArrayArrayOfInteger gets a reference to the given [][]int64 and assigns it to the ArrayArrayOfInteger field.
+func (o *ArrayTest) SetArrayArrayOfInteger(v [][]int64) {
+	o.ArrayArrayOfInteger = &v
+}
+
+// GetArrayArrayOfModel returns the ArrayArrayOfModel field if non-nil, zero value otherwise.
+func (o *ArrayTest) GetArrayArrayOfModel() [][]ReadOnlyFirst {
+	if o == nil || o.ArrayArrayOfModel == nil {
+		var ret [][]ReadOnlyFirst
+		return ret
+	}
+	return *o.ArrayArrayOfModel
+}
+
+// GetArrayArrayOfModelOk returns a tuple with the ArrayArrayOfModel field if it's non-nil, zero value otherwise
+// and a boolean to check if the value has been set.
+func (o *ArrayTest) GetArrayArrayOfModelOk() ([][]ReadOnlyFirst, bool) {
+	if o == nil || o.ArrayArrayOfModel == nil {
+		var ret [][]ReadOnlyFirst
+		return ret, false
+	}
+	return *o.ArrayArrayOfModel, true
+}
+
+// HasArrayArrayOfModel returns a boolean if a field has been set.
+func (o *ArrayTest) HasArrayArrayOfModel() bool {
+	if o != nil && o.ArrayArrayOfModel != nil {
+		return true
+	}
+
+	return false
+}
+
+// SetArrayArrayOfModel gets a reference to the given [][]ReadOnlyFirst and assigns it to the ArrayArrayOfModel field.
+func (o *ArrayTest) SetArrayArrayOfModel(v [][]ReadOnlyFirst) {
+	o.ArrayArrayOfModel = &v
+}
+
+
+func (o ArrayTest) MarshalJSON() ([]byte, error) {
+	toSerialize := map[string]interface{}{}
+	if o.ArrayOfString != nil {
+		toSerialize["array_of_string"] = o.ArrayOfString
+	}
+	if o.ArrayArrayOfInteger != nil {
+		toSerialize["array_array_of_integer"] = o.ArrayArrayOfInteger
+	}
+	if o.ArrayArrayOfModel != nil {
+		toSerialize["array_array_of_model"] = o.ArrayArrayOfModel
+	}
+	return json.Marshal(toSerialize)
+}
+
+
diff --git a/samples/client/petstore/go-experimental/go-petstore/model_capitalization.go b/samples/client/petstore/go-experimental/go-petstore/model_capitalization.go
index 8284ba9c76..107dd7932e 100644
--- a/samples/client/petstore/go-experimental/go-petstore/model_capitalization.go
+++ b/samples/client/petstore/go-experimental/go-petstore/model_capitalization.go
@@ -8,13 +8,246 @@
  */
 
 package petstore
+import (
+	"encoding/json"
+)
 
 type Capitalization struct {
-	SmallCamel string `json:"smallCamel,omitempty"`
-	CapitalCamel string `json:"CapitalCamel,omitempty"`
-	SmallSnake string `json:"small_Snake,omitempty"`
-	CapitalSnake string `json:"Capital_Snake,omitempty"`
-	SCAETHFlowPoints string `json:"SCA_ETH_Flow_Points,omitempty"`
+	SmallCamel *string `json:"smallCamel,omitempty"`
+
+	CapitalCamel *string `json:"CapitalCamel,omitempty"`
+
+	SmallSnake *string `json:"small_Snake,omitempty"`
+
+	CapitalSnake *string `json:"Capital_Snake,omitempty"`
+
+	SCAETHFlowPoints *string `json:"SCA_ETH_Flow_Points,omitempty"`
+
 	// Name of the pet 
-	ATT_NAME string `json:"ATT_NAME,omitempty"`
+	ATT_NAME *string `json:"ATT_NAME,omitempty"`
+
 }
+
+// GetSmallCamel returns the SmallCamel field if non-nil, zero value otherwise.
+func (o *Capitalization) GetSmallCamel() string {
+	if o == nil || o.SmallCamel == nil {
+		var ret string
+		return ret
+	}
+	return *o.SmallCamel
+}
+
+// GetSmallCamelOk returns a tuple with the SmallCamel field if it's non-nil, zero value otherwise
+// and a boolean to check if the value has been set.
+func (o *Capitalization) GetSmallCamelOk() (string, bool) {
+	if o == nil || o.SmallCamel == nil {
+		var ret string
+		return ret, false
+	}
+	return *o.SmallCamel, true
+}
+
+// HasSmallCamel returns a boolean if a field has been set.
+func (o *Capitalization) HasSmallCamel() bool {
+	if o != nil && o.SmallCamel != nil {
+		return true
+	}
+
+	return false
+}
+
+// SetSmallCamel gets a reference to the given string and assigns it to the SmallCamel field.
+func (o *Capitalization) SetSmallCamel(v string) {
+	o.SmallCamel = &v
+}
+
+// GetCapitalCamel returns the CapitalCamel field if non-nil, zero value otherwise.
+func (o *Capitalization) GetCapitalCamel() string {
+	if o == nil || o.CapitalCamel == nil {
+		var ret string
+		return ret
+	}
+	return *o.CapitalCamel
+}
+
+// GetCapitalCamelOk returns a tuple with the CapitalCamel field if it's non-nil, zero value otherwise
+// and a boolean to check if the value has been set.
+func (o *Capitalization) GetCapitalCamelOk() (string, bool) {
+	if o == nil || o.CapitalCamel == nil {
+		var ret string
+		return ret, false
+	}
+	return *o.CapitalCamel, true
+}
+
+// HasCapitalCamel returns a boolean if a field has been set.
+func (o *Capitalization) HasCapitalCamel() bool {
+	if o != nil && o.CapitalCamel != nil {
+		return true
+	}
+
+	return false
+}
+
+// SetCapitalCamel gets a reference to the given string and assigns it to the CapitalCamel field.
+func (o *Capitalization) SetCapitalCamel(v string) {
+	o.CapitalCamel = &v
+}
+
+// GetSmallSnake returns the SmallSnake field if non-nil, zero value otherwise.
+func (o *Capitalization) GetSmallSnake() string {
+	if o == nil || o.SmallSnake == nil {
+		var ret string
+		return ret
+	}
+	return *o.SmallSnake
+}
+
+// GetSmallSnakeOk returns a tuple with the SmallSnake field if it's non-nil, zero value otherwise
+// and a boolean to check if the value has been set.
+func (o *Capitalization) GetSmallSnakeOk() (string, bool) {
+	if o == nil || o.SmallSnake == nil {
+		var ret string
+		return ret, false
+	}
+	return *o.SmallSnake, true
+}
+
+// HasSmallSnake returns a boolean if a field has been set.
+func (o *Capitalization) HasSmallSnake() bool {
+	if o != nil && o.SmallSnake != nil {
+		return true
+	}
+
+	return false
+}
+
+// SetSmallSnake gets a reference to the given string and assigns it to the SmallSnake field.
+func (o *Capitalization) SetSmallSnake(v string) {
+	o.SmallSnake = &v
+}
+
+// GetCapitalSnake returns the CapitalSnake field if non-nil, zero value otherwise.
+func (o *Capitalization) GetCapitalSnake() string {
+	if o == nil || o.CapitalSnake == nil {
+		var ret string
+		return ret
+	}
+	return *o.CapitalSnake
+}
+
+// GetCapitalSnakeOk returns a tuple with the CapitalSnake field if it's non-nil, zero value otherwise
+// and a boolean to check if the value has been set.
+func (o *Capitalization) GetCapitalSnakeOk() (string, bool) {
+	if o == nil || o.CapitalSnake == nil {
+		var ret string
+		return ret, false
+	}
+	return *o.CapitalSnake, true
+}
+
+// HasCapitalSnake returns a boolean if a field has been set.
+func (o *Capitalization) HasCapitalSnake() bool {
+	if o != nil && o.CapitalSnake != nil {
+		return true
+	}
+
+	return false
+}
+
+// SetCapitalSnake gets a reference to the given string and assigns it to the CapitalSnake field.
+func (o *Capitalization) SetCapitalSnake(v string) {
+	o.CapitalSnake = &v
+}
+
+// GetSCAETHFlowPoints returns the SCAETHFlowPoints field if non-nil, zero value otherwise.
+func (o *Capitalization) GetSCAETHFlowPoints() string {
+	if o == nil || o.SCAETHFlowPoints == nil {
+		var ret string
+		return ret
+	}
+	return *o.SCAETHFlowPoints
+}
+
+// GetSCAETHFlowPointsOk returns a tuple with the SCAETHFlowPoints field if it's non-nil, zero value otherwise
+// and a boolean to check if the value has been set.
+func (o *Capitalization) GetSCAETHFlowPointsOk() (string, bool) {
+	if o == nil || o.SCAETHFlowPoints == nil {
+		var ret string
+		return ret, false
+	}
+	return *o.SCAETHFlowPoints, true
+}
+
+// HasSCAETHFlowPoints returns a boolean if a field has been set.
+func (o *Capitalization) HasSCAETHFlowPoints() bool {
+	if o != nil && o.SCAETHFlowPoints != nil {
+		return true
+	}
+
+	return false
+}
+
+// SetSCAETHFlowPoints gets a reference to the given string and assigns it to the SCAETHFlowPoints field.
+func (o *Capitalization) SetSCAETHFlowPoints(v string) {
+	o.SCAETHFlowPoints = &v
+}
+
+// GetATT_NAME returns the ATT_NAME field if non-nil, zero value otherwise.
+func (o *Capitalization) GetATT_NAME() string {
+	if o == nil || o.ATT_NAME == nil {
+		var ret string
+		return ret
+	}
+	return *o.ATT_NAME
+}
+
+// GetATT_NAMEOk returns a tuple with the ATT_NAME field if it's non-nil, zero value otherwise
+// and a boolean to check if the value has been set.
+func (o *Capitalization) GetATT_NAMEOk() (string, bool) {
+	if o == nil || o.ATT_NAME == nil {
+		var ret string
+		return ret, false
+	}
+	return *o.ATT_NAME, true
+}
+
+// HasATT_NAME returns a boolean if a field has been set.
+func (o *Capitalization) HasATT_NAME() bool {
+	if o != nil && o.ATT_NAME != nil {
+		return true
+	}
+
+	return false
+}
+
+// SetATT_NAME gets a reference to the given string and assigns it to the ATT_NAME field.
+func (o *Capitalization) SetATT_NAME(v string) {
+	o.ATT_NAME = &v
+}
+
+
+func (o Capitalization) MarshalJSON() ([]byte, error) {
+	toSerialize := map[string]interface{}{}
+	if o.SmallCamel != nil {
+		toSerialize["smallCamel"] = o.SmallCamel
+	}
+	if o.CapitalCamel != nil {
+		toSerialize["CapitalCamel"] = o.CapitalCamel
+	}
+	if o.SmallSnake != nil {
+		toSerialize["small_Snake"] = o.SmallSnake
+	}
+	if o.CapitalSnake != nil {
+		toSerialize["Capital_Snake"] = o.CapitalSnake
+	}
+	if o.SCAETHFlowPoints != nil {
+		toSerialize["SCA_ETH_Flow_Points"] = o.SCAETHFlowPoints
+	}
+	if o.ATT_NAME != nil {
+		toSerialize["ATT_NAME"] = o.ATT_NAME
+	}
+	return json.Marshal(toSerialize)
+}
+
+
diff --git a/samples/client/petstore/go-experimental/go-petstore/model_cat.go b/samples/client/petstore/go-experimental/go-petstore/model_cat.go
index 58b3deeb93..8efbf58fd1 100644
--- a/samples/client/petstore/go-experimental/go-petstore/model_cat.go
+++ b/samples/client/petstore/go-experimental/go-petstore/model_cat.go
@@ -8,9 +8,135 @@
  */
 
 package petstore
+import (
+	"encoding/json"
+	"errors"
+)
 
 type Cat struct {
-	ClassName string `json:"className"`
-	Color string `json:"color,omitempty"`
-	Declawed bool `json:"declawed,omitempty"`
+	ClassName *string `json:"className,omitempty"`
+
+	Color *string `json:"color,omitempty"`
+
+	Declawed *bool `json:"declawed,omitempty"`
+
 }
+
+// GetClassName returns the ClassName field if non-nil, zero value otherwise.
+func (o *Cat) GetClassName() string {
+	if o == nil || o.ClassName == nil {
+		var ret string
+		return ret
+	}
+	return *o.ClassName
+}
+
+// GetClassNameOk returns a tuple with the ClassName field if it's non-nil, zero value otherwise
+// and a boolean to check if the value has been set.
+func (o *Cat) GetClassNameOk() (string, bool) {
+	if o == nil || o.ClassName == nil {
+		var ret string
+		return ret, false
+	}
+	return *o.ClassName, true
+}
+
+// HasClassName returns a boolean if a field has been set.
+func (o *Cat) HasClassName() bool {
+	if o != nil && o.ClassName != nil {
+		return true
+	}
+
+	return false
+}
+
+// SetClassName gets a reference to the given string and assigns it to the ClassName field.
+func (o *Cat) SetClassName(v string) {
+	o.ClassName = &v
+}
+
+// GetColor returns the Color field if non-nil, zero value otherwise.
+func (o *Cat) GetColor() string {
+	if o == nil || o.Color == nil {
+		var ret string
+		return ret
+	}
+	return *o.Color
+}
+
+// GetColorOk returns a tuple with the Color field if it's non-nil, zero value otherwise
+// and a boolean to check if the value has been set.
+func (o *Cat) GetColorOk() (string, bool) {
+	if o == nil || o.Color == nil {
+		var ret string
+		return ret, false
+	}
+	return *o.Color, true
+}
+
+// HasColor returns a boolean if a field has been set.
+func (o *Cat) HasColor() bool {
+	if o != nil && o.Color != nil {
+		return true
+	}
+
+	return false
+}
+
+// SetColor gets a reference to the given string and assigns it to the Color field.
+func (o *Cat) SetColor(v string) {
+	o.Color = &v
+}
+
+// GetDeclawed returns the Declawed field if non-nil, zero value otherwise.
+func (o *Cat) GetDeclawed() bool {
+	if o == nil || o.Declawed == nil {
+		var ret bool
+		return ret
+	}
+	return *o.Declawed
+}
+
+// GetDeclawedOk returns a tuple with the Declawed field if it's non-nil, zero value otherwise
+// and a boolean to check if the value has been set.
+func (o *Cat) GetDeclawedOk() (bool, bool) {
+	if o == nil || o.Declawed == nil {
+		var ret bool
+		return ret, false
+	}
+	return *o.Declawed, true
+}
+
+// HasDeclawed returns a boolean if a field has been set.
+func (o *Cat) HasDeclawed() bool {
+	if o != nil && o.Declawed != nil {
+		return true
+	}
+
+	return false
+}
+
+// SetDeclawed gets a reference to the given bool and assigns it to the Declawed field.
+func (o *Cat) SetDeclawed(v bool) {
+	o.Declawed = &v
+}
+
+
+func (o Cat) MarshalJSON() ([]byte, error) {
+	toSerialize := map[string]interface{}{}
+	if o.ClassName == nil {
+		return nil, errors.New("ClassName is required and not nullable, but was not set on Cat")
+	}
+	if o.ClassName != nil {
+		toSerialize["className"] = o.ClassName
+	}
+	if o.Color != nil {
+		toSerialize["color"] = o.Color
+	}
+	if o.Declawed != nil {
+		toSerialize["declawed"] = o.Declawed
+	}
+	return json.Marshal(toSerialize)
+}
+
+
diff --git a/samples/client/petstore/go-experimental/go-petstore/model_cat_all_of.go b/samples/client/petstore/go-experimental/go-petstore/model_cat_all_of.go
index 3c1d802bd4..aaf2c8badb 100644
--- a/samples/client/petstore/go-experimental/go-petstore/model_cat_all_of.go
+++ b/samples/client/petstore/go-experimental/go-petstore/model_cat_all_of.go
@@ -8,7 +8,55 @@
  */
 
 package petstore
+import (
+	"encoding/json"
+)
 
 type CatAllOf struct {
-	Declawed bool `json:"declawed,omitempty"`
+	Declawed *bool `json:"declawed,omitempty"`
+
 }
+
+// GetDeclawed returns the Declawed field if non-nil, zero value otherwise.
+func (o *CatAllOf) GetDeclawed() bool {
+	if o == nil || o.Declawed == nil {
+		var ret bool
+		return ret
+	}
+	return *o.Declawed
+}
+
+// GetDeclawedOk returns a tuple with the Declawed field if it's non-nil, zero value otherwise
+// and a boolean to check if the value has been set.
+func (o *CatAllOf) GetDeclawedOk() (bool, bool) {
+	if o == nil || o.Declawed == nil {
+		var ret bool
+		return ret, false
+	}
+	return *o.Declawed, true
+}
+
+// HasDeclawed returns a boolean if a field has been set.
+func (o *CatAllOf) HasDeclawed() bool {
+	if o != nil && o.Declawed != nil {
+		return true
+	}
+
+	return false
+}
+
+// SetDeclawed gets a reference to the given bool and assigns it to the Declawed field.
+func (o *CatAllOf) SetDeclawed(v bool) {
+	o.Declawed = &v
+}
+
+
+func (o CatAllOf) MarshalJSON() ([]byte, error) {
+	toSerialize := map[string]interface{}{}
+	if o.Declawed != nil {
+		toSerialize["declawed"] = o.Declawed
+	}
+	return json.Marshal(toSerialize)
+}
+
+
diff --git a/samples/client/petstore/go-experimental/go-petstore/model_category.go b/samples/client/petstore/go-experimental/go-petstore/model_category.go
index 2f971417ac..c55d4bd6e9 100644
--- a/samples/client/petstore/go-experimental/go-petstore/model_category.go
+++ b/samples/client/petstore/go-experimental/go-petstore/model_category.go
@@ -8,8 +8,97 @@
  */
 
 package petstore
+import (
+	"encoding/json"
+	"errors"
+)
 
 type Category struct {
-	Id int64 `json:"id,omitempty"`
-	Name string `json:"name"`
+	Id *int64 `json:"id,omitempty"`
+
+	Name *string `json:"name,omitempty"`
+
 }
+
+// GetId returns the Id field if non-nil, zero value otherwise.
+func (o *Category) GetId() int64 {
+	if o == nil || o.Id == nil {
+		var ret int64
+		return ret
+	}
+	return *o.Id
+}
+
+// GetIdOk returns a tuple with the Id field if it's non-nil, zero value otherwise
+// and a boolean to check if the value has been set.
+func (o *Category) GetIdOk() (int64, bool) {
+	if o == nil || o.Id == nil {
+		var ret int64
+		return ret, false
+	}
+	return *o.Id, true
+}
+
+// HasId returns a boolean if a field has been set.
+func (o *Category) HasId() bool {
+	if o != nil && o.Id != nil {
+		return true
+	}
+
+	return false
+}
+
+// SetId gets a reference to the given int64 and assigns it to the Id field.
+func (o *Category) SetId(v int64) {
+	o.Id = &v
+}
+
+// GetName returns the Name field if non-nil, zero value otherwise.
+func (o *Category) GetName() string {
+	if o == nil || o.Name == nil {
+		var ret string
+		return ret
+	}
+	return *o.Name
+}
+
+// GetNameOk returns a tuple with the Name field if it's non-nil, zero value otherwise
+// and a boolean to check if the value has been set.
+func (o *Category) GetNameOk() (string, bool) {
+	if o == nil || o.Name == nil {
+		var ret string
+		return ret, false
+	}
+	return *o.Name, true
+}
+
+// HasName returns a boolean if a field has been set.
+func (o *Category) HasName() bool {
+	if o != nil && o.Name != nil {
+		return true
+	}
+
+	return false
+}
+
+// SetName gets a reference to the given string and assigns it to the Name field.
+func (o *Category) SetName(v string) {
+	o.Name = &v
+}
+
+
+func (o Category) MarshalJSON() ([]byte, error) {
+	toSerialize := map[string]interface{}{}
+	if o.Id != nil {
+		toSerialize["id"] = o.Id
+	}
+	if o.Name == nil {
+		return nil, errors.New("Name is required and not nullable, but was not set on Category")
+	}
+	if o.Name != nil {
+		toSerialize["name"] = o.Name
+	}
+	return json.Marshal(toSerialize)
+}
+
+
diff --git a/samples/client/petstore/go-experimental/go-petstore/model_class_model.go b/samples/client/petstore/go-experimental/go-petstore/model_class_model.go
index 09c7e89196..0dcaa26431 100644
--- a/samples/client/petstore/go-experimental/go-petstore/model_class_model.go
+++ b/samples/client/petstore/go-experimental/go-petstore/model_class_model.go
@@ -8,8 +8,56 @@
  */
 
 package petstore
+import (
+	"encoding/json"
+)
 
 // Model for testing model with \"_class\" property
 type ClassModel struct {
-	Class string `json:"_class,omitempty"`
+	Class *string `json:"_class,omitempty"`
+
 }
+
+// GetClass returns the Class field if non-nil, zero value otherwise.
+func (o *ClassModel) GetClass() string {
+	if o == nil || o.Class == nil {
+		var ret string
+		return ret
+	}
+	return *o.Class
+}
+
+// GetClassOk returns a tuple with the Class field if it's non-nil, zero value otherwise
+// and a boolean to check if the value has been set.
+func (o *ClassModel) GetClassOk() (string, bool) {
+	if o == nil || o.Class == nil {
+		var ret string
+		return ret, false
+	}
+	return *o.Class, true
+}
+
+// HasClass returns a boolean if a field has been set.
+func (o *ClassModel) HasClass() bool {
+	if o != nil && o.Class != nil {
+		return true
+	}
+
+	return false
+}
+
+// SetClass gets a reference to the given string and assigns it to the Class field.
+func (o *ClassModel) SetClass(v string) {
+	o.Class = &v
+}
+
+
+func (o ClassModel) MarshalJSON() ([]byte, error) {
+	toSerialize := map[string]interface{}{}
+	if o.Class != nil {
+		toSerialize["_class"] = o.Class
+	}
+	return json.Marshal(toSerialize)
+}
+
+
diff --git a/samples/client/petstore/go-experimental/go-petstore/model_client.go b/samples/client/petstore/go-experimental/go-petstore/model_client.go
index 3aa61112c4..72ebd54300 100644
--- a/samples/client/petstore/go-experimental/go-petstore/model_client.go
+++ b/samples/client/petstore/go-experimental/go-petstore/model_client.go
@@ -8,7 +8,55 @@
  */
 
 package petstore
+import (
+	"encoding/json"
+)
 
 type Client struct {
-	Client string `json:"client,omitempty"`
+	Client *string `json:"client,omitempty"`
+
 }
+
+// GetClient returns the Client field if non-nil, zero value otherwise.
+func (o *Client) GetClient() string {
+	if o == nil || o.Client == nil {
+		var ret string
+		return ret
+	}
+	return *o.Client
+}
+
+// GetClientOk returns a tuple with the Client field if it's non-nil, zero value otherwise
+// and a boolean to check if the value has been set.
+func (o *Client) GetClientOk() (string, bool) {
+	if o == nil || o.Client == nil {
+		var ret string
+		return ret, false
+	}
+	return *o.Client, true
+}
+
+// HasClient returns a boolean if a field has been set.
+func (o *Client) HasClient() bool {
+	if o != nil && o.Client != nil {
+		return true
+	}
+
+	return false
+}
+
+// SetClient gets a reference to the given string and assigns it to the Client field.
+func (o *Client) SetClient(v string) {
+	o.Client = &v
+}
+
+
+func (o Client) MarshalJSON() ([]byte, error) {
+	toSerialize := map[string]interface{}{}
+	if o.Client != nil {
+		toSerialize["client"] = o.Client
+	}
+	return json.Marshal(toSerialize)
+}
+
+
diff --git a/samples/client/petstore/go-experimental/go-petstore/model_dog.go b/samples/client/petstore/go-experimental/go-petstore/model_dog.go
index 3f791ca194..dd9c4e1d67 100644
--- a/samples/client/petstore/go-experimental/go-petstore/model_dog.go
+++ b/samples/client/petstore/go-experimental/go-petstore/model_dog.go
@@ -8,9 +8,135 @@
  */
 
 package petstore
+import (
+	"encoding/json"
+	"errors"
+)
 
 type Dog struct {
-	ClassName string `json:"className"`
-	Color string `json:"color,omitempty"`
-	Breed string `json:"breed,omitempty"`
+	ClassName *string `json:"className,omitempty"`
+
+	Color *string `json:"color,omitempty"`
+
+	Breed *string `json:"breed,omitempty"`
+
 }
+
+// GetClassName returns the ClassName field if non-nil, zero value otherwise.
+func (o *Dog) GetClassName() string {
+	if o == nil || o.ClassName == nil {
+		var ret string
+		return ret
+	}
+	return *o.ClassName
+}
+
+// GetClassNameOk returns a tuple with the ClassName field if it's non-nil, zero value otherwise
+// and a boolean to check if the value has been set.
+func (o *Dog) GetClassNameOk() (string, bool) {
+	if o == nil || o.ClassName == nil {
+		var ret string
+		return ret, false
+	}
+	return *o.ClassName, true
+}
+
+// HasClassName returns a boolean if a field has been set.
+func (o *Dog) HasClassName() bool {
+	if o != nil && o.ClassName != nil {
+		return true
+	}
+
+	return false
+}
+
+// SetClassName gets a reference to the given string and assigns it to the ClassName field.
+func (o *Dog) SetClassName(v string) {
+	o.ClassName = &v
+}
+
+// GetColor returns the Color field if non-nil, zero value otherwise.
+func (o *Dog) GetColor() string {
+	if o == nil || o.Color == nil {
+		var ret string
+		return ret
+	}
+	return *o.Color
+}
+
+// GetColorOk returns a tuple with the Color field if it's non-nil, zero value otherwise
+// and a boolean to check if the value has been set.
+func (o *Dog) GetColorOk() (string, bool) {
+	if o == nil || o.Color == nil {
+		var ret string
+		return ret, false
+	}
+	return *o.Color, true
+}
+
+// HasColor returns a boolean if a field has been set.
+func (o *Dog) HasColor() bool {
+	if o != nil && o.Color != nil {
+		return true
+	}
+
+	return false
+}
+
+// SetColor gets a reference to the given string and assigns it to the Color field.
+func (o *Dog) SetColor(v string) {
+	o.Color = &v
+}
+
+// GetBreed returns the Breed field if non-nil, zero value otherwise.
+func (o *Dog) GetBreed() string {
+	if o == nil || o.Breed == nil {
+		var ret string
+		return ret
+	}
+	return *o.Breed
+}
+
+// GetBreedOk returns a tuple with the Breed field if it's non-nil, zero value otherwise
+// and a boolean to check if the value has been set.
+func (o *Dog) GetBreedOk() (string, bool) {
+	if o == nil || o.Breed == nil {
+		var ret string
+		return ret, false
+	}
+	return *o.Breed, true
+}
+
+// HasBreed returns a boolean if a field has been set.
+func (o *Dog) HasBreed() bool {
+	if o != nil && o.Breed != nil {
+		return true
+	}
+
+	return false
+}
+
+// SetBreed gets a reference to the given string and assigns it to the Breed field.
+func (o *Dog) SetBreed(v string) {
+	o.Breed = &v
+}
+
+
+func (o Dog) MarshalJSON() ([]byte, error) {
+	toSerialize := map[string]interface{}{}
+	if o.ClassName == nil {
+		return nil, errors.New("ClassName is required and not nullable, but was not set on Dog")
+	}
+	if o.ClassName != nil {
+		toSerialize["className"] = o.ClassName
+	}
+	if o.Color != nil {
+		toSerialize["color"] = o.Color
+	}
+	if o.Breed != nil {
+		toSerialize["breed"] = o.Breed
+	}
+	return json.Marshal(toSerialize)
+}
+
+
diff --git a/samples/client/petstore/go-experimental/go-petstore/model_dog_all_of.go b/samples/client/petstore/go-experimental/go-petstore/model_dog_all_of.go
index a0db0aba4b..9dd6d964f0 100644
--- a/samples/client/petstore/go-experimental/go-petstore/model_dog_all_of.go
+++ b/samples/client/petstore/go-experimental/go-petstore/model_dog_all_of.go
@@ -8,7 +8,55 @@
  */
 
 package petstore
+import (
+	"encoding/json"
+)
 
 type DogAllOf struct {
-	Breed string `json:"breed,omitempty"`
+	Breed *string `json:"breed,omitempty"`
+
 }
+
+// GetBreed returns the Breed field if non-nil, zero value otherwise.
+func (o *DogAllOf) GetBreed() string {
+	if o == nil || o.Breed == nil {
+		var ret string
+		return ret
+	}
+	return *o.Breed
+}
+
+// GetBreedOk returns a tuple with the Breed field if it's non-nil, zero value otherwise
+// and a boolean to check if the value has been set.
+func (o *DogAllOf) GetBreedOk() (string, bool) {
+	if o == nil || o.Breed == nil {
+		var ret string
+		return ret, false
+	}
+	return *o.Breed, true
+}
+
+// HasBreed returns a boolean if a field has been set.
+func (o *DogAllOf) HasBreed() bool {
+	if o != nil && o.Breed != nil {
+		return true
+	}
+
+	return false
+}
+
+// SetBreed gets a reference to the given string and assigns it to the Breed field.
+func (o *DogAllOf) SetBreed(v string) {
+	o.Breed = &v
+}
+
+
+func (o DogAllOf) MarshalJSON() ([]byte, error) {
+	toSerialize := map[string]interface{}{}
+	if o.Breed != nil {
+		toSerialize["breed"] = o.Breed
+	}
+	return json.Marshal(toSerialize)
+}
+
+
diff --git a/samples/client/petstore/go-experimental/go-petstore/model_enum_arrays.go b/samples/client/petstore/go-experimental/go-petstore/model_enum_arrays.go
index ab4dce92eb..b52471416a 100644
--- a/samples/client/petstore/go-experimental/go-petstore/model_enum_arrays.go
+++ b/samples/client/petstore/go-experimental/go-petstore/model_enum_arrays.go
@@ -8,8 +8,93 @@
  */
 
 package petstore
+import (
+	"encoding/json"
+)
 
 type EnumArrays struct {
-	JustSymbol string `json:"just_symbol,omitempty"`
-	ArrayEnum []string `json:"array_enum,omitempty"`
+	JustSymbol *string `json:"just_symbol,omitempty"`
+
+	ArrayEnum *[]string `json:"array_enum,omitempty"`
+
 }
+
+// GetJustSymbol returns the JustSymbol field if non-nil, zero value otherwise.
+func (o *EnumArrays) GetJustSymbol() string {
+	if o == nil || o.JustSymbol == nil {
+		var ret string
+		return ret
+	}
+	return *o.JustSymbol
+}
+
+// GetJustSymbolOk returns a tuple with the JustSymbol field if it's non-nil, zero value otherwise
+// and a boolean to check if the value has been set.
+func (o *EnumArrays) GetJustSymbolOk() (string, bool) {
+	if o == nil || o.JustSymbol == nil {
+		var ret string
+		return ret, false
+	}
+	return *o.JustSymbol, true
+}
+
+// HasJustSymbol returns a boolean if a field has been set.
+func (o *EnumArrays) HasJustSymbol() bool {
+	if o != nil && o.JustSymbol != nil {
+		return true
+	}
+
+	return false
+}
+
+// SetJustSymbol gets a reference to the given string and assigns it to the JustSymbol field.
+func (o *EnumArrays) SetJustSymbol(v string) {
+	o.JustSymbol = &v
+}
+
+// GetArrayEnum returns the ArrayEnum field if non-nil, zero value otherwise.
+func (o *EnumArrays) GetArrayEnum() []string {
+	if o == nil || o.ArrayEnum == nil {
+		var ret []string
+		return ret
+	}
+	return *o.ArrayEnum
+}
+
+// GetArrayEnumOk returns a tuple with the ArrayEnum field if it's non-nil, zero value otherwise
+// and a boolean to check if the value has been set.
+func (o *EnumArrays) GetArrayEnumOk() ([]string, bool) {
+	if o == nil || o.ArrayEnum == nil {
+		var ret []string
+		return ret, false
+	}
+	return *o.ArrayEnum, true
+}
+
+// HasArrayEnum returns a boolean if a field has been set.
+func (o *EnumArrays) HasArrayEnum() bool {
+	if o != nil && o.ArrayEnum != nil {
+		return true
+	}
+
+	return false
+}
+
+// SetArrayEnum gets a reference to the given []string and assigns it to the ArrayEnum field.
+func (o *EnumArrays) SetArrayEnum(v []string) {
+	o.ArrayEnum = &v
+}
+
+
+func (o EnumArrays) MarshalJSON() ([]byte, error) {
+	toSerialize := map[string]interface{}{}
+	if o.JustSymbol != nil {
+		toSerialize["just_symbol"] = o.JustSymbol
+	}
+	if o.ArrayEnum != nil {
+		toSerialize["array_enum"] = o.ArrayEnum
+	}
+	return json.Marshal(toSerialize)
+}
+
+
diff --git a/samples/client/petstore/go-experimental/go-petstore/model_enum_class.go b/samples/client/petstore/go-experimental/go-petstore/model_enum_class.go
index 534ce43288..b52d109542 100644
--- a/samples/client/petstore/go-experimental/go-petstore/model_enum_class.go
+++ b/samples/client/petstore/go-experimental/go-petstore/model_enum_class.go
@@ -15,4 +15,5 @@ const (
 	ABC EnumClass = "_abc"
 	EFG EnumClass = "-efg"
 	XYZ EnumClass = "(xyz)"
-)
\ No newline at end of file
+)
+
diff --git a/samples/client/petstore/go-experimental/go-petstore/model_enum_test_.go b/samples/client/petstore/go-experimental/go-petstore/model_enum_test_.go
index f85f31501a..1e9f8a449e 100644
--- a/samples/client/petstore/go-experimental/go-petstore/model_enum_test_.go
+++ b/samples/client/petstore/go-experimental/go-petstore/model_enum_test_.go
@@ -8,11 +8,211 @@
  */
 
 package petstore
+import (
+	"encoding/json"
+	"errors"
+)
 
 type EnumTest struct {
-	EnumString string `json:"enum_string,omitempty"`
-	EnumStringRequired string `json:"enum_string_required"`
-	EnumInteger int32 `json:"enum_integer,omitempty"`
-	EnumNumber float64 `json:"enum_number,omitempty"`
-	OuterEnum OuterEnum `json:"outerEnum,omitempty"`
+	EnumString *string `json:"enum_string,omitempty"`
+
+	EnumStringRequired *string `json:"enum_string_required,omitempty"`
+
+	EnumInteger *int32 `json:"enum_integer,omitempty"`
+
+	EnumNumber *float64 `json:"enum_number,omitempty"`
+
+	OuterEnum *OuterEnum `json:"outerEnum,omitempty"`
+
 }
+
+// GetEnumString returns the EnumString field if non-nil, zero value otherwise.
+func (o *EnumTest) GetEnumString() string {
+	if o == nil || o.EnumString == nil {
+		var ret string
+		return ret
+	}
+	return *o.EnumString
+}
+
+// GetEnumStringOk returns a tuple with the EnumString field if it's non-nil, zero value otherwise
+// and a boolean to check if the value has been set.
+func (o *EnumTest) GetEnumStringOk() (string, bool) {
+	if o == nil || o.EnumString == nil {
+		var ret string
+		return ret, false
+	}
+	return *o.EnumString, true
+}
+
+// HasEnumString returns a boolean if a field has been set.
+func (o *EnumTest) HasEnumString() bool {
+	if o != nil && o.EnumString != nil {
+		return true
+	}
+
+	return false
+}
+
+// SetEnumString gets a reference to the given string and assigns it to the EnumString field.
+func (o *EnumTest) SetEnumString(v string) {
+	o.EnumString = &v
+}
+
+// GetEnumStringRequired returns the EnumStringRequired field if non-nil, zero value otherwise.
+func (o *EnumTest) GetEnumStringRequired() string {
+	if o == nil || o.EnumStringRequired == nil {
+		var ret string
+		return ret
+	}
+	return *o.EnumStringRequired
+}
+
+// GetEnumStringRequiredOk returns a tuple with the EnumStringRequired field if it's non-nil, zero value otherwise
+// and a boolean to check if the value has been set.
+func (o *EnumTest) GetEnumStringRequiredOk() (string, bool) {
+	if o == nil || o.EnumStringRequired == nil {
+		var ret string
+		return ret, false
+	}
+	return *o.EnumStringRequired, true
+}
+
+// HasEnumStringRequired returns a boolean if a field has been set.
+func (o *EnumTest) HasEnumStringRequired() bool {
+	if o != nil && o.EnumStringRequired != nil {
+		return true
+	}
+
+	return false
+}
+
+// SetEnumStringRequired gets a reference to the given string and assigns it to the EnumStringRequired field.
+func (o *EnumTest) SetEnumStringRequired(v string) {
+	o.EnumStringRequired = &v
+}
+
+// GetEnumInteger returns the EnumInteger field if non-nil, zero value otherwise.
+func (o *EnumTest) GetEnumInteger() int32 {
+	if o == nil || o.EnumInteger == nil {
+		var ret int32
+		return ret
+	}
+	return *o.EnumInteger
+}
+
+// GetEnumIntegerOk returns a tuple with the EnumInteger field if it's non-nil, zero value otherwise
+// and a boolean to check if the value has been set.
+func (o *EnumTest) GetEnumIntegerOk() (int32, bool) {
+	if o == nil || o.EnumInteger == nil {
+		var ret int32
+		return ret, false
+	}
+	return *o.EnumInteger, true
+}
+
+// HasEnumInteger returns a boolean if a field has been set.
+func (o *EnumTest) HasEnumInteger() bool {
+	if o != nil && o.EnumInteger != nil {
+		return true
+	}
+
+	return false
+}
+
+// SetEnumInteger gets a reference to the given int32 and assigns it to the EnumInteger field.
+func (o *EnumTest) SetEnumInteger(v int32) {
+	o.EnumInteger = &v
+}
+
+// GetEnumNumber returns the EnumNumber field if non-nil, zero value otherwise.
+func (o *EnumTest) GetEnumNumber() float64 {
+	if o == nil || o.EnumNumber == nil {
+		var ret float64
+		return ret
+	}
+	return *o.EnumNumber
+}
+
+// GetEnumNumberOk returns a tuple with the EnumNumber field if it's non-nil, zero value otherwise
+// and a boolean to check if the value has been set.
+func (o *EnumTest) GetEnumNumberOk() (float64, bool) {
+	if o == nil || o.EnumNumber == nil {
+		var ret float64
+		return ret, false
+	}
+	return *o.EnumNumber, true
+}
+
+// HasEnumNumber returns a boolean if a field has been set.
+func (o *EnumTest) HasEnumNumber() bool {
+	if o != nil && o.EnumNumber != nil {
+		return true
+	}
+
+	return false
+}
+
+// SetEnumNumber gets a reference to the given float64 and assigns it to the EnumNumber field.
+func (o *EnumTest) SetEnumNumber(v float64) {
+	o.EnumNumber = &v
+}
+
+// GetOuterEnum returns the OuterEnum field if non-nil, zero value otherwise.
+func (o *EnumTest) GetOuterEnum() OuterEnum {
+	if o == nil || o.OuterEnum == nil {
+		var ret OuterEnum
+		return ret
+	}
+	return *o.OuterEnum
+}
+
+// GetOuterEnumOk returns a tuple with the OuterEnum field if it's non-nil, zero value otherwise
+// and a boolean to check if the value has been set.
+func (o *EnumTest) GetOuterEnumOk() (OuterEnum, bool) {
+	if o == nil || o.OuterEnum == nil {
+		var ret OuterEnum
+		return ret, false
+	}
+	return *o.OuterEnum, true
+}
+
+// HasOuterEnum returns a boolean if a field has been set.
+func (o *EnumTest) HasOuterEnum() bool {
+	if o != nil && o.OuterEnum != nil {
+		return true
+	}
+
+	return false
+}
+
+// SetOuterEnum gets a reference to the given OuterEnum and assigns it to the OuterEnum field.
+func (o *EnumTest) SetOuterEnum(v OuterEnum) {
+	o.OuterEnum = &v
+}
+
+
+func (o EnumTest) MarshalJSON() ([]byte, error) {
+	toSerialize := map[string]interface{}{}
+	if o.EnumString != nil {
+		toSerialize["enum_string"] = o.EnumString
+	}
+	if o.EnumStringRequired == nil {
+		return nil, errors.New("EnumStringRequired is required and not nullable, but was not set on EnumTest")
+	}
+	if o.EnumStringRequired != nil {
+		toSerialize["enum_string_required"] = o.EnumStringRequired
+	}
+	if o.EnumInteger != nil {
+		toSerialize["enum_integer"] = o.EnumInteger
+	}
+	if o.EnumNumber != nil {
+		toSerialize["enum_number"] = o.EnumNumber
+	}
+	if o.OuterEnum != nil {
+		toSerialize["outerEnum"] = o.OuterEnum
+	}
+	return json.Marshal(toSerialize)
+}
+
+
diff --git a/samples/client/petstore/go-experimental/go-petstore/model_file.go b/samples/client/petstore/go-experimental/go-petstore/model_file.go
index 2782ccc9a2..4968739ef4 100644
--- a/samples/client/petstore/go-experimental/go-petstore/model_file.go
+++ b/samples/client/petstore/go-experimental/go-petstore/model_file.go
@@ -8,9 +8,57 @@
  */
 
 package petstore
+import (
+	"encoding/json"
+)
 
 // Must be named `File` for test.
 type File struct {
 	// Test capitalization
-	SourceURI string `json:"sourceURI,omitempty"`
+	SourceURI *string `json:"sourceURI,omitempty"`
+
 }
+
+// GetSourceURI returns the SourceURI field if non-nil, zero value otherwise.
+func (o *File) GetSourceURI() string {
+	if o == nil || o.SourceURI == nil {
+		var ret string
+		return ret
+	}
+	return *o.SourceURI
+}
+
+// GetSourceURIOk returns a tuple with the SourceURI field if it's non-nil, zero value otherwise
+// and a boolean to check if the value has been set.
+func (o *File) GetSourceURIOk() (string, bool) {
+	if o == nil || o.SourceURI == nil {
+		var ret string
+		return ret, false
+	}
+	return *o.SourceURI, true
+}
+
+// HasSourceURI returns a boolean if a field has been set.
+func (o *File) HasSourceURI() bool {
+	if o != nil && o.SourceURI != nil {
+		return true
+	}
+
+	return false
+}
+
+// SetSourceURI gets a reference to the given string and assigns it to the SourceURI field.
+func (o *File) SetSourceURI(v string) {
+	o.SourceURI = &v
+}
+
+
+func (o File) MarshalJSON() ([]byte, error) {
+	toSerialize := map[string]interface{}{}
+	if o.SourceURI != nil {
+		toSerialize["sourceURI"] = o.SourceURI
+	}
+	return json.Marshal(toSerialize)
+}
+
+
diff --git a/samples/client/petstore/go-experimental/go-petstore/model_file_schema_test_class.go b/samples/client/petstore/go-experimental/go-petstore/model_file_schema_test_class.go
index 487f766c64..16cd67f29d 100644
--- a/samples/client/petstore/go-experimental/go-petstore/model_file_schema_test_class.go
+++ b/samples/client/petstore/go-experimental/go-petstore/model_file_schema_test_class.go
@@ -8,8 +8,93 @@
  */
 
 package petstore
+import (
+	"encoding/json"
+)
 
 type FileSchemaTestClass struct {
-	File File `json:"file,omitempty"`
-	Files []File `json:"files,omitempty"`
+	File *File `json:"file,omitempty"`
+
+	Files *[]File `json:"files,omitempty"`
+
 }
+
+// GetFile returns the File field if non-nil, zero value otherwise.
+func (o *FileSchemaTestClass) GetFile() File {
+	if o == nil || o.File == nil {
+		var ret File
+		return ret
+	}
+	return *o.File
+}
+
+// GetFileOk returns a tuple with the File field if it's non-nil, zero value otherwise
+// and a boolean to check if the value has been set.
+func (o *FileSchemaTestClass) GetFileOk() (File, bool) {
+	if o == nil || o.File == nil {
+		var ret File
+		return ret, false
+	}
+	return *o.File, true
+}
+
+// HasFile returns a boolean if a field has been set.
+func (o *FileSchemaTestClass) HasFile() bool {
+	if o != nil && o.File != nil {
+		return true
+	}
+
+	return false
+}
+
+// SetFile gets a reference to the given File and assigns it to the File field.
+func (o *FileSchemaTestClass) SetFile(v File) {
+	o.File = &v
+}
+
+// GetFiles returns the Files field if non-nil, zero value otherwise.
+func (o *FileSchemaTestClass) GetFiles() []File {
+	if o == nil || o.Files == nil {
+		var ret []File
+		return ret
+	}
+	return *o.Files
+}
+
+// GetFilesOk returns a tuple with the Files field if it's non-nil, zero value otherwise
+// and a boolean to check if the value has been set.
+func (o *FileSchemaTestClass) GetFilesOk() ([]File, bool) {
+	if o == nil || o.Files == nil {
+		var ret []File
+		return ret, false
+	}
+	return *o.Files, true
+}
+
+// HasFiles returns a boolean if a field has been set.
+func (o *FileSchemaTestClass) HasFiles() bool {
+	if o != nil && o.Files != nil {
+		return true
+	}
+
+	return false
+}
+
+// SetFiles gets a reference to the given []File and assigns it to the Files field.
+func (o *FileSchemaTestClass) SetFiles(v []File) {
+	o.Files = &v
+}
+
+
+func (o FileSchemaTestClass) MarshalJSON() ([]byte, error) {
+	toSerialize := map[string]interface{}{}
+	if o.File != nil {
+		toSerialize["file"] = o.File
+	}
+	if o.Files != nil {
+		toSerialize["files"] = o.Files
+	}
+	return json.Marshal(toSerialize)
+}
+
+
diff --git a/samples/client/petstore/go-experimental/go-petstore/model_format_test_.go b/samples/client/petstore/go-experimental/go-petstore/model_format_test_.go
index d723bdfee3..5532e92477 100644
--- a/samples/client/petstore/go-experimental/go-petstore/model_format_test_.go
+++ b/samples/client/petstore/go-experimental/go-petstore/model_format_test_.go
@@ -11,20 +11,523 @@ package petstore
 import (
 	"os"
 	"time"
+	"encoding/json"
+	"errors"
 )
 
 type FormatTest struct {
-	Integer int32 `json:"integer,omitempty"`
-	Int32 int32 `json:"int32,omitempty"`
-	Int64 int64 `json:"int64,omitempty"`
-	Number float32 `json:"number"`
-	Float float32 `json:"float,omitempty"`
-	Double float64 `json:"double,omitempty"`
-	String string `json:"string,omitempty"`
-	Byte string `json:"byte"`
-	Binary *os.File `json:"binary,omitempty"`
-	Date string `json:"date"`
-	DateTime time.Time `json:"dateTime,omitempty"`
-	Uuid string `json:"uuid,omitempty"`
-	Password string `json:"password"`
+	Integer *int32 `json:"integer,omitempty"`
+
+	Int32 *int32 `json:"int32,omitempty"`
+
+	Int64 *int64 `json:"int64,omitempty"`
+
+	Number *float32 `json:"number,omitempty"`
+
+	Float *float32 `json:"float,omitempty"`
+
+	Double *float64 `json:"double,omitempty"`
+
+	String *string `json:"string,omitempty"`
+
+	Byte *string `json:"byte,omitempty"`
+
+	Binary **os.File `json:"binary,omitempty"`
+
+	Date *string `json:"date,omitempty"`
+
+	DateTime *time.Time `json:"dateTime,omitempty"`
+
+	Uuid *string `json:"uuid,omitempty"`
+
+	Password *string `json:"password,omitempty"`
+
 }
+
+// GetInteger returns the Integer field if non-nil, zero value otherwise.
+func (o *FormatTest) GetInteger() int32 {
+	if o == nil || o.Integer == nil {
+		var ret int32
+		return ret
+	}
+	return *o.Integer
+}
+
+// GetIntegerOk returns a tuple with the Integer field if it's non-nil, zero value otherwise
+// and a boolean to check if the value has been set.
+func (o *FormatTest) GetIntegerOk() (int32, bool) {
+	if o == nil || o.Integer == nil {
+		var ret int32
+		return ret, false
+	}
+	return *o.Integer, true
+}
+
+// HasInteger returns a boolean if a field has been set.
+func (o *FormatTest) HasInteger() bool {
+	if o != nil && o.Integer != nil {
+		return true
+	}
+
+	return false
+}
+
+// SetInteger gets a reference to the given int32 and assigns it to the Integer field.
+func (o *FormatTest) SetInteger(v int32) {
+	o.Integer = &v
+}
+
+// GetInt32 returns the Int32 field if non-nil, zero value otherwise.
+func (o *FormatTest) GetInt32() int32 {
+	if o == nil || o.Int32 == nil {
+		var ret int32
+		return ret
+	}
+	return *o.Int32
+}
+
+// GetInt32Ok returns a tuple with the Int32 field if it's non-nil, zero value otherwise
+// and a boolean to check if the value has been set.
+func (o *FormatTest) GetInt32Ok() (int32, bool) {
+	if o == nil || o.Int32 == nil {
+		var ret int32
+		return ret, false
+	}
+	return *o.Int32, true
+}
+
+// HasInt32 returns a boolean if a field has been set.
+func (o *FormatTest) HasInt32() bool {
+	if o != nil && o.Int32 != nil {
+		return true
+	}
+
+	return false
+}
+
+// SetInt32 gets a reference to the given int32 and assigns it to the Int32 field.
+func (o *FormatTest) SetInt32(v int32) {
+	o.Int32 = &v
+}
+
+// GetInt64 returns the Int64 field if non-nil, zero value otherwise.
+func (o *FormatTest) GetInt64() int64 {
+	if o == nil || o.Int64 == nil {
+		var ret int64
+		return ret
+	}
+	return *o.Int64
+}
+
+// GetInt64Ok returns a tuple with the Int64 field if it's non-nil, zero value otherwise
+// and a boolean to check if the value has been set.
+func (o *FormatTest) GetInt64Ok() (int64, bool) {
+	if o == nil || o.Int64 == nil {
+		var ret int64
+		return ret, false
+	}
+	return *o.Int64, true
+}
+
+// HasInt64 returns a boolean if a field has been set.
+func (o *FormatTest) HasInt64() bool {
+	if o != nil && o.Int64 != nil {
+		return true
+	}
+
+	return false
+}
+
+// SetInt64 gets a reference to the given int64 and assigns it to the Int64 field.
+func (o *FormatTest) SetInt64(v int64) {
+	o.Int64 = &v
+}
+
+// GetNumber returns the Number field if non-nil, zero value otherwise.
+func (o *FormatTest) GetNumber() float32 {
+	if o == nil || o.Number == nil {
+		var ret float32
+		return ret
+	}
+	return *o.Number
+}
+
+// GetNumberOk returns a tuple with the Number field if it's non-nil, zero value otherwise
+// and a boolean to check if the value has been set.
+func (o *FormatTest) GetNumberOk() (float32, bool) {
+	if o == nil || o.Number == nil {
+		var ret float32
+		return ret, false
+	}
+	return *o.Number, true
+}
+
+// HasNumber returns a boolean if a field has been set.
+func (o *FormatTest) HasNumber() bool {
+	if o != nil && o.Number != nil {
+		return true
+	}
+
+	return false
+}
+
+// SetNumber gets a reference to the given float32 and assigns it to the Number field.
+func (o *FormatTest) SetNumber(v float32) {
+	o.Number = &v
+}
+
+// GetFloat returns the Float field if non-nil, zero value otherwise.
+func (o *FormatTest) GetFloat() float32 {
+	if o == nil || o.Float == nil {
+		var ret float32
+		return ret
+	}
+	return *o.Float
+}
+
+// GetFloatOk returns a tuple with the Float field if it's non-nil, zero value otherwise
+// and a boolean to check if the value has been set.
+func (o *FormatTest) GetFloatOk() (float32, bool) {
+	if o == nil || o.Float == nil {
+		var ret float32
+		return ret, false
+	}
+	return *o.Float, true
+}
+
+// HasFloat returns a boolean if a field has been set.
+func (o *FormatTest) HasFloat() bool {
+	if o != nil && o.Float != nil {
+		return true
+	}
+
+	return false
+}
+
+// SetFloat gets a reference to the given float32 and assigns it to the Float field.
+func (o *FormatTest) SetFloat(v float32) {
+	o.Float = &v
+}
+
+// GetDouble returns the Double field if non-nil, zero value otherwise.
+func (o *FormatTest) GetDouble() float64 {
+	if o == nil || o.Double == nil {
+		var ret float64
+		return ret
+	}
+	return *o.Double
+}
+
+// GetDoubleOk returns a tuple with the Double field if it's non-nil, zero value otherwise
+// and a boolean to check if the value has been set.
+func (o *FormatTest) GetDoubleOk() (float64, bool) {
+	if o == nil || o.Double == nil {
+		var ret float64
+		return ret, false
+	}
+	return *o.Double, true
+}
+
+// HasDouble returns a boolean if a field has been set.
+func (o *FormatTest) HasDouble() bool {
+	if o != nil && o.Double != nil {
+		return true
+	}
+
+	return false
+}
+
+// SetDouble gets a reference to the given float64 and assigns it to the Double field.
+func (o *FormatTest) SetDouble(v float64) {
+	o.Double = &v
+}
+
+// GetString returns the String field if non-nil, zero value otherwise.
+func (o *FormatTest) GetString() string {
+	if o == nil || o.String == nil {
+		var ret string
+		return ret
+	}
+	return *o.String
+}
+
+// GetStringOk returns a tuple with the String field if it's non-nil, zero value otherwise
+// and a boolean to check if the value has been set.
+func (o *FormatTest) GetStringOk() (string, bool) {
+	if o == nil || o.String == nil {
+		var ret string
+		return ret, false
+	}
+	return *o.String, true
+}
+
+// HasString returns a boolean if a field has been set.
+func (o *FormatTest) HasString() bool {
+	if o != nil && o.String != nil {
+		return true
+	}
+
+	return false
+}
+
+// SetString gets a reference to the given string and assigns it to the String field.
+func (o *FormatTest) SetString(v string) {
+	o.String = &v
+}
+
+// GetByte returns the Byte field if non-nil, zero value otherwise.
+func (o *FormatTest) GetByte() string {
+	if o == nil || o.Byte == nil {
+		var ret string
+		return ret
+	}
+	return *o.Byte
+}
+
+// GetByteOk returns a tuple with the Byte field if it's non-nil, zero value otherwise
+// and a boolean to check if the value has been set.
+func (o *FormatTest) GetByteOk() (string, bool) {
+	if o == nil || o.Byte == nil {
+		var ret string
+		return ret, false
+	}
+	return *o.Byte, true
+}
+
+// HasByte returns a boolean if a field has been set.
+func (o *FormatTest) HasByte() bool {
+	if o != nil && o.Byte != nil {
+		return true
+	}
+
+	return false
+}
+
+// SetByte gets a reference to the given string and assigns it to the Byte field.
+func (o *FormatTest) SetByte(v string) {
+	o.Byte = &v
+}
+
+// GetBinary returns the Binary field if non-nil, zero value otherwise.
+func (o *FormatTest) GetBinary() *os.File {
+	if o == nil || o.Binary == nil {
+		var ret *os.File
+		return ret
+	}
+	return *o.Binary
+}
+
+// GetBinaryOk returns a tuple with the Binary field if it's non-nil, zero value otherwise
+// and a boolean to check if the value has been set.
+func (o *FormatTest) GetBinaryOk() (*os.File, bool) {
+	if o == nil || o.Binary == nil {
+		var ret *os.File
+		return ret, false
+	}
+	return *o.Binary, true
+}
+
+// HasBinary returns a boolean if a field has been set.
+func (o *FormatTest) HasBinary() bool {
+	if o != nil && o.Binary != nil {
+		return true
+	}
+
+	return false
+}
+
+// SetBinary gets a reference to the given *os.File and assigns it to the Binary field.
+func (o *FormatTest) SetBinary(v *os.File) {
+	o.Binary = &v
+}
+
+// GetDate returns the Date field if non-nil, zero value otherwise.
+func (o *FormatTest) GetDate() string {
+	if o == nil || o.Date == nil {
+		var ret string
+		return ret
+	}
+	return *o.Date
+}
+
+// GetDateOk returns a tuple with the Date field if it's non-nil, zero value otherwise
+// and a boolean to check if the value has been set.
+func (o *FormatTest) GetDateOk() (string, bool) {
+	if o == nil || o.Date == nil {
+		var ret string
+		return ret, false
+	}
+	return *o.Date, true
+}
+
+// HasDate returns a boolean if a field has been set.
+func (o *FormatTest) HasDate() bool {
+	if o != nil && o.Date != nil {
+		return true
+	}
+
+	return false
+}
+
+// SetDate gets a reference to the given string and assigns it to the Date field.
+func (o *FormatTest) SetDate(v string) {
+	o.Date = &v
+}
+
+// GetDateTime returns the DateTime field if non-nil, zero value otherwise.
+func (o *FormatTest) GetDateTime() time.Time {
+	if o == nil || o.DateTime == nil {
+		var ret time.Time
+		return ret
+	}
+	return *o.DateTime
+}
+
+// GetDateTimeOk returns a tuple with the DateTime field if it's non-nil, zero value otherwise
+// and a boolean to check if the value has been set.
+func (o *FormatTest) GetDateTimeOk() (time.Time, bool) {
+	if o == nil || o.DateTime == nil {
+		var ret time.Time
+		return ret, false
+	}
+	return *o.DateTime, true
+}
+
+// HasDateTime returns a boolean if a field has been set.
+func (o *FormatTest) HasDateTime() bool {
+	if o != nil && o.DateTime != nil {
+		return true
+	}
+
+	return false
+}
+
+// SetDateTime gets a reference to the given time.Time and assigns it to the DateTime field.
+func (o *FormatTest) SetDateTime(v time.Time) {
+	o.DateTime = &v
+}
+
+// GetUuid returns the Uuid field if non-nil, zero value otherwise.
+func (o *FormatTest) GetUuid() string {
+	if o == nil || o.Uuid == nil {
+		var ret string
+		return ret
+	}
+	return *o.Uuid
+}
+
+// GetUuidOk returns a tuple with the Uuid field if it's non-nil, zero value otherwise
+// and a boolean to check if the value has been set.
+func (o *FormatTest) GetUuidOk() (string, bool) {
+	if o == nil || o.Uuid == nil {
+		var ret string
+		return ret, false
+	}
+	return *o.Uuid, true
+}
+
+// HasUuid returns a boolean if a field has been set.
+func (o *FormatTest) HasUuid() bool {
+	if o != nil && o.Uuid != nil {
+		return true
+	}
+
+	return false
+}
+
+// SetUuid gets a reference to the given string and assigns it to the Uuid field.
+func (o *FormatTest) SetUuid(v string) {
+	o.Uuid = &v
+}
+
+// GetPassword returns the Password field if non-nil, zero value otherwise.
+func (o *FormatTest) GetPassword() string {
+	if o == nil || o.Password == nil {
+		var ret string
+		return ret
+	}
+	return *o.Password
+}
+
+// GetPasswordOk returns a tuple with the Password field if it's non-nil, zero value otherwise
+// and a boolean to check if the value has been set.
+func (o *FormatTest) GetPasswordOk() (string, bool) {
+	if o == nil || o.Password == nil {
+		var ret string
+		return ret, false
+	}
+	return *o.Password, true
+}
+
+// HasPassword returns a boolean if a field has been set.
+func (o *FormatTest) HasPassword() bool {
+	if o != nil && o.Password != nil {
+		return true
+	}
+
+	return false
+}
+
+// SetPassword gets a reference to the given string and assigns it to the Password field.
+func (o *FormatTest) SetPassword(v string) {
+	o.Password = &v
+}
+
+
+func (o FormatTest) MarshalJSON() ([]byte, error) {
+	toSerialize := map[string]interface{}{}
+	if o.Integer != nil {
+		toSerialize["integer"] = o.Integer
+	}
+	if o.Int32 != nil {
+		toSerialize["int32"] = o.Int32
+	}
+	if o.Int64 != nil {
+		toSerialize["int64"] = o.Int64
+	}
+	if o.Number == nil {
+		return nil, errors.New("Number is required and not nullable, but was not set on FormatTest")
+	}
+	if o.Number != nil {
+		toSerialize["number"] = o.Number
+	}
+	if o.Float != nil {
+		toSerialize["float"] = o.Float
+	}
+	if o.Double != nil {
+		toSerialize["double"] = o.Double
+	}
+	if o.String != nil {
+		toSerialize["string"] = o.String
+	}
+	if o.Byte == nil {
+		return nil, errors.New("Byte is required and not nullable, but was not set on FormatTest")
+	}
+	if o.Byte != nil {
+		toSerialize["byte"] = o.Byte
+	}
+	if o.Binary != nil {
+		toSerialize["binary"] = o.Binary
+	}
+	if o.Date == nil {
+		return nil, errors.New("Date is required and not nullable, but was not set on FormatTest")
+	}
+	if o.Date != nil {
+		toSerialize["date"] = o.Date
+	}
+	if o.DateTime != nil {
+		toSerialize["dateTime"] = o.DateTime
+	}
+	if o.Uuid != nil {
+		toSerialize["uuid"] = o.Uuid
+	}
+	if o.Password == nil {
+		return nil, errors.New("Password is required and not nullable, but was not set on FormatTest")
+	}
+	if o.Password != nil {
+		toSerialize["password"] = o.Password
+	}
+	return json.Marshal(toSerialize)
+}
+
+
diff --git a/samples/client/petstore/go-experimental/go-petstore/model_has_only_read_only.go b/samples/client/petstore/go-experimental/go-petstore/model_has_only_read_only.go
index 1cf0e4f530..1b03286159 100644
--- a/samples/client/petstore/go-experimental/go-petstore/model_has_only_read_only.go
+++ b/samples/client/petstore/go-experimental/go-petstore/model_has_only_read_only.go
@@ -8,8 +8,93 @@
  */
 
 package petstore
+import (
+	"encoding/json"
+)
 
 type HasOnlyReadOnly struct {
-	Bar string `json:"bar,omitempty"`
-	Foo string `json:"foo,omitempty"`
+	Bar *string `json:"bar,omitempty"`
+
+	Foo *string `json:"foo,omitempty"`
+
 }
+
+// GetBar returns the Bar field if non-nil, zero value otherwise.
+func (o *HasOnlyReadOnly) GetBar() string {
+	if o == nil || o.Bar == nil {
+		var ret string
+		return ret
+	}
+	return *o.Bar
+}
+
+// GetBarOk returns a tuple with the Bar field if it's non-nil, zero value otherwise
+// and a boolean to check if the value has been set.
+func (o *HasOnlyReadOnly) GetBarOk() (string, bool) {
+	if o == nil || o.Bar == nil {
+		var ret string
+		return ret, false
+	}
+	return *o.Bar, true
+}
+
+// HasBar returns a boolean if a field has been set.
+func (o *HasOnlyReadOnly) HasBar() bool {
+	if o != nil && o.Bar != nil {
+		return true
+	}
+
+	return false
+}
+
+// SetBar gets a reference to the given string and assigns it to the Bar field.
+func (o *HasOnlyReadOnly) SetBar(v string) {
+	o.Bar = &v
+}
+
+// GetFoo returns the Foo field if non-nil, zero value otherwise.
+func (o *HasOnlyReadOnly) GetFoo() string {
+	if o == nil || o.Foo == nil {
+		var ret string
+		return ret
+	}
+	return *o.Foo
+}
+
+// GetFooOk returns a tuple with the Foo field if it's non-nil, zero value otherwise
+// and a boolean to check if the value has been set.
+func (o *HasOnlyReadOnly) GetFooOk() (string, bool) {
+	if o == nil || o.Foo == nil {
+		var ret string
+		return ret, false
+	}
+	return *o.Foo, true
+}
+
+// HasFoo returns a boolean if a field has been set.
+func (o *HasOnlyReadOnly) HasFoo() bool {
+	if o != nil && o.Foo != nil {
+		return true
+	}
+
+	return false
+}
+
+// SetFoo gets a reference to the given string and assigns it to the Foo field.
+func (o *HasOnlyReadOnly) SetFoo(v string) {
+	o.Foo = &v
+}
+
+
+func (o HasOnlyReadOnly) MarshalJSON() ([]byte, error) {
+	toSerialize := map[string]interface{}{}
+	if o.Bar != nil {
+		toSerialize["bar"] = o.Bar
+	}
+	if o.Foo != nil {
+		toSerialize["foo"] = o.Foo
+	}
+	return json.Marshal(toSerialize)
+}
+
+
diff --git a/samples/client/petstore/go-experimental/go-petstore/model_list.go b/samples/client/petstore/go-experimental/go-petstore/model_list.go
index 12f3bd3f66..5c9d4df5c9 100644
--- a/samples/client/petstore/go-experimental/go-petstore/model_list.go
+++ b/samples/client/petstore/go-experimental/go-petstore/model_list.go
@@ -8,7 +8,55 @@
  */
 
 package petstore
+import (
+	"encoding/json"
+)
 
 type List struct {
-	Var123List string `json:"123-list,omitempty"`
+	Var123List *string `json:"123-list,omitempty"`
+
 }
+
+// GetVar123List returns the Var123List field if non-nil, zero value otherwise.
+func (o *List) GetVar123List() string {
+	if o == nil || o.Var123List == nil {
+		var ret string
+		return ret
+	}
+	return *o.Var123List
+}
+
+// GetVar123ListOk returns a tuple with the Var123List field if it's non-nil, zero value otherwise
+// and a boolean to check if the value has been set.
+func (o *List) GetVar123ListOk() (string, bool) {
+	if o == nil || o.Var123List == nil {
+		var ret string
+		return ret, false
+	}
+	return *o.Var123List, true
+}
+
+// HasVar123List returns a boolean if a field has been set.
+func (o *List) HasVar123List() bool {
+	if o != nil && o.Var123List != nil {
+		return true
+	}
+
+	return false
+}
+
+// SetVar123List gets a reference to the given string and assigns it to the Var123List field.
+func (o *List) SetVar123List(v string) {
+	o.Var123List = &v
+}
+
+
+func (o List) MarshalJSON() ([]byte, error) {
+	toSerialize := map[string]interface{}{}
+	if o.Var123List != nil {
+		toSerialize["123-list"] = o.Var123List
+	}
+	return json.Marshal(toSerialize)
+}
+
+
diff --git a/samples/client/petstore/go-experimental/go-petstore/model_map_test_.go b/samples/client/petstore/go-experimental/go-petstore/model_map_test_.go
index 830e760fe3..3ae7b22b88 100644
--- a/samples/client/petstore/go-experimental/go-petstore/model_map_test_.go
+++ b/samples/client/petstore/go-experimental/go-petstore/model_map_test_.go
@@ -8,10 +8,169 @@
  */
 
 package petstore
+import (
+	"encoding/json"
+)
 
 type MapTest struct {
-	MapMapOfString map[string]map[string]string `json:"map_map_of_string,omitempty"`
-	MapOfEnumString map[string]string `json:"map_of_enum_string,omitempty"`
-	DirectMap map[string]bool `json:"direct_map,omitempty"`
-	IndirectMap map[string]bool `json:"indirect_map,omitempty"`
+	MapMapOfString *map[string]map[string]string `json:"map_map_of_string,omitempty"`
+
+	MapOfEnumString *map[string]string `json:"map_of_enum_string,omitempty"`
+
+	DirectMap *map[string]bool `json:"direct_map,omitempty"`
+
+	IndirectMap *map[string]bool `json:"indirect_map,omitempty"`
+
 }
+
+// GetMapMapOfString returns the MapMapOfString field if non-nil, zero value otherwise.
+func (o *MapTest) GetMapMapOfString() map[string]map[string]string {
+	if o == nil || o.MapMapOfString == nil {
+		var ret map[string]map[string]string
+		return ret
+	}
+	return *o.MapMapOfString
+}
+
+// GetMapMapOfStringOk returns a tuple with the MapMapOfString field if it's non-nil, zero value otherwise
+// and a boolean to check if the value has been set.
+func (o *MapTest) GetMapMapOfStringOk() (map[string]map[string]string, bool) {
+	if o == nil || o.MapMapOfString == nil {
+		var ret map[string]map[string]string
+		return ret, false
+	}
+	return *o.MapMapOfString, true
+}
+
+// HasMapMapOfString returns a boolean if a field has been set.
+func (o *MapTest) HasMapMapOfString() bool {
+	if o != nil && o.MapMapOfString != nil {
+		return true
+	}
+
+	return false
+}
+
+// SetMapMapOfString gets a reference to the given map[string]map[string]string and assigns it to the MapMapOfString field.
+func (o *MapTest) SetMapMapOfString(v map[string]map[string]string) {
+	o.MapMapOfString = &v
+}
+
+// GetMapOfEnumString returns the MapOfEnumString field if non-nil, zero value otherwise.
+func (o *MapTest) GetMapOfEnumString() map[string]string {
+	if o == nil || o.MapOfEnumString == nil {
+		var ret map[string]string
+		return ret
+	}
+	return *o.MapOfEnumString
+}
+
+// GetMapOfEnumStringOk returns a tuple with the MapOfEnumString field if it's non-nil, zero value otherwise
+// and a boolean to check if the value has been set.
+func (o *MapTest) GetMapOfEnumStringOk() (map[string]string, bool) {
+	if o == nil || o.MapOfEnumString == nil {
+		var ret map[string]string
+		return ret, false
+	}
+	return *o.MapOfEnumString, true
+}
+
+// HasMapOfEnumString returns a boolean if a field has been set.
+func (o *MapTest) HasMapOfEnumString() bool {
+	if o != nil && o.MapOfEnumString != nil {
+		return true
+	}
+
+	return false
+}
+
+// SetMapOfEnumString gets a reference to the given map[string]string and assigns it to the MapOfEnumString field.
+func (o *MapTest) SetMapOfEnumString(v map[string]string) {
+	o.MapOfEnumString = &v
+}
+
+// GetDirectMap returns the DirectMap field if non-nil, zero value otherwise.
+func (o *MapTest) GetDirectMap() map[string]bool {
+	if o == nil || o.DirectMap == nil {
+		var ret map[string]bool
+		return ret
+	}
+	return *o.DirectMap
+}
+
+// GetDirectMapOk returns a tuple with the DirectMap field if it's non-nil, zero value otherwise
+// and a boolean to check if the value has been set.
+func (o *MapTest) GetDirectMapOk() (map[string]bool, bool) {
+	if o == nil || o.DirectMap == nil {
+		var ret map[string]bool
+		return ret, false
+	}
+	return *o.DirectMap, true
+}
+
+// HasDirectMap returns a boolean if a field has been set.
+func (o *MapTest) HasDirectMap() bool {
+	if o != nil && o.DirectMap != nil {
+		return true
+	}
+
+	return false
+}
+
+// SetDirectMap gets a reference to the given map[string]bool and assigns it to the DirectMap field.
+func (o *MapTest) SetDirectMap(v map[string]bool) {
+	o.DirectMap = &v
+}
+
+// GetIndirectMap returns the IndirectMap field if non-nil, zero value otherwise.
+func (o *MapTest) GetIndirectMap() map[string]bool {
+	if o == nil || o.IndirectMap == nil {
+		var ret map[string]bool
+		return ret
+	}
+	return *o.IndirectMap
+}
+
+// GetIndirectMapOk returns a tuple with the IndirectMap field if it's non-nil, zero value otherwise
+// and a boolean to check if the value has been set.
+func (o *MapTest) GetIndirectMapOk() (map[string]bool, bool) {
+	if o == nil || o.IndirectMap == nil {
+		var ret map[string]bool
+		return ret, false
+	}
+	return *o.IndirectMap, true
+}
+
+// HasIndirectMap returns a boolean if a field has been set.
+func (o *MapTest) HasIndirectMap() bool {
+	if o != nil && o.IndirectMap != nil {
+		return true
+	}
+
+	return false
+}
+
+// SetIndirectMap gets a reference to the given map[string]bool and assigns it to the IndirectMap field.
+func (o *MapTest) SetIndirectMap(v map[string]bool) {
+	o.IndirectMap = &v
+}
+
+
+func (o MapTest) MarshalJSON() ([]byte, error) {
+	toSerialize := map[string]interface{}{}
+	if o.MapMapOfString != nil {
+		toSerialize["map_map_of_string"] = o.MapMapOfString
+	}
+	if o.MapOfEnumString != nil {
+		toSerialize["map_of_enum_string"] = o.MapOfEnumString
+	}
+	if o.DirectMap != nil {
+		toSerialize["direct_map"] = o.DirectMap
+	}
+	if o.IndirectMap != nil {
+		toSerialize["indirect_map"] = o.IndirectMap
+	}
+	return json.Marshal(toSerialize)
+}
+
+
diff --git a/samples/client/petstore/go-experimental/go-petstore/model_mixed_properties_and_additional_properties_class.go b/samples/client/petstore/go-experimental/go-petstore/model_mixed_properties_and_additional_properties_class.go
index 0ad92e96f8..5dd3d1d020 100644
--- a/samples/client/petstore/go-experimental/go-petstore/model_mixed_properties_and_additional_properties_class.go
+++ b/samples/client/petstore/go-experimental/go-petstore/model_mixed_properties_and_additional_properties_class.go
@@ -10,10 +10,130 @@
 package petstore
 import (
 	"time"
+	"encoding/json"
 )
 
 type MixedPropertiesAndAdditionalPropertiesClass struct {
-	Uuid string `json:"uuid,omitempty"`
-	DateTime time.Time `json:"dateTime,omitempty"`
-	Map map[string]Animal `json:"map,omitempty"`
+	Uuid *string `json:"uuid,omitempty"`
+
+	DateTime *time.Time `json:"dateTime,omitempty"`
+
+	Map *map[string]Animal `json:"map,omitempty"`
+
 }
+
+// GetUuid returns the Uuid field if non-nil, zero value otherwise.
+func (o *MixedPropertiesAndAdditionalPropertiesClass) GetUuid() string {
+	if o == nil || o.Uuid == nil {
+		var ret string
+		return ret
+	}
+	return *o.Uuid
+}
+
+// GetUuidOk returns a tuple with the Uuid field if it's non-nil, zero value otherwise
+// and a boolean to check if the value has been set.
+func (o *MixedPropertiesAndAdditionalPropertiesClass) GetUuidOk() (string, bool) {
+	if o == nil || o.Uuid == nil {
+		var ret string
+		return ret, false
+	}
+	return *o.Uuid, true
+}
+
+// HasUuid returns a boolean if a field has been set.
+func (o *MixedPropertiesAndAdditionalPropertiesClass) HasUuid() bool {
+	if o != nil && o.Uuid != nil {
+		return true
+	}
+
+	return false
+}
+
+// SetUuid gets a reference to the given string and assigns it to the Uuid field.
+func (o *MixedPropertiesAndAdditionalPropertiesClass) SetUuid(v string) {
+	o.Uuid = &v
+}
+
+// GetDateTime returns the DateTime field if non-nil, zero value otherwise.
+func (o *MixedPropertiesAndAdditionalPropertiesClass) GetDateTime() time.Time {
+	if o == nil || o.DateTime == nil {
+		var ret time.Time
+		return ret
+	}
+	return *o.DateTime
+}
+
+// GetDateTimeOk returns a tuple with the DateTime field if it's non-nil, zero value otherwise
+// and a boolean to check if the value has been set.
+func (o *MixedPropertiesAndAdditionalPropertiesClass) GetDateTimeOk() (time.Time, bool) {
+	if o == nil || o.DateTime == nil {
+		var ret time.Time
+		return ret, false
+	}
+	return *o.DateTime, true
+}
+
+// HasDateTime returns a boolean if a field has been set.
+func (o *MixedPropertiesAndAdditionalPropertiesClass) HasDateTime() bool {
+	if o != nil && o.DateTime != nil {
+		return true
+	}
+
+	return false
+}
+
+// SetDateTime gets a reference to the given time.Time and assigns it to the DateTime field.
+func (o *MixedPropertiesAndAdditionalPropertiesClass) SetDateTime(v time.Time) {
+	o.DateTime = &v
+}
+
+// GetMap returns the Map field if non-nil, zero value otherwise.
+func (o *MixedPropertiesAndAdditionalPropertiesClass) GetMap() map[string]Animal {
+	if o == nil || o.Map == nil {
+		var ret map[string]Animal
+		return ret
+	}
+	return *o.Map
+}
+
+// GetMapOk returns a tuple with the Map field if it's non-nil, zero value otherwise
+// and a boolean to check if the value has been set.
+func (o *MixedPropertiesAndAdditionalPropertiesClass) GetMapOk() (map[string]Animal, bool) {
+	if o == nil || o.Map == nil {
+		var ret map[string]Animal
+		return ret, false
+	}
+	return *o.Map, true
+}
+
+// HasMap returns a boolean if a field has been set.
+func (o *MixedPropertiesAndAdditionalPropertiesClass) HasMap() bool {
+	if o != nil && o.Map != nil {
+		return true
+	}
+
+	return false
+}
+
+// SetMap gets a reference to the given map[string]Animal and assigns it to the Map field.
+func (o *MixedPropertiesAndAdditionalPropertiesClass) SetMap(v map[string]Animal) {
+	o.Map = &v
+}
+
+
+func (o MixedPropertiesAndAdditionalPropertiesClass) MarshalJSON() ([]byte, error) {
+	toSerialize := map[string]interface{}{}
+	if o.Uuid != nil {
+		toSerialize["uuid"] = o.Uuid
+	}
+	if o.DateTime != nil {
+		toSerialize["dateTime"] = o.DateTime
+	}
+	if o.Map != nil {
+		toSerialize["map"] = o.Map
+	}
+	return json.Marshal(toSerialize)
+}
+
+
diff --git a/samples/client/petstore/go-experimental/go-petstore/model_name.go b/samples/client/petstore/go-experimental/go-petstore/model_name.go
index dde1b92eb6..1a0addae44 100644
--- a/samples/client/petstore/go-experimental/go-petstore/model_name.go
+++ b/samples/client/petstore/go-experimental/go-petstore/model_name.go
@@ -8,11 +8,174 @@
  */
 
 package petstore
+import (
+	"encoding/json"
+	"errors"
+)
 
 // Model for testing model name same as property name
 type Name struct {
-	Name int32 `json:"name"`
-	SnakeCase int32 `json:"snake_case,omitempty"`
-	Property string `json:"property,omitempty"`
-	Var123Number int32 `json:"123Number,omitempty"`
+	Name *int32 `json:"name,omitempty"`
+
+	SnakeCase *int32 `json:"snake_case,omitempty"`
+
+	Property *string `json:"property,omitempty"`
+
+	Var123Number *int32 `json:"123Number,omitempty"`
+
 }
+
+// GetName returns the Name field if non-nil, zero value otherwise.
+func (o *Name) GetName() int32 {
+	if o == nil || o.Name == nil {
+		var ret int32
+		return ret
+	}
+	return *o.Name
+}
+
+// GetNameOk returns a tuple with the Name field if it's non-nil, zero value otherwise
+// and a boolean to check if the value has been set.
+func (o *Name) GetNameOk() (int32, bool) {
+	if o == nil || o.Name == nil {
+		var ret int32
+		return ret, false
+	}
+	return *o.Name, true
+}
+
+// HasName returns a boolean if a field has been set.
+func (o *Name) HasName() bool {
+	if o != nil && o.Name != nil {
+		return true
+	}
+
+	return false
+}
+
+// SetName gets a reference to the given int32 and assigns it to the Name field.
+func (o *Name) SetName(v int32) {
+	o.Name = &v
+}
+
+// GetSnakeCase returns the SnakeCase field if non-nil, zero value otherwise.
+func (o *Name) GetSnakeCase() int32 {
+	if o == nil || o.SnakeCase == nil {
+		var ret int32
+		return ret
+	}
+	return *o.SnakeCase
+}
+
+// GetSnakeCaseOk returns a tuple with the SnakeCase field if it's non-nil, zero value otherwise
+// and a boolean to check if the value has been set.
+func (o *Name) GetSnakeCaseOk() (int32, bool) {
+	if o == nil || o.SnakeCase == nil {
+		var ret int32
+		return ret, false
+	}
+	return *o.SnakeCase, true
+}
+
+// HasSnakeCase returns a boolean if a field has been set.
+func (o *Name) HasSnakeCase() bool {
+	if o != nil && o.SnakeCase != nil {
+		return true
+	}
+
+	return false
+}
+
+// SetSnakeCase gets a reference to the given int32 and assigns it to the SnakeCase field.
+func (o *Name) SetSnakeCase(v int32) {
+	o.SnakeCase = &v
+}
+
+// GetProperty returns the Property field if non-nil, zero value otherwise.
+func (o *Name) GetProperty() string {
+	if o == nil || o.Property == nil {
+		var ret string
+		return ret
+	}
+	return *o.Property
+}
+
+// GetPropertyOk returns a tuple with the Property field if it's non-nil, zero value otherwise
+// and a boolean to check if the value has been set.
+func (o *Name) GetPropertyOk() (string, bool) {
+	if o == nil || o.Property == nil {
+		var ret string
+		return ret, false
+	}
+	return *o.Property, true
+}
+
+// HasProperty returns a boolean if a field has been set.
+func (o *Name) HasProperty() bool {
+	if o != nil && o.Property != nil {
+		return true
+	}
+
+	return false
+}
+
+// SetProperty gets a reference to the given string and assigns it to the Property field.
+func (o *Name) SetProperty(v string) {
+	o.Property = &v
+}
+
+// GetVar123Number returns the Var123Number field if non-nil, zero value otherwise.
+func (o *Name) GetVar123Number() int32 {
+	if o == nil || o.Var123Number == nil {
+		var ret int32
+		return ret
+	}
+	return *o.Var123Number
+}
+
+// GetVar123NumberOk returns a tuple with the Var123Number field if it's non-nil, zero value otherwise
+// and a boolean to check if the value has been set.
+func (o *Name) GetVar123NumberOk() (int32, bool) {
+	if o == nil || o.Var123Number == nil {
+		var ret int32
+		return ret, false
+	}
+	return *o.Var123Number, true
+}
+
+// HasVar123Number returns a boolean if a field has been set.
+func (o *Name) HasVar123Number() bool {
+	if o != nil && o.Var123Number != nil {
+		return true
+	}
+
+	return false
+}
+
+// SetVar123Number gets a reference to the given int32 and assigns it to the Var123Number field.
+func (o *Name) SetVar123Number(v int32) {
+	o.Var123Number = &v
+}
+
+
+func (o Name) MarshalJSON() ([]byte, error) {
+	toSerialize := map[string]interface{}{}
+	if o.Name == nil {
+		return nil, errors.New("Name is required and not nullable, but was not set on Name")
+	}
+	if o.Name != nil {
+		toSerialize["name"] = o.Name
+	}
+	if o.SnakeCase != nil {
+		toSerialize["snake_case"] = o.SnakeCase
+	}
+	if o.Property != nil {
+		toSerialize["property"] = o.Property
+	}
+	if o.Var123Number != nil {
+		toSerialize["123Number"] = o.Var123Number
+	}
+	return json.Marshal(toSerialize)
+}
+
+
diff --git a/samples/client/petstore/go-experimental/go-petstore/model_number_only.go b/samples/client/petstore/go-experimental/go-petstore/model_number_only.go
index 7a2fd5fd8f..47d69c607e 100644
--- a/samples/client/petstore/go-experimental/go-petstore/model_number_only.go
+++ b/samples/client/petstore/go-experimental/go-petstore/model_number_only.go
@@ -8,7 +8,55 @@
  */
 
 package petstore
+import (
+	"encoding/json"
+)
 
 type NumberOnly struct {
-	JustNumber float32 `json:"JustNumber,omitempty"`
+	JustNumber *float32 `json:"JustNumber,omitempty"`
+
 }
+
+// GetJustNumber returns the JustNumber field if non-nil, zero value otherwise.
+func (o *NumberOnly) GetJustNumber() float32 {
+	if o == nil || o.JustNumber == nil {
+		var ret float32
+		return ret
+	}
+	return *o.JustNumber
+}
+
+// GetJustNumberOk returns a tuple with the JustNumber field if it's non-nil, zero value otherwise
+// and a boolean to check if the value has been set.
+func (o *NumberOnly) GetJustNumberOk() (float32, bool) {
+	if o == nil || o.JustNumber == nil {
+		var ret float32
+		return ret, false
+	}
+	return *o.JustNumber, true
+}
+
+// HasJustNumber returns a boolean if a field has been set.
+func (o *NumberOnly) HasJustNumber() bool {
+	if o != nil && o.JustNumber != nil {
+		return true
+	}
+
+	return false
+}
+
+// SetJustNumber gets a reference to the given float32 and assigns it to the JustNumber field.
+func (o *NumberOnly) SetJustNumber(v float32) {
+	o.JustNumber = &v
+}
+
+
+func (o NumberOnly) MarshalJSON() ([]byte, error) {
+	toSerialize := map[string]interface{}{}
+	if o.JustNumber != nil {
+		toSerialize["JustNumber"] = o.JustNumber
+	}
+	return json.Marshal(toSerialize)
+}
+
+
diff --git a/samples/client/petstore/go-experimental/go-petstore/model_order.go b/samples/client/petstore/go-experimental/go-petstore/model_order.go
index c81d67ae0f..75d9299386 100644
--- a/samples/client/petstore/go-experimental/go-petstore/model_order.go
+++ b/samples/client/petstore/go-experimental/go-petstore/model_order.go
@@ -10,14 +10,245 @@
 package petstore
 import (
 	"time"
+	"encoding/json"
 )
 
 type Order struct {
-	Id int64 `json:"id,omitempty"`
-	PetId int64 `json:"petId,omitempty"`
-	Quantity int32 `json:"quantity,omitempty"`
-	ShipDate time.Time `json:"shipDate,omitempty"`
+	Id *int64 `json:"id,omitempty"`
+
+	PetId *int64 `json:"petId,omitempty"`
+
+	Quantity *int32 `json:"quantity,omitempty"`
+
+	ShipDate *time.Time `json:"shipDate,omitempty"`
+
 	// Order Status
-	Status string `json:"status,omitempty"`
-	Complete bool `json:"complete,omitempty"`
+	Status *string `json:"status,omitempty"`
+
+	Complete *bool `json:"complete,omitempty"`
+
 }
+
+// GetId returns the Id field if non-nil, zero value otherwise.
+func (o *Order) GetId() int64 {
+	if o == nil || o.Id == nil {
+		var ret int64
+		return ret
+	}
+	return *o.Id
+}
+
+// GetIdOk returns a tuple with the Id field if it's non-nil, zero value otherwise
+// and a boolean to check if the value has been set.
+func (o *Order) GetIdOk() (int64, bool) {
+	if o == nil || o.Id == nil {
+		var ret int64
+		return ret, false
+	}
+	return *o.Id, true
+}
+
+// HasId returns a boolean if a field has been set.
+func (o *Order) HasId() bool {
+	if o != nil && o.Id != nil {
+		return true
+	}
+
+	return false
+}
+
+// SetId gets a reference to the given int64 and assigns it to the Id field.
+func (o *Order) SetId(v int64) {
+	o.Id = &v
+}
+
+// GetPetId returns the PetId field if non-nil, zero value otherwise.
+func (o *Order) GetPetId() int64 {
+	if o == nil || o.PetId == nil {
+		var ret int64
+		return ret
+	}
+	return *o.PetId
+}
+
+// GetPetIdOk returns a tuple with the PetId field if it's non-nil, zero value otherwise
+// and a boolean to check if the value has been set.
+func (o *Order) GetPetIdOk() (int64, bool) {
+	if o == nil || o.PetId == nil {
+		var ret int64
+		return ret, false
+	}
+	return *o.PetId, true
+}
+
+// HasPetId returns a boolean if a field has been set.
+func (o *Order) HasPetId() bool {
+	if o != nil && o.PetId != nil {
+		return true
+	}
+
+	return false
+}
+
+// SetPetId gets a reference to the given int64 and assigns it to the PetId field.
+func (o *Order) SetPetId(v int64) {
+	o.PetId = &v
+}
+
+// GetQuantity returns the Quantity field if non-nil, zero value otherwise.
+func (o *Order) GetQuantity() int32 {
+	if o == nil || o.Quantity == nil {
+		var ret int32
+		return ret
+	}
+	return *o.Quantity
+}
+
+// GetQuantityOk returns a tuple with the Quantity field if it's non-nil, zero value otherwise
+// and a boolean to check if the value has been set.
+func (o *Order) GetQuantityOk() (int32, bool) {
+	if o == nil || o.Quantity == nil {
+		var ret int32
+		return ret, false
+	}
+	return *o.Quantity, true
+}
+
+// HasQuantity returns a boolean if a field has been set.
+func (o *Order) HasQuantity() bool {
+	if o != nil && o.Quantity != nil {
+		return true
+	}
+
+	return false
+}
+
+// SetQuantity gets a reference to the given int32 and assigns it to the Quantity field.
+func (o *Order) SetQuantity(v int32) {
+	o.Quantity = &v
+}
+
+// GetShipDate returns the ShipDate field if non-nil, zero value otherwise.
+func (o *Order) GetShipDate() time.Time {
+	if o == nil || o.ShipDate == nil {
+		var ret time.Time
+		return ret
+	}
+	return *o.ShipDate
+}
+
+// GetShipDateOk returns a tuple with the ShipDate field if it's non-nil, zero value otherwise
+// and a boolean to check if the value has been set.
+func (o *Order) GetShipDateOk() (time.Time, bool) {
+	if o == nil || o.ShipDate == nil {
+		var ret time.Time
+		return ret, false
+	}
+	return *o.ShipDate, true
+}
+
+// HasShipDate returns a boolean if a field has been set.
+func (o *Order) HasShipDate() bool {
+	if o != nil && o.ShipDate != nil {
+		return true
+	}
+
+	return false
+}
+
+// SetShipDate gets a reference to the given time.Time and assigns it to the ShipDate field.
+func (o *Order) SetShipDate(v time.Time) {
+	o.ShipDate = &v
+}
+
+// GetStatus returns the Status field if non-nil, zero value otherwise.
+func (o *Order) GetStatus() string {
+	if o == nil || o.Status == nil {
+		var ret string
+		return ret
+	}
+	return *o.Status
+}
+
+// GetStatusOk returns a tuple with the Status field if it's non-nil, zero value otherwise
+// and a boolean to check if the value has been set.
+func (o *Order) GetStatusOk() (string, bool) {
+	if o == nil || o.Status == nil {
+		var ret string
+		return ret, false
+	}
+	return *o.Status, true
+}
+
+// HasStatus returns a boolean if a field has been set.
+func (o *Order) HasStatus() bool {
+	if o != nil && o.Status != nil {
+		return true
+	}
+
+	return false
+}
+
+// SetStatus gets a reference to the given string and assigns it to the Status field.
+func (o *Order) SetStatus(v string) {
+	o.Status = &v
+}
+
+// GetComplete returns the Complete field if non-nil, zero value otherwise.
+func (o *Order) GetComplete() bool {
+	if o == nil || o.Complete == nil {
+		var ret bool
+		return ret
+	}
+	return *o.Complete
+}
+
+// GetCompleteOk returns a tuple with the Complete field if it's non-nil, zero value otherwise
+// and a boolean to check if the value has been set.
+func (o *Order) GetCompleteOk() (bool, bool) {
+	if o == nil || o.Complete == nil {
+		var ret bool
+		return ret, false
+	}
+	return *o.Complete, true
+}
+
+// HasComplete returns a boolean if a field has been set.
+func (o *Order) HasComplete() bool {
+	if o != nil && o.Complete != nil {
+		return true
+	}
+
+	return false
+}
+
+// SetComplete gets a reference to the given bool and assigns it to the Complete field.
+func (o *Order) SetComplete(v bool) {
+	o.Complete = &v
+}
+
+
+func (o Order) MarshalJSON() ([]byte, error) {
+	toSerialize := map[string]interface{}{}
+	if o.Id != nil {
+		toSerialize["id"] = o.Id
+	}
+	if o.PetId != nil {
+		toSerialize["petId"] = o.PetId
+	}
+	if o.Quantity != nil {
+		toSerialize["quantity"] = o.Quantity
+	}
+	if o.ShipDate != nil {
+		toSerialize["shipDate"] = o.ShipDate
+	}
+	if o.Status != nil {
+		toSerialize["status"] = o.Status
+	}
+	if o.Complete != nil {
+		toSerialize["complete"] = o.Complete
+	}
+	return json.Marshal(toSerialize)
+}
+
+
diff --git a/samples/client/petstore/go-experimental/go-petstore/model_outer_composite.go b/samples/client/petstore/go-experimental/go-petstore/model_outer_composite.go
index 0ebb526267..83723a9b8e 100644
--- a/samples/client/petstore/go-experimental/go-petstore/model_outer_composite.go
+++ b/samples/client/petstore/go-experimental/go-petstore/model_outer_composite.go
@@ -8,9 +8,131 @@
  */
 
 package petstore
+import (
+	"encoding/json"
+)
 
 type OuterComposite struct {
-	MyNumber float32 `json:"my_number,omitempty"`
-	MyString string `json:"my_string,omitempty"`
-	MyBoolean bool `json:"my_boolean,omitempty"`
+	MyNumber *float32 `json:"my_number,omitempty"`
+
+	MyString *string `json:"my_string,omitempty"`
+
+	MyBoolean *bool `json:"my_boolean,omitempty"`
+
 }
+
+// GetMyNumber returns the MyNumber field if non-nil, zero value otherwise.
+func (o *OuterComposite) GetMyNumber() float32 {
+	if o == nil || o.MyNumber == nil {
+		var ret float32
+		return ret
+	}
+	return *o.MyNumber
+}
+
+// GetMyNumberOk returns a tuple with the MyNumber field if it's non-nil, zero value otherwise
+// and a boolean to check if the value has been set.
+func (o *OuterComposite) GetMyNumberOk() (float32, bool) {
+	if o == nil || o.MyNumber == nil {
+		var ret float32
+		return ret, false
+	}
+	return *o.MyNumber, true
+}
+
+// HasMyNumber returns a boolean if a field has been set.
+func (o *OuterComposite) HasMyNumber() bool {
+	if o != nil && o.MyNumber != nil {
+		return true
+	}
+
+	return false
+}
+
+// SetMyNumber gets a reference to the given float32 and assigns it to the MyNumber field.
+func (o *OuterComposite) SetMyNumber(v float32) {
+	o.MyNumber = &v
+}
+
+// GetMyString returns the MyString field if non-nil, zero value otherwise.
+func (o *OuterComposite) GetMyString() string {
+	if o == nil || o.MyString == nil {
+		var ret string
+		return ret
+	}
+	return *o.MyString
+}
+
+// GetMyStringOk returns a tuple with the MyString field if it's non-nil, zero value otherwise
+// and a boolean to check if the value has been set.
+func (o *OuterComposite) GetMyStringOk() (string, bool) {
+	if o == nil || o.MyString == nil {
+		var ret string
+		return ret, false
+	}
+	return *o.MyString, true
+}
+
+// HasMyString returns a boolean if a field has been set.
+func (o *OuterComposite) HasMyString() bool {
+	if o != nil && o.MyString != nil {
+		return true
+	}
+
+	return false
+}
+
+// SetMyString gets a reference to the given string and assigns it to the MyString field.
+func (o *OuterComposite) SetMyString(v string) {
+	o.MyString = &v
+}
+
+// GetMyBoolean returns the MyBoolean field if non-nil, zero value otherwise.
+func (o *OuterComposite) GetMyBoolean() bool {
+	if o == nil || o.MyBoolean == nil {
+		var ret bool
+		return ret
+	}
+	return *o.MyBoolean
+}
+
+// GetMyBooleanOk returns a tuple with the MyBoolean field if it's non-nil, zero value otherwise
+// and a boolean to check if the value has been set.
+func (o *OuterComposite) GetMyBooleanOk() (bool, bool) {
+	if o == nil || o.MyBoolean == nil {
+		var ret bool
+		return ret, false
+	}
+	return *o.MyBoolean, true
+}
+
+// HasMyBoolean returns a boolean if a field has been set.
+func (o *OuterComposite) HasMyBoolean() bool {
+	if o != nil && o.MyBoolean != nil {
+		return true
+	}
+
+	return false
+}
+
+// SetMyBoolean gets a reference to the given bool and assigns it to the MyBoolean field.
+func (o *OuterComposite) SetMyBoolean(v bool) {
+	o.MyBoolean = &v
+}
+
+
+func (o OuterComposite) MarshalJSON() ([]byte, error) {
+	toSerialize := map[string]interface{}{}
+	if o.MyNumber != nil {
+		toSerialize["my_number"] = o.MyNumber
+	}
+	if o.MyString != nil {
+		toSerialize["my_string"] = o.MyString
+	}
+	if o.MyBoolean != nil {
+		toSerialize["my_boolean"] = o.MyBoolean
+	}
+	return json.Marshal(toSerialize)
+}
+
+
diff --git a/samples/client/petstore/go-experimental/go-petstore/model_outer_enum.go b/samples/client/petstore/go-experimental/go-petstore/model_outer_enum.go
index 903d31e826..131a07c71a 100644
--- a/samples/client/petstore/go-experimental/go-petstore/model_outer_enum.go
+++ b/samples/client/petstore/go-experimental/go-petstore/model_outer_enum.go
@@ -15,4 +15,5 @@ const (
 	PLACED OuterEnum = "placed"
 	APPROVED OuterEnum = "approved"
 	DELIVERED OuterEnum = "delivered"
-)
\ No newline at end of file
+)
+
diff --git a/samples/client/petstore/go-experimental/go-petstore/model_pet.go b/samples/client/petstore/go-experimental/go-petstore/model_pet.go
index 4930dbb92e..1216b0e799 100644
--- a/samples/client/petstore/go-experimental/go-petstore/model_pet.go
+++ b/samples/client/petstore/go-experimental/go-petstore/model_pet.go
@@ -8,13 +8,253 @@
  */
 
 package petstore
+import (
+	"encoding/json"
+	"errors"
+)
 
 type Pet struct {
-	Id int64 `json:"id,omitempty"`
-	Category Category `json:"category,omitempty"`
-	Name string `json:"name"`
-	PhotoUrls []string `json:"photoUrls"`
-	Tags []Tag `json:"tags,omitempty"`
+	Id *int64 `json:"id,omitempty"`
+
+	Category *Category `json:"category,omitempty"`
+
+	Name *string `json:"name,omitempty"`
+
+	PhotoUrls *[]string `json:"photoUrls,omitempty"`
+
+	Tags *[]Tag `json:"tags,omitempty"`
+
 	// pet status in the store
-	Status string `json:"status,omitempty"`
+	Status *string `json:"status,omitempty"`
+
 }
+
+// GetId returns the Id field if non-nil, zero value otherwise.
+func (o *Pet) GetId() int64 {
+	if o == nil || o.Id == nil {
+		var ret int64
+		return ret
+	}
+	return *o.Id
+}
+
+// GetIdOk returns a tuple with the Id field if it's non-nil, zero value otherwise
+// and a boolean to check if the value has been set.
+func (o *Pet) GetIdOk() (int64, bool) {
+	if o == nil || o.Id == nil {
+		var ret int64
+		return ret, false
+	}
+	return *o.Id, true
+}
+
+// HasId returns a boolean if a field has been set.
+func (o *Pet) HasId() bool {
+	if o != nil && o.Id != nil {
+		return true
+	}
+
+	return false
+}
+
+// SetId gets a reference to the given int64 and assigns it to the Id field.
+func (o *Pet) SetId(v int64) {
+	o.Id = &v
+}
+
+// GetCategory returns the Category field if non-nil, zero value otherwise.
+func (o *Pet) GetCategory() Category {
+	if o == nil || o.Category == nil {
+		var ret Category
+		return ret
+	}
+	return *o.Category
+}
+
+// GetCategoryOk returns a tuple with the Category field if it's non-nil, zero value otherwise
+// and a boolean to check if the value has been set.
+func (o *Pet) GetCategoryOk() (Category, bool) {
+	if o == nil || o.Category == nil {
+		var ret Category
+		return ret, false
+	}
+	return *o.Category, true
+}
+
+// HasCategory returns a boolean if a field has been set.
+func (o *Pet) HasCategory() bool {
+	if o != nil && o.Category != nil {
+		return true
+	}
+
+	return false
+}
+
+// SetCategory gets a reference to the given Category and assigns it to the Category field.
+func (o *Pet) SetCategory(v Category) {
+	o.Category = &v
+}
+
+// GetName returns the Name field if non-nil, zero value otherwise.
+func (o *Pet) GetName() string {
+	if o == nil || o.Name == nil {
+		var ret string
+		return ret
+	}
+	return *o.Name
+}
+
+// GetNameOk returns a tuple with the Name field if it's non-nil, zero value otherwise
+// and a boolean to check if the value has been set.
+func (o *Pet) GetNameOk() (string, bool) {
+	if o == nil || o.Name == nil {
+		var ret string
+		return ret, false
+	}
+	return *o.Name, true
+}
+
+// HasName returns a boolean if a field has been set.
+func (o *Pet) HasName() bool {
+	if o != nil && o.Name != nil {
+		return true
+	}
+
+	return false
+}
+
+// SetName gets a reference to the given string and assigns it to the Name field.
+func (o *Pet) SetName(v string) {
+	o.Name = &v
+}
+
+// GetPhotoUrls returns the PhotoUrls field if non-nil, zero value otherwise.
+func (o *Pet) GetPhotoUrls() []string {
+	if o == nil || o.PhotoUrls == nil {
+		var ret []string
+		return ret
+	}
+	return *o.PhotoUrls
+}
+
+// GetPhotoUrlsOk returns a tuple with the PhotoUrls field if it's non-nil, zero value otherwise
+// and a boolean to check if the value has been set.
+func (o *Pet) GetPhotoUrlsOk() ([]string, bool) {
+	if o == nil || o.PhotoUrls == nil {
+		var ret []string
+		return ret, false
+	}
+	return *o.PhotoUrls, true
+}
+
+// HasPhotoUrls returns a boolean if a field has been set.
+func (o *Pet) HasPhotoUrls() bool {
+	if o != nil && o.PhotoUrls != nil {
+		return true
+	}
+
+	return false
+}
+
+// SetPhotoUrls gets a reference to the given []string and assigns it to the PhotoUrls field.
+func (o *Pet) SetPhotoUrls(v []string) {
+	o.PhotoUrls = &v
+}
+
+// GetTags returns the Tags field if non-nil, zero value otherwise.
+func (o *Pet) GetTags() []Tag {
+	if o == nil || o.Tags == nil {
+		var ret []Tag
+		return ret
+	}
+	return *o.Tags
+}
+
+// GetTagsOk returns a tuple with the Tags field if it's non-nil, zero value otherwise
+// and a boolean to check if the value has been set.
+func (o *Pet) GetTagsOk() ([]Tag, bool) {
+	if o == nil || o.Tags == nil {
+		var ret []Tag
+		return ret, false
+	}
+	return *o.Tags, true
+}
+
+// HasTags returns a boolean if a field has been set.
+func (o *Pet) HasTags() bool {
+	if o != nil && o.Tags != nil {
+		return true
+	}
+
+	return false
+}
+
+// SetTags gets a reference to the given []Tag and assigns it to the Tags field.
+func (o *Pet) SetTags(v []Tag) {
+	o.Tags = &v
+}
+
+// GetStatus returns the Status field if non-nil, zero value otherwise.
+func (o *Pet) GetStatus() string {
+	if o == nil || o.Status == nil {
+		var ret string
+		return ret
+	}
+	return *o.Status
+}
+
+// GetStatusOk returns a tuple with the Status field if it's non-nil, zero value otherwise
+// and a boolean to check if the value has been set.
+func (o *Pet) GetStatusOk() (string, bool) {
+	if o == nil || o.Status == nil {
+		var ret string
+		return ret, false
+	}
+	return *o.Status, true
+}
+
+// HasStatus returns a boolean if a field has been set.
+func (o *Pet) HasStatus() bool {
+	if o != nil && o.Status != nil {
+		return true
+	}
+
+	return false
+}
+
+// SetStatus gets a reference to the given string and assigns it to the Status field.
+func (o *Pet) SetStatus(v string) {
+	o.Status = &v
+}
+
+
+func (o Pet) MarshalJSON() ([]byte, error) {
+	toSerialize := map[string]interface{}{}
+	if o.Id != nil {
+		toSerialize["id"] = o.Id
+	}
+	if o.Category != nil {
+		toSerialize["category"] = o.Category
+	}
+	if o.Name == nil {
+		return nil, errors.New("Name is required and not nullable, but was not set on Pet")
+	}
+	if o.Name != nil {
+		toSerialize["name"] = o.Name
+	}
+	if o.PhotoUrls == nil {
+		return nil, errors.New("PhotoUrls is required and not nullable, but was not set on Pet")
+	}
+	if o.PhotoUrls != nil {
+		toSerialize["photoUrls"] = o.PhotoUrls
+	}
+	if o.Tags != nil {
+		toSerialize["tags"] = o.Tags
+	}
+	if o.Status != nil {
+		toSerialize["status"] = o.Status
+	}
+	return json.Marshal(toSerialize)
+}
+
+
diff --git a/samples/client/petstore/go-experimental/go-petstore/model_read_only_first.go b/samples/client/petstore/go-experimental/go-petstore/model_read_only_first.go
index 6b22163900..5c92010e8d 100644
--- a/samples/client/petstore/go-experimental/go-petstore/model_read_only_first.go
+++ b/samples/client/petstore/go-experimental/go-petstore/model_read_only_first.go
@@ -8,8 +8,93 @@
  */
 
 package petstore
+import (
+	"encoding/json"
+)
 
 type ReadOnlyFirst struct {
-	Bar string `json:"bar,omitempty"`
-	Baz string `json:"baz,omitempty"`
+	Bar *string `json:"bar,omitempty"`
+
+	Baz *string `json:"baz,omitempty"`
+
 }
+
+// GetBar returns the Bar field if non-nil, zero value otherwise.
+func (o *ReadOnlyFirst) GetBar() string {
+	if o == nil || o.Bar == nil {
+		var ret string
+		return ret
+	}
+	return *o.Bar
+}
+
+// GetBarOk returns a tuple with the Bar field if it's non-nil, zero value otherwise
+// and a boolean to check if the value has been set.
+func (o *ReadOnlyFirst) GetBarOk() (string, bool) {
+	if o == nil || o.Bar == nil {
+		var ret string
+		return ret, false
+	}
+	return *o.Bar, true
+}
+
+// HasBar returns a boolean if a field has been set.
+func (o *ReadOnlyFirst) HasBar() bool {
+	if o != nil && o.Bar != nil {
+		return true
+	}
+
+	return false
+}
+
+// SetBar gets a reference to the given string and assigns it to the Bar field.
+func (o *ReadOnlyFirst) SetBar(v string) {
+	o.Bar = &v
+}
+
+// GetBaz returns the Baz field if non-nil, zero value otherwise.
+func (o *ReadOnlyFirst) GetBaz() string {
+	if o == nil || o.Baz == nil {
+		var ret string
+		return ret
+	}
+	return *o.Baz
+}
+
+// GetBazOk returns a tuple with the Baz field if it's non-nil, zero value otherwise
+// and a boolean to check if the value has been set.
+func (o *ReadOnlyFirst) GetBazOk() (string, bool) {
+	if o == nil || o.Baz == nil {
+		var ret string
+		return ret, false
+	}
+	return *o.Baz, true
+}
+
+// HasBaz returns a boolean if a field has been set.
+func (o *ReadOnlyFirst) HasBaz() bool {
+	if o != nil && o.Baz != nil {
+		return true
+	}
+
+	return false
+}
+
+// SetBaz gets a reference to the given string and assigns it to the Baz field.
+func (o *ReadOnlyFirst) SetBaz(v string) {
+	o.Baz = &v
+}
+
+
+func (o ReadOnlyFirst) MarshalJSON() ([]byte, error) {
+	toSerialize := map[string]interface{}{}
+	if o.Bar != nil {
+		toSerialize["bar"] = o.Bar
+	}
+	if o.Baz != nil {
+		toSerialize["baz"] = o.Baz
+	}
+	return json.Marshal(toSerialize)
+}
+
+
diff --git a/samples/client/petstore/go-experimental/go-petstore/model_return.go b/samples/client/petstore/go-experimental/go-petstore/model_return.go
index 7851dd851d..e53cc31b5f 100644
--- a/samples/client/petstore/go-experimental/go-petstore/model_return.go
+++ b/samples/client/petstore/go-experimental/go-petstore/model_return.go
@@ -8,8 +8,56 @@
  */
 
 package petstore
+import (
+	"encoding/json"
+)
 
 // Model for testing reserved words
 type Return struct {
-	Return int32 `json:"return,omitempty"`
+	Return *int32 `json:"return,omitempty"`
+
 }
+
+// GetReturn returns the Return field if non-nil, zero value otherwise.
+func (o *Return) GetReturn() int32 {
+	if o == nil || o.Return == nil {
+		var ret int32
+		return ret
+	}
+	return *o.Return
+}
+
+// GetReturnOk returns a tuple with the Return field if it's non-nil, zero value otherwise
+// and a boolean to check if the value has been set.
+func (o *Return) GetReturnOk() (int32, bool) {
+	if o == nil || o.Return == nil {
+		var ret int32
+		return ret, false
+	}
+	return *o.Return, true
+}
+
+// HasReturn returns a boolean if a field has been set.
+func (o *Return) HasReturn() bool {
+	if o != nil && o.Return != nil {
+		return true
+	}
+
+	return false
+}
+
+// SetReturn gets a reference to the given int32 and assigns it to the Return field.
+func (o *Return) SetReturn(v int32) {
+	o.Return = &v
+}
+
+
+func (o Return) MarshalJSON() ([]byte, error) {
+	toSerialize := map[string]interface{}{}
+	if o.Return != nil {
+		toSerialize["return"] = o.Return
+	}
+	return json.Marshal(toSerialize)
+}
+
+
diff --git a/samples/client/petstore/go-experimental/go-petstore/model_special_model_name.go b/samples/client/petstore/go-experimental/go-petstore/model_special_model_name.go
index f906e91987..7e940165d9 100644
--- a/samples/client/petstore/go-experimental/go-petstore/model_special_model_name.go
+++ b/samples/client/petstore/go-experimental/go-petstore/model_special_model_name.go
@@ -8,7 +8,55 @@
  */
 
 package petstore
+import (
+	"encoding/json"
+)
 
 type SpecialModelName struct {
-	SpecialPropertyName int64 `json:"$special[property.name],omitempty"`
+	SpecialPropertyName *int64 `json:"$special[property.name],omitempty"`
+
 }
+
+// GetSpecialPropertyName returns the SpecialPropertyName field if non-nil, zero value otherwise.
+func (o *SpecialModelName) GetSpecialPropertyName() int64 {
+	if o == nil || o.SpecialPropertyName == nil {
+		var ret int64
+		return ret
+	}
+	return *o.SpecialPropertyName
+}
+
+// GetSpecialPropertyNameOk returns a tuple with the SpecialPropertyName field if it's non-nil, zero value otherwise
+// and a boolean to check if the value has been set.
+func (o *SpecialModelName) GetSpecialPropertyNameOk() (int64, bool) {
+	if o == nil || o.SpecialPropertyName == nil {
+		var ret int64
+		return ret, false
+	}
+	return *o.SpecialPropertyName, true
+}
+
+// HasSpecialPropertyName returns a boolean if a field has been set.
+func (o *SpecialModelName) HasSpecialPropertyName() bool {
+	if o != nil && o.SpecialPropertyName != nil {
+		return true
+	}
+
+	return false
+}
+
+// SetSpecialPropertyName gets a reference to the given int64 and assigns it to the SpecialPropertyName field.
+func (o *SpecialModelName) SetSpecialPropertyName(v int64) {
+	o.SpecialPropertyName = &v
+}
+
+
+func (o SpecialModelName) MarshalJSON() ([]byte, error) {
+	toSerialize := map[string]interface{}{}
+	if o.SpecialPropertyName != nil {
+		toSerialize["$special[property.name]"] = o.SpecialPropertyName
+	}
+	return json.Marshal(toSerialize)
+}
+
+
diff --git a/samples/client/petstore/go-experimental/go-petstore/model_tag.go b/samples/client/petstore/go-experimental/go-petstore/model_tag.go
index 37a2b63d44..dc4053da9b 100644
--- a/samples/client/petstore/go-experimental/go-petstore/model_tag.go
+++ b/samples/client/petstore/go-experimental/go-petstore/model_tag.go
@@ -8,8 +8,93 @@
  */
 
 package petstore
+import (
+	"encoding/json"
+)
 
 type Tag struct {
-	Id int64 `json:"id,omitempty"`
-	Name string `json:"name,omitempty"`
+	Id *int64 `json:"id,omitempty"`
+
+	Name *string `json:"name,omitempty"`
+
 }
+
+// GetId returns the Id field if non-nil, zero value otherwise.
+func (o *Tag) GetId() int64 {
+	if o == nil || o.Id == nil {
+		var ret int64
+		return ret
+	}
+	return *o.Id
+}
+
+// GetIdOk returns a tuple with the Id field if it's non-nil, zero value otherwise
+// and a boolean to check if the value has been set.
+func (o *Tag) GetIdOk() (int64, bool) {
+	if o == nil || o.Id == nil {
+		var ret int64
+		return ret, false
+	}
+	return *o.Id, true
+}
+
+// HasId returns a boolean if a field has been set.
+func (o *Tag) HasId() bool {
+	if o != nil && o.Id != nil {
+		return true
+	}
+
+	return false
+}
+
+// SetId gets a reference to the given int64 and assigns it to the Id field.
+func (o *Tag) SetId(v int64) {
+	o.Id = &v
+}
+
+// GetName returns the Name field if non-nil, zero value otherwise.
+func (o *Tag) GetName() string {
+	if o == nil || o.Name == nil {
+		var ret string
+		return ret
+	}
+	return *o.Name
+}
+
+// GetNameOk returns a tuple with the Name field if it's non-nil, zero value otherwise
+// and a boolean to check if the value has been set.
+func (o *Tag) GetNameOk() (string, bool) {
+	if o == nil || o.Name == nil {
+		var ret string
+		return ret, false
+	}
+	return *o.Name, true
+}
+
+// HasName returns a boolean if a field has been set.
+func (o *Tag) HasName() bool {
+	if o != nil && o.Name != nil {
+		return true
+	}
+
+	return false
+}
+
+// SetName gets a reference to the given string and assigns it to the Name field.
+func (o *Tag) SetName(v string) {
+	o.Name = &v
+}
+
+
+func (o Tag) MarshalJSON() ([]byte, error) {
+	toSerialize := map[string]interface{}{}
+	if o.Id != nil {
+		toSerialize["id"] = o.Id
+	}
+	if o.Name != nil {
+		toSerialize["name"] = o.Name
+	}
+	return json.Marshal(toSerialize)
+}
+
+
diff --git a/samples/client/petstore/go-experimental/go-petstore/model_type_holder_default.go b/samples/client/petstore/go-experimental/go-petstore/model_type_holder_default.go
index 68e1218ec9..f1fcc93dd8 100644
--- a/samples/client/petstore/go-experimental/go-petstore/model_type_holder_default.go
+++ b/samples/client/petstore/go-experimental/go-petstore/model_type_holder_default.go
@@ -8,11 +8,223 @@
  */
 
 package petstore
+import (
+	"encoding/json"
+	"errors"
+)
 
 type TypeHolderDefault struct {
-	StringItem string `json:"string_item"`
-	NumberItem float32 `json:"number_item"`
-	IntegerItem int32 `json:"integer_item"`
-	BoolItem bool `json:"bool_item"`
-	ArrayItem []int32 `json:"array_item"`
+	StringItem *string `json:"string_item,omitempty"`
+
+	NumberItem *float32 `json:"number_item,omitempty"`
+
+	IntegerItem *int32 `json:"integer_item,omitempty"`
+
+	BoolItem *bool `json:"bool_item,omitempty"`
+
+	ArrayItem *[]int32 `json:"array_item,omitempty"`
+
 }
+
+// GetStringItem returns the StringItem field if non-nil, zero value otherwise.
+func (o *TypeHolderDefault) GetStringItem() string {
+	if o == nil || o.StringItem == nil {
+		var ret string
+		return ret
+	}
+	return *o.StringItem
+}
+
+// GetStringItemOk returns a tuple with the StringItem field if it's non-nil, zero value otherwise
+// and a boolean to check if the value has been set.
+func (o *TypeHolderDefault) GetStringItemOk() (string, bool) {
+	if o == nil || o.StringItem == nil {
+		var ret string
+		return ret, false
+	}
+	return *o.StringItem, true
+}
+
+// HasStringItem returns a boolean if a field has been set.
+func (o *TypeHolderDefault) HasStringItem() bool {
+	if o != nil && o.StringItem != nil {
+		return true
+	}
+
+	return false
+}
+
+// SetStringItem gets a reference to the given string and assigns it to the StringItem field.
+func (o *TypeHolderDefault) SetStringItem(v string) {
+	o.StringItem = &v
+}
+
+// GetNumberItem returns the NumberItem field if non-nil, zero value otherwise.
+func (o *TypeHolderDefault) GetNumberItem() float32 {
+	if o == nil || o.NumberItem == nil {
+		var ret float32
+		return ret
+	}
+	return *o.NumberItem
+}
+
+// GetNumberItemOk returns a tuple with the NumberItem field if it's non-nil, zero value otherwise
+// and a boolean to check if the value has been set.
+func (o *TypeHolderDefault) GetNumberItemOk() (float32, bool) {
+	if o == nil || o.NumberItem == nil {
+		var ret float32
+		return ret, false
+	}
+	return *o.NumberItem, true
+}
+
+// HasNumberItem returns a boolean if a field has been set.
+func (o *TypeHolderDefault) HasNumberItem() bool {
+	if o != nil && o.NumberItem != nil {
+		return true
+	}
+
+	return false
+}
+
+// SetNumberItem gets a reference to the given float32 and assigns it to the NumberItem field.
+func (o *TypeHolderDefault) SetNumberItem(v float32) {
+	o.NumberItem = &v
+}
+
+// GetIntegerItem returns the IntegerItem field if non-nil, zero value otherwise.
+func (o *TypeHolderDefault) GetIntegerItem() int32 {
+	if o == nil || o.IntegerItem == nil {
+		var ret int32
+		return ret
+	}
+	return *o.IntegerItem
+}
+
+// GetIntegerItemOk returns a tuple with the IntegerItem field if it's non-nil, zero value otherwise
+// and a boolean to check if the value has been set.
+func (o *TypeHolderDefault) GetIntegerItemOk() (int32, bool) {
+	if o == nil || o.IntegerItem == nil {
+		var ret int32
+		return ret, false
+	}
+	return *o.IntegerItem, true
+}
+
+// HasIntegerItem returns a boolean if a field has been set.
+func (o *TypeHolderDefault) HasIntegerItem() bool {
+	if o != nil && o.IntegerItem != nil {
+		return true
+	}
+
+	return false
+}
+
+// SetIntegerItem gets a reference to the given int32 and assigns it to the IntegerItem field.
+func (o *TypeHolderDefault) SetIntegerItem(v int32) {
+	o.IntegerItem = &v
+}
+
+// GetBoolItem returns the BoolItem field if non-nil, zero value otherwise.
+func (o *TypeHolderDefault) GetBoolItem() bool {
+	if o == nil || o.BoolItem == nil {
+		var ret bool
+		return ret
+	}
+	return *o.BoolItem
+}
+
+// GetBoolItemOk returns a tuple with the BoolItem field if it's non-nil, zero value otherwise
+// and a boolean to check if the value has been set.
+func (o *TypeHolderDefault) GetBoolItemOk() (bool, bool) {
+	if o == nil || o.BoolItem == nil {
+		var ret bool
+		return ret, false
+	}
+	return *o.BoolItem, true
+}
+
+// HasBoolItem returns a boolean if a field has been set.
+func (o *TypeHolderDefault) HasBoolItem() bool {
+	if o != nil && o.BoolItem != nil {
+		return true
+	}
+
+	return false
+}
+
+// SetBoolItem gets a reference to the given bool and assigns it to the BoolItem field.
+func (o *TypeHolderDefault) SetBoolItem(v bool) {
+	o.BoolItem = &v
+}
+
+// GetArrayItem returns the ArrayItem field if non-nil, zero value otherwise.
+func (o *TypeHolderDefault) GetArrayItem() []int32 {
+	if o == nil || o.ArrayItem == nil {
+		var ret []int32
+		return ret
+	}
+	return *o.ArrayItem
+}
+
+// GetArrayItemOk returns a tuple with the ArrayItem field if it's non-nil, zero value otherwise
+// and a boolean to check if the value has been set.
+func (o *TypeHolderDefault) GetArrayItemOk() ([]int32, bool) {
+	if o == nil || o.ArrayItem == nil {
+		var ret []int32
+		return ret, false
+	}
+	return *o.ArrayItem, true
+}
+
+// HasArrayItem returns a boolean if a field has been set.
+func (o *TypeHolderDefault) HasArrayItem() bool {
+	if o != nil && o.ArrayItem != nil {
+		return true
+	}
+
+	return false
+}
+
+// SetArrayItem gets a reference to the given []int32 and assigns it to the ArrayItem field.
+func (o *TypeHolderDefault) SetArrayItem(v []int32) {
+	o.ArrayItem = &v
+}
+
+
+func (o TypeHolderDefault) MarshalJSON() ([]byte, error) {
+	toSerialize := map[string]interface{}{}
+	if o.StringItem == nil {
+		return nil, errors.New("StringItem is required and not nullable, but was not set on TypeHolderDefault")
+	}
+	if o.StringItem != nil {
+		toSerialize["string_item"] = o.StringItem
+	}
+	if o.NumberItem == nil {
+		return nil, errors.New("NumberItem is required and not nullable, but was not set on TypeHolderDefault")
+	}
+	if o.NumberItem != nil {
+		toSerialize["number_item"] = o.NumberItem
+	}
+	if o.IntegerItem == nil {
+		return nil, errors.New("IntegerItem is required and not nullable, but was not set on TypeHolderDefault")
+	}
+	if o.IntegerItem != nil {
+		toSerialize["integer_item"] = o.IntegerItem
+	}
+	if o.BoolItem == nil {
+		return nil, errors.New("BoolItem is required and not nullable, but was not set on TypeHolderDefault")
+	}
+	if o.BoolItem != nil {
+		toSerialize["bool_item"] = o.BoolItem
+	}
+	if o.ArrayItem == nil {
+		return nil, errors.New("ArrayItem is required and not nullable, but was not set on TypeHolderDefault")
+	}
+	if o.ArrayItem != nil {
+		toSerialize["array_item"] = o.ArrayItem
+	}
+	return json.Marshal(toSerialize)
+}
+
+
diff --git a/samples/client/petstore/go-experimental/go-petstore/model_type_holder_example.go b/samples/client/petstore/go-experimental/go-petstore/model_type_holder_example.go
index e129bb6a76..0fe346c7cd 100644
--- a/samples/client/petstore/go-experimental/go-petstore/model_type_holder_example.go
+++ b/samples/client/petstore/go-experimental/go-petstore/model_type_holder_example.go
@@ -8,11 +8,223 @@
  */
 
 package petstore
+import (
+	"encoding/json"
+	"errors"
+)
 
 type TypeHolderExample struct {
-	StringItem string `json:"string_item"`
-	NumberItem float32 `json:"number_item"`
-	IntegerItem int32 `json:"integer_item"`
-	BoolItem bool `json:"bool_item"`
-	ArrayItem []int32 `json:"array_item"`
+	StringItem *string `json:"string_item,omitempty"`
+
+	NumberItem *float32 `json:"number_item,omitempty"`
+
+	IntegerItem *int32 `json:"integer_item,omitempty"`
+
+	BoolItem *bool `json:"bool_item,omitempty"`
+
+	ArrayItem *[]int32 `json:"array_item,omitempty"`
+
 }
+
+// GetStringItem returns the StringItem field if non-nil, zero value otherwise.
+func (o *TypeHolderExample) GetStringItem() string {
+	if o == nil || o.StringItem == nil {
+		var ret string
+		return ret
+	}
+	return *o.StringItem
+}
+
+// GetStringItemOk returns a tuple with the StringItem field if it's non-nil, zero value otherwise
+// and a boolean to check if the value has been set.
+func (o *TypeHolderExample) GetStringItemOk() (string, bool) {
+	if o == nil || o.StringItem == nil {
+		var ret string
+		return ret, false
+	}
+	return *o.StringItem, true
+}
+
+// HasStringItem returns a boolean if a field has been set.
+func (o *TypeHolderExample) HasStringItem() bool {
+	if o != nil && o.StringItem != nil {
+		return true
+	}
+
+	return false
+}
+
+// SetStringItem gets a reference to the given string and assigns it to the StringItem field.
+func (o *TypeHolderExample) SetStringItem(v string) {
+	o.StringItem = &v
+}
+
+// GetNumberItem returns the NumberItem field if non-nil, zero value otherwise.
+func (o *TypeHolderExample) GetNumberItem() float32 {
+	if o == nil || o.NumberItem == nil {
+		var ret float32
+		return ret
+	}
+	return *o.NumberItem
+}
+
+// GetNumberItemOk returns a tuple with the NumberItem field if it's non-nil, zero value otherwise
+// and a boolean to check if the value has been set.
+func (o *TypeHolderExample) GetNumberItemOk() (float32, bool) {
+	if o == nil || o.NumberItem == nil {
+		var ret float32
+		return ret, false
+	}
+	return *o.NumberItem, true
+}
+
+// HasNumberItem returns a boolean if a field has been set.
+func (o *TypeHolderExample) HasNumberItem() bool {
+	if o != nil && o.NumberItem != nil {
+		return true
+	}
+
+	return false
+}
+
+// SetNumberItem gets a reference to the given float32 and assigns it to the NumberItem field.
+func (o *TypeHolderExample) SetNumberItem(v float32) {
+	o.NumberItem = &v
+}
+
+// GetIntegerItem returns the IntegerItem field if non-nil, zero value otherwise.
+func (o *TypeHolderExample) GetIntegerItem() int32 {
+	if o == nil || o.IntegerItem == nil {
+		var ret int32
+		return ret
+	}
+	return *o.IntegerItem
+}
+
+// GetIntegerItemOk returns a tuple with the IntegerItem field if it's non-nil, zero value otherwise
+// and a boolean to check if the value has been set.
+func (o *TypeHolderExample) GetIntegerItemOk() (int32, bool) {
+	if o == nil || o.IntegerItem == nil {
+		var ret int32
+		return ret, false
+	}
+	return *o.IntegerItem, true
+}
+
+// HasIntegerItem returns a boolean if a field has been set.
+func (o *TypeHolderExample) HasIntegerItem() bool {
+	if o != nil && o.IntegerItem != nil {
+		return true
+	}
+
+	return false
+}
+
+// SetIntegerItem gets a reference to the given int32 and assigns it to the IntegerItem field.
+func (o *TypeHolderExample) SetIntegerItem(v int32) {
+	o.IntegerItem = &v
+}
+
+// GetBoolItem returns the BoolItem field if non-nil, zero value otherwise.
+func (o *TypeHolderExample) GetBoolItem() bool {
+	if o == nil || o.BoolItem == nil {
+		var ret bool
+		return ret
+	}
+	return *o.BoolItem
+}
+
+// GetBoolItemOk returns a tuple with the BoolItem field if it's non-nil, zero value otherwise
+// and a boolean to check if the value has been set.
+func (o *TypeHolderExample) GetBoolItemOk() (bool, bool) {
+	if o == nil || o.BoolItem == nil {
+		var ret bool
+		return ret, false
+	}
+	return *o.BoolItem, true
+}
+
+// HasBoolItem returns a boolean if a field has been set.
+func (o *TypeHolderExample) HasBoolItem() bool {
+	if o != nil && o.BoolItem != nil {
+		return true
+	}
+
+	return false
+}
+
+// SetBoolItem gets a reference to the given bool and assigns it to the BoolItem field.
+func (o *TypeHolderExample) SetBoolItem(v bool) {
+	o.BoolItem = &v
+}
+
+// GetArrayItem returns the ArrayItem field if non-nil, zero value otherwise.
+func (o *TypeHolderExample) GetArrayItem() []int32 {
+	if o == nil || o.ArrayItem == nil {
+		var ret []int32
+		return ret
+	}
+	return *o.ArrayItem
+}
+
+// GetArrayItemOk returns a tuple with the ArrayItem field if it's non-nil, zero value otherwise
+// and a boolean to check if the value has been set.
+func (o *TypeHolderExample) GetArrayItemOk() ([]int32, bool) {
+	if o == nil || o.ArrayItem == nil {
+		var ret []int32
+		return ret, false
+	}
+	return *o.ArrayItem, true
+}
+
+// HasArrayItem returns a boolean if a field has been set.
+func (o *TypeHolderExample) HasArrayItem() bool {
+	if o != nil && o.ArrayItem != nil {
+		return true
+	}
+
+	return false
+}
+
+// SetArrayItem gets a reference to the given []int32 and assigns it to the ArrayItem field.
+func (o *TypeHolderExample) SetArrayItem(v []int32) {
+	o.ArrayItem = &v
+}
+
+
+func (o TypeHolderExample) MarshalJSON() ([]byte, error) {
+	toSerialize := map[string]interface{}{}
+	if o.StringItem == nil {
+		return nil, errors.New("StringItem is required and not nullable, but was not set on TypeHolderExample")
+	}
+	if o.StringItem != nil {
+		toSerialize["string_item"] = o.StringItem
+	}
+	if o.NumberItem == nil {
+		return nil, errors.New("NumberItem is required and not nullable, but was not set on TypeHolderExample")
+	}
+	if o.NumberItem != nil {
+		toSerialize["number_item"] = o.NumberItem
+	}
+	if o.IntegerItem == nil {
+		return nil, errors.New("IntegerItem is required and not nullable, but was not set on TypeHolderExample")
+	}
+	if o.IntegerItem != nil {
+		toSerialize["integer_item"] = o.IntegerItem
+	}
+	if o.BoolItem == nil {
+		return nil, errors.New("BoolItem is required and not nullable, but was not set on TypeHolderExample")
+	}
+	if o.BoolItem != nil {
+		toSerialize["bool_item"] = o.BoolItem
+	}
+	if o.ArrayItem == nil {
+		return nil, errors.New("ArrayItem is required and not nullable, but was not set on TypeHolderExample")
+	}
+	if o.ArrayItem != nil {
+		toSerialize["array_item"] = o.ArrayItem
+	}
+	return json.Marshal(toSerialize)
+}
+
+
diff --git a/samples/client/petstore/go-experimental/go-petstore/model_user.go b/samples/client/petstore/go-experimental/go-petstore/model_user.go
index caff75ebc2..925f82d582 100644
--- a/samples/client/petstore/go-experimental/go-petstore/model_user.go
+++ b/samples/client/petstore/go-experimental/go-petstore/model_user.go
@@ -8,15 +8,322 @@
  */
 
 package petstore
+import (
+	"encoding/json"
+)
 
 type User struct {
-	Id int64 `json:"id,omitempty"`
-	Username string `json:"username,omitempty"`
-	FirstName string `json:"firstName,omitempty"`
-	LastName string `json:"lastName,omitempty"`
-	Email string `json:"email,omitempty"`
-	Password string `json:"password,omitempty"`
-	Phone string `json:"phone,omitempty"`
+	Id *int64 `json:"id,omitempty"`
+
+	Username *string `json:"username,omitempty"`
+
+	FirstName *string `json:"firstName,omitempty"`
+
+	LastName *string `json:"lastName,omitempty"`
+
+	Email *string `json:"email,omitempty"`
+
+	Password *string `json:"password,omitempty"`
+
+	Phone *string `json:"phone,omitempty"`
+
 	// User Status
-	UserStatus int32 `json:"userStatus,omitempty"`
+	UserStatus *int32 `json:"userStatus,omitempty"`
+
 }
+
+// GetId returns the Id field if non-nil, zero value otherwise.
+func (o *User) GetId() int64 {
+	if o == nil || o.Id == nil {
+		var ret int64
+		return ret
+	}
+	return *o.Id
+}
+
+// GetIdOk returns a tuple with the Id field if it's non-nil, zero value otherwise
+// and a boolean to check if the value has been set.
+func (o *User) GetIdOk() (int64, bool) {
+	if o == nil || o.Id == nil {
+		var ret int64
+		return ret, false
+	}
+	return *o.Id, true
+}
+
+// HasId returns a boolean if a field has been set.
+func (o *User) HasId() bool {
+	if o != nil && o.Id != nil {
+		return true
+	}
+
+	return false
+}
+
+// SetId gets a reference to the given int64 and assigns it to the Id field.
+func (o *User) SetId(v int64) {
+	o.Id = &v
+}
+
+// GetUsername returns the Username field if non-nil, zero value otherwise.
+func (o *User) GetUsername() string {
+	if o == nil || o.Username == nil {
+		var ret string
+		return ret
+	}
+	return *o.Username
+}
+
+// GetUsernameOk returns a tuple with the Username field if it's non-nil, zero value otherwise
+// and a boolean to check if the value has been set.
+func (o *User) GetUsernameOk() (string, bool) {
+	if o == nil || o.Username == nil {
+		var ret string
+		return ret, false
+	}
+	return *o.Username, true
+}
+
+// HasUsername returns a boolean if a field has been set.
+func (o *User) HasUsername() bool {
+	if o != nil && o.Username != nil {
+		return true
+	}
+
+	return false
+}
+
+// SetUsername gets a reference to the given string and assigns it to the Username field.
+func (o *User) SetUsername(v string) {
+	o.Username = &v
+}
+
+// GetFirstName returns the FirstName field if non-nil, zero value otherwise.
+func (o *User) GetFirstName() string {
+	if o == nil || o.FirstName == nil {
+		var ret string
+		return ret
+	}
+	return *o.FirstName
+}
+
+// GetFirstNameOk returns a tuple with the FirstName field if it's non-nil, zero value otherwise
+// and a boolean to check if the value has been set.
+func (o *User) GetFirstNameOk() (string, bool) {
+	if o == nil || o.FirstName == nil {
+		var ret string
+		return ret, false
+	}
+	return *o.FirstName, true
+}
+
+// HasFirstName returns a boolean if a field has been set.
+func (o *User) HasFirstName() bool {
+	if o != nil && o.FirstName != nil {
+		return true
+	}
+
+	return false
+}
+
+// SetFirstName gets a reference to the given string and assigns it to the FirstName field.
+func (o *User) SetFirstName(v string) {
+	o.FirstName = &v
+}
+
+// GetLastName returns the LastName field if non-nil, zero value otherwise.
+func (o *User) GetLastName() string {
+	if o == nil || o.LastName == nil {
+		var ret string
+		return ret
+	}
+	return *o.LastName
+}
+
+// GetLastNameOk returns a tuple with the LastName field if it's non-nil, zero value otherwise
+// and a boolean to check if the value has been set.
+func (o *User) GetLastNameOk() (string, bool) {
+	if o == nil || o.LastName == nil {
+		var ret string
+		return ret, false
+	}
+	return *o.LastName, true
+}
+
+// HasLastName returns a boolean if a field has been set.
+func (o *User) HasLastName() bool {
+	if o != nil && o.LastName != nil {
+		return true
+	}
+
+	return false
+}
+
+// SetLastName gets a reference to the given string and assigns it to the LastName field.
+func (o *User) SetLastName(v string) {
+	o.LastName = &v
+}
+
+// GetEmail returns the Email field if non-nil, zero value otherwise.
+func (o *User) GetEmail() string {
+	if o == nil || o.Email == nil {
+		var ret string
+		return ret
+	}
+	return *o.Email
+}
+
+// GetEmailOk returns a tuple with the Email field if it's non-nil, zero value otherwise
+// and a boolean to check if the value has been set.
+func (o *User) GetEmailOk() (string, bool) {
+	if o == nil || o.Email == nil {
+		var ret string
+		return ret, false
+	}
+	return *o.Email, true
+}
+
+// HasEmail returns a boolean if a field has been set.
+func (o *User) HasEmail() bool {
+	if o != nil && o.Email != nil {
+		return true
+	}
+
+	return false
+}
+
+// SetEmail gets a reference to the given string and assigns it to the Email field.
+func (o *User) SetEmail(v string) {
+	o.Email = &v
+}
+
+// GetPassword returns the Password field if non-nil, zero value otherwise.
+func (o *User) GetPassword() string {
+	if o == nil || o.Password == nil {
+		var ret string
+		return ret
+	}
+	return *o.Password
+}
+
+// GetPasswordOk returns a tuple with the Password field if it's non-nil, zero value otherwise
+// and a boolean to check if the value has been set.
+func (o *User) GetPasswordOk() (string, bool) {
+	if o == nil || o.Password == nil {
+		var ret string
+		return ret, false
+	}
+	return *o.Password, true
+}
+
+// HasPassword returns a boolean if a field has been set.
+func (o *User) HasPassword() bool {
+	if o != nil && o.Password != nil {
+		return true
+	}
+
+	return false
+}
+
+// SetPassword gets a reference to the given string and assigns it to the Password field.
+func (o *User) SetPassword(v string) {
+	o.Password = &v
+}
+
+// GetPhone returns the Phone field if non-nil, zero value otherwise.
+func (o *User) GetPhone() string {
+	if o == nil || o.Phone == nil {
+		var ret string
+		return ret
+	}
+	return *o.Phone
+}
+
+// GetPhoneOk returns a tuple with the Phone field if it's non-nil, zero value otherwise
+// and a boolean to check if the value has been set.
+func (o *User) GetPhoneOk() (string, bool) {
+	if o == nil || o.Phone == nil {
+		var ret string
+		return ret, false
+	}
+	return *o.Phone, true
+}
+
+// HasPhone returns a boolean if a field has been set.
+func (o *User) HasPhone() bool {
+	if o != nil && o.Phone != nil {
+		return true
+	}
+
+	return false
+}
+
+// SetPhone gets a reference to the given string and assigns it to the Phone field.
+func (o *User) SetPhone(v string) {
+	o.Phone = &v
+}
+
+// GetUserStatus returns the UserStatus field if non-nil, zero value otherwise.
+func (o *User) GetUserStatus() int32 {
+	if o == nil || o.UserStatus == nil {
+		var ret int32
+		return ret
+	}
+	return *o.UserStatus
+}
+
+// GetUserStatusOk returns a tuple with the UserStatus field if it's non-nil, zero value otherwise
+// and a boolean to check if the value has been set.
+func (o *User) GetUserStatusOk() (int32, bool) {
+	if o == nil || o.UserStatus == nil {
+		var ret int32
+		return ret, false
+	}
+	return *o.UserStatus, true
+}
+
+// HasUserStatus returns a boolean if a field has been set.
+func (o *User) HasUserStatus() bool {
+	if o != nil && o.UserStatus != nil {
+		return true
+	}
+
+	return false
+}
+
+// SetUserStatus gets a reference to the given int32 and assigns it to the UserStatus field.
+func (o *User) SetUserStatus(v int32) {
+	o.UserStatus = &v
+}
+
+
+func (o User) MarshalJSON() ([]byte, error) {
+	toSerialize := map[string]interface{}{}
+	if o.Id != nil {
+		toSerialize["id"] = o.Id
+	}
+	if o.Username != nil {
+		toSerialize["username"] = o.Username
+	}
+	if o.FirstName != nil {
+		toSerialize["firstName"] = o.FirstName
+	}
+	if o.LastName != nil {
+		toSerialize["lastName"] = o.LastName
+	}
+	if o.Email != nil {
+		toSerialize["email"] = o.Email
+	}
+	if o.Password != nil {
+		toSerialize["password"] = o.Password
+	}
+	if o.Phone != nil {
+		toSerialize["phone"] = o.Phone
+	}
+	if o.UserStatus != nil {
+		toSerialize["userStatus"] = o.UserStatus
+	}
+	return json.Marshal(toSerialize)
+}
+
+
diff --git a/samples/client/petstore/go-experimental/go-petstore/model_xml_item.go b/samples/client/petstore/go-experimental/go-petstore/model_xml_item.go
index a623bda5c7..2f0f8f89c4 100644
--- a/samples/client/petstore/go-experimental/go-petstore/model_xml_item.go
+++ b/samples/client/petstore/go-experimental/go-petstore/model_xml_item.go
@@ -8,35 +8,1119 @@
  */
 
 package petstore
+import (
+	"encoding/json"
+)
 
 type XmlItem struct {
-	AttributeString string `json:"attribute_string,omitempty"`
-	AttributeNumber float32 `json:"attribute_number,omitempty"`
-	AttributeInteger int32 `json:"attribute_integer,omitempty"`
-	AttributeBoolean bool `json:"attribute_boolean,omitempty"`
-	WrappedArray []int32 `json:"wrapped_array,omitempty"`
-	NameString string `json:"name_string,omitempty"`
-	NameNumber float32 `json:"name_number,omitempty"`
-	NameInteger int32 `json:"name_integer,omitempty"`
-	NameBoolean bool `json:"name_boolean,omitempty"`
-	NameArray []int32 `json:"name_array,omitempty"`
-	NameWrappedArray []int32 `json:"name_wrapped_array,omitempty"`
-	PrefixString string `json:"prefix_string,omitempty"`
-	PrefixNumber float32 `json:"prefix_number,omitempty"`
-	PrefixInteger int32 `json:"prefix_integer,omitempty"`
-	PrefixBoolean bool `json:"prefix_boolean,omitempty"`
-	PrefixArray []int32 `json:"prefix_array,omitempty"`
-	PrefixWrappedArray []int32 `json:"prefix_wrapped_array,omitempty"`
-	NamespaceString string `json:"namespace_string,omitempty"`
-	NamespaceNumber float32 `json:"namespace_number,omitempty"`
-	NamespaceInteger int32 `json:"namespace_integer,omitempty"`
-	NamespaceBoolean bool `json:"namespace_boolean,omitempty"`
-	NamespaceArray []int32 `json:"namespace_array,omitempty"`
-	NamespaceWrappedArray []int32 `json:"namespace_wrapped_array,omitempty"`
-	PrefixNsString string `json:"prefix_ns_string,omitempty"`
-	PrefixNsNumber float32 `json:"prefix_ns_number,omitempty"`
-	PrefixNsInteger int32 `json:"prefix_ns_integer,omitempty"`
-	PrefixNsBoolean bool `json:"prefix_ns_boolean,omitempty"`
-	PrefixNsArray []int32 `json:"prefix_ns_array,omitempty"`
-	PrefixNsWrappedArray []int32 `json:"prefix_ns_wrapped_array,omitempty"`
+	AttributeString *string `json:"attribute_string,omitempty"`
+
+	AttributeNumber *float32 `json:"attribute_number,omitempty"`
+
+	AttributeInteger *int32 `json:"attribute_integer,omitempty"`
+
+	AttributeBoolean *bool `json:"attribute_boolean,omitempty"`
+
+	WrappedArray *[]int32 `json:"wrapped_array,omitempty"`
+
+	NameString *string `json:"name_string,omitempty"`
+
+	NameNumber *float32 `json:"name_number,omitempty"`
+
+	NameInteger *int32 `json:"name_integer,omitempty"`
+
+	NameBoolean *bool `json:"name_boolean,omitempty"`
+
+	NameArray *[]int32 `json:"name_array,omitempty"`
+
+	NameWrappedArray *[]int32 `json:"name_wrapped_array,omitempty"`
+
+	PrefixString *string `json:"prefix_string,omitempty"`
+
+	PrefixNumber *float32 `json:"prefix_number,omitempty"`
+
+	PrefixInteger *int32 `json:"prefix_integer,omitempty"`
+
+	PrefixBoolean *bool `json:"prefix_boolean,omitempty"`
+
+	PrefixArray *[]int32 `json:"prefix_array,omitempty"`
+
+	PrefixWrappedArray *[]int32 `json:"prefix_wrapped_array,omitempty"`
+
+	NamespaceString *string `json:"namespace_string,omitempty"`
+
+	NamespaceNumber *float32 `json:"namespace_number,omitempty"`
+
+	NamespaceInteger *int32 `json:"namespace_integer,omitempty"`
+
+	NamespaceBoolean *bool `json:"namespace_boolean,omitempty"`
+
+	NamespaceArray *[]int32 `json:"namespace_array,omitempty"`
+
+	NamespaceWrappedArray *[]int32 `json:"namespace_wrapped_array,omitempty"`
+
+	PrefixNsString *string `json:"prefix_ns_string,omitempty"`
+
+	PrefixNsNumber *float32 `json:"prefix_ns_number,omitempty"`
+
+	PrefixNsInteger *int32 `json:"prefix_ns_integer,omitempty"`
+
+	PrefixNsBoolean *bool `json:"prefix_ns_boolean,omitempty"`
+
+	PrefixNsArray *[]int32 `json:"prefix_ns_array,omitempty"`
+
+	PrefixNsWrappedArray *[]int32 `json:"prefix_ns_wrapped_array,omitempty"`
+
 }
+
+// GetAttributeString returns the AttributeString field if non-nil, zero value otherwise.
+func (o *XmlItem) GetAttributeString() string {
+	if o == nil || o.AttributeString == nil {
+		var ret string
+		return ret
+	}
+	return *o.AttributeString
+}
+
+// GetAttributeStringOk returns a tuple with the AttributeString field if it's non-nil, zero value otherwise
+// and a boolean to check if the value has been set.
+func (o *XmlItem) GetAttributeStringOk() (string, bool) {
+	if o == nil || o.AttributeString == nil {
+		var ret string
+		return ret, false
+	}
+	return *o.AttributeString, true
+}
+
+// HasAttributeString returns a boolean if a field has been set.
+func (o *XmlItem) HasAttributeString() bool {
+	if o != nil && o.AttributeString != nil {
+		return true
+	}
+
+	return false
+}
+
+// SetAttributeString gets a reference to the given string and assigns it to the AttributeString field.
+func (o *XmlItem) SetAttributeString(v string) {
+	o.AttributeString = &v
+}
+
+// GetAttributeNumber returns the AttributeNumber field if non-nil, zero value otherwise.
+func (o *XmlItem) GetAttributeNumber() float32 {
+	if o == nil || o.AttributeNumber == nil {
+		var ret float32
+		return ret
+	}
+	return *o.AttributeNumber
+}
+
+// GetAttributeNumberOk returns a tuple with the AttributeNumber field if it's non-nil, zero value otherwise
+// and a boolean to check if the value has been set.
+func (o *XmlItem) GetAttributeNumberOk() (float32, bool) {
+	if o == nil || o.AttributeNumber == nil {
+		var ret float32
+		return ret, false
+	}
+	return *o.AttributeNumber, true
+}
+
+// HasAttributeNumber returns a boolean if a field has been set.
+func (o *XmlItem) HasAttributeNumber() bool {
+	if o != nil && o.AttributeNumber != nil {
+		return true
+	}
+
+	return false
+}
+
+// SetAttributeNumber gets a reference to the given float32 and assigns it to the AttributeNumber field.
+func (o *XmlItem) SetAttributeNumber(v float32) {
+	o.AttributeNumber = &v
+}
+
+// GetAttributeInteger returns the AttributeInteger field if non-nil, zero value otherwise.
+func (o *XmlItem) GetAttributeInteger() int32 {
+	if o == nil || o.AttributeInteger == nil {
+		var ret int32
+		return ret
+	}
+	return *o.AttributeInteger
+}
+
+// GetAttributeIntegerOk returns a tuple with the AttributeInteger field if it's non-nil, zero value otherwise
+// and a boolean to check if the value has been set.
+func (o *XmlItem) GetAttributeIntegerOk() (int32, bool) {
+	if o == nil || o.AttributeInteger == nil {
+		var ret int32
+		return ret, false
+	}
+	return *o.AttributeInteger, true
+}
+
+// HasAttributeInteger returns a boolean if a field has been set.
+func (o *XmlItem) HasAttributeInteger() bool {
+	if o != nil && o.AttributeInteger != nil {
+		return true
+	}
+
+	return false
+}
+
+// SetAttributeInteger gets a reference to the given int32 and assigns it to the AttributeInteger field.
+func (o *XmlItem) SetAttributeInteger(v int32) {
+	o.AttributeInteger = &v
+}
+
+// GetAttributeBoolean returns the AttributeBoolean field if non-nil, zero value otherwise.
+func (o *XmlItem) GetAttributeBoolean() bool {
+	if o == nil || o.AttributeBoolean == nil {
+		var ret bool
+		return ret
+	}
+	return *o.AttributeBoolean
+}
+
+// GetAttributeBooleanOk returns a tuple with the AttributeBoolean field if it's non-nil, zero value otherwise
+// and a boolean to check if the value has been set.
+func (o *XmlItem) GetAttributeBooleanOk() (bool, bool) {
+	if o == nil || o.AttributeBoolean == nil {
+		var ret bool
+		return ret, false
+	}
+	return *o.AttributeBoolean, true
+}
+
+// HasAttributeBoolean returns a boolean if a field has been set.
+func (o *XmlItem) HasAttributeBoolean() bool {
+	if o != nil && o.AttributeBoolean != nil {
+		return true
+	}
+
+	return false
+}
+
+// SetAttributeBoolean gets a reference to the given bool and assigns it to the AttributeBoolean field.
+func (o *XmlItem) SetAttributeBoolean(v bool) {
+	o.AttributeBoolean = &v
+}
+
+// GetWrappedArray returns the WrappedArray field if non-nil, zero value otherwise.
+func (o *XmlItem) GetWrappedArray() []int32 {
+	if o == nil || o.WrappedArray == nil {
+		var ret []int32
+		return ret
+	}
+	return *o.WrappedArray
+}
+
+// GetWrappedArrayOk returns a tuple with the WrappedArray field if it's non-nil, zero value otherwise
+// and a boolean to check if the value has been set.
+func (o *XmlItem) GetWrappedArrayOk() ([]int32, bool) {
+	if o == nil || o.WrappedArray == nil {
+		var ret []int32
+		return ret, false
+	}
+	return *o.WrappedArray, true
+}
+
+// HasWrappedArray returns a boolean if a field has been set.
+func (o *XmlItem) HasWrappedArray() bool {
+	if o != nil && o.WrappedArray != nil {
+		return true
+	}
+
+	return false
+}
+
+// SetWrappedArray gets a reference to the given []int32 and assigns it to the WrappedArray field.
+func (o *XmlItem) SetWrappedArray(v []int32) {
+	o.WrappedArray = &v
+}
+
+// GetNameString returns the NameString field if non-nil, zero value otherwise.
+func (o *XmlItem) GetNameString() string {
+	if o == nil || o.NameString == nil {
+		var ret string
+		return ret
+	}
+	return *o.NameString
+}
+
+// GetNameStringOk returns a tuple with the NameString field if it's non-nil, zero value otherwise
+// and a boolean to check if the value has been set.
+func (o *XmlItem) GetNameStringOk() (string, bool) {
+	if o == nil || o.NameString == nil {
+		var ret string
+		return ret, false
+	}
+	return *o.NameString, true
+}
+
+// HasNameString returns a boolean if a field has been set.
+func (o *XmlItem) HasNameString() bool {
+	if o != nil && o.NameString != nil {
+		return true
+	}
+
+	return false
+}
+
+// SetNameString gets a reference to the given string and assigns it to the NameString field.
+func (o *XmlItem) SetNameString(v string) {
+	o.NameString = &v
+}
+
+// GetNameNumber returns the NameNumber field if non-nil, zero value otherwise.
+func (o *XmlItem) GetNameNumber() float32 {
+	if o == nil || o.NameNumber == nil {
+		var ret float32
+		return ret
+	}
+	return *o.NameNumber
+}
+
+// GetNameNumberOk returns a tuple with the NameNumber field if it's non-nil, zero value otherwise
+// and a boolean to check if the value has been set.
+func (o *XmlItem) GetNameNumberOk() (float32, bool) {
+	if o == nil || o.NameNumber == nil {
+		var ret float32
+		return ret, false
+	}
+	return *o.NameNumber, true
+}
+
+// HasNameNumber returns a boolean if a field has been set.
+func (o *XmlItem) HasNameNumber() bool {
+	if o != nil && o.NameNumber != nil {
+		return true
+	}
+
+	return false
+}
+
+// SetNameNumber gets a reference to the given float32 and assigns it to the NameNumber field.
+func (o *XmlItem) SetNameNumber(v float32) {
+	o.NameNumber = &v
+}
+
+// GetNameInteger returns the NameInteger field if non-nil, zero value otherwise.
+func (o *XmlItem) GetNameInteger() int32 {
+	if o == nil || o.NameInteger == nil {
+		var ret int32
+		return ret
+	}
+	return *o.NameInteger
+}
+
+// GetNameIntegerOk returns a tuple with the NameInteger field if it's non-nil, zero value otherwise
+// and a boolean to check if the value has been set.
+func (o *XmlItem) GetNameIntegerOk() (int32, bool) {
+	if o == nil || o.NameInteger == nil {
+		var ret int32
+		return ret, false
+	}
+	return *o.NameInteger, true
+}
+
+// HasNameInteger returns a boolean if a field has been set.
+func (o *XmlItem) HasNameInteger() bool {
+	if o != nil && o.NameInteger != nil {
+		return true
+	}
+
+	return false
+}
+
+// SetNameInteger gets a reference to the given int32 and assigns it to the NameInteger field.
+func (o *XmlItem) SetNameInteger(v int32) {
+	o.NameInteger = &v
+}
+
+// GetNameBoolean returns the NameBoolean field if non-nil, zero value otherwise.
+func (o *XmlItem) GetNameBoolean() bool {
+	if o == nil || o.NameBoolean == nil {
+		var ret bool
+		return ret
+	}
+	return *o.NameBoolean
+}
+
+// GetNameBooleanOk returns a tuple with the NameBoolean field if it's non-nil, zero value otherwise
+// and a boolean to check if the value has been set.
+func (o *XmlItem) GetNameBooleanOk() (bool, bool) {
+	if o == nil || o.NameBoolean == nil {
+		var ret bool
+		return ret, false
+	}
+	return *o.NameBoolean, true
+}
+
+// HasNameBoolean returns a boolean if a field has been set.
+func (o *XmlItem) HasNameBoolean() bool {
+	if o != nil && o.NameBoolean != nil {
+		return true
+	}
+
+	return false
+}
+
+// SetNameBoolean gets a reference to the given bool and assigns it to the NameBoolean field.
+func (o *XmlItem) SetNameBoolean(v bool) {
+	o.NameBoolean = &v
+}
+
+// GetNameArray returns the NameArray field if non-nil, zero value otherwise.
+func (o *XmlItem) GetNameArray() []int32 {
+	if o == nil || o.NameArray == nil {
+		var ret []int32
+		return ret
+	}
+	return *o.NameArray
+}
+
+// GetNameArrayOk returns a tuple with the NameArray field if it's non-nil, zero value otherwise
+// and a boolean to check if the value has been set.
+func (o *XmlItem) GetNameArrayOk() ([]int32, bool) {
+	if o == nil || o.NameArray == nil {
+		var ret []int32
+		return ret, false
+	}
+	return *o.NameArray, true
+}
+
+// HasNameArray returns a boolean if a field has been set.
+func (o *XmlItem) HasNameArray() bool {
+	if o != nil && o.NameArray != nil {
+		return true
+	}
+
+	return false
+}
+
+// SetNameArray gets a reference to the given []int32 and assigns it to the NameArray field.
+func (o *XmlItem) SetNameArray(v []int32) {
+	o.NameArray = &v
+}
+
+// GetNameWrappedArray returns the NameWrappedArray field if non-nil, zero value otherwise.
+func (o *XmlItem) GetNameWrappedArray() []int32 {
+	if o == nil || o.NameWrappedArray == nil {
+		var ret []int32
+		return ret
+	}
+	return *o.NameWrappedArray
+}
+
+// GetNameWrappedArrayOk returns a tuple with the NameWrappedArray field if it's non-nil, zero value otherwise
+// and a boolean to check if the value has been set.
+func (o *XmlItem) GetNameWrappedArrayOk() ([]int32, bool) {
+	if o == nil || o.NameWrappedArray == nil {
+		var ret []int32
+		return ret, false
+	}
+	return *o.NameWrappedArray, true
+}
+
+// HasNameWrappedArray returns a boolean if a field has been set.
+func (o *XmlItem) HasNameWrappedArray() bool {
+	if o != nil && o.NameWrappedArray != nil {
+		return true
+	}
+
+	return false
+}
+
+// SetNameWrappedArray gets a reference to the given []int32 and assigns it to the NameWrappedArray field.
+func (o *XmlItem) SetNameWrappedArray(v []int32) {
+	o.NameWrappedArray = &v
+}
+
+// GetPrefixString returns the PrefixString field if non-nil, zero value otherwise.
+func (o *XmlItem) GetPrefixString() string {
+	if o == nil || o.PrefixString == nil {
+		var ret string
+		return ret
+	}
+	return *o.PrefixString
+}
+
+// GetPrefixStringOk returns a tuple with the PrefixString field if it's non-nil, zero value otherwise
+// and a boolean to check if the value has been set.
+func (o *XmlItem) GetPrefixStringOk() (string, bool) {
+	if o == nil || o.PrefixString == nil {
+		var ret string
+		return ret, false
+	}
+	return *o.PrefixString, true
+}
+
+// HasPrefixString returns a boolean if a field has been set.
+func (o *XmlItem) HasPrefixString() bool {
+	if o != nil && o.PrefixString != nil {
+		return true
+	}
+
+	return false
+}
+
+// SetPrefixString gets a reference to the given string and assigns it to the PrefixString field.
+func (o *XmlItem) SetPrefixString(v string) {
+	o.PrefixString = &v
+}
+
+// GetPrefixNumber returns the PrefixNumber field if non-nil, zero value otherwise.
+func (o *XmlItem) GetPrefixNumber() float32 {
+	if o == nil || o.PrefixNumber == nil {
+		var ret float32
+		return ret
+	}
+	return *o.PrefixNumber
+}
+
+// GetPrefixNumberOk returns a tuple with the PrefixNumber field if it's non-nil, zero value otherwise
+// and a boolean to check if the value has been set.
+func (o *XmlItem) GetPrefixNumberOk() (float32, bool) {
+	if o == nil || o.PrefixNumber == nil {
+		var ret float32
+		return ret, false
+	}
+	return *o.PrefixNumber, true
+}
+
+// HasPrefixNumber returns a boolean if a field has been set.
+func (o *XmlItem) HasPrefixNumber() bool {
+	if o != nil && o.PrefixNumber != nil {
+		return true
+	}
+
+	return false
+}
+
+// SetPrefixNumber gets a reference to the given float32 and assigns it to the PrefixNumber field.
+func (o *XmlItem) SetPrefixNumber(v float32) {
+	o.PrefixNumber = &v
+}
+
+// GetPrefixInteger returns the PrefixInteger field if non-nil, zero value otherwise.
+func (o *XmlItem) GetPrefixInteger() int32 {
+	if o == nil || o.PrefixInteger == nil {
+		var ret int32
+		return ret
+	}
+	return *o.PrefixInteger
+}
+
+// GetPrefixIntegerOk returns a tuple with the PrefixInteger field if it's non-nil, zero value otherwise
+// and a boolean to check if the value has been set.
+func (o *XmlItem) GetPrefixIntegerOk() (int32, bool) {
+	if o == nil || o.PrefixInteger == nil {
+		var ret int32
+		return ret, false
+	}
+	return *o.PrefixInteger, true
+}
+
+// HasPrefixInteger returns a boolean if a field has been set.
+func (o *XmlItem) HasPrefixInteger() bool {
+	if o != nil && o.PrefixInteger != nil {
+		return true
+	}
+
+	return false
+}
+
+// SetPrefixInteger gets a reference to the given int32 and assigns it to the PrefixInteger field.
+func (o *XmlItem) SetPrefixInteger(v int32) {
+	o.PrefixInteger = &v
+}
+
+// GetPrefixBoolean returns the PrefixBoolean field if non-nil, zero value otherwise.
+func (o *XmlItem) GetPrefixBoolean() bool {
+	if o == nil || o.PrefixBoolean == nil {
+		var ret bool
+		return ret
+	}
+	return *o.PrefixBoolean
+}
+
+// GetPrefixBooleanOk returns a tuple with the PrefixBoolean field if it's non-nil, zero value otherwise
+// and a boolean to check if the value has been set.
+func (o *XmlItem) GetPrefixBooleanOk() (bool, bool) {
+	if o == nil || o.PrefixBoolean == nil {
+		var ret bool
+		return ret, false
+	}
+	return *o.PrefixBoolean, true
+}
+
+// HasPrefixBoolean returns a boolean if a field has been set.
+func (o *XmlItem) HasPrefixBoolean() bool {
+	if o != nil && o.PrefixBoolean != nil {
+		return true
+	}
+
+	return false
+}
+
+// SetPrefixBoolean gets a reference to the given bool and assigns it to the PrefixBoolean field.
+func (o *XmlItem) SetPrefixBoolean(v bool) {
+	o.PrefixBoolean = &v
+}
+
+// GetPrefixArray returns the PrefixArray field if non-nil, zero value otherwise.
+func (o *XmlItem) GetPrefixArray() []int32 {
+	if o == nil || o.PrefixArray == nil {
+		var ret []int32
+		return ret
+	}
+	return *o.PrefixArray
+}
+
+// GetPrefixArrayOk returns a tuple with the PrefixArray field if it's non-nil, zero value otherwise
+// and a boolean to check if the value has been set.
+func (o *XmlItem) GetPrefixArrayOk() ([]int32, bool) {
+	if o == nil || o.PrefixArray == nil {
+		var ret []int32
+		return ret, false
+	}
+	return *o.PrefixArray, true
+}
+
+// HasPrefixArray returns a boolean if a field has been set.
+func (o *XmlItem) HasPrefixArray() bool {
+	if o != nil && o.PrefixArray != nil {
+		return true
+	}
+
+	return false
+}
+
+// SetPrefixArray gets a reference to the given []int32 and assigns it to the PrefixArray field.
+func (o *XmlItem) SetPrefixArray(v []int32) {
+	o.PrefixArray = &v
+}
+
+// GetPrefixWrappedArray returns the PrefixWrappedArray field if non-nil, zero value otherwise.
+func (o *XmlItem) GetPrefixWrappedArray() []int32 {
+	if o == nil || o.PrefixWrappedArray == nil {
+		var ret []int32
+		return ret
+	}
+	return *o.PrefixWrappedArray
+}
+
+// GetPrefixWrappedArrayOk returns a tuple with the PrefixWrappedArray field if it's non-nil, zero value otherwise
+// and a boolean to check if the value has been set.
+func (o *XmlItem) GetPrefixWrappedArrayOk() ([]int32, bool) {
+	if o == nil || o.PrefixWrappedArray == nil {
+		var ret []int32
+		return ret, false
+	}
+	return *o.PrefixWrappedArray, true
+}
+
+// HasPrefixWrappedArray returns a boolean if a field has been set.
+func (o *XmlItem) HasPrefixWrappedArray() bool {
+	if o != nil && o.PrefixWrappedArray != nil {
+		return true
+	}
+
+	return false
+}
+
+// SetPrefixWrappedArray gets a reference to the given []int32 and assigns it to the PrefixWrappedArray field.
+func (o *XmlItem) SetPrefixWrappedArray(v []int32) {
+	o.PrefixWrappedArray = &v
+}
+
+// GetNamespaceString returns the NamespaceString field if non-nil, zero value otherwise.
+func (o *XmlItem) GetNamespaceString() string {
+	if o == nil || o.NamespaceString == nil {
+		var ret string
+		return ret
+	}
+	return *o.NamespaceString
+}
+
+// GetNamespaceStringOk returns a tuple with the NamespaceString field if it's non-nil, zero value otherwise
+// and a boolean to check if the value has been set.
+func (o *XmlItem) GetNamespaceStringOk() (string, bool) {
+	if o == nil || o.NamespaceString == nil {
+		var ret string
+		return ret, false
+	}
+	return *o.NamespaceString, true
+}
+
+// HasNamespaceString returns a boolean if a field has been set.
+func (o *XmlItem) HasNamespaceString() bool {
+	if o != nil && o.NamespaceString != nil {
+		return true
+	}
+
+	return false
+}
+
+// SetNamespaceString gets a reference to the given string and assigns it to the NamespaceString field.
+func (o *XmlItem) SetNamespaceString(v string) {
+	o.NamespaceString = &v
+}
+
+// GetNamespaceNumber returns the NamespaceNumber field if non-nil, zero value otherwise.
+func (o *XmlItem) GetNamespaceNumber() float32 {
+	if o == nil || o.NamespaceNumber == nil {
+		var ret float32
+		return ret
+	}
+	return *o.NamespaceNumber
+}
+
+// GetNamespaceNumberOk returns a tuple with the NamespaceNumber field if it's non-nil, zero value otherwise
+// and a boolean to check if the value has been set.
+func (o *XmlItem) GetNamespaceNumberOk() (float32, bool) {
+	if o == nil || o.NamespaceNumber == nil {
+		var ret float32
+		return ret, false
+	}
+	return *o.NamespaceNumber, true
+}
+
+// HasNamespaceNumber returns a boolean if a field has been set.
+func (o *XmlItem) HasNamespaceNumber() bool {
+	if o != nil && o.NamespaceNumber != nil {
+		return true
+	}
+
+	return false
+}
+
+// SetNamespaceNumber gets a reference to the given float32 and assigns it to the NamespaceNumber field.
+func (o *XmlItem) SetNamespaceNumber(v float32) {
+	o.NamespaceNumber = &v
+}
+
+// GetNamespaceInteger returns the NamespaceInteger field if non-nil, zero value otherwise.
+func (o *XmlItem) GetNamespaceInteger() int32 {
+	if o == nil || o.NamespaceInteger == nil {
+		var ret int32
+		return ret
+	}
+	return *o.NamespaceInteger
+}
+
+// GetNamespaceIntegerOk returns a tuple with the NamespaceInteger field if it's non-nil, zero value otherwise
+// and a boolean to check if the value has been set.
+func (o *XmlItem) GetNamespaceIntegerOk() (int32, bool) {
+	if o == nil || o.NamespaceInteger == nil {
+		var ret int32
+		return ret, false
+	}
+	return *o.NamespaceInteger, true
+}
+
+// HasNamespaceInteger returns a boolean if a field has been set.
+func (o *XmlItem) HasNamespaceInteger() bool {
+	if o != nil && o.NamespaceInteger != nil {
+		return true
+	}
+
+	return false
+}
+
+// SetNamespaceInteger gets a reference to the given int32 and assigns it to the NamespaceInteger field.
+func (o *XmlItem) SetNamespaceInteger(v int32) {
+	o.NamespaceInteger = &v
+}
+
+// GetNamespaceBoolean returns the NamespaceBoolean field if non-nil, zero value otherwise.
+func (o *XmlItem) GetNamespaceBoolean() bool {
+	if o == nil || o.NamespaceBoolean == nil {
+		var ret bool
+		return ret
+	}
+	return *o.NamespaceBoolean
+}
+
+// GetNamespaceBooleanOk returns a tuple with the NamespaceBoolean field if it's non-nil, zero value otherwise
+// and a boolean to check if the value has been set.
+func (o *XmlItem) GetNamespaceBooleanOk() (bool, bool) {
+	if o == nil || o.NamespaceBoolean == nil {
+		var ret bool
+		return ret, false
+	}
+	return *o.NamespaceBoolean, true
+}
+
+// HasNamespaceBoolean returns a boolean if a field has been set.
+func (o *XmlItem) HasNamespaceBoolean() bool {
+	if o != nil && o.NamespaceBoolean != nil {
+		return true
+	}
+
+	return false
+}
+
+// SetNamespaceBoolean gets a reference to the given bool and assigns it to the NamespaceBoolean field.
+func (o *XmlItem) SetNamespaceBoolean(v bool) {
+	o.NamespaceBoolean = &v
+}
+
+// GetNamespaceArray returns the NamespaceArray field if non-nil, zero value otherwise.
+func (o *XmlItem) GetNamespaceArray() []int32 {
+	if o == nil || o.NamespaceArray == nil {
+		var ret []int32
+		return ret
+	}
+	return *o.NamespaceArray
+}
+
+// GetNamespaceArrayOk returns a tuple with the NamespaceArray field if it's non-nil, zero value otherwise
+// and a boolean to check if the value has been set.
+func (o *XmlItem) GetNamespaceArrayOk() ([]int32, bool) {
+	if o == nil || o.NamespaceArray == nil {
+		var ret []int32
+		return ret, false
+	}
+	return *o.NamespaceArray, true
+}
+
+// HasNamespaceArray returns a boolean if a field has been set.
+func (o *XmlItem) HasNamespaceArray() bool {
+	if o != nil && o.NamespaceArray != nil {
+		return true
+	}
+
+	return false
+}
+
+// SetNamespaceArray gets a reference to the given []int32 and assigns it to the NamespaceArray field.
+func (o *XmlItem) SetNamespaceArray(v []int32) {
+	o.NamespaceArray = &v
+}
+
+// GetNamespaceWrappedArray returns the NamespaceWrappedArray field if non-nil, zero value otherwise.
+func (o *XmlItem) GetNamespaceWrappedArray() []int32 {
+	if o == nil || o.NamespaceWrappedArray == nil {
+		var ret []int32
+		return ret
+	}
+	return *o.NamespaceWrappedArray
+}
+
+// GetNamespaceWrappedArrayOk returns a tuple with the NamespaceWrappedArray field if it's non-nil, zero value otherwise
+// and a boolean to check if the value has been set.
+func (o *XmlItem) GetNamespaceWrappedArrayOk() ([]int32, bool) {
+	if o == nil || o.NamespaceWrappedArray == nil {
+		var ret []int32
+		return ret, false
+	}
+	return *o.NamespaceWrappedArray, true
+}
+
+// HasNamespaceWrappedArray returns a boolean if a field has been set.
+func (o *XmlItem) HasNamespaceWrappedArray() bool {
+	if o != nil && o.NamespaceWrappedArray != nil {
+		return true
+	}
+
+	return false
+}
+
+// SetNamespaceWrappedArray gets a reference to the given []int32 and assigns it to the NamespaceWrappedArray field.
+func (o *XmlItem) SetNamespaceWrappedArray(v []int32) {
+	o.NamespaceWrappedArray = &v
+}
+
+// GetPrefixNsString returns the PrefixNsString field if non-nil, zero value otherwise.
+func (o *XmlItem) GetPrefixNsString() string {
+	if o == nil || o.PrefixNsString == nil {
+		var ret string
+		return ret
+	}
+	return *o.PrefixNsString
+}
+
+// GetPrefixNsStringOk returns a tuple with the PrefixNsString field if it's non-nil, zero value otherwise
+// and a boolean to check if the value has been set.
+func (o *XmlItem) GetPrefixNsStringOk() (string, bool) {
+	if o == nil || o.PrefixNsString == nil {
+		var ret string
+		return ret, false
+	}
+	return *o.PrefixNsString, true
+}
+
+// HasPrefixNsString returns a boolean if a field has been set.
+func (o *XmlItem) HasPrefixNsString() bool {
+	if o != nil && o.PrefixNsString != nil {
+		return true
+	}
+
+	return false
+}
+
+// SetPrefixNsString gets a reference to the given string and assigns it to the PrefixNsString field.
+func (o *XmlItem) SetPrefixNsString(v string) {
+	o.PrefixNsString = &v
+}
+
+// GetPrefixNsNumber returns the PrefixNsNumber field if non-nil, zero value otherwise.
+func (o *XmlItem) GetPrefixNsNumber() float32 {
+	if o == nil || o.PrefixNsNumber == nil {
+		var ret float32
+		return ret
+	}
+	return *o.PrefixNsNumber
+}
+
+// GetPrefixNsNumberOk returns a tuple with the PrefixNsNumber field if it's non-nil, zero value otherwise
+// and a boolean to check if the value has been set.
+func (o *XmlItem) GetPrefixNsNumberOk() (float32, bool) {
+	if o == nil || o.PrefixNsNumber == nil {
+		var ret float32
+		return ret, false
+	}
+	return *o.PrefixNsNumber, true
+}
+
+// HasPrefixNsNumber returns a boolean if a field has been set.
+func (o *XmlItem) HasPrefixNsNumber() bool {
+	if o != nil && o.PrefixNsNumber != nil {
+		return true
+	}
+
+	return false
+}
+
+// SetPrefixNsNumber gets a reference to the given float32 and assigns it to the PrefixNsNumber field.
+func (o *XmlItem) SetPrefixNsNumber(v float32) {
+	o.PrefixNsNumber = &v
+}
+
+// GetPrefixNsInteger returns the PrefixNsInteger field if non-nil, zero value otherwise.
+func (o *XmlItem) GetPrefixNsInteger() int32 {
+	if o == nil || o.PrefixNsInteger == nil {
+		var ret int32
+		return ret
+	}
+	return *o.PrefixNsInteger
+}
+
+// GetPrefixNsIntegerOk returns a tuple with the PrefixNsInteger field if it's non-nil, zero value otherwise
+// and a boolean to check if the value has been set.
+func (o *XmlItem) GetPrefixNsIntegerOk() (int32, bool) {
+	if o == nil || o.PrefixNsInteger == nil {
+		var ret int32
+		return ret, false
+	}
+	return *o.PrefixNsInteger, true
+}
+
+// HasPrefixNsInteger returns a boolean if a field has been set.
+func (o *XmlItem) HasPrefixNsInteger() bool {
+	if o != nil && o.PrefixNsInteger != nil {
+		return true
+	}
+
+	return false
+}
+
+// SetPrefixNsInteger gets a reference to the given int32 and assigns it to the PrefixNsInteger field.
+func (o *XmlItem) SetPrefixNsInteger(v int32) {
+	o.PrefixNsInteger = &v
+}
+
+// GetPrefixNsBoolean returns the PrefixNsBoolean field if non-nil, zero value otherwise.
+func (o *XmlItem) GetPrefixNsBoolean() bool {
+	if o == nil || o.PrefixNsBoolean == nil {
+		var ret bool
+		return ret
+	}
+	return *o.PrefixNsBoolean
+}
+
+// GetPrefixNsBooleanOk returns a tuple with the PrefixNsBoolean field if it's non-nil, zero value otherwise
+// and a boolean to check if the value has been set.
+func (o *XmlItem) GetPrefixNsBooleanOk() (bool, bool) {
+	if o == nil || o.PrefixNsBoolean == nil {
+		var ret bool
+		return ret, false
+	}
+	return *o.PrefixNsBoolean, true
+}
+
+// HasPrefixNsBoolean returns a boolean if a field has been set.
+func (o *XmlItem) HasPrefixNsBoolean() bool {
+	if o != nil && o.PrefixNsBoolean != nil {
+		return true
+	}
+
+	return false
+}
+
+// SetPrefixNsBoolean gets a reference to the given bool and assigns it to the PrefixNsBoolean field.
+func (o *XmlItem) SetPrefixNsBoolean(v bool) {
+	o.PrefixNsBoolean = &v
+}
+
+// GetPrefixNsArray returns the PrefixNsArray field if non-nil, zero value otherwise.
+func (o *XmlItem) GetPrefixNsArray() []int32 {
+	if o == nil || o.PrefixNsArray == nil {
+		var ret []int32
+		return ret
+	}
+	return *o.PrefixNsArray
+}
+
+// GetPrefixNsArrayOk returns a tuple with the PrefixNsArray field if it's non-nil, zero value otherwise
+// and a boolean to check if the value has been set.
+func (o *XmlItem) GetPrefixNsArrayOk() ([]int32, bool) {
+	if o == nil || o.PrefixNsArray == nil {
+		var ret []int32
+		return ret, false
+	}
+	return *o.PrefixNsArray, true
+}
+
+// HasPrefixNsArray returns a boolean if a field has been set.
+func (o *XmlItem) HasPrefixNsArray() bool {
+	if o != nil && o.PrefixNsArray != nil {
+		return true
+	}
+
+	return false
+}
+
+// SetPrefixNsArray gets a reference to the given []int32 and assigns it to the PrefixNsArray field.
+func (o *XmlItem) SetPrefixNsArray(v []int32) {
+	o.PrefixNsArray = &v
+}
+
+// GetPrefixNsWrappedArray returns the PrefixNsWrappedArray field if non-nil, zero value otherwise.
+func (o *XmlItem) GetPrefixNsWrappedArray() []int32 {
+	if o == nil || o.PrefixNsWrappedArray == nil {
+		var ret []int32
+		return ret
+	}
+	return *o.PrefixNsWrappedArray
+}
+
+// GetPrefixNsWrappedArrayOk returns a tuple with the PrefixNsWrappedArray field if it's non-nil, zero value otherwise
+// and a boolean to check if the value has been set.
+func (o *XmlItem) GetPrefixNsWrappedArrayOk() ([]int32, bool) {
+	if o == nil || o.PrefixNsWrappedArray == nil {
+		var ret []int32
+		return ret, false
+	}
+	return *o.PrefixNsWrappedArray, true
+}
+
+// HasPrefixNsWrappedArray returns a boolean if a field has been set.
+func (o *XmlItem) HasPrefixNsWrappedArray() bool {
+	if o != nil && o.PrefixNsWrappedArray != nil {
+		return true
+	}
+
+	return false
+}
+
+// SetPrefixNsWrappedArray gets a reference to the given []int32 and assigns it to the PrefixNsWrappedArray field.
+func (o *XmlItem) SetPrefixNsWrappedArray(v []int32) {
+	o.PrefixNsWrappedArray = &v
+}
+
+
+func (o XmlItem) MarshalJSON() ([]byte, error) {
+	toSerialize := map[string]interface{}{}
+	if o.AttributeString != nil {
+		toSerialize["attribute_string"] = o.AttributeString
+	}
+	if o.AttributeNumber != nil {
+		toSerialize["attribute_number"] = o.AttributeNumber
+	}
+	if o.AttributeInteger != nil {
+		toSerialize["attribute_integer"] = o.AttributeInteger
+	}
+	if o.AttributeBoolean != nil {
+		toSerialize["attribute_boolean"] = o.AttributeBoolean
+	}
+	if o.WrappedArray != nil {
+		toSerialize["wrapped_array"] = o.WrappedArray
+	}
+	if o.NameString != nil {
+		toSerialize["name_string"] = o.NameString
+	}
+	if o.NameNumber != nil {
+		toSerialize["name_number"] = o.NameNumber
+	}
+	if o.NameInteger != nil {
+		toSerialize["name_integer"] = o.NameInteger
+	}
+	if o.NameBoolean != nil {
+		toSerialize["name_boolean"] = o.NameBoolean
+	}
+	if o.NameArray != nil {
+		toSerialize["name_array"] = o.NameArray
+	}
+	if o.NameWrappedArray != nil {
+		toSerialize["name_wrapped_array"] = o.NameWrappedArray
+	}
+	if o.PrefixString != nil {
+		toSerialize["prefix_string"] = o.PrefixString
+	}
+	if o.PrefixNumber != nil {
+		toSerialize["prefix_number"] = o.PrefixNumber
+	}
+	if o.PrefixInteger != nil {
+		toSerialize["prefix_integer"] = o.PrefixInteger
+	}
+	if o.PrefixBoolean != nil {
+		toSerialize["prefix_boolean"] = o.PrefixBoolean
+	}
+	if o.PrefixArray != nil {
+		toSerialize["prefix_array"] = o.PrefixArray
+	}
+	if o.PrefixWrappedArray != nil {
+		toSerialize["prefix_wrapped_array"] = o.PrefixWrappedArray
+	}
+	if o.NamespaceString != nil {
+		toSerialize["namespace_string"] = o.NamespaceString
+	}
+	if o.NamespaceNumber != nil {
+		toSerialize["namespace_number"] = o.NamespaceNumber
+	}
+	if o.NamespaceInteger != nil {
+		toSerialize["namespace_integer"] = o.NamespaceInteger
+	}
+	if o.NamespaceBoolean != nil {
+		toSerialize["namespace_boolean"] = o.NamespaceBoolean
+	}
+	if o.NamespaceArray != nil {
+		toSerialize["namespace_array"] = o.NamespaceArray
+	}
+	if o.NamespaceWrappedArray != nil {
+		toSerialize["namespace_wrapped_array"] = o.NamespaceWrappedArray
+	}
+	if o.PrefixNsString != nil {
+		toSerialize["prefix_ns_string"] = o.PrefixNsString
+	}
+	if o.PrefixNsNumber != nil {
+		toSerialize["prefix_ns_number"] = o.PrefixNsNumber
+	}
+	if o.PrefixNsInteger != nil {
+		toSerialize["prefix_ns_integer"] = o.PrefixNsInteger
+	}
+	if o.PrefixNsBoolean != nil {
+		toSerialize["prefix_ns_boolean"] = o.PrefixNsBoolean
+	}
+	if o.PrefixNsArray != nil {
+		toSerialize["prefix_ns_array"] = o.PrefixNsArray
+	}
+	if o.PrefixNsWrappedArray != nil {
+		toSerialize["prefix_ns_wrapped_array"] = o.PrefixNsWrappedArray
+	}
+	return json.Marshal(toSerialize)
+}
+
+
diff --git a/samples/client/petstore/go-experimental/go-petstore/utils.go b/samples/client/petstore/go-experimental/go-petstore/utils.go
new file mode 100644
index 0000000000..8d2130be3f
--- /dev/null
+++ b/samples/client/petstore/go-experimental/go-petstore/utils.go
@@ -0,0 +1,39 @@
+/*
+ * OpenAPI Petstore
+ *
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * API version: 1.0.0
+ * Generated by: OpenAPI Generator (https://openapi-generator.tech)
+ */
+
+package petstore
+
+import "time"
+
+// PtrBool is a helper routine that returns a pointer to given integer value.
+func PtrBool(v bool) *bool { return &v }
+
+// PtrInt is a helper routine that returns a pointer to given integer value.
+func PtrInt(v int) *int { return &v }
+
+// PtrInt32 is a helper routine that returns a pointer to given integer value.
+func PtrInt32(v int32) *int32 { return &v }
+
+// PtrInt64 is a helper routine that returns a pointer to given integer value.
+func PtrInt64(v int64) *int64 { return &v }
+
+// PtrFloat is a helper routine that returns a pointer to given float value.
+func PtrFloat(v float32) *float32 { return &v }
+
+// PtrFloat32 is a helper routine that returns a pointer to given float value.
+func PtrFloat32(v float32) *float32 { return &v }
+
+// PtrFloat64 is a helper routine that returns a pointer to given float value.
+func PtrFloat64(v float64) *float64 { return &v }
+
+// PtrString is a helper routine that returns a pointer to given string value.
+func PtrString(v string) *string { return &v }
+
+// PtrTime is helper routine that returns a pointer to given Time value.
+func PtrTime(v time.Time) *time.Time { return &v }
\ No newline at end of file
diff --git a/samples/client/petstore/go-experimental/pet_api_test.go b/samples/client/petstore/go-experimental/pet_api_test.go
index 969fab1f66..c1e8006bb0 100644
--- a/samples/client/petstore/go-experimental/pet_api_test.go
+++ b/samples/client/petstore/go-experimental/pet_api_test.go
@@ -28,8 +28,9 @@ func TestMain(m *testing.M) {
 }
 
 func TestAddPet(t *testing.T) {
-	newPet := (sw.Pet{Id: 12830, Name: "gopher",
-		PhotoUrls: []string{"http://1.com", "http://2.com"}, Status: "pending", Tags: []sw.Tag{sw.Tag{Id: 1, Name: "tag2"}}})
+	newPet := (sw.Pet{Id: sw.PtrInt64(12830), Name: sw.PtrString("gopher"),
+		PhotoUrls: &[]string{"http://1.com", "http://2.com"}, Status: sw.PtrString("pending"),
+		Tags: &[]sw.Tag{sw.Tag{Id: sw.PtrInt64(1), Name: sw.PtrString("tag2")}}})
 
 	r, err := client.PetApi.AddPet(context.Background(), newPet)
 
@@ -86,8 +87,8 @@ func TestUpdatePetWithForm(t *testing.T) {
 		t.Log(r)
 	}
 
-    // get the pet with id 12830 from server to verify the update
-    isPetCorrect(t, 12830, "golang", "available")
+	// get the pet with id 12830 from server to verify the update
+	isPetCorrect(t, 12830, "golang", "available")
 }
 
 func TestFindPetsByTag(t *testing.T) {
@@ -103,8 +104,8 @@ func TestFindPetsByTag(t *testing.T) {
 
 			assert := assert.New(t)
 			for i := 0; i < len(resp); i++ {
-				if resp[i].Id == 12830 {
-					assert.Equal(resp[i].Status, "available", "Pet status should be `pending`")
+				if *resp[i].Id == 12830 {
+					assert.Equal(*resp[i].Status, "available", "Pet status should be `pending`")
 					found = true
 				}
 			}
@@ -131,7 +132,7 @@ func TestFindPetsByStatus(t *testing.T) {
 		} else {
 			assert := assert.New(t)
 			for i := 0; i < len(resp); i++ {
-				assert.Equal(resp[i].Status, "available", "Pet status should be `available`")
+				assert.Equal(*resp[i].Status, "available", "Pet status should be `available`")
 			}
 		}
 
@@ -284,9 +285,9 @@ func isPetCorrect(t *testing.T, id int64, name string, status string) {
 	if err != nil {
 		t.Fatalf("Error while getting pet by id: %v", err)
 	} else {
-		assert.Equal(resp.Id, int64(id), "Pet id should be equal")
-		assert.Equal(resp.Name, name, fmt.Sprintf("Pet name should be %s", name))
-		assert.Equal(resp.Status, status, fmt.Sprintf("Pet status should be %s", status))
+		assert.Equal(*resp.Id, int64(id), "Pet id should be equal")
+		assert.Equal(*resp.Name, name, fmt.Sprintf("Pet name should be %s", name))
+		assert.Equal(*resp.Status, status, fmt.Sprintf("Pet status should be %s", status))
 
 		//t.Log(resp)
 	}
@@ -294,4 +295,3 @@ func isPetCorrect(t *testing.T, id int64, name string, status string) {
 		t.Log(r)
 	}
 }
-
diff --git a/samples/client/petstore/go-experimental/store_api_test.go b/samples/client/petstore/go-experimental/store_api_test.go
index 3088adf7b4..81f4fd7e33 100644
--- a/samples/client/petstore/go-experimental/store_api_test.go
+++ b/samples/client/petstore/go-experimental/store_api_test.go
@@ -11,12 +11,12 @@ import (
 
 func TestPlaceOrder(t *testing.T) {
 	newOrder := sw.Order{
-		Id:       0,
-		PetId:    0,
-		Quantity: 0,
-		ShipDate: time.Now().UTC(),
-		Status:   "placed",
-		Complete: false}
+		Id:       sw.PtrInt64(0),
+		PetId:    sw.PtrInt64(0),
+		Quantity: sw.PtrInt32(0),
+		ShipDate: sw.PtrTime(time.Now().UTC()),
+		Status:   sw.PtrString("placed"),
+		Complete: sw.PtrBool(false)}
 
 	_, r, err := client.StoreApi.PlaceOrder(context.Background(), newOrder)
 
diff --git a/samples/client/petstore/go-experimental/user_api_test.go b/samples/client/petstore/go-experimental/user_api_test.go
index 012c608fab..07b82ebb97 100644
--- a/samples/client/petstore/go-experimental/user_api_test.go
+++ b/samples/client/petstore/go-experimental/user_api_test.go
@@ -11,14 +11,14 @@ import (
 
 func TestCreateUser(t *testing.T) {
 	newUser := sw.User{
-		Id:         1000,
-		FirstName:  "gopher",
-		LastName:   "lang",
-		Username:   "gopher",
-		Password:   "lang",
-		Email:      "lang@test.com",
-		Phone:      "5101112222",
-		UserStatus: 1}
+		Id:         sw.PtrInt64(1000),
+		FirstName:  sw.PtrString("gopher"),
+		LastName:   sw.PtrString("lang"),
+        Username:   sw.PtrString("gopher"),
+		Password:   sw.PtrString("lang"),
+		Email:      sw.PtrString("lang@test.com"),
+		Phone:      sw.PtrString("5101112222"),
+		UserStatus: sw.PtrInt32(1)}
 
 	apiResponse, err := client.UserApi.CreateUser(context.Background(), newUser)
 
@@ -34,24 +34,24 @@ func TestCreateUser(t *testing.T) {
 func TestCreateUsersWithArrayInput(t *testing.T) {
 	newUsers := []sw.User{
 		sw.User{
-			Id:         int64(1001),
-			FirstName:  "gopher1",
-			LastName:   "lang1",
-			Username:   "gopher1",
-			Password:   "lang1",
-			Email:      "lang1@test.com",
-			Phone:      "5101112222",
-			UserStatus: int32(1),
+			Id:         sw.PtrInt64(1001),
+			FirstName:  sw.PtrString("gopher1"),
+			LastName:   sw.PtrString("lang1"),
+			Username:   sw.PtrString("gopher1"),
+			Password:   sw.PtrString("lang1"),
+			Email:      sw.PtrString("lang1@test.com"),
+			Phone:      sw.PtrString("5101112222"),
+			UserStatus: sw.PtrInt32(1),
 		},
 		sw.User{
-			Id:         int64(1002),
-			FirstName:  "gopher2",
-			LastName:   "lang2",
-			Username:   "gopher2",
-			Password:   "lang2",
-			Email:      "lang2@test.com",
-			Phone:      "5101112222",
-			UserStatus: int32(1),
+			Id:         sw.PtrInt64(1002),
+			FirstName:  sw.PtrString("gopher2"),
+			LastName:   sw.PtrString("lang2"),
+			Username:   sw.PtrString("gopher2"),
+			Password:   sw.PtrString("lang2"),
+			Email:      sw.PtrString("lang2@test.com"),
+			Phone:      sw.PtrString("5101112222"),
+			UserStatus: sw.PtrInt32(1),
 		},
 	}
 
@@ -84,9 +84,9 @@ func TestGetUserByName(t *testing.T) {
 	if err != nil {
 		t.Fatalf("Error while getting user by id: %v", err)
 	} else {
-		assert.Equal(resp.Id, int64(1000), "User id should be equal")
-		assert.Equal(resp.Username, "gopher", "User name should be gopher")
-		assert.Equal(resp.LastName, "lang", "Last name should be lang")
+		assert.Equal(*resp.Id, int64(1000), "User id should be equal")
+		assert.Equal(*resp.Username, "gopher", "User name should be gopher")
+		assert.Equal(*resp.LastName, "lang", "Last name should be lang")
 		//t.Log(resp)
 	}
 	if apiResponse.StatusCode != 200 {
@@ -113,14 +113,14 @@ func TestUpdateUser(t *testing.T) {
 	assert := assert.New(t)
 
 	newUser := sw.User{
-		Id:         1000,
-		FirstName:  "gopher20",
-		LastName:   "lang20",
-		Username:   "gopher",
-		Password:   "lang",
-		Email:      "lang@test.com",
-		Phone:      "5101112222",
-		UserStatus: 1}
+		Id:         sw.PtrInt64(1000),
+		FirstName:  sw.PtrString("gopher20"),
+		LastName:   sw.PtrString("lang20"),
+		Username:   sw.PtrString("gopher"),
+		Password:   sw.PtrString("lang"),
+		Email:      sw.PtrString("lang@test.com"),
+		Phone:      sw.PtrString("5101112222"),
+		UserStatus: sw.PtrInt32(1)}
 
 	apiResponse, err := client.UserApi.UpdateUser(context.Background(), "gopher", newUser)
 	if err != nil {
@@ -135,9 +135,9 @@ func TestUpdateUser(t *testing.T) {
 	if err != nil {
 		t.Fatalf("Error while getting user by id: %v", err)
 	} else {
-		assert.Equal(resp.Id, int64(1000), "User id should be equal")
-		assert.Equal(resp.FirstName, "gopher20", "User name should be gopher")
-		assert.Equal(resp.Password, "lang", "User name should be the same")
+		assert.Equal(*resp.Id, int64(1000), "User id should be equal")
+		assert.Equal(*resp.FirstName, "gopher20", "User name should be gopher")
+		assert.Equal(*resp.Password, "lang", "User name should be the same")
 	}
 }
 

From 26b8d1f4c2e6f09a17979a7f7ea18704d4606fbf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Beno=C3=AEt=20Courtine?= <benoit.courtine@gmail.com>
Date: Thu, 18 Jul 2019 11:08:48 +0200
Subject: [PATCH 27/62] Better Rust client imports (#3332)

* Better Rust client imports.

* No more "unused_imports" in models for serde_json::Value.
* No more compilation problem for apis requiring serde_json::Value.
* "crate::" prefix for models and apis imports, for compatibility with Rust 2018 edition.

* Rust samples regeneration using new code.
---
 .../codegen/languages/RustClientCodegen.java  |  8 +++----
 .../main/resources/rust/hyper/api.mustache    |  4 ++--
 .../main/resources/rust/hyper/client.mustache |  6 ++---
 .../src/main/resources/rust/model.mustache    |  3 ---
 .../main/resources/rust/reqwest/api.mustache  |  4 ++--
 .../resources/rust/reqwest/client.mustache    |  6 ++---
 .../rust-reqwest/.openapi-generator/VERSION   |  2 +-
 .../client/petstore/rust-reqwest/docs/Pet.md  |  4 ++--
 .../petstore/rust-reqwest/docs/PetApi.md      | 16 ++++++-------
 .../petstore/rust-reqwest/docs/StoreApi.md    |  8 +++----
 .../petstore/rust-reqwest/docs/UserApi.md     |  8 +++----
 .../petstore/rust-reqwest/src/apis/client.rs  | 18 +++++++-------
 .../petstore/rust-reqwest/src/apis/pet_api.rs | 24 +++++++++----------
 .../rust-reqwest/src/apis/store_api.rs        |  8 +++----
 .../rust-reqwest/src/apis/user_api.rs         | 20 ++++++++--------
 .../rust-reqwest/src/models/api_response.rs   |  3 ---
 .../rust-reqwest/src/models/category.rs       |  3 ---
 .../petstore/rust-reqwest/src/models/order.rs |  3 ---
 .../petstore/rust-reqwest/src/models/pet.rs   |  7 ++----
 .../petstore/rust-reqwest/src/models/tag.rs   |  3 ---
 .../petstore/rust-reqwest/src/models/user.rs  |  3 ---
 .../petstore/rust/.openapi-generator/VERSION  |  2 +-
 samples/client/petstore/rust/docs/Pet.md      |  4 ++--
 samples/client/petstore/rust/docs/PetApi.md   | 16 ++++++-------
 samples/client/petstore/rust/docs/StoreApi.md |  8 +++----
 samples/client/petstore/rust/docs/UserApi.md  |  8 +++----
 .../client/petstore/rust/src/apis/client.rs   | 18 +++++++-------
 .../client/petstore/rust/src/apis/pet_api.rs  | 24 +++++++++----------
 .../petstore/rust/src/apis/store_api.rs       |  8 +++----
 .../client/petstore/rust/src/apis/user_api.rs | 20 ++++++++--------
 .../petstore/rust/src/models/api_response.rs  |  3 ---
 .../petstore/rust/src/models/category.rs      |  3 ---
 .../client/petstore/rust/src/models/order.rs  |  3 ---
 .../client/petstore/rust/src/models/pet.rs    |  7 ++----
 .../client/petstore/rust/src/models/tag.rs    |  3 ---
 .../client/petstore/rust/src/models/user.rs   |  3 ---
 36 files changed, 126 insertions(+), 165 deletions(-)

diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/RustClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/RustClientCodegen.java
index 6bd358bd23..ad2c260cac 100644
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/RustClientCodegen.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/RustClientCodegen.java
@@ -124,9 +124,9 @@ public class RustClientCodegen extends DefaultCodegen implements CodegenConfig {
         // I tried to map as "std::io::File", but Reqwest multipart file requires a "AsRef<Path>" param.
         // Getting a file from a Path is simple, but the opposite is difficult. So I map as "std::path::Path".
         typeMapping.put("file", "std::path::PathBuf");
-        typeMapping.put("binary", "::models::File");
+        typeMapping.put("binary", "crate::models::File");
         typeMapping.put("ByteArray", "String");
-        typeMapping.put("object", "Value");
+        typeMapping.put("object", "serde_json::Value");
 
         // no need for rust
         //importMapping = new HashMap<String, String>();
@@ -352,8 +352,8 @@ public class RustClientCodegen extends DefaultCodegen implements CodegenConfig {
         }
 
         // return fully-qualified model name
-        // ::models::{{classnameFile}}::{{classname}}
-        return "::models::" + toModelName(schemaType);
+        // crate::models::{{classnameFile}}::{{classname}}
+        return "crate::models::" + toModelName(schemaType);
     }
 
     @Override
diff --git a/modules/openapi-generator/src/main/resources/rust/hyper/api.mustache b/modules/openapi-generator/src/main/resources/rust/hyper/api.mustache
index 426fee7fe8..872148bddd 100644
--- a/modules/openapi-generator/src/main/resources/rust/hyper/api.mustache
+++ b/modules/openapi-generator/src/main/resources/rust/hyper/api.mustache
@@ -24,7 +24,7 @@ impl<C: hyper::client::Connect> {{{classname}}}Client<C> {
 pub trait {{{classname}}} {
 {{#operations}}
 {{#operation}}
-    fn {{{operationId}}}(&self, {{#allParams}}{{{paramName}}}: {{#isString}}&str{{/isString}}{{#isUuid}}&str{{/isUuid}}{{^isString}}{{^isUuid}}{{^isPrimitiveType}}{{^isContainer}}::models::{{/isContainer}}{{/isPrimitiveType}}{{{dataType}}}{{/isUuid}}{{/isString}}{{#hasMore}}, {{/hasMore}}{{/allParams}}) -> Box<Future<Item = {{^returnType}}(){{/returnType}}{{#returnType}}{{{returnType}}}{{/returnType}}, Error = Error<serde_json::Value>>>;
+    fn {{{operationId}}}(&self, {{#allParams}}{{{paramName}}}: {{#isString}}&str{{/isString}}{{#isUuid}}&str{{/isUuid}}{{^isString}}{{^isUuid}}{{^isPrimitiveType}}{{^isContainer}}crate::models::{{/isContainer}}{{/isPrimitiveType}}{{{dataType}}}{{/isUuid}}{{/isString}}{{#hasMore}}, {{/hasMore}}{{/allParams}}) -> Box<Future<Item = {{^returnType}}(){{/returnType}}{{#returnType}}{{{returnType}}}{{/returnType}}, Error = Error<serde_json::Value>>>;
 {{/operation}}
 {{/operations}}
 }
@@ -33,7 +33,7 @@ pub trait {{{classname}}} {
 impl<C: hyper::client::Connect>{{{classname}}} for {{{classname}}}Client<C> {
 {{#operations}}
 {{#operation}}
-    fn {{{operationId}}}(&self, {{#allParams}}{{{paramName}}}: {{#isString}}&str{{/isString}}{{#isUuid}}&str{{/isUuid}}{{^isString}}{{^isUuid}}{{^isPrimitiveType}}{{^isContainer}}::models::{{/isContainer}}{{/isPrimitiveType}}{{{dataType}}}{{/isUuid}}{{/isString}}{{#hasMore}}, {{/hasMore}}{{/allParams}}) -> Box<Future<Item = {{^returnType}}(){{/returnType}}{{#returnType}}{{{.}}}{{/returnType}}, Error = Error<serde_json::Value>>> {
+    fn {{{operationId}}}(&self, {{#allParams}}{{{paramName}}}: {{#isString}}&str{{/isString}}{{#isUuid}}&str{{/isUuid}}{{^isString}}{{^isUuid}}{{^isPrimitiveType}}{{^isContainer}}crate::models::{{/isContainer}}{{/isPrimitiveType}}{{{dataType}}}{{/isUuid}}{{/isString}}{{#hasMore}}, {{/hasMore}}{{/allParams}}) -> Box<Future<Item = {{^returnType}}(){{/returnType}}{{#returnType}}{{{.}}}{{/returnType}}, Error = Error<serde_json::Value>>> {
         __internal_request::Request::new(hyper::Method::{{{httpMethod}}}, "{{{path}}}".to_string())
         {{#hasAuthMethods}}
         {{#authMethods}}
diff --git a/modules/openapi-generator/src/main/resources/rust/hyper/client.mustache b/modules/openapi-generator/src/main/resources/rust/hyper/client.mustache
index f93577e7cb..a0648b758b 100644
--- a/modules/openapi-generator/src/main/resources/rust/hyper/client.mustache
+++ b/modules/openapi-generator/src/main/resources/rust/hyper/client.mustache
@@ -10,7 +10,7 @@ pub struct APIClient<C: hyper::client::Connect> {
 {{#operations}}
 {{#operation}}
     {{#-last}}
-    {{{classFilename}}}: Box<::apis::{{{classname}}}>,
+    {{{classFilename}}}: Box<crate::apis::{{{classname}}}>,
     {{/-last}}
 {{/operation}}
 {{/operations}}
@@ -29,7 +29,7 @@ impl<C: hyper::client::Connect> APIClient<C> {
 {{#operations}}
 {{#operation}}
             {{#-last}}
-            {{{classFilename}}}: Box::new(::apis::{{{classname}}}Client::new(rc.clone())),
+            {{{classFilename}}}: Box::new(crate::apis::{{{classname}}}Client::new(rc.clone())),
             {{/-last}}
 {{/operation}}
 {{/operations}}
@@ -43,7 +43,7 @@ impl<C: hyper::client::Connect> APIClient<C> {
 {{#operations}}
 {{#operation}}
 {{#-last}}
-    pub fn {{{classFilename}}}(&self) -> &::apis::{{{classname}}}{
+    pub fn {{{classFilename}}}(&self) -> &crate::apis::{{{classname}}}{
         self.{{{classFilename}}}.as_ref()
     }
 
diff --git a/modules/openapi-generator/src/main/resources/rust/model.mustache b/modules/openapi-generator/src/main/resources/rust/model.mustache
index 4c6b8dff10..37a3ff77bc 100644
--- a/modules/openapi-generator/src/main/resources/rust/model.mustache
+++ b/modules/openapi-generator/src/main/resources/rust/model.mustache
@@ -5,9 +5,6 @@
 /// {{{classname}}} : {{{description}}}
 {{/description}}
 
-#[allow(unused_imports)]
-use serde_json::Value;
-
 {{!-- for enum schemas --}}
 {{#isEnum}}
 /// {{{description}}}
diff --git a/modules/openapi-generator/src/main/resources/rust/reqwest/api.mustache b/modules/openapi-generator/src/main/resources/rust/reqwest/api.mustache
index e6706f7afe..038284ec6c 100644
--- a/modules/openapi-generator/src/main/resources/rust/reqwest/api.mustache
+++ b/modules/openapi-generator/src/main/resources/rust/reqwest/api.mustache
@@ -21,7 +21,7 @@ impl {{{classname}}}Client {
 pub trait {{{classname}}} {
 {{#operations}}
 {{#operation}}
-    fn {{{operationId}}}(&self, {{#allParams}}{{{paramName}}}: {{#isString}}&str{{/isString}}{{#isUuid}}&str{{/isUuid}}{{^isString}}{{^isUuid}}{{^isPrimitiveType}}{{^isContainer}}::models::{{/isContainer}}{{/isPrimitiveType}}{{{dataType}}}{{/isUuid}}{{/isString}}{{#hasMore}}, {{/hasMore}}{{/allParams}}) -> Result<{{^returnType}}(){{/returnType}}{{#returnType}}{{{returnType}}}{{/returnType}}, Error>;
+    fn {{{operationId}}}(&self, {{#allParams}}{{{paramName}}}: {{#isString}}&str{{/isString}}{{#isUuid}}&str{{/isUuid}}{{^isString}}{{^isUuid}}{{^isPrimitiveType}}{{^isContainer}}crate::models::{{/isContainer}}{{/isPrimitiveType}}{{{dataType}}}{{/isUuid}}{{/isString}}{{#hasMore}}, {{/hasMore}}{{/allParams}}) -> Result<{{^returnType}}(){{/returnType}}{{#returnType}}{{{returnType}}}{{/returnType}}, Error>;
 {{/operation}}
 {{/operations}}
 }
@@ -29,7 +29,7 @@ pub trait {{{classname}}} {
 impl {{{classname}}} for {{{classname}}}Client {
 {{#operations}}
 {{#operation}}
-    fn {{{operationId}}}(&self, {{#allParams}}{{{paramName}}}: {{#isString}}&str{{/isString}}{{#isUuid}}&str{{/isUuid}}{{^isString}}{{^isUuid}}{{^isPrimitiveType}}{{^isContainer}}::models::{{/isContainer}}{{/isPrimitiveType}}{{{dataType}}}{{/isUuid}}{{/isString}}{{#hasMore}}, {{/hasMore}}{{/allParams}}) -> Result<{{^returnType}}(){{/returnType}}{{#returnType}}{{{returnType}}}{{/returnType}}, Error> {
+    fn {{{operationId}}}(&self, {{#allParams}}{{{paramName}}}: {{#isString}}&str{{/isString}}{{#isUuid}}&str{{/isUuid}}{{^isString}}{{^isUuid}}{{^isPrimitiveType}}{{^isContainer}}crate::models::{{/isContainer}}{{/isPrimitiveType}}{{{dataType}}}{{/isUuid}}{{/isString}}{{#hasMore}}, {{/hasMore}}{{/allParams}}) -> Result<{{^returnType}}(){{/returnType}}{{#returnType}}{{{returnType}}}{{/returnType}}, Error> {
         let configuration: &configuration::Configuration = self.configuration.borrow();
         let client = &configuration.client;
 
diff --git a/modules/openapi-generator/src/main/resources/rust/reqwest/client.mustache b/modules/openapi-generator/src/main/resources/rust/reqwest/client.mustache
index 33f2b2fd61..5fdede09c4 100644
--- a/modules/openapi-generator/src/main/resources/rust/reqwest/client.mustache
+++ b/modules/openapi-generator/src/main/resources/rust/reqwest/client.mustache
@@ -9,7 +9,7 @@ pub struct APIClient {
 {{#operations}}
 {{#operation}}
     {{#-last}}
-    {{{classFilename}}}: Box<::apis::{{{classname}}}>,
+    {{{classFilename}}}: Box<crate::apis::{{{classname}}}>,
     {{/-last}}
 {{/operation}}
 {{/operations}}
@@ -28,7 +28,7 @@ impl APIClient {
 {{#operations}}
 {{#operation}}
             {{#-last}}
-            {{{classFilename}}}: Box::new(::apis::{{{classname}}}Client::new(rc.clone())),
+            {{{classFilename}}}: Box::new(crate::apis::{{{classname}}}Client::new(rc.clone())),
             {{/-last}}
 {{/operation}}
 {{/operations}}
@@ -42,7 +42,7 @@ impl APIClient {
 {{#operations}}
 {{#operation}}
 {{#-last}}
-    pub fn {{{classFilename}}}(&self) -> &::apis::{{{classname}}}{
+    pub fn {{{classFilename}}}(&self) -> &crate::apis::{{{classname}}}{
         self.{{{classFilename}}}.as_ref()
     }
 
diff --git a/samples/client/petstore/rust-reqwest/.openapi-generator/VERSION b/samples/client/petstore/rust-reqwest/.openapi-generator/VERSION
index d96260ba33..83a328a922 100644
--- a/samples/client/petstore/rust-reqwest/.openapi-generator/VERSION
+++ b/samples/client/petstore/rust-reqwest/.openapi-generator/VERSION
@@ -1 +1 @@
-4.0.2-SNAPSHOT
\ No newline at end of file
+4.1.0-SNAPSHOT
\ No newline at end of file
diff --git a/samples/client/petstore/rust-reqwest/docs/Pet.md b/samples/client/petstore/rust-reqwest/docs/Pet.md
index 53a462e68b..2c8ea36dd9 100644
--- a/samples/client/petstore/rust-reqwest/docs/Pet.md
+++ b/samples/client/petstore/rust-reqwest/docs/Pet.md
@@ -5,10 +5,10 @@
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
 **id** | **i64** |  | [optional] 
-**category** | [***::models::Category**](Category.md) |  | [optional] 
+**category** | [***crate::models::Category**](Category.md) |  | [optional] 
 **name** | **String** |  | 
 **photo_urls** | **Vec<String>** |  | 
-**tags** | [**Vec<::models::Tag>**](Tag.md) |  | [optional] 
+**tags** | [**Vec<crate::models::Tag>**](Tag.md) |  | [optional] 
 **status** | **String** | pet status in the store | [optional] 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
diff --git a/samples/client/petstore/rust-reqwest/docs/PetApi.md b/samples/client/petstore/rust-reqwest/docs/PetApi.md
index a74635038e..336116bee5 100644
--- a/samples/client/petstore/rust-reqwest/docs/PetApi.md
+++ b/samples/client/petstore/rust-reqwest/docs/PetApi.md
@@ -85,7 +85,7 @@ Name | Type | Description  | Notes
 
 ## find_pets_by_status
 
-> Vec<::models::Pet> find_pets_by_status(ctx, status)
+> Vec<crate::models::Pet> find_pets_by_status(ctx, status)
 Finds Pets by status
 
 Multiple status values can be provided with comma separated strings
@@ -100,7 +100,7 @@ Name | Type | Description  | Notes
 
 ### Return type
 
-[**Vec<::models::Pet>**](Pet.md)
+[**Vec<crate::models::Pet>**](Pet.md)
 
 ### Authorization
 
@@ -116,7 +116,7 @@ Name | Type | Description  | Notes
 
 ## find_pets_by_tags
 
-> Vec<::models::Pet> find_pets_by_tags(ctx, tags)
+> Vec<crate::models::Pet> find_pets_by_tags(ctx, tags)
 Finds Pets by tags
 
 Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3 for testing.
@@ -131,7 +131,7 @@ Name | Type | Description  | Notes
 
 ### Return type
 
-[**Vec<::models::Pet>**](Pet.md)
+[**Vec<crate::models::Pet>**](Pet.md)
 
 ### Authorization
 
@@ -147,7 +147,7 @@ Name | Type | Description  | Notes
 
 ## get_pet_by_id
 
-> ::models::Pet get_pet_by_id(ctx, pet_id)
+> crate::models::Pet get_pet_by_id(ctx, pet_id)
 Find pet by ID
 
 Returns a single pet
@@ -162,7 +162,7 @@ Name | Type | Description  | Notes
 
 ### Return type
 
-[**::models::Pet**](Pet.md)
+[**crate::models::Pet**](Pet.md)
 
 ### Authorization
 
@@ -247,7 +247,7 @@ Name | Type | Description  | Notes
 
 ## upload_file
 
-> ::models::ApiResponse upload_file(ctx, pet_id, optional)
+> crate::models::ApiResponse upload_file(ctx, pet_id, optional)
 uploads an image
 
 ### Required Parameters
@@ -271,7 +271,7 @@ Name | Type | Description  | Notes
 
 ### Return type
 
-[**::models::ApiResponse**](ApiResponse.md)
+[**crate::models::ApiResponse**](ApiResponse.md)
 
 ### Authorization
 
diff --git a/samples/client/petstore/rust-reqwest/docs/StoreApi.md b/samples/client/petstore/rust-reqwest/docs/StoreApi.md
index e57378b9f8..28ae8c60af 100644
--- a/samples/client/petstore/rust-reqwest/docs/StoreApi.md
+++ b/samples/client/petstore/rust-reqwest/docs/StoreApi.md
@@ -70,7 +70,7 @@ This endpoint does not need any parameter.
 
 ## get_order_by_id
 
-> ::models::Order get_order_by_id(order_id)
+> crate::models::Order get_order_by_id(order_id)
 Find purchase order by ID
 
 For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
@@ -84,7 +84,7 @@ Name | Type | Description  | Notes
 
 ### Return type
 
-[**::models::Order**](Order.md)
+[**crate::models::Order**](Order.md)
 
 ### Authorization
 
@@ -100,7 +100,7 @@ No authorization required
 
 ## place_order
 
-> ::models::Order place_order(body)
+> crate::models::Order place_order(body)
 Place an order for a pet
 
 ### Required Parameters
@@ -112,7 +112,7 @@ Name | Type | Description  | Notes
 
 ### Return type
 
-[**::models::Order**](Order.md)
+[**crate::models::Order**](Order.md)
 
 ### Authorization
 
diff --git a/samples/client/petstore/rust-reqwest/docs/UserApi.md b/samples/client/petstore/rust-reqwest/docs/UserApi.md
index d469a52df8..ce5490e806 100644
--- a/samples/client/petstore/rust-reqwest/docs/UserApi.md
+++ b/samples/client/petstore/rust-reqwest/docs/UserApi.md
@@ -55,7 +55,7 @@ Creates list of users with given input array
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
-  **body** | [**Vec<::models::User>**](User.md)| List of user object | 
+  **body** | [**Vec<crate::models::User>**](User.md)| List of user object | 
 
 ### Return type
 
@@ -83,7 +83,7 @@ Creates list of users with given input array
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
-  **body** | [**Vec<::models::User>**](User.md)| List of user object | 
+  **body** | [**Vec<crate::models::User>**](User.md)| List of user object | 
 
 ### Return type
 
@@ -133,7 +133,7 @@ No authorization required
 
 ## get_user_by_name
 
-> ::models::User get_user_by_name(username)
+> crate::models::User get_user_by_name(username)
 Get user by user name
 
 ### Required Parameters
@@ -145,7 +145,7 @@ Name | Type | Description  | Notes
 
 ### Return type
 
-[**::models::User**](User.md)
+[**crate::models::User**](User.md)
 
 ### Authorization
 
diff --git a/samples/client/petstore/rust-reqwest/src/apis/client.rs b/samples/client/petstore/rust-reqwest/src/apis/client.rs
index ea6b0eb635..14088cbe30 100644
--- a/samples/client/petstore/rust-reqwest/src/apis/client.rs
+++ b/samples/client/petstore/rust-reqwest/src/apis/client.rs
@@ -4,9 +4,9 @@ use super::configuration::Configuration;
 
 pub struct APIClient {
     configuration: Rc<Configuration>,
-    pet_api: Box<::apis::PetApi>,
-    store_api: Box<::apis::StoreApi>,
-    user_api: Box<::apis::UserApi>,
+    pet_api: Box<crate::apis::PetApi>,
+    store_api: Box<crate::apis::StoreApi>,
+    user_api: Box<crate::apis::UserApi>,
 }
 
 impl APIClient {
@@ -15,21 +15,21 @@ impl APIClient {
 
         APIClient {
             configuration: rc.clone(),
-            pet_api: Box::new(::apis::PetApiClient::new(rc.clone())),
-            store_api: Box::new(::apis::StoreApiClient::new(rc.clone())),
-            user_api: Box::new(::apis::UserApiClient::new(rc.clone())),
+            pet_api: Box::new(crate::apis::PetApiClient::new(rc.clone())),
+            store_api: Box::new(crate::apis::StoreApiClient::new(rc.clone())),
+            user_api: Box::new(crate::apis::UserApiClient::new(rc.clone())),
         }
     }
 
-    pub fn pet_api(&self) -> &::apis::PetApi{
+    pub fn pet_api(&self) -> &crate::apis::PetApi{
         self.pet_api.as_ref()
     }
 
-    pub fn store_api(&self) -> &::apis::StoreApi{
+    pub fn store_api(&self) -> &crate::apis::StoreApi{
         self.store_api.as_ref()
     }
 
-    pub fn user_api(&self) -> &::apis::UserApi{
+    pub fn user_api(&self) -> &crate::apis::UserApi{
         self.user_api.as_ref()
     }
 
diff --git a/samples/client/petstore/rust-reqwest/src/apis/pet_api.rs b/samples/client/petstore/rust-reqwest/src/apis/pet_api.rs
index 53d2b82ea7..264fc30e68 100644
--- a/samples/client/petstore/rust-reqwest/src/apis/pet_api.rs
+++ b/samples/client/petstore/rust-reqwest/src/apis/pet_api.rs
@@ -28,18 +28,18 @@ impl PetApiClient {
 }
 
 pub trait PetApi {
-    fn add_pet(&self, body: ::models::Pet) -> Result<(), Error>;
+    fn add_pet(&self, body: crate::models::Pet) -> Result<(), Error>;
     fn delete_pet(&self, pet_id: i64, api_key: &str) -> Result<(), Error>;
-    fn find_pets_by_status(&self, status: Vec<String>) -> Result<Vec<::models::Pet>, Error>;
-    fn find_pets_by_tags(&self, tags: Vec<String>) -> Result<Vec<::models::Pet>, Error>;
-    fn get_pet_by_id(&self, pet_id: i64) -> Result<::models::Pet, Error>;
-    fn update_pet(&self, body: ::models::Pet) -> Result<(), Error>;
+    fn find_pets_by_status(&self, status: Vec<String>) -> Result<Vec<crate::models::Pet>, Error>;
+    fn find_pets_by_tags(&self, tags: Vec<String>) -> Result<Vec<crate::models::Pet>, Error>;
+    fn get_pet_by_id(&self, pet_id: i64) -> Result<crate::models::Pet, Error>;
+    fn update_pet(&self, body: crate::models::Pet) -> Result<(), Error>;
     fn update_pet_with_form(&self, pet_id: i64, name: &str, status: &str) -> Result<(), Error>;
-    fn upload_file(&self, pet_id: i64, additional_metadata: &str, file: std::path::PathBuf) -> Result<::models::ApiResponse, Error>;
+    fn upload_file(&self, pet_id: i64, additional_metadata: &str, file: std::path::PathBuf) -> Result<crate::models::ApiResponse, Error>;
 }
 
 impl PetApi for PetApiClient {
-    fn add_pet(&self, body: ::models::Pet) -> Result<(), Error> {
+    fn add_pet(&self, body: crate::models::Pet) -> Result<(), Error> {
         let configuration: &configuration::Configuration = self.configuration.borrow();
         let client = &configuration.client;
 
@@ -83,7 +83,7 @@ impl PetApi for PetApiClient {
         Ok(())
     }
 
-    fn find_pets_by_status(&self, status: Vec<String>) -> Result<Vec<::models::Pet>, Error> {
+    fn find_pets_by_status(&self, status: Vec<String>) -> Result<Vec<crate::models::Pet>, Error> {
         let configuration: &configuration::Configuration = self.configuration.borrow();
         let client = &configuration.client;
 
@@ -104,7 +104,7 @@ impl PetApi for PetApiClient {
         Ok(client.execute(req)?.error_for_status()?.json()?)
     }
 
-    fn find_pets_by_tags(&self, tags: Vec<String>) -> Result<Vec<::models::Pet>, Error> {
+    fn find_pets_by_tags(&self, tags: Vec<String>) -> Result<Vec<crate::models::Pet>, Error> {
         let configuration: &configuration::Configuration = self.configuration.borrow();
         let client = &configuration.client;
 
@@ -125,7 +125,7 @@ impl PetApi for PetApiClient {
         Ok(client.execute(req)?.error_for_status()?.json()?)
     }
 
-    fn get_pet_by_id(&self, pet_id: i64) -> Result<::models::Pet, Error> {
+    fn get_pet_by_id(&self, pet_id: i64) -> Result<crate::models::Pet, Error> {
         let configuration: &configuration::Configuration = self.configuration.borrow();
         let client = &configuration.client;
 
@@ -150,7 +150,7 @@ impl PetApi for PetApiClient {
         Ok(client.execute(req)?.error_for_status()?.json()?)
     }
 
-    fn update_pet(&self, body: ::models::Pet) -> Result<(), Error> {
+    fn update_pet(&self, body: crate::models::Pet) -> Result<(), Error> {
         let configuration: &configuration::Configuration = self.configuration.borrow();
         let client = &configuration.client;
 
@@ -197,7 +197,7 @@ impl PetApi for PetApiClient {
         Ok(())
     }
 
-    fn upload_file(&self, pet_id: i64, additional_metadata: &str, file: std::path::PathBuf) -> Result<::models::ApiResponse, Error> {
+    fn upload_file(&self, pet_id: i64, additional_metadata: &str, file: std::path::PathBuf) -> Result<crate::models::ApiResponse, Error> {
         let configuration: &configuration::Configuration = self.configuration.borrow();
         let client = &configuration.client;
 
diff --git a/samples/client/petstore/rust-reqwest/src/apis/store_api.rs b/samples/client/petstore/rust-reqwest/src/apis/store_api.rs
index d9d60f0996..dac744b3b2 100644
--- a/samples/client/petstore/rust-reqwest/src/apis/store_api.rs
+++ b/samples/client/petstore/rust-reqwest/src/apis/store_api.rs
@@ -30,8 +30,8 @@ impl StoreApiClient {
 pub trait StoreApi {
     fn delete_order(&self, order_id: &str) -> Result<(), Error>;
     fn get_inventory(&self, ) -> Result<::std::collections::HashMap<String, i32>, Error>;
-    fn get_order_by_id(&self, order_id: i64) -> Result<::models::Order, Error>;
-    fn place_order(&self, body: ::models::Order) -> Result<::models::Order, Error>;
+    fn get_order_by_id(&self, order_id: i64) -> Result<crate::models::Order, Error>;
+    fn place_order(&self, body: crate::models::Order) -> Result<crate::models::Order, Error>;
 }
 
 impl StoreApi for StoreApiClient {
@@ -78,7 +78,7 @@ impl StoreApi for StoreApiClient {
         Ok(client.execute(req)?.error_for_status()?.json()?)
     }
 
-    fn get_order_by_id(&self, order_id: i64) -> Result<::models::Order, Error> {
+    fn get_order_by_id(&self, order_id: i64) -> Result<crate::models::Order, Error> {
         let configuration: &configuration::Configuration = self.configuration.borrow();
         let client = &configuration.client;
 
@@ -95,7 +95,7 @@ impl StoreApi for StoreApiClient {
         Ok(client.execute(req)?.error_for_status()?.json()?)
     }
 
-    fn place_order(&self, body: ::models::Order) -> Result<::models::Order, Error> {
+    fn place_order(&self, body: crate::models::Order) -> Result<crate::models::Order, Error> {
         let configuration: &configuration::Configuration = self.configuration.borrow();
         let client = &configuration.client;
 
diff --git a/samples/client/petstore/rust-reqwest/src/apis/user_api.rs b/samples/client/petstore/rust-reqwest/src/apis/user_api.rs
index 68d4c9f126..e2321b3daa 100644
--- a/samples/client/petstore/rust-reqwest/src/apis/user_api.rs
+++ b/samples/client/petstore/rust-reqwest/src/apis/user_api.rs
@@ -28,18 +28,18 @@ impl UserApiClient {
 }
 
 pub trait UserApi {
-    fn create_user(&self, body: ::models::User) -> Result<(), Error>;
-    fn create_users_with_array_input(&self, body: Vec<::models::User>) -> Result<(), Error>;
-    fn create_users_with_list_input(&self, body: Vec<::models::User>) -> Result<(), Error>;
+    fn create_user(&self, body: crate::models::User) -> Result<(), Error>;
+    fn create_users_with_array_input(&self, body: Vec<crate::models::User>) -> Result<(), Error>;
+    fn create_users_with_list_input(&self, body: Vec<crate::models::User>) -> Result<(), Error>;
     fn delete_user(&self, username: &str) -> Result<(), Error>;
-    fn get_user_by_name(&self, username: &str) -> Result<::models::User, Error>;
+    fn get_user_by_name(&self, username: &str) -> Result<crate::models::User, Error>;
     fn login_user(&self, username: &str, password: &str) -> Result<String, Error>;
     fn logout_user(&self, ) -> Result<(), Error>;
-    fn update_user(&self, username: &str, body: ::models::User) -> Result<(), Error>;
+    fn update_user(&self, username: &str, body: crate::models::User) -> Result<(), Error>;
 }
 
 impl UserApi for UserApiClient {
-    fn create_user(&self, body: ::models::User) -> Result<(), Error> {
+    fn create_user(&self, body: crate::models::User) -> Result<(), Error> {
         let configuration: &configuration::Configuration = self.configuration.borrow();
         let client = &configuration.client;
 
@@ -58,7 +58,7 @@ impl UserApi for UserApiClient {
         Ok(())
     }
 
-    fn create_users_with_array_input(&self, body: Vec<::models::User>) -> Result<(), Error> {
+    fn create_users_with_array_input(&self, body: Vec<crate::models::User>) -> Result<(), Error> {
         let configuration: &configuration::Configuration = self.configuration.borrow();
         let client = &configuration.client;
 
@@ -77,7 +77,7 @@ impl UserApi for UserApiClient {
         Ok(())
     }
 
-    fn create_users_with_list_input(&self, body: Vec<::models::User>) -> Result<(), Error> {
+    fn create_users_with_list_input(&self, body: Vec<crate::models::User>) -> Result<(), Error> {
         let configuration: &configuration::Configuration = self.configuration.borrow();
         let client = &configuration.client;
 
@@ -114,7 +114,7 @@ impl UserApi for UserApiClient {
         Ok(())
     }
 
-    fn get_user_by_name(&self, username: &str) -> Result<::models::User, Error> {
+    fn get_user_by_name(&self, username: &str) -> Result<crate::models::User, Error> {
         let configuration: &configuration::Configuration = self.configuration.borrow();
         let client = &configuration.client;
 
@@ -168,7 +168,7 @@ impl UserApi for UserApiClient {
         Ok(())
     }
 
-    fn update_user(&self, username: &str, body: ::models::User) -> Result<(), Error> {
+    fn update_user(&self, username: &str, body: crate::models::User) -> Result<(), Error> {
         let configuration: &configuration::Configuration = self.configuration.borrow();
         let client = &configuration.client;
 
diff --git a/samples/client/petstore/rust-reqwest/src/models/api_response.rs b/samples/client/petstore/rust-reqwest/src/models/api_response.rs
index 7884fba590..814483602d 100644
--- a/samples/client/petstore/rust-reqwest/src/models/api_response.rs
+++ b/samples/client/petstore/rust-reqwest/src/models/api_response.rs
@@ -10,9 +10,6 @@
 
 /// ApiResponse : Describes the result of uploading an image resource
 
-#[allow(unused_imports)]
-use serde_json::Value;
-
 
 #[derive(Debug, Serialize, Deserialize)]
 pub struct ApiResponse {
diff --git a/samples/client/petstore/rust-reqwest/src/models/category.rs b/samples/client/petstore/rust-reqwest/src/models/category.rs
index 804f9f4c70..8cb5797ee1 100644
--- a/samples/client/petstore/rust-reqwest/src/models/category.rs
+++ b/samples/client/petstore/rust-reqwest/src/models/category.rs
@@ -10,9 +10,6 @@
 
 /// Category : A category for a pet
 
-#[allow(unused_imports)]
-use serde_json::Value;
-
 
 #[derive(Debug, Serialize, Deserialize)]
 pub struct Category {
diff --git a/samples/client/petstore/rust-reqwest/src/models/order.rs b/samples/client/petstore/rust-reqwest/src/models/order.rs
index 118dc31076..24ad342497 100644
--- a/samples/client/petstore/rust-reqwest/src/models/order.rs
+++ b/samples/client/petstore/rust-reqwest/src/models/order.rs
@@ -10,9 +10,6 @@
 
 /// Order : An order for a pets from the pet store
 
-#[allow(unused_imports)]
-use serde_json::Value;
-
 
 #[derive(Debug, Serialize, Deserialize)]
 pub struct Order {
diff --git a/samples/client/petstore/rust-reqwest/src/models/pet.rs b/samples/client/petstore/rust-reqwest/src/models/pet.rs
index 64dae06e45..e3c61239cd 100644
--- a/samples/client/petstore/rust-reqwest/src/models/pet.rs
+++ b/samples/client/petstore/rust-reqwest/src/models/pet.rs
@@ -10,22 +10,19 @@
 
 /// Pet : A pet for sale in the pet store
 
-#[allow(unused_imports)]
-use serde_json::Value;
-
 
 #[derive(Debug, Serialize, Deserialize)]
 pub struct Pet {
     #[serde(rename = "id", skip_serializing_if = "Option::is_none")]
     pub id: Option<i64>,
     #[serde(rename = "category", skip_serializing_if = "Option::is_none")]
-    pub category: Option<::models::Category>,
+    pub category: Option<crate::models::Category>,
     #[serde(rename = "name")]
     pub name: String,
     #[serde(rename = "photoUrls")]
     pub photo_urls: Vec<String>,
     #[serde(rename = "tags", skip_serializing_if = "Option::is_none")]
-    pub tags: Option<Vec<::models::Tag>>,
+    pub tags: Option<Vec<crate::models::Tag>>,
     /// pet status in the store
     #[serde(rename = "status", skip_serializing_if = "Option::is_none")]
     pub status: Option<String>,
diff --git a/samples/client/petstore/rust-reqwest/src/models/tag.rs b/samples/client/petstore/rust-reqwest/src/models/tag.rs
index 503fb7f61b..c7cbdf2cc0 100644
--- a/samples/client/petstore/rust-reqwest/src/models/tag.rs
+++ b/samples/client/petstore/rust-reqwest/src/models/tag.rs
@@ -10,9 +10,6 @@
 
 /// Tag : A tag for a pet
 
-#[allow(unused_imports)]
-use serde_json::Value;
-
 
 #[derive(Debug, Serialize, Deserialize)]
 pub struct Tag {
diff --git a/samples/client/petstore/rust-reqwest/src/models/user.rs b/samples/client/petstore/rust-reqwest/src/models/user.rs
index 6bfa6e2167..e54ed70130 100644
--- a/samples/client/petstore/rust-reqwest/src/models/user.rs
+++ b/samples/client/petstore/rust-reqwest/src/models/user.rs
@@ -10,9 +10,6 @@
 
 /// User : A User who is purchasing from the pet store
 
-#[allow(unused_imports)]
-use serde_json::Value;
-
 
 #[derive(Debug, Serialize, Deserialize)]
 pub struct User {
diff --git a/samples/client/petstore/rust/.openapi-generator/VERSION b/samples/client/petstore/rust/.openapi-generator/VERSION
index d96260ba33..83a328a922 100644
--- a/samples/client/petstore/rust/.openapi-generator/VERSION
+++ b/samples/client/petstore/rust/.openapi-generator/VERSION
@@ -1 +1 @@
-4.0.2-SNAPSHOT
\ No newline at end of file
+4.1.0-SNAPSHOT
\ No newline at end of file
diff --git a/samples/client/petstore/rust/docs/Pet.md b/samples/client/petstore/rust/docs/Pet.md
index 53a462e68b..2c8ea36dd9 100644
--- a/samples/client/petstore/rust/docs/Pet.md
+++ b/samples/client/petstore/rust/docs/Pet.md
@@ -5,10 +5,10 @@
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
 **id** | **i64** |  | [optional] 
-**category** | [***::models::Category**](Category.md) |  | [optional] 
+**category** | [***crate::models::Category**](Category.md) |  | [optional] 
 **name** | **String** |  | 
 **photo_urls** | **Vec<String>** |  | 
-**tags** | [**Vec<::models::Tag>**](Tag.md) |  | [optional] 
+**tags** | [**Vec<crate::models::Tag>**](Tag.md) |  | [optional] 
 **status** | **String** | pet status in the store | [optional] 
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
diff --git a/samples/client/petstore/rust/docs/PetApi.md b/samples/client/petstore/rust/docs/PetApi.md
index e690c80518..4d5e4c7839 100644
--- a/samples/client/petstore/rust/docs/PetApi.md
+++ b/samples/client/petstore/rust/docs/PetApi.md
@@ -85,7 +85,7 @@ Name | Type | Description  | Notes
 
 ## find_pets_by_status
 
-> Vec<::models::Pet> find_pets_by_status(ctx, status)
+> Vec<crate::models::Pet> find_pets_by_status(ctx, status)
 Finds Pets by status
 
 Multiple status values can be provided with comma separated strings
@@ -100,7 +100,7 @@ Name | Type | Description  | Notes
 
 ### Return type
 
-[**Vec<::models::Pet>**](Pet.md)
+[**Vec<crate::models::Pet>**](Pet.md)
 
 ### Authorization
 
@@ -116,7 +116,7 @@ Name | Type | Description  | Notes
 
 ## find_pets_by_tags
 
-> Vec<::models::Pet> find_pets_by_tags(ctx, tags)
+> Vec<crate::models::Pet> find_pets_by_tags(ctx, tags)
 Finds Pets by tags
 
 Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3 for testing.
@@ -131,7 +131,7 @@ Name | Type | Description  | Notes
 
 ### Return type
 
-[**Vec<::models::Pet>**](Pet.md)
+[**Vec<crate::models::Pet>**](Pet.md)
 
 ### Authorization
 
@@ -147,7 +147,7 @@ Name | Type | Description  | Notes
 
 ## get_pet_by_id
 
-> ::models::Pet get_pet_by_id(ctx, pet_id)
+> crate::models::Pet get_pet_by_id(ctx, pet_id)
 Find pet by ID
 
 Returns a single pet
@@ -162,7 +162,7 @@ Name | Type | Description  | Notes
 
 ### Return type
 
-[**::models::Pet**](Pet.md)
+[**crate::models::Pet**](Pet.md)
 
 ### Authorization
 
@@ -247,7 +247,7 @@ Name | Type | Description  | Notes
 
 ## upload_file
 
-> ::models::ApiResponse upload_file(ctx, pet_id, optional)
+> crate::models::ApiResponse upload_file(ctx, pet_id, optional)
 uploads an image
 
 ### Required Parameters
@@ -271,7 +271,7 @@ Name | Type | Description  | Notes
 
 ### Return type
 
-[**::models::ApiResponse**](ApiResponse.md)
+[**crate::models::ApiResponse**](ApiResponse.md)
 
 ### Authorization
 
diff --git a/samples/client/petstore/rust/docs/StoreApi.md b/samples/client/petstore/rust/docs/StoreApi.md
index 1e4bdc3e14..16a09fae3f 100644
--- a/samples/client/petstore/rust/docs/StoreApi.md
+++ b/samples/client/petstore/rust/docs/StoreApi.md
@@ -70,7 +70,7 @@ This endpoint does not need any parameter.
 
 ## get_order_by_id
 
-> ::models::Order get_order_by_id(order_id)
+> crate::models::Order get_order_by_id(order_id)
 Find purchase order by ID
 
 For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
@@ -84,7 +84,7 @@ Name | Type | Description  | Notes
 
 ### Return type
 
-[**::models::Order**](Order.md)
+[**crate::models::Order**](Order.md)
 
 ### Authorization
 
@@ -100,7 +100,7 @@ No authorization required
 
 ## place_order
 
-> ::models::Order place_order(body)
+> crate::models::Order place_order(body)
 Place an order for a pet
 
 ### Required Parameters
@@ -112,7 +112,7 @@ Name | Type | Description  | Notes
 
 ### Return type
 
-[**::models::Order**](Order.md)
+[**crate::models::Order**](Order.md)
 
 ### Authorization
 
diff --git a/samples/client/petstore/rust/docs/UserApi.md b/samples/client/petstore/rust/docs/UserApi.md
index ffa733d64d..9c4af81392 100644
--- a/samples/client/petstore/rust/docs/UserApi.md
+++ b/samples/client/petstore/rust/docs/UserApi.md
@@ -55,7 +55,7 @@ Creates list of users with given input array
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
-  **body** | [**Vec<::models::User>**](User.md)| List of user object | 
+  **body** | [**Vec<crate::models::User>**](User.md)| List of user object | 
 
 ### Return type
 
@@ -83,7 +83,7 @@ Creates list of users with given input array
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
-  **body** | [**Vec<::models::User>**](User.md)| List of user object | 
+  **body** | [**Vec<crate::models::User>**](User.md)| List of user object | 
 
 ### Return type
 
@@ -133,7 +133,7 @@ No authorization required
 
 ## get_user_by_name
 
-> ::models::User get_user_by_name(username)
+> crate::models::User get_user_by_name(username)
 Get user by user name
 
 ### Required Parameters
@@ -145,7 +145,7 @@ Name | Type | Description  | Notes
 
 ### Return type
 
-[**::models::User**](User.md)
+[**crate::models::User**](User.md)
 
 ### Authorization
 
diff --git a/samples/client/petstore/rust/src/apis/client.rs b/samples/client/petstore/rust/src/apis/client.rs
index ddf5f6ee08..dd0de97eb5 100644
--- a/samples/client/petstore/rust/src/apis/client.rs
+++ b/samples/client/petstore/rust/src/apis/client.rs
@@ -5,9 +5,9 @@ use super::configuration::Configuration;
 
 pub struct APIClient<C: hyper::client::Connect> {
     configuration: Rc<Configuration<C>>,
-    pet_api: Box<::apis::PetApi>,
-    store_api: Box<::apis::StoreApi>,
-    user_api: Box<::apis::UserApi>,
+    pet_api: Box<crate::apis::PetApi>,
+    store_api: Box<crate::apis::StoreApi>,
+    user_api: Box<crate::apis::UserApi>,
 }
 
 impl<C: hyper::client::Connect> APIClient<C> {
@@ -16,21 +16,21 @@ impl<C: hyper::client::Connect> APIClient<C> {
 
         APIClient {
             configuration: rc.clone(),
-            pet_api: Box::new(::apis::PetApiClient::new(rc.clone())),
-            store_api: Box::new(::apis::StoreApiClient::new(rc.clone())),
-            user_api: Box::new(::apis::UserApiClient::new(rc.clone())),
+            pet_api: Box::new(crate::apis::PetApiClient::new(rc.clone())),
+            store_api: Box::new(crate::apis::StoreApiClient::new(rc.clone())),
+            user_api: Box::new(crate::apis::UserApiClient::new(rc.clone())),
         }
     }
 
-    pub fn pet_api(&self) -> &::apis::PetApi{
+    pub fn pet_api(&self) -> &crate::apis::PetApi{
         self.pet_api.as_ref()
     }
 
-    pub fn store_api(&self) -> &::apis::StoreApi{
+    pub fn store_api(&self) -> &crate::apis::StoreApi{
         self.store_api.as_ref()
     }
 
-    pub fn user_api(&self) -> &::apis::UserApi{
+    pub fn user_api(&self) -> &crate::apis::UserApi{
         self.user_api.as_ref()
     }
 
diff --git a/samples/client/petstore/rust/src/apis/pet_api.rs b/samples/client/petstore/rust/src/apis/pet_api.rs
index 0c98efec5c..e3fe372fc9 100644
--- a/samples/client/petstore/rust/src/apis/pet_api.rs
+++ b/samples/client/petstore/rust/src/apis/pet_api.rs
@@ -31,19 +31,19 @@ impl<C: hyper::client::Connect> PetApiClient<C> {
 }
 
 pub trait PetApi {
-    fn add_pet(&self, body: ::models::Pet) -> Box<Future<Item = (), Error = Error<serde_json::Value>>>;
+    fn add_pet(&self, body: crate::models::Pet) -> Box<Future<Item = (), Error = Error<serde_json::Value>>>;
     fn delete_pet(&self, pet_id: i64, api_key: &str) -> Box<Future<Item = (), Error = Error<serde_json::Value>>>;
-    fn find_pets_by_status(&self, status: Vec<String>) -> Box<Future<Item = Vec<::models::Pet>, Error = Error<serde_json::Value>>>;
-    fn find_pets_by_tags(&self, tags: Vec<String>) -> Box<Future<Item = Vec<::models::Pet>, Error = Error<serde_json::Value>>>;
-    fn get_pet_by_id(&self, pet_id: i64) -> Box<Future<Item = ::models::Pet, Error = Error<serde_json::Value>>>;
-    fn update_pet(&self, body: ::models::Pet) -> Box<Future<Item = (), Error = Error<serde_json::Value>>>;
+    fn find_pets_by_status(&self, status: Vec<String>) -> Box<Future<Item = Vec<crate::models::Pet>, Error = Error<serde_json::Value>>>;
+    fn find_pets_by_tags(&self, tags: Vec<String>) -> Box<Future<Item = Vec<crate::models::Pet>, Error = Error<serde_json::Value>>>;
+    fn get_pet_by_id(&self, pet_id: i64) -> Box<Future<Item = crate::models::Pet, Error = Error<serde_json::Value>>>;
+    fn update_pet(&self, body: crate::models::Pet) -> Box<Future<Item = (), Error = Error<serde_json::Value>>>;
     fn update_pet_with_form(&self, pet_id: i64, name: &str, status: &str) -> Box<Future<Item = (), Error = Error<serde_json::Value>>>;
-    fn upload_file(&self, pet_id: i64, additional_metadata: &str, file: std::path::PathBuf) -> Box<Future<Item = ::models::ApiResponse, Error = Error<serde_json::Value>>>;
+    fn upload_file(&self, pet_id: i64, additional_metadata: &str, file: std::path::PathBuf) -> Box<Future<Item = crate::models::ApiResponse, Error = Error<serde_json::Value>>>;
 }
 
 
 impl<C: hyper::client::Connect>PetApi for PetApiClient<C> {
-    fn add_pet(&self, body: ::models::Pet) -> Box<Future<Item = (), Error = Error<serde_json::Value>>> {
+    fn add_pet(&self, body: crate::models::Pet) -> Box<Future<Item = (), Error = Error<serde_json::Value>>> {
         __internal_request::Request::new(hyper::Method::Post, "/pet".to_string())
             .with_auth(__internal_request::Auth::Oauth)
             .with_body_param(body)
@@ -60,21 +60,21 @@ impl<C: hyper::client::Connect>PetApi for PetApiClient<C> {
             .execute(self.configuration.borrow())
     }
 
-    fn find_pets_by_status(&self, status: Vec<String>) -> Box<Future<Item = Vec<::models::Pet>, Error = Error<serde_json::Value>>> {
+    fn find_pets_by_status(&self, status: Vec<String>) -> Box<Future<Item = Vec<crate::models::Pet>, Error = Error<serde_json::Value>>> {
         __internal_request::Request::new(hyper::Method::Get, "/pet/findByStatus".to_string())
             .with_auth(__internal_request::Auth::Oauth)
             .with_query_param("status".to_string(), status.join(",").to_string())
             .execute(self.configuration.borrow())
     }
 
-    fn find_pets_by_tags(&self, tags: Vec<String>) -> Box<Future<Item = Vec<::models::Pet>, Error = Error<serde_json::Value>>> {
+    fn find_pets_by_tags(&self, tags: Vec<String>) -> Box<Future<Item = Vec<crate::models::Pet>, Error = Error<serde_json::Value>>> {
         __internal_request::Request::new(hyper::Method::Get, "/pet/findByTags".to_string())
             .with_auth(__internal_request::Auth::Oauth)
             .with_query_param("tags".to_string(), tags.join(",").to_string())
             .execute(self.configuration.borrow())
     }
 
-    fn get_pet_by_id(&self, pet_id: i64) -> Box<Future<Item = ::models::Pet, Error = Error<serde_json::Value>>> {
+    fn get_pet_by_id(&self, pet_id: i64) -> Box<Future<Item = crate::models::Pet, Error = Error<serde_json::Value>>> {
         __internal_request::Request::new(hyper::Method::Get, "/pet/{petId}".to_string())
             .with_auth(__internal_request::Auth::ApiKey(__internal_request::ApiKey{
                 in_header: true,
@@ -85,7 +85,7 @@ impl<C: hyper::client::Connect>PetApi for PetApiClient<C> {
             .execute(self.configuration.borrow())
     }
 
-    fn update_pet(&self, body: ::models::Pet) -> Box<Future<Item = (), Error = Error<serde_json::Value>>> {
+    fn update_pet(&self, body: crate::models::Pet) -> Box<Future<Item = (), Error = Error<serde_json::Value>>> {
         __internal_request::Request::new(hyper::Method::Put, "/pet".to_string())
             .with_auth(__internal_request::Auth::Oauth)
             .with_body_param(body)
@@ -103,7 +103,7 @@ impl<C: hyper::client::Connect>PetApi for PetApiClient<C> {
             .execute(self.configuration.borrow())
     }
 
-    fn upload_file(&self, pet_id: i64, additional_metadata: &str, file: std::path::PathBuf) -> Box<Future<Item = ::models::ApiResponse, Error = Error<serde_json::Value>>> {
+    fn upload_file(&self, pet_id: i64, additional_metadata: &str, file: std::path::PathBuf) -> Box<Future<Item = crate::models::ApiResponse, Error = Error<serde_json::Value>>> {
         __internal_request::Request::new(hyper::Method::Post, "/pet/{petId}/uploadImage".to_string())
             .with_auth(__internal_request::Auth::Oauth)
             .with_path_param("petId".to_string(), pet_id.to_string())
diff --git a/samples/client/petstore/rust/src/apis/store_api.rs b/samples/client/petstore/rust/src/apis/store_api.rs
index 46f0bf53cf..2c827cce04 100644
--- a/samples/client/petstore/rust/src/apis/store_api.rs
+++ b/samples/client/petstore/rust/src/apis/store_api.rs
@@ -33,8 +33,8 @@ impl<C: hyper::client::Connect> StoreApiClient<C> {
 pub trait StoreApi {
     fn delete_order(&self, order_id: &str) -> Box<Future<Item = (), Error = Error<serde_json::Value>>>;
     fn get_inventory(&self, ) -> Box<Future<Item = ::std::collections::HashMap<String, i32>, Error = Error<serde_json::Value>>>;
-    fn get_order_by_id(&self, order_id: i64) -> Box<Future<Item = ::models::Order, Error = Error<serde_json::Value>>>;
-    fn place_order(&self, body: ::models::Order) -> Box<Future<Item = ::models::Order, Error = Error<serde_json::Value>>>;
+    fn get_order_by_id(&self, order_id: i64) -> Box<Future<Item = crate::models::Order, Error = Error<serde_json::Value>>>;
+    fn place_order(&self, body: crate::models::Order) -> Box<Future<Item = crate::models::Order, Error = Error<serde_json::Value>>>;
 }
 
 
@@ -56,13 +56,13 @@ impl<C: hyper::client::Connect>StoreApi for StoreApiClient<C> {
             .execute(self.configuration.borrow())
     }
 
-    fn get_order_by_id(&self, order_id: i64) -> Box<Future<Item = ::models::Order, Error = Error<serde_json::Value>>> {
+    fn get_order_by_id(&self, order_id: i64) -> Box<Future<Item = crate::models::Order, Error = Error<serde_json::Value>>> {
         __internal_request::Request::new(hyper::Method::Get, "/store/order/{orderId}".to_string())
             .with_path_param("orderId".to_string(), order_id.to_string())
             .execute(self.configuration.borrow())
     }
 
-    fn place_order(&self, body: ::models::Order) -> Box<Future<Item = ::models::Order, Error = Error<serde_json::Value>>> {
+    fn place_order(&self, body: crate::models::Order) -> Box<Future<Item = crate::models::Order, Error = Error<serde_json::Value>>> {
         __internal_request::Request::new(hyper::Method::Post, "/store/order".to_string())
             .with_body_param(body)
             .execute(self.configuration.borrow())
diff --git a/samples/client/petstore/rust/src/apis/user_api.rs b/samples/client/petstore/rust/src/apis/user_api.rs
index ba3ad140b4..1ea00f7536 100644
--- a/samples/client/petstore/rust/src/apis/user_api.rs
+++ b/samples/client/petstore/rust/src/apis/user_api.rs
@@ -31,33 +31,33 @@ impl<C: hyper::client::Connect> UserApiClient<C> {
 }
 
 pub trait UserApi {
-    fn create_user(&self, body: ::models::User) -> Box<Future<Item = (), Error = Error<serde_json::Value>>>;
-    fn create_users_with_array_input(&self, body: Vec<::models::User>) -> Box<Future<Item = (), Error = Error<serde_json::Value>>>;
-    fn create_users_with_list_input(&self, body: Vec<::models::User>) -> Box<Future<Item = (), Error = Error<serde_json::Value>>>;
+    fn create_user(&self, body: crate::models::User) -> Box<Future<Item = (), Error = Error<serde_json::Value>>>;
+    fn create_users_with_array_input(&self, body: Vec<crate::models::User>) -> Box<Future<Item = (), Error = Error<serde_json::Value>>>;
+    fn create_users_with_list_input(&self, body: Vec<crate::models::User>) -> Box<Future<Item = (), Error = Error<serde_json::Value>>>;
     fn delete_user(&self, username: &str) -> Box<Future<Item = (), Error = Error<serde_json::Value>>>;
-    fn get_user_by_name(&self, username: &str) -> Box<Future<Item = ::models::User, Error = Error<serde_json::Value>>>;
+    fn get_user_by_name(&self, username: &str) -> Box<Future<Item = crate::models::User, Error = Error<serde_json::Value>>>;
     fn login_user(&self, username: &str, password: &str) -> Box<Future<Item = String, Error = Error<serde_json::Value>>>;
     fn logout_user(&self, ) -> Box<Future<Item = (), Error = Error<serde_json::Value>>>;
-    fn update_user(&self, username: &str, body: ::models::User) -> Box<Future<Item = (), Error = Error<serde_json::Value>>>;
+    fn update_user(&self, username: &str, body: crate::models::User) -> Box<Future<Item = (), Error = Error<serde_json::Value>>>;
 }
 
 
 impl<C: hyper::client::Connect>UserApi for UserApiClient<C> {
-    fn create_user(&self, body: ::models::User) -> Box<Future<Item = (), Error = Error<serde_json::Value>>> {
+    fn create_user(&self, body: crate::models::User) -> Box<Future<Item = (), Error = Error<serde_json::Value>>> {
         __internal_request::Request::new(hyper::Method::Post, "/user".to_string())
             .with_body_param(body)
             .returns_nothing()
             .execute(self.configuration.borrow())
     }
 
-    fn create_users_with_array_input(&self, body: Vec<::models::User>) -> Box<Future<Item = (), Error = Error<serde_json::Value>>> {
+    fn create_users_with_array_input(&self, body: Vec<crate::models::User>) -> Box<Future<Item = (), Error = Error<serde_json::Value>>> {
         __internal_request::Request::new(hyper::Method::Post, "/user/createWithArray".to_string())
             .with_body_param(body)
             .returns_nothing()
             .execute(self.configuration.borrow())
     }
 
-    fn create_users_with_list_input(&self, body: Vec<::models::User>) -> Box<Future<Item = (), Error = Error<serde_json::Value>>> {
+    fn create_users_with_list_input(&self, body: Vec<crate::models::User>) -> Box<Future<Item = (), Error = Error<serde_json::Value>>> {
         __internal_request::Request::new(hyper::Method::Post, "/user/createWithList".to_string())
             .with_body_param(body)
             .returns_nothing()
@@ -71,7 +71,7 @@ impl<C: hyper::client::Connect>UserApi for UserApiClient<C> {
             .execute(self.configuration.borrow())
     }
 
-    fn get_user_by_name(&self, username: &str) -> Box<Future<Item = ::models::User, Error = Error<serde_json::Value>>> {
+    fn get_user_by_name(&self, username: &str) -> Box<Future<Item = crate::models::User, Error = Error<serde_json::Value>>> {
         __internal_request::Request::new(hyper::Method::Get, "/user/{username}".to_string())
             .with_path_param("username".to_string(), username.to_string())
             .execute(self.configuration.borrow())
@@ -90,7 +90,7 @@ impl<C: hyper::client::Connect>UserApi for UserApiClient<C> {
             .execute(self.configuration.borrow())
     }
 
-    fn update_user(&self, username: &str, body: ::models::User) -> Box<Future<Item = (), Error = Error<serde_json::Value>>> {
+    fn update_user(&self, username: &str, body: crate::models::User) -> Box<Future<Item = (), Error = Error<serde_json::Value>>> {
         __internal_request::Request::new(hyper::Method::Put, "/user/{username}".to_string())
             .with_path_param("username".to_string(), username.to_string())
             .with_body_param(body)
diff --git a/samples/client/petstore/rust/src/models/api_response.rs b/samples/client/petstore/rust/src/models/api_response.rs
index 7884fba590..814483602d 100644
--- a/samples/client/petstore/rust/src/models/api_response.rs
+++ b/samples/client/petstore/rust/src/models/api_response.rs
@@ -10,9 +10,6 @@
 
 /// ApiResponse : Describes the result of uploading an image resource
 
-#[allow(unused_imports)]
-use serde_json::Value;
-
 
 #[derive(Debug, Serialize, Deserialize)]
 pub struct ApiResponse {
diff --git a/samples/client/petstore/rust/src/models/category.rs b/samples/client/petstore/rust/src/models/category.rs
index 804f9f4c70..8cb5797ee1 100644
--- a/samples/client/petstore/rust/src/models/category.rs
+++ b/samples/client/petstore/rust/src/models/category.rs
@@ -10,9 +10,6 @@
 
 /// Category : A category for a pet
 
-#[allow(unused_imports)]
-use serde_json::Value;
-
 
 #[derive(Debug, Serialize, Deserialize)]
 pub struct Category {
diff --git a/samples/client/petstore/rust/src/models/order.rs b/samples/client/petstore/rust/src/models/order.rs
index 118dc31076..24ad342497 100644
--- a/samples/client/petstore/rust/src/models/order.rs
+++ b/samples/client/petstore/rust/src/models/order.rs
@@ -10,9 +10,6 @@
 
 /// Order : An order for a pets from the pet store
 
-#[allow(unused_imports)]
-use serde_json::Value;
-
 
 #[derive(Debug, Serialize, Deserialize)]
 pub struct Order {
diff --git a/samples/client/petstore/rust/src/models/pet.rs b/samples/client/petstore/rust/src/models/pet.rs
index 64dae06e45..e3c61239cd 100644
--- a/samples/client/petstore/rust/src/models/pet.rs
+++ b/samples/client/petstore/rust/src/models/pet.rs
@@ -10,22 +10,19 @@
 
 /// Pet : A pet for sale in the pet store
 
-#[allow(unused_imports)]
-use serde_json::Value;
-
 
 #[derive(Debug, Serialize, Deserialize)]
 pub struct Pet {
     #[serde(rename = "id", skip_serializing_if = "Option::is_none")]
     pub id: Option<i64>,
     #[serde(rename = "category", skip_serializing_if = "Option::is_none")]
-    pub category: Option<::models::Category>,
+    pub category: Option<crate::models::Category>,
     #[serde(rename = "name")]
     pub name: String,
     #[serde(rename = "photoUrls")]
     pub photo_urls: Vec<String>,
     #[serde(rename = "tags", skip_serializing_if = "Option::is_none")]
-    pub tags: Option<Vec<::models::Tag>>,
+    pub tags: Option<Vec<crate::models::Tag>>,
     /// pet status in the store
     #[serde(rename = "status", skip_serializing_if = "Option::is_none")]
     pub status: Option<String>,
diff --git a/samples/client/petstore/rust/src/models/tag.rs b/samples/client/petstore/rust/src/models/tag.rs
index 503fb7f61b..c7cbdf2cc0 100644
--- a/samples/client/petstore/rust/src/models/tag.rs
+++ b/samples/client/petstore/rust/src/models/tag.rs
@@ -10,9 +10,6 @@
 
 /// Tag : A tag for a pet
 
-#[allow(unused_imports)]
-use serde_json::Value;
-
 
 #[derive(Debug, Serialize, Deserialize)]
 pub struct Tag {
diff --git a/samples/client/petstore/rust/src/models/user.rs b/samples/client/petstore/rust/src/models/user.rs
index 6bfa6e2167..e54ed70130 100644
--- a/samples/client/petstore/rust/src/models/user.rs
+++ b/samples/client/petstore/rust/src/models/user.rs
@@ -10,9 +10,6 @@
 
 /// User : A User who is purchasing from the pet store
 
-#[allow(unused_imports)]
-use serde_json::Value;
-
 
 #[derive(Debug, Serialize, Deserialize)]
 pub struct User {

From 944e1c34688c29b0003a4dd0d371afb28ae3285c Mon Sep 17 00:00:00 2001
From: Jim Schubert <james.schubert@gmail.com>
Date: Thu, 18 Jul 2019 09:50:54 -0400
Subject: [PATCH 28/62] [fix] Assign template directory to additional
 properties (#3385)

* [fix] Assign template directory to additional properties
---
 .../codegen/config/CodegenConfigurator.java   |  11 ++
 .../config/CodegenConfiguratorTest.java       | 122 ++++++++++++++++++
 .../builds/multiple-parameters/runtime.ts     |   7 +-
 .../php-symfony/SymfonyBundle-php/.gitignore  |  54 ++++++++
 4 files changed, 193 insertions(+), 1 deletion(-)
 create mode 100644 modules/openapi-generator/src/test/java/org/openapitools/codegen/config/CodegenConfiguratorTest.java
 create mode 100644 samples/server/petstore/php-symfony/SymfonyBundle-php/.gitignore

diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/config/CodegenConfigurator.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/config/CodegenConfigurator.java
index 4c251ffc4a..88f2a54898 100644
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/config/CodegenConfigurator.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/config/CodegenConfigurator.java
@@ -223,6 +223,7 @@ public class CodegenConfigurator {
     }
 
     public CodegenConfigurator setImportMappings(Map<String, String> importMappings) {
+        this.importMappings = importMappings;
         generatorSettingsBuilder.withImportMappings(importMappings);
         return this;
     }
@@ -234,6 +235,7 @@ public class CodegenConfigurator {
     }
 
     public CodegenConfigurator setInstantiationTypes(Map<String, String> instantiationTypes) {
+        this.instantiationTypes = instantiationTypes;
         generatorSettingsBuilder.withInstantiationTypes(instantiationTypes);
         return this;
     }
@@ -295,6 +297,7 @@ public class CodegenConfigurator {
     }
 
     public CodegenConfigurator setReservedWordsMappings(Map<String, String> reservedWordMappings) {
+        this.reservedWordMappings = reservedWordMappings;
         generatorSettingsBuilder.withReservedWordMappings(reservedWordMappings);
         return this;
     }
@@ -310,6 +313,7 @@ public class CodegenConfigurator {
     }
 
     public CodegenConfigurator setSystemProperties(Map<String, String> systemProperties) {
+        this.systemProperties = systemProperties;
         workflowSettingsBuilder.withSystemProperties(systemProperties);
         return this;
     }
@@ -326,6 +330,7 @@ public class CodegenConfigurator {
     }
 
     public CodegenConfigurator setTypeMappings(Map<String, String> typeMappings) {
+        this.typeMappings = typeMappings;
         generatorSettingsBuilder.withTypeMappings(typeMappings);
         return this;
     }
@@ -454,6 +459,12 @@ public class CodegenConfigurator {
         config.reservedWordsMappings().putAll(generatorSettings.getReservedWordMappings());
         config.additionalProperties().putAll(generatorSettings.getAdditionalProperties());
 
+        // any other additional properties?
+        String templateDir = workflowSettings.getTemplateDir();
+        if (templateDir != null) {
+            config.additionalProperties().put(CodegenConstants.TEMPLATE_DIR, workflowSettings.getTemplateDir());
+        }
+
         ClientOptInput input = new ClientOptInput()
                 .config(config);
 
diff --git a/modules/openapi-generator/src/test/java/org/openapitools/codegen/config/CodegenConfiguratorTest.java b/modules/openapi-generator/src/test/java/org/openapitools/codegen/config/CodegenConfiguratorTest.java
new file mode 100644
index 0000000000..68271020ca
--- /dev/null
+++ b/modules/openapi-generator/src/test/java/org/openapitools/codegen/config/CodegenConfiguratorTest.java
@@ -0,0 +1,122 @@
+/*
+ * Copyright 2019 OpenAPI-Generator Contributors (https://openapi-generator.tech)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.openapitools.codegen.config;
+
+import org.openapitools.codegen.ClientOptInput;
+import org.openapitools.codegen.CodegenConfig;
+import org.openapitools.codegen.CodegenConstants;
+import org.openapitools.codegen.DefaultGenerator;
+import org.testng.annotations.Test;
+
+import java.io.File;
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Paths;
+import java.util.HashMap;
+import java.util.Map;
+
+import static org.testng.Assert.*;
+
+public class CodegenConfiguratorTest {
+    private void want(Map<String, Object> additionalProperties, String key, Object expected) {
+        assertEquals(additionalProperties.getOrDefault(key, null), expected);
+    }
+
+    @Test
+    public void shouldSetConfiglProperties() throws IOException {
+        // This tests that properties we set on CodegenConfigurator make it down into generator properties,
+        // limiting to those managed in DefaultCodegen.
+        Map<String, Object> properties = new HashMap<String, Object>() {{
+           put("foo", "bar");
+           put("baz", "quux");
+           put(CodegenConstants.HIDE_GENERATION_TIMESTAMP, true);
+           put(CodegenConstants.SORT_PARAMS_BY_REQUIRED_FLAG, true);
+           put(CodegenConstants.PREPEND_FORM_OR_BODY_PARAMETERS, false);
+           put(CodegenConstants.ENSURE_UNIQUE_PARAMS, true);
+           put(CodegenConstants.ALLOW_UNICODE_IDENTIFIERS, true);
+           put(CodegenConstants.REMOVE_OPERATION_ID_PREFIX, false);
+           put(CodegenConstants.DOCEXTENSION, "D");
+           put(CodegenConstants.ENABLE_POST_PROCESS_FILE, false);
+           put(CodegenConstants.GENERATE_ALIAS_AS_MODEL, true);
+        }};
+
+        File output = Files.createTempDirectory("test").toFile();
+        File template = Files.createTempDirectory("test").toFile();
+        String outDir = Paths.get(output.toURI()).toAbsolutePath().toString();
+        String templateDir = Paths.get(template.toURI()).toAbsolutePath().toString();
+
+        final CodegenConfigurator configurator = new CodegenConfigurator()
+                .setGeneratorName("java")
+                .setAdditionalProperties(properties)
+                .setInputSpec("src/test/resources/3_0/ping.yaml")
+                .addImportMapping("one", "two")
+                .addInstantiationType("three", "four")
+                .addLanguageSpecificPrimitive("five")
+                .addSystemProperty("six", "seven")
+                .addTypeMapping("eight", "nine")
+                .setApiPackage("test-api")
+                .setArtifactId("test-artifactId")
+                .setArtifactVersion("test-artifactVersion")
+                .setAuth("test-auth")
+                .setGitRepoId("git")
+                .setGitUserId("user")
+                .setGroupId("group")
+                .setHttpUserAgent("agent")
+                .setModelNamePrefix("model-prefix")
+                .setModelNameSuffix("model-suffix")
+                .setModelPackage("model-package")
+                .setPackageName("package-name")
+                .setReleaseNote("release-note")
+                .setTemplateDir(templateDir)
+                .setOutputDir(outDir);
+
+        final ClientOptInput clientOptInput = configurator.toClientOptInput();
+
+        CodegenConfig config = clientOptInput.getConfig();
+        config.processOpts();
+
+        Map<String, Object> props = config.additionalProperties();
+
+        // This verifies that things we expect to make it into the template will, as a result of this CodegenConfigurator.
+        want(props, CodegenConstants.MODEL_PACKAGE, "model_package"); // * mutated by codegen
+        want(props, CodegenConstants.API_PACKAGE, "test_api"); // * mutated by codegen
+        want(props, CodegenConstants.HIDE_GENERATION_TIMESTAMP, true);
+        want(props, CodegenConstants.SORT_PARAMS_BY_REQUIRED_FLAG, true);
+        want(props, CodegenConstants.PREPEND_FORM_OR_BODY_PARAMETERS, false);
+        want(props, CodegenConstants.ENSURE_UNIQUE_PARAMS, true);
+        want(props, CodegenConstants.ALLOW_UNICODE_IDENTIFIERS, true);
+        want(props, CodegenConstants.MODEL_NAME_PREFIX, "model-prefix");
+        want(props, CodegenConstants.MODEL_NAME_SUFFIX, "model-suffix");
+        want(props, CodegenConstants.REMOVE_OPERATION_ID_PREFIX, false);
+        want(props, CodegenConstants.DOCEXTENSION, "D");
+        want(props, CodegenConstants.ENABLE_POST_PROCESS_FILE, false);
+        want(props, CodegenConstants.GENERATE_ALIAS_AS_MODEL, true);
+        want(props, CodegenConstants.TEMPLATE_DIR, templateDir);
+        want(props, CodegenConstants.GIT_REPO_ID, "git");
+        want(props, CodegenConstants.GIT_USER_ID, "user");
+        want(props, CodegenConstants.GROUP_ID, "group");
+        want(props, CodegenConstants.ARTIFACT_ID, "test-artifactId");
+        want(props, CodegenConstants.ARTIFACT_VERSION, "test-artifactVersion");
+        want(props, CodegenConstants.HTTP_USER_AGENT, "agent");
+        want(props, CodegenConstants.RELEASE_NOTE, "release-note");
+        want(props, CodegenConstants.PACKAGE_NAME, "package-name");
+
+        // test custom properties
+        want(props, "foo", "bar");
+        want(props, "baz", "quux");
+    }
+}
\ No newline at end of file
diff --git a/samples/client/petstore/typescript-fetch/builds/multiple-parameters/runtime.ts b/samples/client/petstore/typescript-fetch/builds/multiple-parameters/runtime.ts
index 5b07f81118..c95a101fba 100644
--- a/samples/client/petstore/typescript-fetch/builds/multiple-parameters/runtime.ts
+++ b/samples/client/petstore/typescript-fetch/builds/multiple-parameters/runtime.ts
@@ -58,7 +58,7 @@ export class BaseAPI {
             // only add the querystring to the URL if there are query parameters.
             // this is done to avoid urls ending with a "?" character which buggy webservers
             // do not handle correctly sometimes.
-            url += '?' + querystring(context.query);
+            url += '?' + this.configuration.queryParamsStringify(context.query);
         }
         const body = (context.body instanceof FormData || isBlob(context.body))
 	    ? context.body
@@ -127,6 +127,7 @@ export interface ConfigurationParameters {
     basePath?: string; // override base path
     fetchApi?: FetchAPI; // override for fetch implementation
     middleware?: Middleware[]; // middleware to apply before/after fetch requests
+    queryParamsStringify?: (params: HTTPQuery) => string; // stringify function for query strings
     username?: string; // parameter for basic security
     password?: string; // parameter for basic security
     apiKey?: string | ((name: string) => string); // parameter for apiKey security
@@ -148,6 +149,10 @@ export class Configuration {
         return this.configuration.middleware || [];
     }
 
+    get queryParamsStringify(): (params: HTTPQuery) => string {
+        return this.configuration.queryParamsStringify || querystring;
+    }
+
     get username(): string | undefined {
         return this.configuration.username;
     }
diff --git a/samples/server/petstore/php-symfony/SymfonyBundle-php/.gitignore b/samples/server/petstore/php-symfony/SymfonyBundle-php/.gitignore
new file mode 100644
index 0000000000..20b7b98976
--- /dev/null
+++ b/samples/server/petstore/php-symfony/SymfonyBundle-php/.gitignore
@@ -0,0 +1,54 @@
+# ref: https://github.com/github/gitignore/blob/master/Symfony.gitignore
+
+# Cache and logs (Symfony2)
+/app/cache/*
+/app/logs/*
+!app/cache/.gitkeep
+!app/logs/.gitkeep
+
+# Email spool folder
+/app/spool/*
+
+# Cache, session files and logs (Symfony3)
+/var/cache/*
+/var/logs/*
+/var/sessions/*
+!var/cache/.gitkeep
+!var/logs/.gitkeep
+!var/sessions/.gitkeep
+
+# Parameters
+/app/config/parameters.yml
+/app/config/parameters.ini
+
+# Managed by Composer
+/app/bootstrap.php.cache
+/var/bootstrap.php.cache
+/bin/*
+!bin/console
+!bin/symfony_requirements
+/vendor/
+
+# Assets and user uploads
+/web/bundles/
+/web/uploads/
+
+# PHPUnit
+/app/phpunit.xml
+/phpunit.xml
+
+# Build data
+/build/
+
+# Composer PHAR
+/composer.phar
+
+# Backup entities generated with doctrine:generate:entities command
+**/Entity/*~
+
+# Embedded web-server pid file
+/.web-server-pid
+
+# From root gitignore
+/Tests/cache/
+/Tests/logs/
\ No newline at end of file

From 84e2f60d6b3f268afd8547745265c6fbf3a37997 Mon Sep 17 00:00:00 2001
From: Prateek Malhotra <someone1@gmail.com>
Date: Fri, 19 Jul 2019 02:04:27 -0400
Subject: [PATCH 29/62] typescript-fetch: fix basic type errors (#3380)

* use proper response for simple object return types
* exclude api and/or model support files and imports if none are generated

Signed-off-by: Prateek Malhotra <someone1@gmail.com>
---
 .../TypeScriptFetchClientCodegen.java         | 35 +++++++++++++++++--
 .../resources/typescript-fetch/index.mustache |  6 ++++
 2 files changed, 38 insertions(+), 3 deletions(-)

diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/TypeScriptFetchClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/TypeScriptFetchClientCodegen.java
index 5521d72e7b..f663409561 100644
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/TypeScriptFetchClientCodegen.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/TypeScriptFetchClientCodegen.java
@@ -36,6 +36,9 @@ public class TypeScriptFetchClientCodegen extends AbstractTypeScriptClientCodege
 
     protected String npmRepository = null;
     private boolean useSingleRequestParameter = true;
+    protected boolean addedApiIndex = false;
+    protected boolean addedModelIndex = false;
+
 
     public TypeScriptFetchClientCodegen() {
         super();
@@ -83,8 +86,6 @@ public class TypeScriptFetchClientCodegen extends AbstractTypeScriptClientCodege
         additionalProperties.put("modelPropertyNaming", getModelPropertyNaming());
         supportingFiles.add(new SupportingFile("index.mustache", "", "index.ts"));
         supportingFiles.add(new SupportingFile("runtime.mustache", "", "runtime.ts"));
-        supportingFiles.add(new SupportingFile("apis.index.mustache", apiPackage().replace('.', File.separatorChar), "index.ts"));
-        supportingFiles.add(new SupportingFile("models.index.mustache", modelPackage().replace('.', File.separatorChar), "index.ts"));
         supportingFiles.add(new SupportingFile("tsconfig.mustache", "", "tsconfig.json"));
         supportingFiles.add(new SupportingFile("gitignore", "", ".gitignore"));
 
@@ -127,8 +128,9 @@ public class TypeScriptFetchClientCodegen extends AbstractTypeScriptClientCodege
 
     @Override
     public Map<String, Object> postProcessModels(Map<String, Object> objs) {
-        // process enum in models
         List<Object> models = (List<Object>) postProcessModelsEnum(objs).get("models");
+
+        // process enum in models
         for (Object _mo : models) {
             Map<String, Object> mo = (Map<String, Object>) _mo;
             CodegenModel cm = (CodegenModel) mo.get("model");
@@ -190,8 +192,21 @@ public class TypeScriptFetchClientCodegen extends AbstractTypeScriptClientCodege
 
     @Override
     public Map<String, Object> postProcessOperationsWithModels(Map<String, Object> operations, List<Object> allModels) {
+        // Add supporting file only if we plan to generate files in /apis
+        if (operations.size() > 0 && !addedApiIndex) {
+            addedApiIndex = true;
+            supportingFiles.add(new SupportingFile("apis.index.mustache", apiPackage().replace('.', File.separatorChar), "index.ts"));
+        }
+
+        // Add supporting file only if we plan to generate files in /models
+        if (allModels.size() > 0 && !addedModelIndex) {
+            addedModelIndex = true;
+            supportingFiles.add(new SupportingFile("models.index.mustache", modelPackage().replace('.', File.separatorChar), "index.ts"));
+        }
+
         this.addOperationModelImportInfomation(operations);
         this.updateOperationParameterEnumInformation(operations);
+        this.addOperationObjectResponseInformation(operations);
         return operations;
     }
 
@@ -224,6 +239,20 @@ public class TypeScriptFetchClientCodegen extends AbstractTypeScriptClientCodege
         operations.put("hasEnums", hasEnum);
     }
 
+    private void addOperationObjectResponseInformation(Map<String, Object> operations) {
+        // This method will modify the infomation on the operations' return type.
+        // The api template uses this infomation to know when to return a text
+        // response for a given simple response operation.
+        Map<String, Object> _operations = (Map<String, Object>) operations.get("operations");
+        List<CodegenOperation> operationList = (List<CodegenOperation>) _operations.get("operation");
+        for (CodegenOperation op : operationList) {
+            if(op.returnType == "object") {
+                op.isMapContainer = true;
+                op.returnSimpleType = false;
+            }
+        }
+    }
+
     private void addExtraReservedWords() {
         this.reservedWords.add("BASE_PATH");
         this.reservedWords.add("BaseAPI");
diff --git a/modules/openapi-generator/src/main/resources/typescript-fetch/index.mustache b/modules/openapi-generator/src/main/resources/typescript-fetch/index.mustache
index 848ecfa4d1..e548c9df6b 100644
--- a/modules/openapi-generator/src/main/resources/typescript-fetch/index.mustache
+++ b/modules/openapi-generator/src/main/resources/typescript-fetch/index.mustache
@@ -1,3 +1,9 @@
 export * from './runtime';
+{{#apiInfo}}
+{{#apis.0}}
 export * from './apis';
+{{/apis.0}}
+{{/apiInfo}}
+{{#models.0}}
 export * from './models';
+{{/models.0}}
\ No newline at end of file

From e58cc2a28247020c547736c6bae516f89278da6e Mon Sep 17 00:00:00 2001
From: William Cheng <wing328hk@gmail.com>
Date: Fri, 19 Jul 2019 15:10:01 +0800
Subject: [PATCH 30/62] Update README.md

---
 README.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/README.md b/README.md
index 8c56937a88..5893543054 100644
--- a/README.md
+++ b/README.md
@@ -597,6 +597,8 @@ Here are some companies/projects (alphabetical order) using OpenAPI Generator in
 - 2019-07-04 - [REST API のためのコード生成入門 (OpenAPI Generator)](https://gum.co/openapi_generator_ebook_big5) by [William Cheng](https://twitter.com/wing328), [中野暁人](https://github.com/ackintosh), [和田拓朗](https://github.com/taxpon)
 - 2019-07-08 - [OpenAPI Generator にコントリビュートしたら社名が載った話。(CAM) - CAM TECH BLOG](https://tech.cam-inc.co.jp/entry/2019/07/08/140000) by [CAM, Inc.](https://www.cam-inc.co.jp/)
 - 2019-07-14 - [OpenAPI GeneratorでPythonのクライアントライブラリを作成した](https://qiita.com/yuji38kwmt/items/dfb929316a1335a161c0) by [yuji38kwmt](https://qiita.com/yuji38kwmt)
+- 2019-07-19 - [Developer Experience (DX) for Open-Source Projects: How to Engage Developers and Build a Growing Developer Community] by [William Cheng](https://twitter.com/wing328), [中野暁人](https://github.com/ackintosh) at [Open Source Summit Japan 2019](https://events.linuxfoundation.org/events/open-source-summit-japan-2019/)
+](https://qiita.com/yuji38kwmt/items/dfb929316a1335a161c0) by [yuji38kwmt](https://qiita.com/yuji38kwmt)
 
 ## [6 - About Us](#table-of-contents)
 

From 5c7d902c4c7016a6726f7428f9b5b65c1b868cc4 Mon Sep 17 00:00:00 2001
From: wing328 <wing328hk@gmail.com>
Date: Fri, 19 Jul 2019 15:15:22 +0800
Subject: [PATCH 31/62] fix link to open summit presentation

---
 README.md | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 5893543054..192ef232c2 100644
--- a/README.md
+++ b/README.md
@@ -597,8 +597,7 @@ Here are some companies/projects (alphabetical order) using OpenAPI Generator in
 - 2019-07-04 - [REST API のためのコード生成入門 (OpenAPI Generator)](https://gum.co/openapi_generator_ebook_big5) by [William Cheng](https://twitter.com/wing328), [中野暁人](https://github.com/ackintosh), [和田拓朗](https://github.com/taxpon)
 - 2019-07-08 - [OpenAPI Generator にコントリビュートしたら社名が載った話。(CAM) - CAM TECH BLOG](https://tech.cam-inc.co.jp/entry/2019/07/08/140000) by [CAM, Inc.](https://www.cam-inc.co.jp/)
 - 2019-07-14 - [OpenAPI GeneratorでPythonのクライアントライブラリを作成した](https://qiita.com/yuji38kwmt/items/dfb929316a1335a161c0) by [yuji38kwmt](https://qiita.com/yuji38kwmt)
-- 2019-07-19 - [Developer Experience (DX) for Open-Source Projects: How to Engage Developers and Build a Growing Developer Community] by [William Cheng](https://twitter.com/wing328), [中野暁人](https://github.com/ackintosh) at [Open Source Summit Japan 2019](https://events.linuxfoundation.org/events/open-source-summit-japan-2019/)
-](https://qiita.com/yuji38kwmt/items/dfb929316a1335a161c0) by [yuji38kwmt](https://qiita.com/yuji38kwmt)
+- 2019-07-19 - [Developer Experience (DX) for Open-Source Projects: How to Engage Developers and Build a Growing Developer Community](https://speakerdeck.com/wing328/developer-experience-dx-for-open-source-projects-english-japanese) by [William Cheng](https://twitter.com/wing328), [中野暁人](https://github.com/ackintosh) at [Open Source Summit Japan 2019](https://events.linuxfoundation.org/events/open-source-summit-japan-2019/)
 
 ## [6 - About Us](#table-of-contents)
 

From 21e29d7177d30ffc2b6e99dde229f3b923ac3a92 Mon Sep 17 00:00:00 2001
From: John Wang <johncwang@gmail.com>
Date: Fri, 19 Jul 2019 00:44:31 -0700
Subject: [PATCH 32/62] fix README.md missing paren typo (#3391)

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 192ef232c2..fb598b1b9f 100644
--- a/README.md
+++ b/README.md
@@ -774,7 +774,7 @@ If you want to join the committee, please kindly apply by sending an email to te
 | Elm       | @eriktim (2018/09) |
 | Erlang    | @tsloughter (2017/11) @jfacorro (2018/10) @robertoaloi (2018/10) |
 | F#        | @nmfisher (2019/05) |
-| Go        | @antihax (2017/11) @bvwells (2017/12) @grokify (2018/07) @kemokemo (2018/09 |
+| Go        | @antihax (2017/11) @bvwells (2017/12) @grokify (2018/07) @kemokemo (2018/09) |
 | GraphQL   | @renepardon (2018/12) |
 | Groovy    |  |
 | Haskell   |  |

From 1413775e0e17968c8a573cae611db762852a182b Mon Sep 17 00:00:00 2001
From: Martin Delille <martin@delille.org>
Date: Sun, 21 Jul 2019 22:23:15 +0200
Subject: [PATCH 33/62] qt5 client: strip whitespace (#3406)

---
 .../cpp-qt5-client/HttpRequest.cpp.mustache   |  4 ++--
 .../cpp-qt5-client/HttpRequest.h.mustache     |  6 ++---
 .../resources/cpp-qt5-client/Project.mustache |  2 +-
 .../cpp-qt5-client/api-body.mustache          |  6 ++---
 .../cpp-qt5-client/api-header.mustache        |  2 +-
 .../resources/cpp-qt5-client/enum.mustache    |  4 ++--
 .../cpp-qt5-client/helpers-body.mustache      | 18 +++++++-------
 .../cpp-qt5-client/helpers-header.mustache    |  2 +-
 .../cpp-qt5-client/model-body.mustache        |  4 ++--
 .../cpp-qt5-client/model-header.mustache      |  2 +-
 .../resources/cpp-qt5-client/object.mustache  |  2 +-
 .../cpp-qt5/.openapi-generator/VERSION        |  2 +-
 .../petstore/cpp-qt5/client/OAIApiResponse.h  |  2 +-
 .../petstore/cpp-qt5/client/OAICategory.h     |  2 +-
 .../client/petstore/cpp-qt5/client/OAIEnum.h  |  4 ++--
 .../petstore/cpp-qt5/client/OAIHelpers.cpp    | 18 +++++++-------
 .../petstore/cpp-qt5/client/OAIHelpers.h      |  2 +-
 .../cpp-qt5/client/OAIHttpRequest.cpp         |  4 ++--
 .../petstore/cpp-qt5/client/OAIHttpRequest.h  |  6 ++---
 .../petstore/cpp-qt5/client/OAIObject.h       |  2 +-
 .../client/petstore/cpp-qt5/client/OAIOrder.h |  2 +-
 .../client/petstore/cpp-qt5/client/OAIPet.h   |  2 +-
 .../petstore/cpp-qt5/client/OAIPetApi.cpp     | 24 +++++++++----------
 .../petstore/cpp-qt5/client/OAIPetApi.h       |  2 +-
 .../petstore/cpp-qt5/client/OAIStoreApi.cpp   | 12 +++++-----
 .../petstore/cpp-qt5/client/OAIStoreApi.h     |  2 +-
 .../client/petstore/cpp-qt5/client/OAITag.h   |  2 +-
 .../client/petstore/cpp-qt5/client/OAIUser.h  |  2 +-
 .../petstore/cpp-qt5/client/OAIUserApi.cpp    | 24 +++++++++----------
 .../petstore/cpp-qt5/client/OAIUserApi.h      |  2 +-
 .../client/petstore/cpp-qt5/client/client.pri |  2 +-
 31 files changed, 85 insertions(+), 85 deletions(-)

diff --git a/modules/openapi-generator/src/main/resources/cpp-qt5-client/HttpRequest.cpp.mustache b/modules/openapi-generator/src/main/resources/cpp-qt5-client/HttpRequest.cpp.mustache
index f9c036f820..05bad7539e 100644
--- a/modules/openapi-generator/src/main/resources/cpp-qt5-client/HttpRequest.cpp.mustache
+++ b/modules/openapi-generator/src/main/resources/cpp-qt5-client/HttpRequest.cpp.mustache
@@ -45,7 +45,7 @@ void {{prefix}}HttpRequestInput::add_file(QString variable_name, QString local_f
     : QObject(parent), manager(nullptr)
 {
     qsrand(QDateTime::currentDateTime().toTime_t());
-    timeout = 0;    
+    timeout = 0;
     timer = new QTimer();
     manager = new QNetworkAccessManager(this);
     connect(manager, &QNetworkAccessManager::finished, this, &{{prefix}}HttpRequestWorker::on_manager_finished);
@@ -57,7 +57,7 @@ void {{prefix}}HttpRequestInput::add_file(QString variable_name, QString local_f
             timer->stop();
         }
         timer->deleteLater();
-    }    
+    }
 }
 
 QMap<QByteArray, QByteArray> {{prefix}}HttpRequestWorker::getResponseHeaders() const {
diff --git a/modules/openapi-generator/src/main/resources/cpp-qt5-client/HttpRequest.h.mustache b/modules/openapi-generator/src/main/resources/cpp-qt5-client/HttpRequest.h.mustache
index 6ba6b63117..0af88c4070 100644
--- a/modules/openapi-generator/src/main/resources/cpp-qt5-client/HttpRequest.h.mustache
+++ b/modules/openapi-generator/src/main/resources/cpp-qt5-client/HttpRequest.h.mustache
@@ -76,10 +76,10 @@ signals:
 private:
     QNetworkAccessManager *manager;
     QMap<QByteArray, QByteArray> headers;
-    int timeout;    
-    void on_manager_timeout(QNetworkReply *reply);    
+    int timeout;
+    void on_manager_timeout(QNetworkReply *reply);
 private slots:
-    void on_manager_finished(QNetworkReply *reply);    
+    void on_manager_finished(QNetworkReply *reply);
 };
 
 {{#cppNamespaceDeclarations}}
diff --git a/modules/openapi-generator/src/main/resources/cpp-qt5-client/Project.mustache b/modules/openapi-generator/src/main/resources/cpp-qt5-client/Project.mustache
index 11a0eb49bf..9f530b381a 100644
--- a/modules/openapi-generator/src/main/resources/cpp-qt5-client/Project.mustache
+++ b/modules/openapi-generator/src/main/resources/cpp-qt5-client/Project.mustache
@@ -19,7 +19,7 @@ HEADERS += \
     $${PWD}/{{prefix}}Helpers.h \
     $${PWD}/{{prefix}}HttpRequest.h \
     $${PWD}/{{prefix}}Object.h
-    $${PWD}/{{prefix}}Enum.h    
+    $${PWD}/{{prefix}}Enum.h
 
 SOURCES += \
 # Models
diff --git a/modules/openapi-generator/src/main/resources/cpp-qt5-client/api-body.mustache b/modules/openapi-generator/src/main/resources/cpp-qt5-client/api-body.mustache
index 899a16b059..5777507ec9 100644
--- a/modules/openapi-generator/src/main/resources/cpp-qt5-client/api-body.mustache
+++ b/modules/openapi-generator/src/main/resources/cpp-qt5-client/api-body.mustache
@@ -49,7 +49,7 @@ void
     QString fullPath;
     fullPath.append(this->host).append(this->basePath).append("{{{path}}}");
     {{#pathParams}}
-    QString {{paramName}}PathParam("{"); 
+    QString {{paramName}}PathParam("{");
     {{paramName}}PathParam.append("{{baseName}}").append("}");
     fullPath.replace({{paramName}}PathParam, QUrl::toPercentEncoding(::{{cppNamespace}}::toStringValue({{paramName}})));
     {{/pathParams}}
@@ -103,7 +103,7 @@ void
     }
     {{/collectionFormat}}{{/queryParams}}
     {{prefix}}HttpRequestWorker *worker = new {{prefix}}HttpRequestWorker();
-    worker->setTimeOut(timeout);    
+    worker->setTimeOut(timeout);
     {{prefix}}HttpRequestInput input(fullPath, "{{httpMethod}}");
     {{#formParams}}
     if ({{paramName}} != nullptr) {
@@ -166,7 +166,7 @@ void
     {{^isListContainer}}
     {{^isMapContainer}}
     {{#returnTypeIsPrimitive}}
-    {{{returnType}}} output;  
+    {{{returnType}}} output;
     ::{{cppNamespace}}::fromStringValue(QString(worker->response), output);
     {{/returnTypeIsPrimitive}}
     {{/isMapContainer}}
diff --git a/modules/openapi-generator/src/main/resources/cpp-qt5-client/api-header.mustache b/modules/openapi-generator/src/main/resources/cpp-qt5-client/api-header.mustache
index ea9218ad52..5f02327975 100644
--- a/modules/openapi-generator/src/main/resources/cpp-qt5-client/api-header.mustache
+++ b/modules/openapi-generator/src/main/resources/cpp-qt5-client/api-header.mustache
@@ -25,7 +25,7 @@ public:
     void setHost(const QString& host);
     void setApiTimeOutMs(const int tout);
     void addHeaders(const QString& key, const QString& value);
-    
+
     {{#operations}}{{#operation}}void {{nickname}}({{#allParams}}const {{{dataType}}}& {{paramName}}{{#hasMore}}, {{/hasMore}}{{/allParams}});
     {{/operation}}{{/operations}}
 private:
diff --git a/modules/openapi-generator/src/main/resources/cpp-qt5-client/enum.mustache b/modules/openapi-generator/src/main/resources/cpp-qt5-client/enum.mustache
index 2874ef8c71..bf34a3a150 100644
--- a/modules/openapi-generator/src/main/resources/cpp-qt5-client/enum.mustache
+++ b/modules/openapi-generator/src/main/resources/cpp-qt5-client/enum.mustache
@@ -15,7 +15,7 @@ class {{prefix}}Enum {
     {{prefix}}Enum() {
 
     }
-    
+
     {{prefix}}Enum(QString jsonString) {
         fromJson(jsonString);
     }
@@ -48,7 +48,7 @@ class {{prefix}}Enum {
         return true;
     }
 private :
-    QString jstr; 
+    QString jstr;
 };
 
 {{#cppNamespaceDeclarations}}
diff --git a/modules/openapi-generator/src/main/resources/cpp-qt5-client/helpers-body.mustache b/modules/openapi-generator/src/main/resources/cpp-qt5-client/helpers-body.mustache
index 9aa16e1b52..ddf83be291 100644
--- a/modules/openapi-generator/src/main/resources/cpp-qt5-client/helpers-body.mustache
+++ b/modules/openapi-generator/src/main/resources/cpp-qt5-client/helpers-body.mustache
@@ -220,7 +220,7 @@ fromJsonValue(QString &value, const QJsonValue &jval){
         } else if(jval.isDouble()){
             value = QString::number(jval.toDouble());
         } else {
-            ok = false;    
+            ok = false;
         }
     } else {
         ok = false;
@@ -230,7 +230,7 @@ fromJsonValue(QString &value, const QJsonValue &jval){
 
 bool
 fromJsonValue(QDateTime &value, const QJsonValue &jval){
-    bool ok = true;    
+    bool ok = true;
     if(!jval.isUndefined() && !jval.isNull() && jval.isString()){
         value = QDateTime::fromString(jval.toString(), Qt::ISODate);
         ok = value.isValid();
@@ -254,7 +254,7 @@ fromJsonValue(QByteArray &value, const QJsonValue &jval){
 
 bool
 fromJsonValue(QDate &value, const QJsonValue &jval){
-    bool ok = true;    
+    bool ok = true;
     if(!jval.isUndefined() && !jval.isNull() && jval.isString()){
         value = QDate::fromString(jval.toString(), Qt::ISODate);
         ok = value.isValid();
@@ -266,7 +266,7 @@ fromJsonValue(QDate &value, const QJsonValue &jval){
 
 bool
 fromJsonValue(qint32 &value, const QJsonValue &jval){
-    bool ok = true;    
+    bool ok = true;
     if(!jval.isUndefined() && !jval.isNull() && !jval.isObject() && !jval.isArray()){
         value = jval.toInt();
     } else {
@@ -277,7 +277,7 @@ fromJsonValue(qint32 &value, const QJsonValue &jval){
 
 bool
 fromJsonValue(qint64 &value, const QJsonValue &jval){
-    bool ok = true;    
+    bool ok = true;
     if(!jval.isUndefined() && !jval.isNull() && !jval.isObject() && !jval.isArray()){
         value = jval.toVariant().toLongLong();
     } else {
@@ -288,7 +288,7 @@ fromJsonValue(qint64 &value, const QJsonValue &jval){
 
 bool
 fromJsonValue(bool &value, const QJsonValue &jval){
-    bool ok = true;    
+    bool ok = true;
     if(jval.isBool()){
         value = jval.toBool();
     } else {
@@ -299,7 +299,7 @@ fromJsonValue(bool &value, const QJsonValue &jval){
 
 bool
 fromJsonValue(float &value, const QJsonValue &jval){
-    bool ok = true;    
+    bool ok = true;
     if(jval.isDouble()){
         value = static_cast<float>(jval.toDouble());
     } else {
@@ -310,7 +310,7 @@ fromJsonValue(float &value, const QJsonValue &jval){
 
 bool
 fromJsonValue(double &value, const QJsonValue &jval){
-    bool ok = true;    
+    bool ok = true;
     if(jval.isDouble()){
         value = jval.toDouble();
     } else {
@@ -321,7 +321,7 @@ fromJsonValue(double &value, const QJsonValue &jval){
 
 bool
 fromJsonValue({{prefix}}Object  &value, const QJsonValue &jval){
-    bool ok = true;    
+    bool ok = true;
     if(jval.isObject()){
         value.fromJsonObject(jval.toObject());
         ok = value.isValid();
diff --git a/modules/openapi-generator/src/main/resources/cpp-qt5-client/helpers-header.mustache b/modules/openapi-generator/src/main/resources/cpp-qt5-client/helpers-header.mustache
index 0948f4f662..6c8436c554 100644
--- a/modules/openapi-generator/src/main/resources/cpp-qt5-client/helpers-header.mustache
+++ b/modules/openapi-generator/src/main/resources/cpp-qt5-client/helpers-header.mustache
@@ -129,7 +129,7 @@ namespace {{this}} {
             ok = false;
         }
         return ok;
-    } 
+    }
 
     template <typename T>
     bool fromJsonValue(QMap<QString, T> &val, const QJsonValue &jval) {
diff --git a/modules/openapi-generator/src/main/resources/cpp-qt5-client/model-body.mustache b/modules/openapi-generator/src/main/resources/cpp-qt5-client/model-body.mustache
index 2a75a18c76..1e25f89827 100644
--- a/modules/openapi-generator/src/main/resources/cpp-qt5-client/model-body.mustache
+++ b/modules/openapi-generator/src/main/resources/cpp-qt5-client/model-body.mustache
@@ -43,7 +43,7 @@ void
     {{^isEnum}}QByteArray array (jsonString.toStdString().c_str());
     QJsonDocument doc = QJsonDocument::fromJson(array);
     QJsonObject jsonObject = doc.object();
-    this->fromJsonObject(jsonObject);{{/isEnum}}{{#isEnum}}{{#allowableValues}}{{#enumVars}} 
+    this->fromJsonObject(jsonObject);{{/isEnum}}{{#isEnum}}{{#allowableValues}}{{#enumVars}}
     {{#-first}}if{{/-first}}{{^-first}}else if{{/-first}} ( jsonString.compare({{#isString}}"{{value}}"{{/isString}}{{^isString}}QString::number({{value}}){{/isString}}, Qt::CaseInsensitive) == 0) {
         m_value = e{{classname}}::{{name}};
         m_value_isValid = true;
@@ -92,7 +92,7 @@ QString
         {{#enumVars}}
         case e{{classname}}::{{name}}:
             val = {{#isString}}"{{value}}"{{/isString}}{{^isString}}QString::number({{value}}){{/isString}};
-            break;{{#-last}} 
+            break;{{#-last}}
         default:
             break;{{/-last}}
         {{/enumVars}}
diff --git a/modules/openapi-generator/src/main/resources/cpp-qt5-client/model-header.mustache b/modules/openapi-generator/src/main/resources/cpp-qt5-client/model-header.mustache
index 38b42f401a..556139facf 100644
--- a/modules/openapi-generator/src/main/resources/cpp-qt5-client/model-header.mustache
+++ b/modules/openapi-generator/src/main/resources/cpp-qt5-client/model-header.mustache
@@ -53,7 +53,7 @@ public:
 
     {{classname}}::e{{classname}} getValue() const;
     void setValue(const {{classname}}::e{{classname}}& value);{{/isEnum}}
-    
+
     virtual bool isSet() const override;
     virtual bool isValid() const override;
 
diff --git a/modules/openapi-generator/src/main/resources/cpp-qt5-client/object.mustache b/modules/openapi-generator/src/main/resources/cpp-qt5-client/object.mustache
index 100670d1fc..e58b49adb9 100644
--- a/modules/openapi-generator/src/main/resources/cpp-qt5-client/object.mustache
+++ b/modules/openapi-generator/src/main/resources/cpp-qt5-client/object.mustache
@@ -15,7 +15,7 @@ class {{prefix}}Object {
     {{prefix}}Object() {
 
     }
-    
+
     {{prefix}}Object(QString jsonString) {
         fromJson(jsonString);
     }
diff --git a/samples/client/petstore/cpp-qt5/.openapi-generator/VERSION b/samples/client/petstore/cpp-qt5/.openapi-generator/VERSION
index d96260ba33..83a328a922 100644
--- a/samples/client/petstore/cpp-qt5/.openapi-generator/VERSION
+++ b/samples/client/petstore/cpp-qt5/.openapi-generator/VERSION
@@ -1 +1 @@
-4.0.2-SNAPSHOT
\ No newline at end of file
+4.1.0-SNAPSHOT
\ No newline at end of file
diff --git a/samples/client/petstore/cpp-qt5/client/OAIApiResponse.h b/samples/client/petstore/cpp-qt5/client/OAIApiResponse.h
index 2fe8209ac1..aa71d9cdfb 100644
--- a/samples/client/petstore/cpp-qt5/client/OAIApiResponse.h
+++ b/samples/client/petstore/cpp-qt5/client/OAIApiResponse.h
@@ -53,7 +53,7 @@ public:
     void setMessage(const QString &message);
 
     
-    
+
     virtual bool isSet() const override;
     virtual bool isValid() const override;
 
diff --git a/samples/client/petstore/cpp-qt5/client/OAICategory.h b/samples/client/petstore/cpp-qt5/client/OAICategory.h
index 129d974857..966f5e295f 100644
--- a/samples/client/petstore/cpp-qt5/client/OAICategory.h
+++ b/samples/client/petstore/cpp-qt5/client/OAICategory.h
@@ -49,7 +49,7 @@ public:
     void setName(const QString &name);
 
     
-    
+
     virtual bool isSet() const override;
     virtual bool isValid() const override;
 
diff --git a/samples/client/petstore/cpp-qt5/client/OAIEnum.h b/samples/client/petstore/cpp-qt5/client/OAIEnum.h
index a5e619960f..66625c43b6 100644
--- a/samples/client/petstore/cpp-qt5/client/OAIEnum.h
+++ b/samples/client/petstore/cpp-qt5/client/OAIEnum.h
@@ -24,7 +24,7 @@ class OAIEnum {
     OAIEnum() {
 
     }
-    
+
     OAIEnum(QString jsonString) {
         fromJson(jsonString);
     }
@@ -57,7 +57,7 @@ class OAIEnum {
         return true;
     }
 private :
-    QString jstr; 
+    QString jstr;
 };
 
 }
diff --git a/samples/client/petstore/cpp-qt5/client/OAIHelpers.cpp b/samples/client/petstore/cpp-qt5/client/OAIHelpers.cpp
index bbe372ea85..fa0ba7d9f2 100644
--- a/samples/client/petstore/cpp-qt5/client/OAIHelpers.cpp
+++ b/samples/client/petstore/cpp-qt5/client/OAIHelpers.cpp
@@ -229,7 +229,7 @@ fromJsonValue(QString &value, const QJsonValue &jval){
         } else if(jval.isDouble()){
             value = QString::number(jval.toDouble());
         } else {
-            ok = false;    
+            ok = false;
         }
     } else {
         ok = false;
@@ -239,7 +239,7 @@ fromJsonValue(QString &value, const QJsonValue &jval){
 
 bool
 fromJsonValue(QDateTime &value, const QJsonValue &jval){
-    bool ok = true;    
+    bool ok = true;
     if(!jval.isUndefined() && !jval.isNull() && jval.isString()){
         value = QDateTime::fromString(jval.toString(), Qt::ISODate);
         ok = value.isValid();
@@ -263,7 +263,7 @@ fromJsonValue(QByteArray &value, const QJsonValue &jval){
 
 bool
 fromJsonValue(QDate &value, const QJsonValue &jval){
-    bool ok = true;    
+    bool ok = true;
     if(!jval.isUndefined() && !jval.isNull() && jval.isString()){
         value = QDate::fromString(jval.toString(), Qt::ISODate);
         ok = value.isValid();
@@ -275,7 +275,7 @@ fromJsonValue(QDate &value, const QJsonValue &jval){
 
 bool
 fromJsonValue(qint32 &value, const QJsonValue &jval){
-    bool ok = true;    
+    bool ok = true;
     if(!jval.isUndefined() && !jval.isNull() && !jval.isObject() && !jval.isArray()){
         value = jval.toInt();
     } else {
@@ -286,7 +286,7 @@ fromJsonValue(qint32 &value, const QJsonValue &jval){
 
 bool
 fromJsonValue(qint64 &value, const QJsonValue &jval){
-    bool ok = true;    
+    bool ok = true;
     if(!jval.isUndefined() && !jval.isNull() && !jval.isObject() && !jval.isArray()){
         value = jval.toVariant().toLongLong();
     } else {
@@ -297,7 +297,7 @@ fromJsonValue(qint64 &value, const QJsonValue &jval){
 
 bool
 fromJsonValue(bool &value, const QJsonValue &jval){
-    bool ok = true;    
+    bool ok = true;
     if(jval.isBool()){
         value = jval.toBool();
     } else {
@@ -308,7 +308,7 @@ fromJsonValue(bool &value, const QJsonValue &jval){
 
 bool
 fromJsonValue(float &value, const QJsonValue &jval){
-    bool ok = true;    
+    bool ok = true;
     if(jval.isDouble()){
         value = static_cast<float>(jval.toDouble());
     } else {
@@ -319,7 +319,7 @@ fromJsonValue(float &value, const QJsonValue &jval){
 
 bool
 fromJsonValue(double &value, const QJsonValue &jval){
-    bool ok = true;    
+    bool ok = true;
     if(jval.isDouble()){
         value = jval.toDouble();
     } else {
@@ -330,7 +330,7 @@ fromJsonValue(double &value, const QJsonValue &jval){
 
 bool
 fromJsonValue(OAIObject  &value, const QJsonValue &jval){
-    bool ok = true;    
+    bool ok = true;
     if(jval.isObject()){
         value.fromJsonObject(jval.toObject());
         ok = value.isValid();
diff --git a/samples/client/petstore/cpp-qt5/client/OAIHelpers.h b/samples/client/petstore/cpp-qt5/client/OAIHelpers.h
index ce7cec3fc7..0555e5dc24 100644
--- a/samples/client/petstore/cpp-qt5/client/OAIHelpers.h
+++ b/samples/client/petstore/cpp-qt5/client/OAIHelpers.h
@@ -138,7 +138,7 @@ namespace OpenAPI {
             ok = false;
         }
         return ok;
-    } 
+    }
 
     template <typename T>
     bool fromJsonValue(QMap<QString, T> &val, const QJsonValue &jval) {
diff --git a/samples/client/petstore/cpp-qt5/client/OAIHttpRequest.cpp b/samples/client/petstore/cpp-qt5/client/OAIHttpRequest.cpp
index 8fdd4ea5e9..a2ec8558ce 100644
--- a/samples/client/petstore/cpp-qt5/client/OAIHttpRequest.cpp
+++ b/samples/client/petstore/cpp-qt5/client/OAIHttpRequest.cpp
@@ -54,7 +54,7 @@ OAIHttpRequestWorker::OAIHttpRequestWorker(QObject *parent)
     : QObject(parent), manager(nullptr)
 {
     qsrand(QDateTime::currentDateTime().toTime_t());
-    timeout = 0;    
+    timeout = 0;
     timer = new QTimer();
     manager = new QNetworkAccessManager(this);
     connect(manager, &QNetworkAccessManager::finished, this, &OAIHttpRequestWorker::on_manager_finished);
@@ -66,7 +66,7 @@ OAIHttpRequestWorker::~OAIHttpRequestWorker() {
             timer->stop();
         }
         timer->deleteLater();
-    }    
+    }
 }
 
 QMap<QByteArray, QByteArray> OAIHttpRequestWorker::getResponseHeaders() const {
diff --git a/samples/client/petstore/cpp-qt5/client/OAIHttpRequest.h b/samples/client/petstore/cpp-qt5/client/OAIHttpRequest.h
index b7380595c0..ad3c31f694 100644
--- a/samples/client/petstore/cpp-qt5/client/OAIHttpRequest.h
+++ b/samples/client/petstore/cpp-qt5/client/OAIHttpRequest.h
@@ -85,10 +85,10 @@ signals:
 private:
     QNetworkAccessManager *manager;
     QMap<QByteArray, QByteArray> headers;
-    int timeout;    
-    void on_manager_timeout(QNetworkReply *reply);    
+    int timeout;
+    void on_manager_timeout(QNetworkReply *reply);
 private slots:
-    void on_manager_finished(QNetworkReply *reply);    
+    void on_manager_finished(QNetworkReply *reply);
 };
 
 }
diff --git a/samples/client/petstore/cpp-qt5/client/OAIObject.h b/samples/client/petstore/cpp-qt5/client/OAIObject.h
index babc1e64fb..83757b5671 100644
--- a/samples/client/petstore/cpp-qt5/client/OAIObject.h
+++ b/samples/client/petstore/cpp-qt5/client/OAIObject.h
@@ -24,7 +24,7 @@ class OAIObject {
     OAIObject() {
 
     }
-    
+
     OAIObject(QString jsonString) {
         fromJson(jsonString);
     }
diff --git a/samples/client/petstore/cpp-qt5/client/OAIOrder.h b/samples/client/petstore/cpp-qt5/client/OAIOrder.h
index c9b006d363..79b3fe7413 100644
--- a/samples/client/petstore/cpp-qt5/client/OAIOrder.h
+++ b/samples/client/petstore/cpp-qt5/client/OAIOrder.h
@@ -66,7 +66,7 @@ public:
     void setComplete(const bool &complete);
 
     
-    
+
     virtual bool isSet() const override;
     virtual bool isValid() const override;
 
diff --git a/samples/client/petstore/cpp-qt5/client/OAIPet.h b/samples/client/petstore/cpp-qt5/client/OAIPet.h
index 6bec604d21..f4e357e693 100644
--- a/samples/client/petstore/cpp-qt5/client/OAIPet.h
+++ b/samples/client/petstore/cpp-qt5/client/OAIPet.h
@@ -68,7 +68,7 @@ public:
     void setStatus(const QString &status);
 
     
-    
+
     virtual bool isSet() const override;
     virtual bool isValid() const override;
 
diff --git a/samples/client/petstore/cpp-qt5/client/OAIPetApi.cpp b/samples/client/petstore/cpp-qt5/client/OAIPetApi.cpp
index 3e83ea0066..1341a73c3b 100644
--- a/samples/client/petstore/cpp-qt5/client/OAIPetApi.cpp
+++ b/samples/client/petstore/cpp-qt5/client/OAIPetApi.cpp
@@ -57,7 +57,7 @@ OAIPetApi::addPet(const OAIPet& body) {
     fullPath.append(this->host).append(this->basePath).append("/pet");
     
     OAIHttpRequestWorker *worker = new OAIHttpRequestWorker();
-    worker->setTimeOut(timeout);    
+    worker->setTimeOut(timeout);
     OAIHttpRequestInput input(fullPath, "POST");
 
     
@@ -104,12 +104,12 @@ void
 OAIPetApi::deletePet(const qint64& pet_id, const QString& api_key) {
     QString fullPath;
     fullPath.append(this->host).append(this->basePath).append("/pet/{petId}");
-    QString pet_idPathParam("{"); 
+    QString pet_idPathParam("{");
     pet_idPathParam.append("petId").append("}");
     fullPath.replace(pet_idPathParam, QUrl::toPercentEncoding(::OpenAPI::toStringValue(pet_id)));
     
     OAIHttpRequestWorker *worker = new OAIHttpRequestWorker();
-    worker->setTimeOut(timeout);    
+    worker->setTimeOut(timeout);
     OAIHttpRequestInput input(fullPath, "DELETE");
 
     if (api_key != nullptr) {
@@ -197,7 +197,7 @@ OAIPetApi::findPetsByStatus(const QList<QString>& status) {
     }
     
     OAIHttpRequestWorker *worker = new OAIHttpRequestWorker();
-    worker->setTimeOut(timeout);    
+    worker->setTimeOut(timeout);
     OAIHttpRequestInput input(fullPath, "GET");
 
 
@@ -292,7 +292,7 @@ OAIPetApi::findPetsByTags(const QList<QString>& tags) {
     }
     
     OAIHttpRequestWorker *worker = new OAIHttpRequestWorker();
-    worker->setTimeOut(timeout);    
+    worker->setTimeOut(timeout);
     OAIHttpRequestInput input(fullPath, "GET");
 
 
@@ -345,12 +345,12 @@ void
 OAIPetApi::getPetById(const qint64& pet_id) {
     QString fullPath;
     fullPath.append(this->host).append(this->basePath).append("/pet/{petId}");
-    QString pet_idPathParam("{"); 
+    QString pet_idPathParam("{");
     pet_idPathParam.append("petId").append("}");
     fullPath.replace(pet_idPathParam, QUrl::toPercentEncoding(::OpenAPI::toStringValue(pet_id)));
     
     OAIHttpRequestWorker *worker = new OAIHttpRequestWorker();
-    worker->setTimeOut(timeout);    
+    worker->setTimeOut(timeout);
     OAIHttpRequestInput input(fullPath, "GET");
 
 
@@ -396,7 +396,7 @@ OAIPetApi::updatePet(const OAIPet& body) {
     fullPath.append(this->host).append(this->basePath).append("/pet");
     
     OAIHttpRequestWorker *worker = new OAIHttpRequestWorker();
-    worker->setTimeOut(timeout);    
+    worker->setTimeOut(timeout);
     OAIHttpRequestInput input(fullPath, "PUT");
 
     
@@ -443,12 +443,12 @@ void
 OAIPetApi::updatePetWithForm(const qint64& pet_id, const QString& name, const QString& status) {
     QString fullPath;
     fullPath.append(this->host).append(this->basePath).append("/pet/{petId}");
-    QString pet_idPathParam("{"); 
+    QString pet_idPathParam("{");
     pet_idPathParam.append("petId").append("}");
     fullPath.replace(pet_idPathParam, QUrl::toPercentEncoding(::OpenAPI::toStringValue(pet_id)));
     
     OAIHttpRequestWorker *worker = new OAIHttpRequestWorker();
-    worker->setTimeOut(timeout);    
+    worker->setTimeOut(timeout);
     OAIHttpRequestInput input(fullPath, "POST");
     if (name != nullptr) {
         input.add_var("name", name);
@@ -497,12 +497,12 @@ void
 OAIPetApi::uploadFile(const qint64& pet_id, const QString& additional_metadata, const OAIHttpRequestInputFileElement*& file) {
     QString fullPath;
     fullPath.append(this->host).append(this->basePath).append("/pet/{petId}/uploadImage");
-    QString pet_idPathParam("{"); 
+    QString pet_idPathParam("{");
     pet_idPathParam.append("petId").append("}");
     fullPath.replace(pet_idPathParam, QUrl::toPercentEncoding(::OpenAPI::toStringValue(pet_id)));
     
     OAIHttpRequestWorker *worker = new OAIHttpRequestWorker();
-    worker->setTimeOut(timeout);    
+    worker->setTimeOut(timeout);
     OAIHttpRequestInput input(fullPath, "POST");
     if (additional_metadata != nullptr) {
         input.add_var("additionalMetadata", additional_metadata);
diff --git a/samples/client/petstore/cpp-qt5/client/OAIPetApi.h b/samples/client/petstore/cpp-qt5/client/OAIPetApi.h
index bd64db93db..449de95853 100644
--- a/samples/client/petstore/cpp-qt5/client/OAIPetApi.h
+++ b/samples/client/petstore/cpp-qt5/client/OAIPetApi.h
@@ -36,7 +36,7 @@ public:
     void setHost(const QString& host);
     void setApiTimeOutMs(const int tout);
     void addHeaders(const QString& key, const QString& value);
-    
+
     void addPet(const OAIPet& body);
     void deletePet(const qint64& pet_id, const QString& api_key);
     void findPetsByStatus(const QList<QString>& status);
diff --git a/samples/client/petstore/cpp-qt5/client/OAIStoreApi.cpp b/samples/client/petstore/cpp-qt5/client/OAIStoreApi.cpp
index 90ac22d129..7b2e37f635 100644
--- a/samples/client/petstore/cpp-qt5/client/OAIStoreApi.cpp
+++ b/samples/client/petstore/cpp-qt5/client/OAIStoreApi.cpp
@@ -55,12 +55,12 @@ void
 OAIStoreApi::deleteOrder(const QString& order_id) {
     QString fullPath;
     fullPath.append(this->host).append(this->basePath).append("/store/order/{orderId}");
-    QString order_idPathParam("{"); 
+    QString order_idPathParam("{");
     order_idPathParam.append("orderId").append("}");
     fullPath.replace(order_idPathParam, QUrl::toPercentEncoding(::OpenAPI::toStringValue(order_id)));
     
     OAIHttpRequestWorker *worker = new OAIHttpRequestWorker();
-    worker->setTimeOut(timeout);    
+    worker->setTimeOut(timeout);
     OAIHttpRequestInput input(fullPath, "DELETE");
 
 
@@ -105,7 +105,7 @@ OAIStoreApi::getInventory() {
     fullPath.append(this->host).append(this->basePath).append("/store/inventory");
     
     OAIHttpRequestWorker *worker = new OAIHttpRequestWorker();
-    worker->setTimeOut(timeout);    
+    worker->setTimeOut(timeout);
     OAIHttpRequestInput input(fullPath, "GET");
 
 
@@ -158,12 +158,12 @@ void
 OAIStoreApi::getOrderById(const qint64& order_id) {
     QString fullPath;
     fullPath.append(this->host).append(this->basePath).append("/store/order/{orderId}");
-    QString order_idPathParam("{"); 
+    QString order_idPathParam("{");
     order_idPathParam.append("orderId").append("}");
     fullPath.replace(order_idPathParam, QUrl::toPercentEncoding(::OpenAPI::toStringValue(order_id)));
     
     OAIHttpRequestWorker *worker = new OAIHttpRequestWorker();
-    worker->setTimeOut(timeout);    
+    worker->setTimeOut(timeout);
     OAIHttpRequestInput input(fullPath, "GET");
 
 
@@ -209,7 +209,7 @@ OAIStoreApi::placeOrder(const OAIOrder& body) {
     fullPath.append(this->host).append(this->basePath).append("/store/order");
     
     OAIHttpRequestWorker *worker = new OAIHttpRequestWorker();
-    worker->setTimeOut(timeout);    
+    worker->setTimeOut(timeout);
     OAIHttpRequestInput input(fullPath, "POST");
 
     
diff --git a/samples/client/petstore/cpp-qt5/client/OAIStoreApi.h b/samples/client/petstore/cpp-qt5/client/OAIStoreApi.h
index e532321dcd..2f9d41b998 100644
--- a/samples/client/petstore/cpp-qt5/client/OAIStoreApi.h
+++ b/samples/client/petstore/cpp-qt5/client/OAIStoreApi.h
@@ -35,7 +35,7 @@ public:
     void setHost(const QString& host);
     void setApiTimeOutMs(const int tout);
     void addHeaders(const QString& key, const QString& value);
-    
+
     void deleteOrder(const QString& order_id);
     void getInventory();
     void getOrderById(const qint64& order_id);
diff --git a/samples/client/petstore/cpp-qt5/client/OAITag.h b/samples/client/petstore/cpp-qt5/client/OAITag.h
index 497a021f08..1ea18b3867 100644
--- a/samples/client/petstore/cpp-qt5/client/OAITag.h
+++ b/samples/client/petstore/cpp-qt5/client/OAITag.h
@@ -49,7 +49,7 @@ public:
     void setName(const QString &name);
 
     
-    
+
     virtual bool isSet() const override;
     virtual bool isValid() const override;
 
diff --git a/samples/client/petstore/cpp-qt5/client/OAIUser.h b/samples/client/petstore/cpp-qt5/client/OAIUser.h
index 556de32258..f7dd6591ec 100644
--- a/samples/client/petstore/cpp-qt5/client/OAIUser.h
+++ b/samples/client/petstore/cpp-qt5/client/OAIUser.h
@@ -73,7 +73,7 @@ public:
     void setUserStatus(const qint32 &user_status);
 
     
-    
+
     virtual bool isSet() const override;
     virtual bool isValid() const override;
 
diff --git a/samples/client/petstore/cpp-qt5/client/OAIUserApi.cpp b/samples/client/petstore/cpp-qt5/client/OAIUserApi.cpp
index 36a418994f..57556eab78 100644
--- a/samples/client/petstore/cpp-qt5/client/OAIUserApi.cpp
+++ b/samples/client/petstore/cpp-qt5/client/OAIUserApi.cpp
@@ -57,7 +57,7 @@ OAIUserApi::createUser(const OAIUser& body) {
     fullPath.append(this->host).append(this->basePath).append("/user");
     
     OAIHttpRequestWorker *worker = new OAIHttpRequestWorker();
-    worker->setTimeOut(timeout);    
+    worker->setTimeOut(timeout);
     OAIHttpRequestInput input(fullPath, "POST");
 
     
@@ -106,7 +106,7 @@ OAIUserApi::createUsersWithArrayInput(const QList<OAIUser>& body) {
     fullPath.append(this->host).append(this->basePath).append("/user/createWithArray");
     
     OAIHttpRequestWorker *worker = new OAIHttpRequestWorker();
-    worker->setTimeOut(timeout);    
+    worker->setTimeOut(timeout);
     OAIHttpRequestInput input(fullPath, "POST");
 
     
@@ -156,7 +156,7 @@ OAIUserApi::createUsersWithListInput(const QList<OAIUser>& body) {
     fullPath.append(this->host).append(this->basePath).append("/user/createWithList");
     
     OAIHttpRequestWorker *worker = new OAIHttpRequestWorker();
-    worker->setTimeOut(timeout);    
+    worker->setTimeOut(timeout);
     OAIHttpRequestInput input(fullPath, "POST");
 
     
@@ -204,12 +204,12 @@ void
 OAIUserApi::deleteUser(const QString& username) {
     QString fullPath;
     fullPath.append(this->host).append(this->basePath).append("/user/{username}");
-    QString usernamePathParam("{"); 
+    QString usernamePathParam("{");
     usernamePathParam.append("username").append("}");
     fullPath.replace(usernamePathParam, QUrl::toPercentEncoding(::OpenAPI::toStringValue(username)));
     
     OAIHttpRequestWorker *worker = new OAIHttpRequestWorker();
-    worker->setTimeOut(timeout);    
+    worker->setTimeOut(timeout);
     OAIHttpRequestInput input(fullPath, "DELETE");
 
 
@@ -252,12 +252,12 @@ void
 OAIUserApi::getUserByName(const QString& username) {
     QString fullPath;
     fullPath.append(this->host).append(this->basePath).append("/user/{username}");
-    QString usernamePathParam("{"); 
+    QString usernamePathParam("{");
     usernamePathParam.append("username").append("}");
     fullPath.replace(usernamePathParam, QUrl::toPercentEncoding(::OpenAPI::toStringValue(username)));
     
     OAIHttpRequestWorker *worker = new OAIHttpRequestWorker();
-    worker->setTimeOut(timeout);    
+    worker->setTimeOut(timeout);
     OAIHttpRequestInput input(fullPath, "GET");
 
 
@@ -319,7 +319,7 @@ OAIUserApi::loginUser(const QString& username, const QString& password) {
         .append(QUrl::toPercentEncoding(::OpenAPI::toStringValue(password)));
     
     OAIHttpRequestWorker *worker = new OAIHttpRequestWorker();
-    worker->setTimeOut(timeout);    
+    worker->setTimeOut(timeout);
     OAIHttpRequestInput input(fullPath, "GET");
 
 
@@ -347,7 +347,7 @@ OAIUserApi::loginUserCallback(OAIHttpRequestWorker * worker) {
     else {
         msg = "Error: " + worker->error_str;
     }
-    QString output;  
+    QString output;
     ::OpenAPI::fromStringValue(QString(worker->response), output);
     worker->deleteLater();
 
@@ -366,7 +366,7 @@ OAIUserApi::logoutUser() {
     fullPath.append(this->host).append(this->basePath).append("/user/logout");
     
     OAIHttpRequestWorker *worker = new OAIHttpRequestWorker();
-    worker->setTimeOut(timeout);    
+    worker->setTimeOut(timeout);
     OAIHttpRequestInput input(fullPath, "GET");
 
 
@@ -409,12 +409,12 @@ void
 OAIUserApi::updateUser(const QString& username, const OAIUser& body) {
     QString fullPath;
     fullPath.append(this->host).append(this->basePath).append("/user/{username}");
-    QString usernamePathParam("{"); 
+    QString usernamePathParam("{");
     usernamePathParam.append("username").append("}");
     fullPath.replace(usernamePathParam, QUrl::toPercentEncoding(::OpenAPI::toStringValue(username)));
     
     OAIHttpRequestWorker *worker = new OAIHttpRequestWorker();
-    worker->setTimeOut(timeout);    
+    worker->setTimeOut(timeout);
     OAIHttpRequestInput input(fullPath, "PUT");
 
     
diff --git a/samples/client/petstore/cpp-qt5/client/OAIUserApi.h b/samples/client/petstore/cpp-qt5/client/OAIUserApi.h
index d95814e071..454210caa6 100644
--- a/samples/client/petstore/cpp-qt5/client/OAIUserApi.h
+++ b/samples/client/petstore/cpp-qt5/client/OAIUserApi.h
@@ -35,7 +35,7 @@ public:
     void setHost(const QString& host);
     void setApiTimeOutMs(const int tout);
     void addHeaders(const QString& key, const QString& value);
-    
+
     void createUser(const OAIUser& body);
     void createUsersWithArrayInput(const QList<OAIUser>& body);
     void createUsersWithListInput(const QList<OAIUser>& body);
diff --git a/samples/client/petstore/cpp-qt5/client/client.pri b/samples/client/petstore/cpp-qt5/client/client.pri
index c2b0a272a1..ca6c9b5524 100644
--- a/samples/client/petstore/cpp-qt5/client/client.pri
+++ b/samples/client/petstore/cpp-qt5/client/client.pri
@@ -16,7 +16,7 @@ HEADERS += \
     $${PWD}/OAIHelpers.h \
     $${PWD}/OAIHttpRequest.h \
     $${PWD}/OAIObject.h
-    $${PWD}/OAIEnum.h    
+    $${PWD}/OAIEnum.h
 
 SOURCES += \
 # Models

From 5cba55f8fbd196a9d6754a5136e046b5089e0d47 Mon Sep 17 00:00:00 2001
From: Daiki Matsudate <d.matsudate@gmail.com>
Date: Mon, 22 Jul 2019 17:12:34 +0900
Subject: [PATCH 34/62] [Swift4] Introduce XcodeGen (#3396)

* add XcodeGen.mustache

* generate code

* add dependencies
---
 bin/swift4-petstore-objcCompatible.sh         |  10 +
 bin/swift4-petstore-promisekit.sh             |  10 +
 bin/swift4-petstore-rxswift.sh                |  10 +
 bin/swift4-petstore-unwrapRequired.sh         |  10 +
 bin/swift4-petstore.sh                        |  10 +
 bin/swift4-test.sh                            |  10 +
 .../codegen/languages/Swift4Codegen.java      |   3 +
 .../main/resources/swift4/XcodeGen.mustache   |  17 +
 .../swift4/default/.openapi-generator/VERSION |   2 +-
 .../client/petstore/swift4/default/Info.plist |  22 +
 .../PetstoreClient.xcodeproj/project.pbxproj  | 569 ++++++++++++++++
 .../contents.xcworkspacedata                  |   7 +
 .../xcshareddata/IDEWorkspaceChecks.plist     |   8 +
 .../xcschemes/PetstoreClient.xcscheme         |  96 +++
 .../Classes/OpenAPIs/APIHelper.swift          |  11 +-
 .../Classes/OpenAPIs/APIs.swift               |  14 +-
 .../OpenAPIs/APIs/AnotherFakeAPI.swift        |   4 +-
 .../Classes/OpenAPIs/APIs/FakeAPI.swift       |  56 +-
 .../APIs/FakeClassnameTags123API.swift        |   4 +-
 .../Classes/OpenAPIs/APIs/PetAPI.swift        |  48 +-
 .../Classes/OpenAPIs/APIs/StoreAPI.swift      |  26 +-
 .../Classes/OpenAPIs/APIs/UserAPI.swift       |  36 +-
 .../OpenAPIs/AlamofireImplementations.swift   |  25 +-
 .../Classes/OpenAPIs/CodableHelper.swift      |   4 +-
 .../Classes/OpenAPIs/Configuration.swift      |   6 +-
 .../Classes/OpenAPIs/Extensions.swift         |  18 +-
 .../Classes/OpenAPIs/JSONEncodingHelper.swift |   4 +-
 .../Classes/OpenAPIs/Models.swift             |   2 +-
 .../Models/AdditionalPropertiesClass.swift    |  12 +-
 .../Classes/OpenAPIs/Models/Animal.swift      |   4 -
 .../Classes/OpenAPIs/Models/AnimalFarm.swift  |   1 -
 .../Classes/OpenAPIs/Models/ApiResponse.swift |   4 -
 .../Models/ArrayOfArrayOfNumberOnly.swift     |   6 +-
 .../OpenAPIs/Models/ArrayOfNumberOnly.swift   |   6 +-
 .../Classes/OpenAPIs/Models/ArrayTest.swift   |   6 +-
 .../OpenAPIs/Models/Capitalization.swift      |   6 +-
 .../Classes/OpenAPIs/Models/Cat.swift         |   4 -
 .../Classes/OpenAPIs/Models/CatAllOf.swift    |  18 +
 .../Classes/OpenAPIs/Models/Category.swift    |   4 -
 .../Classes/OpenAPIs/Models/ClassModel.swift  |   3 -
 .../Classes/OpenAPIs/Models/Client.swift      |   4 -
 .../Classes/OpenAPIs/Models/Dog.swift         |   4 -
 .../Classes/OpenAPIs/Models/DogAllOf.swift    |  18 +
 .../Classes/OpenAPIs/Models/EnumArrays.swift  |   6 +-
 .../Classes/OpenAPIs/Models/EnumClass.swift   |   1 -
 .../Classes/OpenAPIs/Models/EnumTest.swift    |   6 +-
 .../Classes/OpenAPIs/Models/File.swift        |   3 -
 .../OpenAPIs/Models/FileSchemaTestClass.swift |   4 -
 .../Classes/OpenAPIs/Models/FormatTest.swift  |   4 -
 .../OpenAPIs/Models/HasOnlyReadOnly.swift     |   4 -
 .../Classes/OpenAPIs/Models/List.swift        |   6 +-
 .../Classes/OpenAPIs/Models/MapTest.swift     |  14 +-
 ...opertiesAndAdditionalPropertiesClass.swift |   8 +-
 .../OpenAPIs/Models/Model200Response.swift    |   5 +-
 .../Classes/OpenAPIs/Models/Name.swift        |   5 +-
 .../Classes/OpenAPIs/Models/NumberOnly.swift  |   6 +-
 .../Classes/OpenAPIs/Models/Order.swift       |   4 -
 .../OpenAPIs/Models/OuterComposite.swift      |   6 +-
 .../Classes/OpenAPIs/Models/OuterEnum.swift   |   1 -
 .../Classes/OpenAPIs/Models/Pet.swift         |   4 -
 .../OpenAPIs/Models/ReadOnlyFirst.swift       |   4 -
 .../Classes/OpenAPIs/Models/Return.swift      |   5 +-
 .../OpenAPIs/Models/SpecialModelName.swift    |   6 +-
 .../OpenAPIs/Models/StringBooleanMap.swift    |   8 +-
 .../Classes/OpenAPIs/Models/Tag.swift         |   4 -
 .../OpenAPIs/Models/TypeHolderDefault.swift   |   6 +-
 .../OpenAPIs/Models/TypeHolderExample.swift   |   6 +-
 .../Classes/OpenAPIs/Models/User.swift        |   4 -
 .../client/petstore/swift4/default/README.md  |   2 +
 .../Pods/Alamofire/Source/Alamofire.swift     |  27 +-
 .../Alamofire/Source/MultipartFormData.swift  |   6 +-
 .../Source/NetworkReachabilityManager.swift   |   6 +-
 .../Alamofire/Source/ParameterEncoding.swift  |   3 +-
 .../Pods/Alamofire/Source/Request.swift       |   6 +-
 .../Pods/Alamofire/Source/Response.swift      |  12 +-
 .../Source/ResponseSerialization.swift        |  54 +-
 .../Alamofire/Source/ServerTrustPolicy.swift  |   1 -
 .../Alamofire/Source/SessionDelegate.swift    |  36 +-
 .../Alamofire/Source/SessionManager.swift     |  39 +-
 .../Pods/Alamofire/Source/TaskDelegate.swift  |  30 +-
 .../Pods/Alamofire/Source/Timeline.swift      |   3 +-
 .../Pods/Alamofire/Source/Validation.swift    |   6 +-
 .../SwaggerClient/AppDelegate.swift           |   3 -
 .../SwaggerClient/ViewController.swift        |   2 -
 .../SwaggerClientTests/DateFormatTests.swift  |  38 +-
 .../SwaggerClientTests/PetAPITests.swift      |  30 +-
 .../SwaggerClientTests/StoreAPITests.swift    |  26 +-
 .../SwaggerClientTests/UserAPITests.swift     |  22 +-
 .../petstore/swift4/default/docs/CatAllOf.md  |  10 +
 .../petstore/swift4/default/docs/DogAllOf.md  |  10 +
 .../petstore/swift4/default/docs/UserAPI.md   |   4 +-
 .../petstore/swift4/default/project.yml       |  15 +
 .../objcCompatible/.openapi-generator/VERSION |   2 +-
 .../petstore/swift4/objcCompatible/Info.plist |  22 +
 .../PetstoreClient.xcodeproj/project.pbxproj  | 601 +++++++++++++++++
 .../contents.xcworkspacedata                  |   7 +
 .../xcschemes/PetstoreClient.xcscheme         |  96 +++
 .../Classes/OpenAPIs/APIHelper.swift          |  11 +-
 .../Classes/OpenAPIs/APIs.swift               |  14 +-
 .../OpenAPIs/APIs/AnotherFakeAPI.swift        |   4 +-
 .../Classes/OpenAPIs/APIs/FakeAPI.swift       |  58 +-
 .../APIs/FakeClassnameTags123API.swift        |   4 +-
 .../Classes/OpenAPIs/APIs/PetAPI.swift        |  48 +-
 .../Classes/OpenAPIs/APIs/StoreAPI.swift      |  26 +-
 .../Classes/OpenAPIs/APIs/UserAPI.swift       |  36 +-
 .../OpenAPIs/AlamofireImplementations.swift   |  25 +-
 .../Classes/OpenAPIs/CodableHelper.swift      |   4 +-
 .../Classes/OpenAPIs/Configuration.swift      |   6 +-
 .../Classes/OpenAPIs/Extensions.swift         |  18 +-
 .../Classes/OpenAPIs/JSONEncodingHelper.swift |   4 +-
 .../Classes/OpenAPIs/Models.swift             |   2 +-
 .../Models/AdditionalPropertiesAnyType.swift  |   7 +-
 .../Models/AdditionalPropertiesArray.swift    |   7 +-
 .../Models/AdditionalPropertiesBoolean.swift  |   7 +-
 .../Models/AdditionalPropertiesClass.swift    |  24 +-
 .../Models/AdditionalPropertiesInteger.swift  |   7 +-
 .../Models/AdditionalPropertiesNumber.swift   |   7 +-
 .../Models/AdditionalPropertiesObject.swift   |   7 +-
 .../Models/AdditionalPropertiesString.swift   |   7 +-
 .../Classes/OpenAPIs/Models/Animal.swift      |   4 -
 .../Classes/OpenAPIs/Models/AnimalFarm.swift  |   1 -
 .../Classes/OpenAPIs/Models/ApiResponse.swift |   4 -
 .../Models/ArrayOfArrayOfNumberOnly.swift     |   6 +-
 .../OpenAPIs/Models/ArrayOfNumberOnly.swift   |   6 +-
 .../Classes/OpenAPIs/Models/ArrayTest.swift   |   6 +-
 .../OpenAPIs/Models/Capitalization.swift      |   6 +-
 .../Classes/OpenAPIs/Models/Cat.swift         |   4 -
 .../Classes/OpenAPIs/Models/CatAllOf.swift    |  18 +
 .../Classes/OpenAPIs/Models/Category.swift    |   6 +-
 .../Classes/OpenAPIs/Models/ClassModel.swift  |   3 -
 .../Classes/OpenAPIs/Models/Client.swift      |   4 -
 .../Classes/OpenAPIs/Models/Dog.swift         |   4 -
 .../Classes/OpenAPIs/Models/DogAllOf.swift    |  18 +
 .../Classes/OpenAPIs/Models/EnumArrays.swift  |   6 +-
 .../Classes/OpenAPIs/Models/EnumClass.swift   |   1 -
 .../Classes/OpenAPIs/Models/EnumTest.swift    |   6 +-
 .../Classes/OpenAPIs/Models/File.swift        |   3 -
 .../OpenAPIs/Models/FileSchemaTestClass.swift |   4 -
 .../Classes/OpenAPIs/Models/FormatTest.swift  |   4 -
 .../OpenAPIs/Models/HasOnlyReadOnly.swift     |   4 -
 .../Classes/OpenAPIs/Models/List.swift        |   6 +-
 .../Classes/OpenAPIs/Models/MapTest.swift     |  16 +-
 ...opertiesAndAdditionalPropertiesClass.swift |   8 +-
 .../OpenAPIs/Models/Model200Response.swift    |   5 +-
 .../Classes/OpenAPIs/Models/Name.swift        |   5 +-
 .../Classes/OpenAPIs/Models/NumberOnly.swift  |   6 +-
 .../Classes/OpenAPIs/Models/Order.swift       |   6 +-
 .../OpenAPIs/Models/OuterComposite.swift      |   6 +-
 .../Classes/OpenAPIs/Models/OuterEnum.swift   |   1 -
 .../Classes/OpenAPIs/Models/Pet.swift         |   6 +-
 .../OpenAPIs/Models/ReadOnlyFirst.swift       |   4 -
 .../Classes/OpenAPIs/Models/Return.swift      |   5 +-
 .../OpenAPIs/Models/SpecialModelName.swift    |   6 +-
 .../OpenAPIs/Models/StringBooleanMap.swift    |   8 +-
 .../Classes/OpenAPIs/Models/Tag.swift         |   6 +-
 .../OpenAPIs/Models/TypeHolderDefault.swift   |   6 +-
 .../OpenAPIs/Models/TypeHolderExample.swift   |   6 +-
 .../Classes/OpenAPIs/Models/User.swift        |   6 +-
 .../Classes/OpenAPIs/Models/XmlItem.swift     |   6 +-
 .../petstore/swift4/objcCompatible/README.md  |   2 +
 .../swift4/objcCompatible/docs/CatAllOf.md    |  10 +
 .../swift4/objcCompatible/docs/DogAllOf.md    |  10 +
 .../swift4/objcCompatible/docs/UserAPI.md     |   4 +-
 .../swift4/objcCompatible/project.yml         |  15 +
 .../promisekit/.openapi-generator/VERSION     |   2 +-
 .../petstore/swift4/promisekit/Info.plist     |  22 +
 .../PetstoreClient.xcodeproj/project.pbxproj  | 577 +++++++++++++++++
 .../contents.xcworkspacedata                  |   7 +
 .../xcschemes/PetstoreClient.xcscheme         |  96 +++
 .../Classes/OpenAPIs/APIHelper.swift          |  11 +-
 .../Classes/OpenAPIs/APIs.swift               |  14 +-
 .../OpenAPIs/APIs/AnotherFakeAPI.swift        |   2 -
 .../Classes/OpenAPIs/APIs/FakeAPI.swift       |  44 +-
 .../APIs/FakeClassnameTags123API.swift        |   2 -
 .../Classes/OpenAPIs/APIs/PetAPI.swift        |  38 +-
 .../Classes/OpenAPIs/APIs/StoreAPI.swift      |  22 +-
 .../Classes/OpenAPIs/APIs/UserAPI.swift       |  24 +-
 .../OpenAPIs/AlamofireImplementations.swift   |  25 +-
 .../Classes/OpenAPIs/CodableHelper.swift      |   4 +-
 .../Classes/OpenAPIs/Configuration.swift      |   6 +-
 .../Classes/OpenAPIs/Extensions.swift         |  18 +-
 .../Classes/OpenAPIs/JSONEncodingHelper.swift |   4 +-
 .../Classes/OpenAPIs/Models.swift             |   2 +-
 .../Models/AdditionalPropertiesClass.swift    |  12 +-
 .../Classes/OpenAPIs/Models/Animal.swift      |   4 -
 .../Classes/OpenAPIs/Models/AnimalFarm.swift  |   1 -
 .../Classes/OpenAPIs/Models/ApiResponse.swift |   4 -
 .../Models/ArrayOfArrayOfNumberOnly.swift     |   6 +-
 .../OpenAPIs/Models/ArrayOfNumberOnly.swift   |   6 +-
 .../Classes/OpenAPIs/Models/ArrayTest.swift   |   6 +-
 .../OpenAPIs/Models/Capitalization.swift      |   6 +-
 .../Classes/OpenAPIs/Models/Cat.swift         |   4 -
 .../Classes/OpenAPIs/Models/CatAllOf.swift    |  18 +
 .../Classes/OpenAPIs/Models/Category.swift    |   4 -
 .../Classes/OpenAPIs/Models/ClassModel.swift  |   3 -
 .../Classes/OpenAPIs/Models/Client.swift      |   4 -
 .../Classes/OpenAPIs/Models/Dog.swift         |   4 -
 .../Classes/OpenAPIs/Models/DogAllOf.swift    |  18 +
 .../Classes/OpenAPIs/Models/EnumArrays.swift  |   6 +-
 .../Classes/OpenAPIs/Models/EnumClass.swift   |   1 -
 .../Classes/OpenAPIs/Models/EnumTest.swift    |   6 +-
 .../Classes/OpenAPIs/Models/File.swift        |   3 -
 .../OpenAPIs/Models/FileSchemaTestClass.swift |   4 -
 .../Classes/OpenAPIs/Models/FormatTest.swift  |   4 -
 .../OpenAPIs/Models/HasOnlyReadOnly.swift     |   4 -
 .../Classes/OpenAPIs/Models/List.swift        |   6 +-
 .../Classes/OpenAPIs/Models/MapTest.swift     |  14 +-
 ...opertiesAndAdditionalPropertiesClass.swift |   8 +-
 .../OpenAPIs/Models/Model200Response.swift    |   5 +-
 .../Classes/OpenAPIs/Models/Name.swift        |   5 +-
 .../Classes/OpenAPIs/Models/NumberOnly.swift  |   6 +-
 .../Classes/OpenAPIs/Models/Order.swift       |   4 -
 .../OpenAPIs/Models/OuterComposite.swift      |   6 +-
 .../Classes/OpenAPIs/Models/OuterEnum.swift   |   1 -
 .../Classes/OpenAPIs/Models/Pet.swift         |   4 -
 .../OpenAPIs/Models/ReadOnlyFirst.swift       |   4 -
 .../Classes/OpenAPIs/Models/Return.swift      |   5 +-
 .../OpenAPIs/Models/SpecialModelName.swift    |   6 +-
 .../OpenAPIs/Models/StringBooleanMap.swift    |   8 +-
 .../Classes/OpenAPIs/Models/Tag.swift         |   4 -
 .../OpenAPIs/Models/TypeHolderDefault.swift   |   6 +-
 .../OpenAPIs/Models/TypeHolderExample.swift   |   6 +-
 .../Classes/OpenAPIs/Models/User.swift        |   4 -
 .../Classes/OpenAPIs/Models/XmlItem.swift     |   6 +-
 .../petstore/swift4/promisekit/README.md      |   2 +
 .../Pods/Alamofire/Source/Alamofire.swift     |  27 +-
 .../Alamofire/Source/MultipartFormData.swift  |   6 +-
 .../Source/NetworkReachabilityManager.swift   |   6 +-
 .../Alamofire/Source/ParameterEncoding.swift  |   3 +-
 .../Pods/Alamofire/Source/Request.swift       |   6 +-
 .../Pods/Alamofire/Source/Response.swift      |  12 +-
 .../Source/ResponseSerialization.swift        |  54 +-
 .../Alamofire/Source/ServerTrustPolicy.swift  |   1 -
 .../Alamofire/Source/SessionDelegate.swift    |  36 +-
 .../Alamofire/Source/SessionManager.swift     |  39 +-
 .../Pods/Alamofire/Source/TaskDelegate.swift  |  30 +-
 .../Pods/Alamofire/Source/Timeline.swift      |   3 +-
 .../Pods/Alamofire/Source/Validation.swift    |   6 +-
 .../Pods/PromiseKit/Sources/AnyPromise.swift  |   3 +-
 .../Pods/PromiseKit/Sources/Error.swift       |   5 +-
 .../Pods/PromiseKit/Sources/Promise.swift     |  20 +-
 .../Pods/PromiseKit/Sources/State.swift       |   6 +-
 .../Pods/PromiseKit/Sources/Zalgo.swift       |   1 -
 .../Pods/PromiseKit/Sources/join.swift        |   4 +-
 .../Pods/PromiseKit/Sources/when.swift        |   8 +-
 .../Pods/PromiseKit/Sources/wrap.swift        |   2 +-
 .../SwaggerClient/AppDelegate.swift           |   3 -
 .../SwaggerClient/ViewController.swift        |   2 -
 .../SwaggerClientTests/PetAPITests.swift      |  16 +-
 .../SwaggerClientTests/StoreAPITests.swift    |  12 +-
 .../SwaggerClientTests/UserAPITests.swift     |   6 +-
 .../swift4/promisekit/docs/CatAllOf.md        |  10 +
 .../swift4/promisekit/docs/DogAllOf.md        |  10 +
 .../swift4/promisekit/docs/UserAPI.md         |   4 +-
 .../petstore/swift4/promisekit/project.yml    |  16 +
 .../swift4/rxswift/.openapi-generator/VERSION |   2 +-
 .../client/petstore/swift4/rxswift/Info.plist |  22 +
 .../PetstoreClient.xcodeproj/project.pbxproj  | 605 ++++++++++++++++++
 .../contents.xcworkspacedata                  |   7 +
 .../xcschemes/PetstoreClient.xcscheme         |  96 +++
 .../Classes/OpenAPIs/APIHelper.swift          |  11 +-
 .../Classes/OpenAPIs/APIs.swift               |  14 +-
 .../OpenAPIs/APIs/AnotherFakeAPI.swift        |   2 -
 .../Classes/OpenAPIs/APIs/FakeAPI.swift       |  34 +-
 .../APIs/FakeClassnameTags123API.swift        |   2 -
 .../Classes/OpenAPIs/APIs/PetAPI.swift        |  30 +-
 .../Classes/OpenAPIs/APIs/StoreAPI.swift      |  20 +-
 .../Classes/OpenAPIs/APIs/UserAPI.swift       |  20 +-
 .../OpenAPIs/AlamofireImplementations.swift   |  25 +-
 .../Classes/OpenAPIs/CodableHelper.swift      |   4 +-
 .../Classes/OpenAPIs/Configuration.swift      |   6 +-
 .../Classes/OpenAPIs/Extensions.swift         |  18 +-
 .../Classes/OpenAPIs/JSONEncodingHelper.swift |   4 +-
 .../Classes/OpenAPIs/Models.swift             |   2 +-
 .../Models/AdditionalPropertiesAnyType.swift  |   7 +-
 .../Models/AdditionalPropertiesArray.swift    |   7 +-
 .../Models/AdditionalPropertiesBoolean.swift  |   7 +-
 .../Models/AdditionalPropertiesClass.swift    |  12 +-
 .../Models/AdditionalPropertiesInteger.swift  |   7 +-
 .../Models/AdditionalPropertiesNumber.swift   |   7 +-
 .../Models/AdditionalPropertiesObject.swift   |   7 +-
 .../Models/AdditionalPropertiesString.swift   |   7 +-
 .../Classes/OpenAPIs/Models/Animal.swift      |   4 -
 .../Classes/OpenAPIs/Models/AnimalFarm.swift  |   1 -
 .../Classes/OpenAPIs/Models/ApiResponse.swift |   4 -
 .../Models/ArrayOfArrayOfNumberOnly.swift     |   6 +-
 .../OpenAPIs/Models/ArrayOfNumberOnly.swift   |   6 +-
 .../Classes/OpenAPIs/Models/ArrayTest.swift   |   6 +-
 .../OpenAPIs/Models/Capitalization.swift      |   6 +-
 .../Classes/OpenAPIs/Models/Cat.swift         |   4 -
 .../Classes/OpenAPIs/Models/CatAllOf.swift    |  18 +
 .../Classes/OpenAPIs/Models/Category.swift    |   4 -
 .../Classes/OpenAPIs/Models/ClassModel.swift  |   3 -
 .../Classes/OpenAPIs/Models/Client.swift      |   4 -
 .../Classes/OpenAPIs/Models/Dog.swift         |   4 -
 .../Classes/OpenAPIs/Models/DogAllOf.swift    |  18 +
 .../Classes/OpenAPIs/Models/EnumArrays.swift  |   6 +-
 .../Classes/OpenAPIs/Models/EnumClass.swift   |   1 -
 .../Classes/OpenAPIs/Models/EnumTest.swift    |   6 +-
 .../Classes/OpenAPIs/Models/File.swift        |   3 -
 .../OpenAPIs/Models/FileSchemaTestClass.swift |   4 -
 .../Classes/OpenAPIs/Models/FormatTest.swift  |   4 -
 .../OpenAPIs/Models/HasOnlyReadOnly.swift     |   4 -
 .../Classes/OpenAPIs/Models/List.swift        |   6 +-
 .../Classes/OpenAPIs/Models/MapTest.swift     |  14 +-
 ...opertiesAndAdditionalPropertiesClass.swift |   8 +-
 .../OpenAPIs/Models/Model200Response.swift    |   5 +-
 .../Classes/OpenAPIs/Models/Name.swift        |   5 +-
 .../Classes/OpenAPIs/Models/NumberOnly.swift  |   6 +-
 .../Classes/OpenAPIs/Models/Order.swift       |   4 -
 .../OpenAPIs/Models/OuterComposite.swift      |   6 +-
 .../Classes/OpenAPIs/Models/OuterEnum.swift   |   1 -
 .../Classes/OpenAPIs/Models/Pet.swift         |   4 -
 .../OpenAPIs/Models/ReadOnlyFirst.swift       |   4 -
 .../Classes/OpenAPIs/Models/Return.swift      |   5 +-
 .../OpenAPIs/Models/SpecialModelName.swift    |   6 +-
 .../OpenAPIs/Models/StringBooleanMap.swift    |   8 +-
 .../Classes/OpenAPIs/Models/Tag.swift         |   4 -
 .../OpenAPIs/Models/TypeHolderDefault.swift   |   6 +-
 .../OpenAPIs/Models/TypeHolderExample.swift   |   6 +-
 .../Classes/OpenAPIs/Models/User.swift        |   4 -
 .../Classes/OpenAPIs/Models/XmlItem.swift     |   6 +-
 .../client/petstore/swift4/rxswift/README.md  |   2 +
 .../Pods/Alamofire/Source/Alamofire.swift     |  27 +-
 .../Alamofire/Source/MultipartFormData.swift  |   6 +-
 .../Source/NetworkReachabilityManager.swift   |   6 +-
 .../Alamofire/Source/ParameterEncoding.swift  |   3 +-
 .../Pods/Alamofire/Source/Request.swift       |   6 +-
 .../Pods/Alamofire/Source/Response.swift      |  12 +-
 .../Source/ResponseSerialization.swift        |  54 +-
 .../Alamofire/Source/ServerTrustPolicy.swift  |   1 -
 .../Alamofire/Source/SessionDelegate.swift    |  36 +-
 .../Alamofire/Source/SessionManager.swift     |  39 +-
 .../Pods/Alamofire/Source/TaskDelegate.swift  |  30 +-
 .../Pods/Alamofire/Source/Timeline.swift      |   3 +-
 .../Pods/Alamofire/Source/Validation.swift    |   6 +-
 .../Classes/OpenAPIs/APIHelper.swift          |  12 +-
 .../Classes/OpenAPIs/APIs.swift               |  14 +-
 .../OpenAPIs/APIs/AnotherFakeAPI.swift        |   4 +-
 .../Classes/OpenAPIs/APIs/FakeAPI.swift       |  64 +-
 .../APIs/FakeClassnameTags123API.swift        |   4 +-
 .../Classes/OpenAPIs/APIs/PetAPI.swift        |  50 +-
 .../Classes/OpenAPIs/APIs/StoreAPI.swift      |  32 +-
 .../Classes/OpenAPIs/APIs/UserAPI.swift       |  50 +-
 .../OpenAPIs/AlamofireImplementations.swift   |  29 +-
 .../Classes/OpenAPIs/CodableHelper.swift      |  10 +-
 .../Classes/OpenAPIs/Configuration.swift      |   6 +-
 .../Classes/OpenAPIs/Extensions.swift         |  20 +-
 .../OpenAPIs/JSONEncodableEncoding.swift      |   2 +-
 .../Classes/OpenAPIs/JSONEncodingHelper.swift |   8 +-
 .../Classes/OpenAPIs/Models.swift             |   4 +-
 .../Models/AdditionalPropertiesClass.swift    |  12 +-
 .../Classes/OpenAPIs/Models/Animal.swift      |   4 -
 .../Classes/OpenAPIs/Models/AnimalFarm.swift  |   1 -
 .../Classes/OpenAPIs/Models/ApiResponse.swift |   4 -
 .../Models/ArrayOfArrayOfNumberOnly.swift     |   6 +-
 .../OpenAPIs/Models/ArrayOfNumberOnly.swift   |   6 +-
 .../Classes/OpenAPIs/Models/ArrayTest.swift   |   6 +-
 .../OpenAPIs/Models/Capitalization.swift      |   6 +-
 .../Classes/OpenAPIs/Models/Cat.swift         |   4 -
 .../Classes/OpenAPIs/Models/Category.swift    |   6 +-
 .../Classes/OpenAPIs/Models/ClassModel.swift  |   3 -
 .../Classes/OpenAPIs/Models/Client.swift      |   4 -
 .../Classes/OpenAPIs/Models/Dog.swift         |   4 -
 .../Classes/OpenAPIs/Models/EnumArrays.swift  |   6 +-
 .../Classes/OpenAPIs/Models/EnumClass.swift   |   1 -
 .../Classes/OpenAPIs/Models/EnumTest.swift    |   6 +-
 .../Classes/OpenAPIs/Models/FormatTest.swift  |   4 -
 .../OpenAPIs/Models/HasOnlyReadOnly.swift     |   4 -
 .../Classes/OpenAPIs/Models/List.swift        |   6 +-
 .../Classes/OpenAPIs/Models/MapTest.swift     |  12 +-
 ...opertiesAndAdditionalPropertiesClass.swift |   8 +-
 .../OpenAPIs/Models/Model200Response.swift    |   5 +-
 .../Classes/OpenAPIs/Models/Name.swift        |   5 +-
 .../Classes/OpenAPIs/Models/NumberOnly.swift  |   6 +-
 .../Classes/OpenAPIs/Models/Order.swift       |   6 +-
 .../OpenAPIs/Models/OuterComposite.swift      |   6 +-
 .../Classes/OpenAPIs/Models/OuterEnum.swift   |   1 -
 .../Classes/OpenAPIs/Models/Pet.swift         |   6 +-
 .../OpenAPIs/Models/ReadOnlyFirst.swift       |   4 -
 .../Classes/OpenAPIs/Models/Return.swift      |   5 +-
 .../OpenAPIs/Models/SpecialModelName.swift    |   6 +-
 .../Classes/OpenAPIs/Models/Tag.swift         |   6 +-
 .../Classes/OpenAPIs/Models/User.swift        |   6 +-
 .../Pods/RxSwift/Platform/AtomicInt.swift     |   1 -
 .../RxSwift/Platform/DataStructures/Bag.swift |  24 +-
 .../DataStructures/InfiniteSequence.swift     |   6 +-
 .../DataStructures/PriorityQueue.swift        |   2 +-
 .../Platform/DataStructures/Queue.swift       |  36 +-
 .../RxSwift/Platform/DeprecationWarner.swift  |   9 +-
 .../RxSwift/Platform/Platform.Darwin.swift    |   5 +-
 .../RxSwift/Platform/Platform.Linux.swift     |   3 +-
 .../Pods/RxSwift/RxSwift/AnyObserver.swift    |  10 +-
 .../Pods/RxSwift/RxSwift/Cancelable.swift     |   2 +-
 .../RxSwift/Concurrency/AsyncLock.swift       |  23 +-
 .../RxSwift/RxSwift/Concurrency/Lock.swift    |   2 +-
 .../RxSwift/Concurrency/LockOwnerType.swift   |   2 +-
 .../Concurrency/SynchronizedDisposeType.swift |   2 +-
 .../Concurrency/SynchronizedOnType.swift      |   2 +-
 .../SynchronizedUnsubscribeType.swift         |   2 +-
 .../RxSwift/ConnectableObservableType.swift   |   2 +-
 .../Pods/RxSwift/RxSwift/Deprecated.swift     |   4 -
 .../Disposables/AnonymousDisposable.swift     |  12 +-
 .../Disposables/BinaryDisposable.swift        |   6 +-
 .../Disposables/BooleanDisposable.swift       |  10 +-
 .../Disposables/CompositeDisposable.swift     |  56 +-
 .../RxSwift/Disposables/Disposables.swift     |   1 -
 .../RxSwift/Disposables/DisposeBag.swift      |  14 +-
 .../RxSwift/Disposables/DisposeBase.swift     |   6 +-
 .../RxSwift/Disposables/NopDisposable.swift   |  10 +-
 .../Disposables/RefCountDisposable.swift      |  21 +-
 .../Disposables/ScheduledDisposable.swift     |   4 +-
 .../Disposables/SerialDisposable.swift        |  20 +-
 .../SingleAssignmentDisposable.swift          |   4 +-
 .../Pods/RxSwift/RxSwift/Errors.swift         |   4 +-
 .../Pods/RxSwift/RxSwift/Event.swift          |   7 +-
 .../RxSwift/RxSwift/Extensions/Bag+Rx.swift   |   3 +-
 .../RxSwift/RxSwift/GroupedObservable.swift   |   2 +-
 .../RxSwift/ImmediateSchedulerType.swift      |   6 +-
 .../Pods/RxSwift/RxSwift/Observable.swift     |  13 +-
 .../RxSwift/ObservableType+Extensions.swift   |  26 +-
 .../Pods/RxSwift/RxSwift/ObservableType.swift |   4 +-
 .../RxSwift/RxSwift/Observables/AddRef.swift  |  14 +-
 .../RxSwift/RxSwift/Observables/Amb.swift     |  46 +-
 .../RxSwift/RxSwift/Observables/AsMaybe.swift |   4 +-
 .../RxSwift/Observables/AsSingle.swift        |   7 +-
 .../RxSwift/RxSwift/Observables/Buffer.swift  |  49 +-
 .../RxSwift/RxSwift/Observables/Catch.swift   |  68 +-
 .../CombineLatest+Collection.swift            |  48 +-
 .../Observables/CombineLatest+arity.swift     |  16 -
 .../RxSwift/Observables/CombineLatest.swift   |  39 +-
 .../RxSwift/RxSwift/Observables/Concat.swift  |  23 +-
 .../RxSwift/RxSwift/Observables/Create.swift  |   6 +-
 .../RxSwift/Observables/Debounce.swift        |  14 +-
 .../RxSwift/RxSwift/Observables/Debug.swift   |  24 +-
 .../RxSwift/Observables/DefaultIfEmpty.swift  |  16 +-
 .../RxSwift/Observables/Deferred.swift        |  21 +-
 .../RxSwift/RxSwift/Observables/Delay.swift   |  43 +-
 .../Observables/DelaySubscription.swift       |  18 +-
 .../RxSwift/Observables/Dematerialize.swift   |   8 +-
 .../Observables/DistinctUntilChanged.swift    |  27 +-
 .../Pods/RxSwift/RxSwift/Observables/Do.swift |  29 +-
 .../RxSwift/Observables/ElementAt.swift       |  28 +-
 .../RxSwift/RxSwift/Observables/Empty.swift   |   4 +-
 .../RxSwift/Observables/Enumerated.swift      |   9 +-
 .../RxSwift/RxSwift/Observables/Error.swift   |   8 +-
 .../RxSwift/RxSwift/Observables/Filter.swift  |  19 +-
 .../RxSwift/RxSwift/Observables/First.swift   |   2 +-
 .../RxSwift/Observables/Generate.swift        |  28 +-
 .../RxSwift/RxSwift/Observables/GroupBy.swift |  37 +-
 .../RxSwift/RxSwift/Observables/Just.swift    |  14 +-
 .../RxSwift/RxSwift/Observables/Map.swift     |  17 +-
 .../RxSwift/Observables/Materialize.swift     |   6 +-
 .../RxSwift/RxSwift/Observables/Merge.swift   | 105 ++-
 .../RxSwift/Observables/Multicast.swift       |  60 +-
 .../RxSwift/RxSwift/Observables/Never.swift   |   4 +-
 .../RxSwift/Observables/ObserveOn.swift       |  62 +-
 .../RxSwift/Observables/Optional.swift        |  14 +-
 .../RxSwift/Observables/Producer.swift        |  17 +-
 .../RxSwift/RxSwift/Observables/Range.swift   |  19 +-
 .../RxSwift/RxSwift/Observables/Reduce.swift  |  24 +-
 .../RxSwift/RxSwift/Observables/Repeat.swift  |  16 +-
 .../RxSwift/Observables/RetryWhen.swift       |  43 +-
 .../RxSwift/RxSwift/Observables/Sample.swift  |  41 +-
 .../RxSwift/RxSwift/Observables/Scan.swift    |  27 +-
 .../RxSwift/Observables/Sequence.swift        |   9 +-
 .../Observables/ShareReplayScope.swift        |  32 +-
 .../RxSwift/Observables/SingleAsync.swift     |  17 +-
 .../RxSwift/RxSwift/Observables/Sink.swift    |  16 +-
 .../RxSwift/RxSwift/Observables/Skip.swift    |  51 +-
 .../RxSwift/Observables/SkipUntil.swift       |  44 +-
 .../RxSwift/Observables/SkipWhile.swift       |   6 +-
 .../RxSwift/Observables/StartWith.swift       |   4 +-
 .../RxSwift/Observables/SubscribeOn.swift     |  26 +-
 .../RxSwift/RxSwift/Observables/Switch.swift  |  52 +-
 .../RxSwift/Observables/SwitchIfEmpty.swift   |  29 +-
 .../RxSwift/RxSwift/Observables/Take.swift    |  60 +-
 .../RxSwift/Observables/TakeLast.swift        |  20 +-
 .../RxSwift/Observables/TakeUntil.swift       |  50 +-
 .../RxSwift/Observables/TakeWhile.swift       |  17 +-
 .../RxSwift/Observables/Throttle.swift        |  43 +-
 .../RxSwift/RxSwift/Observables/Timeout.swift |  55 +-
 .../RxSwift/RxSwift/Observables/Timer.swift   |  31 +-
 .../RxSwift/RxSwift/Observables/ToArray.swift |  15 +-
 .../RxSwift/RxSwift/Observables/Using.swift   |  27 +-
 .../RxSwift/RxSwift/Observables/Window.swift  |  69 +-
 .../RxSwift/Observables/WithLatestFrom.swift  |  39 +-
 .../RxSwift/Observables/Zip+Collection.swift  |  58 +-
 .../RxSwift/Observables/Zip+arity.swift       |  16 -
 .../RxSwift/RxSwift/Observables/Zip.swift     |  57 +-
 .../Pods/RxSwift/RxSwift/ObserverType.swift   |   6 +-
 .../RxSwift/Observers/AnonymousObserver.swift |  14 +-
 .../RxSwift/Observers/TailRecursiveSink.swift |  22 +-
 .../Pods/RxSwift/RxSwift/Rx.swift             |  10 +-
 .../Pods/RxSwift/RxSwift/RxMutableBox.swift   |   4 +-
 .../Pods/RxSwift/RxSwift/SchedulerType.swift  |  12 +-
 .../ConcurrentDispatchQueueScheduler.swift    |  12 +-
 .../Schedulers/ConcurrentMainScheduler.swift  |   4 +-
 .../Schedulers/CurrentThreadScheduler.swift   |  15 +-
 .../Schedulers/HistoricalScheduler.swift      |   2 +-
 .../HistoricalSchedulerTimeConverter.swift    |   2 +-
 .../Internal/DispatchQueueConfiguration.swift |   5 +-
 .../Schedulers/Internal/ScheduledItem.swift   |  11 +-
 .../Internal/ScheduledItemType.swift          |   4 +-
 .../RxSwift/Schedulers/MainScheduler.swift    |   2 +-
 .../Schedulers/OperationQueueScheduler.swift  |   7 +-
 .../Schedulers/RecursiveScheduler.swift       |  57 +-
 .../SchedulerServices+Emulation.swift         |   2 +-
 .../SerialDispatchQueueScheduler.swift        |  14 +-
 .../Schedulers/VirtualTimeScheduler.swift     |  25 +-
 .../RxSwift/Subjects/AsyncSubject.swift       |  18 +-
 .../RxSwift/Subjects/BehaviorSubject.swift    |  39 +-
 .../RxSwift/Subjects/PublishSubject.swift     |  34 +-
 .../RxSwift/Subjects/ReplaySubject.swift      |  76 +--
 .../RxSwift/Subjects/SubjectType.swift        |   6 +-
 .../RxSwift/Traits/Completable+AndThen.swift  |  15 +-
 .../RxSwift/RxSwift/Traits/Completable.swift  |  38 +-
 .../Pods/RxSwift/RxSwift/Traits/Maybe.swift   |  32 +-
 .../Traits/PrimitiveSequence+Zip+arity.swift  |  23 -
 .../RxSwift/Traits/PrimitiveSequence.swift    |  13 +-
 .../Pods/RxSwift/RxSwift/Traits/Single.swift  |  50 +-
 .../SwaggerClient/AppDelegate.swift           |   2 -
 .../SwaggerClient/ViewController.swift        |   1 -
 .../SwaggerClientTests/APIHelperTests.swift   |   6 +-
 .../SwaggerClientTests/PetAPITests.swift      |   4 +-
 .../SwaggerClientTests/StoreAPITests.swift    |   4 +-
 .../SwaggerClientTests/UserAPITests.swift     |   2 +-
 .../petstore/swift4/rxswift/docs/CatAllOf.md  |  10 +
 .../petstore/swift4/rxswift/docs/DogAllOf.md  |  10 +
 .../petstore/swift4/rxswift/docs/UserAPI.md   |   4 +-
 .../petstore/swift4/rxswift/project.yml       |  16 +
 .../unwrapRequired/.openapi-generator/VERSION |   2 +-
 .../petstore/swift4/unwrapRequired/Info.plist |  22 +
 .../PetstoreClient.xcodeproj/project.pbxproj  | 601 +++++++++++++++++
 .../contents.xcworkspacedata                  |   7 +
 .../xcschemes/PetstoreClient.xcscheme         |  96 +++
 .../Classes/OpenAPIs/APIHelper.swift          |  11 +-
 .../Classes/OpenAPIs/APIs.swift               |  14 +-
 .../OpenAPIs/APIs/AnotherFakeAPI.swift        |   4 +-
 .../Classes/OpenAPIs/APIs/FakeAPI.swift       |  56 +-
 .../APIs/FakeClassnameTags123API.swift        |   4 +-
 .../Classes/OpenAPIs/APIs/PetAPI.swift        |  48 +-
 .../Classes/OpenAPIs/APIs/StoreAPI.swift      |  26 +-
 .../Classes/OpenAPIs/APIs/UserAPI.swift       |  36 +-
 .../OpenAPIs/AlamofireImplementations.swift   |  25 +-
 .../Classes/OpenAPIs/CodableHelper.swift      |   4 +-
 .../Classes/OpenAPIs/Configuration.swift      |   6 +-
 .../Classes/OpenAPIs/Extensions.swift         |  18 +-
 .../Classes/OpenAPIs/JSONEncodingHelper.swift |   4 +-
 .../Classes/OpenAPIs/Models.swift             |   2 +-
 .../Models/AdditionalPropertiesAnyType.swift  |   7 +-
 .../Models/AdditionalPropertiesArray.swift    |   7 +-
 .../Models/AdditionalPropertiesBoolean.swift  |   7 +-
 .../Models/AdditionalPropertiesClass.swift    |  12 +-
 .../Models/AdditionalPropertiesInteger.swift  |   7 +-
 .../Models/AdditionalPropertiesNumber.swift   |   7 +-
 .../Models/AdditionalPropertiesObject.swift   |   7 +-
 .../Models/AdditionalPropertiesString.swift   |   7 +-
 .../Classes/OpenAPIs/Models/Animal.swift      |   4 -
 .../Classes/OpenAPIs/Models/AnimalFarm.swift  |   1 -
 .../Classes/OpenAPIs/Models/ApiResponse.swift |   4 -
 .../Models/ArrayOfArrayOfNumberOnly.swift     |   6 +-
 .../OpenAPIs/Models/ArrayOfNumberOnly.swift   |   6 +-
 .../Classes/OpenAPIs/Models/ArrayTest.swift   |   6 +-
 .../OpenAPIs/Models/Capitalization.swift      |   6 +-
 .../Classes/OpenAPIs/Models/Cat.swift         |   4 -
 .../Classes/OpenAPIs/Models/CatAllOf.swift    |  18 +
 .../Classes/OpenAPIs/Models/Category.swift    |   4 -
 .../Classes/OpenAPIs/Models/ClassModel.swift  |   3 -
 .../Classes/OpenAPIs/Models/Client.swift      |   4 -
 .../Classes/OpenAPIs/Models/Dog.swift         |   4 -
 .../Classes/OpenAPIs/Models/DogAllOf.swift    |  18 +
 .../Classes/OpenAPIs/Models/EnumArrays.swift  |   6 +-
 .../Classes/OpenAPIs/Models/EnumClass.swift   |   1 -
 .../Classes/OpenAPIs/Models/EnumTest.swift    |   6 +-
 .../Classes/OpenAPIs/Models/File.swift        |   3 -
 .../OpenAPIs/Models/FileSchemaTestClass.swift |   4 -
 .../Classes/OpenAPIs/Models/FormatTest.swift  |   4 -
 .../OpenAPIs/Models/HasOnlyReadOnly.swift     |   4 -
 .../Classes/OpenAPIs/Models/List.swift        |   6 +-
 .../Classes/OpenAPIs/Models/MapTest.swift     |  14 +-
 ...opertiesAndAdditionalPropertiesClass.swift |   8 +-
 .../OpenAPIs/Models/Model200Response.swift    |   5 +-
 .../Classes/OpenAPIs/Models/Name.swift        |   5 +-
 .../Classes/OpenAPIs/Models/NumberOnly.swift  |   6 +-
 .../Classes/OpenAPIs/Models/Order.swift       |   4 -
 .../OpenAPIs/Models/OuterComposite.swift      |   6 +-
 .../Classes/OpenAPIs/Models/OuterEnum.swift   |   1 -
 .../Classes/OpenAPIs/Models/Pet.swift         |   4 -
 .../OpenAPIs/Models/ReadOnlyFirst.swift       |   4 -
 .../Classes/OpenAPIs/Models/Return.swift      |   5 +-
 .../OpenAPIs/Models/SpecialModelName.swift    |   6 +-
 .../OpenAPIs/Models/StringBooleanMap.swift    |   8 +-
 .../Classes/OpenAPIs/Models/Tag.swift         |   4 -
 .../OpenAPIs/Models/TypeHolderDefault.swift   |   6 +-
 .../OpenAPIs/Models/TypeHolderExample.swift   |   6 +-
 .../Classes/OpenAPIs/Models/User.swift        |   4 -
 .../Classes/OpenAPIs/Models/XmlItem.swift     |   6 +-
 .../petstore/swift4/unwrapRequired/README.md  |   2 +
 .../swift4/unwrapRequired/docs/CatAllOf.md    |  10 +
 .../swift4/unwrapRequired/docs/DogAllOf.md    |  10 +
 .../swift4/unwrapRequired/docs/UserAPI.md     |   4 +-
 .../swift4/unwrapRequired/project.yml         |  15 +
 .../swift4/default/.openapi-generator/VERSION |   2 +-
 samples/client/test/swift4/default/Info.plist |  22 +
 samples/client/test/swift4/default/README.md  |  58 ++
 .../TestClient.xcodeproj/project.pbxproj      | 593 +++++++++++++++++
 .../contents.xcworkspacedata                  |   7 +
 .../xcschemes/TestClient.xcscheme             |  96 +++
 .../Classes/OpenAPIs/APIHelper.swift          |  17 +-
 .../TestClient/Classes/OpenAPIs/APIs.swift    |  14 +-
 .../Classes/OpenAPIs/APIs/Swift4TestAPI.swift |   8 +-
 .../OpenAPIs/AlamofireImplementations.swift   |  25 +-
 .../Classes/OpenAPIs/CodableHelper.swift      |   4 +-
 .../Classes/OpenAPIs/Configuration.swift      |   6 +-
 .../Classes/OpenAPIs/Extensions.swift         |  18 +-
 .../Classes/OpenAPIs/JSONEncodingHelper.swift |   4 +-
 .../TestClient/Classes/OpenAPIs/Models.swift  |   2 +-
 .../OpenAPIs/Models/AllPrimitives.swift       |   3 -
 .../Classes/OpenAPIs/Models/BaseCard.swift    |   3 -
 .../Classes/OpenAPIs/Models/ErrorInfo.swift   |   3 -
 .../OpenAPIs/Models/GetAllModelsResult.swift  |   3 -
 .../OpenAPIs/Models/ModelDoubleArray.swift    |   1 -
 .../OpenAPIs/Models/ModelErrorInfoArray.swift |   1 -
 .../OpenAPIs/Models/ModelStringArray.swift    |   1 -
 ...ModelWithIntAdditionalPropertiesOnly.swift |   7 +-
 ...ithPropertiesAndAdditionalProperties.swift |   6 +-
 ...elWithStringAdditionalPropertiesOnly.swift |   7 +-
 .../Classes/OpenAPIs/Models/PersonCard.swift  |   3 -
 .../OpenAPIs/Models/PersonCardAllOf.swift     |  20 +
 .../Classes/OpenAPIs/Models/PlaceCard.swift   |   3 -
 .../OpenAPIs/Models/PlaceCardAllOf.swift      |  20 +
 .../Classes/OpenAPIs/Models/SampleBase.swift  |   3 -
 .../OpenAPIs/Models/SampleSubClass.swift      |  10 +-
 .../OpenAPIs/Models/SampleSubClassAllOf.swift |  20 +
 .../Classes/OpenAPIs/Models/StringEnum.swift  |   1 -
 .../OpenAPIs/Models/VariableNameTest.swift    |   5 +-
 .../Classes/Swaggers/APIHelper.swift          |  12 +-
 .../TestClient/Classes/Swaggers/APIs.swift    |  14 +-
 .../Classes/Swaggers/APIs/Swift4TestAPI.swift |   9 +-
 .../Swaggers/AlamofireImplementations.swift   |  29 +-
 .../Classes/Swaggers/CodableHelper.swift      |  10 +-
 .../Classes/Swaggers/Configuration.swift      |   6 +-
 .../Classes/Swaggers/Extensions.swift         |  20 +-
 .../Swaggers/JSONEncodableEncoding.swift      |   2 +-
 .../Classes/Swaggers/JSONEncodingHelper.swift |   8 +-
 .../TestClient/Classes/Swaggers/Models.swift  |   4 +-
 .../Swaggers/Models/AllPrimitives.swift       |   3 -
 .../Classes/Swaggers/Models/BaseCard.swift    |   3 -
 .../Classes/Swaggers/Models/ErrorInfo.swift   |   3 -
 .../Swaggers/Models/GetAllModelsResult.swift  |   3 -
 .../Swaggers/Models/ModelDoubleArray.swift    |   1 -
 .../Swaggers/Models/ModelErrorInfoArray.swift |   1 -
 .../Swaggers/Models/ModelStringArray.swift    |   1 -
 ...ModelWithIntAdditionalPropertiesOnly.swift |   7 +-
 ...ithPropertiesAndAdditionalProperties.swift |   6 +-
 ...elWithStringAdditionalPropertiesOnly.swift |   7 +-
 .../Classes/Swaggers/Models/PersonCard.swift  |   3 -
 .../Classes/Swaggers/Models/PlaceCard.swift   |   3 -
 .../Classes/Swaggers/Models/SampleBase.swift  |   3 -
 .../Swaggers/Models/SampleSubClass.swift      |   3 -
 .../Classes/Swaggers/Models/StringEnum.swift  |   1 -
 .../Swaggers/Models/VariableNameTest.swift    |   5 +-
 .../Pods/Alamofire/Source/Alamofire.swift     |  27 +-
 .../Alamofire/Source/MultipartFormData.swift  |   6 +-
 .../Source/NetworkReachabilityManager.swift   |   6 +-
 .../Alamofire/Source/ParameterEncoding.swift  |   3 +-
 .../Pods/Alamofire/Source/Request.swift       |   6 +-
 .../Pods/Alamofire/Source/Response.swift      |  12 +-
 .../Source/ResponseSerialization.swift        |  54 +-
 .../Alamofire/Source/ServerTrustPolicy.swift  |   1 -
 .../Alamofire/Source/SessionDelegate.swift    |  36 +-
 .../Alamofire/Source/SessionManager.swift     |  39 +-
 .../Pods/Alamofire/Source/TaskDelegate.swift  |  30 +-
 .../Pods/Alamofire/Source/Timeline.swift      |   3 +-
 .../Pods/Alamofire/Source/Validation.swift    |   6 +-
 .../TestClientApp/AppDelegate.swift           |   3 -
 .../TestClientApp/ViewController.swift        |   2 -
 .../TestClientAppTests.swift                  |   2 -
 .../test/swift4/default/docs/AllPrimitives.md |  34 +
 .../test/swift4/default/docs/BaseCard.md      |  10 +
 .../test/swift4/default/docs/ErrorInfo.md     |  12 +
 .../swift4/default/docs/GetAllModelsResult.md |  12 +
 ...elWithPropertiesAndAdditionalProperties.md |  17 +
 .../test/swift4/default/docs/PersonCard.md    |  11 +
 .../swift4/default/docs/PersonCardAllOf.md    |  11 +
 .../test/swift4/default/docs/PlaceCard.md     |  11 +
 .../swift4/default/docs/PlaceCardAllOf.md     |  11 +
 .../test/swift4/default/docs/SampleBase.md    |  11 +
 .../swift4/default/docs/SampleSubClass.md     |  13 +
 .../default/docs/SampleSubClassAllOf.md       |  11 +
 .../test/swift4/default/docs/StringEnum.md    |   9 +
 .../test/swift4/default/docs/Swift4TestAPI.md |  59 ++
 .../swift4/default/docs/VariableNameTest.md   |  12 +
 .../client/test/swift4/default/project.yml    |  15 +
 695 files changed, 7886 insertions(+), 4490 deletions(-)
 create mode 100644 modules/openapi-generator/src/main/resources/swift4/XcodeGen.mustache
 create mode 100644 samples/client/petstore/swift4/default/Info.plist
 create mode 100644 samples/client/petstore/swift4/default/PetstoreClient.xcodeproj/project.pbxproj
 create mode 100644 samples/client/petstore/swift4/default/PetstoreClient.xcodeproj/project.xcworkspace/contents.xcworkspacedata
 create mode 100644 samples/client/petstore/swift4/default/PetstoreClient.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist
 create mode 100644 samples/client/petstore/swift4/default/PetstoreClient.xcodeproj/xcshareddata/xcschemes/PetstoreClient.xcscheme
 create mode 100644 samples/client/petstore/swift4/default/PetstoreClient/Classes/OpenAPIs/Models/CatAllOf.swift
 create mode 100644 samples/client/petstore/swift4/default/PetstoreClient/Classes/OpenAPIs/Models/DogAllOf.swift
 create mode 100644 samples/client/petstore/swift4/default/docs/CatAllOf.md
 create mode 100644 samples/client/petstore/swift4/default/docs/DogAllOf.md
 create mode 100644 samples/client/petstore/swift4/default/project.yml
 create mode 100644 samples/client/petstore/swift4/objcCompatible/Info.plist
 create mode 100644 samples/client/petstore/swift4/objcCompatible/PetstoreClient.xcodeproj/project.pbxproj
 create mode 100644 samples/client/petstore/swift4/objcCompatible/PetstoreClient.xcodeproj/project.xcworkspace/contents.xcworkspacedata
 create mode 100644 samples/client/petstore/swift4/objcCompatible/PetstoreClient.xcodeproj/xcshareddata/xcschemes/PetstoreClient.xcscheme
 create mode 100644 samples/client/petstore/swift4/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/CatAllOf.swift
 create mode 100644 samples/client/petstore/swift4/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/DogAllOf.swift
 create mode 100644 samples/client/petstore/swift4/objcCompatible/docs/CatAllOf.md
 create mode 100644 samples/client/petstore/swift4/objcCompatible/docs/DogAllOf.md
 create mode 100644 samples/client/petstore/swift4/objcCompatible/project.yml
 create mode 100644 samples/client/petstore/swift4/promisekit/Info.plist
 create mode 100644 samples/client/petstore/swift4/promisekit/PetstoreClient.xcodeproj/project.pbxproj
 create mode 100644 samples/client/petstore/swift4/promisekit/PetstoreClient.xcodeproj/project.xcworkspace/contents.xcworkspacedata
 create mode 100644 samples/client/petstore/swift4/promisekit/PetstoreClient.xcodeproj/xcshareddata/xcschemes/PetstoreClient.xcscheme
 create mode 100644 samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/OpenAPIs/Models/CatAllOf.swift
 create mode 100644 samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/OpenAPIs/Models/DogAllOf.swift
 create mode 100644 samples/client/petstore/swift4/promisekit/docs/CatAllOf.md
 create mode 100644 samples/client/petstore/swift4/promisekit/docs/DogAllOf.md
 create mode 100644 samples/client/petstore/swift4/promisekit/project.yml
 create mode 100644 samples/client/petstore/swift4/rxswift/Info.plist
 create mode 100644 samples/client/petstore/swift4/rxswift/PetstoreClient.xcodeproj/project.pbxproj
 create mode 100644 samples/client/petstore/swift4/rxswift/PetstoreClient.xcodeproj/project.xcworkspace/contents.xcworkspacedata
 create mode 100644 samples/client/petstore/swift4/rxswift/PetstoreClient.xcodeproj/xcshareddata/xcschemes/PetstoreClient.xcscheme
 create mode 100644 samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/OpenAPIs/Models/CatAllOf.swift
 create mode 100644 samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/OpenAPIs/Models/DogAllOf.swift
 create mode 100644 samples/client/petstore/swift4/rxswift/docs/CatAllOf.md
 create mode 100644 samples/client/petstore/swift4/rxswift/docs/DogAllOf.md
 create mode 100644 samples/client/petstore/swift4/rxswift/project.yml
 create mode 100644 samples/client/petstore/swift4/unwrapRequired/Info.plist
 create mode 100644 samples/client/petstore/swift4/unwrapRequired/PetstoreClient.xcodeproj/project.pbxproj
 create mode 100644 samples/client/petstore/swift4/unwrapRequired/PetstoreClient.xcodeproj/project.xcworkspace/contents.xcworkspacedata
 create mode 100644 samples/client/petstore/swift4/unwrapRequired/PetstoreClient.xcodeproj/xcshareddata/xcschemes/PetstoreClient.xcscheme
 create mode 100644 samples/client/petstore/swift4/unwrapRequired/PetstoreClient/Classes/OpenAPIs/Models/CatAllOf.swift
 create mode 100644 samples/client/petstore/swift4/unwrapRequired/PetstoreClient/Classes/OpenAPIs/Models/DogAllOf.swift
 create mode 100644 samples/client/petstore/swift4/unwrapRequired/docs/CatAllOf.md
 create mode 100644 samples/client/petstore/swift4/unwrapRequired/docs/DogAllOf.md
 create mode 100644 samples/client/petstore/swift4/unwrapRequired/project.yml
 create mode 100644 samples/client/test/swift4/default/Info.plist
 create mode 100644 samples/client/test/swift4/default/README.md
 create mode 100644 samples/client/test/swift4/default/TestClient.xcodeproj/project.pbxproj
 create mode 100644 samples/client/test/swift4/default/TestClient.xcodeproj/project.xcworkspace/contents.xcworkspacedata
 create mode 100644 samples/client/test/swift4/default/TestClient.xcodeproj/xcshareddata/xcschemes/TestClient.xcscheme
 create mode 100644 samples/client/test/swift4/default/TestClient/Classes/OpenAPIs/Models/PersonCardAllOf.swift
 create mode 100644 samples/client/test/swift4/default/TestClient/Classes/OpenAPIs/Models/PlaceCardAllOf.swift
 create mode 100644 samples/client/test/swift4/default/TestClient/Classes/OpenAPIs/Models/SampleSubClassAllOf.swift
 create mode 100644 samples/client/test/swift4/default/docs/AllPrimitives.md
 create mode 100644 samples/client/test/swift4/default/docs/BaseCard.md
 create mode 100644 samples/client/test/swift4/default/docs/ErrorInfo.md
 create mode 100644 samples/client/test/swift4/default/docs/GetAllModelsResult.md
 create mode 100644 samples/client/test/swift4/default/docs/ModelWithPropertiesAndAdditionalProperties.md
 create mode 100644 samples/client/test/swift4/default/docs/PersonCard.md
 create mode 100644 samples/client/test/swift4/default/docs/PersonCardAllOf.md
 create mode 100644 samples/client/test/swift4/default/docs/PlaceCard.md
 create mode 100644 samples/client/test/swift4/default/docs/PlaceCardAllOf.md
 create mode 100644 samples/client/test/swift4/default/docs/SampleBase.md
 create mode 100644 samples/client/test/swift4/default/docs/SampleSubClass.md
 create mode 100644 samples/client/test/swift4/default/docs/SampleSubClassAllOf.md
 create mode 100644 samples/client/test/swift4/default/docs/StringEnum.md
 create mode 100644 samples/client/test/swift4/default/docs/Swift4TestAPI.md
 create mode 100644 samples/client/test/swift4/default/docs/VariableNameTest.md
 create mode 100644 samples/client/test/swift4/default/project.yml

diff --git a/bin/swift4-petstore-objcCompatible.sh b/bin/swift4-petstore-objcCompatible.sh
index 1cec3c94b8..655d718fce 100755
--- a/bin/swift4-petstore-objcCompatible.sh
+++ b/bin/swift4-petstore-objcCompatible.sh
@@ -30,3 +30,13 @@ export JAVA_OPTS="${JAVA_OPTS} -Xmx1024M -DloggerPath=conf/log4j.properties"
 ags="generate -t modules/openapi-generator/src/main/resources/swift4 -i modules/openapi-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml -g swift4 -c ./bin/swift4-petstore-objcCompatible.json -o samples/client/petstore/swift4/objcCompatible $@"
 
 java $JAVA_OPTS -jar $executable $ags
+
+if type "xcodegen" > /dev/null 2>&1; then
+  cd samples/client/petstore/swift4/objcCompatible
+  xcodegen generate
+fi
+
+if type "swiftlint" > /dev/null 2>&1; then
+  cd samples/client/petstore/swift4/objcCompatible
+  swiftlint autocorrect
+fi
\ No newline at end of file
diff --git a/bin/swift4-petstore-promisekit.sh b/bin/swift4-petstore-promisekit.sh
index 69c3836406..6fc3975d9d 100755
--- a/bin/swift4-petstore-promisekit.sh
+++ b/bin/swift4-petstore-promisekit.sh
@@ -30,3 +30,13 @@ export JAVA_OPTS="${JAVA_OPTS} -Xmx1024M -DloggerPath=conf/log4j.properties"
 ags="generate -t modules/openapi-generator/src/main/resources/swift4 -i modules/openapi-generator/src/test/resources/2_0/swift/petstore-with-fake-endpoints-models-for-testing.yaml -g swift4 -c ./bin/swift4-petstore-promisekit.json -o samples/client/petstore/swift4/promisekit --generate-alias-as-model  $@"
 
 java $JAVA_OPTS -jar $executable $ags
+
+if type "xcodegen" > /dev/null 2>&1; then
+  cd samples/client/petstore/swift4/promisekit
+  xcodegen generate
+fi
+
+if type "swiftlint" > /dev/null 2>&1; then
+  cd samples/client/petstore/swift4/promisekit
+  swiftlint autocorrect
+fi
\ No newline at end of file
diff --git a/bin/swift4-petstore-rxswift.sh b/bin/swift4-petstore-rxswift.sh
index 3a50fbf823..80d2cee49a 100755
--- a/bin/swift4-petstore-rxswift.sh
+++ b/bin/swift4-petstore-rxswift.sh
@@ -30,3 +30,13 @@ export JAVA_OPTS="${JAVA_OPTS} -Xmx1024M -DloggerPath=conf/log4j.properties"
 ags="generate -t modules/openapi-generator/src/main/resources/swift4 -i modules/openapi-generator/src/test/resources/2_0/swift/petstore-with-fake-endpoints-models-for-testing.yaml -g swift4 -c ./bin/swift4-petstore-rxswift.json -o samples/client/petstore/swift4/rxswift --generate-alias-as-model $@"
 
 java $JAVA_OPTS -jar $executable $ags
+
+if type "xcodegen" > /dev/null 2>&1; then
+  cd samples/client/petstore/swift4/rxswift
+  xcodegen generate
+fi
+
+if type "swiftlint" > /dev/null 2>&1; then
+  cd samples/client/petstore/swift4/rxswift
+  swiftlint autocorrect
+fi
\ No newline at end of file
diff --git a/bin/swift4-petstore-unwrapRequired.sh b/bin/swift4-petstore-unwrapRequired.sh
index 7332dcd2ea..500ee6fbd1 100755
--- a/bin/swift4-petstore-unwrapRequired.sh
+++ b/bin/swift4-petstore-unwrapRequired.sh
@@ -30,3 +30,13 @@ export JAVA_OPTS="${JAVA_OPTS} -Xmx1024M -DloggerPath=conf/log4j.properties"
 ags="generate -t modules/openapi-generator/src/main/resources/swift4 -i modules/openapi-generator/src/test/resources/2_0/swift/petstore-with-fake-endpoints-models-for-testing.yaml -g swift4 -c ./bin/swift4-petstore-unwrapRequired.json -o samples/client/petstore/swift4/unwrapRequired --generate-alias-as-model $@"
 
 java $JAVA_OPTS -jar $executable $ags
+
+if type "xcodegen" > /dev/null 2>&1; then
+  cd samples/client/petstore/swift4/unwrapRequired
+  xcodegen generate
+fi
+
+if type "swiftlint" > /dev/null 2>&1; then
+  cd samples/client/petstore/swift4/unwrapRequired
+  swiftlint autocorrect
+fi
\ No newline at end of file
diff --git a/bin/swift4-petstore.sh b/bin/swift4-petstore.sh
index a99d4d69b1..9057c1ee23 100755
--- a/bin/swift4-petstore.sh
+++ b/bin/swift4-petstore.sh
@@ -30,3 +30,13 @@ export JAVA_OPTS="${JAVA_OPTS} -Xmx1024M -DloggerPath=conf/log4j.properties"
 ags="generate -t modules/openapi-generator/src/main/resources/swift4 -i modules/openapi-generator/src/test/resources/2_0/swift/petstore-with-fake-endpoints-models-for-testing.yaml -g swift4 -c ./bin/swift4-petstore.json -o samples/client/petstore/swift4/default --generate-alias-as-model $@"
 
 java $JAVA_OPTS -jar $executable $ags
+
+if type "xcodegen" > /dev/null 2>&1; then
+  cd samples/client/petstore/swift4/default
+  xcodegen generate
+fi
+
+if type "swiftlint" > /dev/null 2>&1; then
+  cd samples/client/petstore/swift4/default
+  swiftlint autocorrect
+fi
diff --git a/bin/swift4-test.sh b/bin/swift4-test.sh
index f43bd6e278..7bced643c4 100755
--- a/bin/swift4-test.sh
+++ b/bin/swift4-test.sh
@@ -30,3 +30,13 @@ export JAVA_OPTS="${JAVA_OPTS} -Xmx1024M -DloggerPath=conf/log4j.properties"
 ags="generate -t modules/openapi-generator/src/main/resources/swift4 -i modules/openapi-generator/src/test/resources/2_0/swift4Test.json -g swift4 -c ./bin/swift4-test.json -o samples/client/test/swift4/default $@"
 
 java $JAVA_OPTS -jar $executable $ags
+
+if type "xcodegen" > /dev/null 2>&1; then
+  cd samples/client/test/swift4/default
+  xcodegen generate
+fi
+
+if type "swiftlint" > /dev/null 2>&1; then
+  cd samples/client/test/swift4/default
+  swiftlint autocorrect
+fi
diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/Swift4Codegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/Swift4Codegen.java
index b78891af4f..1422504281 100644
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/Swift4Codegen.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/Swift4Codegen.java
@@ -421,6 +421,9 @@ public class Swift4Codegen extends DefaultCodegen implements CodegenConfig {
         supportingFiles.add(new SupportingFile("README.mustache",
                 "",
                 "README.md"));
+        supportingFiles.add(new SupportingFile("XcodeGen.mustache",
+                "",
+                "project.yml"));
 
     }
 
diff --git a/modules/openapi-generator/src/main/resources/swift4/XcodeGen.mustache b/modules/openapi-generator/src/main/resources/swift4/XcodeGen.mustache
new file mode 100644
index 0000000000..9e447e49a6
--- /dev/null
+++ b/modules/openapi-generator/src/main/resources/swift4/XcodeGen.mustache
@@ -0,0 +1,17 @@
+name: {{projectName}}
+targets:
+  {{projectName}}:
+    type: framework
+    platform: iOS
+    deploymentTarget: "10.0"
+    sources: [{{projectName}}]
+    info:
+      path: ./Info.plist
+      version: {{#podVersion}}{{podVersion}}{{/podVersion}}{{^podVersion}}{{#apiInfo}}{{version}}{{/apiInfo}}{{^apiInfo}}}0.0.1{{/apiInfo}}{{/podVersion}}
+    settings:
+      APPLICATION_EXTENSION_API_ONLY: true
+    scheme: {}
+    dependencies:
+    - carthage: Alamofire{{#useRxSwift}}
+    - carthage: RxSwift{{/useRxSwift}}{{#usePromiseKit}}
+    - carthage: PromiseKit{{/usePromiseKit}}
diff --git a/samples/client/petstore/swift4/default/.openapi-generator/VERSION b/samples/client/petstore/swift4/default/.openapi-generator/VERSION
index afa6365606..83a328a922 100644
--- a/samples/client/petstore/swift4/default/.openapi-generator/VERSION
+++ b/samples/client/petstore/swift4/default/.openapi-generator/VERSION
@@ -1 +1 @@
-4.0.0-SNAPSHOT
\ No newline at end of file
+4.1.0-SNAPSHOT
\ No newline at end of file
diff --git a/samples/client/petstore/swift4/default/Info.plist b/samples/client/petstore/swift4/default/Info.plist
new file mode 100644
index 0000000000..323e5ecfc4
--- /dev/null
+++ b/samples/client/petstore/swift4/default/Info.plist
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>CFBundleDevelopmentRegion</key>
+	<string>$(DEVELOPMENT_LANGUAGE)</string>
+	<key>CFBundleExecutable</key>
+	<string>$(EXECUTABLE_NAME)</string>
+	<key>CFBundleIdentifier</key>
+	<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
+	<key>CFBundleInfoDictionaryVersion</key>
+	<string>6.0</string>
+	<key>CFBundleName</key>
+	<string>$(PRODUCT_NAME)</string>
+	<key>CFBundlePackageType</key>
+	<string>FMWK</string>
+	<key>CFBundleShortVersionString</key>
+	<string>1.0</string>
+	<key>CFBundleVersion</key>
+	<string>1</string>
+</dict>
+</plist>
diff --git a/samples/client/petstore/swift4/default/PetstoreClient.xcodeproj/project.pbxproj b/samples/client/petstore/swift4/default/PetstoreClient.xcodeproj/project.pbxproj
new file mode 100644
index 0000000000..6d0f6ef15b
--- /dev/null
+++ b/samples/client/petstore/swift4/default/PetstoreClient.xcodeproj/project.pbxproj
@@ -0,0 +1,569 @@
+// !$*UTF8*$!
+{
+	archiveVersion = 1;
+	classes = {
+	};
+	objectVersion = 50;
+	objects = {
+
+/* Begin PBXBuildFile section */
+		02903CEC38DC202565BC08CB040AC4E9 /* Animal.swift in Sources */ = {isa = PBXBuildFile; fileRef = 95568E7C35F119EB4A12B4982B3FB31F /* Animal.swift */; };
+		0462F801432CF94C7EF51D0532737A7E /* APIs.swift in Sources */ = {isa = PBXBuildFile; fileRef = 37DF825B8F3BADA2B2537D17CDC48633 /* APIs.swift */; };
+		08D87E4FECF24910F0DA0F1D2E2D955A /* EnumTest.swift in Sources */ = {isa = PBXBuildFile; fileRef = FD60AEA646791E0EDE885DE1E680A687 /* EnumTest.swift */; };
+		1143FFF06DEE01E5B0F1368AA05BE1B4 /* OuterEnum.swift in Sources */ = {isa = PBXBuildFile; fileRef = C15008AABC804EB6FB4CDAC6B871E6B0 /* OuterEnum.swift */; };
+		122BBAE8245606CC040EEB6B9254E376 /* StoreAPI.swift in Sources */ = {isa = PBXBuildFile; fileRef = A53274D99BBDE1B79BF3521CD7CBC276 /* StoreAPI.swift */; };
+		12327BF7304AA897C5D2A1250B1659B7 /* AdditionalPropertiesClass.swift in Sources */ = {isa = PBXBuildFile; fileRef = 396DEF3156BA0D12D0FC5C3C3AAF52C4 /* AdditionalPropertiesClass.swift */; };
+		12BB95C66D63090732BB9E0379836E3C /* JSONEncodingHelper.swift in Sources */ = {isa = PBXBuildFile; fileRef = 35D710108A69DD8A5297F926A66DA21F /* JSONEncodingHelper.swift */; };
+		16E9A5E22B4823DE282E7F4C18A21EA8 /* JSONEncodableEncoding.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9791B840B8D6EAA35343B00FA277963A /* JSONEncodableEncoding.swift */; };
+		18F19872A0DFB4CC3D9C696BBCA64EFD /* Cat.swift in Sources */ = {isa = PBXBuildFile; fileRef = 212AA914B7F1793A4E32C119370FB05F /* Cat.swift */; };
+		196E9846B27D736630CCF90497696859 /* StringBooleanMap.swift in Sources */ = {isa = PBXBuildFile; fileRef = 47B4DEBABEFE140768CFB70B19D23029 /* StringBooleanMap.swift */; };
+		271D94A05C47B602A2433B9CD3D9DCDC /* DogAllOf.swift in Sources */ = {isa = PBXBuildFile; fileRef = A21A69C8402A60E01116ABBDEE8943DB /* DogAllOf.swift */; };
+		293F4E0FBFC8297E414A3CDBB7F29A96 /* ReadOnlyFirst.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6FD42727E001E799E458C2924CF813CC /* ReadOnlyFirst.swift */; };
+		297E365D1E4672C43C56E0AFD855FFBF /* FakeAPI.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6E00950725DC44436C5E238CDD2EC164 /* FakeAPI.swift */; };
+		2A35688C985E9CB1EB7732AC2AD46B82 /* APIHelper.swift in Sources */ = {isa = PBXBuildFile; fileRef = 897716962D472FE162B723CB713AA6D3 /* APIHelper.swift */; };
+		2DF4544D4D3D6CF7047A59FB89ED31BD /* Model200Response.swift in Sources */ = {isa = PBXBuildFile; fileRef = 82A2C3DC2235F0114C2B08E553F46874 /* Model200Response.swift */; };
+		3251A3722981CE46261615CFBA96A08D /* ArrayOfArrayOfNumberOnly.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7B1B8B838B5D9D312F2002EBAD946378 /* ArrayOfArrayOfNumberOnly.swift */; };
+		36734C4EB3362A114A7CB5F25EE39E6D /* FormatTest.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3156CE41C001C80379B84BDB435DECCB /* FormatTest.swift */; };
+		3D8E407B1DF4FA5A5F16B64E3A285781 /* PetAPI.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9A019F500E546A3292CE716AB967C673 /* PetAPI.swift */; };
+		41D8A105135868152A56E2AC475049BB /* CatAllOf.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3AD0F94F512DFBC09F9CC79AF4BD9BFD /* CatAllOf.swift */; };
+		42C51BC034E8B0CAA29A068F6B0DC815 /* Category.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6F2985D01F8D60A4B1925C694330E6CB /* Category.swift */; };
+		491676EC91BFEF95A12556888EED87B5 /* FileSchemaTestClass.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B3666552AA854DAF9C480A3354C9D7C /* FileSchemaTestClass.swift */; };
+		4C28BFEC5E7C8150DEFD83E09C1A1D32 /* Alamofire.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A235FA3FDFB086CC69CDE83DFC1F4BC9 /* Alamofire.framework */; };
+		58F9704B295AC436D6FB98FA669E2344 /* AlamofireImplementations.swift in Sources */ = {isa = PBXBuildFile; fileRef = 84A201508DF2B697D65F263189C08721 /* AlamofireImplementations.swift */; };
+		59C00CBB07761CAC8DCE7054E34AD5D9 /* EnumClass.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B2C97AE6ACA1E5FB88F5BAA2DB76FDC /* EnumClass.swift */; };
+		59C2F5495C98836BFA9E10BF5C13BC2C /* Order.swift in Sources */ = {isa = PBXBuildFile; fileRef = 27B2E9EF856E89FEAA359A3AC4A2CF5D /* Order.swift */; };
+		5ACDD7CC312167589335E9CA5998E770 /* ClassModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3C30827D8EAF8EA684E7BCEA5A1E93B2 /* ClassModel.swift */; };
+		655AA371771C7BD72EE0AAC0C90DFFF0 /* MapTest.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7986861626C2B1CB49AD7000C6343270 /* MapTest.swift */; };
+		6600BB1500AE35A3C80F7C83F6444552 /* TypeHolderDefault.swift in Sources */ = {isa = PBXBuildFile; fileRef = EBC76F6D4D2AA8084B7EB50E5C15E475 /* TypeHolderDefault.swift */; };
+		6CD20EE568DDAD2304BF0C4B1A70C8DC /* CodableHelper.swift in Sources */ = {isa = PBXBuildFile; fileRef = 02A6F6BB2152ACEE1416D44AB3955243 /* CodableHelper.swift */; };
+		7367A9D91D4B101F2D28AC56ED89F175 /* Capitalization.swift in Sources */ = {isa = PBXBuildFile; fileRef = A7B38FA00A494D13F4C382A3D87FBF59 /* Capitalization.swift */; };
+		82D4D0C8AD0354A700C8ACD421ABED55 /* OuterComposite.swift in Sources */ = {isa = PBXBuildFile; fileRef = F4E0AD8F60A91F72C768756002C14BF9 /* OuterComposite.swift */; };
+		83A2D1863FB136C0DFC423319F4EED65 /* AnotherFakeAPI.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9DF24D2714B9C4CF14146E88FDDC01A5 /* AnotherFakeAPI.swift */; };
+		92FB161BF1E57D11B116AF0292D5835C /* Client.swift in Sources */ = {isa = PBXBuildFile; fileRef = A913A57E72D723632E9A718FF4525C81 /* Client.swift */; };
+		97C99615237E1B662242E04F527B38B9 /* ApiResponse.swift in Sources */ = {isa = PBXBuildFile; fileRef = A8E7B833748B4F0C7CDA90C6E500B199 /* ApiResponse.swift */; };
+		A190AF5A3988639ED4B78163D0EA3CA4 /* ArrayOfNumberOnly.swift in Sources */ = {isa = PBXBuildFile; fileRef = B65BB72353DA24536A9049BEC3D234C8 /* ArrayOfNumberOnly.swift */; };
+		A438970025AE69ED407BC1E67CC6359E /* EnumArrays.swift in Sources */ = {isa = PBXBuildFile; fileRef = 10503995D9EFD031A2EFB57603B3132E /* EnumArrays.swift */; };
+		A9F1AAF6CE029DD3B4F8AC841F0B6BC6 /* FakeClassnameTags123API.swift in Sources */ = {isa = PBXBuildFile; fileRef = B42354B407EC173BEB54E0429D946F3B /* FakeClassnameTags123API.swift */; };
+		AE9D2E1DB59AF6575AC4AC6756C5A937 /* NumberOnly.swift in Sources */ = {isa = PBXBuildFile; fileRef = B8E0B16084741FCB82389F5854AC5E26 /* NumberOnly.swift */; };
+		B399A1742F23330FDCA450EAB98F51F1 /* Pet.swift in Sources */ = {isa = PBXBuildFile; fileRef = ECFEB4C6C257B3BB3CEA36D10A5EDC17 /* Pet.swift */; };
+		BF7D58FBCF5E4D3F2932FCC0E62BED40 /* User.swift in Sources */ = {isa = PBXBuildFile; fileRef = E5565A447062C7B8F695F4517DB5E4A5 /* User.swift */; };
+		C15AC1CC631E96D0360EB8C15BF30452 /* Name.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5AD994DFAA0DA93C188A4DBA16688767 /* Name.swift */; };
+		C1CACABE18A7ADCE37D1CD9DC9128304 /* List.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7A6070F581E611FF44AFD40A4315C49A /* List.swift */; };
+		C2EDEB747887399B13A6DFD72A219CB2 /* ArrayTest.swift in Sources */ = {isa = PBXBuildFile; fileRef = F1A0379CDFC55705AE76C99867B8DB08 /* ArrayTest.swift */; };
+		C329EE55B2FCC9174ED3B128D67C5E8C /* Extensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = B8C298FC8929DCB369053F118D7DF28F /* Extensions.swift */; };
+		D3A17B7FAFA8A7A210875BBCDCC30116 /* MixedPropertiesAndAdditionalPropertiesClass.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9AD714C7CC59BDD18DE8DF4ED40B9DA9 /* MixedPropertiesAndAdditionalPropertiesClass.swift */; };
+		D70EC94E346077DE1482231DD4498BED /* Dog.swift in Sources */ = {isa = PBXBuildFile; fileRef = C6C3E1129526A353B963EFD74ED8419C /* Dog.swift */; };
+		DB1CE39011A741D07E187663291B5DE5 /* AnimalFarm.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8D22BE01748F51106DE0233299A9061E /* AnimalFarm.swift */; };
+		DB724C4F1AD5DF025B53A9A2E0A49E3D /* UserAPI.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7C8D5F382979854D47F18DB1543680FE /* UserAPI.swift */; };
+		DDBC3CF5E447D8D838F0FE200420EEE3 /* HasOnlyReadOnly.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4C7FBC641752D2E13B15097311139DDC /* HasOnlyReadOnly.swift */; };
+		DEC892724574BB29BD65869374F83982 /* Configuration.swift in Sources */ = {isa = PBXBuildFile; fileRef = 28A444949BBC254798C3B3DD14AAF2CD /* Configuration.swift */; };
+		E2C40F0E34DB8C21A806262C72841A51 /* SpecialModelName.swift in Sources */ = {isa = PBXBuildFile; fileRef = 386FD590658E90509C121118F057604D /* SpecialModelName.swift */; };
+		E51ADEC931806B20A041303E539A8BE2 /* Tag.swift in Sources */ = {isa = PBXBuildFile; fileRef = B2896F8BFD1AA2965C8A30158F0EDA8C /* Tag.swift */; };
+		F02BEF9A8503B3848B045370451E85F6 /* Models.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8699F7966F748ED026A6FB4CF550442B /* Models.swift */; };
+		F21D10C71A9DE7D0467AFD23FD391D2E /* Return.swift in Sources */ = {isa = PBXBuildFile; fileRef = C81447828475F76C5CF4F08AA65292F7 /* Return.swift */; };
+		FB4A053CDCD75E48B755CC22D463A3FC /* TypeHolderExample.swift in Sources */ = {isa = PBXBuildFile; fileRef = 19B65C66C97F082718DDD703F39DE1C2 /* TypeHolderExample.swift */; };
+		FECA03F0388E84AE1B22638605D8AC9F /* File.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3933D3B2A3AC4577094D0C23D1C1B266 /* File.swift */; };
+/* End PBXBuildFile section */
+
+/* Begin PBXFileReference section */
+		02A6F6BB2152ACEE1416D44AB3955243 /* CodableHelper.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CodableHelper.swift; sourceTree = "<group>"; };
+		10503995D9EFD031A2EFB57603B3132E /* EnumArrays.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EnumArrays.swift; sourceTree = "<group>"; };
+		164AD6EC9C4CCF634D7C45905E99E3A7 /* PetstoreClient.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = PetstoreClient.framework; sourceTree = BUILT_PRODUCTS_DIR; };
+		19B65C66C97F082718DDD703F39DE1C2 /* TypeHolderExample.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TypeHolderExample.swift; sourceTree = "<group>"; };
+		212AA914B7F1793A4E32C119370FB05F /* Cat.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Cat.swift; sourceTree = "<group>"; };
+		27B2E9EF856E89FEAA359A3AC4A2CF5D /* Order.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Order.swift; sourceTree = "<group>"; };
+		28A444949BBC254798C3B3DD14AAF2CD /* Configuration.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Configuration.swift; sourceTree = "<group>"; };
+		3156CE41C001C80379B84BDB435DECCB /* FormatTest.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FormatTest.swift; sourceTree = "<group>"; };
+		35D710108A69DD8A5297F926A66DA21F /* JSONEncodingHelper.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = JSONEncodingHelper.swift; sourceTree = "<group>"; };
+		37DF825B8F3BADA2B2537D17CDC48633 /* APIs.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = APIs.swift; sourceTree = "<group>"; };
+		386FD590658E90509C121118F057604D /* SpecialModelName.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SpecialModelName.swift; sourceTree = "<group>"; };
+		3933D3B2A3AC4577094D0C23D1C1B266 /* File.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = File.swift; sourceTree = "<group>"; };
+		396DEF3156BA0D12D0FC5C3C3AAF52C4 /* AdditionalPropertiesClass.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AdditionalPropertiesClass.swift; sourceTree = "<group>"; };
+		3AD0F94F512DFBC09F9CC79AF4BD9BFD /* CatAllOf.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CatAllOf.swift; sourceTree = "<group>"; };
+		3C30827D8EAF8EA684E7BCEA5A1E93B2 /* ClassModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ClassModel.swift; sourceTree = "<group>"; };
+		47B4DEBABEFE140768CFB70B19D23029 /* StringBooleanMap.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = StringBooleanMap.swift; sourceTree = "<group>"; };
+		4B2C97AE6ACA1E5FB88F5BAA2DB76FDC /* EnumClass.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EnumClass.swift; sourceTree = "<group>"; };
+		4B3666552AA854DAF9C480A3354C9D7C /* FileSchemaTestClass.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FileSchemaTestClass.swift; sourceTree = "<group>"; };
+		4C7FBC641752D2E13B15097311139DDC /* HasOnlyReadOnly.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HasOnlyReadOnly.swift; sourceTree = "<group>"; };
+		5AD994DFAA0DA93C188A4DBA16688767 /* Name.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Name.swift; sourceTree = "<group>"; };
+		6E00950725DC44436C5E238CDD2EC164 /* FakeAPI.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FakeAPI.swift; sourceTree = "<group>"; };
+		6F2985D01F8D60A4B1925C694330E6CB /* Category.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Category.swift; sourceTree = "<group>"; };
+		6FD42727E001E799E458C2924CF813CC /* ReadOnlyFirst.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ReadOnlyFirst.swift; sourceTree = "<group>"; };
+		7986861626C2B1CB49AD7000C6343270 /* MapTest.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MapTest.swift; sourceTree = "<group>"; };
+		7A6070F581E611FF44AFD40A4315C49A /* List.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = List.swift; sourceTree = "<group>"; };
+		7B1B8B838B5D9D312F2002EBAD946378 /* ArrayOfArrayOfNumberOnly.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ArrayOfArrayOfNumberOnly.swift; sourceTree = "<group>"; };
+		7C8D5F382979854D47F18DB1543680FE /* UserAPI.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UserAPI.swift; sourceTree = "<group>"; };
+		82A2C3DC2235F0114C2B08E553F46874 /* Model200Response.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Model200Response.swift; sourceTree = "<group>"; };
+		84A201508DF2B697D65F263189C08721 /* AlamofireImplementations.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AlamofireImplementations.swift; sourceTree = "<group>"; };
+		8699F7966F748ED026A6FB4CF550442B /* Models.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Models.swift; sourceTree = "<group>"; };
+		897716962D472FE162B723CB713AA6D3 /* APIHelper.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = APIHelper.swift; sourceTree = "<group>"; };
+		8D22BE01748F51106DE0233299A9061E /* AnimalFarm.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AnimalFarm.swift; sourceTree = "<group>"; };
+		95568E7C35F119EB4A12B4982B3FB31F /* Animal.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Animal.swift; sourceTree = "<group>"; };
+		9791B840B8D6EAA35343B00FA277963A /* JSONEncodableEncoding.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = JSONEncodableEncoding.swift; sourceTree = "<group>"; };
+		9A019F500E546A3292CE716AB967C673 /* PetAPI.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PetAPI.swift; sourceTree = "<group>"; };
+		9AD714C7CC59BDD18DE8DF4ED40B9DA9 /* MixedPropertiesAndAdditionalPropertiesClass.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MixedPropertiesAndAdditionalPropertiesClass.swift; sourceTree = "<group>"; };
+		9DF24D2714B9C4CF14146E88FDDC01A5 /* AnotherFakeAPI.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AnotherFakeAPI.swift; sourceTree = "<group>"; };
+		A21A69C8402A60E01116ABBDEE8943DB /* DogAllOf.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DogAllOf.swift; sourceTree = "<group>"; };
+		A235FA3FDFB086CC69CDE83DFC1F4BC9 /* Alamofire.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = Alamofire.framework; sourceTree = "<group>"; };
+		A53274D99BBDE1B79BF3521CD7CBC276 /* StoreAPI.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = StoreAPI.swift; sourceTree = "<group>"; };
+		A7B38FA00A494D13F4C382A3D87FBF59 /* Capitalization.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Capitalization.swift; sourceTree = "<group>"; };
+		A8E7B833748B4F0C7CDA90C6E500B199 /* ApiResponse.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ApiResponse.swift; sourceTree = "<group>"; };
+		A913A57E72D723632E9A718FF4525C81 /* Client.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Client.swift; sourceTree = "<group>"; };
+		B2896F8BFD1AA2965C8A30158F0EDA8C /* Tag.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Tag.swift; sourceTree = "<group>"; };
+		B42354B407EC173BEB54E0429D946F3B /* FakeClassnameTags123API.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FakeClassnameTags123API.swift; sourceTree = "<group>"; };
+		B65BB72353DA24536A9049BEC3D234C8 /* ArrayOfNumberOnly.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ArrayOfNumberOnly.swift; sourceTree = "<group>"; };
+		B8C298FC8929DCB369053F118D7DF28F /* Extensions.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Extensions.swift; sourceTree = "<group>"; };
+		B8E0B16084741FCB82389F5854AC5E26 /* NumberOnly.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NumberOnly.swift; sourceTree = "<group>"; };
+		C15008AABC804EB6FB4CDAC6B871E6B0 /* OuterEnum.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = OuterEnum.swift; sourceTree = "<group>"; };
+		C6C3E1129526A353B963EFD74ED8419C /* Dog.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Dog.swift; sourceTree = "<group>"; };
+		C81447828475F76C5CF4F08AA65292F7 /* Return.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Return.swift; sourceTree = "<group>"; };
+		E5565A447062C7B8F695F4517DB5E4A5 /* User.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = User.swift; sourceTree = "<group>"; };
+		EBC76F6D4D2AA8084B7EB50E5C15E475 /* TypeHolderDefault.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TypeHolderDefault.swift; sourceTree = "<group>"; };
+		ECFEB4C6C257B3BB3CEA36D10A5EDC17 /* Pet.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Pet.swift; sourceTree = "<group>"; };
+		F1A0379CDFC55705AE76C99867B8DB08 /* ArrayTest.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ArrayTest.swift; sourceTree = "<group>"; };
+		F4E0AD8F60A91F72C768756002C14BF9 /* OuterComposite.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = OuterComposite.swift; sourceTree = "<group>"; };
+		FD60AEA646791E0EDE885DE1E680A687 /* EnumTest.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EnumTest.swift; sourceTree = "<group>"; };
+/* End PBXFileReference section */
+
+/* Begin PBXFrameworksBuildPhase section */
+		D1990C2A394CCF025EF98A2FB828C79A /* Frameworks */ = {
+			isa = PBXFrameworksBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				4C28BFEC5E7C8150DEFD83E09C1A1D32 /* Alamofire.framework in Frameworks */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+/* End PBXFrameworksBuildPhase section */
+
+/* Begin PBXGroup section */
+		1E464C0937FE0D3A7A0FE29AF446553C /* Frameworks */ = {
+			isa = PBXGroup;
+			children = (
+				7861EE241895128F64DD787367B3022D /* Carthage */,
+			);
+			name = Frameworks;
+			sourceTree = "<group>";
+		};
+		4FBDCF1330A9AB9122780DB3FA21DE4C /* Models */ = {
+			isa = PBXGroup;
+			children = (
+				396DEF3156BA0D12D0FC5C3C3AAF52C4 /* AdditionalPropertiesClass.swift */,
+				95568E7C35F119EB4A12B4982B3FB31F /* Animal.swift */,
+				8D22BE01748F51106DE0233299A9061E /* AnimalFarm.swift */,
+				A8E7B833748B4F0C7CDA90C6E500B199 /* ApiResponse.swift */,
+				7B1B8B838B5D9D312F2002EBAD946378 /* ArrayOfArrayOfNumberOnly.swift */,
+				B65BB72353DA24536A9049BEC3D234C8 /* ArrayOfNumberOnly.swift */,
+				F1A0379CDFC55705AE76C99867B8DB08 /* ArrayTest.swift */,
+				A7B38FA00A494D13F4C382A3D87FBF59 /* Capitalization.swift */,
+				212AA914B7F1793A4E32C119370FB05F /* Cat.swift */,
+				3AD0F94F512DFBC09F9CC79AF4BD9BFD /* CatAllOf.swift */,
+				6F2985D01F8D60A4B1925C694330E6CB /* Category.swift */,
+				3C30827D8EAF8EA684E7BCEA5A1E93B2 /* ClassModel.swift */,
+				A913A57E72D723632E9A718FF4525C81 /* Client.swift */,
+				C6C3E1129526A353B963EFD74ED8419C /* Dog.swift */,
+				A21A69C8402A60E01116ABBDEE8943DB /* DogAllOf.swift */,
+				10503995D9EFD031A2EFB57603B3132E /* EnumArrays.swift */,
+				4B2C97AE6ACA1E5FB88F5BAA2DB76FDC /* EnumClass.swift */,
+				FD60AEA646791E0EDE885DE1E680A687 /* EnumTest.swift */,
+				3933D3B2A3AC4577094D0C23D1C1B266 /* File.swift */,
+				4B3666552AA854DAF9C480A3354C9D7C /* FileSchemaTestClass.swift */,
+				3156CE41C001C80379B84BDB435DECCB /* FormatTest.swift */,
+				4C7FBC641752D2E13B15097311139DDC /* HasOnlyReadOnly.swift */,
+				7A6070F581E611FF44AFD40A4315C49A /* List.swift */,
+				7986861626C2B1CB49AD7000C6343270 /* MapTest.swift */,
+				9AD714C7CC59BDD18DE8DF4ED40B9DA9 /* MixedPropertiesAndAdditionalPropertiesClass.swift */,
+				82A2C3DC2235F0114C2B08E553F46874 /* Model200Response.swift */,
+				5AD994DFAA0DA93C188A4DBA16688767 /* Name.swift */,
+				B8E0B16084741FCB82389F5854AC5E26 /* NumberOnly.swift */,
+				27B2E9EF856E89FEAA359A3AC4A2CF5D /* Order.swift */,
+				F4E0AD8F60A91F72C768756002C14BF9 /* OuterComposite.swift */,
+				C15008AABC804EB6FB4CDAC6B871E6B0 /* OuterEnum.swift */,
+				ECFEB4C6C257B3BB3CEA36D10A5EDC17 /* Pet.swift */,
+				6FD42727E001E799E458C2924CF813CC /* ReadOnlyFirst.swift */,
+				C81447828475F76C5CF4F08AA65292F7 /* Return.swift */,
+				386FD590658E90509C121118F057604D /* SpecialModelName.swift */,
+				47B4DEBABEFE140768CFB70B19D23029 /* StringBooleanMap.swift */,
+				B2896F8BFD1AA2965C8A30158F0EDA8C /* Tag.swift */,
+				EBC76F6D4D2AA8084B7EB50E5C15E475 /* TypeHolderDefault.swift */,
+				19B65C66C97F082718DDD703F39DE1C2 /* TypeHolderExample.swift */,
+				E5565A447062C7B8F695F4517DB5E4A5 /* User.swift */,
+			);
+			path = Models;
+			sourceTree = "<group>";
+		};
+		5FBA6AE5F64CD737F88B4565AC3CCD3B = {
+			isa = PBXGroup;
+			children = (
+				9B364C01750D7AA4F983B9E77B01BCC6 /* PetstoreClient */,
+				1E464C0937FE0D3A7A0FE29AF446553C /* Frameworks */,
+				857F0DEA1890CE66D6DAD556C55821A6 /* Products */,
+			);
+			sourceTree = "<group>";
+		};
+		67BF3478113E6B4DF1C4E04F40BF58C4 /* OpenAPIs */ = {
+			isa = PBXGroup;
+			children = (
+				84A201508DF2B697D65F263189C08721 /* AlamofireImplementations.swift */,
+				897716962D472FE162B723CB713AA6D3 /* APIHelper.swift */,
+				37DF825B8F3BADA2B2537D17CDC48633 /* APIs.swift */,
+				02A6F6BB2152ACEE1416D44AB3955243 /* CodableHelper.swift */,
+				28A444949BBC254798C3B3DD14AAF2CD /* Configuration.swift */,
+				B8C298FC8929DCB369053F118D7DF28F /* Extensions.swift */,
+				9791B840B8D6EAA35343B00FA277963A /* JSONEncodableEncoding.swift */,
+				35D710108A69DD8A5297F926A66DA21F /* JSONEncodingHelper.swift */,
+				8699F7966F748ED026A6FB4CF550442B /* Models.swift */,
+				F956D0CCAE23BCFD1C7BDD5D47944AA5 /* APIs */,
+				4FBDCF1330A9AB9122780DB3FA21DE4C /* Models */,
+			);
+			path = OpenAPIs;
+			sourceTree = "<group>";
+		};
+		7861EE241895128F64DD787367B3022D /* Carthage */ = {
+			isa = PBXGroup;
+			children = (
+				A012205B41CB71A62B86EECDEAFB0990 /* iOS */,
+			);
+			name = Carthage;
+			path = Carthage/Build;
+			sourceTree = "<group>";
+		};
+		857F0DEA1890CE66D6DAD556C55821A6 /* Products */ = {
+			isa = PBXGroup;
+			children = (
+				164AD6EC9C4CCF634D7C45905E99E3A7 /* PetstoreClient.framework */,
+			);
+			name = Products;
+			sourceTree = "<group>";
+		};
+		9B364C01750D7AA4F983B9E77B01BCC6 /* PetstoreClient */ = {
+			isa = PBXGroup;
+			children = (
+				EF4C81BDD734856ED5023B777D35098B /* Classes */,
+			);
+			path = PetstoreClient;
+			sourceTree = "<group>";
+		};
+		A012205B41CB71A62B86EECDEAFB0990 /* iOS */ = {
+			isa = PBXGroup;
+			children = (
+				A235FA3FDFB086CC69CDE83DFC1F4BC9 /* Alamofire.framework */,
+			);
+			path = iOS;
+			sourceTree = "<group>";
+		};
+		EF4C81BDD734856ED5023B777D35098B /* Classes */ = {
+			isa = PBXGroup;
+			children = (
+				67BF3478113E6B4DF1C4E04F40BF58C4 /* OpenAPIs */,
+			);
+			path = Classes;
+			sourceTree = "<group>";
+		};
+		F956D0CCAE23BCFD1C7BDD5D47944AA5 /* APIs */ = {
+			isa = PBXGroup;
+			children = (
+				9DF24D2714B9C4CF14146E88FDDC01A5 /* AnotherFakeAPI.swift */,
+				6E00950725DC44436C5E238CDD2EC164 /* FakeAPI.swift */,
+				B42354B407EC173BEB54E0429D946F3B /* FakeClassnameTags123API.swift */,
+				9A019F500E546A3292CE716AB967C673 /* PetAPI.swift */,
+				A53274D99BBDE1B79BF3521CD7CBC276 /* StoreAPI.swift */,
+				7C8D5F382979854D47F18DB1543680FE /* UserAPI.swift */,
+			);
+			path = APIs;
+			sourceTree = "<group>";
+		};
+/* End PBXGroup section */
+
+/* Begin PBXNativeTarget section */
+		C1282C2230015E0D204BEAEDDFB49453 /* PetstoreClient */ = {
+			isa = PBXNativeTarget;
+			buildConfigurationList = B46EDEB1A7F0D78FE6394544C60169D1 /* Build configuration list for PBXNativeTarget "PetstoreClient" */;
+			buildPhases = (
+				E539708354CE60FE486F81EDE56D13C8 /* Sources */,
+				D1990C2A394CCF025EF98A2FB828C79A /* Frameworks */,
+			);
+			buildRules = (
+			);
+			dependencies = (
+			);
+			name = PetstoreClient;
+			productName = PetstoreClient;
+			productReference = 164AD6EC9C4CCF634D7C45905E99E3A7 /* PetstoreClient.framework */;
+			productType = "com.apple.product-type.framework";
+		};
+/* End PBXNativeTarget section */
+
+/* Begin PBXProject section */
+		E7D276EE2369D8C455513C2E05F9AED0 /* Project object */ = {
+			isa = PBXProject;
+			attributes = {
+				LastUpgradeCheck = 1000;
+			};
+			buildConfigurationList = ECAB17FF35111B5E14DAAC0883031714 /* Build configuration list for PBXProject "PetstoreClient" */;
+			compatibilityVersion = "Xcode 9.3";
+			developmentRegion = en;
+			hasScannedForEncodings = 0;
+			knownRegions = (
+				en,
+			);
+			mainGroup = 5FBA6AE5F64CD737F88B4565AC3CCD3B;
+			projectDirPath = "";
+			projectRoot = "";
+			targets = (
+				C1282C2230015E0D204BEAEDDFB49453 /* PetstoreClient */,
+			);
+		};
+/* End PBXProject section */
+
+/* Begin PBXSourcesBuildPhase section */
+		E539708354CE60FE486F81EDE56D13C8 /* Sources */ = {
+			isa = PBXSourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				2A35688C985E9CB1EB7732AC2AD46B82 /* APIHelper.swift in Sources */,
+				0462F801432CF94C7EF51D0532737A7E /* APIs.swift in Sources */,
+				12327BF7304AA897C5D2A1250B1659B7 /* AdditionalPropertiesClass.swift in Sources */,
+				58F9704B295AC436D6FB98FA669E2344 /* AlamofireImplementations.swift in Sources */,
+				02903CEC38DC202565BC08CB040AC4E9 /* Animal.swift in Sources */,
+				DB1CE39011A741D07E187663291B5DE5 /* AnimalFarm.swift in Sources */,
+				83A2D1863FB136C0DFC423319F4EED65 /* AnotherFakeAPI.swift in Sources */,
+				97C99615237E1B662242E04F527B38B9 /* ApiResponse.swift in Sources */,
+				3251A3722981CE46261615CFBA96A08D /* ArrayOfArrayOfNumberOnly.swift in Sources */,
+				A190AF5A3988639ED4B78163D0EA3CA4 /* ArrayOfNumberOnly.swift in Sources */,
+				C2EDEB747887399B13A6DFD72A219CB2 /* ArrayTest.swift in Sources */,
+				7367A9D91D4B101F2D28AC56ED89F175 /* Capitalization.swift in Sources */,
+				18F19872A0DFB4CC3D9C696BBCA64EFD /* Cat.swift in Sources */,
+				41D8A105135868152A56E2AC475049BB /* CatAllOf.swift in Sources */,
+				42C51BC034E8B0CAA29A068F6B0DC815 /* Category.swift in Sources */,
+				5ACDD7CC312167589335E9CA5998E770 /* ClassModel.swift in Sources */,
+				92FB161BF1E57D11B116AF0292D5835C /* Client.swift in Sources */,
+				6CD20EE568DDAD2304BF0C4B1A70C8DC /* CodableHelper.swift in Sources */,
+				DEC892724574BB29BD65869374F83982 /* Configuration.swift in Sources */,
+				D70EC94E346077DE1482231DD4498BED /* Dog.swift in Sources */,
+				271D94A05C47B602A2433B9CD3D9DCDC /* DogAllOf.swift in Sources */,
+				A438970025AE69ED407BC1E67CC6359E /* EnumArrays.swift in Sources */,
+				59C00CBB07761CAC8DCE7054E34AD5D9 /* EnumClass.swift in Sources */,
+				08D87E4FECF24910F0DA0F1D2E2D955A /* EnumTest.swift in Sources */,
+				C329EE55B2FCC9174ED3B128D67C5E8C /* Extensions.swift in Sources */,
+				297E365D1E4672C43C56E0AFD855FFBF /* FakeAPI.swift in Sources */,
+				A9F1AAF6CE029DD3B4F8AC841F0B6BC6 /* FakeClassnameTags123API.swift in Sources */,
+				FECA03F0388E84AE1B22638605D8AC9F /* File.swift in Sources */,
+				491676EC91BFEF95A12556888EED87B5 /* FileSchemaTestClass.swift in Sources */,
+				36734C4EB3362A114A7CB5F25EE39E6D /* FormatTest.swift in Sources */,
+				DDBC3CF5E447D8D838F0FE200420EEE3 /* HasOnlyReadOnly.swift in Sources */,
+				16E9A5E22B4823DE282E7F4C18A21EA8 /* JSONEncodableEncoding.swift in Sources */,
+				12BB95C66D63090732BB9E0379836E3C /* JSONEncodingHelper.swift in Sources */,
+				C1CACABE18A7ADCE37D1CD9DC9128304 /* List.swift in Sources */,
+				655AA371771C7BD72EE0AAC0C90DFFF0 /* MapTest.swift in Sources */,
+				D3A17B7FAFA8A7A210875BBCDCC30116 /* MixedPropertiesAndAdditionalPropertiesClass.swift in Sources */,
+				2DF4544D4D3D6CF7047A59FB89ED31BD /* Model200Response.swift in Sources */,
+				F02BEF9A8503B3848B045370451E85F6 /* Models.swift in Sources */,
+				C15AC1CC631E96D0360EB8C15BF30452 /* Name.swift in Sources */,
+				AE9D2E1DB59AF6575AC4AC6756C5A937 /* NumberOnly.swift in Sources */,
+				59C2F5495C98836BFA9E10BF5C13BC2C /* Order.swift in Sources */,
+				82D4D0C8AD0354A700C8ACD421ABED55 /* OuterComposite.swift in Sources */,
+				1143FFF06DEE01E5B0F1368AA05BE1B4 /* OuterEnum.swift in Sources */,
+				B399A1742F23330FDCA450EAB98F51F1 /* Pet.swift in Sources */,
+				3D8E407B1DF4FA5A5F16B64E3A285781 /* PetAPI.swift in Sources */,
+				293F4E0FBFC8297E414A3CDBB7F29A96 /* ReadOnlyFirst.swift in Sources */,
+				F21D10C71A9DE7D0467AFD23FD391D2E /* Return.swift in Sources */,
+				E2C40F0E34DB8C21A806262C72841A51 /* SpecialModelName.swift in Sources */,
+				122BBAE8245606CC040EEB6B9254E376 /* StoreAPI.swift in Sources */,
+				196E9846B27D736630CCF90497696859 /* StringBooleanMap.swift in Sources */,
+				E51ADEC931806B20A041303E539A8BE2 /* Tag.swift in Sources */,
+				6600BB1500AE35A3C80F7C83F6444552 /* TypeHolderDefault.swift in Sources */,
+				FB4A053CDCD75E48B755CC22D463A3FC /* TypeHolderExample.swift in Sources */,
+				BF7D58FBCF5E4D3F2932FCC0E62BED40 /* User.swift in Sources */,
+				DB724C4F1AD5DF025B53A9A2E0A49E3D /* UserAPI.swift in Sources */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+/* End PBXSourcesBuildPhase section */
+
+/* Begin XCBuildConfiguration section */
+		3B2C02AFB91CB5C82766ED5CF21FF628 /* Release */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				APPLICATION_EXTENSION_API_ONLY = YES;
+				CODE_SIGN_IDENTITY = "";
+				CURRENT_PROJECT_VERSION = 1;
+				DEFINES_MODULE = YES;
+				DYLIB_COMPATIBILITY_VERSION = 1;
+				DYLIB_CURRENT_VERSION = 1;
+				DYLIB_INSTALL_NAME_BASE = "@rpath";
+				FRAMEWORK_SEARCH_PATHS = (
+					"$(inherited)",
+					"$(PROJECT_DIR)/Carthage/Build/iOS",
+				);
+				INFOPLIST_FILE = Info.plist;
+				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
+				IPHONEOS_DEPLOYMENT_TARGET = 10.0;
+				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
+				SDKROOT = iphoneos;
+				SKIP_INSTALL = YES;
+				TARGETED_DEVICE_FAMILY = "1,2";
+				VERSIONING_SYSTEM = "apple-generic";
+			};
+			name = Release;
+		};
+		A9EB0A02B94C427CBACFEC7CFFC6A816 /* Debug */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				ALWAYS_SEARCH_USER_PATHS = NO;
+				CLANG_ANALYZER_NONNULL = YES;
+				CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
+				CLANG_CXX_LANGUAGE_STANDARD = "gnu++14";
+				CLANG_CXX_LIBRARY = "libc++";
+				CLANG_ENABLE_MODULES = YES;
+				CLANG_ENABLE_OBJC_ARC = YES;
+				CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
+				CLANG_WARN_BOOL_CONVERSION = YES;
+				CLANG_WARN_COMMA = YES;
+				CLANG_WARN_CONSTANT_CONVERSION = YES;
+				CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
+				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
+				CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
+				CLANG_WARN_EMPTY_BODY = YES;
+				CLANG_WARN_ENUM_CONVERSION = YES;
+				CLANG_WARN_INFINITE_RECURSION = YES;
+				CLANG_WARN_INT_CONVERSION = YES;
+				CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
+				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
+				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
+				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
+				CLANG_WARN_STRICT_PROTOTYPES = YES;
+				CLANG_WARN_SUSPICIOUS_MOVE = YES;
+				CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
+				CLANG_WARN_UNREACHABLE_CODE = YES;
+				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
+				COPY_PHASE_STRIP = NO;
+				DEBUG_INFORMATION_FORMAT = dwarf;
+				ENABLE_STRICT_OBJC_MSGSEND = YES;
+				ENABLE_TESTABILITY = YES;
+				GCC_C_LANGUAGE_STANDARD = gnu11;
+				GCC_DYNAMIC_NO_PIC = NO;
+				GCC_NO_COMMON_BLOCKS = YES;
+				GCC_OPTIMIZATION_LEVEL = 0;
+				GCC_PREPROCESSOR_DEFINITIONS = (
+					"$(inherited)",
+					"DEBUG=1",
+				);
+				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
+				GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
+				GCC_WARN_UNDECLARED_SELECTOR = YES;
+				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
+				GCC_WARN_UNUSED_FUNCTION = YES;
+				GCC_WARN_UNUSED_VARIABLE = YES;
+				MTL_ENABLE_DEBUG_INFO = YES;
+				ONLY_ACTIVE_ARCH = YES;
+				PRODUCT_NAME = "$(TARGET_NAME)";
+				SDKROOT = iphoneos;
+				SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
+				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
+				SWIFT_VERSION = 4.2;
+			};
+			name = Debug;
+		};
+		DD3EEB93949E9EBA4437E9CDBF4A26F6 /* Debug */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				APPLICATION_EXTENSION_API_ONLY = YES;
+				CODE_SIGN_IDENTITY = "";
+				CURRENT_PROJECT_VERSION = 1;
+				DEFINES_MODULE = YES;
+				DYLIB_COMPATIBILITY_VERSION = 1;
+				DYLIB_CURRENT_VERSION = 1;
+				DYLIB_INSTALL_NAME_BASE = "@rpath";
+				FRAMEWORK_SEARCH_PATHS = (
+					"$(inherited)",
+					"$(PROJECT_DIR)/Carthage/Build/iOS",
+				);
+				INFOPLIST_FILE = Info.plist;
+				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
+				IPHONEOS_DEPLOYMENT_TARGET = 10.0;
+				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
+				SDKROOT = iphoneos;
+				SKIP_INSTALL = YES;
+				TARGETED_DEVICE_FAMILY = "1,2";
+				VERSIONING_SYSTEM = "apple-generic";
+			};
+			name = Debug;
+		};
+		F81D4E5FECD46E9AA6DD2C299CEBEF64 /* Release */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				ALWAYS_SEARCH_USER_PATHS = NO;
+				CLANG_ANALYZER_NONNULL = YES;
+				CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
+				CLANG_CXX_LANGUAGE_STANDARD = "gnu++14";
+				CLANG_CXX_LIBRARY = "libc++";
+				CLANG_ENABLE_MODULES = YES;
+				CLANG_ENABLE_OBJC_ARC = YES;
+				CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
+				CLANG_WARN_BOOL_CONVERSION = YES;
+				CLANG_WARN_COMMA = YES;
+				CLANG_WARN_CONSTANT_CONVERSION = YES;
+				CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
+				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
+				CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
+				CLANG_WARN_EMPTY_BODY = YES;
+				CLANG_WARN_ENUM_CONVERSION = YES;
+				CLANG_WARN_INFINITE_RECURSION = YES;
+				CLANG_WARN_INT_CONVERSION = YES;
+				CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
+				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
+				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
+				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
+				CLANG_WARN_STRICT_PROTOTYPES = YES;
+				CLANG_WARN_SUSPICIOUS_MOVE = YES;
+				CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
+				CLANG_WARN_UNREACHABLE_CODE = YES;
+				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
+				COPY_PHASE_STRIP = NO;
+				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
+				ENABLE_NS_ASSERTIONS = NO;
+				ENABLE_STRICT_OBJC_MSGSEND = YES;
+				GCC_C_LANGUAGE_STANDARD = gnu11;
+				GCC_NO_COMMON_BLOCKS = YES;
+				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
+				GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
+				GCC_WARN_UNDECLARED_SELECTOR = YES;
+				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
+				GCC_WARN_UNUSED_FUNCTION = YES;
+				GCC_WARN_UNUSED_VARIABLE = YES;
+				PRODUCT_NAME = "$(TARGET_NAME)";
+				SDKROOT = iphoneos;
+				SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
+				SWIFT_VERSION = 4.2;
+				VALIDATE_PRODUCT = YES;
+			};
+			name = Release;
+		};
+/* End XCBuildConfiguration section */
+
+/* Begin XCConfigurationList section */
+		B46EDEB1A7F0D78FE6394544C60169D1 /* Build configuration list for PBXNativeTarget "PetstoreClient" */ = {
+			isa = XCConfigurationList;
+			buildConfigurations = (
+				DD3EEB93949E9EBA4437E9CDBF4A26F6 /* Debug */,
+				3B2C02AFB91CB5C82766ED5CF21FF628 /* Release */,
+			);
+			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = "";
+		};
+		ECAB17FF35111B5E14DAAC0883031714 /* Build configuration list for PBXProject "PetstoreClient" */ = {
+			isa = XCConfigurationList;
+			buildConfigurations = (
+				A9EB0A02B94C427CBACFEC7CFFC6A816 /* Debug */,
+				F81D4E5FECD46E9AA6DD2C299CEBEF64 /* Release */,
+			);
+			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Debug;
+		};
+/* End XCConfigurationList section */
+	};
+	rootObject = E7D276EE2369D8C455513C2E05F9AED0 /* Project object */;
+}
diff --git a/samples/client/petstore/swift4/default/PetstoreClient.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/samples/client/petstore/swift4/default/PetstoreClient.xcodeproj/project.xcworkspace/contents.xcworkspacedata
new file mode 100644
index 0000000000..919434a625
--- /dev/null
+++ b/samples/client/petstore/swift4/default/PetstoreClient.xcodeproj/project.xcworkspace/contents.xcworkspacedata
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Workspace
+   version = "1.0">
+   <FileRef
+      location = "self:">
+   </FileRef>
+</Workspace>
diff --git a/samples/client/petstore/swift4/default/PetstoreClient.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/samples/client/petstore/swift4/default/PetstoreClient.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist
new file mode 100644
index 0000000000..18d981003d
--- /dev/null
+++ b/samples/client/petstore/swift4/default/PetstoreClient.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>IDEDidComputeMac32BitWarning</key>
+	<true/>
+</dict>
+</plist>
diff --git a/samples/client/petstore/swift4/default/PetstoreClient.xcodeproj/xcshareddata/xcschemes/PetstoreClient.xcscheme b/samples/client/petstore/swift4/default/PetstoreClient.xcodeproj/xcshareddata/xcschemes/PetstoreClient.xcscheme
new file mode 100644
index 0000000000..7802e37945
--- /dev/null
+++ b/samples/client/petstore/swift4/default/PetstoreClient.xcodeproj/xcshareddata/xcschemes/PetstoreClient.xcscheme
@@ -0,0 +1,96 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Scheme
+   LastUpgradeVersion = "1000"
+   version = "1.3">
+   <BuildAction
+      parallelizeBuildables = "YES"
+      buildImplicitDependencies = "YES">
+      <BuildActionEntries>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "YES"
+            buildForProfiling = "YES"
+            buildForArchiving = "YES"
+            buildForAnalyzing = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "C1282C2230015E0D204BEAEDDFB49453"
+               BuildableName = "PetstoreClient.framework"
+               BlueprintName = "PetstoreClient"
+               ReferencedContainer = "container:PetstoreClient.xcodeproj">
+            </BuildableReference>
+         </BuildActionEntry>
+      </BuildActionEntries>
+   </BuildAction>
+   <TestAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      shouldUseLaunchSchemeArgsEnv = "YES">
+      <Testables>
+      </Testables>
+      <MacroExpansion>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "C1282C2230015E0D204BEAEDDFB49453"
+            BuildableName = "PetstoreClient.framework"
+            BlueprintName = "PetstoreClient"
+            ReferencedContainer = "container:PetstoreClient.xcodeproj">
+         </BuildableReference>
+      </MacroExpansion>
+      <CommandLineArguments>
+      </CommandLineArguments>
+      <AdditionalOptions>
+      </AdditionalOptions>
+   </TestAction>
+   <LaunchAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      launchStyle = "0"
+      useCustomWorkingDirectory = "NO"
+      ignoresPersistentStateOnLaunch = "NO"
+      debugDocumentVersioning = "YES"
+      debugServiceExtension = "internal"
+      allowLocationSimulation = "YES">
+      <MacroExpansion>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "C1282C2230015E0D204BEAEDDFB49453"
+            BuildableName = "PetstoreClient.framework"
+            BlueprintName = "PetstoreClient"
+            ReferencedContainer = "container:PetstoreClient.xcodeproj">
+         </BuildableReference>
+      </MacroExpansion>
+      <CommandLineArguments>
+      </CommandLineArguments>
+      <AdditionalOptions>
+      </AdditionalOptions>
+   </LaunchAction>
+   <ProfileAction
+      buildConfiguration = "Release"
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      savedToolIdentifier = ""
+      useCustomWorkingDirectory = "NO"
+      debugDocumentVersioning = "YES">
+      <BuildableProductRunnable
+         runnableDebuggingMode = "0">
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "C1282C2230015E0D204BEAEDDFB49453"
+            BuildableName = "PetstoreClient.framework"
+            BlueprintName = "PetstoreClient"
+            ReferencedContainer = "container:PetstoreClient.xcodeproj">
+         </BuildableReference>
+      </BuildableProductRunnable>
+      <CommandLineArguments>
+      </CommandLineArguments>
+   </ProfileAction>
+   <AnalyzeAction
+      buildConfiguration = "Debug">
+   </AnalyzeAction>
+   <ArchiveAction
+      buildConfiguration = "Release"
+      revealArchiveInOrganizer = "YES">
+   </ArchiveAction>
+</Scheme>
diff --git a/samples/client/petstore/swift4/default/PetstoreClient/Classes/OpenAPIs/APIHelper.swift b/samples/client/petstore/swift4/default/PetstoreClient/Classes/OpenAPIs/APIHelper.swift
index d94614b34f..75dea24395 100644
--- a/samples/client/petstore/swift4/default/PetstoreClient/Classes/OpenAPIs/APIHelper.swift
+++ b/samples/client/petstore/swift4/default/PetstoreClient/Classes/OpenAPIs/APIHelper.swift
@@ -7,7 +7,7 @@
 import Foundation
 
 public struct APIHelper {
-    public static func rejectNil(_ source: [String:Any?]) -> [String:Any]? {
+    public static func rejectNil(_ source: [String: Any?]) -> [String: Any]? {
         let destination = source.reduce(into: [String: Any]()) { (result, item) in
             if let value = item.value {
                 result[item.key] = value
@@ -20,17 +20,17 @@ public struct APIHelper {
         return destination
     }
 
-    public static func rejectNilHeaders(_ source: [String:Any?]) -> [String:String] {
+    public static func rejectNilHeaders(_ source: [String: Any?]) -> [String: String] {
         return source.reduce(into: [String: String]()) { (result, item) in
             if let collection = item.value as? Array<Any?> {
-                result[item.key] = collection.filter({ $0 != nil }).map{ "\($0!)" }.joined(separator: ",")
+                result[item.key] = collection.filter({ $0 != nil }).map { "\($0!)" }.joined(separator: ",")
             } else if let value: Any = item.value {
                 result[item.key] = "\(value)"
             }
         }
     }
 
-    public static func convertBoolToString(_ source: [String: Any]?) -> [String:Any]? {
+    public static func convertBoolToString(_ source: [String: Any]?) -> [String: Any]? {
         guard let source = source else {
             return nil
         }
@@ -52,7 +52,7 @@ public struct APIHelper {
         return source
     }
 
-    public static func mapValuesToQueryItems(_ source: [String:Any?]) -> [URLQueryItem]? {
+    public static func mapValuesToQueryItems(_ source: [String: Any?]) -> [URLQueryItem]? {
         let destination = source.filter({ $0.value != nil}).reduce(into: [URLQueryItem]()) { (result, item) in
             if let collection = item.value as? Array<Any?> {
                 let value = collection.filter({ $0 != nil }).map({"\($0!)"}).joined(separator: ",")
@@ -68,4 +68,3 @@ public struct APIHelper {
         return destination
     }
 }
-
diff --git a/samples/client/petstore/swift4/default/PetstoreClient/Classes/OpenAPIs/APIs.swift b/samples/client/petstore/swift4/default/PetstoreClient/Classes/OpenAPIs/APIs.swift
index 2890bffa27..9e4312f685 100644
--- a/samples/client/petstore/swift4/default/PetstoreClient/Classes/OpenAPIs/APIs.swift
+++ b/samples/client/petstore/swift4/default/PetstoreClient/Classes/OpenAPIs/APIs.swift
@@ -9,22 +9,22 @@ import Foundation
 open class PetstoreClientAPI {
     public static var basePath = "http://petstore.swagger.io:80/v2"
     public static var credential: URLCredential?
-    public static var customHeaders: [String:String] = [:]
+    public static var customHeaders: [String: String] = [:]
     public static var requestBuilderFactory: RequestBuilderFactory = AlamofireRequestBuilderFactory()
 }
 
 open class RequestBuilder<T> {
     var credential: URLCredential?
-    var headers: [String:String]
-    public let parameters: [String:Any]?
+    var headers: [String: String]
+    public let parameters: [String: Any]?
     public let isBody: Bool
     public let method: String
     public let URLString: String
 
     /// Optional block to obtain a reference to the request's progress instance when available.
-    public var onProgressReady: ((Progress) -> ())?
+    public var onProgressReady: ((Progress) -> Void)?
 
-    required public init(method: String, URLString: String, parameters: [String:Any]?, isBody: Bool, headers: [String:String] = [:]) {
+    required public init(method: String, URLString: String, parameters: [String: Any]?, isBody: Bool, headers: [String: String] = [:]) {
         self.method = method
         self.URLString = URLString
         self.parameters = parameters
@@ -34,7 +34,7 @@ open class RequestBuilder<T> {
         addHeaders(PetstoreClientAPI.customHeaders)
     }
 
-    open func addHeaders(_ aHeaders:[String:String]) {
+    open func addHeaders(_ aHeaders: [String: String]) {
         for (header, value) in aHeaders {
             headers[header] = value
         }
@@ -57,5 +57,5 @@ open class RequestBuilder<T> {
 
 public protocol RequestBuilderFactory {
     func getNonDecodableBuilder<T>() -> RequestBuilder<T>.Type
-    func getBuilder<T:Decodable>() -> RequestBuilder<T>.Type
+    func getBuilder<T: Decodable>() -> RequestBuilder<T>.Type
 }
diff --git a/samples/client/petstore/swift4/default/PetstoreClient/Classes/OpenAPIs/APIs/AnotherFakeAPI.swift b/samples/client/petstore/swift4/default/PetstoreClient/Classes/OpenAPIs/APIs/AnotherFakeAPI.swift
index ffecb66c48..30b346de0e 100644
--- a/samples/client/petstore/swift4/default/PetstoreClient/Classes/OpenAPIs/APIs/AnotherFakeAPI.swift
+++ b/samples/client/petstore/swift4/default/PetstoreClient/Classes/OpenAPIs/APIs/AnotherFakeAPI.swift
@@ -8,8 +8,6 @@
 import Foundation
 import Alamofire
 
-
-
 open class AnotherFakeAPI {
     /**
      To test special tags
@@ -17,7 +15,7 @@ open class AnotherFakeAPI {
      - parameter body: (body) client model 
      - parameter completion: completion handler to receive the data and the error objects
      */
-    open class func call123testSpecialTags(body: Client, completion: @escaping ((_ data: Client?,_ error: Error?) -> Void)) {
+    open class func call123testSpecialTags(body: Client, completion: @escaping ((_ data: Client?, _ error: Error?) -> Void)) {
         call123testSpecialTagsWithRequestBuilder(body: body).execute { (response, error) -> Void in
             completion(response?.body, error)
         }
diff --git a/samples/client/petstore/swift4/default/PetstoreClient/Classes/OpenAPIs/APIs/FakeAPI.swift b/samples/client/petstore/swift4/default/PetstoreClient/Classes/OpenAPIs/APIs/FakeAPI.swift
index 302767c2b0..1073935592 100644
--- a/samples/client/petstore/swift4/default/PetstoreClient/Classes/OpenAPIs/APIs/FakeAPI.swift
+++ b/samples/client/petstore/swift4/default/PetstoreClient/Classes/OpenAPIs/APIs/FakeAPI.swift
@@ -8,15 +8,13 @@
 import Foundation
 import Alamofire
 
-
-
 open class FakeAPI {
     /**
 
      - parameter body: (body) Input boolean as post body (optional)
      - parameter completion: completion handler to receive the data and the error objects
      */
-    open class func fakeOuterBooleanSerialize(body: Bool? = nil, completion: @escaping ((_ data: Bool?,_ error: Error?) -> Void)) {
+    open class func fakeOuterBooleanSerialize(body: Bool? = nil, completion: @escaping ((_ data: Bool?, _ error: Error?) -> Void)) {
         fakeOuterBooleanSerializeWithRequestBuilder(body: body).execute { (response, error) -> Void in
             completion(response?.body, error)
         }
@@ -45,7 +43,7 @@ open class FakeAPI {
      - parameter body: (body) Input composite as post body (optional)
      - parameter completion: completion handler to receive the data and the error objects
      */
-    open class func fakeOuterCompositeSerialize(body: OuterComposite? = nil, completion: @escaping ((_ data: OuterComposite?,_ error: Error?) -> Void)) {
+    open class func fakeOuterCompositeSerialize(body: OuterComposite? = nil, completion: @escaping ((_ data: OuterComposite?, _ error: Error?) -> Void)) {
         fakeOuterCompositeSerializeWithRequestBuilder(body: body).execute { (response, error) -> Void in
             completion(response?.body, error)
         }
@@ -74,7 +72,7 @@ open class FakeAPI {
      - parameter body: (body) Input number as post body (optional)
      - parameter completion: completion handler to receive the data and the error objects
      */
-    open class func fakeOuterNumberSerialize(body: Double? = nil, completion: @escaping ((_ data: Double?,_ error: Error?) -> Void)) {
+    open class func fakeOuterNumberSerialize(body: Double? = nil, completion: @escaping ((_ data: Double?, _ error: Error?) -> Void)) {
         fakeOuterNumberSerializeWithRequestBuilder(body: body).execute { (response, error) -> Void in
             completion(response?.body, error)
         }
@@ -103,7 +101,7 @@ open class FakeAPI {
      - parameter body: (body) Input string as post body (optional)
      - parameter completion: completion handler to receive the data and the error objects
      */
-    open class func fakeOuterStringSerialize(body: String? = nil, completion: @escaping ((_ data: String?,_ error: Error?) -> Void)) {
+    open class func fakeOuterStringSerialize(body: String? = nil, completion: @escaping ((_ data: String?, _ error: Error?) -> Void)) {
         fakeOuterStringSerializeWithRequestBuilder(body: body).execute { (response, error) -> Void in
             completion(response?.body, error)
         }
@@ -132,7 +130,7 @@ open class FakeAPI {
      - parameter body: (body)  
      - parameter completion: completion handler to receive the data and the error objects
      */
-    open class func testBodyWithFileSchema(body: FileSchemaTestClass, completion: @escaping ((_ data: Void?,_ error: Error?) -> Void)) {
+    open class func testBodyWithFileSchema(body: FileSchemaTestClass, completion: @escaping ((_ data: Void?, _ error: Error?) -> Void)) {
         testBodyWithFileSchemaWithRequestBuilder(body: body).execute { (response, error) -> Void in
             if error == nil {
                 completion((), error)
@@ -166,7 +164,7 @@ open class FakeAPI {
      - parameter body: (body)  
      - parameter completion: completion handler to receive the data and the error objects
      */
-    open class func testBodyWithQueryParams(query: String, body: User, completion: @escaping ((_ data: Void?,_ error: Error?) -> Void)) {
+    open class func testBodyWithQueryParams(query: String, body: User, completion: @escaping ((_ data: Void?, _ error: Error?) -> Void)) {
         testBodyWithQueryParamsWithRequestBuilder(query: query, body: body).execute { (response, error) -> Void in
             if error == nil {
                 completion((), error)
@@ -203,7 +201,7 @@ open class FakeAPI {
      - parameter body: (body) client model 
      - parameter completion: completion handler to receive the data and the error objects
      */
-    open class func testClientModel(body: Client, completion: @escaping ((_ data: Client?,_ error: Error?) -> Void)) {
+    open class func testClientModel(body: Client, completion: @escaping ((_ data: Client?, _ error: Error?) -> Void)) {
         testClientModelWithRequestBuilder(body: body).execute { (response, error) -> Void in
             completion(response?.body, error)
         }
@@ -247,7 +245,7 @@ open class FakeAPI {
      - parameter callback: (form) None (optional)
      - parameter completion: completion handler to receive the data and the error objects
      */
-    open class func testEndpointParameters(number: Double, double: Double, patternWithoutDelimiter: String, byte: Data, integer: Int? = nil, int32: Int? = nil, int64: Int64? = nil, float: Float? = nil, string: String? = nil, binary: URL? = nil, date: Date? = nil, dateTime: Date? = nil, password: String? = nil, callback: String? = nil, completion: @escaping ((_ data: Void?,_ error: Error?) -> Void)) {
+    open class func testEndpointParameters(number: Double, double: Double, patternWithoutDelimiter: String, byte: Data, integer: Int? = nil, int32: Int? = nil, int64: Int64? = nil, float: Float? = nil, string: String? = nil, binary: URL? = nil, date: Date? = nil, dateTime: Date? = nil, password: String? = nil, callback: String? = nil, completion: @escaping ((_ data: Void?, _ error: Error?) -> Void)) {
         testEndpointParametersWithRequestBuilder(number: number, double: double, patternWithoutDelimiter: patternWithoutDelimiter, byte: byte, integer: integer, int32: int32, int64: int64, float: float, string: string, binary: binary, date: date, dateTime: dateTime, password: password, callback: callback).execute { (response, error) -> Void in
             if error == nil {
                 completion((), error)
@@ -283,7 +281,7 @@ open class FakeAPI {
     open class func testEndpointParametersWithRequestBuilder(number: Double, double: Double, patternWithoutDelimiter: String, byte: Data, integer: Int? = nil, int32: Int? = nil, int64: Int64? = nil, float: Float? = nil, string: String? = nil, binary: URL? = nil, date: Date? = nil, dateTime: Date? = nil, password: String? = nil, callback: String? = nil) -> RequestBuilder<Void> {
         let path = "/fake"
         let URLString = PetstoreClientAPI.basePath + path
-        let formParams: [String:Any?] = [
+        let formParams: [String: Any?] = [
             "integer": integer?.encodeToJSON(),
             "int32": int32?.encodeToJSON(),
             "int64": int64?.encodeToJSON(),
@@ -302,7 +300,7 @@ open class FakeAPI {
 
         let nonNullParameters = APIHelper.rejectNil(formParams)
         let parameters = APIHelper.convertBoolToString(nonNullParameters)
-        
+
         let url = URLComponents(string: URLString)
 
         let requestBuilder: RequestBuilder<Void>.Type = PetstoreClientAPI.requestBuilderFactory.getNonDecodableBuilder()
@@ -390,7 +388,7 @@ open class FakeAPI {
      - parameter enumFormString: (form) Form parameter enum test (string) (optional, default to .-efg)
      - parameter completion: completion handler to receive the data and the error objects
      */
-    open class func testEnumParameters(enumHeaderStringArray: [String]? = nil, enumHeaderString: EnumHeaderString_testEnumParameters? = nil, enumQueryStringArray: [String]? = nil, enumQueryString: EnumQueryString_testEnumParameters? = nil, enumQueryInteger: EnumQueryInteger_testEnumParameters? = nil, enumQueryDouble: EnumQueryDouble_testEnumParameters? = nil, enumFormStringArray: [String]? = nil, enumFormString: EnumFormString_testEnumParameters? = nil, completion: @escaping ((_ data: Void?,_ error: Error?) -> Void)) {
+    open class func testEnumParameters(enumHeaderStringArray: [String]? = nil, enumHeaderString: EnumHeaderString_testEnumParameters? = nil, enumQueryStringArray: [String]? = nil, enumQueryString: EnumQueryString_testEnumParameters? = nil, enumQueryInteger: EnumQueryInteger_testEnumParameters? = nil, enumQueryDouble: EnumQueryDouble_testEnumParameters? = nil, enumFormStringArray: [String]? = nil, enumFormString: EnumFormString_testEnumParameters? = nil, completion: @escaping ((_ data: Void?, _ error: Error?) -> Void)) {
         testEnumParametersWithRequestBuilder(enumHeaderStringArray: enumHeaderStringArray, enumHeaderString: enumHeaderString, enumQueryStringArray: enumQueryStringArray, enumQueryString: enumQueryString, enumQueryInteger: enumQueryInteger, enumQueryDouble: enumQueryDouble, enumFormStringArray: enumFormStringArray, enumFormString: enumFormString).execute { (response, error) -> Void in
             if error == nil {
                 completion((), error)
@@ -417,19 +415,19 @@ open class FakeAPI {
     open class func testEnumParametersWithRequestBuilder(enumHeaderStringArray: [String]? = nil, enumHeaderString: EnumHeaderString_testEnumParameters? = nil, enumQueryStringArray: [String]? = nil, enumQueryString: EnumQueryString_testEnumParameters? = nil, enumQueryInteger: EnumQueryInteger_testEnumParameters? = nil, enumQueryDouble: EnumQueryDouble_testEnumParameters? = nil, enumFormStringArray: [String]? = nil, enumFormString: EnumFormString_testEnumParameters? = nil) -> RequestBuilder<Void> {
         let path = "/fake"
         let URLString = PetstoreClientAPI.basePath + path
-        let formParams: [String:Any?] = [
+        let formParams: [String: Any?] = [
             "enum_form_string_array": enumFormStringArray,
             "enum_form_string": enumFormString?.rawValue
         ]
 
         let nonNullParameters = APIHelper.rejectNil(formParams)
         let parameters = APIHelper.convertBoolToString(nonNullParameters)
-        
+
         var url = URLComponents(string: URLString)
         url?.queryItems = APIHelper.mapValuesToQueryItems([
-            "enum_query_string_array": enumQueryStringArray, 
-            "enum_query_string": enumQueryString?.rawValue, 
-            "enum_query_integer": enumQueryInteger?.rawValue, 
+            "enum_query_string_array": enumQueryStringArray,
+            "enum_query_string": enumQueryString?.rawValue,
+            "enum_query_integer": enumQueryInteger?.rawValue,
             "enum_query_double": enumQueryDouble?.rawValue
         ])
         let nillableHeaders: [String: Any?] = [
@@ -454,7 +452,7 @@ open class FakeAPI {
      - parameter int64Group: (query) Integer in group parameters (optional)
      - parameter completion: completion handler to receive the data and the error objects
      */
-    open class func testGroupParameters(requiredStringGroup: Int, requiredBooleanGroup: Bool, requiredInt64Group: Int64, stringGroup: Int? = nil, booleanGroup: Bool? = nil, int64Group: Int64? = nil, completion: @escaping ((_ data: Void?,_ error: Error?) -> Void)) {
+    open class func testGroupParameters(requiredStringGroup: Int, requiredBooleanGroup: Bool, requiredInt64Group: Int64, stringGroup: Int? = nil, booleanGroup: Bool? = nil, int64Group: Int64? = nil, completion: @escaping ((_ data: Void?, _ error: Error?) -> Void)) {
         testGroupParametersWithRequestBuilder(requiredStringGroup: requiredStringGroup, requiredBooleanGroup: requiredBooleanGroup, requiredInt64Group: requiredInt64Group, stringGroup: stringGroup, booleanGroup: booleanGroup, int64Group: int64Group).execute { (response, error) -> Void in
             if error == nil {
                 completion((), error)
@@ -479,13 +477,13 @@ open class FakeAPI {
     open class func testGroupParametersWithRequestBuilder(requiredStringGroup: Int, requiredBooleanGroup: Bool, requiredInt64Group: Int64, stringGroup: Int? = nil, booleanGroup: Bool? = nil, int64Group: Int64? = nil) -> RequestBuilder<Void> {
         let path = "/fake"
         let URLString = PetstoreClientAPI.basePath + path
-        let parameters: [String:Any]? = nil
-        
+        let parameters: [String: Any]? = nil
+
         var url = URLComponents(string: URLString)
         url?.queryItems = APIHelper.mapValuesToQueryItems([
-            "required_string_group": requiredStringGroup.encodeToJSON(), 
-            "required_int64_group": requiredInt64Group.encodeToJSON(), 
-            "string_group": stringGroup?.encodeToJSON(), 
+            "required_string_group": requiredStringGroup.encodeToJSON(),
+            "required_int64_group": requiredInt64Group.encodeToJSON(),
+            "string_group": stringGroup?.encodeToJSON(),
             "int64_group": int64Group?.encodeToJSON()
         ])
         let nillableHeaders: [String: Any?] = [
@@ -505,7 +503,7 @@ open class FakeAPI {
      - parameter param: (body) request body 
      - parameter completion: completion handler to receive the data and the error objects
      */
-    open class func testInlineAdditionalProperties(param: [String:String], completion: @escaping ((_ data: Void?,_ error: Error?) -> Void)) {
+    open class func testInlineAdditionalProperties(param: [String: String], completion: @escaping ((_ data: Void?, _ error: Error?) -> Void)) {
         testInlineAdditionalPropertiesWithRequestBuilder(param: param).execute { (response, error) -> Void in
             if error == nil {
                 completion((), error)
@@ -521,7 +519,7 @@ open class FakeAPI {
      - parameter param: (body) request body 
      - returns: RequestBuilder<Void> 
      */
-    open class func testInlineAdditionalPropertiesWithRequestBuilder(param: [String:String]) -> RequestBuilder<Void> {
+    open class func testInlineAdditionalPropertiesWithRequestBuilder(param: [String: String]) -> RequestBuilder<Void> {
         let path = "/fake/inline-additionalProperties"
         let URLString = PetstoreClientAPI.basePath + path
         let parameters = JSONEncodingHelper.encodingParameters(forEncodableObject: param)
@@ -540,7 +538,7 @@ open class FakeAPI {
      - parameter param2: (form) field2 
      - parameter completion: completion handler to receive the data and the error objects
      */
-    open class func testJsonFormData(param: String, param2: String, completion: @escaping ((_ data: Void?,_ error: Error?) -> Void)) {
+    open class func testJsonFormData(param: String, param2: String, completion: @escaping ((_ data: Void?, _ error: Error?) -> Void)) {
         testJsonFormDataWithRequestBuilder(param: param, param2: param2).execute { (response, error) -> Void in
             if error == nil {
                 completion((), error)
@@ -560,14 +558,14 @@ open class FakeAPI {
     open class func testJsonFormDataWithRequestBuilder(param: String, param2: String) -> RequestBuilder<Void> {
         let path = "/fake/jsonFormData"
         let URLString = PetstoreClientAPI.basePath + path
-        let formParams: [String:Any?] = [
+        let formParams: [String: Any?] = [
             "param": param,
             "param2": param2
         ]
 
         let nonNullParameters = APIHelper.rejectNil(formParams)
         let parameters = APIHelper.convertBoolToString(nonNullParameters)
-        
+
         let url = URLComponents(string: URLString)
 
         let requestBuilder: RequestBuilder<Void>.Type = PetstoreClientAPI.requestBuilderFactory.getNonDecodableBuilder()
diff --git a/samples/client/petstore/swift4/default/PetstoreClient/Classes/OpenAPIs/APIs/FakeClassnameTags123API.swift b/samples/client/petstore/swift4/default/PetstoreClient/Classes/OpenAPIs/APIs/FakeClassnameTags123API.swift
index ddfeae23ed..6bfa09016f 100644
--- a/samples/client/petstore/swift4/default/PetstoreClient/Classes/OpenAPIs/APIs/FakeClassnameTags123API.swift
+++ b/samples/client/petstore/swift4/default/PetstoreClient/Classes/OpenAPIs/APIs/FakeClassnameTags123API.swift
@@ -8,8 +8,6 @@
 import Foundation
 import Alamofire
 
-
-
 open class FakeClassnameTags123API {
     /**
      To test class name in snake case
@@ -17,7 +15,7 @@ open class FakeClassnameTags123API {
      - parameter body: (body) client model 
      - parameter completion: completion handler to receive the data and the error objects
      */
-    open class func testClassname(body: Client, completion: @escaping ((_ data: Client?,_ error: Error?) -> Void)) {
+    open class func testClassname(body: Client, completion: @escaping ((_ data: Client?, _ error: Error?) -> Void)) {
         testClassnameWithRequestBuilder(body: body).execute { (response, error) -> Void in
             completion(response?.body, error)
         }
diff --git a/samples/client/petstore/swift4/default/PetstoreClient/Classes/OpenAPIs/APIs/PetAPI.swift b/samples/client/petstore/swift4/default/PetstoreClient/Classes/OpenAPIs/APIs/PetAPI.swift
index 0a5dfeb39b..896f151180 100644
--- a/samples/client/petstore/swift4/default/PetstoreClient/Classes/OpenAPIs/APIs/PetAPI.swift
+++ b/samples/client/petstore/swift4/default/PetstoreClient/Classes/OpenAPIs/APIs/PetAPI.swift
@@ -8,8 +8,6 @@
 import Foundation
 import Alamofire
 
-
-
 open class PetAPI {
     /**
      Add a new pet to the store
@@ -17,7 +15,7 @@ open class PetAPI {
      - parameter body: (body) Pet object that needs to be added to the store 
      - parameter completion: completion handler to receive the data and the error objects
      */
-    open class func addPet(body: Pet, completion: @escaping ((_ data: Void?,_ error: Error?) -> Void)) {
+    open class func addPet(body: Pet, completion: @escaping ((_ data: Void?, _ error: Error?) -> Void)) {
         addPetWithRequestBuilder(body: body).execute { (response, error) -> Void in
             if error == nil {
                 completion((), error)
@@ -55,7 +53,7 @@ open class PetAPI {
      - parameter apiKey: (header)  (optional)
      - parameter completion: completion handler to receive the data and the error objects
      */
-    open class func deletePet(petId: Int64, apiKey: String? = nil, completion: @escaping ((_ data: Void?,_ error: Error?) -> Void)) {
+    open class func deletePet(petId: Int64, apiKey: String? = nil, completion: @escaping ((_ data: Void?, _ error: Error?) -> Void)) {
         deletePetWithRequestBuilder(petId: petId, apiKey: apiKey).execute { (response, error) -> Void in
             if error == nil {
                 completion((), error)
@@ -81,8 +79,8 @@ open class PetAPI {
         let petIdPostEscape = petIdPreEscape.addingPercentEncoding(withAllowedCharacters: .urlPathAllowed) ?? ""
         path = path.replacingOccurrences(of: "{petId}", with: petIdPostEscape, options: .literal, range: nil)
         let URLString = PetstoreClientAPI.basePath + path
-        let parameters: [String:Any]? = nil
-        
+        let parameters: [String: Any]? = nil
+
         let url = URLComponents(string: URLString)
         let nillableHeaders: [String: Any?] = [
             "api_key": apiKey
@@ -109,7 +107,7 @@ open class PetAPI {
      - parameter status: (query) Status values that need to be considered for filter 
      - parameter completion: completion handler to receive the data and the error objects
      */
-    open class func findPetsByStatus(status: [String], completion: @escaping ((_ data: [Pet]?,_ error: Error?) -> Void)) {
+    open class func findPetsByStatus(status: [String], completion: @escaping ((_ data: [Pet]?, _ error: Error?) -> Void)) {
         findPetsByStatusWithRequestBuilder(status: status).execute { (response, error) -> Void in
             completion(response?.body, error)
         }
@@ -128,8 +126,8 @@ open class PetAPI {
     open class func findPetsByStatusWithRequestBuilder(status: [String]) -> RequestBuilder<[Pet]> {
         let path = "/pet/findByStatus"
         let URLString = PetstoreClientAPI.basePath + path
-        let parameters: [String:Any]? = nil
-        
+        let parameters: [String: Any]? = nil
+
         var url = URLComponents(string: URLString)
         url?.queryItems = APIHelper.mapValuesToQueryItems([
             "status": status
@@ -146,7 +144,7 @@ open class PetAPI {
      - parameter tags: (query) Tags to filter by 
      - parameter completion: completion handler to receive the data and the error objects
      */
-    open class func findPetsByTags(tags: [String], completion: @escaping ((_ data: [Pet]?,_ error: Error?) -> Void)) {
+    open class func findPetsByTags(tags: [String], completion: @escaping ((_ data: [Pet]?, _ error: Error?) -> Void)) {
         findPetsByTagsWithRequestBuilder(tags: tags).execute { (response, error) -> Void in
             completion(response?.body, error)
         }
@@ -165,8 +163,8 @@ open class PetAPI {
     open class func findPetsByTagsWithRequestBuilder(tags: [String]) -> RequestBuilder<[Pet]> {
         let path = "/pet/findByTags"
         let URLString = PetstoreClientAPI.basePath + path
-        let parameters: [String:Any]? = nil
-        
+        let parameters: [String: Any]? = nil
+
         var url = URLComponents(string: URLString)
         url?.queryItems = APIHelper.mapValuesToQueryItems([
             "tags": tags
@@ -183,7 +181,7 @@ open class PetAPI {
      - parameter petId: (path) ID of pet to return 
      - parameter completion: completion handler to receive the data and the error objects
      */
-    open class func getPetById(petId: Int64, completion: @escaping ((_ data: Pet?,_ error: Error?) -> Void)) {
+    open class func getPetById(petId: Int64, completion: @escaping ((_ data: Pet?, _ error: Error?) -> Void)) {
         getPetByIdWithRequestBuilder(petId: petId).execute { (response, error) -> Void in
             completion(response?.body, error)
         }
@@ -205,8 +203,8 @@ open class PetAPI {
         let petIdPostEscape = petIdPreEscape.addingPercentEncoding(withAllowedCharacters: .urlPathAllowed) ?? ""
         path = path.replacingOccurrences(of: "{petId}", with: petIdPostEscape, options: .literal, range: nil)
         let URLString = PetstoreClientAPI.basePath + path
-        let parameters: [String:Any]? = nil
-        
+        let parameters: [String: Any]? = nil
+
         let url = URLComponents(string: URLString)
 
         let requestBuilder: RequestBuilder<Pet>.Type = PetstoreClientAPI.requestBuilderFactory.getBuilder()
@@ -220,7 +218,7 @@ open class PetAPI {
      - parameter body: (body) Pet object that needs to be added to the store 
      - parameter completion: completion handler to receive the data and the error objects
      */
-    open class func updatePet(body: Pet, completion: @escaping ((_ data: Void?,_ error: Error?) -> Void)) {
+    open class func updatePet(body: Pet, completion: @escaping ((_ data: Void?, _ error: Error?) -> Void)) {
         updatePetWithRequestBuilder(body: body).execute { (response, error) -> Void in
             if error == nil {
                 completion((), error)
@@ -259,7 +257,7 @@ open class PetAPI {
      - parameter status: (form) Updated status of the pet (optional)
      - parameter completion: completion handler to receive the data and the error objects
      */
-    open class func updatePetWithForm(petId: Int64, name: String? = nil, status: String? = nil, completion: @escaping ((_ data: Void?,_ error: Error?) -> Void)) {
+    open class func updatePetWithForm(petId: Int64, name: String? = nil, status: String? = nil, completion: @escaping ((_ data: Void?, _ error: Error?) -> Void)) {
         updatePetWithFormWithRequestBuilder(petId: petId, name: name, status: status).execute { (response, error) -> Void in
             if error == nil {
                 completion((), error)
@@ -286,14 +284,14 @@ open class PetAPI {
         let petIdPostEscape = petIdPreEscape.addingPercentEncoding(withAllowedCharacters: .urlPathAllowed) ?? ""
         path = path.replacingOccurrences(of: "{petId}", with: petIdPostEscape, options: .literal, range: nil)
         let URLString = PetstoreClientAPI.basePath + path
-        let formParams: [String:Any?] = [
+        let formParams: [String: Any?] = [
             "name": name,
             "status": status
         ]
 
         let nonNullParameters = APIHelper.rejectNil(formParams)
         let parameters = APIHelper.convertBoolToString(nonNullParameters)
-        
+
         let url = URLComponents(string: URLString)
 
         let requestBuilder: RequestBuilder<Void>.Type = PetstoreClientAPI.requestBuilderFactory.getNonDecodableBuilder()
@@ -309,7 +307,7 @@ open class PetAPI {
      - parameter file: (form) file to upload (optional)
      - parameter completion: completion handler to receive the data and the error objects
      */
-    open class func uploadFile(petId: Int64, additionalMetadata: String? = nil, file: URL? = nil, completion: @escaping ((_ data: ApiResponse?,_ error: Error?) -> Void)) {
+    open class func uploadFile(petId: Int64, additionalMetadata: String? = nil, file: URL? = nil, completion: @escaping ((_ data: ApiResponse?, _ error: Error?) -> Void)) {
         uploadFileWithRequestBuilder(petId: petId, additionalMetadata: additionalMetadata, file: file).execute { (response, error) -> Void in
             completion(response?.body, error)
         }
@@ -332,14 +330,14 @@ open class PetAPI {
         let petIdPostEscape = petIdPreEscape.addingPercentEncoding(withAllowedCharacters: .urlPathAllowed) ?? ""
         path = path.replacingOccurrences(of: "{petId}", with: petIdPostEscape, options: .literal, range: nil)
         let URLString = PetstoreClientAPI.basePath + path
-        let formParams: [String:Any?] = [
+        let formParams: [String: Any?] = [
             "additionalMetadata": additionalMetadata,
             "file": file
         ]
 
         let nonNullParameters = APIHelper.rejectNil(formParams)
         let parameters = APIHelper.convertBoolToString(nonNullParameters)
-        
+
         let url = URLComponents(string: URLString)
 
         let requestBuilder: RequestBuilder<ApiResponse>.Type = PetstoreClientAPI.requestBuilderFactory.getBuilder()
@@ -355,7 +353,7 @@ open class PetAPI {
      - parameter additionalMetadata: (form) Additional data to pass to server (optional)
      - parameter completion: completion handler to receive the data and the error objects
      */
-    open class func uploadFileWithRequiredFile(petId: Int64, requiredFile: URL, additionalMetadata: String? = nil, completion: @escaping ((_ data: ApiResponse?,_ error: Error?) -> Void)) {
+    open class func uploadFileWithRequiredFile(petId: Int64, requiredFile: URL, additionalMetadata: String? = nil, completion: @escaping ((_ data: ApiResponse?, _ error: Error?) -> Void)) {
         uploadFileWithRequiredFileWithRequestBuilder(petId: petId, requiredFile: requiredFile, additionalMetadata: additionalMetadata).execute { (response, error) -> Void in
             completion(response?.body, error)
         }
@@ -378,14 +376,14 @@ open class PetAPI {
         let petIdPostEscape = petIdPreEscape.addingPercentEncoding(withAllowedCharacters: .urlPathAllowed) ?? ""
         path = path.replacingOccurrences(of: "{petId}", with: petIdPostEscape, options: .literal, range: nil)
         let URLString = PetstoreClientAPI.basePath + path
-        let formParams: [String:Any?] = [
+        let formParams: [String: Any?] = [
             "additionalMetadata": additionalMetadata,
             "requiredFile": requiredFile
         ]
 
         let nonNullParameters = APIHelper.rejectNil(formParams)
         let parameters = APIHelper.convertBoolToString(nonNullParameters)
-        
+
         let url = URLComponents(string: URLString)
 
         let requestBuilder: RequestBuilder<ApiResponse>.Type = PetstoreClientAPI.requestBuilderFactory.getBuilder()
diff --git a/samples/client/petstore/swift4/default/PetstoreClient/Classes/OpenAPIs/APIs/StoreAPI.swift b/samples/client/petstore/swift4/default/PetstoreClient/Classes/OpenAPIs/APIs/StoreAPI.swift
index a2bced598f..71949b335d 100644
--- a/samples/client/petstore/swift4/default/PetstoreClient/Classes/OpenAPIs/APIs/StoreAPI.swift
+++ b/samples/client/petstore/swift4/default/PetstoreClient/Classes/OpenAPIs/APIs/StoreAPI.swift
@@ -8,8 +8,6 @@
 import Foundation
 import Alamofire
 
-
-
 open class StoreAPI {
     /**
      Delete purchase order by ID
@@ -17,7 +15,7 @@ open class StoreAPI {
      - parameter orderId: (path) ID of the order that needs to be deleted 
      - parameter completion: completion handler to receive the data and the error objects
      */
-    open class func deleteOrder(orderId: String, completion: @escaping ((_ data: Void?,_ error: Error?) -> Void)) {
+    open class func deleteOrder(orderId: String, completion: @escaping ((_ data: Void?, _ error: Error?) -> Void)) {
         deleteOrderWithRequestBuilder(orderId: orderId).execute { (response, error) -> Void in
             if error == nil {
                 completion((), error)
@@ -40,8 +38,8 @@ open class StoreAPI {
         let orderIdPostEscape = orderIdPreEscape.addingPercentEncoding(withAllowedCharacters: .urlPathAllowed) ?? ""
         path = path.replacingOccurrences(of: "{order_id}", with: orderIdPostEscape, options: .literal, range: nil)
         let URLString = PetstoreClientAPI.basePath + path
-        let parameters: [String:Any]? = nil
-        
+        let parameters: [String: Any]? = nil
+
         let url = URLComponents(string: URLString)
 
         let requestBuilder: RequestBuilder<Void>.Type = PetstoreClientAPI.requestBuilderFactory.getNonDecodableBuilder()
@@ -54,7 +52,7 @@ open class StoreAPI {
      
      - parameter completion: completion handler to receive the data and the error objects
      */
-    open class func getInventory(completion: @escaping ((_ data: [String:Int]?,_ error: Error?) -> Void)) {
+    open class func getInventory(completion: @escaping ((_ data: [String: Int]?, _ error: Error?) -> Void)) {
         getInventoryWithRequestBuilder().execute { (response, error) -> Void in
             completion(response?.body, error)
         }
@@ -69,14 +67,14 @@ open class StoreAPI {
        - name: api_key
      - returns: RequestBuilder<[String:Int]> 
      */
-    open class func getInventoryWithRequestBuilder() -> RequestBuilder<[String:Int]> {
+    open class func getInventoryWithRequestBuilder() -> RequestBuilder<[String: Int]> {
         let path = "/store/inventory"
         let URLString = PetstoreClientAPI.basePath + path
-        let parameters: [String:Any]? = nil
-        
+        let parameters: [String: Any]? = nil
+
         let url = URLComponents(string: URLString)
 
-        let requestBuilder: RequestBuilder<[String:Int]>.Type = PetstoreClientAPI.requestBuilderFactory.getBuilder()
+        let requestBuilder: RequestBuilder<[String: Int]>.Type = PetstoreClientAPI.requestBuilderFactory.getBuilder()
 
         return requestBuilder.init(method: "GET", URLString: (url?.string ?? URLString), parameters: parameters, isBody: false)
     }
@@ -87,7 +85,7 @@ open class StoreAPI {
      - parameter orderId: (path) ID of pet that needs to be fetched 
      - parameter completion: completion handler to receive the data and the error objects
      */
-    open class func getOrderById(orderId: Int64, completion: @escaping ((_ data: Order?,_ error: Error?) -> Void)) {
+    open class func getOrderById(orderId: Int64, completion: @escaping ((_ data: Order?, _ error: Error?) -> Void)) {
         getOrderByIdWithRequestBuilder(orderId: orderId).execute { (response, error) -> Void in
             completion(response?.body, error)
         }
@@ -106,8 +104,8 @@ open class StoreAPI {
         let orderIdPostEscape = orderIdPreEscape.addingPercentEncoding(withAllowedCharacters: .urlPathAllowed) ?? ""
         path = path.replacingOccurrences(of: "{order_id}", with: orderIdPostEscape, options: .literal, range: nil)
         let URLString = PetstoreClientAPI.basePath + path
-        let parameters: [String:Any]? = nil
-        
+        let parameters: [String: Any]? = nil
+
         let url = URLComponents(string: URLString)
 
         let requestBuilder: RequestBuilder<Order>.Type = PetstoreClientAPI.requestBuilderFactory.getBuilder()
@@ -121,7 +119,7 @@ open class StoreAPI {
      - parameter body: (body) order placed for purchasing the pet 
      - parameter completion: completion handler to receive the data and the error objects
      */
-    open class func placeOrder(body: Order, completion: @escaping ((_ data: Order?,_ error: Error?) -> Void)) {
+    open class func placeOrder(body: Order, completion: @escaping ((_ data: Order?, _ error: Error?) -> Void)) {
         placeOrderWithRequestBuilder(body: body).execute { (response, error) -> Void in
             completion(response?.body, error)
         }
diff --git a/samples/client/petstore/swift4/default/PetstoreClient/Classes/OpenAPIs/APIs/UserAPI.swift b/samples/client/petstore/swift4/default/PetstoreClient/Classes/OpenAPIs/APIs/UserAPI.swift
index d8cafaf2c9..efeb64468a 100644
--- a/samples/client/petstore/swift4/default/PetstoreClient/Classes/OpenAPIs/APIs/UserAPI.swift
+++ b/samples/client/petstore/swift4/default/PetstoreClient/Classes/OpenAPIs/APIs/UserAPI.swift
@@ -8,8 +8,6 @@
 import Foundation
 import Alamofire
 
-
-
 open class UserAPI {
     /**
      Create user
@@ -17,7 +15,7 @@ open class UserAPI {
      - parameter body: (body) Created user object 
      - parameter completion: completion handler to receive the data and the error objects
      */
-    open class func createUser(body: User, completion: @escaping ((_ data: Void?,_ error: Error?) -> Void)) {
+    open class func createUser(body: User, completion: @escaping ((_ data: Void?, _ error: Error?) -> Void)) {
         createUserWithRequestBuilder(body: body).execute { (response, error) -> Void in
             if error == nil {
                 completion((), error)
@@ -52,7 +50,7 @@ open class UserAPI {
      - parameter body: (body) List of user object 
      - parameter completion: completion handler to receive the data and the error objects
      */
-    open class func createUsersWithArrayInput(body: [User], completion: @escaping ((_ data: Void?,_ error: Error?) -> Void)) {
+    open class func createUsersWithArrayInput(body: [User], completion: @escaping ((_ data: Void?, _ error: Error?) -> Void)) {
         createUsersWithArrayInputWithRequestBuilder(body: body).execute { (response, error) -> Void in
             if error == nil {
                 completion((), error)
@@ -86,7 +84,7 @@ open class UserAPI {
      - parameter body: (body) List of user object 
      - parameter completion: completion handler to receive the data and the error objects
      */
-    open class func createUsersWithListInput(body: [User], completion: @escaping ((_ data: Void?,_ error: Error?) -> Void)) {
+    open class func createUsersWithListInput(body: [User], completion: @escaping ((_ data: Void?, _ error: Error?) -> Void)) {
         createUsersWithListInputWithRequestBuilder(body: body).execute { (response, error) -> Void in
             if error == nil {
                 completion((), error)
@@ -120,7 +118,7 @@ open class UserAPI {
      - parameter username: (path) The name that needs to be deleted 
      - parameter completion: completion handler to receive the data and the error objects
      */
-    open class func deleteUser(username: String, completion: @escaping ((_ data: Void?,_ error: Error?) -> Void)) {
+    open class func deleteUser(username: String, completion: @escaping ((_ data: Void?, _ error: Error?) -> Void)) {
         deleteUserWithRequestBuilder(username: username).execute { (response, error) -> Void in
             if error == nil {
                 completion((), error)
@@ -143,8 +141,8 @@ open class UserAPI {
         let usernamePostEscape = usernamePreEscape.addingPercentEncoding(withAllowedCharacters: .urlPathAllowed) ?? ""
         path = path.replacingOccurrences(of: "{username}", with: usernamePostEscape, options: .literal, range: nil)
         let URLString = PetstoreClientAPI.basePath + path
-        let parameters: [String:Any]? = nil
-        
+        let parameters: [String: Any]? = nil
+
         let url = URLComponents(string: URLString)
 
         let requestBuilder: RequestBuilder<Void>.Type = PetstoreClientAPI.requestBuilderFactory.getNonDecodableBuilder()
@@ -158,7 +156,7 @@ open class UserAPI {
      - parameter username: (path) The name that needs to be fetched. Use user1 for testing. 
      - parameter completion: completion handler to receive the data and the error objects
      */
-    open class func getUserByName(username: String, completion: @escaping ((_ data: User?,_ error: Error?) -> Void)) {
+    open class func getUserByName(username: String, completion: @escaping ((_ data: User?, _ error: Error?) -> Void)) {
         getUserByNameWithRequestBuilder(username: username).execute { (response, error) -> Void in
             completion(response?.body, error)
         }
@@ -176,8 +174,8 @@ open class UserAPI {
         let usernamePostEscape = usernamePreEscape.addingPercentEncoding(withAllowedCharacters: .urlPathAllowed) ?? ""
         path = path.replacingOccurrences(of: "{username}", with: usernamePostEscape, options: .literal, range: nil)
         let URLString = PetstoreClientAPI.basePath + path
-        let parameters: [String:Any]? = nil
-        
+        let parameters: [String: Any]? = nil
+
         let url = URLComponents(string: URLString)
 
         let requestBuilder: RequestBuilder<User>.Type = PetstoreClientAPI.requestBuilderFactory.getBuilder()
@@ -192,7 +190,7 @@ open class UserAPI {
      - parameter password: (query) The password for login in clear text 
      - parameter completion: completion handler to receive the data and the error objects
      */
-    open class func loginUser(username: String, password: String, completion: @escaping ((_ data: String?,_ error: Error?) -> Void)) {
+    open class func loginUser(username: String, password: String, completion: @escaping ((_ data: String?, _ error: Error?) -> Void)) {
         loginUserWithRequestBuilder(username: username, password: password).execute { (response, error) -> Void in
             completion(response?.body, error)
         }
@@ -209,11 +207,11 @@ open class UserAPI {
     open class func loginUserWithRequestBuilder(username: String, password: String) -> RequestBuilder<String> {
         let path = "/user/login"
         let URLString = PetstoreClientAPI.basePath + path
-        let parameters: [String:Any]? = nil
-        
+        let parameters: [String: Any]? = nil
+
         var url = URLComponents(string: URLString)
         url?.queryItems = APIHelper.mapValuesToQueryItems([
-            "username": username, 
+            "username": username,
             "password": password
         ])
 
@@ -227,7 +225,7 @@ open class UserAPI {
      
      - parameter completion: completion handler to receive the data and the error objects
      */
-    open class func logoutUser(completion: @escaping ((_ data: Void?,_ error: Error?) -> Void)) {
+    open class func logoutUser(completion: @escaping ((_ data: Void?, _ error: Error?) -> Void)) {
         logoutUserWithRequestBuilder().execute { (response, error) -> Void in
             if error == nil {
                 completion((), error)
@@ -245,8 +243,8 @@ open class UserAPI {
     open class func logoutUserWithRequestBuilder() -> RequestBuilder<Void> {
         let path = "/user/logout"
         let URLString = PetstoreClientAPI.basePath + path
-        let parameters: [String:Any]? = nil
-        
+        let parameters: [String: Any]? = nil
+
         let url = URLComponents(string: URLString)
 
         let requestBuilder: RequestBuilder<Void>.Type = PetstoreClientAPI.requestBuilderFactory.getNonDecodableBuilder()
@@ -261,7 +259,7 @@ open class UserAPI {
      - parameter body: (body) Updated user object 
      - parameter completion: completion handler to receive the data and the error objects
      */
-    open class func updateUser(username: String, body: User, completion: @escaping ((_ data: Void?,_ error: Error?) -> Void)) {
+    open class func updateUser(username: String, body: User, completion: @escaping ((_ data: Void?, _ error: Error?) -> Void)) {
         updateUserWithRequestBuilder(username: username, body: body).execute { (response, error) -> Void in
             if error == nil {
                 completion((), error)
diff --git a/samples/client/petstore/swift4/default/PetstoreClient/Classes/OpenAPIs/AlamofireImplementations.swift b/samples/client/petstore/swift4/default/PetstoreClient/Classes/OpenAPIs/AlamofireImplementations.swift
index dac40e9a31..04ad02a5ce 100644
--- a/samples/client/petstore/swift4/default/PetstoreClient/Classes/OpenAPIs/AlamofireImplementations.swift
+++ b/samples/client/petstore/swift4/default/PetstoreClient/Classes/OpenAPIs/AlamofireImplementations.swift
@@ -12,7 +12,7 @@ class AlamofireRequestBuilderFactory: RequestBuilderFactory {
         return AlamofireRequestBuilder<T>.self
     }
 
-    func getBuilder<T:Decodable>() -> RequestBuilder<T>.Type {
+    func getBuilder<T: Decodable>() -> RequestBuilder<T>.Type {
         return AlamofireDecodableRequestBuilder<T>.self
     }
 }
@@ -50,7 +50,7 @@ private struct SynchronizedDictionary<K: Hashable, V> {
 private var managerStore = SynchronizedDictionary<String, Alamofire.SessionManager>()
 
 open class AlamofireRequestBuilder<T>: RequestBuilder<T> {
-    required public init(method: String, URLString: String, parameters: [String : Any]?, isBody: Bool, headers: [String : String] = [:]) {
+    required public init(method: String, URLString: String, parameters: [String: Any]?, isBody: Bool, headers: [String: String] = [:]) {
         super.init(method: method, URLString: URLString, parameters: parameters, isBody: isBody, headers: headers)
     }
 
@@ -88,17 +88,17 @@ open class AlamofireRequestBuilder<T>: RequestBuilder<T> {
      May be overridden by a subclass if you want to control the request
      configuration (e.g. to override the cache policy).
      */
-    open func makeRequest(manager: SessionManager, method: HTTPMethod, encoding: ParameterEncoding, headers: [String:String]) -> DataRequest {
+    open func makeRequest(manager: SessionManager, method: HTTPMethod, encoding: ParameterEncoding, headers: [String: String]) -> DataRequest {
         return manager.request(URLString, method: method, parameters: parameters, encoding: encoding, headers: headers)
     }
 
     override open func execute(_ completion: @escaping (_ response: Response<T>?, _ error: Error?) -> Void) {
-        let managerId:String = UUID().uuidString
+        let managerId: String = UUID().uuidString
         // Create a new manager for each request to customize its request header
         let manager = createSessionManager()
         managerStore[managerId] = manager
 
-        let encoding:ParameterEncoding = isBody ? JSONDataEncoding() : URLEncoding()
+        let encoding: ParameterEncoding = isBody ? JSONDataEncoding() : URLEncoding()
 
         let xMethod = Alamofire.HTTPMethod(rawValue: method)
         let fileKeys = parameters == nil ? [] : parameters!.filter { $1 is NSURL }
@@ -111,8 +111,7 @@ open class AlamofireRequestBuilder<T>: RequestBuilder<T> {
                     case let fileURL as URL:
                         if let mimeType = self.contentTypeForFormPart(fileURL: fileURL) {
                             mpForm.append(fileURL, withName: k, fileName: fileURL.lastPathComponent, mimeType: mimeType)
-                        }
-                        else {
+                        } else {
                             mpForm.append(fileURL, withName: k)
                         }
                     case let string as String:
@@ -276,7 +275,7 @@ open class AlamofireRequestBuilder<T>: RequestBuilder<T> {
         return httpHeaders
     }
 
-    fileprivate func getFileName(fromContentDisposition contentDisposition : String?) -> String? {
+    fileprivate func getFileName(fromContentDisposition contentDisposition: String?) -> String? {
 
         guard let contentDisposition = contentDisposition else {
             return nil
@@ -284,7 +283,7 @@ open class AlamofireRequestBuilder<T>: RequestBuilder<T> {
 
         let items = contentDisposition.components(separatedBy: ";")
 
-        var filename : String? = nil
+        var filename: String? = nil
 
         for contentItem in items {
 
@@ -304,7 +303,7 @@ open class AlamofireRequestBuilder<T>: RequestBuilder<T> {
 
     }
 
-    fileprivate func getPath(from url : URL) throws -> String {
+    fileprivate func getPath(from url: URL) throws -> String {
 
         guard var path = URLComponents(url: url, resolvingAgainstBaseURL: true)?.path else {
             throw DownloadException.requestMissingPath
@@ -318,7 +317,7 @@ open class AlamofireRequestBuilder<T>: RequestBuilder<T> {
 
     }
 
-    fileprivate func getURL(from urlRequest : URLRequest) throws -> URL {
+    fileprivate func getURL(from urlRequest: URLRequest) throws -> URL {
 
         guard let url = urlRequest.url else {
             throw DownloadException.requestMissingURL
@@ -329,7 +328,7 @@ open class AlamofireRequestBuilder<T>: RequestBuilder<T> {
 
 }
 
-fileprivate enum DownloadException : Error {
+private enum DownloadException: Error {
     case responseDataMissing
     case responseFailed
     case requestMissing
@@ -344,7 +343,7 @@ public enum AlamofireDecodableRequestBuilderError: Error {
     case generalError(Error)
 }
 
-open class AlamofireDecodableRequestBuilder<T:Decodable>: AlamofireRequestBuilder<T> {
+open class AlamofireDecodableRequestBuilder<T: Decodable>: AlamofireRequestBuilder<T> {
 
     override fileprivate func processRequest(request: DataRequest, _ managerId: String, _ completion: @escaping (_ response: Response<T>?, _ error: Error?) -> Void) {
         if let credential = self.credential {
diff --git a/samples/client/petstore/swift4/default/PetstoreClient/Classes/OpenAPIs/CodableHelper.swift b/samples/client/petstore/swift4/default/PetstoreClient/Classes/OpenAPIs/CodableHelper.swift
index 584de8c3d5..111d5a3a8c 100644
--- a/samples/client/petstore/swift4/default/PetstoreClient/Classes/OpenAPIs/CodableHelper.swift
+++ b/samples/client/petstore/swift4/default/PetstoreClient/Classes/OpenAPIs/CodableHelper.swift
@@ -13,7 +13,7 @@ open class CodableHelper {
 
     public static var dateformatter: DateFormatter?
 
-    open class func decode<T>(_ type: T.Type, from data: Data) -> (decodableObj: T?, error: Error?) where T : Decodable {
+    open class func decode<T>(_ type: T.Type, from data: Data) -> (decodableObj: T?, error: Error?) where T: Decodable {
         var returnedDecodable: T? = nil
         var returnedError: Error? = nil
 
@@ -39,7 +39,7 @@ open class CodableHelper {
         return (returnedDecodable, returnedError)
     }
 
-    open class func encode<T>(_ value: T, prettyPrint: Bool = false) -> EncodeResult where T : Encodable {
+    open class func encode<T>(_ value: T, prettyPrint: Bool = false) -> EncodeResult where T: Encodable {
         var returnedData: Data?
         var returnedError: Error? = nil
 
diff --git a/samples/client/petstore/swift4/default/PetstoreClient/Classes/OpenAPIs/Configuration.swift b/samples/client/petstore/swift4/default/PetstoreClient/Classes/OpenAPIs/Configuration.swift
index 516590da5d..e1ecb39726 100644
--- a/samples/client/petstore/swift4/default/PetstoreClient/Classes/OpenAPIs/Configuration.swift
+++ b/samples/client/petstore/swift4/default/PetstoreClient/Classes/OpenAPIs/Configuration.swift
@@ -7,9 +7,9 @@
 import Foundation
 
 open class Configuration {
-	
+
 	// This value is used to configure the date formatter that is used to serialize dates into JSON format. 
 	// You must set it prior to encoding any dates, and it will only be read once. 
     public static var dateFormat = "yyyy-MM-dd'T'HH:mm:ss.SSSZZZZZ"
-    
-}
\ No newline at end of file
+
+}
diff --git a/samples/client/petstore/swift4/default/PetstoreClient/Classes/OpenAPIs/Extensions.swift b/samples/client/petstore/swift4/default/PetstoreClient/Classes/OpenAPIs/Extensions.swift
index 8bf1829ba8..24c128daad 100644
--- a/samples/client/petstore/swift4/default/PetstoreClient/Classes/OpenAPIs/Extensions.swift
+++ b/samples/client/petstore/swift4/default/PetstoreClient/Classes/OpenAPIs/Extensions.swift
@@ -112,24 +112,24 @@ extension String: CodingKey {
 
 extension KeyedEncodingContainerProtocol {
 
-    public mutating func encodeArray<T>(_ values: [T], forKey key: Self.Key) throws where T : Encodable {
+    public mutating func encodeArray<T>(_ values: [T], forKey key: Self.Key) throws where T: Encodable {
         var arrayContainer = nestedUnkeyedContainer(forKey: key)
         try arrayContainer.encode(contentsOf: values)
     }
 
-    public mutating func encodeArrayIfPresent<T>(_ values: [T]?, forKey key: Self.Key) throws where T : Encodable {
+    public mutating func encodeArrayIfPresent<T>(_ values: [T]?, forKey key: Self.Key) throws where T: Encodable {
         if let values = values {
             try encodeArray(values, forKey: key)
         }
     }
 
-    public mutating func encodeMap<T>(_ pairs: [Self.Key: T]) throws where T : Encodable {
+    public mutating func encodeMap<T>(_ pairs: [Self.Key: T]) throws where T: Encodable {
         for (key, value) in pairs {
             try encode(value, forKey: key)
         }
     }
 
-    public mutating func encodeMapIfPresent<T>(_ pairs: [Self.Key: T]?) throws where T : Encodable {
+    public mutating func encodeMapIfPresent<T>(_ pairs: [Self.Key: T]?) throws where T: Encodable {
         if let pairs = pairs {
             try encodeMap(pairs)
         }
@@ -139,7 +139,7 @@ extension KeyedEncodingContainerProtocol {
 
 extension KeyedDecodingContainerProtocol {
 
-    public func decodeArray<T>(_ type: T.Type, forKey key: Self.Key) throws -> [T] where T : Decodable {
+    public func decodeArray<T>(_ type: T.Type, forKey key: Self.Key) throws -> [T] where T: Decodable {
         var tmpArray = [T]()
 
         var nestedContainer = try nestedUnkeyedContainer(forKey: key)
@@ -151,7 +151,7 @@ extension KeyedDecodingContainerProtocol {
         return tmpArray
     }
 
-    public func decodeArrayIfPresent<T>(_ type: T.Type, forKey key: Self.Key) throws -> [T]? where T : Decodable {
+    public func decodeArrayIfPresent<T>(_ type: T.Type, forKey key: Self.Key) throws -> [T]? where T: Decodable {
         var tmpArray: [T]? = nil
 
         if contains(key) {
@@ -161,8 +161,8 @@ extension KeyedDecodingContainerProtocol {
         return tmpArray
     }
 
-    public func decodeMap<T>(_ type: T.Type, excludedKeys: Set<Self.Key>) throws -> [Self.Key: T] where T : Decodable {
-        var map: [Self.Key : T] = [:]
+    public func decodeMap<T>(_ type: T.Type, excludedKeys: Set<Self.Key>) throws -> [Self.Key: T] where T: Decodable {
+        var map: [Self.Key: T] = [:]
 
         for key in allKeys {
             if !excludedKeys.contains(key) {
@@ -175,5 +175,3 @@ extension KeyedDecodingContainerProtocol {
     }
 
 }
-
-
diff --git a/samples/client/petstore/swift4/default/PetstoreClient/Classes/OpenAPIs/JSONEncodingHelper.swift b/samples/client/petstore/swift4/default/PetstoreClient/Classes/OpenAPIs/JSONEncodingHelper.swift
index 7044951584..3e68bb5d4a 100644
--- a/samples/client/petstore/swift4/default/PetstoreClient/Classes/OpenAPIs/JSONEncodingHelper.swift
+++ b/samples/client/petstore/swift4/default/PetstoreClient/Classes/OpenAPIs/JSONEncodingHelper.swift
@@ -10,7 +10,7 @@ import Alamofire
 
 open class JSONEncodingHelper {
 
-    open class func encodingParameters<T:Encodable>(forEncodableObject encodableObj: T?) -> Parameters? {
+    open class func encodingParameters<T: Encodable>(forEncodableObject encodableObj: T?) -> Parameters? {
         var params: Parameters? = nil
 
         // Encode the Encodable object
@@ -39,5 +39,5 @@ open class JSONEncodingHelper {
 
         return params
     }
-    
+
 }
diff --git a/samples/client/petstore/swift4/default/PetstoreClient/Classes/OpenAPIs/Models.swift b/samples/client/petstore/swift4/default/PetstoreClient/Classes/OpenAPIs/Models.swift
index 4085638903..e87ce399c7 100644
--- a/samples/client/petstore/swift4/default/PetstoreClient/Classes/OpenAPIs/Models.swift
+++ b/samples/client/petstore/swift4/default/PetstoreClient/Classes/OpenAPIs/Models.swift
@@ -10,7 +10,7 @@ protocol JSONEncodable {
     func encodeToJSON() -> Any
 }
 
-public enum ErrorResponse : Error {
+public enum ErrorResponse: Error {
     case error(Int, Data?, Error)
 }
 
diff --git a/samples/client/petstore/swift4/default/PetstoreClient/Classes/OpenAPIs/Models/AdditionalPropertiesClass.swift b/samples/client/petstore/swift4/default/PetstoreClient/Classes/OpenAPIs/Models/AdditionalPropertiesClass.swift
index 4db39adae8..83a06951cc 100644
--- a/samples/client/petstore/swift4/default/PetstoreClient/Classes/OpenAPIs/Models/AdditionalPropertiesClass.swift
+++ b/samples/client/petstore/swift4/default/PetstoreClient/Classes/OpenAPIs/Models/AdditionalPropertiesClass.swift
@@ -7,23 +7,19 @@
 
 import Foundation
 
-
-
 public struct AdditionalPropertiesClass: Codable {
 
-    public var mapString: [String:String]?
-    public var mapMapString: [String:[String:String]]?
+    public var mapString: [String: String]?
+    public var mapMapString: [String: [String: String]]?
 
-    public init(mapString: [String:String]?, mapMapString: [String:[String:String]]?) {
+    public init(mapString: [String: String]?, mapMapString: [String: [String: String]]?) {
         self.mapString = mapString
         self.mapMapString = mapMapString
     }
 
-    public enum CodingKeys: String, CodingKey { 
+    public enum CodingKeys: String, CodingKey {
         case mapString = "map_string"
         case mapMapString = "map_map_string"
     }
 
-
 }
-
diff --git a/samples/client/petstore/swift4/default/PetstoreClient/Classes/OpenAPIs/Models/Animal.swift b/samples/client/petstore/swift4/default/PetstoreClient/Classes/OpenAPIs/Models/Animal.swift
index 7221a1be09..5ed9f31e2a 100644
--- a/samples/client/petstore/swift4/default/PetstoreClient/Classes/OpenAPIs/Models/Animal.swift
+++ b/samples/client/petstore/swift4/default/PetstoreClient/Classes/OpenAPIs/Models/Animal.swift
@@ -7,8 +7,6 @@
 
 import Foundation
 
-
-
 public struct Animal: Codable {
 
     public var className: String
@@ -19,6 +17,4 @@ public struct Animal: Codable {
         self.color = color
     }
 
-
 }
-
diff --git a/samples/client/petstore/swift4/default/PetstoreClient/Classes/OpenAPIs/Models/AnimalFarm.swift b/samples/client/petstore/swift4/default/PetstoreClient/Classes/OpenAPIs/Models/AnimalFarm.swift
index e7bea63f8e..e09b0e9efd 100644
--- a/samples/client/petstore/swift4/default/PetstoreClient/Classes/OpenAPIs/Models/AnimalFarm.swift
+++ b/samples/client/petstore/swift4/default/PetstoreClient/Classes/OpenAPIs/Models/AnimalFarm.swift
@@ -7,5 +7,4 @@
 
 import Foundation
 
-
 public typealias AnimalFarm = [Animal]
diff --git a/samples/client/petstore/swift4/default/PetstoreClient/Classes/OpenAPIs/Models/ApiResponse.swift b/samples/client/petstore/swift4/default/PetstoreClient/Classes/OpenAPIs/Models/ApiResponse.swift
index a22e9aaebb..ec270da890 100644
--- a/samples/client/petstore/swift4/default/PetstoreClient/Classes/OpenAPIs/Models/ApiResponse.swift
+++ b/samples/client/petstore/swift4/default/PetstoreClient/Classes/OpenAPIs/Models/ApiResponse.swift
@@ -7,8 +7,6 @@
 
 import Foundation
 
-
-
 public struct ApiResponse: Codable {
 
     public var code: Int?
@@ -21,6 +19,4 @@ public struct ApiResponse: Codable {
         self.message = message
     }
 
-
 }
-
diff --git a/samples/client/petstore/swift4/default/PetstoreClient/Classes/OpenAPIs/Models/ArrayOfArrayOfNumberOnly.swift b/samples/client/petstore/swift4/default/PetstoreClient/Classes/OpenAPIs/Models/ArrayOfArrayOfNumberOnly.swift
index 4e5a5ca144..3843287630 100644
--- a/samples/client/petstore/swift4/default/PetstoreClient/Classes/OpenAPIs/Models/ArrayOfArrayOfNumberOnly.swift
+++ b/samples/client/petstore/swift4/default/PetstoreClient/Classes/OpenAPIs/Models/ArrayOfArrayOfNumberOnly.swift
@@ -7,8 +7,6 @@
 
 import Foundation
 
-
-
 public struct ArrayOfArrayOfNumberOnly: Codable {
 
     public var arrayArrayNumber: [[Double]]?
@@ -17,10 +15,8 @@ public struct ArrayOfArrayOfNumberOnly: Codable {
         self.arrayArrayNumber = arrayArrayNumber
     }
 
-    public enum CodingKeys: String, CodingKey { 
+    public enum CodingKeys: String, CodingKey {
         case arrayArrayNumber = "ArrayArrayNumber"
     }
 
-
 }
-
diff --git a/samples/client/petstore/swift4/default/PetstoreClient/Classes/OpenAPIs/Models/ArrayOfNumberOnly.swift b/samples/client/petstore/swift4/default/PetstoreClient/Classes/OpenAPIs/Models/ArrayOfNumberOnly.swift
index 7d059d3683..f8b198e81f 100644
--- a/samples/client/petstore/swift4/default/PetstoreClient/Classes/OpenAPIs/Models/ArrayOfNumberOnly.swift
+++ b/samples/client/petstore/swift4/default/PetstoreClient/Classes/OpenAPIs/Models/ArrayOfNumberOnly.swift
@@ -7,8 +7,6 @@
 
 import Foundation
 
-
-
 public struct ArrayOfNumberOnly: Codable {
 
     public var arrayNumber: [Double]?
@@ -17,10 +15,8 @@ public struct ArrayOfNumberOnly: Codable {
         self.arrayNumber = arrayNumber
     }
 
-    public enum CodingKeys: String, CodingKey { 
+    public enum CodingKeys: String, CodingKey {
         case arrayNumber = "ArrayNumber"
     }
 
-
 }
-
diff --git a/samples/client/petstore/swift4/default/PetstoreClient/Classes/OpenAPIs/Models/ArrayTest.swift b/samples/client/petstore/swift4/default/PetstoreClient/Classes/OpenAPIs/Models/ArrayTest.swift
index 9c56fed50c..67f7f7e515 100644
--- a/samples/client/petstore/swift4/default/PetstoreClient/Classes/OpenAPIs/Models/ArrayTest.swift
+++ b/samples/client/petstore/swift4/default/PetstoreClient/Classes/OpenAPIs/Models/ArrayTest.swift
@@ -7,8 +7,6 @@
 
 import Foundation
 
-
-
 public struct ArrayTest: Codable {
 
     public var arrayOfString: [String]?
@@ -21,12 +19,10 @@ public struct ArrayTest: Codable {
         self.arrayArrayOfModel = arrayArrayOfModel
     }
 
-    public enum CodingKeys: String, CodingKey { 
+    public enum CodingKeys: String, CodingKey {
         case arrayOfString = "array_of_string"
         case arrayArrayOfInteger = "array_array_of_integer"
         case arrayArrayOfModel = "array_array_of_model"
     }
 
-
 }
-
diff --git a/samples/client/petstore/swift4/default/PetstoreClient/Classes/OpenAPIs/Models/Capitalization.swift b/samples/client/petstore/swift4/default/PetstoreClient/Classes/OpenAPIs/Models/Capitalization.swift
index 98cda23dac..d576b50b1c 100644
--- a/samples/client/petstore/swift4/default/PetstoreClient/Classes/OpenAPIs/Models/Capitalization.swift
+++ b/samples/client/petstore/swift4/default/PetstoreClient/Classes/OpenAPIs/Models/Capitalization.swift
@@ -7,8 +7,6 @@
 
 import Foundation
 
-
-
 public struct Capitalization: Codable {
 
     public var smallCamel: String?
@@ -28,7 +26,7 @@ public struct Capitalization: Codable {
         self.ATT_NAME = ATT_NAME
     }
 
-    public enum CodingKeys: String, CodingKey { 
+    public enum CodingKeys: String, CodingKey {
         case smallCamel
         case capitalCamel = "CapitalCamel"
         case smallSnake = "small_Snake"
@@ -37,6 +35,4 @@ public struct Capitalization: Codable {
         case ATT_NAME
     }
 
-
 }
-
diff --git a/samples/client/petstore/swift4/default/PetstoreClient/Classes/OpenAPIs/Models/Cat.swift b/samples/client/petstore/swift4/default/PetstoreClient/Classes/OpenAPIs/Models/Cat.swift
index a116d964ea..7ab887f311 100644
--- a/samples/client/petstore/swift4/default/PetstoreClient/Classes/OpenAPIs/Models/Cat.swift
+++ b/samples/client/petstore/swift4/default/PetstoreClient/Classes/OpenAPIs/Models/Cat.swift
@@ -7,8 +7,6 @@
 
 import Foundation
 
-
-
 public struct Cat: Codable {
 
     public var className: String
@@ -21,6 +19,4 @@ public struct Cat: Codable {
         self.declawed = declawed
     }
 
-
 }
-
diff --git a/samples/client/petstore/swift4/default/PetstoreClient/Classes/OpenAPIs/Models/CatAllOf.swift b/samples/client/petstore/swift4/default/PetstoreClient/Classes/OpenAPIs/Models/CatAllOf.swift
new file mode 100644
index 0000000000..a51ad0dffa
--- /dev/null
+++ b/samples/client/petstore/swift4/default/PetstoreClient/Classes/OpenAPIs/Models/CatAllOf.swift
@@ -0,0 +1,18 @@
+//
+// CatAllOf.swift
+//
+// Generated by openapi-generator
+// https://openapi-generator.tech
+//
+
+import Foundation
+
+public struct CatAllOf: Codable {
+
+    public var declawed: Bool?
+
+    public init(declawed: Bool?) {
+        self.declawed = declawed
+    }
+
+}
diff --git a/samples/client/petstore/swift4/default/PetstoreClient/Classes/OpenAPIs/Models/Category.swift b/samples/client/petstore/swift4/default/PetstoreClient/Classes/OpenAPIs/Models/Category.swift
index e8c489be46..eb8f7e5e19 100644
--- a/samples/client/petstore/swift4/default/PetstoreClient/Classes/OpenAPIs/Models/Category.swift
+++ b/samples/client/petstore/swift4/default/PetstoreClient/Classes/OpenAPIs/Models/Category.swift
@@ -7,8 +7,6 @@
 
 import Foundation
 
-
-
 public struct Category: Codable {
 
     public var id: Int64?
@@ -19,6 +17,4 @@ public struct Category: Codable {
         self.name = name
     }
 
-
 }
-
diff --git a/samples/client/petstore/swift4/default/PetstoreClient/Classes/OpenAPIs/Models/ClassModel.swift b/samples/client/petstore/swift4/default/PetstoreClient/Classes/OpenAPIs/Models/ClassModel.swift
index f673ed127c..28cb30ce7b 100644
--- a/samples/client/petstore/swift4/default/PetstoreClient/Classes/OpenAPIs/Models/ClassModel.swift
+++ b/samples/client/petstore/swift4/default/PetstoreClient/Classes/OpenAPIs/Models/ClassModel.swift
@@ -7,7 +7,6 @@
 
 import Foundation
 
-
 /** Model for testing model with \&quot;_class\&quot; property */
 
 public struct ClassModel: Codable {
@@ -18,6 +17,4 @@ public struct ClassModel: Codable {
         self._class = _class
     }
 
-
 }
-
diff --git a/samples/client/petstore/swift4/default/PetstoreClient/Classes/OpenAPIs/Models/Client.swift b/samples/client/petstore/swift4/default/PetstoreClient/Classes/OpenAPIs/Models/Client.swift
index 51390b6c4e..00245ca372 100644
--- a/samples/client/petstore/swift4/default/PetstoreClient/Classes/OpenAPIs/Models/Client.swift
+++ b/samples/client/petstore/swift4/default/PetstoreClient/Classes/OpenAPIs/Models/Client.swift
@@ -7,8 +7,6 @@
 
 import Foundation
 
-
-
 public struct Client: Codable {
 
     public var client: String?
@@ -17,6 +15,4 @@ public struct Client: Codable {
         self.client = client
     }
 
-
 }
-
diff --git a/samples/client/petstore/swift4/default/PetstoreClient/Classes/OpenAPIs/Models/Dog.swift b/samples/client/petstore/swift4/default/PetstoreClient/Classes/OpenAPIs/Models/Dog.swift
index 239ce74dcc..492c122800 100644
--- a/samples/client/petstore/swift4/default/PetstoreClient/Classes/OpenAPIs/Models/Dog.swift
+++ b/samples/client/petstore/swift4/default/PetstoreClient/Classes/OpenAPIs/Models/Dog.swift
@@ -7,8 +7,6 @@
 
 import Foundation
 
-
-
 public struct Dog: Codable {
 
     public var className: String
@@ -21,6 +19,4 @@ public struct Dog: Codable {
         self.breed = breed
     }
 
-
 }
-
diff --git a/samples/client/petstore/swift4/default/PetstoreClient/Classes/OpenAPIs/Models/DogAllOf.swift b/samples/client/petstore/swift4/default/PetstoreClient/Classes/OpenAPIs/Models/DogAllOf.swift
new file mode 100644
index 0000000000..7786f8acc5
--- /dev/null
+++ b/samples/client/petstore/swift4/default/PetstoreClient/Classes/OpenAPIs/Models/DogAllOf.swift
@@ -0,0 +1,18 @@
+//
+// DogAllOf.swift
+//
+// Generated by openapi-generator
+// https://openapi-generator.tech
+//
+
+import Foundation
+
+public struct DogAllOf: Codable {
+
+    public var breed: String?
+
+    public init(breed: String?) {
+        self.breed = breed
+    }
+
+}
diff --git a/samples/client/petstore/swift4/default/PetstoreClient/Classes/OpenAPIs/Models/EnumArrays.swift b/samples/client/petstore/swift4/default/PetstoreClient/Classes/OpenAPIs/Models/EnumArrays.swift
index 8713961520..5034ff0b8c 100644
--- a/samples/client/petstore/swift4/default/PetstoreClient/Classes/OpenAPIs/Models/EnumArrays.swift
+++ b/samples/client/petstore/swift4/default/PetstoreClient/Classes/OpenAPIs/Models/EnumArrays.swift
@@ -7,8 +7,6 @@
 
 import Foundation
 
-
-
 public struct EnumArrays: Codable {
 
     public enum JustSymbol: String, Codable {
@@ -27,11 +25,9 @@ public struct EnumArrays: Codable {
         self.arrayEnum = arrayEnum
     }
 
-    public enum CodingKeys: String, CodingKey { 
+    public enum CodingKeys: String, CodingKey {
         case justSymbol = "just_symbol"
         case arrayEnum = "array_enum"
     }
 
-
 }
-
diff --git a/samples/client/petstore/swift4/default/PetstoreClient/Classes/OpenAPIs/Models/EnumClass.swift b/samples/client/petstore/swift4/default/PetstoreClient/Classes/OpenAPIs/Models/EnumClass.swift
index 7280a621fe..3c1dfcac57 100644
--- a/samples/client/petstore/swift4/default/PetstoreClient/Classes/OpenAPIs/Models/EnumClass.swift
+++ b/samples/client/petstore/swift4/default/PetstoreClient/Classes/OpenAPIs/Models/EnumClass.swift
@@ -7,7 +7,6 @@
 
 import Foundation
 
-
 public enum EnumClass: String, Codable {
     case abc = "_abc"
     case efg = "-efg"
diff --git a/samples/client/petstore/swift4/default/PetstoreClient/Classes/OpenAPIs/Models/EnumTest.swift b/samples/client/petstore/swift4/default/PetstoreClient/Classes/OpenAPIs/Models/EnumTest.swift
index 0f546c76a2..6db9b34d18 100644
--- a/samples/client/petstore/swift4/default/PetstoreClient/Classes/OpenAPIs/Models/EnumTest.swift
+++ b/samples/client/petstore/swift4/default/PetstoreClient/Classes/OpenAPIs/Models/EnumTest.swift
@@ -7,8 +7,6 @@
 
 import Foundation
 
-
-
 public struct EnumTest: Codable {
 
     public enum EnumString: String, Codable {
@@ -43,7 +41,7 @@ public struct EnumTest: Codable {
         self.outerEnum = outerEnum
     }
 
-    public enum CodingKeys: String, CodingKey { 
+    public enum CodingKeys: String, CodingKey {
         case enumString = "enum_string"
         case enumStringRequired = "enum_string_required"
         case enumInteger = "enum_integer"
@@ -51,6 +49,4 @@ public struct EnumTest: Codable {
         case outerEnum
     }
 
-
 }
-
diff --git a/samples/client/petstore/swift4/default/PetstoreClient/Classes/OpenAPIs/Models/File.swift b/samples/client/petstore/swift4/default/PetstoreClient/Classes/OpenAPIs/Models/File.swift
index c8bd1f1958..ea3520f053 100644
--- a/samples/client/petstore/swift4/default/PetstoreClient/Classes/OpenAPIs/Models/File.swift
+++ b/samples/client/petstore/swift4/default/PetstoreClient/Classes/OpenAPIs/Models/File.swift
@@ -7,7 +7,6 @@
 
 import Foundation
 
-
 /** Must be named &#x60;File&#x60; for test. */
 
 public struct File: Codable {
@@ -19,6 +18,4 @@ public struct File: Codable {
         self.sourceURI = sourceURI
     }
 
-
 }
-
diff --git a/samples/client/petstore/swift4/default/PetstoreClient/Classes/OpenAPIs/Models/FileSchemaTestClass.swift b/samples/client/petstore/swift4/default/PetstoreClient/Classes/OpenAPIs/Models/FileSchemaTestClass.swift
index 64d0250680..532f145793 100644
--- a/samples/client/petstore/swift4/default/PetstoreClient/Classes/OpenAPIs/Models/FileSchemaTestClass.swift
+++ b/samples/client/petstore/swift4/default/PetstoreClient/Classes/OpenAPIs/Models/FileSchemaTestClass.swift
@@ -7,8 +7,6 @@
 
 import Foundation
 
-
-
 public struct FileSchemaTestClass: Codable {
 
     public var file: File?
@@ -19,6 +17,4 @@ public struct FileSchemaTestClass: Codable {
         self.files = files
     }
 
-
 }
-
diff --git a/samples/client/petstore/swift4/default/PetstoreClient/Classes/OpenAPIs/Models/FormatTest.swift b/samples/client/petstore/swift4/default/PetstoreClient/Classes/OpenAPIs/Models/FormatTest.swift
index faa091b065..20bd6d103b 100644
--- a/samples/client/petstore/swift4/default/PetstoreClient/Classes/OpenAPIs/Models/FormatTest.swift
+++ b/samples/client/petstore/swift4/default/PetstoreClient/Classes/OpenAPIs/Models/FormatTest.swift
@@ -7,8 +7,6 @@
 
 import Foundation
 
-
-
 public struct FormatTest: Codable {
 
     public var integer: Int?
@@ -41,6 +39,4 @@ public struct FormatTest: Codable {
         self.password = password
     }
 
-
 }
-
diff --git a/samples/client/petstore/swift4/default/PetstoreClient/Classes/OpenAPIs/Models/HasOnlyReadOnly.swift b/samples/client/petstore/swift4/default/PetstoreClient/Classes/OpenAPIs/Models/HasOnlyReadOnly.swift
index 554aee1081..906ddb06fb 100644
--- a/samples/client/petstore/swift4/default/PetstoreClient/Classes/OpenAPIs/Models/HasOnlyReadOnly.swift
+++ b/samples/client/petstore/swift4/default/PetstoreClient/Classes/OpenAPIs/Models/HasOnlyReadOnly.swift
@@ -7,8 +7,6 @@
 
 import Foundation
 
-
-
 public struct HasOnlyReadOnly: Codable {
 
     public var bar: String?
@@ -19,6 +17,4 @@ public struct HasOnlyReadOnly: Codable {
         self.foo = foo
     }
 
-
 }
-
diff --git a/samples/client/petstore/swift4/default/PetstoreClient/Classes/OpenAPIs/Models/List.swift b/samples/client/petstore/swift4/default/PetstoreClient/Classes/OpenAPIs/Models/List.swift
index 8997340ff4..08d5995387 100644
--- a/samples/client/petstore/swift4/default/PetstoreClient/Classes/OpenAPIs/Models/List.swift
+++ b/samples/client/petstore/swift4/default/PetstoreClient/Classes/OpenAPIs/Models/List.swift
@@ -7,8 +7,6 @@
 
 import Foundation
 
-
-
 public struct List: Codable {
 
     public var _123list: String?
@@ -17,10 +15,8 @@ public struct List: Codable {
         self._123list = _123list
     }
 
-    public enum CodingKeys: String, CodingKey { 
+    public enum CodingKeys: String, CodingKey {
         case _123list = "123-list"
     }
 
-
 }
-
diff --git a/samples/client/petstore/swift4/default/PetstoreClient/Classes/OpenAPIs/Models/MapTest.swift b/samples/client/petstore/swift4/default/PetstoreClient/Classes/OpenAPIs/Models/MapTest.swift
index 2d3a45d35a..3a10a7dfca 100644
--- a/samples/client/petstore/swift4/default/PetstoreClient/Classes/OpenAPIs/Models/MapTest.swift
+++ b/samples/client/petstore/swift4/default/PetstoreClient/Classes/OpenAPIs/Models/MapTest.swift
@@ -7,33 +7,29 @@
 
 import Foundation
 
-
-
 public struct MapTest: Codable {
 
     public enum MapOfEnumString: String, Codable {
         case upper = "UPPER"
         case lower = "lower"
     }
-    public var mapMapOfString: [String:[String:String]]?
-    public var mapOfEnumString: [String:String]?
-    public var directMap: [String:Bool]?
+    public var mapMapOfString: [String: [String: String]]?
+    public var mapOfEnumString: [String: String]?
+    public var directMap: [String: Bool]?
     public var indirectMap: StringBooleanMap?
 
-    public init(mapMapOfString: [String:[String:String]]?, mapOfEnumString: [String:String]?, directMap: [String:Bool]?, indirectMap: StringBooleanMap?) {
+    public init(mapMapOfString: [String: [String: String]]?, mapOfEnumString: [String: String]?, directMap: [String: Bool]?, indirectMap: StringBooleanMap?) {
         self.mapMapOfString = mapMapOfString
         self.mapOfEnumString = mapOfEnumString
         self.directMap = directMap
         self.indirectMap = indirectMap
     }
 
-    public enum CodingKeys: String, CodingKey { 
+    public enum CodingKeys: String, CodingKey {
         case mapMapOfString = "map_map_of_string"
         case mapOfEnumString = "map_of_enum_string"
         case directMap = "direct_map"
         case indirectMap = "indirect_map"
     }
 
-
 }
-
diff --git a/samples/client/petstore/swift4/default/PetstoreClient/Classes/OpenAPIs/Models/MixedPropertiesAndAdditionalPropertiesClass.swift b/samples/client/petstore/swift4/default/PetstoreClient/Classes/OpenAPIs/Models/MixedPropertiesAndAdditionalPropertiesClass.swift
index 7116108fd7..c3deb2f289 100644
--- a/samples/client/petstore/swift4/default/PetstoreClient/Classes/OpenAPIs/Models/MixedPropertiesAndAdditionalPropertiesClass.swift
+++ b/samples/client/petstore/swift4/default/PetstoreClient/Classes/OpenAPIs/Models/MixedPropertiesAndAdditionalPropertiesClass.swift
@@ -7,20 +7,16 @@
 
 import Foundation
 
-
-
 public struct MixedPropertiesAndAdditionalPropertiesClass: Codable {
 
     public var uuid: UUID?
     public var dateTime: Date?
-    public var map: [String:Animal]?
+    public var map: [String: Animal]?
 
-    public init(uuid: UUID?, dateTime: Date?, map: [String:Animal]?) {
+    public init(uuid: UUID?, dateTime: Date?, map: [String: Animal]?) {
         self.uuid = uuid
         self.dateTime = dateTime
         self.map = map
     }
 
-
 }
-
diff --git a/samples/client/petstore/swift4/default/PetstoreClient/Classes/OpenAPIs/Models/Model200Response.swift b/samples/client/petstore/swift4/default/PetstoreClient/Classes/OpenAPIs/Models/Model200Response.swift
index fc1d0606b7..7ed6aad907 100644
--- a/samples/client/petstore/swift4/default/PetstoreClient/Classes/OpenAPIs/Models/Model200Response.swift
+++ b/samples/client/petstore/swift4/default/PetstoreClient/Classes/OpenAPIs/Models/Model200Response.swift
@@ -7,7 +7,6 @@
 
 import Foundation
 
-
 /** Model for testing model name starting with number */
 
 public struct Model200Response: Codable {
@@ -20,11 +19,9 @@ public struct Model200Response: Codable {
         self._class = _class
     }
 
-    public enum CodingKeys: String, CodingKey { 
+    public enum CodingKeys: String, CodingKey {
         case name
         case _class = "class"
     }
 
-
 }
-
diff --git a/samples/client/petstore/swift4/default/PetstoreClient/Classes/OpenAPIs/Models/Name.swift b/samples/client/petstore/swift4/default/PetstoreClient/Classes/OpenAPIs/Models/Name.swift
index cc165d767d..ce9ffe4fb3 100644
--- a/samples/client/petstore/swift4/default/PetstoreClient/Classes/OpenAPIs/Models/Name.swift
+++ b/samples/client/petstore/swift4/default/PetstoreClient/Classes/OpenAPIs/Models/Name.swift
@@ -7,7 +7,6 @@
 
 import Foundation
 
-
 /** Model for testing model name same as property name */
 
 public struct Name: Codable {
@@ -24,13 +23,11 @@ public struct Name: Codable {
         self._123number = _123number
     }
 
-    public enum CodingKeys: String, CodingKey { 
+    public enum CodingKeys: String, CodingKey {
         case name
         case snakeCase = "snake_case"
         case property
         case _123number = "123Number"
     }
 
-
 }
-
diff --git a/samples/client/petstore/swift4/default/PetstoreClient/Classes/OpenAPIs/Models/NumberOnly.swift b/samples/client/petstore/swift4/default/PetstoreClient/Classes/OpenAPIs/Models/NumberOnly.swift
index e6fb206093..abd2269e8e 100644
--- a/samples/client/petstore/swift4/default/PetstoreClient/Classes/OpenAPIs/Models/NumberOnly.swift
+++ b/samples/client/petstore/swift4/default/PetstoreClient/Classes/OpenAPIs/Models/NumberOnly.swift
@@ -7,8 +7,6 @@
 
 import Foundation
 
-
-
 public struct NumberOnly: Codable {
 
     public var justNumber: Double?
@@ -17,10 +15,8 @@ public struct NumberOnly: Codable {
         self.justNumber = justNumber
     }
 
-    public enum CodingKeys: String, CodingKey { 
+    public enum CodingKeys: String, CodingKey {
         case justNumber = "JustNumber"
     }
 
-
 }
-
diff --git a/samples/client/petstore/swift4/default/PetstoreClient/Classes/OpenAPIs/Models/Order.swift b/samples/client/petstore/swift4/default/PetstoreClient/Classes/OpenAPIs/Models/Order.swift
index 83c3b85e66..a6e1b1d2e5 100644
--- a/samples/client/petstore/swift4/default/PetstoreClient/Classes/OpenAPIs/Models/Order.swift
+++ b/samples/client/petstore/swift4/default/PetstoreClient/Classes/OpenAPIs/Models/Order.swift
@@ -7,8 +7,6 @@
 
 import Foundation
 
-
-
 public struct Order: Codable {
 
     public enum Status: String, Codable {
@@ -33,6 +31,4 @@ public struct Order: Codable {
         self.complete = complete
     }
 
-
 }
-
diff --git a/samples/client/petstore/swift4/default/PetstoreClient/Classes/OpenAPIs/Models/OuterComposite.swift b/samples/client/petstore/swift4/default/PetstoreClient/Classes/OpenAPIs/Models/OuterComposite.swift
index edc4523d9f..49aec001c5 100644
--- a/samples/client/petstore/swift4/default/PetstoreClient/Classes/OpenAPIs/Models/OuterComposite.swift
+++ b/samples/client/petstore/swift4/default/PetstoreClient/Classes/OpenAPIs/Models/OuterComposite.swift
@@ -7,8 +7,6 @@
 
 import Foundation
 
-
-
 public struct OuterComposite: Codable {
 
     public var myNumber: Double?
@@ -21,12 +19,10 @@ public struct OuterComposite: Codable {
         self.myBoolean = myBoolean
     }
 
-    public enum CodingKeys: String, CodingKey { 
+    public enum CodingKeys: String, CodingKey {
         case myNumber = "my_number"
         case myString = "my_string"
         case myBoolean = "my_boolean"
     }
 
-
 }
-
diff --git a/samples/client/petstore/swift4/default/PetstoreClient/Classes/OpenAPIs/Models/OuterEnum.swift b/samples/client/petstore/swift4/default/PetstoreClient/Classes/OpenAPIs/Models/OuterEnum.swift
index bd1643d279..9f80fc95ec 100644
--- a/samples/client/petstore/swift4/default/PetstoreClient/Classes/OpenAPIs/Models/OuterEnum.swift
+++ b/samples/client/petstore/swift4/default/PetstoreClient/Classes/OpenAPIs/Models/OuterEnum.swift
@@ -7,7 +7,6 @@
 
 import Foundation
 
-
 public enum OuterEnum: String, Codable {
     case placed = "placed"
     case approved = "approved"
diff --git a/samples/client/petstore/swift4/default/PetstoreClient/Classes/OpenAPIs/Models/Pet.swift b/samples/client/petstore/swift4/default/PetstoreClient/Classes/OpenAPIs/Models/Pet.swift
index 5e39abae6c..af60a550bb 100644
--- a/samples/client/petstore/swift4/default/PetstoreClient/Classes/OpenAPIs/Models/Pet.swift
+++ b/samples/client/petstore/swift4/default/PetstoreClient/Classes/OpenAPIs/Models/Pet.swift
@@ -7,8 +7,6 @@
 
 import Foundation
 
-
-
 public struct Pet: Codable {
 
     public enum Status: String, Codable {
@@ -33,6 +31,4 @@ public struct Pet: Codable {
         self.status = status
     }
 
-
 }
-
diff --git a/samples/client/petstore/swift4/default/PetstoreClient/Classes/OpenAPIs/Models/ReadOnlyFirst.swift b/samples/client/petstore/swift4/default/PetstoreClient/Classes/OpenAPIs/Models/ReadOnlyFirst.swift
index 48b655a5b0..0acd21fd10 100644
--- a/samples/client/petstore/swift4/default/PetstoreClient/Classes/OpenAPIs/Models/ReadOnlyFirst.swift
+++ b/samples/client/petstore/swift4/default/PetstoreClient/Classes/OpenAPIs/Models/ReadOnlyFirst.swift
@@ -7,8 +7,6 @@
 
 import Foundation
 
-
-
 public struct ReadOnlyFirst: Codable {
 
     public var bar: String?
@@ -19,6 +17,4 @@ public struct ReadOnlyFirst: Codable {
         self.baz = baz
     }
 
-
 }
-
diff --git a/samples/client/petstore/swift4/default/PetstoreClient/Classes/OpenAPIs/Models/Return.swift b/samples/client/petstore/swift4/default/PetstoreClient/Classes/OpenAPIs/Models/Return.swift
index de4b218999..076082af84 100644
--- a/samples/client/petstore/swift4/default/PetstoreClient/Classes/OpenAPIs/Models/Return.swift
+++ b/samples/client/petstore/swift4/default/PetstoreClient/Classes/OpenAPIs/Models/Return.swift
@@ -7,7 +7,6 @@
 
 import Foundation
 
-
 /** Model for testing reserved words */
 
 public struct Return: Codable {
@@ -18,10 +17,8 @@ public struct Return: Codable {
         self._return = _return
     }
 
-    public enum CodingKeys: String, CodingKey { 
+    public enum CodingKeys: String, CodingKey {
         case _return = "return"
     }
 
-
 }
-
diff --git a/samples/client/petstore/swift4/default/PetstoreClient/Classes/OpenAPIs/Models/SpecialModelName.swift b/samples/client/petstore/swift4/default/PetstoreClient/Classes/OpenAPIs/Models/SpecialModelName.swift
index 213d896ba9..e79fc45c0e 100644
--- a/samples/client/petstore/swift4/default/PetstoreClient/Classes/OpenAPIs/Models/SpecialModelName.swift
+++ b/samples/client/petstore/swift4/default/PetstoreClient/Classes/OpenAPIs/Models/SpecialModelName.swift
@@ -7,8 +7,6 @@
 
 import Foundation
 
-
-
 public struct SpecialModelName: Codable {
 
     public var specialPropertyName: Int64?
@@ -17,10 +15,8 @@ public struct SpecialModelName: Codable {
         self.specialPropertyName = specialPropertyName
     }
 
-    public enum CodingKeys: String, CodingKey { 
+    public enum CodingKeys: String, CodingKey {
         case specialPropertyName = "$special[property.name]"
     }
 
-
 }
-
diff --git a/samples/client/petstore/swift4/default/PetstoreClient/Classes/OpenAPIs/Models/StringBooleanMap.swift b/samples/client/petstore/swift4/default/PetstoreClient/Classes/OpenAPIs/Models/StringBooleanMap.swift
index ae15e87d94..3f1237fee4 100644
--- a/samples/client/petstore/swift4/default/PetstoreClient/Classes/OpenAPIs/Models/StringBooleanMap.swift
+++ b/samples/client/petstore/swift4/default/PetstoreClient/Classes/OpenAPIs/Models/StringBooleanMap.swift
@@ -7,12 +7,9 @@
 
 import Foundation
 
-
-
 public struct StringBooleanMap: Codable {
 
-
-    public var additionalProperties: [String:Bool] = [:]
+    public var additionalProperties: [String: Bool] = [:]
 
     public subscript(key: String) -> Bool? {
         get {
@@ -45,7 +42,4 @@ public struct StringBooleanMap: Codable {
         additionalProperties = try container.decodeMap(Bool.self, excludedKeys: nonAdditionalPropertyKeys)
     }
 
-
-
 }
-
diff --git a/samples/client/petstore/swift4/default/PetstoreClient/Classes/OpenAPIs/Models/Tag.swift b/samples/client/petstore/swift4/default/PetstoreClient/Classes/OpenAPIs/Models/Tag.swift
index 32ee33a1a1..4dd8a9a9f5 100644
--- a/samples/client/petstore/swift4/default/PetstoreClient/Classes/OpenAPIs/Models/Tag.swift
+++ b/samples/client/petstore/swift4/default/PetstoreClient/Classes/OpenAPIs/Models/Tag.swift
@@ -7,8 +7,6 @@
 
 import Foundation
 
-
-
 public struct Tag: Codable {
 
     public var id: Int64?
@@ -19,6 +17,4 @@ public struct Tag: Codable {
         self.name = name
     }
 
-
 }
-
diff --git a/samples/client/petstore/swift4/default/PetstoreClient/Classes/OpenAPIs/Models/TypeHolderDefault.swift b/samples/client/petstore/swift4/default/PetstoreClient/Classes/OpenAPIs/Models/TypeHolderDefault.swift
index be1afdf026..bf0006e1a2 100644
--- a/samples/client/petstore/swift4/default/PetstoreClient/Classes/OpenAPIs/Models/TypeHolderDefault.swift
+++ b/samples/client/petstore/swift4/default/PetstoreClient/Classes/OpenAPIs/Models/TypeHolderDefault.swift
@@ -7,8 +7,6 @@
 
 import Foundation
 
-
-
 public struct TypeHolderDefault: Codable {
 
     public var stringItem: String = "what"
@@ -25,7 +23,7 @@ public struct TypeHolderDefault: Codable {
         self.arrayItem = arrayItem
     }
 
-    public enum CodingKeys: String, CodingKey { 
+    public enum CodingKeys: String, CodingKey {
         case stringItem = "string_item"
         case numberItem = "number_item"
         case integerItem = "integer_item"
@@ -33,6 +31,4 @@ public struct TypeHolderDefault: Codable {
         case arrayItem = "array_item"
     }
 
-
 }
-
diff --git a/samples/client/petstore/swift4/default/PetstoreClient/Classes/OpenAPIs/Models/TypeHolderExample.swift b/samples/client/petstore/swift4/default/PetstoreClient/Classes/OpenAPIs/Models/TypeHolderExample.swift
index f46c8952e1..602a2a6d18 100644
--- a/samples/client/petstore/swift4/default/PetstoreClient/Classes/OpenAPIs/Models/TypeHolderExample.swift
+++ b/samples/client/petstore/swift4/default/PetstoreClient/Classes/OpenAPIs/Models/TypeHolderExample.swift
@@ -7,8 +7,6 @@
 
 import Foundation
 
-
-
 public struct TypeHolderExample: Codable {
 
     public var stringItem: String
@@ -25,7 +23,7 @@ public struct TypeHolderExample: Codable {
         self.arrayItem = arrayItem
     }
 
-    public enum CodingKeys: String, CodingKey { 
+    public enum CodingKeys: String, CodingKey {
         case stringItem = "string_item"
         case numberItem = "number_item"
         case integerItem = "integer_item"
@@ -33,6 +31,4 @@ public struct TypeHolderExample: Codable {
         case arrayItem = "array_item"
     }
 
-
 }
-
diff --git a/samples/client/petstore/swift4/default/PetstoreClient/Classes/OpenAPIs/Models/User.swift b/samples/client/petstore/swift4/default/PetstoreClient/Classes/OpenAPIs/Models/User.swift
index a61b584420..79f271ed73 100644
--- a/samples/client/petstore/swift4/default/PetstoreClient/Classes/OpenAPIs/Models/User.swift
+++ b/samples/client/petstore/swift4/default/PetstoreClient/Classes/OpenAPIs/Models/User.swift
@@ -7,8 +7,6 @@
 
 import Foundation
 
-
-
 public struct User: Codable {
 
     public var id: Int64?
@@ -32,6 +30,4 @@ public struct User: Codable {
         self.userStatus = userStatus
     }
 
-
 }
-
diff --git a/samples/client/petstore/swift4/default/README.md b/samples/client/petstore/swift4/default/README.md
index 1e7f0a59ea..0711eb8705 100644
--- a/samples/client/petstore/swift4/default/README.md
+++ b/samples/client/petstore/swift4/default/README.md
@@ -73,10 +73,12 @@ Class | Method | HTTP request | Description
  - [ArrayTest](docs/ArrayTest.md)
  - [Capitalization](docs/Capitalization.md)
  - [Cat](docs/Cat.md)
+ - [CatAllOf](docs/CatAllOf.md)
  - [Category](docs/Category.md)
  - [ClassModel](docs/ClassModel.md)
  - [Client](docs/Client.md)
  - [Dog](docs/Dog.md)
+ - [DogAllOf](docs/DogAllOf.md)
  - [EnumArrays](docs/EnumArrays.md)
  - [EnumClass](docs/EnumClass.md)
  - [EnumTest](docs/EnumTest.md)
diff --git a/samples/client/petstore/swift4/default/SwaggerClientTests/Pods/Alamofire/Source/Alamofire.swift b/samples/client/petstore/swift4/default/SwaggerClientTests/Pods/Alamofire/Source/Alamofire.swift
index 2fcc05ca06..a411b77491 100644
--- a/samples/client/petstore/swift4/default/SwaggerClientTests/Pods/Alamofire/Source/Alamofire.swift
+++ b/samples/client/petstore/swift4/default/SwaggerClientTests/Pods/Alamofire/Source/Alamofire.swift
@@ -135,8 +135,7 @@ public func request(
     parameters: Parameters? = nil,
     encoding: ParameterEncoding = URLEncoding.default,
     headers: HTTPHeaders? = nil)
-    -> DataRequest
-{
+    -> DataRequest {
     return SessionManager.default.request(
         url,
         method: method,
@@ -183,8 +182,7 @@ public func download(
     encoding: ParameterEncoding = URLEncoding.default,
     headers: HTTPHeaders? = nil,
     to destination: DownloadRequest.DownloadFileDestination? = nil)
-    -> DownloadRequest
-{
+    -> DownloadRequest {
     return SessionManager.default.download(
         url,
         method: method,
@@ -209,8 +207,7 @@ public func download(
 public func download(
     _ urlRequest: URLRequestConvertible,
     to destination: DownloadRequest.DownloadFileDestination? = nil)
-    -> DownloadRequest
-{
+    -> DownloadRequest {
     return SessionManager.default.download(urlRequest, to: destination)
 }
 
@@ -239,8 +236,7 @@ public func download(
 public func download(
     resumingWith resumeData: Data,
     to destination: DownloadRequest.DownloadFileDestination? = nil)
-    -> DownloadRequest
-{
+    -> DownloadRequest {
     return SessionManager.default.download(resumingWith: resumeData, to: destination)
 }
 
@@ -263,8 +259,7 @@ public func upload(
     to url: URLConvertible,
     method: HTTPMethod = .post,
     headers: HTTPHeaders? = nil)
-    -> UploadRequest
-{
+    -> UploadRequest {
     return SessionManager.default.upload(fileURL, to: url, method: method, headers: headers)
 }
 
@@ -297,8 +292,7 @@ public func upload(
     to url: URLConvertible,
     method: HTTPMethod = .post,
     headers: HTTPHeaders? = nil)
-    -> UploadRequest
-{
+    -> UploadRequest {
     return SessionManager.default.upload(data, to: url, method: method, headers: headers)
 }
 
@@ -331,8 +325,7 @@ public func upload(
     to url: URLConvertible,
     method: HTTPMethod = .post,
     headers: HTTPHeaders? = nil)
-    -> UploadRequest
-{
+    -> UploadRequest {
     return SessionManager.default.upload(stream, to: url, method: method, headers: headers)
 }
 
@@ -379,8 +372,7 @@ public func upload(
     to url: URLConvertible,
     method: HTTPMethod = .post,
     headers: HTTPHeaders? = nil,
-    encodingCompletion: ((SessionManager.MultipartFormDataEncodingResult) -> Void)?)
-{
+    encodingCompletion: ((SessionManager.MultipartFormDataEncodingResult) -> Void)?) {
     return SessionManager.default.upload(
         multipartFormData: multipartFormData,
         usingThreshold: encodingMemoryThreshold,
@@ -416,8 +408,7 @@ public func upload(
     multipartFormData: @escaping (MultipartFormData) -> Void,
     usingThreshold encodingMemoryThreshold: UInt64 = SessionManager.multipartFormDataEncodingMemoryThreshold,
     with urlRequest: URLRequestConvertible,
-    encodingCompletion: ((SessionManager.MultipartFormDataEncodingResult) -> Void)?)
-{
+    encodingCompletion: ((SessionManager.MultipartFormDataEncodingResult) -> Void)?) {
     return SessionManager.default.upload(
         multipartFormData: multipartFormData,
         usingThreshold: encodingMemoryThreshold,
diff --git a/samples/client/petstore/swift4/default/SwaggerClientTests/Pods/Alamofire/Source/MultipartFormData.swift b/samples/client/petstore/swift4/default/SwaggerClientTests/Pods/Alamofire/Source/MultipartFormData.swift
index 057e68b977..85a0685748 100644
--- a/samples/client/petstore/swift4/default/SwaggerClientTests/Pods/Alamofire/Source/MultipartFormData.swift
+++ b/samples/client/petstore/swift4/default/SwaggerClientTests/Pods/Alamofire/Source/MultipartFormData.swift
@@ -275,8 +275,7 @@ open class MultipartFormData {
             }
 
             bodyContentLength = fileSize.uint64Value
-        }
-        catch {
+        } catch {
             setBodyPartError(withReason: .bodyPartFileSizeQueryFailedWithError(forURL: fileURL, error: error))
             return
         }
@@ -312,8 +311,7 @@ open class MultipartFormData {
         withLength length: UInt64,
         name: String,
         fileName: String,
-        mimeType: String)
-    {
+        mimeType: String) {
         let headers = contentHeaders(withName: name, fileName: fileName, mimeType: mimeType)
         append(stream, withLength: length, headers: headers)
     }
diff --git a/samples/client/petstore/swift4/default/SwaggerClientTests/Pods/Alamofire/Source/NetworkReachabilityManager.swift b/samples/client/petstore/swift4/default/SwaggerClientTests/Pods/Alamofire/Source/NetworkReachabilityManager.swift
index 3ff2e7fc27..60bda83d2f 100644
--- a/samples/client/petstore/swift4/default/SwaggerClientTests/Pods/Alamofire/Source/NetworkReachabilityManager.swift
+++ b/samples/client/petstore/swift4/default/SwaggerClientTests/Pods/Alamofire/Source/NetworkReachabilityManager.swift
@@ -146,8 +146,7 @@ open class NetworkReachabilityManager {
         context.info = Unmanaged.passUnretained(self).toOpaque()
 
         let callbackEnabled = SCNetworkReachabilitySetCallback(
-            reachability,
-            { (_, flags, info) in
+            reachability, { (_, flags, info) in
                 let reachability = Unmanaged<NetworkReachabilityManager>.fromOpaque(info!).takeUnretainedValue()
                 reachability.notifyListener(flags)
             },
@@ -216,8 +215,7 @@ extension NetworkReachabilityManager.NetworkReachabilityStatus: Equatable {}
 public func ==(
     lhs: NetworkReachabilityManager.NetworkReachabilityStatus,
     rhs: NetworkReachabilityManager.NetworkReachabilityStatus)
-    -> Bool
-{
+    -> Bool {
     switch (lhs, rhs) {
     case (.unknown, .unknown):
         return true
diff --git a/samples/client/petstore/swift4/default/SwaggerClientTests/Pods/Alamofire/Source/ParameterEncoding.swift b/samples/client/petstore/swift4/default/SwaggerClientTests/Pods/Alamofire/Source/ParameterEncoding.swift
index 4a54f2dd00..344a048cad 100644
--- a/samples/client/petstore/swift4/default/SwaggerClientTests/Pods/Alamofire/Source/ParameterEncoding.swift
+++ b/samples/client/petstore/swift4/default/SwaggerClientTests/Pods/Alamofire/Source/ParameterEncoding.swift
@@ -435,8 +435,7 @@ public struct PropertyListEncoding: ParameterEncoding {
     /// - returns: The new `PropertyListEncoding` instance.
     public init(
         format: PropertyListSerialization.PropertyListFormat = .xml,
-        options: PropertyListSerialization.WriteOptions = 0)
-    {
+        options: PropertyListSerialization.WriteOptions = 0) {
         self.format = format
         self.options = options
     }
diff --git a/samples/client/petstore/swift4/default/SwaggerClientTests/Pods/Alamofire/Source/Request.swift b/samples/client/petstore/swift4/default/SwaggerClientTests/Pods/Alamofire/Source/Request.swift
index ea43411377..18b83a0e73 100644
--- a/samples/client/petstore/swift4/default/SwaggerClientTests/Pods/Alamofire/Source/Request.swift
+++ b/samples/client/petstore/swift4/default/SwaggerClientTests/Pods/Alamofire/Source/Request.swift
@@ -161,8 +161,7 @@ open class Request {
         user: String,
         password: String,
         persistence: URLCredential.Persistence = .forSession)
-        -> Self
-    {
+        -> Self {
         let credential = URLCredential(user: user, password: password, persistence: persistence)
         return authenticate(usingCredential: credential)
     }
@@ -538,8 +537,7 @@ open class DownloadRequest: Request {
     open class func suggestedDownloadDestination(
         for directory: FileManager.SearchPathDirectory = .documentDirectory,
         in domain: FileManager.SearchPathDomainMask = .userDomainMask)
-        -> DownloadFileDestination
-    {
+        -> DownloadFileDestination {
         return { temporaryURL, response in
             let directoryURLs = FileManager.default.urls(for: directory, in: domain)
 
diff --git a/samples/client/petstore/swift4/default/SwaggerClientTests/Pods/Alamofire/Source/Response.swift b/samples/client/petstore/swift4/default/SwaggerClientTests/Pods/Alamofire/Source/Response.swift
index 74b1ef54d0..23571383ba 100644
--- a/samples/client/petstore/swift4/default/SwaggerClientTests/Pods/Alamofire/Source/Response.swift
+++ b/samples/client/petstore/swift4/default/SwaggerClientTests/Pods/Alamofire/Source/Response.swift
@@ -58,8 +58,7 @@ public struct DefaultDataResponse {
         data: Data?,
         error: Error?,
         timeline: Timeline = Timeline(),
-        metrics: AnyObject? = nil)
-    {
+        metrics: AnyObject? = nil) {
         self.request = request
         self.response = response
         self.data = data
@@ -109,8 +108,7 @@ public struct DataResponse<Value> {
         response: HTTPURLResponse?,
         data: Data?,
         result: Result<Value>,
-        timeline: Timeline = Timeline())
-    {
+        timeline: Timeline = Timeline()) {
         self.request = request
         self.response = response
         self.data = data
@@ -296,8 +294,7 @@ public struct DefaultDownloadResponse {
         resumeData: Data?,
         error: Error?,
         timeline: Timeline = Timeline(),
-        metrics: AnyObject? = nil)
-    {
+        metrics: AnyObject? = nil) {
         self.request = request
         self.response = response
         self.temporaryURL = temporaryURL
@@ -359,8 +356,7 @@ public struct DownloadResponse<Value> {
         destinationURL: URL?,
         resumeData: Data?,
         result: Result<Value>,
-        timeline: Timeline = Timeline())
-    {
+        timeline: Timeline = Timeline()) {
         self.request = request
         self.response = response
         self.temporaryURL = temporaryURL
diff --git a/samples/client/petstore/swift4/default/SwaggerClientTests/Pods/Alamofire/Source/ResponseSerialization.swift b/samples/client/petstore/swift4/default/SwaggerClientTests/Pods/Alamofire/Source/ResponseSerialization.swift
index 3333726d5c..fd049edac1 100644
--- a/samples/client/petstore/swift4/default/SwaggerClientTests/Pods/Alamofire/Source/ResponseSerialization.swift
+++ b/samples/client/petstore/swift4/default/SwaggerClientTests/Pods/Alamofire/Source/ResponseSerialization.swift
@@ -144,8 +144,7 @@ extension DataRequest {
         queue: DispatchQueue? = nil,
         responseSerializer: T,
         completionHandler: @escaping (DataResponse<T.SerializedObject>) -> Void)
-        -> Self
-    {
+        -> Self {
         delegate.queue.addOperation {
             let result = responseSerializer.serializeResponse(
                 self.request,
@@ -182,8 +181,7 @@ extension DownloadRequest {
     public func response(
         queue: DispatchQueue? = nil,
         completionHandler: @escaping (DefaultDownloadResponse) -> Void)
-        -> Self
-    {
+        -> Self {
         delegate.queue.addOperation {
             (queue ?? DispatchQueue.main).async {
                 var downloadResponse = DefaultDownloadResponse(
@@ -218,8 +216,7 @@ extension DownloadRequest {
         queue: DispatchQueue? = nil,
         responseSerializer: T,
         completionHandler: @escaping (DownloadResponse<T.SerializedObject>) -> Void)
-        -> Self
-    {
+        -> Self {
         delegate.queue.addOperation {
             let result = responseSerializer.serializeResponse(
                 self.request,
@@ -289,8 +286,7 @@ extension DataRequest {
     public func responseData(
         queue: DispatchQueue? = nil,
         completionHandler: @escaping (DataResponse<Data>) -> Void)
-        -> Self
-    {
+        -> Self {
         return response(
             queue: queue,
             responseSerializer: DataRequest.dataResponseSerializer(),
@@ -329,8 +325,7 @@ extension DownloadRequest {
     public func responseData(
         queue: DispatchQueue? = nil,
         completionHandler: @escaping (DownloadResponse<Data>) -> Void)
-        -> Self
-    {
+        -> Self {
         return response(
             queue: queue,
             responseSerializer: DownloadRequest.dataResponseSerializer(),
@@ -356,8 +351,7 @@ extension Request {
         response: HTTPURLResponse?,
         data: Data?,
         error: Error?)
-        -> Result<String>
-    {
+        -> Result<String> {
         guard error == nil else { return .failure(error!) }
 
         if let response = response, emptyDataStatusCodes.contains(response.statusCode) { return .success("") }
@@ -411,8 +405,7 @@ extension DataRequest {
         queue: DispatchQueue? = nil,
         encoding: String.Encoding? = nil,
         completionHandler: @escaping (DataResponse<String>) -> Void)
-        -> Self
-    {
+        -> Self {
         return response(
             queue: queue,
             responseSerializer: DataRequest.stringResponseSerializer(encoding: encoding),
@@ -459,8 +452,7 @@ extension DownloadRequest {
         queue: DispatchQueue? = nil,
         encoding: String.Encoding? = nil,
         completionHandler: @escaping (DownloadResponse<String>) -> Void)
-        -> Self
-    {
+        -> Self {
         return response(
             queue: queue,
             responseSerializer: DownloadRequest.stringResponseSerializer(encoding: encoding),
@@ -486,8 +478,7 @@ extension Request {
         response: HTTPURLResponse?,
         data: Data?,
         error: Error?)
-        -> Result<Any>
-    {
+        -> Result<Any> {
         guard error == nil else { return .failure(error!) }
 
         if let response = response, emptyDataStatusCodes.contains(response.statusCode) { return .success(NSNull()) }
@@ -514,8 +505,7 @@ extension DataRequest {
     /// - returns: A JSON object response serializer.
     public static func jsonResponseSerializer(
         options: JSONSerialization.ReadingOptions = .allowFragments)
-        -> DataResponseSerializer<Any>
-    {
+        -> DataResponseSerializer<Any> {
         return DataResponseSerializer { _, response, data, error in
             return Request.serializeResponseJSON(options: options, response: response, data: data, error: error)
         }
@@ -532,8 +522,7 @@ extension DataRequest {
         queue: DispatchQueue? = nil,
         options: JSONSerialization.ReadingOptions = .allowFragments,
         completionHandler: @escaping (DataResponse<Any>) -> Void)
-        -> Self
-    {
+        -> Self {
         return response(
             queue: queue,
             responseSerializer: DataRequest.jsonResponseSerializer(options: options),
@@ -551,8 +540,7 @@ extension DownloadRequest {
     /// - returns: A JSON object response serializer.
     public static func jsonResponseSerializer(
         options: JSONSerialization.ReadingOptions = .allowFragments)
-        -> DownloadResponseSerializer<Any>
-    {
+        -> DownloadResponseSerializer<Any> {
         return DownloadResponseSerializer { _, response, fileURL, error in
             guard error == nil else { return .failure(error!) }
 
@@ -580,8 +568,7 @@ extension DownloadRequest {
         queue: DispatchQueue? = nil,
         options: JSONSerialization.ReadingOptions = .allowFragments,
         completionHandler: @escaping (DownloadResponse<Any>) -> Void)
-        -> Self
-    {
+        -> Self {
         return response(
             queue: queue,
             responseSerializer: DownloadRequest.jsonResponseSerializer(options: options),
@@ -607,8 +594,7 @@ extension Request {
         response: HTTPURLResponse?,
         data: Data?,
         error: Error?)
-        -> Result<Any>
-    {
+        -> Result<Any> {
         guard error == nil else { return .failure(error!) }
 
         if let response = response, emptyDataStatusCodes.contains(response.statusCode) { return .success(NSNull()) }
@@ -635,8 +621,7 @@ extension DataRequest {
     /// - returns: A property list object response serializer.
     public static func propertyListResponseSerializer(
         options: PropertyListSerialization.ReadOptions = [])
-        -> DataResponseSerializer<Any>
-    {
+        -> DataResponseSerializer<Any> {
         return DataResponseSerializer { _, response, data, error in
             return Request.serializeResponsePropertyList(options: options, response: response, data: data, error: error)
         }
@@ -653,8 +638,7 @@ extension DataRequest {
         queue: DispatchQueue? = nil,
         options: PropertyListSerialization.ReadOptions = [],
         completionHandler: @escaping (DataResponse<Any>) -> Void)
-        -> Self
-    {
+        -> Self {
         return response(
             queue: queue,
             responseSerializer: DataRequest.propertyListResponseSerializer(options: options),
@@ -672,8 +656,7 @@ extension DownloadRequest {
     /// - returns: A property list object response serializer.
     public static func propertyListResponseSerializer(
         options: PropertyListSerialization.ReadOptions = [])
-        -> DownloadResponseSerializer<Any>
-    {
+        -> DownloadResponseSerializer<Any> {
         return DownloadResponseSerializer { _, response, fileURL, error in
             guard error == nil else { return .failure(error!) }
 
@@ -701,8 +684,7 @@ extension DownloadRequest {
         queue: DispatchQueue? = nil,
         options: PropertyListSerialization.ReadOptions = [],
         completionHandler: @escaping (DownloadResponse<Any>) -> Void)
-        -> Self
-    {
+        -> Self {
         return response(
             queue: queue,
             responseSerializer: DownloadRequest.propertyListResponseSerializer(options: options),
diff --git a/samples/client/petstore/swift4/default/SwaggerClientTests/Pods/Alamofire/Source/ServerTrustPolicy.swift b/samples/client/petstore/swift4/default/SwaggerClientTests/Pods/Alamofire/Source/ServerTrustPolicy.swift
index 7f44c8d2c6..d50e941fab 100644
--- a/samples/client/petstore/swift4/default/SwaggerClientTests/Pods/Alamofire/Source/ServerTrustPolicy.swift
+++ b/samples/client/petstore/swift4/default/SwaggerClientTests/Pods/Alamofire/Source/ServerTrustPolicy.swift
@@ -249,7 +249,6 @@ public enum ServerTrustPolicy {
             let unspecified = SecTrustResultType.unspecified
             let proceed = SecTrustResultType.proceed
 
-
             isValid = result == unspecified || result == proceed
         }
 
diff --git a/samples/client/petstore/swift4/default/SwaggerClientTests/Pods/Alamofire/Source/SessionDelegate.swift b/samples/client/petstore/swift4/default/SwaggerClientTests/Pods/Alamofire/Source/SessionDelegate.swift
index 03bcb7ced6..17d0d9f150 100644
--- a/samples/client/petstore/swift4/default/SwaggerClientTests/Pods/Alamofire/Source/SessionDelegate.swift
+++ b/samples/client/petstore/swift4/default/SwaggerClientTests/Pods/Alamofire/Source/SessionDelegate.swift
@@ -255,8 +255,7 @@ extension SessionDelegate: URLSessionDelegate {
     open func urlSession(
         _ session: URLSession,
         didReceive challenge: URLAuthenticationChallenge,
-        completionHandler: @escaping (URLSession.AuthChallengeDisposition, URLCredential?) -> Void)
-    {
+        completionHandler: @escaping (URLSession.AuthChallengeDisposition, URLCredential?) -> Void) {
         guard sessionDidReceiveChallengeWithCompletion == nil else {
             sessionDidReceiveChallengeWithCompletion?(session, challenge, completionHandler)
             return
@@ -315,8 +314,7 @@ extension SessionDelegate: URLSessionTaskDelegate {
         task: URLSessionTask,
         willPerformHTTPRedirection response: HTTPURLResponse,
         newRequest request: URLRequest,
-        completionHandler: @escaping (URLRequest?) -> Void)
-    {
+        completionHandler: @escaping (URLRequest?) -> Void) {
         guard taskWillPerformHTTPRedirectionWithCompletion == nil else {
             taskWillPerformHTTPRedirectionWithCompletion?(session, task, response, request, completionHandler)
             return
@@ -342,8 +340,7 @@ extension SessionDelegate: URLSessionTaskDelegate {
         _ session: URLSession,
         task: URLSessionTask,
         didReceive challenge: URLAuthenticationChallenge,
-        completionHandler: @escaping (URLSession.AuthChallengeDisposition, URLCredential?) -> Void)
-    {
+        completionHandler: @escaping (URLSession.AuthChallengeDisposition, URLCredential?) -> Void) {
         guard taskDidReceiveChallengeWithCompletion == nil else {
             taskDidReceiveChallengeWithCompletion?(session, task, challenge, completionHandler)
             return
@@ -372,8 +369,7 @@ extension SessionDelegate: URLSessionTaskDelegate {
     open func urlSession(
         _ session: URLSession,
         task: URLSessionTask,
-        needNewBodyStream completionHandler: @escaping (InputStream?) -> Void)
-    {
+        needNewBodyStream completionHandler: @escaping (InputStream?) -> Void) {
         guard taskNeedNewBodyStreamWithCompletion == nil else {
             taskNeedNewBodyStreamWithCompletion?(session, task, completionHandler)
             return
@@ -398,8 +394,7 @@ extension SessionDelegate: URLSessionTaskDelegate {
         task: URLSessionTask,
         didSendBodyData bytesSent: Int64,
         totalBytesSent: Int64,
-        totalBytesExpectedToSend: Int64)
-    {
+        totalBytesExpectedToSend: Int64) {
         if let taskDidSendBodyData = taskDidSendBodyData {
             taskDidSendBodyData(session, task, bytesSent, totalBytesSent, totalBytesExpectedToSend)
         } else if let delegate = self[task]?.delegate as? UploadTaskDelegate {
@@ -512,8 +507,7 @@ extension SessionDelegate: URLSessionDataDelegate {
         _ session: URLSession,
         dataTask: URLSessionDataTask,
         didReceive response: URLResponse,
-        completionHandler: @escaping (URLSession.ResponseDisposition) -> Void)
-    {
+        completionHandler: @escaping (URLSession.ResponseDisposition) -> Void) {
         guard dataTaskDidReceiveResponseWithCompletion == nil else {
             dataTaskDidReceiveResponseWithCompletion?(session, dataTask, response, completionHandler)
             return
@@ -536,8 +530,7 @@ extension SessionDelegate: URLSessionDataDelegate {
     open func urlSession(
         _ session: URLSession,
         dataTask: URLSessionDataTask,
-        didBecome downloadTask: URLSessionDownloadTask)
-    {
+        didBecome downloadTask: URLSessionDownloadTask) {
         if let dataTaskDidBecomeDownloadTask = dataTaskDidBecomeDownloadTask {
             dataTaskDidBecomeDownloadTask(session, dataTask, downloadTask)
         } else {
@@ -573,8 +566,7 @@ extension SessionDelegate: URLSessionDataDelegate {
         _ session: URLSession,
         dataTask: URLSessionDataTask,
         willCacheResponse proposedResponse: CachedURLResponse,
-        completionHandler: @escaping (CachedURLResponse?) -> Void)
-    {
+        completionHandler: @escaping (CachedURLResponse?) -> Void) {
         guard dataTaskWillCacheResponseWithCompletion == nil else {
             dataTaskWillCacheResponseWithCompletion?(session, dataTask, proposedResponse, completionHandler)
             return
@@ -608,8 +600,7 @@ extension SessionDelegate: URLSessionDownloadDelegate {
     open func urlSession(
         _ session: URLSession,
         downloadTask: URLSessionDownloadTask,
-        didFinishDownloadingTo location: URL)
-    {
+        didFinishDownloadingTo location: URL) {
         if let downloadTaskDidFinishDownloadingToURL = downloadTaskDidFinishDownloadingToURL {
             downloadTaskDidFinishDownloadingToURL(session, downloadTask, location)
         } else if let delegate = self[downloadTask]?.delegate as? DownloadTaskDelegate {
@@ -632,8 +623,7 @@ extension SessionDelegate: URLSessionDownloadDelegate {
         downloadTask: URLSessionDownloadTask,
         didWriteData bytesWritten: Int64,
         totalBytesWritten: Int64,
-        totalBytesExpectedToWrite: Int64)
-    {
+        totalBytesExpectedToWrite: Int64) {
         if let downloadTaskDidWriteData = downloadTaskDidWriteData {
             downloadTaskDidWriteData(session, downloadTask, bytesWritten, totalBytesWritten, totalBytesExpectedToWrite)
         } else if let delegate = self[downloadTask]?.delegate as? DownloadTaskDelegate {
@@ -661,8 +651,7 @@ extension SessionDelegate: URLSessionDownloadDelegate {
         _ session: URLSession,
         downloadTask: URLSessionDownloadTask,
         didResumeAtOffset fileOffset: Int64,
-        expectedTotalBytes: Int64)
-    {
+        expectedTotalBytes: Int64) {
         if let downloadTaskDidResumeAtOffset = downloadTaskDidResumeAtOffset {
             downloadTaskDidResumeAtOffset(session, downloadTask, fileOffset, expectedTotalBytes)
         } else if let delegate = self[downloadTask]?.delegate as? DownloadTaskDelegate {
@@ -716,8 +705,7 @@ extension SessionDelegate: URLSessionStreamDelegate {
         _ session: URLSession,
         streamTask: URLSessionStreamTask,
         didBecome inputStream: InputStream,
-        outputStream: OutputStream)
-    {
+        outputStream: OutputStream) {
         streamTaskDidBecomeInputAndOutputStreams?(session, streamTask, inputStream, outputStream)
     }
 }
diff --git a/samples/client/petstore/swift4/default/SwaggerClientTests/Pods/Alamofire/Source/SessionManager.swift b/samples/client/petstore/swift4/default/SwaggerClientTests/Pods/Alamofire/Source/SessionManager.swift
index 8779efdaa6..8c10706677 100644
--- a/samples/client/petstore/swift4/default/SwaggerClientTests/Pods/Alamofire/Source/SessionManager.swift
+++ b/samples/client/petstore/swift4/default/SwaggerClientTests/Pods/Alamofire/Source/SessionManager.swift
@@ -166,8 +166,7 @@ open class SessionManager {
     public init(
         configuration: URLSessionConfiguration = URLSessionConfiguration.default,
         delegate: SessionDelegate = SessionDelegate(),
-        serverTrustPolicyManager: ServerTrustPolicyManager? = nil)
-    {
+        serverTrustPolicyManager: ServerTrustPolicyManager? = nil) {
         self.delegate = delegate
         self.session = URLSession(configuration: configuration, delegate: delegate, delegateQueue: nil)
 
@@ -185,8 +184,7 @@ open class SessionManager {
     public init?(
         session: URLSession,
         delegate: SessionDelegate,
-        serverTrustPolicyManager: ServerTrustPolicyManager? = nil)
-    {
+        serverTrustPolicyManager: ServerTrustPolicyManager? = nil) {
         guard delegate === session.delegate else { return nil }
 
         self.delegate = delegate
@@ -229,8 +227,7 @@ open class SessionManager {
         parameters: Parameters? = nil,
         encoding: ParameterEncoding = URLEncoding.default,
         headers: HTTPHeaders? = nil)
-        -> DataRequest
-    {
+        -> DataRequest {
         var originalRequest: URLRequest?
 
         do {
@@ -320,8 +317,7 @@ open class SessionManager {
         encoding: ParameterEncoding = URLEncoding.default,
         headers: HTTPHeaders? = nil,
         to destination: DownloadRequest.DownloadFileDestination? = nil)
-        -> DownloadRequest
-    {
+        -> DownloadRequest {
         do {
             let urlRequest = try URLRequest(url: url, method: method, headers: headers)
             let encodedURLRequest = try encoding.encode(urlRequest, with: parameters)
@@ -347,8 +343,7 @@ open class SessionManager {
     open func download(
         _ urlRequest: URLRequestConvertible,
         to destination: DownloadRequest.DownloadFileDestination? = nil)
-        -> DownloadRequest
-    {
+        -> DownloadRequest {
         do {
             let urlRequest = try urlRequest.asURLRequest()
             return download(.request(urlRequest), to: destination)
@@ -384,8 +379,7 @@ open class SessionManager {
     open func download(
         resumingWith resumeData: Data,
         to destination: DownloadRequest.DownloadFileDestination? = nil)
-        -> DownloadRequest
-    {
+        -> DownloadRequest {
         return download(.resumeData(resumeData), to: destination)
     }
 
@@ -394,8 +388,7 @@ open class SessionManager {
     private func download(
         _ downloadable: DownloadRequest.Downloadable,
         to destination: DownloadRequest.DownloadFileDestination?)
-        -> DownloadRequest
-    {
+        -> DownloadRequest {
         do {
             let task = try downloadable.task(session: session, adapter: adapter, queue: queue)
             let download = DownloadRequest(session: session, requestTask: .download(downloadable, task))
@@ -416,8 +409,7 @@ open class SessionManager {
         _ downloadable: DownloadRequest.Downloadable?,
         to destination: DownloadRequest.DownloadFileDestination?,
         failedWith error: Error)
-        -> DownloadRequest
-    {
+        -> DownloadRequest {
         var downloadTask: Request.RequestTask = .download(nil, nil)
 
         if let downloadable = downloadable {
@@ -458,8 +450,7 @@ open class SessionManager {
         to url: URLConvertible,
         method: HTTPMethod = .post,
         headers: HTTPHeaders? = nil)
-        -> UploadRequest
-    {
+        -> UploadRequest {
         do {
             let urlRequest = try URLRequest(url: url, method: method, headers: headers)
             return upload(fileURL, with: urlRequest)
@@ -504,8 +495,7 @@ open class SessionManager {
         to url: URLConvertible,
         method: HTTPMethod = .post,
         headers: HTTPHeaders? = nil)
-        -> UploadRequest
-    {
+        -> UploadRequest {
         do {
             let urlRequest = try URLRequest(url: url, method: method, headers: headers)
             return upload(data, with: urlRequest)
@@ -550,8 +540,7 @@ open class SessionManager {
         to url: URLConvertible,
         method: HTTPMethod = .post,
         headers: HTTPHeaders? = nil)
-        -> UploadRequest
-    {
+        -> UploadRequest {
         do {
             let urlRequest = try URLRequest(url: url, method: method, headers: headers)
             return upload(stream, with: urlRequest)
@@ -611,8 +600,7 @@ open class SessionManager {
         to url: URLConvertible,
         method: HTTPMethod = .post,
         headers: HTTPHeaders? = nil,
-        encodingCompletion: ((MultipartFormDataEncodingResult) -> Void)?)
-    {
+        encodingCompletion: ((MultipartFormDataEncodingResult) -> Void)?) {
         do {
             let urlRequest = try URLRequest(url: url, method: method, headers: headers)
 
@@ -654,8 +642,7 @@ open class SessionManager {
         multipartFormData: @escaping (MultipartFormData) -> Void,
         usingThreshold encodingMemoryThreshold: UInt64 = SessionManager.multipartFormDataEncodingMemoryThreshold,
         with urlRequest: URLRequestConvertible,
-        encodingCompletion: ((MultipartFormDataEncodingResult) -> Void)?)
-    {
+        encodingCompletion: ((MultipartFormDataEncodingResult) -> Void)?) {
         DispatchQueue.global(qos: .utility).async {
             let formData = MultipartFormData()
             multipartFormData(formData)
diff --git a/samples/client/petstore/swift4/default/SwaggerClientTests/Pods/Alamofire/Source/TaskDelegate.swift b/samples/client/petstore/swift4/default/SwaggerClientTests/Pods/Alamofire/Source/TaskDelegate.swift
index 8e19888fc8..12fcbe92d3 100644
--- a/samples/client/petstore/swift4/default/SwaggerClientTests/Pods/Alamofire/Source/TaskDelegate.swift
+++ b/samples/client/petstore/swift4/default/SwaggerClientTests/Pods/Alamofire/Source/TaskDelegate.swift
@@ -94,8 +94,7 @@ open class TaskDelegate: NSObject {
         task: URLSessionTask,
         willPerformHTTPRedirection response: HTTPURLResponse,
         newRequest request: URLRequest,
-        completionHandler: @escaping (URLRequest?) -> Void)
-    {
+        completionHandler: @escaping (URLRequest?) -> Void) {
         var redirectRequest: URLRequest? = request
 
         if let taskWillPerformHTTPRedirection = taskWillPerformHTTPRedirection {
@@ -110,8 +109,7 @@ open class TaskDelegate: NSObject {
         _ session: URLSession,
         task: URLSessionTask,
         didReceive challenge: URLAuthenticationChallenge,
-        completionHandler: @escaping (URLSession.AuthChallengeDisposition, URLCredential?) -> Void)
-    {
+        completionHandler: @escaping (URLSession.AuthChallengeDisposition, URLCredential?) -> Void) {
         var disposition: URLSession.AuthChallengeDisposition = .performDefaultHandling
         var credential: URLCredential?
 
@@ -150,8 +148,7 @@ open class TaskDelegate: NSObject {
     func urlSession(
         _ session: URLSession,
         task: URLSessionTask,
-        needNewBodyStream completionHandler: @escaping (InputStream?) -> Void)
-    {
+        needNewBodyStream completionHandler: @escaping (InputStream?) -> Void) {
         var bodyStream: InputStream?
 
         if let taskNeedNewBodyStream = taskNeedNewBodyStream {
@@ -237,8 +234,7 @@ class DataTaskDelegate: TaskDelegate, URLSessionDataDelegate {
         _ session: URLSession,
         dataTask: URLSessionDataTask,
         didReceive response: URLResponse,
-        completionHandler: @escaping (URLSession.ResponseDisposition) -> Void)
-    {
+        completionHandler: @escaping (URLSession.ResponseDisposition) -> Void) {
         var disposition: URLSession.ResponseDisposition = .allow
 
         expectedContentLength = response.expectedContentLength
@@ -253,8 +249,7 @@ class DataTaskDelegate: TaskDelegate, URLSessionDataDelegate {
     func urlSession(
         _ session: URLSession,
         dataTask: URLSessionDataTask,
-        didBecome downloadTask: URLSessionDownloadTask)
-    {
+        didBecome downloadTask: URLSessionDownloadTask) {
         dataTaskDidBecomeDownloadTask?(session, dataTask, downloadTask)
     }
 
@@ -287,8 +282,7 @@ class DataTaskDelegate: TaskDelegate, URLSessionDataDelegate {
         _ session: URLSession,
         dataTask: URLSessionDataTask,
         willCacheResponse proposedResponse: CachedURLResponse,
-        completionHandler: @escaping (CachedURLResponse?) -> Void)
-    {
+        completionHandler: @escaping (CachedURLResponse?) -> Void) {
         var cachedResponse: CachedURLResponse? = proposedResponse
 
         if let dataTaskWillCacheResponse = dataTaskWillCacheResponse {
@@ -343,8 +337,7 @@ class DownloadTaskDelegate: TaskDelegate, URLSessionDownloadDelegate {
     func urlSession(
         _ session: URLSession,
         downloadTask: URLSessionDownloadTask,
-        didFinishDownloadingTo location: URL)
-    {
+        didFinishDownloadingTo location: URL) {
         temporaryURL = location
 
         guard
@@ -379,8 +372,7 @@ class DownloadTaskDelegate: TaskDelegate, URLSessionDownloadDelegate {
         downloadTask: URLSessionDownloadTask,
         didWriteData bytesWritten: Int64,
         totalBytesWritten: Int64,
-        totalBytesExpectedToWrite: Int64)
-    {
+        totalBytesExpectedToWrite: Int64) {
         if initialResponseTime == nil { initialResponseTime = CFAbsoluteTimeGetCurrent() }
 
         if let downloadTaskDidWriteData = downloadTaskDidWriteData {
@@ -405,8 +397,7 @@ class DownloadTaskDelegate: TaskDelegate, URLSessionDownloadDelegate {
         _ session: URLSession,
         downloadTask: URLSessionDownloadTask,
         didResumeAtOffset fileOffset: Int64,
-        expectedTotalBytes: Int64)
-    {
+        expectedTotalBytes: Int64) {
         if let downloadTaskDidResumeAtOffset = downloadTaskDidResumeAtOffset {
             downloadTaskDidResumeAtOffset(session, downloadTask, fileOffset, expectedTotalBytes)
         } else {
@@ -448,8 +439,7 @@ class UploadTaskDelegate: DataTaskDelegate {
         task: URLSessionTask,
         didSendBodyData bytesSent: Int64,
         totalBytesSent: Int64,
-        totalBytesExpectedToSend: Int64)
-    {
+        totalBytesExpectedToSend: Int64) {
         if initialResponseTime == nil { initialResponseTime = CFAbsoluteTimeGetCurrent() }
 
         if let taskDidSendBodyData = taskDidSendBodyData {
diff --git a/samples/client/petstore/swift4/default/SwaggerClientTests/Pods/Alamofire/Source/Timeline.swift b/samples/client/petstore/swift4/default/SwaggerClientTests/Pods/Alamofire/Source/Timeline.swift
index 181c9883cb..b318b1ff48 100644
--- a/samples/client/petstore/swift4/default/SwaggerClientTests/Pods/Alamofire/Source/Timeline.swift
+++ b/samples/client/petstore/swift4/default/SwaggerClientTests/Pods/Alamofire/Source/Timeline.swift
@@ -64,8 +64,7 @@ public struct Timeline {
         requestStartTime: CFAbsoluteTime = 0.0,
         initialResponseTime: CFAbsoluteTime = 0.0,
         requestCompletedTime: CFAbsoluteTime = 0.0,
-        serializationCompletedTime: CFAbsoluteTime = 0.0)
-    {
+        serializationCompletedTime: CFAbsoluteTime = 0.0) {
         self.requestStartTime = requestStartTime
         self.initialResponseTime = initialResponseTime
         self.requestCompletedTime = requestCompletedTime
diff --git a/samples/client/petstore/swift4/default/SwaggerClientTests/Pods/Alamofire/Source/Validation.swift b/samples/client/petstore/swift4/default/SwaggerClientTests/Pods/Alamofire/Source/Validation.swift
index ec2c5c35a0..deaee34ad8 100644
--- a/samples/client/petstore/swift4/default/SwaggerClientTests/Pods/Alamofire/Source/Validation.swift
+++ b/samples/client/petstore/swift4/default/SwaggerClientTests/Pods/Alamofire/Source/Validation.swift
@@ -94,8 +94,7 @@ extension Request {
         statusCode acceptableStatusCodes: S,
         response: HTTPURLResponse)
         -> ValidationResult
-        where S.Iterator.Element == Int
-    {
+        where S.Iterator.Element == Int {
         if acceptableStatusCodes.contains(response.statusCode) {
             return .success
         } else {
@@ -111,8 +110,7 @@ extension Request {
         response: HTTPURLResponse,
         data: Data?)
         -> ValidationResult
-        where S.Iterator.Element == String
-    {
+        where S.Iterator.Element == String {
         guard let data = data, data.count > 0 else { return .success }
 
         guard
diff --git a/samples/client/petstore/swift4/default/SwaggerClientTests/SwaggerClient/AppDelegate.swift b/samples/client/petstore/swift4/default/SwaggerClientTests/SwaggerClient/AppDelegate.swift
index bb73371c38..b1896774c7 100644
--- a/samples/client/petstore/swift4/default/SwaggerClientTests/SwaggerClient/AppDelegate.swift
+++ b/samples/client/petstore/swift4/default/SwaggerClientTests/SwaggerClient/AppDelegate.swift
@@ -13,7 +13,6 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
 
     var window: UIWindow?
 
-
     func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]?) -> Bool {
         // Override point for customization after application launch.
         return true
@@ -41,6 +40,4 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
         // Called when the application is about to terminate. Save data if appropriate. See also applicationDidEnterBackground:.
     }
 
-
 }
-
diff --git a/samples/client/petstore/swift4/default/SwaggerClientTests/SwaggerClient/ViewController.swift b/samples/client/petstore/swift4/default/SwaggerClientTests/SwaggerClient/ViewController.swift
index cd7e9a1676..8dad16b10f 100644
--- a/samples/client/petstore/swift4/default/SwaggerClientTests/SwaggerClient/ViewController.swift
+++ b/samples/client/petstore/swift4/default/SwaggerClientTests/SwaggerClient/ViewController.swift
@@ -20,6 +20,4 @@ class ViewController: UIViewController {
         // Dispose of any resources that can be recreated.
     }
 
-
 }
-
diff --git a/samples/client/petstore/swift4/default/SwaggerClientTests/SwaggerClientTests/DateFormatTests.swift b/samples/client/petstore/swift4/default/SwaggerClientTests/SwaggerClientTests/DateFormatTests.swift
index 978417c358..b83a008b79 100644
--- a/samples/client/petstore/swift4/default/SwaggerClientTests/SwaggerClientTests/DateFormatTests.swift
+++ b/samples/client/petstore/swift4/default/SwaggerClientTests/SwaggerClientTests/DateFormatTests.swift
@@ -12,21 +12,21 @@ import XCTest
 @testable import SwaggerClient
 
 class DateFormatTests: XCTestCase {
-	
+
 	struct DateTest: Codable {
 		let date: Date
 	}
-	
+
 	override func setUp() {
 		super.setUp()
 		// Put setup code here. This method is called before the invocation of each test method in the class.
 	}
-	
+
 	override func tearDown() {
 		// Put teardown code here. This method is called after the invocation of each test method in the class.
 		super.tearDown()
 	}
-	
+
 	func testEncodeToJSONAlwaysResultsInUTCEncodedDate() {
 		var dateComponents = DateComponents()
 		dateComponents.calendar = Calendar(identifier: .gregorian)
@@ -37,40 +37,40 @@ class DateFormatTests: XCTestCase {
 		dateComponents.minute = 35
 		dateComponents.second = 43
 		dateComponents.nanosecond = 500
-		
+
 		// Testing a date with a timezone of +00:00 (UTC)
 		dateComponents.timeZone = TimeZone(secondsFromGMT: 0)
 		XCTAssert(dateComponents.isValidDate)
-		
+
 		guard let utcDate = dateComponents.date else {
 			XCTFail("Couldn't get a valid date")
 			return
 		}
-		
+
 		var encodedDate = utcDate.encodeToJSON() as! String
 		XCTAssert(encodedDate.hasSuffix("Z"))
-		
+
 		// test with a positive timzone offset from UTC
 		dateComponents.timeZone = TimeZone(secondsFromGMT: 60 * 60) // +01:00
 		XCTAssert(dateComponents.isValidDate)
-		
+
 		guard let nonUTCDate1 = dateComponents.date else {
 			XCTFail("Couldn't get a valid date")
 			return
 		}
-		
+
 		encodedDate = nonUTCDate1.encodeToJSON() as! String
 		XCTAssert(encodedDate.hasSuffix("Z"))
-		
+
 		// test with a negative timzone offset from UTC
 		dateComponents.timeZone = TimeZone(secondsFromGMT: -(60 * 60)) // -01:00
 		XCTAssert(dateComponents.isValidDate)
-		
+
 		guard let nonUTCDate2 = dateComponents.date else {
 			XCTFail("Couldn't get a valid date")
 			return
 		}
-		
+
 		encodedDate = nonUTCDate2.encodeToJSON() as! String
 		XCTAssert(encodedDate.hasSuffix("Z"))
 	}
@@ -79,7 +79,7 @@ class DateFormatTests: XCTestCase {
 		let jsonData = "{\"date\":\"1970-01-01T00:00:00.000Z\"}".data(using: .utf8)!
 		let decodeResult = CodableHelper.decode(DateTest.self, from: jsonData)
 		XCTAssert(decodeResult.decodableObj != nil && decodeResult.error == nil)
-		
+
 		var dateComponents = DateComponents()
 		dateComponents.calendar = Calendar(identifier: .gregorian)
 		dateComponents.year = 1970
@@ -88,16 +88,16 @@ class DateFormatTests: XCTestCase {
 		dateComponents.hour = 00
 		dateComponents.minute = 00
 		dateComponents.second = 00
-		
+
 		// Testing a date with a timezone of +00:00 (UTC)
 		dateComponents.timeZone = TimeZone(secondsFromGMT: 0)
 		XCTAssert(dateComponents.isValidDate)
-		
+
 		guard let date = dateComponents.date else {
 			XCTFail("Couldn't get a valid date")
 			return
 		}
-		
+
 		let dateTest = DateTest(date: date)
 		let encodeResult = CodableHelper.encode(dateTest)
 		XCTAssert(encodeResult.data != nil && encodeResult.error == nil)
@@ -105,9 +105,9 @@ class DateFormatTests: XCTestCase {
 			XCTFail("Unable to convert encoded data to string.")
 			return
 		}
-		
+
 		let exampleJSONString = "{\"date\":\"1970-01-01T00:00:00.000Z\"}"
 		XCTAssert(jsonString == exampleJSONString, "Encoded JSON String: \(jsonString) should match: \(exampleJSONString)")
 	}
-	
+
 }
diff --git a/samples/client/petstore/swift4/default/SwaggerClientTests/SwaggerClientTests/PetAPITests.swift b/samples/client/petstore/swift4/default/SwaggerClientTests/SwaggerClientTests/PetAPITests.swift
index b2f9fecb40..6be5bc6d29 100644
--- a/samples/client/petstore/swift4/default/SwaggerClientTests/SwaggerClientTests/PetAPITests.swift
+++ b/samples/client/petstore/swift4/default/SwaggerClientTests/SwaggerClientTests/PetAPITests.swift
@@ -11,61 +11,61 @@ import XCTest
 @testable import SwaggerClient
 
 class PetAPITests: XCTestCase {
-    
+
     let testTimeout = 10.0
 
     override func setUp() {
         super.setUp()
         // Put setup code here. This method is called before the invocation of each test method in the class.
     }
-    
+
     override func tearDown() {
         // Put teardown code here. This method is called after the invocation of each test method in the class.
         super.tearDown()
     }
-    
+
     func test1CreatePet() {
         let expectation = self.expectation(description: "testCreatePet")
         let category = PetstoreClient.Category(id: 1234, name: "eyeColor")
         let tags = [Tag(id: 1234, name: "New York"), Tag(id: 124321, name: "Jose")]
         let newPet = Pet(id: 1000, category: category, name: "Fluffy", photoUrls: ["https://petstore.com/sample/photo1.jpg", "https://petstore.com/sample/photo2.jpg"], tags: tags, status: .available)
 
-        PetAPI.addPet(body: newPet) { (response, error) in
+        PetAPI.addPet(body: newPet) { (_, error) in
             guard error == nil else {
                 XCTFail("error creating pet")
                 return
             }
-            
+
             expectation.fulfill()
         }
-        
+
         self.waitForExpectations(timeout: testTimeout, handler: nil)
     }
-    
+
     func test2GetPet() {
         let expectation = self.expectation(description: "testGetPet")
-        
+
         PetAPI.getPetById(petId: 1000) { (pet, error) in
             guard error == nil else {
                 XCTFail("error retrieving pet")
                 return
             }
-            
+
             if let pet = pet {
                 XCTAssert(pet.id == 1000, "invalid id")
                 XCTAssert(pet.name == "Fluffy", "invalid name")
-                
+
                 expectation.fulfill()
             }
         }
-        
+
         self.waitForExpectations(timeout: testTimeout, handler: nil)
     }
-    
+
     func test3DeletePet() {
         let expectation = self.expectation(description: "testDeletePet")
-        
-        PetAPI.deletePet(petId: 1000) { (response, error) in
+
+        PetAPI.deletePet(petId: 1000) { (_, error) in
             guard error == nil else {
                 XCTFail("error deleting pet")
                 return
@@ -73,7 +73,7 @@ class PetAPITests: XCTestCase {
 
             expectation.fulfill()
         }
-        
+
         self.waitForExpectations(timeout: testTimeout, handler: nil)
     }
 
diff --git a/samples/client/petstore/swift4/default/SwaggerClientTests/SwaggerClientTests/StoreAPITests.swift b/samples/client/petstore/swift4/default/SwaggerClientTests/SwaggerClientTests/StoreAPITests.swift
index 5bd01081e4..fedf7fcdbb 100644
--- a/samples/client/petstore/swift4/default/SwaggerClientTests/SwaggerClientTests/StoreAPITests.swift
+++ b/samples/client/petstore/swift4/default/SwaggerClientTests/SwaggerClientTests/StoreAPITests.swift
@@ -13,7 +13,7 @@ import XCTest
 class StoreAPITests: XCTestCase {
 
     let isoDateFormat = "yyyy-MM-dd'T'HH:mm:ssZ"
-    
+
     let testTimeout = 10.0
 
     func test1PlaceOrder() {
@@ -27,45 +27,45 @@ class StoreAPITests: XCTestCase {
                 XCTFail("error placing order: \(error.debugDescription)")
                 return
             }
-            
+
             if let order = order {
                 XCTAssert(order.id == 1000, "invalid id")
                 XCTAssert(order.quantity == 10, "invalid quantity")
                 XCTAssert(order.status == .placed, "invalid status")
                 XCTAssert(order.shipDate!.isEqual(shipDate, format: self.isoDateFormat),
                           "Date should be idempotent")
-                
+
                 expectation.fulfill()
             }
         }
-        
+
         self.waitForExpectations(timeout: testTimeout, handler: nil)
     }
-    
+
     func test2GetOrder() {
         let expectation = self.expectation(description: "testGetOrder")
-        
+
         StoreAPI.getOrderById(orderId: 1000) { (order, error) in
             guard error == nil else {
                 XCTFail("error retrieving order: \(error.debugDescription)")
                 return
             }
-            
+
             if let order = order {
                 XCTAssert(order.id == 1000, "invalid id")
                 XCTAssert(order.quantity == 10, "invalid quantity")
                 XCTAssert(order.status == .placed, "invalid status")
-                
+
                 expectation.fulfill()
             }
         }
-        
+
         self.waitForExpectations(timeout: testTimeout, handler: nil)
     }
-    
+
     func test3DeleteOrder() {
         let expectation = self.expectation(description: "testDeleteOrder")
-        
+
         StoreAPI.deleteOrder(orderId: "1000") { (response, error) in
             guard error == nil else {
                 XCTFail("error deleting order")
@@ -79,7 +79,7 @@ class StoreAPITests: XCTestCase {
 
             expectation.fulfill()
         }
-        
+
         self.waitForExpectations(timeout: testTimeout, handler: nil)
     }
 
@@ -92,7 +92,7 @@ class StoreAPITests: XCTestCase {
             progressExpectation.fulfill()
         }
 
-        requestBuilder.execute { (response, error) in
+        requestBuilder.execute { (_, _) in
             responseExpectation.fulfill()
         }
 
diff --git a/samples/client/petstore/swift4/default/SwaggerClientTests/SwaggerClientTests/UserAPITests.swift b/samples/client/petstore/swift4/default/SwaggerClientTests/SwaggerClientTests/UserAPITests.swift
index 686bebec0a..0a1ca3902e 100644
--- a/samples/client/petstore/swift4/default/SwaggerClientTests/SwaggerClientTests/UserAPITests.swift
+++ b/samples/client/petstore/swift4/default/SwaggerClientTests/SwaggerClientTests/UserAPITests.swift
@@ -11,22 +11,22 @@ import XCTest
 @testable import SwaggerClient
 
 class UserAPITests: XCTestCase {
-    
+
     let testTimeout = 10.0
-    
+
     override func setUp() {
         super.setUp()
         // Put setup code here. This method is called before the invocation of each test method in the class.
     }
-    
+
     override func tearDown() {
         // Put teardown code here. This method is called after the invocation of each test method in the class.
         super.tearDown()
     }
-    
+
     func testLogin() {
         let expectation = self.expectation(description: "testLogin")
-        
+
         UserAPI.loginUser(username: "swiftTester", password: "swift") { (_, error) in
             guard error == nil else {
                 XCTFail("error logging in")
@@ -35,14 +35,14 @@ class UserAPITests: XCTestCase {
 
             expectation.fulfill()
         }
-        
+
         self.waitForExpectations(timeout: testTimeout, handler: nil)
     }
-    
+
     func testLogout() {
         let expectation = self.expectation(description: "testLogout")
-        
-        UserAPI.logoutUser { (response, error) in
+
+        UserAPI.logoutUser { (_, error) in
             guard error == nil else {
                 XCTFail("error logging out")
                 return
@@ -50,7 +50,7 @@ class UserAPITests: XCTestCase {
 
             expectation.fulfill()
         }
-        
+
         self.waitForExpectations(timeout: testTimeout, handler: nil)
     }
 
@@ -60,7 +60,7 @@ class UserAPITests: XCTestCase {
         // into the path. So we intentionally introduce a path with spaces.
         let userRequestBuilder = UserAPI.getUserByNameWithRequestBuilder(username: "User Name With Spaces")
         let urlContainsSpace = userRequestBuilder.URLString.contains(" ")
-        
+
         XCTAssert(!urlContainsSpace, "Expected URL to be escaped, but it was not.")
     }
 
diff --git a/samples/client/petstore/swift4/default/docs/CatAllOf.md b/samples/client/petstore/swift4/default/docs/CatAllOf.md
new file mode 100644
index 0000000000..79789be61c
--- /dev/null
+++ b/samples/client/petstore/swift4/default/docs/CatAllOf.md
@@ -0,0 +1,10 @@
+# CatAllOf
+
+## Properties
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**declawed** | **Bool** |  | [optional] 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
+
diff --git a/samples/client/petstore/swift4/default/docs/DogAllOf.md b/samples/client/petstore/swift4/default/docs/DogAllOf.md
new file mode 100644
index 0000000000..9302ef52e9
--- /dev/null
+++ b/samples/client/petstore/swift4/default/docs/DogAllOf.md
@@ -0,0 +1,10 @@
+# DogAllOf
+
+## Properties
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**breed** | **String** |  | [optional] 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
+
diff --git a/samples/client/petstore/swift4/default/docs/UserAPI.md b/samples/client/petstore/swift4/default/docs/UserAPI.md
index da20013482..380813bc68 100644
--- a/samples/client/petstore/swift4/default/docs/UserAPI.md
+++ b/samples/client/petstore/swift4/default/docs/UserAPI.md
@@ -95,7 +95,7 @@ UserAPI.createUsersWithArrayInput(body: body) { (response, error) in
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **body** | [**[User]**](Array.md) | List of user object | 
+ **body** | [**[User]**](User.md) | List of user object | 
 
 ### Return type
 
@@ -143,7 +143,7 @@ UserAPI.createUsersWithListInput(body: body) { (response, error) in
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **body** | [**[User]**](Array.md) | List of user object | 
+ **body** | [**[User]**](User.md) | List of user object | 
 
 ### Return type
 
diff --git a/samples/client/petstore/swift4/default/project.yml b/samples/client/petstore/swift4/default/project.yml
new file mode 100644
index 0000000000..148b42517b
--- /dev/null
+++ b/samples/client/petstore/swift4/default/project.yml
@@ -0,0 +1,15 @@
+name: PetstoreClient
+targets:
+  PetstoreClient:
+    type: framework
+    platform: iOS
+    deploymentTarget: "10.0"
+    sources: [PetstoreClient]
+    info:
+      path: ./Info.plist
+      version: 1.0.0
+    settings:
+      APPLICATION_EXTENSION_API_ONLY: true
+    scheme: {}
+    dependencies:
+    - carthage: Alamofire
diff --git a/samples/client/petstore/swift4/objcCompatible/.openapi-generator/VERSION b/samples/client/petstore/swift4/objcCompatible/.openapi-generator/VERSION
index afa6365606..83a328a922 100644
--- a/samples/client/petstore/swift4/objcCompatible/.openapi-generator/VERSION
+++ b/samples/client/petstore/swift4/objcCompatible/.openapi-generator/VERSION
@@ -1 +1 @@
-4.0.0-SNAPSHOT
\ No newline at end of file
+4.1.0-SNAPSHOT
\ No newline at end of file
diff --git a/samples/client/petstore/swift4/objcCompatible/Info.plist b/samples/client/petstore/swift4/objcCompatible/Info.plist
new file mode 100644
index 0000000000..323e5ecfc4
--- /dev/null
+++ b/samples/client/petstore/swift4/objcCompatible/Info.plist
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>CFBundleDevelopmentRegion</key>
+	<string>$(DEVELOPMENT_LANGUAGE)</string>
+	<key>CFBundleExecutable</key>
+	<string>$(EXECUTABLE_NAME)</string>
+	<key>CFBundleIdentifier</key>
+	<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
+	<key>CFBundleInfoDictionaryVersion</key>
+	<string>6.0</string>
+	<key>CFBundleName</key>
+	<string>$(PRODUCT_NAME)</string>
+	<key>CFBundlePackageType</key>
+	<string>FMWK</string>
+	<key>CFBundleShortVersionString</key>
+	<string>1.0</string>
+	<key>CFBundleVersion</key>
+	<string>1</string>
+</dict>
+</plist>
diff --git a/samples/client/petstore/swift4/objcCompatible/PetstoreClient.xcodeproj/project.pbxproj b/samples/client/petstore/swift4/objcCompatible/PetstoreClient.xcodeproj/project.pbxproj
new file mode 100644
index 0000000000..55021e5d19
--- /dev/null
+++ b/samples/client/petstore/swift4/objcCompatible/PetstoreClient.xcodeproj/project.pbxproj
@@ -0,0 +1,601 @@
+// !$*UTF8*$!
+{
+	archiveVersion = 1;
+	classes = {
+	};
+	objectVersion = 50;
+	objects = {
+
+/* Begin PBXBuildFile section */
+		02903CEC38DC202565BC08CB040AC4E9 /* Animal.swift in Sources */ = {isa = PBXBuildFile; fileRef = 95568E7C35F119EB4A12B4982B3FB31F /* Animal.swift */; };
+		0462F801432CF94C7EF51D0532737A7E /* APIs.swift in Sources */ = {isa = PBXBuildFile; fileRef = 37DF825B8F3BADA2B2537D17CDC48633 /* APIs.swift */; };
+		08D87E4FECF24910F0DA0F1D2E2D955A /* EnumTest.swift in Sources */ = {isa = PBXBuildFile; fileRef = FD60AEA646791E0EDE885DE1E680A687 /* EnumTest.swift */; };
+		08F5828F0C2BCF07A9E4917DBBB993AE /* AdditionalPropertiesInteger.swift in Sources */ = {isa = PBXBuildFile; fileRef = FA2F3566156A4ABC465F201B4A1F6227 /* AdditionalPropertiesInteger.swift */; };
+		1143FFF06DEE01E5B0F1368AA05BE1B4 /* OuterEnum.swift in Sources */ = {isa = PBXBuildFile; fileRef = C15008AABC804EB6FB4CDAC6B871E6B0 /* OuterEnum.swift */; };
+		122BBAE8245606CC040EEB6B9254E376 /* StoreAPI.swift in Sources */ = {isa = PBXBuildFile; fileRef = A53274D99BBDE1B79BF3521CD7CBC276 /* StoreAPI.swift */; };
+		12327BF7304AA897C5D2A1250B1659B7 /* AdditionalPropertiesClass.swift in Sources */ = {isa = PBXBuildFile; fileRef = 396DEF3156BA0D12D0FC5C3C3AAF52C4 /* AdditionalPropertiesClass.swift */; };
+		12BB95C66D63090732BB9E0379836E3C /* JSONEncodingHelper.swift in Sources */ = {isa = PBXBuildFile; fileRef = 35D710108A69DD8A5297F926A66DA21F /* JSONEncodingHelper.swift */; };
+		16E9A5E22B4823DE282E7F4C18A21EA8 /* JSONEncodableEncoding.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9791B840B8D6EAA35343B00FA277963A /* JSONEncodableEncoding.swift */; };
+		18F19872A0DFB4CC3D9C696BBCA64EFD /* Cat.swift in Sources */ = {isa = PBXBuildFile; fileRef = 212AA914B7F1793A4E32C119370FB05F /* Cat.swift */; };
+		196E9846B27D736630CCF90497696859 /* StringBooleanMap.swift in Sources */ = {isa = PBXBuildFile; fileRef = 47B4DEBABEFE140768CFB70B19D23029 /* StringBooleanMap.swift */; };
+		271D94A05C47B602A2433B9CD3D9DCDC /* DogAllOf.swift in Sources */ = {isa = PBXBuildFile; fileRef = A21A69C8402A60E01116ABBDEE8943DB /* DogAllOf.swift */; };
+		293F4E0FBFC8297E414A3CDBB7F29A96 /* ReadOnlyFirst.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6FD42727E001E799E458C2924CF813CC /* ReadOnlyFirst.swift */; };
+		297E365D1E4672C43C56E0AFD855FFBF /* FakeAPI.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6E00950725DC44436C5E238CDD2EC164 /* FakeAPI.swift */; };
+		2A35688C985E9CB1EB7732AC2AD46B82 /* APIHelper.swift in Sources */ = {isa = PBXBuildFile; fileRef = 897716962D472FE162B723CB713AA6D3 /* APIHelper.swift */; };
+		2DF4544D4D3D6CF7047A59FB89ED31BD /* Model200Response.swift in Sources */ = {isa = PBXBuildFile; fileRef = 82A2C3DC2235F0114C2B08E553F46874 /* Model200Response.swift */; };
+		3251A3722981CE46261615CFBA96A08D /* ArrayOfArrayOfNumberOnly.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7B1B8B838B5D9D312F2002EBAD946378 /* ArrayOfArrayOfNumberOnly.swift */; };
+		36734C4EB3362A114A7CB5F25EE39E6D /* FormatTest.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3156CE41C001C80379B84BDB435DECCB /* FormatTest.swift */; };
+		39F9FBA1AC5C2612ECA1FF715EBFC287 /* AdditionalPropertiesString.swift in Sources */ = {isa = PBXBuildFile; fileRef = FFE215C1B526E0418ED301B15357B970 /* AdditionalPropertiesString.swift */; };
+		3D8E407B1DF4FA5A5F16B64E3A285781 /* PetAPI.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9A019F500E546A3292CE716AB967C673 /* PetAPI.swift */; };
+		41D8A105135868152A56E2AC475049BB /* CatAllOf.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3AD0F94F512DFBC09F9CC79AF4BD9BFD /* CatAllOf.swift */; };
+		42C51BC034E8B0CAA29A068F6B0DC815 /* Category.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6F2985D01F8D60A4B1925C694330E6CB /* Category.swift */; };
+		491676EC91BFEF95A12556888EED87B5 /* FileSchemaTestClass.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B3666552AA854DAF9C480A3354C9D7C /* FileSchemaTestClass.swift */; };
+		4C28BFEC5E7C8150DEFD83E09C1A1D32 /* Alamofire.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A235FA3FDFB086CC69CDE83DFC1F4BC9 /* Alamofire.framework */; };
+		52B5604F986335DB69CD2B430FB83BAB /* AdditionalPropertiesAnyType.swift in Sources */ = {isa = PBXBuildFile; fileRef = F5AB1037D937AADF8B4A70C96D5E5D61 /* AdditionalPropertiesAnyType.swift */; };
+		58F9704B295AC436D6FB98FA669E2344 /* AlamofireImplementations.swift in Sources */ = {isa = PBXBuildFile; fileRef = 84A201508DF2B697D65F263189C08721 /* AlamofireImplementations.swift */; };
+		59C00CBB07761CAC8DCE7054E34AD5D9 /* EnumClass.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B2C97AE6ACA1E5FB88F5BAA2DB76FDC /* EnumClass.swift */; };
+		59C2F5495C98836BFA9E10BF5C13BC2C /* Order.swift in Sources */ = {isa = PBXBuildFile; fileRef = 27B2E9EF856E89FEAA359A3AC4A2CF5D /* Order.swift */; };
+		59EAB3527305A37ED99FB210045B69EA /* AdditionalPropertiesNumber.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1E0512B3582586B4C0C598D5DB1C0D39 /* AdditionalPropertiesNumber.swift */; };
+		5ACDD7CC312167589335E9CA5998E770 /* ClassModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3C30827D8EAF8EA684E7BCEA5A1E93B2 /* ClassModel.swift */; };
+		655AA371771C7BD72EE0AAC0C90DFFF0 /* MapTest.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7986861626C2B1CB49AD7000C6343270 /* MapTest.swift */; };
+		6600BB1500AE35A3C80F7C83F6444552 /* TypeHolderDefault.swift in Sources */ = {isa = PBXBuildFile; fileRef = EBC76F6D4D2AA8084B7EB50E5C15E475 /* TypeHolderDefault.swift */; };
+		6CD20EE568DDAD2304BF0C4B1A70C8DC /* CodableHelper.swift in Sources */ = {isa = PBXBuildFile; fileRef = 02A6F6BB2152ACEE1416D44AB3955243 /* CodableHelper.swift */; };
+		7367A9D91D4B101F2D28AC56ED89F175 /* Capitalization.swift in Sources */ = {isa = PBXBuildFile; fileRef = A7B38FA00A494D13F4C382A3D87FBF59 /* Capitalization.swift */; };
+		82D4D0C8AD0354A700C8ACD421ABED55 /* OuterComposite.swift in Sources */ = {isa = PBXBuildFile; fileRef = F4E0AD8F60A91F72C768756002C14BF9 /* OuterComposite.swift */; };
+		83A2D1863FB136C0DFC423319F4EED65 /* AnotherFakeAPI.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9DF24D2714B9C4CF14146E88FDDC01A5 /* AnotherFakeAPI.swift */; };
+		92FB161BF1E57D11B116AF0292D5835C /* Client.swift in Sources */ = {isa = PBXBuildFile; fileRef = A913A57E72D723632E9A718FF4525C81 /* Client.swift */; };
+		97C99615237E1B662242E04F527B38B9 /* ApiResponse.swift in Sources */ = {isa = PBXBuildFile; fileRef = A8E7B833748B4F0C7CDA90C6E500B199 /* ApiResponse.swift */; };
+		988F461F59E4E1091156840007CB3773 /* AdditionalPropertiesBoolean.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0CC24C01A55F644957196F9F81D10F81 /* AdditionalPropertiesBoolean.swift */; };
+		A190AF5A3988639ED4B78163D0EA3CA4 /* ArrayOfNumberOnly.swift in Sources */ = {isa = PBXBuildFile; fileRef = B65BB72353DA24536A9049BEC3D234C8 /* ArrayOfNumberOnly.swift */; };
+		A438970025AE69ED407BC1E67CC6359E /* EnumArrays.swift in Sources */ = {isa = PBXBuildFile; fileRef = 10503995D9EFD031A2EFB57603B3132E /* EnumArrays.swift */; };
+		A9F1AAF6CE029DD3B4F8AC841F0B6BC6 /* FakeClassnameTags123API.swift in Sources */ = {isa = PBXBuildFile; fileRef = B42354B407EC173BEB54E0429D946F3B /* FakeClassnameTags123API.swift */; };
+		AE9D2E1DB59AF6575AC4AC6756C5A937 /* NumberOnly.swift in Sources */ = {isa = PBXBuildFile; fileRef = B8E0B16084741FCB82389F5854AC5E26 /* NumberOnly.swift */; };
+		B399A1742F23330FDCA450EAB98F51F1 /* Pet.swift in Sources */ = {isa = PBXBuildFile; fileRef = ECFEB4C6C257B3BB3CEA36D10A5EDC17 /* Pet.swift */; };
+		BB02FDCF1B2B0E457E1C2BF39FBB599D /* XmlItem.swift in Sources */ = {isa = PBXBuildFile; fileRef = A2253391845B73B8BA3680491575CC07 /* XmlItem.swift */; };
+		BF7D58FBCF5E4D3F2932FCC0E62BED40 /* User.swift in Sources */ = {isa = PBXBuildFile; fileRef = E5565A447062C7B8F695F4517DB5E4A5 /* User.swift */; };
+		C15AC1CC631E96D0360EB8C15BF30452 /* Name.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5AD994DFAA0DA93C188A4DBA16688767 /* Name.swift */; };
+		C1CACABE18A7ADCE37D1CD9DC9128304 /* List.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7A6070F581E611FF44AFD40A4315C49A /* List.swift */; };
+		C2EDEB747887399B13A6DFD72A219CB2 /* ArrayTest.swift in Sources */ = {isa = PBXBuildFile; fileRef = F1A0379CDFC55705AE76C99867B8DB08 /* ArrayTest.swift */; };
+		C329EE55B2FCC9174ED3B128D67C5E8C /* Extensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = B8C298FC8929DCB369053F118D7DF28F /* Extensions.swift */; };
+		D3A17B7FAFA8A7A210875BBCDCC30116 /* MixedPropertiesAndAdditionalPropertiesClass.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9AD714C7CC59BDD18DE8DF4ED40B9DA9 /* MixedPropertiesAndAdditionalPropertiesClass.swift */; };
+		D68F23CD4B5178493CE7AE8DFB868EAE /* AdditionalPropertiesArray.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4FEE553331890581C2FF366F9EA0956D /* AdditionalPropertiesArray.swift */; };
+		D70EC94E346077DE1482231DD4498BED /* Dog.swift in Sources */ = {isa = PBXBuildFile; fileRef = C6C3E1129526A353B963EFD74ED8419C /* Dog.swift */; };
+		DB1CE39011A741D07E187663291B5DE5 /* AnimalFarm.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8D22BE01748F51106DE0233299A9061E /* AnimalFarm.swift */; };
+		DB724C4F1AD5DF025B53A9A2E0A49E3D /* UserAPI.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7C8D5F382979854D47F18DB1543680FE /* UserAPI.swift */; };
+		DDBC3CF5E447D8D838F0FE200420EEE3 /* HasOnlyReadOnly.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4C7FBC641752D2E13B15097311139DDC /* HasOnlyReadOnly.swift */; };
+		DEC892724574BB29BD65869374F83982 /* Configuration.swift in Sources */ = {isa = PBXBuildFile; fileRef = 28A444949BBC254798C3B3DD14AAF2CD /* Configuration.swift */; };
+		E2C40F0E34DB8C21A806262C72841A51 /* SpecialModelName.swift in Sources */ = {isa = PBXBuildFile; fileRef = 386FD590658E90509C121118F057604D /* SpecialModelName.swift */; };
+		E51ADEC931806B20A041303E539A8BE2 /* Tag.swift in Sources */ = {isa = PBXBuildFile; fileRef = B2896F8BFD1AA2965C8A30158F0EDA8C /* Tag.swift */; };
+		E57CD12D2F500D40B4135D0F5ECA9866 /* AdditionalPropertiesObject.swift in Sources */ = {isa = PBXBuildFile; fileRef = 72FEDC94BA0E37214D360871B284BC8A /* AdditionalPropertiesObject.swift */; };
+		F02BEF9A8503B3848B045370451E85F6 /* Models.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8699F7966F748ED026A6FB4CF550442B /* Models.swift */; };
+		F21D10C71A9DE7D0467AFD23FD391D2E /* Return.swift in Sources */ = {isa = PBXBuildFile; fileRef = C81447828475F76C5CF4F08AA65292F7 /* Return.swift */; };
+		FB4A053CDCD75E48B755CC22D463A3FC /* TypeHolderExample.swift in Sources */ = {isa = PBXBuildFile; fileRef = 19B65C66C97F082718DDD703F39DE1C2 /* TypeHolderExample.swift */; };
+		FECA03F0388E84AE1B22638605D8AC9F /* File.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3933D3B2A3AC4577094D0C23D1C1B266 /* File.swift */; };
+/* End PBXBuildFile section */
+
+/* Begin PBXFileReference section */
+		02A6F6BB2152ACEE1416D44AB3955243 /* CodableHelper.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CodableHelper.swift; sourceTree = "<group>"; };
+		0CC24C01A55F644957196F9F81D10F81 /* AdditionalPropertiesBoolean.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AdditionalPropertiesBoolean.swift; sourceTree = "<group>"; };
+		10503995D9EFD031A2EFB57603B3132E /* EnumArrays.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EnumArrays.swift; sourceTree = "<group>"; };
+		164AD6EC9C4CCF634D7C45905E99E3A7 /* PetstoreClient.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = PetstoreClient.framework; sourceTree = BUILT_PRODUCTS_DIR; };
+		19B65C66C97F082718DDD703F39DE1C2 /* TypeHolderExample.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TypeHolderExample.swift; sourceTree = "<group>"; };
+		1E0512B3582586B4C0C598D5DB1C0D39 /* AdditionalPropertiesNumber.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AdditionalPropertiesNumber.swift; sourceTree = "<group>"; };
+		212AA914B7F1793A4E32C119370FB05F /* Cat.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Cat.swift; sourceTree = "<group>"; };
+		27B2E9EF856E89FEAA359A3AC4A2CF5D /* Order.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Order.swift; sourceTree = "<group>"; };
+		28A444949BBC254798C3B3DD14AAF2CD /* Configuration.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Configuration.swift; sourceTree = "<group>"; };
+		3156CE41C001C80379B84BDB435DECCB /* FormatTest.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FormatTest.swift; sourceTree = "<group>"; };
+		35D710108A69DD8A5297F926A66DA21F /* JSONEncodingHelper.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = JSONEncodingHelper.swift; sourceTree = "<group>"; };
+		37DF825B8F3BADA2B2537D17CDC48633 /* APIs.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = APIs.swift; sourceTree = "<group>"; };
+		386FD590658E90509C121118F057604D /* SpecialModelName.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SpecialModelName.swift; sourceTree = "<group>"; };
+		3933D3B2A3AC4577094D0C23D1C1B266 /* File.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = File.swift; sourceTree = "<group>"; };
+		396DEF3156BA0D12D0FC5C3C3AAF52C4 /* AdditionalPropertiesClass.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AdditionalPropertiesClass.swift; sourceTree = "<group>"; };
+		3AD0F94F512DFBC09F9CC79AF4BD9BFD /* CatAllOf.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CatAllOf.swift; sourceTree = "<group>"; };
+		3C30827D8EAF8EA684E7BCEA5A1E93B2 /* ClassModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ClassModel.swift; sourceTree = "<group>"; };
+		47B4DEBABEFE140768CFB70B19D23029 /* StringBooleanMap.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = StringBooleanMap.swift; sourceTree = "<group>"; };
+		4B2C97AE6ACA1E5FB88F5BAA2DB76FDC /* EnumClass.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EnumClass.swift; sourceTree = "<group>"; };
+		4B3666552AA854DAF9C480A3354C9D7C /* FileSchemaTestClass.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FileSchemaTestClass.swift; sourceTree = "<group>"; };
+		4C7FBC641752D2E13B15097311139DDC /* HasOnlyReadOnly.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HasOnlyReadOnly.swift; sourceTree = "<group>"; };
+		4FEE553331890581C2FF366F9EA0956D /* AdditionalPropertiesArray.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AdditionalPropertiesArray.swift; sourceTree = "<group>"; };
+		5AD994DFAA0DA93C188A4DBA16688767 /* Name.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Name.swift; sourceTree = "<group>"; };
+		6E00950725DC44436C5E238CDD2EC164 /* FakeAPI.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FakeAPI.swift; sourceTree = "<group>"; };
+		6F2985D01F8D60A4B1925C694330E6CB /* Category.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Category.swift; sourceTree = "<group>"; };
+		6FD42727E001E799E458C2924CF813CC /* ReadOnlyFirst.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ReadOnlyFirst.swift; sourceTree = "<group>"; };
+		72FEDC94BA0E37214D360871B284BC8A /* AdditionalPropertiesObject.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AdditionalPropertiesObject.swift; sourceTree = "<group>"; };
+		7986861626C2B1CB49AD7000C6343270 /* MapTest.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MapTest.swift; sourceTree = "<group>"; };
+		7A6070F581E611FF44AFD40A4315C49A /* List.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = List.swift; sourceTree = "<group>"; };
+		7B1B8B838B5D9D312F2002EBAD946378 /* ArrayOfArrayOfNumberOnly.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ArrayOfArrayOfNumberOnly.swift; sourceTree = "<group>"; };
+		7C8D5F382979854D47F18DB1543680FE /* UserAPI.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UserAPI.swift; sourceTree = "<group>"; };
+		82A2C3DC2235F0114C2B08E553F46874 /* Model200Response.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Model200Response.swift; sourceTree = "<group>"; };
+		84A201508DF2B697D65F263189C08721 /* AlamofireImplementations.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AlamofireImplementations.swift; sourceTree = "<group>"; };
+		8699F7966F748ED026A6FB4CF550442B /* Models.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Models.swift; sourceTree = "<group>"; };
+		897716962D472FE162B723CB713AA6D3 /* APIHelper.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = APIHelper.swift; sourceTree = "<group>"; };
+		8D22BE01748F51106DE0233299A9061E /* AnimalFarm.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AnimalFarm.swift; sourceTree = "<group>"; };
+		95568E7C35F119EB4A12B4982B3FB31F /* Animal.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Animal.swift; sourceTree = "<group>"; };
+		9791B840B8D6EAA35343B00FA277963A /* JSONEncodableEncoding.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = JSONEncodableEncoding.swift; sourceTree = "<group>"; };
+		9A019F500E546A3292CE716AB967C673 /* PetAPI.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PetAPI.swift; sourceTree = "<group>"; };
+		9AD714C7CC59BDD18DE8DF4ED40B9DA9 /* MixedPropertiesAndAdditionalPropertiesClass.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MixedPropertiesAndAdditionalPropertiesClass.swift; sourceTree = "<group>"; };
+		9DF24D2714B9C4CF14146E88FDDC01A5 /* AnotherFakeAPI.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AnotherFakeAPI.swift; sourceTree = "<group>"; };
+		A21A69C8402A60E01116ABBDEE8943DB /* DogAllOf.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DogAllOf.swift; sourceTree = "<group>"; };
+		A2253391845B73B8BA3680491575CC07 /* XmlItem.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = XmlItem.swift; sourceTree = "<group>"; };
+		A235FA3FDFB086CC69CDE83DFC1F4BC9 /* Alamofire.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = Alamofire.framework; sourceTree = "<group>"; };
+		A53274D99BBDE1B79BF3521CD7CBC276 /* StoreAPI.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = StoreAPI.swift; sourceTree = "<group>"; };
+		A7B38FA00A494D13F4C382A3D87FBF59 /* Capitalization.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Capitalization.swift; sourceTree = "<group>"; };
+		A8E7B833748B4F0C7CDA90C6E500B199 /* ApiResponse.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ApiResponse.swift; sourceTree = "<group>"; };
+		A913A57E72D723632E9A718FF4525C81 /* Client.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Client.swift; sourceTree = "<group>"; };
+		B2896F8BFD1AA2965C8A30158F0EDA8C /* Tag.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Tag.swift; sourceTree = "<group>"; };
+		B42354B407EC173BEB54E0429D946F3B /* FakeClassnameTags123API.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FakeClassnameTags123API.swift; sourceTree = "<group>"; };
+		B65BB72353DA24536A9049BEC3D234C8 /* ArrayOfNumberOnly.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ArrayOfNumberOnly.swift; sourceTree = "<group>"; };
+		B8C298FC8929DCB369053F118D7DF28F /* Extensions.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Extensions.swift; sourceTree = "<group>"; };
+		B8E0B16084741FCB82389F5854AC5E26 /* NumberOnly.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NumberOnly.swift; sourceTree = "<group>"; };
+		C15008AABC804EB6FB4CDAC6B871E6B0 /* OuterEnum.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = OuterEnum.swift; sourceTree = "<group>"; };
+		C6C3E1129526A353B963EFD74ED8419C /* Dog.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Dog.swift; sourceTree = "<group>"; };
+		C81447828475F76C5CF4F08AA65292F7 /* Return.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Return.swift; sourceTree = "<group>"; };
+		E5565A447062C7B8F695F4517DB5E4A5 /* User.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = User.swift; sourceTree = "<group>"; };
+		EBC76F6D4D2AA8084B7EB50E5C15E475 /* TypeHolderDefault.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TypeHolderDefault.swift; sourceTree = "<group>"; };
+		ECFEB4C6C257B3BB3CEA36D10A5EDC17 /* Pet.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Pet.swift; sourceTree = "<group>"; };
+		F1A0379CDFC55705AE76C99867B8DB08 /* ArrayTest.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ArrayTest.swift; sourceTree = "<group>"; };
+		F4E0AD8F60A91F72C768756002C14BF9 /* OuterComposite.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = OuterComposite.swift; sourceTree = "<group>"; };
+		F5AB1037D937AADF8B4A70C96D5E5D61 /* AdditionalPropertiesAnyType.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AdditionalPropertiesAnyType.swift; sourceTree = "<group>"; };
+		FA2F3566156A4ABC465F201B4A1F6227 /* AdditionalPropertiesInteger.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AdditionalPropertiesInteger.swift; sourceTree = "<group>"; };
+		FD60AEA646791E0EDE885DE1E680A687 /* EnumTest.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EnumTest.swift; sourceTree = "<group>"; };
+		FFE215C1B526E0418ED301B15357B970 /* AdditionalPropertiesString.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AdditionalPropertiesString.swift; sourceTree = "<group>"; };
+/* End PBXFileReference section */
+
+/* Begin PBXFrameworksBuildPhase section */
+		D1990C2A394CCF025EF98A2FB828C79A /* Frameworks */ = {
+			isa = PBXFrameworksBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				4C28BFEC5E7C8150DEFD83E09C1A1D32 /* Alamofire.framework in Frameworks */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+/* End PBXFrameworksBuildPhase section */
+
+/* Begin PBXGroup section */
+		1E464C0937FE0D3A7A0FE29AF446553C /* Frameworks */ = {
+			isa = PBXGroup;
+			children = (
+				7861EE241895128F64DD787367B3022D /* Carthage */,
+			);
+			name = Frameworks;
+			sourceTree = "<group>";
+		};
+		4FBDCF1330A9AB9122780DB3FA21DE4C /* Models */ = {
+			isa = PBXGroup;
+			children = (
+				F5AB1037D937AADF8B4A70C96D5E5D61 /* AdditionalPropertiesAnyType.swift */,
+				4FEE553331890581C2FF366F9EA0956D /* AdditionalPropertiesArray.swift */,
+				0CC24C01A55F644957196F9F81D10F81 /* AdditionalPropertiesBoolean.swift */,
+				396DEF3156BA0D12D0FC5C3C3AAF52C4 /* AdditionalPropertiesClass.swift */,
+				FA2F3566156A4ABC465F201B4A1F6227 /* AdditionalPropertiesInteger.swift */,
+				1E0512B3582586B4C0C598D5DB1C0D39 /* AdditionalPropertiesNumber.swift */,
+				72FEDC94BA0E37214D360871B284BC8A /* AdditionalPropertiesObject.swift */,
+				FFE215C1B526E0418ED301B15357B970 /* AdditionalPropertiesString.swift */,
+				95568E7C35F119EB4A12B4982B3FB31F /* Animal.swift */,
+				8D22BE01748F51106DE0233299A9061E /* AnimalFarm.swift */,
+				A8E7B833748B4F0C7CDA90C6E500B199 /* ApiResponse.swift */,
+				7B1B8B838B5D9D312F2002EBAD946378 /* ArrayOfArrayOfNumberOnly.swift */,
+				B65BB72353DA24536A9049BEC3D234C8 /* ArrayOfNumberOnly.swift */,
+				F1A0379CDFC55705AE76C99867B8DB08 /* ArrayTest.swift */,
+				A7B38FA00A494D13F4C382A3D87FBF59 /* Capitalization.swift */,
+				212AA914B7F1793A4E32C119370FB05F /* Cat.swift */,
+				3AD0F94F512DFBC09F9CC79AF4BD9BFD /* CatAllOf.swift */,
+				6F2985D01F8D60A4B1925C694330E6CB /* Category.swift */,
+				3C30827D8EAF8EA684E7BCEA5A1E93B2 /* ClassModel.swift */,
+				A913A57E72D723632E9A718FF4525C81 /* Client.swift */,
+				C6C3E1129526A353B963EFD74ED8419C /* Dog.swift */,
+				A21A69C8402A60E01116ABBDEE8943DB /* DogAllOf.swift */,
+				10503995D9EFD031A2EFB57603B3132E /* EnumArrays.swift */,
+				4B2C97AE6ACA1E5FB88F5BAA2DB76FDC /* EnumClass.swift */,
+				FD60AEA646791E0EDE885DE1E680A687 /* EnumTest.swift */,
+				3933D3B2A3AC4577094D0C23D1C1B266 /* File.swift */,
+				4B3666552AA854DAF9C480A3354C9D7C /* FileSchemaTestClass.swift */,
+				3156CE41C001C80379B84BDB435DECCB /* FormatTest.swift */,
+				4C7FBC641752D2E13B15097311139DDC /* HasOnlyReadOnly.swift */,
+				7A6070F581E611FF44AFD40A4315C49A /* List.swift */,
+				7986861626C2B1CB49AD7000C6343270 /* MapTest.swift */,
+				9AD714C7CC59BDD18DE8DF4ED40B9DA9 /* MixedPropertiesAndAdditionalPropertiesClass.swift */,
+				82A2C3DC2235F0114C2B08E553F46874 /* Model200Response.swift */,
+				5AD994DFAA0DA93C188A4DBA16688767 /* Name.swift */,
+				B8E0B16084741FCB82389F5854AC5E26 /* NumberOnly.swift */,
+				27B2E9EF856E89FEAA359A3AC4A2CF5D /* Order.swift */,
+				F4E0AD8F60A91F72C768756002C14BF9 /* OuterComposite.swift */,
+				C15008AABC804EB6FB4CDAC6B871E6B0 /* OuterEnum.swift */,
+				ECFEB4C6C257B3BB3CEA36D10A5EDC17 /* Pet.swift */,
+				6FD42727E001E799E458C2924CF813CC /* ReadOnlyFirst.swift */,
+				C81447828475F76C5CF4F08AA65292F7 /* Return.swift */,
+				386FD590658E90509C121118F057604D /* SpecialModelName.swift */,
+				47B4DEBABEFE140768CFB70B19D23029 /* StringBooleanMap.swift */,
+				B2896F8BFD1AA2965C8A30158F0EDA8C /* Tag.swift */,
+				EBC76F6D4D2AA8084B7EB50E5C15E475 /* TypeHolderDefault.swift */,
+				19B65C66C97F082718DDD703F39DE1C2 /* TypeHolderExample.swift */,
+				E5565A447062C7B8F695F4517DB5E4A5 /* User.swift */,
+				A2253391845B73B8BA3680491575CC07 /* XmlItem.swift */,
+			);
+			path = Models;
+			sourceTree = "<group>";
+		};
+		5FBA6AE5F64CD737F88B4565AC3CCD3B = {
+			isa = PBXGroup;
+			children = (
+				9B364C01750D7AA4F983B9E77B01BCC6 /* PetstoreClient */,
+				1E464C0937FE0D3A7A0FE29AF446553C /* Frameworks */,
+				857F0DEA1890CE66D6DAD556C55821A6 /* Products */,
+			);
+			sourceTree = "<group>";
+		};
+		67BF3478113E6B4DF1C4E04F40BF58C4 /* OpenAPIs */ = {
+			isa = PBXGroup;
+			children = (
+				84A201508DF2B697D65F263189C08721 /* AlamofireImplementations.swift */,
+				897716962D472FE162B723CB713AA6D3 /* APIHelper.swift */,
+				37DF825B8F3BADA2B2537D17CDC48633 /* APIs.swift */,
+				02A6F6BB2152ACEE1416D44AB3955243 /* CodableHelper.swift */,
+				28A444949BBC254798C3B3DD14AAF2CD /* Configuration.swift */,
+				B8C298FC8929DCB369053F118D7DF28F /* Extensions.swift */,
+				9791B840B8D6EAA35343B00FA277963A /* JSONEncodableEncoding.swift */,
+				35D710108A69DD8A5297F926A66DA21F /* JSONEncodingHelper.swift */,
+				8699F7966F748ED026A6FB4CF550442B /* Models.swift */,
+				F956D0CCAE23BCFD1C7BDD5D47944AA5 /* APIs */,
+				4FBDCF1330A9AB9122780DB3FA21DE4C /* Models */,
+			);
+			path = OpenAPIs;
+			sourceTree = "<group>";
+		};
+		7861EE241895128F64DD787367B3022D /* Carthage */ = {
+			isa = PBXGroup;
+			children = (
+				A012205B41CB71A62B86EECDEAFB0990 /* iOS */,
+			);
+			name = Carthage;
+			path = Carthage/Build;
+			sourceTree = "<group>";
+		};
+		857F0DEA1890CE66D6DAD556C55821A6 /* Products */ = {
+			isa = PBXGroup;
+			children = (
+				164AD6EC9C4CCF634D7C45905E99E3A7 /* PetstoreClient.framework */,
+			);
+			name = Products;
+			sourceTree = "<group>";
+		};
+		9B364C01750D7AA4F983B9E77B01BCC6 /* PetstoreClient */ = {
+			isa = PBXGroup;
+			children = (
+				EF4C81BDD734856ED5023B777D35098B /* Classes */,
+			);
+			path = PetstoreClient;
+			sourceTree = "<group>";
+		};
+		A012205B41CB71A62B86EECDEAFB0990 /* iOS */ = {
+			isa = PBXGroup;
+			children = (
+				A235FA3FDFB086CC69CDE83DFC1F4BC9 /* Alamofire.framework */,
+			);
+			path = iOS;
+			sourceTree = "<group>";
+		};
+		EF4C81BDD734856ED5023B777D35098B /* Classes */ = {
+			isa = PBXGroup;
+			children = (
+				67BF3478113E6B4DF1C4E04F40BF58C4 /* OpenAPIs */,
+			);
+			path = Classes;
+			sourceTree = "<group>";
+		};
+		F956D0CCAE23BCFD1C7BDD5D47944AA5 /* APIs */ = {
+			isa = PBXGroup;
+			children = (
+				9DF24D2714B9C4CF14146E88FDDC01A5 /* AnotherFakeAPI.swift */,
+				6E00950725DC44436C5E238CDD2EC164 /* FakeAPI.swift */,
+				B42354B407EC173BEB54E0429D946F3B /* FakeClassnameTags123API.swift */,
+				9A019F500E546A3292CE716AB967C673 /* PetAPI.swift */,
+				A53274D99BBDE1B79BF3521CD7CBC276 /* StoreAPI.swift */,
+				7C8D5F382979854D47F18DB1543680FE /* UserAPI.swift */,
+			);
+			path = APIs;
+			sourceTree = "<group>";
+		};
+/* End PBXGroup section */
+
+/* Begin PBXNativeTarget section */
+		C1282C2230015E0D204BEAEDDFB49453 /* PetstoreClient */ = {
+			isa = PBXNativeTarget;
+			buildConfigurationList = B46EDEB1A7F0D78FE6394544C60169D1 /* Build configuration list for PBXNativeTarget "PetstoreClient" */;
+			buildPhases = (
+				E539708354CE60FE486F81EDE56D13C8 /* Sources */,
+				D1990C2A394CCF025EF98A2FB828C79A /* Frameworks */,
+			);
+			buildRules = (
+			);
+			dependencies = (
+			);
+			name = PetstoreClient;
+			productName = PetstoreClient;
+			productReference = 164AD6EC9C4CCF634D7C45905E99E3A7 /* PetstoreClient.framework */;
+			productType = "com.apple.product-type.framework";
+		};
+/* End PBXNativeTarget section */
+
+/* Begin PBXProject section */
+		E7D276EE2369D8C455513C2E05F9AED0 /* Project object */ = {
+			isa = PBXProject;
+			attributes = {
+				LastUpgradeCheck = 1000;
+			};
+			buildConfigurationList = ECAB17FF35111B5E14DAAC0883031714 /* Build configuration list for PBXProject "PetstoreClient" */;
+			compatibilityVersion = "Xcode 9.3";
+			developmentRegion = en;
+			hasScannedForEncodings = 0;
+			knownRegions = (
+				en,
+			);
+			mainGroup = 5FBA6AE5F64CD737F88B4565AC3CCD3B;
+			projectDirPath = "";
+			projectRoot = "";
+			targets = (
+				C1282C2230015E0D204BEAEDDFB49453 /* PetstoreClient */,
+			);
+		};
+/* End PBXProject section */
+
+/* Begin PBXSourcesBuildPhase section */
+		E539708354CE60FE486F81EDE56D13C8 /* Sources */ = {
+			isa = PBXSourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				2A35688C985E9CB1EB7732AC2AD46B82 /* APIHelper.swift in Sources */,
+				0462F801432CF94C7EF51D0532737A7E /* APIs.swift in Sources */,
+				52B5604F986335DB69CD2B430FB83BAB /* AdditionalPropertiesAnyType.swift in Sources */,
+				D68F23CD4B5178493CE7AE8DFB868EAE /* AdditionalPropertiesArray.swift in Sources */,
+				988F461F59E4E1091156840007CB3773 /* AdditionalPropertiesBoolean.swift in Sources */,
+				12327BF7304AA897C5D2A1250B1659B7 /* AdditionalPropertiesClass.swift in Sources */,
+				08F5828F0C2BCF07A9E4917DBBB993AE /* AdditionalPropertiesInteger.swift in Sources */,
+				59EAB3527305A37ED99FB210045B69EA /* AdditionalPropertiesNumber.swift in Sources */,
+				E57CD12D2F500D40B4135D0F5ECA9866 /* AdditionalPropertiesObject.swift in Sources */,
+				39F9FBA1AC5C2612ECA1FF715EBFC287 /* AdditionalPropertiesString.swift in Sources */,
+				58F9704B295AC436D6FB98FA669E2344 /* AlamofireImplementations.swift in Sources */,
+				02903CEC38DC202565BC08CB040AC4E9 /* Animal.swift in Sources */,
+				DB1CE39011A741D07E187663291B5DE5 /* AnimalFarm.swift in Sources */,
+				83A2D1863FB136C0DFC423319F4EED65 /* AnotherFakeAPI.swift in Sources */,
+				97C99615237E1B662242E04F527B38B9 /* ApiResponse.swift in Sources */,
+				3251A3722981CE46261615CFBA96A08D /* ArrayOfArrayOfNumberOnly.swift in Sources */,
+				A190AF5A3988639ED4B78163D0EA3CA4 /* ArrayOfNumberOnly.swift in Sources */,
+				C2EDEB747887399B13A6DFD72A219CB2 /* ArrayTest.swift in Sources */,
+				7367A9D91D4B101F2D28AC56ED89F175 /* Capitalization.swift in Sources */,
+				18F19872A0DFB4CC3D9C696BBCA64EFD /* Cat.swift in Sources */,
+				41D8A105135868152A56E2AC475049BB /* CatAllOf.swift in Sources */,
+				42C51BC034E8B0CAA29A068F6B0DC815 /* Category.swift in Sources */,
+				5ACDD7CC312167589335E9CA5998E770 /* ClassModel.swift in Sources */,
+				92FB161BF1E57D11B116AF0292D5835C /* Client.swift in Sources */,
+				6CD20EE568DDAD2304BF0C4B1A70C8DC /* CodableHelper.swift in Sources */,
+				DEC892724574BB29BD65869374F83982 /* Configuration.swift in Sources */,
+				D70EC94E346077DE1482231DD4498BED /* Dog.swift in Sources */,
+				271D94A05C47B602A2433B9CD3D9DCDC /* DogAllOf.swift in Sources */,
+				A438970025AE69ED407BC1E67CC6359E /* EnumArrays.swift in Sources */,
+				59C00CBB07761CAC8DCE7054E34AD5D9 /* EnumClass.swift in Sources */,
+				08D87E4FECF24910F0DA0F1D2E2D955A /* EnumTest.swift in Sources */,
+				C329EE55B2FCC9174ED3B128D67C5E8C /* Extensions.swift in Sources */,
+				297E365D1E4672C43C56E0AFD855FFBF /* FakeAPI.swift in Sources */,
+				A9F1AAF6CE029DD3B4F8AC841F0B6BC6 /* FakeClassnameTags123API.swift in Sources */,
+				FECA03F0388E84AE1B22638605D8AC9F /* File.swift in Sources */,
+				491676EC91BFEF95A12556888EED87B5 /* FileSchemaTestClass.swift in Sources */,
+				36734C4EB3362A114A7CB5F25EE39E6D /* FormatTest.swift in Sources */,
+				DDBC3CF5E447D8D838F0FE200420EEE3 /* HasOnlyReadOnly.swift in Sources */,
+				16E9A5E22B4823DE282E7F4C18A21EA8 /* JSONEncodableEncoding.swift in Sources */,
+				12BB95C66D63090732BB9E0379836E3C /* JSONEncodingHelper.swift in Sources */,
+				C1CACABE18A7ADCE37D1CD9DC9128304 /* List.swift in Sources */,
+				655AA371771C7BD72EE0AAC0C90DFFF0 /* MapTest.swift in Sources */,
+				D3A17B7FAFA8A7A210875BBCDCC30116 /* MixedPropertiesAndAdditionalPropertiesClass.swift in Sources */,
+				2DF4544D4D3D6CF7047A59FB89ED31BD /* Model200Response.swift in Sources */,
+				F02BEF9A8503B3848B045370451E85F6 /* Models.swift in Sources */,
+				C15AC1CC631E96D0360EB8C15BF30452 /* Name.swift in Sources */,
+				AE9D2E1DB59AF6575AC4AC6756C5A937 /* NumberOnly.swift in Sources */,
+				59C2F5495C98836BFA9E10BF5C13BC2C /* Order.swift in Sources */,
+				82D4D0C8AD0354A700C8ACD421ABED55 /* OuterComposite.swift in Sources */,
+				1143FFF06DEE01E5B0F1368AA05BE1B4 /* OuterEnum.swift in Sources */,
+				B399A1742F23330FDCA450EAB98F51F1 /* Pet.swift in Sources */,
+				3D8E407B1DF4FA5A5F16B64E3A285781 /* PetAPI.swift in Sources */,
+				293F4E0FBFC8297E414A3CDBB7F29A96 /* ReadOnlyFirst.swift in Sources */,
+				F21D10C71A9DE7D0467AFD23FD391D2E /* Return.swift in Sources */,
+				E2C40F0E34DB8C21A806262C72841A51 /* SpecialModelName.swift in Sources */,
+				122BBAE8245606CC040EEB6B9254E376 /* StoreAPI.swift in Sources */,
+				196E9846B27D736630CCF90497696859 /* StringBooleanMap.swift in Sources */,
+				E51ADEC931806B20A041303E539A8BE2 /* Tag.swift in Sources */,
+				6600BB1500AE35A3C80F7C83F6444552 /* TypeHolderDefault.swift in Sources */,
+				FB4A053CDCD75E48B755CC22D463A3FC /* TypeHolderExample.swift in Sources */,
+				BF7D58FBCF5E4D3F2932FCC0E62BED40 /* User.swift in Sources */,
+				DB724C4F1AD5DF025B53A9A2E0A49E3D /* UserAPI.swift in Sources */,
+				BB02FDCF1B2B0E457E1C2BF39FBB599D /* XmlItem.swift in Sources */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+/* End PBXSourcesBuildPhase section */
+
+/* Begin XCBuildConfiguration section */
+		3B2C02AFB91CB5C82766ED5CF21FF628 /* Release */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				APPLICATION_EXTENSION_API_ONLY = YES;
+				CODE_SIGN_IDENTITY = "";
+				CURRENT_PROJECT_VERSION = 1;
+				DEFINES_MODULE = YES;
+				DYLIB_COMPATIBILITY_VERSION = 1;
+				DYLIB_CURRENT_VERSION = 1;
+				DYLIB_INSTALL_NAME_BASE = "@rpath";
+				FRAMEWORK_SEARCH_PATHS = (
+					"$(inherited)",
+					"$(PROJECT_DIR)/Carthage/Build/iOS",
+				);
+				INFOPLIST_FILE = Info.plist;
+				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
+				IPHONEOS_DEPLOYMENT_TARGET = 10.0;
+				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
+				SDKROOT = iphoneos;
+				SKIP_INSTALL = YES;
+				TARGETED_DEVICE_FAMILY = "1,2";
+				VERSIONING_SYSTEM = "apple-generic";
+			};
+			name = Release;
+		};
+		A9EB0A02B94C427CBACFEC7CFFC6A816 /* Debug */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				ALWAYS_SEARCH_USER_PATHS = NO;
+				CLANG_ANALYZER_NONNULL = YES;
+				CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
+				CLANG_CXX_LANGUAGE_STANDARD = "gnu++14";
+				CLANG_CXX_LIBRARY = "libc++";
+				CLANG_ENABLE_MODULES = YES;
+				CLANG_ENABLE_OBJC_ARC = YES;
+				CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
+				CLANG_WARN_BOOL_CONVERSION = YES;
+				CLANG_WARN_COMMA = YES;
+				CLANG_WARN_CONSTANT_CONVERSION = YES;
+				CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
+				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
+				CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
+				CLANG_WARN_EMPTY_BODY = YES;
+				CLANG_WARN_ENUM_CONVERSION = YES;
+				CLANG_WARN_INFINITE_RECURSION = YES;
+				CLANG_WARN_INT_CONVERSION = YES;
+				CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
+				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
+				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
+				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
+				CLANG_WARN_STRICT_PROTOTYPES = YES;
+				CLANG_WARN_SUSPICIOUS_MOVE = YES;
+				CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
+				CLANG_WARN_UNREACHABLE_CODE = YES;
+				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
+				COPY_PHASE_STRIP = NO;
+				DEBUG_INFORMATION_FORMAT = dwarf;
+				ENABLE_STRICT_OBJC_MSGSEND = YES;
+				ENABLE_TESTABILITY = YES;
+				GCC_C_LANGUAGE_STANDARD = gnu11;
+				GCC_DYNAMIC_NO_PIC = NO;
+				GCC_NO_COMMON_BLOCKS = YES;
+				GCC_OPTIMIZATION_LEVEL = 0;
+				GCC_PREPROCESSOR_DEFINITIONS = (
+					"$(inherited)",
+					"DEBUG=1",
+				);
+				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
+				GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
+				GCC_WARN_UNDECLARED_SELECTOR = YES;
+				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
+				GCC_WARN_UNUSED_FUNCTION = YES;
+				GCC_WARN_UNUSED_VARIABLE = YES;
+				MTL_ENABLE_DEBUG_INFO = YES;
+				ONLY_ACTIVE_ARCH = YES;
+				PRODUCT_NAME = "$(TARGET_NAME)";
+				SDKROOT = iphoneos;
+				SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
+				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
+				SWIFT_VERSION = 4.2;
+			};
+			name = Debug;
+		};
+		DD3EEB93949E9EBA4437E9CDBF4A26F6 /* Debug */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				APPLICATION_EXTENSION_API_ONLY = YES;
+				CODE_SIGN_IDENTITY = "";
+				CURRENT_PROJECT_VERSION = 1;
+				DEFINES_MODULE = YES;
+				DYLIB_COMPATIBILITY_VERSION = 1;
+				DYLIB_CURRENT_VERSION = 1;
+				DYLIB_INSTALL_NAME_BASE = "@rpath";
+				FRAMEWORK_SEARCH_PATHS = (
+					"$(inherited)",
+					"$(PROJECT_DIR)/Carthage/Build/iOS",
+				);
+				INFOPLIST_FILE = Info.plist;
+				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
+				IPHONEOS_DEPLOYMENT_TARGET = 10.0;
+				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
+				SDKROOT = iphoneos;
+				SKIP_INSTALL = YES;
+				TARGETED_DEVICE_FAMILY = "1,2";
+				VERSIONING_SYSTEM = "apple-generic";
+			};
+			name = Debug;
+		};
+		F81D4E5FECD46E9AA6DD2C299CEBEF64 /* Release */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				ALWAYS_SEARCH_USER_PATHS = NO;
+				CLANG_ANALYZER_NONNULL = YES;
+				CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
+				CLANG_CXX_LANGUAGE_STANDARD = "gnu++14";
+				CLANG_CXX_LIBRARY = "libc++";
+				CLANG_ENABLE_MODULES = YES;
+				CLANG_ENABLE_OBJC_ARC = YES;
+				CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
+				CLANG_WARN_BOOL_CONVERSION = YES;
+				CLANG_WARN_COMMA = YES;
+				CLANG_WARN_CONSTANT_CONVERSION = YES;
+				CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
+				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
+				CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
+				CLANG_WARN_EMPTY_BODY = YES;
+				CLANG_WARN_ENUM_CONVERSION = YES;
+				CLANG_WARN_INFINITE_RECURSION = YES;
+				CLANG_WARN_INT_CONVERSION = YES;
+				CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
+				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
+				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
+				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
+				CLANG_WARN_STRICT_PROTOTYPES = YES;
+				CLANG_WARN_SUSPICIOUS_MOVE = YES;
+				CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
+				CLANG_WARN_UNREACHABLE_CODE = YES;
+				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
+				COPY_PHASE_STRIP = NO;
+				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
+				ENABLE_NS_ASSERTIONS = NO;
+				ENABLE_STRICT_OBJC_MSGSEND = YES;
+				GCC_C_LANGUAGE_STANDARD = gnu11;
+				GCC_NO_COMMON_BLOCKS = YES;
+				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
+				GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
+				GCC_WARN_UNDECLARED_SELECTOR = YES;
+				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
+				GCC_WARN_UNUSED_FUNCTION = YES;
+				GCC_WARN_UNUSED_VARIABLE = YES;
+				PRODUCT_NAME = "$(TARGET_NAME)";
+				SDKROOT = iphoneos;
+				SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
+				SWIFT_VERSION = 4.2;
+				VALIDATE_PRODUCT = YES;
+			};
+			name = Release;
+		};
+/* End XCBuildConfiguration section */
+
+/* Begin XCConfigurationList section */
+		B46EDEB1A7F0D78FE6394544C60169D1 /* Build configuration list for PBXNativeTarget "PetstoreClient" */ = {
+			isa = XCConfigurationList;
+			buildConfigurations = (
+				DD3EEB93949E9EBA4437E9CDBF4A26F6 /* Debug */,
+				3B2C02AFB91CB5C82766ED5CF21FF628 /* Release */,
+			);
+			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = "";
+		};
+		ECAB17FF35111B5E14DAAC0883031714 /* Build configuration list for PBXProject "PetstoreClient" */ = {
+			isa = XCConfigurationList;
+			buildConfigurations = (
+				A9EB0A02B94C427CBACFEC7CFFC6A816 /* Debug */,
+				F81D4E5FECD46E9AA6DD2C299CEBEF64 /* Release */,
+			);
+			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Debug;
+		};
+/* End XCConfigurationList section */
+	};
+	rootObject = E7D276EE2369D8C455513C2E05F9AED0 /* Project object */;
+}
diff --git a/samples/client/petstore/swift4/objcCompatible/PetstoreClient.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/samples/client/petstore/swift4/objcCompatible/PetstoreClient.xcodeproj/project.xcworkspace/contents.xcworkspacedata
new file mode 100644
index 0000000000..919434a625
--- /dev/null
+++ b/samples/client/petstore/swift4/objcCompatible/PetstoreClient.xcodeproj/project.xcworkspace/contents.xcworkspacedata
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Workspace
+   version = "1.0">
+   <FileRef
+      location = "self:">
+   </FileRef>
+</Workspace>
diff --git a/samples/client/petstore/swift4/objcCompatible/PetstoreClient.xcodeproj/xcshareddata/xcschemes/PetstoreClient.xcscheme b/samples/client/petstore/swift4/objcCompatible/PetstoreClient.xcodeproj/xcshareddata/xcschemes/PetstoreClient.xcscheme
new file mode 100644
index 0000000000..7802e37945
--- /dev/null
+++ b/samples/client/petstore/swift4/objcCompatible/PetstoreClient.xcodeproj/xcshareddata/xcschemes/PetstoreClient.xcscheme
@@ -0,0 +1,96 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Scheme
+   LastUpgradeVersion = "1000"
+   version = "1.3">
+   <BuildAction
+      parallelizeBuildables = "YES"
+      buildImplicitDependencies = "YES">
+      <BuildActionEntries>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "YES"
+            buildForProfiling = "YES"
+            buildForArchiving = "YES"
+            buildForAnalyzing = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "C1282C2230015E0D204BEAEDDFB49453"
+               BuildableName = "PetstoreClient.framework"
+               BlueprintName = "PetstoreClient"
+               ReferencedContainer = "container:PetstoreClient.xcodeproj">
+            </BuildableReference>
+         </BuildActionEntry>
+      </BuildActionEntries>
+   </BuildAction>
+   <TestAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      shouldUseLaunchSchemeArgsEnv = "YES">
+      <Testables>
+      </Testables>
+      <MacroExpansion>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "C1282C2230015E0D204BEAEDDFB49453"
+            BuildableName = "PetstoreClient.framework"
+            BlueprintName = "PetstoreClient"
+            ReferencedContainer = "container:PetstoreClient.xcodeproj">
+         </BuildableReference>
+      </MacroExpansion>
+      <CommandLineArguments>
+      </CommandLineArguments>
+      <AdditionalOptions>
+      </AdditionalOptions>
+   </TestAction>
+   <LaunchAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      launchStyle = "0"
+      useCustomWorkingDirectory = "NO"
+      ignoresPersistentStateOnLaunch = "NO"
+      debugDocumentVersioning = "YES"
+      debugServiceExtension = "internal"
+      allowLocationSimulation = "YES">
+      <MacroExpansion>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "C1282C2230015E0D204BEAEDDFB49453"
+            BuildableName = "PetstoreClient.framework"
+            BlueprintName = "PetstoreClient"
+            ReferencedContainer = "container:PetstoreClient.xcodeproj">
+         </BuildableReference>
+      </MacroExpansion>
+      <CommandLineArguments>
+      </CommandLineArguments>
+      <AdditionalOptions>
+      </AdditionalOptions>
+   </LaunchAction>
+   <ProfileAction
+      buildConfiguration = "Release"
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      savedToolIdentifier = ""
+      useCustomWorkingDirectory = "NO"
+      debugDocumentVersioning = "YES">
+      <BuildableProductRunnable
+         runnableDebuggingMode = "0">
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "C1282C2230015E0D204BEAEDDFB49453"
+            BuildableName = "PetstoreClient.framework"
+            BlueprintName = "PetstoreClient"
+            ReferencedContainer = "container:PetstoreClient.xcodeproj">
+         </BuildableReference>
+      </BuildableProductRunnable>
+      <CommandLineArguments>
+      </CommandLineArguments>
+   </ProfileAction>
+   <AnalyzeAction
+      buildConfiguration = "Debug">
+   </AnalyzeAction>
+   <ArchiveAction
+      buildConfiguration = "Release"
+      revealArchiveInOrganizer = "YES">
+   </ArchiveAction>
+</Scheme>
diff --git a/samples/client/petstore/swift4/objcCompatible/PetstoreClient/Classes/OpenAPIs/APIHelper.swift b/samples/client/petstore/swift4/objcCompatible/PetstoreClient/Classes/OpenAPIs/APIHelper.swift
index d94614b34f..75dea24395 100644
--- a/samples/client/petstore/swift4/objcCompatible/PetstoreClient/Classes/OpenAPIs/APIHelper.swift
+++ b/samples/client/petstore/swift4/objcCompatible/PetstoreClient/Classes/OpenAPIs/APIHelper.swift
@@ -7,7 +7,7 @@
 import Foundation
 
 public struct APIHelper {
-    public static func rejectNil(_ source: [String:Any?]) -> [String:Any]? {
+    public static func rejectNil(_ source: [String: Any?]) -> [String: Any]? {
         let destination = source.reduce(into: [String: Any]()) { (result, item) in
             if let value = item.value {
                 result[item.key] = value
@@ -20,17 +20,17 @@ public struct APIHelper {
         return destination
     }
 
-    public static func rejectNilHeaders(_ source: [String:Any?]) -> [String:String] {
+    public static func rejectNilHeaders(_ source: [String: Any?]) -> [String: String] {
         return source.reduce(into: [String: String]()) { (result, item) in
             if let collection = item.value as? Array<Any?> {
-                result[item.key] = collection.filter({ $0 != nil }).map{ "\($0!)" }.joined(separator: ",")
+                result[item.key] = collection.filter({ $0 != nil }).map { "\($0!)" }.joined(separator: ",")
             } else if let value: Any = item.value {
                 result[item.key] = "\(value)"
             }
         }
     }
 
-    public static func convertBoolToString(_ source: [String: Any]?) -> [String:Any]? {
+    public static func convertBoolToString(_ source: [String: Any]?) -> [String: Any]? {
         guard let source = source else {
             return nil
         }
@@ -52,7 +52,7 @@ public struct APIHelper {
         return source
     }
 
-    public static func mapValuesToQueryItems(_ source: [String:Any?]) -> [URLQueryItem]? {
+    public static func mapValuesToQueryItems(_ source: [String: Any?]) -> [URLQueryItem]? {
         let destination = source.filter({ $0.value != nil}).reduce(into: [URLQueryItem]()) { (result, item) in
             if let collection = item.value as? Array<Any?> {
                 let value = collection.filter({ $0 != nil }).map({"\($0!)"}).joined(separator: ",")
@@ -68,4 +68,3 @@ public struct APIHelper {
         return destination
     }
 }
-
diff --git a/samples/client/petstore/swift4/objcCompatible/PetstoreClient/Classes/OpenAPIs/APIs.swift b/samples/client/petstore/swift4/objcCompatible/PetstoreClient/Classes/OpenAPIs/APIs.swift
index 2890bffa27..9e4312f685 100644
--- a/samples/client/petstore/swift4/objcCompatible/PetstoreClient/Classes/OpenAPIs/APIs.swift
+++ b/samples/client/petstore/swift4/objcCompatible/PetstoreClient/Classes/OpenAPIs/APIs.swift
@@ -9,22 +9,22 @@ import Foundation
 open class PetstoreClientAPI {
     public static var basePath = "http://petstore.swagger.io:80/v2"
     public static var credential: URLCredential?
-    public static var customHeaders: [String:String] = [:]
+    public static var customHeaders: [String: String] = [:]
     public static var requestBuilderFactory: RequestBuilderFactory = AlamofireRequestBuilderFactory()
 }
 
 open class RequestBuilder<T> {
     var credential: URLCredential?
-    var headers: [String:String]
-    public let parameters: [String:Any]?
+    var headers: [String: String]
+    public let parameters: [String: Any]?
     public let isBody: Bool
     public let method: String
     public let URLString: String
 
     /// Optional block to obtain a reference to the request's progress instance when available.
-    public var onProgressReady: ((Progress) -> ())?
+    public var onProgressReady: ((Progress) -> Void)?
 
-    required public init(method: String, URLString: String, parameters: [String:Any]?, isBody: Bool, headers: [String:String] = [:]) {
+    required public init(method: String, URLString: String, parameters: [String: Any]?, isBody: Bool, headers: [String: String] = [:]) {
         self.method = method
         self.URLString = URLString
         self.parameters = parameters
@@ -34,7 +34,7 @@ open class RequestBuilder<T> {
         addHeaders(PetstoreClientAPI.customHeaders)
     }
 
-    open func addHeaders(_ aHeaders:[String:String]) {
+    open func addHeaders(_ aHeaders: [String: String]) {
         for (header, value) in aHeaders {
             headers[header] = value
         }
@@ -57,5 +57,5 @@ open class RequestBuilder<T> {
 
 public protocol RequestBuilderFactory {
     func getNonDecodableBuilder<T>() -> RequestBuilder<T>.Type
-    func getBuilder<T:Decodable>() -> RequestBuilder<T>.Type
+    func getBuilder<T: Decodable>() -> RequestBuilder<T>.Type
 }
diff --git a/samples/client/petstore/swift4/objcCompatible/PetstoreClient/Classes/OpenAPIs/APIs/AnotherFakeAPI.swift b/samples/client/petstore/swift4/objcCompatible/PetstoreClient/Classes/OpenAPIs/APIs/AnotherFakeAPI.swift
index ffecb66c48..30b346de0e 100644
--- a/samples/client/petstore/swift4/objcCompatible/PetstoreClient/Classes/OpenAPIs/APIs/AnotherFakeAPI.swift
+++ b/samples/client/petstore/swift4/objcCompatible/PetstoreClient/Classes/OpenAPIs/APIs/AnotherFakeAPI.swift
@@ -8,8 +8,6 @@
 import Foundation
 import Alamofire
 
-
-
 open class AnotherFakeAPI {
     /**
      To test special tags
@@ -17,7 +15,7 @@ open class AnotherFakeAPI {
      - parameter body: (body) client model 
      - parameter completion: completion handler to receive the data and the error objects
      */
-    open class func call123testSpecialTags(body: Client, completion: @escaping ((_ data: Client?,_ error: Error?) -> Void)) {
+    open class func call123testSpecialTags(body: Client, completion: @escaping ((_ data: Client?, _ error: Error?) -> Void)) {
         call123testSpecialTagsWithRequestBuilder(body: body).execute { (response, error) -> Void in
             completion(response?.body, error)
         }
diff --git a/samples/client/petstore/swift4/objcCompatible/PetstoreClient/Classes/OpenAPIs/APIs/FakeAPI.swift b/samples/client/petstore/swift4/objcCompatible/PetstoreClient/Classes/OpenAPIs/APIs/FakeAPI.swift
index 2bfd5a21d7..4198e76546 100644
--- a/samples/client/petstore/swift4/objcCompatible/PetstoreClient/Classes/OpenAPIs/APIs/FakeAPI.swift
+++ b/samples/client/petstore/swift4/objcCompatible/PetstoreClient/Classes/OpenAPIs/APIs/FakeAPI.swift
@@ -8,8 +8,6 @@
 import Foundation
 import Alamofire
 
-
-
 open class FakeAPI {
     /**
      creates an XmlItem
@@ -17,7 +15,7 @@ open class FakeAPI {
      - parameter xmlItem: (body) XmlItem Body 
      - parameter completion: completion handler to receive the data and the error objects
      */
-    open class func createXmlItem(xmlItem: XmlItem, completion: @escaping ((_ data: Void?,_ error: Error?) -> Void)) {
+    open class func createXmlItem(xmlItem: XmlItem, completion: @escaping ((_ data: Void?, _ error: Error?) -> Void)) {
         createXmlItemWithRequestBuilder(xmlItem: xmlItem).execute { (response, error) -> Void in
             if error == nil {
                 completion((), error)
@@ -51,7 +49,7 @@ open class FakeAPI {
      - parameter body: (body) Input boolean as post body (optional)
      - parameter completion: completion handler to receive the data and the error objects
      */
-    open class func fakeOuterBooleanSerialize(body: Bool? = nil, completion: @escaping ((_ data: Bool?,_ error: Error?) -> Void)) {
+    open class func fakeOuterBooleanSerialize(body: Bool? = nil, completion: @escaping ((_ data: Bool?, _ error: Error?) -> Void)) {
         fakeOuterBooleanSerializeWithRequestBuilder(body: body).execute { (response, error) -> Void in
             completion(response?.body, error)
         }
@@ -80,7 +78,7 @@ open class FakeAPI {
      - parameter body: (body) Input composite as post body (optional)
      - parameter completion: completion handler to receive the data and the error objects
      */
-    open class func fakeOuterCompositeSerialize(body: OuterComposite? = nil, completion: @escaping ((_ data: OuterComposite?,_ error: Error?) -> Void)) {
+    open class func fakeOuterCompositeSerialize(body: OuterComposite? = nil, completion: @escaping ((_ data: OuterComposite?, _ error: Error?) -> Void)) {
         fakeOuterCompositeSerializeWithRequestBuilder(body: body).execute { (response, error) -> Void in
             completion(response?.body, error)
         }
@@ -109,7 +107,7 @@ open class FakeAPI {
      - parameter body: (body) Input number as post body (optional)
      - parameter completion: completion handler to receive the data and the error objects
      */
-    open class func fakeOuterNumberSerialize(body: Double? = nil, completion: @escaping ((_ data: Double?,_ error: Error?) -> Void)) {
+    open class func fakeOuterNumberSerialize(body: Double? = nil, completion: @escaping ((_ data: Double?, _ error: Error?) -> Void)) {
         fakeOuterNumberSerializeWithRequestBuilder(body: body).execute { (response, error) -> Void in
             completion(response?.body, error)
         }
@@ -138,7 +136,7 @@ open class FakeAPI {
      - parameter body: (body) Input string as post body (optional)
      - parameter completion: completion handler to receive the data and the error objects
      */
-    open class func fakeOuterStringSerialize(body: String? = nil, completion: @escaping ((_ data: String?,_ error: Error?) -> Void)) {
+    open class func fakeOuterStringSerialize(body: String? = nil, completion: @escaping ((_ data: String?, _ error: Error?) -> Void)) {
         fakeOuterStringSerializeWithRequestBuilder(body: body).execute { (response, error) -> Void in
             completion(response?.body, error)
         }
@@ -167,7 +165,7 @@ open class FakeAPI {
      - parameter body: (body)  
      - parameter completion: completion handler to receive the data and the error objects
      */
-    open class func testBodyWithFileSchema(body: FileSchemaTestClass, completion: @escaping ((_ data: Void?,_ error: Error?) -> Void)) {
+    open class func testBodyWithFileSchema(body: FileSchemaTestClass, completion: @escaping ((_ data: Void?, _ error: Error?) -> Void)) {
         testBodyWithFileSchemaWithRequestBuilder(body: body).execute { (response, error) -> Void in
             if error == nil {
                 completion((), error)
@@ -201,7 +199,7 @@ open class FakeAPI {
      - parameter body: (body)  
      - parameter completion: completion handler to receive the data and the error objects
      */
-    open class func testBodyWithQueryParams(query: String, body: User, completion: @escaping ((_ data: Void?,_ error: Error?) -> Void)) {
+    open class func testBodyWithQueryParams(query: String, body: User, completion: @escaping ((_ data: Void?, _ error: Error?) -> Void)) {
         testBodyWithQueryParamsWithRequestBuilder(query: query, body: body).execute { (response, error) -> Void in
             if error == nil {
                 completion((), error)
@@ -238,7 +236,7 @@ open class FakeAPI {
      - parameter body: (body) client model 
      - parameter completion: completion handler to receive the data and the error objects
      */
-    open class func testClientModel(body: Client, completion: @escaping ((_ data: Client?,_ error: Error?) -> Void)) {
+    open class func testClientModel(body: Client, completion: @escaping ((_ data: Client?, _ error: Error?) -> Void)) {
         testClientModelWithRequestBuilder(body: body).execute { (response, error) -> Void in
             completion(response?.body, error)
         }
@@ -282,7 +280,7 @@ open class FakeAPI {
      - parameter callback: (form) None (optional)
      - parameter completion: completion handler to receive the data and the error objects
      */
-    open class func testEndpointParameters(number: Double, double: Double, patternWithoutDelimiter: String, byte: Data, integer: Int? = nil, int32: Int? = nil, int64: Int64? = nil, float: Float? = nil, string: String? = nil, binary: URL? = nil, date: Date? = nil, dateTime: Date? = nil, password: String? = nil, callback: String? = nil, completion: @escaping ((_ data: Void?,_ error: Error?) -> Void)) {
+    open class func testEndpointParameters(number: Double, double: Double, patternWithoutDelimiter: String, byte: Data, integer: Int? = nil, int32: Int? = nil, int64: Int64? = nil, float: Float? = nil, string: String? = nil, binary: URL? = nil, date: Date? = nil, dateTime: Date? = nil, password: String? = nil, callback: String? = nil, completion: @escaping ((_ data: Void?, _ error: Error?) -> Void)) {
         testEndpointParametersWithRequestBuilder(number: number, double: double, patternWithoutDelimiter: patternWithoutDelimiter, byte: byte, integer: integer, int32: int32, int64: int64, float: float, string: string, binary: binary, date: date, dateTime: dateTime, password: password, callback: callback).execute { (response, error) -> Void in
             if error == nil {
                 completion((), error)
@@ -318,7 +316,7 @@ open class FakeAPI {
     open class func testEndpointParametersWithRequestBuilder(number: Double, double: Double, patternWithoutDelimiter: String, byte: Data, integer: Int? = nil, int32: Int? = nil, int64: Int64? = nil, float: Float? = nil, string: String? = nil, binary: URL? = nil, date: Date? = nil, dateTime: Date? = nil, password: String? = nil, callback: String? = nil) -> RequestBuilder<Void> {
         let path = "/fake"
         let URLString = PetstoreClientAPI.basePath + path
-        let formParams: [String:Any?] = [
+        let formParams: [String: Any?] = [
             "integer": integer?.encodeToJSON(),
             "int32": int32?.encodeToJSON(),
             "int64": int64?.encodeToJSON(),
@@ -337,7 +335,7 @@ open class FakeAPI {
 
         let nonNullParameters = APIHelper.rejectNil(formParams)
         let parameters = APIHelper.convertBoolToString(nonNullParameters)
-        
+
         let url = URLComponents(string: URLString)
 
         let requestBuilder: RequestBuilder<Void>.Type = PetstoreClientAPI.requestBuilderFactory.getNonDecodableBuilder()
@@ -425,7 +423,7 @@ open class FakeAPI {
      - parameter enumFormString: (form) Form parameter enum test (string) (optional, default to .-efg)
      - parameter completion: completion handler to receive the data and the error objects
      */
-    open class func testEnumParameters(enumHeaderStringArray: [String]? = nil, enumHeaderString: EnumHeaderString_testEnumParameters? = nil, enumQueryStringArray: [String]? = nil, enumQueryString: EnumQueryString_testEnumParameters? = nil, enumQueryInteger: EnumQueryInteger_testEnumParameters? = nil, enumQueryDouble: EnumQueryDouble_testEnumParameters? = nil, enumFormStringArray: [String]? = nil, enumFormString: EnumFormString_testEnumParameters? = nil, completion: @escaping ((_ data: Void?,_ error: Error?) -> Void)) {
+    open class func testEnumParameters(enumHeaderStringArray: [String]? = nil, enumHeaderString: EnumHeaderString_testEnumParameters? = nil, enumQueryStringArray: [String]? = nil, enumQueryString: EnumQueryString_testEnumParameters? = nil, enumQueryInteger: EnumQueryInteger_testEnumParameters? = nil, enumQueryDouble: EnumQueryDouble_testEnumParameters? = nil, enumFormStringArray: [String]? = nil, enumFormString: EnumFormString_testEnumParameters? = nil, completion: @escaping ((_ data: Void?, _ error: Error?) -> Void)) {
         testEnumParametersWithRequestBuilder(enumHeaderStringArray: enumHeaderStringArray, enumHeaderString: enumHeaderString, enumQueryStringArray: enumQueryStringArray, enumQueryString: enumQueryString, enumQueryInteger: enumQueryInteger, enumQueryDouble: enumQueryDouble, enumFormStringArray: enumFormStringArray, enumFormString: enumFormString).execute { (response, error) -> Void in
             if error == nil {
                 completion((), error)
@@ -452,19 +450,19 @@ open class FakeAPI {
     open class func testEnumParametersWithRequestBuilder(enumHeaderStringArray: [String]? = nil, enumHeaderString: EnumHeaderString_testEnumParameters? = nil, enumQueryStringArray: [String]? = nil, enumQueryString: EnumQueryString_testEnumParameters? = nil, enumQueryInteger: EnumQueryInteger_testEnumParameters? = nil, enumQueryDouble: EnumQueryDouble_testEnumParameters? = nil, enumFormStringArray: [String]? = nil, enumFormString: EnumFormString_testEnumParameters? = nil) -> RequestBuilder<Void> {
         let path = "/fake"
         let URLString = PetstoreClientAPI.basePath + path
-        let formParams: [String:Any?] = [
+        let formParams: [String: Any?] = [
             "enum_form_string_array": enumFormStringArray,
             "enum_form_string": enumFormString?.rawValue
         ]
 
         let nonNullParameters = APIHelper.rejectNil(formParams)
         let parameters = APIHelper.convertBoolToString(nonNullParameters)
-        
+
         var url = URLComponents(string: URLString)
         url?.queryItems = APIHelper.mapValuesToQueryItems([
-            "enum_query_string_array": enumQueryStringArray, 
-            "enum_query_string": enumQueryString?.rawValue, 
-            "enum_query_integer": enumQueryInteger?.rawValue, 
+            "enum_query_string_array": enumQueryStringArray,
+            "enum_query_string": enumQueryString?.rawValue,
+            "enum_query_integer": enumQueryInteger?.rawValue,
             "enum_query_double": enumQueryDouble?.rawValue
         ])
         let nillableHeaders: [String: Any?] = [
@@ -489,7 +487,7 @@ open class FakeAPI {
      - parameter int64Group: (query) Integer in group parameters (optional)
      - parameter completion: completion handler to receive the data and the error objects
      */
-    open class func testGroupParameters(requiredStringGroup: Int, requiredBooleanGroup: Bool, requiredInt64Group: Int64, stringGroup: Int? = nil, booleanGroup: Bool? = nil, int64Group: Int64? = nil, completion: @escaping ((_ data: Void?,_ error: Error?) -> Void)) {
+    open class func testGroupParameters(requiredStringGroup: Int, requiredBooleanGroup: Bool, requiredInt64Group: Int64, stringGroup: Int? = nil, booleanGroup: Bool? = nil, int64Group: Int64? = nil, completion: @escaping ((_ data: Void?, _ error: Error?) -> Void)) {
         testGroupParametersWithRequestBuilder(requiredStringGroup: requiredStringGroup, requiredBooleanGroup: requiredBooleanGroup, requiredInt64Group: requiredInt64Group, stringGroup: stringGroup, booleanGroup: booleanGroup, int64Group: int64Group).execute { (response, error) -> Void in
             if error == nil {
                 completion((), error)
@@ -514,13 +512,13 @@ open class FakeAPI {
     open class func testGroupParametersWithRequestBuilder(requiredStringGroup: Int, requiredBooleanGroup: Bool, requiredInt64Group: Int64, stringGroup: Int? = nil, booleanGroup: Bool? = nil, int64Group: Int64? = nil) -> RequestBuilder<Void> {
         let path = "/fake"
         let URLString = PetstoreClientAPI.basePath + path
-        let parameters: [String:Any]? = nil
-        
+        let parameters: [String: Any]? = nil
+
         var url = URLComponents(string: URLString)
         url?.queryItems = APIHelper.mapValuesToQueryItems([
-            "required_string_group": requiredStringGroup.encodeToJSON(), 
-            "required_int64_group": requiredInt64Group.encodeToJSON(), 
-            "string_group": stringGroup?.encodeToJSON(), 
+            "required_string_group": requiredStringGroup.encodeToJSON(),
+            "required_int64_group": requiredInt64Group.encodeToJSON(),
+            "string_group": stringGroup?.encodeToJSON(),
             "int64_group": int64Group?.encodeToJSON()
         ])
         let nillableHeaders: [String: Any?] = [
@@ -540,7 +538,7 @@ open class FakeAPI {
      - parameter param: (body) request body 
      - parameter completion: completion handler to receive the data and the error objects
      */
-    open class func testInlineAdditionalProperties(param: [String:String], completion: @escaping ((_ data: Void?,_ error: Error?) -> Void)) {
+    open class func testInlineAdditionalProperties(param: [String: String], completion: @escaping ((_ data: Void?, _ error: Error?) -> Void)) {
         testInlineAdditionalPropertiesWithRequestBuilder(param: param).execute { (response, error) -> Void in
             if error == nil {
                 completion((), error)
@@ -556,7 +554,7 @@ open class FakeAPI {
      - parameter param: (body) request body 
      - returns: RequestBuilder<Void> 
      */
-    open class func testInlineAdditionalPropertiesWithRequestBuilder(param: [String:String]) -> RequestBuilder<Void> {
+    open class func testInlineAdditionalPropertiesWithRequestBuilder(param: [String: String]) -> RequestBuilder<Void> {
         let path = "/fake/inline-additionalProperties"
         let URLString = PetstoreClientAPI.basePath + path
         let parameters = JSONEncodingHelper.encodingParameters(forEncodableObject: param)
@@ -575,7 +573,7 @@ open class FakeAPI {
      - parameter param2: (form) field2 
      - parameter completion: completion handler to receive the data and the error objects
      */
-    open class func testJsonFormData(param: String, param2: String, completion: @escaping ((_ data: Void?,_ error: Error?) -> Void)) {
+    open class func testJsonFormData(param: String, param2: String, completion: @escaping ((_ data: Void?, _ error: Error?) -> Void)) {
         testJsonFormDataWithRequestBuilder(param: param, param2: param2).execute { (response, error) -> Void in
             if error == nil {
                 completion((), error)
@@ -595,14 +593,14 @@ open class FakeAPI {
     open class func testJsonFormDataWithRequestBuilder(param: String, param2: String) -> RequestBuilder<Void> {
         let path = "/fake/jsonFormData"
         let URLString = PetstoreClientAPI.basePath + path
-        let formParams: [String:Any?] = [
+        let formParams: [String: Any?] = [
             "param": param,
             "param2": param2
         ]
 
         let nonNullParameters = APIHelper.rejectNil(formParams)
         let parameters = APIHelper.convertBoolToString(nonNullParameters)
-        
+
         let url = URLComponents(string: URLString)
 
         let requestBuilder: RequestBuilder<Void>.Type = PetstoreClientAPI.requestBuilderFactory.getNonDecodableBuilder()
diff --git a/samples/client/petstore/swift4/objcCompatible/PetstoreClient/Classes/OpenAPIs/APIs/FakeClassnameTags123API.swift b/samples/client/petstore/swift4/objcCompatible/PetstoreClient/Classes/OpenAPIs/APIs/FakeClassnameTags123API.swift
index ddfeae23ed..6bfa09016f 100644
--- a/samples/client/petstore/swift4/objcCompatible/PetstoreClient/Classes/OpenAPIs/APIs/FakeClassnameTags123API.swift
+++ b/samples/client/petstore/swift4/objcCompatible/PetstoreClient/Classes/OpenAPIs/APIs/FakeClassnameTags123API.swift
@@ -8,8 +8,6 @@
 import Foundation
 import Alamofire
 
-
-
 open class FakeClassnameTags123API {
     /**
      To test class name in snake case
@@ -17,7 +15,7 @@ open class FakeClassnameTags123API {
      - parameter body: (body) client model 
      - parameter completion: completion handler to receive the data and the error objects
      */
-    open class func testClassname(body: Client, completion: @escaping ((_ data: Client?,_ error: Error?) -> Void)) {
+    open class func testClassname(body: Client, completion: @escaping ((_ data: Client?, _ error: Error?) -> Void)) {
         testClassnameWithRequestBuilder(body: body).execute { (response, error) -> Void in
             completion(response?.body, error)
         }
diff --git a/samples/client/petstore/swift4/objcCompatible/PetstoreClient/Classes/OpenAPIs/APIs/PetAPI.swift b/samples/client/petstore/swift4/objcCompatible/PetstoreClient/Classes/OpenAPIs/APIs/PetAPI.swift
index 0a5dfeb39b..896f151180 100644
--- a/samples/client/petstore/swift4/objcCompatible/PetstoreClient/Classes/OpenAPIs/APIs/PetAPI.swift
+++ b/samples/client/petstore/swift4/objcCompatible/PetstoreClient/Classes/OpenAPIs/APIs/PetAPI.swift
@@ -8,8 +8,6 @@
 import Foundation
 import Alamofire
 
-
-
 open class PetAPI {
     /**
      Add a new pet to the store
@@ -17,7 +15,7 @@ open class PetAPI {
      - parameter body: (body) Pet object that needs to be added to the store 
      - parameter completion: completion handler to receive the data and the error objects
      */
-    open class func addPet(body: Pet, completion: @escaping ((_ data: Void?,_ error: Error?) -> Void)) {
+    open class func addPet(body: Pet, completion: @escaping ((_ data: Void?, _ error: Error?) -> Void)) {
         addPetWithRequestBuilder(body: body).execute { (response, error) -> Void in
             if error == nil {
                 completion((), error)
@@ -55,7 +53,7 @@ open class PetAPI {
      - parameter apiKey: (header)  (optional)
      - parameter completion: completion handler to receive the data and the error objects
      */
-    open class func deletePet(petId: Int64, apiKey: String? = nil, completion: @escaping ((_ data: Void?,_ error: Error?) -> Void)) {
+    open class func deletePet(petId: Int64, apiKey: String? = nil, completion: @escaping ((_ data: Void?, _ error: Error?) -> Void)) {
         deletePetWithRequestBuilder(petId: petId, apiKey: apiKey).execute { (response, error) -> Void in
             if error == nil {
                 completion((), error)
@@ -81,8 +79,8 @@ open class PetAPI {
         let petIdPostEscape = petIdPreEscape.addingPercentEncoding(withAllowedCharacters: .urlPathAllowed) ?? ""
         path = path.replacingOccurrences(of: "{petId}", with: petIdPostEscape, options: .literal, range: nil)
         let URLString = PetstoreClientAPI.basePath + path
-        let parameters: [String:Any]? = nil
-        
+        let parameters: [String: Any]? = nil
+
         let url = URLComponents(string: URLString)
         let nillableHeaders: [String: Any?] = [
             "api_key": apiKey
@@ -109,7 +107,7 @@ open class PetAPI {
      - parameter status: (query) Status values that need to be considered for filter 
      - parameter completion: completion handler to receive the data and the error objects
      */
-    open class func findPetsByStatus(status: [String], completion: @escaping ((_ data: [Pet]?,_ error: Error?) -> Void)) {
+    open class func findPetsByStatus(status: [String], completion: @escaping ((_ data: [Pet]?, _ error: Error?) -> Void)) {
         findPetsByStatusWithRequestBuilder(status: status).execute { (response, error) -> Void in
             completion(response?.body, error)
         }
@@ -128,8 +126,8 @@ open class PetAPI {
     open class func findPetsByStatusWithRequestBuilder(status: [String]) -> RequestBuilder<[Pet]> {
         let path = "/pet/findByStatus"
         let URLString = PetstoreClientAPI.basePath + path
-        let parameters: [String:Any]? = nil
-        
+        let parameters: [String: Any]? = nil
+
         var url = URLComponents(string: URLString)
         url?.queryItems = APIHelper.mapValuesToQueryItems([
             "status": status
@@ -146,7 +144,7 @@ open class PetAPI {
      - parameter tags: (query) Tags to filter by 
      - parameter completion: completion handler to receive the data and the error objects
      */
-    open class func findPetsByTags(tags: [String], completion: @escaping ((_ data: [Pet]?,_ error: Error?) -> Void)) {
+    open class func findPetsByTags(tags: [String], completion: @escaping ((_ data: [Pet]?, _ error: Error?) -> Void)) {
         findPetsByTagsWithRequestBuilder(tags: tags).execute { (response, error) -> Void in
             completion(response?.body, error)
         }
@@ -165,8 +163,8 @@ open class PetAPI {
     open class func findPetsByTagsWithRequestBuilder(tags: [String]) -> RequestBuilder<[Pet]> {
         let path = "/pet/findByTags"
         let URLString = PetstoreClientAPI.basePath + path
-        let parameters: [String:Any]? = nil
-        
+        let parameters: [String: Any]? = nil
+
         var url = URLComponents(string: URLString)
         url?.queryItems = APIHelper.mapValuesToQueryItems([
             "tags": tags
@@ -183,7 +181,7 @@ open class PetAPI {
      - parameter petId: (path) ID of pet to return 
      - parameter completion: completion handler to receive the data and the error objects
      */
-    open class func getPetById(petId: Int64, completion: @escaping ((_ data: Pet?,_ error: Error?) -> Void)) {
+    open class func getPetById(petId: Int64, completion: @escaping ((_ data: Pet?, _ error: Error?) -> Void)) {
         getPetByIdWithRequestBuilder(petId: petId).execute { (response, error) -> Void in
             completion(response?.body, error)
         }
@@ -205,8 +203,8 @@ open class PetAPI {
         let petIdPostEscape = petIdPreEscape.addingPercentEncoding(withAllowedCharacters: .urlPathAllowed) ?? ""
         path = path.replacingOccurrences(of: "{petId}", with: petIdPostEscape, options: .literal, range: nil)
         let URLString = PetstoreClientAPI.basePath + path
-        let parameters: [String:Any]? = nil
-        
+        let parameters: [String: Any]? = nil
+
         let url = URLComponents(string: URLString)
 
         let requestBuilder: RequestBuilder<Pet>.Type = PetstoreClientAPI.requestBuilderFactory.getBuilder()
@@ -220,7 +218,7 @@ open class PetAPI {
      - parameter body: (body) Pet object that needs to be added to the store 
      - parameter completion: completion handler to receive the data and the error objects
      */
-    open class func updatePet(body: Pet, completion: @escaping ((_ data: Void?,_ error: Error?) -> Void)) {
+    open class func updatePet(body: Pet, completion: @escaping ((_ data: Void?, _ error: Error?) -> Void)) {
         updatePetWithRequestBuilder(body: body).execute { (response, error) -> Void in
             if error == nil {
                 completion((), error)
@@ -259,7 +257,7 @@ open class PetAPI {
      - parameter status: (form) Updated status of the pet (optional)
      - parameter completion: completion handler to receive the data and the error objects
      */
-    open class func updatePetWithForm(petId: Int64, name: String? = nil, status: String? = nil, completion: @escaping ((_ data: Void?,_ error: Error?) -> Void)) {
+    open class func updatePetWithForm(petId: Int64, name: String? = nil, status: String? = nil, completion: @escaping ((_ data: Void?, _ error: Error?) -> Void)) {
         updatePetWithFormWithRequestBuilder(petId: petId, name: name, status: status).execute { (response, error) -> Void in
             if error == nil {
                 completion((), error)
@@ -286,14 +284,14 @@ open class PetAPI {
         let petIdPostEscape = petIdPreEscape.addingPercentEncoding(withAllowedCharacters: .urlPathAllowed) ?? ""
         path = path.replacingOccurrences(of: "{petId}", with: petIdPostEscape, options: .literal, range: nil)
         let URLString = PetstoreClientAPI.basePath + path
-        let formParams: [String:Any?] = [
+        let formParams: [String: Any?] = [
             "name": name,
             "status": status
         ]
 
         let nonNullParameters = APIHelper.rejectNil(formParams)
         let parameters = APIHelper.convertBoolToString(nonNullParameters)
-        
+
         let url = URLComponents(string: URLString)
 
         let requestBuilder: RequestBuilder<Void>.Type = PetstoreClientAPI.requestBuilderFactory.getNonDecodableBuilder()
@@ -309,7 +307,7 @@ open class PetAPI {
      - parameter file: (form) file to upload (optional)
      - parameter completion: completion handler to receive the data and the error objects
      */
-    open class func uploadFile(petId: Int64, additionalMetadata: String? = nil, file: URL? = nil, completion: @escaping ((_ data: ApiResponse?,_ error: Error?) -> Void)) {
+    open class func uploadFile(petId: Int64, additionalMetadata: String? = nil, file: URL? = nil, completion: @escaping ((_ data: ApiResponse?, _ error: Error?) -> Void)) {
         uploadFileWithRequestBuilder(petId: petId, additionalMetadata: additionalMetadata, file: file).execute { (response, error) -> Void in
             completion(response?.body, error)
         }
@@ -332,14 +330,14 @@ open class PetAPI {
         let petIdPostEscape = petIdPreEscape.addingPercentEncoding(withAllowedCharacters: .urlPathAllowed) ?? ""
         path = path.replacingOccurrences(of: "{petId}", with: petIdPostEscape, options: .literal, range: nil)
         let URLString = PetstoreClientAPI.basePath + path
-        let formParams: [String:Any?] = [
+        let formParams: [String: Any?] = [
             "additionalMetadata": additionalMetadata,
             "file": file
         ]
 
         let nonNullParameters = APIHelper.rejectNil(formParams)
         let parameters = APIHelper.convertBoolToString(nonNullParameters)
-        
+
         let url = URLComponents(string: URLString)
 
         let requestBuilder: RequestBuilder<ApiResponse>.Type = PetstoreClientAPI.requestBuilderFactory.getBuilder()
@@ -355,7 +353,7 @@ open class PetAPI {
      - parameter additionalMetadata: (form) Additional data to pass to server (optional)
      - parameter completion: completion handler to receive the data and the error objects
      */
-    open class func uploadFileWithRequiredFile(petId: Int64, requiredFile: URL, additionalMetadata: String? = nil, completion: @escaping ((_ data: ApiResponse?,_ error: Error?) -> Void)) {
+    open class func uploadFileWithRequiredFile(petId: Int64, requiredFile: URL, additionalMetadata: String? = nil, completion: @escaping ((_ data: ApiResponse?, _ error: Error?) -> Void)) {
         uploadFileWithRequiredFileWithRequestBuilder(petId: petId, requiredFile: requiredFile, additionalMetadata: additionalMetadata).execute { (response, error) -> Void in
             completion(response?.body, error)
         }
@@ -378,14 +376,14 @@ open class PetAPI {
         let petIdPostEscape = petIdPreEscape.addingPercentEncoding(withAllowedCharacters: .urlPathAllowed) ?? ""
         path = path.replacingOccurrences(of: "{petId}", with: petIdPostEscape, options: .literal, range: nil)
         let URLString = PetstoreClientAPI.basePath + path
-        let formParams: [String:Any?] = [
+        let formParams: [String: Any?] = [
             "additionalMetadata": additionalMetadata,
             "requiredFile": requiredFile
         ]
 
         let nonNullParameters = APIHelper.rejectNil(formParams)
         let parameters = APIHelper.convertBoolToString(nonNullParameters)
-        
+
         let url = URLComponents(string: URLString)
 
         let requestBuilder: RequestBuilder<ApiResponse>.Type = PetstoreClientAPI.requestBuilderFactory.getBuilder()
diff --git a/samples/client/petstore/swift4/objcCompatible/PetstoreClient/Classes/OpenAPIs/APIs/StoreAPI.swift b/samples/client/petstore/swift4/objcCompatible/PetstoreClient/Classes/OpenAPIs/APIs/StoreAPI.swift
index a2bced598f..71949b335d 100644
--- a/samples/client/petstore/swift4/objcCompatible/PetstoreClient/Classes/OpenAPIs/APIs/StoreAPI.swift
+++ b/samples/client/petstore/swift4/objcCompatible/PetstoreClient/Classes/OpenAPIs/APIs/StoreAPI.swift
@@ -8,8 +8,6 @@
 import Foundation
 import Alamofire
 
-
-
 open class StoreAPI {
     /**
      Delete purchase order by ID
@@ -17,7 +15,7 @@ open class StoreAPI {
      - parameter orderId: (path) ID of the order that needs to be deleted 
      - parameter completion: completion handler to receive the data and the error objects
      */
-    open class func deleteOrder(orderId: String, completion: @escaping ((_ data: Void?,_ error: Error?) -> Void)) {
+    open class func deleteOrder(orderId: String, completion: @escaping ((_ data: Void?, _ error: Error?) -> Void)) {
         deleteOrderWithRequestBuilder(orderId: orderId).execute { (response, error) -> Void in
             if error == nil {
                 completion((), error)
@@ -40,8 +38,8 @@ open class StoreAPI {
         let orderIdPostEscape = orderIdPreEscape.addingPercentEncoding(withAllowedCharacters: .urlPathAllowed) ?? ""
         path = path.replacingOccurrences(of: "{order_id}", with: orderIdPostEscape, options: .literal, range: nil)
         let URLString = PetstoreClientAPI.basePath + path
-        let parameters: [String:Any]? = nil
-        
+        let parameters: [String: Any]? = nil
+
         let url = URLComponents(string: URLString)
 
         let requestBuilder: RequestBuilder<Void>.Type = PetstoreClientAPI.requestBuilderFactory.getNonDecodableBuilder()
@@ -54,7 +52,7 @@ open class StoreAPI {
      
      - parameter completion: completion handler to receive the data and the error objects
      */
-    open class func getInventory(completion: @escaping ((_ data: [String:Int]?,_ error: Error?) -> Void)) {
+    open class func getInventory(completion: @escaping ((_ data: [String: Int]?, _ error: Error?) -> Void)) {
         getInventoryWithRequestBuilder().execute { (response, error) -> Void in
             completion(response?.body, error)
         }
@@ -69,14 +67,14 @@ open class StoreAPI {
        - name: api_key
      - returns: RequestBuilder<[String:Int]> 
      */
-    open class func getInventoryWithRequestBuilder() -> RequestBuilder<[String:Int]> {
+    open class func getInventoryWithRequestBuilder() -> RequestBuilder<[String: Int]> {
         let path = "/store/inventory"
         let URLString = PetstoreClientAPI.basePath + path
-        let parameters: [String:Any]? = nil
-        
+        let parameters: [String: Any]? = nil
+
         let url = URLComponents(string: URLString)
 
-        let requestBuilder: RequestBuilder<[String:Int]>.Type = PetstoreClientAPI.requestBuilderFactory.getBuilder()
+        let requestBuilder: RequestBuilder<[String: Int]>.Type = PetstoreClientAPI.requestBuilderFactory.getBuilder()
 
         return requestBuilder.init(method: "GET", URLString: (url?.string ?? URLString), parameters: parameters, isBody: false)
     }
@@ -87,7 +85,7 @@ open class StoreAPI {
      - parameter orderId: (path) ID of pet that needs to be fetched 
      - parameter completion: completion handler to receive the data and the error objects
      */
-    open class func getOrderById(orderId: Int64, completion: @escaping ((_ data: Order?,_ error: Error?) -> Void)) {
+    open class func getOrderById(orderId: Int64, completion: @escaping ((_ data: Order?, _ error: Error?) -> Void)) {
         getOrderByIdWithRequestBuilder(orderId: orderId).execute { (response, error) -> Void in
             completion(response?.body, error)
         }
@@ -106,8 +104,8 @@ open class StoreAPI {
         let orderIdPostEscape = orderIdPreEscape.addingPercentEncoding(withAllowedCharacters: .urlPathAllowed) ?? ""
         path = path.replacingOccurrences(of: "{order_id}", with: orderIdPostEscape, options: .literal, range: nil)
         let URLString = PetstoreClientAPI.basePath + path
-        let parameters: [String:Any]? = nil
-        
+        let parameters: [String: Any]? = nil
+
         let url = URLComponents(string: URLString)
 
         let requestBuilder: RequestBuilder<Order>.Type = PetstoreClientAPI.requestBuilderFactory.getBuilder()
@@ -121,7 +119,7 @@ open class StoreAPI {
      - parameter body: (body) order placed for purchasing the pet 
      - parameter completion: completion handler to receive the data and the error objects
      */
-    open class func placeOrder(body: Order, completion: @escaping ((_ data: Order?,_ error: Error?) -> Void)) {
+    open class func placeOrder(body: Order, completion: @escaping ((_ data: Order?, _ error: Error?) -> Void)) {
         placeOrderWithRequestBuilder(body: body).execute { (response, error) -> Void in
             completion(response?.body, error)
         }
diff --git a/samples/client/petstore/swift4/objcCompatible/PetstoreClient/Classes/OpenAPIs/APIs/UserAPI.swift b/samples/client/petstore/swift4/objcCompatible/PetstoreClient/Classes/OpenAPIs/APIs/UserAPI.swift
index d8cafaf2c9..efeb64468a 100644
--- a/samples/client/petstore/swift4/objcCompatible/PetstoreClient/Classes/OpenAPIs/APIs/UserAPI.swift
+++ b/samples/client/petstore/swift4/objcCompatible/PetstoreClient/Classes/OpenAPIs/APIs/UserAPI.swift
@@ -8,8 +8,6 @@
 import Foundation
 import Alamofire
 
-
-
 open class UserAPI {
     /**
      Create user
@@ -17,7 +15,7 @@ open class UserAPI {
      - parameter body: (body) Created user object 
      - parameter completion: completion handler to receive the data and the error objects
      */
-    open class func createUser(body: User, completion: @escaping ((_ data: Void?,_ error: Error?) -> Void)) {
+    open class func createUser(body: User, completion: @escaping ((_ data: Void?, _ error: Error?) -> Void)) {
         createUserWithRequestBuilder(body: body).execute { (response, error) -> Void in
             if error == nil {
                 completion((), error)
@@ -52,7 +50,7 @@ open class UserAPI {
      - parameter body: (body) List of user object 
      - parameter completion: completion handler to receive the data and the error objects
      */
-    open class func createUsersWithArrayInput(body: [User], completion: @escaping ((_ data: Void?,_ error: Error?) -> Void)) {
+    open class func createUsersWithArrayInput(body: [User], completion: @escaping ((_ data: Void?, _ error: Error?) -> Void)) {
         createUsersWithArrayInputWithRequestBuilder(body: body).execute { (response, error) -> Void in
             if error == nil {
                 completion((), error)
@@ -86,7 +84,7 @@ open class UserAPI {
      - parameter body: (body) List of user object 
      - parameter completion: completion handler to receive the data and the error objects
      */
-    open class func createUsersWithListInput(body: [User], completion: @escaping ((_ data: Void?,_ error: Error?) -> Void)) {
+    open class func createUsersWithListInput(body: [User], completion: @escaping ((_ data: Void?, _ error: Error?) -> Void)) {
         createUsersWithListInputWithRequestBuilder(body: body).execute { (response, error) -> Void in
             if error == nil {
                 completion((), error)
@@ -120,7 +118,7 @@ open class UserAPI {
      - parameter username: (path) The name that needs to be deleted 
      - parameter completion: completion handler to receive the data and the error objects
      */
-    open class func deleteUser(username: String, completion: @escaping ((_ data: Void?,_ error: Error?) -> Void)) {
+    open class func deleteUser(username: String, completion: @escaping ((_ data: Void?, _ error: Error?) -> Void)) {
         deleteUserWithRequestBuilder(username: username).execute { (response, error) -> Void in
             if error == nil {
                 completion((), error)
@@ -143,8 +141,8 @@ open class UserAPI {
         let usernamePostEscape = usernamePreEscape.addingPercentEncoding(withAllowedCharacters: .urlPathAllowed) ?? ""
         path = path.replacingOccurrences(of: "{username}", with: usernamePostEscape, options: .literal, range: nil)
         let URLString = PetstoreClientAPI.basePath + path
-        let parameters: [String:Any]? = nil
-        
+        let parameters: [String: Any]? = nil
+
         let url = URLComponents(string: URLString)
 
         let requestBuilder: RequestBuilder<Void>.Type = PetstoreClientAPI.requestBuilderFactory.getNonDecodableBuilder()
@@ -158,7 +156,7 @@ open class UserAPI {
      - parameter username: (path) The name that needs to be fetched. Use user1 for testing. 
      - parameter completion: completion handler to receive the data and the error objects
      */
-    open class func getUserByName(username: String, completion: @escaping ((_ data: User?,_ error: Error?) -> Void)) {
+    open class func getUserByName(username: String, completion: @escaping ((_ data: User?, _ error: Error?) -> Void)) {
         getUserByNameWithRequestBuilder(username: username).execute { (response, error) -> Void in
             completion(response?.body, error)
         }
@@ -176,8 +174,8 @@ open class UserAPI {
         let usernamePostEscape = usernamePreEscape.addingPercentEncoding(withAllowedCharacters: .urlPathAllowed) ?? ""
         path = path.replacingOccurrences(of: "{username}", with: usernamePostEscape, options: .literal, range: nil)
         let URLString = PetstoreClientAPI.basePath + path
-        let parameters: [String:Any]? = nil
-        
+        let parameters: [String: Any]? = nil
+
         let url = URLComponents(string: URLString)
 
         let requestBuilder: RequestBuilder<User>.Type = PetstoreClientAPI.requestBuilderFactory.getBuilder()
@@ -192,7 +190,7 @@ open class UserAPI {
      - parameter password: (query) The password for login in clear text 
      - parameter completion: completion handler to receive the data and the error objects
      */
-    open class func loginUser(username: String, password: String, completion: @escaping ((_ data: String?,_ error: Error?) -> Void)) {
+    open class func loginUser(username: String, password: String, completion: @escaping ((_ data: String?, _ error: Error?) -> Void)) {
         loginUserWithRequestBuilder(username: username, password: password).execute { (response, error) -> Void in
             completion(response?.body, error)
         }
@@ -209,11 +207,11 @@ open class UserAPI {
     open class func loginUserWithRequestBuilder(username: String, password: String) -> RequestBuilder<String> {
         let path = "/user/login"
         let URLString = PetstoreClientAPI.basePath + path
-        let parameters: [String:Any]? = nil
-        
+        let parameters: [String: Any]? = nil
+
         var url = URLComponents(string: URLString)
         url?.queryItems = APIHelper.mapValuesToQueryItems([
-            "username": username, 
+            "username": username,
             "password": password
         ])
 
@@ -227,7 +225,7 @@ open class UserAPI {
      
      - parameter completion: completion handler to receive the data and the error objects
      */
-    open class func logoutUser(completion: @escaping ((_ data: Void?,_ error: Error?) -> Void)) {
+    open class func logoutUser(completion: @escaping ((_ data: Void?, _ error: Error?) -> Void)) {
         logoutUserWithRequestBuilder().execute { (response, error) -> Void in
             if error == nil {
                 completion((), error)
@@ -245,8 +243,8 @@ open class UserAPI {
     open class func logoutUserWithRequestBuilder() -> RequestBuilder<Void> {
         let path = "/user/logout"
         let URLString = PetstoreClientAPI.basePath + path
-        let parameters: [String:Any]? = nil
-        
+        let parameters: [String: Any]? = nil
+
         let url = URLComponents(string: URLString)
 
         let requestBuilder: RequestBuilder<Void>.Type = PetstoreClientAPI.requestBuilderFactory.getNonDecodableBuilder()
@@ -261,7 +259,7 @@ open class UserAPI {
      - parameter body: (body) Updated user object 
      - parameter completion: completion handler to receive the data and the error objects
      */
-    open class func updateUser(username: String, body: User, completion: @escaping ((_ data: Void?,_ error: Error?) -> Void)) {
+    open class func updateUser(username: String, body: User, completion: @escaping ((_ data: Void?, _ error: Error?) -> Void)) {
         updateUserWithRequestBuilder(username: username, body: body).execute { (response, error) -> Void in
             if error == nil {
                 completion((), error)
diff --git a/samples/client/petstore/swift4/objcCompatible/PetstoreClient/Classes/OpenAPIs/AlamofireImplementations.swift b/samples/client/petstore/swift4/objcCompatible/PetstoreClient/Classes/OpenAPIs/AlamofireImplementations.swift
index dac40e9a31..04ad02a5ce 100644
--- a/samples/client/petstore/swift4/objcCompatible/PetstoreClient/Classes/OpenAPIs/AlamofireImplementations.swift
+++ b/samples/client/petstore/swift4/objcCompatible/PetstoreClient/Classes/OpenAPIs/AlamofireImplementations.swift
@@ -12,7 +12,7 @@ class AlamofireRequestBuilderFactory: RequestBuilderFactory {
         return AlamofireRequestBuilder<T>.self
     }
 
-    func getBuilder<T:Decodable>() -> RequestBuilder<T>.Type {
+    func getBuilder<T: Decodable>() -> RequestBuilder<T>.Type {
         return AlamofireDecodableRequestBuilder<T>.self
     }
 }
@@ -50,7 +50,7 @@ private struct SynchronizedDictionary<K: Hashable, V> {
 private var managerStore = SynchronizedDictionary<String, Alamofire.SessionManager>()
 
 open class AlamofireRequestBuilder<T>: RequestBuilder<T> {
-    required public init(method: String, URLString: String, parameters: [String : Any]?, isBody: Bool, headers: [String : String] = [:]) {
+    required public init(method: String, URLString: String, parameters: [String: Any]?, isBody: Bool, headers: [String: String] = [:]) {
         super.init(method: method, URLString: URLString, parameters: parameters, isBody: isBody, headers: headers)
     }
 
@@ -88,17 +88,17 @@ open class AlamofireRequestBuilder<T>: RequestBuilder<T> {
      May be overridden by a subclass if you want to control the request
      configuration (e.g. to override the cache policy).
      */
-    open func makeRequest(manager: SessionManager, method: HTTPMethod, encoding: ParameterEncoding, headers: [String:String]) -> DataRequest {
+    open func makeRequest(manager: SessionManager, method: HTTPMethod, encoding: ParameterEncoding, headers: [String: String]) -> DataRequest {
         return manager.request(URLString, method: method, parameters: parameters, encoding: encoding, headers: headers)
     }
 
     override open func execute(_ completion: @escaping (_ response: Response<T>?, _ error: Error?) -> Void) {
-        let managerId:String = UUID().uuidString
+        let managerId: String = UUID().uuidString
         // Create a new manager for each request to customize its request header
         let manager = createSessionManager()
         managerStore[managerId] = manager
 
-        let encoding:ParameterEncoding = isBody ? JSONDataEncoding() : URLEncoding()
+        let encoding: ParameterEncoding = isBody ? JSONDataEncoding() : URLEncoding()
 
         let xMethod = Alamofire.HTTPMethod(rawValue: method)
         let fileKeys = parameters == nil ? [] : parameters!.filter { $1 is NSURL }
@@ -111,8 +111,7 @@ open class AlamofireRequestBuilder<T>: RequestBuilder<T> {
                     case let fileURL as URL:
                         if let mimeType = self.contentTypeForFormPart(fileURL: fileURL) {
                             mpForm.append(fileURL, withName: k, fileName: fileURL.lastPathComponent, mimeType: mimeType)
-                        }
-                        else {
+                        } else {
                             mpForm.append(fileURL, withName: k)
                         }
                     case let string as String:
@@ -276,7 +275,7 @@ open class AlamofireRequestBuilder<T>: RequestBuilder<T> {
         return httpHeaders
     }
 
-    fileprivate func getFileName(fromContentDisposition contentDisposition : String?) -> String? {
+    fileprivate func getFileName(fromContentDisposition contentDisposition: String?) -> String? {
 
         guard let contentDisposition = contentDisposition else {
             return nil
@@ -284,7 +283,7 @@ open class AlamofireRequestBuilder<T>: RequestBuilder<T> {
 
         let items = contentDisposition.components(separatedBy: ";")
 
-        var filename : String? = nil
+        var filename: String? = nil
 
         for contentItem in items {
 
@@ -304,7 +303,7 @@ open class AlamofireRequestBuilder<T>: RequestBuilder<T> {
 
     }
 
-    fileprivate func getPath(from url : URL) throws -> String {
+    fileprivate func getPath(from url: URL) throws -> String {
 
         guard var path = URLComponents(url: url, resolvingAgainstBaseURL: true)?.path else {
             throw DownloadException.requestMissingPath
@@ -318,7 +317,7 @@ open class AlamofireRequestBuilder<T>: RequestBuilder<T> {
 
     }
 
-    fileprivate func getURL(from urlRequest : URLRequest) throws -> URL {
+    fileprivate func getURL(from urlRequest: URLRequest) throws -> URL {
 
         guard let url = urlRequest.url else {
             throw DownloadException.requestMissingURL
@@ -329,7 +328,7 @@ open class AlamofireRequestBuilder<T>: RequestBuilder<T> {
 
 }
 
-fileprivate enum DownloadException : Error {
+private enum DownloadException: Error {
     case responseDataMissing
     case responseFailed
     case requestMissing
@@ -344,7 +343,7 @@ public enum AlamofireDecodableRequestBuilderError: Error {
     case generalError(Error)
 }
 
-open class AlamofireDecodableRequestBuilder<T:Decodable>: AlamofireRequestBuilder<T> {
+open class AlamofireDecodableRequestBuilder<T: Decodable>: AlamofireRequestBuilder<T> {
 
     override fileprivate func processRequest(request: DataRequest, _ managerId: String, _ completion: @escaping (_ response: Response<T>?, _ error: Error?) -> Void) {
         if let credential = self.credential {
diff --git a/samples/client/petstore/swift4/objcCompatible/PetstoreClient/Classes/OpenAPIs/CodableHelper.swift b/samples/client/petstore/swift4/objcCompatible/PetstoreClient/Classes/OpenAPIs/CodableHelper.swift
index 584de8c3d5..111d5a3a8c 100644
--- a/samples/client/petstore/swift4/objcCompatible/PetstoreClient/Classes/OpenAPIs/CodableHelper.swift
+++ b/samples/client/petstore/swift4/objcCompatible/PetstoreClient/Classes/OpenAPIs/CodableHelper.swift
@@ -13,7 +13,7 @@ open class CodableHelper {
 
     public static var dateformatter: DateFormatter?
 
-    open class func decode<T>(_ type: T.Type, from data: Data) -> (decodableObj: T?, error: Error?) where T : Decodable {
+    open class func decode<T>(_ type: T.Type, from data: Data) -> (decodableObj: T?, error: Error?) where T: Decodable {
         var returnedDecodable: T? = nil
         var returnedError: Error? = nil
 
@@ -39,7 +39,7 @@ open class CodableHelper {
         return (returnedDecodable, returnedError)
     }
 
-    open class func encode<T>(_ value: T, prettyPrint: Bool = false) -> EncodeResult where T : Encodable {
+    open class func encode<T>(_ value: T, prettyPrint: Bool = false) -> EncodeResult where T: Encodable {
         var returnedData: Data?
         var returnedError: Error? = nil
 
diff --git a/samples/client/petstore/swift4/objcCompatible/PetstoreClient/Classes/OpenAPIs/Configuration.swift b/samples/client/petstore/swift4/objcCompatible/PetstoreClient/Classes/OpenAPIs/Configuration.swift
index 516590da5d..e1ecb39726 100644
--- a/samples/client/petstore/swift4/objcCompatible/PetstoreClient/Classes/OpenAPIs/Configuration.swift
+++ b/samples/client/petstore/swift4/objcCompatible/PetstoreClient/Classes/OpenAPIs/Configuration.swift
@@ -7,9 +7,9 @@
 import Foundation
 
 open class Configuration {
-	
+
 	// This value is used to configure the date formatter that is used to serialize dates into JSON format. 
 	// You must set it prior to encoding any dates, and it will only be read once. 
     public static var dateFormat = "yyyy-MM-dd'T'HH:mm:ss.SSSZZZZZ"
-    
-}
\ No newline at end of file
+
+}
diff --git a/samples/client/petstore/swift4/objcCompatible/PetstoreClient/Classes/OpenAPIs/Extensions.swift b/samples/client/petstore/swift4/objcCompatible/PetstoreClient/Classes/OpenAPIs/Extensions.swift
index 8bf1829ba8..24c128daad 100644
--- a/samples/client/petstore/swift4/objcCompatible/PetstoreClient/Classes/OpenAPIs/Extensions.swift
+++ b/samples/client/petstore/swift4/objcCompatible/PetstoreClient/Classes/OpenAPIs/Extensions.swift
@@ -112,24 +112,24 @@ extension String: CodingKey {
 
 extension KeyedEncodingContainerProtocol {
 
-    public mutating func encodeArray<T>(_ values: [T], forKey key: Self.Key) throws where T : Encodable {
+    public mutating func encodeArray<T>(_ values: [T], forKey key: Self.Key) throws where T: Encodable {
         var arrayContainer = nestedUnkeyedContainer(forKey: key)
         try arrayContainer.encode(contentsOf: values)
     }
 
-    public mutating func encodeArrayIfPresent<T>(_ values: [T]?, forKey key: Self.Key) throws where T : Encodable {
+    public mutating func encodeArrayIfPresent<T>(_ values: [T]?, forKey key: Self.Key) throws where T: Encodable {
         if let values = values {
             try encodeArray(values, forKey: key)
         }
     }
 
-    public mutating func encodeMap<T>(_ pairs: [Self.Key: T]) throws where T : Encodable {
+    public mutating func encodeMap<T>(_ pairs: [Self.Key: T]) throws where T: Encodable {
         for (key, value) in pairs {
             try encode(value, forKey: key)
         }
     }
 
-    public mutating func encodeMapIfPresent<T>(_ pairs: [Self.Key: T]?) throws where T : Encodable {
+    public mutating func encodeMapIfPresent<T>(_ pairs: [Self.Key: T]?) throws where T: Encodable {
         if let pairs = pairs {
             try encodeMap(pairs)
         }
@@ -139,7 +139,7 @@ extension KeyedEncodingContainerProtocol {
 
 extension KeyedDecodingContainerProtocol {
 
-    public func decodeArray<T>(_ type: T.Type, forKey key: Self.Key) throws -> [T] where T : Decodable {
+    public func decodeArray<T>(_ type: T.Type, forKey key: Self.Key) throws -> [T] where T: Decodable {
         var tmpArray = [T]()
 
         var nestedContainer = try nestedUnkeyedContainer(forKey: key)
@@ -151,7 +151,7 @@ extension KeyedDecodingContainerProtocol {
         return tmpArray
     }
 
-    public func decodeArrayIfPresent<T>(_ type: T.Type, forKey key: Self.Key) throws -> [T]? where T : Decodable {
+    public func decodeArrayIfPresent<T>(_ type: T.Type, forKey key: Self.Key) throws -> [T]? where T: Decodable {
         var tmpArray: [T]? = nil
 
         if contains(key) {
@@ -161,8 +161,8 @@ extension KeyedDecodingContainerProtocol {
         return tmpArray
     }
 
-    public func decodeMap<T>(_ type: T.Type, excludedKeys: Set<Self.Key>) throws -> [Self.Key: T] where T : Decodable {
-        var map: [Self.Key : T] = [:]
+    public func decodeMap<T>(_ type: T.Type, excludedKeys: Set<Self.Key>) throws -> [Self.Key: T] where T: Decodable {
+        var map: [Self.Key: T] = [:]
 
         for key in allKeys {
             if !excludedKeys.contains(key) {
@@ -175,5 +175,3 @@ extension KeyedDecodingContainerProtocol {
     }
 
 }
-
-
diff --git a/samples/client/petstore/swift4/objcCompatible/PetstoreClient/Classes/OpenAPIs/JSONEncodingHelper.swift b/samples/client/petstore/swift4/objcCompatible/PetstoreClient/Classes/OpenAPIs/JSONEncodingHelper.swift
index 7044951584..3e68bb5d4a 100644
--- a/samples/client/petstore/swift4/objcCompatible/PetstoreClient/Classes/OpenAPIs/JSONEncodingHelper.swift
+++ b/samples/client/petstore/swift4/objcCompatible/PetstoreClient/Classes/OpenAPIs/JSONEncodingHelper.swift
@@ -10,7 +10,7 @@ import Alamofire
 
 open class JSONEncodingHelper {
 
-    open class func encodingParameters<T:Encodable>(forEncodableObject encodableObj: T?) -> Parameters? {
+    open class func encodingParameters<T: Encodable>(forEncodableObject encodableObj: T?) -> Parameters? {
         var params: Parameters? = nil
 
         // Encode the Encodable object
@@ -39,5 +39,5 @@ open class JSONEncodingHelper {
 
         return params
     }
-    
+
 }
diff --git a/samples/client/petstore/swift4/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models.swift b/samples/client/petstore/swift4/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models.swift
index 4085638903..e87ce399c7 100644
--- a/samples/client/petstore/swift4/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models.swift
+++ b/samples/client/petstore/swift4/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models.swift
@@ -10,7 +10,7 @@ protocol JSONEncodable {
     func encodeToJSON() -> Any
 }
 
-public enum ErrorResponse : Error {
+public enum ErrorResponse: Error {
     case error(Int, Data?, Error)
 }
 
diff --git a/samples/client/petstore/swift4/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/AdditionalPropertiesAnyType.swift b/samples/client/petstore/swift4/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/AdditionalPropertiesAnyType.swift
index 796e46eca2..94295c495c 100644
--- a/samples/client/petstore/swift4/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/AdditionalPropertiesAnyType.swift
+++ b/samples/client/petstore/swift4/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/AdditionalPropertiesAnyType.swift
@@ -7,8 +7,6 @@
 
 import Foundation
 
-
-
 public struct AdditionalPropertiesAnyType: Codable {
 
     public var name: String?
@@ -16,7 +14,7 @@ public struct AdditionalPropertiesAnyType: Codable {
     public init(name: String?) {
         self.name = name
     }
-    public var additionalProperties: [String:Any] = [:]
+    public var additionalProperties: [String: Any] = [:]
 
     public subscript(key: String) -> Any? {
         get {
@@ -52,7 +50,4 @@ public struct AdditionalPropertiesAnyType: Codable {
         additionalProperties = try container.decodeMap(Any.self, excludedKeys: nonAdditionalPropertyKeys)
     }
 
-
-
 }
-
diff --git a/samples/client/petstore/swift4/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/AdditionalPropertiesArray.swift b/samples/client/petstore/swift4/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/AdditionalPropertiesArray.swift
index 5e58839b5a..cde9824ddb 100644
--- a/samples/client/petstore/swift4/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/AdditionalPropertiesArray.swift
+++ b/samples/client/petstore/swift4/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/AdditionalPropertiesArray.swift
@@ -7,8 +7,6 @@
 
 import Foundation
 
-
-
 public struct AdditionalPropertiesArray: Codable {
 
     public var name: String?
@@ -16,7 +14,7 @@ public struct AdditionalPropertiesArray: Codable {
     public init(name: String?) {
         self.name = name
     }
-    public var additionalProperties: [String:Array] = [:]
+    public var additionalProperties: [String: Array] = [:]
 
     public subscript(key: String) -> Array? {
         get {
@@ -52,7 +50,4 @@ public struct AdditionalPropertiesArray: Codable {
         additionalProperties = try container.decodeMap(Array.self, excludedKeys: nonAdditionalPropertyKeys)
     }
 
-
-
 }
-
diff --git a/samples/client/petstore/swift4/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/AdditionalPropertiesBoolean.swift b/samples/client/petstore/swift4/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/AdditionalPropertiesBoolean.swift
index d4c90829b4..76791a9ddd 100644
--- a/samples/client/petstore/swift4/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/AdditionalPropertiesBoolean.swift
+++ b/samples/client/petstore/swift4/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/AdditionalPropertiesBoolean.swift
@@ -7,8 +7,6 @@
 
 import Foundation
 
-
-
 public struct AdditionalPropertiesBoolean: Codable {
 
     public var name: String?
@@ -16,7 +14,7 @@ public struct AdditionalPropertiesBoolean: Codable {
     public init(name: String?) {
         self.name = name
     }
-    public var additionalProperties: [String:Bool] = [:]
+    public var additionalProperties: [String: Bool] = [:]
 
     public subscript(key: String) -> Bool? {
         get {
@@ -52,7 +50,4 @@ public struct AdditionalPropertiesBoolean: Codable {
         additionalProperties = try container.decodeMap(Bool.self, excludedKeys: nonAdditionalPropertyKeys)
     }
 
-
-
 }
-
diff --git a/samples/client/petstore/swift4/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/AdditionalPropertiesClass.swift b/samples/client/petstore/swift4/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/AdditionalPropertiesClass.swift
index 0e2263b14e..a4e11337fb 100644
--- a/samples/client/petstore/swift4/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/AdditionalPropertiesClass.swift
+++ b/samples/client/petstore/swift4/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/AdditionalPropertiesClass.swift
@@ -7,23 +7,21 @@
 
 import Foundation
 
-
-
 public struct AdditionalPropertiesClass: Codable {
 
-    public var mapString: [String:String]?
-    public var mapNumber: [String:Double]?
-    public var mapInteger: [String:Int]?
-    public var mapBoolean: [String:Bool]?
-    public var mapArrayInteger: [String:[Int]]?
-    public var mapArrayAnytype: [String:[Any]]?
-    public var mapMapString: [String:[String:String]]?
-    public var mapMapAnytype: [String:[String:Any]]?
+    public var mapString: [String: String]?
+    public var mapNumber: [String: Double]?
+    public var mapInteger: [String: Int]?
+    public var mapBoolean: [String: Bool]?
+    public var mapArrayInteger: [String: [Int]]?
+    public var mapArrayAnytype: [String: [Any]]?
+    public var mapMapString: [String: [String: String]]?
+    public var mapMapAnytype: [String: [String: Any]]?
     public var anytype1: Any?
     public var anytype2: Any?
     public var anytype3: Any?
 
-    public init(mapString: [String:String]?, mapNumber: [String:Double]?, mapInteger: [String:Int]?, mapBoolean: [String:Bool]?, mapArrayInteger: [String:[Int]]?, mapArrayAnytype: [String:[Any]]?, mapMapString: [String:[String:String]]?, mapMapAnytype: [String:[String:Any]]?, anytype1: Any?, anytype2: Any?, anytype3: Any?) {
+    public init(mapString: [String: String]?, mapNumber: [String: Double]?, mapInteger: [String: Int]?, mapBoolean: [String: Bool]?, mapArrayInteger: [String: [Int]]?, mapArrayAnytype: [String: [Any]]?, mapMapString: [String: [String: String]]?, mapMapAnytype: [String: [String: Any]]?, anytype1: Any?, anytype2: Any?, anytype3: Any?) {
         self.mapString = mapString
         self.mapNumber = mapNumber
         self.mapInteger = mapInteger
@@ -37,7 +35,7 @@ public struct AdditionalPropertiesClass: Codable {
         self.anytype3 = anytype3
     }
 
-    public enum CodingKeys: String, CodingKey { 
+    public enum CodingKeys: String, CodingKey {
         case mapString = "map_string"
         case mapNumber = "map_number"
         case mapInteger = "map_integer"
@@ -51,6 +49,4 @@ public struct AdditionalPropertiesClass: Codable {
         case anytype3 = "anytype_3"
     }
 
-
 }
-
diff --git a/samples/client/petstore/swift4/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/AdditionalPropertiesInteger.swift b/samples/client/petstore/swift4/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/AdditionalPropertiesInteger.swift
index b03bbe4456..4a0f2acaa4 100644
--- a/samples/client/petstore/swift4/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/AdditionalPropertiesInteger.swift
+++ b/samples/client/petstore/swift4/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/AdditionalPropertiesInteger.swift
@@ -7,8 +7,6 @@
 
 import Foundation
 
-
-
 public struct AdditionalPropertiesInteger: Codable {
 
     public var name: String?
@@ -16,7 +14,7 @@ public struct AdditionalPropertiesInteger: Codable {
     public init(name: String?) {
         self.name = name
     }
-    public var additionalProperties: [String:Int] = [:]
+    public var additionalProperties: [String: Int] = [:]
 
     public subscript(key: String) -> Int? {
         get {
@@ -52,7 +50,4 @@ public struct AdditionalPropertiesInteger: Codable {
         additionalProperties = try container.decodeMap(Int.self, excludedKeys: nonAdditionalPropertyKeys)
     }
 
-
-
 }
-
diff --git a/samples/client/petstore/swift4/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/AdditionalPropertiesNumber.swift b/samples/client/petstore/swift4/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/AdditionalPropertiesNumber.swift
index 9701d54c9b..95e491000a 100644
--- a/samples/client/petstore/swift4/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/AdditionalPropertiesNumber.swift
+++ b/samples/client/petstore/swift4/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/AdditionalPropertiesNumber.swift
@@ -7,8 +7,6 @@
 
 import Foundation
 
-
-
 public struct AdditionalPropertiesNumber: Codable {
 
     public var name: String?
@@ -16,7 +14,7 @@ public struct AdditionalPropertiesNumber: Codable {
     public init(name: String?) {
         self.name = name
     }
-    public var additionalProperties: [String:Double] = [:]
+    public var additionalProperties: [String: Double] = [:]
 
     public subscript(key: String) -> Double? {
         get {
@@ -52,7 +50,4 @@ public struct AdditionalPropertiesNumber: Codable {
         additionalProperties = try container.decodeMap(Double.self, excludedKeys: nonAdditionalPropertyKeys)
     }
 
-
-
 }
-
diff --git a/samples/client/petstore/swift4/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/AdditionalPropertiesObject.swift b/samples/client/petstore/swift4/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/AdditionalPropertiesObject.swift
index c6e1e670b8..f45888a410 100644
--- a/samples/client/petstore/swift4/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/AdditionalPropertiesObject.swift
+++ b/samples/client/petstore/swift4/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/AdditionalPropertiesObject.swift
@@ -7,8 +7,6 @@
 
 import Foundation
 
-
-
 public struct AdditionalPropertiesObject: Codable {
 
     public var name: String?
@@ -16,7 +14,7 @@ public struct AdditionalPropertiesObject: Codable {
     public init(name: String?) {
         self.name = name
     }
-    public var additionalProperties: [String:Dictionary] = [:]
+    public var additionalProperties: [String: Dictionary] = [:]
 
     public subscript(key: String) -> Dictionary? {
         get {
@@ -52,7 +50,4 @@ public struct AdditionalPropertiesObject: Codable {
         additionalProperties = try container.decodeMap(Dictionary.self, excludedKeys: nonAdditionalPropertyKeys)
     }
 
-
-
 }
-
diff --git a/samples/client/petstore/swift4/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/AdditionalPropertiesString.swift b/samples/client/petstore/swift4/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/AdditionalPropertiesString.swift
index 6128dce7d4..7af63cc715 100644
--- a/samples/client/petstore/swift4/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/AdditionalPropertiesString.swift
+++ b/samples/client/petstore/swift4/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/AdditionalPropertiesString.swift
@@ -7,8 +7,6 @@
 
 import Foundation
 
-
-
 public struct AdditionalPropertiesString: Codable {
 
     public var name: String?
@@ -16,7 +14,7 @@ public struct AdditionalPropertiesString: Codable {
     public init(name: String?) {
         self.name = name
     }
-    public var additionalProperties: [String:String] = [:]
+    public var additionalProperties: [String: String] = [:]
 
     public subscript(key: String) -> String? {
         get {
@@ -52,7 +50,4 @@ public struct AdditionalPropertiesString: Codable {
         additionalProperties = try container.decodeMap(String.self, excludedKeys: nonAdditionalPropertyKeys)
     }
 
-
-
 }
-
diff --git a/samples/client/petstore/swift4/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/Animal.swift b/samples/client/petstore/swift4/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/Animal.swift
index 7221a1be09..5ed9f31e2a 100644
--- a/samples/client/petstore/swift4/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/Animal.swift
+++ b/samples/client/petstore/swift4/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/Animal.swift
@@ -7,8 +7,6 @@
 
 import Foundation
 
-
-
 public struct Animal: Codable {
 
     public var className: String
@@ -19,6 +17,4 @@ public struct Animal: Codable {
         self.color = color
     }
 
-
 }
-
diff --git a/samples/client/petstore/swift4/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/AnimalFarm.swift b/samples/client/petstore/swift4/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/AnimalFarm.swift
index e7bea63f8e..e09b0e9efd 100644
--- a/samples/client/petstore/swift4/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/AnimalFarm.swift
+++ b/samples/client/petstore/swift4/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/AnimalFarm.swift
@@ -7,5 +7,4 @@
 
 import Foundation
 
-
 public typealias AnimalFarm = [Animal]
diff --git a/samples/client/petstore/swift4/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/ApiResponse.swift b/samples/client/petstore/swift4/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/ApiResponse.swift
index a22e9aaebb..ec270da890 100644
--- a/samples/client/petstore/swift4/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/ApiResponse.swift
+++ b/samples/client/petstore/swift4/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/ApiResponse.swift
@@ -7,8 +7,6 @@
 
 import Foundation
 
-
-
 public struct ApiResponse: Codable {
 
     public var code: Int?
@@ -21,6 +19,4 @@ public struct ApiResponse: Codable {
         self.message = message
     }
 
-
 }
-
diff --git a/samples/client/petstore/swift4/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/ArrayOfArrayOfNumberOnly.swift b/samples/client/petstore/swift4/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/ArrayOfArrayOfNumberOnly.swift
index 4e5a5ca144..3843287630 100644
--- a/samples/client/petstore/swift4/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/ArrayOfArrayOfNumberOnly.swift
+++ b/samples/client/petstore/swift4/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/ArrayOfArrayOfNumberOnly.swift
@@ -7,8 +7,6 @@
 
 import Foundation
 
-
-
 public struct ArrayOfArrayOfNumberOnly: Codable {
 
     public var arrayArrayNumber: [[Double]]?
@@ -17,10 +15,8 @@ public struct ArrayOfArrayOfNumberOnly: Codable {
         self.arrayArrayNumber = arrayArrayNumber
     }
 
-    public enum CodingKeys: String, CodingKey { 
+    public enum CodingKeys: String, CodingKey {
         case arrayArrayNumber = "ArrayArrayNumber"
     }
 
-
 }
-
diff --git a/samples/client/petstore/swift4/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/ArrayOfNumberOnly.swift b/samples/client/petstore/swift4/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/ArrayOfNumberOnly.swift
index 7d059d3683..f8b198e81f 100644
--- a/samples/client/petstore/swift4/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/ArrayOfNumberOnly.swift
+++ b/samples/client/petstore/swift4/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/ArrayOfNumberOnly.swift
@@ -7,8 +7,6 @@
 
 import Foundation
 
-
-
 public struct ArrayOfNumberOnly: Codable {
 
     public var arrayNumber: [Double]?
@@ -17,10 +15,8 @@ public struct ArrayOfNumberOnly: Codable {
         self.arrayNumber = arrayNumber
     }
 
-    public enum CodingKeys: String, CodingKey { 
+    public enum CodingKeys: String, CodingKey {
         case arrayNumber = "ArrayNumber"
     }
 
-
 }
-
diff --git a/samples/client/petstore/swift4/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/ArrayTest.swift b/samples/client/petstore/swift4/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/ArrayTest.swift
index 9c56fed50c..67f7f7e515 100644
--- a/samples/client/petstore/swift4/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/ArrayTest.swift
+++ b/samples/client/petstore/swift4/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/ArrayTest.swift
@@ -7,8 +7,6 @@
 
 import Foundation
 
-
-
 public struct ArrayTest: Codable {
 
     public var arrayOfString: [String]?
@@ -21,12 +19,10 @@ public struct ArrayTest: Codable {
         self.arrayArrayOfModel = arrayArrayOfModel
     }
 
-    public enum CodingKeys: String, CodingKey { 
+    public enum CodingKeys: String, CodingKey {
         case arrayOfString = "array_of_string"
         case arrayArrayOfInteger = "array_array_of_integer"
         case arrayArrayOfModel = "array_array_of_model"
     }
 
-
 }
-
diff --git a/samples/client/petstore/swift4/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/Capitalization.swift b/samples/client/petstore/swift4/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/Capitalization.swift
index 98cda23dac..d576b50b1c 100644
--- a/samples/client/petstore/swift4/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/Capitalization.swift
+++ b/samples/client/petstore/swift4/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/Capitalization.swift
@@ -7,8 +7,6 @@
 
 import Foundation
 
-
-
 public struct Capitalization: Codable {
 
     public var smallCamel: String?
@@ -28,7 +26,7 @@ public struct Capitalization: Codable {
         self.ATT_NAME = ATT_NAME
     }
 
-    public enum CodingKeys: String, CodingKey { 
+    public enum CodingKeys: String, CodingKey {
         case smallCamel
         case capitalCamel = "CapitalCamel"
         case smallSnake = "small_Snake"
@@ -37,6 +35,4 @@ public struct Capitalization: Codable {
         case ATT_NAME
     }
 
-
 }
-
diff --git a/samples/client/petstore/swift4/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/Cat.swift b/samples/client/petstore/swift4/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/Cat.swift
index 5675a05350..7d819cbcc8 100644
--- a/samples/client/petstore/swift4/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/Cat.swift
+++ b/samples/client/petstore/swift4/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/Cat.swift
@@ -7,8 +7,6 @@
 
 import Foundation
 
-
-
 public struct Cat: Codable {
 
     public var className: String
@@ -26,6 +24,4 @@ public struct Cat: Codable {
         self.declawed = declawed
     }
 
-
 }
-
diff --git a/samples/client/petstore/swift4/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/CatAllOf.swift b/samples/client/petstore/swift4/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/CatAllOf.swift
new file mode 100644
index 0000000000..a51ad0dffa
--- /dev/null
+++ b/samples/client/petstore/swift4/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/CatAllOf.swift
@@ -0,0 +1,18 @@
+//
+// CatAllOf.swift
+//
+// Generated by openapi-generator
+// https://openapi-generator.tech
+//
+
+import Foundation
+
+public struct CatAllOf: Codable {
+
+    public var declawed: Bool?
+
+    public init(declawed: Bool?) {
+        self.declawed = declawed
+    }
+
+}
diff --git a/samples/client/petstore/swift4/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/Category.swift b/samples/client/petstore/swift4/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/Category.swift
index afdc89b6dd..abcd82b078 100644
--- a/samples/client/petstore/swift4/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/Category.swift
+++ b/samples/client/petstore/swift4/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/Category.swift
@@ -7,8 +7,6 @@
 
 import Foundation
 
-
-
 public struct Category: Codable {
 
     public var _id: Int64?
@@ -19,11 +17,9 @@ public struct Category: Codable {
         self.name = name
     }
 
-    public enum CodingKeys: String, CodingKey { 
+    public enum CodingKeys: String, CodingKey {
         case _id = "id"
         case name
     }
 
-
 }
-
diff --git a/samples/client/petstore/swift4/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/ClassModel.swift b/samples/client/petstore/swift4/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/ClassModel.swift
index f673ed127c..28cb30ce7b 100644
--- a/samples/client/petstore/swift4/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/ClassModel.swift
+++ b/samples/client/petstore/swift4/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/ClassModel.swift
@@ -7,7 +7,6 @@
 
 import Foundation
 
-
 /** Model for testing model with \&quot;_class\&quot; property */
 
 public struct ClassModel: Codable {
@@ -18,6 +17,4 @@ public struct ClassModel: Codable {
         self._class = _class
     }
 
-
 }
-
diff --git a/samples/client/petstore/swift4/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/Client.swift b/samples/client/petstore/swift4/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/Client.swift
index 51390b6c4e..00245ca372 100644
--- a/samples/client/petstore/swift4/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/Client.swift
+++ b/samples/client/petstore/swift4/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/Client.swift
@@ -7,8 +7,6 @@
 
 import Foundation
 
-
-
 public struct Client: Codable {
 
     public var client: String?
@@ -17,6 +15,4 @@ public struct Client: Codable {
         self.client = client
     }
 
-
 }
-
diff --git a/samples/client/petstore/swift4/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/Dog.swift b/samples/client/petstore/swift4/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/Dog.swift
index 239ce74dcc..492c122800 100644
--- a/samples/client/petstore/swift4/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/Dog.swift
+++ b/samples/client/petstore/swift4/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/Dog.swift
@@ -7,8 +7,6 @@
 
 import Foundation
 
-
-
 public struct Dog: Codable {
 
     public var className: String
@@ -21,6 +19,4 @@ public struct Dog: Codable {
         self.breed = breed
     }
 
-
 }
-
diff --git a/samples/client/petstore/swift4/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/DogAllOf.swift b/samples/client/petstore/swift4/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/DogAllOf.swift
new file mode 100644
index 0000000000..7786f8acc5
--- /dev/null
+++ b/samples/client/petstore/swift4/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/DogAllOf.swift
@@ -0,0 +1,18 @@
+//
+// DogAllOf.swift
+//
+// Generated by openapi-generator
+// https://openapi-generator.tech
+//
+
+import Foundation
+
+public struct DogAllOf: Codable {
+
+    public var breed: String?
+
+    public init(breed: String?) {
+        self.breed = breed
+    }
+
+}
diff --git a/samples/client/petstore/swift4/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/EnumArrays.swift b/samples/client/petstore/swift4/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/EnumArrays.swift
index 8713961520..5034ff0b8c 100644
--- a/samples/client/petstore/swift4/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/EnumArrays.swift
+++ b/samples/client/petstore/swift4/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/EnumArrays.swift
@@ -7,8 +7,6 @@
 
 import Foundation
 
-
-
 public struct EnumArrays: Codable {
 
     public enum JustSymbol: String, Codable {
@@ -27,11 +25,9 @@ public struct EnumArrays: Codable {
         self.arrayEnum = arrayEnum
     }
 
-    public enum CodingKeys: String, CodingKey { 
+    public enum CodingKeys: String, CodingKey {
         case justSymbol = "just_symbol"
         case arrayEnum = "array_enum"
     }
 
-
 }
-
diff --git a/samples/client/petstore/swift4/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/EnumClass.swift b/samples/client/petstore/swift4/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/EnumClass.swift
index 7280a621fe..3c1dfcac57 100644
--- a/samples/client/petstore/swift4/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/EnumClass.swift
+++ b/samples/client/petstore/swift4/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/EnumClass.swift
@@ -7,7 +7,6 @@
 
 import Foundation
 
-
 public enum EnumClass: String, Codable {
     case abc = "_abc"
     case efg = "-efg"
diff --git a/samples/client/petstore/swift4/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/EnumTest.swift b/samples/client/petstore/swift4/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/EnumTest.swift
index 0f546c76a2..6db9b34d18 100644
--- a/samples/client/petstore/swift4/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/EnumTest.swift
+++ b/samples/client/petstore/swift4/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/EnumTest.swift
@@ -7,8 +7,6 @@
 
 import Foundation
 
-
-
 public struct EnumTest: Codable {
 
     public enum EnumString: String, Codable {
@@ -43,7 +41,7 @@ public struct EnumTest: Codable {
         self.outerEnum = outerEnum
     }
 
-    public enum CodingKeys: String, CodingKey { 
+    public enum CodingKeys: String, CodingKey {
         case enumString = "enum_string"
         case enumStringRequired = "enum_string_required"
         case enumInteger = "enum_integer"
@@ -51,6 +49,4 @@ public struct EnumTest: Codable {
         case outerEnum
     }
 
-
 }
-
diff --git a/samples/client/petstore/swift4/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/File.swift b/samples/client/petstore/swift4/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/File.swift
index c8bd1f1958..ea3520f053 100644
--- a/samples/client/petstore/swift4/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/File.swift
+++ b/samples/client/petstore/swift4/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/File.swift
@@ -7,7 +7,6 @@
 
 import Foundation
 
-
 /** Must be named &#x60;File&#x60; for test. */
 
 public struct File: Codable {
@@ -19,6 +18,4 @@ public struct File: Codable {
         self.sourceURI = sourceURI
     }
 
-
 }
-
diff --git a/samples/client/petstore/swift4/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/FileSchemaTestClass.swift b/samples/client/petstore/swift4/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/FileSchemaTestClass.swift
index 64d0250680..532f145793 100644
--- a/samples/client/petstore/swift4/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/FileSchemaTestClass.swift
+++ b/samples/client/petstore/swift4/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/FileSchemaTestClass.swift
@@ -7,8 +7,6 @@
 
 import Foundation
 
-
-
 public struct FileSchemaTestClass: Codable {
 
     public var file: File?
@@ -19,6 +17,4 @@ public struct FileSchemaTestClass: Codable {
         self.files = files
     }
 
-
 }
-
diff --git a/samples/client/petstore/swift4/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/FormatTest.swift b/samples/client/petstore/swift4/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/FormatTest.swift
index faa091b065..20bd6d103b 100644
--- a/samples/client/petstore/swift4/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/FormatTest.swift
+++ b/samples/client/petstore/swift4/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/FormatTest.swift
@@ -7,8 +7,6 @@
 
 import Foundation
 
-
-
 public struct FormatTest: Codable {
 
     public var integer: Int?
@@ -41,6 +39,4 @@ public struct FormatTest: Codable {
         self.password = password
     }
 
-
 }
-
diff --git a/samples/client/petstore/swift4/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/HasOnlyReadOnly.swift b/samples/client/petstore/swift4/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/HasOnlyReadOnly.swift
index 554aee1081..906ddb06fb 100644
--- a/samples/client/petstore/swift4/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/HasOnlyReadOnly.swift
+++ b/samples/client/petstore/swift4/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/HasOnlyReadOnly.swift
@@ -7,8 +7,6 @@
 
 import Foundation
 
-
-
 public struct HasOnlyReadOnly: Codable {
 
     public var bar: String?
@@ -19,6 +17,4 @@ public struct HasOnlyReadOnly: Codable {
         self.foo = foo
     }
 
-
 }
-
diff --git a/samples/client/petstore/swift4/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/List.swift b/samples/client/petstore/swift4/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/List.swift
index 8997340ff4..08d5995387 100644
--- a/samples/client/petstore/swift4/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/List.swift
+++ b/samples/client/petstore/swift4/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/List.swift
@@ -7,8 +7,6 @@
 
 import Foundation
 
-
-
 public struct List: Codable {
 
     public var _123list: String?
@@ -17,10 +15,8 @@ public struct List: Codable {
         self._123list = _123list
     }
 
-    public enum CodingKeys: String, CodingKey { 
+    public enum CodingKeys: String, CodingKey {
         case _123list = "123-list"
     }
 
-
 }
-
diff --git a/samples/client/petstore/swift4/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/MapTest.swift b/samples/client/petstore/swift4/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/MapTest.swift
index 392c1e4438..358ca7a58d 100644
--- a/samples/client/petstore/swift4/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/MapTest.swift
+++ b/samples/client/petstore/swift4/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/MapTest.swift
@@ -7,33 +7,29 @@
 
 import Foundation
 
-
-
 public struct MapTest: Codable {
 
     public enum MapOfEnumString: String, Codable {
         case upper = "UPPER"
         case lower = "lower"
     }
-    public var mapMapOfString: [String:[String:String]]?
-    public var mapOfEnumString: [String:String]?
-    public var directMap: [String:Bool]?
-    public var indirectMap: [String:Bool]?
+    public var mapMapOfString: [String: [String: String]]?
+    public var mapOfEnumString: [String: String]?
+    public var directMap: [String: Bool]?
+    public var indirectMap: [String: Bool]?
 
-    public init(mapMapOfString: [String:[String:String]]?, mapOfEnumString: [String:String]?, directMap: [String:Bool]?, indirectMap: [String:Bool]?) {
+    public init(mapMapOfString: [String: [String: String]]?, mapOfEnumString: [String: String]?, directMap: [String: Bool]?, indirectMap: [String: Bool]?) {
         self.mapMapOfString = mapMapOfString
         self.mapOfEnumString = mapOfEnumString
         self.directMap = directMap
         self.indirectMap = indirectMap
     }
 
-    public enum CodingKeys: String, CodingKey { 
+    public enum CodingKeys: String, CodingKey {
         case mapMapOfString = "map_map_of_string"
         case mapOfEnumString = "map_of_enum_string"
         case directMap = "direct_map"
         case indirectMap = "indirect_map"
     }
 
-
 }
-
diff --git a/samples/client/petstore/swift4/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/MixedPropertiesAndAdditionalPropertiesClass.swift b/samples/client/petstore/swift4/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/MixedPropertiesAndAdditionalPropertiesClass.swift
index 7116108fd7..c3deb2f289 100644
--- a/samples/client/petstore/swift4/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/MixedPropertiesAndAdditionalPropertiesClass.swift
+++ b/samples/client/petstore/swift4/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/MixedPropertiesAndAdditionalPropertiesClass.swift
@@ -7,20 +7,16 @@
 
 import Foundation
 
-
-
 public struct MixedPropertiesAndAdditionalPropertiesClass: Codable {
 
     public var uuid: UUID?
     public var dateTime: Date?
-    public var map: [String:Animal]?
+    public var map: [String: Animal]?
 
-    public init(uuid: UUID?, dateTime: Date?, map: [String:Animal]?) {
+    public init(uuid: UUID?, dateTime: Date?, map: [String: Animal]?) {
         self.uuid = uuid
         self.dateTime = dateTime
         self.map = map
     }
 
-
 }
-
diff --git a/samples/client/petstore/swift4/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/Model200Response.swift b/samples/client/petstore/swift4/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/Model200Response.swift
index fc1d0606b7..7ed6aad907 100644
--- a/samples/client/petstore/swift4/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/Model200Response.swift
+++ b/samples/client/petstore/swift4/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/Model200Response.swift
@@ -7,7 +7,6 @@
 
 import Foundation
 
-
 /** Model for testing model name starting with number */
 
 public struct Model200Response: Codable {
@@ -20,11 +19,9 @@ public struct Model200Response: Codable {
         self._class = _class
     }
 
-    public enum CodingKeys: String, CodingKey { 
+    public enum CodingKeys: String, CodingKey {
         case name
         case _class = "class"
     }
 
-
 }
-
diff --git a/samples/client/petstore/swift4/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/Name.swift b/samples/client/petstore/swift4/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/Name.swift
index cc165d767d..ce9ffe4fb3 100644
--- a/samples/client/petstore/swift4/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/Name.swift
+++ b/samples/client/petstore/swift4/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/Name.swift
@@ -7,7 +7,6 @@
 
 import Foundation
 
-
 /** Model for testing model name same as property name */
 
 public struct Name: Codable {
@@ -24,13 +23,11 @@ public struct Name: Codable {
         self._123number = _123number
     }
 
-    public enum CodingKeys: String, CodingKey { 
+    public enum CodingKeys: String, CodingKey {
         case name
         case snakeCase = "snake_case"
         case property
         case _123number = "123Number"
     }
 
-
 }
-
diff --git a/samples/client/petstore/swift4/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/NumberOnly.swift b/samples/client/petstore/swift4/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/NumberOnly.swift
index e6fb206093..abd2269e8e 100644
--- a/samples/client/petstore/swift4/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/NumberOnly.swift
+++ b/samples/client/petstore/swift4/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/NumberOnly.swift
@@ -7,8 +7,6 @@
 
 import Foundation
 
-
-
 public struct NumberOnly: Codable {
 
     public var justNumber: Double?
@@ -17,10 +15,8 @@ public struct NumberOnly: Codable {
         self.justNumber = justNumber
     }
 
-    public enum CodingKeys: String, CodingKey { 
+    public enum CodingKeys: String, CodingKey {
         case justNumber = "JustNumber"
     }
 
-
 }
-
diff --git a/samples/client/petstore/swift4/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/Order.swift b/samples/client/petstore/swift4/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/Order.swift
index 5cad29458b..f2b7565e2d 100644
--- a/samples/client/petstore/swift4/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/Order.swift
+++ b/samples/client/petstore/swift4/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/Order.swift
@@ -7,8 +7,6 @@
 
 import Foundation
 
-
-
 public struct Order: Codable {
 
     public enum Status: String, Codable {
@@ -33,7 +31,7 @@ public struct Order: Codable {
         self.complete = complete
     }
 
-    public enum CodingKeys: String, CodingKey { 
+    public enum CodingKeys: String, CodingKey {
         case _id = "id"
         case petId
         case quantity
@@ -42,6 +40,4 @@ public struct Order: Codable {
         case complete
     }
 
-
 }
-
diff --git a/samples/client/petstore/swift4/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/OuterComposite.swift b/samples/client/petstore/swift4/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/OuterComposite.swift
index edc4523d9f..49aec001c5 100644
--- a/samples/client/petstore/swift4/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/OuterComposite.swift
+++ b/samples/client/petstore/swift4/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/OuterComposite.swift
@@ -7,8 +7,6 @@
 
 import Foundation
 
-
-
 public struct OuterComposite: Codable {
 
     public var myNumber: Double?
@@ -21,12 +19,10 @@ public struct OuterComposite: Codable {
         self.myBoolean = myBoolean
     }
 
-    public enum CodingKeys: String, CodingKey { 
+    public enum CodingKeys: String, CodingKey {
         case myNumber = "my_number"
         case myString = "my_string"
         case myBoolean = "my_boolean"
     }
 
-
 }
-
diff --git a/samples/client/petstore/swift4/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/OuterEnum.swift b/samples/client/petstore/swift4/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/OuterEnum.swift
index bd1643d279..9f80fc95ec 100644
--- a/samples/client/petstore/swift4/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/OuterEnum.swift
+++ b/samples/client/petstore/swift4/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/OuterEnum.swift
@@ -7,7 +7,6 @@
 
 import Foundation
 
-
 public enum OuterEnum: String, Codable {
     case placed = "placed"
     case approved = "approved"
diff --git a/samples/client/petstore/swift4/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/Pet.swift b/samples/client/petstore/swift4/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/Pet.swift
index 3773bf5331..971ce9d4db 100644
--- a/samples/client/petstore/swift4/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/Pet.swift
+++ b/samples/client/petstore/swift4/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/Pet.swift
@@ -7,8 +7,6 @@
 
 import Foundation
 
-
-
 public struct Pet: Codable {
 
     public enum Status: String, Codable {
@@ -33,7 +31,7 @@ public struct Pet: Codable {
         self.status = status
     }
 
-    public enum CodingKeys: String, CodingKey { 
+    public enum CodingKeys: String, CodingKey {
         case _id = "id"
         case category
         case name
@@ -42,6 +40,4 @@ public struct Pet: Codable {
         case status
     }
 
-
 }
-
diff --git a/samples/client/petstore/swift4/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/ReadOnlyFirst.swift b/samples/client/petstore/swift4/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/ReadOnlyFirst.swift
index 48b655a5b0..0acd21fd10 100644
--- a/samples/client/petstore/swift4/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/ReadOnlyFirst.swift
+++ b/samples/client/petstore/swift4/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/ReadOnlyFirst.swift
@@ -7,8 +7,6 @@
 
 import Foundation
 
-
-
 public struct ReadOnlyFirst: Codable {
 
     public var bar: String?
@@ -19,6 +17,4 @@ public struct ReadOnlyFirst: Codable {
         self.baz = baz
     }
 
-
 }
-
diff --git a/samples/client/petstore/swift4/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/Return.swift b/samples/client/petstore/swift4/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/Return.swift
index de4b218999..076082af84 100644
--- a/samples/client/petstore/swift4/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/Return.swift
+++ b/samples/client/petstore/swift4/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/Return.swift
@@ -7,7 +7,6 @@
 
 import Foundation
 
-
 /** Model for testing reserved words */
 
 public struct Return: Codable {
@@ -18,10 +17,8 @@ public struct Return: Codable {
         self._return = _return
     }
 
-    public enum CodingKeys: String, CodingKey { 
+    public enum CodingKeys: String, CodingKey {
         case _return = "return"
     }
 
-
 }
-
diff --git a/samples/client/petstore/swift4/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/SpecialModelName.swift b/samples/client/petstore/swift4/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/SpecialModelName.swift
index 213d896ba9..e79fc45c0e 100644
--- a/samples/client/petstore/swift4/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/SpecialModelName.swift
+++ b/samples/client/petstore/swift4/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/SpecialModelName.swift
@@ -7,8 +7,6 @@
 
 import Foundation
 
-
-
 public struct SpecialModelName: Codable {
 
     public var specialPropertyName: Int64?
@@ -17,10 +15,8 @@ public struct SpecialModelName: Codable {
         self.specialPropertyName = specialPropertyName
     }
 
-    public enum CodingKeys: String, CodingKey { 
+    public enum CodingKeys: String, CodingKey {
         case specialPropertyName = "$special[property.name]"
     }
 
-
 }
-
diff --git a/samples/client/petstore/swift4/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/StringBooleanMap.swift b/samples/client/petstore/swift4/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/StringBooleanMap.swift
index ae15e87d94..3f1237fee4 100644
--- a/samples/client/petstore/swift4/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/StringBooleanMap.swift
+++ b/samples/client/petstore/swift4/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/StringBooleanMap.swift
@@ -7,12 +7,9 @@
 
 import Foundation
 
-
-
 public struct StringBooleanMap: Codable {
 
-
-    public var additionalProperties: [String:Bool] = [:]
+    public var additionalProperties: [String: Bool] = [:]
 
     public subscript(key: String) -> Bool? {
         get {
@@ -45,7 +42,4 @@ public struct StringBooleanMap: Codable {
         additionalProperties = try container.decodeMap(Bool.self, excludedKeys: nonAdditionalPropertyKeys)
     }
 
-
-
 }
-
diff --git a/samples/client/petstore/swift4/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/Tag.swift b/samples/client/petstore/swift4/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/Tag.swift
index 20f50efd3a..83efe72b8a 100644
--- a/samples/client/petstore/swift4/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/Tag.swift
+++ b/samples/client/petstore/swift4/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/Tag.swift
@@ -7,8 +7,6 @@
 
 import Foundation
 
-
-
 public struct Tag: Codable {
 
     public var _id: Int64?
@@ -19,11 +17,9 @@ public struct Tag: Codable {
         self.name = name
     }
 
-    public enum CodingKeys: String, CodingKey { 
+    public enum CodingKeys: String, CodingKey {
         case _id = "id"
         case name
     }
 
-
 }
-
diff --git a/samples/client/petstore/swift4/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/TypeHolderDefault.swift b/samples/client/petstore/swift4/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/TypeHolderDefault.swift
index be1afdf026..bf0006e1a2 100644
--- a/samples/client/petstore/swift4/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/TypeHolderDefault.swift
+++ b/samples/client/petstore/swift4/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/TypeHolderDefault.swift
@@ -7,8 +7,6 @@
 
 import Foundation
 
-
-
 public struct TypeHolderDefault: Codable {
 
     public var stringItem: String = "what"
@@ -25,7 +23,7 @@ public struct TypeHolderDefault: Codable {
         self.arrayItem = arrayItem
     }
 
-    public enum CodingKeys: String, CodingKey { 
+    public enum CodingKeys: String, CodingKey {
         case stringItem = "string_item"
         case numberItem = "number_item"
         case integerItem = "integer_item"
@@ -33,6 +31,4 @@ public struct TypeHolderDefault: Codable {
         case arrayItem = "array_item"
     }
 
-
 }
-
diff --git a/samples/client/petstore/swift4/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/TypeHolderExample.swift b/samples/client/petstore/swift4/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/TypeHolderExample.swift
index f46c8952e1..602a2a6d18 100644
--- a/samples/client/petstore/swift4/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/TypeHolderExample.swift
+++ b/samples/client/petstore/swift4/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/TypeHolderExample.swift
@@ -7,8 +7,6 @@
 
 import Foundation
 
-
-
 public struct TypeHolderExample: Codable {
 
     public var stringItem: String
@@ -25,7 +23,7 @@ public struct TypeHolderExample: Codable {
         self.arrayItem = arrayItem
     }
 
-    public enum CodingKeys: String, CodingKey { 
+    public enum CodingKeys: String, CodingKey {
         case stringItem = "string_item"
         case numberItem = "number_item"
         case integerItem = "integer_item"
@@ -33,6 +31,4 @@ public struct TypeHolderExample: Codable {
         case arrayItem = "array_item"
     }
 
-
 }
-
diff --git a/samples/client/petstore/swift4/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/User.swift b/samples/client/petstore/swift4/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/User.swift
index d9c564d2a1..7d6b24b9e1 100644
--- a/samples/client/petstore/swift4/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/User.swift
+++ b/samples/client/petstore/swift4/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/User.swift
@@ -7,8 +7,6 @@
 
 import Foundation
 
-
-
 public struct User: Codable {
 
     public var _id: Int64?
@@ -32,7 +30,7 @@ public struct User: Codable {
         self.userStatus = userStatus
     }
 
-    public enum CodingKeys: String, CodingKey { 
+    public enum CodingKeys: String, CodingKey {
         case _id = "id"
         case username
         case firstName
@@ -43,6 +41,4 @@ public struct User: Codable {
         case userStatus
     }
 
-
 }
-
diff --git a/samples/client/petstore/swift4/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/XmlItem.swift b/samples/client/petstore/swift4/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/XmlItem.swift
index e1b1ace8b1..aa01668350 100644
--- a/samples/client/petstore/swift4/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/XmlItem.swift
+++ b/samples/client/petstore/swift4/objcCompatible/PetstoreClient/Classes/OpenAPIs/Models/XmlItem.swift
@@ -7,8 +7,6 @@
 
 import Foundation
 
-
-
 public struct XmlItem: Codable {
 
     public var attributeString: String?
@@ -73,7 +71,7 @@ public struct XmlItem: Codable {
         self.prefixNsWrappedArray = prefixNsWrappedArray
     }
 
-    public enum CodingKeys: String, CodingKey { 
+    public enum CodingKeys: String, CodingKey {
         case attributeString = "attribute_string"
         case attributeNumber = "attribute_number"
         case attributeInteger = "attribute_integer"
@@ -105,6 +103,4 @@ public struct XmlItem: Codable {
         case prefixNsWrappedArray = "prefix_ns_wrapped_array"
     }
 
-
 }
-
diff --git a/samples/client/petstore/swift4/objcCompatible/README.md b/samples/client/petstore/swift4/objcCompatible/README.md
index ac131d8fcd..8c1afe63fc 100644
--- a/samples/client/petstore/swift4/objcCompatible/README.md
+++ b/samples/client/petstore/swift4/objcCompatible/README.md
@@ -80,10 +80,12 @@ Class | Method | HTTP request | Description
  - [ArrayTest](docs/ArrayTest.md)
  - [Capitalization](docs/Capitalization.md)
  - [Cat](docs/Cat.md)
+ - [CatAllOf](docs/CatAllOf.md)
  - [Category](docs/Category.md)
  - [ClassModel](docs/ClassModel.md)
  - [Client](docs/Client.md)
  - [Dog](docs/Dog.md)
+ - [DogAllOf](docs/DogAllOf.md)
  - [EnumArrays](docs/EnumArrays.md)
  - [EnumClass](docs/EnumClass.md)
  - [EnumTest](docs/EnumTest.md)
diff --git a/samples/client/petstore/swift4/objcCompatible/docs/CatAllOf.md b/samples/client/petstore/swift4/objcCompatible/docs/CatAllOf.md
new file mode 100644
index 0000000000..79789be61c
--- /dev/null
+++ b/samples/client/petstore/swift4/objcCompatible/docs/CatAllOf.md
@@ -0,0 +1,10 @@
+# CatAllOf
+
+## Properties
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**declawed** | **Bool** |  | [optional] 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
+
diff --git a/samples/client/petstore/swift4/objcCompatible/docs/DogAllOf.md b/samples/client/petstore/swift4/objcCompatible/docs/DogAllOf.md
new file mode 100644
index 0000000000..9302ef52e9
--- /dev/null
+++ b/samples/client/petstore/swift4/objcCompatible/docs/DogAllOf.md
@@ -0,0 +1,10 @@
+# DogAllOf
+
+## Properties
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**breed** | **String** |  | [optional] 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
+
diff --git a/samples/client/petstore/swift4/objcCompatible/docs/UserAPI.md b/samples/client/petstore/swift4/objcCompatible/docs/UserAPI.md
index 6a8e9dd372..18e233420a 100644
--- a/samples/client/petstore/swift4/objcCompatible/docs/UserAPI.md
+++ b/samples/client/petstore/swift4/objcCompatible/docs/UserAPI.md
@@ -95,7 +95,7 @@ UserAPI.createUsersWithArrayInput(body: body) { (response, error) in
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **body** | [**[User]**](Array.md) | List of user object | 
+ **body** | [**[User]**](User.md) | List of user object | 
 
 ### Return type
 
@@ -143,7 +143,7 @@ UserAPI.createUsersWithListInput(body: body) { (response, error) in
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **body** | [**[User]**](Array.md) | List of user object | 
+ **body** | [**[User]**](User.md) | List of user object | 
 
 ### Return type
 
diff --git a/samples/client/petstore/swift4/objcCompatible/project.yml b/samples/client/petstore/swift4/objcCompatible/project.yml
new file mode 100644
index 0000000000..148b42517b
--- /dev/null
+++ b/samples/client/petstore/swift4/objcCompatible/project.yml
@@ -0,0 +1,15 @@
+name: PetstoreClient
+targets:
+  PetstoreClient:
+    type: framework
+    platform: iOS
+    deploymentTarget: "10.0"
+    sources: [PetstoreClient]
+    info:
+      path: ./Info.plist
+      version: 1.0.0
+    settings:
+      APPLICATION_EXTENSION_API_ONLY: true
+    scheme: {}
+    dependencies:
+    - carthage: Alamofire
diff --git a/samples/client/petstore/swift4/promisekit/.openapi-generator/VERSION b/samples/client/petstore/swift4/promisekit/.openapi-generator/VERSION
index afa6365606..83a328a922 100644
--- a/samples/client/petstore/swift4/promisekit/.openapi-generator/VERSION
+++ b/samples/client/petstore/swift4/promisekit/.openapi-generator/VERSION
@@ -1 +1 @@
-4.0.0-SNAPSHOT
\ No newline at end of file
+4.1.0-SNAPSHOT
\ No newline at end of file
diff --git a/samples/client/petstore/swift4/promisekit/Info.plist b/samples/client/petstore/swift4/promisekit/Info.plist
new file mode 100644
index 0000000000..323e5ecfc4
--- /dev/null
+++ b/samples/client/petstore/swift4/promisekit/Info.plist
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>CFBundleDevelopmentRegion</key>
+	<string>$(DEVELOPMENT_LANGUAGE)</string>
+	<key>CFBundleExecutable</key>
+	<string>$(EXECUTABLE_NAME)</string>
+	<key>CFBundleIdentifier</key>
+	<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
+	<key>CFBundleInfoDictionaryVersion</key>
+	<string>6.0</string>
+	<key>CFBundleName</key>
+	<string>$(PRODUCT_NAME)</string>
+	<key>CFBundlePackageType</key>
+	<string>FMWK</string>
+	<key>CFBundleShortVersionString</key>
+	<string>1.0</string>
+	<key>CFBundleVersion</key>
+	<string>1</string>
+</dict>
+</plist>
diff --git a/samples/client/petstore/swift4/promisekit/PetstoreClient.xcodeproj/project.pbxproj b/samples/client/petstore/swift4/promisekit/PetstoreClient.xcodeproj/project.pbxproj
new file mode 100644
index 0000000000..89e8b9f238
--- /dev/null
+++ b/samples/client/petstore/swift4/promisekit/PetstoreClient.xcodeproj/project.pbxproj
@@ -0,0 +1,577 @@
+// !$*UTF8*$!
+{
+	archiveVersion = 1;
+	classes = {
+	};
+	objectVersion = 50;
+	objects = {
+
+/* Begin PBXBuildFile section */
+		02903CEC38DC202565BC08CB040AC4E9 /* Animal.swift in Sources */ = {isa = PBXBuildFile; fileRef = 95568E7C35F119EB4A12B4982B3FB31F /* Animal.swift */; };
+		0462F801432CF94C7EF51D0532737A7E /* APIs.swift in Sources */ = {isa = PBXBuildFile; fileRef = 37DF825B8F3BADA2B2537D17CDC48633 /* APIs.swift */; };
+		08D87E4FECF24910F0DA0F1D2E2D955A /* EnumTest.swift in Sources */ = {isa = PBXBuildFile; fileRef = FD60AEA646791E0EDE885DE1E680A687 /* EnumTest.swift */; };
+		1143FFF06DEE01E5B0F1368AA05BE1B4 /* OuterEnum.swift in Sources */ = {isa = PBXBuildFile; fileRef = C15008AABC804EB6FB4CDAC6B871E6B0 /* OuterEnum.swift */; };
+		122BBAE8245606CC040EEB6B9254E376 /* StoreAPI.swift in Sources */ = {isa = PBXBuildFile; fileRef = A53274D99BBDE1B79BF3521CD7CBC276 /* StoreAPI.swift */; };
+		12327BF7304AA897C5D2A1250B1659B7 /* AdditionalPropertiesClass.swift in Sources */ = {isa = PBXBuildFile; fileRef = 396DEF3156BA0D12D0FC5C3C3AAF52C4 /* AdditionalPropertiesClass.swift */; };
+		12BB95C66D63090732BB9E0379836E3C /* JSONEncodingHelper.swift in Sources */ = {isa = PBXBuildFile; fileRef = 35D710108A69DD8A5297F926A66DA21F /* JSONEncodingHelper.swift */; };
+		16E9A5E22B4823DE282E7F4C18A21EA8 /* JSONEncodableEncoding.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9791B840B8D6EAA35343B00FA277963A /* JSONEncodableEncoding.swift */; };
+		18F19872A0DFB4CC3D9C696BBCA64EFD /* Cat.swift in Sources */ = {isa = PBXBuildFile; fileRef = 212AA914B7F1793A4E32C119370FB05F /* Cat.swift */; };
+		196E9846B27D736630CCF90497696859 /* StringBooleanMap.swift in Sources */ = {isa = PBXBuildFile; fileRef = 47B4DEBABEFE140768CFB70B19D23029 /* StringBooleanMap.swift */; };
+		271D94A05C47B602A2433B9CD3D9DCDC /* DogAllOf.swift in Sources */ = {isa = PBXBuildFile; fileRef = A21A69C8402A60E01116ABBDEE8943DB /* DogAllOf.swift */; };
+		293F4E0FBFC8297E414A3CDBB7F29A96 /* ReadOnlyFirst.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6FD42727E001E799E458C2924CF813CC /* ReadOnlyFirst.swift */; };
+		297E365D1E4672C43C56E0AFD855FFBF /* FakeAPI.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6E00950725DC44436C5E238CDD2EC164 /* FakeAPI.swift */; };
+		2A35688C985E9CB1EB7732AC2AD46B82 /* APIHelper.swift in Sources */ = {isa = PBXBuildFile; fileRef = 897716962D472FE162B723CB713AA6D3 /* APIHelper.swift */; };
+		2DF4544D4D3D6CF7047A59FB89ED31BD /* Model200Response.swift in Sources */ = {isa = PBXBuildFile; fileRef = 82A2C3DC2235F0114C2B08E553F46874 /* Model200Response.swift */; };
+		3251A3722981CE46261615CFBA96A08D /* ArrayOfArrayOfNumberOnly.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7B1B8B838B5D9D312F2002EBAD946378 /* ArrayOfArrayOfNumberOnly.swift */; };
+		36734C4EB3362A114A7CB5F25EE39E6D /* FormatTest.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3156CE41C001C80379B84BDB435DECCB /* FormatTest.swift */; };
+		3D8E407B1DF4FA5A5F16B64E3A285781 /* PetAPI.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9A019F500E546A3292CE716AB967C673 /* PetAPI.swift */; };
+		41D8A105135868152A56E2AC475049BB /* CatAllOf.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3AD0F94F512DFBC09F9CC79AF4BD9BFD /* CatAllOf.swift */; };
+		42C51BC034E8B0CAA29A068F6B0DC815 /* Category.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6F2985D01F8D60A4B1925C694330E6CB /* Category.swift */; };
+		491676EC91BFEF95A12556888EED87B5 /* FileSchemaTestClass.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B3666552AA854DAF9C480A3354C9D7C /* FileSchemaTestClass.swift */; };
+		4C28BFEC5E7C8150DEFD83E09C1A1D32 /* Alamofire.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A235FA3FDFB086CC69CDE83DFC1F4BC9 /* Alamofire.framework */; };
+		58F9704B295AC436D6FB98FA669E2344 /* AlamofireImplementations.swift in Sources */ = {isa = PBXBuildFile; fileRef = 84A201508DF2B697D65F263189C08721 /* AlamofireImplementations.swift */; };
+		59C00CBB07761CAC8DCE7054E34AD5D9 /* EnumClass.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B2C97AE6ACA1E5FB88F5BAA2DB76FDC /* EnumClass.swift */; };
+		59C2F5495C98836BFA9E10BF5C13BC2C /* Order.swift in Sources */ = {isa = PBXBuildFile; fileRef = 27B2E9EF856E89FEAA359A3AC4A2CF5D /* Order.swift */; };
+		5ACDD7CC312167589335E9CA5998E770 /* ClassModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3C30827D8EAF8EA684E7BCEA5A1E93B2 /* ClassModel.swift */; };
+		655AA371771C7BD72EE0AAC0C90DFFF0 /* MapTest.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7986861626C2B1CB49AD7000C6343270 /* MapTest.swift */; };
+		6600BB1500AE35A3C80F7C83F6444552 /* TypeHolderDefault.swift in Sources */ = {isa = PBXBuildFile; fileRef = EBC76F6D4D2AA8084B7EB50E5C15E475 /* TypeHolderDefault.swift */; };
+		6CD20EE568DDAD2304BF0C4B1A70C8DC /* CodableHelper.swift in Sources */ = {isa = PBXBuildFile; fileRef = 02A6F6BB2152ACEE1416D44AB3955243 /* CodableHelper.swift */; };
+		7367A9D91D4B101F2D28AC56ED89F175 /* Capitalization.swift in Sources */ = {isa = PBXBuildFile; fileRef = A7B38FA00A494D13F4C382A3D87FBF59 /* Capitalization.swift */; };
+		82D4D0C8AD0354A700C8ACD421ABED55 /* OuterComposite.swift in Sources */ = {isa = PBXBuildFile; fileRef = F4E0AD8F60A91F72C768756002C14BF9 /* OuterComposite.swift */; };
+		83A2D1863FB136C0DFC423319F4EED65 /* AnotherFakeAPI.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9DF24D2714B9C4CF14146E88FDDC01A5 /* AnotherFakeAPI.swift */; };
+		92FB161BF1E57D11B116AF0292D5835C /* Client.swift in Sources */ = {isa = PBXBuildFile; fileRef = A913A57E72D723632E9A718FF4525C81 /* Client.swift */; };
+		97C99615237E1B662242E04F527B38B9 /* ApiResponse.swift in Sources */ = {isa = PBXBuildFile; fileRef = A8E7B833748B4F0C7CDA90C6E500B199 /* ApiResponse.swift */; };
+		A190AF5A3988639ED4B78163D0EA3CA4 /* ArrayOfNumberOnly.swift in Sources */ = {isa = PBXBuildFile; fileRef = B65BB72353DA24536A9049BEC3D234C8 /* ArrayOfNumberOnly.swift */; };
+		A196B597ADCA20BEC280660B57FF7333 /* PromiseKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A586582C92491DF9C12D27E2CB7F0695 /* PromiseKit.framework */; };
+		A438970025AE69ED407BC1E67CC6359E /* EnumArrays.swift in Sources */ = {isa = PBXBuildFile; fileRef = 10503995D9EFD031A2EFB57603B3132E /* EnumArrays.swift */; };
+		A9F1AAF6CE029DD3B4F8AC841F0B6BC6 /* FakeClassnameTags123API.swift in Sources */ = {isa = PBXBuildFile; fileRef = B42354B407EC173BEB54E0429D946F3B /* FakeClassnameTags123API.swift */; };
+		AE9D2E1DB59AF6575AC4AC6756C5A937 /* NumberOnly.swift in Sources */ = {isa = PBXBuildFile; fileRef = B8E0B16084741FCB82389F5854AC5E26 /* NumberOnly.swift */; };
+		B399A1742F23330FDCA450EAB98F51F1 /* Pet.swift in Sources */ = {isa = PBXBuildFile; fileRef = ECFEB4C6C257B3BB3CEA36D10A5EDC17 /* Pet.swift */; };
+		BB02FDCF1B2B0E457E1C2BF39FBB599D /* XmlItem.swift in Sources */ = {isa = PBXBuildFile; fileRef = A2253391845B73B8BA3680491575CC07 /* XmlItem.swift */; };
+		BF7D58FBCF5E4D3F2932FCC0E62BED40 /* User.swift in Sources */ = {isa = PBXBuildFile; fileRef = E5565A447062C7B8F695F4517DB5E4A5 /* User.swift */; };
+		C15AC1CC631E96D0360EB8C15BF30452 /* Name.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5AD994DFAA0DA93C188A4DBA16688767 /* Name.swift */; };
+		C1CACABE18A7ADCE37D1CD9DC9128304 /* List.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7A6070F581E611FF44AFD40A4315C49A /* List.swift */; };
+		C2EDEB747887399B13A6DFD72A219CB2 /* ArrayTest.swift in Sources */ = {isa = PBXBuildFile; fileRef = F1A0379CDFC55705AE76C99867B8DB08 /* ArrayTest.swift */; };
+		C329EE55B2FCC9174ED3B128D67C5E8C /* Extensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = B8C298FC8929DCB369053F118D7DF28F /* Extensions.swift */; };
+		D3A17B7FAFA8A7A210875BBCDCC30116 /* MixedPropertiesAndAdditionalPropertiesClass.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9AD714C7CC59BDD18DE8DF4ED40B9DA9 /* MixedPropertiesAndAdditionalPropertiesClass.swift */; };
+		D70EC94E346077DE1482231DD4498BED /* Dog.swift in Sources */ = {isa = PBXBuildFile; fileRef = C6C3E1129526A353B963EFD74ED8419C /* Dog.swift */; };
+		DB1CE39011A741D07E187663291B5DE5 /* AnimalFarm.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8D22BE01748F51106DE0233299A9061E /* AnimalFarm.swift */; };
+		DB724C4F1AD5DF025B53A9A2E0A49E3D /* UserAPI.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7C8D5F382979854D47F18DB1543680FE /* UserAPI.swift */; };
+		DDBC3CF5E447D8D838F0FE200420EEE3 /* HasOnlyReadOnly.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4C7FBC641752D2E13B15097311139DDC /* HasOnlyReadOnly.swift */; };
+		DEC892724574BB29BD65869374F83982 /* Configuration.swift in Sources */ = {isa = PBXBuildFile; fileRef = 28A444949BBC254798C3B3DD14AAF2CD /* Configuration.swift */; };
+		E2C40F0E34DB8C21A806262C72841A51 /* SpecialModelName.swift in Sources */ = {isa = PBXBuildFile; fileRef = 386FD590658E90509C121118F057604D /* SpecialModelName.swift */; };
+		E51ADEC931806B20A041303E539A8BE2 /* Tag.swift in Sources */ = {isa = PBXBuildFile; fileRef = B2896F8BFD1AA2965C8A30158F0EDA8C /* Tag.swift */; };
+		F02BEF9A8503B3848B045370451E85F6 /* Models.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8699F7966F748ED026A6FB4CF550442B /* Models.swift */; };
+		F21D10C71A9DE7D0467AFD23FD391D2E /* Return.swift in Sources */ = {isa = PBXBuildFile; fileRef = C81447828475F76C5CF4F08AA65292F7 /* Return.swift */; };
+		FB4A053CDCD75E48B755CC22D463A3FC /* TypeHolderExample.swift in Sources */ = {isa = PBXBuildFile; fileRef = 19B65C66C97F082718DDD703F39DE1C2 /* TypeHolderExample.swift */; };
+		FECA03F0388E84AE1B22638605D8AC9F /* File.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3933D3B2A3AC4577094D0C23D1C1B266 /* File.swift */; };
+/* End PBXBuildFile section */
+
+/* Begin PBXFileReference section */
+		02A6F6BB2152ACEE1416D44AB3955243 /* CodableHelper.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CodableHelper.swift; sourceTree = "<group>"; };
+		10503995D9EFD031A2EFB57603B3132E /* EnumArrays.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EnumArrays.swift; sourceTree = "<group>"; };
+		164AD6EC9C4CCF634D7C45905E99E3A7 /* PetstoreClient.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = PetstoreClient.framework; sourceTree = BUILT_PRODUCTS_DIR; };
+		19B65C66C97F082718DDD703F39DE1C2 /* TypeHolderExample.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TypeHolderExample.swift; sourceTree = "<group>"; };
+		212AA914B7F1793A4E32C119370FB05F /* Cat.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Cat.swift; sourceTree = "<group>"; };
+		27B2E9EF856E89FEAA359A3AC4A2CF5D /* Order.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Order.swift; sourceTree = "<group>"; };
+		28A444949BBC254798C3B3DD14AAF2CD /* Configuration.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Configuration.swift; sourceTree = "<group>"; };
+		3156CE41C001C80379B84BDB435DECCB /* FormatTest.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FormatTest.swift; sourceTree = "<group>"; };
+		35D710108A69DD8A5297F926A66DA21F /* JSONEncodingHelper.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = JSONEncodingHelper.swift; sourceTree = "<group>"; };
+		37DF825B8F3BADA2B2537D17CDC48633 /* APIs.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = APIs.swift; sourceTree = "<group>"; };
+		386FD590658E90509C121118F057604D /* SpecialModelName.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SpecialModelName.swift; sourceTree = "<group>"; };
+		3933D3B2A3AC4577094D0C23D1C1B266 /* File.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = File.swift; sourceTree = "<group>"; };
+		396DEF3156BA0D12D0FC5C3C3AAF52C4 /* AdditionalPropertiesClass.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AdditionalPropertiesClass.swift; sourceTree = "<group>"; };
+		3AD0F94F512DFBC09F9CC79AF4BD9BFD /* CatAllOf.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CatAllOf.swift; sourceTree = "<group>"; };
+		3C30827D8EAF8EA684E7BCEA5A1E93B2 /* ClassModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ClassModel.swift; sourceTree = "<group>"; };
+		47B4DEBABEFE140768CFB70B19D23029 /* StringBooleanMap.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = StringBooleanMap.swift; sourceTree = "<group>"; };
+		4B2C97AE6ACA1E5FB88F5BAA2DB76FDC /* EnumClass.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EnumClass.swift; sourceTree = "<group>"; };
+		4B3666552AA854DAF9C480A3354C9D7C /* FileSchemaTestClass.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FileSchemaTestClass.swift; sourceTree = "<group>"; };
+		4C7FBC641752D2E13B15097311139DDC /* HasOnlyReadOnly.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HasOnlyReadOnly.swift; sourceTree = "<group>"; };
+		5AD994DFAA0DA93C188A4DBA16688767 /* Name.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Name.swift; sourceTree = "<group>"; };
+		6E00950725DC44436C5E238CDD2EC164 /* FakeAPI.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FakeAPI.swift; sourceTree = "<group>"; };
+		6F2985D01F8D60A4B1925C694330E6CB /* Category.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Category.swift; sourceTree = "<group>"; };
+		6FD42727E001E799E458C2924CF813CC /* ReadOnlyFirst.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ReadOnlyFirst.swift; sourceTree = "<group>"; };
+		7986861626C2B1CB49AD7000C6343270 /* MapTest.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MapTest.swift; sourceTree = "<group>"; };
+		7A6070F581E611FF44AFD40A4315C49A /* List.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = List.swift; sourceTree = "<group>"; };
+		7B1B8B838B5D9D312F2002EBAD946378 /* ArrayOfArrayOfNumberOnly.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ArrayOfArrayOfNumberOnly.swift; sourceTree = "<group>"; };
+		7C8D5F382979854D47F18DB1543680FE /* UserAPI.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UserAPI.swift; sourceTree = "<group>"; };
+		82A2C3DC2235F0114C2B08E553F46874 /* Model200Response.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Model200Response.swift; sourceTree = "<group>"; };
+		84A201508DF2B697D65F263189C08721 /* AlamofireImplementations.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AlamofireImplementations.swift; sourceTree = "<group>"; };
+		8699F7966F748ED026A6FB4CF550442B /* Models.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Models.swift; sourceTree = "<group>"; };
+		897716962D472FE162B723CB713AA6D3 /* APIHelper.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = APIHelper.swift; sourceTree = "<group>"; };
+		8D22BE01748F51106DE0233299A9061E /* AnimalFarm.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AnimalFarm.swift; sourceTree = "<group>"; };
+		95568E7C35F119EB4A12B4982B3FB31F /* Animal.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Animal.swift; sourceTree = "<group>"; };
+		9791B840B8D6EAA35343B00FA277963A /* JSONEncodableEncoding.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = JSONEncodableEncoding.swift; sourceTree = "<group>"; };
+		9A019F500E546A3292CE716AB967C673 /* PetAPI.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PetAPI.swift; sourceTree = "<group>"; };
+		9AD714C7CC59BDD18DE8DF4ED40B9DA9 /* MixedPropertiesAndAdditionalPropertiesClass.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MixedPropertiesAndAdditionalPropertiesClass.swift; sourceTree = "<group>"; };
+		9DF24D2714B9C4CF14146E88FDDC01A5 /* AnotherFakeAPI.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AnotherFakeAPI.swift; sourceTree = "<group>"; };
+		A21A69C8402A60E01116ABBDEE8943DB /* DogAllOf.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DogAllOf.swift; sourceTree = "<group>"; };
+		A2253391845B73B8BA3680491575CC07 /* XmlItem.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = XmlItem.swift; sourceTree = "<group>"; };
+		A235FA3FDFB086CC69CDE83DFC1F4BC9 /* Alamofire.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = Alamofire.framework; sourceTree = "<group>"; };
+		A53274D99BBDE1B79BF3521CD7CBC276 /* StoreAPI.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = StoreAPI.swift; sourceTree = "<group>"; };
+		A586582C92491DF9C12D27E2CB7F0695 /* PromiseKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = PromiseKit.framework; sourceTree = "<group>"; };
+		A7B38FA00A494D13F4C382A3D87FBF59 /* Capitalization.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Capitalization.swift; sourceTree = "<group>"; };
+		A8E7B833748B4F0C7CDA90C6E500B199 /* ApiResponse.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ApiResponse.swift; sourceTree = "<group>"; };
+		A913A57E72D723632E9A718FF4525C81 /* Client.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Client.swift; sourceTree = "<group>"; };
+		B2896F8BFD1AA2965C8A30158F0EDA8C /* Tag.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Tag.swift; sourceTree = "<group>"; };
+		B42354B407EC173BEB54E0429D946F3B /* FakeClassnameTags123API.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FakeClassnameTags123API.swift; sourceTree = "<group>"; };
+		B65BB72353DA24536A9049BEC3D234C8 /* ArrayOfNumberOnly.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ArrayOfNumberOnly.swift; sourceTree = "<group>"; };
+		B8C298FC8929DCB369053F118D7DF28F /* Extensions.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Extensions.swift; sourceTree = "<group>"; };
+		B8E0B16084741FCB82389F5854AC5E26 /* NumberOnly.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NumberOnly.swift; sourceTree = "<group>"; };
+		C15008AABC804EB6FB4CDAC6B871E6B0 /* OuterEnum.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = OuterEnum.swift; sourceTree = "<group>"; };
+		C6C3E1129526A353B963EFD74ED8419C /* Dog.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Dog.swift; sourceTree = "<group>"; };
+		C81447828475F76C5CF4F08AA65292F7 /* Return.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Return.swift; sourceTree = "<group>"; };
+		E5565A447062C7B8F695F4517DB5E4A5 /* User.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = User.swift; sourceTree = "<group>"; };
+		EBC76F6D4D2AA8084B7EB50E5C15E475 /* TypeHolderDefault.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TypeHolderDefault.swift; sourceTree = "<group>"; };
+		ECFEB4C6C257B3BB3CEA36D10A5EDC17 /* Pet.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Pet.swift; sourceTree = "<group>"; };
+		F1A0379CDFC55705AE76C99867B8DB08 /* ArrayTest.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ArrayTest.swift; sourceTree = "<group>"; };
+		F4E0AD8F60A91F72C768756002C14BF9 /* OuterComposite.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = OuterComposite.swift; sourceTree = "<group>"; };
+		FD60AEA646791E0EDE885DE1E680A687 /* EnumTest.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EnumTest.swift; sourceTree = "<group>"; };
+/* End PBXFileReference section */
+
+/* Begin PBXFrameworksBuildPhase section */
+		D1990C2A394CCF025EF98A2FB828C79A /* Frameworks */ = {
+			isa = PBXFrameworksBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				4C28BFEC5E7C8150DEFD83E09C1A1D32 /* Alamofire.framework in Frameworks */,
+				A196B597ADCA20BEC280660B57FF7333 /* PromiseKit.framework in Frameworks */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+/* End PBXFrameworksBuildPhase section */
+
+/* Begin PBXGroup section */
+		1E464C0937FE0D3A7A0FE29AF446553C /* Frameworks */ = {
+			isa = PBXGroup;
+			children = (
+				7861EE241895128F64DD787367B3022D /* Carthage */,
+			);
+			name = Frameworks;
+			sourceTree = "<group>";
+		};
+		4FBDCF1330A9AB9122780DB3FA21DE4C /* Models */ = {
+			isa = PBXGroup;
+			children = (
+				396DEF3156BA0D12D0FC5C3C3AAF52C4 /* AdditionalPropertiesClass.swift */,
+				95568E7C35F119EB4A12B4982B3FB31F /* Animal.swift */,
+				8D22BE01748F51106DE0233299A9061E /* AnimalFarm.swift */,
+				A8E7B833748B4F0C7CDA90C6E500B199 /* ApiResponse.swift */,
+				7B1B8B838B5D9D312F2002EBAD946378 /* ArrayOfArrayOfNumberOnly.swift */,
+				B65BB72353DA24536A9049BEC3D234C8 /* ArrayOfNumberOnly.swift */,
+				F1A0379CDFC55705AE76C99867B8DB08 /* ArrayTest.swift */,
+				A7B38FA00A494D13F4C382A3D87FBF59 /* Capitalization.swift */,
+				212AA914B7F1793A4E32C119370FB05F /* Cat.swift */,
+				3AD0F94F512DFBC09F9CC79AF4BD9BFD /* CatAllOf.swift */,
+				6F2985D01F8D60A4B1925C694330E6CB /* Category.swift */,
+				3C30827D8EAF8EA684E7BCEA5A1E93B2 /* ClassModel.swift */,
+				A913A57E72D723632E9A718FF4525C81 /* Client.swift */,
+				C6C3E1129526A353B963EFD74ED8419C /* Dog.swift */,
+				A21A69C8402A60E01116ABBDEE8943DB /* DogAllOf.swift */,
+				10503995D9EFD031A2EFB57603B3132E /* EnumArrays.swift */,
+				4B2C97AE6ACA1E5FB88F5BAA2DB76FDC /* EnumClass.swift */,
+				FD60AEA646791E0EDE885DE1E680A687 /* EnumTest.swift */,
+				3933D3B2A3AC4577094D0C23D1C1B266 /* File.swift */,
+				4B3666552AA854DAF9C480A3354C9D7C /* FileSchemaTestClass.swift */,
+				3156CE41C001C80379B84BDB435DECCB /* FormatTest.swift */,
+				4C7FBC641752D2E13B15097311139DDC /* HasOnlyReadOnly.swift */,
+				7A6070F581E611FF44AFD40A4315C49A /* List.swift */,
+				7986861626C2B1CB49AD7000C6343270 /* MapTest.swift */,
+				9AD714C7CC59BDD18DE8DF4ED40B9DA9 /* MixedPropertiesAndAdditionalPropertiesClass.swift */,
+				82A2C3DC2235F0114C2B08E553F46874 /* Model200Response.swift */,
+				5AD994DFAA0DA93C188A4DBA16688767 /* Name.swift */,
+				B8E0B16084741FCB82389F5854AC5E26 /* NumberOnly.swift */,
+				27B2E9EF856E89FEAA359A3AC4A2CF5D /* Order.swift */,
+				F4E0AD8F60A91F72C768756002C14BF9 /* OuterComposite.swift */,
+				C15008AABC804EB6FB4CDAC6B871E6B0 /* OuterEnum.swift */,
+				ECFEB4C6C257B3BB3CEA36D10A5EDC17 /* Pet.swift */,
+				6FD42727E001E799E458C2924CF813CC /* ReadOnlyFirst.swift */,
+				C81447828475F76C5CF4F08AA65292F7 /* Return.swift */,
+				386FD590658E90509C121118F057604D /* SpecialModelName.swift */,
+				47B4DEBABEFE140768CFB70B19D23029 /* StringBooleanMap.swift */,
+				B2896F8BFD1AA2965C8A30158F0EDA8C /* Tag.swift */,
+				EBC76F6D4D2AA8084B7EB50E5C15E475 /* TypeHolderDefault.swift */,
+				19B65C66C97F082718DDD703F39DE1C2 /* TypeHolderExample.swift */,
+				E5565A447062C7B8F695F4517DB5E4A5 /* User.swift */,
+				A2253391845B73B8BA3680491575CC07 /* XmlItem.swift */,
+			);
+			path = Models;
+			sourceTree = "<group>";
+		};
+		5FBA6AE5F64CD737F88B4565AC3CCD3B = {
+			isa = PBXGroup;
+			children = (
+				9B364C01750D7AA4F983B9E77B01BCC6 /* PetstoreClient */,
+				1E464C0937FE0D3A7A0FE29AF446553C /* Frameworks */,
+				857F0DEA1890CE66D6DAD556C55821A6 /* Products */,
+			);
+			sourceTree = "<group>";
+		};
+		67BF3478113E6B4DF1C4E04F40BF58C4 /* OpenAPIs */ = {
+			isa = PBXGroup;
+			children = (
+				84A201508DF2B697D65F263189C08721 /* AlamofireImplementations.swift */,
+				897716962D472FE162B723CB713AA6D3 /* APIHelper.swift */,
+				37DF825B8F3BADA2B2537D17CDC48633 /* APIs.swift */,
+				02A6F6BB2152ACEE1416D44AB3955243 /* CodableHelper.swift */,
+				28A444949BBC254798C3B3DD14AAF2CD /* Configuration.swift */,
+				B8C298FC8929DCB369053F118D7DF28F /* Extensions.swift */,
+				9791B840B8D6EAA35343B00FA277963A /* JSONEncodableEncoding.swift */,
+				35D710108A69DD8A5297F926A66DA21F /* JSONEncodingHelper.swift */,
+				8699F7966F748ED026A6FB4CF550442B /* Models.swift */,
+				F956D0CCAE23BCFD1C7BDD5D47944AA5 /* APIs */,
+				4FBDCF1330A9AB9122780DB3FA21DE4C /* Models */,
+			);
+			path = OpenAPIs;
+			sourceTree = "<group>";
+		};
+		7861EE241895128F64DD787367B3022D /* Carthage */ = {
+			isa = PBXGroup;
+			children = (
+				A012205B41CB71A62B86EECDEAFB0990 /* iOS */,
+			);
+			name = Carthage;
+			path = Carthage/Build;
+			sourceTree = "<group>";
+		};
+		857F0DEA1890CE66D6DAD556C55821A6 /* Products */ = {
+			isa = PBXGroup;
+			children = (
+				164AD6EC9C4CCF634D7C45905E99E3A7 /* PetstoreClient.framework */,
+			);
+			name = Products;
+			sourceTree = "<group>";
+		};
+		9B364C01750D7AA4F983B9E77B01BCC6 /* PetstoreClient */ = {
+			isa = PBXGroup;
+			children = (
+				EF4C81BDD734856ED5023B777D35098B /* Classes */,
+			);
+			path = PetstoreClient;
+			sourceTree = "<group>";
+		};
+		A012205B41CB71A62B86EECDEAFB0990 /* iOS */ = {
+			isa = PBXGroup;
+			children = (
+				A235FA3FDFB086CC69CDE83DFC1F4BC9 /* Alamofire.framework */,
+				A586582C92491DF9C12D27E2CB7F0695 /* PromiseKit.framework */,
+			);
+			path = iOS;
+			sourceTree = "<group>";
+		};
+		EF4C81BDD734856ED5023B777D35098B /* Classes */ = {
+			isa = PBXGroup;
+			children = (
+				67BF3478113E6B4DF1C4E04F40BF58C4 /* OpenAPIs */,
+			);
+			path = Classes;
+			sourceTree = "<group>";
+		};
+		F956D0CCAE23BCFD1C7BDD5D47944AA5 /* APIs */ = {
+			isa = PBXGroup;
+			children = (
+				9DF24D2714B9C4CF14146E88FDDC01A5 /* AnotherFakeAPI.swift */,
+				6E00950725DC44436C5E238CDD2EC164 /* FakeAPI.swift */,
+				B42354B407EC173BEB54E0429D946F3B /* FakeClassnameTags123API.swift */,
+				9A019F500E546A3292CE716AB967C673 /* PetAPI.swift */,
+				A53274D99BBDE1B79BF3521CD7CBC276 /* StoreAPI.swift */,
+				7C8D5F382979854D47F18DB1543680FE /* UserAPI.swift */,
+			);
+			path = APIs;
+			sourceTree = "<group>";
+		};
+/* End PBXGroup section */
+
+/* Begin PBXNativeTarget section */
+		C1282C2230015E0D204BEAEDDFB49453 /* PetstoreClient */ = {
+			isa = PBXNativeTarget;
+			buildConfigurationList = B46EDEB1A7F0D78FE6394544C60169D1 /* Build configuration list for PBXNativeTarget "PetstoreClient" */;
+			buildPhases = (
+				E539708354CE60FE486F81EDE56D13C8 /* Sources */,
+				D1990C2A394CCF025EF98A2FB828C79A /* Frameworks */,
+			);
+			buildRules = (
+			);
+			dependencies = (
+			);
+			name = PetstoreClient;
+			productName = PetstoreClient;
+			productReference = 164AD6EC9C4CCF634D7C45905E99E3A7 /* PetstoreClient.framework */;
+			productType = "com.apple.product-type.framework";
+		};
+/* End PBXNativeTarget section */
+
+/* Begin PBXProject section */
+		E7D276EE2369D8C455513C2E05F9AED0 /* Project object */ = {
+			isa = PBXProject;
+			attributes = {
+				LastUpgradeCheck = 1000;
+			};
+			buildConfigurationList = ECAB17FF35111B5E14DAAC0883031714 /* Build configuration list for PBXProject "PetstoreClient" */;
+			compatibilityVersion = "Xcode 9.3";
+			developmentRegion = en;
+			hasScannedForEncodings = 0;
+			knownRegions = (
+				en,
+			);
+			mainGroup = 5FBA6AE5F64CD737F88B4565AC3CCD3B;
+			projectDirPath = "";
+			projectRoot = "";
+			targets = (
+				C1282C2230015E0D204BEAEDDFB49453 /* PetstoreClient */,
+			);
+		};
+/* End PBXProject section */
+
+/* Begin PBXSourcesBuildPhase section */
+		E539708354CE60FE486F81EDE56D13C8 /* Sources */ = {
+			isa = PBXSourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				2A35688C985E9CB1EB7732AC2AD46B82 /* APIHelper.swift in Sources */,
+				0462F801432CF94C7EF51D0532737A7E /* APIs.swift in Sources */,
+				12327BF7304AA897C5D2A1250B1659B7 /* AdditionalPropertiesClass.swift in Sources */,
+				58F9704B295AC436D6FB98FA669E2344 /* AlamofireImplementations.swift in Sources */,
+				02903CEC38DC202565BC08CB040AC4E9 /* Animal.swift in Sources */,
+				DB1CE39011A741D07E187663291B5DE5 /* AnimalFarm.swift in Sources */,
+				83A2D1863FB136C0DFC423319F4EED65 /* AnotherFakeAPI.swift in Sources */,
+				97C99615237E1B662242E04F527B38B9 /* ApiResponse.swift in Sources */,
+				3251A3722981CE46261615CFBA96A08D /* ArrayOfArrayOfNumberOnly.swift in Sources */,
+				A190AF5A3988639ED4B78163D0EA3CA4 /* ArrayOfNumberOnly.swift in Sources */,
+				C2EDEB747887399B13A6DFD72A219CB2 /* ArrayTest.swift in Sources */,
+				7367A9D91D4B101F2D28AC56ED89F175 /* Capitalization.swift in Sources */,
+				18F19872A0DFB4CC3D9C696BBCA64EFD /* Cat.swift in Sources */,
+				41D8A105135868152A56E2AC475049BB /* CatAllOf.swift in Sources */,
+				42C51BC034E8B0CAA29A068F6B0DC815 /* Category.swift in Sources */,
+				5ACDD7CC312167589335E9CA5998E770 /* ClassModel.swift in Sources */,
+				92FB161BF1E57D11B116AF0292D5835C /* Client.swift in Sources */,
+				6CD20EE568DDAD2304BF0C4B1A70C8DC /* CodableHelper.swift in Sources */,
+				DEC892724574BB29BD65869374F83982 /* Configuration.swift in Sources */,
+				D70EC94E346077DE1482231DD4498BED /* Dog.swift in Sources */,
+				271D94A05C47B602A2433B9CD3D9DCDC /* DogAllOf.swift in Sources */,
+				A438970025AE69ED407BC1E67CC6359E /* EnumArrays.swift in Sources */,
+				59C00CBB07761CAC8DCE7054E34AD5D9 /* EnumClass.swift in Sources */,
+				08D87E4FECF24910F0DA0F1D2E2D955A /* EnumTest.swift in Sources */,
+				C329EE55B2FCC9174ED3B128D67C5E8C /* Extensions.swift in Sources */,
+				297E365D1E4672C43C56E0AFD855FFBF /* FakeAPI.swift in Sources */,
+				A9F1AAF6CE029DD3B4F8AC841F0B6BC6 /* FakeClassnameTags123API.swift in Sources */,
+				FECA03F0388E84AE1B22638605D8AC9F /* File.swift in Sources */,
+				491676EC91BFEF95A12556888EED87B5 /* FileSchemaTestClass.swift in Sources */,
+				36734C4EB3362A114A7CB5F25EE39E6D /* FormatTest.swift in Sources */,
+				DDBC3CF5E447D8D838F0FE200420EEE3 /* HasOnlyReadOnly.swift in Sources */,
+				16E9A5E22B4823DE282E7F4C18A21EA8 /* JSONEncodableEncoding.swift in Sources */,
+				12BB95C66D63090732BB9E0379836E3C /* JSONEncodingHelper.swift in Sources */,
+				C1CACABE18A7ADCE37D1CD9DC9128304 /* List.swift in Sources */,
+				655AA371771C7BD72EE0AAC0C90DFFF0 /* MapTest.swift in Sources */,
+				D3A17B7FAFA8A7A210875BBCDCC30116 /* MixedPropertiesAndAdditionalPropertiesClass.swift in Sources */,
+				2DF4544D4D3D6CF7047A59FB89ED31BD /* Model200Response.swift in Sources */,
+				F02BEF9A8503B3848B045370451E85F6 /* Models.swift in Sources */,
+				C15AC1CC631E96D0360EB8C15BF30452 /* Name.swift in Sources */,
+				AE9D2E1DB59AF6575AC4AC6756C5A937 /* NumberOnly.swift in Sources */,
+				59C2F5495C98836BFA9E10BF5C13BC2C /* Order.swift in Sources */,
+				82D4D0C8AD0354A700C8ACD421ABED55 /* OuterComposite.swift in Sources */,
+				1143FFF06DEE01E5B0F1368AA05BE1B4 /* OuterEnum.swift in Sources */,
+				B399A1742F23330FDCA450EAB98F51F1 /* Pet.swift in Sources */,
+				3D8E407B1DF4FA5A5F16B64E3A285781 /* PetAPI.swift in Sources */,
+				293F4E0FBFC8297E414A3CDBB7F29A96 /* ReadOnlyFirst.swift in Sources */,
+				F21D10C71A9DE7D0467AFD23FD391D2E /* Return.swift in Sources */,
+				E2C40F0E34DB8C21A806262C72841A51 /* SpecialModelName.swift in Sources */,
+				122BBAE8245606CC040EEB6B9254E376 /* StoreAPI.swift in Sources */,
+				196E9846B27D736630CCF90497696859 /* StringBooleanMap.swift in Sources */,
+				E51ADEC931806B20A041303E539A8BE2 /* Tag.swift in Sources */,
+				6600BB1500AE35A3C80F7C83F6444552 /* TypeHolderDefault.swift in Sources */,
+				FB4A053CDCD75E48B755CC22D463A3FC /* TypeHolderExample.swift in Sources */,
+				BF7D58FBCF5E4D3F2932FCC0E62BED40 /* User.swift in Sources */,
+				DB724C4F1AD5DF025B53A9A2E0A49E3D /* UserAPI.swift in Sources */,
+				BB02FDCF1B2B0E457E1C2BF39FBB599D /* XmlItem.swift in Sources */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+/* End PBXSourcesBuildPhase section */
+
+/* Begin XCBuildConfiguration section */
+		3B2C02AFB91CB5C82766ED5CF21FF628 /* Release */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				APPLICATION_EXTENSION_API_ONLY = YES;
+				CODE_SIGN_IDENTITY = "";
+				CURRENT_PROJECT_VERSION = 1;
+				DEFINES_MODULE = YES;
+				DYLIB_COMPATIBILITY_VERSION = 1;
+				DYLIB_CURRENT_VERSION = 1;
+				DYLIB_INSTALL_NAME_BASE = "@rpath";
+				FRAMEWORK_SEARCH_PATHS = (
+					"$(inherited)",
+					"$(PROJECT_DIR)/Carthage/Build/iOS",
+				);
+				INFOPLIST_FILE = Info.plist;
+				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
+				IPHONEOS_DEPLOYMENT_TARGET = 10.0;
+				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
+				SDKROOT = iphoneos;
+				SKIP_INSTALL = YES;
+				TARGETED_DEVICE_FAMILY = "1,2";
+				VERSIONING_SYSTEM = "apple-generic";
+			};
+			name = Release;
+		};
+		A9EB0A02B94C427CBACFEC7CFFC6A816 /* Debug */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				ALWAYS_SEARCH_USER_PATHS = NO;
+				CLANG_ANALYZER_NONNULL = YES;
+				CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
+				CLANG_CXX_LANGUAGE_STANDARD = "gnu++14";
+				CLANG_CXX_LIBRARY = "libc++";
+				CLANG_ENABLE_MODULES = YES;
+				CLANG_ENABLE_OBJC_ARC = YES;
+				CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
+				CLANG_WARN_BOOL_CONVERSION = YES;
+				CLANG_WARN_COMMA = YES;
+				CLANG_WARN_CONSTANT_CONVERSION = YES;
+				CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
+				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
+				CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
+				CLANG_WARN_EMPTY_BODY = YES;
+				CLANG_WARN_ENUM_CONVERSION = YES;
+				CLANG_WARN_INFINITE_RECURSION = YES;
+				CLANG_WARN_INT_CONVERSION = YES;
+				CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
+				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
+				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
+				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
+				CLANG_WARN_STRICT_PROTOTYPES = YES;
+				CLANG_WARN_SUSPICIOUS_MOVE = YES;
+				CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
+				CLANG_WARN_UNREACHABLE_CODE = YES;
+				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
+				COPY_PHASE_STRIP = NO;
+				DEBUG_INFORMATION_FORMAT = dwarf;
+				ENABLE_STRICT_OBJC_MSGSEND = YES;
+				ENABLE_TESTABILITY = YES;
+				GCC_C_LANGUAGE_STANDARD = gnu11;
+				GCC_DYNAMIC_NO_PIC = NO;
+				GCC_NO_COMMON_BLOCKS = YES;
+				GCC_OPTIMIZATION_LEVEL = 0;
+				GCC_PREPROCESSOR_DEFINITIONS = (
+					"$(inherited)",
+					"DEBUG=1",
+				);
+				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
+				GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
+				GCC_WARN_UNDECLARED_SELECTOR = YES;
+				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
+				GCC_WARN_UNUSED_FUNCTION = YES;
+				GCC_WARN_UNUSED_VARIABLE = YES;
+				MTL_ENABLE_DEBUG_INFO = YES;
+				ONLY_ACTIVE_ARCH = YES;
+				PRODUCT_NAME = "$(TARGET_NAME)";
+				SDKROOT = iphoneos;
+				SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
+				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
+				SWIFT_VERSION = 4.2;
+			};
+			name = Debug;
+		};
+		DD3EEB93949E9EBA4437E9CDBF4A26F6 /* Debug */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				APPLICATION_EXTENSION_API_ONLY = YES;
+				CODE_SIGN_IDENTITY = "";
+				CURRENT_PROJECT_VERSION = 1;
+				DEFINES_MODULE = YES;
+				DYLIB_COMPATIBILITY_VERSION = 1;
+				DYLIB_CURRENT_VERSION = 1;
+				DYLIB_INSTALL_NAME_BASE = "@rpath";
+				FRAMEWORK_SEARCH_PATHS = (
+					"$(inherited)",
+					"$(PROJECT_DIR)/Carthage/Build/iOS",
+				);
+				INFOPLIST_FILE = Info.plist;
+				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
+				IPHONEOS_DEPLOYMENT_TARGET = 10.0;
+				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
+				SDKROOT = iphoneos;
+				SKIP_INSTALL = YES;
+				TARGETED_DEVICE_FAMILY = "1,2";
+				VERSIONING_SYSTEM = "apple-generic";
+			};
+			name = Debug;
+		};
+		F81D4E5FECD46E9AA6DD2C299CEBEF64 /* Release */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				ALWAYS_SEARCH_USER_PATHS = NO;
+				CLANG_ANALYZER_NONNULL = YES;
+				CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
+				CLANG_CXX_LANGUAGE_STANDARD = "gnu++14";
+				CLANG_CXX_LIBRARY = "libc++";
+				CLANG_ENABLE_MODULES = YES;
+				CLANG_ENABLE_OBJC_ARC = YES;
+				CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
+				CLANG_WARN_BOOL_CONVERSION = YES;
+				CLANG_WARN_COMMA = YES;
+				CLANG_WARN_CONSTANT_CONVERSION = YES;
+				CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
+				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
+				CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
+				CLANG_WARN_EMPTY_BODY = YES;
+				CLANG_WARN_ENUM_CONVERSION = YES;
+				CLANG_WARN_INFINITE_RECURSION = YES;
+				CLANG_WARN_INT_CONVERSION = YES;
+				CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
+				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
+				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
+				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
+				CLANG_WARN_STRICT_PROTOTYPES = YES;
+				CLANG_WARN_SUSPICIOUS_MOVE = YES;
+				CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
+				CLANG_WARN_UNREACHABLE_CODE = YES;
+				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
+				COPY_PHASE_STRIP = NO;
+				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
+				ENABLE_NS_ASSERTIONS = NO;
+				ENABLE_STRICT_OBJC_MSGSEND = YES;
+				GCC_C_LANGUAGE_STANDARD = gnu11;
+				GCC_NO_COMMON_BLOCKS = YES;
+				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
+				GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
+				GCC_WARN_UNDECLARED_SELECTOR = YES;
+				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
+				GCC_WARN_UNUSED_FUNCTION = YES;
+				GCC_WARN_UNUSED_VARIABLE = YES;
+				PRODUCT_NAME = "$(TARGET_NAME)";
+				SDKROOT = iphoneos;
+				SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
+				SWIFT_VERSION = 4.2;
+				VALIDATE_PRODUCT = YES;
+			};
+			name = Release;
+		};
+/* End XCBuildConfiguration section */
+
+/* Begin XCConfigurationList section */
+		B46EDEB1A7F0D78FE6394544C60169D1 /* Build configuration list for PBXNativeTarget "PetstoreClient" */ = {
+			isa = XCConfigurationList;
+			buildConfigurations = (
+				DD3EEB93949E9EBA4437E9CDBF4A26F6 /* Debug */,
+				3B2C02AFB91CB5C82766ED5CF21FF628 /* Release */,
+			);
+			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = "";
+		};
+		ECAB17FF35111B5E14DAAC0883031714 /* Build configuration list for PBXProject "PetstoreClient" */ = {
+			isa = XCConfigurationList;
+			buildConfigurations = (
+				A9EB0A02B94C427CBACFEC7CFFC6A816 /* Debug */,
+				F81D4E5FECD46E9AA6DD2C299CEBEF64 /* Release */,
+			);
+			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Debug;
+		};
+/* End XCConfigurationList section */
+	};
+	rootObject = E7D276EE2369D8C455513C2E05F9AED0 /* Project object */;
+}
diff --git a/samples/client/petstore/swift4/promisekit/PetstoreClient.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/samples/client/petstore/swift4/promisekit/PetstoreClient.xcodeproj/project.xcworkspace/contents.xcworkspacedata
new file mode 100644
index 0000000000..919434a625
--- /dev/null
+++ b/samples/client/petstore/swift4/promisekit/PetstoreClient.xcodeproj/project.xcworkspace/contents.xcworkspacedata
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Workspace
+   version = "1.0">
+   <FileRef
+      location = "self:">
+   </FileRef>
+</Workspace>
diff --git a/samples/client/petstore/swift4/promisekit/PetstoreClient.xcodeproj/xcshareddata/xcschemes/PetstoreClient.xcscheme b/samples/client/petstore/swift4/promisekit/PetstoreClient.xcodeproj/xcshareddata/xcschemes/PetstoreClient.xcscheme
new file mode 100644
index 0000000000..7802e37945
--- /dev/null
+++ b/samples/client/petstore/swift4/promisekit/PetstoreClient.xcodeproj/xcshareddata/xcschemes/PetstoreClient.xcscheme
@@ -0,0 +1,96 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Scheme
+   LastUpgradeVersion = "1000"
+   version = "1.3">
+   <BuildAction
+      parallelizeBuildables = "YES"
+      buildImplicitDependencies = "YES">
+      <BuildActionEntries>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "YES"
+            buildForProfiling = "YES"
+            buildForArchiving = "YES"
+            buildForAnalyzing = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "C1282C2230015E0D204BEAEDDFB49453"
+               BuildableName = "PetstoreClient.framework"
+               BlueprintName = "PetstoreClient"
+               ReferencedContainer = "container:PetstoreClient.xcodeproj">
+            </BuildableReference>
+         </BuildActionEntry>
+      </BuildActionEntries>
+   </BuildAction>
+   <TestAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      shouldUseLaunchSchemeArgsEnv = "YES">
+      <Testables>
+      </Testables>
+      <MacroExpansion>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "C1282C2230015E0D204BEAEDDFB49453"
+            BuildableName = "PetstoreClient.framework"
+            BlueprintName = "PetstoreClient"
+            ReferencedContainer = "container:PetstoreClient.xcodeproj">
+         </BuildableReference>
+      </MacroExpansion>
+      <CommandLineArguments>
+      </CommandLineArguments>
+      <AdditionalOptions>
+      </AdditionalOptions>
+   </TestAction>
+   <LaunchAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      launchStyle = "0"
+      useCustomWorkingDirectory = "NO"
+      ignoresPersistentStateOnLaunch = "NO"
+      debugDocumentVersioning = "YES"
+      debugServiceExtension = "internal"
+      allowLocationSimulation = "YES">
+      <MacroExpansion>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "C1282C2230015E0D204BEAEDDFB49453"
+            BuildableName = "PetstoreClient.framework"
+            BlueprintName = "PetstoreClient"
+            ReferencedContainer = "container:PetstoreClient.xcodeproj">
+         </BuildableReference>
+      </MacroExpansion>
+      <CommandLineArguments>
+      </CommandLineArguments>
+      <AdditionalOptions>
+      </AdditionalOptions>
+   </LaunchAction>
+   <ProfileAction
+      buildConfiguration = "Release"
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      savedToolIdentifier = ""
+      useCustomWorkingDirectory = "NO"
+      debugDocumentVersioning = "YES">
+      <BuildableProductRunnable
+         runnableDebuggingMode = "0">
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "C1282C2230015E0D204BEAEDDFB49453"
+            BuildableName = "PetstoreClient.framework"
+            BlueprintName = "PetstoreClient"
+            ReferencedContainer = "container:PetstoreClient.xcodeproj">
+         </BuildableReference>
+      </BuildableProductRunnable>
+      <CommandLineArguments>
+      </CommandLineArguments>
+   </ProfileAction>
+   <AnalyzeAction
+      buildConfiguration = "Debug">
+   </AnalyzeAction>
+   <ArchiveAction
+      buildConfiguration = "Release"
+      revealArchiveInOrganizer = "YES">
+   </ArchiveAction>
+</Scheme>
diff --git a/samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/OpenAPIs/APIHelper.swift b/samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/OpenAPIs/APIHelper.swift
index d94614b34f..75dea24395 100644
--- a/samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/OpenAPIs/APIHelper.swift
+++ b/samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/OpenAPIs/APIHelper.swift
@@ -7,7 +7,7 @@
 import Foundation
 
 public struct APIHelper {
-    public static func rejectNil(_ source: [String:Any?]) -> [String:Any]? {
+    public static func rejectNil(_ source: [String: Any?]) -> [String: Any]? {
         let destination = source.reduce(into: [String: Any]()) { (result, item) in
             if let value = item.value {
                 result[item.key] = value
@@ -20,17 +20,17 @@ public struct APIHelper {
         return destination
     }
 
-    public static func rejectNilHeaders(_ source: [String:Any?]) -> [String:String] {
+    public static func rejectNilHeaders(_ source: [String: Any?]) -> [String: String] {
         return source.reduce(into: [String: String]()) { (result, item) in
             if let collection = item.value as? Array<Any?> {
-                result[item.key] = collection.filter({ $0 != nil }).map{ "\($0!)" }.joined(separator: ",")
+                result[item.key] = collection.filter({ $0 != nil }).map { "\($0!)" }.joined(separator: ",")
             } else if let value: Any = item.value {
                 result[item.key] = "\(value)"
             }
         }
     }
 
-    public static func convertBoolToString(_ source: [String: Any]?) -> [String:Any]? {
+    public static func convertBoolToString(_ source: [String: Any]?) -> [String: Any]? {
         guard let source = source else {
             return nil
         }
@@ -52,7 +52,7 @@ public struct APIHelper {
         return source
     }
 
-    public static func mapValuesToQueryItems(_ source: [String:Any?]) -> [URLQueryItem]? {
+    public static func mapValuesToQueryItems(_ source: [String: Any?]) -> [URLQueryItem]? {
         let destination = source.filter({ $0.value != nil}).reduce(into: [URLQueryItem]()) { (result, item) in
             if let collection = item.value as? Array<Any?> {
                 let value = collection.filter({ $0 != nil }).map({"\($0!)"}).joined(separator: ",")
@@ -68,4 +68,3 @@ public struct APIHelper {
         return destination
     }
 }
-
diff --git a/samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/OpenAPIs/APIs.swift b/samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/OpenAPIs/APIs.swift
index 2890bffa27..9e4312f685 100644
--- a/samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/OpenAPIs/APIs.swift
+++ b/samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/OpenAPIs/APIs.swift
@@ -9,22 +9,22 @@ import Foundation
 open class PetstoreClientAPI {
     public static var basePath = "http://petstore.swagger.io:80/v2"
     public static var credential: URLCredential?
-    public static var customHeaders: [String:String] = [:]
+    public static var customHeaders: [String: String] = [:]
     public static var requestBuilderFactory: RequestBuilderFactory = AlamofireRequestBuilderFactory()
 }
 
 open class RequestBuilder<T> {
     var credential: URLCredential?
-    var headers: [String:String]
-    public let parameters: [String:Any]?
+    var headers: [String: String]
+    public let parameters: [String: Any]?
     public let isBody: Bool
     public let method: String
     public let URLString: String
 
     /// Optional block to obtain a reference to the request's progress instance when available.
-    public var onProgressReady: ((Progress) -> ())?
+    public var onProgressReady: ((Progress) -> Void)?
 
-    required public init(method: String, URLString: String, parameters: [String:Any]?, isBody: Bool, headers: [String:String] = [:]) {
+    required public init(method: String, URLString: String, parameters: [String: Any]?, isBody: Bool, headers: [String: String] = [:]) {
         self.method = method
         self.URLString = URLString
         self.parameters = parameters
@@ -34,7 +34,7 @@ open class RequestBuilder<T> {
         addHeaders(PetstoreClientAPI.customHeaders)
     }
 
-    open func addHeaders(_ aHeaders:[String:String]) {
+    open func addHeaders(_ aHeaders: [String: String]) {
         for (header, value) in aHeaders {
             headers[header] = value
         }
@@ -57,5 +57,5 @@ open class RequestBuilder<T> {
 
 public protocol RequestBuilderFactory {
     func getNonDecodableBuilder<T>() -> RequestBuilder<T>.Type
-    func getBuilder<T:Decodable>() -> RequestBuilder<T>.Type
+    func getBuilder<T: Decodable>() -> RequestBuilder<T>.Type
 }
diff --git a/samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/OpenAPIs/APIs/AnotherFakeAPI.swift b/samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/OpenAPIs/APIs/AnotherFakeAPI.swift
index 18204a2a75..2a2e7ab048 100644
--- a/samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/OpenAPIs/APIs/AnotherFakeAPI.swift
+++ b/samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/OpenAPIs/APIs/AnotherFakeAPI.swift
@@ -9,8 +9,6 @@ import Foundation
 import Alamofire
 import PromiseKit
 
-
-
 open class AnotherFakeAPI {
     /**
      To test special tags
diff --git a/samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/OpenAPIs/APIs/FakeAPI.swift b/samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/OpenAPIs/APIs/FakeAPI.swift
index ed3c187e72..3fdda64aa2 100644
--- a/samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/OpenAPIs/APIs/FakeAPI.swift
+++ b/samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/OpenAPIs/APIs/FakeAPI.swift
@@ -9,8 +9,6 @@ import Foundation
 import Alamofire
 import PromiseKit
 
-
-
 open class FakeAPI {
     /**
 
@@ -201,7 +199,7 @@ open class FakeAPI {
      - parameter body: (body)  
      - returns: Promise<Void>
      */
-    open class func testBodyWithQueryParams( query: String,  body: User) -> Promise<Void> {
+    open class func testBodyWithQueryParams( query: String, body: User) -> Promise<Void> {
         let deferred = Promise<Void>.pending()
         testBodyWithQueryParamsWithRequestBuilder(query: query, body: body).execute { (response, error) -> Void in
             if let error = error {
@@ -292,7 +290,7 @@ open class FakeAPI {
      - parameter callback: (form) None (optional)
      - returns: Promise<Void>
      */
-    open class func testEndpointParameters( number: Double,  double: Double,  patternWithoutDelimiter: String,  byte: Data,  integer: Int? = nil,  int32: Int? = nil,  int64: Int64? = nil,  float: Float? = nil,  string: String? = nil,  binary: URL? = nil,  date: Date? = nil,  dateTime: Date? = nil,  password: String? = nil,  callback: String? = nil) -> Promise<Void> {
+    open class func testEndpointParameters( number: Double, double: Double, patternWithoutDelimiter: String, byte: Data, integer: Int? = nil, int32: Int? = nil, int64: Int64? = nil, float: Float? = nil, string: String? = nil, binary: URL? = nil, date: Date? = nil, dateTime: Date? = nil, password: String? = nil, callback: String? = nil) -> Promise<Void> {
         let deferred = Promise<Void>.pending()
         testEndpointParametersWithRequestBuilder(number: number, double: double, patternWithoutDelimiter: patternWithoutDelimiter, byte: byte, integer: integer, int32: int32, int64: int64, float: float, string: string, binary: binary, date: date, dateTime: dateTime, password: password, callback: callback).execute { (response, error) -> Void in
             if let error = error {
@@ -330,7 +328,7 @@ open class FakeAPI {
     open class func testEndpointParametersWithRequestBuilder(number: Double, double: Double, patternWithoutDelimiter: String, byte: Data, integer: Int? = nil, int32: Int? = nil, int64: Int64? = nil, float: Float? = nil, string: String? = nil, binary: URL? = nil, date: Date? = nil, dateTime: Date? = nil, password: String? = nil, callback: String? = nil) -> RequestBuilder<Void> {
         let path = "/fake"
         let URLString = PetstoreClientAPI.basePath + path
-        let formParams: [String:Any?] = [
+        let formParams: [String: Any?] = [
             "integer": integer?.encodeToJSON(),
             "int32": int32?.encodeToJSON(),
             "int64": int64?.encodeToJSON(),
@@ -349,7 +347,7 @@ open class FakeAPI {
 
         let nonNullParameters = APIHelper.rejectNil(formParams)
         let parameters = APIHelper.convertBoolToString(nonNullParameters)
-        
+
         let url = URLComponents(string: URLString)
 
         let requestBuilder: RequestBuilder<Void>.Type = PetstoreClientAPI.requestBuilderFactory.getNonDecodableBuilder()
@@ -437,7 +435,7 @@ open class FakeAPI {
      - parameter enumFormString: (form) Form parameter enum test (string) (optional, default to .-efg)
      - returns: Promise<Void>
      */
-    open class func testEnumParameters( enumHeaderStringArray: [String]? = nil,  enumHeaderString: EnumHeaderString_testEnumParameters? = nil,  enumQueryStringArray: [String]? = nil,  enumQueryString: EnumQueryString_testEnumParameters? = nil,  enumQueryInteger: EnumQueryInteger_testEnumParameters? = nil,  enumQueryDouble: EnumQueryDouble_testEnumParameters? = nil,  enumFormStringArray: [String]? = nil,  enumFormString: EnumFormString_testEnumParameters? = nil) -> Promise<Void> {
+    open class func testEnumParameters( enumHeaderStringArray: [String]? = nil, enumHeaderString: EnumHeaderString_testEnumParameters? = nil, enumQueryStringArray: [String]? = nil, enumQueryString: EnumQueryString_testEnumParameters? = nil, enumQueryInteger: EnumQueryInteger_testEnumParameters? = nil, enumQueryDouble: EnumQueryDouble_testEnumParameters? = nil, enumFormStringArray: [String]? = nil, enumFormString: EnumFormString_testEnumParameters? = nil) -> Promise<Void> {
         let deferred = Promise<Void>.pending()
         testEnumParametersWithRequestBuilder(enumHeaderStringArray: enumHeaderStringArray, enumHeaderString: enumHeaderString, enumQueryStringArray: enumQueryStringArray, enumQueryString: enumQueryString, enumQueryInteger: enumQueryInteger, enumQueryDouble: enumQueryDouble, enumFormStringArray: enumFormStringArray, enumFormString: enumFormString).execute { (response, error) -> Void in
             if let error = error {
@@ -466,19 +464,19 @@ open class FakeAPI {
     open class func testEnumParametersWithRequestBuilder(enumHeaderStringArray: [String]? = nil, enumHeaderString: EnumHeaderString_testEnumParameters? = nil, enumQueryStringArray: [String]? = nil, enumQueryString: EnumQueryString_testEnumParameters? = nil, enumQueryInteger: EnumQueryInteger_testEnumParameters? = nil, enumQueryDouble: EnumQueryDouble_testEnumParameters? = nil, enumFormStringArray: [String]? = nil, enumFormString: EnumFormString_testEnumParameters? = nil) -> RequestBuilder<Void> {
         let path = "/fake"
         let URLString = PetstoreClientAPI.basePath + path
-        let formParams: [String:Any?] = [
+        let formParams: [String: Any?] = [
             "enum_form_string_array": enumFormStringArray,
             "enum_form_string": enumFormString?.rawValue
         ]
 
         let nonNullParameters = APIHelper.rejectNil(formParams)
         let parameters = APIHelper.convertBoolToString(nonNullParameters)
-        
+
         var url = URLComponents(string: URLString)
         url?.queryItems = APIHelper.mapValuesToQueryItems([
-            "enum_query_string_array": enumQueryStringArray, 
-            "enum_query_string": enumQueryString?.rawValue, 
-            "enum_query_integer": enumQueryInteger?.rawValue, 
+            "enum_query_string_array": enumQueryStringArray,
+            "enum_query_string": enumQueryString?.rawValue,
+            "enum_query_integer": enumQueryInteger?.rawValue,
             "enum_query_double": enumQueryDouble?.rawValue
         ])
         let nillableHeaders: [String: Any?] = [
@@ -503,7 +501,7 @@ open class FakeAPI {
      - parameter int64Group: (query) Integer in group parameters (optional)
      - returns: Promise<Void>
      */
-    open class func testGroupParameters( requiredStringGroup: Int,  requiredBooleanGroup: Bool,  requiredInt64Group: Int64,  stringGroup: Int? = nil,  booleanGroup: Bool? = nil,  int64Group: Int64? = nil) -> Promise<Void> {
+    open class func testGroupParameters( requiredStringGroup: Int, requiredBooleanGroup: Bool, requiredInt64Group: Int64, stringGroup: Int? = nil, booleanGroup: Bool? = nil, int64Group: Int64? = nil) -> Promise<Void> {
         let deferred = Promise<Void>.pending()
         testGroupParametersWithRequestBuilder(requiredStringGroup: requiredStringGroup, requiredBooleanGroup: requiredBooleanGroup, requiredInt64Group: requiredInt64Group, stringGroup: stringGroup, booleanGroup: booleanGroup, int64Group: int64Group).execute { (response, error) -> Void in
             if let error = error {
@@ -530,13 +528,13 @@ open class FakeAPI {
     open class func testGroupParametersWithRequestBuilder(requiredStringGroup: Int, requiredBooleanGroup: Bool, requiredInt64Group: Int64, stringGroup: Int? = nil, booleanGroup: Bool? = nil, int64Group: Int64? = nil) -> RequestBuilder<Void> {
         let path = "/fake"
         let URLString = PetstoreClientAPI.basePath + path
-        let parameters: [String:Any]? = nil
-        
+        let parameters: [String: Any]? = nil
+
         var url = URLComponents(string: URLString)
         url?.queryItems = APIHelper.mapValuesToQueryItems([
-            "required_string_group": requiredStringGroup.encodeToJSON(), 
-            "required_int64_group": requiredInt64Group.encodeToJSON(), 
-            "string_group": stringGroup?.encodeToJSON(), 
+            "required_string_group": requiredStringGroup.encodeToJSON(),
+            "required_int64_group": requiredInt64Group.encodeToJSON(),
+            "string_group": stringGroup?.encodeToJSON(),
             "int64_group": int64Group?.encodeToJSON()
         ])
         let nillableHeaders: [String: Any?] = [
@@ -556,7 +554,7 @@ open class FakeAPI {
      - parameter param: (body) request body 
      - returns: Promise<Void>
      */
-    open class func testInlineAdditionalProperties( param: [String:String]) -> Promise<Void> {
+    open class func testInlineAdditionalProperties( param: [String: String]) -> Promise<Void> {
         let deferred = Promise<Void>.pending()
         testInlineAdditionalPropertiesWithRequestBuilder(param: param).execute { (response, error) -> Void in
             if let error = error {
@@ -574,7 +572,7 @@ open class FakeAPI {
      - parameter param: (body) request body 
      - returns: RequestBuilder<Void> 
      */
-    open class func testInlineAdditionalPropertiesWithRequestBuilder(param: [String:String]) -> RequestBuilder<Void> {
+    open class func testInlineAdditionalPropertiesWithRequestBuilder(param: [String: String]) -> RequestBuilder<Void> {
         let path = "/fake/inline-additionalProperties"
         let URLString = PetstoreClientAPI.basePath + path
         let parameters = JSONEncodingHelper.encodingParameters(forEncodableObject: param)
@@ -593,7 +591,7 @@ open class FakeAPI {
      - parameter param2: (form) field2 
      - returns: Promise<Void>
      */
-    open class func testJsonFormData( param: String,  param2: String) -> Promise<Void> {
+    open class func testJsonFormData( param: String, param2: String) -> Promise<Void> {
         let deferred = Promise<Void>.pending()
         testJsonFormDataWithRequestBuilder(param: param, param2: param2).execute { (response, error) -> Void in
             if let error = error {
@@ -615,14 +613,14 @@ open class FakeAPI {
     open class func testJsonFormDataWithRequestBuilder(param: String, param2: String) -> RequestBuilder<Void> {
         let path = "/fake/jsonFormData"
         let URLString = PetstoreClientAPI.basePath + path
-        let formParams: [String:Any?] = [
+        let formParams: [String: Any?] = [
             "param": param,
             "param2": param2
         ]
 
         let nonNullParameters = APIHelper.rejectNil(formParams)
         let parameters = APIHelper.convertBoolToString(nonNullParameters)
-        
+
         let url = URLComponents(string: URLString)
 
         let requestBuilder: RequestBuilder<Void>.Type = PetstoreClientAPI.requestBuilderFactory.getNonDecodableBuilder()
diff --git a/samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/OpenAPIs/APIs/FakeClassnameTags123API.swift b/samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/OpenAPIs/APIs/FakeClassnameTags123API.swift
index 51e1cd244b..a6bb118c58 100644
--- a/samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/OpenAPIs/APIs/FakeClassnameTags123API.swift
+++ b/samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/OpenAPIs/APIs/FakeClassnameTags123API.swift
@@ -9,8 +9,6 @@ import Foundation
 import Alamofire
 import PromiseKit
 
-
-
 open class FakeClassnameTags123API {
     /**
      To test class name in snake case
diff --git a/samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/OpenAPIs/APIs/PetAPI.swift b/samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/OpenAPIs/APIs/PetAPI.swift
index 29fc9ba64f..a9c64e897b 100644
--- a/samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/OpenAPIs/APIs/PetAPI.swift
+++ b/samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/OpenAPIs/APIs/PetAPI.swift
@@ -9,8 +9,6 @@ import Foundation
 import Alamofire
 import PromiseKit
 
-
-
 open class PetAPI {
     /**
      Add a new pet to the store
@@ -58,7 +56,7 @@ open class PetAPI {
      - parameter apiKey: (header)  (optional)
      - returns: Promise<Void>
      */
-    open class func deletePet( petId: Int64,  apiKey: String? = nil) -> Promise<Void> {
+    open class func deletePet( petId: Int64, apiKey: String? = nil) -> Promise<Void> {
         let deferred = Promise<Void>.pending()
         deletePetWithRequestBuilder(petId: petId, apiKey: apiKey).execute { (response, error) -> Void in
             if let error = error {
@@ -86,8 +84,8 @@ open class PetAPI {
         let petIdPostEscape = petIdPreEscape.addingPercentEncoding(withAllowedCharacters: .urlPathAllowed) ?? ""
         path = path.replacingOccurrences(of: "{petId}", with: petIdPostEscape, options: .literal, range: nil)
         let URLString = PetstoreClientAPI.basePath + path
-        let parameters: [String:Any]? = nil
-        
+        let parameters: [String: Any]? = nil
+
         let url = URLComponents(string: URLString)
         let nillableHeaders: [String: Any?] = [
             "api_key": apiKey
@@ -141,8 +139,8 @@ open class PetAPI {
     open class func findPetsByStatusWithRequestBuilder(status: [String]) -> RequestBuilder<[Pet]> {
         let path = "/pet/findByStatus"
         let URLString = PetstoreClientAPI.basePath + path
-        let parameters: [String:Any]? = nil
-        
+        let parameters: [String: Any]? = nil
+
         var url = URLComponents(string: URLString)
         url?.queryItems = APIHelper.mapValuesToQueryItems([
             "status": status
@@ -186,8 +184,8 @@ open class PetAPI {
     open class func findPetsByTagsWithRequestBuilder(tags: [String]) -> RequestBuilder<[Pet]> {
         let path = "/pet/findByTags"
         let URLString = PetstoreClientAPI.basePath + path
-        let parameters: [String:Any]? = nil
-        
+        let parameters: [String: Any]? = nil
+
         var url = URLComponents(string: URLString)
         url?.queryItems = APIHelper.mapValuesToQueryItems([
             "tags": tags
@@ -234,8 +232,8 @@ open class PetAPI {
         let petIdPostEscape = petIdPreEscape.addingPercentEncoding(withAllowedCharacters: .urlPathAllowed) ?? ""
         path = path.replacingOccurrences(of: "{petId}", with: petIdPostEscape, options: .literal, range: nil)
         let URLString = PetstoreClientAPI.basePath + path
-        let parameters: [String:Any]? = nil
-        
+        let parameters: [String: Any]? = nil
+
         let url = URLComponents(string: URLString)
 
         let requestBuilder: RequestBuilder<Pet>.Type = PetstoreClientAPI.requestBuilderFactory.getBuilder()
@@ -290,7 +288,7 @@ open class PetAPI {
      - parameter status: (form) Updated status of the pet (optional)
      - returns: Promise<Void>
      */
-    open class func updatePetWithForm( petId: Int64,  name: String? = nil,  status: String? = nil) -> Promise<Void> {
+    open class func updatePetWithForm( petId: Int64, name: String? = nil, status: String? = nil) -> Promise<Void> {
         let deferred = Promise<Void>.pending()
         updatePetWithFormWithRequestBuilder(petId: petId, name: name, status: status).execute { (response, error) -> Void in
             if let error = error {
@@ -319,14 +317,14 @@ open class PetAPI {
         let petIdPostEscape = petIdPreEscape.addingPercentEncoding(withAllowedCharacters: .urlPathAllowed) ?? ""
         path = path.replacingOccurrences(of: "{petId}", with: petIdPostEscape, options: .literal, range: nil)
         let URLString = PetstoreClientAPI.basePath + path
-        let formParams: [String:Any?] = [
+        let formParams: [String: Any?] = [
             "name": name,
             "status": status
         ]
 
         let nonNullParameters = APIHelper.rejectNil(formParams)
         let parameters = APIHelper.convertBoolToString(nonNullParameters)
-        
+
         let url = URLComponents(string: URLString)
 
         let requestBuilder: RequestBuilder<Void>.Type = PetstoreClientAPI.requestBuilderFactory.getNonDecodableBuilder()
@@ -342,7 +340,7 @@ open class PetAPI {
      - parameter file: (form) file to upload (optional)
      - returns: Promise<ApiResponse>
      */
-    open class func uploadFile( petId: Int64,  additionalMetadata: String? = nil,  file: URL? = nil) -> Promise<ApiResponse> {
+    open class func uploadFile( petId: Int64, additionalMetadata: String? = nil, file: URL? = nil) -> Promise<ApiResponse> {
         let deferred = Promise<ApiResponse>.pending()
         uploadFileWithRequestBuilder(petId: petId, additionalMetadata: additionalMetadata, file: file).execute { (response, error) -> Void in
             if let error = error {
@@ -373,14 +371,14 @@ open class PetAPI {
         let petIdPostEscape = petIdPreEscape.addingPercentEncoding(withAllowedCharacters: .urlPathAllowed) ?? ""
         path = path.replacingOccurrences(of: "{petId}", with: petIdPostEscape, options: .literal, range: nil)
         let URLString = PetstoreClientAPI.basePath + path
-        let formParams: [String:Any?] = [
+        let formParams: [String: Any?] = [
             "additionalMetadata": additionalMetadata,
             "file": file
         ]
 
         let nonNullParameters = APIHelper.rejectNil(formParams)
         let parameters = APIHelper.convertBoolToString(nonNullParameters)
-        
+
         let url = URLComponents(string: URLString)
 
         let requestBuilder: RequestBuilder<ApiResponse>.Type = PetstoreClientAPI.requestBuilderFactory.getBuilder()
@@ -396,7 +394,7 @@ open class PetAPI {
      - parameter additionalMetadata: (form) Additional data to pass to server (optional)
      - returns: Promise<ApiResponse>
      */
-    open class func uploadFileWithRequiredFile( petId: Int64,  requiredFile: URL,  additionalMetadata: String? = nil) -> Promise<ApiResponse> {
+    open class func uploadFileWithRequiredFile( petId: Int64, requiredFile: URL, additionalMetadata: String? = nil) -> Promise<ApiResponse> {
         let deferred = Promise<ApiResponse>.pending()
         uploadFileWithRequiredFileWithRequestBuilder(petId: petId, requiredFile: requiredFile, additionalMetadata: additionalMetadata).execute { (response, error) -> Void in
             if let error = error {
@@ -427,14 +425,14 @@ open class PetAPI {
         let petIdPostEscape = petIdPreEscape.addingPercentEncoding(withAllowedCharacters: .urlPathAllowed) ?? ""
         path = path.replacingOccurrences(of: "{petId}", with: petIdPostEscape, options: .literal, range: nil)
         let URLString = PetstoreClientAPI.basePath + path
-        let formParams: [String:Any?] = [
+        let formParams: [String: Any?] = [
             "additionalMetadata": additionalMetadata,
             "requiredFile": requiredFile
         ]
 
         let nonNullParameters = APIHelper.rejectNil(formParams)
         let parameters = APIHelper.convertBoolToString(nonNullParameters)
-        
+
         let url = URLComponents(string: URLString)
 
         let requestBuilder: RequestBuilder<ApiResponse>.Type = PetstoreClientAPI.requestBuilderFactory.getBuilder()
diff --git a/samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/OpenAPIs/APIs/StoreAPI.swift b/samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/OpenAPIs/APIs/StoreAPI.swift
index 2461befb0a..502f44af60 100644
--- a/samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/OpenAPIs/APIs/StoreAPI.swift
+++ b/samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/OpenAPIs/APIs/StoreAPI.swift
@@ -9,8 +9,6 @@ import Foundation
 import Alamofire
 import PromiseKit
 
-
-
 open class StoreAPI {
     /**
      Delete purchase order by ID
@@ -43,8 +41,8 @@ open class StoreAPI {
         let orderIdPostEscape = orderIdPreEscape.addingPercentEncoding(withAllowedCharacters: .urlPathAllowed) ?? ""
         path = path.replacingOccurrences(of: "{order_id}", with: orderIdPostEscape, options: .literal, range: nil)
         let URLString = PetstoreClientAPI.basePath + path
-        let parameters: [String:Any]? = nil
-        
+        let parameters: [String: Any]? = nil
+
         let url = URLComponents(string: URLString)
 
         let requestBuilder: RequestBuilder<Void>.Type = PetstoreClientAPI.requestBuilderFactory.getNonDecodableBuilder()
@@ -57,8 +55,8 @@ open class StoreAPI {
      
      - returns: Promise<[String:Int]>
      */
-    open class func getInventory() -> Promise<[String:Int]> {
-        let deferred = Promise<[String:Int]>.pending()
+    open class func getInventory() -> Promise<[String: Int]> {
+        let deferred = Promise<[String: Int]>.pending()
         getInventoryWithRequestBuilder().execute { (response, error) -> Void in
             if let error = error {
                 deferred.reject(error)
@@ -80,14 +78,14 @@ open class StoreAPI {
        - name: api_key
      - returns: RequestBuilder<[String:Int]> 
      */
-    open class func getInventoryWithRequestBuilder() -> RequestBuilder<[String:Int]> {
+    open class func getInventoryWithRequestBuilder() -> RequestBuilder<[String: Int]> {
         let path = "/store/inventory"
         let URLString = PetstoreClientAPI.basePath + path
-        let parameters: [String:Any]? = nil
-        
+        let parameters: [String: Any]? = nil
+
         let url = URLComponents(string: URLString)
 
-        let requestBuilder: RequestBuilder<[String:Int]>.Type = PetstoreClientAPI.requestBuilderFactory.getBuilder()
+        let requestBuilder: RequestBuilder<[String: Int]>.Type = PetstoreClientAPI.requestBuilderFactory.getBuilder()
 
         return requestBuilder.init(method: "GET", URLString: (url?.string ?? URLString), parameters: parameters, isBody: false)
     }
@@ -125,8 +123,8 @@ open class StoreAPI {
         let orderIdPostEscape = orderIdPreEscape.addingPercentEncoding(withAllowedCharacters: .urlPathAllowed) ?? ""
         path = path.replacingOccurrences(of: "{order_id}", with: orderIdPostEscape, options: .literal, range: nil)
         let URLString = PetstoreClientAPI.basePath + path
-        let parameters: [String:Any]? = nil
-        
+        let parameters: [String: Any]? = nil
+
         let url = URLComponents(string: URLString)
 
         let requestBuilder: RequestBuilder<Order>.Type = PetstoreClientAPI.requestBuilderFactory.getBuilder()
diff --git a/samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/OpenAPIs/APIs/UserAPI.swift b/samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/OpenAPIs/APIs/UserAPI.swift
index a306c14e59..793c47447e 100644
--- a/samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/OpenAPIs/APIs/UserAPI.swift
+++ b/samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/OpenAPIs/APIs/UserAPI.swift
@@ -9,8 +9,6 @@ import Foundation
 import Alamofire
 import PromiseKit
 
-
-
 open class UserAPI {
     /**
      Create user
@@ -152,8 +150,8 @@ open class UserAPI {
         let usernamePostEscape = usernamePreEscape.addingPercentEncoding(withAllowedCharacters: .urlPathAllowed) ?? ""
         path = path.replacingOccurrences(of: "{username}", with: usernamePostEscape, options: .literal, range: nil)
         let URLString = PetstoreClientAPI.basePath + path
-        let parameters: [String:Any]? = nil
-        
+        let parameters: [String: Any]? = nil
+
         let url = URLComponents(string: URLString)
 
         let requestBuilder: RequestBuilder<Void>.Type = PetstoreClientAPI.requestBuilderFactory.getNonDecodableBuilder()
@@ -193,8 +191,8 @@ open class UserAPI {
         let usernamePostEscape = usernamePreEscape.addingPercentEncoding(withAllowedCharacters: .urlPathAllowed) ?? ""
         path = path.replacingOccurrences(of: "{username}", with: usernamePostEscape, options: .literal, range: nil)
         let URLString = PetstoreClientAPI.basePath + path
-        let parameters: [String:Any]? = nil
-        
+        let parameters: [String: Any]? = nil
+
         let url = URLComponents(string: URLString)
 
         let requestBuilder: RequestBuilder<User>.Type = PetstoreClientAPI.requestBuilderFactory.getBuilder()
@@ -209,7 +207,7 @@ open class UserAPI {
      - parameter password: (query) The password for login in clear text 
      - returns: Promise<String>
      */
-    open class func loginUser( username: String,  password: String) -> Promise<String> {
+    open class func loginUser( username: String, password: String) -> Promise<String> {
         let deferred = Promise<String>.pending()
         loginUserWithRequestBuilder(username: username, password: password).execute { (response, error) -> Void in
             if let error = error {
@@ -234,11 +232,11 @@ open class UserAPI {
     open class func loginUserWithRequestBuilder(username: String, password: String) -> RequestBuilder<String> {
         let path = "/user/login"
         let URLString = PetstoreClientAPI.basePath + path
-        let parameters: [String:Any]? = nil
-        
+        let parameters: [String: Any]? = nil
+
         var url = URLComponents(string: URLString)
         url?.queryItems = APIHelper.mapValuesToQueryItems([
-            "username": username, 
+            "username": username,
             "password": password
         ])
 
@@ -272,8 +270,8 @@ open class UserAPI {
     open class func logoutUserWithRequestBuilder() -> RequestBuilder<Void> {
         let path = "/user/logout"
         let URLString = PetstoreClientAPI.basePath + path
-        let parameters: [String:Any]? = nil
-        
+        let parameters: [String: Any]? = nil
+
         let url = URLComponents(string: URLString)
 
         let requestBuilder: RequestBuilder<Void>.Type = PetstoreClientAPI.requestBuilderFactory.getNonDecodableBuilder()
@@ -288,7 +286,7 @@ open class UserAPI {
      - parameter body: (body) Updated user object 
      - returns: Promise<Void>
      */
-    open class func updateUser( username: String,  body: User) -> Promise<Void> {
+    open class func updateUser( username: String, body: User) -> Promise<Void> {
         let deferred = Promise<Void>.pending()
         updateUserWithRequestBuilder(username: username, body: body).execute { (response, error) -> Void in
             if let error = error {
diff --git a/samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/OpenAPIs/AlamofireImplementations.swift b/samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/OpenAPIs/AlamofireImplementations.swift
index dac40e9a31..04ad02a5ce 100644
--- a/samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/OpenAPIs/AlamofireImplementations.swift
+++ b/samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/OpenAPIs/AlamofireImplementations.swift
@@ -12,7 +12,7 @@ class AlamofireRequestBuilderFactory: RequestBuilderFactory {
         return AlamofireRequestBuilder<T>.self
     }
 
-    func getBuilder<T:Decodable>() -> RequestBuilder<T>.Type {
+    func getBuilder<T: Decodable>() -> RequestBuilder<T>.Type {
         return AlamofireDecodableRequestBuilder<T>.self
     }
 }
@@ -50,7 +50,7 @@ private struct SynchronizedDictionary<K: Hashable, V> {
 private var managerStore = SynchronizedDictionary<String, Alamofire.SessionManager>()
 
 open class AlamofireRequestBuilder<T>: RequestBuilder<T> {
-    required public init(method: String, URLString: String, parameters: [String : Any]?, isBody: Bool, headers: [String : String] = [:]) {
+    required public init(method: String, URLString: String, parameters: [String: Any]?, isBody: Bool, headers: [String: String] = [:]) {
         super.init(method: method, URLString: URLString, parameters: parameters, isBody: isBody, headers: headers)
     }
 
@@ -88,17 +88,17 @@ open class AlamofireRequestBuilder<T>: RequestBuilder<T> {
      May be overridden by a subclass if you want to control the request
      configuration (e.g. to override the cache policy).
      */
-    open func makeRequest(manager: SessionManager, method: HTTPMethod, encoding: ParameterEncoding, headers: [String:String]) -> DataRequest {
+    open func makeRequest(manager: SessionManager, method: HTTPMethod, encoding: ParameterEncoding, headers: [String: String]) -> DataRequest {
         return manager.request(URLString, method: method, parameters: parameters, encoding: encoding, headers: headers)
     }
 
     override open func execute(_ completion: @escaping (_ response: Response<T>?, _ error: Error?) -> Void) {
-        let managerId:String = UUID().uuidString
+        let managerId: String = UUID().uuidString
         // Create a new manager for each request to customize its request header
         let manager = createSessionManager()
         managerStore[managerId] = manager
 
-        let encoding:ParameterEncoding = isBody ? JSONDataEncoding() : URLEncoding()
+        let encoding: ParameterEncoding = isBody ? JSONDataEncoding() : URLEncoding()
 
         let xMethod = Alamofire.HTTPMethod(rawValue: method)
         let fileKeys = parameters == nil ? [] : parameters!.filter { $1 is NSURL }
@@ -111,8 +111,7 @@ open class AlamofireRequestBuilder<T>: RequestBuilder<T> {
                     case let fileURL as URL:
                         if let mimeType = self.contentTypeForFormPart(fileURL: fileURL) {
                             mpForm.append(fileURL, withName: k, fileName: fileURL.lastPathComponent, mimeType: mimeType)
-                        }
-                        else {
+                        } else {
                             mpForm.append(fileURL, withName: k)
                         }
                     case let string as String:
@@ -276,7 +275,7 @@ open class AlamofireRequestBuilder<T>: RequestBuilder<T> {
         return httpHeaders
     }
 
-    fileprivate func getFileName(fromContentDisposition contentDisposition : String?) -> String? {
+    fileprivate func getFileName(fromContentDisposition contentDisposition: String?) -> String? {
 
         guard let contentDisposition = contentDisposition else {
             return nil
@@ -284,7 +283,7 @@ open class AlamofireRequestBuilder<T>: RequestBuilder<T> {
 
         let items = contentDisposition.components(separatedBy: ";")
 
-        var filename : String? = nil
+        var filename: String? = nil
 
         for contentItem in items {
 
@@ -304,7 +303,7 @@ open class AlamofireRequestBuilder<T>: RequestBuilder<T> {
 
     }
 
-    fileprivate func getPath(from url : URL) throws -> String {
+    fileprivate func getPath(from url: URL) throws -> String {
 
         guard var path = URLComponents(url: url, resolvingAgainstBaseURL: true)?.path else {
             throw DownloadException.requestMissingPath
@@ -318,7 +317,7 @@ open class AlamofireRequestBuilder<T>: RequestBuilder<T> {
 
     }
 
-    fileprivate func getURL(from urlRequest : URLRequest) throws -> URL {
+    fileprivate func getURL(from urlRequest: URLRequest) throws -> URL {
 
         guard let url = urlRequest.url else {
             throw DownloadException.requestMissingURL
@@ -329,7 +328,7 @@ open class AlamofireRequestBuilder<T>: RequestBuilder<T> {
 
 }
 
-fileprivate enum DownloadException : Error {
+private enum DownloadException: Error {
     case responseDataMissing
     case responseFailed
     case requestMissing
@@ -344,7 +343,7 @@ public enum AlamofireDecodableRequestBuilderError: Error {
     case generalError(Error)
 }
 
-open class AlamofireDecodableRequestBuilder<T:Decodable>: AlamofireRequestBuilder<T> {
+open class AlamofireDecodableRequestBuilder<T: Decodable>: AlamofireRequestBuilder<T> {
 
     override fileprivate func processRequest(request: DataRequest, _ managerId: String, _ completion: @escaping (_ response: Response<T>?, _ error: Error?) -> Void) {
         if let credential = self.credential {
diff --git a/samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/OpenAPIs/CodableHelper.swift b/samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/OpenAPIs/CodableHelper.swift
index 584de8c3d5..111d5a3a8c 100644
--- a/samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/OpenAPIs/CodableHelper.swift
+++ b/samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/OpenAPIs/CodableHelper.swift
@@ -13,7 +13,7 @@ open class CodableHelper {
 
     public static var dateformatter: DateFormatter?
 
-    open class func decode<T>(_ type: T.Type, from data: Data) -> (decodableObj: T?, error: Error?) where T : Decodable {
+    open class func decode<T>(_ type: T.Type, from data: Data) -> (decodableObj: T?, error: Error?) where T: Decodable {
         var returnedDecodable: T? = nil
         var returnedError: Error? = nil
 
@@ -39,7 +39,7 @@ open class CodableHelper {
         return (returnedDecodable, returnedError)
     }
 
-    open class func encode<T>(_ value: T, prettyPrint: Bool = false) -> EncodeResult where T : Encodable {
+    open class func encode<T>(_ value: T, prettyPrint: Bool = false) -> EncodeResult where T: Encodable {
         var returnedData: Data?
         var returnedError: Error? = nil
 
diff --git a/samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/OpenAPIs/Configuration.swift b/samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/OpenAPIs/Configuration.swift
index 516590da5d..e1ecb39726 100644
--- a/samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/OpenAPIs/Configuration.swift
+++ b/samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/OpenAPIs/Configuration.swift
@@ -7,9 +7,9 @@
 import Foundation
 
 open class Configuration {
-	
+
 	// This value is used to configure the date formatter that is used to serialize dates into JSON format. 
 	// You must set it prior to encoding any dates, and it will only be read once. 
     public static var dateFormat = "yyyy-MM-dd'T'HH:mm:ss.SSSZZZZZ"
-    
-}
\ No newline at end of file
+
+}
diff --git a/samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/OpenAPIs/Extensions.swift b/samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/OpenAPIs/Extensions.swift
index 97a90f9af4..d6202ace07 100644
--- a/samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/OpenAPIs/Extensions.swift
+++ b/samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/OpenAPIs/Extensions.swift
@@ -113,24 +113,24 @@ extension String: CodingKey {
 
 extension KeyedEncodingContainerProtocol {
 
-    public mutating func encodeArray<T>(_ values: [T], forKey key: Self.Key) throws where T : Encodable {
+    public mutating func encodeArray<T>(_ values: [T], forKey key: Self.Key) throws where T: Encodable {
         var arrayContainer = nestedUnkeyedContainer(forKey: key)
         try arrayContainer.encode(contentsOf: values)
     }
 
-    public mutating func encodeArrayIfPresent<T>(_ values: [T]?, forKey key: Self.Key) throws where T : Encodable {
+    public mutating func encodeArrayIfPresent<T>(_ values: [T]?, forKey key: Self.Key) throws where T: Encodable {
         if let values = values {
             try encodeArray(values, forKey: key)
         }
     }
 
-    public mutating func encodeMap<T>(_ pairs: [Self.Key: T]) throws where T : Encodable {
+    public mutating func encodeMap<T>(_ pairs: [Self.Key: T]) throws where T: Encodable {
         for (key, value) in pairs {
             try encode(value, forKey: key)
         }
     }
 
-    public mutating func encodeMapIfPresent<T>(_ pairs: [Self.Key: T]?) throws where T : Encodable {
+    public mutating func encodeMapIfPresent<T>(_ pairs: [Self.Key: T]?) throws where T: Encodable {
         if let pairs = pairs {
             try encodeMap(pairs)
         }
@@ -140,7 +140,7 @@ extension KeyedEncodingContainerProtocol {
 
 extension KeyedDecodingContainerProtocol {
 
-    public func decodeArray<T>(_ type: T.Type, forKey key: Self.Key) throws -> [T] where T : Decodable {
+    public func decodeArray<T>(_ type: T.Type, forKey key: Self.Key) throws -> [T] where T: Decodable {
         var tmpArray = [T]()
 
         var nestedContainer = try nestedUnkeyedContainer(forKey: key)
@@ -152,7 +152,7 @@ extension KeyedDecodingContainerProtocol {
         return tmpArray
     }
 
-    public func decodeArrayIfPresent<T>(_ type: T.Type, forKey key: Self.Key) throws -> [T]? where T : Decodable {
+    public func decodeArrayIfPresent<T>(_ type: T.Type, forKey key: Self.Key) throws -> [T]? where T: Decodable {
         var tmpArray: [T]? = nil
 
         if contains(key) {
@@ -162,8 +162,8 @@ extension KeyedDecodingContainerProtocol {
         return tmpArray
     }
 
-    public func decodeMap<T>(_ type: T.Type, excludedKeys: Set<Self.Key>) throws -> [Self.Key: T] where T : Decodable {
-        var map: [Self.Key : T] = [:]
+    public func decodeMap<T>(_ type: T.Type, excludedKeys: Set<Self.Key>) throws -> [Self.Key: T] where T: Decodable {
+        var map: [Self.Key: T] = [:]
 
         for key in allKeys {
             if !excludedKeys.contains(key) {
@@ -178,7 +178,7 @@ extension KeyedDecodingContainerProtocol {
 }
 
 extension RequestBuilder {
-    public func execute() -> Promise<Response<T>>  {
+    public func execute() -> Promise<Response<T>> {
         let deferred = Promise<Response<T>>.pending()
         self.execute { (response: Response<T>?, error: Error?) in
             if let response = response {
diff --git a/samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/OpenAPIs/JSONEncodingHelper.swift b/samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/OpenAPIs/JSONEncodingHelper.swift
index 7044951584..3e68bb5d4a 100644
--- a/samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/OpenAPIs/JSONEncodingHelper.swift
+++ b/samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/OpenAPIs/JSONEncodingHelper.swift
@@ -10,7 +10,7 @@ import Alamofire
 
 open class JSONEncodingHelper {
 
-    open class func encodingParameters<T:Encodable>(forEncodableObject encodableObj: T?) -> Parameters? {
+    open class func encodingParameters<T: Encodable>(forEncodableObject encodableObj: T?) -> Parameters? {
         var params: Parameters? = nil
 
         // Encode the Encodable object
@@ -39,5 +39,5 @@ open class JSONEncodingHelper {
 
         return params
     }
-    
+
 }
diff --git a/samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/OpenAPIs/Models.swift b/samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/OpenAPIs/Models.swift
index 4085638903..e87ce399c7 100644
--- a/samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/OpenAPIs/Models.swift
+++ b/samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/OpenAPIs/Models.swift
@@ -10,7 +10,7 @@ protocol JSONEncodable {
     func encodeToJSON() -> Any
 }
 
-public enum ErrorResponse : Error {
+public enum ErrorResponse: Error {
     case error(Int, Data?, Error)
 }
 
diff --git a/samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/OpenAPIs/Models/AdditionalPropertiesClass.swift b/samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/OpenAPIs/Models/AdditionalPropertiesClass.swift
index 4db39adae8..83a06951cc 100644
--- a/samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/OpenAPIs/Models/AdditionalPropertiesClass.swift
+++ b/samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/OpenAPIs/Models/AdditionalPropertiesClass.swift
@@ -7,23 +7,19 @@
 
 import Foundation
 
-
-
 public struct AdditionalPropertiesClass: Codable {
 
-    public var mapString: [String:String]?
-    public var mapMapString: [String:[String:String]]?
+    public var mapString: [String: String]?
+    public var mapMapString: [String: [String: String]]?
 
-    public init(mapString: [String:String]?, mapMapString: [String:[String:String]]?) {
+    public init(mapString: [String: String]?, mapMapString: [String: [String: String]]?) {
         self.mapString = mapString
         self.mapMapString = mapMapString
     }
 
-    public enum CodingKeys: String, CodingKey { 
+    public enum CodingKeys: String, CodingKey {
         case mapString = "map_string"
         case mapMapString = "map_map_string"
     }
 
-
 }
-
diff --git a/samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/OpenAPIs/Models/Animal.swift b/samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/OpenAPIs/Models/Animal.swift
index 7221a1be09..5ed9f31e2a 100644
--- a/samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/OpenAPIs/Models/Animal.swift
+++ b/samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/OpenAPIs/Models/Animal.swift
@@ -7,8 +7,6 @@
 
 import Foundation
 
-
-
 public struct Animal: Codable {
 
     public var className: String
@@ -19,6 +17,4 @@ public struct Animal: Codable {
         self.color = color
     }
 
-
 }
-
diff --git a/samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/OpenAPIs/Models/AnimalFarm.swift b/samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/OpenAPIs/Models/AnimalFarm.swift
index e7bea63f8e..e09b0e9efd 100644
--- a/samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/OpenAPIs/Models/AnimalFarm.swift
+++ b/samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/OpenAPIs/Models/AnimalFarm.swift
@@ -7,5 +7,4 @@
 
 import Foundation
 
-
 public typealias AnimalFarm = [Animal]
diff --git a/samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/OpenAPIs/Models/ApiResponse.swift b/samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/OpenAPIs/Models/ApiResponse.swift
index a22e9aaebb..ec270da890 100644
--- a/samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/OpenAPIs/Models/ApiResponse.swift
+++ b/samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/OpenAPIs/Models/ApiResponse.swift
@@ -7,8 +7,6 @@
 
 import Foundation
 
-
-
 public struct ApiResponse: Codable {
 
     public var code: Int?
@@ -21,6 +19,4 @@ public struct ApiResponse: Codable {
         self.message = message
     }
 
-
 }
-
diff --git a/samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/OpenAPIs/Models/ArrayOfArrayOfNumberOnly.swift b/samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/OpenAPIs/Models/ArrayOfArrayOfNumberOnly.swift
index 4e5a5ca144..3843287630 100644
--- a/samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/OpenAPIs/Models/ArrayOfArrayOfNumberOnly.swift
+++ b/samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/OpenAPIs/Models/ArrayOfArrayOfNumberOnly.swift
@@ -7,8 +7,6 @@
 
 import Foundation
 
-
-
 public struct ArrayOfArrayOfNumberOnly: Codable {
 
     public var arrayArrayNumber: [[Double]]?
@@ -17,10 +15,8 @@ public struct ArrayOfArrayOfNumberOnly: Codable {
         self.arrayArrayNumber = arrayArrayNumber
     }
 
-    public enum CodingKeys: String, CodingKey { 
+    public enum CodingKeys: String, CodingKey {
         case arrayArrayNumber = "ArrayArrayNumber"
     }
 
-
 }
-
diff --git a/samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/OpenAPIs/Models/ArrayOfNumberOnly.swift b/samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/OpenAPIs/Models/ArrayOfNumberOnly.swift
index 7d059d3683..f8b198e81f 100644
--- a/samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/OpenAPIs/Models/ArrayOfNumberOnly.swift
+++ b/samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/OpenAPIs/Models/ArrayOfNumberOnly.swift
@@ -7,8 +7,6 @@
 
 import Foundation
 
-
-
 public struct ArrayOfNumberOnly: Codable {
 
     public var arrayNumber: [Double]?
@@ -17,10 +15,8 @@ public struct ArrayOfNumberOnly: Codable {
         self.arrayNumber = arrayNumber
     }
 
-    public enum CodingKeys: String, CodingKey { 
+    public enum CodingKeys: String, CodingKey {
         case arrayNumber = "ArrayNumber"
     }
 
-
 }
-
diff --git a/samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/OpenAPIs/Models/ArrayTest.swift b/samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/OpenAPIs/Models/ArrayTest.swift
index 9c56fed50c..67f7f7e515 100644
--- a/samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/OpenAPIs/Models/ArrayTest.swift
+++ b/samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/OpenAPIs/Models/ArrayTest.swift
@@ -7,8 +7,6 @@
 
 import Foundation
 
-
-
 public struct ArrayTest: Codable {
 
     public var arrayOfString: [String]?
@@ -21,12 +19,10 @@ public struct ArrayTest: Codable {
         self.arrayArrayOfModel = arrayArrayOfModel
     }
 
-    public enum CodingKeys: String, CodingKey { 
+    public enum CodingKeys: String, CodingKey {
         case arrayOfString = "array_of_string"
         case arrayArrayOfInteger = "array_array_of_integer"
         case arrayArrayOfModel = "array_array_of_model"
     }
 
-
 }
-
diff --git a/samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/OpenAPIs/Models/Capitalization.swift b/samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/OpenAPIs/Models/Capitalization.swift
index 98cda23dac..d576b50b1c 100644
--- a/samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/OpenAPIs/Models/Capitalization.swift
+++ b/samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/OpenAPIs/Models/Capitalization.swift
@@ -7,8 +7,6 @@
 
 import Foundation
 
-
-
 public struct Capitalization: Codable {
 
     public var smallCamel: String?
@@ -28,7 +26,7 @@ public struct Capitalization: Codable {
         self.ATT_NAME = ATT_NAME
     }
 
-    public enum CodingKeys: String, CodingKey { 
+    public enum CodingKeys: String, CodingKey {
         case smallCamel
         case capitalCamel = "CapitalCamel"
         case smallSnake = "small_Snake"
@@ -37,6 +35,4 @@ public struct Capitalization: Codable {
         case ATT_NAME
     }
 
-
 }
-
diff --git a/samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/OpenAPIs/Models/Cat.swift b/samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/OpenAPIs/Models/Cat.swift
index a116d964ea..7ab887f311 100644
--- a/samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/OpenAPIs/Models/Cat.swift
+++ b/samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/OpenAPIs/Models/Cat.swift
@@ -7,8 +7,6 @@
 
 import Foundation
 
-
-
 public struct Cat: Codable {
 
     public var className: String
@@ -21,6 +19,4 @@ public struct Cat: Codable {
         self.declawed = declawed
     }
 
-
 }
-
diff --git a/samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/OpenAPIs/Models/CatAllOf.swift b/samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/OpenAPIs/Models/CatAllOf.swift
new file mode 100644
index 0000000000..a51ad0dffa
--- /dev/null
+++ b/samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/OpenAPIs/Models/CatAllOf.swift
@@ -0,0 +1,18 @@
+//
+// CatAllOf.swift
+//
+// Generated by openapi-generator
+// https://openapi-generator.tech
+//
+
+import Foundation
+
+public struct CatAllOf: Codable {
+
+    public var declawed: Bool?
+
+    public init(declawed: Bool?) {
+        self.declawed = declawed
+    }
+
+}
diff --git a/samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/OpenAPIs/Models/Category.swift b/samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/OpenAPIs/Models/Category.swift
index e8c489be46..eb8f7e5e19 100644
--- a/samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/OpenAPIs/Models/Category.swift
+++ b/samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/OpenAPIs/Models/Category.swift
@@ -7,8 +7,6 @@
 
 import Foundation
 
-
-
 public struct Category: Codable {
 
     public var id: Int64?
@@ -19,6 +17,4 @@ public struct Category: Codable {
         self.name = name
     }
 
-
 }
-
diff --git a/samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/OpenAPIs/Models/ClassModel.swift b/samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/OpenAPIs/Models/ClassModel.swift
index f673ed127c..28cb30ce7b 100644
--- a/samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/OpenAPIs/Models/ClassModel.swift
+++ b/samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/OpenAPIs/Models/ClassModel.swift
@@ -7,7 +7,6 @@
 
 import Foundation
 
-
 /** Model for testing model with \&quot;_class\&quot; property */
 
 public struct ClassModel: Codable {
@@ -18,6 +17,4 @@ public struct ClassModel: Codable {
         self._class = _class
     }
 
-
 }
-
diff --git a/samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/OpenAPIs/Models/Client.swift b/samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/OpenAPIs/Models/Client.swift
index 51390b6c4e..00245ca372 100644
--- a/samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/OpenAPIs/Models/Client.swift
+++ b/samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/OpenAPIs/Models/Client.swift
@@ -7,8 +7,6 @@
 
 import Foundation
 
-
-
 public struct Client: Codable {
 
     public var client: String?
@@ -17,6 +15,4 @@ public struct Client: Codable {
         self.client = client
     }
 
-
 }
-
diff --git a/samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/OpenAPIs/Models/Dog.swift b/samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/OpenAPIs/Models/Dog.swift
index 239ce74dcc..492c122800 100644
--- a/samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/OpenAPIs/Models/Dog.swift
+++ b/samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/OpenAPIs/Models/Dog.swift
@@ -7,8 +7,6 @@
 
 import Foundation
 
-
-
 public struct Dog: Codable {
 
     public var className: String
@@ -21,6 +19,4 @@ public struct Dog: Codable {
         self.breed = breed
     }
 
-
 }
-
diff --git a/samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/OpenAPIs/Models/DogAllOf.swift b/samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/OpenAPIs/Models/DogAllOf.swift
new file mode 100644
index 0000000000..7786f8acc5
--- /dev/null
+++ b/samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/OpenAPIs/Models/DogAllOf.swift
@@ -0,0 +1,18 @@
+//
+// DogAllOf.swift
+//
+// Generated by openapi-generator
+// https://openapi-generator.tech
+//
+
+import Foundation
+
+public struct DogAllOf: Codable {
+
+    public var breed: String?
+
+    public init(breed: String?) {
+        self.breed = breed
+    }
+
+}
diff --git a/samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/OpenAPIs/Models/EnumArrays.swift b/samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/OpenAPIs/Models/EnumArrays.swift
index 8713961520..5034ff0b8c 100644
--- a/samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/OpenAPIs/Models/EnumArrays.swift
+++ b/samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/OpenAPIs/Models/EnumArrays.swift
@@ -7,8 +7,6 @@
 
 import Foundation
 
-
-
 public struct EnumArrays: Codable {
 
     public enum JustSymbol: String, Codable {
@@ -27,11 +25,9 @@ public struct EnumArrays: Codable {
         self.arrayEnum = arrayEnum
     }
 
-    public enum CodingKeys: String, CodingKey { 
+    public enum CodingKeys: String, CodingKey {
         case justSymbol = "just_symbol"
         case arrayEnum = "array_enum"
     }
 
-
 }
-
diff --git a/samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/OpenAPIs/Models/EnumClass.swift b/samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/OpenAPIs/Models/EnumClass.swift
index 7280a621fe..3c1dfcac57 100644
--- a/samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/OpenAPIs/Models/EnumClass.swift
+++ b/samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/OpenAPIs/Models/EnumClass.swift
@@ -7,7 +7,6 @@
 
 import Foundation
 
-
 public enum EnumClass: String, Codable {
     case abc = "_abc"
     case efg = "-efg"
diff --git a/samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/OpenAPIs/Models/EnumTest.swift b/samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/OpenAPIs/Models/EnumTest.swift
index 0f546c76a2..6db9b34d18 100644
--- a/samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/OpenAPIs/Models/EnumTest.swift
+++ b/samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/OpenAPIs/Models/EnumTest.swift
@@ -7,8 +7,6 @@
 
 import Foundation
 
-
-
 public struct EnumTest: Codable {
 
     public enum EnumString: String, Codable {
@@ -43,7 +41,7 @@ public struct EnumTest: Codable {
         self.outerEnum = outerEnum
     }
 
-    public enum CodingKeys: String, CodingKey { 
+    public enum CodingKeys: String, CodingKey {
         case enumString = "enum_string"
         case enumStringRequired = "enum_string_required"
         case enumInteger = "enum_integer"
@@ -51,6 +49,4 @@ public struct EnumTest: Codable {
         case outerEnum
     }
 
-
 }
-
diff --git a/samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/OpenAPIs/Models/File.swift b/samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/OpenAPIs/Models/File.swift
index c8bd1f1958..ea3520f053 100644
--- a/samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/OpenAPIs/Models/File.swift
+++ b/samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/OpenAPIs/Models/File.swift
@@ -7,7 +7,6 @@
 
 import Foundation
 
-
 /** Must be named &#x60;File&#x60; for test. */
 
 public struct File: Codable {
@@ -19,6 +18,4 @@ public struct File: Codable {
         self.sourceURI = sourceURI
     }
 
-
 }
-
diff --git a/samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/OpenAPIs/Models/FileSchemaTestClass.swift b/samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/OpenAPIs/Models/FileSchemaTestClass.swift
index 64d0250680..532f145793 100644
--- a/samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/OpenAPIs/Models/FileSchemaTestClass.swift
+++ b/samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/OpenAPIs/Models/FileSchemaTestClass.swift
@@ -7,8 +7,6 @@
 
 import Foundation
 
-
-
 public struct FileSchemaTestClass: Codable {
 
     public var file: File?
@@ -19,6 +17,4 @@ public struct FileSchemaTestClass: Codable {
         self.files = files
     }
 
-
 }
-
diff --git a/samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/OpenAPIs/Models/FormatTest.swift b/samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/OpenAPIs/Models/FormatTest.swift
index faa091b065..20bd6d103b 100644
--- a/samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/OpenAPIs/Models/FormatTest.swift
+++ b/samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/OpenAPIs/Models/FormatTest.swift
@@ -7,8 +7,6 @@
 
 import Foundation
 
-
-
 public struct FormatTest: Codable {
 
     public var integer: Int?
@@ -41,6 +39,4 @@ public struct FormatTest: Codable {
         self.password = password
     }
 
-
 }
-
diff --git a/samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/OpenAPIs/Models/HasOnlyReadOnly.swift b/samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/OpenAPIs/Models/HasOnlyReadOnly.swift
index 554aee1081..906ddb06fb 100644
--- a/samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/OpenAPIs/Models/HasOnlyReadOnly.swift
+++ b/samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/OpenAPIs/Models/HasOnlyReadOnly.swift
@@ -7,8 +7,6 @@
 
 import Foundation
 
-
-
 public struct HasOnlyReadOnly: Codable {
 
     public var bar: String?
@@ -19,6 +17,4 @@ public struct HasOnlyReadOnly: Codable {
         self.foo = foo
     }
 
-
 }
-
diff --git a/samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/OpenAPIs/Models/List.swift b/samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/OpenAPIs/Models/List.swift
index 8997340ff4..08d5995387 100644
--- a/samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/OpenAPIs/Models/List.swift
+++ b/samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/OpenAPIs/Models/List.swift
@@ -7,8 +7,6 @@
 
 import Foundation
 
-
-
 public struct List: Codable {
 
     public var _123list: String?
@@ -17,10 +15,8 @@ public struct List: Codable {
         self._123list = _123list
     }
 
-    public enum CodingKeys: String, CodingKey { 
+    public enum CodingKeys: String, CodingKey {
         case _123list = "123-list"
     }
 
-
 }
-
diff --git a/samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/OpenAPIs/Models/MapTest.swift b/samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/OpenAPIs/Models/MapTest.swift
index 2d3a45d35a..3a10a7dfca 100644
--- a/samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/OpenAPIs/Models/MapTest.swift
+++ b/samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/OpenAPIs/Models/MapTest.swift
@@ -7,33 +7,29 @@
 
 import Foundation
 
-
-
 public struct MapTest: Codable {
 
     public enum MapOfEnumString: String, Codable {
         case upper = "UPPER"
         case lower = "lower"
     }
-    public var mapMapOfString: [String:[String:String]]?
-    public var mapOfEnumString: [String:String]?
-    public var directMap: [String:Bool]?
+    public var mapMapOfString: [String: [String: String]]?
+    public var mapOfEnumString: [String: String]?
+    public var directMap: [String: Bool]?
     public var indirectMap: StringBooleanMap?
 
-    public init(mapMapOfString: [String:[String:String]]?, mapOfEnumString: [String:String]?, directMap: [String:Bool]?, indirectMap: StringBooleanMap?) {
+    public init(mapMapOfString: [String: [String: String]]?, mapOfEnumString: [String: String]?, directMap: [String: Bool]?, indirectMap: StringBooleanMap?) {
         self.mapMapOfString = mapMapOfString
         self.mapOfEnumString = mapOfEnumString
         self.directMap = directMap
         self.indirectMap = indirectMap
     }
 
-    public enum CodingKeys: String, CodingKey { 
+    public enum CodingKeys: String, CodingKey {
         case mapMapOfString = "map_map_of_string"
         case mapOfEnumString = "map_of_enum_string"
         case directMap = "direct_map"
         case indirectMap = "indirect_map"
     }
 
-
 }
-
diff --git a/samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/OpenAPIs/Models/MixedPropertiesAndAdditionalPropertiesClass.swift b/samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/OpenAPIs/Models/MixedPropertiesAndAdditionalPropertiesClass.swift
index 7116108fd7..c3deb2f289 100644
--- a/samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/OpenAPIs/Models/MixedPropertiesAndAdditionalPropertiesClass.swift
+++ b/samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/OpenAPIs/Models/MixedPropertiesAndAdditionalPropertiesClass.swift
@@ -7,20 +7,16 @@
 
 import Foundation
 
-
-
 public struct MixedPropertiesAndAdditionalPropertiesClass: Codable {
 
     public var uuid: UUID?
     public var dateTime: Date?
-    public var map: [String:Animal]?
+    public var map: [String: Animal]?
 
-    public init(uuid: UUID?, dateTime: Date?, map: [String:Animal]?) {
+    public init(uuid: UUID?, dateTime: Date?, map: [String: Animal]?) {
         self.uuid = uuid
         self.dateTime = dateTime
         self.map = map
     }
 
-
 }
-
diff --git a/samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/OpenAPIs/Models/Model200Response.swift b/samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/OpenAPIs/Models/Model200Response.swift
index fc1d0606b7..7ed6aad907 100644
--- a/samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/OpenAPIs/Models/Model200Response.swift
+++ b/samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/OpenAPIs/Models/Model200Response.swift
@@ -7,7 +7,6 @@
 
 import Foundation
 
-
 /** Model for testing model name starting with number */
 
 public struct Model200Response: Codable {
@@ -20,11 +19,9 @@ public struct Model200Response: Codable {
         self._class = _class
     }
 
-    public enum CodingKeys: String, CodingKey { 
+    public enum CodingKeys: String, CodingKey {
         case name
         case _class = "class"
     }
 
-
 }
-
diff --git a/samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/OpenAPIs/Models/Name.swift b/samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/OpenAPIs/Models/Name.swift
index cc165d767d..ce9ffe4fb3 100644
--- a/samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/OpenAPIs/Models/Name.swift
+++ b/samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/OpenAPIs/Models/Name.swift
@@ -7,7 +7,6 @@
 
 import Foundation
 
-
 /** Model for testing model name same as property name */
 
 public struct Name: Codable {
@@ -24,13 +23,11 @@ public struct Name: Codable {
         self._123number = _123number
     }
 
-    public enum CodingKeys: String, CodingKey { 
+    public enum CodingKeys: String, CodingKey {
         case name
         case snakeCase = "snake_case"
         case property
         case _123number = "123Number"
     }
 
-
 }
-
diff --git a/samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/OpenAPIs/Models/NumberOnly.swift b/samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/OpenAPIs/Models/NumberOnly.swift
index e6fb206093..abd2269e8e 100644
--- a/samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/OpenAPIs/Models/NumberOnly.swift
+++ b/samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/OpenAPIs/Models/NumberOnly.swift
@@ -7,8 +7,6 @@
 
 import Foundation
 
-
-
 public struct NumberOnly: Codable {
 
     public var justNumber: Double?
@@ -17,10 +15,8 @@ public struct NumberOnly: Codable {
         self.justNumber = justNumber
     }
 
-    public enum CodingKeys: String, CodingKey { 
+    public enum CodingKeys: String, CodingKey {
         case justNumber = "JustNumber"
     }
 
-
 }
-
diff --git a/samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/OpenAPIs/Models/Order.swift b/samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/OpenAPIs/Models/Order.swift
index 83c3b85e66..a6e1b1d2e5 100644
--- a/samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/OpenAPIs/Models/Order.swift
+++ b/samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/OpenAPIs/Models/Order.swift
@@ -7,8 +7,6 @@
 
 import Foundation
 
-
-
 public struct Order: Codable {
 
     public enum Status: String, Codable {
@@ -33,6 +31,4 @@ public struct Order: Codable {
         self.complete = complete
     }
 
-
 }
-
diff --git a/samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/OpenAPIs/Models/OuterComposite.swift b/samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/OpenAPIs/Models/OuterComposite.swift
index edc4523d9f..49aec001c5 100644
--- a/samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/OpenAPIs/Models/OuterComposite.swift
+++ b/samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/OpenAPIs/Models/OuterComposite.swift
@@ -7,8 +7,6 @@
 
 import Foundation
 
-
-
 public struct OuterComposite: Codable {
 
     public var myNumber: Double?
@@ -21,12 +19,10 @@ public struct OuterComposite: Codable {
         self.myBoolean = myBoolean
     }
 
-    public enum CodingKeys: String, CodingKey { 
+    public enum CodingKeys: String, CodingKey {
         case myNumber = "my_number"
         case myString = "my_string"
         case myBoolean = "my_boolean"
     }
 
-
 }
-
diff --git a/samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/OpenAPIs/Models/OuterEnum.swift b/samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/OpenAPIs/Models/OuterEnum.swift
index bd1643d279..9f80fc95ec 100644
--- a/samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/OpenAPIs/Models/OuterEnum.swift
+++ b/samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/OpenAPIs/Models/OuterEnum.swift
@@ -7,7 +7,6 @@
 
 import Foundation
 
-
 public enum OuterEnum: String, Codable {
     case placed = "placed"
     case approved = "approved"
diff --git a/samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/OpenAPIs/Models/Pet.swift b/samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/OpenAPIs/Models/Pet.swift
index 5e39abae6c..af60a550bb 100644
--- a/samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/OpenAPIs/Models/Pet.swift
+++ b/samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/OpenAPIs/Models/Pet.swift
@@ -7,8 +7,6 @@
 
 import Foundation
 
-
-
 public struct Pet: Codable {
 
     public enum Status: String, Codable {
@@ -33,6 +31,4 @@ public struct Pet: Codable {
         self.status = status
     }
 
-
 }
-
diff --git a/samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/OpenAPIs/Models/ReadOnlyFirst.swift b/samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/OpenAPIs/Models/ReadOnlyFirst.swift
index 48b655a5b0..0acd21fd10 100644
--- a/samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/OpenAPIs/Models/ReadOnlyFirst.swift
+++ b/samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/OpenAPIs/Models/ReadOnlyFirst.swift
@@ -7,8 +7,6 @@
 
 import Foundation
 
-
-
 public struct ReadOnlyFirst: Codable {
 
     public var bar: String?
@@ -19,6 +17,4 @@ public struct ReadOnlyFirst: Codable {
         self.baz = baz
     }
 
-
 }
-
diff --git a/samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/OpenAPIs/Models/Return.swift b/samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/OpenAPIs/Models/Return.swift
index de4b218999..076082af84 100644
--- a/samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/OpenAPIs/Models/Return.swift
+++ b/samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/OpenAPIs/Models/Return.swift
@@ -7,7 +7,6 @@
 
 import Foundation
 
-
 /** Model for testing reserved words */
 
 public struct Return: Codable {
@@ -18,10 +17,8 @@ public struct Return: Codable {
         self._return = _return
     }
 
-    public enum CodingKeys: String, CodingKey { 
+    public enum CodingKeys: String, CodingKey {
         case _return = "return"
     }
 
-
 }
-
diff --git a/samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/OpenAPIs/Models/SpecialModelName.swift b/samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/OpenAPIs/Models/SpecialModelName.swift
index 213d896ba9..e79fc45c0e 100644
--- a/samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/OpenAPIs/Models/SpecialModelName.swift
+++ b/samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/OpenAPIs/Models/SpecialModelName.swift
@@ -7,8 +7,6 @@
 
 import Foundation
 
-
-
 public struct SpecialModelName: Codable {
 
     public var specialPropertyName: Int64?
@@ -17,10 +15,8 @@ public struct SpecialModelName: Codable {
         self.specialPropertyName = specialPropertyName
     }
 
-    public enum CodingKeys: String, CodingKey { 
+    public enum CodingKeys: String, CodingKey {
         case specialPropertyName = "$special[property.name]"
     }
 
-
 }
-
diff --git a/samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/OpenAPIs/Models/StringBooleanMap.swift b/samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/OpenAPIs/Models/StringBooleanMap.swift
index ae15e87d94..3f1237fee4 100644
--- a/samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/OpenAPIs/Models/StringBooleanMap.swift
+++ b/samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/OpenAPIs/Models/StringBooleanMap.swift
@@ -7,12 +7,9 @@
 
 import Foundation
 
-
-
 public struct StringBooleanMap: Codable {
 
-
-    public var additionalProperties: [String:Bool] = [:]
+    public var additionalProperties: [String: Bool] = [:]
 
     public subscript(key: String) -> Bool? {
         get {
@@ -45,7 +42,4 @@ public struct StringBooleanMap: Codable {
         additionalProperties = try container.decodeMap(Bool.self, excludedKeys: nonAdditionalPropertyKeys)
     }
 
-
-
 }
-
diff --git a/samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/OpenAPIs/Models/Tag.swift b/samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/OpenAPIs/Models/Tag.swift
index 32ee33a1a1..4dd8a9a9f5 100644
--- a/samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/OpenAPIs/Models/Tag.swift
+++ b/samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/OpenAPIs/Models/Tag.swift
@@ -7,8 +7,6 @@
 
 import Foundation
 
-
-
 public struct Tag: Codable {
 
     public var id: Int64?
@@ -19,6 +17,4 @@ public struct Tag: Codable {
         self.name = name
     }
 
-
 }
-
diff --git a/samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/OpenAPIs/Models/TypeHolderDefault.swift b/samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/OpenAPIs/Models/TypeHolderDefault.swift
index be1afdf026..bf0006e1a2 100644
--- a/samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/OpenAPIs/Models/TypeHolderDefault.swift
+++ b/samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/OpenAPIs/Models/TypeHolderDefault.swift
@@ -7,8 +7,6 @@
 
 import Foundation
 
-
-
 public struct TypeHolderDefault: Codable {
 
     public var stringItem: String = "what"
@@ -25,7 +23,7 @@ public struct TypeHolderDefault: Codable {
         self.arrayItem = arrayItem
     }
 
-    public enum CodingKeys: String, CodingKey { 
+    public enum CodingKeys: String, CodingKey {
         case stringItem = "string_item"
         case numberItem = "number_item"
         case integerItem = "integer_item"
@@ -33,6 +31,4 @@ public struct TypeHolderDefault: Codable {
         case arrayItem = "array_item"
     }
 
-
 }
-
diff --git a/samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/OpenAPIs/Models/TypeHolderExample.swift b/samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/OpenAPIs/Models/TypeHolderExample.swift
index f46c8952e1..602a2a6d18 100644
--- a/samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/OpenAPIs/Models/TypeHolderExample.swift
+++ b/samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/OpenAPIs/Models/TypeHolderExample.swift
@@ -7,8 +7,6 @@
 
 import Foundation
 
-
-
 public struct TypeHolderExample: Codable {
 
     public var stringItem: String
@@ -25,7 +23,7 @@ public struct TypeHolderExample: Codable {
         self.arrayItem = arrayItem
     }
 
-    public enum CodingKeys: String, CodingKey { 
+    public enum CodingKeys: String, CodingKey {
         case stringItem = "string_item"
         case numberItem = "number_item"
         case integerItem = "integer_item"
@@ -33,6 +31,4 @@ public struct TypeHolderExample: Codable {
         case arrayItem = "array_item"
     }
 
-
 }
-
diff --git a/samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/OpenAPIs/Models/User.swift b/samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/OpenAPIs/Models/User.swift
index a61b584420..79f271ed73 100644
--- a/samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/OpenAPIs/Models/User.swift
+++ b/samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/OpenAPIs/Models/User.swift
@@ -7,8 +7,6 @@
 
 import Foundation
 
-
-
 public struct User: Codable {
 
     public var id: Int64?
@@ -32,6 +30,4 @@ public struct User: Codable {
         self.userStatus = userStatus
     }
 
-
 }
-
diff --git a/samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/OpenAPIs/Models/XmlItem.swift b/samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/OpenAPIs/Models/XmlItem.swift
index e1b1ace8b1..aa01668350 100644
--- a/samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/OpenAPIs/Models/XmlItem.swift
+++ b/samples/client/petstore/swift4/promisekit/PetstoreClient/Classes/OpenAPIs/Models/XmlItem.swift
@@ -7,8 +7,6 @@
 
 import Foundation
 
-
-
 public struct XmlItem: Codable {
 
     public var attributeString: String?
@@ -73,7 +71,7 @@ public struct XmlItem: Codable {
         self.prefixNsWrappedArray = prefixNsWrappedArray
     }
 
-    public enum CodingKeys: String, CodingKey { 
+    public enum CodingKeys: String, CodingKey {
         case attributeString = "attribute_string"
         case attributeNumber = "attribute_number"
         case attributeInteger = "attribute_integer"
@@ -105,6 +103,4 @@ public struct XmlItem: Codable {
         case prefixNsWrappedArray = "prefix_ns_wrapped_array"
     }
 
-
 }
-
diff --git a/samples/client/petstore/swift4/promisekit/README.md b/samples/client/petstore/swift4/promisekit/README.md
index 1e7f0a59ea..0711eb8705 100644
--- a/samples/client/petstore/swift4/promisekit/README.md
+++ b/samples/client/petstore/swift4/promisekit/README.md
@@ -73,10 +73,12 @@ Class | Method | HTTP request | Description
  - [ArrayTest](docs/ArrayTest.md)
  - [Capitalization](docs/Capitalization.md)
  - [Cat](docs/Cat.md)
+ - [CatAllOf](docs/CatAllOf.md)
  - [Category](docs/Category.md)
  - [ClassModel](docs/ClassModel.md)
  - [Client](docs/Client.md)
  - [Dog](docs/Dog.md)
+ - [DogAllOf](docs/DogAllOf.md)
  - [EnumArrays](docs/EnumArrays.md)
  - [EnumClass](docs/EnumClass.md)
  - [EnumTest](docs/EnumTest.md)
diff --git a/samples/client/petstore/swift4/promisekit/SwaggerClientTests/Pods/Alamofire/Source/Alamofire.swift b/samples/client/petstore/swift4/promisekit/SwaggerClientTests/Pods/Alamofire/Source/Alamofire.swift
index 2fcc05ca06..a411b77491 100644
--- a/samples/client/petstore/swift4/promisekit/SwaggerClientTests/Pods/Alamofire/Source/Alamofire.swift
+++ b/samples/client/petstore/swift4/promisekit/SwaggerClientTests/Pods/Alamofire/Source/Alamofire.swift
@@ -135,8 +135,7 @@ public func request(
     parameters: Parameters? = nil,
     encoding: ParameterEncoding = URLEncoding.default,
     headers: HTTPHeaders? = nil)
-    -> DataRequest
-{
+    -> DataRequest {
     return SessionManager.default.request(
         url,
         method: method,
@@ -183,8 +182,7 @@ public func download(
     encoding: ParameterEncoding = URLEncoding.default,
     headers: HTTPHeaders? = nil,
     to destination: DownloadRequest.DownloadFileDestination? = nil)
-    -> DownloadRequest
-{
+    -> DownloadRequest {
     return SessionManager.default.download(
         url,
         method: method,
@@ -209,8 +207,7 @@ public func download(
 public func download(
     _ urlRequest: URLRequestConvertible,
     to destination: DownloadRequest.DownloadFileDestination? = nil)
-    -> DownloadRequest
-{
+    -> DownloadRequest {
     return SessionManager.default.download(urlRequest, to: destination)
 }
 
@@ -239,8 +236,7 @@ public func download(
 public func download(
     resumingWith resumeData: Data,
     to destination: DownloadRequest.DownloadFileDestination? = nil)
-    -> DownloadRequest
-{
+    -> DownloadRequest {
     return SessionManager.default.download(resumingWith: resumeData, to: destination)
 }
 
@@ -263,8 +259,7 @@ public func upload(
     to url: URLConvertible,
     method: HTTPMethod = .post,
     headers: HTTPHeaders? = nil)
-    -> UploadRequest
-{
+    -> UploadRequest {
     return SessionManager.default.upload(fileURL, to: url, method: method, headers: headers)
 }
 
@@ -297,8 +292,7 @@ public func upload(
     to url: URLConvertible,
     method: HTTPMethod = .post,
     headers: HTTPHeaders? = nil)
-    -> UploadRequest
-{
+    -> UploadRequest {
     return SessionManager.default.upload(data, to: url, method: method, headers: headers)
 }
 
@@ -331,8 +325,7 @@ public func upload(
     to url: URLConvertible,
     method: HTTPMethod = .post,
     headers: HTTPHeaders? = nil)
-    -> UploadRequest
-{
+    -> UploadRequest {
     return SessionManager.default.upload(stream, to: url, method: method, headers: headers)
 }
 
@@ -379,8 +372,7 @@ public func upload(
     to url: URLConvertible,
     method: HTTPMethod = .post,
     headers: HTTPHeaders? = nil,
-    encodingCompletion: ((SessionManager.MultipartFormDataEncodingResult) -> Void)?)
-{
+    encodingCompletion: ((SessionManager.MultipartFormDataEncodingResult) -> Void)?) {
     return SessionManager.default.upload(
         multipartFormData: multipartFormData,
         usingThreshold: encodingMemoryThreshold,
@@ -416,8 +408,7 @@ public func upload(
     multipartFormData: @escaping (MultipartFormData) -> Void,
     usingThreshold encodingMemoryThreshold: UInt64 = SessionManager.multipartFormDataEncodingMemoryThreshold,
     with urlRequest: URLRequestConvertible,
-    encodingCompletion: ((SessionManager.MultipartFormDataEncodingResult) -> Void)?)
-{
+    encodingCompletion: ((SessionManager.MultipartFormDataEncodingResult) -> Void)?) {
     return SessionManager.default.upload(
         multipartFormData: multipartFormData,
         usingThreshold: encodingMemoryThreshold,
diff --git a/samples/client/petstore/swift4/promisekit/SwaggerClientTests/Pods/Alamofire/Source/MultipartFormData.swift b/samples/client/petstore/swift4/promisekit/SwaggerClientTests/Pods/Alamofire/Source/MultipartFormData.swift
index 057e68b977..85a0685748 100644
--- a/samples/client/petstore/swift4/promisekit/SwaggerClientTests/Pods/Alamofire/Source/MultipartFormData.swift
+++ b/samples/client/petstore/swift4/promisekit/SwaggerClientTests/Pods/Alamofire/Source/MultipartFormData.swift
@@ -275,8 +275,7 @@ open class MultipartFormData {
             }
 
             bodyContentLength = fileSize.uint64Value
-        }
-        catch {
+        } catch {
             setBodyPartError(withReason: .bodyPartFileSizeQueryFailedWithError(forURL: fileURL, error: error))
             return
         }
@@ -312,8 +311,7 @@ open class MultipartFormData {
         withLength length: UInt64,
         name: String,
         fileName: String,
-        mimeType: String)
-    {
+        mimeType: String) {
         let headers = contentHeaders(withName: name, fileName: fileName, mimeType: mimeType)
         append(stream, withLength: length, headers: headers)
     }
diff --git a/samples/client/petstore/swift4/promisekit/SwaggerClientTests/Pods/Alamofire/Source/NetworkReachabilityManager.swift b/samples/client/petstore/swift4/promisekit/SwaggerClientTests/Pods/Alamofire/Source/NetworkReachabilityManager.swift
index 3ff2e7fc27..60bda83d2f 100644
--- a/samples/client/petstore/swift4/promisekit/SwaggerClientTests/Pods/Alamofire/Source/NetworkReachabilityManager.swift
+++ b/samples/client/petstore/swift4/promisekit/SwaggerClientTests/Pods/Alamofire/Source/NetworkReachabilityManager.swift
@@ -146,8 +146,7 @@ open class NetworkReachabilityManager {
         context.info = Unmanaged.passUnretained(self).toOpaque()
 
         let callbackEnabled = SCNetworkReachabilitySetCallback(
-            reachability,
-            { (_, flags, info) in
+            reachability, { (_, flags, info) in
                 let reachability = Unmanaged<NetworkReachabilityManager>.fromOpaque(info!).takeUnretainedValue()
                 reachability.notifyListener(flags)
             },
@@ -216,8 +215,7 @@ extension NetworkReachabilityManager.NetworkReachabilityStatus: Equatable {}
 public func ==(
     lhs: NetworkReachabilityManager.NetworkReachabilityStatus,
     rhs: NetworkReachabilityManager.NetworkReachabilityStatus)
-    -> Bool
-{
+    -> Bool {
     switch (lhs, rhs) {
     case (.unknown, .unknown):
         return true
diff --git a/samples/client/petstore/swift4/promisekit/SwaggerClientTests/Pods/Alamofire/Source/ParameterEncoding.swift b/samples/client/petstore/swift4/promisekit/SwaggerClientTests/Pods/Alamofire/Source/ParameterEncoding.swift
index 4a54f2dd00..344a048cad 100644
--- a/samples/client/petstore/swift4/promisekit/SwaggerClientTests/Pods/Alamofire/Source/ParameterEncoding.swift
+++ b/samples/client/petstore/swift4/promisekit/SwaggerClientTests/Pods/Alamofire/Source/ParameterEncoding.swift
@@ -435,8 +435,7 @@ public struct PropertyListEncoding: ParameterEncoding {
     /// - returns: The new `PropertyListEncoding` instance.
     public init(
         format: PropertyListSerialization.PropertyListFormat = .xml,
-        options: PropertyListSerialization.WriteOptions = 0)
-    {
+        options: PropertyListSerialization.WriteOptions = 0) {
         self.format = format
         self.options = options
     }
diff --git a/samples/client/petstore/swift4/promisekit/SwaggerClientTests/Pods/Alamofire/Source/Request.swift b/samples/client/petstore/swift4/promisekit/SwaggerClientTests/Pods/Alamofire/Source/Request.swift
index ea43411377..18b83a0e73 100644
--- a/samples/client/petstore/swift4/promisekit/SwaggerClientTests/Pods/Alamofire/Source/Request.swift
+++ b/samples/client/petstore/swift4/promisekit/SwaggerClientTests/Pods/Alamofire/Source/Request.swift
@@ -161,8 +161,7 @@ open class Request {
         user: String,
         password: String,
         persistence: URLCredential.Persistence = .forSession)
-        -> Self
-    {
+        -> Self {
         let credential = URLCredential(user: user, password: password, persistence: persistence)
         return authenticate(usingCredential: credential)
     }
@@ -538,8 +537,7 @@ open class DownloadRequest: Request {
     open class func suggestedDownloadDestination(
         for directory: FileManager.SearchPathDirectory = .documentDirectory,
         in domain: FileManager.SearchPathDomainMask = .userDomainMask)
-        -> DownloadFileDestination
-    {
+        -> DownloadFileDestination {
         return { temporaryURL, response in
             let directoryURLs = FileManager.default.urls(for: directory, in: domain)
 
diff --git a/samples/client/petstore/swift4/promisekit/SwaggerClientTests/Pods/Alamofire/Source/Response.swift b/samples/client/petstore/swift4/promisekit/SwaggerClientTests/Pods/Alamofire/Source/Response.swift
index 74b1ef54d0..23571383ba 100644
--- a/samples/client/petstore/swift4/promisekit/SwaggerClientTests/Pods/Alamofire/Source/Response.swift
+++ b/samples/client/petstore/swift4/promisekit/SwaggerClientTests/Pods/Alamofire/Source/Response.swift
@@ -58,8 +58,7 @@ public struct DefaultDataResponse {
         data: Data?,
         error: Error?,
         timeline: Timeline = Timeline(),
-        metrics: AnyObject? = nil)
-    {
+        metrics: AnyObject? = nil) {
         self.request = request
         self.response = response
         self.data = data
@@ -109,8 +108,7 @@ public struct DataResponse<Value> {
         response: HTTPURLResponse?,
         data: Data?,
         result: Result<Value>,
-        timeline: Timeline = Timeline())
-    {
+        timeline: Timeline = Timeline()) {
         self.request = request
         self.response = response
         self.data = data
@@ -296,8 +294,7 @@ public struct DefaultDownloadResponse {
         resumeData: Data?,
         error: Error?,
         timeline: Timeline = Timeline(),
-        metrics: AnyObject? = nil)
-    {
+        metrics: AnyObject? = nil) {
         self.request = request
         self.response = response
         self.temporaryURL = temporaryURL
@@ -359,8 +356,7 @@ public struct DownloadResponse<Value> {
         destinationURL: URL?,
         resumeData: Data?,
         result: Result<Value>,
-        timeline: Timeline = Timeline())
-    {
+        timeline: Timeline = Timeline()) {
         self.request = request
         self.response = response
         self.temporaryURL = temporaryURL
diff --git a/samples/client/petstore/swift4/promisekit/SwaggerClientTests/Pods/Alamofire/Source/ResponseSerialization.swift b/samples/client/petstore/swift4/promisekit/SwaggerClientTests/Pods/Alamofire/Source/ResponseSerialization.swift
index 3333726d5c..fd049edac1 100644
--- a/samples/client/petstore/swift4/promisekit/SwaggerClientTests/Pods/Alamofire/Source/ResponseSerialization.swift
+++ b/samples/client/petstore/swift4/promisekit/SwaggerClientTests/Pods/Alamofire/Source/ResponseSerialization.swift
@@ -144,8 +144,7 @@ extension DataRequest {
         queue: DispatchQueue? = nil,
         responseSerializer: T,
         completionHandler: @escaping (DataResponse<T.SerializedObject>) -> Void)
-        -> Self
-    {
+        -> Self {
         delegate.queue.addOperation {
             let result = responseSerializer.serializeResponse(
                 self.request,
@@ -182,8 +181,7 @@ extension DownloadRequest {
     public func response(
         queue: DispatchQueue? = nil,
         completionHandler: @escaping (DefaultDownloadResponse) -> Void)
-        -> Self
-    {
+        -> Self {
         delegate.queue.addOperation {
             (queue ?? DispatchQueue.main).async {
                 var downloadResponse = DefaultDownloadResponse(
@@ -218,8 +216,7 @@ extension DownloadRequest {
         queue: DispatchQueue? = nil,
         responseSerializer: T,
         completionHandler: @escaping (DownloadResponse<T.SerializedObject>) -> Void)
-        -> Self
-    {
+        -> Self {
         delegate.queue.addOperation {
             let result = responseSerializer.serializeResponse(
                 self.request,
@@ -289,8 +286,7 @@ extension DataRequest {
     public func responseData(
         queue: DispatchQueue? = nil,
         completionHandler: @escaping (DataResponse<Data>) -> Void)
-        -> Self
-    {
+        -> Self {
         return response(
             queue: queue,
             responseSerializer: DataRequest.dataResponseSerializer(),
@@ -329,8 +325,7 @@ extension DownloadRequest {
     public func responseData(
         queue: DispatchQueue? = nil,
         completionHandler: @escaping (DownloadResponse<Data>) -> Void)
-        -> Self
-    {
+        -> Self {
         return response(
             queue: queue,
             responseSerializer: DownloadRequest.dataResponseSerializer(),
@@ -356,8 +351,7 @@ extension Request {
         response: HTTPURLResponse?,
         data: Data?,
         error: Error?)
-        -> Result<String>
-    {
+        -> Result<String> {
         guard error == nil else { return .failure(error!) }
 
         if let response = response, emptyDataStatusCodes.contains(response.statusCode) { return .success("") }
@@ -411,8 +405,7 @@ extension DataRequest {
         queue: DispatchQueue? = nil,
         encoding: String.Encoding? = nil,
         completionHandler: @escaping (DataResponse<String>) -> Void)
-        -> Self
-    {
+        -> Self {
         return response(
             queue: queue,
             responseSerializer: DataRequest.stringResponseSerializer(encoding: encoding),
@@ -459,8 +452,7 @@ extension DownloadRequest {
         queue: DispatchQueue? = nil,
         encoding: String.Encoding? = nil,
         completionHandler: @escaping (DownloadResponse<String>) -> Void)
-        -> Self
-    {
+        -> Self {
         return response(
             queue: queue,
             responseSerializer: DownloadRequest.stringResponseSerializer(encoding: encoding),
@@ -486,8 +478,7 @@ extension Request {
         response: HTTPURLResponse?,
         data: Data?,
         error: Error?)
-        -> Result<Any>
-    {
+        -> Result<Any> {
         guard error == nil else { return .failure(error!) }
 
         if let response = response, emptyDataStatusCodes.contains(response.statusCode) { return .success(NSNull()) }
@@ -514,8 +505,7 @@ extension DataRequest {
     /// - returns: A JSON object response serializer.
     public static func jsonResponseSerializer(
         options: JSONSerialization.ReadingOptions = .allowFragments)
-        -> DataResponseSerializer<Any>
-    {
+        -> DataResponseSerializer<Any> {
         return DataResponseSerializer { _, response, data, error in
             return Request.serializeResponseJSON(options: options, response: response, data: data, error: error)
         }
@@ -532,8 +522,7 @@ extension DataRequest {
         queue: DispatchQueue? = nil,
         options: JSONSerialization.ReadingOptions = .allowFragments,
         completionHandler: @escaping (DataResponse<Any>) -> Void)
-        -> Self
-    {
+        -> Self {
         return response(
             queue: queue,
             responseSerializer: DataRequest.jsonResponseSerializer(options: options),
@@ -551,8 +540,7 @@ extension DownloadRequest {
     /// - returns: A JSON object response serializer.
     public static func jsonResponseSerializer(
         options: JSONSerialization.ReadingOptions = .allowFragments)
-        -> DownloadResponseSerializer<Any>
-    {
+        -> DownloadResponseSerializer<Any> {
         return DownloadResponseSerializer { _, response, fileURL, error in
             guard error == nil else { return .failure(error!) }
 
@@ -580,8 +568,7 @@ extension DownloadRequest {
         queue: DispatchQueue? = nil,
         options: JSONSerialization.ReadingOptions = .allowFragments,
         completionHandler: @escaping (DownloadResponse<Any>) -> Void)
-        -> Self
-    {
+        -> Self {
         return response(
             queue: queue,
             responseSerializer: DownloadRequest.jsonResponseSerializer(options: options),
@@ -607,8 +594,7 @@ extension Request {
         response: HTTPURLResponse?,
         data: Data?,
         error: Error?)
-        -> Result<Any>
-    {
+        -> Result<Any> {
         guard error == nil else { return .failure(error!) }
 
         if let response = response, emptyDataStatusCodes.contains(response.statusCode) { return .success(NSNull()) }
@@ -635,8 +621,7 @@ extension DataRequest {
     /// - returns: A property list object response serializer.
     public static func propertyListResponseSerializer(
         options: PropertyListSerialization.ReadOptions = [])
-        -> DataResponseSerializer<Any>
-    {
+        -> DataResponseSerializer<Any> {
         return DataResponseSerializer { _, response, data, error in
             return Request.serializeResponsePropertyList(options: options, response: response, data: data, error: error)
         }
@@ -653,8 +638,7 @@ extension DataRequest {
         queue: DispatchQueue? = nil,
         options: PropertyListSerialization.ReadOptions = [],
         completionHandler: @escaping (DataResponse<Any>) -> Void)
-        -> Self
-    {
+        -> Self {
         return response(
             queue: queue,
             responseSerializer: DataRequest.propertyListResponseSerializer(options: options),
@@ -672,8 +656,7 @@ extension DownloadRequest {
     /// - returns: A property list object response serializer.
     public static func propertyListResponseSerializer(
         options: PropertyListSerialization.ReadOptions = [])
-        -> DownloadResponseSerializer<Any>
-    {
+        -> DownloadResponseSerializer<Any> {
         return DownloadResponseSerializer { _, response, fileURL, error in
             guard error == nil else { return .failure(error!) }
 
@@ -701,8 +684,7 @@ extension DownloadRequest {
         queue: DispatchQueue? = nil,
         options: PropertyListSerialization.ReadOptions = [],
         completionHandler: @escaping (DownloadResponse<Any>) -> Void)
-        -> Self
-    {
+        -> Self {
         return response(
             queue: queue,
             responseSerializer: DownloadRequest.propertyListResponseSerializer(options: options),
diff --git a/samples/client/petstore/swift4/promisekit/SwaggerClientTests/Pods/Alamofire/Source/ServerTrustPolicy.swift b/samples/client/petstore/swift4/promisekit/SwaggerClientTests/Pods/Alamofire/Source/ServerTrustPolicy.swift
index 7f44c8d2c6..d50e941fab 100644
--- a/samples/client/petstore/swift4/promisekit/SwaggerClientTests/Pods/Alamofire/Source/ServerTrustPolicy.swift
+++ b/samples/client/petstore/swift4/promisekit/SwaggerClientTests/Pods/Alamofire/Source/ServerTrustPolicy.swift
@@ -249,7 +249,6 @@ public enum ServerTrustPolicy {
             let unspecified = SecTrustResultType.unspecified
             let proceed = SecTrustResultType.proceed
 
-
             isValid = result == unspecified || result == proceed
         }
 
diff --git a/samples/client/petstore/swift4/promisekit/SwaggerClientTests/Pods/Alamofire/Source/SessionDelegate.swift b/samples/client/petstore/swift4/promisekit/SwaggerClientTests/Pods/Alamofire/Source/SessionDelegate.swift
index 03bcb7ced6..17d0d9f150 100644
--- a/samples/client/petstore/swift4/promisekit/SwaggerClientTests/Pods/Alamofire/Source/SessionDelegate.swift
+++ b/samples/client/petstore/swift4/promisekit/SwaggerClientTests/Pods/Alamofire/Source/SessionDelegate.swift
@@ -255,8 +255,7 @@ extension SessionDelegate: URLSessionDelegate {
     open func urlSession(
         _ session: URLSession,
         didReceive challenge: URLAuthenticationChallenge,
-        completionHandler: @escaping (URLSession.AuthChallengeDisposition, URLCredential?) -> Void)
-    {
+        completionHandler: @escaping (URLSession.AuthChallengeDisposition, URLCredential?) -> Void) {
         guard sessionDidReceiveChallengeWithCompletion == nil else {
             sessionDidReceiveChallengeWithCompletion?(session, challenge, completionHandler)
             return
@@ -315,8 +314,7 @@ extension SessionDelegate: URLSessionTaskDelegate {
         task: URLSessionTask,
         willPerformHTTPRedirection response: HTTPURLResponse,
         newRequest request: URLRequest,
-        completionHandler: @escaping (URLRequest?) -> Void)
-    {
+        completionHandler: @escaping (URLRequest?) -> Void) {
         guard taskWillPerformHTTPRedirectionWithCompletion == nil else {
             taskWillPerformHTTPRedirectionWithCompletion?(session, task, response, request, completionHandler)
             return
@@ -342,8 +340,7 @@ extension SessionDelegate: URLSessionTaskDelegate {
         _ session: URLSession,
         task: URLSessionTask,
         didReceive challenge: URLAuthenticationChallenge,
-        completionHandler: @escaping (URLSession.AuthChallengeDisposition, URLCredential?) -> Void)
-    {
+        completionHandler: @escaping (URLSession.AuthChallengeDisposition, URLCredential?) -> Void) {
         guard taskDidReceiveChallengeWithCompletion == nil else {
             taskDidReceiveChallengeWithCompletion?(session, task, challenge, completionHandler)
             return
@@ -372,8 +369,7 @@ extension SessionDelegate: URLSessionTaskDelegate {
     open func urlSession(
         _ session: URLSession,
         task: URLSessionTask,
-        needNewBodyStream completionHandler: @escaping (InputStream?) -> Void)
-    {
+        needNewBodyStream completionHandler: @escaping (InputStream?) -> Void) {
         guard taskNeedNewBodyStreamWithCompletion == nil else {
             taskNeedNewBodyStreamWithCompletion?(session, task, completionHandler)
             return
@@ -398,8 +394,7 @@ extension SessionDelegate: URLSessionTaskDelegate {
         task: URLSessionTask,
         didSendBodyData bytesSent: Int64,
         totalBytesSent: Int64,
-        totalBytesExpectedToSend: Int64)
-    {
+        totalBytesExpectedToSend: Int64) {
         if let taskDidSendBodyData = taskDidSendBodyData {
             taskDidSendBodyData(session, task, bytesSent, totalBytesSent, totalBytesExpectedToSend)
         } else if let delegate = self[task]?.delegate as? UploadTaskDelegate {
@@ -512,8 +507,7 @@ extension SessionDelegate: URLSessionDataDelegate {
         _ session: URLSession,
         dataTask: URLSessionDataTask,
         didReceive response: URLResponse,
-        completionHandler: @escaping (URLSession.ResponseDisposition) -> Void)
-    {
+        completionHandler: @escaping (URLSession.ResponseDisposition) -> Void) {
         guard dataTaskDidReceiveResponseWithCompletion == nil else {
             dataTaskDidReceiveResponseWithCompletion?(session, dataTask, response, completionHandler)
             return
@@ -536,8 +530,7 @@ extension SessionDelegate: URLSessionDataDelegate {
     open func urlSession(
         _ session: URLSession,
         dataTask: URLSessionDataTask,
-        didBecome downloadTask: URLSessionDownloadTask)
-    {
+        didBecome downloadTask: URLSessionDownloadTask) {
         if let dataTaskDidBecomeDownloadTask = dataTaskDidBecomeDownloadTask {
             dataTaskDidBecomeDownloadTask(session, dataTask, downloadTask)
         } else {
@@ -573,8 +566,7 @@ extension SessionDelegate: URLSessionDataDelegate {
         _ session: URLSession,
         dataTask: URLSessionDataTask,
         willCacheResponse proposedResponse: CachedURLResponse,
-        completionHandler: @escaping (CachedURLResponse?) -> Void)
-    {
+        completionHandler: @escaping (CachedURLResponse?) -> Void) {
         guard dataTaskWillCacheResponseWithCompletion == nil else {
             dataTaskWillCacheResponseWithCompletion?(session, dataTask, proposedResponse, completionHandler)
             return
@@ -608,8 +600,7 @@ extension SessionDelegate: URLSessionDownloadDelegate {
     open func urlSession(
         _ session: URLSession,
         downloadTask: URLSessionDownloadTask,
-        didFinishDownloadingTo location: URL)
-    {
+        didFinishDownloadingTo location: URL) {
         if let downloadTaskDidFinishDownloadingToURL = downloadTaskDidFinishDownloadingToURL {
             downloadTaskDidFinishDownloadingToURL(session, downloadTask, location)
         } else if let delegate = self[downloadTask]?.delegate as? DownloadTaskDelegate {
@@ -632,8 +623,7 @@ extension SessionDelegate: URLSessionDownloadDelegate {
         downloadTask: URLSessionDownloadTask,
         didWriteData bytesWritten: Int64,
         totalBytesWritten: Int64,
-        totalBytesExpectedToWrite: Int64)
-    {
+        totalBytesExpectedToWrite: Int64) {
         if let downloadTaskDidWriteData = downloadTaskDidWriteData {
             downloadTaskDidWriteData(session, downloadTask, bytesWritten, totalBytesWritten, totalBytesExpectedToWrite)
         } else if let delegate = self[downloadTask]?.delegate as? DownloadTaskDelegate {
@@ -661,8 +651,7 @@ extension SessionDelegate: URLSessionDownloadDelegate {
         _ session: URLSession,
         downloadTask: URLSessionDownloadTask,
         didResumeAtOffset fileOffset: Int64,
-        expectedTotalBytes: Int64)
-    {
+        expectedTotalBytes: Int64) {
         if let downloadTaskDidResumeAtOffset = downloadTaskDidResumeAtOffset {
             downloadTaskDidResumeAtOffset(session, downloadTask, fileOffset, expectedTotalBytes)
         } else if let delegate = self[downloadTask]?.delegate as? DownloadTaskDelegate {
@@ -716,8 +705,7 @@ extension SessionDelegate: URLSessionStreamDelegate {
         _ session: URLSession,
         streamTask: URLSessionStreamTask,
         didBecome inputStream: InputStream,
-        outputStream: OutputStream)
-    {
+        outputStream: OutputStream) {
         streamTaskDidBecomeInputAndOutputStreams?(session, streamTask, inputStream, outputStream)
     }
 }
diff --git a/samples/client/petstore/swift4/promisekit/SwaggerClientTests/Pods/Alamofire/Source/SessionManager.swift b/samples/client/petstore/swift4/promisekit/SwaggerClientTests/Pods/Alamofire/Source/SessionManager.swift
index 8779efdaa6..8c10706677 100644
--- a/samples/client/petstore/swift4/promisekit/SwaggerClientTests/Pods/Alamofire/Source/SessionManager.swift
+++ b/samples/client/petstore/swift4/promisekit/SwaggerClientTests/Pods/Alamofire/Source/SessionManager.swift
@@ -166,8 +166,7 @@ open class SessionManager {
     public init(
         configuration: URLSessionConfiguration = URLSessionConfiguration.default,
         delegate: SessionDelegate = SessionDelegate(),
-        serverTrustPolicyManager: ServerTrustPolicyManager? = nil)
-    {
+        serverTrustPolicyManager: ServerTrustPolicyManager? = nil) {
         self.delegate = delegate
         self.session = URLSession(configuration: configuration, delegate: delegate, delegateQueue: nil)
 
@@ -185,8 +184,7 @@ open class SessionManager {
     public init?(
         session: URLSession,
         delegate: SessionDelegate,
-        serverTrustPolicyManager: ServerTrustPolicyManager? = nil)
-    {
+        serverTrustPolicyManager: ServerTrustPolicyManager? = nil) {
         guard delegate === session.delegate else { return nil }
 
         self.delegate = delegate
@@ -229,8 +227,7 @@ open class SessionManager {
         parameters: Parameters? = nil,
         encoding: ParameterEncoding = URLEncoding.default,
         headers: HTTPHeaders? = nil)
-        -> DataRequest
-    {
+        -> DataRequest {
         var originalRequest: URLRequest?
 
         do {
@@ -320,8 +317,7 @@ open class SessionManager {
         encoding: ParameterEncoding = URLEncoding.default,
         headers: HTTPHeaders? = nil,
         to destination: DownloadRequest.DownloadFileDestination? = nil)
-        -> DownloadRequest
-    {
+        -> DownloadRequest {
         do {
             let urlRequest = try URLRequest(url: url, method: method, headers: headers)
             let encodedURLRequest = try encoding.encode(urlRequest, with: parameters)
@@ -347,8 +343,7 @@ open class SessionManager {
     open func download(
         _ urlRequest: URLRequestConvertible,
         to destination: DownloadRequest.DownloadFileDestination? = nil)
-        -> DownloadRequest
-    {
+        -> DownloadRequest {
         do {
             let urlRequest = try urlRequest.asURLRequest()
             return download(.request(urlRequest), to: destination)
@@ -384,8 +379,7 @@ open class SessionManager {
     open func download(
         resumingWith resumeData: Data,
         to destination: DownloadRequest.DownloadFileDestination? = nil)
-        -> DownloadRequest
-    {
+        -> DownloadRequest {
         return download(.resumeData(resumeData), to: destination)
     }
 
@@ -394,8 +388,7 @@ open class SessionManager {
     private func download(
         _ downloadable: DownloadRequest.Downloadable,
         to destination: DownloadRequest.DownloadFileDestination?)
-        -> DownloadRequest
-    {
+        -> DownloadRequest {
         do {
             let task = try downloadable.task(session: session, adapter: adapter, queue: queue)
             let download = DownloadRequest(session: session, requestTask: .download(downloadable, task))
@@ -416,8 +409,7 @@ open class SessionManager {
         _ downloadable: DownloadRequest.Downloadable?,
         to destination: DownloadRequest.DownloadFileDestination?,
         failedWith error: Error)
-        -> DownloadRequest
-    {
+        -> DownloadRequest {
         var downloadTask: Request.RequestTask = .download(nil, nil)
 
         if let downloadable = downloadable {
@@ -458,8 +450,7 @@ open class SessionManager {
         to url: URLConvertible,
         method: HTTPMethod = .post,
         headers: HTTPHeaders? = nil)
-        -> UploadRequest
-    {
+        -> UploadRequest {
         do {
             let urlRequest = try URLRequest(url: url, method: method, headers: headers)
             return upload(fileURL, with: urlRequest)
@@ -504,8 +495,7 @@ open class SessionManager {
         to url: URLConvertible,
         method: HTTPMethod = .post,
         headers: HTTPHeaders? = nil)
-        -> UploadRequest
-    {
+        -> UploadRequest {
         do {
             let urlRequest = try URLRequest(url: url, method: method, headers: headers)
             return upload(data, with: urlRequest)
@@ -550,8 +540,7 @@ open class SessionManager {
         to url: URLConvertible,
         method: HTTPMethod = .post,
         headers: HTTPHeaders? = nil)
-        -> UploadRequest
-    {
+        -> UploadRequest {
         do {
             let urlRequest = try URLRequest(url: url, method: method, headers: headers)
             return upload(stream, with: urlRequest)
@@ -611,8 +600,7 @@ open class SessionManager {
         to url: URLConvertible,
         method: HTTPMethod = .post,
         headers: HTTPHeaders? = nil,
-        encodingCompletion: ((MultipartFormDataEncodingResult) -> Void)?)
-    {
+        encodingCompletion: ((MultipartFormDataEncodingResult) -> Void)?) {
         do {
             let urlRequest = try URLRequest(url: url, method: method, headers: headers)
 
@@ -654,8 +642,7 @@ open class SessionManager {
         multipartFormData: @escaping (MultipartFormData) -> Void,
         usingThreshold encodingMemoryThreshold: UInt64 = SessionManager.multipartFormDataEncodingMemoryThreshold,
         with urlRequest: URLRequestConvertible,
-        encodingCompletion: ((MultipartFormDataEncodingResult) -> Void)?)
-    {
+        encodingCompletion: ((MultipartFormDataEncodingResult) -> Void)?) {
         DispatchQueue.global(qos: .utility).async {
             let formData = MultipartFormData()
             multipartFormData(formData)
diff --git a/samples/client/petstore/swift4/promisekit/SwaggerClientTests/Pods/Alamofire/Source/TaskDelegate.swift b/samples/client/petstore/swift4/promisekit/SwaggerClientTests/Pods/Alamofire/Source/TaskDelegate.swift
index 8e19888fc8..12fcbe92d3 100644
--- a/samples/client/petstore/swift4/promisekit/SwaggerClientTests/Pods/Alamofire/Source/TaskDelegate.swift
+++ b/samples/client/petstore/swift4/promisekit/SwaggerClientTests/Pods/Alamofire/Source/TaskDelegate.swift
@@ -94,8 +94,7 @@ open class TaskDelegate: NSObject {
         task: URLSessionTask,
         willPerformHTTPRedirection response: HTTPURLResponse,
         newRequest request: URLRequest,
-        completionHandler: @escaping (URLRequest?) -> Void)
-    {
+        completionHandler: @escaping (URLRequest?) -> Void) {
         var redirectRequest: URLRequest? = request
 
         if let taskWillPerformHTTPRedirection = taskWillPerformHTTPRedirection {
@@ -110,8 +109,7 @@ open class TaskDelegate: NSObject {
         _ session: URLSession,
         task: URLSessionTask,
         didReceive challenge: URLAuthenticationChallenge,
-        completionHandler: @escaping (URLSession.AuthChallengeDisposition, URLCredential?) -> Void)
-    {
+        completionHandler: @escaping (URLSession.AuthChallengeDisposition, URLCredential?) -> Void) {
         var disposition: URLSession.AuthChallengeDisposition = .performDefaultHandling
         var credential: URLCredential?
 
@@ -150,8 +148,7 @@ open class TaskDelegate: NSObject {
     func urlSession(
         _ session: URLSession,
         task: URLSessionTask,
-        needNewBodyStream completionHandler: @escaping (InputStream?) -> Void)
-    {
+        needNewBodyStream completionHandler: @escaping (InputStream?) -> Void) {
         var bodyStream: InputStream?
 
         if let taskNeedNewBodyStream = taskNeedNewBodyStream {
@@ -237,8 +234,7 @@ class DataTaskDelegate: TaskDelegate, URLSessionDataDelegate {
         _ session: URLSession,
         dataTask: URLSessionDataTask,
         didReceive response: URLResponse,
-        completionHandler: @escaping (URLSession.ResponseDisposition) -> Void)
-    {
+        completionHandler: @escaping (URLSession.ResponseDisposition) -> Void) {
         var disposition: URLSession.ResponseDisposition = .allow
 
         expectedContentLength = response.expectedContentLength
@@ -253,8 +249,7 @@ class DataTaskDelegate: TaskDelegate, URLSessionDataDelegate {
     func urlSession(
         _ session: URLSession,
         dataTask: URLSessionDataTask,
-        didBecome downloadTask: URLSessionDownloadTask)
-    {
+        didBecome downloadTask: URLSessionDownloadTask) {
         dataTaskDidBecomeDownloadTask?(session, dataTask, downloadTask)
     }
 
@@ -287,8 +282,7 @@ class DataTaskDelegate: TaskDelegate, URLSessionDataDelegate {
         _ session: URLSession,
         dataTask: URLSessionDataTask,
         willCacheResponse proposedResponse: CachedURLResponse,
-        completionHandler: @escaping (CachedURLResponse?) -> Void)
-    {
+        completionHandler: @escaping (CachedURLResponse?) -> Void) {
         var cachedResponse: CachedURLResponse? = proposedResponse
 
         if let dataTaskWillCacheResponse = dataTaskWillCacheResponse {
@@ -343,8 +337,7 @@ class DownloadTaskDelegate: TaskDelegate, URLSessionDownloadDelegate {
     func urlSession(
         _ session: URLSession,
         downloadTask: URLSessionDownloadTask,
-        didFinishDownloadingTo location: URL)
-    {
+        didFinishDownloadingTo location: URL) {
         temporaryURL = location
 
         guard
@@ -379,8 +372,7 @@ class DownloadTaskDelegate: TaskDelegate, URLSessionDownloadDelegate {
         downloadTask: URLSessionDownloadTask,
         didWriteData bytesWritten: Int64,
         totalBytesWritten: Int64,
-        totalBytesExpectedToWrite: Int64)
-    {
+        totalBytesExpectedToWrite: Int64) {
         if initialResponseTime == nil { initialResponseTime = CFAbsoluteTimeGetCurrent() }
 
         if let downloadTaskDidWriteData = downloadTaskDidWriteData {
@@ -405,8 +397,7 @@ class DownloadTaskDelegate: TaskDelegate, URLSessionDownloadDelegate {
         _ session: URLSession,
         downloadTask: URLSessionDownloadTask,
         didResumeAtOffset fileOffset: Int64,
-        expectedTotalBytes: Int64)
-    {
+        expectedTotalBytes: Int64) {
         if let downloadTaskDidResumeAtOffset = downloadTaskDidResumeAtOffset {
             downloadTaskDidResumeAtOffset(session, downloadTask, fileOffset, expectedTotalBytes)
         } else {
@@ -448,8 +439,7 @@ class UploadTaskDelegate: DataTaskDelegate {
         task: URLSessionTask,
         didSendBodyData bytesSent: Int64,
         totalBytesSent: Int64,
-        totalBytesExpectedToSend: Int64)
-    {
+        totalBytesExpectedToSend: Int64) {
         if initialResponseTime == nil { initialResponseTime = CFAbsoluteTimeGetCurrent() }
 
         if let taskDidSendBodyData = taskDidSendBodyData {
diff --git a/samples/client/petstore/swift4/promisekit/SwaggerClientTests/Pods/Alamofire/Source/Timeline.swift b/samples/client/petstore/swift4/promisekit/SwaggerClientTests/Pods/Alamofire/Source/Timeline.swift
index 181c9883cb..b318b1ff48 100644
--- a/samples/client/petstore/swift4/promisekit/SwaggerClientTests/Pods/Alamofire/Source/Timeline.swift
+++ b/samples/client/petstore/swift4/promisekit/SwaggerClientTests/Pods/Alamofire/Source/Timeline.swift
@@ -64,8 +64,7 @@ public struct Timeline {
         requestStartTime: CFAbsoluteTime = 0.0,
         initialResponseTime: CFAbsoluteTime = 0.0,
         requestCompletedTime: CFAbsoluteTime = 0.0,
-        serializationCompletedTime: CFAbsoluteTime = 0.0)
-    {
+        serializationCompletedTime: CFAbsoluteTime = 0.0) {
         self.requestStartTime = requestStartTime
         self.initialResponseTime = initialResponseTime
         self.requestCompletedTime = requestCompletedTime
diff --git a/samples/client/petstore/swift4/promisekit/SwaggerClientTests/Pods/Alamofire/Source/Validation.swift b/samples/client/petstore/swift4/promisekit/SwaggerClientTests/Pods/Alamofire/Source/Validation.swift
index ec2c5c35a0..deaee34ad8 100644
--- a/samples/client/petstore/swift4/promisekit/SwaggerClientTests/Pods/Alamofire/Source/Validation.swift
+++ b/samples/client/petstore/swift4/promisekit/SwaggerClientTests/Pods/Alamofire/Source/Validation.swift
@@ -94,8 +94,7 @@ extension Request {
         statusCode acceptableStatusCodes: S,
         response: HTTPURLResponse)
         -> ValidationResult
-        where S.Iterator.Element == Int
-    {
+        where S.Iterator.Element == Int {
         if acceptableStatusCodes.contains(response.statusCode) {
             return .success
         } else {
@@ -111,8 +110,7 @@ extension Request {
         response: HTTPURLResponse,
         data: Data?)
         -> ValidationResult
-        where S.Iterator.Element == String
-    {
+        where S.Iterator.Element == String {
         guard let data = data, data.count > 0 else { return .success }
 
         guard
diff --git a/samples/client/petstore/swift4/promisekit/SwaggerClientTests/Pods/PromiseKit/Sources/AnyPromise.swift b/samples/client/petstore/swift4/promisekit/SwaggerClientTests/Pods/PromiseKit/Sources/AnyPromise.swift
index 843f2c1fac..251659bc58 100644
--- a/samples/client/petstore/swift4/promisekit/SwaggerClientTests/Pods/PromiseKit/Sources/AnyPromise.swift
+++ b/samples/client/petstore/swift4/promisekit/SwaggerClientTests/Pods/PromiseKit/Sources/AnyPromise.swift
@@ -100,7 +100,7 @@ import Foundation
         state.catch(on: q, policy: policy, else: { _ in }, execute: body)
     }
 
-//MARK: ObjC methods
+// MARK: ObjC methods
 
     /**
      A promise starts pending and eventually resolves.
@@ -254,7 +254,6 @@ import Foundation
     }
 }
 
-
 extension AnyPromise {
     /**
      - Returns: A description of the state of this promise.
diff --git a/samples/client/petstore/swift4/promisekit/SwaggerClientTests/Pods/PromiseKit/Sources/Error.swift b/samples/client/petstore/swift4/promisekit/SwaggerClientTests/Pods/PromiseKit/Sources/Error.swift
index 99e7d1f292..0c746ce45a 100644
--- a/samples/client/petstore/swift4/promisekit/SwaggerClientTests/Pods/PromiseKit/Sources/Error.swift
+++ b/samples/client/petstore/swift4/promisekit/SwaggerClientTests/Pods/PromiseKit/Sources/Error.swift
@@ -82,7 +82,6 @@ public enum JSONError: Error {
     case unexpectedRootNode(Any)
 }
 
-
 //////////////////////////////////////////////////////////// Cancellation
 
 public protocol CancellableError: Error {
@@ -129,12 +128,11 @@ extension NSError {
 private var cancelledErrorIdentifiers = Set([
     ErrorPair(PMKErrorDomain, PMKOperationCancelled),
     ErrorPair(NSCocoaErrorDomain, NSUserCancelledError),
-    ErrorPair(NSURLErrorDomain, NSURLErrorCancelled),
+    ErrorPair(NSURLErrorDomain, NSURLErrorCancelled)
 ])
 
 #endif
 
-
 extension Error {
     public var isCancelledError: Bool {
         if let ce = self as? CancellableError {
@@ -150,7 +148,6 @@ extension Error {
     }
 }
 
-
 //////////////////////////////////////////////////////// Unhandled Errors
 class ErrorConsumptionToken {
     var consumed = false
diff --git a/samples/client/petstore/swift4/promisekit/SwaggerClientTests/Pods/PromiseKit/Sources/Promise.swift b/samples/client/petstore/swift4/promisekit/SwaggerClientTests/Pods/PromiseKit/Sources/Promise.swift
index 12c85ce4f0..39cfd4ad29 100644
--- a/samples/client/petstore/swift4/promisekit/SwaggerClientTests/Pods/PromiseKit/Sources/Promise.swift
+++ b/samples/client/petstore/swift4/promisekit/SwaggerClientTests/Pods/PromiseKit/Sources/Promise.swift
@@ -2,7 +2,6 @@ import class Dispatch.DispatchQueue
 import class Foundation.NSError
 import func Foundation.NSLog
 
-
 /**
  A *promise* represents the future value of a (usually) asynchronous task.
 
@@ -171,7 +170,7 @@ open class Promise<T> {
      */
     public func then<U>(on q: DispatchQueue = .default, execute body: @escaping (T) throws -> Promise<U>) -> Promise<U> {
         var resolve: ((Resolution<U>) -> Void)!
-        let rv = Promise<U>{ resolve = $0 }
+        let rv = Promise<U> { resolve = $0 }
         state.then(on: q, else: resolve) { value in
             let promise = try body(value)
             guard promise !== rv else { throw PMKError.returnedSelf }
@@ -268,7 +267,7 @@ open class Promise<T> {
      */
     public func recover(on q: DispatchQueue = .default, policy: CatchPolicy = .allErrorsExceptCancellation, execute body: @escaping (Error) throws -> Promise) -> Promise {
         var resolve: ((Resolution<T>) -> Void)!
-        let rv = Promise{ resolve = $0 }
+        let rv = Promise { resolve = $0 }
         state.catch(on: q, policy: policy, else: resolve) { error in
             let promise = try body(error)
             guard promise !== rv else { throw PMKError.returnedSelf }
@@ -319,7 +318,7 @@ open class Promise<T> {
      */
 	@discardableResult
     public func always(on q: DispatchQueue = .default, execute body: @escaping () -> Void) -> Promise {
-        state.always(on: q) { resolution in
+        state.always(on: q) { _ in
             body()
         }
         return self
@@ -354,7 +353,7 @@ open class Promise<T> {
         return then(on: zalgo) { _ in return }
     }
 
-//MARK: deprecations
+// MARK: deprecations
 
     @available(*, unavailable, renamed: "always()")
     public func finally(on: DispatchQueue = DispatchQueue.main, execute body: () -> Void) -> Promise { fatalError() }
@@ -386,7 +385,7 @@ open class Promise<T> {
     @available(*, unavailable, renamed: "init(value:)")
     public init(_ value: T) { fatalError() }
 
-//MARK: disallow `Promise<Error>`
+// MARK: disallow `Promise<Error>`
 
     @available(*, unavailable, message: "cannot instantiate Promise<Error>")
     public init<T: Error>(resolvers: (_ fulfill: (T) -> Void, _ reject: (Error) -> Void) throws -> Void) { fatalError() }
@@ -394,7 +393,7 @@ open class Promise<T> {
     @available(*, unavailable, message: "cannot instantiate Promise<Error>")
     public class func pending<T: Error>() -> (promise: Promise, fulfill: (T) -> Void, reject: (Error) -> Void) { fatalError() }
 
-//MARK: disallow returning `Error`
+// MARK: disallow returning `Error`
 
     @available (*, unavailable, message: "instead of returning the error; throw")
     public func then<U: Error>(on: DispatchQueue = .default, execute body: (T) throws -> U) -> Promise<U> { fatalError() }
@@ -402,7 +401,7 @@ open class Promise<T> {
     @available (*, unavailable, message: "instead of returning the error; throw")
     public func recover<T: Error>(on: DispatchQueue = .default, execute body: (Error) throws -> T) -> Promise { fatalError() }
 
-//MARK: disallow returning `Promise?`
+// MARK: disallow returning `Promise?`
 
     @available(*, unavailable, message: "unwrap the promise")
     public func then<U>(on: DispatchQueue = .default, execute body: (T) throws -> Promise<U>?) -> Promise<U> { fatalError() }
@@ -487,7 +486,7 @@ public func firstly<T, U, V, W, X>(execute body: () throws -> (Promise<T>, Promi
 }
 
 /// utility function to serve `firstly` implementations with `body` returning tuple of promises
-fileprivate func firstly<U, V>(execute body: () throws -> V, when: (V) -> Promise<U>) -> Promise<U> {
+private func firstly<U, V>(execute body: () throws -> V, when: (V) -> Promise<U>) -> Promise<U> {
     do {
         return when(try body())
     } catch {
@@ -509,7 +508,6 @@ public func dispatch_promise<T>(_ on: DispatchQueue, _ body: @escaping () throws
     return Promise(value: ()).then(on: on, execute: body)
 }
 
-
 /**
  The underlying resolved state of a promise.
  - Remark: Same as `Resolution<T>` but without the associated `ErrorConsumptionToken`.
@@ -603,7 +601,6 @@ extension Promise {
     }
 }
 
-
 extension Promise where T: Collection {
     /**
      Transforms a `Promise` where `T` is a `Collection` into a `Promise<[U]>`
@@ -627,7 +624,6 @@ extension Promise where T: Collection {
     }
 }
 
-
 #if swift(>=3.1)
 public extension Promise where T == Void {
     convenience init() {
diff --git a/samples/client/petstore/swift4/promisekit/SwaggerClientTests/Pods/PromiseKit/Sources/State.swift b/samples/client/petstore/swift4/promisekit/SwaggerClientTests/Pods/PromiseKit/Sources/State.swift
index cc1a19ce70..1a87b46af4 100644
--- a/samples/client/petstore/swift4/promisekit/SwaggerClientTests/Pods/PromiseKit/Sources/State.swift
+++ b/samples/client/petstore/swift4/promisekit/SwaggerClientTests/Pods/PromiseKit/Sources/State.swift
@@ -154,11 +154,11 @@ class UnsealedState<T>: State<T> {
 
 class SealedState<T>: State<T> {
     fileprivate let resolution: Resolution<T>
-    
+
     init(resolution: Resolution<T>) {
         self.resolution = resolution
     }
-    
+
     override func get() -> Resolution<T>? {
         return resolution
     }
@@ -168,7 +168,6 @@ class SealedState<T>: State<T> {
     }
 }
 
-
 class Handlers<T>: Sequence {
     var bodies: [(Resolution<T>) -> Void] = []
 
@@ -185,7 +184,6 @@ class Handlers<T>: Sequence {
     }
 }
 
-
 extension Resolution: CustomStringConvertible {
     var description: String {
         switch self {
diff --git a/samples/client/petstore/swift4/promisekit/SwaggerClientTests/Pods/PromiseKit/Sources/Zalgo.swift b/samples/client/petstore/swift4/promisekit/SwaggerClientTests/Pods/PromiseKit/Sources/Zalgo.swift
index e191df10d6..b5364fe81d 100644
--- a/samples/client/petstore/swift4/promisekit/SwaggerClientTests/Pods/PromiseKit/Sources/Zalgo.swift
+++ b/samples/client/petstore/swift4/promisekit/SwaggerClientTests/Pods/PromiseKit/Sources/Zalgo.swift
@@ -64,7 +64,6 @@ public let zalgo = DispatchQueue(label: "Zalgo")
  */
 public let waldo = DispatchQueue(label: "Waldo")
 
-
 @inline(__always) func contain_zalgo(_ q: DispatchQueue, body: @escaping () -> Void) {
     if q === zalgo || q === waldo && !Thread.isMainThread {
         body()
diff --git a/samples/client/petstore/swift4/promisekit/SwaggerClientTests/Pods/PromiseKit/Sources/join.swift b/samples/client/petstore/swift4/promisekit/SwaggerClientTests/Pods/PromiseKit/Sources/join.swift
index 8ff69b2c2c..a50c4665d4 100644
--- a/samples/client/petstore/swift4/promisekit/SwaggerClientTests/Pods/PromiseKit/Sources/join.swift
+++ b/samples/client/petstore/swift4/promisekit/SwaggerClientTests/Pods/PromiseKit/Sources/join.swift
@@ -32,7 +32,7 @@ public func join(_ promises: [Promise<Void>]) -> Promise<Void> {
 @available(*, deprecated: 4.0, message: "Use when(resolved:)")
 public func join<T>(_ promises: [Promise<T>]) -> Promise<[T]> {
     guard !promises.isEmpty else { return Promise(value: []) }
-  
+
     var countdown = promises.count
     let barrier = DispatchQueue(label: "org.promisekit.barrier.join", attributes: .concurrent)
     var rejected = false
@@ -50,7 +50,7 @@ public func join<T>(_ promises: [Promise<T>]) -> Promise<[T]> {
                         if rejected {
                             reject(PMKError.join(promises))
                         } else {
-                            fulfill(promises.map{ $0.value! })
+                            fulfill(promises.map { $0.value! })
                         }
                     }
                 }
diff --git a/samples/client/petstore/swift4/promisekit/SwaggerClientTests/Pods/PromiseKit/Sources/when.swift b/samples/client/petstore/swift4/promisekit/SwaggerClientTests/Pods/PromiseKit/Sources/when.swift
index 41943b88b7..2e48ea4d68 100644
--- a/samples/client/petstore/swift4/promisekit/SwaggerClientTests/Pods/PromiseKit/Sources/when.swift
+++ b/samples/client/petstore/swift4/promisekit/SwaggerClientTests/Pods/PromiseKit/Sources/when.swift
@@ -76,7 +76,7 @@ private func _when<T>(_ promises: [Promise<T>]) -> Promise<Void> {
  - SeeAlso: `when(resolved:)`
 */
 public func when<T>(fulfilled promises: [Promise<T>]) -> Promise<[T]> {
-    return _when(promises).then(on: zalgo) { promises.map{ $0.value! } }
+    return _when(promises).then(on: zalgo) { promises.map { $0.value! } }
 }
 
 /// Wait for all promises in a set to fulfill.
@@ -177,7 +177,7 @@ public func when<T, PromiseIterator: IteratorProtocol>(fulfilled promiseIterator
         func testDone() {
             barrier.sync {
                 if pendingPromises == 0 {
-                    root.fulfill(promises.flatMap{ $0.value })
+                    root.fulfill(promises.flatMap { $0.value })
                 }
             }
         }
@@ -203,7 +203,7 @@ public func when<T, PromiseIterator: IteratorProtocol>(fulfilled promiseIterator
 
         dequeue()
     }
-        
+
     dequeue()
 
     return root.promise
@@ -237,7 +237,7 @@ public func when<T>(resolved promises: [Promise<T>]) -> Promise<[Result<T>]> {
     var countdown = promises.count
     let barrier = DispatchQueue(label: "org.promisekit.barrier.join", attributes: .concurrent)
 
-    return Promise { fulfill, reject in
+    return Promise { fulfill, _ in
         for promise in promises {
             promise.state.pipe { resolution in
                 if case .rejected(_, let token) = resolution {
diff --git a/samples/client/petstore/swift4/promisekit/SwaggerClientTests/Pods/PromiseKit/Sources/wrap.swift b/samples/client/petstore/swift4/promisekit/SwaggerClientTests/Pods/PromiseKit/Sources/wrap.swift
index 7249df91d3..48bd4b1bee 100644
--- a/samples/client/petstore/swift4/promisekit/SwaggerClientTests/Pods/PromiseKit/Sources/wrap.swift
+++ b/samples/client/petstore/swift4/promisekit/SwaggerClientTests/Pods/PromiseKit/Sources/wrap.swift
@@ -27,7 +27,7 @@ public func wrap<T>(_ body: (@escaping (T?, Error?) -> Void) throws -> Void) ->
 }
 
 /// For completion-handlers that eg. provide an enum or an error.
-public func wrap<T>(_ body: (@escaping (T, Error?) -> Void) throws -> Void) -> Promise<T>  {
+public func wrap<T>(_ body: (@escaping (T, Error?) -> Void) throws -> Void) -> Promise<T> {
     return Promise { fulfill, reject in
         try body { obj, err in
             if let err = err {
diff --git a/samples/client/petstore/swift4/promisekit/SwaggerClientTests/SwaggerClient/AppDelegate.swift b/samples/client/petstore/swift4/promisekit/SwaggerClientTests/SwaggerClient/AppDelegate.swift
index 7fd6929617..821a4aea70 100644
--- a/samples/client/petstore/swift4/promisekit/SwaggerClientTests/SwaggerClient/AppDelegate.swift
+++ b/samples/client/petstore/swift4/promisekit/SwaggerClientTests/SwaggerClient/AppDelegate.swift
@@ -13,7 +13,6 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
 
     var window: UIWindow?
 
-
     func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplicationLaunchOptionsKey: Any]?) -> Bool {
         // Override point for customization after application launch.
         return true
@@ -41,6 +40,4 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
         // Called when the application is about to terminate. Save data if appropriate. See also applicationDidEnterBackground:.
     }
 
-
 }
-
diff --git a/samples/client/petstore/swift4/promisekit/SwaggerClientTests/SwaggerClient/ViewController.swift b/samples/client/petstore/swift4/promisekit/SwaggerClientTests/SwaggerClient/ViewController.swift
index cd7e9a1676..8dad16b10f 100644
--- a/samples/client/petstore/swift4/promisekit/SwaggerClientTests/SwaggerClient/ViewController.swift
+++ b/samples/client/petstore/swift4/promisekit/SwaggerClientTests/SwaggerClient/ViewController.swift
@@ -20,6 +20,4 @@ class ViewController: UIViewController {
         // Dispose of any resources that can be recreated.
     }
 
-
 }
-
diff --git a/samples/client/petstore/swift4/promisekit/SwaggerClientTests/SwaggerClientTests/PetAPITests.swift b/samples/client/petstore/swift4/promisekit/SwaggerClientTests/SwaggerClientTests/PetAPITests.swift
index 8f58cc4d4f..22b2e7d605 100644
--- a/samples/client/petstore/swift4/promisekit/SwaggerClientTests/SwaggerClientTests/PetAPITests.swift
+++ b/samples/client/petstore/swift4/promisekit/SwaggerClientTests/SwaggerClientTests/PetAPITests.swift
@@ -12,19 +12,19 @@ import XCTest
 @testable import SwaggerClient
 
 class PetAPITests: XCTestCase {
-    
+
     let testTimeout = 10.0
 
     override func setUp() {
         super.setUp()
         // Put setup code here. This method is called before the invocation of each test method in the class.
     }
-    
+
     override func tearDown() {
         // Put teardown code here. This method is called after the invocation of each test method in the class.
         super.tearDown()
     }
-    
+
     func test1CreatePet() {
         let expectation = self.expectation(description: "testCreatePet")
         let category = PetstoreClient.Category(id: 1234, name: "eyeColor")
@@ -35,12 +35,12 @@ class PetAPITests: XCTestCase {
                 expectation.fulfill()
             }.always {
                 // Noop for now
-            }.catch { errorType in
+            }.catch { _ in
                 XCTFail("error creating pet")
         }
         self.waitForExpectations(timeout: testTimeout, handler: nil)
     }
-    
+
     func test2GetPet() {
         let expectation = self.expectation(description: "testGetPet")
         PetAPI.getPetById(petId: 1000).then { pet -> Void in
@@ -49,19 +49,19 @@ class PetAPITests: XCTestCase {
                 expectation.fulfill()
             }.always {
                 // Noop for now
-            }.catch { errorType in
+            }.catch { _ in
                 XCTFail("error creating pet")
         }
         self.waitForExpectations(timeout: testTimeout, handler: nil)
     }
-    
+
     func test3DeletePet() {
         let expectation = self.expectation(description: "testDeletePet")
         PetAPI.deletePet(petId: 1000).then {
             expectation.fulfill()
             }.always {
                 // Noop for now
-            }.catch { (errorType) in
+            }.catch { (_) in
                 XCTFail("error deleting pet")
         }
         self.waitForExpectations(timeout: testTimeout, handler: nil)
diff --git a/samples/client/petstore/swift4/promisekit/SwaggerClientTests/SwaggerClientTests/StoreAPITests.swift b/samples/client/petstore/swift4/promisekit/SwaggerClientTests/SwaggerClientTests/StoreAPITests.swift
index 7d7ae16b83..abb0921471 100644
--- a/samples/client/petstore/swift4/promisekit/SwaggerClientTests/SwaggerClientTests/StoreAPITests.swift
+++ b/samples/client/petstore/swift4/promisekit/SwaggerClientTests/SwaggerClientTests/StoreAPITests.swift
@@ -16,7 +16,7 @@ class StoreAPITests: XCTestCase {
     let isoDateFormat = "yyyy-MM-dd'T'HH:mm:ssZ"
 
     let testTimeout = 10.0
-    
+
     func test1PlaceOrder() {
         // use explicit naming to reference the enum so that we test we don't regress on enum naming
         let shipDate = Date()
@@ -32,12 +32,12 @@ class StoreAPITests: XCTestCase {
                 expectation.fulfill()
             }.always {
                 // Noop for now
-            }.catch { errorType in
+            }.catch { _ in
                 XCTFail("error placing order")
         }
         self.waitForExpectations(timeout: testTimeout, handler: nil)
     }
-    
+
     func test2GetOrder() {
         let expectation = self.expectation(description: "testGetOrder")
         StoreAPI.getOrderById(orderId: 1000).then { order -> Void in
@@ -47,19 +47,19 @@ class StoreAPITests: XCTestCase {
             expectation.fulfill()
             }.always {
                 // Noop for now
-            }.catch { errorType in
+            }.catch { _ in
                 XCTFail("error placing order")
         }
         self.waitForExpectations(timeout: testTimeout, handler: nil)
     }
-    
+
     func test3DeleteOrder() {
         let expectation = self.expectation(description: "testDeleteOrder")
         StoreAPI.deleteOrder(orderId: "1000").then {
             expectation.fulfill()
             }.always {
                 // Noop for now
-            }.catch { (error) in
+            }.catch { (_) in
                 XCTFail("error deleting order")
         }
         self.waitForExpectations(timeout: testTimeout, handler: nil)
diff --git a/samples/client/petstore/swift4/promisekit/SwaggerClientTests/SwaggerClientTests/UserAPITests.swift b/samples/client/petstore/swift4/promisekit/SwaggerClientTests/SwaggerClientTests/UserAPITests.swift
index f416f745b4..2fd0ff0fbb 100644
--- a/samples/client/petstore/swift4/promisekit/SwaggerClientTests/SwaggerClientTests/UserAPITests.swift
+++ b/samples/client/petstore/swift4/promisekit/SwaggerClientTests/SwaggerClientTests/UserAPITests.swift
@@ -21,19 +21,19 @@ class UserAPITests: XCTestCase {
             expectation.fulfill()
             }.always {
                 // Noop for now
-            }.catch { (error) in
+            }.catch { (_) in
                 XCTFail("login error")
         }
         self.waitForExpectations(timeout: testTimeout, handler: nil)
     }
-    
+
     func testLogout() {
         let expectation = self.expectation(description: "testLogout")
         UserAPI.logoutUser().then {
             expectation.fulfill()
             }.always {
                 // Noop for now
-            }.catch { (error) in
+            }.catch { (_) in
                 XCTFail("")
         }
         self.waitForExpectations(timeout: testTimeout, handler: nil)
diff --git a/samples/client/petstore/swift4/promisekit/docs/CatAllOf.md b/samples/client/petstore/swift4/promisekit/docs/CatAllOf.md
new file mode 100644
index 0000000000..79789be61c
--- /dev/null
+++ b/samples/client/petstore/swift4/promisekit/docs/CatAllOf.md
@@ -0,0 +1,10 @@
+# CatAllOf
+
+## Properties
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**declawed** | **Bool** |  | [optional] 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
+
diff --git a/samples/client/petstore/swift4/promisekit/docs/DogAllOf.md b/samples/client/petstore/swift4/promisekit/docs/DogAllOf.md
new file mode 100644
index 0000000000..9302ef52e9
--- /dev/null
+++ b/samples/client/petstore/swift4/promisekit/docs/DogAllOf.md
@@ -0,0 +1,10 @@
+# DogAllOf
+
+## Properties
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**breed** | **String** |  | [optional] 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
+
diff --git a/samples/client/petstore/swift4/promisekit/docs/UserAPI.md b/samples/client/petstore/swift4/promisekit/docs/UserAPI.md
index 2ec91cfda3..e18cc451e9 100644
--- a/samples/client/petstore/swift4/promisekit/docs/UserAPI.md
+++ b/samples/client/petstore/swift4/promisekit/docs/UserAPI.md
@@ -89,7 +89,7 @@ UserAPI.createUsersWithArrayInput(body: body).then {
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **body** | [**[User]**](Array.md) | List of user object | 
+ **body** | [**[User]**](User.md) | List of user object | 
 
 ### Return type
 
@@ -134,7 +134,7 @@ UserAPI.createUsersWithListInput(body: body).then {
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **body** | [**[User]**](Array.md) | List of user object | 
+ **body** | [**[User]**](User.md) | List of user object | 
 
 ### Return type
 
diff --git a/samples/client/petstore/swift4/promisekit/project.yml b/samples/client/petstore/swift4/promisekit/project.yml
new file mode 100644
index 0000000000..e35045a1d0
--- /dev/null
+++ b/samples/client/petstore/swift4/promisekit/project.yml
@@ -0,0 +1,16 @@
+name: PetstoreClient
+targets:
+  PetstoreClient:
+    type: framework
+    platform: iOS
+    deploymentTarget: "10.0"
+    sources: [PetstoreClient]
+    info:
+      path: ./Info.plist
+      version: 1.0.0
+    settings:
+      APPLICATION_EXTENSION_API_ONLY: true
+    scheme: {}
+    dependencies:
+    - carthage: Alamofire
+    - carthage: PromiseKit
diff --git a/samples/client/petstore/swift4/rxswift/.openapi-generator/VERSION b/samples/client/petstore/swift4/rxswift/.openapi-generator/VERSION
index afa6365606..83a328a922 100644
--- a/samples/client/petstore/swift4/rxswift/.openapi-generator/VERSION
+++ b/samples/client/petstore/swift4/rxswift/.openapi-generator/VERSION
@@ -1 +1 @@
-4.0.0-SNAPSHOT
\ No newline at end of file
+4.1.0-SNAPSHOT
\ No newline at end of file
diff --git a/samples/client/petstore/swift4/rxswift/Info.plist b/samples/client/petstore/swift4/rxswift/Info.plist
new file mode 100644
index 0000000000..323e5ecfc4
--- /dev/null
+++ b/samples/client/petstore/swift4/rxswift/Info.plist
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>CFBundleDevelopmentRegion</key>
+	<string>$(DEVELOPMENT_LANGUAGE)</string>
+	<key>CFBundleExecutable</key>
+	<string>$(EXECUTABLE_NAME)</string>
+	<key>CFBundleIdentifier</key>
+	<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
+	<key>CFBundleInfoDictionaryVersion</key>
+	<string>6.0</string>
+	<key>CFBundleName</key>
+	<string>$(PRODUCT_NAME)</string>
+	<key>CFBundlePackageType</key>
+	<string>FMWK</string>
+	<key>CFBundleShortVersionString</key>
+	<string>1.0</string>
+	<key>CFBundleVersion</key>
+	<string>1</string>
+</dict>
+</plist>
diff --git a/samples/client/petstore/swift4/rxswift/PetstoreClient.xcodeproj/project.pbxproj b/samples/client/petstore/swift4/rxswift/PetstoreClient.xcodeproj/project.pbxproj
new file mode 100644
index 0000000000..578d38a3ff
--- /dev/null
+++ b/samples/client/petstore/swift4/rxswift/PetstoreClient.xcodeproj/project.pbxproj
@@ -0,0 +1,605 @@
+// !$*UTF8*$!
+{
+	archiveVersion = 1;
+	classes = {
+	};
+	objectVersion = 50;
+	objects = {
+
+/* Begin PBXBuildFile section */
+		02903CEC38DC202565BC08CB040AC4E9 /* Animal.swift in Sources */ = {isa = PBXBuildFile; fileRef = 95568E7C35F119EB4A12B4982B3FB31F /* Animal.swift */; };
+		0462F801432CF94C7EF51D0532737A7E /* APIs.swift in Sources */ = {isa = PBXBuildFile; fileRef = 37DF825B8F3BADA2B2537D17CDC48633 /* APIs.swift */; };
+		08D87E4FECF24910F0DA0F1D2E2D955A /* EnumTest.swift in Sources */ = {isa = PBXBuildFile; fileRef = FD60AEA646791E0EDE885DE1E680A687 /* EnumTest.swift */; };
+		08F5828F0C2BCF07A9E4917DBBB993AE /* AdditionalPropertiesInteger.swift in Sources */ = {isa = PBXBuildFile; fileRef = FA2F3566156A4ABC465F201B4A1F6227 /* AdditionalPropertiesInteger.swift */; };
+		1143FFF06DEE01E5B0F1368AA05BE1B4 /* OuterEnum.swift in Sources */ = {isa = PBXBuildFile; fileRef = C15008AABC804EB6FB4CDAC6B871E6B0 /* OuterEnum.swift */; };
+		122BBAE8245606CC040EEB6B9254E376 /* StoreAPI.swift in Sources */ = {isa = PBXBuildFile; fileRef = A53274D99BBDE1B79BF3521CD7CBC276 /* StoreAPI.swift */; };
+		12327BF7304AA897C5D2A1250B1659B7 /* AdditionalPropertiesClass.swift in Sources */ = {isa = PBXBuildFile; fileRef = 396DEF3156BA0D12D0FC5C3C3AAF52C4 /* AdditionalPropertiesClass.swift */; };
+		12BB95C66D63090732BB9E0379836E3C /* JSONEncodingHelper.swift in Sources */ = {isa = PBXBuildFile; fileRef = 35D710108A69DD8A5297F926A66DA21F /* JSONEncodingHelper.swift */; };
+		16E9A5E22B4823DE282E7F4C18A21EA8 /* JSONEncodableEncoding.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9791B840B8D6EAA35343B00FA277963A /* JSONEncodableEncoding.swift */; };
+		18F19872A0DFB4CC3D9C696BBCA64EFD /* Cat.swift in Sources */ = {isa = PBXBuildFile; fileRef = 212AA914B7F1793A4E32C119370FB05F /* Cat.swift */; };
+		196E9846B27D736630CCF90497696859 /* StringBooleanMap.swift in Sources */ = {isa = PBXBuildFile; fileRef = 47B4DEBABEFE140768CFB70B19D23029 /* StringBooleanMap.swift */; };
+		271D94A05C47B602A2433B9CD3D9DCDC /* DogAllOf.swift in Sources */ = {isa = PBXBuildFile; fileRef = A21A69C8402A60E01116ABBDEE8943DB /* DogAllOf.swift */; };
+		293F4E0FBFC8297E414A3CDBB7F29A96 /* ReadOnlyFirst.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6FD42727E001E799E458C2924CF813CC /* ReadOnlyFirst.swift */; };
+		297E365D1E4672C43C56E0AFD855FFBF /* FakeAPI.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6E00950725DC44436C5E238CDD2EC164 /* FakeAPI.swift */; };
+		2A35688C985E9CB1EB7732AC2AD46B82 /* APIHelper.swift in Sources */ = {isa = PBXBuildFile; fileRef = 897716962D472FE162B723CB713AA6D3 /* APIHelper.swift */; };
+		2DF4544D4D3D6CF7047A59FB89ED31BD /* Model200Response.swift in Sources */ = {isa = PBXBuildFile; fileRef = 82A2C3DC2235F0114C2B08E553F46874 /* Model200Response.swift */; };
+		3251A3722981CE46261615CFBA96A08D /* ArrayOfArrayOfNumberOnly.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7B1B8B838B5D9D312F2002EBAD946378 /* ArrayOfArrayOfNumberOnly.swift */; };
+		36734C4EB3362A114A7CB5F25EE39E6D /* FormatTest.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3156CE41C001C80379B84BDB435DECCB /* FormatTest.swift */; };
+		39F9FBA1AC5C2612ECA1FF715EBFC287 /* AdditionalPropertiesString.swift in Sources */ = {isa = PBXBuildFile; fileRef = FFE215C1B526E0418ED301B15357B970 /* AdditionalPropertiesString.swift */; };
+		3D8E407B1DF4FA5A5F16B64E3A285781 /* PetAPI.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9A019F500E546A3292CE716AB967C673 /* PetAPI.swift */; };
+		41D8A105135868152A56E2AC475049BB /* CatAllOf.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3AD0F94F512DFBC09F9CC79AF4BD9BFD /* CatAllOf.swift */; };
+		42C51BC034E8B0CAA29A068F6B0DC815 /* Category.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6F2985D01F8D60A4B1925C694330E6CB /* Category.swift */; };
+		491676EC91BFEF95A12556888EED87B5 /* FileSchemaTestClass.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B3666552AA854DAF9C480A3354C9D7C /* FileSchemaTestClass.swift */; };
+		4C28BFEC5E7C8150DEFD83E09C1A1D32 /* Alamofire.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A235FA3FDFB086CC69CDE83DFC1F4BC9 /* Alamofire.framework */; };
+		52B5604F986335DB69CD2B430FB83BAB /* AdditionalPropertiesAnyType.swift in Sources */ = {isa = PBXBuildFile; fileRef = F5AB1037D937AADF8B4A70C96D5E5D61 /* AdditionalPropertiesAnyType.swift */; };
+		58F9704B295AC436D6FB98FA669E2344 /* AlamofireImplementations.swift in Sources */ = {isa = PBXBuildFile; fileRef = 84A201508DF2B697D65F263189C08721 /* AlamofireImplementations.swift */; };
+		59C00CBB07761CAC8DCE7054E34AD5D9 /* EnumClass.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B2C97AE6ACA1E5FB88F5BAA2DB76FDC /* EnumClass.swift */; };
+		59C2F5495C98836BFA9E10BF5C13BC2C /* Order.swift in Sources */ = {isa = PBXBuildFile; fileRef = 27B2E9EF856E89FEAA359A3AC4A2CF5D /* Order.swift */; };
+		59EAB3527305A37ED99FB210045B69EA /* AdditionalPropertiesNumber.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1E0512B3582586B4C0C598D5DB1C0D39 /* AdditionalPropertiesNumber.swift */; };
+		5ACDD7CC312167589335E9CA5998E770 /* ClassModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3C30827D8EAF8EA684E7BCEA5A1E93B2 /* ClassModel.swift */; };
+		655AA371771C7BD72EE0AAC0C90DFFF0 /* MapTest.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7986861626C2B1CB49AD7000C6343270 /* MapTest.swift */; };
+		6600BB1500AE35A3C80F7C83F6444552 /* TypeHolderDefault.swift in Sources */ = {isa = PBXBuildFile; fileRef = EBC76F6D4D2AA8084B7EB50E5C15E475 /* TypeHolderDefault.swift */; };
+		6CD20EE568DDAD2304BF0C4B1A70C8DC /* CodableHelper.swift in Sources */ = {isa = PBXBuildFile; fileRef = 02A6F6BB2152ACEE1416D44AB3955243 /* CodableHelper.swift */; };
+		7367A9D91D4B101F2D28AC56ED89F175 /* Capitalization.swift in Sources */ = {isa = PBXBuildFile; fileRef = A7B38FA00A494D13F4C382A3D87FBF59 /* Capitalization.swift */; };
+		79536B981ECC24C77EB665FDAC7CA7BD /* RxSwift.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 69DB3E1D94EB0566C0052331742B5012 /* RxSwift.framework */; };
+		82D4D0C8AD0354A700C8ACD421ABED55 /* OuterComposite.swift in Sources */ = {isa = PBXBuildFile; fileRef = F4E0AD8F60A91F72C768756002C14BF9 /* OuterComposite.swift */; };
+		83A2D1863FB136C0DFC423319F4EED65 /* AnotherFakeAPI.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9DF24D2714B9C4CF14146E88FDDC01A5 /* AnotherFakeAPI.swift */; };
+		92FB161BF1E57D11B116AF0292D5835C /* Client.swift in Sources */ = {isa = PBXBuildFile; fileRef = A913A57E72D723632E9A718FF4525C81 /* Client.swift */; };
+		97C99615237E1B662242E04F527B38B9 /* ApiResponse.swift in Sources */ = {isa = PBXBuildFile; fileRef = A8E7B833748B4F0C7CDA90C6E500B199 /* ApiResponse.swift */; };
+		988F461F59E4E1091156840007CB3773 /* AdditionalPropertiesBoolean.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0CC24C01A55F644957196F9F81D10F81 /* AdditionalPropertiesBoolean.swift */; };
+		A190AF5A3988639ED4B78163D0EA3CA4 /* ArrayOfNumberOnly.swift in Sources */ = {isa = PBXBuildFile; fileRef = B65BB72353DA24536A9049BEC3D234C8 /* ArrayOfNumberOnly.swift */; };
+		A438970025AE69ED407BC1E67CC6359E /* EnumArrays.swift in Sources */ = {isa = PBXBuildFile; fileRef = 10503995D9EFD031A2EFB57603B3132E /* EnumArrays.swift */; };
+		A9F1AAF6CE029DD3B4F8AC841F0B6BC6 /* FakeClassnameTags123API.swift in Sources */ = {isa = PBXBuildFile; fileRef = B42354B407EC173BEB54E0429D946F3B /* FakeClassnameTags123API.swift */; };
+		AE9D2E1DB59AF6575AC4AC6756C5A937 /* NumberOnly.swift in Sources */ = {isa = PBXBuildFile; fileRef = B8E0B16084741FCB82389F5854AC5E26 /* NumberOnly.swift */; };
+		B399A1742F23330FDCA450EAB98F51F1 /* Pet.swift in Sources */ = {isa = PBXBuildFile; fileRef = ECFEB4C6C257B3BB3CEA36D10A5EDC17 /* Pet.swift */; };
+		BB02FDCF1B2B0E457E1C2BF39FBB599D /* XmlItem.swift in Sources */ = {isa = PBXBuildFile; fileRef = A2253391845B73B8BA3680491575CC07 /* XmlItem.swift */; };
+		BF7D58FBCF5E4D3F2932FCC0E62BED40 /* User.swift in Sources */ = {isa = PBXBuildFile; fileRef = E5565A447062C7B8F695F4517DB5E4A5 /* User.swift */; };
+		C15AC1CC631E96D0360EB8C15BF30452 /* Name.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5AD994DFAA0DA93C188A4DBA16688767 /* Name.swift */; };
+		C1CACABE18A7ADCE37D1CD9DC9128304 /* List.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7A6070F581E611FF44AFD40A4315C49A /* List.swift */; };
+		C2EDEB747887399B13A6DFD72A219CB2 /* ArrayTest.swift in Sources */ = {isa = PBXBuildFile; fileRef = F1A0379CDFC55705AE76C99867B8DB08 /* ArrayTest.swift */; };
+		C329EE55B2FCC9174ED3B128D67C5E8C /* Extensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = B8C298FC8929DCB369053F118D7DF28F /* Extensions.swift */; };
+		D3A17B7FAFA8A7A210875BBCDCC30116 /* MixedPropertiesAndAdditionalPropertiesClass.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9AD714C7CC59BDD18DE8DF4ED40B9DA9 /* MixedPropertiesAndAdditionalPropertiesClass.swift */; };
+		D68F23CD4B5178493CE7AE8DFB868EAE /* AdditionalPropertiesArray.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4FEE553331890581C2FF366F9EA0956D /* AdditionalPropertiesArray.swift */; };
+		D70EC94E346077DE1482231DD4498BED /* Dog.swift in Sources */ = {isa = PBXBuildFile; fileRef = C6C3E1129526A353B963EFD74ED8419C /* Dog.swift */; };
+		DB1CE39011A741D07E187663291B5DE5 /* AnimalFarm.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8D22BE01748F51106DE0233299A9061E /* AnimalFarm.swift */; };
+		DB724C4F1AD5DF025B53A9A2E0A49E3D /* UserAPI.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7C8D5F382979854D47F18DB1543680FE /* UserAPI.swift */; };
+		DDBC3CF5E447D8D838F0FE200420EEE3 /* HasOnlyReadOnly.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4C7FBC641752D2E13B15097311139DDC /* HasOnlyReadOnly.swift */; };
+		DEC892724574BB29BD65869374F83982 /* Configuration.swift in Sources */ = {isa = PBXBuildFile; fileRef = 28A444949BBC254798C3B3DD14AAF2CD /* Configuration.swift */; };
+		E2C40F0E34DB8C21A806262C72841A51 /* SpecialModelName.swift in Sources */ = {isa = PBXBuildFile; fileRef = 386FD590658E90509C121118F057604D /* SpecialModelName.swift */; };
+		E51ADEC931806B20A041303E539A8BE2 /* Tag.swift in Sources */ = {isa = PBXBuildFile; fileRef = B2896F8BFD1AA2965C8A30158F0EDA8C /* Tag.swift */; };
+		E57CD12D2F500D40B4135D0F5ECA9866 /* AdditionalPropertiesObject.swift in Sources */ = {isa = PBXBuildFile; fileRef = 72FEDC94BA0E37214D360871B284BC8A /* AdditionalPropertiesObject.swift */; };
+		F02BEF9A8503B3848B045370451E85F6 /* Models.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8699F7966F748ED026A6FB4CF550442B /* Models.swift */; };
+		F21D10C71A9DE7D0467AFD23FD391D2E /* Return.swift in Sources */ = {isa = PBXBuildFile; fileRef = C81447828475F76C5CF4F08AA65292F7 /* Return.swift */; };
+		FB4A053CDCD75E48B755CC22D463A3FC /* TypeHolderExample.swift in Sources */ = {isa = PBXBuildFile; fileRef = 19B65C66C97F082718DDD703F39DE1C2 /* TypeHolderExample.swift */; };
+		FECA03F0388E84AE1B22638605D8AC9F /* File.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3933D3B2A3AC4577094D0C23D1C1B266 /* File.swift */; };
+/* End PBXBuildFile section */
+
+/* Begin PBXFileReference section */
+		02A6F6BB2152ACEE1416D44AB3955243 /* CodableHelper.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CodableHelper.swift; sourceTree = "<group>"; };
+		0CC24C01A55F644957196F9F81D10F81 /* AdditionalPropertiesBoolean.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AdditionalPropertiesBoolean.swift; sourceTree = "<group>"; };
+		10503995D9EFD031A2EFB57603B3132E /* EnumArrays.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EnumArrays.swift; sourceTree = "<group>"; };
+		164AD6EC9C4CCF634D7C45905E99E3A7 /* PetstoreClient.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = PetstoreClient.framework; sourceTree = BUILT_PRODUCTS_DIR; };
+		19B65C66C97F082718DDD703F39DE1C2 /* TypeHolderExample.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TypeHolderExample.swift; sourceTree = "<group>"; };
+		1E0512B3582586B4C0C598D5DB1C0D39 /* AdditionalPropertiesNumber.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AdditionalPropertiesNumber.swift; sourceTree = "<group>"; };
+		212AA914B7F1793A4E32C119370FB05F /* Cat.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Cat.swift; sourceTree = "<group>"; };
+		27B2E9EF856E89FEAA359A3AC4A2CF5D /* Order.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Order.swift; sourceTree = "<group>"; };
+		28A444949BBC254798C3B3DD14AAF2CD /* Configuration.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Configuration.swift; sourceTree = "<group>"; };
+		3156CE41C001C80379B84BDB435DECCB /* FormatTest.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FormatTest.swift; sourceTree = "<group>"; };
+		35D710108A69DD8A5297F926A66DA21F /* JSONEncodingHelper.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = JSONEncodingHelper.swift; sourceTree = "<group>"; };
+		37DF825B8F3BADA2B2537D17CDC48633 /* APIs.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = APIs.swift; sourceTree = "<group>"; };
+		386FD590658E90509C121118F057604D /* SpecialModelName.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SpecialModelName.swift; sourceTree = "<group>"; };
+		3933D3B2A3AC4577094D0C23D1C1B266 /* File.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = File.swift; sourceTree = "<group>"; };
+		396DEF3156BA0D12D0FC5C3C3AAF52C4 /* AdditionalPropertiesClass.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AdditionalPropertiesClass.swift; sourceTree = "<group>"; };
+		3AD0F94F512DFBC09F9CC79AF4BD9BFD /* CatAllOf.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CatAllOf.swift; sourceTree = "<group>"; };
+		3C30827D8EAF8EA684E7BCEA5A1E93B2 /* ClassModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ClassModel.swift; sourceTree = "<group>"; };
+		47B4DEBABEFE140768CFB70B19D23029 /* StringBooleanMap.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = StringBooleanMap.swift; sourceTree = "<group>"; };
+		4B2C97AE6ACA1E5FB88F5BAA2DB76FDC /* EnumClass.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EnumClass.swift; sourceTree = "<group>"; };
+		4B3666552AA854DAF9C480A3354C9D7C /* FileSchemaTestClass.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FileSchemaTestClass.swift; sourceTree = "<group>"; };
+		4C7FBC641752D2E13B15097311139DDC /* HasOnlyReadOnly.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HasOnlyReadOnly.swift; sourceTree = "<group>"; };
+		4FEE553331890581C2FF366F9EA0956D /* AdditionalPropertiesArray.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AdditionalPropertiesArray.swift; sourceTree = "<group>"; };
+		5AD994DFAA0DA93C188A4DBA16688767 /* Name.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Name.swift; sourceTree = "<group>"; };
+		69DB3E1D94EB0566C0052331742B5012 /* RxSwift.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = RxSwift.framework; sourceTree = "<group>"; };
+		6E00950725DC44436C5E238CDD2EC164 /* FakeAPI.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FakeAPI.swift; sourceTree = "<group>"; };
+		6F2985D01F8D60A4B1925C694330E6CB /* Category.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Category.swift; sourceTree = "<group>"; };
+		6FD42727E001E799E458C2924CF813CC /* ReadOnlyFirst.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ReadOnlyFirst.swift; sourceTree = "<group>"; };
+		72FEDC94BA0E37214D360871B284BC8A /* AdditionalPropertiesObject.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AdditionalPropertiesObject.swift; sourceTree = "<group>"; };
+		7986861626C2B1CB49AD7000C6343270 /* MapTest.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MapTest.swift; sourceTree = "<group>"; };
+		7A6070F581E611FF44AFD40A4315C49A /* List.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = List.swift; sourceTree = "<group>"; };
+		7B1B8B838B5D9D312F2002EBAD946378 /* ArrayOfArrayOfNumberOnly.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ArrayOfArrayOfNumberOnly.swift; sourceTree = "<group>"; };
+		7C8D5F382979854D47F18DB1543680FE /* UserAPI.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UserAPI.swift; sourceTree = "<group>"; };
+		82A2C3DC2235F0114C2B08E553F46874 /* Model200Response.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Model200Response.swift; sourceTree = "<group>"; };
+		84A201508DF2B697D65F263189C08721 /* AlamofireImplementations.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AlamofireImplementations.swift; sourceTree = "<group>"; };
+		8699F7966F748ED026A6FB4CF550442B /* Models.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Models.swift; sourceTree = "<group>"; };
+		897716962D472FE162B723CB713AA6D3 /* APIHelper.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = APIHelper.swift; sourceTree = "<group>"; };
+		8D22BE01748F51106DE0233299A9061E /* AnimalFarm.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AnimalFarm.swift; sourceTree = "<group>"; };
+		95568E7C35F119EB4A12B4982B3FB31F /* Animal.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Animal.swift; sourceTree = "<group>"; };
+		9791B840B8D6EAA35343B00FA277963A /* JSONEncodableEncoding.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = JSONEncodableEncoding.swift; sourceTree = "<group>"; };
+		9A019F500E546A3292CE716AB967C673 /* PetAPI.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PetAPI.swift; sourceTree = "<group>"; };
+		9AD714C7CC59BDD18DE8DF4ED40B9DA9 /* MixedPropertiesAndAdditionalPropertiesClass.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MixedPropertiesAndAdditionalPropertiesClass.swift; sourceTree = "<group>"; };
+		9DF24D2714B9C4CF14146E88FDDC01A5 /* AnotherFakeAPI.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AnotherFakeAPI.swift; sourceTree = "<group>"; };
+		A21A69C8402A60E01116ABBDEE8943DB /* DogAllOf.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DogAllOf.swift; sourceTree = "<group>"; };
+		A2253391845B73B8BA3680491575CC07 /* XmlItem.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = XmlItem.swift; sourceTree = "<group>"; };
+		A235FA3FDFB086CC69CDE83DFC1F4BC9 /* Alamofire.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = Alamofire.framework; sourceTree = "<group>"; };
+		A53274D99BBDE1B79BF3521CD7CBC276 /* StoreAPI.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = StoreAPI.swift; sourceTree = "<group>"; };
+		A7B38FA00A494D13F4C382A3D87FBF59 /* Capitalization.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Capitalization.swift; sourceTree = "<group>"; };
+		A8E7B833748B4F0C7CDA90C6E500B199 /* ApiResponse.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ApiResponse.swift; sourceTree = "<group>"; };
+		A913A57E72D723632E9A718FF4525C81 /* Client.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Client.swift; sourceTree = "<group>"; };
+		B2896F8BFD1AA2965C8A30158F0EDA8C /* Tag.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Tag.swift; sourceTree = "<group>"; };
+		B42354B407EC173BEB54E0429D946F3B /* FakeClassnameTags123API.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FakeClassnameTags123API.swift; sourceTree = "<group>"; };
+		B65BB72353DA24536A9049BEC3D234C8 /* ArrayOfNumberOnly.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ArrayOfNumberOnly.swift; sourceTree = "<group>"; };
+		B8C298FC8929DCB369053F118D7DF28F /* Extensions.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Extensions.swift; sourceTree = "<group>"; };
+		B8E0B16084741FCB82389F5854AC5E26 /* NumberOnly.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NumberOnly.swift; sourceTree = "<group>"; };
+		C15008AABC804EB6FB4CDAC6B871E6B0 /* OuterEnum.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = OuterEnum.swift; sourceTree = "<group>"; };
+		C6C3E1129526A353B963EFD74ED8419C /* Dog.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Dog.swift; sourceTree = "<group>"; };
+		C81447828475F76C5CF4F08AA65292F7 /* Return.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Return.swift; sourceTree = "<group>"; };
+		E5565A447062C7B8F695F4517DB5E4A5 /* User.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = User.swift; sourceTree = "<group>"; };
+		EBC76F6D4D2AA8084B7EB50E5C15E475 /* TypeHolderDefault.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TypeHolderDefault.swift; sourceTree = "<group>"; };
+		ECFEB4C6C257B3BB3CEA36D10A5EDC17 /* Pet.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Pet.swift; sourceTree = "<group>"; };
+		F1A0379CDFC55705AE76C99867B8DB08 /* ArrayTest.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ArrayTest.swift; sourceTree = "<group>"; };
+		F4E0AD8F60A91F72C768756002C14BF9 /* OuterComposite.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = OuterComposite.swift; sourceTree = "<group>"; };
+		F5AB1037D937AADF8B4A70C96D5E5D61 /* AdditionalPropertiesAnyType.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AdditionalPropertiesAnyType.swift; sourceTree = "<group>"; };
+		FA2F3566156A4ABC465F201B4A1F6227 /* AdditionalPropertiesInteger.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AdditionalPropertiesInteger.swift; sourceTree = "<group>"; };
+		FD60AEA646791E0EDE885DE1E680A687 /* EnumTest.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EnumTest.swift; sourceTree = "<group>"; };
+		FFE215C1B526E0418ED301B15357B970 /* AdditionalPropertiesString.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AdditionalPropertiesString.swift; sourceTree = "<group>"; };
+/* End PBXFileReference section */
+
+/* Begin PBXFrameworksBuildPhase section */
+		D1990C2A394CCF025EF98A2FB828C79A /* Frameworks */ = {
+			isa = PBXFrameworksBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				4C28BFEC5E7C8150DEFD83E09C1A1D32 /* Alamofire.framework in Frameworks */,
+				79536B981ECC24C77EB665FDAC7CA7BD /* RxSwift.framework in Frameworks */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+/* End PBXFrameworksBuildPhase section */
+
+/* Begin PBXGroup section */
+		1E464C0937FE0D3A7A0FE29AF446553C /* Frameworks */ = {
+			isa = PBXGroup;
+			children = (
+				7861EE241895128F64DD787367B3022D /* Carthage */,
+			);
+			name = Frameworks;
+			sourceTree = "<group>";
+		};
+		4FBDCF1330A9AB9122780DB3FA21DE4C /* Models */ = {
+			isa = PBXGroup;
+			children = (
+				F5AB1037D937AADF8B4A70C96D5E5D61 /* AdditionalPropertiesAnyType.swift */,
+				4FEE553331890581C2FF366F9EA0956D /* AdditionalPropertiesArray.swift */,
+				0CC24C01A55F644957196F9F81D10F81 /* AdditionalPropertiesBoolean.swift */,
+				396DEF3156BA0D12D0FC5C3C3AAF52C4 /* AdditionalPropertiesClass.swift */,
+				FA2F3566156A4ABC465F201B4A1F6227 /* AdditionalPropertiesInteger.swift */,
+				1E0512B3582586B4C0C598D5DB1C0D39 /* AdditionalPropertiesNumber.swift */,
+				72FEDC94BA0E37214D360871B284BC8A /* AdditionalPropertiesObject.swift */,
+				FFE215C1B526E0418ED301B15357B970 /* AdditionalPropertiesString.swift */,
+				95568E7C35F119EB4A12B4982B3FB31F /* Animal.swift */,
+				8D22BE01748F51106DE0233299A9061E /* AnimalFarm.swift */,
+				A8E7B833748B4F0C7CDA90C6E500B199 /* ApiResponse.swift */,
+				7B1B8B838B5D9D312F2002EBAD946378 /* ArrayOfArrayOfNumberOnly.swift */,
+				B65BB72353DA24536A9049BEC3D234C8 /* ArrayOfNumberOnly.swift */,
+				F1A0379CDFC55705AE76C99867B8DB08 /* ArrayTest.swift */,
+				A7B38FA00A494D13F4C382A3D87FBF59 /* Capitalization.swift */,
+				212AA914B7F1793A4E32C119370FB05F /* Cat.swift */,
+				3AD0F94F512DFBC09F9CC79AF4BD9BFD /* CatAllOf.swift */,
+				6F2985D01F8D60A4B1925C694330E6CB /* Category.swift */,
+				3C30827D8EAF8EA684E7BCEA5A1E93B2 /* ClassModel.swift */,
+				A913A57E72D723632E9A718FF4525C81 /* Client.swift */,
+				C6C3E1129526A353B963EFD74ED8419C /* Dog.swift */,
+				A21A69C8402A60E01116ABBDEE8943DB /* DogAllOf.swift */,
+				10503995D9EFD031A2EFB57603B3132E /* EnumArrays.swift */,
+				4B2C97AE6ACA1E5FB88F5BAA2DB76FDC /* EnumClass.swift */,
+				FD60AEA646791E0EDE885DE1E680A687 /* EnumTest.swift */,
+				3933D3B2A3AC4577094D0C23D1C1B266 /* File.swift */,
+				4B3666552AA854DAF9C480A3354C9D7C /* FileSchemaTestClass.swift */,
+				3156CE41C001C80379B84BDB435DECCB /* FormatTest.swift */,
+				4C7FBC641752D2E13B15097311139DDC /* HasOnlyReadOnly.swift */,
+				7A6070F581E611FF44AFD40A4315C49A /* List.swift */,
+				7986861626C2B1CB49AD7000C6343270 /* MapTest.swift */,
+				9AD714C7CC59BDD18DE8DF4ED40B9DA9 /* MixedPropertiesAndAdditionalPropertiesClass.swift */,
+				82A2C3DC2235F0114C2B08E553F46874 /* Model200Response.swift */,
+				5AD994DFAA0DA93C188A4DBA16688767 /* Name.swift */,
+				B8E0B16084741FCB82389F5854AC5E26 /* NumberOnly.swift */,
+				27B2E9EF856E89FEAA359A3AC4A2CF5D /* Order.swift */,
+				F4E0AD8F60A91F72C768756002C14BF9 /* OuterComposite.swift */,
+				C15008AABC804EB6FB4CDAC6B871E6B0 /* OuterEnum.swift */,
+				ECFEB4C6C257B3BB3CEA36D10A5EDC17 /* Pet.swift */,
+				6FD42727E001E799E458C2924CF813CC /* ReadOnlyFirst.swift */,
+				C81447828475F76C5CF4F08AA65292F7 /* Return.swift */,
+				386FD590658E90509C121118F057604D /* SpecialModelName.swift */,
+				47B4DEBABEFE140768CFB70B19D23029 /* StringBooleanMap.swift */,
+				B2896F8BFD1AA2965C8A30158F0EDA8C /* Tag.swift */,
+				EBC76F6D4D2AA8084B7EB50E5C15E475 /* TypeHolderDefault.swift */,
+				19B65C66C97F082718DDD703F39DE1C2 /* TypeHolderExample.swift */,
+				E5565A447062C7B8F695F4517DB5E4A5 /* User.swift */,
+				A2253391845B73B8BA3680491575CC07 /* XmlItem.swift */,
+			);
+			path = Models;
+			sourceTree = "<group>";
+		};
+		5FBA6AE5F64CD737F88B4565AC3CCD3B = {
+			isa = PBXGroup;
+			children = (
+				9B364C01750D7AA4F983B9E77B01BCC6 /* PetstoreClient */,
+				1E464C0937FE0D3A7A0FE29AF446553C /* Frameworks */,
+				857F0DEA1890CE66D6DAD556C55821A6 /* Products */,
+			);
+			sourceTree = "<group>";
+		};
+		67BF3478113E6B4DF1C4E04F40BF58C4 /* OpenAPIs */ = {
+			isa = PBXGroup;
+			children = (
+				84A201508DF2B697D65F263189C08721 /* AlamofireImplementations.swift */,
+				897716962D472FE162B723CB713AA6D3 /* APIHelper.swift */,
+				37DF825B8F3BADA2B2537D17CDC48633 /* APIs.swift */,
+				02A6F6BB2152ACEE1416D44AB3955243 /* CodableHelper.swift */,
+				28A444949BBC254798C3B3DD14AAF2CD /* Configuration.swift */,
+				B8C298FC8929DCB369053F118D7DF28F /* Extensions.swift */,
+				9791B840B8D6EAA35343B00FA277963A /* JSONEncodableEncoding.swift */,
+				35D710108A69DD8A5297F926A66DA21F /* JSONEncodingHelper.swift */,
+				8699F7966F748ED026A6FB4CF550442B /* Models.swift */,
+				F956D0CCAE23BCFD1C7BDD5D47944AA5 /* APIs */,
+				4FBDCF1330A9AB9122780DB3FA21DE4C /* Models */,
+			);
+			path = OpenAPIs;
+			sourceTree = "<group>";
+		};
+		7861EE241895128F64DD787367B3022D /* Carthage */ = {
+			isa = PBXGroup;
+			children = (
+				A012205B41CB71A62B86EECDEAFB0990 /* iOS */,
+			);
+			name = Carthage;
+			path = Carthage/Build;
+			sourceTree = "<group>";
+		};
+		857F0DEA1890CE66D6DAD556C55821A6 /* Products */ = {
+			isa = PBXGroup;
+			children = (
+				164AD6EC9C4CCF634D7C45905E99E3A7 /* PetstoreClient.framework */,
+			);
+			name = Products;
+			sourceTree = "<group>";
+		};
+		9B364C01750D7AA4F983B9E77B01BCC6 /* PetstoreClient */ = {
+			isa = PBXGroup;
+			children = (
+				EF4C81BDD734856ED5023B777D35098B /* Classes */,
+			);
+			path = PetstoreClient;
+			sourceTree = "<group>";
+		};
+		A012205B41CB71A62B86EECDEAFB0990 /* iOS */ = {
+			isa = PBXGroup;
+			children = (
+				A235FA3FDFB086CC69CDE83DFC1F4BC9 /* Alamofire.framework */,
+				69DB3E1D94EB0566C0052331742B5012 /* RxSwift.framework */,
+			);
+			path = iOS;
+			sourceTree = "<group>";
+		};
+		EF4C81BDD734856ED5023B777D35098B /* Classes */ = {
+			isa = PBXGroup;
+			children = (
+				67BF3478113E6B4DF1C4E04F40BF58C4 /* OpenAPIs */,
+			);
+			path = Classes;
+			sourceTree = "<group>";
+		};
+		F956D0CCAE23BCFD1C7BDD5D47944AA5 /* APIs */ = {
+			isa = PBXGroup;
+			children = (
+				9DF24D2714B9C4CF14146E88FDDC01A5 /* AnotherFakeAPI.swift */,
+				6E00950725DC44436C5E238CDD2EC164 /* FakeAPI.swift */,
+				B42354B407EC173BEB54E0429D946F3B /* FakeClassnameTags123API.swift */,
+				9A019F500E546A3292CE716AB967C673 /* PetAPI.swift */,
+				A53274D99BBDE1B79BF3521CD7CBC276 /* StoreAPI.swift */,
+				7C8D5F382979854D47F18DB1543680FE /* UserAPI.swift */,
+			);
+			path = APIs;
+			sourceTree = "<group>";
+		};
+/* End PBXGroup section */
+
+/* Begin PBXNativeTarget section */
+		C1282C2230015E0D204BEAEDDFB49453 /* PetstoreClient */ = {
+			isa = PBXNativeTarget;
+			buildConfigurationList = B46EDEB1A7F0D78FE6394544C60169D1 /* Build configuration list for PBXNativeTarget "PetstoreClient" */;
+			buildPhases = (
+				E539708354CE60FE486F81EDE56D13C8 /* Sources */,
+				D1990C2A394CCF025EF98A2FB828C79A /* Frameworks */,
+			);
+			buildRules = (
+			);
+			dependencies = (
+			);
+			name = PetstoreClient;
+			productName = PetstoreClient;
+			productReference = 164AD6EC9C4CCF634D7C45905E99E3A7 /* PetstoreClient.framework */;
+			productType = "com.apple.product-type.framework";
+		};
+/* End PBXNativeTarget section */
+
+/* Begin PBXProject section */
+		E7D276EE2369D8C455513C2E05F9AED0 /* Project object */ = {
+			isa = PBXProject;
+			attributes = {
+				LastUpgradeCheck = 1000;
+			};
+			buildConfigurationList = ECAB17FF35111B5E14DAAC0883031714 /* Build configuration list for PBXProject "PetstoreClient" */;
+			compatibilityVersion = "Xcode 9.3";
+			developmentRegion = en;
+			hasScannedForEncodings = 0;
+			knownRegions = (
+				en,
+			);
+			mainGroup = 5FBA6AE5F64CD737F88B4565AC3CCD3B;
+			projectDirPath = "";
+			projectRoot = "";
+			targets = (
+				C1282C2230015E0D204BEAEDDFB49453 /* PetstoreClient */,
+			);
+		};
+/* End PBXProject section */
+
+/* Begin PBXSourcesBuildPhase section */
+		E539708354CE60FE486F81EDE56D13C8 /* Sources */ = {
+			isa = PBXSourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				2A35688C985E9CB1EB7732AC2AD46B82 /* APIHelper.swift in Sources */,
+				0462F801432CF94C7EF51D0532737A7E /* APIs.swift in Sources */,
+				52B5604F986335DB69CD2B430FB83BAB /* AdditionalPropertiesAnyType.swift in Sources */,
+				D68F23CD4B5178493CE7AE8DFB868EAE /* AdditionalPropertiesArray.swift in Sources */,
+				988F461F59E4E1091156840007CB3773 /* AdditionalPropertiesBoolean.swift in Sources */,
+				12327BF7304AA897C5D2A1250B1659B7 /* AdditionalPropertiesClass.swift in Sources */,
+				08F5828F0C2BCF07A9E4917DBBB993AE /* AdditionalPropertiesInteger.swift in Sources */,
+				59EAB3527305A37ED99FB210045B69EA /* AdditionalPropertiesNumber.swift in Sources */,
+				E57CD12D2F500D40B4135D0F5ECA9866 /* AdditionalPropertiesObject.swift in Sources */,
+				39F9FBA1AC5C2612ECA1FF715EBFC287 /* AdditionalPropertiesString.swift in Sources */,
+				58F9704B295AC436D6FB98FA669E2344 /* AlamofireImplementations.swift in Sources */,
+				02903CEC38DC202565BC08CB040AC4E9 /* Animal.swift in Sources */,
+				DB1CE39011A741D07E187663291B5DE5 /* AnimalFarm.swift in Sources */,
+				83A2D1863FB136C0DFC423319F4EED65 /* AnotherFakeAPI.swift in Sources */,
+				97C99615237E1B662242E04F527B38B9 /* ApiResponse.swift in Sources */,
+				3251A3722981CE46261615CFBA96A08D /* ArrayOfArrayOfNumberOnly.swift in Sources */,
+				A190AF5A3988639ED4B78163D0EA3CA4 /* ArrayOfNumberOnly.swift in Sources */,
+				C2EDEB747887399B13A6DFD72A219CB2 /* ArrayTest.swift in Sources */,
+				7367A9D91D4B101F2D28AC56ED89F175 /* Capitalization.swift in Sources */,
+				18F19872A0DFB4CC3D9C696BBCA64EFD /* Cat.swift in Sources */,
+				41D8A105135868152A56E2AC475049BB /* CatAllOf.swift in Sources */,
+				42C51BC034E8B0CAA29A068F6B0DC815 /* Category.swift in Sources */,
+				5ACDD7CC312167589335E9CA5998E770 /* ClassModel.swift in Sources */,
+				92FB161BF1E57D11B116AF0292D5835C /* Client.swift in Sources */,
+				6CD20EE568DDAD2304BF0C4B1A70C8DC /* CodableHelper.swift in Sources */,
+				DEC892724574BB29BD65869374F83982 /* Configuration.swift in Sources */,
+				D70EC94E346077DE1482231DD4498BED /* Dog.swift in Sources */,
+				271D94A05C47B602A2433B9CD3D9DCDC /* DogAllOf.swift in Sources */,
+				A438970025AE69ED407BC1E67CC6359E /* EnumArrays.swift in Sources */,
+				59C00CBB07761CAC8DCE7054E34AD5D9 /* EnumClass.swift in Sources */,
+				08D87E4FECF24910F0DA0F1D2E2D955A /* EnumTest.swift in Sources */,
+				C329EE55B2FCC9174ED3B128D67C5E8C /* Extensions.swift in Sources */,
+				297E365D1E4672C43C56E0AFD855FFBF /* FakeAPI.swift in Sources */,
+				A9F1AAF6CE029DD3B4F8AC841F0B6BC6 /* FakeClassnameTags123API.swift in Sources */,
+				FECA03F0388E84AE1B22638605D8AC9F /* File.swift in Sources */,
+				491676EC91BFEF95A12556888EED87B5 /* FileSchemaTestClass.swift in Sources */,
+				36734C4EB3362A114A7CB5F25EE39E6D /* FormatTest.swift in Sources */,
+				DDBC3CF5E447D8D838F0FE200420EEE3 /* HasOnlyReadOnly.swift in Sources */,
+				16E9A5E22B4823DE282E7F4C18A21EA8 /* JSONEncodableEncoding.swift in Sources */,
+				12BB95C66D63090732BB9E0379836E3C /* JSONEncodingHelper.swift in Sources */,
+				C1CACABE18A7ADCE37D1CD9DC9128304 /* List.swift in Sources */,
+				655AA371771C7BD72EE0AAC0C90DFFF0 /* MapTest.swift in Sources */,
+				D3A17B7FAFA8A7A210875BBCDCC30116 /* MixedPropertiesAndAdditionalPropertiesClass.swift in Sources */,
+				2DF4544D4D3D6CF7047A59FB89ED31BD /* Model200Response.swift in Sources */,
+				F02BEF9A8503B3848B045370451E85F6 /* Models.swift in Sources */,
+				C15AC1CC631E96D0360EB8C15BF30452 /* Name.swift in Sources */,
+				AE9D2E1DB59AF6575AC4AC6756C5A937 /* NumberOnly.swift in Sources */,
+				59C2F5495C98836BFA9E10BF5C13BC2C /* Order.swift in Sources */,
+				82D4D0C8AD0354A700C8ACD421ABED55 /* OuterComposite.swift in Sources */,
+				1143FFF06DEE01E5B0F1368AA05BE1B4 /* OuterEnum.swift in Sources */,
+				B399A1742F23330FDCA450EAB98F51F1 /* Pet.swift in Sources */,
+				3D8E407B1DF4FA5A5F16B64E3A285781 /* PetAPI.swift in Sources */,
+				293F4E0FBFC8297E414A3CDBB7F29A96 /* ReadOnlyFirst.swift in Sources */,
+				F21D10C71A9DE7D0467AFD23FD391D2E /* Return.swift in Sources */,
+				E2C40F0E34DB8C21A806262C72841A51 /* SpecialModelName.swift in Sources */,
+				122BBAE8245606CC040EEB6B9254E376 /* StoreAPI.swift in Sources */,
+				196E9846B27D736630CCF90497696859 /* StringBooleanMap.swift in Sources */,
+				E51ADEC931806B20A041303E539A8BE2 /* Tag.swift in Sources */,
+				6600BB1500AE35A3C80F7C83F6444552 /* TypeHolderDefault.swift in Sources */,
+				FB4A053CDCD75E48B755CC22D463A3FC /* TypeHolderExample.swift in Sources */,
+				BF7D58FBCF5E4D3F2932FCC0E62BED40 /* User.swift in Sources */,
+				DB724C4F1AD5DF025B53A9A2E0A49E3D /* UserAPI.swift in Sources */,
+				BB02FDCF1B2B0E457E1C2BF39FBB599D /* XmlItem.swift in Sources */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+/* End PBXSourcesBuildPhase section */
+
+/* Begin XCBuildConfiguration section */
+		3B2C02AFB91CB5C82766ED5CF21FF628 /* Release */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				APPLICATION_EXTENSION_API_ONLY = YES;
+				CODE_SIGN_IDENTITY = "";
+				CURRENT_PROJECT_VERSION = 1;
+				DEFINES_MODULE = YES;
+				DYLIB_COMPATIBILITY_VERSION = 1;
+				DYLIB_CURRENT_VERSION = 1;
+				DYLIB_INSTALL_NAME_BASE = "@rpath";
+				FRAMEWORK_SEARCH_PATHS = (
+					"$(inherited)",
+					"$(PROJECT_DIR)/Carthage/Build/iOS",
+				);
+				INFOPLIST_FILE = Info.plist;
+				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
+				IPHONEOS_DEPLOYMENT_TARGET = 10.0;
+				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
+				SDKROOT = iphoneos;
+				SKIP_INSTALL = YES;
+				TARGETED_DEVICE_FAMILY = "1,2";
+				VERSIONING_SYSTEM = "apple-generic";
+			};
+			name = Release;
+		};
+		A9EB0A02B94C427CBACFEC7CFFC6A816 /* Debug */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				ALWAYS_SEARCH_USER_PATHS = NO;
+				CLANG_ANALYZER_NONNULL = YES;
+				CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
+				CLANG_CXX_LANGUAGE_STANDARD = "gnu++14";
+				CLANG_CXX_LIBRARY = "libc++";
+				CLANG_ENABLE_MODULES = YES;
+				CLANG_ENABLE_OBJC_ARC = YES;
+				CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
+				CLANG_WARN_BOOL_CONVERSION = YES;
+				CLANG_WARN_COMMA = YES;
+				CLANG_WARN_CONSTANT_CONVERSION = YES;
+				CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
+				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
+				CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
+				CLANG_WARN_EMPTY_BODY = YES;
+				CLANG_WARN_ENUM_CONVERSION = YES;
+				CLANG_WARN_INFINITE_RECURSION = YES;
+				CLANG_WARN_INT_CONVERSION = YES;
+				CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
+				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
+				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
+				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
+				CLANG_WARN_STRICT_PROTOTYPES = YES;
+				CLANG_WARN_SUSPICIOUS_MOVE = YES;
+				CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
+				CLANG_WARN_UNREACHABLE_CODE = YES;
+				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
+				COPY_PHASE_STRIP = NO;
+				DEBUG_INFORMATION_FORMAT = dwarf;
+				ENABLE_STRICT_OBJC_MSGSEND = YES;
+				ENABLE_TESTABILITY = YES;
+				GCC_C_LANGUAGE_STANDARD = gnu11;
+				GCC_DYNAMIC_NO_PIC = NO;
+				GCC_NO_COMMON_BLOCKS = YES;
+				GCC_OPTIMIZATION_LEVEL = 0;
+				GCC_PREPROCESSOR_DEFINITIONS = (
+					"$(inherited)",
+					"DEBUG=1",
+				);
+				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
+				GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
+				GCC_WARN_UNDECLARED_SELECTOR = YES;
+				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
+				GCC_WARN_UNUSED_FUNCTION = YES;
+				GCC_WARN_UNUSED_VARIABLE = YES;
+				MTL_ENABLE_DEBUG_INFO = YES;
+				ONLY_ACTIVE_ARCH = YES;
+				PRODUCT_NAME = "$(TARGET_NAME)";
+				SDKROOT = iphoneos;
+				SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
+				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
+				SWIFT_VERSION = 4.2;
+			};
+			name = Debug;
+		};
+		DD3EEB93949E9EBA4437E9CDBF4A26F6 /* Debug */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				APPLICATION_EXTENSION_API_ONLY = YES;
+				CODE_SIGN_IDENTITY = "";
+				CURRENT_PROJECT_VERSION = 1;
+				DEFINES_MODULE = YES;
+				DYLIB_COMPATIBILITY_VERSION = 1;
+				DYLIB_CURRENT_VERSION = 1;
+				DYLIB_INSTALL_NAME_BASE = "@rpath";
+				FRAMEWORK_SEARCH_PATHS = (
+					"$(inherited)",
+					"$(PROJECT_DIR)/Carthage/Build/iOS",
+				);
+				INFOPLIST_FILE = Info.plist;
+				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
+				IPHONEOS_DEPLOYMENT_TARGET = 10.0;
+				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
+				SDKROOT = iphoneos;
+				SKIP_INSTALL = YES;
+				TARGETED_DEVICE_FAMILY = "1,2";
+				VERSIONING_SYSTEM = "apple-generic";
+			};
+			name = Debug;
+		};
+		F81D4E5FECD46E9AA6DD2C299CEBEF64 /* Release */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				ALWAYS_SEARCH_USER_PATHS = NO;
+				CLANG_ANALYZER_NONNULL = YES;
+				CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
+				CLANG_CXX_LANGUAGE_STANDARD = "gnu++14";
+				CLANG_CXX_LIBRARY = "libc++";
+				CLANG_ENABLE_MODULES = YES;
+				CLANG_ENABLE_OBJC_ARC = YES;
+				CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
+				CLANG_WARN_BOOL_CONVERSION = YES;
+				CLANG_WARN_COMMA = YES;
+				CLANG_WARN_CONSTANT_CONVERSION = YES;
+				CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
+				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
+				CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
+				CLANG_WARN_EMPTY_BODY = YES;
+				CLANG_WARN_ENUM_CONVERSION = YES;
+				CLANG_WARN_INFINITE_RECURSION = YES;
+				CLANG_WARN_INT_CONVERSION = YES;
+				CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
+				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
+				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
+				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
+				CLANG_WARN_STRICT_PROTOTYPES = YES;
+				CLANG_WARN_SUSPICIOUS_MOVE = YES;
+				CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
+				CLANG_WARN_UNREACHABLE_CODE = YES;
+				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
+				COPY_PHASE_STRIP = NO;
+				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
+				ENABLE_NS_ASSERTIONS = NO;
+				ENABLE_STRICT_OBJC_MSGSEND = YES;
+				GCC_C_LANGUAGE_STANDARD = gnu11;
+				GCC_NO_COMMON_BLOCKS = YES;
+				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
+				GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
+				GCC_WARN_UNDECLARED_SELECTOR = YES;
+				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
+				GCC_WARN_UNUSED_FUNCTION = YES;
+				GCC_WARN_UNUSED_VARIABLE = YES;
+				PRODUCT_NAME = "$(TARGET_NAME)";
+				SDKROOT = iphoneos;
+				SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
+				SWIFT_VERSION = 4.2;
+				VALIDATE_PRODUCT = YES;
+			};
+			name = Release;
+		};
+/* End XCBuildConfiguration section */
+
+/* Begin XCConfigurationList section */
+		B46EDEB1A7F0D78FE6394544C60169D1 /* Build configuration list for PBXNativeTarget "PetstoreClient" */ = {
+			isa = XCConfigurationList;
+			buildConfigurations = (
+				DD3EEB93949E9EBA4437E9CDBF4A26F6 /* Debug */,
+				3B2C02AFB91CB5C82766ED5CF21FF628 /* Release */,
+			);
+			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = "";
+		};
+		ECAB17FF35111B5E14DAAC0883031714 /* Build configuration list for PBXProject "PetstoreClient" */ = {
+			isa = XCConfigurationList;
+			buildConfigurations = (
+				A9EB0A02B94C427CBACFEC7CFFC6A816 /* Debug */,
+				F81D4E5FECD46E9AA6DD2C299CEBEF64 /* Release */,
+			);
+			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Debug;
+		};
+/* End XCConfigurationList section */
+	};
+	rootObject = E7D276EE2369D8C455513C2E05F9AED0 /* Project object */;
+}
diff --git a/samples/client/petstore/swift4/rxswift/PetstoreClient.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/samples/client/petstore/swift4/rxswift/PetstoreClient.xcodeproj/project.xcworkspace/contents.xcworkspacedata
new file mode 100644
index 0000000000..919434a625
--- /dev/null
+++ b/samples/client/petstore/swift4/rxswift/PetstoreClient.xcodeproj/project.xcworkspace/contents.xcworkspacedata
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Workspace
+   version = "1.0">
+   <FileRef
+      location = "self:">
+   </FileRef>
+</Workspace>
diff --git a/samples/client/petstore/swift4/rxswift/PetstoreClient.xcodeproj/xcshareddata/xcschemes/PetstoreClient.xcscheme b/samples/client/petstore/swift4/rxswift/PetstoreClient.xcodeproj/xcshareddata/xcschemes/PetstoreClient.xcscheme
new file mode 100644
index 0000000000..7802e37945
--- /dev/null
+++ b/samples/client/petstore/swift4/rxswift/PetstoreClient.xcodeproj/xcshareddata/xcschemes/PetstoreClient.xcscheme
@@ -0,0 +1,96 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Scheme
+   LastUpgradeVersion = "1000"
+   version = "1.3">
+   <BuildAction
+      parallelizeBuildables = "YES"
+      buildImplicitDependencies = "YES">
+      <BuildActionEntries>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "YES"
+            buildForProfiling = "YES"
+            buildForArchiving = "YES"
+            buildForAnalyzing = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "C1282C2230015E0D204BEAEDDFB49453"
+               BuildableName = "PetstoreClient.framework"
+               BlueprintName = "PetstoreClient"
+               ReferencedContainer = "container:PetstoreClient.xcodeproj">
+            </BuildableReference>
+         </BuildActionEntry>
+      </BuildActionEntries>
+   </BuildAction>
+   <TestAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      shouldUseLaunchSchemeArgsEnv = "YES">
+      <Testables>
+      </Testables>
+      <MacroExpansion>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "C1282C2230015E0D204BEAEDDFB49453"
+            BuildableName = "PetstoreClient.framework"
+            BlueprintName = "PetstoreClient"
+            ReferencedContainer = "container:PetstoreClient.xcodeproj">
+         </BuildableReference>
+      </MacroExpansion>
+      <CommandLineArguments>
+      </CommandLineArguments>
+      <AdditionalOptions>
+      </AdditionalOptions>
+   </TestAction>
+   <LaunchAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      launchStyle = "0"
+      useCustomWorkingDirectory = "NO"
+      ignoresPersistentStateOnLaunch = "NO"
+      debugDocumentVersioning = "YES"
+      debugServiceExtension = "internal"
+      allowLocationSimulation = "YES">
+      <MacroExpansion>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "C1282C2230015E0D204BEAEDDFB49453"
+            BuildableName = "PetstoreClient.framework"
+            BlueprintName = "PetstoreClient"
+            ReferencedContainer = "container:PetstoreClient.xcodeproj">
+         </BuildableReference>
+      </MacroExpansion>
+      <CommandLineArguments>
+      </CommandLineArguments>
+      <AdditionalOptions>
+      </AdditionalOptions>
+   </LaunchAction>
+   <ProfileAction
+      buildConfiguration = "Release"
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      savedToolIdentifier = ""
+      useCustomWorkingDirectory = "NO"
+      debugDocumentVersioning = "YES">
+      <BuildableProductRunnable
+         runnableDebuggingMode = "0">
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "C1282C2230015E0D204BEAEDDFB49453"
+            BuildableName = "PetstoreClient.framework"
+            BlueprintName = "PetstoreClient"
+            ReferencedContainer = "container:PetstoreClient.xcodeproj">
+         </BuildableReference>
+      </BuildableProductRunnable>
+      <CommandLineArguments>
+      </CommandLineArguments>
+   </ProfileAction>
+   <AnalyzeAction
+      buildConfiguration = "Debug">
+   </AnalyzeAction>
+   <ArchiveAction
+      buildConfiguration = "Release"
+      revealArchiveInOrganizer = "YES">
+   </ArchiveAction>
+</Scheme>
diff --git a/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/OpenAPIs/APIHelper.swift b/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/OpenAPIs/APIHelper.swift
index d94614b34f..75dea24395 100644
--- a/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/OpenAPIs/APIHelper.swift
+++ b/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/OpenAPIs/APIHelper.swift
@@ -7,7 +7,7 @@
 import Foundation
 
 public struct APIHelper {
-    public static func rejectNil(_ source: [String:Any?]) -> [String:Any]? {
+    public static func rejectNil(_ source: [String: Any?]) -> [String: Any]? {
         let destination = source.reduce(into: [String: Any]()) { (result, item) in
             if let value = item.value {
                 result[item.key] = value
@@ -20,17 +20,17 @@ public struct APIHelper {
         return destination
     }
 
-    public static func rejectNilHeaders(_ source: [String:Any?]) -> [String:String] {
+    public static func rejectNilHeaders(_ source: [String: Any?]) -> [String: String] {
         return source.reduce(into: [String: String]()) { (result, item) in
             if let collection = item.value as? Array<Any?> {
-                result[item.key] = collection.filter({ $0 != nil }).map{ "\($0!)" }.joined(separator: ",")
+                result[item.key] = collection.filter({ $0 != nil }).map { "\($0!)" }.joined(separator: ",")
             } else if let value: Any = item.value {
                 result[item.key] = "\(value)"
             }
         }
     }
 
-    public static func convertBoolToString(_ source: [String: Any]?) -> [String:Any]? {
+    public static func convertBoolToString(_ source: [String: Any]?) -> [String: Any]? {
         guard let source = source else {
             return nil
         }
@@ -52,7 +52,7 @@ public struct APIHelper {
         return source
     }
 
-    public static func mapValuesToQueryItems(_ source: [String:Any?]) -> [URLQueryItem]? {
+    public static func mapValuesToQueryItems(_ source: [String: Any?]) -> [URLQueryItem]? {
         let destination = source.filter({ $0.value != nil}).reduce(into: [URLQueryItem]()) { (result, item) in
             if let collection = item.value as? Array<Any?> {
                 let value = collection.filter({ $0 != nil }).map({"\($0!)"}).joined(separator: ",")
@@ -68,4 +68,3 @@ public struct APIHelper {
         return destination
     }
 }
-
diff --git a/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/OpenAPIs/APIs.swift b/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/OpenAPIs/APIs.swift
index 2890bffa27..9e4312f685 100644
--- a/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/OpenAPIs/APIs.swift
+++ b/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/OpenAPIs/APIs.swift
@@ -9,22 +9,22 @@ import Foundation
 open class PetstoreClientAPI {
     public static var basePath = "http://petstore.swagger.io:80/v2"
     public static var credential: URLCredential?
-    public static var customHeaders: [String:String] = [:]
+    public static var customHeaders: [String: String] = [:]
     public static var requestBuilderFactory: RequestBuilderFactory = AlamofireRequestBuilderFactory()
 }
 
 open class RequestBuilder<T> {
     var credential: URLCredential?
-    var headers: [String:String]
-    public let parameters: [String:Any]?
+    var headers: [String: String]
+    public let parameters: [String: Any]?
     public let isBody: Bool
     public let method: String
     public let URLString: String
 
     /// Optional block to obtain a reference to the request's progress instance when available.
-    public var onProgressReady: ((Progress) -> ())?
+    public var onProgressReady: ((Progress) -> Void)?
 
-    required public init(method: String, URLString: String, parameters: [String:Any]?, isBody: Bool, headers: [String:String] = [:]) {
+    required public init(method: String, URLString: String, parameters: [String: Any]?, isBody: Bool, headers: [String: String] = [:]) {
         self.method = method
         self.URLString = URLString
         self.parameters = parameters
@@ -34,7 +34,7 @@ open class RequestBuilder<T> {
         addHeaders(PetstoreClientAPI.customHeaders)
     }
 
-    open func addHeaders(_ aHeaders:[String:String]) {
+    open func addHeaders(_ aHeaders: [String: String]) {
         for (header, value) in aHeaders {
             headers[header] = value
         }
@@ -57,5 +57,5 @@ open class RequestBuilder<T> {
 
 public protocol RequestBuilderFactory {
     func getNonDecodableBuilder<T>() -> RequestBuilder<T>.Type
-    func getBuilder<T:Decodable>() -> RequestBuilder<T>.Type
+    func getBuilder<T: Decodable>() -> RequestBuilder<T>.Type
 }
diff --git a/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/OpenAPIs/APIs/AnotherFakeAPI.swift b/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/OpenAPIs/APIs/AnotherFakeAPI.swift
index 1a95322a6b..0d88a4bad9 100644
--- a/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/OpenAPIs/APIs/AnotherFakeAPI.swift
+++ b/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/OpenAPIs/APIs/AnotherFakeAPI.swift
@@ -9,8 +9,6 @@ import Foundation
 import Alamofire
 import RxSwift
 
-
-
 open class AnotherFakeAPI {
     /**
      To test special tags
diff --git a/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/OpenAPIs/APIs/FakeAPI.swift b/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/OpenAPIs/APIs/FakeAPI.swift
index 05053aed92..8e6840eeaa 100644
--- a/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/OpenAPIs/APIs/FakeAPI.swift
+++ b/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/OpenAPIs/APIs/FakeAPI.swift
@@ -9,8 +9,6 @@ import Foundation
 import Alamofire
 import RxSwift
 
-
-
 open class FakeAPI {
     /**
 
@@ -346,7 +344,7 @@ open class FakeAPI {
     open class func testEndpointParametersWithRequestBuilder(number: Double, double: Double, patternWithoutDelimiter: String, byte: Data, integer: Int? = nil, int32: Int? = nil, int64: Int64? = nil, float: Float? = nil, string: String? = nil, binary: URL? = nil, date: Date? = nil, dateTime: Date? = nil, password: String? = nil, callback: String? = nil) -> RequestBuilder<Void> {
         let path = "/fake"
         let URLString = PetstoreClientAPI.basePath + path
-        let formParams: [String:Any?] = [
+        let formParams: [String: Any?] = [
             "integer": integer?.encodeToJSON(),
             "int32": int32?.encodeToJSON(),
             "int64": int64?.encodeToJSON(),
@@ -365,7 +363,7 @@ open class FakeAPI {
 
         let nonNullParameters = APIHelper.rejectNil(formParams)
         let parameters = APIHelper.convertBoolToString(nonNullParameters)
-        
+
         let url = URLComponents(string: URLString)
 
         let requestBuilder: RequestBuilder<Void>.Type = PetstoreClientAPI.requestBuilderFactory.getNonDecodableBuilder()
@@ -484,19 +482,19 @@ open class FakeAPI {
     open class func testEnumParametersWithRequestBuilder(enumHeaderStringArray: [String]? = nil, enumHeaderString: EnumHeaderString_testEnumParameters? = nil, enumQueryStringArray: [String]? = nil, enumQueryString: EnumQueryString_testEnumParameters? = nil, enumQueryInteger: EnumQueryInteger_testEnumParameters? = nil, enumQueryDouble: EnumQueryDouble_testEnumParameters? = nil, enumFormStringArray: [String]? = nil, enumFormString: EnumFormString_testEnumParameters? = nil) -> RequestBuilder<Void> {
         let path = "/fake"
         let URLString = PetstoreClientAPI.basePath + path
-        let formParams: [String:Any?] = [
+        let formParams: [String: Any?] = [
             "enum_form_string_array": enumFormStringArray,
             "enum_form_string": enumFormString?.rawValue
         ]
 
         let nonNullParameters = APIHelper.rejectNil(formParams)
         let parameters = APIHelper.convertBoolToString(nonNullParameters)
-        
+
         var url = URLComponents(string: URLString)
         url?.queryItems = APIHelper.mapValuesToQueryItems([
-            "enum_query_string_array": enumQueryStringArray, 
-            "enum_query_string": enumQueryString?.rawValue, 
-            "enum_query_integer": enumQueryInteger?.rawValue, 
+            "enum_query_string_array": enumQueryStringArray,
+            "enum_query_string": enumQueryString?.rawValue,
+            "enum_query_integer": enumQueryInteger?.rawValue,
             "enum_query_double": enumQueryDouble?.rawValue
         ])
         let nillableHeaders: [String: Any?] = [
@@ -550,13 +548,13 @@ open class FakeAPI {
     open class func testGroupParametersWithRequestBuilder(requiredStringGroup: Int, requiredBooleanGroup: Bool, requiredInt64Group: Int64, stringGroup: Int? = nil, booleanGroup: Bool? = nil, int64Group: Int64? = nil) -> RequestBuilder<Void> {
         let path = "/fake"
         let URLString = PetstoreClientAPI.basePath + path
-        let parameters: [String:Any]? = nil
-        
+        let parameters: [String: Any]? = nil
+
         var url = URLComponents(string: URLString)
         url?.queryItems = APIHelper.mapValuesToQueryItems([
-            "required_string_group": requiredStringGroup.encodeToJSON(), 
-            "required_int64_group": requiredInt64Group.encodeToJSON(), 
-            "string_group": stringGroup?.encodeToJSON(), 
+            "required_string_group": requiredStringGroup.encodeToJSON(),
+            "required_int64_group": requiredInt64Group.encodeToJSON(),
+            "string_group": stringGroup?.encodeToJSON(),
             "int64_group": int64Group?.encodeToJSON()
         ])
         let nillableHeaders: [String: Any?] = [
@@ -576,7 +574,7 @@ open class FakeAPI {
      - parameter param: (body) request body 
      - returns: Observable<Void>
      */
-    open class func testInlineAdditionalProperties(param: [String:String]) -> Observable<Void> {
+    open class func testInlineAdditionalProperties(param: [String: String]) -> Observable<Void> {
         return Observable.create { observer -> Disposable in
             testInlineAdditionalPropertiesWithRequestBuilder(param: param).execute { (response, error) -> Void in
                 if let error = error {
@@ -596,7 +594,7 @@ open class FakeAPI {
      - parameter param: (body) request body 
      - returns: RequestBuilder<Void> 
      */
-    open class func testInlineAdditionalPropertiesWithRequestBuilder(param: [String:String]) -> RequestBuilder<Void> {
+    open class func testInlineAdditionalPropertiesWithRequestBuilder(param: [String: String]) -> RequestBuilder<Void> {
         let path = "/fake/inline-additionalProperties"
         let URLString = PetstoreClientAPI.basePath + path
         let parameters = JSONEncodingHelper.encodingParameters(forEncodableObject: param)
@@ -639,14 +637,14 @@ open class FakeAPI {
     open class func testJsonFormDataWithRequestBuilder(param: String, param2: String) -> RequestBuilder<Void> {
         let path = "/fake/jsonFormData"
         let URLString = PetstoreClientAPI.basePath + path
-        let formParams: [String:Any?] = [
+        let formParams: [String: Any?] = [
             "param": param,
             "param2": param2
         ]
 
         let nonNullParameters = APIHelper.rejectNil(formParams)
         let parameters = APIHelper.convertBoolToString(nonNullParameters)
-        
+
         let url = URLComponents(string: URLString)
 
         let requestBuilder: RequestBuilder<Void>.Type = PetstoreClientAPI.requestBuilderFactory.getNonDecodableBuilder()
diff --git a/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/OpenAPIs/APIs/FakeClassnameTags123API.swift b/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/OpenAPIs/APIs/FakeClassnameTags123API.swift
index 2784d5cfb6..a4e7d073c9 100644
--- a/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/OpenAPIs/APIs/FakeClassnameTags123API.swift
+++ b/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/OpenAPIs/APIs/FakeClassnameTags123API.swift
@@ -9,8 +9,6 @@ import Foundation
 import Alamofire
 import RxSwift
 
-
-
 open class FakeClassnameTags123API {
     /**
      To test class name in snake case
diff --git a/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/OpenAPIs/APIs/PetAPI.swift b/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/OpenAPIs/APIs/PetAPI.swift
index b9ca8262f4..fcbd3f3b00 100644
--- a/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/OpenAPIs/APIs/PetAPI.swift
+++ b/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/OpenAPIs/APIs/PetAPI.swift
@@ -9,8 +9,6 @@ import Foundation
 import Alamofire
 import RxSwift
 
-
-
 open class PetAPI {
     /**
      Add a new pet to the store
@@ -90,8 +88,8 @@ open class PetAPI {
         let petIdPostEscape = petIdPreEscape.addingPercentEncoding(withAllowedCharacters: .urlPathAllowed) ?? ""
         path = path.replacingOccurrences(of: "{petId}", with: petIdPostEscape, options: .literal, range: nil)
         let URLString = PetstoreClientAPI.basePath + path
-        let parameters: [String:Any]? = nil
-        
+        let parameters: [String: Any]? = nil
+
         let url = URLComponents(string: URLString)
         let nillableHeaders: [String: Any?] = [
             "api_key": apiKey
@@ -147,8 +145,8 @@ open class PetAPI {
     open class func findPetsByStatusWithRequestBuilder(status: [String]) -> RequestBuilder<[Pet]> {
         let path = "/pet/findByStatus"
         let URLString = PetstoreClientAPI.basePath + path
-        let parameters: [String:Any]? = nil
-        
+        let parameters: [String: Any]? = nil
+
         var url = URLComponents(string: URLString)
         url?.queryItems = APIHelper.mapValuesToQueryItems([
             "status": status
@@ -194,8 +192,8 @@ open class PetAPI {
     open class func findPetsByTagsWithRequestBuilder(tags: [String]) -> RequestBuilder<[Pet]> {
         let path = "/pet/findByTags"
         let URLString = PetstoreClientAPI.basePath + path
-        let parameters: [String:Any]? = nil
-        
+        let parameters: [String: Any]? = nil
+
         var url = URLComponents(string: URLString)
         url?.queryItems = APIHelper.mapValuesToQueryItems([
             "tags": tags
@@ -244,8 +242,8 @@ open class PetAPI {
         let petIdPostEscape = petIdPreEscape.addingPercentEncoding(withAllowedCharacters: .urlPathAllowed) ?? ""
         path = path.replacingOccurrences(of: "{petId}", with: petIdPostEscape, options: .literal, range: nil)
         let URLString = PetstoreClientAPI.basePath + path
-        let parameters: [String:Any]? = nil
-        
+        let parameters: [String: Any]? = nil
+
         let url = URLComponents(string: URLString)
 
         let requestBuilder: RequestBuilder<Pet>.Type = PetstoreClientAPI.requestBuilderFactory.getBuilder()
@@ -333,14 +331,14 @@ open class PetAPI {
         let petIdPostEscape = petIdPreEscape.addingPercentEncoding(withAllowedCharacters: .urlPathAllowed) ?? ""
         path = path.replacingOccurrences(of: "{petId}", with: petIdPostEscape, options: .literal, range: nil)
         let URLString = PetstoreClientAPI.basePath + path
-        let formParams: [String:Any?] = [
+        let formParams: [String: Any?] = [
             "name": name,
             "status": status
         ]
 
         let nonNullParameters = APIHelper.rejectNil(formParams)
         let parameters = APIHelper.convertBoolToString(nonNullParameters)
-        
+
         let url = URLComponents(string: URLString)
 
         let requestBuilder: RequestBuilder<Void>.Type = PetstoreClientAPI.requestBuilderFactory.getNonDecodableBuilder()
@@ -389,14 +387,14 @@ open class PetAPI {
         let petIdPostEscape = petIdPreEscape.addingPercentEncoding(withAllowedCharacters: .urlPathAllowed) ?? ""
         path = path.replacingOccurrences(of: "{petId}", with: petIdPostEscape, options: .literal, range: nil)
         let URLString = PetstoreClientAPI.basePath + path
-        let formParams: [String:Any?] = [
+        let formParams: [String: Any?] = [
             "additionalMetadata": additionalMetadata,
             "file": file
         ]
 
         let nonNullParameters = APIHelper.rejectNil(formParams)
         let parameters = APIHelper.convertBoolToString(nonNullParameters)
-        
+
         let url = URLComponents(string: URLString)
 
         let requestBuilder: RequestBuilder<ApiResponse>.Type = PetstoreClientAPI.requestBuilderFactory.getBuilder()
@@ -445,14 +443,14 @@ open class PetAPI {
         let petIdPostEscape = petIdPreEscape.addingPercentEncoding(withAllowedCharacters: .urlPathAllowed) ?? ""
         path = path.replacingOccurrences(of: "{petId}", with: petIdPostEscape, options: .literal, range: nil)
         let URLString = PetstoreClientAPI.basePath + path
-        let formParams: [String:Any?] = [
+        let formParams: [String: Any?] = [
             "additionalMetadata": additionalMetadata,
             "requiredFile": requiredFile
         ]
 
         let nonNullParameters = APIHelper.rejectNil(formParams)
         let parameters = APIHelper.convertBoolToString(nonNullParameters)
-        
+
         let url = URLComponents(string: URLString)
 
         let requestBuilder: RequestBuilder<ApiResponse>.Type = PetstoreClientAPI.requestBuilderFactory.getBuilder()
diff --git a/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/OpenAPIs/APIs/StoreAPI.swift b/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/OpenAPIs/APIs/StoreAPI.swift
index 4af70c9253..6171b68c85 100644
--- a/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/OpenAPIs/APIs/StoreAPI.swift
+++ b/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/OpenAPIs/APIs/StoreAPI.swift
@@ -9,8 +9,6 @@ import Foundation
 import Alamofire
 import RxSwift
 
-
-
 open class StoreAPI {
     /**
      Delete purchase order by ID
@@ -45,8 +43,8 @@ open class StoreAPI {
         let orderIdPostEscape = orderIdPreEscape.addingPercentEncoding(withAllowedCharacters: .urlPathAllowed) ?? ""
         path = path.replacingOccurrences(of: "{order_id}", with: orderIdPostEscape, options: .literal, range: nil)
         let URLString = PetstoreClientAPI.basePath + path
-        let parameters: [String:Any]? = nil
-        
+        let parameters: [String: Any]? = nil
+
         let url = URLComponents(string: URLString)
 
         let requestBuilder: RequestBuilder<Void>.Type = PetstoreClientAPI.requestBuilderFactory.getNonDecodableBuilder()
@@ -59,7 +57,7 @@ open class StoreAPI {
      
      - returns: Observable<[String:Int]>
      */
-    open class func getInventory() -> Observable<[String:Int]> {
+    open class func getInventory() -> Observable<[String: Int]> {
         return Observable.create { observer -> Disposable in
             getInventoryWithRequestBuilder().execute { (response, error) -> Void in
                 if let error = error {
@@ -84,14 +82,14 @@ open class StoreAPI {
        - name: api_key
      - returns: RequestBuilder<[String:Int]> 
      */
-    open class func getInventoryWithRequestBuilder() -> RequestBuilder<[String:Int]> {
+    open class func getInventoryWithRequestBuilder() -> RequestBuilder<[String: Int]> {
         let path = "/store/inventory"
         let URLString = PetstoreClientAPI.basePath + path
-        let parameters: [String:Any]? = nil
-        
+        let parameters: [String: Any]? = nil
+
         let url = URLComponents(string: URLString)
 
-        let requestBuilder: RequestBuilder<[String:Int]>.Type = PetstoreClientAPI.requestBuilderFactory.getBuilder()
+        let requestBuilder: RequestBuilder<[String: Int]>.Type = PetstoreClientAPI.requestBuilderFactory.getBuilder()
 
         return requestBuilder.init(method: "GET", URLString: (url?.string ?? URLString), parameters: parameters, isBody: false)
     }
@@ -131,8 +129,8 @@ open class StoreAPI {
         let orderIdPostEscape = orderIdPreEscape.addingPercentEncoding(withAllowedCharacters: .urlPathAllowed) ?? ""
         path = path.replacingOccurrences(of: "{order_id}", with: orderIdPostEscape, options: .literal, range: nil)
         let URLString = PetstoreClientAPI.basePath + path
-        let parameters: [String:Any]? = nil
-        
+        let parameters: [String: Any]? = nil
+
         let url = URLComponents(string: URLString)
 
         let requestBuilder: RequestBuilder<Order>.Type = PetstoreClientAPI.requestBuilderFactory.getBuilder()
diff --git a/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/OpenAPIs/APIs/UserAPI.swift b/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/OpenAPIs/APIs/UserAPI.swift
index 999b7791db..baeb80933a 100644
--- a/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/OpenAPIs/APIs/UserAPI.swift
+++ b/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/OpenAPIs/APIs/UserAPI.swift
@@ -9,8 +9,6 @@ import Foundation
 import Alamofire
 import RxSwift
 
-
-
 open class UserAPI {
     /**
      Create user
@@ -160,8 +158,8 @@ open class UserAPI {
         let usernamePostEscape = usernamePreEscape.addingPercentEncoding(withAllowedCharacters: .urlPathAllowed) ?? ""
         path = path.replacingOccurrences(of: "{username}", with: usernamePostEscape, options: .literal, range: nil)
         let URLString = PetstoreClientAPI.basePath + path
-        let parameters: [String:Any]? = nil
-        
+        let parameters: [String: Any]? = nil
+
         let url = URLComponents(string: URLString)
 
         let requestBuilder: RequestBuilder<Void>.Type = PetstoreClientAPI.requestBuilderFactory.getNonDecodableBuilder()
@@ -203,8 +201,8 @@ open class UserAPI {
         let usernamePostEscape = usernamePreEscape.addingPercentEncoding(withAllowedCharacters: .urlPathAllowed) ?? ""
         path = path.replacingOccurrences(of: "{username}", with: usernamePostEscape, options: .literal, range: nil)
         let URLString = PetstoreClientAPI.basePath + path
-        let parameters: [String:Any]? = nil
-        
+        let parameters: [String: Any]? = nil
+
         let url = URLComponents(string: URLString)
 
         let requestBuilder: RequestBuilder<User>.Type = PetstoreClientAPI.requestBuilderFactory.getBuilder()
@@ -246,11 +244,11 @@ open class UserAPI {
     open class func loginUserWithRequestBuilder(username: String, password: String) -> RequestBuilder<String> {
         let path = "/user/login"
         let URLString = PetstoreClientAPI.basePath + path
-        let parameters: [String:Any]? = nil
-        
+        let parameters: [String: Any]? = nil
+
         var url = URLComponents(string: URLString)
         url?.queryItems = APIHelper.mapValuesToQueryItems([
-            "username": username, 
+            "username": username,
             "password": password
         ])
 
@@ -286,8 +284,8 @@ open class UserAPI {
     open class func logoutUserWithRequestBuilder() -> RequestBuilder<Void> {
         let path = "/user/logout"
         let URLString = PetstoreClientAPI.basePath + path
-        let parameters: [String:Any]? = nil
-        
+        let parameters: [String: Any]? = nil
+
         let url = URLComponents(string: URLString)
 
         let requestBuilder: RequestBuilder<Void>.Type = PetstoreClientAPI.requestBuilderFactory.getNonDecodableBuilder()
diff --git a/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/OpenAPIs/AlamofireImplementations.swift b/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/OpenAPIs/AlamofireImplementations.swift
index dac40e9a31..04ad02a5ce 100644
--- a/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/OpenAPIs/AlamofireImplementations.swift
+++ b/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/OpenAPIs/AlamofireImplementations.swift
@@ -12,7 +12,7 @@ class AlamofireRequestBuilderFactory: RequestBuilderFactory {
         return AlamofireRequestBuilder<T>.self
     }
 
-    func getBuilder<T:Decodable>() -> RequestBuilder<T>.Type {
+    func getBuilder<T: Decodable>() -> RequestBuilder<T>.Type {
         return AlamofireDecodableRequestBuilder<T>.self
     }
 }
@@ -50,7 +50,7 @@ private struct SynchronizedDictionary<K: Hashable, V> {
 private var managerStore = SynchronizedDictionary<String, Alamofire.SessionManager>()
 
 open class AlamofireRequestBuilder<T>: RequestBuilder<T> {
-    required public init(method: String, URLString: String, parameters: [String : Any]?, isBody: Bool, headers: [String : String] = [:]) {
+    required public init(method: String, URLString: String, parameters: [String: Any]?, isBody: Bool, headers: [String: String] = [:]) {
         super.init(method: method, URLString: URLString, parameters: parameters, isBody: isBody, headers: headers)
     }
 
@@ -88,17 +88,17 @@ open class AlamofireRequestBuilder<T>: RequestBuilder<T> {
      May be overridden by a subclass if you want to control the request
      configuration (e.g. to override the cache policy).
      */
-    open func makeRequest(manager: SessionManager, method: HTTPMethod, encoding: ParameterEncoding, headers: [String:String]) -> DataRequest {
+    open func makeRequest(manager: SessionManager, method: HTTPMethod, encoding: ParameterEncoding, headers: [String: String]) -> DataRequest {
         return manager.request(URLString, method: method, parameters: parameters, encoding: encoding, headers: headers)
     }
 
     override open func execute(_ completion: @escaping (_ response: Response<T>?, _ error: Error?) -> Void) {
-        let managerId:String = UUID().uuidString
+        let managerId: String = UUID().uuidString
         // Create a new manager for each request to customize its request header
         let manager = createSessionManager()
         managerStore[managerId] = manager
 
-        let encoding:ParameterEncoding = isBody ? JSONDataEncoding() : URLEncoding()
+        let encoding: ParameterEncoding = isBody ? JSONDataEncoding() : URLEncoding()
 
         let xMethod = Alamofire.HTTPMethod(rawValue: method)
         let fileKeys = parameters == nil ? [] : parameters!.filter { $1 is NSURL }
@@ -111,8 +111,7 @@ open class AlamofireRequestBuilder<T>: RequestBuilder<T> {
                     case let fileURL as URL:
                         if let mimeType = self.contentTypeForFormPart(fileURL: fileURL) {
                             mpForm.append(fileURL, withName: k, fileName: fileURL.lastPathComponent, mimeType: mimeType)
-                        }
-                        else {
+                        } else {
                             mpForm.append(fileURL, withName: k)
                         }
                     case let string as String:
@@ -276,7 +275,7 @@ open class AlamofireRequestBuilder<T>: RequestBuilder<T> {
         return httpHeaders
     }
 
-    fileprivate func getFileName(fromContentDisposition contentDisposition : String?) -> String? {
+    fileprivate func getFileName(fromContentDisposition contentDisposition: String?) -> String? {
 
         guard let contentDisposition = contentDisposition else {
             return nil
@@ -284,7 +283,7 @@ open class AlamofireRequestBuilder<T>: RequestBuilder<T> {
 
         let items = contentDisposition.components(separatedBy: ";")
 
-        var filename : String? = nil
+        var filename: String? = nil
 
         for contentItem in items {
 
@@ -304,7 +303,7 @@ open class AlamofireRequestBuilder<T>: RequestBuilder<T> {
 
     }
 
-    fileprivate func getPath(from url : URL) throws -> String {
+    fileprivate func getPath(from url: URL) throws -> String {
 
         guard var path = URLComponents(url: url, resolvingAgainstBaseURL: true)?.path else {
             throw DownloadException.requestMissingPath
@@ -318,7 +317,7 @@ open class AlamofireRequestBuilder<T>: RequestBuilder<T> {
 
     }
 
-    fileprivate func getURL(from urlRequest : URLRequest) throws -> URL {
+    fileprivate func getURL(from urlRequest: URLRequest) throws -> URL {
 
         guard let url = urlRequest.url else {
             throw DownloadException.requestMissingURL
@@ -329,7 +328,7 @@ open class AlamofireRequestBuilder<T>: RequestBuilder<T> {
 
 }
 
-fileprivate enum DownloadException : Error {
+private enum DownloadException: Error {
     case responseDataMissing
     case responseFailed
     case requestMissing
@@ -344,7 +343,7 @@ public enum AlamofireDecodableRequestBuilderError: Error {
     case generalError(Error)
 }
 
-open class AlamofireDecodableRequestBuilder<T:Decodable>: AlamofireRequestBuilder<T> {
+open class AlamofireDecodableRequestBuilder<T: Decodable>: AlamofireRequestBuilder<T> {
 
     override fileprivate func processRequest(request: DataRequest, _ managerId: String, _ completion: @escaping (_ response: Response<T>?, _ error: Error?) -> Void) {
         if let credential = self.credential {
diff --git a/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/OpenAPIs/CodableHelper.swift b/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/OpenAPIs/CodableHelper.swift
index 584de8c3d5..111d5a3a8c 100644
--- a/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/OpenAPIs/CodableHelper.swift
+++ b/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/OpenAPIs/CodableHelper.swift
@@ -13,7 +13,7 @@ open class CodableHelper {
 
     public static var dateformatter: DateFormatter?
 
-    open class func decode<T>(_ type: T.Type, from data: Data) -> (decodableObj: T?, error: Error?) where T : Decodable {
+    open class func decode<T>(_ type: T.Type, from data: Data) -> (decodableObj: T?, error: Error?) where T: Decodable {
         var returnedDecodable: T? = nil
         var returnedError: Error? = nil
 
@@ -39,7 +39,7 @@ open class CodableHelper {
         return (returnedDecodable, returnedError)
     }
 
-    open class func encode<T>(_ value: T, prettyPrint: Bool = false) -> EncodeResult where T : Encodable {
+    open class func encode<T>(_ value: T, prettyPrint: Bool = false) -> EncodeResult where T: Encodable {
         var returnedData: Data?
         var returnedError: Error? = nil
 
diff --git a/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/OpenAPIs/Configuration.swift b/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/OpenAPIs/Configuration.swift
index 516590da5d..e1ecb39726 100644
--- a/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/OpenAPIs/Configuration.swift
+++ b/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/OpenAPIs/Configuration.swift
@@ -7,9 +7,9 @@
 import Foundation
 
 open class Configuration {
-	
+
 	// This value is used to configure the date formatter that is used to serialize dates into JSON format. 
 	// You must set it prior to encoding any dates, and it will only be read once. 
     public static var dateFormat = "yyyy-MM-dd'T'HH:mm:ss.SSSZZZZZ"
-    
-}
\ No newline at end of file
+
+}
diff --git a/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/OpenAPIs/Extensions.swift b/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/OpenAPIs/Extensions.swift
index 8bf1829ba8..24c128daad 100644
--- a/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/OpenAPIs/Extensions.swift
+++ b/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/OpenAPIs/Extensions.swift
@@ -112,24 +112,24 @@ extension String: CodingKey {
 
 extension KeyedEncodingContainerProtocol {
 
-    public mutating func encodeArray<T>(_ values: [T], forKey key: Self.Key) throws where T : Encodable {
+    public mutating func encodeArray<T>(_ values: [T], forKey key: Self.Key) throws where T: Encodable {
         var arrayContainer = nestedUnkeyedContainer(forKey: key)
         try arrayContainer.encode(contentsOf: values)
     }
 
-    public mutating func encodeArrayIfPresent<T>(_ values: [T]?, forKey key: Self.Key) throws where T : Encodable {
+    public mutating func encodeArrayIfPresent<T>(_ values: [T]?, forKey key: Self.Key) throws where T: Encodable {
         if let values = values {
             try encodeArray(values, forKey: key)
         }
     }
 
-    public mutating func encodeMap<T>(_ pairs: [Self.Key: T]) throws where T : Encodable {
+    public mutating func encodeMap<T>(_ pairs: [Self.Key: T]) throws where T: Encodable {
         for (key, value) in pairs {
             try encode(value, forKey: key)
         }
     }
 
-    public mutating func encodeMapIfPresent<T>(_ pairs: [Self.Key: T]?) throws where T : Encodable {
+    public mutating func encodeMapIfPresent<T>(_ pairs: [Self.Key: T]?) throws where T: Encodable {
         if let pairs = pairs {
             try encodeMap(pairs)
         }
@@ -139,7 +139,7 @@ extension KeyedEncodingContainerProtocol {
 
 extension KeyedDecodingContainerProtocol {
 
-    public func decodeArray<T>(_ type: T.Type, forKey key: Self.Key) throws -> [T] where T : Decodable {
+    public func decodeArray<T>(_ type: T.Type, forKey key: Self.Key) throws -> [T] where T: Decodable {
         var tmpArray = [T]()
 
         var nestedContainer = try nestedUnkeyedContainer(forKey: key)
@@ -151,7 +151,7 @@ extension KeyedDecodingContainerProtocol {
         return tmpArray
     }
 
-    public func decodeArrayIfPresent<T>(_ type: T.Type, forKey key: Self.Key) throws -> [T]? where T : Decodable {
+    public func decodeArrayIfPresent<T>(_ type: T.Type, forKey key: Self.Key) throws -> [T]? where T: Decodable {
         var tmpArray: [T]? = nil
 
         if contains(key) {
@@ -161,8 +161,8 @@ extension KeyedDecodingContainerProtocol {
         return tmpArray
     }
 
-    public func decodeMap<T>(_ type: T.Type, excludedKeys: Set<Self.Key>) throws -> [Self.Key: T] where T : Decodable {
-        var map: [Self.Key : T] = [:]
+    public func decodeMap<T>(_ type: T.Type, excludedKeys: Set<Self.Key>) throws -> [Self.Key: T] where T: Decodable {
+        var map: [Self.Key: T] = [:]
 
         for key in allKeys {
             if !excludedKeys.contains(key) {
@@ -175,5 +175,3 @@ extension KeyedDecodingContainerProtocol {
     }
 
 }
-
-
diff --git a/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/OpenAPIs/JSONEncodingHelper.swift b/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/OpenAPIs/JSONEncodingHelper.swift
index 7044951584..3e68bb5d4a 100644
--- a/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/OpenAPIs/JSONEncodingHelper.swift
+++ b/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/OpenAPIs/JSONEncodingHelper.swift
@@ -10,7 +10,7 @@ import Alamofire
 
 open class JSONEncodingHelper {
 
-    open class func encodingParameters<T:Encodable>(forEncodableObject encodableObj: T?) -> Parameters? {
+    open class func encodingParameters<T: Encodable>(forEncodableObject encodableObj: T?) -> Parameters? {
         var params: Parameters? = nil
 
         // Encode the Encodable object
@@ -39,5 +39,5 @@ open class JSONEncodingHelper {
 
         return params
     }
-    
+
 }
diff --git a/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/OpenAPIs/Models.swift b/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/OpenAPIs/Models.swift
index 4085638903..e87ce399c7 100644
--- a/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/OpenAPIs/Models.swift
+++ b/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/OpenAPIs/Models.swift
@@ -10,7 +10,7 @@ protocol JSONEncodable {
     func encodeToJSON() -> Any
 }
 
-public enum ErrorResponse : Error {
+public enum ErrorResponse: Error {
     case error(Int, Data?, Error)
 }
 
diff --git a/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/OpenAPIs/Models/AdditionalPropertiesAnyType.swift b/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/OpenAPIs/Models/AdditionalPropertiesAnyType.swift
index 796e46eca2..94295c495c 100644
--- a/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/OpenAPIs/Models/AdditionalPropertiesAnyType.swift
+++ b/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/OpenAPIs/Models/AdditionalPropertiesAnyType.swift
@@ -7,8 +7,6 @@
 
 import Foundation
 
-
-
 public struct AdditionalPropertiesAnyType: Codable {
 
     public var name: String?
@@ -16,7 +14,7 @@ public struct AdditionalPropertiesAnyType: Codable {
     public init(name: String?) {
         self.name = name
     }
-    public var additionalProperties: [String:Any] = [:]
+    public var additionalProperties: [String: Any] = [:]
 
     public subscript(key: String) -> Any? {
         get {
@@ -52,7 +50,4 @@ public struct AdditionalPropertiesAnyType: Codable {
         additionalProperties = try container.decodeMap(Any.self, excludedKeys: nonAdditionalPropertyKeys)
     }
 
-
-
 }
-
diff --git a/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/OpenAPIs/Models/AdditionalPropertiesArray.swift b/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/OpenAPIs/Models/AdditionalPropertiesArray.swift
index 5e58839b5a..cde9824ddb 100644
--- a/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/OpenAPIs/Models/AdditionalPropertiesArray.swift
+++ b/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/OpenAPIs/Models/AdditionalPropertiesArray.swift
@@ -7,8 +7,6 @@
 
 import Foundation
 
-
-
 public struct AdditionalPropertiesArray: Codable {
 
     public var name: String?
@@ -16,7 +14,7 @@ public struct AdditionalPropertiesArray: Codable {
     public init(name: String?) {
         self.name = name
     }
-    public var additionalProperties: [String:Array] = [:]
+    public var additionalProperties: [String: Array] = [:]
 
     public subscript(key: String) -> Array? {
         get {
@@ -52,7 +50,4 @@ public struct AdditionalPropertiesArray: Codable {
         additionalProperties = try container.decodeMap(Array.self, excludedKeys: nonAdditionalPropertyKeys)
     }
 
-
-
 }
-
diff --git a/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/OpenAPIs/Models/AdditionalPropertiesBoolean.swift b/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/OpenAPIs/Models/AdditionalPropertiesBoolean.swift
index d4c90829b4..76791a9ddd 100644
--- a/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/OpenAPIs/Models/AdditionalPropertiesBoolean.swift
+++ b/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/OpenAPIs/Models/AdditionalPropertiesBoolean.swift
@@ -7,8 +7,6 @@
 
 import Foundation
 
-
-
 public struct AdditionalPropertiesBoolean: Codable {
 
     public var name: String?
@@ -16,7 +14,7 @@ public struct AdditionalPropertiesBoolean: Codable {
     public init(name: String?) {
         self.name = name
     }
-    public var additionalProperties: [String:Bool] = [:]
+    public var additionalProperties: [String: Bool] = [:]
 
     public subscript(key: String) -> Bool? {
         get {
@@ -52,7 +50,4 @@ public struct AdditionalPropertiesBoolean: Codable {
         additionalProperties = try container.decodeMap(Bool.self, excludedKeys: nonAdditionalPropertyKeys)
     }
 
-
-
 }
-
diff --git a/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/OpenAPIs/Models/AdditionalPropertiesClass.swift b/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/OpenAPIs/Models/AdditionalPropertiesClass.swift
index 4db39adae8..83a06951cc 100644
--- a/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/OpenAPIs/Models/AdditionalPropertiesClass.swift
+++ b/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/OpenAPIs/Models/AdditionalPropertiesClass.swift
@@ -7,23 +7,19 @@
 
 import Foundation
 
-
-
 public struct AdditionalPropertiesClass: Codable {
 
-    public var mapString: [String:String]?
-    public var mapMapString: [String:[String:String]]?
+    public var mapString: [String: String]?
+    public var mapMapString: [String: [String: String]]?
 
-    public init(mapString: [String:String]?, mapMapString: [String:[String:String]]?) {
+    public init(mapString: [String: String]?, mapMapString: [String: [String: String]]?) {
         self.mapString = mapString
         self.mapMapString = mapMapString
     }
 
-    public enum CodingKeys: String, CodingKey { 
+    public enum CodingKeys: String, CodingKey {
         case mapString = "map_string"
         case mapMapString = "map_map_string"
     }
 
-
 }
-
diff --git a/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/OpenAPIs/Models/AdditionalPropertiesInteger.swift b/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/OpenAPIs/Models/AdditionalPropertiesInteger.swift
index b03bbe4456..4a0f2acaa4 100644
--- a/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/OpenAPIs/Models/AdditionalPropertiesInteger.swift
+++ b/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/OpenAPIs/Models/AdditionalPropertiesInteger.swift
@@ -7,8 +7,6 @@
 
 import Foundation
 
-
-
 public struct AdditionalPropertiesInteger: Codable {
 
     public var name: String?
@@ -16,7 +14,7 @@ public struct AdditionalPropertiesInteger: Codable {
     public init(name: String?) {
         self.name = name
     }
-    public var additionalProperties: [String:Int] = [:]
+    public var additionalProperties: [String: Int] = [:]
 
     public subscript(key: String) -> Int? {
         get {
@@ -52,7 +50,4 @@ public struct AdditionalPropertiesInteger: Codable {
         additionalProperties = try container.decodeMap(Int.self, excludedKeys: nonAdditionalPropertyKeys)
     }
 
-
-
 }
-
diff --git a/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/OpenAPIs/Models/AdditionalPropertiesNumber.swift b/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/OpenAPIs/Models/AdditionalPropertiesNumber.swift
index 9701d54c9b..95e491000a 100644
--- a/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/OpenAPIs/Models/AdditionalPropertiesNumber.swift
+++ b/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/OpenAPIs/Models/AdditionalPropertiesNumber.swift
@@ -7,8 +7,6 @@
 
 import Foundation
 
-
-
 public struct AdditionalPropertiesNumber: Codable {
 
     public var name: String?
@@ -16,7 +14,7 @@ public struct AdditionalPropertiesNumber: Codable {
     public init(name: String?) {
         self.name = name
     }
-    public var additionalProperties: [String:Double] = [:]
+    public var additionalProperties: [String: Double] = [:]
 
     public subscript(key: String) -> Double? {
         get {
@@ -52,7 +50,4 @@ public struct AdditionalPropertiesNumber: Codable {
         additionalProperties = try container.decodeMap(Double.self, excludedKeys: nonAdditionalPropertyKeys)
     }
 
-
-
 }
-
diff --git a/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/OpenAPIs/Models/AdditionalPropertiesObject.swift b/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/OpenAPIs/Models/AdditionalPropertiesObject.swift
index c6e1e670b8..f45888a410 100644
--- a/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/OpenAPIs/Models/AdditionalPropertiesObject.swift
+++ b/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/OpenAPIs/Models/AdditionalPropertiesObject.swift
@@ -7,8 +7,6 @@
 
 import Foundation
 
-
-
 public struct AdditionalPropertiesObject: Codable {
 
     public var name: String?
@@ -16,7 +14,7 @@ public struct AdditionalPropertiesObject: Codable {
     public init(name: String?) {
         self.name = name
     }
-    public var additionalProperties: [String:Dictionary] = [:]
+    public var additionalProperties: [String: Dictionary] = [:]
 
     public subscript(key: String) -> Dictionary? {
         get {
@@ -52,7 +50,4 @@ public struct AdditionalPropertiesObject: Codable {
         additionalProperties = try container.decodeMap(Dictionary.self, excludedKeys: nonAdditionalPropertyKeys)
     }
 
-
-
 }
-
diff --git a/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/OpenAPIs/Models/AdditionalPropertiesString.swift b/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/OpenAPIs/Models/AdditionalPropertiesString.swift
index 6128dce7d4..7af63cc715 100644
--- a/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/OpenAPIs/Models/AdditionalPropertiesString.swift
+++ b/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/OpenAPIs/Models/AdditionalPropertiesString.swift
@@ -7,8 +7,6 @@
 
 import Foundation
 
-
-
 public struct AdditionalPropertiesString: Codable {
 
     public var name: String?
@@ -16,7 +14,7 @@ public struct AdditionalPropertiesString: Codable {
     public init(name: String?) {
         self.name = name
     }
-    public var additionalProperties: [String:String] = [:]
+    public var additionalProperties: [String: String] = [:]
 
     public subscript(key: String) -> String? {
         get {
@@ -52,7 +50,4 @@ public struct AdditionalPropertiesString: Codable {
         additionalProperties = try container.decodeMap(String.self, excludedKeys: nonAdditionalPropertyKeys)
     }
 
-
-
 }
-
diff --git a/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/OpenAPIs/Models/Animal.swift b/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/OpenAPIs/Models/Animal.swift
index 7221a1be09..5ed9f31e2a 100644
--- a/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/OpenAPIs/Models/Animal.swift
+++ b/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/OpenAPIs/Models/Animal.swift
@@ -7,8 +7,6 @@
 
 import Foundation
 
-
-
 public struct Animal: Codable {
 
     public var className: String
@@ -19,6 +17,4 @@ public struct Animal: Codable {
         self.color = color
     }
 
-
 }
-
diff --git a/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/OpenAPIs/Models/AnimalFarm.swift b/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/OpenAPIs/Models/AnimalFarm.swift
index e7bea63f8e..e09b0e9efd 100644
--- a/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/OpenAPIs/Models/AnimalFarm.swift
+++ b/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/OpenAPIs/Models/AnimalFarm.swift
@@ -7,5 +7,4 @@
 
 import Foundation
 
-
 public typealias AnimalFarm = [Animal]
diff --git a/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/OpenAPIs/Models/ApiResponse.swift b/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/OpenAPIs/Models/ApiResponse.swift
index a22e9aaebb..ec270da890 100644
--- a/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/OpenAPIs/Models/ApiResponse.swift
+++ b/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/OpenAPIs/Models/ApiResponse.swift
@@ -7,8 +7,6 @@
 
 import Foundation
 
-
-
 public struct ApiResponse: Codable {
 
     public var code: Int?
@@ -21,6 +19,4 @@ public struct ApiResponse: Codable {
         self.message = message
     }
 
-
 }
-
diff --git a/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/OpenAPIs/Models/ArrayOfArrayOfNumberOnly.swift b/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/OpenAPIs/Models/ArrayOfArrayOfNumberOnly.swift
index 4e5a5ca144..3843287630 100644
--- a/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/OpenAPIs/Models/ArrayOfArrayOfNumberOnly.swift
+++ b/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/OpenAPIs/Models/ArrayOfArrayOfNumberOnly.swift
@@ -7,8 +7,6 @@
 
 import Foundation
 
-
-
 public struct ArrayOfArrayOfNumberOnly: Codable {
 
     public var arrayArrayNumber: [[Double]]?
@@ -17,10 +15,8 @@ public struct ArrayOfArrayOfNumberOnly: Codable {
         self.arrayArrayNumber = arrayArrayNumber
     }
 
-    public enum CodingKeys: String, CodingKey { 
+    public enum CodingKeys: String, CodingKey {
         case arrayArrayNumber = "ArrayArrayNumber"
     }
 
-
 }
-
diff --git a/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/OpenAPIs/Models/ArrayOfNumberOnly.swift b/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/OpenAPIs/Models/ArrayOfNumberOnly.swift
index 7d059d3683..f8b198e81f 100644
--- a/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/OpenAPIs/Models/ArrayOfNumberOnly.swift
+++ b/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/OpenAPIs/Models/ArrayOfNumberOnly.swift
@@ -7,8 +7,6 @@
 
 import Foundation
 
-
-
 public struct ArrayOfNumberOnly: Codable {
 
     public var arrayNumber: [Double]?
@@ -17,10 +15,8 @@ public struct ArrayOfNumberOnly: Codable {
         self.arrayNumber = arrayNumber
     }
 
-    public enum CodingKeys: String, CodingKey { 
+    public enum CodingKeys: String, CodingKey {
         case arrayNumber = "ArrayNumber"
     }
 
-
 }
-
diff --git a/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/OpenAPIs/Models/ArrayTest.swift b/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/OpenAPIs/Models/ArrayTest.swift
index 9c56fed50c..67f7f7e515 100644
--- a/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/OpenAPIs/Models/ArrayTest.swift
+++ b/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/OpenAPIs/Models/ArrayTest.swift
@@ -7,8 +7,6 @@
 
 import Foundation
 
-
-
 public struct ArrayTest: Codable {
 
     public var arrayOfString: [String]?
@@ -21,12 +19,10 @@ public struct ArrayTest: Codable {
         self.arrayArrayOfModel = arrayArrayOfModel
     }
 
-    public enum CodingKeys: String, CodingKey { 
+    public enum CodingKeys: String, CodingKey {
         case arrayOfString = "array_of_string"
         case arrayArrayOfInteger = "array_array_of_integer"
         case arrayArrayOfModel = "array_array_of_model"
     }
 
-
 }
-
diff --git a/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/OpenAPIs/Models/Capitalization.swift b/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/OpenAPIs/Models/Capitalization.swift
index 98cda23dac..d576b50b1c 100644
--- a/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/OpenAPIs/Models/Capitalization.swift
+++ b/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/OpenAPIs/Models/Capitalization.swift
@@ -7,8 +7,6 @@
 
 import Foundation
 
-
-
 public struct Capitalization: Codable {
 
     public var smallCamel: String?
@@ -28,7 +26,7 @@ public struct Capitalization: Codable {
         self.ATT_NAME = ATT_NAME
     }
 
-    public enum CodingKeys: String, CodingKey { 
+    public enum CodingKeys: String, CodingKey {
         case smallCamel
         case capitalCamel = "CapitalCamel"
         case smallSnake = "small_Snake"
@@ -37,6 +35,4 @@ public struct Capitalization: Codable {
         case ATT_NAME
     }
 
-
 }
-
diff --git a/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/OpenAPIs/Models/Cat.swift b/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/OpenAPIs/Models/Cat.swift
index a116d964ea..7ab887f311 100644
--- a/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/OpenAPIs/Models/Cat.swift
+++ b/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/OpenAPIs/Models/Cat.swift
@@ -7,8 +7,6 @@
 
 import Foundation
 
-
-
 public struct Cat: Codable {
 
     public var className: String
@@ -21,6 +19,4 @@ public struct Cat: Codable {
         self.declawed = declawed
     }
 
-
 }
-
diff --git a/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/OpenAPIs/Models/CatAllOf.swift b/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/OpenAPIs/Models/CatAllOf.swift
new file mode 100644
index 0000000000..a51ad0dffa
--- /dev/null
+++ b/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/OpenAPIs/Models/CatAllOf.swift
@@ -0,0 +1,18 @@
+//
+// CatAllOf.swift
+//
+// Generated by openapi-generator
+// https://openapi-generator.tech
+//
+
+import Foundation
+
+public struct CatAllOf: Codable {
+
+    public var declawed: Bool?
+
+    public init(declawed: Bool?) {
+        self.declawed = declawed
+    }
+
+}
diff --git a/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/OpenAPIs/Models/Category.swift b/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/OpenAPIs/Models/Category.swift
index e8c489be46..eb8f7e5e19 100644
--- a/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/OpenAPIs/Models/Category.swift
+++ b/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/OpenAPIs/Models/Category.swift
@@ -7,8 +7,6 @@
 
 import Foundation
 
-
-
 public struct Category: Codable {
 
     public var id: Int64?
@@ -19,6 +17,4 @@ public struct Category: Codable {
         self.name = name
     }
 
-
 }
-
diff --git a/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/OpenAPIs/Models/ClassModel.swift b/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/OpenAPIs/Models/ClassModel.swift
index f673ed127c..28cb30ce7b 100644
--- a/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/OpenAPIs/Models/ClassModel.swift
+++ b/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/OpenAPIs/Models/ClassModel.swift
@@ -7,7 +7,6 @@
 
 import Foundation
 
-
 /** Model for testing model with \&quot;_class\&quot; property */
 
 public struct ClassModel: Codable {
@@ -18,6 +17,4 @@ public struct ClassModel: Codable {
         self._class = _class
     }
 
-
 }
-
diff --git a/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/OpenAPIs/Models/Client.swift b/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/OpenAPIs/Models/Client.swift
index 51390b6c4e..00245ca372 100644
--- a/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/OpenAPIs/Models/Client.swift
+++ b/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/OpenAPIs/Models/Client.swift
@@ -7,8 +7,6 @@
 
 import Foundation
 
-
-
 public struct Client: Codable {
 
     public var client: String?
@@ -17,6 +15,4 @@ public struct Client: Codable {
         self.client = client
     }
 
-
 }
-
diff --git a/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/OpenAPIs/Models/Dog.swift b/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/OpenAPIs/Models/Dog.swift
index 239ce74dcc..492c122800 100644
--- a/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/OpenAPIs/Models/Dog.swift
+++ b/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/OpenAPIs/Models/Dog.swift
@@ -7,8 +7,6 @@
 
 import Foundation
 
-
-
 public struct Dog: Codable {
 
     public var className: String
@@ -21,6 +19,4 @@ public struct Dog: Codable {
         self.breed = breed
     }
 
-
 }
-
diff --git a/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/OpenAPIs/Models/DogAllOf.swift b/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/OpenAPIs/Models/DogAllOf.swift
new file mode 100644
index 0000000000..7786f8acc5
--- /dev/null
+++ b/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/OpenAPIs/Models/DogAllOf.swift
@@ -0,0 +1,18 @@
+//
+// DogAllOf.swift
+//
+// Generated by openapi-generator
+// https://openapi-generator.tech
+//
+
+import Foundation
+
+public struct DogAllOf: Codable {
+
+    public var breed: String?
+
+    public init(breed: String?) {
+        self.breed = breed
+    }
+
+}
diff --git a/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/OpenAPIs/Models/EnumArrays.swift b/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/OpenAPIs/Models/EnumArrays.swift
index 8713961520..5034ff0b8c 100644
--- a/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/OpenAPIs/Models/EnumArrays.swift
+++ b/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/OpenAPIs/Models/EnumArrays.swift
@@ -7,8 +7,6 @@
 
 import Foundation
 
-
-
 public struct EnumArrays: Codable {
 
     public enum JustSymbol: String, Codable {
@@ -27,11 +25,9 @@ public struct EnumArrays: Codable {
         self.arrayEnum = arrayEnum
     }
 
-    public enum CodingKeys: String, CodingKey { 
+    public enum CodingKeys: String, CodingKey {
         case justSymbol = "just_symbol"
         case arrayEnum = "array_enum"
     }
 
-
 }
-
diff --git a/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/OpenAPIs/Models/EnumClass.swift b/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/OpenAPIs/Models/EnumClass.swift
index 7280a621fe..3c1dfcac57 100644
--- a/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/OpenAPIs/Models/EnumClass.swift
+++ b/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/OpenAPIs/Models/EnumClass.swift
@@ -7,7 +7,6 @@
 
 import Foundation
 
-
 public enum EnumClass: String, Codable {
     case abc = "_abc"
     case efg = "-efg"
diff --git a/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/OpenAPIs/Models/EnumTest.swift b/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/OpenAPIs/Models/EnumTest.swift
index 0f546c76a2..6db9b34d18 100644
--- a/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/OpenAPIs/Models/EnumTest.swift
+++ b/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/OpenAPIs/Models/EnumTest.swift
@@ -7,8 +7,6 @@
 
 import Foundation
 
-
-
 public struct EnumTest: Codable {
 
     public enum EnumString: String, Codable {
@@ -43,7 +41,7 @@ public struct EnumTest: Codable {
         self.outerEnum = outerEnum
     }
 
-    public enum CodingKeys: String, CodingKey { 
+    public enum CodingKeys: String, CodingKey {
         case enumString = "enum_string"
         case enumStringRequired = "enum_string_required"
         case enumInteger = "enum_integer"
@@ -51,6 +49,4 @@ public struct EnumTest: Codable {
         case outerEnum
     }
 
-
 }
-
diff --git a/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/OpenAPIs/Models/File.swift b/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/OpenAPIs/Models/File.swift
index c8bd1f1958..ea3520f053 100644
--- a/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/OpenAPIs/Models/File.swift
+++ b/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/OpenAPIs/Models/File.swift
@@ -7,7 +7,6 @@
 
 import Foundation
 
-
 /** Must be named &#x60;File&#x60; for test. */
 
 public struct File: Codable {
@@ -19,6 +18,4 @@ public struct File: Codable {
         self.sourceURI = sourceURI
     }
 
-
 }
-
diff --git a/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/OpenAPIs/Models/FileSchemaTestClass.swift b/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/OpenAPIs/Models/FileSchemaTestClass.swift
index 64d0250680..532f145793 100644
--- a/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/OpenAPIs/Models/FileSchemaTestClass.swift
+++ b/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/OpenAPIs/Models/FileSchemaTestClass.swift
@@ -7,8 +7,6 @@
 
 import Foundation
 
-
-
 public struct FileSchemaTestClass: Codable {
 
     public var file: File?
@@ -19,6 +17,4 @@ public struct FileSchemaTestClass: Codable {
         self.files = files
     }
 
-
 }
-
diff --git a/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/OpenAPIs/Models/FormatTest.swift b/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/OpenAPIs/Models/FormatTest.swift
index faa091b065..20bd6d103b 100644
--- a/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/OpenAPIs/Models/FormatTest.swift
+++ b/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/OpenAPIs/Models/FormatTest.swift
@@ -7,8 +7,6 @@
 
 import Foundation
 
-
-
 public struct FormatTest: Codable {
 
     public var integer: Int?
@@ -41,6 +39,4 @@ public struct FormatTest: Codable {
         self.password = password
     }
 
-
 }
-
diff --git a/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/OpenAPIs/Models/HasOnlyReadOnly.swift b/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/OpenAPIs/Models/HasOnlyReadOnly.swift
index 554aee1081..906ddb06fb 100644
--- a/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/OpenAPIs/Models/HasOnlyReadOnly.swift
+++ b/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/OpenAPIs/Models/HasOnlyReadOnly.swift
@@ -7,8 +7,6 @@
 
 import Foundation
 
-
-
 public struct HasOnlyReadOnly: Codable {
 
     public var bar: String?
@@ -19,6 +17,4 @@ public struct HasOnlyReadOnly: Codable {
         self.foo = foo
     }
 
-
 }
-
diff --git a/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/OpenAPIs/Models/List.swift b/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/OpenAPIs/Models/List.swift
index 8997340ff4..08d5995387 100644
--- a/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/OpenAPIs/Models/List.swift
+++ b/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/OpenAPIs/Models/List.swift
@@ -7,8 +7,6 @@
 
 import Foundation
 
-
-
 public struct List: Codable {
 
     public var _123list: String?
@@ -17,10 +15,8 @@ public struct List: Codable {
         self._123list = _123list
     }
 
-    public enum CodingKeys: String, CodingKey { 
+    public enum CodingKeys: String, CodingKey {
         case _123list = "123-list"
     }
 
-
 }
-
diff --git a/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/OpenAPIs/Models/MapTest.swift b/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/OpenAPIs/Models/MapTest.swift
index 2d3a45d35a..3a10a7dfca 100644
--- a/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/OpenAPIs/Models/MapTest.swift
+++ b/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/OpenAPIs/Models/MapTest.swift
@@ -7,33 +7,29 @@
 
 import Foundation
 
-
-
 public struct MapTest: Codable {
 
     public enum MapOfEnumString: String, Codable {
         case upper = "UPPER"
         case lower = "lower"
     }
-    public var mapMapOfString: [String:[String:String]]?
-    public var mapOfEnumString: [String:String]?
-    public var directMap: [String:Bool]?
+    public var mapMapOfString: [String: [String: String]]?
+    public var mapOfEnumString: [String: String]?
+    public var directMap: [String: Bool]?
     public var indirectMap: StringBooleanMap?
 
-    public init(mapMapOfString: [String:[String:String]]?, mapOfEnumString: [String:String]?, directMap: [String:Bool]?, indirectMap: StringBooleanMap?) {
+    public init(mapMapOfString: [String: [String: String]]?, mapOfEnumString: [String: String]?, directMap: [String: Bool]?, indirectMap: StringBooleanMap?) {
         self.mapMapOfString = mapMapOfString
         self.mapOfEnumString = mapOfEnumString
         self.directMap = directMap
         self.indirectMap = indirectMap
     }
 
-    public enum CodingKeys: String, CodingKey { 
+    public enum CodingKeys: String, CodingKey {
         case mapMapOfString = "map_map_of_string"
         case mapOfEnumString = "map_of_enum_string"
         case directMap = "direct_map"
         case indirectMap = "indirect_map"
     }
 
-
 }
-
diff --git a/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/OpenAPIs/Models/MixedPropertiesAndAdditionalPropertiesClass.swift b/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/OpenAPIs/Models/MixedPropertiesAndAdditionalPropertiesClass.swift
index 7116108fd7..c3deb2f289 100644
--- a/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/OpenAPIs/Models/MixedPropertiesAndAdditionalPropertiesClass.swift
+++ b/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/OpenAPIs/Models/MixedPropertiesAndAdditionalPropertiesClass.swift
@@ -7,20 +7,16 @@
 
 import Foundation
 
-
-
 public struct MixedPropertiesAndAdditionalPropertiesClass: Codable {
 
     public var uuid: UUID?
     public var dateTime: Date?
-    public var map: [String:Animal]?
+    public var map: [String: Animal]?
 
-    public init(uuid: UUID?, dateTime: Date?, map: [String:Animal]?) {
+    public init(uuid: UUID?, dateTime: Date?, map: [String: Animal]?) {
         self.uuid = uuid
         self.dateTime = dateTime
         self.map = map
     }
 
-
 }
-
diff --git a/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/OpenAPIs/Models/Model200Response.swift b/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/OpenAPIs/Models/Model200Response.swift
index fc1d0606b7..7ed6aad907 100644
--- a/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/OpenAPIs/Models/Model200Response.swift
+++ b/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/OpenAPIs/Models/Model200Response.swift
@@ -7,7 +7,6 @@
 
 import Foundation
 
-
 /** Model for testing model name starting with number */
 
 public struct Model200Response: Codable {
@@ -20,11 +19,9 @@ public struct Model200Response: Codable {
         self._class = _class
     }
 
-    public enum CodingKeys: String, CodingKey { 
+    public enum CodingKeys: String, CodingKey {
         case name
         case _class = "class"
     }
 
-
 }
-
diff --git a/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/OpenAPIs/Models/Name.swift b/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/OpenAPIs/Models/Name.swift
index cc165d767d..ce9ffe4fb3 100644
--- a/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/OpenAPIs/Models/Name.swift
+++ b/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/OpenAPIs/Models/Name.swift
@@ -7,7 +7,6 @@
 
 import Foundation
 
-
 /** Model for testing model name same as property name */
 
 public struct Name: Codable {
@@ -24,13 +23,11 @@ public struct Name: Codable {
         self._123number = _123number
     }
 
-    public enum CodingKeys: String, CodingKey { 
+    public enum CodingKeys: String, CodingKey {
         case name
         case snakeCase = "snake_case"
         case property
         case _123number = "123Number"
     }
 
-
 }
-
diff --git a/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/OpenAPIs/Models/NumberOnly.swift b/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/OpenAPIs/Models/NumberOnly.swift
index e6fb206093..abd2269e8e 100644
--- a/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/OpenAPIs/Models/NumberOnly.swift
+++ b/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/OpenAPIs/Models/NumberOnly.swift
@@ -7,8 +7,6 @@
 
 import Foundation
 
-
-
 public struct NumberOnly: Codable {
 
     public var justNumber: Double?
@@ -17,10 +15,8 @@ public struct NumberOnly: Codable {
         self.justNumber = justNumber
     }
 
-    public enum CodingKeys: String, CodingKey { 
+    public enum CodingKeys: String, CodingKey {
         case justNumber = "JustNumber"
     }
 
-
 }
-
diff --git a/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/OpenAPIs/Models/Order.swift b/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/OpenAPIs/Models/Order.swift
index 83c3b85e66..a6e1b1d2e5 100644
--- a/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/OpenAPIs/Models/Order.swift
+++ b/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/OpenAPIs/Models/Order.swift
@@ -7,8 +7,6 @@
 
 import Foundation
 
-
-
 public struct Order: Codable {
 
     public enum Status: String, Codable {
@@ -33,6 +31,4 @@ public struct Order: Codable {
         self.complete = complete
     }
 
-
 }
-
diff --git a/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/OpenAPIs/Models/OuterComposite.swift b/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/OpenAPIs/Models/OuterComposite.swift
index edc4523d9f..49aec001c5 100644
--- a/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/OpenAPIs/Models/OuterComposite.swift
+++ b/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/OpenAPIs/Models/OuterComposite.swift
@@ -7,8 +7,6 @@
 
 import Foundation
 
-
-
 public struct OuterComposite: Codable {
 
     public var myNumber: Double?
@@ -21,12 +19,10 @@ public struct OuterComposite: Codable {
         self.myBoolean = myBoolean
     }
 
-    public enum CodingKeys: String, CodingKey { 
+    public enum CodingKeys: String, CodingKey {
         case myNumber = "my_number"
         case myString = "my_string"
         case myBoolean = "my_boolean"
     }
 
-
 }
-
diff --git a/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/OpenAPIs/Models/OuterEnum.swift b/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/OpenAPIs/Models/OuterEnum.swift
index bd1643d279..9f80fc95ec 100644
--- a/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/OpenAPIs/Models/OuterEnum.swift
+++ b/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/OpenAPIs/Models/OuterEnum.swift
@@ -7,7 +7,6 @@
 
 import Foundation
 
-
 public enum OuterEnum: String, Codable {
     case placed = "placed"
     case approved = "approved"
diff --git a/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/OpenAPIs/Models/Pet.swift b/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/OpenAPIs/Models/Pet.swift
index 5e39abae6c..af60a550bb 100644
--- a/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/OpenAPIs/Models/Pet.swift
+++ b/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/OpenAPIs/Models/Pet.swift
@@ -7,8 +7,6 @@
 
 import Foundation
 
-
-
 public struct Pet: Codable {
 
     public enum Status: String, Codable {
@@ -33,6 +31,4 @@ public struct Pet: Codable {
         self.status = status
     }
 
-
 }
-
diff --git a/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/OpenAPIs/Models/ReadOnlyFirst.swift b/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/OpenAPIs/Models/ReadOnlyFirst.swift
index 48b655a5b0..0acd21fd10 100644
--- a/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/OpenAPIs/Models/ReadOnlyFirst.swift
+++ b/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/OpenAPIs/Models/ReadOnlyFirst.swift
@@ -7,8 +7,6 @@
 
 import Foundation
 
-
-
 public struct ReadOnlyFirst: Codable {
 
     public var bar: String?
@@ -19,6 +17,4 @@ public struct ReadOnlyFirst: Codable {
         self.baz = baz
     }
 
-
 }
-
diff --git a/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/OpenAPIs/Models/Return.swift b/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/OpenAPIs/Models/Return.swift
index de4b218999..076082af84 100644
--- a/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/OpenAPIs/Models/Return.swift
+++ b/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/OpenAPIs/Models/Return.swift
@@ -7,7 +7,6 @@
 
 import Foundation
 
-
 /** Model for testing reserved words */
 
 public struct Return: Codable {
@@ -18,10 +17,8 @@ public struct Return: Codable {
         self._return = _return
     }
 
-    public enum CodingKeys: String, CodingKey { 
+    public enum CodingKeys: String, CodingKey {
         case _return = "return"
     }
 
-
 }
-
diff --git a/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/OpenAPIs/Models/SpecialModelName.swift b/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/OpenAPIs/Models/SpecialModelName.swift
index 213d896ba9..e79fc45c0e 100644
--- a/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/OpenAPIs/Models/SpecialModelName.swift
+++ b/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/OpenAPIs/Models/SpecialModelName.swift
@@ -7,8 +7,6 @@
 
 import Foundation
 
-
-
 public struct SpecialModelName: Codable {
 
     public var specialPropertyName: Int64?
@@ -17,10 +15,8 @@ public struct SpecialModelName: Codable {
         self.specialPropertyName = specialPropertyName
     }
 
-    public enum CodingKeys: String, CodingKey { 
+    public enum CodingKeys: String, CodingKey {
         case specialPropertyName = "$special[property.name]"
     }
 
-
 }
-
diff --git a/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/OpenAPIs/Models/StringBooleanMap.swift b/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/OpenAPIs/Models/StringBooleanMap.swift
index ae15e87d94..3f1237fee4 100644
--- a/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/OpenAPIs/Models/StringBooleanMap.swift
+++ b/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/OpenAPIs/Models/StringBooleanMap.swift
@@ -7,12 +7,9 @@
 
 import Foundation
 
-
-
 public struct StringBooleanMap: Codable {
 
-
-    public var additionalProperties: [String:Bool] = [:]
+    public var additionalProperties: [String: Bool] = [:]
 
     public subscript(key: String) -> Bool? {
         get {
@@ -45,7 +42,4 @@ public struct StringBooleanMap: Codable {
         additionalProperties = try container.decodeMap(Bool.self, excludedKeys: nonAdditionalPropertyKeys)
     }
 
-
-
 }
-
diff --git a/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/OpenAPIs/Models/Tag.swift b/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/OpenAPIs/Models/Tag.swift
index 32ee33a1a1..4dd8a9a9f5 100644
--- a/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/OpenAPIs/Models/Tag.swift
+++ b/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/OpenAPIs/Models/Tag.swift
@@ -7,8 +7,6 @@
 
 import Foundation
 
-
-
 public struct Tag: Codable {
 
     public var id: Int64?
@@ -19,6 +17,4 @@ public struct Tag: Codable {
         self.name = name
     }
 
-
 }
-
diff --git a/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/OpenAPIs/Models/TypeHolderDefault.swift b/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/OpenAPIs/Models/TypeHolderDefault.swift
index be1afdf026..bf0006e1a2 100644
--- a/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/OpenAPIs/Models/TypeHolderDefault.swift
+++ b/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/OpenAPIs/Models/TypeHolderDefault.swift
@@ -7,8 +7,6 @@
 
 import Foundation
 
-
-
 public struct TypeHolderDefault: Codable {
 
     public var stringItem: String = "what"
@@ -25,7 +23,7 @@ public struct TypeHolderDefault: Codable {
         self.arrayItem = arrayItem
     }
 
-    public enum CodingKeys: String, CodingKey { 
+    public enum CodingKeys: String, CodingKey {
         case stringItem = "string_item"
         case numberItem = "number_item"
         case integerItem = "integer_item"
@@ -33,6 +31,4 @@ public struct TypeHolderDefault: Codable {
         case arrayItem = "array_item"
     }
 
-
 }
-
diff --git a/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/OpenAPIs/Models/TypeHolderExample.swift b/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/OpenAPIs/Models/TypeHolderExample.swift
index f46c8952e1..602a2a6d18 100644
--- a/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/OpenAPIs/Models/TypeHolderExample.swift
+++ b/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/OpenAPIs/Models/TypeHolderExample.swift
@@ -7,8 +7,6 @@
 
 import Foundation
 
-
-
 public struct TypeHolderExample: Codable {
 
     public var stringItem: String
@@ -25,7 +23,7 @@ public struct TypeHolderExample: Codable {
         self.arrayItem = arrayItem
     }
 
-    public enum CodingKeys: String, CodingKey { 
+    public enum CodingKeys: String, CodingKey {
         case stringItem = "string_item"
         case numberItem = "number_item"
         case integerItem = "integer_item"
@@ -33,6 +31,4 @@ public struct TypeHolderExample: Codable {
         case arrayItem = "array_item"
     }
 
-
 }
-
diff --git a/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/OpenAPIs/Models/User.swift b/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/OpenAPIs/Models/User.swift
index a61b584420..79f271ed73 100644
--- a/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/OpenAPIs/Models/User.swift
+++ b/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/OpenAPIs/Models/User.swift
@@ -7,8 +7,6 @@
 
 import Foundation
 
-
-
 public struct User: Codable {
 
     public var id: Int64?
@@ -32,6 +30,4 @@ public struct User: Codable {
         self.userStatus = userStatus
     }
 
-
 }
-
diff --git a/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/OpenAPIs/Models/XmlItem.swift b/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/OpenAPIs/Models/XmlItem.swift
index e1b1ace8b1..aa01668350 100644
--- a/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/OpenAPIs/Models/XmlItem.swift
+++ b/samples/client/petstore/swift4/rxswift/PetstoreClient/Classes/OpenAPIs/Models/XmlItem.swift
@@ -7,8 +7,6 @@
 
 import Foundation
 
-
-
 public struct XmlItem: Codable {
 
     public var attributeString: String?
@@ -73,7 +71,7 @@ public struct XmlItem: Codable {
         self.prefixNsWrappedArray = prefixNsWrappedArray
     }
 
-    public enum CodingKeys: String, CodingKey { 
+    public enum CodingKeys: String, CodingKey {
         case attributeString = "attribute_string"
         case attributeNumber = "attribute_number"
         case attributeInteger = "attribute_integer"
@@ -105,6 +103,4 @@ public struct XmlItem: Codable {
         case prefixNsWrappedArray = "prefix_ns_wrapped_array"
     }
 
-
 }
-
diff --git a/samples/client/petstore/swift4/rxswift/README.md b/samples/client/petstore/swift4/rxswift/README.md
index 1e7f0a59ea..0711eb8705 100644
--- a/samples/client/petstore/swift4/rxswift/README.md
+++ b/samples/client/petstore/swift4/rxswift/README.md
@@ -73,10 +73,12 @@ Class | Method | HTTP request | Description
  - [ArrayTest](docs/ArrayTest.md)
  - [Capitalization](docs/Capitalization.md)
  - [Cat](docs/Cat.md)
+ - [CatAllOf](docs/CatAllOf.md)
  - [Category](docs/Category.md)
  - [ClassModel](docs/ClassModel.md)
  - [Client](docs/Client.md)
  - [Dog](docs/Dog.md)
+ - [DogAllOf](docs/DogAllOf.md)
  - [EnumArrays](docs/EnumArrays.md)
  - [EnumClass](docs/EnumClass.md)
  - [EnumTest](docs/EnumTest.md)
diff --git a/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/Alamofire/Source/Alamofire.swift b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/Alamofire/Source/Alamofire.swift
index 2fcc05ca06..a411b77491 100644
--- a/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/Alamofire/Source/Alamofire.swift
+++ b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/Alamofire/Source/Alamofire.swift
@@ -135,8 +135,7 @@ public func request(
     parameters: Parameters? = nil,
     encoding: ParameterEncoding = URLEncoding.default,
     headers: HTTPHeaders? = nil)
-    -> DataRequest
-{
+    -> DataRequest {
     return SessionManager.default.request(
         url,
         method: method,
@@ -183,8 +182,7 @@ public func download(
     encoding: ParameterEncoding = URLEncoding.default,
     headers: HTTPHeaders? = nil,
     to destination: DownloadRequest.DownloadFileDestination? = nil)
-    -> DownloadRequest
-{
+    -> DownloadRequest {
     return SessionManager.default.download(
         url,
         method: method,
@@ -209,8 +207,7 @@ public func download(
 public func download(
     _ urlRequest: URLRequestConvertible,
     to destination: DownloadRequest.DownloadFileDestination? = nil)
-    -> DownloadRequest
-{
+    -> DownloadRequest {
     return SessionManager.default.download(urlRequest, to: destination)
 }
 
@@ -239,8 +236,7 @@ public func download(
 public func download(
     resumingWith resumeData: Data,
     to destination: DownloadRequest.DownloadFileDestination? = nil)
-    -> DownloadRequest
-{
+    -> DownloadRequest {
     return SessionManager.default.download(resumingWith: resumeData, to: destination)
 }
 
@@ -263,8 +259,7 @@ public func upload(
     to url: URLConvertible,
     method: HTTPMethod = .post,
     headers: HTTPHeaders? = nil)
-    -> UploadRequest
-{
+    -> UploadRequest {
     return SessionManager.default.upload(fileURL, to: url, method: method, headers: headers)
 }
 
@@ -297,8 +292,7 @@ public func upload(
     to url: URLConvertible,
     method: HTTPMethod = .post,
     headers: HTTPHeaders? = nil)
-    -> UploadRequest
-{
+    -> UploadRequest {
     return SessionManager.default.upload(data, to: url, method: method, headers: headers)
 }
 
@@ -331,8 +325,7 @@ public func upload(
     to url: URLConvertible,
     method: HTTPMethod = .post,
     headers: HTTPHeaders? = nil)
-    -> UploadRequest
-{
+    -> UploadRequest {
     return SessionManager.default.upload(stream, to: url, method: method, headers: headers)
 }
 
@@ -379,8 +372,7 @@ public func upload(
     to url: URLConvertible,
     method: HTTPMethod = .post,
     headers: HTTPHeaders? = nil,
-    encodingCompletion: ((SessionManager.MultipartFormDataEncodingResult) -> Void)?)
-{
+    encodingCompletion: ((SessionManager.MultipartFormDataEncodingResult) -> Void)?) {
     return SessionManager.default.upload(
         multipartFormData: multipartFormData,
         usingThreshold: encodingMemoryThreshold,
@@ -416,8 +408,7 @@ public func upload(
     multipartFormData: @escaping (MultipartFormData) -> Void,
     usingThreshold encodingMemoryThreshold: UInt64 = SessionManager.multipartFormDataEncodingMemoryThreshold,
     with urlRequest: URLRequestConvertible,
-    encodingCompletion: ((SessionManager.MultipartFormDataEncodingResult) -> Void)?)
-{
+    encodingCompletion: ((SessionManager.MultipartFormDataEncodingResult) -> Void)?) {
     return SessionManager.default.upload(
         multipartFormData: multipartFormData,
         usingThreshold: encodingMemoryThreshold,
diff --git a/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/Alamofire/Source/MultipartFormData.swift b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/Alamofire/Source/MultipartFormData.swift
index 057e68b977..85a0685748 100644
--- a/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/Alamofire/Source/MultipartFormData.swift
+++ b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/Alamofire/Source/MultipartFormData.swift
@@ -275,8 +275,7 @@ open class MultipartFormData {
             }
 
             bodyContentLength = fileSize.uint64Value
-        }
-        catch {
+        } catch {
             setBodyPartError(withReason: .bodyPartFileSizeQueryFailedWithError(forURL: fileURL, error: error))
             return
         }
@@ -312,8 +311,7 @@ open class MultipartFormData {
         withLength length: UInt64,
         name: String,
         fileName: String,
-        mimeType: String)
-    {
+        mimeType: String) {
         let headers = contentHeaders(withName: name, fileName: fileName, mimeType: mimeType)
         append(stream, withLength: length, headers: headers)
     }
diff --git a/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/Alamofire/Source/NetworkReachabilityManager.swift b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/Alamofire/Source/NetworkReachabilityManager.swift
index 3ff2e7fc27..60bda83d2f 100644
--- a/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/Alamofire/Source/NetworkReachabilityManager.swift
+++ b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/Alamofire/Source/NetworkReachabilityManager.swift
@@ -146,8 +146,7 @@ open class NetworkReachabilityManager {
         context.info = Unmanaged.passUnretained(self).toOpaque()
 
         let callbackEnabled = SCNetworkReachabilitySetCallback(
-            reachability,
-            { (_, flags, info) in
+            reachability, { (_, flags, info) in
                 let reachability = Unmanaged<NetworkReachabilityManager>.fromOpaque(info!).takeUnretainedValue()
                 reachability.notifyListener(flags)
             },
@@ -216,8 +215,7 @@ extension NetworkReachabilityManager.NetworkReachabilityStatus: Equatable {}
 public func ==(
     lhs: NetworkReachabilityManager.NetworkReachabilityStatus,
     rhs: NetworkReachabilityManager.NetworkReachabilityStatus)
-    -> Bool
-{
+    -> Bool {
     switch (lhs, rhs) {
     case (.unknown, .unknown):
         return true
diff --git a/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/Alamofire/Source/ParameterEncoding.swift b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/Alamofire/Source/ParameterEncoding.swift
index 4a54f2dd00..344a048cad 100644
--- a/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/Alamofire/Source/ParameterEncoding.swift
+++ b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/Alamofire/Source/ParameterEncoding.swift
@@ -435,8 +435,7 @@ public struct PropertyListEncoding: ParameterEncoding {
     /// - returns: The new `PropertyListEncoding` instance.
     public init(
         format: PropertyListSerialization.PropertyListFormat = .xml,
-        options: PropertyListSerialization.WriteOptions = 0)
-    {
+        options: PropertyListSerialization.WriteOptions = 0) {
         self.format = format
         self.options = options
     }
diff --git a/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/Alamofire/Source/Request.swift b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/Alamofire/Source/Request.swift
index ea43411377..18b83a0e73 100644
--- a/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/Alamofire/Source/Request.swift
+++ b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/Alamofire/Source/Request.swift
@@ -161,8 +161,7 @@ open class Request {
         user: String,
         password: String,
         persistence: URLCredential.Persistence = .forSession)
-        -> Self
-    {
+        -> Self {
         let credential = URLCredential(user: user, password: password, persistence: persistence)
         return authenticate(usingCredential: credential)
     }
@@ -538,8 +537,7 @@ open class DownloadRequest: Request {
     open class func suggestedDownloadDestination(
         for directory: FileManager.SearchPathDirectory = .documentDirectory,
         in domain: FileManager.SearchPathDomainMask = .userDomainMask)
-        -> DownloadFileDestination
-    {
+        -> DownloadFileDestination {
         return { temporaryURL, response in
             let directoryURLs = FileManager.default.urls(for: directory, in: domain)
 
diff --git a/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/Alamofire/Source/Response.swift b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/Alamofire/Source/Response.swift
index 74b1ef54d0..23571383ba 100644
--- a/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/Alamofire/Source/Response.swift
+++ b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/Alamofire/Source/Response.swift
@@ -58,8 +58,7 @@ public struct DefaultDataResponse {
         data: Data?,
         error: Error?,
         timeline: Timeline = Timeline(),
-        metrics: AnyObject? = nil)
-    {
+        metrics: AnyObject? = nil) {
         self.request = request
         self.response = response
         self.data = data
@@ -109,8 +108,7 @@ public struct DataResponse<Value> {
         response: HTTPURLResponse?,
         data: Data?,
         result: Result<Value>,
-        timeline: Timeline = Timeline())
-    {
+        timeline: Timeline = Timeline()) {
         self.request = request
         self.response = response
         self.data = data
@@ -296,8 +294,7 @@ public struct DefaultDownloadResponse {
         resumeData: Data?,
         error: Error?,
         timeline: Timeline = Timeline(),
-        metrics: AnyObject? = nil)
-    {
+        metrics: AnyObject? = nil) {
         self.request = request
         self.response = response
         self.temporaryURL = temporaryURL
@@ -359,8 +356,7 @@ public struct DownloadResponse<Value> {
         destinationURL: URL?,
         resumeData: Data?,
         result: Result<Value>,
-        timeline: Timeline = Timeline())
-    {
+        timeline: Timeline = Timeline()) {
         self.request = request
         self.response = response
         self.temporaryURL = temporaryURL
diff --git a/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/Alamofire/Source/ResponseSerialization.swift b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/Alamofire/Source/ResponseSerialization.swift
index 3333726d5c..fd049edac1 100644
--- a/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/Alamofire/Source/ResponseSerialization.swift
+++ b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/Alamofire/Source/ResponseSerialization.swift
@@ -144,8 +144,7 @@ extension DataRequest {
         queue: DispatchQueue? = nil,
         responseSerializer: T,
         completionHandler: @escaping (DataResponse<T.SerializedObject>) -> Void)
-        -> Self
-    {
+        -> Self {
         delegate.queue.addOperation {
             let result = responseSerializer.serializeResponse(
                 self.request,
@@ -182,8 +181,7 @@ extension DownloadRequest {
     public func response(
         queue: DispatchQueue? = nil,
         completionHandler: @escaping (DefaultDownloadResponse) -> Void)
-        -> Self
-    {
+        -> Self {
         delegate.queue.addOperation {
             (queue ?? DispatchQueue.main).async {
                 var downloadResponse = DefaultDownloadResponse(
@@ -218,8 +216,7 @@ extension DownloadRequest {
         queue: DispatchQueue? = nil,
         responseSerializer: T,
         completionHandler: @escaping (DownloadResponse<T.SerializedObject>) -> Void)
-        -> Self
-    {
+        -> Self {
         delegate.queue.addOperation {
             let result = responseSerializer.serializeResponse(
                 self.request,
@@ -289,8 +286,7 @@ extension DataRequest {
     public func responseData(
         queue: DispatchQueue? = nil,
         completionHandler: @escaping (DataResponse<Data>) -> Void)
-        -> Self
-    {
+        -> Self {
         return response(
             queue: queue,
             responseSerializer: DataRequest.dataResponseSerializer(),
@@ -329,8 +325,7 @@ extension DownloadRequest {
     public func responseData(
         queue: DispatchQueue? = nil,
         completionHandler: @escaping (DownloadResponse<Data>) -> Void)
-        -> Self
-    {
+        -> Self {
         return response(
             queue: queue,
             responseSerializer: DownloadRequest.dataResponseSerializer(),
@@ -356,8 +351,7 @@ extension Request {
         response: HTTPURLResponse?,
         data: Data?,
         error: Error?)
-        -> Result<String>
-    {
+        -> Result<String> {
         guard error == nil else { return .failure(error!) }
 
         if let response = response, emptyDataStatusCodes.contains(response.statusCode) { return .success("") }
@@ -411,8 +405,7 @@ extension DataRequest {
         queue: DispatchQueue? = nil,
         encoding: String.Encoding? = nil,
         completionHandler: @escaping (DataResponse<String>) -> Void)
-        -> Self
-    {
+        -> Self {
         return response(
             queue: queue,
             responseSerializer: DataRequest.stringResponseSerializer(encoding: encoding),
@@ -459,8 +452,7 @@ extension DownloadRequest {
         queue: DispatchQueue? = nil,
         encoding: String.Encoding? = nil,
         completionHandler: @escaping (DownloadResponse<String>) -> Void)
-        -> Self
-    {
+        -> Self {
         return response(
             queue: queue,
             responseSerializer: DownloadRequest.stringResponseSerializer(encoding: encoding),
@@ -486,8 +478,7 @@ extension Request {
         response: HTTPURLResponse?,
         data: Data?,
         error: Error?)
-        -> Result<Any>
-    {
+        -> Result<Any> {
         guard error == nil else { return .failure(error!) }
 
         if let response = response, emptyDataStatusCodes.contains(response.statusCode) { return .success(NSNull()) }
@@ -514,8 +505,7 @@ extension DataRequest {
     /// - returns: A JSON object response serializer.
     public static func jsonResponseSerializer(
         options: JSONSerialization.ReadingOptions = .allowFragments)
-        -> DataResponseSerializer<Any>
-    {
+        -> DataResponseSerializer<Any> {
         return DataResponseSerializer { _, response, data, error in
             return Request.serializeResponseJSON(options: options, response: response, data: data, error: error)
         }
@@ -532,8 +522,7 @@ extension DataRequest {
         queue: DispatchQueue? = nil,
         options: JSONSerialization.ReadingOptions = .allowFragments,
         completionHandler: @escaping (DataResponse<Any>) -> Void)
-        -> Self
-    {
+        -> Self {
         return response(
             queue: queue,
             responseSerializer: DataRequest.jsonResponseSerializer(options: options),
@@ -551,8 +540,7 @@ extension DownloadRequest {
     /// - returns: A JSON object response serializer.
     public static func jsonResponseSerializer(
         options: JSONSerialization.ReadingOptions = .allowFragments)
-        -> DownloadResponseSerializer<Any>
-    {
+        -> DownloadResponseSerializer<Any> {
         return DownloadResponseSerializer { _, response, fileURL, error in
             guard error == nil else { return .failure(error!) }
 
@@ -580,8 +568,7 @@ extension DownloadRequest {
         queue: DispatchQueue? = nil,
         options: JSONSerialization.ReadingOptions = .allowFragments,
         completionHandler: @escaping (DownloadResponse<Any>) -> Void)
-        -> Self
-    {
+        -> Self {
         return response(
             queue: queue,
             responseSerializer: DownloadRequest.jsonResponseSerializer(options: options),
@@ -607,8 +594,7 @@ extension Request {
         response: HTTPURLResponse?,
         data: Data?,
         error: Error?)
-        -> Result<Any>
-    {
+        -> Result<Any> {
         guard error == nil else { return .failure(error!) }
 
         if let response = response, emptyDataStatusCodes.contains(response.statusCode) { return .success(NSNull()) }
@@ -635,8 +621,7 @@ extension DataRequest {
     /// - returns: A property list object response serializer.
     public static func propertyListResponseSerializer(
         options: PropertyListSerialization.ReadOptions = [])
-        -> DataResponseSerializer<Any>
-    {
+        -> DataResponseSerializer<Any> {
         return DataResponseSerializer { _, response, data, error in
             return Request.serializeResponsePropertyList(options: options, response: response, data: data, error: error)
         }
@@ -653,8 +638,7 @@ extension DataRequest {
         queue: DispatchQueue? = nil,
         options: PropertyListSerialization.ReadOptions = [],
         completionHandler: @escaping (DataResponse<Any>) -> Void)
-        -> Self
-    {
+        -> Self {
         return response(
             queue: queue,
             responseSerializer: DataRequest.propertyListResponseSerializer(options: options),
@@ -672,8 +656,7 @@ extension DownloadRequest {
     /// - returns: A property list object response serializer.
     public static func propertyListResponseSerializer(
         options: PropertyListSerialization.ReadOptions = [])
-        -> DownloadResponseSerializer<Any>
-    {
+        -> DownloadResponseSerializer<Any> {
         return DownloadResponseSerializer { _, response, fileURL, error in
             guard error == nil else { return .failure(error!) }
 
@@ -701,8 +684,7 @@ extension DownloadRequest {
         queue: DispatchQueue? = nil,
         options: PropertyListSerialization.ReadOptions = [],
         completionHandler: @escaping (DownloadResponse<Any>) -> Void)
-        -> Self
-    {
+        -> Self {
         return response(
             queue: queue,
             responseSerializer: DownloadRequest.propertyListResponseSerializer(options: options),
diff --git a/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/Alamofire/Source/ServerTrustPolicy.swift b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/Alamofire/Source/ServerTrustPolicy.swift
index 7f44c8d2c6..d50e941fab 100644
--- a/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/Alamofire/Source/ServerTrustPolicy.swift
+++ b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/Alamofire/Source/ServerTrustPolicy.swift
@@ -249,7 +249,6 @@ public enum ServerTrustPolicy {
             let unspecified = SecTrustResultType.unspecified
             let proceed = SecTrustResultType.proceed
 
-
             isValid = result == unspecified || result == proceed
         }
 
diff --git a/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/Alamofire/Source/SessionDelegate.swift b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/Alamofire/Source/SessionDelegate.swift
index 03bcb7ced6..17d0d9f150 100644
--- a/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/Alamofire/Source/SessionDelegate.swift
+++ b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/Alamofire/Source/SessionDelegate.swift
@@ -255,8 +255,7 @@ extension SessionDelegate: URLSessionDelegate {
     open func urlSession(
         _ session: URLSession,
         didReceive challenge: URLAuthenticationChallenge,
-        completionHandler: @escaping (URLSession.AuthChallengeDisposition, URLCredential?) -> Void)
-    {
+        completionHandler: @escaping (URLSession.AuthChallengeDisposition, URLCredential?) -> Void) {
         guard sessionDidReceiveChallengeWithCompletion == nil else {
             sessionDidReceiveChallengeWithCompletion?(session, challenge, completionHandler)
             return
@@ -315,8 +314,7 @@ extension SessionDelegate: URLSessionTaskDelegate {
         task: URLSessionTask,
         willPerformHTTPRedirection response: HTTPURLResponse,
         newRequest request: URLRequest,
-        completionHandler: @escaping (URLRequest?) -> Void)
-    {
+        completionHandler: @escaping (URLRequest?) -> Void) {
         guard taskWillPerformHTTPRedirectionWithCompletion == nil else {
             taskWillPerformHTTPRedirectionWithCompletion?(session, task, response, request, completionHandler)
             return
@@ -342,8 +340,7 @@ extension SessionDelegate: URLSessionTaskDelegate {
         _ session: URLSession,
         task: URLSessionTask,
         didReceive challenge: URLAuthenticationChallenge,
-        completionHandler: @escaping (URLSession.AuthChallengeDisposition, URLCredential?) -> Void)
-    {
+        completionHandler: @escaping (URLSession.AuthChallengeDisposition, URLCredential?) -> Void) {
         guard taskDidReceiveChallengeWithCompletion == nil else {
             taskDidReceiveChallengeWithCompletion?(session, task, challenge, completionHandler)
             return
@@ -372,8 +369,7 @@ extension SessionDelegate: URLSessionTaskDelegate {
     open func urlSession(
         _ session: URLSession,
         task: URLSessionTask,
-        needNewBodyStream completionHandler: @escaping (InputStream?) -> Void)
-    {
+        needNewBodyStream completionHandler: @escaping (InputStream?) -> Void) {
         guard taskNeedNewBodyStreamWithCompletion == nil else {
             taskNeedNewBodyStreamWithCompletion?(session, task, completionHandler)
             return
@@ -398,8 +394,7 @@ extension SessionDelegate: URLSessionTaskDelegate {
         task: URLSessionTask,
         didSendBodyData bytesSent: Int64,
         totalBytesSent: Int64,
-        totalBytesExpectedToSend: Int64)
-    {
+        totalBytesExpectedToSend: Int64) {
         if let taskDidSendBodyData = taskDidSendBodyData {
             taskDidSendBodyData(session, task, bytesSent, totalBytesSent, totalBytesExpectedToSend)
         } else if let delegate = self[task]?.delegate as? UploadTaskDelegate {
@@ -512,8 +507,7 @@ extension SessionDelegate: URLSessionDataDelegate {
         _ session: URLSession,
         dataTask: URLSessionDataTask,
         didReceive response: URLResponse,
-        completionHandler: @escaping (URLSession.ResponseDisposition) -> Void)
-    {
+        completionHandler: @escaping (URLSession.ResponseDisposition) -> Void) {
         guard dataTaskDidReceiveResponseWithCompletion == nil else {
             dataTaskDidReceiveResponseWithCompletion?(session, dataTask, response, completionHandler)
             return
@@ -536,8 +530,7 @@ extension SessionDelegate: URLSessionDataDelegate {
     open func urlSession(
         _ session: URLSession,
         dataTask: URLSessionDataTask,
-        didBecome downloadTask: URLSessionDownloadTask)
-    {
+        didBecome downloadTask: URLSessionDownloadTask) {
         if let dataTaskDidBecomeDownloadTask = dataTaskDidBecomeDownloadTask {
             dataTaskDidBecomeDownloadTask(session, dataTask, downloadTask)
         } else {
@@ -573,8 +566,7 @@ extension SessionDelegate: URLSessionDataDelegate {
         _ session: URLSession,
         dataTask: URLSessionDataTask,
         willCacheResponse proposedResponse: CachedURLResponse,
-        completionHandler: @escaping (CachedURLResponse?) -> Void)
-    {
+        completionHandler: @escaping (CachedURLResponse?) -> Void) {
         guard dataTaskWillCacheResponseWithCompletion == nil else {
             dataTaskWillCacheResponseWithCompletion?(session, dataTask, proposedResponse, completionHandler)
             return
@@ -608,8 +600,7 @@ extension SessionDelegate: URLSessionDownloadDelegate {
     open func urlSession(
         _ session: URLSession,
         downloadTask: URLSessionDownloadTask,
-        didFinishDownloadingTo location: URL)
-    {
+        didFinishDownloadingTo location: URL) {
         if let downloadTaskDidFinishDownloadingToURL = downloadTaskDidFinishDownloadingToURL {
             downloadTaskDidFinishDownloadingToURL(session, downloadTask, location)
         } else if let delegate = self[downloadTask]?.delegate as? DownloadTaskDelegate {
@@ -632,8 +623,7 @@ extension SessionDelegate: URLSessionDownloadDelegate {
         downloadTask: URLSessionDownloadTask,
         didWriteData bytesWritten: Int64,
         totalBytesWritten: Int64,
-        totalBytesExpectedToWrite: Int64)
-    {
+        totalBytesExpectedToWrite: Int64) {
         if let downloadTaskDidWriteData = downloadTaskDidWriteData {
             downloadTaskDidWriteData(session, downloadTask, bytesWritten, totalBytesWritten, totalBytesExpectedToWrite)
         } else if let delegate = self[downloadTask]?.delegate as? DownloadTaskDelegate {
@@ -661,8 +651,7 @@ extension SessionDelegate: URLSessionDownloadDelegate {
         _ session: URLSession,
         downloadTask: URLSessionDownloadTask,
         didResumeAtOffset fileOffset: Int64,
-        expectedTotalBytes: Int64)
-    {
+        expectedTotalBytes: Int64) {
         if let downloadTaskDidResumeAtOffset = downloadTaskDidResumeAtOffset {
             downloadTaskDidResumeAtOffset(session, downloadTask, fileOffset, expectedTotalBytes)
         } else if let delegate = self[downloadTask]?.delegate as? DownloadTaskDelegate {
@@ -716,8 +705,7 @@ extension SessionDelegate: URLSessionStreamDelegate {
         _ session: URLSession,
         streamTask: URLSessionStreamTask,
         didBecome inputStream: InputStream,
-        outputStream: OutputStream)
-    {
+        outputStream: OutputStream) {
         streamTaskDidBecomeInputAndOutputStreams?(session, streamTask, inputStream, outputStream)
     }
 }
diff --git a/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/Alamofire/Source/SessionManager.swift b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/Alamofire/Source/SessionManager.swift
index 8779efdaa6..8c10706677 100644
--- a/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/Alamofire/Source/SessionManager.swift
+++ b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/Alamofire/Source/SessionManager.swift
@@ -166,8 +166,7 @@ open class SessionManager {
     public init(
         configuration: URLSessionConfiguration = URLSessionConfiguration.default,
         delegate: SessionDelegate = SessionDelegate(),
-        serverTrustPolicyManager: ServerTrustPolicyManager? = nil)
-    {
+        serverTrustPolicyManager: ServerTrustPolicyManager? = nil) {
         self.delegate = delegate
         self.session = URLSession(configuration: configuration, delegate: delegate, delegateQueue: nil)
 
@@ -185,8 +184,7 @@ open class SessionManager {
     public init?(
         session: URLSession,
         delegate: SessionDelegate,
-        serverTrustPolicyManager: ServerTrustPolicyManager? = nil)
-    {
+        serverTrustPolicyManager: ServerTrustPolicyManager? = nil) {
         guard delegate === session.delegate else { return nil }
 
         self.delegate = delegate
@@ -229,8 +227,7 @@ open class SessionManager {
         parameters: Parameters? = nil,
         encoding: ParameterEncoding = URLEncoding.default,
         headers: HTTPHeaders? = nil)
-        -> DataRequest
-    {
+        -> DataRequest {
         var originalRequest: URLRequest?
 
         do {
@@ -320,8 +317,7 @@ open class SessionManager {
         encoding: ParameterEncoding = URLEncoding.default,
         headers: HTTPHeaders? = nil,
         to destination: DownloadRequest.DownloadFileDestination? = nil)
-        -> DownloadRequest
-    {
+        -> DownloadRequest {
         do {
             let urlRequest = try URLRequest(url: url, method: method, headers: headers)
             let encodedURLRequest = try encoding.encode(urlRequest, with: parameters)
@@ -347,8 +343,7 @@ open class SessionManager {
     open func download(
         _ urlRequest: URLRequestConvertible,
         to destination: DownloadRequest.DownloadFileDestination? = nil)
-        -> DownloadRequest
-    {
+        -> DownloadRequest {
         do {
             let urlRequest = try urlRequest.asURLRequest()
             return download(.request(urlRequest), to: destination)
@@ -384,8 +379,7 @@ open class SessionManager {
     open func download(
         resumingWith resumeData: Data,
         to destination: DownloadRequest.DownloadFileDestination? = nil)
-        -> DownloadRequest
-    {
+        -> DownloadRequest {
         return download(.resumeData(resumeData), to: destination)
     }
 
@@ -394,8 +388,7 @@ open class SessionManager {
     private func download(
         _ downloadable: DownloadRequest.Downloadable,
         to destination: DownloadRequest.DownloadFileDestination?)
-        -> DownloadRequest
-    {
+        -> DownloadRequest {
         do {
             let task = try downloadable.task(session: session, adapter: adapter, queue: queue)
             let download = DownloadRequest(session: session, requestTask: .download(downloadable, task))
@@ -416,8 +409,7 @@ open class SessionManager {
         _ downloadable: DownloadRequest.Downloadable?,
         to destination: DownloadRequest.DownloadFileDestination?,
         failedWith error: Error)
-        -> DownloadRequest
-    {
+        -> DownloadRequest {
         var downloadTask: Request.RequestTask = .download(nil, nil)
 
         if let downloadable = downloadable {
@@ -458,8 +450,7 @@ open class SessionManager {
         to url: URLConvertible,
         method: HTTPMethod = .post,
         headers: HTTPHeaders? = nil)
-        -> UploadRequest
-    {
+        -> UploadRequest {
         do {
             let urlRequest = try URLRequest(url: url, method: method, headers: headers)
             return upload(fileURL, with: urlRequest)
@@ -504,8 +495,7 @@ open class SessionManager {
         to url: URLConvertible,
         method: HTTPMethod = .post,
         headers: HTTPHeaders? = nil)
-        -> UploadRequest
-    {
+        -> UploadRequest {
         do {
             let urlRequest = try URLRequest(url: url, method: method, headers: headers)
             return upload(data, with: urlRequest)
@@ -550,8 +540,7 @@ open class SessionManager {
         to url: URLConvertible,
         method: HTTPMethod = .post,
         headers: HTTPHeaders? = nil)
-        -> UploadRequest
-    {
+        -> UploadRequest {
         do {
             let urlRequest = try URLRequest(url: url, method: method, headers: headers)
             return upload(stream, with: urlRequest)
@@ -611,8 +600,7 @@ open class SessionManager {
         to url: URLConvertible,
         method: HTTPMethod = .post,
         headers: HTTPHeaders? = nil,
-        encodingCompletion: ((MultipartFormDataEncodingResult) -> Void)?)
-    {
+        encodingCompletion: ((MultipartFormDataEncodingResult) -> Void)?) {
         do {
             let urlRequest = try URLRequest(url: url, method: method, headers: headers)
 
@@ -654,8 +642,7 @@ open class SessionManager {
         multipartFormData: @escaping (MultipartFormData) -> Void,
         usingThreshold encodingMemoryThreshold: UInt64 = SessionManager.multipartFormDataEncodingMemoryThreshold,
         with urlRequest: URLRequestConvertible,
-        encodingCompletion: ((MultipartFormDataEncodingResult) -> Void)?)
-    {
+        encodingCompletion: ((MultipartFormDataEncodingResult) -> Void)?) {
         DispatchQueue.global(qos: .utility).async {
             let formData = MultipartFormData()
             multipartFormData(formData)
diff --git a/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/Alamofire/Source/TaskDelegate.swift b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/Alamofire/Source/TaskDelegate.swift
index 8e19888fc8..12fcbe92d3 100644
--- a/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/Alamofire/Source/TaskDelegate.swift
+++ b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/Alamofire/Source/TaskDelegate.swift
@@ -94,8 +94,7 @@ open class TaskDelegate: NSObject {
         task: URLSessionTask,
         willPerformHTTPRedirection response: HTTPURLResponse,
         newRequest request: URLRequest,
-        completionHandler: @escaping (URLRequest?) -> Void)
-    {
+        completionHandler: @escaping (URLRequest?) -> Void) {
         var redirectRequest: URLRequest? = request
 
         if let taskWillPerformHTTPRedirection = taskWillPerformHTTPRedirection {
@@ -110,8 +109,7 @@ open class TaskDelegate: NSObject {
         _ session: URLSession,
         task: URLSessionTask,
         didReceive challenge: URLAuthenticationChallenge,
-        completionHandler: @escaping (URLSession.AuthChallengeDisposition, URLCredential?) -> Void)
-    {
+        completionHandler: @escaping (URLSession.AuthChallengeDisposition, URLCredential?) -> Void) {
         var disposition: URLSession.AuthChallengeDisposition = .performDefaultHandling
         var credential: URLCredential?
 
@@ -150,8 +148,7 @@ open class TaskDelegate: NSObject {
     func urlSession(
         _ session: URLSession,
         task: URLSessionTask,
-        needNewBodyStream completionHandler: @escaping (InputStream?) -> Void)
-    {
+        needNewBodyStream completionHandler: @escaping (InputStream?) -> Void) {
         var bodyStream: InputStream?
 
         if let taskNeedNewBodyStream = taskNeedNewBodyStream {
@@ -237,8 +234,7 @@ class DataTaskDelegate: TaskDelegate, URLSessionDataDelegate {
         _ session: URLSession,
         dataTask: URLSessionDataTask,
         didReceive response: URLResponse,
-        completionHandler: @escaping (URLSession.ResponseDisposition) -> Void)
-    {
+        completionHandler: @escaping (URLSession.ResponseDisposition) -> Void) {
         var disposition: URLSession.ResponseDisposition = .allow
 
         expectedContentLength = response.expectedContentLength
@@ -253,8 +249,7 @@ class DataTaskDelegate: TaskDelegate, URLSessionDataDelegate {
     func urlSession(
         _ session: URLSession,
         dataTask: URLSessionDataTask,
-        didBecome downloadTask: URLSessionDownloadTask)
-    {
+        didBecome downloadTask: URLSessionDownloadTask) {
         dataTaskDidBecomeDownloadTask?(session, dataTask, downloadTask)
     }
 
@@ -287,8 +282,7 @@ class DataTaskDelegate: TaskDelegate, URLSessionDataDelegate {
         _ session: URLSession,
         dataTask: URLSessionDataTask,
         willCacheResponse proposedResponse: CachedURLResponse,
-        completionHandler: @escaping (CachedURLResponse?) -> Void)
-    {
+        completionHandler: @escaping (CachedURLResponse?) -> Void) {
         var cachedResponse: CachedURLResponse? = proposedResponse
 
         if let dataTaskWillCacheResponse = dataTaskWillCacheResponse {
@@ -343,8 +337,7 @@ class DownloadTaskDelegate: TaskDelegate, URLSessionDownloadDelegate {
     func urlSession(
         _ session: URLSession,
         downloadTask: URLSessionDownloadTask,
-        didFinishDownloadingTo location: URL)
-    {
+        didFinishDownloadingTo location: URL) {
         temporaryURL = location
 
         guard
@@ -379,8 +372,7 @@ class DownloadTaskDelegate: TaskDelegate, URLSessionDownloadDelegate {
         downloadTask: URLSessionDownloadTask,
         didWriteData bytesWritten: Int64,
         totalBytesWritten: Int64,
-        totalBytesExpectedToWrite: Int64)
-    {
+        totalBytesExpectedToWrite: Int64) {
         if initialResponseTime == nil { initialResponseTime = CFAbsoluteTimeGetCurrent() }
 
         if let downloadTaskDidWriteData = downloadTaskDidWriteData {
@@ -405,8 +397,7 @@ class DownloadTaskDelegate: TaskDelegate, URLSessionDownloadDelegate {
         _ session: URLSession,
         downloadTask: URLSessionDownloadTask,
         didResumeAtOffset fileOffset: Int64,
-        expectedTotalBytes: Int64)
-    {
+        expectedTotalBytes: Int64) {
         if let downloadTaskDidResumeAtOffset = downloadTaskDidResumeAtOffset {
             downloadTaskDidResumeAtOffset(session, downloadTask, fileOffset, expectedTotalBytes)
         } else {
@@ -448,8 +439,7 @@ class UploadTaskDelegate: DataTaskDelegate {
         task: URLSessionTask,
         didSendBodyData bytesSent: Int64,
         totalBytesSent: Int64,
-        totalBytesExpectedToSend: Int64)
-    {
+        totalBytesExpectedToSend: Int64) {
         if initialResponseTime == nil { initialResponseTime = CFAbsoluteTimeGetCurrent() }
 
         if let taskDidSendBodyData = taskDidSendBodyData {
diff --git a/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/Alamofire/Source/Timeline.swift b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/Alamofire/Source/Timeline.swift
index 181c9883cb..b318b1ff48 100644
--- a/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/Alamofire/Source/Timeline.swift
+++ b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/Alamofire/Source/Timeline.swift
@@ -64,8 +64,7 @@ public struct Timeline {
         requestStartTime: CFAbsoluteTime = 0.0,
         initialResponseTime: CFAbsoluteTime = 0.0,
         requestCompletedTime: CFAbsoluteTime = 0.0,
-        serializationCompletedTime: CFAbsoluteTime = 0.0)
-    {
+        serializationCompletedTime: CFAbsoluteTime = 0.0) {
         self.requestStartTime = requestStartTime
         self.initialResponseTime = initialResponseTime
         self.requestCompletedTime = requestCompletedTime
diff --git a/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/Alamofire/Source/Validation.swift b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/Alamofire/Source/Validation.swift
index ec2c5c35a0..deaee34ad8 100644
--- a/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/Alamofire/Source/Validation.swift
+++ b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/Alamofire/Source/Validation.swift
@@ -94,8 +94,7 @@ extension Request {
         statusCode acceptableStatusCodes: S,
         response: HTTPURLResponse)
         -> ValidationResult
-        where S.Iterator.Element == Int
-    {
+        where S.Iterator.Element == Int {
         if acceptableStatusCodes.contains(response.statusCode) {
             return .success
         } else {
@@ -111,8 +110,7 @@ extension Request {
         response: HTTPURLResponse,
         data: Data?)
         -> ValidationResult
-        where S.Iterator.Element == String
-    {
+        where S.Iterator.Element == String {
         guard let data = data, data.count > 0 else { return .success }
 
         guard
diff --git a/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/PetstoreClient/Classes/OpenAPIs/APIHelper.swift b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/PetstoreClient/Classes/OpenAPIs/APIHelper.swift
index 3c7b53f814..447a87c094 100644
--- a/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/PetstoreClient/Classes/OpenAPIs/APIHelper.swift
+++ b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/PetstoreClient/Classes/OpenAPIs/APIHelper.swift
@@ -7,7 +7,7 @@
 import Foundation
 
 public struct APIHelper {
-    public static func rejectNil(_ source: [String:Any?]) -> [String:Any]? {
+    public static func rejectNil(_ source: [String: Any?]) -> [String: Any]? {
         let destination = source.reduce(into: [String: Any]()) { (result, item) in
             if let value = item.value {
                 result[item.key] = value
@@ -20,17 +20,17 @@ public struct APIHelper {
         return destination
     }
 
-    public static func rejectNilHeaders(_ source: [String:Any?]) -> [String:String] {
+    public static func rejectNilHeaders(_ source: [String: Any?]) -> [String: String] {
         return source.reduce(into: [String: String]()) { (result, item) in
             if let collection = item.value as? Array<Any?> {
-                result[item.key] = collection.filter({ $0 != nil }).map{ "\($0!)" }.joined(separator: ",")
+                result[item.key] = collection.filter({ $0 != nil }).map { "\($0!)" }.joined(separator: ",")
             } else if let value: Any = item.value {
                 result[item.key] = "\(value)"
             }
         }
     }
 
-    public static func convertBoolToString(_ source: [String: Any]?) -> [String:Any]? {
+    public static func convertBoolToString(_ source: [String: Any]?) -> [String: Any]? {
         guard let source = source else {
             return nil
         }
@@ -45,8 +45,7 @@ public struct APIHelper {
         })
     }
 
-
-    public static func mapValuesToQueryItems(_ source: [String:Any?]) -> [URLQueryItem]? {
+    public static func mapValuesToQueryItems(_ source: [String: Any?]) -> [URLQueryItem]? {
         let destination = source.filter({ $0.value != nil}).reduce(into: [URLQueryItem]()) { (result, item) in
             if let collection = item.value as? Array<Any?> {
                 let value = collection.filter({ $0 != nil }).map({"\($0!)"}).joined(separator: ",")
@@ -62,4 +61,3 @@ public struct APIHelper {
         return destination
     }
 }
-
diff --git a/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/PetstoreClient/Classes/OpenAPIs/APIs.swift b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/PetstoreClient/Classes/OpenAPIs/APIs.swift
index 8cae3aacfe..bb2f200ba3 100644
--- a/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/PetstoreClient/Classes/OpenAPIs/APIs.swift
+++ b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/PetstoreClient/Classes/OpenAPIs/APIs.swift
@@ -9,22 +9,22 @@ import Foundation
 open class PetstoreClientAPI {
     open static var basePath = "http://petstore.swagger.io:80/v2"
     open static var credential: URLCredential?
-    open static var customHeaders: [String:String] = [:]
+    open static var customHeaders: [String: String] = [:]
     open static var requestBuilderFactory: RequestBuilderFactory = AlamofireRequestBuilderFactory()
 }
 
 open class RequestBuilder<T> {
     var credential: URLCredential?
-    var headers: [String:String]
-    public let parameters: [String:Any]?
+    var headers: [String: String]
+    public let parameters: [String: Any]?
     public let isBody: Bool
     public let method: String
     public let URLString: String
 
     /// Optional block to obtain a reference to the request's progress instance when available.
-    public var onProgressReady: ((Progress) -> ())?
+    public var onProgressReady: ((Progress) -> Void)?
 
-    required public init(method: String, URLString: String, parameters: [String:Any]?, isBody: Bool, headers: [String:String] = [:]) {
+    required public init(method: String, URLString: String, parameters: [String: Any]?, isBody: Bool, headers: [String: String] = [:]) {
         self.method = method
         self.URLString = URLString
         self.parameters = parameters
@@ -34,7 +34,7 @@ open class RequestBuilder<T> {
         addHeaders(PetstoreClientAPI.customHeaders)
     }
 
-    open func addHeaders(_ aHeaders:[String:String]) {
+    open func addHeaders(_ aHeaders: [String: String]) {
         for (header, value) in aHeaders {
             headers[header] = value
         }
@@ -57,5 +57,5 @@ open class RequestBuilder<T> {
 
 public protocol RequestBuilderFactory {
     func getNonDecodableBuilder<T>() -> RequestBuilder<T>.Type
-    func getBuilder<T:Decodable>() -> RequestBuilder<T>.Type
+    func getBuilder<T: Decodable>() -> RequestBuilder<T>.Type
 }
diff --git a/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/PetstoreClient/Classes/OpenAPIs/APIs/AnotherFakeAPI.swift b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/PetstoreClient/Classes/OpenAPIs/APIs/AnotherFakeAPI.swift
index 637fa6df55..2fadeb51ce 100644
--- a/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/PetstoreClient/Classes/OpenAPIs/APIs/AnotherFakeAPI.swift
+++ b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/PetstoreClient/Classes/OpenAPIs/APIs/AnotherFakeAPI.swift
@@ -9,8 +9,6 @@ import Foundation
 import Alamofire
 import RxSwift
 
-
-
 open class AnotherFakeAPI {
     /**
      To test special tags
@@ -18,7 +16,7 @@ open class AnotherFakeAPI {
      - parameter client: (body) client model 
      - parameter completion: completion handler to receive the data and the error objects
      */
-    open class func testSpecialTags(client: Client, completion: @escaping ((_ data: Client?,_ error: Error?) -> Void)) {
+    open class func testSpecialTags(client: Client, completion: @escaping ((_ data: Client?, _ error: Error?) -> Void)) {
         testSpecialTagsWithRequestBuilder(client: client).execute { (response, error) -> Void in
             completion(response?.body, error)
         }
diff --git a/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/PetstoreClient/Classes/OpenAPIs/APIs/FakeAPI.swift b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/PetstoreClient/Classes/OpenAPIs/APIs/FakeAPI.swift
index 31285485c0..404824a2c7 100644
--- a/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/PetstoreClient/Classes/OpenAPIs/APIs/FakeAPI.swift
+++ b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/PetstoreClient/Classes/OpenAPIs/APIs/FakeAPI.swift
@@ -9,15 +9,13 @@ import Foundation
 import Alamofire
 import RxSwift
 
-
-
 open class FakeAPI {
     /**
 
      - parameter body: (body) Input boolean as post body (optional)
      - parameter completion: completion handler to receive the data and the error objects
      */
-    open class func fakeOuterBooleanSerialize(body: Bool? = nil, completion: @escaping ((_ data: Bool?,_ error: Error?) -> Void)) {
+    open class func fakeOuterBooleanSerialize(body: Bool? = nil, completion: @escaping ((_ data: Bool?, _ error: Error?) -> Void)) {
         fakeOuterBooleanSerializeWithRequestBuilder(body: body).execute { (response, error) -> Void in
             completion(response?.body, error)
         }
@@ -47,7 +45,7 @@ open class FakeAPI {
      - Test serialization of outer boolean types
      - examples: [{contentType=*/*, example=null}]
      - parameter body: (body) Input boolean as post body (optional)
-     - returns: RequestBuilder<Bool> 
+     - returns: RequestBuilder<Bool>
      */
     open class func fakeOuterBooleanSerializeWithRequestBuilder(body: Bool? = nil) -> RequestBuilder<Bool> {
         let path = "/fake/outer/boolean"
@@ -66,7 +64,7 @@ open class FakeAPI {
      - parameter outerComposite: (body) Input composite as post body (optional)
      - parameter completion: completion handler to receive the data and the error objects
      */
-    open class func fakeOuterCompositeSerialize(outerComposite: OuterComposite? = nil, completion: @escaping ((_ data: OuterComposite?,_ error: Error?) -> Void)) {
+    open class func fakeOuterCompositeSerialize(outerComposite: OuterComposite? = nil, completion: @escaping ((_ data: OuterComposite?, _ error: Error?) -> Void)) {
         fakeOuterCompositeSerializeWithRequestBuilder(outerComposite: outerComposite).execute { (response, error) -> Void in
             completion(response?.body, error)
         }
@@ -94,9 +92,9 @@ open class FakeAPI {
     /**
      - POST /fake/outer/composite
      - Test serialization of object with outer number type
-     - examples: [{contentType=*/*, example={ }}]
+     - examples: [{contentType=*/*, example= { }}]
      - parameter outerComposite: (body) Input composite as post body (optional)
-     - returns: RequestBuilder<OuterComposite> 
+     - returns: RequestBuilder<OuterComposite>
      */
     open class func fakeOuterCompositeSerializeWithRequestBuilder(outerComposite: OuterComposite? = nil) -> RequestBuilder<OuterComposite> {
         let path = "/fake/outer/composite"
@@ -115,7 +113,7 @@ open class FakeAPI {
      - parameter body: (body) Input number as post body (optional)
      - parameter completion: completion handler to receive the data and the error objects
      */
-    open class func fakeOuterNumberSerialize(body: Double? = nil, completion: @escaping ((_ data: Double?,_ error: Error?) -> Void)) {
+    open class func fakeOuterNumberSerialize(body: Double? = nil, completion: @escaping ((_ data: Double?, _ error: Error?) -> Void)) {
         fakeOuterNumberSerializeWithRequestBuilder(body: body).execute { (response, error) -> Void in
             completion(response?.body, error)
         }
@@ -145,7 +143,7 @@ open class FakeAPI {
      - Test serialization of outer number types
      - examples: [{contentType=*/*, example=null}]
      - parameter body: (body) Input number as post body (optional)
-     - returns: RequestBuilder<Double> 
+     - returns: RequestBuilder<Double>
      */
     open class func fakeOuterNumberSerializeWithRequestBuilder(body: Double? = nil) -> RequestBuilder<Double> {
         let path = "/fake/outer/number"
@@ -164,7 +162,7 @@ open class FakeAPI {
      - parameter body: (body) Input string as post body (optional)
      - parameter completion: completion handler to receive the data and the error objects
      */
-    open class func fakeOuterStringSerialize(body: String? = nil, completion: @escaping ((_ data: String?,_ error: Error?) -> Void)) {
+    open class func fakeOuterStringSerialize(body: String? = nil, completion: @escaping ((_ data: String?, _ error: Error?) -> Void)) {
         fakeOuterStringSerializeWithRequestBuilder(body: body).execute { (response, error) -> Void in
             completion(response?.body, error)
         }
@@ -194,7 +192,7 @@ open class FakeAPI {
      - Test serialization of outer string types
      - examples: [{contentType=*/*, example=null}]
      - parameter body: (body) Input string as post body (optional)
-     - returns: RequestBuilder<String> 
+     - returns: RequestBuilder<String>
      */
     open class func fakeOuterStringSerializeWithRequestBuilder(body: String? = nil) -> RequestBuilder<String> {
         let path = "/fake/outer/string"
@@ -214,8 +212,8 @@ open class FakeAPI {
      - parameter user: (body)  
      - parameter completion: completion handler to receive the data and the error objects
      */
-    open class func testBodyWithQueryParams(query: String, user: User, completion: @escaping ((_ data: Void?,_ error: Error?) -> Void)) {
-        testBodyWithQueryParamsWithRequestBuilder(query: query, user: user).execute { (response, error) -> Void in
+    open class func testBodyWithQueryParams(query: String, user: User, completion: @escaping ((_ data: Void?, _ error: Error?) -> Void)) {
+        testBodyWithQueryParamsWithRequestBuilder(query: query, user: user).execute { (_, error) -> Void in
             if error == nil {
                 completion((), error)
             } else {
@@ -271,7 +269,7 @@ open class FakeAPI {
      - parameter client: (body) client model 
      - parameter completion: completion handler to receive the data and the error objects
      */
-    open class func testClientModel(client: Client, completion: @escaping ((_ data: Client?,_ error: Error?) -> Void)) {
+    open class func testClientModel(client: Client, completion: @escaping ((_ data: Client?, _ error: Error?) -> Void)) {
         testClientModelWithRequestBuilder(client: client).execute { (response, error) -> Void in
             completion(response?.body, error)
         }
@@ -338,8 +336,8 @@ open class FakeAPI {
      - parameter callback: (form) None (optional)
      - parameter completion: completion handler to receive the data and the error objects
      */
-    open class func testEndpointParameters(number: Double, double: Double, patternWithoutDelimiter: String, byte: Data, integer: Int? = nil, int32: Int? = nil, int64: Int64? = nil, float: Float? = nil, string: String? = nil, binary: URL? = nil, date: Date? = nil, dateTime: Date? = nil, password: String? = nil, callback: String? = nil, completion: @escaping ((_ data: Void?,_ error: Error?) -> Void)) {
-        testEndpointParametersWithRequestBuilder(number: number, double: double, patternWithoutDelimiter: patternWithoutDelimiter, byte: byte, integer: integer, int32: int32, int64: int64, float: float, string: string, binary: binary, date: date, dateTime: dateTime, password: password, callback: callback).execute { (response, error) -> Void in
+    open class func testEndpointParameters(number: Double, double: Double, patternWithoutDelimiter: String, byte: Data, integer: Int? = nil, int32: Int? = nil, int64: Int64? = nil, float: Float? = nil, string: String? = nil, binary: URL? = nil, date: Date? = nil, dateTime: Date? = nil, password: String? = nil, callback: String? = nil, completion: @escaping ((_ data: Void?, _ error: Error?) -> Void)) {
+        testEndpointParametersWithRequestBuilder(number: number, double: double, patternWithoutDelimiter: patternWithoutDelimiter, byte: byte, integer: integer, int32: int32, int64: int64, float: float, string: string, binary: binary, date: date, dateTime: dateTime, password: password, callback: callback).execute { (_, error) -> Void in
             if error == nil {
                 completion((), error)
             } else {
@@ -407,7 +405,7 @@ open class FakeAPI {
     open class func testEndpointParametersWithRequestBuilder(number: Double, double: Double, patternWithoutDelimiter: String, byte: Data, integer: Int? = nil, int32: Int? = nil, int64: Int64? = nil, float: Float? = nil, string: String? = nil, binary: URL? = nil, date: Date? = nil, dateTime: Date? = nil, password: String? = nil, callback: String? = nil) -> RequestBuilder<Void> {
         let path = "/fake"
         let URLString = PetstoreClientAPI.basePath + path
-        let formParams: [String:Any?] = [
+        let formParams: [String: Any?] = [
             "integer": integer?.encodeToJSON(),
             "int32": int32?.encodeToJSON(),
             "int64": int64?.encodeToJSON(),
@@ -426,7 +424,7 @@ open class FakeAPI {
 
         let nonNullParameters = APIHelper.rejectNil(formParams)
         let parameters = APIHelper.convertBoolToString(nonNullParameters)
-        
+
         let url = URLComponents(string: URLString)
 
         let requestBuilder: RequestBuilder<Void>.Type = PetstoreClientAPI.requestBuilderFactory.getNonDecodableBuilder()
@@ -514,8 +512,8 @@ open class FakeAPI {
      - parameter enumFormString: (form) Form parameter enum test (string) (optional, default to "-efg")
      - parameter completion: completion handler to receive the data and the error objects
      */
-    open class func testEnumParameters(enumHeaderStringArray: [String]? = nil, enumHeaderString: EnumHeaderString_testEnumParameters? = nil, enumQueryStringArray: [String]? = nil, enumQueryString: EnumQueryString_testEnumParameters? = nil, enumQueryInteger: EnumQueryInteger_testEnumParameters? = nil, enumQueryDouble: EnumQueryDouble_testEnumParameters? = nil, enumFormStringArray: [String]? = nil, enumFormString: EnumFormString_testEnumParameters? = nil, completion: @escaping ((_ data: Void?,_ error: Error?) -> Void)) {
-        testEnumParametersWithRequestBuilder(enumHeaderStringArray: enumHeaderStringArray, enumHeaderString: enumHeaderString, enumQueryStringArray: enumQueryStringArray, enumQueryString: enumQueryString, enumQueryInteger: enumQueryInteger, enumQueryDouble: enumQueryDouble, enumFormStringArray: enumFormStringArray, enumFormString: enumFormString).execute { (response, error) -> Void in
+    open class func testEnumParameters(enumHeaderStringArray: [String]? = nil, enumHeaderString: EnumHeaderString_testEnumParameters? = nil, enumQueryStringArray: [String]? = nil, enumQueryString: EnumQueryString_testEnumParameters? = nil, enumQueryInteger: EnumQueryInteger_testEnumParameters? = nil, enumQueryDouble: EnumQueryDouble_testEnumParameters? = nil, enumFormStringArray: [String]? = nil, enumFormString: EnumFormString_testEnumParameters? = nil, completion: @escaping ((_ data: Void?, _ error: Error?) -> Void)) {
+        testEnumParametersWithRequestBuilder(enumHeaderStringArray: enumHeaderStringArray, enumHeaderString: enumHeaderString, enumQueryStringArray: enumQueryStringArray, enumQueryString: enumQueryString, enumQueryInteger: enumQueryInteger, enumQueryDouble: enumQueryDouble, enumFormStringArray: enumFormStringArray, enumFormString: enumFormString).execute { (_, error) -> Void in
             if error == nil {
                 completion((), error)
             } else {
@@ -568,19 +566,19 @@ open class FakeAPI {
     open class func testEnumParametersWithRequestBuilder(enumHeaderStringArray: [String]? = nil, enumHeaderString: EnumHeaderString_testEnumParameters? = nil, enumQueryStringArray: [String]? = nil, enumQueryString: EnumQueryString_testEnumParameters? = nil, enumQueryInteger: EnumQueryInteger_testEnumParameters? = nil, enumQueryDouble: EnumQueryDouble_testEnumParameters? = nil, enumFormStringArray: [String]? = nil, enumFormString: EnumFormString_testEnumParameters? = nil) -> RequestBuilder<Void> {
         let path = "/fake"
         let URLString = PetstoreClientAPI.basePath + path
-        let formParams: [String:Any?] = [
+        let formParams: [String: Any?] = [
             "enum_form_string_array": enumFormStringArray,
             "enum_form_string": enumFormString?.rawValue
         ]
 
         let nonNullParameters = APIHelper.rejectNil(formParams)
         let parameters = APIHelper.convertBoolToString(nonNullParameters)
-        
+
         var url = URLComponents(string: URLString)
         url?.queryItems = APIHelper.mapValuesToQueryItems([
-            "enum_query_string_array": enumQueryStringArray, 
-            "enum_query_string": enumQueryString?.rawValue, 
-            "enum_query_integer": enumQueryInteger?.rawValue, 
+            "enum_query_string_array": enumQueryStringArray,
+            "enum_query_string": enumQueryString?.rawValue,
+            "enum_query_integer": enumQueryInteger?.rawValue,
             "enum_query_double": enumQueryDouble?.rawValue
         ])
         let nillableHeaders: [String: Any?] = [
@@ -600,8 +598,8 @@ open class FakeAPI {
      - parameter requestBody: (body) request body 
      - parameter completion: completion handler to receive the data and the error objects
      */
-    open class func testInlineAdditionalProperties(requestBody: [String:String], completion: @escaping ((_ data: Void?,_ error: Error?) -> Void)) {
-        testInlineAdditionalPropertiesWithRequestBuilder(requestBody: requestBody).execute { (response, error) -> Void in
+    open class func testInlineAdditionalProperties(requestBody: [String: String], completion: @escaping ((_ data: Void?, _ error: Error?) -> Void)) {
+        testInlineAdditionalPropertiesWithRequestBuilder(requestBody: requestBody).execute { (_, error) -> Void in
             if error == nil {
                 completion((), error)
             } else {
@@ -616,7 +614,7 @@ open class FakeAPI {
      - parameter requestBody: (body) request body 
      - returns: Observable<Void>
      */
-    open class func testInlineAdditionalProperties(requestBody: [String:String]) -> Observable<Void> {
+    open class func testInlineAdditionalProperties(requestBody: [String: String]) -> Observable<Void> {
         return Observable.create { observer -> Disposable in
             testInlineAdditionalProperties(requestBody: requestBody) { data, error in
                 if let error = error {
@@ -636,7 +634,7 @@ open class FakeAPI {
      - parameter requestBody: (body) request body 
      - returns: RequestBuilder<Void> 
      */
-    open class func testInlineAdditionalPropertiesWithRequestBuilder(requestBody: [String:String]) -> RequestBuilder<Void> {
+    open class func testInlineAdditionalPropertiesWithRequestBuilder(requestBody: [String: String]) -> RequestBuilder<Void> {
         let path = "/fake/inline-additionalProperties"
         let URLString = PetstoreClientAPI.basePath + path
         let parameters = JSONEncodingHelper.encodingParameters(forEncodableObject: requestBody)
@@ -655,8 +653,8 @@ open class FakeAPI {
      - parameter param2: (form) field2 
      - parameter completion: completion handler to receive the data and the error objects
      */
-    open class func testJsonFormData(param: String, param2: String, completion: @escaping ((_ data: Void?,_ error: Error?) -> Void)) {
-        testJsonFormDataWithRequestBuilder(param: param, param2: param2).execute { (response, error) -> Void in
+    open class func testJsonFormData(param: String, param2: String, completion: @escaping ((_ data: Void?, _ error: Error?) -> Void)) {
+        testJsonFormDataWithRequestBuilder(param: param, param2: param2).execute { (_, error) -> Void in
             if error == nil {
                 completion((), error)
             } else {
@@ -696,14 +694,14 @@ open class FakeAPI {
     open class func testJsonFormDataWithRequestBuilder(param: String, param2: String) -> RequestBuilder<Void> {
         let path = "/fake/jsonFormData"
         let URLString = PetstoreClientAPI.basePath + path
-        let formParams: [String:Any?] = [
+        let formParams: [String: Any?] = [
             "param": param,
             "param2": param2
         ]
 
         let nonNullParameters = APIHelper.rejectNil(formParams)
         let parameters = APIHelper.convertBoolToString(nonNullParameters)
-        
+
         let url = URLComponents(string: URLString)
 
         let requestBuilder: RequestBuilder<Void>.Type = PetstoreClientAPI.requestBuilderFactory.getNonDecodableBuilder()
diff --git a/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/PetstoreClient/Classes/OpenAPIs/APIs/FakeClassnameTags123API.swift b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/PetstoreClient/Classes/OpenAPIs/APIs/FakeClassnameTags123API.swift
index b4003e2c25..b14e41a990 100644
--- a/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/PetstoreClient/Classes/OpenAPIs/APIs/FakeClassnameTags123API.swift
+++ b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/PetstoreClient/Classes/OpenAPIs/APIs/FakeClassnameTags123API.swift
@@ -9,8 +9,6 @@ import Foundation
 import Alamofire
 import RxSwift
 
-
-
 open class FakeClassnameTags123API {
     /**
      To test class name in snake case
@@ -18,7 +16,7 @@ open class FakeClassnameTags123API {
      - parameter client: (body) client model 
      - parameter completion: completion handler to receive the data and the error objects
      */
-    open class func testClassname(client: Client, completion: @escaping ((_ data: Client?,_ error: Error?) -> Void)) {
+    open class func testClassname(client: Client, completion: @escaping ((_ data: Client?, _ error: Error?) -> Void)) {
         testClassnameWithRequestBuilder(client: client).execute { (response, error) -> Void in
             completion(response?.body, error)
         }
diff --git a/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/PetstoreClient/Classes/OpenAPIs/APIs/PetAPI.swift b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/PetstoreClient/Classes/OpenAPIs/APIs/PetAPI.swift
index 59dab5ba43..5bfe5c64b2 100644
--- a/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/PetstoreClient/Classes/OpenAPIs/APIs/PetAPI.swift
+++ b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/PetstoreClient/Classes/OpenAPIs/APIs/PetAPI.swift
@@ -9,8 +9,6 @@ import Foundation
 import Alamofire
 import RxSwift
 
-
-
 open class PetAPI {
     /**
      Add a new pet to the store
@@ -18,8 +16,8 @@ open class PetAPI {
      - parameter pet: (body) Pet object that needs to be added to the store 
      - parameter completion: completion handler to receive the data and the error objects
      */
-    open class func addPet(pet: Pet, completion: @escaping ((_ data: Void?,_ error: Error?) -> Void)) {
-        addPetWithRequestBuilder(pet: pet).execute { (response, error) -> Void in
+    open class func addPet(pet: Pet, completion: @escaping ((_ data: Void?, _ error: Error?) -> Void)) {
+        addPetWithRequestBuilder(pet: pet).execute { (_, error) -> Void in
             if error == nil {
                 completion((), error)
             } else {
@@ -76,8 +74,8 @@ open class PetAPI {
      - parameter apiKey: (header)  (optional)
      - parameter completion: completion handler to receive the data and the error objects
      */
-    open class func deletePet(petId: Int64, apiKey: String? = nil, completion: @escaping ((_ data: Void?,_ error: Error?) -> Void)) {
-        deletePetWithRequestBuilder(petId: petId, apiKey: apiKey).execute { (response, error) -> Void in
+    open class func deletePet(petId: Int64, apiKey: String? = nil, completion: @escaping ((_ data: Void?, _ error: Error?) -> Void)) {
+        deletePetWithRequestBuilder(petId: petId, apiKey: apiKey).execute { (_, error) -> Void in
             if error == nil {
                 completion((), error)
             } else {
@@ -123,8 +121,8 @@ open class PetAPI {
         let petIdPostEscape = petIdPreEscape.addingPercentEncoding(withAllowedCharacters: .urlPathAllowed) ?? ""
         path = path.replacingOccurrences(of: "{petId}", with: petIdPostEscape, options: .literal, range: nil)
         let URLString = PetstoreClientAPI.basePath + path
-        let parameters: [String:Any]? = nil
-        
+        let parameters: [String: Any]? = nil
+
         let url = URLComponents(string: URLString)
         let nillableHeaders: [String: Any?] = [
             "api_key": apiKey
@@ -151,7 +149,7 @@ open class PetAPI {
      - parameter status: (query) Status values that need to be considered for filter 
      - parameter completion: completion handler to receive the data and the error objects
      */
-    open class func findPetsByStatus(status: [String], completion: @escaping ((_ data: [Pet]?,_ error: Error?) -> Void)) {
+    open class func findPetsByStatus(status: [String], completion: @escaping ((_ data: [Pet]?, _ error: Error?) -> Void)) {
         findPetsByStatusWithRequestBuilder(status: status).execute { (response, error) -> Void in
             completion(response?.body, error)
         }
@@ -216,8 +214,8 @@ open class PetAPI {
     open class func findPetsByStatusWithRequestBuilder(status: [String]) -> RequestBuilder<[Pet]> {
         let path = "/pet/findByStatus"
         let URLString = PetstoreClientAPI.basePath + path
-        let parameters: [String:Any]? = nil
-        
+        let parameters: [String: Any]? = nil
+
         var url = URLComponents(string: URLString)
         url?.queryItems = APIHelper.mapValuesToQueryItems([
             "status": status
@@ -234,7 +232,7 @@ open class PetAPI {
      - parameter tags: (query) Tags to filter by 
      - parameter completion: completion handler to receive the data and the error objects
      */
-    open class func findPetsByTags(tags: [String], completion: @escaping ((_ data: [Pet]?,_ error: Error?) -> Void)) {
+    open class func findPetsByTags(tags: [String], completion: @escaping ((_ data: [Pet]?, _ error: Error?) -> Void)) {
         findPetsByTagsWithRequestBuilder(tags: tags).execute { (response, error) -> Void in
             completion(response?.body, error)
         }
@@ -299,8 +297,8 @@ open class PetAPI {
     open class func findPetsByTagsWithRequestBuilder(tags: [String]) -> RequestBuilder<[Pet]> {
         let path = "/pet/findByTags"
         let URLString = PetstoreClientAPI.basePath + path
-        let parameters: [String:Any]? = nil
-        
+        let parameters: [String: Any]? = nil
+
         var url = URLComponents(string: URLString)
         url?.queryItems = APIHelper.mapValuesToQueryItems([
             "tags": tags
@@ -317,7 +315,7 @@ open class PetAPI {
      - parameter petId: (path) ID of pet to return 
      - parameter completion: completion handler to receive the data and the error objects
      */
-    open class func getPetById(petId: Int64, completion: @escaping ((_ data: Pet?,_ error: Error?) -> Void)) {
+    open class func getPetById(petId: Int64, completion: @escaping ((_ data: Pet?, _ error: Error?) -> Void)) {
         getPetByIdWithRequestBuilder(petId: petId).execute { (response, error) -> Void in
             completion(response?.body, error)
         }
@@ -385,8 +383,8 @@ open class PetAPI {
         let petIdPostEscape = petIdPreEscape.addingPercentEncoding(withAllowedCharacters: .urlPathAllowed) ?? ""
         path = path.replacingOccurrences(of: "{petId}", with: petIdPostEscape, options: .literal, range: nil)
         let URLString = PetstoreClientAPI.basePath + path
-        let parameters: [String:Any]? = nil
-        
+        let parameters: [String: Any]? = nil
+
         let url = URLComponents(string: URLString)
 
         let requestBuilder: RequestBuilder<Pet>.Type = PetstoreClientAPI.requestBuilderFactory.getBuilder()
@@ -400,8 +398,8 @@ open class PetAPI {
      - parameter pet: (body) Pet object that needs to be added to the store 
      - parameter completion: completion handler to receive the data and the error objects
      */
-    open class func updatePet(pet: Pet, completion: @escaping ((_ data: Void?,_ error: Error?) -> Void)) {
-        updatePetWithRequestBuilder(pet: pet).execute { (response, error) -> Void in
+    open class func updatePet(pet: Pet, completion: @escaping ((_ data: Void?, _ error: Error?) -> Void)) {
+        updatePetWithRequestBuilder(pet: pet).execute { (_, error) -> Void in
             if error == nil {
                 completion((), error)
             } else {
@@ -459,8 +457,8 @@ open class PetAPI {
      - parameter status: (form) Updated status of the pet (optional)
      - parameter completion: completion handler to receive the data and the error objects
      */
-    open class func updatePetWithForm(petId: Int64, name: String? = nil, status: String? = nil, completion: @escaping ((_ data: Void?,_ error: Error?) -> Void)) {
-        updatePetWithFormWithRequestBuilder(petId: petId, name: name, status: status).execute { (response, error) -> Void in
+    open class func updatePetWithForm(petId: Int64, name: String? = nil, status: String? = nil, completion: @escaping ((_ data: Void?, _ error: Error?) -> Void)) {
+        updatePetWithFormWithRequestBuilder(petId: petId, name: name, status: status).execute { (_, error) -> Void in
             if error == nil {
                 completion((), error)
             } else {
@@ -508,14 +506,14 @@ open class PetAPI {
         let petIdPostEscape = petIdPreEscape.addingPercentEncoding(withAllowedCharacters: .urlPathAllowed) ?? ""
         path = path.replacingOccurrences(of: "{petId}", with: petIdPostEscape, options: .literal, range: nil)
         let URLString = PetstoreClientAPI.basePath + path
-        let formParams: [String:Any?] = [
+        let formParams: [String: Any?] = [
             "name": name,
             "status": status
         ]
 
         let nonNullParameters = APIHelper.rejectNil(formParams)
         let parameters = APIHelper.convertBoolToString(nonNullParameters)
-        
+
         let url = URLComponents(string: URLString)
 
         let requestBuilder: RequestBuilder<Void>.Type = PetstoreClientAPI.requestBuilderFactory.getNonDecodableBuilder()
@@ -531,7 +529,7 @@ open class PetAPI {
      - parameter file: (form) file to upload (optional)
      - parameter completion: completion handler to receive the data and the error objects
      */
-    open class func uploadFile(petId: Int64, additionalMetadata: String? = nil, file: URL? = nil, completion: @escaping ((_ data: ApiResponse?,_ error: Error?) -> Void)) {
+    open class func uploadFile(petId: Int64, additionalMetadata: String? = nil, file: URL? = nil, completion: @escaping ((_ data: ApiResponse?, _ error: Error?) -> Void)) {
         uploadFileWithRequestBuilder(petId: petId, additionalMetadata: additionalMetadata, file: file).execute { (response, error) -> Void in
             completion(response?.body, error)
         }
@@ -581,14 +579,14 @@ open class PetAPI {
         let petIdPostEscape = petIdPreEscape.addingPercentEncoding(withAllowedCharacters: .urlPathAllowed) ?? ""
         path = path.replacingOccurrences(of: "{petId}", with: petIdPostEscape, options: .literal, range: nil)
         let URLString = PetstoreClientAPI.basePath + path
-        let formParams: [String:Any?] = [
+        let formParams: [String: Any?] = [
             "additionalMetadata": additionalMetadata,
             "file": file
         ]
 
         let nonNullParameters = APIHelper.rejectNil(formParams)
         let parameters = APIHelper.convertBoolToString(nonNullParameters)
-        
+
         let url = URLComponents(string: URLString)
 
         let requestBuilder: RequestBuilder<ApiResponse>.Type = PetstoreClientAPI.requestBuilderFactory.getBuilder()
diff --git a/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/PetstoreClient/Classes/OpenAPIs/APIs/StoreAPI.swift b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/PetstoreClient/Classes/OpenAPIs/APIs/StoreAPI.swift
index b4e23ae435..4fb14bc42d 100644
--- a/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/PetstoreClient/Classes/OpenAPIs/APIs/StoreAPI.swift
+++ b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/PetstoreClient/Classes/OpenAPIs/APIs/StoreAPI.swift
@@ -9,8 +9,6 @@ import Foundation
 import Alamofire
 import RxSwift
 
-
-
 open class StoreAPI {
     /**
      Delete purchase order by ID
@@ -18,8 +16,8 @@ open class StoreAPI {
      - parameter orderId: (path) ID of the order that needs to be deleted 
      - parameter completion: completion handler to receive the data and the error objects
      */
-    open class func deleteOrder(orderId: String, completion: @escaping ((_ data: Void?,_ error: Error?) -> Void)) {
-        deleteOrderWithRequestBuilder(orderId: orderId).execute { (response, error) -> Void in
+    open class func deleteOrder(orderId: String, completion: @escaping ((_ data: Void?, _ error: Error?) -> Void)) {
+        deleteOrderWithRequestBuilder(orderId: orderId).execute { (_, error) -> Void in
             if error == nil {
                 completion((), error)
             } else {
@@ -61,8 +59,8 @@ open class StoreAPI {
         let orderIdPostEscape = orderIdPreEscape.addingPercentEncoding(withAllowedCharacters: .urlPathAllowed) ?? ""
         path = path.replacingOccurrences(of: "{order_id}", with: orderIdPostEscape, options: .literal, range: nil)
         let URLString = PetstoreClientAPI.basePath + path
-        let parameters: [String:Any]? = nil
-        
+        let parameters: [String: Any]? = nil
+
         let url = URLComponents(string: URLString)
 
         let requestBuilder: RequestBuilder<Void>.Type = PetstoreClientAPI.requestBuilderFactory.getNonDecodableBuilder()
@@ -75,7 +73,7 @@ open class StoreAPI {
      
      - parameter completion: completion handler to receive the data and the error objects
      */
-    open class func getInventory(completion: @escaping ((_ data: [String:Int]?,_ error: Error?) -> Void)) {
+    open class func getInventory(completion: @escaping ((_ data: [String: Int]?, _ error: Error?) -> Void)) {
         getInventoryWithRequestBuilder().execute { (response, error) -> Void in
             completion(response?.body, error)
         }
@@ -86,9 +84,9 @@ open class StoreAPI {
      
      - returns: Observable<[String:Int]>
      */
-    open class func getInventory() -> Observable<[String:Int]> {
+    open class func getInventory() -> Observable<[String: Int]> {
         return Observable.create { observer -> Disposable in
-            getInventory() { data, error in
+            getInventory { data, error in
                 if let error = error {
                     observer.on(.error(error))
                 } else {
@@ -109,14 +107,14 @@ open class StoreAPI {
        - name: api_key
      - returns: RequestBuilder<[String:Int]> 
      */
-    open class func getInventoryWithRequestBuilder() -> RequestBuilder<[String:Int]> {
+    open class func getInventoryWithRequestBuilder() -> RequestBuilder<[String: Int]> {
         let path = "/store/inventory"
         let URLString = PetstoreClientAPI.basePath + path
-        let parameters: [String:Any]? = nil
-        
+        let parameters: [String: Any]? = nil
+
         let url = URLComponents(string: URLString)
 
-        let requestBuilder: RequestBuilder<[String:Int]>.Type = PetstoreClientAPI.requestBuilderFactory.getBuilder()
+        let requestBuilder: RequestBuilder<[String: Int]>.Type = PetstoreClientAPI.requestBuilderFactory.getBuilder()
 
         return requestBuilder.init(method: "GET", URLString: (url?.string ?? URLString), parameters: parameters, isBody: false)
     }
@@ -127,7 +125,7 @@ open class StoreAPI {
      - parameter orderId: (path) ID of pet that needs to be fetched 
      - parameter completion: completion handler to receive the data and the error objects
      */
-    open class func getOrderById(orderId: Int64, completion: @escaping ((_ data: Order?,_ error: Error?) -> Void)) {
+    open class func getOrderById(orderId: Int64, completion: @escaping ((_ data: Order?, _ error: Error?) -> Void)) {
         getOrderByIdWithRequestBuilder(orderId: orderId).execute { (response, error) -> Void in
             completion(response?.body, error)
         }
@@ -181,8 +179,8 @@ open class StoreAPI {
         let orderIdPostEscape = orderIdPreEscape.addingPercentEncoding(withAllowedCharacters: .urlPathAllowed) ?? ""
         path = path.replacingOccurrences(of: "{order_id}", with: orderIdPostEscape, options: .literal, range: nil)
         let URLString = PetstoreClientAPI.basePath + path
-        let parameters: [String:Any]? = nil
-        
+        let parameters: [String: Any]? = nil
+
         let url = URLComponents(string: URLString)
 
         let requestBuilder: RequestBuilder<Order>.Type = PetstoreClientAPI.requestBuilderFactory.getBuilder()
@@ -196,7 +194,7 @@ open class StoreAPI {
      - parameter order: (body) order placed for purchasing the pet 
      - parameter completion: completion handler to receive the data and the error objects
      */
-    open class func placeOrder(order: Order, completion: @escaping ((_ data: Order?,_ error: Error?) -> Void)) {
+    open class func placeOrder(order: Order, completion: @escaping ((_ data: Order?, _ error: Error?) -> Void)) {
         placeOrderWithRequestBuilder(order: order).execute { (response, error) -> Void in
             completion(response?.body, error)
         }
diff --git a/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/PetstoreClient/Classes/OpenAPIs/APIs/UserAPI.swift b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/PetstoreClient/Classes/OpenAPIs/APIs/UserAPI.swift
index 7a2e5332ad..9f5e670bfc 100644
--- a/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/PetstoreClient/Classes/OpenAPIs/APIs/UserAPI.swift
+++ b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/PetstoreClient/Classes/OpenAPIs/APIs/UserAPI.swift
@@ -9,8 +9,6 @@ import Foundation
 import Alamofire
 import RxSwift
 
-
-
 open class UserAPI {
     /**
      Create user
@@ -18,8 +16,8 @@ open class UserAPI {
      - parameter user: (body) Created user object 
      - parameter completion: completion handler to receive the data and the error objects
      */
-    open class func createUser(user: User, completion: @escaping ((_ data: Void?,_ error: Error?) -> Void)) {
-        createUserWithRequestBuilder(user: user).execute { (response, error) -> Void in
+    open class func createUser(user: User, completion: @escaping ((_ data: Void?, _ error: Error?) -> Void)) {
+        createUserWithRequestBuilder(user: user).execute { (_, error) -> Void in
             if error == nil {
                 completion((), error)
             } else {
@@ -73,8 +71,8 @@ open class UserAPI {
      - parameter user: (body) List of user object 
      - parameter completion: completion handler to receive the data and the error objects
      */
-    open class func createUsersWithArrayInput(user: [User], completion: @escaping ((_ data: Void?,_ error: Error?) -> Void)) {
-        createUsersWithArrayInputWithRequestBuilder(user: user).execute { (response, error) -> Void in
+    open class func createUsersWithArrayInput(user: [User], completion: @escaping ((_ data: Void?, _ error: Error?) -> Void)) {
+        createUsersWithArrayInputWithRequestBuilder(user: user).execute { (_, error) -> Void in
             if error == nil {
                 completion((), error)
             } else {
@@ -127,8 +125,8 @@ open class UserAPI {
      - parameter user: (body) List of user object 
      - parameter completion: completion handler to receive the data and the error objects
      */
-    open class func createUsersWithListInput(user: [User], completion: @escaping ((_ data: Void?,_ error: Error?) -> Void)) {
-        createUsersWithListInputWithRequestBuilder(user: user).execute { (response, error) -> Void in
+    open class func createUsersWithListInput(user: [User], completion: @escaping ((_ data: Void?, _ error: Error?) -> Void)) {
+        createUsersWithListInputWithRequestBuilder(user: user).execute { (_, error) -> Void in
             if error == nil {
                 completion((), error)
             } else {
@@ -181,8 +179,8 @@ open class UserAPI {
      - parameter username: (path) The name that needs to be deleted 
      - parameter completion: completion handler to receive the data and the error objects
      */
-    open class func deleteUser(username: String, completion: @escaping ((_ data: Void?,_ error: Error?) -> Void)) {
-        deleteUserWithRequestBuilder(username: username).execute { (response, error) -> Void in
+    open class func deleteUser(username: String, completion: @escaping ((_ data: Void?, _ error: Error?) -> Void)) {
+        deleteUserWithRequestBuilder(username: username).execute { (_, error) -> Void in
             if error == nil {
                 completion((), error)
             } else {
@@ -224,8 +222,8 @@ open class UserAPI {
         let usernamePostEscape = usernamePreEscape.addingPercentEncoding(withAllowedCharacters: .urlPathAllowed) ?? ""
         path = path.replacingOccurrences(of: "{username}", with: usernamePostEscape, options: .literal, range: nil)
         let URLString = PetstoreClientAPI.basePath + path
-        let parameters: [String:Any]? = nil
-        
+        let parameters: [String: Any]? = nil
+
         let url = URLComponents(string: URLString)
 
         let requestBuilder: RequestBuilder<Void>.Type = PetstoreClientAPI.requestBuilderFactory.getNonDecodableBuilder()
@@ -239,7 +237,7 @@ open class UserAPI {
      - parameter username: (path) The name that needs to be fetched. Use user1 for testing. 
      - parameter completion: completion handler to receive the data and the error objects
      */
-    open class func getUserByName(username: String, completion: @escaping ((_ data: User?,_ error: Error?) -> Void)) {
+    open class func getUserByName(username: String, completion: @escaping ((_ data: User?, _ error: Error?) -> Void)) {
         getUserByNameWithRequestBuilder(username: username).execute { (response, error) -> Void in
             completion(response?.body, error)
         }
@@ -296,8 +294,8 @@ open class UserAPI {
         let usernamePostEscape = usernamePreEscape.addingPercentEncoding(withAllowedCharacters: .urlPathAllowed) ?? ""
         path = path.replacingOccurrences(of: "{username}", with: usernamePostEscape, options: .literal, range: nil)
         let URLString = PetstoreClientAPI.basePath + path
-        let parameters: [String:Any]? = nil
-        
+        let parameters: [String: Any]? = nil
+
         let url = URLComponents(string: URLString)
 
         let requestBuilder: RequestBuilder<User>.Type = PetstoreClientAPI.requestBuilderFactory.getBuilder()
@@ -312,7 +310,7 @@ open class UserAPI {
      - parameter password: (query) The password for login in clear text 
      - parameter completion: completion handler to receive the data and the error objects
      */
-    open class func loginUser(username: String, password: String, completion: @escaping ((_ data: String?,_ error: Error?) -> Void)) {
+    open class func loginUser(username: String, password: String, completion: @escaping ((_ data: String?, _ error: Error?) -> Void)) {
         loginUserWithRequestBuilder(username: username, password: password).execute { (response, error) -> Void in
             completion(response?.body, error)
         }
@@ -350,11 +348,11 @@ open class UserAPI {
     open class func loginUserWithRequestBuilder(username: String, password: String) -> RequestBuilder<String> {
         let path = "/user/login"
         let URLString = PetstoreClientAPI.basePath + path
-        let parameters: [String:Any]? = nil
-        
+        let parameters: [String: Any]? = nil
+
         var url = URLComponents(string: URLString)
         url?.queryItems = APIHelper.mapValuesToQueryItems([
-            "username": username, 
+            "username": username,
             "password": password
         ])
 
@@ -368,8 +366,8 @@ open class UserAPI {
      
      - parameter completion: completion handler to receive the data and the error objects
      */
-    open class func logoutUser(completion: @escaping ((_ data: Void?,_ error: Error?) -> Void)) {
-        logoutUserWithRequestBuilder().execute { (response, error) -> Void in
+    open class func logoutUser(completion: @escaping ((_ data: Void?, _ error: Error?) -> Void)) {
+        logoutUserWithRequestBuilder().execute { (_, error) -> Void in
             if error == nil {
                 completion((), error)
             } else {
@@ -385,7 +383,7 @@ open class UserAPI {
      */
     open class func logoutUser() -> Observable<Void> {
         return Observable.create { observer -> Disposable in
-            logoutUser() { data, error in
+            logoutUser { data, error in
                 if let error = error {
                     observer.on(.error(error))
                 } else {
@@ -405,8 +403,8 @@ open class UserAPI {
     open class func logoutUserWithRequestBuilder() -> RequestBuilder<Void> {
         let path = "/user/logout"
         let URLString = PetstoreClientAPI.basePath + path
-        let parameters: [String:Any]? = nil
-        
+        let parameters: [String: Any]? = nil
+
         let url = URLComponents(string: URLString)
 
         let requestBuilder: RequestBuilder<Void>.Type = PetstoreClientAPI.requestBuilderFactory.getNonDecodableBuilder()
@@ -421,8 +419,8 @@ open class UserAPI {
      - parameter user: (body) Updated user object 
      - parameter completion: completion handler to receive the data and the error objects
      */
-    open class func updateUser(username: String, user: User, completion: @escaping ((_ data: Void?,_ error: Error?) -> Void)) {
-        updateUserWithRequestBuilder(username: username, user: user).execute { (response, error) -> Void in
+    open class func updateUser(username: String, user: User, completion: @escaping ((_ data: Void?, _ error: Error?) -> Void)) {
+        updateUserWithRequestBuilder(username: username, user: user).execute { (_, error) -> Void in
             if error == nil {
                 completion((), error)
             } else {
diff --git a/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/PetstoreClient/Classes/OpenAPIs/AlamofireImplementations.swift b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/PetstoreClient/Classes/OpenAPIs/AlamofireImplementations.swift
index 280b4e5338..8fc48ccbed 100644
--- a/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/PetstoreClient/Classes/OpenAPIs/AlamofireImplementations.swift
+++ b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/PetstoreClient/Classes/OpenAPIs/AlamofireImplementations.swift
@@ -12,7 +12,7 @@ class AlamofireRequestBuilderFactory: RequestBuilderFactory {
         return AlamofireRequestBuilder<T>.self
     }
 
-    func getBuilder<T:Decodable>() -> RequestBuilder<T>.Type {
+    func getBuilder<T: Decodable>() -> RequestBuilder<T>.Type {
         return AlamofireDecodableRequestBuilder<T>.self
     }
 }
@@ -21,7 +21,7 @@ class AlamofireRequestBuilderFactory: RequestBuilderFactory {
 private var managerStore: [String: Alamofire.SessionManager] = [:]
 
 open class AlamofireRequestBuilder<T>: RequestBuilder<T> {
-    required public init(method: String, URLString: String, parameters: [String : Any]?, isBody: Bool, headers: [String : String] = [:]) {
+    required public init(method: String, URLString: String, parameters: [String: Any]?, isBody: Bool, headers: [String: String] = [:]) {
         super.init(method: method, URLString: URLString, parameters: parameters, isBody: isBody, headers: headers)
     }
 
@@ -50,17 +50,17 @@ open class AlamofireRequestBuilder<T>: RequestBuilder<T> {
      May be overridden by a subclass if you want to control the request
      configuration (e.g. to override the cache policy).
      */
-    open func makeRequest(manager: SessionManager, method: HTTPMethod, encoding: ParameterEncoding, headers: [String:String]) -> DataRequest {
+    open func makeRequest(manager: SessionManager, method: HTTPMethod, encoding: ParameterEncoding, headers: [String: String]) -> DataRequest {
         return manager.request(URLString, method: method, parameters: parameters, encoding: encoding, headers: headers)
     }
 
     override open func execute(_ completion: @escaping (_ response: Response<T>?, _ error: Error?) -> Void) {
-        let managerId:String = UUID().uuidString
+        let managerId: String = UUID().uuidString
         // Create a new manager for each request to customize its request header
         let manager = createSessionManager()
         managerStore[managerId] = manager
 
-        let encoding:ParameterEncoding = isBody ? JSONDataEncoding() : URLEncoding()
+        let encoding: ParameterEncoding = isBody ? JSONDataEncoding() : URLEncoding()
 
         let xMethod = Alamofire.HTTPMethod(rawValue: method)
         let fileKeys = parameters == nil ? [] : parameters!.filter { $1 is NSURL }
@@ -73,8 +73,7 @@ open class AlamofireRequestBuilder<T>: RequestBuilder<T> {
                     case let fileURL as URL:
                         if let mimeType = self.contentTypeForFormPart(fileURL: fileURL) {
                             mpForm.append(fileURL, withName: k, fileName: fileURL.lastPathComponent, mimeType: mimeType)
-                        }
-                        else {
+                        } else {
                             mpForm.append(fileURL, withName: k)
                         }
                     case let string as String:
@@ -238,7 +237,7 @@ open class AlamofireRequestBuilder<T>: RequestBuilder<T> {
         return httpHeaders
     }
 
-    fileprivate func getFileName(fromContentDisposition contentDisposition : String?) -> String? {
+    fileprivate func getFileName(fromContentDisposition contentDisposition: String?) -> String? {
 
         guard let contentDisposition = contentDisposition else {
             return nil
@@ -246,7 +245,7 @@ open class AlamofireRequestBuilder<T>: RequestBuilder<T> {
 
         let items = contentDisposition.components(separatedBy: ";")
 
-        var filename : String? = nil
+        var filename: String?
 
         for contentItem in items {
 
@@ -257,7 +256,7 @@ open class AlamofireRequestBuilder<T>: RequestBuilder<T> {
 
             filename = contentItem
             return filename?
-                .replacingCharacters(in: range, with:"")
+                .replacingCharacters(in: range, with: "")
                 .replacingOccurrences(of: "\"", with: "")
                 .trimmingCharacters(in: .whitespacesAndNewlines)
         }
@@ -266,7 +265,7 @@ open class AlamofireRequestBuilder<T>: RequestBuilder<T> {
 
     }
 
-    fileprivate func getPath(from url : URL) throws -> String {
+    fileprivate func getPath(from url: URL) throws -> String {
 
         guard var path = URLComponents(url: url, resolvingAgainstBaseURL: true)?.path else {
             throw DownloadException.requestMissingPath
@@ -280,7 +279,7 @@ open class AlamofireRequestBuilder<T>: RequestBuilder<T> {
 
     }
 
-    fileprivate func getURL(from urlRequest : URLRequest) throws -> URL {
+    fileprivate func getURL(from urlRequest: URLRequest) throws -> URL {
 
         guard let url = urlRequest.url else {
             throw DownloadException.requestMissingURL
@@ -291,7 +290,7 @@ open class AlamofireRequestBuilder<T>: RequestBuilder<T> {
 
 }
 
-fileprivate enum DownloadException : Error {
+private enum DownloadException: Error {
     case responseDataMissing
     case responseFailed
     case requestMissing
@@ -306,7 +305,7 @@ public enum AlamofireDecodableRequestBuilderError: Error {
     case generalError(Error)
 }
 
-open class AlamofireDecodableRequestBuilder<T:Decodable>: AlamofireRequestBuilder<T> {
+open class AlamofireDecodableRequestBuilder<T: Decodable>: AlamofireRequestBuilder<T> {
 
     override fileprivate func processRequest(request: DataRequest, _ managerId: String, _ completion: @escaping (_ response: Response<T>?, _ error: Error?) -> Void) {
         if let credential = self.credential {
@@ -398,7 +397,7 @@ open class AlamofireDecodableRequestBuilder<T:Decodable>: AlamofireRequestBuilde
                     return
                 }
 
-                var responseObj: Response<T>? = nil
+                var responseObj: Response<T>?
 
                 let decodeResult: (decodableObj: T?, error: Error?) = CodableHelper.decode(T.self, from: data)
                 if decodeResult.error == nil {
diff --git a/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/PetstoreClient/Classes/OpenAPIs/CodableHelper.swift b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/PetstoreClient/Classes/OpenAPIs/CodableHelper.swift
index 2d50e463ae..27e6a28761 100644
--- a/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/PetstoreClient/Classes/OpenAPIs/CodableHelper.swift
+++ b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/PetstoreClient/Classes/OpenAPIs/CodableHelper.swift
@@ -13,9 +13,9 @@ open class CodableHelper {
 
     open static var dateformatter: DateFormatter?
 
-    open class func decode<T>(_ type: T.Type, from data: Data) -> (decodableObj: T?, error: Error?) where T : Decodable {
-        var returnedDecodable: T? = nil
-        var returnedError: Error? = nil
+    open class func decode<T>(_ type: T.Type, from data: Data) -> (decodableObj: T?, error: Error?) where T: Decodable {
+        var returnedDecodable: T?
+        var returnedError: Error?
 
         let decoder = JSONDecoder()
         if let df = self.dateformatter {
@@ -39,9 +39,9 @@ open class CodableHelper {
         return (returnedDecodable, returnedError)
     }
 
-    open class func encode<T>(_ value: T, prettyPrint: Bool = false) -> EncodeResult where T : Encodable {
+    open class func encode<T>(_ value: T, prettyPrint: Bool = false) -> EncodeResult where T: Encodable {
         var returnedData: Data?
-        var returnedError: Error? = nil
+        var returnedError: Error?
 
         let encoder = JSONEncoder()
         if prettyPrint {
diff --git a/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/PetstoreClient/Classes/OpenAPIs/Configuration.swift b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/PetstoreClient/Classes/OpenAPIs/Configuration.swift
index f8180752b6..eb61a73c0b 100644
--- a/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/PetstoreClient/Classes/OpenAPIs/Configuration.swift
+++ b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/PetstoreClient/Classes/OpenAPIs/Configuration.swift
@@ -7,9 +7,9 @@
 import Foundation
 
 open class Configuration {
-	
+
 	// This value is used to configure the date formatter that is used to serialize dates into JSON format. 
 	// You must set it prior to encoding any dates, and it will only be read once. 
     open static var dateFormat = "yyyy-MM-dd'T'HH:mm:ss.SSSZZZZZ"
-    
-}
\ No newline at end of file
+
+}
diff --git a/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/PetstoreClient/Classes/OpenAPIs/Extensions.swift b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/PetstoreClient/Classes/OpenAPIs/Extensions.swift
index abe218b4e7..47967f9248 100644
--- a/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/PetstoreClient/Classes/OpenAPIs/Extensions.swift
+++ b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/PetstoreClient/Classes/OpenAPIs/Extensions.swift
@@ -106,24 +106,24 @@ extension String: CodingKey {
 
 extension KeyedEncodingContainerProtocol {
 
-    public mutating func encodeArray<T>(_ values: [T], forKey key: Self.Key) throws where T : Encodable {
+    public mutating func encodeArray<T>(_ values: [T], forKey key: Self.Key) throws where T: Encodable {
         var arrayContainer = nestedUnkeyedContainer(forKey: key)
         try arrayContainer.encode(contentsOf: values)
     }
 
-    public mutating func encodeArrayIfPresent<T>(_ values: [T]?, forKey key: Self.Key) throws where T : Encodable {
+    public mutating func encodeArrayIfPresent<T>(_ values: [T]?, forKey key: Self.Key) throws where T: Encodable {
         if let values = values {
             try encodeArray(values, forKey: key)
         }
     }
 
-    public mutating func encodeMap<T>(_ pairs: [Self.Key: T]) throws where T : Encodable {
+    public mutating func encodeMap<T>(_ pairs: [Self.Key: T]) throws where T: Encodable {
         for (key, value) in pairs {
             try encode(value, forKey: key)
         }
     }
 
-    public mutating func encodeMapIfPresent<T>(_ pairs: [Self.Key: T]?) throws where T : Encodable {
+    public mutating func encodeMapIfPresent<T>(_ pairs: [Self.Key: T]?) throws where T: Encodable {
         if let pairs = pairs {
             try encodeMap(pairs)
         }
@@ -133,7 +133,7 @@ extension KeyedEncodingContainerProtocol {
 
 extension KeyedDecodingContainerProtocol {
 
-    public func decodeArray<T>(_ type: T.Type, forKey key: Self.Key) throws -> [T] where T : Decodable {
+    public func decodeArray<T>(_ type: T.Type, forKey key: Self.Key) throws -> [T] where T: Decodable {
         var tmpArray = [T]()
 
         var nestedContainer = try nestedUnkeyedContainer(forKey: key)
@@ -145,8 +145,8 @@ extension KeyedDecodingContainerProtocol {
         return tmpArray
     }
 
-    public func decodeArrayIfPresent<T>(_ type: T.Type, forKey key: Self.Key) throws -> [T]? where T : Decodable {
-        var tmpArray: [T]? = nil
+    public func decodeArrayIfPresent<T>(_ type: T.Type, forKey key: Self.Key) throws -> [T]? where T: Decodable {
+        var tmpArray: [T]?
 
         if contains(key) {
             tmpArray = try decodeArray(T.self, forKey: key)
@@ -155,8 +155,8 @@ extension KeyedDecodingContainerProtocol {
         return tmpArray
     }
 
-    public func decodeMap<T>(_ type: T.Type, excludedKeys: Set<Self.Key>) throws -> [Self.Key: T] where T : Decodable {
-        var map: [Self.Key : T] = [:]
+    public func decodeMap<T>(_ type: T.Type, excludedKeys: Set<Self.Key>) throws -> [Self.Key: T] where T: Decodable {
+        var map: [Self.Key: T] = [:]
 
         for key in allKeys {
             if !excludedKeys.contains(key) {
@@ -169,5 +169,3 @@ extension KeyedDecodingContainerProtocol {
     }
 
 }
-
-
diff --git a/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/PetstoreClient/Classes/OpenAPIs/JSONEncodableEncoding.swift b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/PetstoreClient/Classes/OpenAPIs/JSONEncodableEncoding.swift
index ca05906d42..fb76bbed26 100644
--- a/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/PetstoreClient/Classes/OpenAPIs/JSONEncodableEncoding.swift
+++ b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/PetstoreClient/Classes/OpenAPIs/JSONEncodableEncoding.swift
@@ -42,7 +42,7 @@ public struct JSONDataEncoding: ParameterEncoding {
     }
 
     public static func encodingParameters(jsonData: Data?) -> Parameters? {
-        var returnedParams: Parameters? = nil
+        var returnedParams: Parameters?
         if let jsonData = jsonData, !jsonData.isEmpty {
             var params = Parameters()
             params[jsonDataKey] = jsonData
diff --git a/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/PetstoreClient/Classes/OpenAPIs/JSONEncodingHelper.swift b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/PetstoreClient/Classes/OpenAPIs/JSONEncodingHelper.swift
index 7044951584..7bd1267e95 100644
--- a/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/PetstoreClient/Classes/OpenAPIs/JSONEncodingHelper.swift
+++ b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/PetstoreClient/Classes/OpenAPIs/JSONEncodingHelper.swift
@@ -10,8 +10,8 @@ import Alamofire
 
 open class JSONEncodingHelper {
 
-    open class func encodingParameters<T:Encodable>(forEncodableObject encodableObj: T?) -> Parameters? {
-        var params: Parameters? = nil
+    open class func encodingParameters<T: Encodable>(forEncodableObject encodableObj: T?) -> Parameters? {
+        var params: Parameters?
 
         // Encode the Encodable object
         if let encodableObj = encodableObj {
@@ -25,7 +25,7 @@ open class JSONEncodingHelper {
     }
 
     open class func encodingParameters(forEncodableObject encodableObj: Any?) -> Parameters? {
-        var params: Parameters? = nil
+        var params: Parameters?
 
         if let encodableObj = encodableObj {
             do {
@@ -39,5 +39,5 @@ open class JSONEncodingHelper {
 
         return params
     }
-    
+
 }
diff --git a/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/PetstoreClient/Classes/OpenAPIs/Models.swift b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/PetstoreClient/Classes/OpenAPIs/Models.swift
index 42f8186ae4..9d4101c3cd 100644
--- a/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/PetstoreClient/Classes/OpenAPIs/Models.swift
+++ b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/PetstoreClient/Classes/OpenAPIs/Models.swift
@@ -10,7 +10,7 @@ protocol JSONEncodable {
     func encodeToJSON() -> Any
 }
 
-public enum ErrorResponse : Error {
+public enum ErrorResponse: Error {
     case error(Int, Data?, Error)
 }
 
@@ -27,7 +27,7 @@ open class Response<T> {
 
     public convenience init(response: HTTPURLResponse, body: T?) {
         let rawHeader = response.allHeaderFields
-        var header = [String:String]()
+        var header = [String: String]()
         for case let (key, value) as (String, String) in rawHeader {
             header[key] = value
         }
diff --git a/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/PetstoreClient/Classes/OpenAPIs/Models/AdditionalPropertiesClass.swift b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/PetstoreClient/Classes/OpenAPIs/Models/AdditionalPropertiesClass.swift
index 4e018486ad..52c1d3bd2b 100644
--- a/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/PetstoreClient/Classes/OpenAPIs/Models/AdditionalPropertiesClass.swift
+++ b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/PetstoreClient/Classes/OpenAPIs/Models/AdditionalPropertiesClass.swift
@@ -7,23 +7,19 @@
 
 import Foundation
 
-
-
 public struct AdditionalPropertiesClass: Codable {
 
-    public var mapProperty: [String:String]?
-    public var mapOfMapProperty: [String:[String:String]]?
+    public var mapProperty: [String: String]?
+    public var mapOfMapProperty: [String: [String: String]]?
 
-    public init(mapProperty: [String:String]?, mapOfMapProperty: [String:[String:String]]?) {
+    public init(mapProperty: [String: String]?, mapOfMapProperty: [String: [String: String]]?) {
         self.mapProperty = mapProperty
         self.mapOfMapProperty = mapOfMapProperty
     }
 
-    public enum CodingKeys: String, CodingKey { 
+    public enum CodingKeys: String, CodingKey {
         case mapProperty = "map_property"
         case mapOfMapProperty = "map_of_map_property"
     }
 
-
 }
-
diff --git a/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/PetstoreClient/Classes/OpenAPIs/Models/Animal.swift b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/PetstoreClient/Classes/OpenAPIs/Models/Animal.swift
index 7221a1be09..5ed9f31e2a 100644
--- a/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/PetstoreClient/Classes/OpenAPIs/Models/Animal.swift
+++ b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/PetstoreClient/Classes/OpenAPIs/Models/Animal.swift
@@ -7,8 +7,6 @@
 
 import Foundation
 
-
-
 public struct Animal: Codable {
 
     public var className: String
@@ -19,6 +17,4 @@ public struct Animal: Codable {
         self.color = color
     }
 
-
 }
-
diff --git a/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/PetstoreClient/Classes/OpenAPIs/Models/AnimalFarm.swift b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/PetstoreClient/Classes/OpenAPIs/Models/AnimalFarm.swift
index e7bea63f8e..e09b0e9efd 100644
--- a/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/PetstoreClient/Classes/OpenAPIs/Models/AnimalFarm.swift
+++ b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/PetstoreClient/Classes/OpenAPIs/Models/AnimalFarm.swift
@@ -7,5 +7,4 @@
 
 import Foundation
 
-
 public typealias AnimalFarm = [Animal]
diff --git a/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/PetstoreClient/Classes/OpenAPIs/Models/ApiResponse.swift b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/PetstoreClient/Classes/OpenAPIs/Models/ApiResponse.swift
index a22e9aaebb..ec270da890 100644
--- a/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/PetstoreClient/Classes/OpenAPIs/Models/ApiResponse.swift
+++ b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/PetstoreClient/Classes/OpenAPIs/Models/ApiResponse.swift
@@ -7,8 +7,6 @@
 
 import Foundation
 
-
-
 public struct ApiResponse: Codable {
 
     public var code: Int?
@@ -21,6 +19,4 @@ public struct ApiResponse: Codable {
         self.message = message
     }
 
-
 }
-
diff --git a/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/PetstoreClient/Classes/OpenAPIs/Models/ArrayOfArrayOfNumberOnly.swift b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/PetstoreClient/Classes/OpenAPIs/Models/ArrayOfArrayOfNumberOnly.swift
index 4e5a5ca144..3843287630 100644
--- a/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/PetstoreClient/Classes/OpenAPIs/Models/ArrayOfArrayOfNumberOnly.swift
+++ b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/PetstoreClient/Classes/OpenAPIs/Models/ArrayOfArrayOfNumberOnly.swift
@@ -7,8 +7,6 @@
 
 import Foundation
 
-
-
 public struct ArrayOfArrayOfNumberOnly: Codable {
 
     public var arrayArrayNumber: [[Double]]?
@@ -17,10 +15,8 @@ public struct ArrayOfArrayOfNumberOnly: Codable {
         self.arrayArrayNumber = arrayArrayNumber
     }
 
-    public enum CodingKeys: String, CodingKey { 
+    public enum CodingKeys: String, CodingKey {
         case arrayArrayNumber = "ArrayArrayNumber"
     }
 
-
 }
-
diff --git a/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/PetstoreClient/Classes/OpenAPIs/Models/ArrayOfNumberOnly.swift b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/PetstoreClient/Classes/OpenAPIs/Models/ArrayOfNumberOnly.swift
index 7d059d3683..f8b198e81f 100644
--- a/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/PetstoreClient/Classes/OpenAPIs/Models/ArrayOfNumberOnly.swift
+++ b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/PetstoreClient/Classes/OpenAPIs/Models/ArrayOfNumberOnly.swift
@@ -7,8 +7,6 @@
 
 import Foundation
 
-
-
 public struct ArrayOfNumberOnly: Codable {
 
     public var arrayNumber: [Double]?
@@ -17,10 +15,8 @@ public struct ArrayOfNumberOnly: Codable {
         self.arrayNumber = arrayNumber
     }
 
-    public enum CodingKeys: String, CodingKey { 
+    public enum CodingKeys: String, CodingKey {
         case arrayNumber = "ArrayNumber"
     }
 
-
 }
-
diff --git a/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/PetstoreClient/Classes/OpenAPIs/Models/ArrayTest.swift b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/PetstoreClient/Classes/OpenAPIs/Models/ArrayTest.swift
index 9c56fed50c..67f7f7e515 100644
--- a/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/PetstoreClient/Classes/OpenAPIs/Models/ArrayTest.swift
+++ b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/PetstoreClient/Classes/OpenAPIs/Models/ArrayTest.swift
@@ -7,8 +7,6 @@
 
 import Foundation
 
-
-
 public struct ArrayTest: Codable {
 
     public var arrayOfString: [String]?
@@ -21,12 +19,10 @@ public struct ArrayTest: Codable {
         self.arrayArrayOfModel = arrayArrayOfModel
     }
 
-    public enum CodingKeys: String, CodingKey { 
+    public enum CodingKeys: String, CodingKey {
         case arrayOfString = "array_of_string"
         case arrayArrayOfInteger = "array_array_of_integer"
         case arrayArrayOfModel = "array_array_of_model"
     }
 
-
 }
-
diff --git a/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/PetstoreClient/Classes/OpenAPIs/Models/Capitalization.swift b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/PetstoreClient/Classes/OpenAPIs/Models/Capitalization.swift
index 98cda23dac..d576b50b1c 100644
--- a/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/PetstoreClient/Classes/OpenAPIs/Models/Capitalization.swift
+++ b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/PetstoreClient/Classes/OpenAPIs/Models/Capitalization.swift
@@ -7,8 +7,6 @@
 
 import Foundation
 
-
-
 public struct Capitalization: Codable {
 
     public var smallCamel: String?
@@ -28,7 +26,7 @@ public struct Capitalization: Codable {
         self.ATT_NAME = ATT_NAME
     }
 
-    public enum CodingKeys: String, CodingKey { 
+    public enum CodingKeys: String, CodingKey {
         case smallCamel
         case capitalCamel = "CapitalCamel"
         case smallSnake = "small_Snake"
@@ -37,6 +35,4 @@ public struct Capitalization: Codable {
         case ATT_NAME
     }
 
-
 }
-
diff --git a/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/PetstoreClient/Classes/OpenAPIs/Models/Cat.swift b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/PetstoreClient/Classes/OpenAPIs/Models/Cat.swift
index a116d964ea..7ab887f311 100644
--- a/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/PetstoreClient/Classes/OpenAPIs/Models/Cat.swift
+++ b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/PetstoreClient/Classes/OpenAPIs/Models/Cat.swift
@@ -7,8 +7,6 @@
 
 import Foundation
 
-
-
 public struct Cat: Codable {
 
     public var className: String
@@ -21,6 +19,4 @@ public struct Cat: Codable {
         self.declawed = declawed
     }
 
-
 }
-
diff --git a/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/PetstoreClient/Classes/OpenAPIs/Models/Category.swift b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/PetstoreClient/Classes/OpenAPIs/Models/Category.swift
index 77fba95c1d..399a062cfa 100644
--- a/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/PetstoreClient/Classes/OpenAPIs/Models/Category.swift
+++ b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/PetstoreClient/Classes/OpenAPIs/Models/Category.swift
@@ -7,8 +7,6 @@
 
 import Foundation
 
-
-
 public struct Category: Codable {
 
     public var _id: Int64?
@@ -19,11 +17,9 @@ public struct Category: Codable {
         self.name = name
     }
 
-    public enum CodingKeys: String, CodingKey { 
+    public enum CodingKeys: String, CodingKey {
         case _id = "id"
         case name
     }
 
-
 }
-
diff --git a/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/PetstoreClient/Classes/OpenAPIs/Models/ClassModel.swift b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/PetstoreClient/Classes/OpenAPIs/Models/ClassModel.swift
index f673ed127c..28cb30ce7b 100644
--- a/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/PetstoreClient/Classes/OpenAPIs/Models/ClassModel.swift
+++ b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/PetstoreClient/Classes/OpenAPIs/Models/ClassModel.swift
@@ -7,7 +7,6 @@
 
 import Foundation
 
-
 /** Model for testing model with \&quot;_class\&quot; property */
 
 public struct ClassModel: Codable {
@@ -18,6 +17,4 @@ public struct ClassModel: Codable {
         self._class = _class
     }
 
-
 }
-
diff --git a/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/PetstoreClient/Classes/OpenAPIs/Models/Client.swift b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/PetstoreClient/Classes/OpenAPIs/Models/Client.swift
index 51390b6c4e..00245ca372 100644
--- a/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/PetstoreClient/Classes/OpenAPIs/Models/Client.swift
+++ b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/PetstoreClient/Classes/OpenAPIs/Models/Client.swift
@@ -7,8 +7,6 @@
 
 import Foundation
 
-
-
 public struct Client: Codable {
 
     public var client: String?
@@ -17,6 +15,4 @@ public struct Client: Codable {
         self.client = client
     }
 
-
 }
-
diff --git a/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/PetstoreClient/Classes/OpenAPIs/Models/Dog.swift b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/PetstoreClient/Classes/OpenAPIs/Models/Dog.swift
index 239ce74dcc..492c122800 100644
--- a/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/PetstoreClient/Classes/OpenAPIs/Models/Dog.swift
+++ b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/PetstoreClient/Classes/OpenAPIs/Models/Dog.swift
@@ -7,8 +7,6 @@
 
 import Foundation
 
-
-
 public struct Dog: Codable {
 
     public var className: String
@@ -21,6 +19,4 @@ public struct Dog: Codable {
         self.breed = breed
     }
 
-
 }
-
diff --git a/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/PetstoreClient/Classes/OpenAPIs/Models/EnumArrays.swift b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/PetstoreClient/Classes/OpenAPIs/Models/EnumArrays.swift
index 8713961520..5034ff0b8c 100644
--- a/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/PetstoreClient/Classes/OpenAPIs/Models/EnumArrays.swift
+++ b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/PetstoreClient/Classes/OpenAPIs/Models/EnumArrays.swift
@@ -7,8 +7,6 @@
 
 import Foundation
 
-
-
 public struct EnumArrays: Codable {
 
     public enum JustSymbol: String, Codable {
@@ -27,11 +25,9 @@ public struct EnumArrays: Codable {
         self.arrayEnum = arrayEnum
     }
 
-    public enum CodingKeys: String, CodingKey { 
+    public enum CodingKeys: String, CodingKey {
         case justSymbol = "just_symbol"
         case arrayEnum = "array_enum"
     }
 
-
 }
-
diff --git a/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/PetstoreClient/Classes/OpenAPIs/Models/EnumClass.swift b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/PetstoreClient/Classes/OpenAPIs/Models/EnumClass.swift
index 7280a621fe..3c1dfcac57 100644
--- a/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/PetstoreClient/Classes/OpenAPIs/Models/EnumClass.swift
+++ b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/PetstoreClient/Classes/OpenAPIs/Models/EnumClass.swift
@@ -7,7 +7,6 @@
 
 import Foundation
 
-
 public enum EnumClass: String, Codable {
     case abc = "_abc"
     case efg = "-efg"
diff --git a/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/PetstoreClient/Classes/OpenAPIs/Models/EnumTest.swift b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/PetstoreClient/Classes/OpenAPIs/Models/EnumTest.swift
index 0f546c76a2..6db9b34d18 100644
--- a/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/PetstoreClient/Classes/OpenAPIs/Models/EnumTest.swift
+++ b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/PetstoreClient/Classes/OpenAPIs/Models/EnumTest.swift
@@ -7,8 +7,6 @@
 
 import Foundation
 
-
-
 public struct EnumTest: Codable {
 
     public enum EnumString: String, Codable {
@@ -43,7 +41,7 @@ public struct EnumTest: Codable {
         self.outerEnum = outerEnum
     }
 
-    public enum CodingKeys: String, CodingKey { 
+    public enum CodingKeys: String, CodingKey {
         case enumString = "enum_string"
         case enumStringRequired = "enum_string_required"
         case enumInteger = "enum_integer"
@@ -51,6 +49,4 @@ public struct EnumTest: Codable {
         case outerEnum
     }
 
-
 }
-
diff --git a/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/PetstoreClient/Classes/OpenAPIs/Models/FormatTest.swift b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/PetstoreClient/Classes/OpenAPIs/Models/FormatTest.swift
index faa091b065..20bd6d103b 100644
--- a/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/PetstoreClient/Classes/OpenAPIs/Models/FormatTest.swift
+++ b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/PetstoreClient/Classes/OpenAPIs/Models/FormatTest.swift
@@ -7,8 +7,6 @@
 
 import Foundation
 
-
-
 public struct FormatTest: Codable {
 
     public var integer: Int?
@@ -41,6 +39,4 @@ public struct FormatTest: Codable {
         self.password = password
     }
 
-
 }
-
diff --git a/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/PetstoreClient/Classes/OpenAPIs/Models/HasOnlyReadOnly.swift b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/PetstoreClient/Classes/OpenAPIs/Models/HasOnlyReadOnly.swift
index 554aee1081..906ddb06fb 100644
--- a/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/PetstoreClient/Classes/OpenAPIs/Models/HasOnlyReadOnly.swift
+++ b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/PetstoreClient/Classes/OpenAPIs/Models/HasOnlyReadOnly.swift
@@ -7,8 +7,6 @@
 
 import Foundation
 
-
-
 public struct HasOnlyReadOnly: Codable {
 
     public var bar: String?
@@ -19,6 +17,4 @@ public struct HasOnlyReadOnly: Codable {
         self.foo = foo
     }
 
-
 }
-
diff --git a/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/PetstoreClient/Classes/OpenAPIs/Models/List.swift b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/PetstoreClient/Classes/OpenAPIs/Models/List.swift
index 8997340ff4..08d5995387 100644
--- a/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/PetstoreClient/Classes/OpenAPIs/Models/List.swift
+++ b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/PetstoreClient/Classes/OpenAPIs/Models/List.swift
@@ -7,8 +7,6 @@
 
 import Foundation
 
-
-
 public struct List: Codable {
 
     public var _123list: String?
@@ -17,10 +15,8 @@ public struct List: Codable {
         self._123list = _123list
     }
 
-    public enum CodingKeys: String, CodingKey { 
+    public enum CodingKeys: String, CodingKey {
         case _123list = "123-list"
     }
 
-
 }
-
diff --git a/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/PetstoreClient/Classes/OpenAPIs/Models/MapTest.swift b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/PetstoreClient/Classes/OpenAPIs/Models/MapTest.swift
index dfbbee8428..2860f90785 100644
--- a/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/PetstoreClient/Classes/OpenAPIs/Models/MapTest.swift
+++ b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/PetstoreClient/Classes/OpenAPIs/Models/MapTest.swift
@@ -7,27 +7,23 @@
 
 import Foundation
 
-
-
 public struct MapTest: Codable {
 
     public enum MapOfEnumString: String, Codable {
         case upper = "UPPER"
         case lower = "lower"
     }
-    public var mapMapOfString: [String:[String:String]]?
-    public var mapOfEnumString: [String:String]?
+    public var mapMapOfString: [String: [String: String]]?
+    public var mapOfEnumString: [String: String]?
 
-    public init(mapMapOfString: [String:[String:String]]?, mapOfEnumString: [String:String]?) {
+    public init(mapMapOfString: [String: [String: String]]?, mapOfEnumString: [String: String]?) {
         self.mapMapOfString = mapMapOfString
         self.mapOfEnumString = mapOfEnumString
     }
 
-    public enum CodingKeys: String, CodingKey { 
+    public enum CodingKeys: String, CodingKey {
         case mapMapOfString = "map_map_of_string"
         case mapOfEnumString = "map_of_enum_string"
     }
 
-
 }
-
diff --git a/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/PetstoreClient/Classes/OpenAPIs/Models/MixedPropertiesAndAdditionalPropertiesClass.swift b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/PetstoreClient/Classes/OpenAPIs/Models/MixedPropertiesAndAdditionalPropertiesClass.swift
index 7116108fd7..c3deb2f289 100644
--- a/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/PetstoreClient/Classes/OpenAPIs/Models/MixedPropertiesAndAdditionalPropertiesClass.swift
+++ b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/PetstoreClient/Classes/OpenAPIs/Models/MixedPropertiesAndAdditionalPropertiesClass.swift
@@ -7,20 +7,16 @@
 
 import Foundation
 
-
-
 public struct MixedPropertiesAndAdditionalPropertiesClass: Codable {
 
     public var uuid: UUID?
     public var dateTime: Date?
-    public var map: [String:Animal]?
+    public var map: [String: Animal]?
 
-    public init(uuid: UUID?, dateTime: Date?, map: [String:Animal]?) {
+    public init(uuid: UUID?, dateTime: Date?, map: [String: Animal]?) {
         self.uuid = uuid
         self.dateTime = dateTime
         self.map = map
     }
 
-
 }
-
diff --git a/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/PetstoreClient/Classes/OpenAPIs/Models/Model200Response.swift b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/PetstoreClient/Classes/OpenAPIs/Models/Model200Response.swift
index fc1d0606b7..7ed6aad907 100644
--- a/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/PetstoreClient/Classes/OpenAPIs/Models/Model200Response.swift
+++ b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/PetstoreClient/Classes/OpenAPIs/Models/Model200Response.swift
@@ -7,7 +7,6 @@
 
 import Foundation
 
-
 /** Model for testing model name starting with number */
 
 public struct Model200Response: Codable {
@@ -20,11 +19,9 @@ public struct Model200Response: Codable {
         self._class = _class
     }
 
-    public enum CodingKeys: String, CodingKey { 
+    public enum CodingKeys: String, CodingKey {
         case name
         case _class = "class"
     }
 
-
 }
-
diff --git a/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/PetstoreClient/Classes/OpenAPIs/Models/Name.swift b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/PetstoreClient/Classes/OpenAPIs/Models/Name.swift
index cc165d767d..ce9ffe4fb3 100644
--- a/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/PetstoreClient/Classes/OpenAPIs/Models/Name.swift
+++ b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/PetstoreClient/Classes/OpenAPIs/Models/Name.swift
@@ -7,7 +7,6 @@
 
 import Foundation
 
-
 /** Model for testing model name same as property name */
 
 public struct Name: Codable {
@@ -24,13 +23,11 @@ public struct Name: Codable {
         self._123number = _123number
     }
 
-    public enum CodingKeys: String, CodingKey { 
+    public enum CodingKeys: String, CodingKey {
         case name
         case snakeCase = "snake_case"
         case property
         case _123number = "123Number"
     }
 
-
 }
-
diff --git a/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/PetstoreClient/Classes/OpenAPIs/Models/NumberOnly.swift b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/PetstoreClient/Classes/OpenAPIs/Models/NumberOnly.swift
index e6fb206093..abd2269e8e 100644
--- a/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/PetstoreClient/Classes/OpenAPIs/Models/NumberOnly.swift
+++ b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/PetstoreClient/Classes/OpenAPIs/Models/NumberOnly.swift
@@ -7,8 +7,6 @@
 
 import Foundation
 
-
-
 public struct NumberOnly: Codable {
 
     public var justNumber: Double?
@@ -17,10 +15,8 @@ public struct NumberOnly: Codable {
         self.justNumber = justNumber
     }
 
-    public enum CodingKeys: String, CodingKey { 
+    public enum CodingKeys: String, CodingKey {
         case justNumber = "JustNumber"
     }
 
-
 }
-
diff --git a/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/PetstoreClient/Classes/OpenAPIs/Models/Order.swift b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/PetstoreClient/Classes/OpenAPIs/Models/Order.swift
index 5cad29458b..f2b7565e2d 100644
--- a/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/PetstoreClient/Classes/OpenAPIs/Models/Order.swift
+++ b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/PetstoreClient/Classes/OpenAPIs/Models/Order.swift
@@ -7,8 +7,6 @@
 
 import Foundation
 
-
-
 public struct Order: Codable {
 
     public enum Status: String, Codable {
@@ -33,7 +31,7 @@ public struct Order: Codable {
         self.complete = complete
     }
 
-    public enum CodingKeys: String, CodingKey { 
+    public enum CodingKeys: String, CodingKey {
         case _id = "id"
         case petId
         case quantity
@@ -42,6 +40,4 @@ public struct Order: Codable {
         case complete
     }
 
-
 }
-
diff --git a/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/PetstoreClient/Classes/OpenAPIs/Models/OuterComposite.swift b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/PetstoreClient/Classes/OpenAPIs/Models/OuterComposite.swift
index edc4523d9f..49aec001c5 100644
--- a/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/PetstoreClient/Classes/OpenAPIs/Models/OuterComposite.swift
+++ b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/PetstoreClient/Classes/OpenAPIs/Models/OuterComposite.swift
@@ -7,8 +7,6 @@
 
 import Foundation
 
-
-
 public struct OuterComposite: Codable {
 
     public var myNumber: Double?
@@ -21,12 +19,10 @@ public struct OuterComposite: Codable {
         self.myBoolean = myBoolean
     }
 
-    public enum CodingKeys: String, CodingKey { 
+    public enum CodingKeys: String, CodingKey {
         case myNumber = "my_number"
         case myString = "my_string"
         case myBoolean = "my_boolean"
     }
 
-
 }
-
diff --git a/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/PetstoreClient/Classes/OpenAPIs/Models/OuterEnum.swift b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/PetstoreClient/Classes/OpenAPIs/Models/OuterEnum.swift
index bd1643d279..9f80fc95ec 100644
--- a/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/PetstoreClient/Classes/OpenAPIs/Models/OuterEnum.swift
+++ b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/PetstoreClient/Classes/OpenAPIs/Models/OuterEnum.swift
@@ -7,7 +7,6 @@
 
 import Foundation
 
-
 public enum OuterEnum: String, Codable {
     case placed = "placed"
     case approved = "approved"
diff --git a/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/PetstoreClient/Classes/OpenAPIs/Models/Pet.swift b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/PetstoreClient/Classes/OpenAPIs/Models/Pet.swift
index 3773bf5331..971ce9d4db 100644
--- a/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/PetstoreClient/Classes/OpenAPIs/Models/Pet.swift
+++ b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/PetstoreClient/Classes/OpenAPIs/Models/Pet.swift
@@ -7,8 +7,6 @@
 
 import Foundation
 
-
-
 public struct Pet: Codable {
 
     public enum Status: String, Codable {
@@ -33,7 +31,7 @@ public struct Pet: Codable {
         self.status = status
     }
 
-    public enum CodingKeys: String, CodingKey { 
+    public enum CodingKeys: String, CodingKey {
         case _id = "id"
         case category
         case name
@@ -42,6 +40,4 @@ public struct Pet: Codable {
         case status
     }
 
-
 }
-
diff --git a/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/PetstoreClient/Classes/OpenAPIs/Models/ReadOnlyFirst.swift b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/PetstoreClient/Classes/OpenAPIs/Models/ReadOnlyFirst.swift
index 48b655a5b0..0acd21fd10 100644
--- a/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/PetstoreClient/Classes/OpenAPIs/Models/ReadOnlyFirst.swift
+++ b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/PetstoreClient/Classes/OpenAPIs/Models/ReadOnlyFirst.swift
@@ -7,8 +7,6 @@
 
 import Foundation
 
-
-
 public struct ReadOnlyFirst: Codable {
 
     public var bar: String?
@@ -19,6 +17,4 @@ public struct ReadOnlyFirst: Codable {
         self.baz = baz
     }
 
-
 }
-
diff --git a/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/PetstoreClient/Classes/OpenAPIs/Models/Return.swift b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/PetstoreClient/Classes/OpenAPIs/Models/Return.swift
index de4b218999..076082af84 100644
--- a/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/PetstoreClient/Classes/OpenAPIs/Models/Return.swift
+++ b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/PetstoreClient/Classes/OpenAPIs/Models/Return.swift
@@ -7,7 +7,6 @@
 
 import Foundation
 
-
 /** Model for testing reserved words */
 
 public struct Return: Codable {
@@ -18,10 +17,8 @@ public struct Return: Codable {
         self._return = _return
     }
 
-    public enum CodingKeys: String, CodingKey { 
+    public enum CodingKeys: String, CodingKey {
         case _return = "return"
     }
 
-
 }
-
diff --git a/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/PetstoreClient/Classes/OpenAPIs/Models/SpecialModelName.swift b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/PetstoreClient/Classes/OpenAPIs/Models/SpecialModelName.swift
index 213d896ba9..e79fc45c0e 100644
--- a/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/PetstoreClient/Classes/OpenAPIs/Models/SpecialModelName.swift
+++ b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/PetstoreClient/Classes/OpenAPIs/Models/SpecialModelName.swift
@@ -7,8 +7,6 @@
 
 import Foundation
 
-
-
 public struct SpecialModelName: Codable {
 
     public var specialPropertyName: Int64?
@@ -17,10 +15,8 @@ public struct SpecialModelName: Codable {
         self.specialPropertyName = specialPropertyName
     }
 
-    public enum CodingKeys: String, CodingKey { 
+    public enum CodingKeys: String, CodingKey {
         case specialPropertyName = "$special[property.name]"
     }
 
-
 }
-
diff --git a/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/PetstoreClient/Classes/OpenAPIs/Models/Tag.swift b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/PetstoreClient/Classes/OpenAPIs/Models/Tag.swift
index 20f50efd3a..83efe72b8a 100644
--- a/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/PetstoreClient/Classes/OpenAPIs/Models/Tag.swift
+++ b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/PetstoreClient/Classes/OpenAPIs/Models/Tag.swift
@@ -7,8 +7,6 @@
 
 import Foundation
 
-
-
 public struct Tag: Codable {
 
     public var _id: Int64?
@@ -19,11 +17,9 @@ public struct Tag: Codable {
         self.name = name
     }
 
-    public enum CodingKeys: String, CodingKey { 
+    public enum CodingKeys: String, CodingKey {
         case _id = "id"
         case name
     }
 
-
 }
-
diff --git a/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/PetstoreClient/Classes/OpenAPIs/Models/User.swift b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/PetstoreClient/Classes/OpenAPIs/Models/User.swift
index d9c564d2a1..7d6b24b9e1 100644
--- a/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/PetstoreClient/Classes/OpenAPIs/Models/User.swift
+++ b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/PetstoreClient/Classes/OpenAPIs/Models/User.swift
@@ -7,8 +7,6 @@
 
 import Foundation
 
-
-
 public struct User: Codable {
 
     public var _id: Int64?
@@ -32,7 +30,7 @@ public struct User: Codable {
         self.userStatus = userStatus
     }
 
-    public enum CodingKeys: String, CodingKey { 
+    public enum CodingKeys: String, CodingKey {
         case _id = "id"
         case username
         case firstName
@@ -43,6 +41,4 @@ public struct User: Codable {
         case userStatus
     }
 
-
 }
-
diff --git a/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/Platform/AtomicInt.swift b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/Platform/AtomicInt.swift
index 28ed4ad65a..2f405c8a0e 100644
--- a/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/Platform/AtomicInt.swift
+++ b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/Platform/AtomicInt.swift
@@ -30,4 +30,3 @@ extension AtomicInt {
         return (self.load() & mask) != 0
     }
 }
-
diff --git a/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/Platform/DataStructures/Bag.swift b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/Platform/DataStructures/Bag.swift
index 22d82d51fb..6b92b4011d 100644
--- a/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/Platform/DataStructures/Bag.swift
+++ b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/Platform/DataStructures/Bag.swift
@@ -32,29 +32,29 @@ It is suitable for storing small number of elements.
 struct Bag<T> : CustomDebugStringConvertible {
     /// Type of identifier for inserted elements.
     typealias KeyType = BagKey
-    
+
     typealias Entry = (key: BagKey, value: T)
- 
+
     fileprivate var _nextKey: BagKey = BagKey(rawValue: 0)
 
     // data
 
     // first fill inline variables
-    var _key0: BagKey? = nil
-    var _value0: T? = nil
+    var _key0: BagKey?
+    var _value0: T?
 
     // then fill "array dictionary"
     var _pairs = ContiguousArray<Entry>()
 
     // last is sparse dictionary
-    var _dictionary: [BagKey : T]? = nil
+    var _dictionary: [BagKey: T]?
 
     var _onlyFastPath = true
 
     /// Creates new empty `Bag`.
     init() {
     }
-    
+
     /**
     Inserts `value` into bag.
     
@@ -83,18 +83,18 @@ struct Bag<T> : CustomDebugStringConvertible {
             _pairs.append((key: key, value: element))
             return key
         }
-        
+
         _dictionary = [key: element]
-        
+
         return key
     }
-    
+
     /// - returns: Number of elements in bag.
     var count: Int {
         let dictionaryCount: Int = _dictionary?.count ?? 0
         return (_value0 != nil ? 1 : 0) + _pairs.count + dictionaryCount
     }
-    
+
     /// Removes all elements from bag and clears capacity.
     mutating func removeAll() {
         _key0 = nil
@@ -103,7 +103,7 @@ struct Bag<T> : CustomDebugStringConvertible {
         _pairs.removeAll(keepingCapacity: false)
         _dictionary?.removeAll(keepingCapacity: false)
     }
-    
+
     /**
     Removes element with a specific `key` from bag.
     
@@ -136,7 +136,7 @@ struct Bag<T> : CustomDebugStringConvertible {
 
 extension Bag {
     /// A textual representation of `self`, suitable for debugging.
-    var debugDescription : String {
+    var debugDescription: String {
         return "\(self.count) elements in Bag"
     }
 }
diff --git a/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/Platform/DataStructures/InfiniteSequence.swift b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/Platform/DataStructures/InfiniteSequence.swift
index 5a573a0de1..a46e74827c 100644
--- a/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/Platform/DataStructures/InfiniteSequence.swift
+++ b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/Platform/DataStructures/InfiniteSequence.swift
@@ -10,13 +10,13 @@
 struct InfiniteSequence<E> : Sequence {
     typealias Element = E
     typealias Iterator = AnyIterator<E>
-    
+
     private let _repeatedValue: E
-    
+
     init(repeatedValue: E) {
         _repeatedValue = repeatedValue
     }
-    
+
     func makeIterator() -> Iterator {
         let repeatedValue = _repeatedValue
         return AnyIterator {
diff --git a/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/Platform/DataStructures/PriorityQueue.swift b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/Platform/DataStructures/PriorityQueue.swift
index 9b2c370ec4..7d174fd7be 100644
--- a/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/Platform/DataStructures/PriorityQueue.swift
+++ b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/Platform/DataStructures/PriorityQueue.swift
@@ -116,7 +116,7 @@ struct PriorityQueue<Element> {
     }
 }
 
-extension PriorityQueue : CustomDebugStringConvertible {
+extension PriorityQueue: CustomDebugStringConvertible {
     var debugDescription: String {
         return _elements.debugDescription
     }
diff --git a/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/Platform/DataStructures/Queue.swift b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/Platform/DataStructures/Queue.swift
index d05726c7b9..b9b3ae2e8b 100644
--- a/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/Platform/DataStructures/Queue.swift
+++ b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/Platform/DataStructures/Queue.swift
@@ -19,7 +19,7 @@ struct Queue<T>: Sequence {
     typealias Generator = AnyIterator<T>
 
     private let _resizeFactor = 2
-    
+
     private var _storage: ContiguousArray<T?>
     private var _count = 0
     private var _pushNextIndex = 0
@@ -35,50 +35,50 @@ struct Queue<T>: Sequence {
 
         _storage = ContiguousArray<T?>(repeating: nil, count: capacity)
     }
-    
+
     private var dequeueIndex: Int {
         let index = _pushNextIndex - count
         return index < 0 ? index + _storage.count : index
     }
-    
+
     /// - returns: Is queue empty.
     var isEmpty: Bool {
         return count == 0
     }
-    
+
     /// - returns: Number of elements inside queue.
     var count: Int {
         return _count
     }
-    
+
     /// - returns: Element in front of a list of elements to `dequeue`.
     func peek() -> T {
         precondition(count > 0)
-        
+
         return _storage[dequeueIndex]!
     }
-    
+
     mutating private func resizeTo(_ size: Int) {
         var newStorage = ContiguousArray<T?>(repeating: nil, count: size)
-        
+
         let count = _count
-        
+
         let dequeueIndex = self.dequeueIndex
         let spaceToEndOfQueue = _storage.count - dequeueIndex
-        
+
         // first batch is from dequeue index to end of array
         let countElementsInFirstBatch = Swift.min(count, spaceToEndOfQueue)
         // second batch is wrapped from start of array to end of queue
         let numberOfElementsInSecondBatch = count - countElementsInFirstBatch
-        
+
         newStorage[0 ..< countElementsInFirstBatch] = _storage[dequeueIndex ..< (dequeueIndex + countElementsInFirstBatch)]
         newStorage[countElementsInFirstBatch ..< (countElementsInFirstBatch + numberOfElementsInSecondBatch)] = _storage[0 ..< numberOfElementsInSecondBatch]
-        
+
         _count = count
         _pushNextIndex = count
         _storage = newStorage
     }
-    
+
     /// Enqueues `element`.
     ///
     /// - parameter element: Element to enqueue.
@@ -86,19 +86,19 @@ struct Queue<T>: Sequence {
         if count == _storage.count {
             resizeTo(Swift.max(_storage.count, 1) * _resizeFactor)
         }
-        
+
         _storage[_pushNextIndex] = element
         _pushNextIndex += 1
         _count += 1
-        
+
         if _pushNextIndex >= _storage.count {
             _pushNextIndex -= _storage.count
         }
     }
-    
+
     private mutating func dequeueElementOnly() -> T {
         precondition(count > 0)
-        
+
         let index = dequeueIndex
 
         defer {
@@ -126,7 +126,7 @@ struct Queue<T>: Sequence {
 
         return dequeueElementOnly()
     }
-    
+
     /// - returns: Generator of contained elements.
     func makeIterator() -> AnyIterator<T> {
         var i = dequeueIndex
diff --git a/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/Platform/DeprecationWarner.swift b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/Platform/DeprecationWarner.swift
index 863636b7b7..d2ede7fb48 100644
--- a/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/Platform/DeprecationWarner.swift
+++ b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/Platform/DeprecationWarner.swift
@@ -12,23 +12,23 @@ import Foundation
     class DeprecationWarner {
         private static var warned = Set<Kind>()
         private static var _lock = NSRecursiveLock()
-        
+
         static func warnIfNeeded(_ kind: Kind) {
             _lock.lock(); defer { _lock.unlock() }
             guard !warned.contains(kind) else { return }
-            
+
             warned.insert(kind)
             print("ℹ️ [DEPRECATED] \(kind.message)")
         }
     }
-    
+
     extension DeprecationWarner {
         enum Kind {
             case variable
             case globalTestFunctionNext
             case globalTestFunctionError
             case globalTestFunctionCompleted
-            
+
             var message: String {
                 switch self {
                 case .variable: return "`Variable` is planned for future deprecation. Please consider `BehaviorRelay` as a replacement. Read more at: https://git.io/vNqvx"
@@ -40,4 +40,3 @@ import Foundation
         }
     }
 #endif
-
diff --git a/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/Platform/Platform.Darwin.swift b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/Platform/Platform.Darwin.swift
index 6dc36add7b..f75007f442 100644
--- a/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/Platform/Platform.Darwin.swift
+++ b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/Platform/Platform.Darwin.swift
@@ -19,8 +19,7 @@
 
             if let newValue = value {
                 threadDictionary[key] = newValue
-            }
-            else {
+            } else {
                 threadDictionary[key] = nil
             }
         }
@@ -28,7 +27,7 @@
         static func getThreadLocalStorageValueForKey<T>(_ key: NSCopying) -> T? {
             let currentThread = Thread.current
             let threadDictionary = currentThread.threadDictionary
-            
+
             return threadDictionary[key] as? T
         }
     }
diff --git a/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/Platform/Platform.Linux.swift b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/Platform/Platform.Linux.swift
index 570f8f00fa..125fe8863f 100644
--- a/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/Platform/Platform.Linux.swift
+++ b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/Platform/Platform.Linux.swift
@@ -18,8 +18,7 @@
 
             if let newValue = value {
                 threadDictionary[key] = newValue
-            }
-            else {
+            } else {
                 threadDictionary[key] = nil
             }
 
diff --git a/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/AnyObserver.swift b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/AnyObserver.swift
index dd4f9c4086..4516036439 100644
--- a/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/AnyObserver.swift
+++ b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/AnyObserver.swift
@@ -12,7 +12,7 @@
 public struct AnyObserver<Element> : ObserverType {
     /// The type of elements in sequence that observer can observe.
     public typealias E = Element
-    
+
     /// Anonymous event handler type.
     public typealias EventHandler = (Event<Element>) -> Void
 
@@ -24,14 +24,14 @@ public struct AnyObserver<Element> : ObserverType {
     public init(eventHandler: @escaping EventHandler) {
         self.observer = eventHandler
     }
-    
+
     /// Construct an instance whose `on(event)` calls `observer.on(event)`
     ///
     /// - parameter observer: Observer that receives sequence events.
-    public init<O : ObserverType>(_ observer: O) where O.E == Element {
+    public init<O: ObserverType>(_ observer: O) where O.E == Element {
         self.observer = observer.on
     }
-    
+
     /// Send `event` to this observer.
     ///
     /// - parameter event: Event instance.
@@ -49,7 +49,7 @@ public struct AnyObserver<Element> : ObserverType {
 
 extension AnyObserver {
     /// Collection of `AnyObserver`s
-    typealias s = Bag<(Event<Element>) -> ()>
+    typealias s = Bag<(Event<Element>) -> Void>
 }
 
 extension ObserverType {
diff --git a/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Cancelable.swift b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Cancelable.swift
index 1fa7a67726..341807c18c 100644
--- a/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Cancelable.swift
+++ b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Cancelable.swift
@@ -7,7 +7,7 @@
 //
 
 /// Represents disposable resource with state tracking.
-public protocol Cancelable : Disposable {
+public protocol Cancelable: Disposable {
     /// Was resource disposed.
     var isDisposed: Bool { get }
 }
diff --git a/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Concurrency/AsyncLock.swift b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Concurrency/AsyncLock.swift
index 7fbf8c9c6a..7d040e7bf1 100644
--- a/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Concurrency/AsyncLock.swift
+++ b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Concurrency/AsyncLock.swift
@@ -17,13 +17,11 @@ and pending work.
 That means that enqueued work could possibly be executed later on a different thread.
 */
 final class AsyncLock<I: InvocableType>
-    : Disposable
-    , Lock
-    , SynchronizedDisposeType {
+    : Disposable, Lock, SynchronizedDisposeType {
     typealias Action = () -> Void
-    
+
     var _lock = SpinLock()
-    
+
     private var _queue: Queue<I> = Queue(capacity: 0)
 
     private var _isExecuting: Bool = false
@@ -60,8 +58,7 @@ final class AsyncLock<I: InvocableType>
         _lock.lock(); defer { _lock.unlock() } // {
             if !_queue.isEmpty {
                 return _queue.dequeue()
-            }
-            else {
+            } else {
                 _isExecuting = false
                 return nil
             }
@@ -70,27 +67,25 @@ final class AsyncLock<I: InvocableType>
 
     func invoke(_ action: I) {
         let firstEnqueuedAction = enqueue(action)
-        
+
         if let firstEnqueuedAction = firstEnqueuedAction {
             firstEnqueuedAction.invoke()
-        }
-        else {
+        } else {
             // action is enqueued, it's somebody else's concern now
             return
         }
-        
+
         while true {
             let nextAction = dequeue()
 
             if let nextAction = nextAction {
                 nextAction.invoke()
-            }
-            else {
+            } else {
                 return
             }
         }
     }
-    
+
     func dispose() {
         synchronizedDispose()
     }
diff --git a/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Concurrency/Lock.swift b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Concurrency/Lock.swift
index 52afc1cb87..6f9ff8e4e4 100644
--- a/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Concurrency/Lock.swift
+++ b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Concurrency/Lock.swift
@@ -14,7 +14,7 @@ protocol Lock {
 // https://lists.swift.org/pipermail/swift-dev/Week-of-Mon-20151214/000321.html
 typealias SpinLock = RecursiveLock
 
-extension RecursiveLock : Lock {
+extension RecursiveLock: Lock {
     @inline(__always)
     final func performLocked(_ action: () -> Void) {
         lock(); defer { unlock() }
diff --git a/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Concurrency/LockOwnerType.swift b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Concurrency/LockOwnerType.swift
index eca8d8e120..0f6efdff4a 100644
--- a/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Concurrency/LockOwnerType.swift
+++ b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Concurrency/LockOwnerType.swift
@@ -6,7 +6,7 @@
 //  Copyright © 2015 Krunoslav Zaher. All rights reserved.
 //
 
-protocol LockOwnerType : class, Lock {
+protocol LockOwnerType: class, Lock {
     var _lock: RecursiveLock { get }
 }
 
diff --git a/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Concurrency/SynchronizedDisposeType.swift b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Concurrency/SynchronizedDisposeType.swift
index af9548f6ed..ba729399b5 100644
--- a/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Concurrency/SynchronizedDisposeType.swift
+++ b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Concurrency/SynchronizedDisposeType.swift
@@ -6,7 +6,7 @@
 //  Copyright © 2015 Krunoslav Zaher. All rights reserved.
 //
 
-protocol SynchronizedDisposeType : class, Disposable, Lock {
+protocol SynchronizedDisposeType: class, Disposable, Lock {
     func _synchronized_dispose()
 }
 
diff --git a/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Concurrency/SynchronizedOnType.swift b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Concurrency/SynchronizedOnType.swift
index 8dfc556841..d7923769e2 100644
--- a/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Concurrency/SynchronizedOnType.swift
+++ b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Concurrency/SynchronizedOnType.swift
@@ -6,7 +6,7 @@
 //  Copyright © 2015 Krunoslav Zaher. All rights reserved.
 //
 
-protocol SynchronizedOnType : class, ObserverType, Lock {
+protocol SynchronizedOnType: class, ObserverType, Lock {
     func _synchronized_on(_ event: Event<E>)
 }
 
diff --git a/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Concurrency/SynchronizedUnsubscribeType.swift b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Concurrency/SynchronizedUnsubscribeType.swift
index bb1aa7e47d..29897d4bdb 100644
--- a/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Concurrency/SynchronizedUnsubscribeType.swift
+++ b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Concurrency/SynchronizedUnsubscribeType.swift
@@ -6,7 +6,7 @@
 //  Copyright © 2015 Krunoslav Zaher. All rights reserved.
 //
 
-protocol SynchronizedUnsubscribeType : class {
+protocol SynchronizedUnsubscribeType: class {
     associatedtype DisposeKey
 
     func synchronizedUnsubscribe(_ disposeKey: DisposeKey)
diff --git a/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/ConnectableObservableType.swift b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/ConnectableObservableType.swift
index 52bf93c568..239455a0f9 100644
--- a/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/ConnectableObservableType.swift
+++ b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/ConnectableObservableType.swift
@@ -9,7 +9,7 @@
 /**
 Represents an observable sequence wrapper that can be connected and disconnected from its underlying observable sequence.
 */
-public protocol ConnectableObservableType : ObservableType {
+public protocol ConnectableObservableType: ObservableType {
     /**
     Connects the observable wrapper to its source. All subscribed observers will receive values from the underlying observable sequence as long as the connection is established.
     
diff --git a/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Deprecated.swift b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Deprecated.swift
index 0337d82c9e..2ec47b3109 100644
--- a/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Deprecated.swift
+++ b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Deprecated.swift
@@ -51,7 +51,6 @@ extension ObservableType {
         return enumerated().map { try selector($0.element, $0.index) }
     }
 
-
     /**
 
      Projects each element of an observable sequence to an observable sequence by incorporating the element's index and merges the resulting observable sequences into one observable sequence.
@@ -82,7 +81,6 @@ extension ObservableType {
         return enumerated().skipWhile { try predicate($0.element, $0.index) }.map { $0.element }
     }
 
-
     /**
 
      Returns elements from an observable sequence as long as a specified condition is true.
@@ -113,7 +111,6 @@ extension Disposable {
     }
 }
 
-
 extension ObservableType {
 
     /**
@@ -132,7 +129,6 @@ extension ObservableType {
     }
 }
 
-
 extension ObservableType {
 
     /**
diff --git a/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Disposables/AnonymousDisposable.swift b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Disposables/AnonymousDisposable.swift
index 449ee3da17..73a8db7927 100644
--- a/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Disposables/AnonymousDisposable.swift
+++ b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Disposables/AnonymousDisposable.swift
@@ -9,7 +9,7 @@
 /// Represents an Action-based disposable.
 ///
 /// When dispose method is called, disposal action will be dereferenced.
-fileprivate final class AnonymousDisposable : DisposeBase, Cancelable {
+fileprivate final class AnonymousDisposable: DisposeBase, Cancelable {
     public typealias DisposeAction = () -> Void
 
     private var _isDisposed = AtomicInt(0)
@@ -27,13 +27,13 @@ fileprivate final class AnonymousDisposable : DisposeBase, Cancelable {
         _disposeAction = disposeAction
         super.init()
     }
-    
+
     // Non-deprecated version of the constructor, used by `Disposables.create(with:)`
     fileprivate init(disposeAction: @escaping DisposeAction) {
         _disposeAction = disposeAction
         super.init()
     }
-    
+
     /// Calls the disposal action if and only if the current instance hasn't been disposed yet.
     ///
     /// After invoking disposal action, disposal action will be dereferenced.
@@ -50,12 +50,12 @@ fileprivate final class AnonymousDisposable : DisposeBase, Cancelable {
 }
 
 extension Disposables {
-    
+
     /// Constructs a new disposable with the given action used for disposal.
     ///
     /// - parameter dispose: Disposal action which will be run upon calling `dispose`.
-    public static func create(with dispose: @escaping () -> ()) -> Cancelable {
+    public static func create(with dispose: @escaping () -> Void) -> Cancelable {
         return AnonymousDisposable(disposeAction: dispose)
     }
-    
+
 }
diff --git a/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Disposables/BinaryDisposable.swift b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Disposables/BinaryDisposable.swift
index 949476cf12..ee95e422e9 100644
--- a/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Disposables/BinaryDisposable.swift
+++ b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Disposables/BinaryDisposable.swift
@@ -7,7 +7,7 @@
 //
 
 /// Represents two disposable resources that are disposed together.
-private final class BinaryDisposable : DisposeBase, Cancelable {
+private final class BinaryDisposable: DisposeBase, Cancelable {
 
     private var _isDisposed = AtomicInt(0)
 
@@ -44,10 +44,10 @@ private final class BinaryDisposable : DisposeBase, Cancelable {
 }
 
 extension Disposables {
-    
+
     /// Creates a disposable with the given disposables.
     public static func create(_ disposable1: Disposable, _ disposable2: Disposable) -> Cancelable {
         return BinaryDisposable(disposable1, disposable2)
     }
-    
+
 }
diff --git a/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Disposables/BooleanDisposable.swift b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Disposables/BooleanDisposable.swift
index efae55e410..0e6a7da9cf 100644
--- a/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Disposables/BooleanDisposable.swift
+++ b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Disposables/BooleanDisposable.swift
@@ -7,25 +7,25 @@
 //
 
 /// Represents a disposable resource that can be checked for disposal status.
-public final class BooleanDisposable : Cancelable {
+public final class BooleanDisposable: Cancelable {
 
     internal static let BooleanDisposableTrue = BooleanDisposable(isDisposed: true)
     private var _isDisposed = false
-    
+
     /// Initializes a new instance of the `BooleanDisposable` class
     public init() {
     }
-    
+
     /// Initializes a new instance of the `BooleanDisposable` class with given value
     public init(isDisposed: Bool) {
         self._isDisposed = isDisposed
     }
-    
+
     /// - returns: Was resource disposed.
     public var isDisposed: Bool {
         return _isDisposed
     }
-    
+
     /// Sets the status to disposed, which can be observer through the `isDisposed` property.
     public func dispose() {
         _isDisposed = true
diff --git a/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Disposables/CompositeDisposable.swift b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Disposables/CompositeDisposable.swift
index b057817238..46790ac8f6 100644
--- a/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Disposables/CompositeDisposable.swift
+++ b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Disposables/CompositeDisposable.swift
@@ -7,7 +7,7 @@
 //
 
 /// Represents a group of disposable resources that are disposed together.
-public final class CompositeDisposable : DisposeBase, Cancelable {
+public final class CompositeDisposable: DisposeBase, Cancelable {
     /// Key used to remove disposable from composite disposable
     public struct DisposeKey {
         fileprivate let key: BagKey
@@ -17,7 +17,7 @@ public final class CompositeDisposable : DisposeBase, Cancelable {
     }
 
     private var _lock = SpinLock()
-    
+
     // state
     private var _disposables: Bag<Disposable>? = Bag()
 
@@ -25,42 +25,42 @@ public final class CompositeDisposable : DisposeBase, Cancelable {
         _lock.lock(); defer { _lock.unlock() }
         return _disposables == nil
     }
-    
+
     public override init() {
     }
-    
+
     /// Initializes a new instance of composite disposable with the specified number of disposables.
     public init(_ disposable1: Disposable, _ disposable2: Disposable) {
         // This overload is here to make sure we are using optimized version up to 4 arguments.
-        let _ = _disposables!.insert(disposable1)
-        let _ = _disposables!.insert(disposable2)
+        _ = _disposables!.insert(disposable1)
+        _ = _disposables!.insert(disposable2)
     }
-    
+
     /// Initializes a new instance of composite disposable with the specified number of disposables.
     public init(_ disposable1: Disposable, _ disposable2: Disposable, _ disposable3: Disposable) {
         // This overload is here to make sure we are using optimized version up to 4 arguments.
-        let _ = _disposables!.insert(disposable1)
-        let _ = _disposables!.insert(disposable2)
-        let _ = _disposables!.insert(disposable3)
+        _ = _disposables!.insert(disposable1)
+        _ = _disposables!.insert(disposable2)
+        _ = _disposables!.insert(disposable3)
     }
-    
+
     /// Initializes a new instance of composite disposable with the specified number of disposables.
     public init(_ disposable1: Disposable, _ disposable2: Disposable, _ disposable3: Disposable, _ disposable4: Disposable, _ disposables: Disposable...) {
         // This overload is here to make sure we are using optimized version up to 4 arguments.
-        let _ = _disposables!.insert(disposable1)
-        let _ = _disposables!.insert(disposable2)
-        let _ = _disposables!.insert(disposable3)
-        let _ = _disposables!.insert(disposable4)
-        
+        _ = _disposables!.insert(disposable1)
+        _ = _disposables!.insert(disposable2)
+        _ = _disposables!.insert(disposable3)
+        _ = _disposables!.insert(disposable4)
+
         for disposable in disposables {
-            let _ = _disposables!.insert(disposable)
+            _ = _disposables!.insert(disposable)
         }
     }
-    
+
     /// Initializes a new instance of composite disposable with the specified number of disposables.
     public init(disposables: [Disposable]) {
         for disposable in disposables {
-            let _ = _disposables!.insert(disposable)
+            _ = _disposables!.insert(disposable)
         }
     }
 
@@ -73,39 +73,39 @@ public final class CompositeDisposable : DisposeBase, Cancelable {
      */
     public func insert(_ disposable: Disposable) -> DisposeKey? {
         let key = _insert(disposable)
-        
+
         if key == nil {
             disposable.dispose()
         }
-        
+
         return key
     }
-    
+
     private func _insert(_ disposable: Disposable) -> DisposeKey? {
         _lock.lock(); defer { _lock.unlock() }
 
         let bagKey = _disposables?.insert(disposable)
         return bagKey.map(DisposeKey.init)
     }
-    
+
     /// - returns: Gets the number of disposables contained in the `CompositeDisposable`.
     public var count: Int {
         _lock.lock(); defer { _lock.unlock() }
         return _disposables?.count ?? 0
     }
-    
+
     /// Removes and disposes the disposable identified by `disposeKey` from the CompositeDisposable.
     ///
     /// - parameter disposeKey: Key used to identify disposable to be removed.
     public func remove(for disposeKey: DisposeKey) {
         _remove(for: disposeKey)?.dispose()
     }
-    
+
     private func _remove(for disposeKey: DisposeKey) -> Disposable? {
         _lock.lock(); defer { _lock.unlock() }
         return _disposables?.removeKey(disposeKey.key)
     }
-    
+
     /// Disposes all disposables in the group and removes them from the group.
     public func dispose() {
         if let disposables = _dispose() {
@@ -129,7 +129,7 @@ extension Disposables {
     public static func create(_ disposable1: Disposable, _ disposable2: Disposable, _ disposable3: Disposable) -> Cancelable {
         return CompositeDisposable(disposable1, disposable2, disposable3)
     }
-    
+
     /// Creates a disposable with the given disposables.
     public static func create(_ disposable1: Disposable, _ disposable2: Disposable, _ disposable3: Disposable, _ disposables: Disposable ...) -> Cancelable {
         var disposables = disposables
@@ -138,7 +138,7 @@ extension Disposables {
         disposables.append(disposable3)
         return CompositeDisposable(disposables: disposables)
     }
-    
+
     /// Creates a disposable with the given disposables.
     public static func create(_ disposables: [Disposable]) -> Cancelable {
         switch disposables.count {
diff --git a/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Disposables/Disposables.swift b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Disposables/Disposables.swift
index 8cd6e28c3c..fbee0bc5b8 100644
--- a/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Disposables/Disposables.swift
+++ b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Disposables/Disposables.swift
@@ -10,4 +10,3 @@
 public struct Disposables {
     private init() {}
 }
-
diff --git a/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Disposables/DisposeBag.swift b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Disposables/DisposeBag.swift
index 9a2386d159..edb449d467 100644
--- a/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Disposables/DisposeBag.swift
+++ b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Disposables/DisposeBag.swift
@@ -28,13 +28,13 @@ or create a new one in its place.
 In case explicit disposal is necessary, there is also `CompositeDisposable`.
 */
 public final class DisposeBag: DisposeBase {
-    
+
     private var _lock = SpinLock()
-    
+
     // state
     fileprivate var _disposables = [Disposable]()
     fileprivate var _isDisposed = false
-    
+
     /// Constructs new empty dispose bag.
     public override init() {
         super.init()
@@ -46,7 +46,7 @@ public final class DisposeBag: DisposeBase {
     public func insert(_ disposable: Disposable) {
         _insert(disposable)?.dispose()
     }
-    
+
     private func _insert(_ disposable: Disposable) -> Disposable? {
         _lock.lock(); defer { _lock.unlock() }
         if _isDisposed {
@@ -71,13 +71,13 @@ public final class DisposeBag: DisposeBase {
         _lock.lock(); defer { _lock.unlock() }
 
         let disposables = _disposables
-        
+
         _disposables.removeAll(keepingCapacity: false)
         _isDisposed = true
-        
+
         return disposables
     }
-    
+
     deinit {
         dispose()
     }
diff --git a/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Disposables/DisposeBase.swift b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Disposables/DisposeBase.swift
index 8c6a44f0b8..08cd2dd263 100644
--- a/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Disposables/DisposeBase.swift
+++ b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Disposables/DisposeBase.swift
@@ -10,13 +10,13 @@
 public class DisposeBase {
     init() {
 #if TRACE_RESOURCES
-    let _ = Resources.incrementTotal()
+    _ = Resources.incrementTotal()
 #endif
     }
-    
+
     deinit {
 #if TRACE_RESOURCES
-    let _ = Resources.decrementTotal()
+    _ = Resources.decrementTotal()
 #endif
     }
 }
diff --git a/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Disposables/NopDisposable.swift b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Disposables/NopDisposable.swift
index 149f866434..24fb5acc61 100644
--- a/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Disposables/NopDisposable.swift
+++ b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Disposables/NopDisposable.swift
@@ -9,14 +9,14 @@
 /// Represents a disposable that does nothing on disposal.
 ///
 /// Nop = No Operation
-fileprivate struct NopDisposable : Disposable {
- 
+private struct NopDisposable: Disposable {
+
     fileprivate static let noOp: Disposable = NopDisposable()
-    
+
     fileprivate init() {
-        
+
     }
-    
+
     /// Does nothing.
     public func dispose() {
     }
diff --git a/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Disposables/RefCountDisposable.swift b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Disposables/RefCountDisposable.swift
index 664603c878..f40fd84ff4 100644
--- a/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Disposables/RefCountDisposable.swift
+++ b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Disposables/RefCountDisposable.swift
@@ -7,7 +7,7 @@
 //
 
 /// Represents a disposable resource that only disposes its underlying disposable resource when all dependent disposable objects have been disposed.
-public final class RefCountDisposable : DisposeBase, Cancelable {
+public final class RefCountDisposable: DisposeBase, Cancelable {
     private var _lock = SpinLock()
     private var _disposable = nil as Disposable?
     private var _primaryDisposed = false
@@ -35,7 +35,7 @@ public final class RefCountDisposable : DisposeBase, Cancelable {
             if let _ = _disposable {
 
                 do {
-                    let _ = try incrementChecked(&_count)
+                    _ = try incrementChecked(&_count)
                 } catch (_) {
                     rxFatalError("RefCountDisposable increment failed")
                 }
@@ -50,12 +50,10 @@ public final class RefCountDisposable : DisposeBase, Cancelable {
     /// Disposes the underlying disposable only when all dependent disposables have been disposed.
     public func dispose() {
         let oldDisposable: Disposable? = _lock.calculateLocked {
-            if let oldDisposable = _disposable, !_primaryDisposed
-            {
+            if let oldDisposable = _disposable, !_primaryDisposed {
                 _primaryDisposed = true
 
-                if (_count == 0)
-                {
+                if (_count == 0) {
                     _disposable = nil
                     return oldDisposable
                 }
@@ -73,7 +71,7 @@ public final class RefCountDisposable : DisposeBase, Cancelable {
         let oldDisposable: Disposable? = _lock.calculateLocked {
             if let oldDisposable = _disposable {
                 do {
-                    let _ = try decrementChecked(&_count)
+                    _ = try decrementChecked(&_count)
                 } catch (_) {
                     rxFatalError("RefCountDisposable decrement on release failed")
                 }
@@ -97,19 +95,16 @@ public final class RefCountDisposable : DisposeBase, Cancelable {
     }
 }
 
-internal final class RefCountInnerDisposable: DisposeBase, Disposable
-{
+internal final class RefCountInnerDisposable: DisposeBase, Disposable {
     private let _parent: RefCountDisposable
     private var _isDisposed = AtomicInt(0)
 
-    init(_ parent: RefCountDisposable)
-    {
+    init(_ parent: RefCountDisposable) {
         _parent = parent
         super.init()
     }
 
-    internal func dispose()
-    {
+    internal func dispose() {
         if _isDisposed.fetchOr(1) == 0 {
             _parent.release()
         }
diff --git a/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Disposables/ScheduledDisposable.swift b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Disposables/ScheduledDisposable.swift
index 564a3a263b..fffd5881c3 100644
--- a/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Disposables/ScheduledDisposable.swift
+++ b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Disposables/ScheduledDisposable.swift
@@ -12,7 +12,7 @@ private let disposeScheduledDisposable: (ScheduledDisposable) -> Disposable = {
 }
 
 /// Represents a disposable resource whose disposal invocation will be scheduled on the specified scheduler.
-public final class ScheduledDisposable : Cancelable {
+public final class ScheduledDisposable: Cancelable {
     public let scheduler: ImmediateSchedulerType
 
     private var _isDisposed = AtomicInt(0)
@@ -38,7 +38,7 @@ public final class ScheduledDisposable : Cancelable {
 
     /// Disposes the wrapped disposable on the provided scheduler.
     public func dispose() {
-        let _ = scheduler.schedule(self, action: disposeScheduledDisposable)
+        _ = scheduler.schedule(self, action: disposeScheduledDisposable)
     }
 
     func disposeInner() {
diff --git a/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Disposables/SerialDisposable.swift b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Disposables/SerialDisposable.swift
index 6373d2bba5..0932f568ec 100644
--- a/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Disposables/SerialDisposable.swift
+++ b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Disposables/SerialDisposable.swift
@@ -7,23 +7,23 @@
 //
 
 /// Represents a disposable resource whose underlying disposable resource can be replaced by another disposable resource, causing automatic disposal of the previous underlying disposable resource.
-public final class SerialDisposable : DisposeBase, Cancelable {
+public final class SerialDisposable: DisposeBase, Cancelable {
     private var _lock = SpinLock()
-    
+
     // state
     private var _current = nil as Disposable?
     private var _isDisposed = false
-    
+
     /// - returns: Was resource disposed.
     public var isDisposed: Bool {
         return _isDisposed
     }
-    
+
     /// Initializes a new instance of the `SerialDisposable`.
     override public init() {
         super.init()
     }
-    
+
     /**
     Gets or sets the underlying disposable.
     
@@ -41,20 +41,19 @@ public final class SerialDisposable : DisposeBase, Cancelable {
             let disposable: Disposable? = _lock.calculateLocked {
                 if _isDisposed {
                     return newDisposable
-                }
-                else {
+                } else {
                     let toDispose = _current
                     _current = newDisposable
                     return toDispose
                 }
             }
-            
+
             if let disposable = disposable {
                 disposable.dispose()
             }
         }
     }
-    
+
     /// Disposes the underlying disposable as well as all future replacements.
     public func dispose() {
         _dispose()?.dispose()
@@ -64,8 +63,7 @@ public final class SerialDisposable : DisposeBase, Cancelable {
         _lock.lock(); defer { _lock.unlock() }
         if _isDisposed {
             return nil
-        }
-        else {
+        } else {
             _isDisposed = true
             let current = _current
             _current = nil
diff --git a/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Disposables/SingleAssignmentDisposable.swift b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Disposables/SingleAssignmentDisposable.swift
index f34fac6bbd..6ff65235df 100644
--- a/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Disposables/SingleAssignmentDisposable.swift
+++ b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Disposables/SingleAssignmentDisposable.swift
@@ -11,7 +11,7 @@ Represents a disposable resource which only allows a single assignment of its un
 
 If an underlying disposable resource has already been set, future attempts to set the underlying disposable resource will throw an exception.
 */
-public final class SingleAssignmentDisposable : DisposeBase, Cancelable {
+public final class SingleAssignmentDisposable: DisposeBase, Cancelable {
 
     fileprivate enum DisposeState: Int32 {
         case disposed = 1
@@ -39,7 +39,7 @@ public final class SingleAssignmentDisposable : DisposeBase, Cancelable {
         _disposable = disposable
 
         let previousState = _state.fetchOr(DisposeState.disposableSet.rawValue)
-        
+
         if (previousState & DisposeState.disposableSet.rawValue) != 0 {
             rxFatalError("oldState.disposable != nil")
         }
diff --git a/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Errors.swift b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Errors.swift
index f17b52d882..648918e16f 100644
--- a/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Errors.swift
+++ b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Errors.swift
@@ -10,9 +10,7 @@ let RxErrorDomain       = "RxErrorDomain"
 let RxCompositeFailures = "RxCompositeFailures"
 
 /// Generic Rx error codes.
-public enum RxError
-    : Swift.Error
-    , CustomDebugStringConvertible {
+public enum RxError: Swift.Error, CustomDebugStringConvertible {
     /// Unknown error occurred.
     case unknown
     /// Performing an action on disposed object.
diff --git a/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Event.swift b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Event.swift
index 9193e3504d..1386ba8a49 100644
--- a/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Event.swift
+++ b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Event.swift
@@ -21,7 +21,7 @@ public enum Event<Element> {
     case completed
 }
 
-extension Event : CustomDebugStringConvertible {
+extension Event: CustomDebugStringConvertible {
     /// Description of event.
     public var debugDescription: String {
         switch self {
@@ -82,8 +82,7 @@ extension Event {
             case .completed:
                 return .completed
             }
-        }
-        catch let e {
+        } catch let e {
             return .error(e)
         }
     }
@@ -98,7 +97,7 @@ public protocol EventConvertible {
     var event: Event<ElementType> { get }
 }
 
-extension Event : EventConvertible {
+extension Event: EventConvertible {
     /// Event representation of this instance
     public var event: Event<Element> {
         return self
diff --git a/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Extensions/Bag+Rx.swift b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Extensions/Bag+Rx.swift
index 748578d918..0b228b8a3f 100644
--- a/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Extensions/Bag+Rx.swift
+++ b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Extensions/Bag+Rx.swift
@@ -6,11 +6,10 @@
 //  Copyright © 2016 Krunoslav Zaher. All rights reserved.
 //
 
-
 // MARK: forEach
 
 @inline(__always)
-func dispatch<E>(_ bag: Bag<(Event<E>) -> ()>, _ event: Event<E>) {
+func dispatch<E>(_ bag: Bag<(Event<E>) -> Void>, _ event: Event<E>) {
     bag._value0?(event)
 
     if bag._onlyFastPath {
diff --git a/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/GroupedObservable.swift b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/GroupedObservable.swift
index d87e0bad02..432f50d23b 100644
--- a/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/GroupedObservable.swift
+++ b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/GroupedObservable.swift
@@ -26,7 +26,7 @@ public struct GroupedObservable<Key, Element> : ObservableType {
     }
 
     /// Subscribes `observer` to receive events for this sequence.
-    public func subscribe<O : ObserverType>(_ observer: O) -> Disposable where O.E == E {
+    public func subscribe<O: ObserverType>(_ observer: O) -> Disposable where O.E == E {
         return self.source.subscribe(observer)
     }
 
diff --git a/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/ImmediateSchedulerType.swift b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/ImmediateSchedulerType.swift
index 8dc2a85c49..de9f9ee925 100644
--- a/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/ImmediateSchedulerType.swift
+++ b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/ImmediateSchedulerType.swift
@@ -26,11 +26,11 @@ extension ImmediateSchedulerType {
     - parameter action: Action to execute recursively. The last parameter passed to the action is used to trigger recursive scheduling of the action, passing in recursive invocation state.
     - returns: The disposable object used to cancel the scheduled action (best effort).
     */
-    public func scheduleRecursive<State>(_ state: State, action: @escaping (_ state: State, _ recurse: (State) -> ()) -> ()) -> Disposable {
+    public func scheduleRecursive<State>(_ state: State, action: @escaping (_ state: State, _ recurse: (State) -> Void) -> Void) -> Disposable {
         let recursiveScheduler = RecursiveImmediateScheduler(action: action, scheduler: self)
-        
+
         recursiveScheduler.schedule(state)
-        
+
         return Disposables.create(with: recursiveScheduler.dispose)
     }
 }
diff --git a/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Observable.swift b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Observable.swift
index f0c55af714..6ba34b1fbe 100644
--- a/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Observable.swift
+++ b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Observable.swift
@@ -12,24 +12,24 @@
 public class Observable<Element> : ObservableType {
     /// Type of elements in sequence.
     public typealias E = Element
-    
+
     init() {
 #if TRACE_RESOURCES
-        let _ = Resources.incrementTotal()
+        _ = Resources.incrementTotal()
 #endif
     }
-    
+
     public func subscribe<O: ObserverType>(_ observer: O) -> Disposable where O.E == E {
         rxAbstractMethod()
     }
-    
+
     public func asObservable() -> Observable<E> {
         return self
     }
-    
+
     deinit {
 #if TRACE_RESOURCES
-        let _ = Resources.decrementTotal()
+        _ = Resources.decrementTotal()
 #endif
     }
 
@@ -41,4 +41,3 @@ public class Observable<Element> : ObservableType {
         return _map(source: self, transform: transform)
     }
 }
-
diff --git a/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/ObservableType+Extensions.swift b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/ObservableType+Extensions.swift
index 29ed8a29f2..0d07788cbd 100644
--- a/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/ObservableType+Extensions.swift
+++ b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/ObservableType+Extensions.swift
@@ -24,8 +24,7 @@ extension ObservableType {
             }
             return self.asObservable().subscribe(observer)
     }
-    
-    
+
     /**
      Subscribes an element handler, an error handler, a completion handler and disposed handler to an observable sequence.
      
@@ -39,35 +38,33 @@ extension ObservableType {
     public func subscribe(onNext: ((E) -> Void)? = nil, onError: ((Swift.Error) -> Void)? = nil, onCompleted: (() -> Void)? = nil, onDisposed: (() -> Void)? = nil)
         -> Disposable {
             let disposable: Disposable
-            
+
             if let disposed = onDisposed {
                 disposable = Disposables.create(with: disposed)
-            }
-            else {
+            } else {
                 disposable = Disposables.create()
             }
-            
+
             #if DEBUG
                 let synchronizationTracker = SynchronizationTracker()
             #endif
-            
+
             let callStack = Hooks.recordCallStackOnError ? Hooks.customCaptureSubscriptionCallstack() : []
-            
+
             let observer = AnonymousObserver<E> { event in
-                
+
                 #if DEBUG
                     synchronizationTracker.register(synchronizationErrorMessage: .default)
                     defer { synchronizationTracker.unregister() }
                 #endif
-                
+
                 switch event {
                 case .next(let value):
                     onNext?(value)
                 case .error(let error):
                     if let onError = onError {
                         onError(error)
-                    }
-                    else {
+                    } else {
                         Hooks.defaultErrorHandler(callStack, error)
                     }
                     disposable.dispose()
@@ -86,7 +83,7 @@ extension ObservableType {
 import class Foundation.NSRecursiveLock
 
 extension Hooks {
-    public typealias DefaultErrorHandler = (_ subscriptionCallStack: [String], _ error: Error) -> ()
+    public typealias DefaultErrorHandler = (_ subscriptionCallStack: [String], _ error: Error) -> Void
     public typealias CustomCaptureSubscriptionCallstack = () -> [String]
 
     fileprivate static let _lock = RecursiveLock()
@@ -115,7 +112,7 @@ extension Hooks {
             _defaultErrorHandler = newValue
         }
     }
-    
+
     /// Subscription callstack block to fetch custom callstack information.
     public static var customCaptureSubscriptionCallstack: CustomCaptureSubscriptionCallstack {
         get {
@@ -128,4 +125,3 @@ extension Hooks {
         }
     }
 }
-
diff --git a/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/ObservableType.swift b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/ObservableType.swift
index e41a36a1ae..5f2a0219ab 100644
--- a/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/ObservableType.swift
+++ b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/ObservableType.swift
@@ -7,7 +7,7 @@
 //
 
 /// Represents a push style sequence.
-public protocol ObservableType : ObservableConvertibleType {
+public protocol ObservableType: ObservableConvertibleType {
     /**
     Subscribes `observer` to receive events for this sequence.
     
@@ -35,7 +35,7 @@ public protocol ObservableType : ObservableConvertibleType {
 }
 
 extension ObservableType {
-    
+
     /// Default implementation of converting `ObservableType` to `Observable`.
     public func asObservable() -> Observable<E> {
         // temporary workaround
diff --git a/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Observables/AddRef.swift b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Observables/AddRef.swift
index b782c13f49..2d107dc49b 100644
--- a/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Observables/AddRef.swift
+++ b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Observables/AddRef.swift
@@ -8,16 +8,16 @@
 
 final class AddRefSink<O: ObserverType> : Sink<O>, ObserverType {
     typealias Element = O.E
-    
+
     override init(observer: O, cancel: Cancelable) {
         super.init(observer: observer, cancel: cancel)
     }
-    
+
     func on(_ event: Event<Element>) {
         switch event {
-        case .next(_):
+        case .next:
             forwardOn(event)
-        case .completed, .error(_):
+        case .completed, .error:
             forwardOn(event)
             dispose()
         }
@@ -26,15 +26,15 @@ final class AddRefSink<O: ObserverType> : Sink<O>, ObserverType {
 
 final class AddRef<Element> : Producer<Element> {
     typealias EventHandler = (Event<Element>) throws -> Void
-    
+
     private let _source: Observable<Element>
     private let _refCount: RefCountDisposable
-    
+
     init(source: Observable<Element>, refCount: RefCountDisposable) {
         _source = source
         _refCount = refCount
     }
-    
+
     override func run<O: ObserverType>(_ observer: O, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where O.E == Element {
         let releaseDisposable = _refCount.retain()
         let sink = AddRefSink(observer: observer, cancel: cancel)
diff --git a/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Observables/Amb.swift b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Observables/Amb.swift
index 08ec04e1ca..93b49fcfad 100644
--- a/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Observables/Amb.swift
+++ b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Observables/Amb.swift
@@ -39,67 +39,67 @@ extension ObservableType {
     }
 }
 
-fileprivate enum AmbState {
+private enum AmbState {
     case neither
     case left
     case right
 }
 
-final fileprivate class AmbObserver<O: ObserverType> : ObserverType {
+final private class AmbObserver<O: ObserverType> : ObserverType {
     typealias Element = O.E
     typealias Parent = AmbSink<O>
     typealias This = AmbObserver<O>
     typealias Sink = (This, Event<Element>) -> Void
-    
+
     fileprivate let _parent: Parent
     fileprivate var _sink: Sink
     fileprivate var _cancel: Disposable
-    
+
     init(parent: Parent, cancel: Disposable, sink: @escaping Sink) {
 #if TRACE_RESOURCES
-        let _ = Resources.incrementTotal()
+        _ = Resources.incrementTotal()
 #endif
-        
+
         _parent = parent
         _sink = sink
         _cancel = cancel
     }
-    
+
     func on(_ event: Event<Element>) {
         _sink(self, event)
         if event.isStopEvent {
             _cancel.dispose()
         }
     }
-    
+
     deinit {
 #if TRACE_RESOURCES
-        let _ = Resources.decrementTotal()
+        _ = Resources.decrementTotal()
 #endif
     }
 }
 
-final fileprivate class AmbSink<O: ObserverType> : Sink<O> {
+final private class AmbSink<O: ObserverType> : Sink<O> {
     typealias ElementType = O.E
     typealias Parent = Amb<ElementType>
     typealias AmbObserverType = AmbObserver<O>
 
     private let _parent: Parent
-    
+
     private let _lock = RecursiveLock()
     // state
     private var _choice = AmbState.neither
-    
+
     init(parent: Parent, observer: O, cancel: Cancelable) {
         _parent = parent
         super.init(observer: observer, cancel: cancel)
     }
-    
+
     func run() -> Disposable {
         let subscription1 = SingleAssignmentDisposable()
         let subscription2 = SingleAssignmentDisposable()
         let disposeAll = Disposables.create(subscription1, subscription2)
-        
+
         let forwardEvent = { (o: AmbObserverType, event: Event<ElementType>) -> Void in
             self.forwardOn(event)
             if event.isStopEvent {
@@ -115,7 +115,7 @@ final fileprivate class AmbSink<O: ObserverType> : Sink<O> {
                     o._cancel = disposeAll
                     otherSubscription.dispose()
                 }
-                
+
                 if self._choice == me {
                     self.forwardOn(event)
                     if event.isStopEvent {
@@ -124,32 +124,32 @@ final fileprivate class AmbSink<O: ObserverType> : Sink<O> {
                 }
             }
         }
-        
+
         let sink1 = AmbObserver(parent: self, cancel: subscription1) { o, e in
             decide(o, e, .left, subscription2)
         }
-        
+
         let sink2 = AmbObserver(parent: self, cancel: subscription1) { o, e in
             decide(o, e, .right, subscription1)
         }
-        
+
         subscription1.setDisposable(_parent._left.subscribe(sink1))
         subscription2.setDisposable(_parent._right.subscribe(sink2))
-        
+
         return disposeAll
     }
 }
 
-final fileprivate class Amb<Element>: Producer<Element> {
+final private class Amb<Element>: Producer<Element> {
     fileprivate let _left: Observable<Element>
     fileprivate let _right: Observable<Element>
-    
+
     init(left: Observable<Element>, right: Observable<Element>) {
         _left = left
         _right = right
     }
-    
-    override func run<O : ObserverType>(_ observer: O, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where O.E == Element {
+
+    override func run<O: ObserverType>(_ observer: O, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where O.E == Element {
         let sink = AmbSink(parent: self, observer: observer, cancel: cancel)
         let subscription = sink.run()
         return (sink: sink, subscription: subscription)
diff --git a/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Observables/AsMaybe.swift b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Observables/AsMaybe.swift
index 36fa685fa8..d2c169c426 100644
--- a/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Observables/AsMaybe.swift
+++ b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Observables/AsMaybe.swift
@@ -10,7 +10,7 @@ fileprivate final class AsMaybeSink<O: ObserverType> : Sink<O>, ObserverType {
     typealias ElementType = O.E
     typealias E = ElementType
 
-    private var _element: Event<E>? = nil
+    private var _element: Event<E>?
 
     func on(_ event: Event<E>) {
         switch event {
@@ -41,7 +41,7 @@ final class AsMaybe<Element>: Producer<Element> {
         _source = source
     }
 
-    override func run<O : ObserverType>(_ observer: O, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where O.E == Element {
+    override func run<O: ObserverType>(_ observer: O, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where O.E == Element {
         let sink = AsMaybeSink(observer: observer, cancel: cancel)
         let subscription = _source.subscribe(sink)
         return (sink: sink, subscription: subscription)
diff --git a/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Observables/AsSingle.swift b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Observables/AsSingle.swift
index 080aa8e1a1..61e3e6eb9d 100644
--- a/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Observables/AsSingle.swift
+++ b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Observables/AsSingle.swift
@@ -10,7 +10,7 @@ fileprivate final class AsSingleSink<O: ObserverType> : Sink<O>, ObserverType {
     typealias ElementType = O.E
     typealias E = ElementType
 
-    private var _element: Event<E>? = nil
+    private var _element: Event<E>?
 
     func on(_ event: Event<E>) {
         switch event {
@@ -28,8 +28,7 @@ fileprivate final class AsSingleSink<O: ObserverType> : Sink<O>, ObserverType {
             if let element = _element {
                 forwardOn(element)
                 forwardOn(.completed)
-            }
-            else {
+            } else {
                 forwardOn(.error(RxError.noElements))
             }
             dispose()
@@ -44,7 +43,7 @@ final class AsSingle<Element>: Producer<Element> {
         _source = source
     }
 
-    override func run<O : ObserverType>(_ observer: O, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where O.E == Element {
+    override func run<O: ObserverType>(_ observer: O, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where O.E == Element {
         let sink = AsSingleSink(observer: observer, cancel: cancel)
         let subscription = _source.subscribe(sink)
         return (sink: sink, subscription: subscription)
diff --git a/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Observables/Buffer.swift b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Observables/Buffer.swift
index b8c33ae818..f270c3807d 100644
--- a/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Observables/Buffer.swift
+++ b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Observables/Buffer.swift
@@ -26,65 +26,62 @@ extension ObservableType {
     }
 }
 
-final fileprivate class BufferTimeCount<Element> : Producer<[Element]> {
-    
+final private class BufferTimeCount<Element> : Producer<[Element]> {
+
     fileprivate let _timeSpan: RxTimeInterval
     fileprivate let _count: Int
     fileprivate let _scheduler: SchedulerType
     fileprivate let _source: Observable<Element>
-    
+
     init(source: Observable<Element>, timeSpan: RxTimeInterval, count: Int, scheduler: SchedulerType) {
         _source = source
         _timeSpan = timeSpan
         _count = count
         _scheduler = scheduler
     }
-    
-    override func run<O : ObserverType>(_ observer: O, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where O.E == [Element] {
+
+    override func run<O: ObserverType>(_ observer: O, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where O.E == [Element] {
         let sink = BufferTimeCountSink(parent: self, observer: observer, cancel: cancel)
         let subscription = sink.run()
         return (sink: sink, subscription: subscription)
     }
 }
 
-final fileprivate class BufferTimeCountSink<Element, O: ObserverType>
-    : Sink<O>
-    , LockOwnerType
-    , ObserverType
-    , SynchronizedOnType where O.E == [Element] {
+final private class BufferTimeCountSink<Element, O: ObserverType>
+    : Sink<O>, LockOwnerType, ObserverType, SynchronizedOnType where O.E == [Element] {
     typealias Parent = BufferTimeCount<Element>
     typealias E = Element
-    
+
     private let _parent: Parent
-    
+
     let _lock = RecursiveLock()
-    
+
     // state
     private let _timerD = SerialDisposable()
     private var _buffer = [Element]()
     private var _windowID = 0
-    
+
     init(parent: Parent, observer: O, cancel: Cancelable) {
         _parent = parent
         super.init(observer: observer, cancel: cancel)
     }
- 
+
     func run() -> Disposable {
         createTimer(_windowID)
         return Disposables.create(_timerD, _parent._source.subscribe(self))
     }
-    
+
     func startNewWindowAndSendCurrentOne() {
         _windowID = _windowID &+ 1
         let windowID = _windowID
-        
+
         let buffer = _buffer
         _buffer = []
         forwardOn(.next(buffer))
-        
+
         createTimer(windowID)
     }
-    
+
     func on(_ event: Event<E>) {
         synchronizedOn(event)
     }
@@ -93,11 +90,11 @@ final fileprivate class BufferTimeCountSink<Element, O: ObserverType>
         switch event {
         case .next(let element):
             _buffer.append(element)
-            
+
             if _buffer.count == _parent._count {
                 startNewWindowAndSendCurrentOne()
             }
-            
+
         case .error(let error):
             _buffer = []
             forwardOn(.error(error))
@@ -108,18 +105,18 @@ final fileprivate class BufferTimeCountSink<Element, O: ObserverType>
             dispose()
         }
     }
-    
+
     func createTimer(_ windowID: Int) {
         if _timerD.isDisposed {
             return
         }
-        
+
         if _windowID != windowID {
             return
         }
 
         let nextTimer = SingleAssignmentDisposable()
-        
+
         _timerD.disposable = nextTimer
 
         let disposable = _parent._scheduler.scheduleRelative(windowID, dueTime: _parent._timeSpan) { previousWindowID in
@@ -127,10 +124,10 @@ final fileprivate class BufferTimeCountSink<Element, O: ObserverType>
                 if previousWindowID != self._windowID {
                     return
                 }
-             
+
                 self.startNewWindowAndSendCurrentOne()
             }
-            
+
             return Disposables.create()
         }
 
diff --git a/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Observables/Catch.swift b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Observables/Catch.swift
index 187eb8a988..447d9e30ce 100644
--- a/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Observables/Catch.swift
+++ b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Observables/Catch.swift
@@ -33,7 +33,7 @@ extension ObservableType {
         -> Observable<E> {
         return Catch(source: asObservable(), handler: { _ in Observable.just(element) })
     }
-    
+
 }
 
 extension ObservableType {
@@ -83,19 +83,19 @@ extension ObservableType {
 
 // catch with callback
 
-final fileprivate class CatchSinkProxy<O: ObserverType> : ObserverType {
+final private class CatchSinkProxy<O: ObserverType> : ObserverType {
     typealias E = O.E
     typealias Parent = CatchSink<O>
-    
+
     private let _parent: Parent
-    
+
     init(parent: Parent) {
         _parent = parent
     }
-    
+
     func on(_ event: Event<E>) {
         _parent.forwardOn(event)
-        
+
         switch event {
         case .next:
             break
@@ -105,18 +105,18 @@ final fileprivate class CatchSinkProxy<O: ObserverType> : ObserverType {
     }
 }
 
-final fileprivate class CatchSink<O: ObserverType> : Sink<O>, ObserverType {
+final private class CatchSink<O: ObserverType> : Sink<O>, ObserverType {
     typealias E = O.E
     typealias Parent = Catch<E>
-    
+
     private let _parent: Parent
     private let _subscription = SerialDisposable()
-    
+
     init(parent: Parent, observer: O, cancel: Cancelable) {
         _parent = parent
         super.init(observer: observer, cancel: cancel)
     }
-    
+
     func run() -> Disposable {
         let d1 = SingleAssignmentDisposable()
         _subscription.disposable = d1
@@ -124,7 +124,7 @@ final fileprivate class CatchSink<O: ObserverType> : Sink<O>, ObserverType {
 
         return _subscription
     }
-    
+
     func on(_ event: Event<E>) {
         switch event {
         case .next:
@@ -137,10 +137,9 @@ final fileprivate class CatchSink<O: ObserverType> : Sink<O>, ObserverType {
                 let catchSequence = try _parent._handler(error)
 
                 let observer = CatchSinkProxy(parent: self)
-                
+
                 _subscription.disposable = catchSequence.subscribe(observer)
-            }
-            catch let e {
+            } catch let e {
                 forwardOn(.error(e))
                 dispose()
             }
@@ -148,17 +147,17 @@ final fileprivate class CatchSink<O: ObserverType> : Sink<O>, ObserverType {
     }
 }
 
-final fileprivate class Catch<Element> : Producer<Element> {
+final private class Catch<Element> : Producer<Element> {
     typealias Handler = (Swift.Error) throws -> Observable<Element>
-    
+
     fileprivate let _source: Observable<Element>
     fileprivate let _handler: Handler
-    
+
     init(source: Observable<Element>, handler: @escaping Handler) {
         _source = source
         _handler = handler
     }
-    
+
     override func run<O: ObserverType>(_ observer: O, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where O.E == Element {
         let sink = CatchSink(parent: self, observer: observer, cancel: cancel)
         let subscription = sink.run()
@@ -168,18 +167,17 @@ final fileprivate class Catch<Element> : Producer<Element> {
 
 // catch enumerable
 
-final fileprivate class CatchSequenceSink<S: Sequence, O: ObserverType>
-    : TailRecursiveSink<S, O>
-    , ObserverType where S.Iterator.Element : ObservableConvertibleType, S.Iterator.Element.E == O.E {
+final private class CatchSequenceSink<S: Sequence, O: ObserverType>
+    : TailRecursiveSink<S, O>, ObserverType where S.Iterator.Element: ObservableConvertibleType, S.Iterator.Element.E == O.E {
     typealias Element = O.E
     typealias Parent = CatchSequence<S>
-    
+
     private var _lastError: Swift.Error?
-    
+
     override init(observer: O, cancel: Cancelable) {
         super.init(observer: observer, cancel: cancel)
     }
-    
+
     func on(_ event: Event<Element>) {
         switch event {
         case .next:
@@ -196,38 +194,36 @@ final fileprivate class CatchSequenceSink<S: Sequence, O: ObserverType>
     override func subscribeToNext(_ source: Observable<E>) -> Disposable {
         return source.subscribe(self)
     }
-    
+
     override func done() {
         if let lastError = _lastError {
             forwardOn(.error(lastError))
-        }
-        else {
+        } else {
             forwardOn(.completed)
         }
-        
+
         self.dispose()
     }
-    
+
     override func extract(_ observable: Observable<Element>) -> SequenceGenerator? {
         if let onError = observable as? CatchSequence<S> {
             return (onError.sources.makeIterator(), nil)
-        }
-        else {
+        } else {
             return nil
         }
     }
 }
 
-final fileprivate class CatchSequence<S: Sequence> : Producer<S.Iterator.Element.E> where S.Iterator.Element : ObservableConvertibleType {
+final private class CatchSequence<S: Sequence> : Producer<S.Iterator.Element.E> where S.Iterator.Element: ObservableConvertibleType {
     typealias Element = S.Iterator.Element.E
-    
+
     let sources: S
-    
+
     init(sources: S) {
         self.sources = sources
     }
-    
-    override func run<O : ObserverType>(_ observer: O, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where O.E == Element {
+
+    override func run<O: ObserverType>(_ observer: O, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where O.E == Element {
         let sink = CatchSequenceSink<S, O>(observer: observer, cancel: cancel)
         let subscription = sink.run((self.sources.makeIterator(), nil))
         return (sink: sink, subscription: subscription)
diff --git a/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Observables/CombineLatest+Collection.swift b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Observables/CombineLatest+Collection.swift
index 45e01737ee..f063c6439b 100644
--- a/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Observables/CombineLatest+Collection.swift
+++ b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Observables/CombineLatest+Collection.swift
@@ -33,14 +33,14 @@ extension ObservableType {
     }
 }
 
-final fileprivate class CombineLatestCollectionTypeSink<C: Collection, O: ObserverType>
-    : Sink<O> where C.Iterator.Element : ObservableConvertibleType {
+final private class CombineLatestCollectionTypeSink<C: Collection, O: ObserverType>
+    : Sink<O> where C.Iterator.Element: ObservableConvertibleType {
     typealias R = O.E
     typealias Parent = CombineLatestCollectionType<C, R>
     typealias SourceElement = C.Iterator.Element.E
-    
+
     let _parent: Parent
-    
+
     let _lock = RecursiveLock()
 
     // state
@@ -49,21 +49,21 @@ final fileprivate class CombineLatestCollectionTypeSink<C: Collection, O: Observ
     var _isDone: [Bool]
     var _numberOfDone = 0
     var _subscriptions: [SingleAssignmentDisposable]
-    
+
     init(parent: Parent, observer: O, cancel: Cancelable) {
         _parent = parent
         _values = [SourceElement?](repeating: nil, count: parent._count)
         _isDone = [Bool](repeating: false, count: parent._count)
         _subscriptions = Array<SingleAssignmentDisposable>()
         _subscriptions.reserveCapacity(parent._count)
-        
+
         for _ in 0 ..< parent._count {
             _subscriptions.append(SingleAssignmentDisposable())
         }
-        
+
         super.init(observer: observer, cancel: cancel)
     }
-    
+
     func on(_ event: Event<SourceElement>, atIndex: Int) {
         _lock.lock(); defer { _lock.unlock() } // {
             switch event {
@@ -71,9 +71,9 @@ final fileprivate class CombineLatestCollectionTypeSink<C: Collection, O: Observ
                 if _values[atIndex] == nil {
                    _numberOfValues += 1
                 }
-                
+
                 _values[atIndex] = element
-                
+
                 if _numberOfValues < _parent._count {
                     let numberOfOthersThatAreDone = self._numberOfDone - (_isDone[atIndex] ? 1 : 0)
                     if numberOfOthersThatAreDone == self._parent._count - 1 {
@@ -82,16 +82,15 @@ final fileprivate class CombineLatestCollectionTypeSink<C: Collection, O: Observ
                     }
                     return
                 }
-                
+
                 do {
                     let result = try _parent._resultSelector(_values.map { $0! })
                     forwardOn(.next(result))
-                }
-                catch let error {
+                } catch let error {
                     forwardOn(.error(error))
                     dispose()
                 }
-                
+
             case .error(let error):
                 forwardOn(.error(error))
                 dispose()
@@ -99,21 +98,20 @@ final fileprivate class CombineLatestCollectionTypeSink<C: Collection, O: Observ
                 if _isDone[atIndex] {
                     return
                 }
-                
+
                 _isDone[atIndex] = true
                 _numberOfDone += 1
-                
+
                 if _numberOfDone == self._parent._count {
                     forwardOn(.completed)
                     dispose()
-                }
-                else {
+                } else {
                     _subscriptions[atIndex].dispose()
                 }
             }
         // }
     }
-    
+
     func run() -> Disposable {
         var j = 0
         for i in _parent._sources {
@@ -124,21 +122,21 @@ final fileprivate class CombineLatestCollectionTypeSink<C: Collection, O: Observ
             })
 
             _subscriptions[j].setDisposable(disposable)
-            
+
             j += 1
         }
 
         if _parent._sources.isEmpty {
             self.forwardOn(.completed)
         }
-        
+
         return Disposables.create(_subscriptions)
     }
 }
 
-final fileprivate class CombineLatestCollectionType<C: Collection, R> : Producer<R> where C.Iterator.Element : ObservableConvertibleType {
+final private class CombineLatestCollectionType<C: Collection, R> : Producer<R> where C.Iterator.Element: ObservableConvertibleType {
     typealias ResultSelector = ([C.Iterator.Element.E]) throws -> R
-    
+
     let _sources: C
     let _resultSelector: ResultSelector
     let _count: Int
@@ -148,8 +146,8 @@ final fileprivate class CombineLatestCollectionType<C: Collection, R> : Producer
         _resultSelector = resultSelector
         _count = Int(Int64(self._sources.count))
     }
-    
-    override func run<O : ObserverType>(_ observer: O, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where O.E == R {
+
+    override func run<O: ObserverType>(_ observer: O, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where O.E == R {
         let sink = CombineLatestCollectionTypeSink(parent: self, observer: observer, cancel: cancel)
         let subscription = sink.run()
         return (sink: sink, subscription: subscription)
diff --git a/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Observables/CombineLatest+arity.swift b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Observables/CombineLatest+arity.swift
index aad2255487..465a0b578c 100644
--- a/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Observables/CombineLatest+arity.swift
+++ b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Observables/CombineLatest+arity.swift
@@ -7,8 +7,6 @@
 //  Copyright © 2015 Krunoslav Zaher. All rights reserved.
 //
 
-
-
 // 2
 
 extension ObservableType {
@@ -105,8 +103,6 @@ final class CombineLatest2<E1, E2, R> : Producer<R> {
     }
 }
 
-
-
 // 3
 
 extension ObservableType {
@@ -210,8 +206,6 @@ final class CombineLatest3<E1, E2, E3, R> : Producer<R> {
     }
 }
 
-
-
 // 4
 
 extension ObservableType {
@@ -322,8 +316,6 @@ final class CombineLatest4<E1, E2, E3, E4, R> : Producer<R> {
     }
 }
 
-
-
 // 5
 
 extension ObservableType {
@@ -441,8 +433,6 @@ final class CombineLatest5<E1, E2, E3, E4, E5, R> : Producer<R> {
     }
 }
 
-
-
 // 6
 
 extension ObservableType {
@@ -567,8 +557,6 @@ final class CombineLatest6<E1, E2, E3, E4, E5, E6, R> : Producer<R> {
     }
 }
 
-
-
 // 7
 
 extension ObservableType {
@@ -700,8 +688,6 @@ final class CombineLatest7<E1, E2, E3, E4, E5, E6, E7, R> : Producer<R> {
     }
 }
 
-
-
 // 8
 
 extension ObservableType {
@@ -839,5 +825,3 @@ final class CombineLatest8<E1, E2, E3, E4, E5, E6, E7, E8, R> : Producer<R> {
         return (sink: sink, subscription: subscription)
     }
 }
-
-
diff --git a/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Observables/CombineLatest.swift b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Observables/CombineLatest.swift
index 8c03e8c38c..0d846b3d94 100644
--- a/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Observables/CombineLatest.swift
+++ b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Observables/CombineLatest.swift
@@ -6,17 +6,16 @@
 //  Copyright © 2015 Krunoslav Zaher. All rights reserved.
 //
 
-protocol CombineLatestProtocol : class {
+protocol CombineLatestProtocol: class {
     func next(_ index: Int)
     func fail(_ error: Swift.Error)
     func done(_ index: Int)
 }
 
 class CombineLatestSink<O: ObserverType>
-    : Sink<O>
-    , CombineLatestProtocol {
+    : Sink<O>, CombineLatestProtocol {
     typealias Element = O.E
-   
+
     let _lock = RecursiveLock()
 
     private let _arity: Int
@@ -24,19 +23,19 @@ class CombineLatestSink<O: ObserverType>
     private var _numberOfDone = 0
     private var _hasValue: [Bool]
     private var _isDone: [Bool]
-   
+
     init(arity: Int, observer: O, cancel: Cancelable) {
         _arity = arity
         _hasValue = [Bool](repeating: false, count: arity)
         _isDone = [Bool](repeating: false, count: arity)
-        
+
         super.init(observer: observer, cancel: cancel)
     }
-    
+
     func getResult() throws -> Element {
         rxAbstractMethod()
     }
-    
+
     func next(_ index: Int) {
         if !_hasValue[index] {
             _hasValue[index] = true
@@ -47,13 +46,11 @@ class CombineLatestSink<O: ObserverType>
             do {
                 let result = try getResult()
                 forwardOn(.next(result))
-            }
-            catch let e {
+            } catch let e {
                 forwardOn(.error(e))
                 dispose()
             }
-        }
-        else {
+        } else {
             var allOthersDone = true
 
             for i in 0 ..< _arity {
@@ -62,19 +59,19 @@ class CombineLatestSink<O: ObserverType>
                     break
                 }
             }
-            
+
             if allOthersDone {
                 forwardOn(.completed)
                 dispose()
             }
         }
     }
-    
+
     func fail(_ error: Swift.Error) {
         forwardOn(.error(error))
         dispose()
     }
-    
+
     func done(_ index: Int) {
         if _isDone[index] {
             return
@@ -91,19 +88,17 @@ class CombineLatestSink<O: ObserverType>
 }
 
 final class CombineLatestObserver<ElementType>
-    : ObserverType
-    , LockOwnerType
-    , SynchronizedOnType {
+    : ObserverType, LockOwnerType, SynchronizedOnType {
     typealias Element = ElementType
     typealias ValueSetter = (Element) -> Void
-    
+
     private let _parent: CombineLatestProtocol
-    
+
     let _lock: RecursiveLock
     private let _index: Int
     private let _this: Disposable
     private let _setLatestValue: ValueSetter
-    
+
     init(lock: RecursiveLock, parent: CombineLatestProtocol, index: Int, setLatestValue: @escaping ValueSetter, this: Disposable) {
         _lock = lock
         _parent = parent
@@ -111,7 +106,7 @@ final class CombineLatestObserver<ElementType>
         _this = this
         _setLatestValue = setLatestValue
     }
-    
+
     func on(_ event: Event<Element>) {
         synchronizedOn(event)
     }
diff --git a/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Observables/Concat.swift b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Observables/Concat.swift
index 35ef0e1f78..24ce36840f 100644
--- a/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Observables/Concat.swift
+++ b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Observables/Concat.swift
@@ -76,16 +76,15 @@ extension ObservableType {
     }
 }
 
-final fileprivate class ConcatSink<S: Sequence, O: ObserverType>
-    : TailRecursiveSink<S, O>
-    , ObserverType where S.Iterator.Element : ObservableConvertibleType, S.Iterator.Element.E == O.E {
+final private class ConcatSink<S: Sequence, O: ObserverType>
+    : TailRecursiveSink<S, O>, ObserverType where S.Iterator.Element: ObservableConvertibleType, S.Iterator.Element.E == O.E {
     typealias Element = O.E
-    
+
     override init(observer: O, cancel: Cancelable) {
         super.init(observer: observer, cancel: cancel)
     }
-    
-    func on(_ event: Event<Element>){
+
+    func on(_ event: Event<Element>) {
         switch event {
         case .next:
             forwardOn(event)
@@ -100,20 +99,19 @@ final fileprivate class ConcatSink<S: Sequence, O: ObserverType>
     override func subscribeToNext(_ source: Observable<E>) -> Disposable {
         return source.subscribe(self)
     }
-    
+
     override func extract(_ observable: Observable<E>) -> SequenceGenerator? {
         if let source = observable as? Concat<S> {
             return (source._sources.makeIterator(), source._count)
-        }
-        else {
+        } else {
             return nil
         }
     }
 }
 
-final fileprivate class Concat<S: Sequence> : Producer<S.Iterator.Element.E> where S.Iterator.Element : ObservableConvertibleType {
+final private class Concat<S: Sequence> : Producer<S.Iterator.Element.E> where S.Iterator.Element: ObservableConvertibleType {
     typealias Element = S.Iterator.Element.E
-    
+
     fileprivate let _sources: S
     fileprivate let _count: IntMax?
 
@@ -121,11 +119,10 @@ final fileprivate class Concat<S: Sequence> : Producer<S.Iterator.Element.E> whe
         _sources = sources
         _count = count
     }
-    
+
     override func run<O: ObserverType>(_ observer: O, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where O.E == Element {
         let sink = ConcatSink<S, O>(observer: observer, cancel: cancel)
         let subscription = sink.run((_sources.makeIterator(), _count))
         return (sink: sink, subscription: subscription)
     }
 }
-
diff --git a/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Observables/Create.swift b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Observables/Create.swift
index 507c8e6d9c..5a362145b8 100644
--- a/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Observables/Create.swift
+++ b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Observables/Create.swift
@@ -22,7 +22,7 @@ extension ObservableType {
     }
 }
 
-final fileprivate class AnonymousObservableSink<O: ObserverType> : Sink<O>, ObserverType {
+final private class AnonymousObservableSink<O: ObserverType> : Sink<O>, ObserverType {
     typealias E = O.E
     typealias Parent = AnonymousObservable<E>
 
@@ -61,7 +61,7 @@ final fileprivate class AnonymousObservableSink<O: ObserverType> : Sink<O>, Obse
     }
 }
 
-final fileprivate class AnonymousObservable<Element> : Producer<Element> {
+final private class AnonymousObservable<Element> : Producer<Element> {
     typealias SubscribeHandler = (AnyObserver<Element>) -> Disposable
 
     let _subscribeHandler: SubscribeHandler
@@ -70,7 +70,7 @@ final fileprivate class AnonymousObservable<Element> : Producer<Element> {
         _subscribeHandler = subscribeHandler
     }
 
-    override func run<O : ObserverType>(_ observer: O, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where O.E == Element {
+    override func run<O: ObserverType>(_ observer: O, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where O.E == Element {
         let sink = AnonymousObservableSink(observer: observer, cancel: cancel)
         let subscription = sink.run(self)
         return (sink: sink, subscription: subscription)
diff --git a/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Observables/Debounce.swift b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Observables/Debounce.swift
index 866427a0d4..22931d09d5 100644
--- a/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Observables/Debounce.swift
+++ b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Observables/Debounce.swift
@@ -23,11 +23,8 @@ extension ObservableType {
     }
 }
 
-final fileprivate class DebounceSink<O: ObserverType>
-    : Sink<O>
-    , ObserverType
-    , LockOwnerType
-    , SynchronizedOnType {
+final private class DebounceSink<O: ObserverType>
+    : Sink<O>, ObserverType, LockOwnerType, SynchronizedOnType {
     typealias Element = O.E
     typealias ParentType = Debounce<Element>
 
@@ -37,7 +34,7 @@ final fileprivate class DebounceSink<O: ObserverType>
 
     // state
     private var _id = 0 as UInt64
-    private var _value: Element? = nil
+    private var _value: Element?
 
     let cancellable = SerialDisposable()
 
@@ -64,7 +61,6 @@ final fileprivate class DebounceSink<O: ObserverType>
             let currentId = _id
             _value = element
 
-
             let scheduler = _parent._scheduler
             let dueTime = _parent._dueTime
 
@@ -98,7 +94,7 @@ final fileprivate class DebounceSink<O: ObserverType>
     }
 }
 
-final fileprivate class Debounce<Element> : Producer<Element> {
+final private class Debounce<Element> : Producer<Element> {
 
     fileprivate let _source: Observable<Element>
     fileprivate let _dueTime: RxTimeInterval
@@ -115,5 +111,5 @@ final fileprivate class Debounce<Element> : Producer<Element> {
         let subscription = sink.run()
         return (sink: sink, subscription: subscription)
     }
-    
+
 }
diff --git a/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Observables/Debug.swift b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Observables/Debug.swift
index 85b8af7575..8a1183a631 100644
--- a/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Observables/Debug.swift
+++ b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Observables/Debug.swift
@@ -26,19 +26,19 @@ extension ObservableType {
     }
 }
 
-fileprivate let dateFormat = "yyyy-MM-dd HH:mm:ss.SSS"
+private let dateFormat = "yyyy-MM-dd HH:mm:ss.SSS"
 
-fileprivate func logEvent(_ identifier: String, dateFormat: DateFormatter, content: String) {
+private func logEvent(_ identifier: String, dateFormat: DateFormatter, content: String) {
     print("\(dateFormat.string(from: Date())): \(identifier) -> \(content)")
 }
 
-final fileprivate class DebugSink<Source: ObservableType, O: ObserverType> : Sink<O>, ObserverType where O.E == Source.E {
+final private class DebugSink<Source: ObservableType, O: ObserverType> : Sink<O>, ObserverType where O.E == Source.E {
     typealias Element = O.E
     typealias Parent = Debug<Source>
-    
+
     private let _parent: Parent
     private let _timestampFormatter = DateFormatter()
-    
+
     init(parent: Parent, observer: O, cancel: Cancelable) {
         _parent = parent
         _timestampFormatter.dateFormat = dateFormat
@@ -47,7 +47,7 @@ final fileprivate class DebugSink<Source: ObservableType, O: ObserverType> : Sin
 
         super.init(observer: observer, cancel: cancel)
     }
-    
+
     func on(_ event: Event<Element>) {
         let maxEventTextLength = 40
         let eventText = "\(event)"
@@ -63,7 +63,7 @@ final fileprivate class DebugSink<Source: ObservableType, O: ObserverType> : Sin
             dispose()
         }
     }
-    
+
     override func dispose() {
         if !self.disposed {
             logEvent(_parent._identifier, dateFormat: _timestampFormatter, content: "isDisposed")
@@ -72,7 +72,7 @@ final fileprivate class DebugSink<Source: ObservableType, O: ObserverType> : Sin
     }
 }
 
-final fileprivate class Debug<Source: ObservableType> : Producer<Source.E> {
+final private class Debug<Source: ObservableType> : Producer<Source.E> {
     fileprivate let _identifier: String
     fileprivate let _trimOutput: Bool
     fileprivate let _source: Source
@@ -81,20 +81,18 @@ final fileprivate class Debug<Source: ObservableType> : Producer<Source.E> {
         _trimOutput = trimOutput
         if let identifier = identifier {
             _identifier = identifier
-        }
-        else {
+        } else {
             let trimmedFile: String
             if let lastIndex = file.lastIndexOf("/") {
                 trimmedFile = String(file[file.index(after: lastIndex) ..< file.endIndex])
-            }
-            else {
+            } else {
                 trimmedFile = file
             }
             _identifier = "\(trimmedFile):\(line) (\(function))"
         }
         _source = source
     }
-    
+
     override func run<O: ObserverType>(_ observer: O, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where O.E == Source.E {
         let sink = DebugSink(parent: self, observer: observer, cancel: cancel)
         let subscription = _source.subscribe(sink)
diff --git a/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Observables/DefaultIfEmpty.swift b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Observables/DefaultIfEmpty.swift
index 696361fdd3..69d369a1d7 100644
--- a/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Observables/DefaultIfEmpty.swift
+++ b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Observables/DefaultIfEmpty.swift
@@ -21,22 +21,22 @@ extension ObservableType {
     }
 }
 
-final fileprivate class DefaultIfEmptySink<O: ObserverType>: Sink<O>, ObserverType {
+final private class DefaultIfEmptySink<O: ObserverType>: Sink<O>, ObserverType {
     typealias E = O.E
     private let _default: E
     private var _isEmpty = true
-    
+
     init(default: E, observer: O, cancel: Cancelable) {
         _default = `default`
         super.init(observer: observer, cancel: cancel)
     }
-    
+
     func on(_ event: Event<E>) {
         switch event {
-        case .next(_):
+        case .next:
             _isEmpty = false
             forwardOn(event)
-        case .error(_):
+        case .error:
             forwardOn(event)
             dispose()
         case .completed:
@@ -49,15 +49,15 @@ final fileprivate class DefaultIfEmptySink<O: ObserverType>: Sink<O>, ObserverTy
     }
 }
 
-final fileprivate class DefaultIfEmpty<SourceType>: Producer<SourceType> {
+final private class DefaultIfEmpty<SourceType>: Producer<SourceType> {
     private let _source: Observable<SourceType>
     private let _default: SourceType
-    
+
     init(source: Observable<SourceType>, `default`: SourceType) {
         _source = source
         _default = `default`
     }
-    
+
     override func run<O: ObserverType>(_ observer: O, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where O.E == SourceType {
         let sink = DefaultIfEmptySink(default: _default, observer: observer, cancel: cancel)
         let subscription = _source.subscribe(sink)
diff --git a/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Observables/Deferred.swift b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Observables/Deferred.swift
index 947f604a5c..df0cbbdcd9 100644
--- a/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Observables/Deferred.swift
+++ b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Observables/Deferred.swift
@@ -21,7 +21,7 @@ extension ObservableType {
     }
 }
 
-final fileprivate class DeferredSink<S: ObservableType, O: ObserverType> : Sink<O>, ObserverType where S.E == O.E {
+final private class DeferredSink<S: ObservableType, O: ObserverType> : Sink<O>, ObserverType where S.E == O.E {
     typealias E = O.E
 
     private let _observableFactory: () throws -> S
@@ -30,22 +30,21 @@ final fileprivate class DeferredSink<S: ObservableType, O: ObserverType> : Sink<
         _observableFactory = observableFactory
         super.init(observer: observer, cancel: cancel)
     }
-    
+
     func run() -> Disposable {
         do {
             let result = try _observableFactory()
             return result.subscribe(self)
-        }
-        catch let e {
+        } catch let e {
             forwardOn(.error(e))
             dispose()
             return Disposables.create()
         }
     }
-    
+
     func on(_ event: Event<E>) {
         forwardOn(event)
-        
+
         switch event {
         case .next:
             break
@@ -57,15 +56,15 @@ final fileprivate class DeferredSink<S: ObservableType, O: ObserverType> : Sink<
     }
 }
 
-final fileprivate class Deferred<S: ObservableType> : Producer<S.E> {
+final private class Deferred<S: ObservableType> : Producer<S.E> {
     typealias Factory = () throws -> S
-    
-    private let _observableFactory : Factory
-    
+
+    private let _observableFactory: Factory
+
     init(observableFactory: @escaping Factory) {
         _observableFactory = observableFactory
     }
-    
+
     override func run<O: ObserverType>(_ observer: O, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where O.E == S.E {
         let sink = DeferredSink(observableFactory: _observableFactory, observer: observer, cancel: cancel)
         let subscription = sink.run()
diff --git a/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Observables/Delay.swift b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Observables/Delay.swift
index 13955a3524..0b35a626e5 100644
--- a/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Observables/Delay.swift
+++ b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Observables/Delay.swift
@@ -25,18 +25,17 @@ extension ObservableType {
     }
 }
 
-final fileprivate class DelaySink<O: ObserverType>
-    : Sink<O>
-    , ObserverType {
+final private class DelaySink<O: ObserverType>
+    : Sink<O>, ObserverType {
     typealias E = O.E
     typealias Source = Observable<E>
     typealias DisposeKey = Bag<Disposable>.KeyType
-    
+
     private let _lock = RecursiveLock()
 
     private let _dueTime: RxTimeInterval
     private let _scheduler: SchedulerType
-    
+
     private let _sourceSubscription = SingleAssignmentDisposable()
     private let _cancelable = SerialDisposable()
 
@@ -44,12 +43,12 @@ final fileprivate class DelaySink<O: ObserverType>
     private var _active = false
     // is "run loop" on different scheduler running
     private var _running = false
-    private var _errorEvent: Event<E>? = nil
+    private var _errorEvent: Event<E>?
 
     // state
     private var _queue = Queue<(eventTime: RxTime, event: Event<E>)>(capacity: 0)
     private var _disposed = false
-    
+
     init(observer: O, dueTime: RxTimeInterval, scheduler: SchedulerType, cancel: Cancelable) {
         _dueTime = dueTime
         _scheduler = scheduler
@@ -84,14 +83,11 @@ final fileprivate class DelaySink<O: ObserverType>
                 let nextEventToScheduleOriginalTime: Date? = ranAtLeastOnce && !_queue.isEmpty ? _queue.peek().eventTime : nil
 
                 if let _ = errorEvent {
-                }
-                else  {
+                } else {
                     if let _ = eventToForwardImmediately {
-                    }
-                    else if let _ = nextEventToScheduleOriginalTime {
+                    } else if let _ = nextEventToScheduleOriginalTime {
                         _running = false
-                    }
-                    else {
+                    } else {
                         _running = false
                         _active = false
                     }
@@ -102,8 +98,7 @@ final fileprivate class DelaySink<O: ObserverType>
                 self.forwardOn(errorEvent)
                 self.dispose()
                 return
-            }
-            else {
+            } else {
                 if let eventToForwardImmediately = eventToForwardImmediately {
                     ranAtLeastOnce = true
                     self.forwardOn(eventToForwardImmediately)
@@ -111,28 +106,26 @@ final fileprivate class DelaySink<O: ObserverType>
                         self.dispose()
                         return
                     }
-                }
-                else if let nextEventToScheduleOriginalTime = nextEventToScheduleOriginalTime {
+                } else if let nextEventToScheduleOriginalTime = nextEventToScheduleOriginalTime {
                     let elapsedTime = _scheduler.now.timeIntervalSince(nextEventToScheduleOriginalTime)
                     let interval = _dueTime - elapsedTime
                     let normalizedInterval = interval < 0.0 ? 0.0 : interval
                     scheduler.schedule((), dueTime: normalizedInterval)
                     return
-                }
-                else {
+                } else {
                     return
                 }
             }
         }
     }
-    
+
     func on(_ event: Event<E>) {
         if event.isStopEvent {
             _sourceSubscription.dispose()
         }
 
         switch event {
-        case .error(_):
+        case .error:
             _lock.lock()    // {
                 let shouldSendImmediately = !_running
                 _queue = Queue(capacity: 0)
@@ -155,25 +148,25 @@ final fileprivate class DelaySink<O: ObserverType>
             }
         }
     }
-    
+
     func run(source: Observable<E>) -> Disposable {
         _sourceSubscription.setDisposable(source.subscribe(self))
         return Disposables.create(_sourceSubscription, _cancelable)
     }
 }
 
-final fileprivate class Delay<Element>: Producer<Element> {
+final private class Delay<Element>: Producer<Element> {
     private let _source: Observable<Element>
     private let _dueTime: RxTimeInterval
     private let _scheduler: SchedulerType
-    
+
     init(source: Observable<Element>, dueTime: RxTimeInterval, scheduler: SchedulerType) {
         _source = source
         _dueTime = dueTime
         _scheduler = scheduler
     }
 
-    override func run<O : ObserverType>(_ observer: O, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where O.E == Element {
+    override func run<O: ObserverType>(_ observer: O, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where O.E == Element {
         let sink = DelaySink(observer: observer, dueTime: _dueTime, scheduler: _scheduler, cancel: cancel)
         let subscription = sink.run(source: _source)
         return (sink: sink, subscription: subscription)
diff --git a/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Observables/DelaySubscription.swift b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Observables/DelaySubscription.swift
index 9225a196c7..253808bc01 100644
--- a/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Observables/DelaySubscription.swift
+++ b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Observables/DelaySubscription.swift
@@ -23,39 +23,39 @@ extension ObservableType {
     }
 }
 
-final fileprivate class DelaySubscriptionSink<O: ObserverType>
+final private class DelaySubscriptionSink<O: ObserverType>
     : Sink<O>, ObserverType {
     typealias E = O.E
     typealias Parent = DelaySubscription<E>
-    
+
     private let _parent: Parent
-    
+
     init(parent: Parent, observer: O, cancel: Cancelable) {
         _parent = parent
         super.init(observer: observer, cancel: cancel)
     }
-    
+
     func on(_ event: Event<E>) {
         forwardOn(event)
         if event.isStopEvent {
             dispose()
         }
     }
-    
+
 }
 
-final fileprivate class DelaySubscription<Element>: Producer<Element> {
+final private class DelaySubscription<Element>: Producer<Element> {
     private let _source: Observable<Element>
     private let _dueTime: RxTimeInterval
     private let _scheduler: SchedulerType
-    
+
     init(source: Observable<Element>, dueTime: RxTimeInterval, scheduler: SchedulerType) {
         _source = source
         _dueTime = dueTime
         _scheduler = scheduler
     }
-    
-    override func run<O : ObserverType>(_ observer: O, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where O.E == Element {
+
+    override func run<O: ObserverType>(_ observer: O, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where O.E == Element {
         let sink = DelaySubscriptionSink(parent: self, observer: observer, cancel: cancel)
         let subscription = _scheduler.scheduleRelative((), dueTime: _dueTime) { _ in
             return self._source.subscribe(sink)
diff --git a/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Observables/Dematerialize.swift b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Observables/Dematerialize.swift
index d142249a96..9c5ea9a6c6 100644
--- a/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Observables/Dematerialize.swift
+++ b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Observables/Dematerialize.swift
@@ -36,14 +36,14 @@ fileprivate final class DematerializeSink<Element: EventConvertible, O: Observer
     }
 }
 
-final fileprivate class Dematerialize<Element: EventConvertible>: Producer<Element.ElementType>  {
+final private class Dematerialize<Element: EventConvertible>: Producer<Element.ElementType> {
     private let _source: Observable<Element>
-    
+
     init(source: Observable<Element>) {
         _source = source
     }
-    
-    override func run<O : ObserverType>(_ observer: O, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where O.E == Element.ElementType {
+
+    override func run<O: ObserverType>(_ observer: O, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where O.E == Element.ElementType {
         let sink = DematerializeSink<Element, O>(observer: observer, cancel: cancel)
         let subscription = _source.subscribe(sink)
         return (sink: sink, subscription: subscription)
diff --git a/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Observables/DistinctUntilChanged.swift b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Observables/DistinctUntilChanged.swift
index f72f52014d..e1aef7c33e 100644
--- a/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Observables/DistinctUntilChanged.swift
+++ b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Observables/DistinctUntilChanged.swift
@@ -63,17 +63,17 @@ extension ObservableType {
     }
 }
 
-final fileprivate class DistinctUntilChangedSink<O: ObserverType, Key>: Sink<O>, ObserverType {
+final private class DistinctUntilChangedSink<O: ObserverType, Key>: Sink<O>, ObserverType {
     typealias E = O.E
-    
+
     private let _parent: DistinctUntilChanged<E, Key>
-    private var _currentKey: Key? = nil
-    
+    private var _currentKey: Key?
+
     init(parent: DistinctUntilChanged<E, Key>, observer: O, cancel: Cancelable) {
         _parent = parent
         super.init(observer: observer, cancel: cancel)
     }
-    
+
     func on(_ event: Event<E>) {
         switch event {
         case .next(let value):
@@ -83,16 +83,15 @@ final fileprivate class DistinctUntilChangedSink<O: ObserverType, Key>: Sink<O>,
                 if let currentKey = _currentKey {
                     areEqual = try _parent._comparer(currentKey, key)
                 }
-                
+
                 if areEqual {
                     return
                 }
-                
+
                 _currentKey = key
-                
+
                 forwardOn(event)
-            }
-            catch let error {
+            } catch let error {
                 forwardOn(.error(error))
                 dispose()
             }
@@ -103,20 +102,20 @@ final fileprivate class DistinctUntilChangedSink<O: ObserverType, Key>: Sink<O>,
     }
 }
 
-final fileprivate class DistinctUntilChanged<Element, Key>: Producer<Element> {
+final private class DistinctUntilChanged<Element, Key>: Producer<Element> {
     typealias KeySelector = (Element) throws -> Key
     typealias EqualityComparer = (Key, Key) throws -> Bool
-    
+
     fileprivate let _source: Observable<Element>
     fileprivate let _selector: KeySelector
     fileprivate let _comparer: EqualityComparer
-    
+
     init(source: Observable<Element>, selector: @escaping KeySelector, comparer: @escaping EqualityComparer) {
         _source = source
         _selector = selector
         _comparer = comparer
     }
-    
+
     override func run<O: ObserverType>(_ observer: O, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where O.E == Element {
         let sink = DistinctUntilChangedSink(parent: self, observer: observer, cancel: cancel)
         let subscription = _source.subscribe(sink)
diff --git a/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Observables/Do.swift b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Observables/Do.swift
index 2be6d58328..22ef161a78 100644
--- a/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Observables/Do.swift
+++ b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Observables/Do.swift
@@ -20,7 +20,7 @@ extension ObservableType {
      - parameter onDispose: Action to invoke after subscription to source observable has been disposed for any reason. It can be either because sequence terminates for some reason or observer subscription being disposed.
      - returns: The source sequence with the side-effecting behavior applied.
      */
-    public func `do`(onNext: ((E) throws -> Void)? = nil, onError: ((Swift.Error) throws -> Void)? = nil, onCompleted: (() throws -> Void)? = nil, onSubscribe: (() -> ())? = nil, onSubscribed: (() -> ())? = nil, onDispose: (() -> ())? = nil)
+    public func `do`(onNext: ((E) throws -> Void)? = nil, onError: ((Swift.Error) throws -> Void)? = nil, onCompleted: (() throws -> Void)? = nil, onSubscribe: (() -> Void)? = nil, onSubscribed: (() -> Void)? = nil, onDispose: (() -> Void)? = nil)
         -> Observable<E> {
             return Do(source: self.asObservable(), eventHandler: { e in
                 switch e {
@@ -35,17 +35,17 @@ extension ObservableType {
     }
 }
 
-final fileprivate class DoSink<O: ObserverType> : Sink<O>, ObserverType {
+final private class DoSink<O: ObserverType> : Sink<O>, ObserverType {
     typealias Element = O.E
     typealias EventHandler = (Event<Element>) throws -> Void
-    
+
     private let _eventHandler: EventHandler
-    
+
     init(eventHandler: @escaping EventHandler, observer: O, cancel: Cancelable) {
         _eventHandler = eventHandler
         super.init(observer: observer, cancel: cancel)
     }
-    
+
     func on(_ event: Event<Element>) {
         do {
             try _eventHandler(event)
@@ -53,31 +53,30 @@ final fileprivate class DoSink<O: ObserverType> : Sink<O>, ObserverType {
             if event.isStopEvent {
                 dispose()
             }
-        }
-        catch let error {
+        } catch let error {
             forwardOn(.error(error))
             dispose()
         }
     }
 }
 
-final fileprivate class Do<Element> : Producer<Element> {
+final private class Do<Element> : Producer<Element> {
     typealias EventHandler = (Event<Element>) throws -> Void
-    
+
     fileprivate let _source: Observable<Element>
     fileprivate let _eventHandler: EventHandler
-    fileprivate let _onSubscribe: (() -> ())?
-    fileprivate let _onSubscribed: (() -> ())?
-    fileprivate let _onDispose: (() -> ())?
-    
-    init(source: Observable<Element>, eventHandler: @escaping EventHandler, onSubscribe: (() -> ())?, onSubscribed: (() -> ())?, onDispose: (() -> ())?) {
+    fileprivate let _onSubscribe: (() -> Void)?
+    fileprivate let _onSubscribed: (() -> Void)?
+    fileprivate let _onDispose: (() -> Void)?
+
+    init(source: Observable<Element>, eventHandler: @escaping EventHandler, onSubscribe: (() -> Void)?, onSubscribed: (() -> Void)?, onDispose: (() -> Void)?) {
         _source = source
         _eventHandler = eventHandler
         _onSubscribe = onSubscribe
         _onSubscribed = onSubscribed
         _onDispose = onDispose
     }
-    
+
     override func run<O: ObserverType>(_ observer: O, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where O.E == Element {
         _onSubscribe?()
         let sink = DoSink(eventHandler: _eventHandler, observer: observer, cancel: cancel)
diff --git a/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Observables/ElementAt.swift b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Observables/ElementAt.swift
index 500a0442e4..a8609a9c68 100644
--- a/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Observables/ElementAt.swift
+++ b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Observables/ElementAt.swift
@@ -22,38 +22,38 @@ extension ObservableType {
     }
 }
 
-final fileprivate class ElementAtSink<O: ObserverType> : Sink<O>, ObserverType {
+final private class ElementAtSink<O: ObserverType> : Sink<O>, ObserverType {
     typealias SourceType = O.E
     typealias Parent = ElementAt<SourceType>
-    
+
     let _parent: Parent
     var _i: Int
-    
+
     init(parent: Parent, observer: O, cancel: Cancelable) {
         _parent = parent
         _i = parent._index
-        
+
         super.init(observer: observer, cancel: cancel)
     }
-    
+
     func on(_ event: Event<SourceType>) {
         switch event {
-        case .next(_):
+        case .next:
 
             if (_i == 0) {
                 forwardOn(event)
                 forwardOn(.completed)
                 self.dispose()
             }
-            
+
             do {
-                let _ = try decrementChecked(&_i)
+                _ = try decrementChecked(&_i)
             } catch(let e) {
                 forwardOn(.error(e))
                 dispose()
                 return
             }
-            
+
         case .error(let e):
             forwardOn(.error(e))
             self.dispose()
@@ -63,18 +63,18 @@ final fileprivate class ElementAtSink<O: ObserverType> : Sink<O>, ObserverType {
             } else {
                 forwardOn(.completed)
             }
-            
+
             self.dispose()
         }
     }
 }
 
-final fileprivate class ElementAt<SourceType> : Producer<SourceType> {
-    
+final private class ElementAt<SourceType> : Producer<SourceType> {
+
     let _source: Observable<SourceType>
     let _throwOnEmpty: Bool
     let _index: Int
-    
+
     init(source: Observable<SourceType>, index: Int, throwOnEmpty: Bool) {
         if index < 0 {
             rxFatalError("index can't be negative")
@@ -84,7 +84,7 @@ final fileprivate class ElementAt<SourceType> : Producer<SourceType> {
         self._index = index
         self._throwOnEmpty = throwOnEmpty
     }
-    
+
     override func run<O: ObserverType>(_ observer: O, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where O.E == SourceType {
         let sink = ElementAtSink(parent: self, observer: observer, cancel: cancel)
         let subscription = _source.subscribe(sink)
diff --git a/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Observables/Empty.swift b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Observables/Empty.swift
index d2dcdb0096..abaeab1b8b 100644
--- a/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Observables/Empty.swift
+++ b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Observables/Empty.swift
@@ -19,8 +19,8 @@ extension ObservableType {
     }
 }
 
-final fileprivate class EmptyProducer<Element> : Producer<Element> {
-    override func subscribe<O : ObserverType>(_ observer: O) -> Disposable where O.E == Element {
+final private class EmptyProducer<Element> : Producer<Element> {
+    override func subscribe<O: ObserverType>(_ observer: O) -> Disposable where O.E == Element {
         observer.on(.completed)
         return Disposables.create()
     }
diff --git a/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Observables/Enumerated.swift b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Observables/Enumerated.swift
index 2a6cd98084..c86560e51f 100644
--- a/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Observables/Enumerated.swift
+++ b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Observables/Enumerated.swift
@@ -21,10 +21,10 @@ extension ObservableType {
     }
 }
 
-final fileprivate class EnumeratedSink<Element, O : ObserverType>: Sink<O>, ObserverType where O.E == (index: Int, element: Element) {
+final private class EnumeratedSink<Element, O: ObserverType>: Sink<O>, ObserverType where O.E == (index: Int, element: Element) {
     typealias E = Element
     var index = 0
-    
+
     func on(_ event: Event<Element>) {
         switch event {
         case .next(let value):
@@ -32,8 +32,7 @@ final fileprivate class EnumeratedSink<Element, O : ObserverType>: Sink<O>, Obse
                 let nextIndex = try incrementChecked(&index)
                 let next = (index: nextIndex, element: value)
                 forwardOn(.next(next))
-            }
-            catch let e {
+            } catch let e {
                 forwardOn(.error(e))
                 dispose()
             }
@@ -47,7 +46,7 @@ final fileprivate class EnumeratedSink<Element, O : ObserverType>: Sink<O>, Obse
     }
 }
 
-final fileprivate class Enumerated<Element> : Producer<(index: Int, element: Element)> {
+final private class Enumerated<Element> : Producer<(index: Int, element: Element)> {
     private let _source: Observable<Element>
 
     init(source: Observable<Element>) {
diff --git a/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Observables/Error.swift b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Observables/Error.swift
index a15942bb51..2e7be595f8 100644
--- a/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Observables/Error.swift
+++ b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Observables/Error.swift
@@ -19,14 +19,14 @@ extension ObservableType {
     }
 }
 
-final fileprivate class ErrorProducer<Element> : Producer<Element> {
+final private class ErrorProducer<Element> : Producer<Element> {
     private let _error: Swift.Error
-    
+
     init(error: Swift.Error) {
         _error = error
     }
-    
-    override func subscribe<O : ObserverType>(_ observer: O) -> Disposable where O.E == Element {
+
+    override func subscribe<O: ObserverType>(_ observer: O) -> Disposable where O.E == Element {
         observer.on(.error(_error))
         return Disposables.create()
     }
diff --git a/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Observables/Filter.swift b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Observables/Filter.swift
index 05dc8a4b7f..45113c9b72 100644
--- a/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Observables/Filter.swift
+++ b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Observables/Filter.swift
@@ -40,17 +40,17 @@ extension ObservableType {
     }
 }
 
-final fileprivate class FilterSink<O : ObserverType>: Sink<O>, ObserverType {
+final private class FilterSink<O: ObserverType>: Sink<O>, ObserverType {
     typealias Predicate = (Element) throws -> Bool
     typealias Element = O.E
-    
+
     private let _predicate: Predicate
-    
+
     init(predicate: @escaping Predicate, observer: O, cancel: Cancelable) {
         _predicate = predicate
         super.init(observer: observer, cancel: cancel)
     }
-    
+
     func on(_ event: Event<Element>) {
         switch event {
             case .next(let value):
@@ -59,8 +59,7 @@ final fileprivate class FilterSink<O : ObserverType>: Sink<O>, ObserverType {
                     if satisfies {
                         forwardOn(.next(value))
                     }
-                }
-                catch let e {
+                } catch let e {
                     forwardOn(.error(e))
                     dispose()
                 }
@@ -71,17 +70,17 @@ final fileprivate class FilterSink<O : ObserverType>: Sink<O>, ObserverType {
     }
 }
 
-final fileprivate class Filter<Element> : Producer<Element> {
+final private class Filter<Element> : Producer<Element> {
     typealias Predicate = (Element) throws -> Bool
-    
+
     private let _source: Observable<Element>
     private let _predicate: Predicate
-    
+
     init(source: Observable<Element>, predicate: @escaping Predicate) {
         _source = source
         _predicate = predicate
     }
-    
+
     override func run<O: ObserverType>(_ observer: O, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where O.E == Element {
         let sink = FilterSink(predicate: _predicate, observer: observer, cancel: cancel)
         let subscription = _source.subscribe(sink)
diff --git a/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Observables/First.swift b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Observables/First.swift
index 4a72ba0d14..2dbdc79597 100644
--- a/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Observables/First.swift
+++ b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Observables/First.swift
@@ -34,7 +34,7 @@ final class First<Element>: Producer<Element?> {
         _source = source
     }
 
-    override func run<O : ObserverType>(_ observer: O, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where O.E == Element? {
+    override func run<O: ObserverType>(_ observer: O, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where O.E == Element? {
         let sink = FirstSink(observer: observer, cancel: cancel)
         let subscription = _source.subscribe(sink)
         return (sink: sink, subscription: subscription)
diff --git a/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Observables/Generate.swift b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Observables/Generate.swift
index 6469937dbd..4c1d48274e 100644
--- a/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Observables/Generate.swift
+++ b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Observables/Generate.swift
@@ -24,38 +24,36 @@ extension ObservableType {
     }
 }
 
-final fileprivate class GenerateSink<S, O: ObserverType> : Sink<O> {
+final private class GenerateSink<S, O: ObserverType> : Sink<O> {
     typealias Parent = Generate<S, O.E>
-    
+
     private let _parent: Parent
-    
+
     private var _state: S
-    
+
     init(parent: Parent, observer: O, cancel: Cancelable) {
         _parent = parent
         _state = parent._initialState
         super.init(observer: observer, cancel: cancel)
     }
-    
+
     func run() -> Disposable {
         return _parent._scheduler.scheduleRecursive(true) { (isFirst, recurse) -> Void in
             do {
                 if !isFirst {
                     self._state = try self._parent._iterate(self._state)
                 }
-                
+
                 if try self._parent._condition(self._state) {
                     let result = try self._parent._resultSelector(self._state)
                     self.forwardOn(.next(result))
-                    
+
                     recurse(false)
-                }
-                else {
+                } else {
                     self.forwardOn(.completed)
                     self.dispose()
                 }
-            }
-            catch let error {
+            } catch let error {
                 self.forwardOn(.error(error))
                 self.dispose()
             }
@@ -63,13 +61,13 @@ final fileprivate class GenerateSink<S, O: ObserverType> : Sink<O> {
     }
 }
 
-final fileprivate class Generate<S, E> : Producer<E> {
+final private class Generate<S, E> : Producer<E> {
     fileprivate let _initialState: S
     fileprivate let _condition: (S) throws -> Bool
     fileprivate let _iterate: (S) throws -> S
     fileprivate let _resultSelector: (S) throws -> E
     fileprivate let _scheduler: ImmediateSchedulerType
-    
+
     init(initialState: S, condition: @escaping (S) throws -> Bool, iterate: @escaping (S) throws -> S, resultSelector: @escaping (S) throws -> E, scheduler: ImmediateSchedulerType) {
         _initialState = initialState
         _condition = condition
@@ -78,8 +76,8 @@ final fileprivate class Generate<S, E> : Producer<E> {
         _scheduler = scheduler
         super.init()
     }
-    
-    override func run<O : ObserverType>(_ observer: O, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where O.E == E {
+
+    override func run<O: ObserverType>(_ observer: O, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where O.E == E {
         let sink = GenerateSink(parent: self, observer: observer, cancel: cancel)
         let subscription = sink.run()
         return (sink: sink, subscription: subscription)
diff --git a/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Observables/GroupBy.swift b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Observables/GroupBy.swift
index a8a0e78afd..6ce5fd8301 100644
--- a/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Observables/GroupBy.swift
+++ b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Observables/GroupBy.swift
@@ -16,15 +16,15 @@ extension ObservableType {
      - returns: A sequence of observable groups, each of which corresponds to a unique key value, containing all elements that share that same key value.
      */
     public func groupBy<K: Hashable>(keySelector: @escaping (E) throws -> K)
-        -> Observable<GroupedObservable<K,E>> {
+        -> Observable<GroupedObservable<K, E>> {
         return GroupBy(source: self.asObservable(), selector: keySelector)
     }
 }
 
-final fileprivate class GroupedObservableImpl<Key, Element> : Observable<Element> {
+final private class GroupedObservableImpl<Key, Element> : Observable<Element> {
     private var _subject: PublishSubject<Element>
     private var _refCount: RefCountDisposable
-    
+
     init(key: Key, subject: PublishSubject<Element>, refCount: RefCountDisposable) {
         _subject = subject
         _refCount = refCount
@@ -37,10 +37,8 @@ final fileprivate class GroupedObservableImpl<Key, Element> : Observable<Element
     }
 }
 
-
-final fileprivate class GroupBySink<Key: Hashable, Element, O: ObserverType>
-    : Sink<O>
-    , ObserverType where O.E == GroupedObservable<Key, Element> {
+final private class GroupBySink<Key: Hashable, Element, O: ObserverType>
+    : Sink<O>, ObserverType where O.E == GroupedObservable<Key, Element> {
     typealias E = Element
     typealias ResultType = O.E
     typealias Parent = GroupBy<Key, Element>
@@ -49,33 +47,33 @@ final fileprivate class GroupBySink<Key: Hashable, Element, O: ObserverType>
     private let _subscription = SingleAssignmentDisposable()
     private var _refCountDisposable: RefCountDisposable!
     private var _groupedSubjectTable: [Key: PublishSubject<Element>]
-    
+
     init(parent: Parent, observer: O, cancel: Cancelable) {
         _parent = parent
         _groupedSubjectTable = [Key: PublishSubject<Element>]()
         super.init(observer: observer, cancel: cancel)
     }
-    
+
     func run() -> Disposable {
         _refCountDisposable = RefCountDisposable(disposable: _subscription)
-        
+
         _subscription.setDisposable(_parent._source.subscribe(self))
-        
+
         return _refCountDisposable
     }
-    
+
     private func onGroupEvent(key: Key, value: Element) {
         if let writer = _groupedSubjectTable[key] {
             writer.on(.next(value))
         } else {
             let writer = PublishSubject<Element>()
             _groupedSubjectTable[key] = writer
-            
+
             let group = GroupedObservable(
                 key: key,
                 source: GroupedObservableImpl(key: key, subject: writer, refCount: _refCountDisposable)
             )
-            
+
             forwardOn(.next(group))
             writer.on(.next(value))
         }
@@ -87,8 +85,7 @@ final fileprivate class GroupBySink<Key: Hashable, Element, O: ObserverType>
             do {
                 let groupKey = try _parent._selector(value)
                 onGroupEvent(key: groupKey, value: value)
-            }
-            catch let e {
+            } catch let e {
                 error(e)
                 return
             }
@@ -108,7 +105,7 @@ final fileprivate class GroupBySink<Key: Hashable, Element, O: ObserverType>
         _subscription.dispose()
         dispose()
     }
-    
+
     final func forwardOnGroups(event: Event<Element>) {
         for writer in _groupedSubjectTable.values {
             writer.on(event)
@@ -116,18 +113,18 @@ final fileprivate class GroupBySink<Key: Hashable, Element, O: ObserverType>
     }
 }
 
-final fileprivate class GroupBy<Key: Hashable, Element>: Producer<GroupedObservable<Key,Element>> {
+final private class GroupBy<Key: Hashable, Element>: Producer<GroupedObservable<Key, Element>> {
     typealias KeySelector = (Element) throws -> Key
 
     fileprivate let _source: Observable<Element>
     fileprivate let _selector: KeySelector
-    
+
     init(source: Observable<Element>, selector: @escaping KeySelector) {
         _source = source
         _selector = selector
     }
 
-    override func run<O : ObserverType>(_ observer: O, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where O.E == GroupedObservable<Key,Element> {
+    override func run<O: ObserverType>(_ observer: O, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where O.E == GroupedObservable<Key, Element> {
         let sink = GroupBySink(parent: self, observer: observer, cancel: cancel)
         return (sink: sink, subscription: sink.run())
     }
diff --git a/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Observables/Just.swift b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Observables/Just.swift
index 4e49059bc6..466de2bd04 100644
--- a/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Observables/Just.swift
+++ b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Observables/Just.swift
@@ -33,7 +33,7 @@ extension ObservableType {
     }
 }
 
-final fileprivate class JustScheduledSink<O: ObserverType> : Sink<O> {
+final private class JustScheduledSink<O: ObserverType> : Sink<O> {
     typealias Parent = JustScheduled<O.E>
 
     private let _parent: Parent
@@ -56,7 +56,7 @@ final fileprivate class JustScheduledSink<O: ObserverType> : Sink<O> {
     }
 }
 
-final fileprivate class JustScheduled<Element> : Producer<Element> {
+final private class JustScheduled<Element> : Producer<Element> {
     fileprivate let _scheduler: ImmediateSchedulerType
     fileprivate let _element: Element
 
@@ -65,21 +65,21 @@ final fileprivate class JustScheduled<Element> : Producer<Element> {
         _element = element
     }
 
-    override func run<O : ObserverType>(_ observer: O, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where O.E == E {
+    override func run<O: ObserverType>(_ observer: O, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where O.E == E {
         let sink = JustScheduledSink(parent: self, observer: observer, cancel: cancel)
         let subscription = sink.run()
         return (sink: sink, subscription: subscription)
     }
 }
 
-final fileprivate class Just<Element> : Producer<Element> {
+final private class Just<Element> : Producer<Element> {
     private let _element: Element
-    
+
     init(element: Element) {
         _element = element
     }
-    
-    override func subscribe<O : ObserverType>(_ observer: O) -> Disposable where O.E == Element {
+
+    override func subscribe<O: ObserverType>(_ observer: O) -> Disposable where O.E == Element {
         observer.on(.next(_element))
         observer.on(.completed)
         return Disposables.create()
diff --git a/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Observables/Map.swift b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Observables/Map.swift
index c513218f66..fd7f266860 100644
--- a/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Observables/Map.swift
+++ b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Observables/Map.swift
@@ -23,14 +23,14 @@ extension ObservableType {
     }
 }
 
-final fileprivate class MapSink<SourceType, O : ObserverType> : Sink<O>, ObserverType {
+final private class MapSink<SourceType, O: ObserverType> : Sink<O>, ObserverType {
     typealias Transform = (SourceType) throws -> ResultType
 
     typealias ResultType = O.E
     typealias Element = SourceType
 
     private let _transform: Transform
-    
+
     init(transform: @escaping Transform, observer: O, cancel: Cancelable) {
         _transform = transform
         super.init(observer: observer, cancel: cancel)
@@ -42,8 +42,7 @@ final fileprivate class MapSink<SourceType, O : ObserverType> : Sink<O>, Observe
             do {
                 let mappedElement = try _transform(element)
                 forwardOn(.next(mappedElement))
-            }
-            catch let e {
+            } catch let e {
                 forwardOn(.error(e))
                 dispose()
             }
@@ -58,7 +57,7 @@ final fileprivate class MapSink<SourceType, O : ObserverType> : Sink<O>, Observe
 }
 
 #if TRACE_RESOURCES
-    fileprivate var _numberOfMapOperators = AtomicInt(0)
+    private var _numberOfMapOperators = AtomicInt(0)
     extension Resources {
         public static var numberOfMapOperators: Int32 {
             return _numberOfMapOperators.load()
@@ -70,7 +69,7 @@ internal func _map<Element, R>(source: Observable<Element>, transform: @escaping
     return Map(source: source, transform: transform)
 }
 
-final fileprivate class Map<SourceType, ResultType>: Producer<ResultType> {
+final private class Map<SourceType, ResultType>: Producer<ResultType> {
     typealias Transform = (SourceType) throws -> ResultType
 
     private let _source: Observable<SourceType>
@@ -82,7 +81,7 @@ final fileprivate class Map<SourceType, ResultType>: Producer<ResultType> {
         _transform = transform
 
 #if TRACE_RESOURCES
-        let _ = _numberOfMapOperators.increment()
+        _ = _numberOfMapOperators.increment()
 #endif
     }
 
@@ -93,7 +92,7 @@ final fileprivate class Map<SourceType, ResultType>: Producer<ResultType> {
             return try selector(r)
         })
     }
-    
+
     override func run<O: ObserverType>(_ observer: O, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where O.E == ResultType {
         let sink = MapSink(transform: _transform, observer: observer, cancel: cancel)
         let subscription = _source.subscribe(sink)
@@ -102,7 +101,7 @@ final fileprivate class Map<SourceType, ResultType>: Producer<ResultType> {
 
     #if TRACE_RESOURCES
     deinit {
-        let _ = _numberOfMapOperators.decrement()
+        _ = _numberOfMapOperators.decrement()
     }
     #endif
 }
diff --git a/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Observables/Materialize.swift b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Observables/Materialize.swift
index cf19b6da9b..18e549d979 100644
--- a/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Observables/Materialize.swift
+++ b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Observables/Materialize.swift
@@ -18,7 +18,7 @@ extension ObservableType {
 }
 
 fileprivate final class MaterializeSink<Element, O: ObserverType>: Sink<O>, ObserverType where O.E == Event<Element> {
-    
+
     func on(_ event: Event<Element>) {
         forwardOn(.next(event))
         if event.isStopEvent {
@@ -28,9 +28,9 @@ fileprivate final class MaterializeSink<Element, O: ObserverType>: Sink<O>, Obse
     }
 }
 
-final fileprivate class Materialize<Element>: Producer<Event<Element>> {
+final private class Materialize<Element>: Producer<Event<Element>> {
     private let _source: Observable<Element>
-    
+
     init(source: Observable<Element>) {
         _source = source
     }
diff --git a/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Observables/Merge.swift b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Observables/Merge.swift
index b2f9a0d9fc..3790efd647 100644
--- a/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Observables/Merge.swift
+++ b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Observables/Merge.swift
@@ -40,7 +40,7 @@ extension ObservableType {
     }
 }
 
-extension ObservableType where E : ObservableConvertibleType {
+extension ObservableType where E: ObservableConvertibleType {
 
     /**
      Merges elements from all observable sequences in the given enumerable sequence into a single observable sequence.
@@ -67,7 +67,7 @@ extension ObservableType where E : ObservableConvertibleType {
     }
 }
 
-extension ObservableType where E : ObservableConvertibleType {
+extension ObservableType where E: ObservableConvertibleType {
 
     /**
      Concatenates all inner observable sequences, as long as the previous observable sequence terminated successfully.
@@ -129,7 +129,7 @@ extension ObservableType {
      
      - returns: An observable sequence that contains the elements of each observed inner sequence, in sequential order.
      */
-    
+
     public func concatMap<O: ObservableConvertibleType>(_ selector: @escaping (E) throws -> O)
         -> Observable<O.E> {
             return ConcatMap(source: asObservable(), selector: selector)
@@ -137,25 +137,23 @@ extension ObservableType {
 }
 
 fileprivate final class MergeLimitedSinkIter<SourceElement, SourceSequence: ObservableConvertibleType, Observer: ObserverType>
-    : ObserverType
-    , LockOwnerType
-    , SynchronizedOnType where SourceSequence.E == Observer.E {
+    : ObserverType, LockOwnerType, SynchronizedOnType where SourceSequence.E == Observer.E {
     typealias E = Observer.E
     typealias DisposeKey = CompositeDisposable.DisposeKey
     typealias Parent = MergeLimitedSink<SourceElement, SourceSequence, Observer>
-    
+
     private let _parent: Parent
     private let _disposeKey: DisposeKey
 
     var _lock: RecursiveLock {
         return _parent._lock
     }
-    
+
     init(parent: Parent, disposeKey: DisposeKey) {
         _parent = parent
         _disposeKey = disposeKey
     }
-    
+
     func on(_ event: Event<E>) {
         synchronizedOn(event)
     }
@@ -171,10 +169,9 @@ fileprivate final class MergeLimitedSinkIter<SourceElement, SourceSequence: Obse
             _parent._group.remove(for: _disposeKey)
             if let next = _parent._queue.dequeue() {
                 _parent.subscribe(next, group: _parent._group)
-            }
-            else {
+            } else {
                 _parent._activeCount = _parent._activeCount - 1
-                
+
                 if _parent._stopped && _parent._activeCount == 0 {
                     _parent.forwardOn(.completed)
                     _parent.dispose()
@@ -186,29 +183,28 @@ fileprivate final class MergeLimitedSinkIter<SourceElement, SourceSequence: Obse
 
 fileprivate final class ConcatMapSink<SourceElement, SourceSequence: ObservableConvertibleType, Observer: ObserverType>: MergeLimitedSink<SourceElement, SourceSequence, Observer> where Observer.E == SourceSequence.E {
     typealias Selector = (SourceElement) throws -> SourceSequence
-    
+
     private let _selector: Selector
-    
+
     init(selector: @escaping Selector, observer: Observer, cancel: Cancelable) {
         _selector = selector
         super.init(maxConcurrent: 1, observer: observer, cancel: cancel)
     }
-    
+
     override func performMap(_ element: SourceElement) throws -> SourceSequence {
         return try _selector(element)
     }
 }
 
 fileprivate final class MergeLimitedBasicSink<SourceSequence: ObservableConvertibleType, Observer: ObserverType>: MergeLimitedSink<SourceSequence, SourceSequence, Observer> where Observer.E == SourceSequence.E {
-    
+
     override func performMap(_ element: SourceSequence) throws -> SourceSequence {
         return element
     }
 }
 
-fileprivate class MergeLimitedSink<SourceElement, SourceSequence: ObservableConvertibleType, Observer: ObserverType>
-    : Sink<Observer>
-    , ObserverType where Observer.E == SourceSequence.E  {
+private class MergeLimitedSink<SourceElement, SourceSequence: ObservableConvertibleType, Observer: ObserverType>
+    : Sink<Observer>, ObserverType where Observer.E == SourceSequence.E {
     typealias QueueType = Queue<SourceSequence>
 
     let _maxConcurrent: Int
@@ -219,36 +215,36 @@ fileprivate class MergeLimitedSink<SourceElement, SourceSequence: ObservableConv
     var _stopped = false
     var _activeCount = 0
     var _queue = QueueType(capacity: 2)
-    
+
     let _sourceSubscription = SingleAssignmentDisposable()
     let _group = CompositeDisposable()
-    
+
     init(maxConcurrent: Int, observer: Observer, cancel: Cancelable) {
         _maxConcurrent = maxConcurrent
         super.init(observer: observer, cancel: cancel)
     }
-    
+
     func run(_ source: Observable<SourceElement>) -> Disposable {
-        let _ = _group.insert(_sourceSubscription)
-        
+        _ = _group.insert(_sourceSubscription)
+
         let disposable = source.subscribe(self)
         _sourceSubscription.setDisposable(disposable)
         return _group
     }
-    
+
     func subscribe(_ innerSource: SourceSequence, group: CompositeDisposable) {
         let subscription = SingleAssignmentDisposable()
-        
+
         let key = group.insert(subscription)
-        
+
         if let key = key {
             let observer = MergeLimitedSinkIter(parent: self, disposeKey: key)
-            
+
             let disposable = innerSource.asObservable().subscribe(observer)
             subscription.setDisposable(disposable)
         }
     }
-    
+
     func performMap(_ element: SourceElement) throws -> SourceSequence {
         rxAbstractMethod()
     }
@@ -260,8 +256,7 @@ fileprivate class MergeLimitedSink<SourceElement, SourceSequence: ObservableConv
             if _activeCount < _maxConcurrent {
                 _activeCount += 1
                 subscribe = true
-            }
-            else {
+            } else {
                 do {
                     let value = try performMap(element)
                     _queue.enqueue(value)
@@ -302,8 +297,7 @@ fileprivate class MergeLimitedSink<SourceElement, SourceSequence: ObservableConv
             if _activeCount == 0 {
                 forwardOn(.completed)
                 dispose()
-            }
-            else {
+            } else {
                 _sourceSubscription.dispose()
             }
 
@@ -312,15 +306,15 @@ fileprivate class MergeLimitedSink<SourceElement, SourceSequence: ObservableConv
     }
 }
 
-final fileprivate class MergeLimited<SourceSequence: ObservableConvertibleType> : Producer<SourceSequence.E> {
+final private class MergeLimited<SourceSequence: ObservableConvertibleType> : Producer<SourceSequence.E> {
     private let _source: Observable<SourceSequence>
     private let _maxConcurrent: Int
-    
+
     init(source: Observable<SourceSequence>, maxConcurrent: Int) {
         _source = source
         _maxConcurrent = maxConcurrent
     }
-    
+
     override func run<O: ObserverType>(_ observer: O, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where O.E == SourceSequence.E {
         let sink = MergeLimitedBasicSink<SourceSequence, O>(maxConcurrent: _maxConcurrent, observer: observer, cancel: cancel)
         let subscription = sink.run(_source)
@@ -378,7 +372,7 @@ fileprivate final class MergeSinkIter<SourceElement, SourceSequence: ObservableC
     typealias Parent = MergeSink<SourceElement, SourceSequence, Observer>
     typealias DisposeKey = CompositeDisposable.DisposeKey
     typealias E = Observer.E
-    
+
     private let _parent: Parent
     private let _disposeKey: DisposeKey
 
@@ -386,7 +380,7 @@ fileprivate final class MergeSinkIter<SourceElement, SourceSequence: ObservableC
         _parent = parent
         _disposeKey = disposeKey
     }
-    
+
     func on(_ event: Event<E>) {
         _parent._lock.lock(); defer { _parent._lock.unlock() } // lock {
             switch event {
@@ -404,10 +398,8 @@ fileprivate final class MergeSinkIter<SourceElement, SourceSequence: ObservableC
     }
 }
 
-
-fileprivate class MergeSink<SourceElement, SourceSequence: ObservableConvertibleType, Observer: ObserverType>
-    : Sink<Observer>
-    , ObserverType where Observer.E == SourceSequence.E {
+private class MergeSink<SourceElement, SourceSequence: ObservableConvertibleType, Observer: ObserverType>
+    : Sink<Observer>, ObserverType where Observer.E == SourceSequence.E {
     typealias ResultType = Observer.E
     typealias Element = SourceElement
 
@@ -443,15 +435,14 @@ fileprivate class MergeSink<SourceElement, SourceSequence: ObservableConvertible
                 let value = try performMap(element)
                 _activeCount += 1
                 return value
-            }
-            catch let e {
+            } catch let e {
                 forwardOn(.error(e))
                 dispose()
                 return nil
             }
         // }
     }
-    
+
     func on(_ event: Event<SourceElement>) {
         switch event {
         case .next(let element):
@@ -500,31 +491,31 @@ fileprivate class MergeSink<SourceElement, SourceSequence: ObservableConvertible
             self.dispose()
         }
     }
-    
+
     func run(_ source: Observable<SourceElement>) -> Disposable {
-        let _ = _group.insert(_sourceSubscription)
+        _ = _group.insert(_sourceSubscription)
 
         let subscription = source.subscribe(self)
         _sourceSubscription.setDisposable(subscription)
-        
+
         return _group
     }
 }
 
 // MARK: Producers
 
-final fileprivate class FlatMap<SourceElement, SourceSequence: ObservableConvertibleType>: Producer<SourceSequence.E> {
+final private class FlatMap<SourceElement, SourceSequence: ObservableConvertibleType>: Producer<SourceSequence.E> {
     typealias Selector = (SourceElement) throws -> SourceSequence
 
     private let _source: Observable<SourceElement>
-    
+
     private let _selector: Selector
 
     init(source: Observable<SourceElement>, selector: @escaping Selector) {
         _source = source
         _selector = selector
     }
-    
+
     override func run<O: ObserverType>(_ observer: O, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where O.E == SourceSequence.E {
         let sink = FlatMapSink(selector: _selector, observer: observer, cancel: cancel)
         let subscription = sink.run(_source)
@@ -532,7 +523,7 @@ final fileprivate class FlatMap<SourceElement, SourceSequence: ObservableConvert
     }
 }
 
-final fileprivate class FlatMapFirst<SourceElement, SourceSequence: ObservableConvertibleType>: Producer<SourceSequence.E> {
+final private class FlatMapFirst<SourceElement, SourceSequence: ObservableConvertibleType>: Producer<SourceSequence.E> {
     typealias Selector = (SourceElement) throws -> SourceSequence
 
     private let _source: Observable<SourceElement>
@@ -553,15 +544,15 @@ final fileprivate class FlatMapFirst<SourceElement, SourceSequence: ObservableCo
 
 final class ConcatMap<SourceElement, SourceSequence: ObservableConvertibleType>: Producer<SourceSequence.E> {
     typealias Selector = (SourceElement) throws -> SourceSequence
-    
+
     private let _source: Observable<SourceElement>
     private let _selector: Selector
-    
+
     init(source: Observable<SourceElement>, selector: @escaping Selector) {
         _source = source
         _selector = selector
     }
-    
+
     override func run<O: ObserverType>(_ observer: O, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where O.E == SourceSequence.E {
         let sink = ConcatMapSink<SourceElement, SourceSequence, O>(selector: _selector, observer: observer, cancel: cancel)
         let subscription = sink.run(_source)
@@ -575,7 +566,7 @@ final class Merge<SourceSequence: ObservableConvertibleType> : Producer<SourceSe
     init(source: Observable<SourceSequence>) {
         _source = source
     }
-    
+
     override func run<O: ObserverType>(_ observer: O, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where O.E == SourceSequence.E {
         let sink = MergeBasicSink<SourceSequence, O>(observer: observer, cancel: cancel)
         let subscription = sink.run(_source)
@@ -583,7 +574,7 @@ final class Merge<SourceSequence: ObservableConvertibleType> : Producer<SourceSe
     }
 }
 
-final fileprivate class MergeArray<Element> : Producer<Element> {
+final private class MergeArray<Element> : Producer<Element> {
     private let _sources: [Observable<Element>]
 
     init(sources: [Observable<Element>]) {
diff --git a/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Observables/Multicast.swift b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Observables/Multicast.swift
index a027c4f69c..5eaf9e9810 100644
--- a/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Observables/Multicast.swift
+++ b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Observables/Multicast.swift
@@ -10,8 +10,7 @@
  Represents an observable wrapper that can be connected and disconnected from its underlying observable sequence.
  */
 public class ConnectableObservable<Element>
-    : Observable<Element>
-    , ConnectableObservableType {
+    : Observable<Element>, ConnectableObservableType {
 
     /**
      Connects the observable wrapper to its source. All subscribed observers will receive values from the underlying observable sequence as long as the connection is established.
@@ -24,7 +23,7 @@ public class ConnectableObservable<Element>
 }
 
 extension ObservableType {
-    
+
     /**
     Multicasts the source sequence notifications through an instantiated subject into all uses of the sequence within a selector function. 
     
@@ -49,7 +48,7 @@ extension ObservableType {
 }
 
 extension ObservableType {
-    
+
     /**
     Returns a connectable observable sequence that shares a single subscription to the underlying sequence. 
     
@@ -97,7 +96,7 @@ extension ObservableType {
 }
 
 extension ConnectableObservableType {
-    
+
     /**
     Returns an observable sequence that stays connected to the source as long as there is at least one subscription to the observable sequence.
 
@@ -147,13 +146,13 @@ extension ObservableType {
     }
 }
 
-final fileprivate class Connection<S: SubjectType> : ObserverType, Disposable {
+final private class Connection<S: SubjectType> : ObserverType, Disposable {
     typealias E = S.SubjectObserverType.E
 
     private var _lock: RecursiveLock
     // state
     private var _parent: ConnectableObservableAdapter<S>?
-    private var _subscription : Disposable?
+    private var _subscription: Disposable?
     private var _subjectObserver: S.SubjectObserverType
 
     private var _disposed: Bool = false
@@ -194,7 +193,7 @@ final fileprivate class Connection<S: SubjectType> : ObserverType, Disposable {
     }
 }
 
-final fileprivate class ConnectableObservableAdapter<S: SubjectType>
+final private class ConnectableObservableAdapter<S: SubjectType>
     : ConnectableObservable<S.E> {
     typealias ConnectionType = Connection<S>
 
@@ -239,14 +238,13 @@ final fileprivate class ConnectableObservableAdapter<S: SubjectType>
         return subject
     }
 
-    override func subscribe<O : ObserverType>(_ observer: O) -> Disposable where O.E == S.E {
+    override func subscribe<O: ObserverType>(_ observer: O) -> Disposable where O.E == S.E {
         return self.lazySubject.subscribe(observer)
     }
 }
 
-final fileprivate class RefCountSink<CO: ConnectableObservableType, O: ObserverType>
-    : Sink<O>
-    , ObserverType where CO.E == O.E {
+final private class RefCountSink<CO: ConnectableObservableType, O: ObserverType>
+    : Sink<O>, ObserverType where CO.E == O.E {
     typealias Element = O.E
     typealias Parent = RefCount<CO>
 
@@ -272,8 +270,7 @@ final fileprivate class RefCountSink<CO: ConnectableObservableType, O: ObserverT
         if _parent._count == 0 {
             _parent._count = 1
             _parent._connectableSubscription = _parent._source.connect()
-        }
-        else {
+        } else {
             _parent._count = _parent._count + 1
         }
         // }
@@ -292,11 +289,9 @@ final fileprivate class RefCountSink<CO: ConnectableObservableType, O: ObserverT
 
                 connectableSubscription.dispose()
                 self._parent._connectableSubscription = nil
-            }
-            else if self._parent._count > 1 {
+            } else if self._parent._count > 1 {
                 self._parent._count = self._parent._count - 1
-            }
-            else {
+            } else {
                 rxFatalError("Something went wrong with RefCount disposing mechanism")
             }
             // }
@@ -324,7 +319,7 @@ final fileprivate class RefCountSink<CO: ConnectableObservableType, O: ObserverT
     }
 }
 
-final fileprivate class RefCount<CO: ConnectableObservableType>: Producer<CO.E> {
+final private class RefCount<CO: ConnectableObservableType>: Producer<CO.E> {
     fileprivate let _lock = RecursiveLock()
 
     // state
@@ -345,37 +340,36 @@ final fileprivate class RefCount<CO: ConnectableObservableType>: Producer<CO.E>
     }
 }
 
-final fileprivate class MulticastSink<S: SubjectType, O: ObserverType>: Sink<O>, ObserverType {
+final private class MulticastSink<S: SubjectType, O: ObserverType>: Sink<O>, ObserverType {
     typealias Element = O.E
     typealias ResultType = Element
     typealias MutlicastType = Multicast<S, O.E>
-    
+
     private let _parent: MutlicastType
-    
+
     init(parent: MutlicastType, observer: O, cancel: Cancelable) {
         _parent = parent
         super.init(observer: observer, cancel: cancel)
     }
-    
+
     func run() -> Disposable {
         do {
             let subject = try _parent._subjectSelector()
             let connectable = ConnectableObservableAdapter(source: _parent._source, makeSubject: { subject })
-            
+
             let observable = try _parent._selector(connectable)
-            
+
             let subscription = observable.subscribe(self)
             let connection = connectable.connect()
-                
+
             return Disposables.create(subscription, connection)
-        }
-        catch let e {
+        } catch let e {
             forwardOn(.error(e))
             dispose()
             return Disposables.create()
         }
     }
-    
+
     func on(_ event: Event<ResultType>) {
         forwardOn(event)
         switch event {
@@ -386,20 +380,20 @@ final fileprivate class MulticastSink<S: SubjectType, O: ObserverType>: Sink<O>,
     }
 }
 
-final fileprivate class Multicast<S: SubjectType, R>: Producer<R> {
+final private class Multicast<S: SubjectType, R>: Producer<R> {
     typealias SubjectSelectorType = () throws -> S
     typealias SelectorType = (Observable<S.E>) throws -> Observable<R>
-    
+
     fileprivate let _source: Observable<S.SubjectObserverType.E>
     fileprivate let _subjectSelector: SubjectSelectorType
     fileprivate let _selector: SelectorType
-    
+
     init(source: Observable<S.SubjectObserverType.E>, subjectSelector: @escaping SubjectSelectorType, selector: @escaping SelectorType) {
         _source = source
         _subjectSelector = subjectSelector
         _selector = selector
     }
-    
+
     override func run<O: ObserverType>(_ observer: O, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where O.E == R {
         let sink = MulticastSink(parent: self, observer: observer, cancel: cancel)
         let subscription = sink.run()
diff --git a/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Observables/Never.swift b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Observables/Never.swift
index d98a7a8fa4..77ac7303b4 100644
--- a/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Observables/Never.swift
+++ b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Observables/Never.swift
@@ -20,8 +20,8 @@ extension ObservableType {
     }
 }
 
-final fileprivate class NeverProducer<Element> : Producer<Element> {
-    override func subscribe<O : ObserverType>(_ observer: O) -> Disposable where O.E == Element {
+final private class NeverProducer<Element> : Producer<Element> {
+    override func subscribe<O: ObserverType>(_ observer: O) -> Disposable where O.E == Element {
         return Disposables.create()
     }
 }
diff --git a/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Observables/ObserveOn.swift b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Observables/ObserveOn.swift
index 82147a0fb2..552ce7dc2d 100644
--- a/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Observables/ObserveOn.swift
+++ b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Observables/ObserveOn.swift
@@ -23,49 +23,48 @@ extension ObservableType {
         -> Observable<E> {
             if let scheduler = scheduler as? SerialDispatchQueueScheduler {
                 return ObserveOnSerialDispatchQueue(source: self.asObservable(), scheduler: scheduler)
-            }
-            else {
+            } else {
                 return ObserveOn(source: self.asObservable(), scheduler: scheduler)
             }
     }
 }
 
-final fileprivate class ObserveOn<E> : Producer<E> {
+final private class ObserveOn<E> : Producer<E> {
     let scheduler: ImmediateSchedulerType
     let source: Observable<E>
-    
+
     init(source: Observable<E>, scheduler: ImmediateSchedulerType) {
         self.scheduler = scheduler
         self.source = source
-        
+
 #if TRACE_RESOURCES
-        let _ = Resources.incrementTotal()
+        _ = Resources.incrementTotal()
 #endif
     }
-    
-    override func run<O : ObserverType>(_ observer: O, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where O.E == E {
+
+    override func run<O: ObserverType>(_ observer: O, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where O.E == E {
         let sink = ObserveOnSink(scheduler: scheduler, observer: observer, cancel: cancel)
         let subscription = source.subscribe(sink)
         return (sink: sink, subscription: subscription)
     }
-    
+
 #if TRACE_RESOURCES
     deinit {
-        let _ = Resources.decrementTotal()
+        _ = Resources.decrementTotal()
     }
 #endif
 }
 
-enum ObserveOnState : Int32 {
+enum ObserveOnState: Int32 {
     // pump is not running
     case stopped = 0
     // pump is running
     case running = 1
 }
 
-final fileprivate class ObserveOnSink<O: ObserverType> : ObserverBase<O.E> {
+final private class ObserveOnSink<O: ObserverType> : ObserverBase<O.E> {
     typealias E = O.E
-    
+
     let _scheduler: ImmediateSchedulerType
 
     var _lock = SpinLock()
@@ -87,7 +86,7 @@ final fileprivate class ObserveOnSink<O: ObserverType> : ObserverBase<O.E> {
     override func onCore(_ event: Event<E>) {
         let shouldStart = _lock.calculateLocked { () -> Bool in
             self._queue.enqueue(event)
-            
+
             switch self._state {
             case .stopped:
                 self._state = .running
@@ -96,18 +95,17 @@ final fileprivate class ObserveOnSink<O: ObserverType> : ObserverBase<O.E> {
                 return false
             }
         }
-        
+
         if shouldStart {
             _scheduleDisposable.disposable = self._scheduler.scheduleRecursive((), action: self.run)
         }
     }
-    
-    func run(_ state: (), _ recurse: (()) -> ()) {
+
+    func run(_ state: (), _ recurse: (()) -> Void) {
         let (nextEvent, observer) = self._lock.calculateLocked { () -> (Event<E>?, O) in
             if !self._queue.isEmpty {
                 return (self._queue.dequeue(), self._observer)
-            }
-            else {
+            } else {
                 self._state = .stopped
                 return (nil, self._observer)
             }
@@ -118,8 +116,7 @@ final fileprivate class ObserveOnSink<O: ObserverType> : ObserverBase<O.E> {
             if nextEvent.isStopEvent {
                 dispose()
             }
-        }
-        else {
+        } else {
             return
         }
 
@@ -134,14 +131,13 @@ final fileprivate class ObserveOnSink<O: ObserverType> : ObserverBase<O.E> {
         _lock.lock(); defer { _lock.unlock() } // {
             if !self._queue.isEmpty {
                 return true
-            }
-            else {
+            } else {
                 self._state = .stopped
                 return false
             }
         // }
     }
-    
+
     override func dispose() {
         super.dispose()
 
@@ -151,7 +147,7 @@ final fileprivate class ObserveOnSink<O: ObserverType> : ObserverBase<O.E> {
 }
 
 #if TRACE_RESOURCES
-    fileprivate var _numberOfSerialDispatchQueueObservables = AtomicInt(0)
+    private var _numberOfSerialDispatchQueueObservables = AtomicInt(0)
     extension Resources {
         /**
          Counts number of `SerialDispatchQueueObservables`.
@@ -164,7 +160,7 @@ final fileprivate class ObserveOnSink<O: ObserverType> : ObserverBase<O.E> {
     }
 #endif
 
-final fileprivate class ObserveOnSerialDispatchQueueSink<O: ObserverType> : ObserverBase<O.E> {
+final private class ObserveOnSerialDispatchQueueSink<O: ObserverType> : ObserverBase<O.E> {
     let scheduler: SerialDispatchQueueScheduler
     let observer: O
 
@@ -192,7 +188,7 @@ final fileprivate class ObserveOnSerialDispatchQueueSink<O: ObserverType> : Obse
     }
 
     override func onCore(_ event: Event<E>) {
-        let _ = self.scheduler.schedule((self, event), action: cachedScheduleLambda!)
+        _ = self.scheduler.schedule((self, event), action: cachedScheduleLambda!)
     }
 
     override func dispose() {
@@ -202,7 +198,7 @@ final fileprivate class ObserveOnSerialDispatchQueueSink<O: ObserverType> : Obse
     }
 }
 
-final fileprivate class ObserveOnSerialDispatchQueue<E> : Producer<E> {
+final private class ObserveOnSerialDispatchQueue<E> : Producer<E> {
     let scheduler: SerialDispatchQueueScheduler
     let source: Observable<E>
 
@@ -211,12 +207,12 @@ final fileprivate class ObserveOnSerialDispatchQueue<E> : Producer<E> {
         self.source = source
 
         #if TRACE_RESOURCES
-            let _ = Resources.incrementTotal()
-            let _ = _numberOfSerialDispatchQueueObservables.increment()
+            _ = Resources.incrementTotal()
+            _ = _numberOfSerialDispatchQueueObservables.increment()
         #endif
     }
 
-    override func run<O : ObserverType>(_ observer: O, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where O.E == E {
+    override func run<O: ObserverType>(_ observer: O, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where O.E == E {
         let sink = ObserveOnSerialDispatchQueueSink(scheduler: scheduler, observer: observer, cancel: cancel)
         let subscription = source.subscribe(sink)
         return (sink: sink, subscription: subscription)
@@ -224,8 +220,8 @@ final fileprivate class ObserveOnSerialDispatchQueue<E> : Producer<E> {
 
     #if TRACE_RESOURCES
     deinit {
-        let _ = Resources.decrementTotal()
-        let _ = _numberOfSerialDispatchQueueObservables.decrement()
+        _ = Resources.decrementTotal()
+        _ = _numberOfSerialDispatchQueueObservables.decrement()
     }
     #endif
 }
diff --git a/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Observables/Optional.swift b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Observables/Optional.swift
index 8cd6a16baf..4f40fe14e3 100644
--- a/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Observables/Optional.swift
+++ b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Observables/Optional.swift
@@ -33,7 +33,7 @@ extension ObservableType {
     }
 }
 
-final fileprivate class ObservableOptionalScheduledSink<O: ObserverType> : Sink<O> {
+final private class ObservableOptionalScheduledSink<O: ObserverType> : Sink<O> {
     typealias E = O.E
     typealias Parent = ObservableOptionalScheduled<E>
 
@@ -62,7 +62,7 @@ final fileprivate class ObservableOptionalScheduledSink<O: ObserverType> : Sink<
     }
 }
 
-final fileprivate class ObservableOptionalScheduled<E> : Producer<E> {
+final private class ObservableOptionalScheduled<E> : Producer<E> {
     fileprivate let _optional: E?
     fileprivate let _scheduler: ImmediateSchedulerType
 
@@ -71,21 +71,21 @@ final fileprivate class ObservableOptionalScheduled<E> : Producer<E> {
         _scheduler = scheduler
     }
 
-    override func run<O : ObserverType>(_ observer: O, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where O.E == E {
+    override func run<O: ObserverType>(_ observer: O, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where O.E == E {
         let sink = ObservableOptionalScheduledSink(parent: self, observer: observer, cancel: cancel)
         let subscription = sink.run()
         return (sink: sink, subscription: subscription)
     }
 }
 
-final fileprivate class ObservableOptional<E>: Producer<E> {
+final private class ObservableOptional<E>: Producer<E> {
     private let _optional: E?
-    
+
     init(optional: E?) {
         _optional = optional
     }
-    
-    override func subscribe<O : ObserverType>(_ observer: O) -> Disposable where O.E == E {
+
+    override func subscribe<O: ObserverType>(_ observer: O) -> Disposable where O.E == E {
         if let element = _optional {
             observer.on(.next(element))
         }
diff --git a/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Observables/Producer.swift b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Observables/Producer.swift
index 2b60fbf8ed..a1199e9796 100644
--- a/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Observables/Producer.swift
+++ b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Observables/Producer.swift
@@ -10,8 +10,8 @@ class Producer<Element> : Observable<Element> {
     override init() {
         super.init()
     }
-    
-    override func subscribe<O : ObserverType>(_ observer: O) -> Disposable where O.E == Element {
+
+    override func subscribe<O: ObserverType>(_ observer: O) -> Disposable where O.E == Element {
         if !CurrentThreadScheduler.isScheduleRequired {
             // The returned disposable needs to release all references once it was disposed.
             let disposer = SinkDisposer()
@@ -19,8 +19,7 @@ class Producer<Element> : Observable<Element> {
             disposer.setSinkAndSubscription(sink: sinkAndSubscription.sink, subscription: sinkAndSubscription.subscription)
 
             return disposer
-        }
-        else {
+        } else {
             return CurrentThreadScheduler.instance.schedule(()) { _ in
                 let disposer = SinkDisposer()
                 let sinkAndSubscription = self.run(observer, cancel: disposer)
@@ -30,8 +29,8 @@ class Producer<Element> : Observable<Element> {
             }
         }
     }
-    
-    func run<O : ObserverType>(_ observer: O, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where O.E == Element {
+
+    func run<O: ObserverType>(_ observer: O, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where O.E == Element {
         rxAbstractMethod()
     }
 }
@@ -43,8 +42,8 @@ fileprivate final class SinkDisposer: Cancelable {
     }
 
     private var _state = AtomicInt(0)
-    private var _sink: Disposable? = nil
-    private var _subscription: Disposable? = nil
+    private var _sink: Disposable?
+    private var _subscription: Disposable?
 
     var isDisposed: Bool {
         return _state.isFlagSet(DisposeState.disposed.rawValue)
@@ -66,7 +65,7 @@ fileprivate final class SinkDisposer: Cancelable {
             _subscription = nil
         }
     }
-    
+
     func dispose() {
         let previousState = _state.fetchOr(DisposeState.disposed.rawValue)
 
diff --git a/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Observables/Range.swift b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Observables/Range.swift
index 9b85554eb7..8d455cae4f 100644
--- a/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Observables/Range.swift
+++ b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Observables/Range.swift
@@ -6,7 +6,7 @@
 //  Copyright © 2015 Krunoslav Zaher. All rights reserved.
 //
 
-extension ObservableType where E : RxAbstractInteger {
+extension ObservableType where E: RxAbstractInteger {
     /**
      Generates an observable sequence of integral numbers within a specified range, using the specified scheduler to generate and send out observer messages.
 
@@ -22,7 +22,7 @@ extension ObservableType where E : RxAbstractInteger {
     }
 }
 
-final fileprivate class RangeProducer<E: RxAbstractInteger> : Producer<E> {
+final private class RangeProducer<E: RxAbstractInteger> : Producer<E> {
     fileprivate let _start: E
     fileprivate let _count: E
     fileprivate let _scheduler: ImmediateSchedulerType
@@ -40,31 +40,30 @@ final fileprivate class RangeProducer<E: RxAbstractInteger> : Producer<E> {
         _count = count
         _scheduler = scheduler
     }
-    
-    override func run<O : ObserverType>(_ observer: O, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where O.E == E {
+
+    override func run<O: ObserverType>(_ observer: O, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where O.E == E {
         let sink = RangeSink(parent: self, observer: observer, cancel: cancel)
         let subscription = sink.run()
         return (sink: sink, subscription: subscription)
     }
 }
 
-final fileprivate class RangeSink<O: ObserverType> : Sink<O> where O.E: RxAbstractInteger {
+final private class RangeSink<O: ObserverType> : Sink<O> where O.E: RxAbstractInteger {
     typealias Parent = RangeProducer<O.E>
-    
+
     private let _parent: Parent
-    
+
     init(parent: Parent, observer: O, cancel: Cancelable) {
         _parent = parent
         super.init(observer: observer, cancel: cancel)
     }
-    
+
     func run() -> Disposable {
         return _parent._scheduler.scheduleRecursive(0 as O.E) { i, recurse in
             if i < self._parent._count {
                 self.forwardOn(.next(self._parent._start + i))
                 recurse(i + 1)
-            }
-            else {
+            } else {
                 self.forwardOn(.completed)
                 self.dispose()
             }
diff --git a/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Observables/Reduce.swift b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Observables/Reduce.swift
index 3e4a7b9de9..964d6c6632 100644
--- a/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Observables/Reduce.swift
+++ b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Observables/Reduce.swift
@@ -6,7 +6,6 @@
 //  Copyright © 2015 Krunoslav Zaher. All rights reserved.
 //
 
-
 extension ObservableType {
     /**
     Applies an `accumulator` function over an observable sequence, returning the result of the aggregation as a single element in the result sequence. The specified `seed` value is used as the initial accumulator value.
@@ -42,27 +41,26 @@ extension ObservableType {
     }
 }
 
-final fileprivate class ReduceSink<SourceType, AccumulateType, O: ObserverType> : Sink<O>, ObserverType {
+final private class ReduceSink<SourceType, AccumulateType, O: ObserverType> : Sink<O>, ObserverType {
     typealias ResultType = O.E
     typealias Parent = Reduce<SourceType, AccumulateType, ResultType>
-    
+
     private let _parent: Parent
     private var _accumulation: AccumulateType
-    
+
     init(parent: Parent, observer: O, cancel: Cancelable) {
         _parent = parent
         _accumulation = parent._seed
-        
+
         super.init(observer: observer, cancel: cancel)
     }
-    
+
     func on(_ event: Event<SourceType>) {
         switch event {
         case .next(let value):
             do {
                 _accumulation = try _parent._accumulator(_accumulation, value)
-            }
-            catch let e {
+            } catch let e {
                 forwardOn(.error(e))
                 dispose()
             }
@@ -75,8 +73,7 @@ final fileprivate class ReduceSink<SourceType, AccumulateType, O: ObserverType>
                 forwardOn(.next(result))
                 forwardOn(.completed)
                 dispose()
-            }
-            catch let e {
+            } catch let e {
                 forwardOn(.error(e))
                 dispose()
             }
@@ -84,15 +81,15 @@ final fileprivate class ReduceSink<SourceType, AccumulateType, O: ObserverType>
     }
 }
 
-final fileprivate class Reduce<SourceType, AccumulateType, ResultType> : Producer<ResultType> {
+final private class Reduce<SourceType, AccumulateType, ResultType> : Producer<ResultType> {
     typealias AccumulatorType = (AccumulateType, SourceType) throws -> AccumulateType
     typealias ResultSelectorType = (AccumulateType) throws -> ResultType
-    
+
     fileprivate let _source: Observable<SourceType>
     fileprivate let _seed: AccumulateType
     fileprivate let _accumulator: AccumulatorType
     fileprivate let _mapResult: ResultSelectorType
-    
+
     init(source: Observable<SourceType>, seed: AccumulateType, accumulator: @escaping AccumulatorType, mapResult: @escaping ResultSelectorType) {
         _source = source
         _seed = seed
@@ -106,4 +103,3 @@ final fileprivate class Reduce<SourceType, AccumulateType, ResultType> : Produce
         return (sink: sink, subscription: subscription)
     }
 }
-
diff --git a/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Observables/Repeat.swift b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Observables/Repeat.swift
index 6892ec128b..f66adb29d4 100644
--- a/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Observables/Repeat.swift
+++ b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Observables/Repeat.swift
@@ -21,16 +21,16 @@ extension ObservableType {
     }
 }
 
-final fileprivate class RepeatElement<Element> : Producer<Element> {
+final private class RepeatElement<Element> : Producer<Element> {
     fileprivate let _element: Element
     fileprivate let _scheduler: ImmediateSchedulerType
-    
+
     init(element: Element, scheduler: ImmediateSchedulerType) {
         _element = element
         _scheduler = scheduler
     }
-    
-    override func run<O : ObserverType>(_ observer: O, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where O.E == Element {
+
+    override func run<O: ObserverType>(_ observer: O, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where O.E == Element {
         let sink = RepeatElementSink(parent: self, observer: observer, cancel: cancel)
         let subscription = sink.run()
 
@@ -38,16 +38,16 @@ final fileprivate class RepeatElement<Element> : Producer<Element> {
     }
 }
 
-final fileprivate class RepeatElementSink<O: ObserverType> : Sink<O> {
+final private class RepeatElementSink<O: ObserverType> : Sink<O> {
     typealias Parent = RepeatElement<O.E>
-    
+
     private let _parent: Parent
-    
+
     init(parent: Parent, observer: O, cancel: Cancelable) {
         _parent = parent
         super.init(observer: observer, cancel: cancel)
     }
-    
+
     func run() -> Disposable {
         return _parent._scheduler.scheduleRecursive(_parent._element) { e, recurse in
             self.forwardOn(.next(e))
diff --git a/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Observables/RetryWhen.swift b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Observables/RetryWhen.swift
index 268b399a8c..39a3e4ba39 100644
--- a/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Observables/RetryWhen.swift
+++ b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Observables/RetryWhen.swift
@@ -37,12 +37,12 @@ extension ObservableType {
     }
 }
 
-final fileprivate class RetryTriggerSink<S: Sequence, O: ObserverType, TriggerObservable: ObservableType, Error>
-    : ObserverType where S.Iterator.Element : ObservableType, S.Iterator.Element.E == O.E {
+final private class RetryTriggerSink<S: Sequence, O: ObserverType, TriggerObservable: ObservableType, Error>
+    : ObserverType where S.Iterator.Element: ObservableType, S.Iterator.Element.E == O.E {
     typealias E = TriggerObservable.E
-    
+
     typealias Parent = RetryWhenSequenceSinkIter<S, O, TriggerObservable, Error>
-    
+
     fileprivate let _parent: Parent
 
     init(parent: Parent) {
@@ -64,9 +64,8 @@ final fileprivate class RetryTriggerSink<S: Sequence, O: ObserverType, TriggerOb
     }
 }
 
-final fileprivate class RetryWhenSequenceSinkIter<S: Sequence, O: ObserverType, TriggerObservable: ObservableType, Error>
-    : ObserverType
-    , Disposable where S.Iterator.Element : ObservableType, S.Iterator.Element.E == O.E {
+final private class RetryWhenSequenceSinkIter<S: Sequence, O: ObserverType, TriggerObservable: ObservableType, Error>
+    : ObserverType, Disposable where S.Iterator.Element: ObservableType, S.Iterator.Element.E == O.E {
     typealias E = O.E
     typealias Parent = RetryWhenSequenceSink<S, O, TriggerObservable, Error>
 
@@ -93,8 +92,7 @@ final fileprivate class RetryWhenSequenceSinkIter<S: Sequence, O: ObserverType,
                 let errorHandlerSubscription = _parent._notifier.subscribe(RetryTriggerSink(parent: self))
                 _errorHandlerSubscription.setDisposable(errorHandlerSubscription)
                 _parent._errorSubject.on(.next(failedWith))
-            }
-            else {
+            } else {
                 _parent.forwardOn(.error(error))
                 _parent.dispose()
             }
@@ -110,15 +108,15 @@ final fileprivate class RetryWhenSequenceSinkIter<S: Sequence, O: ObserverType,
     }
 }
 
-final fileprivate class RetryWhenSequenceSink<S: Sequence, O: ObserverType, TriggerObservable: ObservableType, Error>
-    : TailRecursiveSink<S, O> where S.Iterator.Element : ObservableType, S.Iterator.Element.E == O.E {
+final private class RetryWhenSequenceSink<S: Sequence, O: ObserverType, TriggerObservable: ObservableType, Error>
+    : TailRecursiveSink<S, O> where S.Iterator.Element: ObservableType, S.Iterator.Element.E == O.E {
     typealias Element = O.E
     typealias Parent = RetryWhenSequence<S, TriggerObservable, Error>
-    
+
     let _lock = RecursiveLock()
-    
+
     fileprivate let _parent: Parent
-    
+
     fileprivate var _lastError: Swift.Error?
     fileprivate let _errorSubject = PublishSubject<Error>()
     fileprivate let _handler: Observable<TriggerObservable.E>
@@ -129,19 +127,18 @@ final fileprivate class RetryWhenSequenceSink<S: Sequence, O: ObserverType, Trig
         _handler = parent._notificationHandler(_errorSubject).asObservable()
         super.init(observer: observer, cancel: cancel)
     }
-    
+
     override func done() {
         if let lastError = _lastError {
             forwardOn(.error(lastError))
             _lastError = nil
-        }
-        else {
+        } else {
             forwardOn(.completed)
         }
 
         dispose()
     }
-    
+
     override func extract(_ observable: Observable<E>) -> SequenceGenerator? {
         // It is important to always return `nil` here because there are sideffects in the `run` method
         // that are dependant on particular `retryWhen` operator so single operator stack can't be reused in this
@@ -163,18 +160,18 @@ final fileprivate class RetryWhenSequenceSink<S: Sequence, O: ObserverType, Trig
     }
 }
 
-final fileprivate class RetryWhenSequence<S: Sequence, TriggerObservable: ObservableType, Error> : Producer<S.Iterator.Element.E> where S.Iterator.Element : ObservableType {
+final private class RetryWhenSequence<S: Sequence, TriggerObservable: ObservableType, Error> : Producer<S.Iterator.Element.E> where S.Iterator.Element: ObservableType {
     typealias Element = S.Iterator.Element.E
-    
+
     fileprivate let _sources: S
     fileprivate let _notificationHandler: (Observable<Error>) -> TriggerObservable
-    
+
     init(sources: S, notificationHandler: @escaping (Observable<Error>) -> TriggerObservable) {
         _sources = sources
         _notificationHandler = notificationHandler
     }
-    
-    override func run<O : ObserverType>(_ observer: O, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where O.E == Element {
+
+    override func run<O: ObserverType>(_ observer: O, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where O.E == Element {
         let sink = RetryWhenSequenceSink<S, O, TriggerObservable, Error>(parent: self, observer: observer, cancel: cancel)
         let subscription = sink.run((self._sources.makeIterator(), nil))
         return (sink: sink, subscription: subscription)
diff --git a/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Observables/Sample.swift b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Observables/Sample.swift
index 31f8b625d6..4d479b1e9a 100644
--- a/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Observables/Sample.swift
+++ b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Observables/Sample.swift
@@ -26,24 +26,22 @@ extension ObservableType {
     }
 }
 
-final fileprivate class SamplerSink<O: ObserverType, SampleType>
-    : ObserverType
-    , LockOwnerType
-    , SynchronizedOnType {
+final private class SamplerSink<O: ObserverType, SampleType>
+    : ObserverType, LockOwnerType, SynchronizedOnType {
     typealias E = SampleType
-    
+
     typealias Parent = SampleSequenceSink<O, SampleType>
-    
+
     fileprivate let _parent: Parent
 
     var _lock: RecursiveLock {
         return _parent._lock
     }
-    
+
     init(parent: Parent) {
         _parent = parent
     }
-    
+
     func on(_ event: Event<E>) {
         synchronizedOn(event)
     }
@@ -76,36 +74,33 @@ final fileprivate class SamplerSink<O: ObserverType, SampleType>
     }
 }
 
-final fileprivate class SampleSequenceSink<O: ObserverType, SampleType>
-    : Sink<O>
-    , ObserverType
-    , LockOwnerType
-    , SynchronizedOnType {
+final private class SampleSequenceSink<O: ObserverType, SampleType>
+    : Sink<O>, ObserverType, LockOwnerType, SynchronizedOnType {
     typealias Element = O.E
     typealias Parent = Sample<Element, SampleType>
-    
+
     fileprivate let _parent: Parent
 
     let _lock = RecursiveLock()
-    
+
     // state
     fileprivate var _element = nil as Element?
     fileprivate var _atEnd = false
-    
+
     fileprivate let _sourceSubscription = SingleAssignmentDisposable()
-    
+
     init(parent: Parent, observer: O, cancel: Cancelable) {
         _parent = parent
         super.init(observer: observer, cancel: cancel)
     }
-    
+
     func run() -> Disposable {
         _sourceSubscription.setDisposable(_parent._source.subscribe(self))
         let samplerSubscription = _parent._sampler.subscribe(SamplerSink(parent: self))
-        
+
         return Disposables.create(_sourceSubscription, samplerSubscription)
     }
-    
+
     func on(_ event: Event<Element>) {
         synchronizedOn(event)
     }
@@ -122,10 +117,10 @@ final fileprivate class SampleSequenceSink<O: ObserverType, SampleType>
             _sourceSubscription.dispose()
         }
     }
-    
+
 }
 
-final fileprivate class Sample<Element, SampleType> : Producer<Element> {
+final private class Sample<Element, SampleType> : Producer<Element> {
     fileprivate let _source: Observable<Element>
     fileprivate let _sampler: Observable<SampleType>
 
@@ -133,7 +128,7 @@ final fileprivate class Sample<Element, SampleType> : Producer<Element> {
         _source = source
         _sampler = sampler
     }
-    
+
     override func run<O: ObserverType>(_ observer: O, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where O.E == Element {
         let sink = SampleSequenceSink(parent: self, observer: observer, cancel: cancel)
         let subscription = sink.run()
diff --git a/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Observables/Scan.swift b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Observables/Scan.swift
index 39d5e92f4e..56877b2703 100644
--- a/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Observables/Scan.swift
+++ b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Observables/Scan.swift
@@ -19,7 +19,7 @@ extension ObservableType {
      - parameter accumulator: An accumulator function to be invoked on each element.
      - returns: An observable sequence containing the accumulated values.
      */
-    public func scan<A>(into seed: A, accumulator: @escaping (inout A, E) throws -> ())
+    public func scan<A>(into seed: A, accumulator: @escaping (inout A, E) throws -> Void)
         -> Observable<A> {
         return Scan(source: self.asObservable(), seed: seed, accumulator: accumulator)
     }
@@ -44,28 +44,27 @@ extension ObservableType {
     }
 }
 
-final fileprivate class ScanSink<ElementType, O: ObserverType> : Sink<O>, ObserverType {
+final private class ScanSink<ElementType, O: ObserverType> : Sink<O>, ObserverType {
     typealias Accumulate = O.E
     typealias Parent = Scan<ElementType, Accumulate>
     typealias E = ElementType
-    
+
     fileprivate let _parent: Parent
     fileprivate var _accumulate: Accumulate
-    
+
     init(parent: Parent, observer: O, cancel: Cancelable) {
         _parent = parent
         _accumulate = parent._seed
         super.init(observer: observer, cancel: cancel)
     }
-    
+
     func on(_ event: Event<ElementType>) {
         switch event {
         case .next(let element):
             do {
                 try _parent._accumulator(&_accumulate, element)
                 forwardOn(.next(_accumulate))
-            }
-            catch let error {
+            } catch let error {
                 forwardOn(.error(error))
                 dispose()
             }
@@ -77,23 +76,23 @@ final fileprivate class ScanSink<ElementType, O: ObserverType> : Sink<O>, Observ
             dispose()
         }
     }
-    
+
 }
 
-final fileprivate class Scan<Element, Accumulate>: Producer<Accumulate> {
-    typealias Accumulator = (inout Accumulate, Element) throws -> ()
-    
+final private class Scan<Element, Accumulate>: Producer<Accumulate> {
+    typealias Accumulator = (inout Accumulate, Element) throws -> Void
+
     fileprivate let _source: Observable<Element>
     fileprivate let _seed: Accumulate
     fileprivate let _accumulator: Accumulator
-    
+
     init(source: Observable<Element>, seed: Accumulate, accumulator: @escaping Accumulator) {
         _source = source
         _seed = seed
         _accumulator = accumulator
     }
-    
-    override func run<O : ObserverType>(_ observer: O, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where O.E == Accumulate {
+
+    override func run<O: ObserverType>(_ observer: O, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where O.E == Accumulate {
         let sink = ScanSink(parent: self, observer: observer, cancel: cancel)
         let subscription = _source.subscribe(sink)
         return (sink: sink, subscription: subscription)
diff --git a/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Observables/Sequence.swift b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Observables/Sequence.swift
index e141bc72f7..79b0af4e39 100644
--- a/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Observables/Sequence.swift
+++ b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Observables/Sequence.swift
@@ -47,7 +47,7 @@ extension ObservableType {
     }
 }
 
-final fileprivate class ObservableSequenceSink<S: Sequence, O: ObserverType> : Sink<O> where S.Iterator.Element == O.E {
+final private class ObservableSequenceSink<S: Sequence, O: ObserverType> : Sink<O> where S.Iterator.Element == O.E {
     typealias Parent = ObservableSequence<S>
 
     private let _parent: Parent
@@ -63,8 +63,7 @@ final fileprivate class ObservableSequenceSink<S: Sequence, O: ObserverType> : S
             if let next = mutableIterator.0.next() {
                 self.forwardOn(.next(next))
                 recurse(mutableIterator)
-            }
-            else {
+            } else {
                 self.forwardOn(.completed)
                 self.dispose()
             }
@@ -72,7 +71,7 @@ final fileprivate class ObservableSequenceSink<S: Sequence, O: ObserverType> : S
     }
 }
 
-final fileprivate class ObservableSequence<S: Sequence> : Producer<S.Iterator.Element> {
+final private class ObservableSequence<S: Sequence> : Producer<S.Iterator.Element> {
     fileprivate let _elements: S
     fileprivate let _scheduler: ImmediateSchedulerType
 
@@ -81,7 +80,7 @@ final fileprivate class ObservableSequence<S: Sequence> : Producer<S.Iterator.El
         _scheduler = scheduler
     }
 
-    override func run<O : ObserverType>(_ observer: O, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where O.E == E {
+    override func run<O: ObserverType>(_ observer: O, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where O.E == E {
         let sink = ObservableSequenceSink(parent: self, observer: observer, cancel: cancel)
         let subscription = sink.run()
         return (sink: sink, subscription: subscription)
diff --git a/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Observables/ShareReplayScope.swift b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Observables/ShareReplayScope.swift
index 5af102f02f..f32fedb194 100644
--- a/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Observables/ShareReplayScope.swift
+++ b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Observables/ShareReplayScope.swift
@@ -157,8 +157,7 @@ extension ObservableType {
 }
 
 fileprivate final class ShareReplay1WhileConnectedConnection<Element>
-    : ObserverType
-    , SynchronizedUnsubscribeType {
+    : ObserverType, SynchronizedUnsubscribeType {
     typealias E = Element
     typealias Observers = AnyObserver<Element>.s
     typealias DisposeKey = Observers.KeyType
@@ -208,7 +207,7 @@ fileprivate final class ShareReplay1WhileConnectedConnection<Element>
         _subscription.setDisposable(_parent._source.subscribe(self))
     }
 
-    final func _synchronized_subscribe<O : ObserverType>(_ observer: O) -> Disposable where O.E == Element {
+    final func _synchronized_subscribe<O: ObserverType>(_ observer: O) -> Disposable where O.E == Element {
         _lock.lock(); defer { _lock.unlock() }
         if let element = _element {
             observer.on(.next(element))
@@ -259,7 +258,7 @@ fileprivate final class ShareReplay1WhileConnectedConnection<Element>
 }
 
 // optimized version of share replay for most common case
-final fileprivate class ShareReplay1WhileConnected<Element>
+final private class ShareReplay1WhileConnected<Element>
     : Observable<Element> {
 
     fileprivate typealias Connection = ShareReplay1WhileConnectedConnection<Element>
@@ -274,7 +273,7 @@ final fileprivate class ShareReplay1WhileConnected<Element>
         self._source = source
     }
 
-    override func subscribe<O : ObserverType>(_ observer: O) -> Disposable where O.E == E {
+    override func subscribe<O: ObserverType>(_ observer: O) -> Disposable where O.E == E {
         _lock.lock()
 
         let connection = _synchronized_subscribe(observer)
@@ -283,7 +282,7 @@ final fileprivate class ShareReplay1WhileConnected<Element>
         let disposable = connection._synchronized_subscribe(observer)
 
         _lock.unlock()
-        
+
         if count == 0 {
             connection.connect()
         }
@@ -292,13 +291,12 @@ final fileprivate class ShareReplay1WhileConnected<Element>
     }
 
     @inline(__always)
-    private func _synchronized_subscribe<O : ObserverType>(_ observer: O) -> Connection where O.E == E {
+    private func _synchronized_subscribe<O: ObserverType>(_ observer: O) -> Connection where O.E == E {
         let connection: Connection
 
         if let existingConnection = _connection {
             connection = existingConnection
-        }
-        else {
+        } else {
             connection = ShareReplay1WhileConnectedConnection<Element>(
                 parent: self,
                 lock: _lock)
@@ -310,8 +308,7 @@ final fileprivate class ShareReplay1WhileConnected<Element>
 }
 
 fileprivate final class ShareWhileConnectedConnection<Element>
-    : ObserverType
-    , SynchronizedUnsubscribeType {
+    : ObserverType, SynchronizedUnsubscribeType {
     typealias E = Element
     typealias Observers = AnyObserver<Element>.s
     typealias DisposeKey = Observers.KeyType
@@ -359,7 +356,7 @@ fileprivate final class ShareWhileConnectedConnection<Element>
         _subscription.setDisposable(_parent._source.subscribe(self))
     }
 
-    final func _synchronized_subscribe<O : ObserverType>(_ observer: O) -> Disposable where O.E == Element {
+    final func _synchronized_subscribe<O: ObserverType>(_ observer: O) -> Disposable where O.E == Element {
         _lock.lock(); defer { _lock.unlock() }
 
         let disposeKey = _observers.insert(observer.on)
@@ -407,7 +404,7 @@ fileprivate final class ShareWhileConnectedConnection<Element>
 }
 
 // optimized version of share replay for most common case
-final fileprivate class ShareWhileConnected<Element>
+final private class ShareWhileConnected<Element>
     : Observable<Element> {
 
     fileprivate typealias Connection = ShareWhileConnectedConnection<Element>
@@ -422,7 +419,7 @@ final fileprivate class ShareWhileConnected<Element>
         self._source = source
     }
 
-    override func subscribe<O : ObserverType>(_ observer: O) -> Disposable where O.E == E {
+    override func subscribe<O: ObserverType>(_ observer: O) -> Disposable where O.E == E {
         _lock.lock()
 
         let connection = _synchronized_subscribe(observer)
@@ -440,19 +437,18 @@ final fileprivate class ShareWhileConnected<Element>
     }
 
     @inline(__always)
-    private func _synchronized_subscribe<O : ObserverType>(_ observer: O) -> Connection where O.E == E {
+    private func _synchronized_subscribe<O: ObserverType>(_ observer: O) -> Connection where O.E == E {
         let connection: Connection
 
         if let existingConnection = _connection {
             connection = existingConnection
-        }
-        else {
+        } else {
             connection = ShareWhileConnectedConnection<Element>(
                 parent: self,
                 lock: _lock)
             _connection = connection
         }
-        
+
         return connection
     }
 }
diff --git a/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Observables/SingleAsync.swift b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Observables/SingleAsync.swift
index 1419a93fc8..265e877443 100644
--- a/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Observables/SingleAsync.swift
+++ b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Observables/SingleAsync.swift
@@ -40,15 +40,15 @@ fileprivate final class SingleAsyncSink<O: ObserverType> : Sink<O>, ObserverType
     typealias ElementType = O.E
     typealias Parent = SingleAsync<ElementType>
     typealias E = ElementType
-    
+
     private let _parent: Parent
     private var _seenValue: Bool = false
-    
+
     init(parent: Parent, observer: O, cancel: Cancelable) {
         _parent = parent
         super.init(observer: observer, cancel: cancel)
     }
-    
+
     func on(_ event: Event<E>) {
         switch event {
         case .next(let value):
@@ -57,8 +57,7 @@ fileprivate final class SingleAsyncSink<O: ObserverType> : Sink<O>, ObserverType
                 if !forward {
                     return
                 }
-            }
-            catch let error {
+            } catch let error {
                 forwardOn(.error(error as Swift.Error))
                 dispose()
                 return
@@ -88,16 +87,16 @@ fileprivate final class SingleAsyncSink<O: ObserverType> : Sink<O>, ObserverType
 
 final class SingleAsync<Element>: Producer<Element> {
     typealias Predicate = (Element) throws -> Bool
-    
+
     fileprivate let _source: Observable<Element>
     fileprivate let _predicate: Predicate?
-    
+
     init(source: Observable<Element>, predicate: Predicate? = nil) {
         _source = source
         _predicate = predicate
     }
-    
-    override func run<O : ObserverType>(_ observer: O, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where O.E == Element {
+
+    override func run<O: ObserverType>(_ observer: O, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where O.E == Element {
         let sink = SingleAsyncSink(parent: self, observer: observer, cancel: cancel)
         let subscription = _source.subscribe(sink)
         return (sink: sink, subscription: subscription)
diff --git a/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Observables/Sink.swift b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Observables/Sink.swift
index 214cfda326..88c3e86dad 100644
--- a/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Observables/Sink.swift
+++ b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Observables/Sink.swift
@@ -6,7 +6,7 @@
 //  Copyright © 2015 Krunoslav Zaher. All rights reserved.
 //
 
-class Sink<O : ObserverType> : Disposable {
+class Sink<O: ObserverType> : Disposable {
     fileprivate let _observer: O
     fileprivate let _cancel: Cancelable
     fileprivate var _disposed: Bool
@@ -17,13 +17,13 @@ class Sink<O : ObserverType> : Disposable {
 
     init(observer: O, cancel: Cancelable) {
 #if TRACE_RESOURCES
-        let _ = Resources.incrementTotal()
+        _ = Resources.incrementTotal()
 #endif
         _observer = observer
         _cancel = cancel
         _disposed = false
     }
-    
+
     final func forwardOn(_ event: Event<O.E>) {
         #if DEBUG
             _synchronizationTracker.register(synchronizationErrorMessage: .default)
@@ -34,7 +34,7 @@ class Sink<O : ObserverType> : Disposable {
         }
         _observer.on(event)
     }
-    
+
     final func forwarder() -> SinkForward<O> {
         return SinkForward(forward: self)
     }
@@ -50,20 +50,20 @@ class Sink<O : ObserverType> : Disposable {
 
     deinit {
 #if TRACE_RESOURCES
-       let _ =  Resources.decrementTotal()
+       _ =  Resources.decrementTotal()
 #endif
     }
 }
 
 final class SinkForward<O: ObserverType>: ObserverType {
     typealias E = O.E
-    
+
     private let _forward: Sink<O>
-    
+
     init(forward: Sink<O>) {
         _forward = forward
     }
-    
+
     final func on(_ event: Event<E>) {
         switch event {
         case .next:
diff --git a/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Observables/Skip.swift b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Observables/Skip.swift
index fcac9d4a02..96186c7dde 100644
--- a/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Observables/Skip.swift
+++ b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Observables/Skip.swift
@@ -41,28 +41,27 @@ extension ObservableType {
 
 // count version
 
-final fileprivate class SkipCountSink<O: ObserverType> : Sink<O>, ObserverType {
+final private class SkipCountSink<O: ObserverType> : Sink<O>, ObserverType {
     typealias Element = O.E
     typealias Parent = SkipCount<Element>
-    
+
     let parent: Parent
-    
+
     var remaining: Int
-    
+
     init(parent: Parent, observer: O, cancel: Cancelable) {
         self.parent = parent
         self.remaining = parent.count
         super.init(observer: observer, cancel: cancel)
     }
-    
+
     func on(_ event: Event<Element>) {
         switch event {
         case .next(let value):
-            
+
             if remaining <= 0 {
                 forwardOn(.next(value))
-            }
-            else {
+            } else {
                 remaining -= 1
             }
         case .error:
@@ -73,19 +72,19 @@ final fileprivate class SkipCountSink<O: ObserverType> : Sink<O>, ObserverType {
             self.dispose()
         }
     }
-    
+
 }
 
-final fileprivate class SkipCount<Element>: Producer<Element> {
+final private class SkipCount<Element>: Producer<Element> {
     let source: Observable<Element>
     let count: Int
-    
+
     init(source: Observable<Element>, count: Int) {
         self.source = source
         self.count = count
     }
-    
-    override func run<O : ObserverType>(_ observer: O, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where O.E == Element {
+
+    override func run<O: ObserverType>(_ observer: O, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where O.E == Element {
         let sink = SkipCountSink(parent: self, observer: observer, cancel: cancel)
         let subscription = source.subscribe(sink)
 
@@ -95,20 +94,20 @@ final fileprivate class SkipCount<Element>: Producer<Element> {
 
 // time version
 
-final fileprivate class SkipTimeSink<ElementType, O: ObserverType> : Sink<O>, ObserverType where O.E == ElementType {
+final private class SkipTimeSink<ElementType, O: ObserverType> : Sink<O>, ObserverType where O.E == ElementType {
     typealias Parent = SkipTime<ElementType>
     typealias Element = ElementType
 
     let parent: Parent
-    
+
     // state
     var open = false
-    
+
     init(parent: Parent, observer: O, cancel: Cancelable) {
         self.parent = parent
         super.init(observer: observer, cancel: cancel)
     }
-    
+
     func on(_ event: Event<Element>) {
         switch event {
         case .next(let value):
@@ -123,35 +122,35 @@ final fileprivate class SkipTimeSink<ElementType, O: ObserverType> : Sink<O>, Ob
             self.dispose()
         }
     }
-    
+
     func tick() {
         open = true
     }
-    
+
     func run() -> Disposable {
-        let disposeTimer = parent.scheduler.scheduleRelative((), dueTime: self.parent.duration) { _ in 
+        let disposeTimer = parent.scheduler.scheduleRelative((), dueTime: self.parent.duration) { _ in
             self.tick()
             return Disposables.create()
         }
-        
+
         let disposeSubscription = parent.source.subscribe(self)
-        
+
         return Disposables.create(disposeTimer, disposeSubscription)
     }
 }
 
-final fileprivate class SkipTime<Element>: Producer<Element> {
+final private class SkipTime<Element>: Producer<Element> {
     let source: Observable<Element>
     let duration: RxTimeInterval
     let scheduler: SchedulerType
-    
+
     init(source: Observable<Element>, duration: RxTimeInterval, scheduler: SchedulerType) {
         self.source = source
         self.scheduler = scheduler
         self.duration = duration
     }
-    
-    override func run<O : ObserverType>(_ observer: O, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where O.E == Element {
+
+    override func run<O: ObserverType>(_ observer: O, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where O.E == Element {
         let sink = SkipTimeSink(parent: self, observer: observer, cancel: cancel)
         let subscription = sink.run()
         return (sink: sink, subscription: subscription)
diff --git a/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Observables/SkipUntil.swift b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Observables/SkipUntil.swift
index f35f1fd8ae..d466cce36f 100644
--- a/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Observables/SkipUntil.swift
+++ b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Observables/SkipUntil.swift
@@ -22,25 +22,23 @@ extension ObservableType {
     }
 }
 
-final fileprivate class SkipUntilSinkOther<Other, O: ObserverType>
-    : ObserverType
-    , LockOwnerType
-    , SynchronizedOnType {
+final private class SkipUntilSinkOther<Other, O: ObserverType>
+    : ObserverType, LockOwnerType, SynchronizedOnType {
     typealias Parent = SkipUntilSink<Other, O>
     typealias E = Other
-    
+
     fileprivate let _parent: Parent
 
     var _lock: RecursiveLock {
         return _parent._lock
     }
-    
+
     let _subscription = SingleAssignmentDisposable()
 
     init(parent: Parent) {
         _parent = parent
         #if TRACE_RESOURCES
-            let _ = Resources.incrementTotal()
+            _ = Resources.incrementTotal()
         #endif
     }
 
@@ -60,35 +58,31 @@ final fileprivate class SkipUntilSinkOther<Other, O: ObserverType>
             _subscription.dispose()
         }
     }
-    
+
     #if TRACE_RESOURCES
     deinit {
-        let _ = Resources.decrementTotal()
+        _ = Resources.decrementTotal()
     }
     #endif
 
 }
 
-
-final fileprivate class SkipUntilSink<Other, O: ObserverType>
-    : Sink<O>
-    , ObserverType
-    , LockOwnerType
-    , SynchronizedOnType {
+final private class SkipUntilSink<Other, O: ObserverType>
+    : Sink<O>, ObserverType, LockOwnerType, SynchronizedOnType {
     typealias E = O.E
     typealias Parent = SkipUntil<E, Other>
-    
+
     let _lock = RecursiveLock()
     fileprivate let _parent: Parent
     fileprivate var _forwardElements = false
-    
+
     fileprivate let _sourceSubscription = SingleAssignmentDisposable()
 
     init(parent: Parent, observer: O, cancel: Cancelable) {
         _parent = parent
         super.init(observer: observer, cancel: cancel)
     }
-    
+
     func on(_ event: Event<E>) {
         synchronizedOn(event)
     }
@@ -109,29 +103,29 @@ final fileprivate class SkipUntilSink<Other, O: ObserverType>
             self.dispose()
         }
     }
-    
+
     func run() -> Disposable {
         let sourceSubscription = _parent._source.subscribe(self)
         let otherObserver = SkipUntilSinkOther(parent: self)
         let otherSubscription = _parent._other.subscribe(otherObserver)
         _sourceSubscription.setDisposable(sourceSubscription)
         otherObserver._subscription.setDisposable(otherSubscription)
-        
+
         return Disposables.create(_sourceSubscription, otherObserver._subscription)
     }
 }
 
-final fileprivate class SkipUntil<Element, Other>: Producer<Element> {
-    
+final private class SkipUntil<Element, Other>: Producer<Element> {
+
     fileprivate let _source: Observable<Element>
     fileprivate let _other: Observable<Other>
-    
+
     init(source: Observable<Element>, other: Observable<Other>) {
         _source = source
         _other = other
     }
-    
-    override func run<O : ObserverType>(_ observer: O, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where O.E == Element {
+
+    override func run<O: ObserverType>(_ observer: O, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where O.E == Element {
         let sink = SkipUntilSink(parent: self, observer: observer, cancel: cancel)
         let subscription = sink.run()
         return (sink: sink, subscription: subscription)
diff --git a/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Observables/SkipWhile.swift b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Observables/SkipWhile.swift
index 4bb394b964..5fb122fe5c 100644
--- a/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Observables/SkipWhile.swift
+++ b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Observables/SkipWhile.swift
@@ -21,7 +21,7 @@ extension ObservableType {
     }
 }
 
-final fileprivate class SkipWhileSink<O: ObserverType> : Sink<O>, ObserverType {
+final private class SkipWhileSink<O: ObserverType> : Sink<O>, ObserverType {
 
     typealias Element = O.E
     typealias Parent = SkipWhile<Element>
@@ -57,7 +57,7 @@ final fileprivate class SkipWhileSink<O: ObserverType> : Sink<O>, ObserverType {
     }
 }
 
-final fileprivate class SkipWhile<Element>: Producer<Element> {
+final private class SkipWhile<Element>: Producer<Element> {
     typealias Predicate = (Element) throws -> Bool
     typealias PredicateWithIndex = (Element, Int) throws -> Bool
 
@@ -69,7 +69,7 @@ final fileprivate class SkipWhile<Element>: Producer<Element> {
         _predicate = predicate
     }
 
-    override func run<O : ObserverType>(_ observer: O, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where O.E == Element {
+    override func run<O: ObserverType>(_ observer: O, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where O.E == Element {
         let sink = SkipWhileSink(parent: self, observer: observer, cancel: cancel)
         let subscription = _source.subscribe(sink)
         return (sink: sink, subscription: subscription)
diff --git a/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Observables/StartWith.swift b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Observables/StartWith.swift
index 14776f9e65..deebf4b52e 100644
--- a/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Observables/StartWith.swift
+++ b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Observables/StartWith.swift
@@ -22,7 +22,7 @@ extension ObservableType {
     }
 }
 
-final fileprivate class StartWith<Element>: Producer<Element> {
+final private class StartWith<Element>: Producer<Element> {
     let elements: [Element]
     let source: Observable<Element>
 
@@ -32,7 +32,7 @@ final fileprivate class StartWith<Element>: Producer<Element> {
         super.init()
     }
 
-    override func run<O : ObserverType>(_ observer: O, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where O.E == Element {
+    override func run<O: ObserverType>(_ observer: O, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where O.E == Element {
         for e in elements {
             observer.on(.next(e))
         }
diff --git a/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Observables/SubscribeOn.swift b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Observables/SubscribeOn.swift
index 2a33e03e5a..aad97d65e1 100644
--- a/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Observables/SubscribeOn.swift
+++ b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Observables/SubscribeOn.swift
@@ -29,31 +29,31 @@ extension ObservableType {
     }
 }
 
-final fileprivate class SubscribeOnSink<Ob: ObservableType, O: ObserverType> : Sink<O>, ObserverType where Ob.E == O.E {
+final private class SubscribeOnSink<Ob: ObservableType, O: ObserverType> : Sink<O>, ObserverType where Ob.E == O.E {
     typealias Element = O.E
     typealias Parent = SubscribeOn<Ob>
-    
+
     let parent: Parent
-    
+
     init(parent: Parent, observer: O, cancel: Cancelable) {
         self.parent = parent
         super.init(observer: observer, cancel: cancel)
     }
-    
+
     func on(_ event: Event<Element>) {
         forwardOn(event)
-        
+
         if event.isStopEvent {
             self.dispose()
         }
     }
-    
+
     func run() -> Disposable {
         let disposeEverything = SerialDisposable()
         let cancelSchedule = SingleAssignmentDisposable()
-        
+
         disposeEverything.disposable = cancelSchedule
-        
+
         let disposeSchedule = parent.scheduler.schedule(()) { (_) -> Disposable in
             let subscription = self.parent.source.subscribe(self)
             disposeEverything.disposable = ScheduledDisposable(scheduler: self.parent.scheduler, disposable: subscription)
@@ -61,21 +61,21 @@ final fileprivate class SubscribeOnSink<Ob: ObservableType, O: ObserverType> : S
         }
 
         cancelSchedule.setDisposable(disposeSchedule)
-    
+
         return disposeEverything
     }
 }
 
-final fileprivate class SubscribeOn<Ob: ObservableType> : Producer<Ob.E> {
+final private class SubscribeOn<Ob: ObservableType> : Producer<Ob.E> {
     let source: Ob
     let scheduler: ImmediateSchedulerType
-    
+
     init(source: Ob, scheduler: ImmediateSchedulerType) {
         self.source = source
         self.scheduler = scheduler
     }
-    
-    override func run<O : ObserverType>(_ observer: O, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where O.E == Ob.E {
+
+    override func run<O: ObserverType>(_ observer: O, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where O.E == Ob.E {
         let sink = SubscribeOnSink(parent: self, observer: observer, cancel: cancel)
         let subscription = sink.run()
         return (sink: sink, subscription: subscription)
diff --git a/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Observables/Switch.swift b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Observables/Switch.swift
index 2da100053e..204a3b0775 100644
--- a/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Observables/Switch.swift
+++ b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Observables/Switch.swift
@@ -25,7 +25,7 @@ extension ObservableType {
     }
 }
 
-extension ObservableType where E : ObservableConvertibleType {
+extension ObservableType where E: ObservableConvertibleType {
 
     /**
      Transforms an observable sequence of observable sequences into an observable sequence
@@ -43,25 +43,24 @@ extension ObservableType where E : ObservableConvertibleType {
     }
 }
 
-fileprivate class SwitchSink<SourceType, S: ObservableConvertibleType, O: ObserverType>
-    : Sink<O>
-    , ObserverType where S.E == O.E {
+private class SwitchSink<SourceType, S: ObservableConvertibleType, O: ObserverType>
+    : Sink<O>, ObserverType where S.E == O.E {
     typealias E = SourceType
 
     fileprivate let _subscriptions: SingleAssignmentDisposable = SingleAssignmentDisposable()
     fileprivate let _innerSubscription: SerialDisposable = SerialDisposable()
 
     let _lock = RecursiveLock()
-    
+
     // state
     fileprivate var _stopped = false
     fileprivate var _latest = 0
     fileprivate var _hasLatest = false
-    
+
     override init(observer: O, cancel: Cancelable) {
         super.init(observer: observer, cancel: cancel)
     }
-    
+
     func run(_ source: Observable<SourceType>) -> Disposable {
         let subscription = source.subscribe(self)
         _subscriptions.setDisposable(subscription)
@@ -80,8 +79,7 @@ fileprivate class SwitchSink<SourceType, S: ObservableConvertibleType, O: Observ
                 _hasLatest = true
                 _latest = _latest &+ 1
                 return (_latest, observable)
-            }
-            catch let error {
+            } catch let error {
                 forwardOn(.error(error))
                 dispose()
             }
@@ -96,7 +94,7 @@ fileprivate class SwitchSink<SourceType, S: ObservableConvertibleType, O: Observ
             if let (latest, observable) = nextElementArrived(element: element) {
                 let d = SingleAssignmentDisposable()
                 _innerSubscription.disposable = d
-                   
+
                 let observer = SwitchSinkIter(parent: self, id: latest, _self: d)
                 let disposable = observable.subscribe(observer)
                 d.setDisposable(disposable)
@@ -108,9 +106,9 @@ fileprivate class SwitchSink<SourceType, S: ObservableConvertibleType, O: Observ
         case .completed:
             _lock.lock(); defer { _lock.unlock() }
             _stopped = true
-            
+
             _subscriptions.dispose()
-            
+
             if !_hasLatest {
                 forwardOn(.completed)
                 dispose()
@@ -119,13 +117,11 @@ fileprivate class SwitchSink<SourceType, S: ObservableConvertibleType, O: Observ
     }
 }
 
-final fileprivate class SwitchSinkIter<SourceType, S: ObservableConvertibleType, O: ObserverType>
-    : ObserverType
-    , LockOwnerType
-    , SynchronizedOnType where S.E == O.E {
+final private class SwitchSinkIter<SourceType, S: ObservableConvertibleType, O: ObserverType>
+    : ObserverType, LockOwnerType, SynchronizedOnType where S.E == O.E {
     typealias E = S.E
     typealias Parent = SwitchSink<SourceType, S, O>
-    
+
     fileprivate let _parent: Parent
     fileprivate let _id: Int
     fileprivate let _self: Disposable
@@ -139,7 +135,7 @@ final fileprivate class SwitchSinkIter<SourceType, S: ObservableConvertibleType,
         _id = id
         self._self = _self
     }
-    
+
     func on(_ event: Event<E>) {
         synchronizedOn(event)
     }
@@ -150,11 +146,11 @@ final fileprivate class SwitchSinkIter<SourceType, S: ObservableConvertibleType,
         case .error, .completed:
             _self.dispose()
         }
-        
+
         if _parent._latest != _id {
             return
         }
-       
+
         switch event {
         case .next:
             _parent.forwardOn(event)
@@ -173,7 +169,7 @@ final fileprivate class SwitchSinkIter<SourceType, S: ObservableConvertibleType,
 
 // MARK: Specializations
 
-final fileprivate class SwitchIdentitySink<S: ObservableConvertibleType, O: ObserverType> : SwitchSink<S, S, O> where O.E == S.E {
+final private class SwitchIdentitySink<S: ObservableConvertibleType, O: ObserverType> : SwitchSink<S, S, O> where O.E == S.E {
     override init(observer: O, cancel: Cancelable) {
         super.init(observer: observer, cancel: cancel)
     }
@@ -183,7 +179,7 @@ final fileprivate class SwitchIdentitySink<S: ObservableConvertibleType, O: Obse
     }
 }
 
-final fileprivate class MapSwitchSink<SourceType, S: ObservableConvertibleType, O: ObserverType> : SwitchSink<SourceType, S, O> where O.E == S.E {
+final private class MapSwitchSink<SourceType, S: ObservableConvertibleType, O: ObserverType> : SwitchSink<SourceType, S, O> where O.E == S.E {
     typealias Selector = (SourceType) throws -> S
 
     fileprivate let _selector: Selector
@@ -200,21 +196,21 @@ final fileprivate class MapSwitchSink<SourceType, S: ObservableConvertibleType,
 
 // MARK: Producers
 
-final fileprivate class Switch<S: ObservableConvertibleType> : Producer<S.E> {
+final private class Switch<S: ObservableConvertibleType> : Producer<S.E> {
     fileprivate let _source: Observable<S>
-    
+
     init(source: Observable<S>) {
         _source = source
     }
-    
-    override func run<O : ObserverType>(_ observer: O, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where O.E == S.E {
+
+    override func run<O: ObserverType>(_ observer: O, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where O.E == S.E {
         let sink = SwitchIdentitySink<S, O>(observer: observer, cancel: cancel)
         let subscription = sink.run(_source)
         return (sink: sink, subscription: subscription)
     }
 }
 
-final fileprivate class FlatMapLatest<SourceType, S: ObservableConvertibleType> : Producer<S.E> {
+final private class FlatMapLatest<SourceType, S: ObservableConvertibleType> : Producer<S.E> {
     typealias Selector = (SourceType) throws -> S
 
     fileprivate let _source: Observable<SourceType>
@@ -225,7 +221,7 @@ final fileprivate class FlatMapLatest<SourceType, S: ObservableConvertibleType>
         _selector = selector
     }
 
-    override func run<O : ObserverType>(_ observer: O, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where O.E == S.E {
+    override func run<O: ObserverType>(_ observer: O, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where O.E == S.E {
         let sink = MapSwitchSink<SourceType, S, O>(selector: _selector, observer: observer, cancel: cancel)
         let subscription = sink.run(_source)
         return (sink: sink, subscription: subscription)
diff --git a/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Observables/SwitchIfEmpty.swift b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Observables/SwitchIfEmpty.swift
index 0b10dc614a..9ee3b30ee5 100644
--- a/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Observables/SwitchIfEmpty.swift
+++ b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Observables/SwitchIfEmpty.swift
@@ -20,44 +20,43 @@ extension ObservableType {
     }
 }
 
-final fileprivate class SwitchIfEmpty<Element>: Producer<Element> {
-    
+final private class SwitchIfEmpty<Element>: Producer<Element> {
+
     private let _source: Observable<E>
     private let _ifEmpty: Observable<E>
-    
+
     init(source: Observable<E>, ifEmpty: Observable<E>) {
         _source = source
         _ifEmpty = ifEmpty
     }
-    
-    override func run<O : ObserverType>(_ observer: O, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where O.E == Element {
+
+    override func run<O: ObserverType>(_ observer: O, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where O.E == Element {
         let sink = SwitchIfEmptySink(ifEmpty: _ifEmpty,
                                      observer: observer,
                                      cancel: cancel)
         let subscription = sink.run(_source.asObservable())
-        
+
         return (sink: sink, subscription: subscription)
     }
 }
 
-final fileprivate class SwitchIfEmptySink<O: ObserverType>: Sink<O>
-    , ObserverType {
+final private class SwitchIfEmptySink<O: ObserverType>: Sink<O>, ObserverType {
     typealias E = O.E
-    
+
     private let _ifEmpty: Observable<E>
     private var _isEmpty = true
     private let _ifEmptySubscription = SingleAssignmentDisposable()
-    
+
     init(ifEmpty: Observable<E>, observer: O, cancel: Cancelable) {
         _ifEmpty = ifEmpty
         super.init(observer: observer, cancel: cancel)
     }
-    
+
     func run(_ source: Observable<O.E>) -> Disposable {
         let subscription = source.subscribe(self)
         return Disposables.create(subscription, _ifEmptySubscription)
     }
-    
+
     func on(_ event: Event<E>) {
         switch event {
         case .next:
@@ -78,17 +77,17 @@ final fileprivate class SwitchIfEmptySink<O: ObserverType>: Sink<O>
     }
 }
 
-final fileprivate class SwitchIfEmptySinkIter<O: ObserverType>
+final private class SwitchIfEmptySinkIter<O: ObserverType>
     : ObserverType {
     typealias E = O.E
     typealias Parent = SwitchIfEmptySink<O>
-    
+
     private let _parent: Parent
 
     init(parent: Parent) {
         _parent = parent
     }
-    
+
     func on(_ event: Event<E>) {
         switch event {
         case .next:
diff --git a/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Observables/Take.swift b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Observables/Take.swift
index 661f8582d6..4c1e00f747 100644
--- a/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Observables/Take.swift
+++ b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Observables/Take.swift
@@ -20,8 +20,7 @@ extension ObservableType {
         -> Observable<E> {
         if count == 0 {
             return Observable.empty()
-        }
-        else {
+        } else {
             return TakeCount(source: asObservable(), count: count)
         }
     }
@@ -46,29 +45,29 @@ extension ObservableType {
 
 // count version
 
-final fileprivate class TakeCountSink<O: ObserverType> : Sink<O>, ObserverType {
+final private class TakeCountSink<O: ObserverType> : Sink<O>, ObserverType {
     typealias E = O.E
     typealias Parent = TakeCount<E>
-    
+
     private let _parent: Parent
-    
+
     private var _remaining: Int
-    
+
     init(parent: Parent, observer: O, cancel: Cancelable) {
         _parent = parent
         _remaining = parent._count
         super.init(observer: observer, cancel: cancel)
     }
-    
+
     func on(_ event: Event<E>) {
         switch event {
         case .next(let value):
-            
+
             if _remaining > 0 {
                 _remaining -= 1
-                
+
                 forwardOn(.next(value))
-            
+
                 if _remaining == 0 {
                     forwardOn(.completed)
                     dispose()
@@ -82,13 +81,13 @@ final fileprivate class TakeCountSink<O: ObserverType> : Sink<O>, ObserverType {
             dispose()
         }
     }
-    
+
 }
 
-final fileprivate class TakeCount<Element>: Producer<Element> {
+final private class TakeCount<Element>: Producer<Element> {
     fileprivate let _source: Observable<Element>
     fileprivate let _count: Int
-    
+
     init(source: Observable<Element>, count: Int) {
         if count < 0 {
             rxFatalError("count can't be negative")
@@ -96,8 +95,8 @@ final fileprivate class TakeCount<Element>: Producer<Element> {
         _source = source
         _count = count
     }
-    
-    override func run<O : ObserverType>(_ observer: O, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where O.E == Element {
+
+    override func run<O: ObserverType>(_ observer: O, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where O.E == Element {
         let sink = TakeCountSink(parent: self, observer: observer, cancel: cancel)
         let subscription = _source.subscribe(sink)
         return (sink: sink, subscription: subscription)
@@ -106,23 +105,20 @@ final fileprivate class TakeCount<Element>: Producer<Element> {
 
 // time version
 
-final fileprivate class TakeTimeSink<ElementType, O: ObserverType>
-    : Sink<O>
-    , LockOwnerType
-    , ObserverType
-    , SynchronizedOnType where O.E == ElementType {
+final private class TakeTimeSink<ElementType, O: ObserverType>
+    : Sink<O>, LockOwnerType, ObserverType, SynchronizedOnType where O.E == ElementType {
     typealias Parent = TakeTime<ElementType>
     typealias E = ElementType
 
     fileprivate let _parent: Parent
-    
+
     let _lock = RecursiveLock()
-    
+
     init(parent: Parent, observer: O, cancel: Cancelable) {
         _parent = parent
         super.init(observer: observer, cancel: cancel)
     }
-    
+
     func on(_ event: Event<E>) {
         synchronizedOn(event)
     }
@@ -139,40 +135,40 @@ final fileprivate class TakeTimeSink<ElementType, O: ObserverType>
             dispose()
         }
     }
-    
+
     func tick() {
         _lock.lock(); defer { _lock.unlock() }
 
         forwardOn(.completed)
         dispose()
     }
-    
+
     func run() -> Disposable {
         let disposeTimer = _parent._scheduler.scheduleRelative((), dueTime: _parent._duration) { _ in
             self.tick()
             return Disposables.create()
         }
-        
+
         let disposeSubscription = _parent._source.subscribe(self)
-        
+
         return Disposables.create(disposeTimer, disposeSubscription)
     }
 }
 
-final fileprivate class TakeTime<Element> : Producer<Element> {
+final private class TakeTime<Element> : Producer<Element> {
     typealias TimeInterval = RxTimeInterval
-    
+
     fileprivate let _source: Observable<Element>
     fileprivate let _duration: TimeInterval
     fileprivate let _scheduler: SchedulerType
-    
+
     init(source: Observable<Element>, duration: TimeInterval, scheduler: SchedulerType) {
         _source = source
         _scheduler = scheduler
         _duration = duration
     }
-    
-    override func run<O : ObserverType>(_ observer: O, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where O.E == Element {
+
+    override func run<O: ObserverType>(_ observer: O, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where O.E == Element {
         let sink = TakeTimeSink(parent: self, observer: observer, cancel: cancel)
         let subscription = sink.run()
         return (sink: sink, subscription: subscription)
diff --git a/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Observables/TakeLast.swift b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Observables/TakeLast.swift
index 7bf1664bfd..4da8bb6eed 100644
--- a/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Observables/TakeLast.swift
+++ b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Observables/TakeLast.swift
@@ -24,26 +24,26 @@ extension ObservableType {
     }
 }
 
-final fileprivate class TakeLastSink<O: ObserverType> : Sink<O>, ObserverType {
+final private class TakeLastSink<O: ObserverType> : Sink<O>, ObserverType {
     typealias E = O.E
     typealias Parent = TakeLast<E>
-    
+
     private let _parent: Parent
-    
+
     private var _elements: Queue<E>
-    
+
     init(parent: Parent, observer: O, cancel: Cancelable) {
         _parent = parent
         _elements = Queue<E>(capacity: parent._count + 1)
         super.init(observer: observer, cancel: cancel)
     }
-    
+
     func on(_ event: Event<E>) {
         switch event {
         case .next(let value):
             _elements.enqueue(value)
             if _elements.count > self._parent._count {
-                let _ = _elements.dequeue()
+                _ = _elements.dequeue()
             }
         case .error:
             forwardOn(event)
@@ -58,10 +58,10 @@ final fileprivate class TakeLastSink<O: ObserverType> : Sink<O>, ObserverType {
     }
 }
 
-final fileprivate class TakeLast<Element>: Producer<Element> {
+final private class TakeLast<Element>: Producer<Element> {
     fileprivate let _source: Observable<Element>
     fileprivate let _count: Int
-    
+
     init(source: Observable<Element>, count: Int) {
         if count < 0 {
             rxFatalError("count can't be negative")
@@ -69,8 +69,8 @@ final fileprivate class TakeLast<Element>: Producer<Element> {
         _source = source
         _count = count
     }
-    
-    override func run<O : ObserverType>(_ observer: O, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where O.E == Element {
+
+    override func run<O: ObserverType>(_ observer: O, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where O.E == Element {
         let sink = TakeLastSink(parent: self, observer: observer, cancel: cancel)
         let subscription = _source.subscribe(sink)
         return (sink: sink, subscription: subscription)
diff --git a/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Observables/TakeUntil.swift b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Observables/TakeUntil.swift
index f2e5f98b01..e53c709591 100644
--- a/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Observables/TakeUntil.swift
+++ b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Observables/TakeUntil.swift
@@ -22,28 +22,26 @@ extension ObservableType {
     }
 }
 
-final fileprivate class TakeUntilSinkOther<Other, O: ObserverType>
-    : ObserverType
-    , LockOwnerType
-    , SynchronizedOnType {
+final private class TakeUntilSinkOther<Other, O: ObserverType>
+    : ObserverType, LockOwnerType, SynchronizedOnType {
     typealias Parent = TakeUntilSink<Other, O>
     typealias E = Other
-    
+
     fileprivate let _parent: Parent
 
     var _lock: RecursiveLock {
         return _parent._lock
     }
-    
+
     fileprivate let _subscription = SingleAssignmentDisposable()
-    
+
     init(parent: Parent) {
         _parent = parent
 #if TRACE_RESOURCES
-        let _ = Resources.incrementTotal()
+        _ = Resources.incrementTotal()
 #endif
     }
-    
+
     func on(_ event: Event<E>) {
         synchronizedOn(event)
     }
@@ -60,32 +58,28 @@ final fileprivate class TakeUntilSinkOther<Other, O: ObserverType>
             _subscription.dispose()
         }
     }
-    
+
 #if TRACE_RESOURCES
     deinit {
-        let _ = Resources.decrementTotal()
+        _ = Resources.decrementTotal()
     }
 #endif
 }
 
-final fileprivate class TakeUntilSink<Other, O: ObserverType>
-    : Sink<O>
-    , LockOwnerType
-    , ObserverType
-    , SynchronizedOnType {
+final private class TakeUntilSink<Other, O: ObserverType>
+    : Sink<O>, LockOwnerType, ObserverType, SynchronizedOnType {
     typealias E = O.E
     typealias Parent = TakeUntil<E, Other>
-    
+
     fileprivate let _parent: Parent
- 
+
     let _lock = RecursiveLock()
-    
-    
+
     init(parent: Parent, observer: O, cancel: Cancelable) {
         _parent = parent
         super.init(observer: observer, cancel: cancel)
     }
-    
+
     func on(_ event: Event<E>) {
         synchronizedOn(event)
     }
@@ -102,28 +96,28 @@ final fileprivate class TakeUntilSink<Other, O: ObserverType>
             dispose()
         }
     }
-    
+
     func run() -> Disposable {
         let otherObserver = TakeUntilSinkOther(parent: self)
         let otherSubscription = _parent._other.subscribe(otherObserver)
         otherObserver._subscription.setDisposable(otherSubscription)
         let sourceSubscription = _parent._source.subscribe(self)
-        
+
         return Disposables.create(sourceSubscription, otherObserver._subscription)
     }
 }
 
-final fileprivate class TakeUntil<Element, Other>: Producer<Element> {
-    
+final private class TakeUntil<Element, Other>: Producer<Element> {
+
     fileprivate let _source: Observable<Element>
     fileprivate let _other: Observable<Other>
-    
+
     init(source: Observable<Element>, other: Observable<Other>) {
         _source = source
         _other = other
     }
-    
-    override func run<O : ObserverType>(_ observer: O, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where O.E == Element {
+
+    override func run<O: ObserverType>(_ observer: O, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where O.E == Element {
         let sink = TakeUntilSink(parent: self, observer: observer, cancel: cancel)
         let subscription = sink.run()
         return (sink: sink, subscription: subscription)
diff --git a/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Observables/TakeWhile.swift b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Observables/TakeWhile.swift
index 2b7b55101a..5318f2c566 100644
--- a/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Observables/TakeWhile.swift
+++ b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Observables/TakeWhile.swift
@@ -22,9 +22,8 @@ extension ObservableType {
     }
 }
 
-final fileprivate class TakeWhileSink<O: ObserverType>
-    : Sink<O>
-    , ObserverType {
+final private class TakeWhileSink<O: ObserverType>
+    : Sink<O>, ObserverType {
     typealias Element = O.E
     typealias Parent = TakeWhile<Element>
 
@@ -36,14 +35,14 @@ final fileprivate class TakeWhileSink<O: ObserverType>
         _parent = parent
         super.init(observer: observer, cancel: cancel)
     }
-    
+
     func on(_ event: Event<Element>) {
         switch event {
         case .next(let value):
             if !_running {
                 return
             }
-            
+
             do {
                 _running = try _parent._predicate(value)
             } catch let e {
@@ -51,7 +50,7 @@ final fileprivate class TakeWhileSink<O: ObserverType>
                 dispose()
                 return
             }
-            
+
             if _running {
                 forwardOn(.next(value))
             } else {
@@ -63,10 +62,10 @@ final fileprivate class TakeWhileSink<O: ObserverType>
             dispose()
         }
     }
-    
+
 }
 
-final fileprivate class TakeWhile<Element>: Producer<Element> {
+final private class TakeWhile<Element>: Producer<Element> {
     typealias Predicate = (Element) throws -> Bool
 
     fileprivate let _source: Observable<Element>
@@ -77,7 +76,7 @@ final fileprivate class TakeWhile<Element>: Producer<Element> {
         _predicate = predicate
     }
 
-    override func run<O : ObserverType>(_ observer: O, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where O.E == Element {
+    override func run<O: ObserverType>(_ observer: O, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where O.E == Element {
         let sink = TakeWhileSink(parent: self, observer: observer, cancel: cancel)
         let subscription = _source.subscribe(sink)
         return (sink: sink, subscription: subscription)
diff --git a/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Observables/Throttle.swift b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Observables/Throttle.swift
index 0c4ca7466f..6a02ff41a5 100644
--- a/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Observables/Throttle.swift
+++ b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Observables/Throttle.swift
@@ -28,34 +28,31 @@ extension ObservableType {
     }
 }
 
-final fileprivate class ThrottleSink<O: ObserverType>
-    : Sink<O>
-    , ObserverType
-    , LockOwnerType
-    , SynchronizedOnType {
+final private class ThrottleSink<O: ObserverType>
+    : Sink<O>, ObserverType, LockOwnerType, SynchronizedOnType {
     typealias Element = O.E
     typealias ParentType = Throttle<Element>
-    
+
     private let _parent: ParentType
-    
+
     let _lock = RecursiveLock()
-    
+
     // state
-    private var _lastUnsentElement: Element? = nil
-    private var _lastSentTime: Date? = nil
+    private var _lastUnsentElement: Element?
+    private var _lastSentTime: Date?
     private var _completed: Bool = false
 
     let cancellable = SerialDisposable()
-    
+
     init(parent: ParentType, observer: O, cancel: Cancelable) {
         _parent = parent
-        
+
         super.init(observer: observer, cancel: cancel)
     }
-    
+
     func run() -> Disposable {
         let subscription = _parent._source.subscribe(self)
-        
+
         return Disposables.create(subscription, cancellable)
     }
 
@@ -72,8 +69,7 @@ final fileprivate class ThrottleSink<O: ObserverType>
 
             if let lastSendingTime = _lastSentTime {
                 timeIntervalSinceLast = now.timeIntervalSince(lastSendingTime)
-            }
-            else {
+            } else {
                 timeIntervalSinceLast = _parent._dueTime
             }
 
@@ -89,7 +85,7 @@ final fileprivate class ThrottleSink<O: ObserverType>
             }
 
             let isThereAlreadyInFlightRequest = _lastUnsentElement != nil
-            
+
             _lastUnsentElement = element
 
             if isThereAlreadyInFlightRequest {
@@ -110,8 +106,7 @@ final fileprivate class ThrottleSink<O: ObserverType>
         case .completed:
             if let _ = _lastUnsentElement {
                 _completed = true
-            }
-            else {
+            } else {
                 forwardOn(.completed)
                 dispose()
             }
@@ -124,7 +119,7 @@ final fileprivate class ThrottleSink<O: ObserverType>
         // in case element processing takes a while, this should give some more room
         _lastSentTime = _parent._scheduler.now
     }
-    
+
     func propagate(_: Int) -> Disposable {
         _lock.lock(); defer { _lock.unlock() } // {
             if let lastUnsentElement = _lastUnsentElement {
@@ -140,8 +135,8 @@ final fileprivate class ThrottleSink<O: ObserverType>
     }
 }
 
-final fileprivate class Throttle<Element> : Producer<Element> {
-    
+final private class Throttle<Element> : Producer<Element> {
+
     fileprivate let _source: Observable<Element>
     fileprivate let _dueTime: RxTimeInterval
     fileprivate let _latest: Bool
@@ -153,11 +148,11 @@ final fileprivate class Throttle<Element> : Producer<Element> {
         _latest = latest
         _scheduler = scheduler
     }
-    
+
     override func run<O: ObserverType>(_ observer: O, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where O.E == Element {
         let sink = ThrottleSink(parent: self, observer: observer, cancel: cancel)
         let subscription = sink.run()
         return (sink: sink, subscription: subscription)
     }
-    
+
 }
diff --git a/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Observables/Timeout.swift b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Observables/Timeout.swift
index 7008de8286..16b79ff4be 100644
--- a/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Observables/Timeout.swift
+++ b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Observables/Timeout.swift
@@ -38,33 +38,33 @@ extension ObservableType {
     }
 }
 
-final fileprivate class TimeoutSink<O: ObserverType>: Sink<O>, LockOwnerType, ObserverType {
+final private class TimeoutSink<O: ObserverType>: Sink<O>, LockOwnerType, ObserverType {
     typealias E = O.E
     typealias Parent = Timeout<E>
-    
+
     private let _parent: Parent
-    
+
     let _lock = RecursiveLock()
 
     private let _timerD = SerialDisposable()
     private let _subscription = SerialDisposable()
-    
+
     private var _id = 0
     private var _switched = false
-    
+
     init(parent: Parent, observer: O, cancel: Cancelable) {
         _parent = parent
         super.init(observer: observer, cancel: cancel)
     }
-    
+
     func run() -> Disposable {
         let original = SingleAssignmentDisposable()
         _subscription.disposable = original
-        
+
         _createTimeoutTimer()
-        
+
         original.setDisposable(_parent._source.subscribe(self))
-        
+
         return Disposables.create(_subscription, _timerD)
     }
 
@@ -72,56 +72,56 @@ final fileprivate class TimeoutSink<O: ObserverType>: Sink<O>, LockOwnerType, Ob
         switch event {
         case .next:
             var onNextWins = false
-            
-            _lock.performLocked() {
+
+            _lock.performLocked {
                 onNextWins = !self._switched
                 if onNextWins {
                     self._id = self._id &+ 1
                 }
             }
-            
+
             if onNextWins {
                 forwardOn(event)
                 self._createTimeoutTimer()
             }
         case .error, .completed:
             var onEventWins = false
-            
-            _lock.performLocked() {
+
+            _lock.performLocked {
                 onEventWins = !self._switched
                 if onEventWins {
                     self._id = self._id &+ 1
                 }
             }
-            
+
             if onEventWins {
                 forwardOn(event)
                 self.dispose()
             }
         }
     }
-    
+
     private func _createTimeoutTimer() {
         if _timerD.isDisposed {
             return
         }
-        
+
         let nextTimer = SingleAssignmentDisposable()
         _timerD.disposable = nextTimer
-        
+
         let disposeSchedule = _parent._scheduler.scheduleRelative(_id, dueTime: _parent._dueTime) { state in
-            
+
             var timerWins = false
-            
-            self._lock.performLocked() {
+
+            self._lock.performLocked {
                 self._switched = (state == self._id)
                 timerWins = self._switched
             }
-            
+
             if timerWins {
                 self._subscription.disposable = self._parent._other.subscribe(self.forwarder())
             }
-            
+
             return Disposables.create()
         }
 
@@ -129,22 +129,21 @@ final fileprivate class TimeoutSink<O: ObserverType>: Sink<O>, LockOwnerType, Ob
     }
 }
 
+final private class Timeout<Element> : Producer<Element> {
 
-final fileprivate class Timeout<Element> : Producer<Element> {
-    
     fileprivate let _source: Observable<Element>
     fileprivate let _dueTime: RxTimeInterval
     fileprivate let _other: Observable<Element>
     fileprivate let _scheduler: SchedulerType
-    
+
     init(source: Observable<Element>, dueTime: RxTimeInterval, other: Observable<Element>, scheduler: SchedulerType) {
         _source = source
         _dueTime = dueTime
         _other = other
         _scheduler = scheduler
     }
-    
-    override func run<O : ObserverType>(_ observer: O, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where O.E == Element {
+
+    override func run<O: ObserverType>(_ observer: O, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where O.E == Element {
         let sink = TimeoutSink(parent: self, observer: observer, cancel: cancel)
         let subscription = sink.run()
         return (sink: sink, subscription: subscription)
diff --git a/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Observables/Timer.swift b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Observables/Timer.swift
index dec69e12d0..77a0b88137 100644
--- a/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Observables/Timer.swift
+++ b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Observables/Timer.swift
@@ -6,7 +6,7 @@
 //  Copyright © 2015 Krunoslav Zaher. All rights reserved.
 //
 
-extension ObservableType where E : RxAbstractInteger {
+extension ObservableType where E: RxAbstractInteger {
     /**
      Returns an observable sequence that produces a value after each period, using the specified scheduler to run timers and to send out observer messages.
 
@@ -46,16 +46,16 @@ extension ObservableType where E: RxAbstractInteger {
     }
 }
 
-final fileprivate class TimerSink<O: ObserverType> : Sink<O> where O.E : RxAbstractInteger  {
+final private class TimerSink<O: ObserverType> : Sink<O> where O.E: RxAbstractInteger {
     typealias Parent = Timer<O.E>
-    
+
     private let _parent: Parent
-    
+
     init(parent: Parent, observer: O, cancel: Cancelable) {
         _parent = parent
         super.init(observer: observer, cancel: cancel)
     }
-    
+
     func run() -> Disposable {
         return _parent._scheduler.schedulePeriodic(0 as O.E, startAfter: _parent._dueTime, period: _parent._period!) { state in
             self.forwardOn(.next(state))
@@ -64,18 +64,18 @@ final fileprivate class TimerSink<O: ObserverType> : Sink<O> where O.E : RxAbstr
     }
 }
 
-final fileprivate class TimerOneOffSink<O: ObserverType> : Sink<O> where O.E : RxAbstractInteger {
+final private class TimerOneOffSink<O: ObserverType> : Sink<O> where O.E: RxAbstractInteger {
     typealias Parent = Timer<O.E>
-    
+
     private let _parent: Parent
-    
+
     init(parent: Parent, observer: O, cancel: Cancelable) {
         _parent = parent
         super.init(observer: observer, cancel: cancel)
     }
-    
+
     func run() -> Disposable {
-        return _parent._scheduler.scheduleRelative(self, dueTime: _parent._dueTime) { (`self`) -> Disposable in
+        return _parent._scheduler.scheduleRelative(self, dueTime: _parent._dueTime) { (_f`) -> Disposable in
             self.forwardOn(.next(0))
             self.forwardOn(.completed)
             self.dispose()
@@ -85,24 +85,23 @@ final fileprivate class TimerOneOffSink<O: ObserverType> : Sink<O> where O.E : R
     }
 }
 
-final fileprivate class Timer<E: RxAbstractInteger>: Producer<E> {
+final private class Timer<E: RxAbstractInteger>: Producer<E> {
     fileprivate let _scheduler: SchedulerType
     fileprivate let _dueTime: RxTimeInterval
     fileprivate let _period: RxTimeInterval?
-    
+
     init(dueTime: RxTimeInterval, period: RxTimeInterval?, scheduler: SchedulerType) {
         _scheduler = scheduler
         _dueTime = dueTime
         _period = period
     }
-    
-    override func run<O : ObserverType>(_ observer: O, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where O.E == E {
+
+    override func run<O: ObserverType>(_ observer: O, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where O.E == E {
         if let _ = _period {
             let sink = TimerSink(parent: self, observer: observer, cancel: cancel)
             let subscription = sink.run()
             return (sink: sink, subscription: subscription)
-        }
-        else {
+        } else {
             let sink = TimerOneOffSink(parent: self, observer: observer, cancel: cancel)
             let subscription = sink.run()
             return (sink: sink, subscription: subscription)
diff --git a/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Observables/ToArray.swift b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Observables/ToArray.swift
index 93fcb80e11..d760f2197f 100644
--- a/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Observables/ToArray.swift
+++ b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Observables/ToArray.swift
@@ -6,7 +6,6 @@
 //  Copyright © 2015 Krunoslav Zaher. All rights reserved.
 //
 
-
 extension ObservableType {
 
     /**
@@ -24,18 +23,18 @@ extension ObservableType {
     }
 }
 
-final fileprivate class ToArraySink<SourceType, O: ObserverType> : Sink<O>, ObserverType where O.E == [SourceType] {
+final private class ToArraySink<SourceType, O: ObserverType> : Sink<O>, ObserverType where O.E == [SourceType] {
     typealias Parent = ToArray<SourceType>
-    
+
     let _parent: Parent
     var _list = Array<SourceType>()
-    
+
     init(parent: Parent, observer: O, cancel: Cancelable) {
         _parent = parent
-        
+
         super.init(observer: observer, cancel: cancel)
     }
-    
+
     func on(_ event: Event<SourceType>) {
         switch event {
         case .next(let value):
@@ -51,13 +50,13 @@ final fileprivate class ToArraySink<SourceType, O: ObserverType> : Sink<O>, Obse
     }
 }
 
-final fileprivate class ToArray<SourceType> : Producer<[SourceType]> {
+final private class ToArray<SourceType> : Producer<[SourceType]> {
     let _source: Observable<SourceType>
 
     init(source: Observable<SourceType>) {
         _source = source
     }
-    
+
     override func run<O: ObserverType>(_ observer: O, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where O.E == [SourceType] {
         let sink = ToArraySink(parent: self, observer: observer, cancel: cancel)
         let subscription = _source.subscribe(sink)
diff --git a/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Observables/Using.swift b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Observables/Using.swift
index 8ea832678b..a8213b9247 100644
--- a/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Observables/Using.swift
+++ b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Observables/Using.swift
@@ -21,25 +21,25 @@ extension ObservableType {
     }
 }
 
-final fileprivate class UsingSink<ResourceType: Disposable, O: ObserverType> : Sink<O>, ObserverType {
+final private class UsingSink<ResourceType: Disposable, O: ObserverType> : Sink<O>, ObserverType {
     typealias SourceType = O.E
     typealias Parent = Using<SourceType, ResourceType>
 
     private let _parent: Parent
-    
+
     init(parent: Parent, observer: O, cancel: Cancelable) {
         _parent = parent
         super.init(observer: observer, cancel: cancel)
     }
-    
+
     func run() -> Disposable {
         var disposable = Disposables.create()
-        
+
         do {
             let resource = try _parent._resourceFactory()
             disposable = resource
             let source = try _parent._observableFactory(resource)
-            
+
             return Disposables.create(
                 source.subscribe(self),
                 disposable
@@ -51,7 +51,7 @@ final fileprivate class UsingSink<ResourceType: Disposable, O: ObserverType> : S
             )
         }
     }
-    
+
     func on(_ event: Event<SourceType>) {
         switch event {
         case let .next(value):
@@ -66,23 +66,22 @@ final fileprivate class UsingSink<ResourceType: Disposable, O: ObserverType> : S
     }
 }
 
-final fileprivate class Using<SourceType, ResourceType: Disposable>: Producer<SourceType> {
-    
+final private class Using<SourceType, ResourceType: Disposable>: Producer<SourceType> {
+
     typealias E = SourceType
-    
+
     typealias ResourceFactory = () throws -> ResourceType
     typealias ObservableFactory = (ResourceType) throws -> Observable<SourceType>
-    
+
     fileprivate let _resourceFactory: ResourceFactory
     fileprivate let _observableFactory: ObservableFactory
-    
-    
+
     init(resourceFactory: @escaping ResourceFactory, observableFactory: @escaping ObservableFactory) {
         _resourceFactory = resourceFactory
         _observableFactory = observableFactory
     }
-    
-    override func run<O : ObserverType>(_ observer: O, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where O.E == E {
+
+    override func run<O: ObserverType>(_ observer: O, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where O.E == E {
         let sink = UsingSink(parent: self, observer: observer, cancel: cancel)
         let subscription = sink.run()
         return (sink: sink, subscription: subscription)
diff --git a/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Observables/Window.swift b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Observables/Window.swift
index c862dfba78..0c6e7b2b24 100644
--- a/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Observables/Window.swift
+++ b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Observables/Window.swift
@@ -24,48 +24,45 @@ extension ObservableType {
     }
 }
 
-final fileprivate class WindowTimeCountSink<Element, O: ObserverType>
-    : Sink<O>
-    , ObserverType
-    , LockOwnerType
-    , SynchronizedOnType where O.E == Observable<Element> {
+final private class WindowTimeCountSink<Element, O: ObserverType>
+    : Sink<O>, ObserverType, LockOwnerType, SynchronizedOnType where O.E == Observable<Element> {
     typealias Parent = WindowTimeCount<Element>
     typealias E = Element
-    
+
     private let _parent: Parent
-    
+
     let _lock = RecursiveLock()
-    
+
     private var _subject = PublishSubject<Element>()
     private var _count = 0
     private var _windowId = 0
-    
+
     private let _timerD = SerialDisposable()
     private let _refCountDisposable: RefCountDisposable
     private let _groupDisposable = CompositeDisposable()
-    
+
     init(parent: Parent, observer: O, cancel: Cancelable) {
         _parent = parent
-        
-        let _ = _groupDisposable.insert(_timerD)
-        
+
+        _ = _groupDisposable.insert(_timerD)
+
         _refCountDisposable = RefCountDisposable(disposable: _groupDisposable)
         super.init(observer: observer, cancel: cancel)
     }
-    
+
     func run() -> Disposable {
-        
+
         forwardOn(.next(AddRef(source: _subject, refCount: _refCountDisposable).asObservable()))
         createTimer(_windowId)
-        
-        let _ = _groupDisposable.insert(_parent._source.subscribe(self))
+
+        _ = _groupDisposable.insert(_parent._source.subscribe(self))
         return _refCountDisposable
     }
-    
+
     func startNewWindowAndCompleteCurrentOne() {
         _subject.on(.completed)
         _subject = PublishSubject<Element>()
-        
+
         forwardOn(.next(AddRef(source: _subject, refCount: _refCountDisposable).asObservable()))
     }
 
@@ -76,18 +73,18 @@ final fileprivate class WindowTimeCountSink<Element, O: ObserverType>
     func _synchronized_on(_ event: Event<E>) {
         var newWindow = false
         var newId = 0
-        
+
         switch event {
         case .next(let element):
             _subject.on(.next(element))
-            
+
             do {
-                let _ = try incrementChecked(&_count)
+                _ = try incrementChecked(&_count)
             } catch (let e) {
                 _subject.on(.error(e as Swift.Error))
                 dispose()
             }
-            
+
             if (_count == _parent._count) {
                 newWindow = true
                 _count = 0
@@ -95,7 +92,7 @@ final fileprivate class WindowTimeCountSink<Element, O: ObserverType>
                 newId = _windowId
                 self.startNewWindowAndCompleteCurrentOne()
             }
-            
+
         case .error(let error):
             _subject.on(.error(error))
             forwardOn(.error(error))
@@ -110,12 +107,12 @@ final fileprivate class WindowTimeCountSink<Element, O: ObserverType>
             createTimer(newId)
         }
     }
-    
+
     func createTimer(_ windowId: Int) {
         if _timerD.isDisposed {
             return
         }
-        
+
         if _windowId != windowId {
             return
         }
@@ -125,22 +122,22 @@ final fileprivate class WindowTimeCountSink<Element, O: ObserverType>
         _timerD.disposable = nextTimer
 
         let scheduledRelative = _parent._scheduler.scheduleRelative(windowId, dueTime: _parent._timeSpan) { previousWindowId in
-            
+
             var newId = 0
-            
+
             self._lock.performLocked {
                 if previousWindowId != self._windowId {
                     return
                 }
-                
+
                 self._count = 0
                 self._windowId = self._windowId &+ 1
                 newId = self._windowId
                 self.startNewWindowAndCompleteCurrentOne()
             }
-            
+
             self.createTimer(newId)
-            
+
             return Disposables.create()
         }
 
@@ -148,21 +145,21 @@ final fileprivate class WindowTimeCountSink<Element, O: ObserverType>
     }
 }
 
-final fileprivate class WindowTimeCount<Element> : Producer<Observable<Element>> {
-    
+final private class WindowTimeCount<Element> : Producer<Observable<Element>> {
+
     fileprivate let _timeSpan: RxTimeInterval
     fileprivate let _count: Int
     fileprivate let _scheduler: SchedulerType
     fileprivate let _source: Observable<Element>
-    
+
     init(source: Observable<Element>, timeSpan: RxTimeInterval, count: Int, scheduler: SchedulerType) {
         _source = source
         _timeSpan = timeSpan
         _count = count
         _scheduler = scheduler
     }
-    
-    override func run<O : ObserverType>(_ observer: O, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where O.E == Observable<Element> {
+
+    override func run<O: ObserverType>(_ observer: O, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where O.E == Observable<Element> {
         let sink = WindowTimeCountSink(parent: self, observer: observer, cancel: cancel)
         let subscription = sink.run()
         return (sink: sink, subscription: subscription)
diff --git a/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Observables/WithLatestFrom.swift b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Observables/WithLatestFrom.swift
index bd22e2f01b..b938aa1d6e 100644
--- a/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Observables/WithLatestFrom.swift
+++ b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Observables/WithLatestFrom.swift
@@ -34,30 +34,27 @@ extension ObservableType {
     }
 }
 
-final fileprivate class WithLatestFromSink<FirstType, SecondType, O: ObserverType>
-    : Sink<O>
-    , ObserverType
-    , LockOwnerType
-    , SynchronizedOnType {
+final private class WithLatestFromSink<FirstType, SecondType, O: ObserverType>
+    : Sink<O>, ObserverType, LockOwnerType, SynchronizedOnType {
     typealias ResultType = O.E
     typealias Parent = WithLatestFrom<FirstType, SecondType, ResultType>
     typealias E = FirstType
-    
+
     fileprivate let _parent: Parent
-    
+
     var _lock = RecursiveLock()
     fileprivate var _latest: SecondType?
 
     init(parent: Parent, observer: O, cancel: Cancelable) {
         _parent = parent
-        
+
         super.init(observer: observer, cancel: cancel)
     }
-    
+
     func run() -> Disposable {
         let sndSubscription = SingleAssignmentDisposable()
         let sndO = WithLatestFromSecond(parent: self, disposable: sndSubscription)
-        
+
         sndSubscription.setDisposable(_parent._second.subscribe(sndO))
         let fstSubscription = _parent._first.subscribe(self)
 
@@ -74,7 +71,7 @@ final fileprivate class WithLatestFromSink<FirstType, SecondType, O: ObserverTyp
             guard let latest = _latest else { return }
             do {
                 let res = try _parent._resultSelector(value, latest)
-                
+
                 forwardOn(.next(res))
             } catch let e {
                 forwardOn(.error(e))
@@ -90,15 +87,13 @@ final fileprivate class WithLatestFromSink<FirstType, SecondType, O: ObserverTyp
     }
 }
 
-final fileprivate class WithLatestFromSecond<FirstType, SecondType, O: ObserverType>
-    : ObserverType
-    , LockOwnerType
-    , SynchronizedOnType {
-    
+final private class WithLatestFromSecond<FirstType, SecondType, O: ObserverType>
+    : ObserverType, LockOwnerType, SynchronizedOnType {
+
     typealias ResultType = O.E
     typealias Parent = WithLatestFromSink<FirstType, SecondType, O>
     typealias E = SecondType
-    
+
     private let _parent: Parent
     private let _disposable: Disposable
 
@@ -110,7 +105,7 @@ final fileprivate class WithLatestFromSecond<FirstType, SecondType, O: ObserverT
         _parent = parent
         _disposable = disposable
     }
-    
+
     func on(_ event: Event<E>) {
         synchronizedOn(event)
     }
@@ -128,9 +123,9 @@ final fileprivate class WithLatestFromSecond<FirstType, SecondType, O: ObserverT
     }
 }
 
-final fileprivate class WithLatestFrom<FirstType, SecondType, ResultType>: Producer<ResultType> {
+final private class WithLatestFrom<FirstType, SecondType, ResultType>: Producer<ResultType> {
     typealias ResultSelector = (FirstType, SecondType) throws -> ResultType
-    
+
     fileprivate let _first: Observable<FirstType>
     fileprivate let _second: Observable<SecondType>
     fileprivate let _resultSelector: ResultSelector
@@ -140,8 +135,8 @@ final fileprivate class WithLatestFrom<FirstType, SecondType, ResultType>: Produ
         _second = second
         _resultSelector = resultSelector
     }
-    
-    override func run<O : ObserverType>(_ observer: O, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where O.E == ResultType {
+
+    override func run<O: ObserverType>(_ observer: O, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where O.E == ResultType {
         let sink = WithLatestFromSink(parent: self, observer: observer, cancel: cancel)
         let subscription = sink.run()
         return (sink: sink, subscription: subscription)
diff --git a/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Observables/Zip+Collection.swift b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Observables/Zip+Collection.swift
index 1a871c1ee0..fd465e7366 100644
--- a/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Observables/Zip+Collection.swift
+++ b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Observables/Zip+Collection.swift
@@ -31,50 +31,50 @@ extension ObservableType {
         where C.Iterator.Element: ObservableType, C.Iterator.Element.E == E {
         return ZipCollectionType(sources: collection, resultSelector: { $0 })
     }
-    
+
 }
 
-final fileprivate class ZipCollectionTypeSink<C: Collection, O: ObserverType>
-    : Sink<O> where C.Iterator.Element : ObservableConvertibleType {
+final private class ZipCollectionTypeSink<C: Collection, O: ObserverType>
+    : Sink<O> where C.Iterator.Element: ObservableConvertibleType {
     typealias R = O.E
     typealias Parent = ZipCollectionType<C, R>
     typealias SourceElement = C.Iterator.Element.E
-    
+
     private let _parent: Parent
-    
+
     private let _lock = RecursiveLock()
-    
+
     // state
     private var _numberOfValues = 0
     private var _values: [Queue<SourceElement>]
     private var _isDone: [Bool]
     private var _numberOfDone = 0
     private var _subscriptions: [SingleAssignmentDisposable]
-    
+
     init(parent: Parent, observer: O, cancel: Cancelable) {
         _parent = parent
         _values = [Queue<SourceElement>](repeating: Queue(capacity: 4), count: parent.count)
         _isDone = [Bool](repeating: false, count: parent.count)
         _subscriptions = Array<SingleAssignmentDisposable>()
         _subscriptions.reserveCapacity(parent.count)
-        
+
         for _ in 0 ..< parent.count {
             _subscriptions.append(SingleAssignmentDisposable())
         }
-        
+
         super.init(observer: observer, cancel: cancel)
     }
-    
+
     func on(_ event: Event<SourceElement>, atIndex: Int) {
         _lock.lock(); defer { _lock.unlock() } // {
             switch event {
             case .next(let element):
                 _values[atIndex].enqueue(element)
-                
+
                 if _values[atIndex].count == 1 {
                     _numberOfValues += 1
                 }
-                
+
                 if _numberOfValues < _parent.count {
                     if _numberOfDone == _parent.count - 1 {
                         self.forwardOn(.completed)
@@ -82,29 +82,28 @@ final fileprivate class ZipCollectionTypeSink<C: Collection, O: ObserverType>
                     }
                     return
                 }
-                
+
                 do {
                     var arguments = [SourceElement]()
                     arguments.reserveCapacity(_parent.count)
-                    
+
                     // recalculate number of values
                     _numberOfValues = 0
-                    
+
                     for i in 0 ..< _values.count {
                         arguments.append(_values[i].dequeue()!)
                         if !_values[i].isEmpty {
                             _numberOfValues += 1
                         }
                     }
-                    
+
                     let result = try _parent.resultSelector(arguments)
                     self.forwardOn(.next(result))
-                }
-                catch let error {
+                } catch let error {
                     self.forwardOn(.error(error))
                     self.dispose()
                 }
-                
+
             case .error(let error):
                 self.forwardOn(.error(error))
                 self.dispose()
@@ -112,21 +111,20 @@ final fileprivate class ZipCollectionTypeSink<C: Collection, O: ObserverType>
                 if _isDone[atIndex] {
                     return
                 }
-                
+
                 _isDone[atIndex] = true
                 _numberOfDone += 1
-                
+
                 if _numberOfDone == _parent.count {
                     self.forwardOn(.completed)
                     self.dispose()
-                }
-                else {
+                } else {
                     _subscriptions[atIndex].dispose()
                 }
             }
         // }
     }
-    
+
     func run() -> Disposable {
         var j = 0
         for i in _parent.sources {
@@ -143,25 +141,25 @@ final fileprivate class ZipCollectionTypeSink<C: Collection, O: ObserverType>
         if _parent.sources.isEmpty {
             self.forwardOn(.completed)
         }
-        
+
         return Disposables.create(_subscriptions)
     }
 }
 
-final fileprivate class ZipCollectionType<C: Collection, R> : Producer<R> where C.Iterator.Element : ObservableConvertibleType {
+final private class ZipCollectionType<C: Collection, R> : Producer<R> where C.Iterator.Element: ObservableConvertibleType {
     typealias ResultSelector = ([C.Iterator.Element.E]) throws -> R
-    
+
     let sources: C
     let resultSelector: ResultSelector
     let count: Int
-    
+
     init(sources: C, resultSelector: @escaping ResultSelector) {
         self.sources = sources
         self.resultSelector = resultSelector
         self.count = Int(Int64(self.sources.count))
     }
-    
-    override func run<O : ObserverType>(_ observer: O, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where O.E == R {
+
+    override func run<O: ObserverType>(_ observer: O, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where O.E == R {
         let sink = ZipCollectionTypeSink(parent: self, observer: observer, cancel: cancel)
         let subscription = sink.run()
         return (sink: sink, subscription: subscription)
diff --git a/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Observables/Zip+arity.swift b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Observables/Zip+arity.swift
index 434543e758..945adc3af6 100644
--- a/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Observables/Zip+arity.swift
+++ b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Observables/Zip+arity.swift
@@ -7,8 +7,6 @@
 //  Copyright © 2015 Krunoslav Zaher. All rights reserved.
 //
 
-
-
 // 2
 
 extension ObservableType {
@@ -117,8 +115,6 @@ final class Zip2<E1, E2, R> : Producer<R> {
     }
 }
 
-
-
 // 3
 
 extension ObservableType {
@@ -235,8 +231,6 @@ final class Zip3<E1, E2, E3, R> : Producer<R> {
     }
 }
 
-
-
 // 4
 
 extension ObservableType {
@@ -361,8 +355,6 @@ final class Zip4<E1, E2, E3, E4, R> : Producer<R> {
     }
 }
 
-
-
 // 5
 
 extension ObservableType {
@@ -495,8 +487,6 @@ final class Zip5<E1, E2, E3, E4, E5, R> : Producer<R> {
     }
 }
 
-
-
 // 6
 
 extension ObservableType {
@@ -637,8 +627,6 @@ final class Zip6<E1, E2, E3, E4, E5, E6, R> : Producer<R> {
     }
 }
 
-
-
 // 7
 
 extension ObservableType {
@@ -787,8 +775,6 @@ final class Zip7<E1, E2, E3, E4, E5, E6, E7, R> : Producer<R> {
     }
 }
 
-
-
 // 8
 
 extension ObservableType {
@@ -944,5 +930,3 @@ final class Zip8<E1, E2, E3, E4, E5, E6, E7, E8, R> : Producer<R> {
         return (sink: sink, subscription: subscription)
     }
 }
-
-
diff --git a/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Observables/Zip.swift b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Observables/Zip.swift
index a283bf2b23..de65c27cfc 100644
--- a/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Observables/Zip.swift
+++ b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Observables/Zip.swift
@@ -6,8 +6,7 @@
 //  Copyright © 2015 Krunoslav Zaher. All rights reserved.
 //
 
-protocol ZipSinkProtocol : class
-{
+protocol ZipSinkProtocol: class {
     func next(_ index: Int)
     func fail(_ error: Swift.Error)
     func done(_ index: Int)
@@ -15,52 +14,50 @@ protocol ZipSinkProtocol : class
 
 class ZipSink<O: ObserverType> : Sink<O>, ZipSinkProtocol {
     typealias Element = O.E
-    
+
     let _arity: Int
 
     let _lock = RecursiveLock()
 
     // state
     private var _isDone: [Bool]
-    
+
     init(arity: Int, observer: O, cancel: Cancelable) {
         _isDone = [Bool](repeating: false, count: arity)
         _arity = arity
-        
+
         super.init(observer: observer, cancel: cancel)
     }
 
     func getResult() throws -> Element {
         rxAbstractMethod()
     }
-    
+
     func hasElements(_ index: Int) -> Bool {
         rxAbstractMethod()
     }
-    
+
     func next(_ index: Int) {
         var hasValueAll = true
-        
+
         for i in 0 ..< _arity {
             if !hasElements(i) {
                 hasValueAll = false
                 break
             }
         }
-        
+
         if hasValueAll {
             do {
                 let result = try getResult()
                 self.forwardOn(.next(result))
-            }
-            catch let e {
+            } catch let e {
                 self.forwardOn(.error(e))
                 dispose()
             }
-        }
-        else {
+        } else {
             var allOthersDone = true
-            
+
             let arity = _isDone.count
             for i in 0 ..< arity {
                 if i != index && !_isDone[i] {
@@ -68,31 +65,31 @@ class ZipSink<O: ObserverType> : Sink<O>, ZipSinkProtocol {
                     break
                 }
             }
-            
+
             if allOthersDone {
                 forwardOn(.completed)
                 self.dispose()
             }
         }
     }
-    
+
     func fail(_ error: Swift.Error) {
         forwardOn(.error(error))
         dispose()
     }
-    
+
     func done(_ index: Int) {
         _isDone[index] = true
-        
+
         var allDone = true
-        
+
         for done in _isDone {
             if !done {
                 allDone = false
                 break
             }
         }
-        
+
         if allDone {
             forwardOn(.completed)
             dispose()
@@ -101,21 +98,19 @@ class ZipSink<O: ObserverType> : Sink<O>, ZipSinkProtocol {
 }
 
 final class ZipObserver<ElementType>
-    : ObserverType
-    , LockOwnerType
-    , SynchronizedOnType {
+    : ObserverType, LockOwnerType, SynchronizedOnType {
     typealias E = ElementType
-    typealias ValueSetter = (ElementType) -> ()
+    typealias ValueSetter = (ElementType) -> Void
 
     private var _parent: ZipSinkProtocol?
-    
+
     let _lock: RecursiveLock
-    
+
     // state
     private let _index: Int
     private let _this: Disposable
     private let _setNextValue: ValueSetter
-    
+
     init(lock: RecursiveLock, parent: ZipSinkProtocol, index: Int, setNextValue: @escaping ValueSetter, this: Disposable) {
         _lock = lock
         _parent = parent
@@ -123,7 +118,7 @@ final class ZipObserver<ElementType>
         _this = this
         _setNextValue = setNextValue
     }
-    
+
     func on(_ event: Event<E>) {
         synchronizedOn(event)
     }
@@ -131,15 +126,15 @@ final class ZipObserver<ElementType>
     func _synchronized_on(_ event: Event<E>) {
         if let _ = _parent {
             switch event {
-            case .next(_):
+            case .next:
                 break
-            case .error(_):
+            case .error:
                 _this.dispose()
             case .completed:
                 _this.dispose()
             }
         }
-        
+
         if let parent = _parent {
             switch event {
             case .next(let value):
diff --git a/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/ObserverType.swift b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/ObserverType.swift
index e3ed7aa886..5a9b84b2db 100644
--- a/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/ObserverType.swift
+++ b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/ObserverType.swift
@@ -19,19 +19,19 @@ public protocol ObserverType {
 
 /// Convenience API extensions to provide alternate next, error, completed events
 extension ObserverType {
-    
+
     /// Convenience method equivalent to `on(.next(element: E))`
     ///
     /// - parameter element: Next element to send to observer(s)
     public func onNext(_ element: E) {
         on(.next(element))
     }
-    
+
     /// Convenience method equivalent to `on(.completed)`
     public func onCompleted() {
         on(.completed)
     }
-    
+
     /// Convenience method equivalent to `on(.error(Swift.Error))`
     /// - parameter error: Swift.Error to send to observer(s)
     public func onError(_ error: Swift.Error) {
diff --git a/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Observers/AnonymousObserver.swift b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Observers/AnonymousObserver.swift
index 54e83f5485..8a54b7dcd1 100644
--- a/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Observers/AnonymousObserver.swift
+++ b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Observers/AnonymousObserver.swift
@@ -8,14 +8,14 @@
 
 final class AnonymousObserver<ElementType> : ObserverBase<ElementType> {
     typealias Element = ElementType
-    
+
     typealias EventHandler = (Event<Element>) -> Void
-    
-    private let _eventHandler : EventHandler
-    
+
+    private let _eventHandler: EventHandler
+
     init(_ eventHandler: @escaping EventHandler) {
 #if TRACE_RESOURCES
-        let _ = Resources.incrementTotal()
+        _ = Resources.incrementTotal()
 #endif
         _eventHandler = eventHandler
     }
@@ -23,10 +23,10 @@ final class AnonymousObserver<ElementType> : ObserverBase<ElementType> {
     override func onCore(_ event: Event<Element>) {
         return _eventHandler(event)
     }
-    
+
 #if TRACE_RESOURCES
     deinit {
-        let _ = Resources.decrementTotal()
+        _ = Resources.decrementTotal()
     }
 #endif
 }
diff --git a/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Observers/TailRecursiveSink.swift b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Observers/TailRecursiveSink.swift
index 48a599dd3a..23bdbbd30c 100644
--- a/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Observers/TailRecursiveSink.swift
+++ b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Observers/TailRecursiveSink.swift
@@ -17,8 +17,7 @@ enum TailRecursiveSinkCommand {
 
 /// This class is usually used with `Generator` version of the operators.
 class TailRecursiveSink<S: Sequence, O: ObserverType>
-    : Sink<O>
-    , InvocableWithValueType where S.Iterator.Element: ObservableConvertibleType, S.Iterator.Element.E == O.E {
+    : Sink<O>, InvocableWithValueType where S.Iterator.Element: ObservableConvertibleType, S.Iterator.Element.E == O.E {
     typealias Value = TailRecursiveSinkCommand
     typealias E = O.E
     typealias SequenceGenerator = (generator: S.Iterator, remaining: IntMax?)
@@ -68,19 +67,19 @@ class TailRecursiveSink<S: Sequence, O: ObserverType>
     // should be done on gate locked
 
     private func moveNextCommand() {
-        var next: Observable<E>? = nil
+        var next: Observable<E>?
 
         repeat {
             guard let (g, left) = _generators.last else {
                 break
             }
-            
+
             if _isDisposed {
                 return
             }
 
             _generators.removeLast()
-            
+
             var e = g
 
             guard let nextCandidate = e.next()?.asObservable() else {
@@ -100,8 +99,7 @@ class TailRecursiveSink<S: Sequence, O: ObserverType>
                 if knownOriginalLeft - 1 >= 1 {
                     _generators.append((e, knownOriginalLeft - 1))
                 }
-            }
-            else {
+            } else {
                 _generators.append((e, nil))
             }
 
@@ -114,13 +112,12 @@ class TailRecursiveSink<S: Sequence, O: ObserverType>
                         maxTailRecursiveSinkStackSize = _generators.count
                     }
                 #endif
-            }
-            else {
+            } else {
                 next = nextCandidate
             }
         } while next == nil
 
-        guard let existingNext = next else  {
+        guard let existingNext = next else {
             done()
             return
         }
@@ -141,11 +138,10 @@ class TailRecursiveSink<S: Sequence, O: ObserverType>
 
     override func dispose() {
         super.dispose()
-        
+
         _subscription.dispose()
         _gate.dispose()
-        
+
         schedule(.dispose)
     }
 }
-
diff --git a/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Rx.swift b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Rx.swift
index af948fcb86..7f5b11a184 100644
--- a/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Rx.swift
+++ b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Rx.swift
@@ -7,7 +7,7 @@
 //
 
 #if TRACE_RESOURCES
-    fileprivate var resourceCount = AtomicInt(0)
+    private var resourceCount = AtomicInt(0)
 
     /// Resource utilization information
     public struct Resources {
@@ -37,7 +37,7 @@ func rxAbstractMethod(file: StaticString = #file, line: UInt = #line) -> Swift.N
     rxFatalError("Abstract method", file: file, line: line)
 }
 
-func rxFatalError(_ lastMessage: @autoclosure () -> String, file: StaticString = #file, line: UInt = #line) -> Swift.Never  {
+func rxFatalError(_ lastMessage: @autoclosure () -> String, file: StaticString = #file, line: UInt = #line) -> Swift.Never {
     // The temptation to comment this line is great, but please don't, it's for your own good. The choice is yours.
     fatalError(lastMessage(), file: file, line: line)
 }
@@ -85,7 +85,7 @@ func decrementChecked(_ i: inout Int) throws -> Int {
                 print(message)
             #endif
         }
-        
+
         func register(synchronizationErrorMessage: SynchronizationErrorMessages) {
             _lock.lock(); defer { _lock.unlock() }
             let pointer = Unmanaged.passUnretained(Thread.current).toOpaque()
@@ -104,7 +104,7 @@ func decrementChecked(_ i: inout Int) throws -> Int {
                     "    or by enqueing sequence events in some other way.\n"
                 )
             }
-            
+
             _threads[pointer] = count
 
             if _threads.count > 1 {
@@ -135,7 +135,7 @@ func decrementChecked(_ i: inout Int) throws -> Int {
 
 /// RxSwift global hooks
 public enum Hooks {
-    
+
     // Should capture call stack
     public static var recordCallStackOnError: Bool = false
 
diff --git a/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/RxMutableBox.swift b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/RxMutableBox.swift
index 7f3c333baa..bd88886766 100644
--- a/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/RxMutableBox.swift
+++ b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/RxMutableBox.swift
@@ -9,8 +9,8 @@
 /// Creates mutable reference wrapper for any type.
 final class RxMutableBox<T> : CustomDebugStringConvertible {
     /// Wrapped value
-    var value : T
-    
+    var value: T
+
     /// Creates reference wrapper for `value`.
     ///
     /// - parameter value: Value to wrap.
diff --git a/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/SchedulerType.swift b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/SchedulerType.swift
index bdfcf8b017..d765c9a45d 100644
--- a/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/SchedulerType.swift
+++ b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/SchedulerType.swift
@@ -19,7 +19,7 @@ public typealias RxTime = Date
 public protocol SchedulerType: ImmediateSchedulerType {
 
     /// - returns: Current time.
-    var now : RxTime {
+    var now: RxTime {
         get
     }
 
@@ -32,7 +32,7 @@ public protocol SchedulerType: ImmediateSchedulerType {
     - returns: The disposable object used to cancel the scheduled action (best effort).
     */
     func scheduleRelative<StateType>(_ state: StateType, dueTime: RxTimeInterval, action: @escaping (StateType) -> Disposable) -> Disposable
- 
+
     /**
     Schedules a periodic piece of work.
     
@@ -57,15 +57,15 @@ extension SchedulerType {
     */
     public func schedulePeriodic<StateType>(_ state: StateType, startAfter: RxTimeInterval, period: RxTimeInterval, action: @escaping (StateType) -> StateType) -> Disposable {
         let schedule = SchedulePeriodicRecursive(scheduler: self, startAfter: startAfter, period: period, action: action, state: state)
-            
+
         return schedule.start()
     }
 
-    func scheduleRecursive<State>(_ state: State, dueTime: RxTimeInterval, action: @escaping (State, AnyRecursiveScheduler<State>) -> ()) -> Disposable {
+    func scheduleRecursive<State>(_ state: State, dueTime: RxTimeInterval, action: @escaping (State, AnyRecursiveScheduler<State>) -> Void) -> Disposable {
         let scheduler = AnyRecursiveScheduler(scheduler: self, action: action)
-         
+
         scheduler.schedule(state, dueTime: dueTime)
-            
+
         return Disposables.create(with: scheduler.dispose)
     }
 }
diff --git a/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Schedulers/ConcurrentDispatchQueueScheduler.swift b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Schedulers/ConcurrentDispatchQueueScheduler.swift
index aa1f480e52..b800097983 100644
--- a/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Schedulers/ConcurrentDispatchQueueScheduler.swift
+++ b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Schedulers/ConcurrentDispatchQueueScheduler.swift
@@ -16,13 +16,13 @@ import Dispatch
 public class ConcurrentDispatchQueueScheduler: SchedulerType {
     public typealias TimeInterval = Foundation.TimeInterval
     public typealias Time = Date
-    
-    public var now : Date {
+
+    public var now: Date {
         return Date()
     }
 
     let configuration: DispatchQueueConfiguration
-    
+
     /// Constructs new `ConcurrentDispatchQueueScheduler` that wraps `queue`.
     ///
     /// - parameter queue: Target dispatch queue.
@@ -30,7 +30,7 @@ public class ConcurrentDispatchQueueScheduler: SchedulerType {
     public init(queue: DispatchQueue, leeway: DispatchTimeInterval = DispatchTimeInterval.nanoseconds(0)) {
         configuration = DispatchQueueConfiguration(queue: queue, leeway: leeway)
     }
-    
+
     /// Convenience init for scheduler that wraps one of the global concurrent dispatch queues.
     ///
     /// - parameter qos: Target global dispatch queue, by quality of service class.
@@ -56,7 +56,7 @@ public class ConcurrentDispatchQueueScheduler: SchedulerType {
     public final func schedule<StateType>(_ state: StateType, action: @escaping (StateType) -> Disposable) -> Disposable {
         return self.configuration.schedule(state, action: action)
     }
-    
+
     /**
     Schedules an action to be executed.
     
@@ -68,7 +68,7 @@ public class ConcurrentDispatchQueueScheduler: SchedulerType {
     public final func scheduleRelative<StateType>(_ state: StateType, dueTime: Foundation.TimeInterval, action: @escaping (StateType) -> Disposable) -> Disposable {
         return self.configuration.scheduleRelative(state, dueTime: dueTime, action: action)
     }
-    
+
     /**
     Schedules a periodic piece of work.
     
diff --git a/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Schedulers/ConcurrentMainScheduler.swift b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Schedulers/ConcurrentMainScheduler.swift
index a98ad218a0..c717147bd5 100644
--- a/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Schedulers/ConcurrentMainScheduler.swift
+++ b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Schedulers/ConcurrentMainScheduler.swift
@@ -16,7 +16,7 @@ Abstracts work that needs to be performed on `MainThread`. In case `schedule` me
 This scheduler is optimized for `subscribeOn` operator. If you want to observe observable sequence elements on main thread using `observeOn` operator,
 `MainScheduler` is more suitable for that purpose.
 */
-public final class ConcurrentMainScheduler : SchedulerType {
+public final class ConcurrentMainScheduler: SchedulerType {
     public typealias TimeInterval = Foundation.TimeInterval
     public typealias Time = Date
 
@@ -24,7 +24,7 @@ public final class ConcurrentMainScheduler : SchedulerType {
     private let _mainQueue: DispatchQueue
 
     /// - returns: Current time.
-    public var now : Date {
+    public var now: Date {
         return _mainScheduler.now as Date
     }
 
diff --git a/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Schedulers/CurrentThreadScheduler.swift b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Schedulers/CurrentThreadScheduler.swift
index 0676444def..2d85097458 100644
--- a/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Schedulers/CurrentThreadScheduler.swift
+++ b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Schedulers/CurrentThreadScheduler.swift
@@ -16,12 +16,12 @@ import Dispatch
     import func Foundation.pthread_setspecific
     import func Foundation.pthread_getspecific
     import func Foundation.pthread_key_create
-    
-    fileprivate enum CurrentThreadSchedulerQueueKey {
+
+    private enum CurrentThreadSchedulerQueueKey {
         fileprivate static let instance = "RxSwift.CurrentThreadScheduler.Queue"
     }
 #else
-    fileprivate class CurrentThreadSchedulerQueueKey: NSObject, NSCopying {
+    private class CurrentThreadSchedulerQueueKey: NSObject, NSCopying {
         static let instance = CurrentThreadSchedulerQueueKey()
         private override init() {
             super.init()
@@ -42,7 +42,7 @@ import Dispatch
 /// This is the default scheduler for operators that generate elements.
 ///
 /// This scheduler is also sometimes called `trampoline scheduler`.
-public class CurrentThreadScheduler : ImmediateSchedulerType {
+public class CurrentThreadScheduler: ImmediateSchedulerType {
     typealias ScheduleQueue = RxMutableBox<Queue<ScheduledItemType>>
 
     /// The singleton instance of the current thread scheduler.
@@ -57,7 +57,7 @@ public class CurrentThreadScheduler : ImmediateSchedulerType {
             key.deallocate(capacity: 1)
 #endif
         }
-                                                               
+
         guard pthread_key_create(key, nil) == 0 else {
             rxFatalError("isScheduleRequired key creation failed")
         }
@@ -69,7 +69,7 @@ public class CurrentThreadScheduler : ImmediateSchedulerType {
         return UnsafeRawPointer(UnsafeMutablePointer<Int>.allocate(capacity: 1))
     }()
 
-    static var queue : ScheduleQueue? {
+    static var queue: ScheduleQueue? {
         get {
             return Thread.getThreadLocalStorageValueForKey(CurrentThreadSchedulerQueueKey.instance)
         }
@@ -130,8 +130,7 @@ public class CurrentThreadScheduler : ImmediateSchedulerType {
         let queue: RxMutableBox<Queue<ScheduledItemType>>
         if let existingQueue = existingQueue {
             queue = existingQueue
-        }
-        else {
+        } else {
             queue = RxMutableBox(Queue<ScheduledItemType>(capacity: 1))
             CurrentThreadScheduler.queue = queue
         }
diff --git a/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Schedulers/HistoricalScheduler.swift b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Schedulers/HistoricalScheduler.swift
index 11af238a3b..8f76a1407b 100644
--- a/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Schedulers/HistoricalScheduler.swift
+++ b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Schedulers/HistoricalScheduler.swift
@@ -9,7 +9,7 @@
 import struct Foundation.Date
 
 /// Provides a virtual time scheduler that uses `Date` for absolute time and `NSTimeInterval` for relative time.
-public class HistoricalScheduler : VirtualTimeScheduler<HistoricalSchedulerTimeConverter> {
+public class HistoricalScheduler: VirtualTimeScheduler<HistoricalSchedulerTimeConverter> {
 
     /**
       Creates a new historical scheduler with initial clock value.
diff --git a/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Schedulers/HistoricalSchedulerTimeConverter.swift b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Schedulers/HistoricalSchedulerTimeConverter.swift
index 930ca37762..260f5a2bd8 100644
--- a/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Schedulers/HistoricalSchedulerTimeConverter.swift
+++ b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Schedulers/HistoricalSchedulerTimeConverter.swift
@@ -11,7 +11,7 @@ import struct Foundation.Date
 /// Converts historical virtual time into real time.
 ///
 /// Since historical virtual time is also measured in `Date`, this converter is identity function.
-public struct HistoricalSchedulerTimeConverter : VirtualTimeConverterType {
+public struct HistoricalSchedulerTimeConverter: VirtualTimeConverterType {
     /// Virtual time unit used that represents ticks of virtual clock.
     public typealias VirtualTimeUnit = RxTime
 
diff --git a/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Schedulers/Internal/DispatchQueueConfiguration.swift b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Schedulers/Internal/DispatchQueueConfiguration.swift
index f2dfb90f27..d16434d234 100644
--- a/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Schedulers/Internal/DispatchQueueConfiguration.swift
+++ b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Schedulers/Internal/DispatchQueueConfiguration.swift
@@ -30,7 +30,6 @@ extension DispatchQueueConfiguration {
                 return
             }
 
-
             cancel.setDisposable(action(state))
         }
 
@@ -78,7 +77,7 @@ extension DispatchQueueConfiguration {
 
         let timer = DispatchSource.makeTimerSource(queue: queue)
         timer.schedule(deadline: initial, repeating: dispatchInterval(period), leeway: leeway)
-        
+
         // TODO:
         // This looks horrible, and yes, it is.
         // It looks like Apple has made a conceputal change here, and I'm unsure why.
@@ -98,7 +97,7 @@ extension DispatchQueueConfiguration {
             timerState = action(timerState)
         })
         timer.resume()
-        
+
         return cancelTimer
     }
 }
diff --git a/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Schedulers/Internal/ScheduledItem.swift b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Schedulers/Internal/ScheduledItem.swift
index 454fb34bb7..8b01608a65 100644
--- a/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Schedulers/Internal/ScheduledItem.swift
+++ b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Schedulers/Internal/ScheduledItem.swift
@@ -7,10 +7,9 @@
 //
 
 struct ScheduledItem<T>
-    : ScheduledItemType
-    , InvocableType {
+    : ScheduledItemType, InvocableType {
     typealias Action = (T) -> Disposable
-    
+
     private let _action: Action
     private let _state: T
 
@@ -19,16 +18,16 @@ struct ScheduledItem<T>
     var isDisposed: Bool {
         return _disposable.isDisposed
     }
-    
+
     init(action: @escaping Action, state: T) {
         _action = action
         _state = state
     }
-    
+
     func invoke() {
          _disposable.setDisposable(_action(_state))
     }
-    
+
     func dispose() {
         _disposable.dispose()
     }
diff --git a/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Schedulers/Internal/ScheduledItemType.swift b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Schedulers/Internal/ScheduledItemType.swift
index d2b16cab70..ec05efda62 100644
--- a/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Schedulers/Internal/ScheduledItemType.swift
+++ b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Schedulers/Internal/ScheduledItemType.swift
@@ -6,8 +6,6 @@
 //  Copyright © 2015 Krunoslav Zaher. All rights reserved.
 //
 
-protocol ScheduledItemType
-    : Cancelable
-    , InvocableType {
+protocol ScheduledItemType: Cancelable, InvocableType {
     func invoke()
 }
diff --git a/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Schedulers/MainScheduler.swift b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Schedulers/MainScheduler.swift
index 2a72137520..421659f71f 100644
--- a/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Schedulers/MainScheduler.swift
+++ b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Schedulers/MainScheduler.swift
@@ -18,7 +18,7 @@ Main scheduler is a specialization of `SerialDispatchQueueScheduler`.
 This scheduler is optimized for `observeOn` operator. To ensure observable sequence is subscribed on main thread using `subscribeOn`
 operator please use `ConcurrentMainScheduler` because it is more optimized for that purpose.
 */
-public final class MainScheduler : SerialDispatchQueueScheduler {
+public final class MainScheduler: SerialDispatchQueueScheduler {
 
     private let _mainQueue: DispatchQueue
 
diff --git a/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Schedulers/OperationQueueScheduler.swift b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Schedulers/OperationQueueScheduler.swift
index 81ba59f34e..a7dc1b8e3e 100644
--- a/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Schedulers/OperationQueueScheduler.swift
+++ b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Schedulers/OperationQueueScheduler.swift
@@ -17,7 +17,7 @@ import Dispatch
 public class OperationQueueScheduler: ImmediateSchedulerType {
     public let operationQueue: OperationQueue
     public let queuePriority: Operation.QueuePriority
-    
+
     /// Constructs new instance of `OperationQueueScheduler` that performs work on `operationQueue`.
     ///
     /// - parameter operationQueue: Operation queue targeted to perform work on.
@@ -26,7 +26,7 @@ public class OperationQueueScheduler: ImmediateSchedulerType {
         self.operationQueue = operationQueue
         self.queuePriority = queuePriority
     }
-    
+
     /**
     Schedules an action to be executed recursively.
     
@@ -42,14 +42,13 @@ public class OperationQueueScheduler: ImmediateSchedulerType {
                 return
             }
 
-
             cancel.setDisposable(action(state))
         }
 
         operation.queuePriority = self.queuePriority
 
         self.operationQueue.addOperation(operation)
-        
+
         return cancel
     }
 
diff --git a/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Schedulers/RecursiveScheduler.swift b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Schedulers/RecursiveScheduler.swift
index 24d19cc677..f0e4a5d18a 100644
--- a/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Schedulers/RecursiveScheduler.swift
+++ b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Schedulers/RecursiveScheduler.swift
@@ -6,7 +6,7 @@
 //  Copyright © 2015 Krunoslav Zaher. All rights reserved.
 //
 
-fileprivate enum ScheduleState {
+private enum ScheduleState {
     case initial
     case added(CompositeDisposable.DisposeKey)
     case done
@@ -14,17 +14,17 @@ fileprivate enum ScheduleState {
 
 /// Type erased recursive scheduler.
 final class AnyRecursiveScheduler<State> {
-    
+
     typealias Action =  (State, AnyRecursiveScheduler<State>) -> Void
 
     private let _lock = RecursiveLock()
-    
+
     // state
     private let _group = CompositeDisposable()
 
     private var _scheduler: SchedulerType
     private var _action: Action?
-    
+
     init(scheduler: SchedulerType, action: @escaping Action) {
         _action = action
         _scheduler = scheduler
@@ -44,7 +44,7 @@ final class AnyRecursiveScheduler<State> {
             if self._group.isDisposed {
                 return Disposables.create()
             }
-            
+
             let action = self._lock.calculateLocked { () -> Action? in
                 switch scheduleState {
                 case let .added(removeKey):
@@ -59,14 +59,14 @@ final class AnyRecursiveScheduler<State> {
 
                 return self._action
             }
-            
+
             if let action = action {
                 action(state, self)
             }
-            
+
             return Disposables.create()
         }
-            
+
         _lock.performLocked {
             switch scheduleState {
             case .added:
@@ -75,8 +75,7 @@ final class AnyRecursiveScheduler<State> {
             case .initial:
                 if let removeKey = _group.insert(d) {
                     scheduleState = .added(removeKey)
-                }
-                else {
+                } else {
                     scheduleState = .done
                 }
                 break
@@ -97,7 +96,7 @@ final class AnyRecursiveScheduler<State> {
             if self._group.isDisposed {
                 return Disposables.create()
             }
-            
+
             let action = self._lock.calculateLocked { () -> Action? in
                 switch scheduleState {
                 case let .added(removeKey):
@@ -109,17 +108,17 @@ final class AnyRecursiveScheduler<State> {
                 }
 
                 scheduleState = .done
-                
+
                 return self._action
             }
-           
+
             if let action = action {
                 action(state, self)
             }
-            
+
             return Disposables.create()
         }
-        
+
         _lock.performLocked {
             switch scheduleState {
             case .added:
@@ -128,8 +127,7 @@ final class AnyRecursiveScheduler<State> {
             case .initial:
                 if let removeKey = _group.insert(d) {
                     scheduleState = .added(removeKey)
-                }
-                else {
+                } else {
                     scheduleState = .done
                 }
                 break
@@ -138,7 +136,7 @@ final class AnyRecursiveScheduler<State> {
             }
         }
     }
-    
+
     func dispose() {
         _lock.performLocked {
             _action = nil
@@ -150,20 +148,20 @@ final class AnyRecursiveScheduler<State> {
 /// Type erased recursive scheduler.
 final class RecursiveImmediateScheduler<State> {
     typealias Action =  (_ state: State, _ recurse: (State) -> Void) -> Void
-    
+
     private var _lock = SpinLock()
     private let _group = CompositeDisposable()
-    
+
     private var _action: Action?
     private let _scheduler: ImmediateSchedulerType
-    
+
     init(action: @escaping Action, scheduler: ImmediateSchedulerType) {
         _action = action
         _scheduler = scheduler
     }
-    
+
     // immediate scheduling
-    
+
     /// Schedules an action to be executed recursively.
     ///
     /// - parameter state: State passed to the action to be executed.
@@ -175,7 +173,7 @@ final class RecursiveImmediateScheduler<State> {
             if self._group.isDisposed {
                 return Disposables.create()
             }
-            
+
             let action = self._lock.calculateLocked { () -> Action? in
                 switch scheduleState {
                 case let .added(removeKey):
@@ -190,14 +188,14 @@ final class RecursiveImmediateScheduler<State> {
 
                 return self._action
             }
-            
+
             if let action = action {
                 action(state, self.schedule)
             }
-            
+
             return Disposables.create()
         }
-        
+
         _lock.performLocked {
             switch scheduleState {
             case .added:
@@ -206,8 +204,7 @@ final class RecursiveImmediateScheduler<State> {
             case .initial:
                 if let removeKey = _group.insert(d) {
                     scheduleState = .added(removeKey)
-                }
-                else {
+                } else {
                     scheduleState = .done
                 }
                 break
@@ -216,7 +213,7 @@ final class RecursiveImmediateScheduler<State> {
             }
         }
     }
-    
+
     func dispose() {
         _lock.performLocked {
             _action = nil
diff --git a/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Schedulers/SchedulerServices+Emulation.swift b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Schedulers/SchedulerServices+Emulation.swift
index ca0a04a8ae..2e6bd76c36 100644
--- a/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Schedulers/SchedulerServices+Emulation.swift
+++ b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Schedulers/SchedulerServices+Emulation.swift
@@ -35,7 +35,7 @@ final class SchedulePeriodicRecursive<State> {
         return _scheduler.scheduleRecursive(SchedulePeriodicRecursiveCommand.tick, dueTime: _startAfter, action: self.tick)
     }
 
-    func tick(_ command: SchedulePeriodicRecursiveCommand, scheduler: RecursiveScheduler) -> Void {
+    func tick(_ command: SchedulePeriodicRecursiveCommand, scheduler: RecursiveScheduler) {
         // Tries to emulate periodic scheduling as best as possible.
         // The problem that could arise is if handling periodic ticks take too long, or
         // tick interval is short.
diff --git a/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Schedulers/SerialDispatchQueueScheduler.swift b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Schedulers/SerialDispatchQueueScheduler.swift
index 1a38a73968..33dfc6e8d4 100644
--- a/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Schedulers/SerialDispatchQueueScheduler.swift
+++ b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Schedulers/SerialDispatchQueueScheduler.swift
@@ -27,17 +27,17 @@ In case some customization need to be made on it before usage,
 internal serial queue can be customized using `serialQueueConfiguration`
 callback.
 */
-public class SerialDispatchQueueScheduler : SchedulerType {
+public class SerialDispatchQueueScheduler: SchedulerType {
     public typealias TimeInterval = Foundation.TimeInterval
     public typealias Time = Date
-    
+
     /// - returns: Current time.
-    public var now : Date {
+    public var now: Date {
         return Date()
     }
 
     let configuration: DispatchQueueConfiguration
-    
+
     /**
     Constructs new `SerialDispatchQueueScheduler` that wraps `serialQueue`.
 
@@ -62,7 +62,7 @@ public class SerialDispatchQueueScheduler : SchedulerType {
         serialQueueConfiguration?(queue)
         self.init(serialQueue: queue, leeway: leeway)
     }
-    
+
     /**
     Constructs new `SerialDispatchQueueScheduler` named `internalSerialQueueName` that wraps `queue`.
     
@@ -89,7 +89,7 @@ public class SerialDispatchQueueScheduler : SchedulerType {
     public convenience init(qos: DispatchQoS, internalSerialQueueName: String = "rx.global_dispatch_queue.serial", leeway: DispatchTimeInterval = DispatchTimeInterval.nanoseconds(0)) {
         self.init(queue: DispatchQueue.global(qos: qos.qosClass), internalSerialQueueName: internalSerialQueueName, leeway: leeway)
     }
-    
+
     /**
     Schedules an action to be executed immediately.
     
@@ -116,7 +116,7 @@ public class SerialDispatchQueueScheduler : SchedulerType {
     public final func scheduleRelative<StateType>(_ state: StateType, dueTime: Foundation.TimeInterval, action: @escaping (StateType) -> Disposable) -> Disposable {
         return self.configuration.scheduleRelative(state, dueTime: dueTime, action: action)
     }
-    
+
     /**
     Schedules a periodic piece of work.
     
diff --git a/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Schedulers/VirtualTimeScheduler.swift b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Schedulers/VirtualTimeScheduler.swift
index c0e1aa5624..0c86a089ae 100644
--- a/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Schedulers/VirtualTimeScheduler.swift
+++ b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Schedulers/VirtualTimeScheduler.swift
@@ -13,11 +13,11 @@ open class VirtualTimeScheduler<Converter: VirtualTimeConverterType>
     public typealias VirtualTime = Converter.VirtualTimeUnit
     public typealias VirtualTimeInterval = Converter.VirtualTimeIntervalUnit
 
-    private var _running : Bool
+    private var _running: Bool
 
     private var _clock: VirtualTime
 
-    fileprivate var _schedulerQueue : PriorityQueue<VirtualSchedulerItem<VirtualTime>>
+    fileprivate var _schedulerQueue: PriorityQueue<VirtualSchedulerItem<VirtualTime>>
     private var _converter: Converter
 
     private var _nextId = 0
@@ -50,7 +50,7 @@ open class VirtualTimeScheduler<Converter: VirtualTimeConverterType>
             }
         }, isEqual: { $0 === $1 })
         #if TRACE_RESOURCES
-            let _ = Resources.incrementTotal()
+            _ = Resources.incrementTotal()
         #endif
     }
 
@@ -116,9 +116,9 @@ open class VirtualTimeScheduler<Converter: VirtualTimeConverterType>
         _nextId += 1
 
         _schedulerQueue.enqueue(item)
-        
+
         _ = compositeDisposable.insert(item)
-        
+
         return compositeDisposable
     }
 
@@ -141,7 +141,7 @@ open class VirtualTimeScheduler<Converter: VirtualTimeConverterType>
                 break
             }
 
-            if _converter.compareVirtualTime(next.time, self.clock).greaterThan  {
+            if _converter.compareVirtualTime(next.time, self.clock).greaterThan {
                 _clock = next.time
             }
 
@@ -185,7 +185,7 @@ open class VirtualTimeScheduler<Converter: VirtualTimeConverterType>
                 break
             }
 
-            if _converter.compareVirtualTime(next.time, self.clock).greaterThan  {
+            if _converter.compareVirtualTime(next.time, self.clock).greaterThan {
                 _clock = next.time
             }
 
@@ -235,7 +235,7 @@ extension VirtualTimeScheduler: CustomDebugStringConvertible {
 final class VirtualSchedulerItem<Time>
     : Disposable {
     typealias Action = () -> Disposable
-    
+
     let action: Action
     let time: Time
     let id: Int
@@ -243,9 +243,9 @@ final class VirtualSchedulerItem<Time>
     var isDisposed: Bool {
         return disposable.isDisposed
     }
-    
+
     var disposable = SingleAssignmentDisposable()
-    
+
     init(action: @escaping Action, time: Time, id: Int) {
         self.action = action
         self.time = time
@@ -255,14 +255,13 @@ final class VirtualSchedulerItem<Time>
     func invoke() {
          self.disposable.setDisposable(action())
     }
-    
+
     func dispose() {
         self.disposable.dispose()
     }
 }
 
-extension VirtualSchedulerItem
-    : CustomDebugStringConvertible {
+extension VirtualSchedulerItem: CustomDebugStringConvertible {
     var debugDescription: String {
         return "\(time)"
     }
diff --git a/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Subjects/AsyncSubject.swift b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Subjects/AsyncSubject.swift
index 520207d879..cb80d425d5 100644
--- a/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Subjects/AsyncSubject.swift
+++ b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Subjects/AsyncSubject.swift
@@ -11,10 +11,7 @@
 ///
 /// (If the source Observable does not emit any values, the AsyncSubject also completes without emitting any values.)
 public final class AsyncSubject<Element>
-    : Observable<Element>
-    , SubjectType
-    , ObserverType
-    , SynchronizedUnsubscribeType {
+    : Observable<Element>, SubjectType, ObserverType, SynchronizedUnsubscribeType {
     public typealias SubjectObserverType = AsyncSubject<Element>
 
     typealias Observers = AnyObserver<Element>.s
@@ -42,7 +39,6 @@ public final class AsyncSubject<Element>
         fileprivate let _synchronizationTracker = SynchronizationTracker()
     #endif
 
-
     /// Creates a subject.
     public override init() {
         #if TRACE_RESOURCES
@@ -96,8 +92,7 @@ public final class AsyncSubject<Element>
             if let lastElement = _lastElement {
                 _stoppedEvent = .next(lastElement)
                 return (observers, .next(lastElement))
-            }
-            else {
+            } else {
                 _stoppedEvent = event
                 return (observers, .completed)
             }
@@ -108,12 +103,12 @@ public final class AsyncSubject<Element>
     ///
     /// - parameter observer: Observer to subscribe to the subject.
     /// - returns: Disposable object that can be used to unsubscribe the observer from the subject.
-    public override func subscribe<O : ObserverType>(_ observer: O) -> Disposable where O.E == Element {
+    public override func subscribe<O: ObserverType>(_ observer: O) -> Disposable where O.E == Element {
         _lock.lock(); defer { _lock.unlock() }
         return _synchronized_subscribe(observer)
     }
 
-    func _synchronized_subscribe<O : ObserverType>(_ observer: O) -> Disposable where O.E == E {
+    func _synchronized_subscribe<O: ObserverType>(_ observer: O) -> Disposable where O.E == E {
         if let stoppedEvent = _stoppedEvent {
             switch stoppedEvent {
             case .next:
@@ -136,11 +131,11 @@ public final class AsyncSubject<Element>
         _lock.lock(); defer { _lock.unlock() }
         _synchronized_unsubscribe(disposeKey)
     }
-    
+
     func _synchronized_unsubscribe(_ disposeKey: DisposeKey) {
         _ = _observers.removeKey(disposeKey)
     }
-    
+
     /// Returns observer interface for subject.
     public func asObserver() -> AsyncSubject<Element> {
         return self
@@ -152,4 +147,3 @@ public final class AsyncSubject<Element>
     }
     #endif
 }
-
diff --git a/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Subjects/BehaviorSubject.swift b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Subjects/BehaviorSubject.swift
index f2de851a7c..8286120e57 100644
--- a/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Subjects/BehaviorSubject.swift
+++ b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Subjects/BehaviorSubject.swift
@@ -10,16 +10,12 @@
 ///
 /// Observers can subscribe to the subject to receive the last (or initial) value and all subsequent notifications.
 public final class BehaviorSubject<Element>
-    : Observable<Element>
-    , SubjectType
-    , ObserverType
-    , SynchronizedUnsubscribeType
-    , Disposable {
+    : Observable<Element>, SubjectType, ObserverType, SynchronizedUnsubscribeType, Disposable {
     public typealias SubjectObserverType = BehaviorSubject<Element>
 
     typealias Observers = AnyObserver<Element>.s
     typealias DisposeKey = Observers.KeyType
-    
+
     /// Indicates whether the subject has any observers
     public var hasObservers: Bool {
         _lock.lock()
@@ -27,9 +23,9 @@ public final class BehaviorSubject<Element>
         _lock.unlock()
         return value
     }
-    
+
     let _lock = RecursiveLock()
-    
+
     // state
     private var _isDisposed = false
     private var _element: Element
@@ -44,7 +40,7 @@ public final class BehaviorSubject<Element>
     public var isDisposed: Bool {
         return _isDisposed
     }
- 
+
     /// Initializes a new instance of the subject that caches its last value and starts with the specified value.
     ///
     /// - parameter value: Initial value sent to observers when no other value has been received by the subject yet.
@@ -55,7 +51,7 @@ public final class BehaviorSubject<Element>
             _ = Resources.incrementTotal()
         #endif
     }
-    
+
     /// Gets the current value or throws an error.
     ///
     /// - returns: Latest value.
@@ -64,17 +60,16 @@ public final class BehaviorSubject<Element>
             if _isDisposed {
                 throw RxError.disposed(object: self)
             }
-            
+
             if let error = _stoppedEvent?.error {
                 // intentionally throw exception
                 throw error
-            }
-            else {
+            } else {
                 return _element
             }
         //}
     }
-    
+
     /// Notifies all subscribed observers about next event.
     ///
     /// - parameter event: Event to send to the observers.
@@ -91,42 +86,42 @@ public final class BehaviorSubject<Element>
         if _stoppedEvent != nil || _isDisposed {
             return Observers()
         }
-        
+
         switch event {
         case .next(let element):
             _element = element
         case .error, .completed:
             _stoppedEvent = event
         }
-        
+
         return _observers
     }
-    
+
     /// Subscribes an observer to the subject.
     ///
     /// - parameter observer: Observer to subscribe to the subject.
     /// - returns: Disposable object that can be used to unsubscribe the observer from the subject.
-    public override func subscribe<O : ObserverType>(_ observer: O) -> Disposable where O.E == Element {
+    public override func subscribe<O: ObserverType>(_ observer: O) -> Disposable where O.E == Element {
         _lock.lock()
         let subscription = _synchronized_subscribe(observer)
         _lock.unlock()
         return subscription
     }
 
-    func _synchronized_subscribe<O : ObserverType>(_ observer: O) -> Disposable where O.E == E {
+    func _synchronized_subscribe<O: ObserverType>(_ observer: O) -> Disposable where O.E == E {
         if _isDisposed {
             observer.on(.error(RxError.disposed(object: self)))
             return Disposables.create()
         }
-        
+
         if let stoppedEvent = _stoppedEvent {
             observer.on(stoppedEvent)
             return Disposables.create()
         }
-        
+
         let key = _observers.insert(observer.on)
         observer.on(.next(_element))
-    
+
         return SubscriptionDisposable(owner: self, key: key)
     }
 
diff --git a/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Subjects/PublishSubject.swift b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Subjects/PublishSubject.swift
index d847ce8698..c212659439 100644
--- a/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Subjects/PublishSubject.swift
+++ b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Subjects/PublishSubject.swift
@@ -10,16 +10,12 @@
 ///
 /// Each notification is broadcasted to all subscribed observers.
 public final class PublishSubject<Element>
-    : Observable<Element>
-    , SubjectType
-    , Cancelable
-    , ObserverType
-    , SynchronizedUnsubscribeType {
+    : Observable<Element>, SubjectType, Cancelable, ObserverType, SynchronizedUnsubscribeType {
     public typealias SubjectObserverType = PublishSubject<Element>
 
     typealias Observers = AnyObserver<Element>.s
     typealias DisposeKey = Observers.KeyType
-    
+
     /// Indicates whether the subject has any observers
     public var hasObservers: Bool {
         _lock.lock()
@@ -27,9 +23,9 @@ public final class PublishSubject<Element>
         _lock.unlock()
         return count
     }
-    
+
     private let _lock = RecursiveLock()
-    
+
     // state
     private var _isDisposed = false
     private var _observers = Observers()
@@ -44,7 +40,7 @@ public final class PublishSubject<Element>
     public var isDisposed: Bool {
         return _isDisposed
     }
-    
+
     /// Creates a subject.
     public override init() {
         super.init()
@@ -52,7 +48,7 @@ public final class PublishSubject<Element>
             _ = Resources.incrementTotal()
         #endif
     }
-    
+
     /// Notifies all subscribed observers about next event.
     ///
     /// - parameter event: Event to send to the observers.
@@ -67,11 +63,11 @@ public final class PublishSubject<Element>
     func _synchronized_on(_ event: Event<E>) -> Observers {
         _lock.lock(); defer { _lock.unlock() }
         switch event {
-        case .next(_):
+        case .next:
             if _isDisposed || _stopped {
                 return Observers()
             }
-            
+
             return _observers
         case .completed, .error:
             if _stoppedEvent == nil {
@@ -85,31 +81,31 @@ public final class PublishSubject<Element>
             return Observers()
         }
     }
-    
+
     /**
     Subscribes an observer to the subject.
     
     - parameter observer: Observer to subscribe to the subject.
     - returns: Disposable object that can be used to unsubscribe the observer from the subject.
     */
-    public override func subscribe<O : ObserverType>(_ observer: O) -> Disposable where O.E == Element {
+    public override func subscribe<O: ObserverType>(_ observer: O) -> Disposable where O.E == Element {
         _lock.lock()
         let subscription = _synchronized_subscribe(observer)
         _lock.unlock()
         return subscription
     }
 
-    func _synchronized_subscribe<O : ObserverType>(_ observer: O) -> Disposable where O.E == E {
+    func _synchronized_subscribe<O: ObserverType>(_ observer: O) -> Disposable where O.E == E {
         if let stoppedEvent = _stoppedEvent {
             observer.on(stoppedEvent)
             return Disposables.create()
         }
-        
+
         if _isDisposed {
             observer.on(.error(RxError.disposed(object: self)))
             return Disposables.create()
         }
-        
+
         let key = _observers.insert(observer.on)
         return SubscriptionDisposable(owner: self, key: key)
     }
@@ -123,12 +119,12 @@ public final class PublishSubject<Element>
     func _synchronized_unsubscribe(_ disposeKey: DisposeKey) {
         _ = _observers.removeKey(disposeKey)
     }
-    
+
     /// Returns observer interface for subject.
     public func asObserver() -> PublishSubject<Element> {
         return self
     }
-    
+
     /// Unsubscribe all observers and release resources.
     public func dispose() {
         _lock.lock()
diff --git a/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Subjects/ReplaySubject.swift b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Subjects/ReplaySubject.swift
index 54abc35b24..2e37a079ac 100644
--- a/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Subjects/ReplaySubject.swift
+++ b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Subjects/ReplaySubject.swift
@@ -10,10 +10,7 @@
 ///
 /// Each notification is broadcasted to all subscribed and future observers, subject to buffer trimming policies.
 public class ReplaySubject<Element>
-    : Observable<Element>
-    , SubjectType
-    , ObserverType
-    , Disposable {
+    : Observable<Element>, SubjectType, ObserverType, Disposable {
     public typealias SubjectObserverType = ReplaySubject<Element>
 
     typealias Observers = AnyObserver<Element>.s
@@ -26,9 +23,9 @@ public class ReplaySubject<Element>
         _lock.unlock()
         return value
     }
-    
+
     fileprivate let _lock = RecursiveLock()
-    
+
     // state
     fileprivate var _isDisposed = false
     fileprivate var _isStopped = false
@@ -50,19 +47,19 @@ public class ReplaySubject<Element>
     final var isStopped: Bool {
         return _isStopped
     }
-    
+
     /// Notifies all subscribed observers about next event.
     ///
     /// - parameter event: Event to send to the observers.
     public func on(_ event: Event<E>) {
         rxAbstractMethod()
     }
-    
+
     /// Returns observer interface for subject.
     public func asObserver() -> SubjectObserverType {
         return self
     }
-    
+
     /// Unsubscribe all observers and release resources.
     public func dispose() {
     }
@@ -74,8 +71,7 @@ public class ReplaySubject<Element>
     public static func create(bufferSize: Int) -> ReplaySubject<Element> {
         if bufferSize == 1 {
             return ReplayOne()
-        }
-        else {
+        } else {
             return ReplayMany(bufferSize: bufferSize)
         }
     }
@@ -98,22 +94,21 @@ public class ReplaySubject<Element>
     #endif
 }
 
-fileprivate class ReplayBufferBase<Element>
-    : ReplaySubject<Element>
-    , SynchronizedUnsubscribeType {
-    
+private class ReplayBufferBase<Element>
+    : ReplaySubject<Element>, SynchronizedUnsubscribeType {
+
     func trim() {
         rxAbstractMethod()
     }
-    
+
     func addValueToBuffer(_ value: Element) {
         rxAbstractMethod()
     }
-    
+
     func replayBuffer<O: ObserverType>(_ observer: O) where O.E == Element {
         rxAbstractMethod()
     }
-    
+
     override func on(_ event: Event<Element>) {
         #if DEBUG
             _synchronizationTracker.register(synchronizationErrorMessage: .default)
@@ -127,11 +122,11 @@ fileprivate class ReplayBufferBase<Element>
         if _isDisposed {
             return Observers()
         }
-        
+
         if _isStopped {
             return Observers()
         }
-        
+
         switch event {
         case .next(let element):
             addValueToBuffer(element)
@@ -145,28 +140,27 @@ fileprivate class ReplayBufferBase<Element>
             return observers
         }
     }
-    
-    override func subscribe<O : ObserverType>(_ observer: O) -> Disposable where O.E == Element {
+
+    override func subscribe<O: ObserverType>(_ observer: O) -> Disposable where O.E == Element {
         _lock.lock()
         let subscription = _synchronized_subscribe(observer)
         _lock.unlock()
         return subscription
     }
 
-    func _synchronized_subscribe<O : ObserverType>(_ observer: O) -> Disposable where O.E == E {
+    func _synchronized_subscribe<O: ObserverType>(_ observer: O) -> Disposable where O.E == E {
         if _isDisposed {
             observer.on(.error(RxError.disposed(object: self)))
             return Disposables.create()
         }
-     
+
         let anyObserver = observer.asObserver()
-        
+
         replayBuffer(anyObserver)
         if let stoppedEvent = _stoppedEvent {
             observer.on(stoppedEvent)
             return Disposables.create()
-        }
-        else {
+        } else {
             let key = _observers.insert(observer.on)
             return SubscriptionDisposable(owner: self, key: key)
         }
@@ -182,10 +176,10 @@ fileprivate class ReplayBufferBase<Element>
         if _isDisposed {
             return
         }
-        
+
         _ = _observers.removeKey(disposeKey)
     }
-    
+
     override func dispose() {
         super.dispose()
 
@@ -206,15 +200,15 @@ fileprivate class ReplayBufferBase<Element>
 
 fileprivate final class ReplayOne<Element> : ReplayBufferBase<Element> {
     private var _value: Element?
-    
+
     override init() {
         super.init()
     }
-    
+
     override func trim() {
-        
+
     }
-    
+
     override func addValueToBuffer(_ value: Element) {
         _value = value
     }
@@ -231,13 +225,13 @@ fileprivate final class ReplayOne<Element> : ReplayBufferBase<Element> {
     }
 }
 
-fileprivate class ReplayManyBase<Element> : ReplayBufferBase<Element> {
+private class ReplayManyBase<Element> : ReplayBufferBase<Element> {
     fileprivate var _queue: Queue<Element>
-    
+
     init(queueSize: Int) {
         _queue = Queue(capacity: queueSize + 1)
     }
-    
+
     override func addValueToBuffer(_ value: Element) {
         _queue.enqueue(value)
     }
@@ -256,13 +250,13 @@ fileprivate class ReplayManyBase<Element> : ReplayBufferBase<Element> {
 
 fileprivate final class ReplayMany<Element> : ReplayManyBase<Element> {
     private let _bufferSize: Int
-    
+
     init(bufferSize: Int) {
         _bufferSize = bufferSize
-        
+
         super.init(queueSize: bufferSize)
     }
-    
+
     override func trim() {
         while _queue.count > _bufferSize {
             _ = _queue.dequeue()
@@ -274,8 +268,8 @@ fileprivate final class ReplayAll<Element> : ReplayManyBase<Element> {
     init() {
         super.init(queueSize: 0)
     }
-    
+
     override func trim() {
-        
+
     }
 }
diff --git a/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Subjects/SubjectType.swift b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Subjects/SubjectType.swift
index 0fc0d03592..6fb3b6ec63 100644
--- a/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Subjects/SubjectType.swift
+++ b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Subjects/SubjectType.swift
@@ -7,15 +7,15 @@
 //
 
 /// Represents an object that is both an observable sequence as well as an observer.
-public protocol SubjectType : ObservableType {
+public protocol SubjectType: ObservableType {
     /// The type of the observer that represents this subject.
     ///
     /// Usually this type is type of subject itself, but it doesn't have to be.
-    associatedtype SubjectObserverType : ObserverType
+    associatedtype SubjectObserverType: ObserverType
 
     /// Returns observer interface for subject.
     ///
     /// - returns: Observer interface for subject.
     func asObserver() -> SubjectObserverType
-    
+
 }
diff --git a/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Traits/Completable+AndThen.swift b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Traits/Completable+AndThen.swift
index c02c9e5147..e2af195127 100644
--- a/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Traits/Completable+AndThen.swift
+++ b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Traits/Completable+AndThen.swift
@@ -60,7 +60,7 @@ extension PrimitiveSequenceType where TraitType == CompletableTrait, ElementType
     }
 }
 
-final fileprivate class ConcatCompletable<Element> : Producer<Element> {
+final private class ConcatCompletable<Element> : Producer<Element> {
     fileprivate let _completable: Observable<Never>
     fileprivate let _second: Observable<Element>
 
@@ -69,22 +69,21 @@ final fileprivate class ConcatCompletable<Element> : Producer<Element> {
         self._second = second
     }
 
-    override func run<O>(_ observer: O, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where O : ObserverType, O.E == Element {
+    override func run<O>(_ observer: O, cancel: Cancelable) -> (sink: Disposable, subscription: Disposable) where O: ObserverType, O.E == Element {
         let sink = ConcatCompletableSink(parent: self, observer: observer, cancel: cancel)
         let subscription = sink.run()
         return (sink: sink, subscription: subscription)
     }
 }
 
-final fileprivate class ConcatCompletableSink<O: ObserverType>
-    : Sink<O>
-    , ObserverType {
+final private class ConcatCompletableSink<O: ObserverType>
+    : Sink<O>, ObserverType {
     typealias E = Never
     typealias Parent = ConcatCompletable<O.E>
 
     private let _parent: Parent
     private let _subscription = SerialDisposable()
-    
+
     init(parent: Parent, observer: O, cancel: Cancelable) {
         self._parent = parent
         super.init(observer: observer, cancel: cancel)
@@ -111,12 +110,12 @@ final fileprivate class ConcatCompletableSink<O: ObserverType>
     }
 }
 
-final fileprivate class ConcatCompletableSinkOther<O: ObserverType>
+final private class ConcatCompletableSinkOther<O: ObserverType>
     : ObserverType {
     typealias E = O.E
 
     typealias Parent = ConcatCompletableSink<O>
-    
+
     private let _parent: Parent
 
     init(parent: Parent) {
diff --git a/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Traits/Completable.swift b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Traits/Completable.swift
index 8431fed167..aed6ed47ab 100644
--- a/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Traits/Completable.swift
+++ b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Traits/Completable.swift
@@ -18,14 +18,14 @@ public typealias Completable = PrimitiveSequence<CompletableTrait, Swift.Never>
 public enum CompletableEvent {
     /// Sequence terminated with an error. (underlying observable sequence emits: `.error(Error)`)
     case error(Swift.Error)
-    
+
     /// Sequence completed successfully.
     case completed
 }
 
 public extension PrimitiveSequenceType where TraitType == CompletableTrait, ElementType == Swift.Never {
-    public typealias CompletableObserver = (CompletableEvent) -> ()
-    
+    public typealias CompletableObserver = (CompletableEvent) -> Void
+
     /**
      Creates an observable sequence from a specified subscribe method implementation.
      
@@ -45,21 +45,21 @@ public extension PrimitiveSequenceType where TraitType == CompletableTrait, Elem
                 }
             }
         }
-        
+
         return PrimitiveSequence(raw: source)
     }
-    
+
     /**
      Subscribes `observer` to receive events for this sequence.
      
      - returns: Subscription for `observer` that can be used to cancel production of sequence elements and free resources.
      */
-    public func subscribe(_ observer: @escaping (CompletableEvent) -> ()) -> Disposable {
+    public func subscribe(_ observer: @escaping (CompletableEvent) -> Void) -> Disposable {
         var stopped = false
         return self.primitiveSequence.asObservable().subscribe { event in
             if stopped { return }
             stopped = true
-            
+
             switch event {
             case .next:
                 rxFatalError("Completables can't emit values")
@@ -70,7 +70,7 @@ public extension PrimitiveSequenceType where TraitType == CompletableTrait, Elem
             }
         }
     }
-    
+
     /**
      Subscribes a completion handler and an error handler for this sequence.
      
@@ -136,7 +136,7 @@ public extension PrimitiveSequenceType where TraitType == CompletableTrait, Elem
 
 }
 
-public extension PrimitiveSequenceType where TraitType == CompletableTrait, ElementType == Swift.Never {    
+public extension PrimitiveSequenceType where TraitType == CompletableTrait, ElementType == Swift.Never {
     /**
      Invokes an action for each event in the observable sequence, and propagates all observer messages through the result sequence.
      
@@ -152,9 +152,9 @@ public extension PrimitiveSequenceType where TraitType == CompletableTrait, Elem
      */
     public func `do`(onError: ((Swift.Error) throws -> Void)? = nil,
                      onCompleted: (() throws -> Void)? = nil,
-                     onSubscribe: (() -> ())? = nil,
-                     onSubscribed: (() -> ())? = nil,
-                     onDispose: (() -> ())? = nil)
+                     onSubscribe: (() -> Void)? = nil,
+                     onSubscribed: (() -> Void)? = nil,
+                     onDispose: (() -> Void)? = nil)
         -> Completable {
             return Completable(raw: primitiveSequence.source.do(
                 onError: onError,
@@ -165,8 +165,6 @@ public extension PrimitiveSequenceType where TraitType == CompletableTrait, Elem
             )
     }
 
-
-
     /**
      Concatenates the second observable sequence to `self` upon successful termination of `self`.
      
@@ -178,7 +176,7 @@ public extension PrimitiveSequenceType where TraitType == CompletableTrait, Elem
     public func concat(_ second: Completable) -> Completable {
         return Completable.concat(primitiveSequence, second)
     }
-    
+
     /**
      Concatenates all observable sequences in the given sequence, as long as the previous observable sequence terminated successfully.
      
@@ -191,7 +189,7 @@ public extension PrimitiveSequenceType where TraitType == CompletableTrait, Elem
             let source = Observable.concat(sequence.lazy.map { $0.asObservable() })
             return Completable(raw: source)
     }
-    
+
     /**
      Concatenates all observable sequences in the given sequence, as long as the previous observable sequence terminated successfully.
      
@@ -204,7 +202,7 @@ public extension PrimitiveSequenceType where TraitType == CompletableTrait, Elem
             let source = Observable.concat(collection.map { $0.asObservable() })
             return Completable(raw: source)
     }
-    
+
     /**
      Concatenates all observable sequences in the given sequence, as long as the previous observable sequence terminated successfully.
      
@@ -216,7 +214,7 @@ public extension PrimitiveSequenceType where TraitType == CompletableTrait, Elem
         let source = Observable.concat(sources.map { $0.asObservable() })
         return Completable(raw: source)
     }
-    
+
     /**
      Merges elements from all observable sequences from collection into a single observable sequence.
      
@@ -230,7 +228,7 @@ public extension PrimitiveSequenceType where TraitType == CompletableTrait, Elem
             let source = Observable.merge(sources.map { $0.asObservable() })
             return Completable(raw: source)
     }
-    
+
     /**
      Merges elements from all observable sequences from array into a single observable sequence.
      
@@ -243,7 +241,7 @@ public extension PrimitiveSequenceType where TraitType == CompletableTrait, Elem
         let source = Observable.merge(sources.map { $0.asObservable() })
         return Completable(raw: source)
     }
-    
+
     /**
      Merges elements from all observable sequences into a single observable sequence.
      
diff --git a/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Traits/Maybe.swift b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Traits/Maybe.swift
index ad5859eaf9..682c2fd4c0 100644
--- a/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Traits/Maybe.swift
+++ b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Traits/Maybe.swift
@@ -18,17 +18,17 @@ public typealias Maybe<Element> = PrimitiveSequence<MaybeTrait, Element>
 public enum MaybeEvent<Element> {
     /// One and only sequence element is produced. (underlying observable sequence emits: `.next(Element)`, `.completed`)
     case success(Element)
-    
+
     /// Sequence terminated with an error. (underlying observable sequence emits: `.error(Error)`)
     case error(Swift.Error)
-    
+
     /// Sequence completed successfully.
     case completed
 }
 
 public extension PrimitiveSequenceType where TraitType == MaybeTrait {
-    public typealias MaybeObserver = (MaybeEvent<ElementType>) -> ()
-    
+    public typealias MaybeObserver = (MaybeEvent<ElementType>) -> Void
+
     /**
      Creates an observable sequence from a specified subscribe method implementation.
      
@@ -51,21 +51,21 @@ public extension PrimitiveSequenceType where TraitType == MaybeTrait {
                 }
             }
         }
-        
+
         return PrimitiveSequence(raw: source)
     }
-    
+
     /**
      Subscribes `observer` to receive events for this sequence.
      
      - returns: Subscription for `observer` that can be used to cancel production of sequence elements and free resources.
      */
-    public func subscribe(_ observer: @escaping (MaybeEvent<ElementType>) -> ()) -> Disposable {
+    public func subscribe(_ observer: @escaping (MaybeEvent<ElementType>) -> Void) -> Disposable {
         var stopped = false
         return self.primitiveSequence.asObservable().subscribe { event in
             if stopped { return }
             stopped = true
-            
+
             switch event {
             case .next(let element):
                 observer(.success(element))
@@ -76,7 +76,7 @@ public extension PrimitiveSequenceType where TraitType == MaybeTrait {
             }
         }
     }
-    
+
     /**
      Subscribes a success handler, an error handler, and a completion handler for this sequence.
      
@@ -111,7 +111,7 @@ public extension PrimitiveSequenceType where TraitType == MaybeTrait {
     }
 }
 
-public extension PrimitiveSequenceType where TraitType == MaybeTrait {    
+public extension PrimitiveSequenceType where TraitType == MaybeTrait {
     /**
      Returns an observable sequence that contains a single element.
      
@@ -123,7 +123,7 @@ public extension PrimitiveSequenceType where TraitType == MaybeTrait {
     public static func just(_ element: ElementType) -> Maybe<ElementType> {
         return Maybe(raw: Observable.just(element))
     }
-    
+
     /**
      Returns an observable sequence that contains a single element.
      
@@ -188,9 +188,9 @@ public extension PrimitiveSequenceType where TraitType == MaybeTrait {
     public func `do`(onNext: ((ElementType) throws -> Void)? = nil,
                      onError: ((Swift.Error) throws -> Void)? = nil,
                      onCompleted: (() throws -> Void)? = nil,
-                     onSubscribe: (() -> ())? = nil,
-                     onSubscribed: (() -> ())? = nil,
-                     onDispose: (() -> ())? = nil)
+                     onSubscribe: (() -> Void)? = nil,
+                     onSubscribed: (() -> Void)? = nil,
+                     onDispose: (() -> Void)? = nil)
         -> Maybe<ElementType> {
             return Maybe(raw: primitiveSequence.source.do(
                 onNext: onNext,
@@ -201,7 +201,7 @@ public extension PrimitiveSequenceType where TraitType == MaybeTrait {
                 onDispose: onDispose)
             )
     }
-    
+
     /**
      Filters the elements of an observable sequence based on a predicate.
      
@@ -214,7 +214,7 @@ public extension PrimitiveSequenceType where TraitType == MaybeTrait {
         -> Maybe<ElementType> {
             return Maybe(raw: primitiveSequence.source.filter(predicate))
     }
-    
+
     /**
      Projects each element of an observable sequence into a new form.
      
diff --git a/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Traits/PrimitiveSequence+Zip+arity.swift b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Traits/PrimitiveSequence+Zip+arity.swift
index e50e576597..7f99194989 100644
--- a/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Traits/PrimitiveSequence+Zip+arity.swift
+++ b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Traits/PrimitiveSequence+Zip+arity.swift
@@ -7,8 +7,6 @@
 //  Copyright © 2015 Krunoslav Zaher. All rights reserved.
 //
 
-
-
 // 2
 
 extension PrimitiveSequenceType where TraitType == SingleTrait {
@@ -79,9 +77,6 @@ extension PrimitiveSequenceType where ElementType == Any, TraitType == MaybeTrai
     }
 }
 
-
-
-
 // 3
 
 extension PrimitiveSequenceType where TraitType == SingleTrait {
@@ -152,9 +147,6 @@ extension PrimitiveSequenceType where ElementType == Any, TraitType == MaybeTrai
     }
 }
 
-
-
-
 // 4
 
 extension PrimitiveSequenceType where TraitType == SingleTrait {
@@ -225,9 +217,6 @@ extension PrimitiveSequenceType where ElementType == Any, TraitType == MaybeTrai
     }
 }
 
-
-
-
 // 5
 
 extension PrimitiveSequenceType where TraitType == SingleTrait {
@@ -298,9 +287,6 @@ extension PrimitiveSequenceType where ElementType == Any, TraitType == MaybeTrai
     }
 }
 
-
-
-
 // 6
 
 extension PrimitiveSequenceType where TraitType == SingleTrait {
@@ -371,9 +357,6 @@ extension PrimitiveSequenceType where ElementType == Any, TraitType == MaybeTrai
     }
 }
 
-
-
-
 // 7
 
 extension PrimitiveSequenceType where TraitType == SingleTrait {
@@ -444,9 +427,6 @@ extension PrimitiveSequenceType where ElementType == Any, TraitType == MaybeTrai
     }
 }
 
-
-
-
 // 8
 
 extension PrimitiveSequenceType where TraitType == SingleTrait {
@@ -516,6 +496,3 @@ extension PrimitiveSequenceType where ElementType == Any, TraitType == MaybeTrai
             )
     }
 }
-
-
-
diff --git a/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Traits/PrimitiveSequence.swift b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Traits/PrimitiveSequence.swift
index 73e98145a3..751357ce85 100644
--- a/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Traits/PrimitiveSequence.swift
+++ b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Traits/PrimitiveSequence.swift
@@ -97,7 +97,7 @@ extension PrimitiveSequence {
         -> PrimitiveSequence<Trait, Element> {
         return PrimitiveSequence(raw: source.delaySubscription(dueTime, scheduler: scheduler))
     }
-    
+
     /**
      Wraps the source sequence in order to run its observer callbacks on the specified scheduler.
 
@@ -201,7 +201,7 @@ extension PrimitiveSequence {
         -> PrimitiveSequence<Trait, Element> {
             return PrimitiveSequence(raw: source.debug(identifier, trimOutput: trimOutput, file: file, line: line, function: function))
     }
-    
+
     /**
      Constructs an observable sequence that depends on a resource object, whose lifetime is tied to the resulting observable sequence's lifetime.
      
@@ -228,10 +228,10 @@ extension PrimitiveSequence {
      - returns: An observable sequence with a `RxError.timeout` in case of a timeout.
      */
     public func timeout(_ dueTime: RxTimeInterval, scheduler: SchedulerType)
-        -> PrimitiveSequence<Trait, Element>  {
+        -> PrimitiveSequence<Trait, Element> {
             return PrimitiveSequence<Trait, Element>(raw: primitiveSequence.source.timeout(dueTime, scheduler: scheduler))
     }
-    
+
     /**
      Applies a timeout policy for each element in the observable sequence, using the specified scheduler to run timeout timers. If the next element isn't received within the specified timeout duration starting from its predecessor, the other observable sequence is used to produce future messages from that point on.
      
@@ -249,8 +249,7 @@ extension PrimitiveSequence {
     }
 }
 
-extension PrimitiveSequenceType where ElementType: RxAbstractInteger
-{
+extension PrimitiveSequenceType where ElementType: RxAbstractInteger {
     /**
      Returns an observable sequence that periodically produces a value after the specified initial relative due time has elapsed, using the specified scheduler to run timers.
 
@@ -261,7 +260,7 @@ extension PrimitiveSequenceType where ElementType: RxAbstractInteger
      - returns: An observable sequence that produces a value after due time has elapsed and then each period.
      */
     public static func timer(_ dueTime: RxTimeInterval, scheduler: SchedulerType)
-        -> PrimitiveSequence<TraitType, ElementType>  {
+        -> PrimitiveSequence<TraitType, ElementType> {
         return PrimitiveSequence(raw: Observable<ElementType>.timer(dueTime, scheduler: scheduler))
     }
 }
diff --git a/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Traits/Single.swift b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Traits/Single.swift
index c9dc13f1ed..78c89c3851 100644
--- a/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Traits/Single.swift
+++ b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/Pods/RxSwift/RxSwift/Traits/Single.swift
@@ -18,14 +18,14 @@ public typealias Single<Element> = PrimitiveSequence<SingleTrait, Element>
 public enum SingleEvent<Element> {
     /// One and only sequence element is produced. (underlying observable sequence emits: `.next(Element)`, `.completed`)
     case success(Element)
-    
+
     /// Sequence terminated with an error. (underlying observable sequence emits: `.error(Error)`)
     case error(Swift.Error)
 }
 
 extension PrimitiveSequenceType where TraitType == SingleTrait {
-    public typealias SingleObserver = (SingleEvent<ElementType>) -> ()
-    
+    public typealias SingleObserver = (SingleEvent<ElementType>) -> Void
+
     /**
      Creates an observable sequence from a specified subscribe method implementation.
      
@@ -46,22 +46,21 @@ extension PrimitiveSequenceType where TraitType == SingleTrait {
                 }
             }
         }
-        
+
         return PrimitiveSequence(raw: source)
     }
-    
-    
+
     /**
      Subscribes `observer` to receive events for this sequence.
      
      - returns: Subscription for `observer` that can be used to cancel production of sequence elements and free resources.
      */
-    public func subscribe(_ observer: @escaping (SingleEvent<ElementType>) -> ()) -> Disposable {
+    public func subscribe(_ observer: @escaping (SingleEvent<ElementType>) -> Void) -> Disposable {
         var stopped = false
         return self.primitiveSequence.asObservable().subscribe { event in
             if stopped { return }
             stopped = true
-            
+
             switch event {
             case .next(let element):
                 observer(.success(element))
@@ -72,7 +71,7 @@ extension PrimitiveSequenceType where TraitType == SingleTrait {
             }
         }
     }
-    
+
     /**
      Subscribes a success handler, and an error handler for this sequence.
      
@@ -86,7 +85,7 @@ extension PrimitiveSequenceType where TraitType == SingleTrait {
         #else
             let callStack = [String]()
         #endif
-    
+
         return self.primitiveSequence.subscribe { event in
             switch event {
             case .success(let element):
@@ -114,7 +113,7 @@ extension PrimitiveSequenceType where TraitType == SingleTrait {
     public static func just(_ element: ElementType) -> Single<ElementType> {
         return Single(raw: Observable.just(element))
     }
-    
+
     /**
      Returns an observable sequence that contains a single element.
      
@@ -167,9 +166,9 @@ extension PrimitiveSequenceType where TraitType == SingleTrait {
      */
     public func `do`(onSuccess: ((ElementType) throws -> Void)? = nil,
                      onError: ((Swift.Error) throws -> Void)? = nil,
-                     onSubscribe: (() -> ())? = nil,
-                     onSubscribed: (() -> ())? = nil,
-                     onDispose: (() -> ())? = nil)
+                     onSubscribe: (() -> Void)? = nil,
+                     onSubscribed: (() -> Void)? = nil,
+                     onDispose: (() -> Void)? = nil)
         -> Single<ElementType> {
             return Single(raw: primitiveSequence.source.do(
                 onNext: onSuccess,
@@ -195,9 +194,9 @@ extension PrimitiveSequenceType where TraitType == SingleTrait {
     @available(*, deprecated, renamed: "do(onSuccess:onError:onSubscribe:onSubscribed:onDispose:)")
     public func `do`(onNext: ((ElementType) throws -> Void)?,
                      onError: ((Swift.Error) throws -> Void)? = nil,
-                     onSubscribe: (() -> ())? = nil,
-                     onSubscribed: (() -> ())? = nil,
-                     onDispose: (() -> ())? = nil)
+                     onSubscribe: (() -> Void)? = nil,
+                     onSubscribed: (() -> Void)? = nil,
+                     onDispose: (() -> Void)? = nil)
         -> Single<ElementType> {
             return `do`(
                 onSuccess: onNext,
@@ -207,7 +206,7 @@ extension PrimitiveSequenceType where TraitType == SingleTrait {
                 onDispose: onDispose
             )
     }
-    
+
     /**
      Filters the elements of an observable sequence based on a predicate.
      
@@ -220,8 +219,7 @@ extension PrimitiveSequenceType where TraitType == SingleTrait {
         -> Maybe<ElementType> {
             return Maybe(raw: primitiveSequence.source.filter(predicate))
     }
-    
-    
+
     /**
      Projects each element of an observable sequence into a new form.
      
@@ -235,7 +233,7 @@ extension PrimitiveSequenceType where TraitType == SingleTrait {
         -> Single<R> {
             return Single(raw: primitiveSequence.source.map(transform))
     }
-    
+
     /**
      Projects each element of an observable sequence to an observable sequence and merges the resulting observable sequences into one observable sequence.
      
@@ -282,28 +280,28 @@ extension PrimitiveSequenceType where TraitType == SingleTrait {
      - returns: An observable sequence containing the result of combining elements of the sources using the specified result selector function.
      */
     public static func zip<C: Collection, R>(_ collection: C, _ resultSelector: @escaping ([ElementType]) throws -> R) -> PrimitiveSequence<TraitType, R> where C.Iterator.Element == PrimitiveSequence<TraitType, ElementType> {
-        
+
         if collection.isEmpty {
             return PrimitiveSequence<TraitType, R>.deferred {
                 return PrimitiveSequence<TraitType, R>(raw: .just(try resultSelector([])))
             }
         }
-        
+
         let raw = Observable.zip(collection.map { $0.asObservable() }, resultSelector)
         return PrimitiveSequence<TraitType, R>(raw: raw)
     }
-    
+
     /**
      Merges the specified observable sequences into one observable sequence all of the observable sequences have produced an element at a corresponding index.
      
      - returns: An observable sequence containing the result of combining elements of the sources.
      */
     public static func zip<C: Collection>(_ collection: C) -> PrimitiveSequence<TraitType, [ElementType]> where C.Iterator.Element == PrimitiveSequence<TraitType, ElementType> {
-        
+
         if collection.isEmpty {
             return PrimitiveSequence<TraitType, [ElementType]>(raw: .just([]))
         }
-        
+
         let raw = Observable.zip(collection.map { $0.asObservable() })
         return PrimitiveSequence(raw: raw)
     }
diff --git a/samples/client/petstore/swift4/rxswift/SwaggerClientTests/SwaggerClient/AppDelegate.swift b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/SwaggerClient/AppDelegate.swift
index e19be16160..e8f911b0fa 100644
--- a/samples/client/petstore/swift4/rxswift/SwaggerClientTests/SwaggerClient/AppDelegate.swift
+++ b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/SwaggerClient/AppDelegate.swift
@@ -13,7 +13,6 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
 
     var window: UIWindow?
 
-
     func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]?) -> Bool {
         // Override point for customization after application launch.
         return true
@@ -41,5 +40,4 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
         // Called when the application is about to terminate. Save data if appropriate. See also applicationDidEnterBackground:.
     }
 
-
 }
diff --git a/samples/client/petstore/swift4/rxswift/SwaggerClientTests/SwaggerClient/ViewController.swift b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/SwaggerClient/ViewController.swift
index 14180180be..3a45ba8fc5 100644
--- a/samples/client/petstore/swift4/rxswift/SwaggerClientTests/SwaggerClient/ViewController.swift
+++ b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/SwaggerClient/ViewController.swift
@@ -20,5 +20,4 @@ class ViewController: UIViewController {
         // Dispose of any resources that can be recreated.
     }
 
-
 }
diff --git a/samples/client/petstore/swift4/rxswift/SwaggerClientTests/SwaggerClientTests/APIHelperTests.swift b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/SwaggerClientTests/APIHelperTests.swift
index 0f2ae9f9ff..4f51881a66 100644
--- a/samples/client/petstore/swift4/rxswift/SwaggerClientTests/SwaggerClientTests/APIHelperTests.swift
+++ b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/SwaggerClientTests/APIHelperTests.swift
@@ -11,17 +11,17 @@ import PetstoreClient
 @testable import SwaggerClient
 
 class APIHelperTests: XCTestCase {
-    
+
     override func setUp() {
         super.setUp()
         // Put setup code here. This method is called before the invocation of each test method in the class.
     }
-    
+
     override func tearDown() {
         // Put teardown code here. This method is called after the invocation of each test method in the class.
         super.tearDown()
     }
-    
+
     func testRejectNil() {
         let source: [String: Any?] = ["a": 1, "b": nil, "c": ["1", nil, "2"], "d": true, "e": false]
         let expected: [String: Any] = ["a": 1, "c": ["1", nil, "2"], "d": true, "e": false]
diff --git a/samples/client/petstore/swift4/rxswift/SwaggerClientTests/SwaggerClientTests/PetAPITests.swift b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/SwaggerClientTests/PetAPITests.swift
index 99f4e85eac..5b75994742 100644
--- a/samples/client/petstore/swift4/rxswift/SwaggerClientTests/SwaggerClientTests/PetAPITests.swift
+++ b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/SwaggerClientTests/PetAPITests.swift
@@ -34,7 +34,7 @@ class PetAPITests: XCTestCase {
 
         PetAPI.addPet(body: newPet).subscribe(onNext: {
             expectation.fulfill()
-            }, onError: { errorType in
+            }, onError: { _ in
                 XCTFail("error creating pet")
             }).disposed(by: disposeBag)
         self.waitForExpectations(timeout: testTimeout, handler: nil)
@@ -60,7 +60,7 @@ class PetAPITests: XCTestCase {
             XCTAssert(pet.photoUrls[1] == "https://petstore.com/sample/photo2.jpg")
 
             expectation.fulfill()
-            }, onError: { errorType in
+            }, onError: { _ in
                 XCTFail("error getting pet")
         }).disposed(by: disposeBag)
         self.waitForExpectations(timeout: testTimeout, handler: nil)
diff --git a/samples/client/petstore/swift4/rxswift/SwaggerClientTests/SwaggerClientTests/StoreAPITests.swift b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/SwaggerClientTests/StoreAPITests.swift
index 97db90b226..730f5c134e 100644
--- a/samples/client/petstore/swift4/rxswift/SwaggerClientTests/SwaggerClientTests/StoreAPITests.swift
+++ b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/SwaggerClientTests/StoreAPITests.swift
@@ -32,7 +32,7 @@ class StoreAPITests: XCTestCase {
             XCTAssert(order.complete == true, "invalid complete")
 
             expectation.fulfill()
-        }, onError: { errorType in
+        }, onError: { _ in
             XCTFail("error placing order")
         }).disposed(by: disposeBag)
         self.waitForExpectations(timeout: testTimeout, handler: nil)
@@ -46,7 +46,7 @@ class StoreAPITests: XCTestCase {
             XCTAssert(order.status == .placed, "invalid status")
             XCTAssert(order.complete == true, "invalid complete")
             expectation.fulfill()
-            }, onError: { errorType in
+            }, onError: { _ in
                 XCTFail("error placing order")
         }).disposed(by: disposeBag)
         self.waitForExpectations(timeout: testTimeout, handler: nil)
diff --git a/samples/client/petstore/swift4/rxswift/SwaggerClientTests/SwaggerClientTests/UserAPITests.swift b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/SwaggerClientTests/UserAPITests.swift
index fbe9c68db3..ae0994fa82 100644
--- a/samples/client/petstore/swift4/rxswift/SwaggerClientTests/SwaggerClientTests/UserAPITests.swift
+++ b/samples/client/petstore/swift4/rxswift/SwaggerClientTests/SwaggerClientTests/UserAPITests.swift
@@ -96,7 +96,7 @@ class UserAPITests: XCTestCase {
             XCTAssert(user.password == "test!", "invalid password")
             XCTAssert(user.phone == "867-5309", "invalid phone")
             expectation.fulfill()
-            }, onError: { errorType in
+            }, onError: { _ in
                 XCTFail("error getting user")
             }).disposed(by: disposeBag)
         self.waitForExpectations(timeout: testTimeout, handler: nil)
diff --git a/samples/client/petstore/swift4/rxswift/docs/CatAllOf.md b/samples/client/petstore/swift4/rxswift/docs/CatAllOf.md
new file mode 100644
index 0000000000..79789be61c
--- /dev/null
+++ b/samples/client/petstore/swift4/rxswift/docs/CatAllOf.md
@@ -0,0 +1,10 @@
+# CatAllOf
+
+## Properties
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**declawed** | **Bool** |  | [optional] 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
+
diff --git a/samples/client/petstore/swift4/rxswift/docs/DogAllOf.md b/samples/client/petstore/swift4/rxswift/docs/DogAllOf.md
new file mode 100644
index 0000000000..9302ef52e9
--- /dev/null
+++ b/samples/client/petstore/swift4/rxswift/docs/DogAllOf.md
@@ -0,0 +1,10 @@
+# DogAllOf
+
+## Properties
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**breed** | **String** |  | [optional] 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
+
diff --git a/samples/client/petstore/swift4/rxswift/docs/UserAPI.md b/samples/client/petstore/swift4/rxswift/docs/UserAPI.md
index b5b1f40b47..a707c7085a 100644
--- a/samples/client/petstore/swift4/rxswift/docs/UserAPI.md
+++ b/samples/client/petstore/swift4/rxswift/docs/UserAPI.md
@@ -75,7 +75,7 @@ let body = [User(id: 123, username: "username_example", firstName: "firstName_ex
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **body** | [**[User]**](Array.md) | List of user object | 
+ **body** | [**[User]**](User.md) | List of user object | 
 
 ### Return type
 
@@ -113,7 +113,7 @@ let body = [User(id: 123, username: "username_example", firstName: "firstName_ex
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **body** | [**[User]**](Array.md) | List of user object | 
+ **body** | [**[User]**](User.md) | List of user object | 
 
 ### Return type
 
diff --git a/samples/client/petstore/swift4/rxswift/project.yml b/samples/client/petstore/swift4/rxswift/project.yml
new file mode 100644
index 0000000000..3f2e1286ba
--- /dev/null
+++ b/samples/client/petstore/swift4/rxswift/project.yml
@@ -0,0 +1,16 @@
+name: PetstoreClient
+targets:
+  PetstoreClient:
+    type: framework
+    platform: iOS
+    deploymentTarget: "10.0"
+    sources: [PetstoreClient]
+    info:
+      path: ./Info.plist
+      version: 1.0.0
+    settings:
+      APPLICATION_EXTENSION_API_ONLY: true
+    scheme: {}
+    dependencies:
+    - carthage: Alamofire
+    - carthage: RxSwift
diff --git a/samples/client/petstore/swift4/unwrapRequired/.openapi-generator/VERSION b/samples/client/petstore/swift4/unwrapRequired/.openapi-generator/VERSION
index afa6365606..83a328a922 100644
--- a/samples/client/petstore/swift4/unwrapRequired/.openapi-generator/VERSION
+++ b/samples/client/petstore/swift4/unwrapRequired/.openapi-generator/VERSION
@@ -1 +1 @@
-4.0.0-SNAPSHOT
\ No newline at end of file
+4.1.0-SNAPSHOT
\ No newline at end of file
diff --git a/samples/client/petstore/swift4/unwrapRequired/Info.plist b/samples/client/petstore/swift4/unwrapRequired/Info.plist
new file mode 100644
index 0000000000..323e5ecfc4
--- /dev/null
+++ b/samples/client/petstore/swift4/unwrapRequired/Info.plist
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>CFBundleDevelopmentRegion</key>
+	<string>$(DEVELOPMENT_LANGUAGE)</string>
+	<key>CFBundleExecutable</key>
+	<string>$(EXECUTABLE_NAME)</string>
+	<key>CFBundleIdentifier</key>
+	<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
+	<key>CFBundleInfoDictionaryVersion</key>
+	<string>6.0</string>
+	<key>CFBundleName</key>
+	<string>$(PRODUCT_NAME)</string>
+	<key>CFBundlePackageType</key>
+	<string>FMWK</string>
+	<key>CFBundleShortVersionString</key>
+	<string>1.0</string>
+	<key>CFBundleVersion</key>
+	<string>1</string>
+</dict>
+</plist>
diff --git a/samples/client/petstore/swift4/unwrapRequired/PetstoreClient.xcodeproj/project.pbxproj b/samples/client/petstore/swift4/unwrapRequired/PetstoreClient.xcodeproj/project.pbxproj
new file mode 100644
index 0000000000..55021e5d19
--- /dev/null
+++ b/samples/client/petstore/swift4/unwrapRequired/PetstoreClient.xcodeproj/project.pbxproj
@@ -0,0 +1,601 @@
+// !$*UTF8*$!
+{
+	archiveVersion = 1;
+	classes = {
+	};
+	objectVersion = 50;
+	objects = {
+
+/* Begin PBXBuildFile section */
+		02903CEC38DC202565BC08CB040AC4E9 /* Animal.swift in Sources */ = {isa = PBXBuildFile; fileRef = 95568E7C35F119EB4A12B4982B3FB31F /* Animal.swift */; };
+		0462F801432CF94C7EF51D0532737A7E /* APIs.swift in Sources */ = {isa = PBXBuildFile; fileRef = 37DF825B8F3BADA2B2537D17CDC48633 /* APIs.swift */; };
+		08D87E4FECF24910F0DA0F1D2E2D955A /* EnumTest.swift in Sources */ = {isa = PBXBuildFile; fileRef = FD60AEA646791E0EDE885DE1E680A687 /* EnumTest.swift */; };
+		08F5828F0C2BCF07A9E4917DBBB993AE /* AdditionalPropertiesInteger.swift in Sources */ = {isa = PBXBuildFile; fileRef = FA2F3566156A4ABC465F201B4A1F6227 /* AdditionalPropertiesInteger.swift */; };
+		1143FFF06DEE01E5B0F1368AA05BE1B4 /* OuterEnum.swift in Sources */ = {isa = PBXBuildFile; fileRef = C15008AABC804EB6FB4CDAC6B871E6B0 /* OuterEnum.swift */; };
+		122BBAE8245606CC040EEB6B9254E376 /* StoreAPI.swift in Sources */ = {isa = PBXBuildFile; fileRef = A53274D99BBDE1B79BF3521CD7CBC276 /* StoreAPI.swift */; };
+		12327BF7304AA897C5D2A1250B1659B7 /* AdditionalPropertiesClass.swift in Sources */ = {isa = PBXBuildFile; fileRef = 396DEF3156BA0D12D0FC5C3C3AAF52C4 /* AdditionalPropertiesClass.swift */; };
+		12BB95C66D63090732BB9E0379836E3C /* JSONEncodingHelper.swift in Sources */ = {isa = PBXBuildFile; fileRef = 35D710108A69DD8A5297F926A66DA21F /* JSONEncodingHelper.swift */; };
+		16E9A5E22B4823DE282E7F4C18A21EA8 /* JSONEncodableEncoding.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9791B840B8D6EAA35343B00FA277963A /* JSONEncodableEncoding.swift */; };
+		18F19872A0DFB4CC3D9C696BBCA64EFD /* Cat.swift in Sources */ = {isa = PBXBuildFile; fileRef = 212AA914B7F1793A4E32C119370FB05F /* Cat.swift */; };
+		196E9846B27D736630CCF90497696859 /* StringBooleanMap.swift in Sources */ = {isa = PBXBuildFile; fileRef = 47B4DEBABEFE140768CFB70B19D23029 /* StringBooleanMap.swift */; };
+		271D94A05C47B602A2433B9CD3D9DCDC /* DogAllOf.swift in Sources */ = {isa = PBXBuildFile; fileRef = A21A69C8402A60E01116ABBDEE8943DB /* DogAllOf.swift */; };
+		293F4E0FBFC8297E414A3CDBB7F29A96 /* ReadOnlyFirst.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6FD42727E001E799E458C2924CF813CC /* ReadOnlyFirst.swift */; };
+		297E365D1E4672C43C56E0AFD855FFBF /* FakeAPI.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6E00950725DC44436C5E238CDD2EC164 /* FakeAPI.swift */; };
+		2A35688C985E9CB1EB7732AC2AD46B82 /* APIHelper.swift in Sources */ = {isa = PBXBuildFile; fileRef = 897716962D472FE162B723CB713AA6D3 /* APIHelper.swift */; };
+		2DF4544D4D3D6CF7047A59FB89ED31BD /* Model200Response.swift in Sources */ = {isa = PBXBuildFile; fileRef = 82A2C3DC2235F0114C2B08E553F46874 /* Model200Response.swift */; };
+		3251A3722981CE46261615CFBA96A08D /* ArrayOfArrayOfNumberOnly.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7B1B8B838B5D9D312F2002EBAD946378 /* ArrayOfArrayOfNumberOnly.swift */; };
+		36734C4EB3362A114A7CB5F25EE39E6D /* FormatTest.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3156CE41C001C80379B84BDB435DECCB /* FormatTest.swift */; };
+		39F9FBA1AC5C2612ECA1FF715EBFC287 /* AdditionalPropertiesString.swift in Sources */ = {isa = PBXBuildFile; fileRef = FFE215C1B526E0418ED301B15357B970 /* AdditionalPropertiesString.swift */; };
+		3D8E407B1DF4FA5A5F16B64E3A285781 /* PetAPI.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9A019F500E546A3292CE716AB967C673 /* PetAPI.swift */; };
+		41D8A105135868152A56E2AC475049BB /* CatAllOf.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3AD0F94F512DFBC09F9CC79AF4BD9BFD /* CatAllOf.swift */; };
+		42C51BC034E8B0CAA29A068F6B0DC815 /* Category.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6F2985D01F8D60A4B1925C694330E6CB /* Category.swift */; };
+		491676EC91BFEF95A12556888EED87B5 /* FileSchemaTestClass.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B3666552AA854DAF9C480A3354C9D7C /* FileSchemaTestClass.swift */; };
+		4C28BFEC5E7C8150DEFD83E09C1A1D32 /* Alamofire.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A235FA3FDFB086CC69CDE83DFC1F4BC9 /* Alamofire.framework */; };
+		52B5604F986335DB69CD2B430FB83BAB /* AdditionalPropertiesAnyType.swift in Sources */ = {isa = PBXBuildFile; fileRef = F5AB1037D937AADF8B4A70C96D5E5D61 /* AdditionalPropertiesAnyType.swift */; };
+		58F9704B295AC436D6FB98FA669E2344 /* AlamofireImplementations.swift in Sources */ = {isa = PBXBuildFile; fileRef = 84A201508DF2B697D65F263189C08721 /* AlamofireImplementations.swift */; };
+		59C00CBB07761CAC8DCE7054E34AD5D9 /* EnumClass.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B2C97AE6ACA1E5FB88F5BAA2DB76FDC /* EnumClass.swift */; };
+		59C2F5495C98836BFA9E10BF5C13BC2C /* Order.swift in Sources */ = {isa = PBXBuildFile; fileRef = 27B2E9EF856E89FEAA359A3AC4A2CF5D /* Order.swift */; };
+		59EAB3527305A37ED99FB210045B69EA /* AdditionalPropertiesNumber.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1E0512B3582586B4C0C598D5DB1C0D39 /* AdditionalPropertiesNumber.swift */; };
+		5ACDD7CC312167589335E9CA5998E770 /* ClassModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3C30827D8EAF8EA684E7BCEA5A1E93B2 /* ClassModel.swift */; };
+		655AA371771C7BD72EE0AAC0C90DFFF0 /* MapTest.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7986861626C2B1CB49AD7000C6343270 /* MapTest.swift */; };
+		6600BB1500AE35A3C80F7C83F6444552 /* TypeHolderDefault.swift in Sources */ = {isa = PBXBuildFile; fileRef = EBC76F6D4D2AA8084B7EB50E5C15E475 /* TypeHolderDefault.swift */; };
+		6CD20EE568DDAD2304BF0C4B1A70C8DC /* CodableHelper.swift in Sources */ = {isa = PBXBuildFile; fileRef = 02A6F6BB2152ACEE1416D44AB3955243 /* CodableHelper.swift */; };
+		7367A9D91D4B101F2D28AC56ED89F175 /* Capitalization.swift in Sources */ = {isa = PBXBuildFile; fileRef = A7B38FA00A494D13F4C382A3D87FBF59 /* Capitalization.swift */; };
+		82D4D0C8AD0354A700C8ACD421ABED55 /* OuterComposite.swift in Sources */ = {isa = PBXBuildFile; fileRef = F4E0AD8F60A91F72C768756002C14BF9 /* OuterComposite.swift */; };
+		83A2D1863FB136C0DFC423319F4EED65 /* AnotherFakeAPI.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9DF24D2714B9C4CF14146E88FDDC01A5 /* AnotherFakeAPI.swift */; };
+		92FB161BF1E57D11B116AF0292D5835C /* Client.swift in Sources */ = {isa = PBXBuildFile; fileRef = A913A57E72D723632E9A718FF4525C81 /* Client.swift */; };
+		97C99615237E1B662242E04F527B38B9 /* ApiResponse.swift in Sources */ = {isa = PBXBuildFile; fileRef = A8E7B833748B4F0C7CDA90C6E500B199 /* ApiResponse.swift */; };
+		988F461F59E4E1091156840007CB3773 /* AdditionalPropertiesBoolean.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0CC24C01A55F644957196F9F81D10F81 /* AdditionalPropertiesBoolean.swift */; };
+		A190AF5A3988639ED4B78163D0EA3CA4 /* ArrayOfNumberOnly.swift in Sources */ = {isa = PBXBuildFile; fileRef = B65BB72353DA24536A9049BEC3D234C8 /* ArrayOfNumberOnly.swift */; };
+		A438970025AE69ED407BC1E67CC6359E /* EnumArrays.swift in Sources */ = {isa = PBXBuildFile; fileRef = 10503995D9EFD031A2EFB57603B3132E /* EnumArrays.swift */; };
+		A9F1AAF6CE029DD3B4F8AC841F0B6BC6 /* FakeClassnameTags123API.swift in Sources */ = {isa = PBXBuildFile; fileRef = B42354B407EC173BEB54E0429D946F3B /* FakeClassnameTags123API.swift */; };
+		AE9D2E1DB59AF6575AC4AC6756C5A937 /* NumberOnly.swift in Sources */ = {isa = PBXBuildFile; fileRef = B8E0B16084741FCB82389F5854AC5E26 /* NumberOnly.swift */; };
+		B399A1742F23330FDCA450EAB98F51F1 /* Pet.swift in Sources */ = {isa = PBXBuildFile; fileRef = ECFEB4C6C257B3BB3CEA36D10A5EDC17 /* Pet.swift */; };
+		BB02FDCF1B2B0E457E1C2BF39FBB599D /* XmlItem.swift in Sources */ = {isa = PBXBuildFile; fileRef = A2253391845B73B8BA3680491575CC07 /* XmlItem.swift */; };
+		BF7D58FBCF5E4D3F2932FCC0E62BED40 /* User.swift in Sources */ = {isa = PBXBuildFile; fileRef = E5565A447062C7B8F695F4517DB5E4A5 /* User.swift */; };
+		C15AC1CC631E96D0360EB8C15BF30452 /* Name.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5AD994DFAA0DA93C188A4DBA16688767 /* Name.swift */; };
+		C1CACABE18A7ADCE37D1CD9DC9128304 /* List.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7A6070F581E611FF44AFD40A4315C49A /* List.swift */; };
+		C2EDEB747887399B13A6DFD72A219CB2 /* ArrayTest.swift in Sources */ = {isa = PBXBuildFile; fileRef = F1A0379CDFC55705AE76C99867B8DB08 /* ArrayTest.swift */; };
+		C329EE55B2FCC9174ED3B128D67C5E8C /* Extensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = B8C298FC8929DCB369053F118D7DF28F /* Extensions.swift */; };
+		D3A17B7FAFA8A7A210875BBCDCC30116 /* MixedPropertiesAndAdditionalPropertiesClass.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9AD714C7CC59BDD18DE8DF4ED40B9DA9 /* MixedPropertiesAndAdditionalPropertiesClass.swift */; };
+		D68F23CD4B5178493CE7AE8DFB868EAE /* AdditionalPropertiesArray.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4FEE553331890581C2FF366F9EA0956D /* AdditionalPropertiesArray.swift */; };
+		D70EC94E346077DE1482231DD4498BED /* Dog.swift in Sources */ = {isa = PBXBuildFile; fileRef = C6C3E1129526A353B963EFD74ED8419C /* Dog.swift */; };
+		DB1CE39011A741D07E187663291B5DE5 /* AnimalFarm.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8D22BE01748F51106DE0233299A9061E /* AnimalFarm.swift */; };
+		DB724C4F1AD5DF025B53A9A2E0A49E3D /* UserAPI.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7C8D5F382979854D47F18DB1543680FE /* UserAPI.swift */; };
+		DDBC3CF5E447D8D838F0FE200420EEE3 /* HasOnlyReadOnly.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4C7FBC641752D2E13B15097311139DDC /* HasOnlyReadOnly.swift */; };
+		DEC892724574BB29BD65869374F83982 /* Configuration.swift in Sources */ = {isa = PBXBuildFile; fileRef = 28A444949BBC254798C3B3DD14AAF2CD /* Configuration.swift */; };
+		E2C40F0E34DB8C21A806262C72841A51 /* SpecialModelName.swift in Sources */ = {isa = PBXBuildFile; fileRef = 386FD590658E90509C121118F057604D /* SpecialModelName.swift */; };
+		E51ADEC931806B20A041303E539A8BE2 /* Tag.swift in Sources */ = {isa = PBXBuildFile; fileRef = B2896F8BFD1AA2965C8A30158F0EDA8C /* Tag.swift */; };
+		E57CD12D2F500D40B4135D0F5ECA9866 /* AdditionalPropertiesObject.swift in Sources */ = {isa = PBXBuildFile; fileRef = 72FEDC94BA0E37214D360871B284BC8A /* AdditionalPropertiesObject.swift */; };
+		F02BEF9A8503B3848B045370451E85F6 /* Models.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8699F7966F748ED026A6FB4CF550442B /* Models.swift */; };
+		F21D10C71A9DE7D0467AFD23FD391D2E /* Return.swift in Sources */ = {isa = PBXBuildFile; fileRef = C81447828475F76C5CF4F08AA65292F7 /* Return.swift */; };
+		FB4A053CDCD75E48B755CC22D463A3FC /* TypeHolderExample.swift in Sources */ = {isa = PBXBuildFile; fileRef = 19B65C66C97F082718DDD703F39DE1C2 /* TypeHolderExample.swift */; };
+		FECA03F0388E84AE1B22638605D8AC9F /* File.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3933D3B2A3AC4577094D0C23D1C1B266 /* File.swift */; };
+/* End PBXBuildFile section */
+
+/* Begin PBXFileReference section */
+		02A6F6BB2152ACEE1416D44AB3955243 /* CodableHelper.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CodableHelper.swift; sourceTree = "<group>"; };
+		0CC24C01A55F644957196F9F81D10F81 /* AdditionalPropertiesBoolean.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AdditionalPropertiesBoolean.swift; sourceTree = "<group>"; };
+		10503995D9EFD031A2EFB57603B3132E /* EnumArrays.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EnumArrays.swift; sourceTree = "<group>"; };
+		164AD6EC9C4CCF634D7C45905E99E3A7 /* PetstoreClient.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = PetstoreClient.framework; sourceTree = BUILT_PRODUCTS_DIR; };
+		19B65C66C97F082718DDD703F39DE1C2 /* TypeHolderExample.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TypeHolderExample.swift; sourceTree = "<group>"; };
+		1E0512B3582586B4C0C598D5DB1C0D39 /* AdditionalPropertiesNumber.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AdditionalPropertiesNumber.swift; sourceTree = "<group>"; };
+		212AA914B7F1793A4E32C119370FB05F /* Cat.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Cat.swift; sourceTree = "<group>"; };
+		27B2E9EF856E89FEAA359A3AC4A2CF5D /* Order.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Order.swift; sourceTree = "<group>"; };
+		28A444949BBC254798C3B3DD14AAF2CD /* Configuration.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Configuration.swift; sourceTree = "<group>"; };
+		3156CE41C001C80379B84BDB435DECCB /* FormatTest.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FormatTest.swift; sourceTree = "<group>"; };
+		35D710108A69DD8A5297F926A66DA21F /* JSONEncodingHelper.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = JSONEncodingHelper.swift; sourceTree = "<group>"; };
+		37DF825B8F3BADA2B2537D17CDC48633 /* APIs.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = APIs.swift; sourceTree = "<group>"; };
+		386FD590658E90509C121118F057604D /* SpecialModelName.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SpecialModelName.swift; sourceTree = "<group>"; };
+		3933D3B2A3AC4577094D0C23D1C1B266 /* File.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = File.swift; sourceTree = "<group>"; };
+		396DEF3156BA0D12D0FC5C3C3AAF52C4 /* AdditionalPropertiesClass.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AdditionalPropertiesClass.swift; sourceTree = "<group>"; };
+		3AD0F94F512DFBC09F9CC79AF4BD9BFD /* CatAllOf.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CatAllOf.swift; sourceTree = "<group>"; };
+		3C30827D8EAF8EA684E7BCEA5A1E93B2 /* ClassModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ClassModel.swift; sourceTree = "<group>"; };
+		47B4DEBABEFE140768CFB70B19D23029 /* StringBooleanMap.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = StringBooleanMap.swift; sourceTree = "<group>"; };
+		4B2C97AE6ACA1E5FB88F5BAA2DB76FDC /* EnumClass.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EnumClass.swift; sourceTree = "<group>"; };
+		4B3666552AA854DAF9C480A3354C9D7C /* FileSchemaTestClass.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FileSchemaTestClass.swift; sourceTree = "<group>"; };
+		4C7FBC641752D2E13B15097311139DDC /* HasOnlyReadOnly.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HasOnlyReadOnly.swift; sourceTree = "<group>"; };
+		4FEE553331890581C2FF366F9EA0956D /* AdditionalPropertiesArray.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AdditionalPropertiesArray.swift; sourceTree = "<group>"; };
+		5AD994DFAA0DA93C188A4DBA16688767 /* Name.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Name.swift; sourceTree = "<group>"; };
+		6E00950725DC44436C5E238CDD2EC164 /* FakeAPI.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FakeAPI.swift; sourceTree = "<group>"; };
+		6F2985D01F8D60A4B1925C694330E6CB /* Category.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Category.swift; sourceTree = "<group>"; };
+		6FD42727E001E799E458C2924CF813CC /* ReadOnlyFirst.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ReadOnlyFirst.swift; sourceTree = "<group>"; };
+		72FEDC94BA0E37214D360871B284BC8A /* AdditionalPropertiesObject.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AdditionalPropertiesObject.swift; sourceTree = "<group>"; };
+		7986861626C2B1CB49AD7000C6343270 /* MapTest.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MapTest.swift; sourceTree = "<group>"; };
+		7A6070F581E611FF44AFD40A4315C49A /* List.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = List.swift; sourceTree = "<group>"; };
+		7B1B8B838B5D9D312F2002EBAD946378 /* ArrayOfArrayOfNumberOnly.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ArrayOfArrayOfNumberOnly.swift; sourceTree = "<group>"; };
+		7C8D5F382979854D47F18DB1543680FE /* UserAPI.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UserAPI.swift; sourceTree = "<group>"; };
+		82A2C3DC2235F0114C2B08E553F46874 /* Model200Response.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Model200Response.swift; sourceTree = "<group>"; };
+		84A201508DF2B697D65F263189C08721 /* AlamofireImplementations.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AlamofireImplementations.swift; sourceTree = "<group>"; };
+		8699F7966F748ED026A6FB4CF550442B /* Models.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Models.swift; sourceTree = "<group>"; };
+		897716962D472FE162B723CB713AA6D3 /* APIHelper.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = APIHelper.swift; sourceTree = "<group>"; };
+		8D22BE01748F51106DE0233299A9061E /* AnimalFarm.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AnimalFarm.swift; sourceTree = "<group>"; };
+		95568E7C35F119EB4A12B4982B3FB31F /* Animal.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Animal.swift; sourceTree = "<group>"; };
+		9791B840B8D6EAA35343B00FA277963A /* JSONEncodableEncoding.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = JSONEncodableEncoding.swift; sourceTree = "<group>"; };
+		9A019F500E546A3292CE716AB967C673 /* PetAPI.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PetAPI.swift; sourceTree = "<group>"; };
+		9AD714C7CC59BDD18DE8DF4ED40B9DA9 /* MixedPropertiesAndAdditionalPropertiesClass.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MixedPropertiesAndAdditionalPropertiesClass.swift; sourceTree = "<group>"; };
+		9DF24D2714B9C4CF14146E88FDDC01A5 /* AnotherFakeAPI.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AnotherFakeAPI.swift; sourceTree = "<group>"; };
+		A21A69C8402A60E01116ABBDEE8943DB /* DogAllOf.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DogAllOf.swift; sourceTree = "<group>"; };
+		A2253391845B73B8BA3680491575CC07 /* XmlItem.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = XmlItem.swift; sourceTree = "<group>"; };
+		A235FA3FDFB086CC69CDE83DFC1F4BC9 /* Alamofire.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = Alamofire.framework; sourceTree = "<group>"; };
+		A53274D99BBDE1B79BF3521CD7CBC276 /* StoreAPI.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = StoreAPI.swift; sourceTree = "<group>"; };
+		A7B38FA00A494D13F4C382A3D87FBF59 /* Capitalization.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Capitalization.swift; sourceTree = "<group>"; };
+		A8E7B833748B4F0C7CDA90C6E500B199 /* ApiResponse.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ApiResponse.swift; sourceTree = "<group>"; };
+		A913A57E72D723632E9A718FF4525C81 /* Client.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Client.swift; sourceTree = "<group>"; };
+		B2896F8BFD1AA2965C8A30158F0EDA8C /* Tag.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Tag.swift; sourceTree = "<group>"; };
+		B42354B407EC173BEB54E0429D946F3B /* FakeClassnameTags123API.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FakeClassnameTags123API.swift; sourceTree = "<group>"; };
+		B65BB72353DA24536A9049BEC3D234C8 /* ArrayOfNumberOnly.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ArrayOfNumberOnly.swift; sourceTree = "<group>"; };
+		B8C298FC8929DCB369053F118D7DF28F /* Extensions.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Extensions.swift; sourceTree = "<group>"; };
+		B8E0B16084741FCB82389F5854AC5E26 /* NumberOnly.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NumberOnly.swift; sourceTree = "<group>"; };
+		C15008AABC804EB6FB4CDAC6B871E6B0 /* OuterEnum.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = OuterEnum.swift; sourceTree = "<group>"; };
+		C6C3E1129526A353B963EFD74ED8419C /* Dog.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Dog.swift; sourceTree = "<group>"; };
+		C81447828475F76C5CF4F08AA65292F7 /* Return.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Return.swift; sourceTree = "<group>"; };
+		E5565A447062C7B8F695F4517DB5E4A5 /* User.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = User.swift; sourceTree = "<group>"; };
+		EBC76F6D4D2AA8084B7EB50E5C15E475 /* TypeHolderDefault.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TypeHolderDefault.swift; sourceTree = "<group>"; };
+		ECFEB4C6C257B3BB3CEA36D10A5EDC17 /* Pet.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Pet.swift; sourceTree = "<group>"; };
+		F1A0379CDFC55705AE76C99867B8DB08 /* ArrayTest.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ArrayTest.swift; sourceTree = "<group>"; };
+		F4E0AD8F60A91F72C768756002C14BF9 /* OuterComposite.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = OuterComposite.swift; sourceTree = "<group>"; };
+		F5AB1037D937AADF8B4A70C96D5E5D61 /* AdditionalPropertiesAnyType.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AdditionalPropertiesAnyType.swift; sourceTree = "<group>"; };
+		FA2F3566156A4ABC465F201B4A1F6227 /* AdditionalPropertiesInteger.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AdditionalPropertiesInteger.swift; sourceTree = "<group>"; };
+		FD60AEA646791E0EDE885DE1E680A687 /* EnumTest.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EnumTest.swift; sourceTree = "<group>"; };
+		FFE215C1B526E0418ED301B15357B970 /* AdditionalPropertiesString.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AdditionalPropertiesString.swift; sourceTree = "<group>"; };
+/* End PBXFileReference section */
+
+/* Begin PBXFrameworksBuildPhase section */
+		D1990C2A394CCF025EF98A2FB828C79A /* Frameworks */ = {
+			isa = PBXFrameworksBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				4C28BFEC5E7C8150DEFD83E09C1A1D32 /* Alamofire.framework in Frameworks */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+/* End PBXFrameworksBuildPhase section */
+
+/* Begin PBXGroup section */
+		1E464C0937FE0D3A7A0FE29AF446553C /* Frameworks */ = {
+			isa = PBXGroup;
+			children = (
+				7861EE241895128F64DD787367B3022D /* Carthage */,
+			);
+			name = Frameworks;
+			sourceTree = "<group>";
+		};
+		4FBDCF1330A9AB9122780DB3FA21DE4C /* Models */ = {
+			isa = PBXGroup;
+			children = (
+				F5AB1037D937AADF8B4A70C96D5E5D61 /* AdditionalPropertiesAnyType.swift */,
+				4FEE553331890581C2FF366F9EA0956D /* AdditionalPropertiesArray.swift */,
+				0CC24C01A55F644957196F9F81D10F81 /* AdditionalPropertiesBoolean.swift */,
+				396DEF3156BA0D12D0FC5C3C3AAF52C4 /* AdditionalPropertiesClass.swift */,
+				FA2F3566156A4ABC465F201B4A1F6227 /* AdditionalPropertiesInteger.swift */,
+				1E0512B3582586B4C0C598D5DB1C0D39 /* AdditionalPropertiesNumber.swift */,
+				72FEDC94BA0E37214D360871B284BC8A /* AdditionalPropertiesObject.swift */,
+				FFE215C1B526E0418ED301B15357B970 /* AdditionalPropertiesString.swift */,
+				95568E7C35F119EB4A12B4982B3FB31F /* Animal.swift */,
+				8D22BE01748F51106DE0233299A9061E /* AnimalFarm.swift */,
+				A8E7B833748B4F0C7CDA90C6E500B199 /* ApiResponse.swift */,
+				7B1B8B838B5D9D312F2002EBAD946378 /* ArrayOfArrayOfNumberOnly.swift */,
+				B65BB72353DA24536A9049BEC3D234C8 /* ArrayOfNumberOnly.swift */,
+				F1A0379CDFC55705AE76C99867B8DB08 /* ArrayTest.swift */,
+				A7B38FA00A494D13F4C382A3D87FBF59 /* Capitalization.swift */,
+				212AA914B7F1793A4E32C119370FB05F /* Cat.swift */,
+				3AD0F94F512DFBC09F9CC79AF4BD9BFD /* CatAllOf.swift */,
+				6F2985D01F8D60A4B1925C694330E6CB /* Category.swift */,
+				3C30827D8EAF8EA684E7BCEA5A1E93B2 /* ClassModel.swift */,
+				A913A57E72D723632E9A718FF4525C81 /* Client.swift */,
+				C6C3E1129526A353B963EFD74ED8419C /* Dog.swift */,
+				A21A69C8402A60E01116ABBDEE8943DB /* DogAllOf.swift */,
+				10503995D9EFD031A2EFB57603B3132E /* EnumArrays.swift */,
+				4B2C97AE6ACA1E5FB88F5BAA2DB76FDC /* EnumClass.swift */,
+				FD60AEA646791E0EDE885DE1E680A687 /* EnumTest.swift */,
+				3933D3B2A3AC4577094D0C23D1C1B266 /* File.swift */,
+				4B3666552AA854DAF9C480A3354C9D7C /* FileSchemaTestClass.swift */,
+				3156CE41C001C80379B84BDB435DECCB /* FormatTest.swift */,
+				4C7FBC641752D2E13B15097311139DDC /* HasOnlyReadOnly.swift */,
+				7A6070F581E611FF44AFD40A4315C49A /* List.swift */,
+				7986861626C2B1CB49AD7000C6343270 /* MapTest.swift */,
+				9AD714C7CC59BDD18DE8DF4ED40B9DA9 /* MixedPropertiesAndAdditionalPropertiesClass.swift */,
+				82A2C3DC2235F0114C2B08E553F46874 /* Model200Response.swift */,
+				5AD994DFAA0DA93C188A4DBA16688767 /* Name.swift */,
+				B8E0B16084741FCB82389F5854AC5E26 /* NumberOnly.swift */,
+				27B2E9EF856E89FEAA359A3AC4A2CF5D /* Order.swift */,
+				F4E0AD8F60A91F72C768756002C14BF9 /* OuterComposite.swift */,
+				C15008AABC804EB6FB4CDAC6B871E6B0 /* OuterEnum.swift */,
+				ECFEB4C6C257B3BB3CEA36D10A5EDC17 /* Pet.swift */,
+				6FD42727E001E799E458C2924CF813CC /* ReadOnlyFirst.swift */,
+				C81447828475F76C5CF4F08AA65292F7 /* Return.swift */,
+				386FD590658E90509C121118F057604D /* SpecialModelName.swift */,
+				47B4DEBABEFE140768CFB70B19D23029 /* StringBooleanMap.swift */,
+				B2896F8BFD1AA2965C8A30158F0EDA8C /* Tag.swift */,
+				EBC76F6D4D2AA8084B7EB50E5C15E475 /* TypeHolderDefault.swift */,
+				19B65C66C97F082718DDD703F39DE1C2 /* TypeHolderExample.swift */,
+				E5565A447062C7B8F695F4517DB5E4A5 /* User.swift */,
+				A2253391845B73B8BA3680491575CC07 /* XmlItem.swift */,
+			);
+			path = Models;
+			sourceTree = "<group>";
+		};
+		5FBA6AE5F64CD737F88B4565AC3CCD3B = {
+			isa = PBXGroup;
+			children = (
+				9B364C01750D7AA4F983B9E77B01BCC6 /* PetstoreClient */,
+				1E464C0937FE0D3A7A0FE29AF446553C /* Frameworks */,
+				857F0DEA1890CE66D6DAD556C55821A6 /* Products */,
+			);
+			sourceTree = "<group>";
+		};
+		67BF3478113E6B4DF1C4E04F40BF58C4 /* OpenAPIs */ = {
+			isa = PBXGroup;
+			children = (
+				84A201508DF2B697D65F263189C08721 /* AlamofireImplementations.swift */,
+				897716962D472FE162B723CB713AA6D3 /* APIHelper.swift */,
+				37DF825B8F3BADA2B2537D17CDC48633 /* APIs.swift */,
+				02A6F6BB2152ACEE1416D44AB3955243 /* CodableHelper.swift */,
+				28A444949BBC254798C3B3DD14AAF2CD /* Configuration.swift */,
+				B8C298FC8929DCB369053F118D7DF28F /* Extensions.swift */,
+				9791B840B8D6EAA35343B00FA277963A /* JSONEncodableEncoding.swift */,
+				35D710108A69DD8A5297F926A66DA21F /* JSONEncodingHelper.swift */,
+				8699F7966F748ED026A6FB4CF550442B /* Models.swift */,
+				F956D0CCAE23BCFD1C7BDD5D47944AA5 /* APIs */,
+				4FBDCF1330A9AB9122780DB3FA21DE4C /* Models */,
+			);
+			path = OpenAPIs;
+			sourceTree = "<group>";
+		};
+		7861EE241895128F64DD787367B3022D /* Carthage */ = {
+			isa = PBXGroup;
+			children = (
+				A012205B41CB71A62B86EECDEAFB0990 /* iOS */,
+			);
+			name = Carthage;
+			path = Carthage/Build;
+			sourceTree = "<group>";
+		};
+		857F0DEA1890CE66D6DAD556C55821A6 /* Products */ = {
+			isa = PBXGroup;
+			children = (
+				164AD6EC9C4CCF634D7C45905E99E3A7 /* PetstoreClient.framework */,
+			);
+			name = Products;
+			sourceTree = "<group>";
+		};
+		9B364C01750D7AA4F983B9E77B01BCC6 /* PetstoreClient */ = {
+			isa = PBXGroup;
+			children = (
+				EF4C81BDD734856ED5023B777D35098B /* Classes */,
+			);
+			path = PetstoreClient;
+			sourceTree = "<group>";
+		};
+		A012205B41CB71A62B86EECDEAFB0990 /* iOS */ = {
+			isa = PBXGroup;
+			children = (
+				A235FA3FDFB086CC69CDE83DFC1F4BC9 /* Alamofire.framework */,
+			);
+			path = iOS;
+			sourceTree = "<group>";
+		};
+		EF4C81BDD734856ED5023B777D35098B /* Classes */ = {
+			isa = PBXGroup;
+			children = (
+				67BF3478113E6B4DF1C4E04F40BF58C4 /* OpenAPIs */,
+			);
+			path = Classes;
+			sourceTree = "<group>";
+		};
+		F956D0CCAE23BCFD1C7BDD5D47944AA5 /* APIs */ = {
+			isa = PBXGroup;
+			children = (
+				9DF24D2714B9C4CF14146E88FDDC01A5 /* AnotherFakeAPI.swift */,
+				6E00950725DC44436C5E238CDD2EC164 /* FakeAPI.swift */,
+				B42354B407EC173BEB54E0429D946F3B /* FakeClassnameTags123API.swift */,
+				9A019F500E546A3292CE716AB967C673 /* PetAPI.swift */,
+				A53274D99BBDE1B79BF3521CD7CBC276 /* StoreAPI.swift */,
+				7C8D5F382979854D47F18DB1543680FE /* UserAPI.swift */,
+			);
+			path = APIs;
+			sourceTree = "<group>";
+		};
+/* End PBXGroup section */
+
+/* Begin PBXNativeTarget section */
+		C1282C2230015E0D204BEAEDDFB49453 /* PetstoreClient */ = {
+			isa = PBXNativeTarget;
+			buildConfigurationList = B46EDEB1A7F0D78FE6394544C60169D1 /* Build configuration list for PBXNativeTarget "PetstoreClient" */;
+			buildPhases = (
+				E539708354CE60FE486F81EDE56D13C8 /* Sources */,
+				D1990C2A394CCF025EF98A2FB828C79A /* Frameworks */,
+			);
+			buildRules = (
+			);
+			dependencies = (
+			);
+			name = PetstoreClient;
+			productName = PetstoreClient;
+			productReference = 164AD6EC9C4CCF634D7C45905E99E3A7 /* PetstoreClient.framework */;
+			productType = "com.apple.product-type.framework";
+		};
+/* End PBXNativeTarget section */
+
+/* Begin PBXProject section */
+		E7D276EE2369D8C455513C2E05F9AED0 /* Project object */ = {
+			isa = PBXProject;
+			attributes = {
+				LastUpgradeCheck = 1000;
+			};
+			buildConfigurationList = ECAB17FF35111B5E14DAAC0883031714 /* Build configuration list for PBXProject "PetstoreClient" */;
+			compatibilityVersion = "Xcode 9.3";
+			developmentRegion = en;
+			hasScannedForEncodings = 0;
+			knownRegions = (
+				en,
+			);
+			mainGroup = 5FBA6AE5F64CD737F88B4565AC3CCD3B;
+			projectDirPath = "";
+			projectRoot = "";
+			targets = (
+				C1282C2230015E0D204BEAEDDFB49453 /* PetstoreClient */,
+			);
+		};
+/* End PBXProject section */
+
+/* Begin PBXSourcesBuildPhase section */
+		E539708354CE60FE486F81EDE56D13C8 /* Sources */ = {
+			isa = PBXSourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				2A35688C985E9CB1EB7732AC2AD46B82 /* APIHelper.swift in Sources */,
+				0462F801432CF94C7EF51D0532737A7E /* APIs.swift in Sources */,
+				52B5604F986335DB69CD2B430FB83BAB /* AdditionalPropertiesAnyType.swift in Sources */,
+				D68F23CD4B5178493CE7AE8DFB868EAE /* AdditionalPropertiesArray.swift in Sources */,
+				988F461F59E4E1091156840007CB3773 /* AdditionalPropertiesBoolean.swift in Sources */,
+				12327BF7304AA897C5D2A1250B1659B7 /* AdditionalPropertiesClass.swift in Sources */,
+				08F5828F0C2BCF07A9E4917DBBB993AE /* AdditionalPropertiesInteger.swift in Sources */,
+				59EAB3527305A37ED99FB210045B69EA /* AdditionalPropertiesNumber.swift in Sources */,
+				E57CD12D2F500D40B4135D0F5ECA9866 /* AdditionalPropertiesObject.swift in Sources */,
+				39F9FBA1AC5C2612ECA1FF715EBFC287 /* AdditionalPropertiesString.swift in Sources */,
+				58F9704B295AC436D6FB98FA669E2344 /* AlamofireImplementations.swift in Sources */,
+				02903CEC38DC202565BC08CB040AC4E9 /* Animal.swift in Sources */,
+				DB1CE39011A741D07E187663291B5DE5 /* AnimalFarm.swift in Sources */,
+				83A2D1863FB136C0DFC423319F4EED65 /* AnotherFakeAPI.swift in Sources */,
+				97C99615237E1B662242E04F527B38B9 /* ApiResponse.swift in Sources */,
+				3251A3722981CE46261615CFBA96A08D /* ArrayOfArrayOfNumberOnly.swift in Sources */,
+				A190AF5A3988639ED4B78163D0EA3CA4 /* ArrayOfNumberOnly.swift in Sources */,
+				C2EDEB747887399B13A6DFD72A219CB2 /* ArrayTest.swift in Sources */,
+				7367A9D91D4B101F2D28AC56ED89F175 /* Capitalization.swift in Sources */,
+				18F19872A0DFB4CC3D9C696BBCA64EFD /* Cat.swift in Sources */,
+				41D8A105135868152A56E2AC475049BB /* CatAllOf.swift in Sources */,
+				42C51BC034E8B0CAA29A068F6B0DC815 /* Category.swift in Sources */,
+				5ACDD7CC312167589335E9CA5998E770 /* ClassModel.swift in Sources */,
+				92FB161BF1E57D11B116AF0292D5835C /* Client.swift in Sources */,
+				6CD20EE568DDAD2304BF0C4B1A70C8DC /* CodableHelper.swift in Sources */,
+				DEC892724574BB29BD65869374F83982 /* Configuration.swift in Sources */,
+				D70EC94E346077DE1482231DD4498BED /* Dog.swift in Sources */,
+				271D94A05C47B602A2433B9CD3D9DCDC /* DogAllOf.swift in Sources */,
+				A438970025AE69ED407BC1E67CC6359E /* EnumArrays.swift in Sources */,
+				59C00CBB07761CAC8DCE7054E34AD5D9 /* EnumClass.swift in Sources */,
+				08D87E4FECF24910F0DA0F1D2E2D955A /* EnumTest.swift in Sources */,
+				C329EE55B2FCC9174ED3B128D67C5E8C /* Extensions.swift in Sources */,
+				297E365D1E4672C43C56E0AFD855FFBF /* FakeAPI.swift in Sources */,
+				A9F1AAF6CE029DD3B4F8AC841F0B6BC6 /* FakeClassnameTags123API.swift in Sources */,
+				FECA03F0388E84AE1B22638605D8AC9F /* File.swift in Sources */,
+				491676EC91BFEF95A12556888EED87B5 /* FileSchemaTestClass.swift in Sources */,
+				36734C4EB3362A114A7CB5F25EE39E6D /* FormatTest.swift in Sources */,
+				DDBC3CF5E447D8D838F0FE200420EEE3 /* HasOnlyReadOnly.swift in Sources */,
+				16E9A5E22B4823DE282E7F4C18A21EA8 /* JSONEncodableEncoding.swift in Sources */,
+				12BB95C66D63090732BB9E0379836E3C /* JSONEncodingHelper.swift in Sources */,
+				C1CACABE18A7ADCE37D1CD9DC9128304 /* List.swift in Sources */,
+				655AA371771C7BD72EE0AAC0C90DFFF0 /* MapTest.swift in Sources */,
+				D3A17B7FAFA8A7A210875BBCDCC30116 /* MixedPropertiesAndAdditionalPropertiesClass.swift in Sources */,
+				2DF4544D4D3D6CF7047A59FB89ED31BD /* Model200Response.swift in Sources */,
+				F02BEF9A8503B3848B045370451E85F6 /* Models.swift in Sources */,
+				C15AC1CC631E96D0360EB8C15BF30452 /* Name.swift in Sources */,
+				AE9D2E1DB59AF6575AC4AC6756C5A937 /* NumberOnly.swift in Sources */,
+				59C2F5495C98836BFA9E10BF5C13BC2C /* Order.swift in Sources */,
+				82D4D0C8AD0354A700C8ACD421ABED55 /* OuterComposite.swift in Sources */,
+				1143FFF06DEE01E5B0F1368AA05BE1B4 /* OuterEnum.swift in Sources */,
+				B399A1742F23330FDCA450EAB98F51F1 /* Pet.swift in Sources */,
+				3D8E407B1DF4FA5A5F16B64E3A285781 /* PetAPI.swift in Sources */,
+				293F4E0FBFC8297E414A3CDBB7F29A96 /* ReadOnlyFirst.swift in Sources */,
+				F21D10C71A9DE7D0467AFD23FD391D2E /* Return.swift in Sources */,
+				E2C40F0E34DB8C21A806262C72841A51 /* SpecialModelName.swift in Sources */,
+				122BBAE8245606CC040EEB6B9254E376 /* StoreAPI.swift in Sources */,
+				196E9846B27D736630CCF90497696859 /* StringBooleanMap.swift in Sources */,
+				E51ADEC931806B20A041303E539A8BE2 /* Tag.swift in Sources */,
+				6600BB1500AE35A3C80F7C83F6444552 /* TypeHolderDefault.swift in Sources */,
+				FB4A053CDCD75E48B755CC22D463A3FC /* TypeHolderExample.swift in Sources */,
+				BF7D58FBCF5E4D3F2932FCC0E62BED40 /* User.swift in Sources */,
+				DB724C4F1AD5DF025B53A9A2E0A49E3D /* UserAPI.swift in Sources */,
+				BB02FDCF1B2B0E457E1C2BF39FBB599D /* XmlItem.swift in Sources */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+/* End PBXSourcesBuildPhase section */
+
+/* Begin XCBuildConfiguration section */
+		3B2C02AFB91CB5C82766ED5CF21FF628 /* Release */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				APPLICATION_EXTENSION_API_ONLY = YES;
+				CODE_SIGN_IDENTITY = "";
+				CURRENT_PROJECT_VERSION = 1;
+				DEFINES_MODULE = YES;
+				DYLIB_COMPATIBILITY_VERSION = 1;
+				DYLIB_CURRENT_VERSION = 1;
+				DYLIB_INSTALL_NAME_BASE = "@rpath";
+				FRAMEWORK_SEARCH_PATHS = (
+					"$(inherited)",
+					"$(PROJECT_DIR)/Carthage/Build/iOS",
+				);
+				INFOPLIST_FILE = Info.plist;
+				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
+				IPHONEOS_DEPLOYMENT_TARGET = 10.0;
+				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
+				SDKROOT = iphoneos;
+				SKIP_INSTALL = YES;
+				TARGETED_DEVICE_FAMILY = "1,2";
+				VERSIONING_SYSTEM = "apple-generic";
+			};
+			name = Release;
+		};
+		A9EB0A02B94C427CBACFEC7CFFC6A816 /* Debug */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				ALWAYS_SEARCH_USER_PATHS = NO;
+				CLANG_ANALYZER_NONNULL = YES;
+				CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
+				CLANG_CXX_LANGUAGE_STANDARD = "gnu++14";
+				CLANG_CXX_LIBRARY = "libc++";
+				CLANG_ENABLE_MODULES = YES;
+				CLANG_ENABLE_OBJC_ARC = YES;
+				CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
+				CLANG_WARN_BOOL_CONVERSION = YES;
+				CLANG_WARN_COMMA = YES;
+				CLANG_WARN_CONSTANT_CONVERSION = YES;
+				CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
+				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
+				CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
+				CLANG_WARN_EMPTY_BODY = YES;
+				CLANG_WARN_ENUM_CONVERSION = YES;
+				CLANG_WARN_INFINITE_RECURSION = YES;
+				CLANG_WARN_INT_CONVERSION = YES;
+				CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
+				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
+				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
+				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
+				CLANG_WARN_STRICT_PROTOTYPES = YES;
+				CLANG_WARN_SUSPICIOUS_MOVE = YES;
+				CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
+				CLANG_WARN_UNREACHABLE_CODE = YES;
+				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
+				COPY_PHASE_STRIP = NO;
+				DEBUG_INFORMATION_FORMAT = dwarf;
+				ENABLE_STRICT_OBJC_MSGSEND = YES;
+				ENABLE_TESTABILITY = YES;
+				GCC_C_LANGUAGE_STANDARD = gnu11;
+				GCC_DYNAMIC_NO_PIC = NO;
+				GCC_NO_COMMON_BLOCKS = YES;
+				GCC_OPTIMIZATION_LEVEL = 0;
+				GCC_PREPROCESSOR_DEFINITIONS = (
+					"$(inherited)",
+					"DEBUG=1",
+				);
+				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
+				GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
+				GCC_WARN_UNDECLARED_SELECTOR = YES;
+				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
+				GCC_WARN_UNUSED_FUNCTION = YES;
+				GCC_WARN_UNUSED_VARIABLE = YES;
+				MTL_ENABLE_DEBUG_INFO = YES;
+				ONLY_ACTIVE_ARCH = YES;
+				PRODUCT_NAME = "$(TARGET_NAME)";
+				SDKROOT = iphoneos;
+				SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
+				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
+				SWIFT_VERSION = 4.2;
+			};
+			name = Debug;
+		};
+		DD3EEB93949E9EBA4437E9CDBF4A26F6 /* Debug */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				APPLICATION_EXTENSION_API_ONLY = YES;
+				CODE_SIGN_IDENTITY = "";
+				CURRENT_PROJECT_VERSION = 1;
+				DEFINES_MODULE = YES;
+				DYLIB_COMPATIBILITY_VERSION = 1;
+				DYLIB_CURRENT_VERSION = 1;
+				DYLIB_INSTALL_NAME_BASE = "@rpath";
+				FRAMEWORK_SEARCH_PATHS = (
+					"$(inherited)",
+					"$(PROJECT_DIR)/Carthage/Build/iOS",
+				);
+				INFOPLIST_FILE = Info.plist;
+				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
+				IPHONEOS_DEPLOYMENT_TARGET = 10.0;
+				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
+				SDKROOT = iphoneos;
+				SKIP_INSTALL = YES;
+				TARGETED_DEVICE_FAMILY = "1,2";
+				VERSIONING_SYSTEM = "apple-generic";
+			};
+			name = Debug;
+		};
+		F81D4E5FECD46E9AA6DD2C299CEBEF64 /* Release */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				ALWAYS_SEARCH_USER_PATHS = NO;
+				CLANG_ANALYZER_NONNULL = YES;
+				CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
+				CLANG_CXX_LANGUAGE_STANDARD = "gnu++14";
+				CLANG_CXX_LIBRARY = "libc++";
+				CLANG_ENABLE_MODULES = YES;
+				CLANG_ENABLE_OBJC_ARC = YES;
+				CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
+				CLANG_WARN_BOOL_CONVERSION = YES;
+				CLANG_WARN_COMMA = YES;
+				CLANG_WARN_CONSTANT_CONVERSION = YES;
+				CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
+				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
+				CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
+				CLANG_WARN_EMPTY_BODY = YES;
+				CLANG_WARN_ENUM_CONVERSION = YES;
+				CLANG_WARN_INFINITE_RECURSION = YES;
+				CLANG_WARN_INT_CONVERSION = YES;
+				CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
+				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
+				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
+				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
+				CLANG_WARN_STRICT_PROTOTYPES = YES;
+				CLANG_WARN_SUSPICIOUS_MOVE = YES;
+				CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
+				CLANG_WARN_UNREACHABLE_CODE = YES;
+				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
+				COPY_PHASE_STRIP = NO;
+				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
+				ENABLE_NS_ASSERTIONS = NO;
+				ENABLE_STRICT_OBJC_MSGSEND = YES;
+				GCC_C_LANGUAGE_STANDARD = gnu11;
+				GCC_NO_COMMON_BLOCKS = YES;
+				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
+				GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
+				GCC_WARN_UNDECLARED_SELECTOR = YES;
+				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
+				GCC_WARN_UNUSED_FUNCTION = YES;
+				GCC_WARN_UNUSED_VARIABLE = YES;
+				PRODUCT_NAME = "$(TARGET_NAME)";
+				SDKROOT = iphoneos;
+				SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
+				SWIFT_VERSION = 4.2;
+				VALIDATE_PRODUCT = YES;
+			};
+			name = Release;
+		};
+/* End XCBuildConfiguration section */
+
+/* Begin XCConfigurationList section */
+		B46EDEB1A7F0D78FE6394544C60169D1 /* Build configuration list for PBXNativeTarget "PetstoreClient" */ = {
+			isa = XCConfigurationList;
+			buildConfigurations = (
+				DD3EEB93949E9EBA4437E9CDBF4A26F6 /* Debug */,
+				3B2C02AFB91CB5C82766ED5CF21FF628 /* Release */,
+			);
+			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = "";
+		};
+		ECAB17FF35111B5E14DAAC0883031714 /* Build configuration list for PBXProject "PetstoreClient" */ = {
+			isa = XCConfigurationList;
+			buildConfigurations = (
+				A9EB0A02B94C427CBACFEC7CFFC6A816 /* Debug */,
+				F81D4E5FECD46E9AA6DD2C299CEBEF64 /* Release */,
+			);
+			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Debug;
+		};
+/* End XCConfigurationList section */
+	};
+	rootObject = E7D276EE2369D8C455513C2E05F9AED0 /* Project object */;
+}
diff --git a/samples/client/petstore/swift4/unwrapRequired/PetstoreClient.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/samples/client/petstore/swift4/unwrapRequired/PetstoreClient.xcodeproj/project.xcworkspace/contents.xcworkspacedata
new file mode 100644
index 0000000000..919434a625
--- /dev/null
+++ b/samples/client/petstore/swift4/unwrapRequired/PetstoreClient.xcodeproj/project.xcworkspace/contents.xcworkspacedata
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Workspace
+   version = "1.0">
+   <FileRef
+      location = "self:">
+   </FileRef>
+</Workspace>
diff --git a/samples/client/petstore/swift4/unwrapRequired/PetstoreClient.xcodeproj/xcshareddata/xcschemes/PetstoreClient.xcscheme b/samples/client/petstore/swift4/unwrapRequired/PetstoreClient.xcodeproj/xcshareddata/xcschemes/PetstoreClient.xcscheme
new file mode 100644
index 0000000000..7802e37945
--- /dev/null
+++ b/samples/client/petstore/swift4/unwrapRequired/PetstoreClient.xcodeproj/xcshareddata/xcschemes/PetstoreClient.xcscheme
@@ -0,0 +1,96 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Scheme
+   LastUpgradeVersion = "1000"
+   version = "1.3">
+   <BuildAction
+      parallelizeBuildables = "YES"
+      buildImplicitDependencies = "YES">
+      <BuildActionEntries>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "YES"
+            buildForProfiling = "YES"
+            buildForArchiving = "YES"
+            buildForAnalyzing = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "C1282C2230015E0D204BEAEDDFB49453"
+               BuildableName = "PetstoreClient.framework"
+               BlueprintName = "PetstoreClient"
+               ReferencedContainer = "container:PetstoreClient.xcodeproj">
+            </BuildableReference>
+         </BuildActionEntry>
+      </BuildActionEntries>
+   </BuildAction>
+   <TestAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      shouldUseLaunchSchemeArgsEnv = "YES">
+      <Testables>
+      </Testables>
+      <MacroExpansion>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "C1282C2230015E0D204BEAEDDFB49453"
+            BuildableName = "PetstoreClient.framework"
+            BlueprintName = "PetstoreClient"
+            ReferencedContainer = "container:PetstoreClient.xcodeproj">
+         </BuildableReference>
+      </MacroExpansion>
+      <CommandLineArguments>
+      </CommandLineArguments>
+      <AdditionalOptions>
+      </AdditionalOptions>
+   </TestAction>
+   <LaunchAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      launchStyle = "0"
+      useCustomWorkingDirectory = "NO"
+      ignoresPersistentStateOnLaunch = "NO"
+      debugDocumentVersioning = "YES"
+      debugServiceExtension = "internal"
+      allowLocationSimulation = "YES">
+      <MacroExpansion>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "C1282C2230015E0D204BEAEDDFB49453"
+            BuildableName = "PetstoreClient.framework"
+            BlueprintName = "PetstoreClient"
+            ReferencedContainer = "container:PetstoreClient.xcodeproj">
+         </BuildableReference>
+      </MacroExpansion>
+      <CommandLineArguments>
+      </CommandLineArguments>
+      <AdditionalOptions>
+      </AdditionalOptions>
+   </LaunchAction>
+   <ProfileAction
+      buildConfiguration = "Release"
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      savedToolIdentifier = ""
+      useCustomWorkingDirectory = "NO"
+      debugDocumentVersioning = "YES">
+      <BuildableProductRunnable
+         runnableDebuggingMode = "0">
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "C1282C2230015E0D204BEAEDDFB49453"
+            BuildableName = "PetstoreClient.framework"
+            BlueprintName = "PetstoreClient"
+            ReferencedContainer = "container:PetstoreClient.xcodeproj">
+         </BuildableReference>
+      </BuildableProductRunnable>
+      <CommandLineArguments>
+      </CommandLineArguments>
+   </ProfileAction>
+   <AnalyzeAction
+      buildConfiguration = "Debug">
+   </AnalyzeAction>
+   <ArchiveAction
+      buildConfiguration = "Release"
+      revealArchiveInOrganizer = "YES">
+   </ArchiveAction>
+</Scheme>
diff --git a/samples/client/petstore/swift4/unwrapRequired/PetstoreClient/Classes/OpenAPIs/APIHelper.swift b/samples/client/petstore/swift4/unwrapRequired/PetstoreClient/Classes/OpenAPIs/APIHelper.swift
index d94614b34f..75dea24395 100644
--- a/samples/client/petstore/swift4/unwrapRequired/PetstoreClient/Classes/OpenAPIs/APIHelper.swift
+++ b/samples/client/petstore/swift4/unwrapRequired/PetstoreClient/Classes/OpenAPIs/APIHelper.swift
@@ -7,7 +7,7 @@
 import Foundation
 
 public struct APIHelper {
-    public static func rejectNil(_ source: [String:Any?]) -> [String:Any]? {
+    public static func rejectNil(_ source: [String: Any?]) -> [String: Any]? {
         let destination = source.reduce(into: [String: Any]()) { (result, item) in
             if let value = item.value {
                 result[item.key] = value
@@ -20,17 +20,17 @@ public struct APIHelper {
         return destination
     }
 
-    public static func rejectNilHeaders(_ source: [String:Any?]) -> [String:String] {
+    public static func rejectNilHeaders(_ source: [String: Any?]) -> [String: String] {
         return source.reduce(into: [String: String]()) { (result, item) in
             if let collection = item.value as? Array<Any?> {
-                result[item.key] = collection.filter({ $0 != nil }).map{ "\($0!)" }.joined(separator: ",")
+                result[item.key] = collection.filter({ $0 != nil }).map { "\($0!)" }.joined(separator: ",")
             } else if let value: Any = item.value {
                 result[item.key] = "\(value)"
             }
         }
     }
 
-    public static func convertBoolToString(_ source: [String: Any]?) -> [String:Any]? {
+    public static func convertBoolToString(_ source: [String: Any]?) -> [String: Any]? {
         guard let source = source else {
             return nil
         }
@@ -52,7 +52,7 @@ public struct APIHelper {
         return source
     }
 
-    public static func mapValuesToQueryItems(_ source: [String:Any?]) -> [URLQueryItem]? {
+    public static func mapValuesToQueryItems(_ source: [String: Any?]) -> [URLQueryItem]? {
         let destination = source.filter({ $0.value != nil}).reduce(into: [URLQueryItem]()) { (result, item) in
             if let collection = item.value as? Array<Any?> {
                 let value = collection.filter({ $0 != nil }).map({"\($0!)"}).joined(separator: ",")
@@ -68,4 +68,3 @@ public struct APIHelper {
         return destination
     }
 }
-
diff --git a/samples/client/petstore/swift4/unwrapRequired/PetstoreClient/Classes/OpenAPIs/APIs.swift b/samples/client/petstore/swift4/unwrapRequired/PetstoreClient/Classes/OpenAPIs/APIs.swift
index 2890bffa27..9e4312f685 100644
--- a/samples/client/petstore/swift4/unwrapRequired/PetstoreClient/Classes/OpenAPIs/APIs.swift
+++ b/samples/client/petstore/swift4/unwrapRequired/PetstoreClient/Classes/OpenAPIs/APIs.swift
@@ -9,22 +9,22 @@ import Foundation
 open class PetstoreClientAPI {
     public static var basePath = "http://petstore.swagger.io:80/v2"
     public static var credential: URLCredential?
-    public static var customHeaders: [String:String] = [:]
+    public static var customHeaders: [String: String] = [:]
     public static var requestBuilderFactory: RequestBuilderFactory = AlamofireRequestBuilderFactory()
 }
 
 open class RequestBuilder<T> {
     var credential: URLCredential?
-    var headers: [String:String]
-    public let parameters: [String:Any]?
+    var headers: [String: String]
+    public let parameters: [String: Any]?
     public let isBody: Bool
     public let method: String
     public let URLString: String
 
     /// Optional block to obtain a reference to the request's progress instance when available.
-    public var onProgressReady: ((Progress) -> ())?
+    public var onProgressReady: ((Progress) -> Void)?
 
-    required public init(method: String, URLString: String, parameters: [String:Any]?, isBody: Bool, headers: [String:String] = [:]) {
+    required public init(method: String, URLString: String, parameters: [String: Any]?, isBody: Bool, headers: [String: String] = [:]) {
         self.method = method
         self.URLString = URLString
         self.parameters = parameters
@@ -34,7 +34,7 @@ open class RequestBuilder<T> {
         addHeaders(PetstoreClientAPI.customHeaders)
     }
 
-    open func addHeaders(_ aHeaders:[String:String]) {
+    open func addHeaders(_ aHeaders: [String: String]) {
         for (header, value) in aHeaders {
             headers[header] = value
         }
@@ -57,5 +57,5 @@ open class RequestBuilder<T> {
 
 public protocol RequestBuilderFactory {
     func getNonDecodableBuilder<T>() -> RequestBuilder<T>.Type
-    func getBuilder<T:Decodable>() -> RequestBuilder<T>.Type
+    func getBuilder<T: Decodable>() -> RequestBuilder<T>.Type
 }
diff --git a/samples/client/petstore/swift4/unwrapRequired/PetstoreClient/Classes/OpenAPIs/APIs/AnotherFakeAPI.swift b/samples/client/petstore/swift4/unwrapRequired/PetstoreClient/Classes/OpenAPIs/APIs/AnotherFakeAPI.swift
index ffecb66c48..30b346de0e 100644
--- a/samples/client/petstore/swift4/unwrapRequired/PetstoreClient/Classes/OpenAPIs/APIs/AnotherFakeAPI.swift
+++ b/samples/client/petstore/swift4/unwrapRequired/PetstoreClient/Classes/OpenAPIs/APIs/AnotherFakeAPI.swift
@@ -8,8 +8,6 @@
 import Foundation
 import Alamofire
 
-
-
 open class AnotherFakeAPI {
     /**
      To test special tags
@@ -17,7 +15,7 @@ open class AnotherFakeAPI {
      - parameter body: (body) client model 
      - parameter completion: completion handler to receive the data and the error objects
      */
-    open class func call123testSpecialTags(body: Client, completion: @escaping ((_ data: Client?,_ error: Error?) -> Void)) {
+    open class func call123testSpecialTags(body: Client, completion: @escaping ((_ data: Client?, _ error: Error?) -> Void)) {
         call123testSpecialTagsWithRequestBuilder(body: body).execute { (response, error) -> Void in
             completion(response?.body, error)
         }
diff --git a/samples/client/petstore/swift4/unwrapRequired/PetstoreClient/Classes/OpenAPIs/APIs/FakeAPI.swift b/samples/client/petstore/swift4/unwrapRequired/PetstoreClient/Classes/OpenAPIs/APIs/FakeAPI.swift
index 302767c2b0..1073935592 100644
--- a/samples/client/petstore/swift4/unwrapRequired/PetstoreClient/Classes/OpenAPIs/APIs/FakeAPI.swift
+++ b/samples/client/petstore/swift4/unwrapRequired/PetstoreClient/Classes/OpenAPIs/APIs/FakeAPI.swift
@@ -8,15 +8,13 @@
 import Foundation
 import Alamofire
 
-
-
 open class FakeAPI {
     /**
 
      - parameter body: (body) Input boolean as post body (optional)
      - parameter completion: completion handler to receive the data and the error objects
      */
-    open class func fakeOuterBooleanSerialize(body: Bool? = nil, completion: @escaping ((_ data: Bool?,_ error: Error?) -> Void)) {
+    open class func fakeOuterBooleanSerialize(body: Bool? = nil, completion: @escaping ((_ data: Bool?, _ error: Error?) -> Void)) {
         fakeOuterBooleanSerializeWithRequestBuilder(body: body).execute { (response, error) -> Void in
             completion(response?.body, error)
         }
@@ -45,7 +43,7 @@ open class FakeAPI {
      - parameter body: (body) Input composite as post body (optional)
      - parameter completion: completion handler to receive the data and the error objects
      */
-    open class func fakeOuterCompositeSerialize(body: OuterComposite? = nil, completion: @escaping ((_ data: OuterComposite?,_ error: Error?) -> Void)) {
+    open class func fakeOuterCompositeSerialize(body: OuterComposite? = nil, completion: @escaping ((_ data: OuterComposite?, _ error: Error?) -> Void)) {
         fakeOuterCompositeSerializeWithRequestBuilder(body: body).execute { (response, error) -> Void in
             completion(response?.body, error)
         }
@@ -74,7 +72,7 @@ open class FakeAPI {
      - parameter body: (body) Input number as post body (optional)
      - parameter completion: completion handler to receive the data and the error objects
      */
-    open class func fakeOuterNumberSerialize(body: Double? = nil, completion: @escaping ((_ data: Double?,_ error: Error?) -> Void)) {
+    open class func fakeOuterNumberSerialize(body: Double? = nil, completion: @escaping ((_ data: Double?, _ error: Error?) -> Void)) {
         fakeOuterNumberSerializeWithRequestBuilder(body: body).execute { (response, error) -> Void in
             completion(response?.body, error)
         }
@@ -103,7 +101,7 @@ open class FakeAPI {
      - parameter body: (body) Input string as post body (optional)
      - parameter completion: completion handler to receive the data and the error objects
      */
-    open class func fakeOuterStringSerialize(body: String? = nil, completion: @escaping ((_ data: String?,_ error: Error?) -> Void)) {
+    open class func fakeOuterStringSerialize(body: String? = nil, completion: @escaping ((_ data: String?, _ error: Error?) -> Void)) {
         fakeOuterStringSerializeWithRequestBuilder(body: body).execute { (response, error) -> Void in
             completion(response?.body, error)
         }
@@ -132,7 +130,7 @@ open class FakeAPI {
      - parameter body: (body)  
      - parameter completion: completion handler to receive the data and the error objects
      */
-    open class func testBodyWithFileSchema(body: FileSchemaTestClass, completion: @escaping ((_ data: Void?,_ error: Error?) -> Void)) {
+    open class func testBodyWithFileSchema(body: FileSchemaTestClass, completion: @escaping ((_ data: Void?, _ error: Error?) -> Void)) {
         testBodyWithFileSchemaWithRequestBuilder(body: body).execute { (response, error) -> Void in
             if error == nil {
                 completion((), error)
@@ -166,7 +164,7 @@ open class FakeAPI {
      - parameter body: (body)  
      - parameter completion: completion handler to receive the data and the error objects
      */
-    open class func testBodyWithQueryParams(query: String, body: User, completion: @escaping ((_ data: Void?,_ error: Error?) -> Void)) {
+    open class func testBodyWithQueryParams(query: String, body: User, completion: @escaping ((_ data: Void?, _ error: Error?) -> Void)) {
         testBodyWithQueryParamsWithRequestBuilder(query: query, body: body).execute { (response, error) -> Void in
             if error == nil {
                 completion((), error)
@@ -203,7 +201,7 @@ open class FakeAPI {
      - parameter body: (body) client model 
      - parameter completion: completion handler to receive the data and the error objects
      */
-    open class func testClientModel(body: Client, completion: @escaping ((_ data: Client?,_ error: Error?) -> Void)) {
+    open class func testClientModel(body: Client, completion: @escaping ((_ data: Client?, _ error: Error?) -> Void)) {
         testClientModelWithRequestBuilder(body: body).execute { (response, error) -> Void in
             completion(response?.body, error)
         }
@@ -247,7 +245,7 @@ open class FakeAPI {
      - parameter callback: (form) None (optional)
      - parameter completion: completion handler to receive the data and the error objects
      */
-    open class func testEndpointParameters(number: Double, double: Double, patternWithoutDelimiter: String, byte: Data, integer: Int? = nil, int32: Int? = nil, int64: Int64? = nil, float: Float? = nil, string: String? = nil, binary: URL? = nil, date: Date? = nil, dateTime: Date? = nil, password: String? = nil, callback: String? = nil, completion: @escaping ((_ data: Void?,_ error: Error?) -> Void)) {
+    open class func testEndpointParameters(number: Double, double: Double, patternWithoutDelimiter: String, byte: Data, integer: Int? = nil, int32: Int? = nil, int64: Int64? = nil, float: Float? = nil, string: String? = nil, binary: URL? = nil, date: Date? = nil, dateTime: Date? = nil, password: String? = nil, callback: String? = nil, completion: @escaping ((_ data: Void?, _ error: Error?) -> Void)) {
         testEndpointParametersWithRequestBuilder(number: number, double: double, patternWithoutDelimiter: patternWithoutDelimiter, byte: byte, integer: integer, int32: int32, int64: int64, float: float, string: string, binary: binary, date: date, dateTime: dateTime, password: password, callback: callback).execute { (response, error) -> Void in
             if error == nil {
                 completion((), error)
@@ -283,7 +281,7 @@ open class FakeAPI {
     open class func testEndpointParametersWithRequestBuilder(number: Double, double: Double, patternWithoutDelimiter: String, byte: Data, integer: Int? = nil, int32: Int? = nil, int64: Int64? = nil, float: Float? = nil, string: String? = nil, binary: URL? = nil, date: Date? = nil, dateTime: Date? = nil, password: String? = nil, callback: String? = nil) -> RequestBuilder<Void> {
         let path = "/fake"
         let URLString = PetstoreClientAPI.basePath + path
-        let formParams: [String:Any?] = [
+        let formParams: [String: Any?] = [
             "integer": integer?.encodeToJSON(),
             "int32": int32?.encodeToJSON(),
             "int64": int64?.encodeToJSON(),
@@ -302,7 +300,7 @@ open class FakeAPI {
 
         let nonNullParameters = APIHelper.rejectNil(formParams)
         let parameters = APIHelper.convertBoolToString(nonNullParameters)
-        
+
         let url = URLComponents(string: URLString)
 
         let requestBuilder: RequestBuilder<Void>.Type = PetstoreClientAPI.requestBuilderFactory.getNonDecodableBuilder()
@@ -390,7 +388,7 @@ open class FakeAPI {
      - parameter enumFormString: (form) Form parameter enum test (string) (optional, default to .-efg)
      - parameter completion: completion handler to receive the data and the error objects
      */
-    open class func testEnumParameters(enumHeaderStringArray: [String]? = nil, enumHeaderString: EnumHeaderString_testEnumParameters? = nil, enumQueryStringArray: [String]? = nil, enumQueryString: EnumQueryString_testEnumParameters? = nil, enumQueryInteger: EnumQueryInteger_testEnumParameters? = nil, enumQueryDouble: EnumQueryDouble_testEnumParameters? = nil, enumFormStringArray: [String]? = nil, enumFormString: EnumFormString_testEnumParameters? = nil, completion: @escaping ((_ data: Void?,_ error: Error?) -> Void)) {
+    open class func testEnumParameters(enumHeaderStringArray: [String]? = nil, enumHeaderString: EnumHeaderString_testEnumParameters? = nil, enumQueryStringArray: [String]? = nil, enumQueryString: EnumQueryString_testEnumParameters? = nil, enumQueryInteger: EnumQueryInteger_testEnumParameters? = nil, enumQueryDouble: EnumQueryDouble_testEnumParameters? = nil, enumFormStringArray: [String]? = nil, enumFormString: EnumFormString_testEnumParameters? = nil, completion: @escaping ((_ data: Void?, _ error: Error?) -> Void)) {
         testEnumParametersWithRequestBuilder(enumHeaderStringArray: enumHeaderStringArray, enumHeaderString: enumHeaderString, enumQueryStringArray: enumQueryStringArray, enumQueryString: enumQueryString, enumQueryInteger: enumQueryInteger, enumQueryDouble: enumQueryDouble, enumFormStringArray: enumFormStringArray, enumFormString: enumFormString).execute { (response, error) -> Void in
             if error == nil {
                 completion((), error)
@@ -417,19 +415,19 @@ open class FakeAPI {
     open class func testEnumParametersWithRequestBuilder(enumHeaderStringArray: [String]? = nil, enumHeaderString: EnumHeaderString_testEnumParameters? = nil, enumQueryStringArray: [String]? = nil, enumQueryString: EnumQueryString_testEnumParameters? = nil, enumQueryInteger: EnumQueryInteger_testEnumParameters? = nil, enumQueryDouble: EnumQueryDouble_testEnumParameters? = nil, enumFormStringArray: [String]? = nil, enumFormString: EnumFormString_testEnumParameters? = nil) -> RequestBuilder<Void> {
         let path = "/fake"
         let URLString = PetstoreClientAPI.basePath + path
-        let formParams: [String:Any?] = [
+        let formParams: [String: Any?] = [
             "enum_form_string_array": enumFormStringArray,
             "enum_form_string": enumFormString?.rawValue
         ]
 
         let nonNullParameters = APIHelper.rejectNil(formParams)
         let parameters = APIHelper.convertBoolToString(nonNullParameters)
-        
+
         var url = URLComponents(string: URLString)
         url?.queryItems = APIHelper.mapValuesToQueryItems([
-            "enum_query_string_array": enumQueryStringArray, 
-            "enum_query_string": enumQueryString?.rawValue, 
-            "enum_query_integer": enumQueryInteger?.rawValue, 
+            "enum_query_string_array": enumQueryStringArray,
+            "enum_query_string": enumQueryString?.rawValue,
+            "enum_query_integer": enumQueryInteger?.rawValue,
             "enum_query_double": enumQueryDouble?.rawValue
         ])
         let nillableHeaders: [String: Any?] = [
@@ -454,7 +452,7 @@ open class FakeAPI {
      - parameter int64Group: (query) Integer in group parameters (optional)
      - parameter completion: completion handler to receive the data and the error objects
      */
-    open class func testGroupParameters(requiredStringGroup: Int, requiredBooleanGroup: Bool, requiredInt64Group: Int64, stringGroup: Int? = nil, booleanGroup: Bool? = nil, int64Group: Int64? = nil, completion: @escaping ((_ data: Void?,_ error: Error?) -> Void)) {
+    open class func testGroupParameters(requiredStringGroup: Int, requiredBooleanGroup: Bool, requiredInt64Group: Int64, stringGroup: Int? = nil, booleanGroup: Bool? = nil, int64Group: Int64? = nil, completion: @escaping ((_ data: Void?, _ error: Error?) -> Void)) {
         testGroupParametersWithRequestBuilder(requiredStringGroup: requiredStringGroup, requiredBooleanGroup: requiredBooleanGroup, requiredInt64Group: requiredInt64Group, stringGroup: stringGroup, booleanGroup: booleanGroup, int64Group: int64Group).execute { (response, error) -> Void in
             if error == nil {
                 completion((), error)
@@ -479,13 +477,13 @@ open class FakeAPI {
     open class func testGroupParametersWithRequestBuilder(requiredStringGroup: Int, requiredBooleanGroup: Bool, requiredInt64Group: Int64, stringGroup: Int? = nil, booleanGroup: Bool? = nil, int64Group: Int64? = nil) -> RequestBuilder<Void> {
         let path = "/fake"
         let URLString = PetstoreClientAPI.basePath + path
-        let parameters: [String:Any]? = nil
-        
+        let parameters: [String: Any]? = nil
+
         var url = URLComponents(string: URLString)
         url?.queryItems = APIHelper.mapValuesToQueryItems([
-            "required_string_group": requiredStringGroup.encodeToJSON(), 
-            "required_int64_group": requiredInt64Group.encodeToJSON(), 
-            "string_group": stringGroup?.encodeToJSON(), 
+            "required_string_group": requiredStringGroup.encodeToJSON(),
+            "required_int64_group": requiredInt64Group.encodeToJSON(),
+            "string_group": stringGroup?.encodeToJSON(),
             "int64_group": int64Group?.encodeToJSON()
         ])
         let nillableHeaders: [String: Any?] = [
@@ -505,7 +503,7 @@ open class FakeAPI {
      - parameter param: (body) request body 
      - parameter completion: completion handler to receive the data and the error objects
      */
-    open class func testInlineAdditionalProperties(param: [String:String], completion: @escaping ((_ data: Void?,_ error: Error?) -> Void)) {
+    open class func testInlineAdditionalProperties(param: [String: String], completion: @escaping ((_ data: Void?, _ error: Error?) -> Void)) {
         testInlineAdditionalPropertiesWithRequestBuilder(param: param).execute { (response, error) -> Void in
             if error == nil {
                 completion((), error)
@@ -521,7 +519,7 @@ open class FakeAPI {
      - parameter param: (body) request body 
      - returns: RequestBuilder<Void> 
      */
-    open class func testInlineAdditionalPropertiesWithRequestBuilder(param: [String:String]) -> RequestBuilder<Void> {
+    open class func testInlineAdditionalPropertiesWithRequestBuilder(param: [String: String]) -> RequestBuilder<Void> {
         let path = "/fake/inline-additionalProperties"
         let URLString = PetstoreClientAPI.basePath + path
         let parameters = JSONEncodingHelper.encodingParameters(forEncodableObject: param)
@@ -540,7 +538,7 @@ open class FakeAPI {
      - parameter param2: (form) field2 
      - parameter completion: completion handler to receive the data and the error objects
      */
-    open class func testJsonFormData(param: String, param2: String, completion: @escaping ((_ data: Void?,_ error: Error?) -> Void)) {
+    open class func testJsonFormData(param: String, param2: String, completion: @escaping ((_ data: Void?, _ error: Error?) -> Void)) {
         testJsonFormDataWithRequestBuilder(param: param, param2: param2).execute { (response, error) -> Void in
             if error == nil {
                 completion((), error)
@@ -560,14 +558,14 @@ open class FakeAPI {
     open class func testJsonFormDataWithRequestBuilder(param: String, param2: String) -> RequestBuilder<Void> {
         let path = "/fake/jsonFormData"
         let URLString = PetstoreClientAPI.basePath + path
-        let formParams: [String:Any?] = [
+        let formParams: [String: Any?] = [
             "param": param,
             "param2": param2
         ]
 
         let nonNullParameters = APIHelper.rejectNil(formParams)
         let parameters = APIHelper.convertBoolToString(nonNullParameters)
-        
+
         let url = URLComponents(string: URLString)
 
         let requestBuilder: RequestBuilder<Void>.Type = PetstoreClientAPI.requestBuilderFactory.getNonDecodableBuilder()
diff --git a/samples/client/petstore/swift4/unwrapRequired/PetstoreClient/Classes/OpenAPIs/APIs/FakeClassnameTags123API.swift b/samples/client/petstore/swift4/unwrapRequired/PetstoreClient/Classes/OpenAPIs/APIs/FakeClassnameTags123API.swift
index ddfeae23ed..6bfa09016f 100644
--- a/samples/client/petstore/swift4/unwrapRequired/PetstoreClient/Classes/OpenAPIs/APIs/FakeClassnameTags123API.swift
+++ b/samples/client/petstore/swift4/unwrapRequired/PetstoreClient/Classes/OpenAPIs/APIs/FakeClassnameTags123API.swift
@@ -8,8 +8,6 @@
 import Foundation
 import Alamofire
 
-
-
 open class FakeClassnameTags123API {
     /**
      To test class name in snake case
@@ -17,7 +15,7 @@ open class FakeClassnameTags123API {
      - parameter body: (body) client model 
      - parameter completion: completion handler to receive the data and the error objects
      */
-    open class func testClassname(body: Client, completion: @escaping ((_ data: Client?,_ error: Error?) -> Void)) {
+    open class func testClassname(body: Client, completion: @escaping ((_ data: Client?, _ error: Error?) -> Void)) {
         testClassnameWithRequestBuilder(body: body).execute { (response, error) -> Void in
             completion(response?.body, error)
         }
diff --git a/samples/client/petstore/swift4/unwrapRequired/PetstoreClient/Classes/OpenAPIs/APIs/PetAPI.swift b/samples/client/petstore/swift4/unwrapRequired/PetstoreClient/Classes/OpenAPIs/APIs/PetAPI.swift
index 0a5dfeb39b..896f151180 100644
--- a/samples/client/petstore/swift4/unwrapRequired/PetstoreClient/Classes/OpenAPIs/APIs/PetAPI.swift
+++ b/samples/client/petstore/swift4/unwrapRequired/PetstoreClient/Classes/OpenAPIs/APIs/PetAPI.swift
@@ -8,8 +8,6 @@
 import Foundation
 import Alamofire
 
-
-
 open class PetAPI {
     /**
      Add a new pet to the store
@@ -17,7 +15,7 @@ open class PetAPI {
      - parameter body: (body) Pet object that needs to be added to the store 
      - parameter completion: completion handler to receive the data and the error objects
      */
-    open class func addPet(body: Pet, completion: @escaping ((_ data: Void?,_ error: Error?) -> Void)) {
+    open class func addPet(body: Pet, completion: @escaping ((_ data: Void?, _ error: Error?) -> Void)) {
         addPetWithRequestBuilder(body: body).execute { (response, error) -> Void in
             if error == nil {
                 completion((), error)
@@ -55,7 +53,7 @@ open class PetAPI {
      - parameter apiKey: (header)  (optional)
      - parameter completion: completion handler to receive the data and the error objects
      */
-    open class func deletePet(petId: Int64, apiKey: String? = nil, completion: @escaping ((_ data: Void?,_ error: Error?) -> Void)) {
+    open class func deletePet(petId: Int64, apiKey: String? = nil, completion: @escaping ((_ data: Void?, _ error: Error?) -> Void)) {
         deletePetWithRequestBuilder(petId: petId, apiKey: apiKey).execute { (response, error) -> Void in
             if error == nil {
                 completion((), error)
@@ -81,8 +79,8 @@ open class PetAPI {
         let petIdPostEscape = petIdPreEscape.addingPercentEncoding(withAllowedCharacters: .urlPathAllowed) ?? ""
         path = path.replacingOccurrences(of: "{petId}", with: petIdPostEscape, options: .literal, range: nil)
         let URLString = PetstoreClientAPI.basePath + path
-        let parameters: [String:Any]? = nil
-        
+        let parameters: [String: Any]? = nil
+
         let url = URLComponents(string: URLString)
         let nillableHeaders: [String: Any?] = [
             "api_key": apiKey
@@ -109,7 +107,7 @@ open class PetAPI {
      - parameter status: (query) Status values that need to be considered for filter 
      - parameter completion: completion handler to receive the data and the error objects
      */
-    open class func findPetsByStatus(status: [String], completion: @escaping ((_ data: [Pet]?,_ error: Error?) -> Void)) {
+    open class func findPetsByStatus(status: [String], completion: @escaping ((_ data: [Pet]?, _ error: Error?) -> Void)) {
         findPetsByStatusWithRequestBuilder(status: status).execute { (response, error) -> Void in
             completion(response?.body, error)
         }
@@ -128,8 +126,8 @@ open class PetAPI {
     open class func findPetsByStatusWithRequestBuilder(status: [String]) -> RequestBuilder<[Pet]> {
         let path = "/pet/findByStatus"
         let URLString = PetstoreClientAPI.basePath + path
-        let parameters: [String:Any]? = nil
-        
+        let parameters: [String: Any]? = nil
+
         var url = URLComponents(string: URLString)
         url?.queryItems = APIHelper.mapValuesToQueryItems([
             "status": status
@@ -146,7 +144,7 @@ open class PetAPI {
      - parameter tags: (query) Tags to filter by 
      - parameter completion: completion handler to receive the data and the error objects
      */
-    open class func findPetsByTags(tags: [String], completion: @escaping ((_ data: [Pet]?,_ error: Error?) -> Void)) {
+    open class func findPetsByTags(tags: [String], completion: @escaping ((_ data: [Pet]?, _ error: Error?) -> Void)) {
         findPetsByTagsWithRequestBuilder(tags: tags).execute { (response, error) -> Void in
             completion(response?.body, error)
         }
@@ -165,8 +163,8 @@ open class PetAPI {
     open class func findPetsByTagsWithRequestBuilder(tags: [String]) -> RequestBuilder<[Pet]> {
         let path = "/pet/findByTags"
         let URLString = PetstoreClientAPI.basePath + path
-        let parameters: [String:Any]? = nil
-        
+        let parameters: [String: Any]? = nil
+
         var url = URLComponents(string: URLString)
         url?.queryItems = APIHelper.mapValuesToQueryItems([
             "tags": tags
@@ -183,7 +181,7 @@ open class PetAPI {
      - parameter petId: (path) ID of pet to return 
      - parameter completion: completion handler to receive the data and the error objects
      */
-    open class func getPetById(petId: Int64, completion: @escaping ((_ data: Pet?,_ error: Error?) -> Void)) {
+    open class func getPetById(petId: Int64, completion: @escaping ((_ data: Pet?, _ error: Error?) -> Void)) {
         getPetByIdWithRequestBuilder(petId: petId).execute { (response, error) -> Void in
             completion(response?.body, error)
         }
@@ -205,8 +203,8 @@ open class PetAPI {
         let petIdPostEscape = petIdPreEscape.addingPercentEncoding(withAllowedCharacters: .urlPathAllowed) ?? ""
         path = path.replacingOccurrences(of: "{petId}", with: petIdPostEscape, options: .literal, range: nil)
         let URLString = PetstoreClientAPI.basePath + path
-        let parameters: [String:Any]? = nil
-        
+        let parameters: [String: Any]? = nil
+
         let url = URLComponents(string: URLString)
 
         let requestBuilder: RequestBuilder<Pet>.Type = PetstoreClientAPI.requestBuilderFactory.getBuilder()
@@ -220,7 +218,7 @@ open class PetAPI {
      - parameter body: (body) Pet object that needs to be added to the store 
      - parameter completion: completion handler to receive the data and the error objects
      */
-    open class func updatePet(body: Pet, completion: @escaping ((_ data: Void?,_ error: Error?) -> Void)) {
+    open class func updatePet(body: Pet, completion: @escaping ((_ data: Void?, _ error: Error?) -> Void)) {
         updatePetWithRequestBuilder(body: body).execute { (response, error) -> Void in
             if error == nil {
                 completion((), error)
@@ -259,7 +257,7 @@ open class PetAPI {
      - parameter status: (form) Updated status of the pet (optional)
      - parameter completion: completion handler to receive the data and the error objects
      */
-    open class func updatePetWithForm(petId: Int64, name: String? = nil, status: String? = nil, completion: @escaping ((_ data: Void?,_ error: Error?) -> Void)) {
+    open class func updatePetWithForm(petId: Int64, name: String? = nil, status: String? = nil, completion: @escaping ((_ data: Void?, _ error: Error?) -> Void)) {
         updatePetWithFormWithRequestBuilder(petId: petId, name: name, status: status).execute { (response, error) -> Void in
             if error == nil {
                 completion((), error)
@@ -286,14 +284,14 @@ open class PetAPI {
         let petIdPostEscape = petIdPreEscape.addingPercentEncoding(withAllowedCharacters: .urlPathAllowed) ?? ""
         path = path.replacingOccurrences(of: "{petId}", with: petIdPostEscape, options: .literal, range: nil)
         let URLString = PetstoreClientAPI.basePath + path
-        let formParams: [String:Any?] = [
+        let formParams: [String: Any?] = [
             "name": name,
             "status": status
         ]
 
         let nonNullParameters = APIHelper.rejectNil(formParams)
         let parameters = APIHelper.convertBoolToString(nonNullParameters)
-        
+
         let url = URLComponents(string: URLString)
 
         let requestBuilder: RequestBuilder<Void>.Type = PetstoreClientAPI.requestBuilderFactory.getNonDecodableBuilder()
@@ -309,7 +307,7 @@ open class PetAPI {
      - parameter file: (form) file to upload (optional)
      - parameter completion: completion handler to receive the data and the error objects
      */
-    open class func uploadFile(petId: Int64, additionalMetadata: String? = nil, file: URL? = nil, completion: @escaping ((_ data: ApiResponse?,_ error: Error?) -> Void)) {
+    open class func uploadFile(petId: Int64, additionalMetadata: String? = nil, file: URL? = nil, completion: @escaping ((_ data: ApiResponse?, _ error: Error?) -> Void)) {
         uploadFileWithRequestBuilder(petId: petId, additionalMetadata: additionalMetadata, file: file).execute { (response, error) -> Void in
             completion(response?.body, error)
         }
@@ -332,14 +330,14 @@ open class PetAPI {
         let petIdPostEscape = petIdPreEscape.addingPercentEncoding(withAllowedCharacters: .urlPathAllowed) ?? ""
         path = path.replacingOccurrences(of: "{petId}", with: petIdPostEscape, options: .literal, range: nil)
         let URLString = PetstoreClientAPI.basePath + path
-        let formParams: [String:Any?] = [
+        let formParams: [String: Any?] = [
             "additionalMetadata": additionalMetadata,
             "file": file
         ]
 
         let nonNullParameters = APIHelper.rejectNil(formParams)
         let parameters = APIHelper.convertBoolToString(nonNullParameters)
-        
+
         let url = URLComponents(string: URLString)
 
         let requestBuilder: RequestBuilder<ApiResponse>.Type = PetstoreClientAPI.requestBuilderFactory.getBuilder()
@@ -355,7 +353,7 @@ open class PetAPI {
      - parameter additionalMetadata: (form) Additional data to pass to server (optional)
      - parameter completion: completion handler to receive the data and the error objects
      */
-    open class func uploadFileWithRequiredFile(petId: Int64, requiredFile: URL, additionalMetadata: String? = nil, completion: @escaping ((_ data: ApiResponse?,_ error: Error?) -> Void)) {
+    open class func uploadFileWithRequiredFile(petId: Int64, requiredFile: URL, additionalMetadata: String? = nil, completion: @escaping ((_ data: ApiResponse?, _ error: Error?) -> Void)) {
         uploadFileWithRequiredFileWithRequestBuilder(petId: petId, requiredFile: requiredFile, additionalMetadata: additionalMetadata).execute { (response, error) -> Void in
             completion(response?.body, error)
         }
@@ -378,14 +376,14 @@ open class PetAPI {
         let petIdPostEscape = petIdPreEscape.addingPercentEncoding(withAllowedCharacters: .urlPathAllowed) ?? ""
         path = path.replacingOccurrences(of: "{petId}", with: petIdPostEscape, options: .literal, range: nil)
         let URLString = PetstoreClientAPI.basePath + path
-        let formParams: [String:Any?] = [
+        let formParams: [String: Any?] = [
             "additionalMetadata": additionalMetadata,
             "requiredFile": requiredFile
         ]
 
         let nonNullParameters = APIHelper.rejectNil(formParams)
         let parameters = APIHelper.convertBoolToString(nonNullParameters)
-        
+
         let url = URLComponents(string: URLString)
 
         let requestBuilder: RequestBuilder<ApiResponse>.Type = PetstoreClientAPI.requestBuilderFactory.getBuilder()
diff --git a/samples/client/petstore/swift4/unwrapRequired/PetstoreClient/Classes/OpenAPIs/APIs/StoreAPI.swift b/samples/client/petstore/swift4/unwrapRequired/PetstoreClient/Classes/OpenAPIs/APIs/StoreAPI.swift
index a2bced598f..71949b335d 100644
--- a/samples/client/petstore/swift4/unwrapRequired/PetstoreClient/Classes/OpenAPIs/APIs/StoreAPI.swift
+++ b/samples/client/petstore/swift4/unwrapRequired/PetstoreClient/Classes/OpenAPIs/APIs/StoreAPI.swift
@@ -8,8 +8,6 @@
 import Foundation
 import Alamofire
 
-
-
 open class StoreAPI {
     /**
      Delete purchase order by ID
@@ -17,7 +15,7 @@ open class StoreAPI {
      - parameter orderId: (path) ID of the order that needs to be deleted 
      - parameter completion: completion handler to receive the data and the error objects
      */
-    open class func deleteOrder(orderId: String, completion: @escaping ((_ data: Void?,_ error: Error?) -> Void)) {
+    open class func deleteOrder(orderId: String, completion: @escaping ((_ data: Void?, _ error: Error?) -> Void)) {
         deleteOrderWithRequestBuilder(orderId: orderId).execute { (response, error) -> Void in
             if error == nil {
                 completion((), error)
@@ -40,8 +38,8 @@ open class StoreAPI {
         let orderIdPostEscape = orderIdPreEscape.addingPercentEncoding(withAllowedCharacters: .urlPathAllowed) ?? ""
         path = path.replacingOccurrences(of: "{order_id}", with: orderIdPostEscape, options: .literal, range: nil)
         let URLString = PetstoreClientAPI.basePath + path
-        let parameters: [String:Any]? = nil
-        
+        let parameters: [String: Any]? = nil
+
         let url = URLComponents(string: URLString)
 
         let requestBuilder: RequestBuilder<Void>.Type = PetstoreClientAPI.requestBuilderFactory.getNonDecodableBuilder()
@@ -54,7 +52,7 @@ open class StoreAPI {
      
      - parameter completion: completion handler to receive the data and the error objects
      */
-    open class func getInventory(completion: @escaping ((_ data: [String:Int]?,_ error: Error?) -> Void)) {
+    open class func getInventory(completion: @escaping ((_ data: [String: Int]?, _ error: Error?) -> Void)) {
         getInventoryWithRequestBuilder().execute { (response, error) -> Void in
             completion(response?.body, error)
         }
@@ -69,14 +67,14 @@ open class StoreAPI {
        - name: api_key
      - returns: RequestBuilder<[String:Int]> 
      */
-    open class func getInventoryWithRequestBuilder() -> RequestBuilder<[String:Int]> {
+    open class func getInventoryWithRequestBuilder() -> RequestBuilder<[String: Int]> {
         let path = "/store/inventory"
         let URLString = PetstoreClientAPI.basePath + path
-        let parameters: [String:Any]? = nil
-        
+        let parameters: [String: Any]? = nil
+
         let url = URLComponents(string: URLString)
 
-        let requestBuilder: RequestBuilder<[String:Int]>.Type = PetstoreClientAPI.requestBuilderFactory.getBuilder()
+        let requestBuilder: RequestBuilder<[String: Int]>.Type = PetstoreClientAPI.requestBuilderFactory.getBuilder()
 
         return requestBuilder.init(method: "GET", URLString: (url?.string ?? URLString), parameters: parameters, isBody: false)
     }
@@ -87,7 +85,7 @@ open class StoreAPI {
      - parameter orderId: (path) ID of pet that needs to be fetched 
      - parameter completion: completion handler to receive the data and the error objects
      */
-    open class func getOrderById(orderId: Int64, completion: @escaping ((_ data: Order?,_ error: Error?) -> Void)) {
+    open class func getOrderById(orderId: Int64, completion: @escaping ((_ data: Order?, _ error: Error?) -> Void)) {
         getOrderByIdWithRequestBuilder(orderId: orderId).execute { (response, error) -> Void in
             completion(response?.body, error)
         }
@@ -106,8 +104,8 @@ open class StoreAPI {
         let orderIdPostEscape = orderIdPreEscape.addingPercentEncoding(withAllowedCharacters: .urlPathAllowed) ?? ""
         path = path.replacingOccurrences(of: "{order_id}", with: orderIdPostEscape, options: .literal, range: nil)
         let URLString = PetstoreClientAPI.basePath + path
-        let parameters: [String:Any]? = nil
-        
+        let parameters: [String: Any]? = nil
+
         let url = URLComponents(string: URLString)
 
         let requestBuilder: RequestBuilder<Order>.Type = PetstoreClientAPI.requestBuilderFactory.getBuilder()
@@ -121,7 +119,7 @@ open class StoreAPI {
      - parameter body: (body) order placed for purchasing the pet 
      - parameter completion: completion handler to receive the data and the error objects
      */
-    open class func placeOrder(body: Order, completion: @escaping ((_ data: Order?,_ error: Error?) -> Void)) {
+    open class func placeOrder(body: Order, completion: @escaping ((_ data: Order?, _ error: Error?) -> Void)) {
         placeOrderWithRequestBuilder(body: body).execute { (response, error) -> Void in
             completion(response?.body, error)
         }
diff --git a/samples/client/petstore/swift4/unwrapRequired/PetstoreClient/Classes/OpenAPIs/APIs/UserAPI.swift b/samples/client/petstore/swift4/unwrapRequired/PetstoreClient/Classes/OpenAPIs/APIs/UserAPI.swift
index d8cafaf2c9..efeb64468a 100644
--- a/samples/client/petstore/swift4/unwrapRequired/PetstoreClient/Classes/OpenAPIs/APIs/UserAPI.swift
+++ b/samples/client/petstore/swift4/unwrapRequired/PetstoreClient/Classes/OpenAPIs/APIs/UserAPI.swift
@@ -8,8 +8,6 @@
 import Foundation
 import Alamofire
 
-
-
 open class UserAPI {
     /**
      Create user
@@ -17,7 +15,7 @@ open class UserAPI {
      - parameter body: (body) Created user object 
      - parameter completion: completion handler to receive the data and the error objects
      */
-    open class func createUser(body: User, completion: @escaping ((_ data: Void?,_ error: Error?) -> Void)) {
+    open class func createUser(body: User, completion: @escaping ((_ data: Void?, _ error: Error?) -> Void)) {
         createUserWithRequestBuilder(body: body).execute { (response, error) -> Void in
             if error == nil {
                 completion((), error)
@@ -52,7 +50,7 @@ open class UserAPI {
      - parameter body: (body) List of user object 
      - parameter completion: completion handler to receive the data and the error objects
      */
-    open class func createUsersWithArrayInput(body: [User], completion: @escaping ((_ data: Void?,_ error: Error?) -> Void)) {
+    open class func createUsersWithArrayInput(body: [User], completion: @escaping ((_ data: Void?, _ error: Error?) -> Void)) {
         createUsersWithArrayInputWithRequestBuilder(body: body).execute { (response, error) -> Void in
             if error == nil {
                 completion((), error)
@@ -86,7 +84,7 @@ open class UserAPI {
      - parameter body: (body) List of user object 
      - parameter completion: completion handler to receive the data and the error objects
      */
-    open class func createUsersWithListInput(body: [User], completion: @escaping ((_ data: Void?,_ error: Error?) -> Void)) {
+    open class func createUsersWithListInput(body: [User], completion: @escaping ((_ data: Void?, _ error: Error?) -> Void)) {
         createUsersWithListInputWithRequestBuilder(body: body).execute { (response, error) -> Void in
             if error == nil {
                 completion((), error)
@@ -120,7 +118,7 @@ open class UserAPI {
      - parameter username: (path) The name that needs to be deleted 
      - parameter completion: completion handler to receive the data and the error objects
      */
-    open class func deleteUser(username: String, completion: @escaping ((_ data: Void?,_ error: Error?) -> Void)) {
+    open class func deleteUser(username: String, completion: @escaping ((_ data: Void?, _ error: Error?) -> Void)) {
         deleteUserWithRequestBuilder(username: username).execute { (response, error) -> Void in
             if error == nil {
                 completion((), error)
@@ -143,8 +141,8 @@ open class UserAPI {
         let usernamePostEscape = usernamePreEscape.addingPercentEncoding(withAllowedCharacters: .urlPathAllowed) ?? ""
         path = path.replacingOccurrences(of: "{username}", with: usernamePostEscape, options: .literal, range: nil)
         let URLString = PetstoreClientAPI.basePath + path
-        let parameters: [String:Any]? = nil
-        
+        let parameters: [String: Any]? = nil
+
         let url = URLComponents(string: URLString)
 
         let requestBuilder: RequestBuilder<Void>.Type = PetstoreClientAPI.requestBuilderFactory.getNonDecodableBuilder()
@@ -158,7 +156,7 @@ open class UserAPI {
      - parameter username: (path) The name that needs to be fetched. Use user1 for testing. 
      - parameter completion: completion handler to receive the data and the error objects
      */
-    open class func getUserByName(username: String, completion: @escaping ((_ data: User?,_ error: Error?) -> Void)) {
+    open class func getUserByName(username: String, completion: @escaping ((_ data: User?, _ error: Error?) -> Void)) {
         getUserByNameWithRequestBuilder(username: username).execute { (response, error) -> Void in
             completion(response?.body, error)
         }
@@ -176,8 +174,8 @@ open class UserAPI {
         let usernamePostEscape = usernamePreEscape.addingPercentEncoding(withAllowedCharacters: .urlPathAllowed) ?? ""
         path = path.replacingOccurrences(of: "{username}", with: usernamePostEscape, options: .literal, range: nil)
         let URLString = PetstoreClientAPI.basePath + path
-        let parameters: [String:Any]? = nil
-        
+        let parameters: [String: Any]? = nil
+
         let url = URLComponents(string: URLString)
 
         let requestBuilder: RequestBuilder<User>.Type = PetstoreClientAPI.requestBuilderFactory.getBuilder()
@@ -192,7 +190,7 @@ open class UserAPI {
      - parameter password: (query) The password for login in clear text 
      - parameter completion: completion handler to receive the data and the error objects
      */
-    open class func loginUser(username: String, password: String, completion: @escaping ((_ data: String?,_ error: Error?) -> Void)) {
+    open class func loginUser(username: String, password: String, completion: @escaping ((_ data: String?, _ error: Error?) -> Void)) {
         loginUserWithRequestBuilder(username: username, password: password).execute { (response, error) -> Void in
             completion(response?.body, error)
         }
@@ -209,11 +207,11 @@ open class UserAPI {
     open class func loginUserWithRequestBuilder(username: String, password: String) -> RequestBuilder<String> {
         let path = "/user/login"
         let URLString = PetstoreClientAPI.basePath + path
-        let parameters: [String:Any]? = nil
-        
+        let parameters: [String: Any]? = nil
+
         var url = URLComponents(string: URLString)
         url?.queryItems = APIHelper.mapValuesToQueryItems([
-            "username": username, 
+            "username": username,
             "password": password
         ])
 
@@ -227,7 +225,7 @@ open class UserAPI {
      
      - parameter completion: completion handler to receive the data and the error objects
      */
-    open class func logoutUser(completion: @escaping ((_ data: Void?,_ error: Error?) -> Void)) {
+    open class func logoutUser(completion: @escaping ((_ data: Void?, _ error: Error?) -> Void)) {
         logoutUserWithRequestBuilder().execute { (response, error) -> Void in
             if error == nil {
                 completion((), error)
@@ -245,8 +243,8 @@ open class UserAPI {
     open class func logoutUserWithRequestBuilder() -> RequestBuilder<Void> {
         let path = "/user/logout"
         let URLString = PetstoreClientAPI.basePath + path
-        let parameters: [String:Any]? = nil
-        
+        let parameters: [String: Any]? = nil
+
         let url = URLComponents(string: URLString)
 
         let requestBuilder: RequestBuilder<Void>.Type = PetstoreClientAPI.requestBuilderFactory.getNonDecodableBuilder()
@@ -261,7 +259,7 @@ open class UserAPI {
      - parameter body: (body) Updated user object 
      - parameter completion: completion handler to receive the data and the error objects
      */
-    open class func updateUser(username: String, body: User, completion: @escaping ((_ data: Void?,_ error: Error?) -> Void)) {
+    open class func updateUser(username: String, body: User, completion: @escaping ((_ data: Void?, _ error: Error?) -> Void)) {
         updateUserWithRequestBuilder(username: username, body: body).execute { (response, error) -> Void in
             if error == nil {
                 completion((), error)
diff --git a/samples/client/petstore/swift4/unwrapRequired/PetstoreClient/Classes/OpenAPIs/AlamofireImplementations.swift b/samples/client/petstore/swift4/unwrapRequired/PetstoreClient/Classes/OpenAPIs/AlamofireImplementations.swift
index dac40e9a31..04ad02a5ce 100644
--- a/samples/client/petstore/swift4/unwrapRequired/PetstoreClient/Classes/OpenAPIs/AlamofireImplementations.swift
+++ b/samples/client/petstore/swift4/unwrapRequired/PetstoreClient/Classes/OpenAPIs/AlamofireImplementations.swift
@@ -12,7 +12,7 @@ class AlamofireRequestBuilderFactory: RequestBuilderFactory {
         return AlamofireRequestBuilder<T>.self
     }
 
-    func getBuilder<T:Decodable>() -> RequestBuilder<T>.Type {
+    func getBuilder<T: Decodable>() -> RequestBuilder<T>.Type {
         return AlamofireDecodableRequestBuilder<T>.self
     }
 }
@@ -50,7 +50,7 @@ private struct SynchronizedDictionary<K: Hashable, V> {
 private var managerStore = SynchronizedDictionary<String, Alamofire.SessionManager>()
 
 open class AlamofireRequestBuilder<T>: RequestBuilder<T> {
-    required public init(method: String, URLString: String, parameters: [String : Any]?, isBody: Bool, headers: [String : String] = [:]) {
+    required public init(method: String, URLString: String, parameters: [String: Any]?, isBody: Bool, headers: [String: String] = [:]) {
         super.init(method: method, URLString: URLString, parameters: parameters, isBody: isBody, headers: headers)
     }
 
@@ -88,17 +88,17 @@ open class AlamofireRequestBuilder<T>: RequestBuilder<T> {
      May be overridden by a subclass if you want to control the request
      configuration (e.g. to override the cache policy).
      */
-    open func makeRequest(manager: SessionManager, method: HTTPMethod, encoding: ParameterEncoding, headers: [String:String]) -> DataRequest {
+    open func makeRequest(manager: SessionManager, method: HTTPMethod, encoding: ParameterEncoding, headers: [String: String]) -> DataRequest {
         return manager.request(URLString, method: method, parameters: parameters, encoding: encoding, headers: headers)
     }
 
     override open func execute(_ completion: @escaping (_ response: Response<T>?, _ error: Error?) -> Void) {
-        let managerId:String = UUID().uuidString
+        let managerId: String = UUID().uuidString
         // Create a new manager for each request to customize its request header
         let manager = createSessionManager()
         managerStore[managerId] = manager
 
-        let encoding:ParameterEncoding = isBody ? JSONDataEncoding() : URLEncoding()
+        let encoding: ParameterEncoding = isBody ? JSONDataEncoding() : URLEncoding()
 
         let xMethod = Alamofire.HTTPMethod(rawValue: method)
         let fileKeys = parameters == nil ? [] : parameters!.filter { $1 is NSURL }
@@ -111,8 +111,7 @@ open class AlamofireRequestBuilder<T>: RequestBuilder<T> {
                     case let fileURL as URL:
                         if let mimeType = self.contentTypeForFormPart(fileURL: fileURL) {
                             mpForm.append(fileURL, withName: k, fileName: fileURL.lastPathComponent, mimeType: mimeType)
-                        }
-                        else {
+                        } else {
                             mpForm.append(fileURL, withName: k)
                         }
                     case let string as String:
@@ -276,7 +275,7 @@ open class AlamofireRequestBuilder<T>: RequestBuilder<T> {
         return httpHeaders
     }
 
-    fileprivate func getFileName(fromContentDisposition contentDisposition : String?) -> String? {
+    fileprivate func getFileName(fromContentDisposition contentDisposition: String?) -> String? {
 
         guard let contentDisposition = contentDisposition else {
             return nil
@@ -284,7 +283,7 @@ open class AlamofireRequestBuilder<T>: RequestBuilder<T> {
 
         let items = contentDisposition.components(separatedBy: ";")
 
-        var filename : String? = nil
+        var filename: String? = nil
 
         for contentItem in items {
 
@@ -304,7 +303,7 @@ open class AlamofireRequestBuilder<T>: RequestBuilder<T> {
 
     }
 
-    fileprivate func getPath(from url : URL) throws -> String {
+    fileprivate func getPath(from url: URL) throws -> String {
 
         guard var path = URLComponents(url: url, resolvingAgainstBaseURL: true)?.path else {
             throw DownloadException.requestMissingPath
@@ -318,7 +317,7 @@ open class AlamofireRequestBuilder<T>: RequestBuilder<T> {
 
     }
 
-    fileprivate func getURL(from urlRequest : URLRequest) throws -> URL {
+    fileprivate func getURL(from urlRequest: URLRequest) throws -> URL {
 
         guard let url = urlRequest.url else {
             throw DownloadException.requestMissingURL
@@ -329,7 +328,7 @@ open class AlamofireRequestBuilder<T>: RequestBuilder<T> {
 
 }
 
-fileprivate enum DownloadException : Error {
+private enum DownloadException: Error {
     case responseDataMissing
     case responseFailed
     case requestMissing
@@ -344,7 +343,7 @@ public enum AlamofireDecodableRequestBuilderError: Error {
     case generalError(Error)
 }
 
-open class AlamofireDecodableRequestBuilder<T:Decodable>: AlamofireRequestBuilder<T> {
+open class AlamofireDecodableRequestBuilder<T: Decodable>: AlamofireRequestBuilder<T> {
 
     override fileprivate func processRequest(request: DataRequest, _ managerId: String, _ completion: @escaping (_ response: Response<T>?, _ error: Error?) -> Void) {
         if let credential = self.credential {
diff --git a/samples/client/petstore/swift4/unwrapRequired/PetstoreClient/Classes/OpenAPIs/CodableHelper.swift b/samples/client/petstore/swift4/unwrapRequired/PetstoreClient/Classes/OpenAPIs/CodableHelper.swift
index 584de8c3d5..111d5a3a8c 100644
--- a/samples/client/petstore/swift4/unwrapRequired/PetstoreClient/Classes/OpenAPIs/CodableHelper.swift
+++ b/samples/client/petstore/swift4/unwrapRequired/PetstoreClient/Classes/OpenAPIs/CodableHelper.swift
@@ -13,7 +13,7 @@ open class CodableHelper {
 
     public static var dateformatter: DateFormatter?
 
-    open class func decode<T>(_ type: T.Type, from data: Data) -> (decodableObj: T?, error: Error?) where T : Decodable {
+    open class func decode<T>(_ type: T.Type, from data: Data) -> (decodableObj: T?, error: Error?) where T: Decodable {
         var returnedDecodable: T? = nil
         var returnedError: Error? = nil
 
@@ -39,7 +39,7 @@ open class CodableHelper {
         return (returnedDecodable, returnedError)
     }
 
-    open class func encode<T>(_ value: T, prettyPrint: Bool = false) -> EncodeResult where T : Encodable {
+    open class func encode<T>(_ value: T, prettyPrint: Bool = false) -> EncodeResult where T: Encodable {
         var returnedData: Data?
         var returnedError: Error? = nil
 
diff --git a/samples/client/petstore/swift4/unwrapRequired/PetstoreClient/Classes/OpenAPIs/Configuration.swift b/samples/client/petstore/swift4/unwrapRequired/PetstoreClient/Classes/OpenAPIs/Configuration.swift
index 516590da5d..e1ecb39726 100644
--- a/samples/client/petstore/swift4/unwrapRequired/PetstoreClient/Classes/OpenAPIs/Configuration.swift
+++ b/samples/client/petstore/swift4/unwrapRequired/PetstoreClient/Classes/OpenAPIs/Configuration.swift
@@ -7,9 +7,9 @@
 import Foundation
 
 open class Configuration {
-	
+
 	// This value is used to configure the date formatter that is used to serialize dates into JSON format. 
 	// You must set it prior to encoding any dates, and it will only be read once. 
     public static var dateFormat = "yyyy-MM-dd'T'HH:mm:ss.SSSZZZZZ"
-    
-}
\ No newline at end of file
+
+}
diff --git a/samples/client/petstore/swift4/unwrapRequired/PetstoreClient/Classes/OpenAPIs/Extensions.swift b/samples/client/petstore/swift4/unwrapRequired/PetstoreClient/Classes/OpenAPIs/Extensions.swift
index 8bf1829ba8..24c128daad 100644
--- a/samples/client/petstore/swift4/unwrapRequired/PetstoreClient/Classes/OpenAPIs/Extensions.swift
+++ b/samples/client/petstore/swift4/unwrapRequired/PetstoreClient/Classes/OpenAPIs/Extensions.swift
@@ -112,24 +112,24 @@ extension String: CodingKey {
 
 extension KeyedEncodingContainerProtocol {
 
-    public mutating func encodeArray<T>(_ values: [T], forKey key: Self.Key) throws where T : Encodable {
+    public mutating func encodeArray<T>(_ values: [T], forKey key: Self.Key) throws where T: Encodable {
         var arrayContainer = nestedUnkeyedContainer(forKey: key)
         try arrayContainer.encode(contentsOf: values)
     }
 
-    public mutating func encodeArrayIfPresent<T>(_ values: [T]?, forKey key: Self.Key) throws where T : Encodable {
+    public mutating func encodeArrayIfPresent<T>(_ values: [T]?, forKey key: Self.Key) throws where T: Encodable {
         if let values = values {
             try encodeArray(values, forKey: key)
         }
     }
 
-    public mutating func encodeMap<T>(_ pairs: [Self.Key: T]) throws where T : Encodable {
+    public mutating func encodeMap<T>(_ pairs: [Self.Key: T]) throws where T: Encodable {
         for (key, value) in pairs {
             try encode(value, forKey: key)
         }
     }
 
-    public mutating func encodeMapIfPresent<T>(_ pairs: [Self.Key: T]?) throws where T : Encodable {
+    public mutating func encodeMapIfPresent<T>(_ pairs: [Self.Key: T]?) throws where T: Encodable {
         if let pairs = pairs {
             try encodeMap(pairs)
         }
@@ -139,7 +139,7 @@ extension KeyedEncodingContainerProtocol {
 
 extension KeyedDecodingContainerProtocol {
 
-    public func decodeArray<T>(_ type: T.Type, forKey key: Self.Key) throws -> [T] where T : Decodable {
+    public func decodeArray<T>(_ type: T.Type, forKey key: Self.Key) throws -> [T] where T: Decodable {
         var tmpArray = [T]()
 
         var nestedContainer = try nestedUnkeyedContainer(forKey: key)
@@ -151,7 +151,7 @@ extension KeyedDecodingContainerProtocol {
         return tmpArray
     }
 
-    public func decodeArrayIfPresent<T>(_ type: T.Type, forKey key: Self.Key) throws -> [T]? where T : Decodable {
+    public func decodeArrayIfPresent<T>(_ type: T.Type, forKey key: Self.Key) throws -> [T]? where T: Decodable {
         var tmpArray: [T]? = nil
 
         if contains(key) {
@@ -161,8 +161,8 @@ extension KeyedDecodingContainerProtocol {
         return tmpArray
     }
 
-    public func decodeMap<T>(_ type: T.Type, excludedKeys: Set<Self.Key>) throws -> [Self.Key: T] where T : Decodable {
-        var map: [Self.Key : T] = [:]
+    public func decodeMap<T>(_ type: T.Type, excludedKeys: Set<Self.Key>) throws -> [Self.Key: T] where T: Decodable {
+        var map: [Self.Key: T] = [:]
 
         for key in allKeys {
             if !excludedKeys.contains(key) {
@@ -175,5 +175,3 @@ extension KeyedDecodingContainerProtocol {
     }
 
 }
-
-
diff --git a/samples/client/petstore/swift4/unwrapRequired/PetstoreClient/Classes/OpenAPIs/JSONEncodingHelper.swift b/samples/client/petstore/swift4/unwrapRequired/PetstoreClient/Classes/OpenAPIs/JSONEncodingHelper.swift
index 7044951584..3e68bb5d4a 100644
--- a/samples/client/petstore/swift4/unwrapRequired/PetstoreClient/Classes/OpenAPIs/JSONEncodingHelper.swift
+++ b/samples/client/petstore/swift4/unwrapRequired/PetstoreClient/Classes/OpenAPIs/JSONEncodingHelper.swift
@@ -10,7 +10,7 @@ import Alamofire
 
 open class JSONEncodingHelper {
 
-    open class func encodingParameters<T:Encodable>(forEncodableObject encodableObj: T?) -> Parameters? {
+    open class func encodingParameters<T: Encodable>(forEncodableObject encodableObj: T?) -> Parameters? {
         var params: Parameters? = nil
 
         // Encode the Encodable object
@@ -39,5 +39,5 @@ open class JSONEncodingHelper {
 
         return params
     }
-    
+
 }
diff --git a/samples/client/petstore/swift4/unwrapRequired/PetstoreClient/Classes/OpenAPIs/Models.swift b/samples/client/petstore/swift4/unwrapRequired/PetstoreClient/Classes/OpenAPIs/Models.swift
index 4085638903..e87ce399c7 100644
--- a/samples/client/petstore/swift4/unwrapRequired/PetstoreClient/Classes/OpenAPIs/Models.swift
+++ b/samples/client/petstore/swift4/unwrapRequired/PetstoreClient/Classes/OpenAPIs/Models.swift
@@ -10,7 +10,7 @@ protocol JSONEncodable {
     func encodeToJSON() -> Any
 }
 
-public enum ErrorResponse : Error {
+public enum ErrorResponse: Error {
     case error(Int, Data?, Error)
 }
 
diff --git a/samples/client/petstore/swift4/unwrapRequired/PetstoreClient/Classes/OpenAPIs/Models/AdditionalPropertiesAnyType.swift b/samples/client/petstore/swift4/unwrapRequired/PetstoreClient/Classes/OpenAPIs/Models/AdditionalPropertiesAnyType.swift
index 796e46eca2..94295c495c 100644
--- a/samples/client/petstore/swift4/unwrapRequired/PetstoreClient/Classes/OpenAPIs/Models/AdditionalPropertiesAnyType.swift
+++ b/samples/client/petstore/swift4/unwrapRequired/PetstoreClient/Classes/OpenAPIs/Models/AdditionalPropertiesAnyType.swift
@@ -7,8 +7,6 @@
 
 import Foundation
 
-
-
 public struct AdditionalPropertiesAnyType: Codable {
 
     public var name: String?
@@ -16,7 +14,7 @@ public struct AdditionalPropertiesAnyType: Codable {
     public init(name: String?) {
         self.name = name
     }
-    public var additionalProperties: [String:Any] = [:]
+    public var additionalProperties: [String: Any] = [:]
 
     public subscript(key: String) -> Any? {
         get {
@@ -52,7 +50,4 @@ public struct AdditionalPropertiesAnyType: Codable {
         additionalProperties = try container.decodeMap(Any.self, excludedKeys: nonAdditionalPropertyKeys)
     }
 
-
-
 }
-
diff --git a/samples/client/petstore/swift4/unwrapRequired/PetstoreClient/Classes/OpenAPIs/Models/AdditionalPropertiesArray.swift b/samples/client/petstore/swift4/unwrapRequired/PetstoreClient/Classes/OpenAPIs/Models/AdditionalPropertiesArray.swift
index 5e58839b5a..cde9824ddb 100644
--- a/samples/client/petstore/swift4/unwrapRequired/PetstoreClient/Classes/OpenAPIs/Models/AdditionalPropertiesArray.swift
+++ b/samples/client/petstore/swift4/unwrapRequired/PetstoreClient/Classes/OpenAPIs/Models/AdditionalPropertiesArray.swift
@@ -7,8 +7,6 @@
 
 import Foundation
 
-
-
 public struct AdditionalPropertiesArray: Codable {
 
     public var name: String?
@@ -16,7 +14,7 @@ public struct AdditionalPropertiesArray: Codable {
     public init(name: String?) {
         self.name = name
     }
-    public var additionalProperties: [String:Array] = [:]
+    public var additionalProperties: [String: Array] = [:]
 
     public subscript(key: String) -> Array? {
         get {
@@ -52,7 +50,4 @@ public struct AdditionalPropertiesArray: Codable {
         additionalProperties = try container.decodeMap(Array.self, excludedKeys: nonAdditionalPropertyKeys)
     }
 
-
-
 }
-
diff --git a/samples/client/petstore/swift4/unwrapRequired/PetstoreClient/Classes/OpenAPIs/Models/AdditionalPropertiesBoolean.swift b/samples/client/petstore/swift4/unwrapRequired/PetstoreClient/Classes/OpenAPIs/Models/AdditionalPropertiesBoolean.swift
index d4c90829b4..76791a9ddd 100644
--- a/samples/client/petstore/swift4/unwrapRequired/PetstoreClient/Classes/OpenAPIs/Models/AdditionalPropertiesBoolean.swift
+++ b/samples/client/petstore/swift4/unwrapRequired/PetstoreClient/Classes/OpenAPIs/Models/AdditionalPropertiesBoolean.swift
@@ -7,8 +7,6 @@
 
 import Foundation
 
-
-
 public struct AdditionalPropertiesBoolean: Codable {
 
     public var name: String?
@@ -16,7 +14,7 @@ public struct AdditionalPropertiesBoolean: Codable {
     public init(name: String?) {
         self.name = name
     }
-    public var additionalProperties: [String:Bool] = [:]
+    public var additionalProperties: [String: Bool] = [:]
 
     public subscript(key: String) -> Bool? {
         get {
@@ -52,7 +50,4 @@ public struct AdditionalPropertiesBoolean: Codable {
         additionalProperties = try container.decodeMap(Bool.self, excludedKeys: nonAdditionalPropertyKeys)
     }
 
-
-
 }
-
diff --git a/samples/client/petstore/swift4/unwrapRequired/PetstoreClient/Classes/OpenAPIs/Models/AdditionalPropertiesClass.swift b/samples/client/petstore/swift4/unwrapRequired/PetstoreClient/Classes/OpenAPIs/Models/AdditionalPropertiesClass.swift
index 4db39adae8..83a06951cc 100644
--- a/samples/client/petstore/swift4/unwrapRequired/PetstoreClient/Classes/OpenAPIs/Models/AdditionalPropertiesClass.swift
+++ b/samples/client/petstore/swift4/unwrapRequired/PetstoreClient/Classes/OpenAPIs/Models/AdditionalPropertiesClass.swift
@@ -7,23 +7,19 @@
 
 import Foundation
 
-
-
 public struct AdditionalPropertiesClass: Codable {
 
-    public var mapString: [String:String]?
-    public var mapMapString: [String:[String:String]]?
+    public var mapString: [String: String]?
+    public var mapMapString: [String: [String: String]]?
 
-    public init(mapString: [String:String]?, mapMapString: [String:[String:String]]?) {
+    public init(mapString: [String: String]?, mapMapString: [String: [String: String]]?) {
         self.mapString = mapString
         self.mapMapString = mapMapString
     }
 
-    public enum CodingKeys: String, CodingKey { 
+    public enum CodingKeys: String, CodingKey {
         case mapString = "map_string"
         case mapMapString = "map_map_string"
     }
 
-
 }
-
diff --git a/samples/client/petstore/swift4/unwrapRequired/PetstoreClient/Classes/OpenAPIs/Models/AdditionalPropertiesInteger.swift b/samples/client/petstore/swift4/unwrapRequired/PetstoreClient/Classes/OpenAPIs/Models/AdditionalPropertiesInteger.swift
index b03bbe4456..4a0f2acaa4 100644
--- a/samples/client/petstore/swift4/unwrapRequired/PetstoreClient/Classes/OpenAPIs/Models/AdditionalPropertiesInteger.swift
+++ b/samples/client/petstore/swift4/unwrapRequired/PetstoreClient/Classes/OpenAPIs/Models/AdditionalPropertiesInteger.swift
@@ -7,8 +7,6 @@
 
 import Foundation
 
-
-
 public struct AdditionalPropertiesInteger: Codable {
 
     public var name: String?
@@ -16,7 +14,7 @@ public struct AdditionalPropertiesInteger: Codable {
     public init(name: String?) {
         self.name = name
     }
-    public var additionalProperties: [String:Int] = [:]
+    public var additionalProperties: [String: Int] = [:]
 
     public subscript(key: String) -> Int? {
         get {
@@ -52,7 +50,4 @@ public struct AdditionalPropertiesInteger: Codable {
         additionalProperties = try container.decodeMap(Int.self, excludedKeys: nonAdditionalPropertyKeys)
     }
 
-
-
 }
-
diff --git a/samples/client/petstore/swift4/unwrapRequired/PetstoreClient/Classes/OpenAPIs/Models/AdditionalPropertiesNumber.swift b/samples/client/petstore/swift4/unwrapRequired/PetstoreClient/Classes/OpenAPIs/Models/AdditionalPropertiesNumber.swift
index 9701d54c9b..95e491000a 100644
--- a/samples/client/petstore/swift4/unwrapRequired/PetstoreClient/Classes/OpenAPIs/Models/AdditionalPropertiesNumber.swift
+++ b/samples/client/petstore/swift4/unwrapRequired/PetstoreClient/Classes/OpenAPIs/Models/AdditionalPropertiesNumber.swift
@@ -7,8 +7,6 @@
 
 import Foundation
 
-
-
 public struct AdditionalPropertiesNumber: Codable {
 
     public var name: String?
@@ -16,7 +14,7 @@ public struct AdditionalPropertiesNumber: Codable {
     public init(name: String?) {
         self.name = name
     }
-    public var additionalProperties: [String:Double] = [:]
+    public var additionalProperties: [String: Double] = [:]
 
     public subscript(key: String) -> Double? {
         get {
@@ -52,7 +50,4 @@ public struct AdditionalPropertiesNumber: Codable {
         additionalProperties = try container.decodeMap(Double.self, excludedKeys: nonAdditionalPropertyKeys)
     }
 
-
-
 }
-
diff --git a/samples/client/petstore/swift4/unwrapRequired/PetstoreClient/Classes/OpenAPIs/Models/AdditionalPropertiesObject.swift b/samples/client/petstore/swift4/unwrapRequired/PetstoreClient/Classes/OpenAPIs/Models/AdditionalPropertiesObject.swift
index c6e1e670b8..f45888a410 100644
--- a/samples/client/petstore/swift4/unwrapRequired/PetstoreClient/Classes/OpenAPIs/Models/AdditionalPropertiesObject.swift
+++ b/samples/client/petstore/swift4/unwrapRequired/PetstoreClient/Classes/OpenAPIs/Models/AdditionalPropertiesObject.swift
@@ -7,8 +7,6 @@
 
 import Foundation
 
-
-
 public struct AdditionalPropertiesObject: Codable {
 
     public var name: String?
@@ -16,7 +14,7 @@ public struct AdditionalPropertiesObject: Codable {
     public init(name: String?) {
         self.name = name
     }
-    public var additionalProperties: [String:Dictionary] = [:]
+    public var additionalProperties: [String: Dictionary] = [:]
 
     public subscript(key: String) -> Dictionary? {
         get {
@@ -52,7 +50,4 @@ public struct AdditionalPropertiesObject: Codable {
         additionalProperties = try container.decodeMap(Dictionary.self, excludedKeys: nonAdditionalPropertyKeys)
     }
 
-
-
 }
-
diff --git a/samples/client/petstore/swift4/unwrapRequired/PetstoreClient/Classes/OpenAPIs/Models/AdditionalPropertiesString.swift b/samples/client/petstore/swift4/unwrapRequired/PetstoreClient/Classes/OpenAPIs/Models/AdditionalPropertiesString.swift
index 6128dce7d4..7af63cc715 100644
--- a/samples/client/petstore/swift4/unwrapRequired/PetstoreClient/Classes/OpenAPIs/Models/AdditionalPropertiesString.swift
+++ b/samples/client/petstore/swift4/unwrapRequired/PetstoreClient/Classes/OpenAPIs/Models/AdditionalPropertiesString.swift
@@ -7,8 +7,6 @@
 
 import Foundation
 
-
-
 public struct AdditionalPropertiesString: Codable {
 
     public var name: String?
@@ -16,7 +14,7 @@ public struct AdditionalPropertiesString: Codable {
     public init(name: String?) {
         self.name = name
     }
-    public var additionalProperties: [String:String] = [:]
+    public var additionalProperties: [String: String] = [:]
 
     public subscript(key: String) -> String? {
         get {
@@ -52,7 +50,4 @@ public struct AdditionalPropertiesString: Codable {
         additionalProperties = try container.decodeMap(String.self, excludedKeys: nonAdditionalPropertyKeys)
     }
 
-
-
 }
-
diff --git a/samples/client/petstore/swift4/unwrapRequired/PetstoreClient/Classes/OpenAPIs/Models/Animal.swift b/samples/client/petstore/swift4/unwrapRequired/PetstoreClient/Classes/OpenAPIs/Models/Animal.swift
index befb84b1df..88eceebd2a 100644
--- a/samples/client/petstore/swift4/unwrapRequired/PetstoreClient/Classes/OpenAPIs/Models/Animal.swift
+++ b/samples/client/petstore/swift4/unwrapRequired/PetstoreClient/Classes/OpenAPIs/Models/Animal.swift
@@ -7,8 +7,6 @@
 
 import Foundation
 
-
-
 public struct Animal: Codable {
 
     public var className: String?
@@ -19,6 +17,4 @@ public struct Animal: Codable {
         self.color = color
     }
 
-
 }
-
diff --git a/samples/client/petstore/swift4/unwrapRequired/PetstoreClient/Classes/OpenAPIs/Models/AnimalFarm.swift b/samples/client/petstore/swift4/unwrapRequired/PetstoreClient/Classes/OpenAPIs/Models/AnimalFarm.swift
index e7bea63f8e..e09b0e9efd 100644
--- a/samples/client/petstore/swift4/unwrapRequired/PetstoreClient/Classes/OpenAPIs/Models/AnimalFarm.swift
+++ b/samples/client/petstore/swift4/unwrapRequired/PetstoreClient/Classes/OpenAPIs/Models/AnimalFarm.swift
@@ -7,5 +7,4 @@
 
 import Foundation
 
-
 public typealias AnimalFarm = [Animal]
diff --git a/samples/client/petstore/swift4/unwrapRequired/PetstoreClient/Classes/OpenAPIs/Models/ApiResponse.swift b/samples/client/petstore/swift4/unwrapRequired/PetstoreClient/Classes/OpenAPIs/Models/ApiResponse.swift
index a22e9aaebb..ec270da890 100644
--- a/samples/client/petstore/swift4/unwrapRequired/PetstoreClient/Classes/OpenAPIs/Models/ApiResponse.swift
+++ b/samples/client/petstore/swift4/unwrapRequired/PetstoreClient/Classes/OpenAPIs/Models/ApiResponse.swift
@@ -7,8 +7,6 @@
 
 import Foundation
 
-
-
 public struct ApiResponse: Codable {
 
     public var code: Int?
@@ -21,6 +19,4 @@ public struct ApiResponse: Codable {
         self.message = message
     }
 
-
 }
-
diff --git a/samples/client/petstore/swift4/unwrapRequired/PetstoreClient/Classes/OpenAPIs/Models/ArrayOfArrayOfNumberOnly.swift b/samples/client/petstore/swift4/unwrapRequired/PetstoreClient/Classes/OpenAPIs/Models/ArrayOfArrayOfNumberOnly.swift
index 4e5a5ca144..3843287630 100644
--- a/samples/client/petstore/swift4/unwrapRequired/PetstoreClient/Classes/OpenAPIs/Models/ArrayOfArrayOfNumberOnly.swift
+++ b/samples/client/petstore/swift4/unwrapRequired/PetstoreClient/Classes/OpenAPIs/Models/ArrayOfArrayOfNumberOnly.swift
@@ -7,8 +7,6 @@
 
 import Foundation
 
-
-
 public struct ArrayOfArrayOfNumberOnly: Codable {
 
     public var arrayArrayNumber: [[Double]]?
@@ -17,10 +15,8 @@ public struct ArrayOfArrayOfNumberOnly: Codable {
         self.arrayArrayNumber = arrayArrayNumber
     }
 
-    public enum CodingKeys: String, CodingKey { 
+    public enum CodingKeys: String, CodingKey {
         case arrayArrayNumber = "ArrayArrayNumber"
     }
 
-
 }
-
diff --git a/samples/client/petstore/swift4/unwrapRequired/PetstoreClient/Classes/OpenAPIs/Models/ArrayOfNumberOnly.swift b/samples/client/petstore/swift4/unwrapRequired/PetstoreClient/Classes/OpenAPIs/Models/ArrayOfNumberOnly.swift
index 7d059d3683..f8b198e81f 100644
--- a/samples/client/petstore/swift4/unwrapRequired/PetstoreClient/Classes/OpenAPIs/Models/ArrayOfNumberOnly.swift
+++ b/samples/client/petstore/swift4/unwrapRequired/PetstoreClient/Classes/OpenAPIs/Models/ArrayOfNumberOnly.swift
@@ -7,8 +7,6 @@
 
 import Foundation
 
-
-
 public struct ArrayOfNumberOnly: Codable {
 
     public var arrayNumber: [Double]?
@@ -17,10 +15,8 @@ public struct ArrayOfNumberOnly: Codable {
         self.arrayNumber = arrayNumber
     }
 
-    public enum CodingKeys: String, CodingKey { 
+    public enum CodingKeys: String, CodingKey {
         case arrayNumber = "ArrayNumber"
     }
 
-
 }
-
diff --git a/samples/client/petstore/swift4/unwrapRequired/PetstoreClient/Classes/OpenAPIs/Models/ArrayTest.swift b/samples/client/petstore/swift4/unwrapRequired/PetstoreClient/Classes/OpenAPIs/Models/ArrayTest.swift
index 9c56fed50c..67f7f7e515 100644
--- a/samples/client/petstore/swift4/unwrapRequired/PetstoreClient/Classes/OpenAPIs/Models/ArrayTest.swift
+++ b/samples/client/petstore/swift4/unwrapRequired/PetstoreClient/Classes/OpenAPIs/Models/ArrayTest.swift
@@ -7,8 +7,6 @@
 
 import Foundation
 
-
-
 public struct ArrayTest: Codable {
 
     public var arrayOfString: [String]?
@@ -21,12 +19,10 @@ public struct ArrayTest: Codable {
         self.arrayArrayOfModel = arrayArrayOfModel
     }
 
-    public enum CodingKeys: String, CodingKey { 
+    public enum CodingKeys: String, CodingKey {
         case arrayOfString = "array_of_string"
         case arrayArrayOfInteger = "array_array_of_integer"
         case arrayArrayOfModel = "array_array_of_model"
     }
 
-
 }
-
diff --git a/samples/client/petstore/swift4/unwrapRequired/PetstoreClient/Classes/OpenAPIs/Models/Capitalization.swift b/samples/client/petstore/swift4/unwrapRequired/PetstoreClient/Classes/OpenAPIs/Models/Capitalization.swift
index 98cda23dac..d576b50b1c 100644
--- a/samples/client/petstore/swift4/unwrapRequired/PetstoreClient/Classes/OpenAPIs/Models/Capitalization.swift
+++ b/samples/client/petstore/swift4/unwrapRequired/PetstoreClient/Classes/OpenAPIs/Models/Capitalization.swift
@@ -7,8 +7,6 @@
 
 import Foundation
 
-
-
 public struct Capitalization: Codable {
 
     public var smallCamel: String?
@@ -28,7 +26,7 @@ public struct Capitalization: Codable {
         self.ATT_NAME = ATT_NAME
     }
 
-    public enum CodingKeys: String, CodingKey { 
+    public enum CodingKeys: String, CodingKey {
         case smallCamel
         case capitalCamel = "CapitalCamel"
         case smallSnake = "small_Snake"
@@ -37,6 +35,4 @@ public struct Capitalization: Codable {
         case ATT_NAME
     }
 
-
 }
-
diff --git a/samples/client/petstore/swift4/unwrapRequired/PetstoreClient/Classes/OpenAPIs/Models/Cat.swift b/samples/client/petstore/swift4/unwrapRequired/PetstoreClient/Classes/OpenAPIs/Models/Cat.swift
index c83ab1d0d9..d6133a3dd5 100644
--- a/samples/client/petstore/swift4/unwrapRequired/PetstoreClient/Classes/OpenAPIs/Models/Cat.swift
+++ b/samples/client/petstore/swift4/unwrapRequired/PetstoreClient/Classes/OpenAPIs/Models/Cat.swift
@@ -7,8 +7,6 @@
 
 import Foundation
 
-
-
 public struct Cat: Codable {
 
     public var className: String?
@@ -21,6 +19,4 @@ public struct Cat: Codable {
         self.declawed = declawed
     }
 
-
 }
-
diff --git a/samples/client/petstore/swift4/unwrapRequired/PetstoreClient/Classes/OpenAPIs/Models/CatAllOf.swift b/samples/client/petstore/swift4/unwrapRequired/PetstoreClient/Classes/OpenAPIs/Models/CatAllOf.swift
new file mode 100644
index 0000000000..a51ad0dffa
--- /dev/null
+++ b/samples/client/petstore/swift4/unwrapRequired/PetstoreClient/Classes/OpenAPIs/Models/CatAllOf.swift
@@ -0,0 +1,18 @@
+//
+// CatAllOf.swift
+//
+// Generated by openapi-generator
+// https://openapi-generator.tech
+//
+
+import Foundation
+
+public struct CatAllOf: Codable {
+
+    public var declawed: Bool?
+
+    public init(declawed: Bool?) {
+        self.declawed = declawed
+    }
+
+}
diff --git a/samples/client/petstore/swift4/unwrapRequired/PetstoreClient/Classes/OpenAPIs/Models/Category.swift b/samples/client/petstore/swift4/unwrapRequired/PetstoreClient/Classes/OpenAPIs/Models/Category.swift
index 3c11cfb3bc..48b43fc318 100644
--- a/samples/client/petstore/swift4/unwrapRequired/PetstoreClient/Classes/OpenAPIs/Models/Category.swift
+++ b/samples/client/petstore/swift4/unwrapRequired/PetstoreClient/Classes/OpenAPIs/Models/Category.swift
@@ -7,8 +7,6 @@
 
 import Foundation
 
-
-
 public struct Category: Codable {
 
     public var id: Int64?
@@ -19,6 +17,4 @@ public struct Category: Codable {
         self.name = name
     }
 
-
 }
-
diff --git a/samples/client/petstore/swift4/unwrapRequired/PetstoreClient/Classes/OpenAPIs/Models/ClassModel.swift b/samples/client/petstore/swift4/unwrapRequired/PetstoreClient/Classes/OpenAPIs/Models/ClassModel.swift
index f673ed127c..28cb30ce7b 100644
--- a/samples/client/petstore/swift4/unwrapRequired/PetstoreClient/Classes/OpenAPIs/Models/ClassModel.swift
+++ b/samples/client/petstore/swift4/unwrapRequired/PetstoreClient/Classes/OpenAPIs/Models/ClassModel.swift
@@ -7,7 +7,6 @@
 
 import Foundation
 
-
 /** Model for testing model with \&quot;_class\&quot; property */
 
 public struct ClassModel: Codable {
@@ -18,6 +17,4 @@ public struct ClassModel: Codable {
         self._class = _class
     }
 
-
 }
-
diff --git a/samples/client/petstore/swift4/unwrapRequired/PetstoreClient/Classes/OpenAPIs/Models/Client.swift b/samples/client/petstore/swift4/unwrapRequired/PetstoreClient/Classes/OpenAPIs/Models/Client.swift
index 51390b6c4e..00245ca372 100644
--- a/samples/client/petstore/swift4/unwrapRequired/PetstoreClient/Classes/OpenAPIs/Models/Client.swift
+++ b/samples/client/petstore/swift4/unwrapRequired/PetstoreClient/Classes/OpenAPIs/Models/Client.swift
@@ -7,8 +7,6 @@
 
 import Foundation
 
-
-
 public struct Client: Codable {
 
     public var client: String?
@@ -17,6 +15,4 @@ public struct Client: Codable {
         self.client = client
     }
 
-
 }
-
diff --git a/samples/client/petstore/swift4/unwrapRequired/PetstoreClient/Classes/OpenAPIs/Models/Dog.swift b/samples/client/petstore/swift4/unwrapRequired/PetstoreClient/Classes/OpenAPIs/Models/Dog.swift
index 9a30164953..35c8cea0dd 100644
--- a/samples/client/petstore/swift4/unwrapRequired/PetstoreClient/Classes/OpenAPIs/Models/Dog.swift
+++ b/samples/client/petstore/swift4/unwrapRequired/PetstoreClient/Classes/OpenAPIs/Models/Dog.swift
@@ -7,8 +7,6 @@
 
 import Foundation
 
-
-
 public struct Dog: Codable {
 
     public var className: String?
@@ -21,6 +19,4 @@ public struct Dog: Codable {
         self.breed = breed
     }
 
-
 }
-
diff --git a/samples/client/petstore/swift4/unwrapRequired/PetstoreClient/Classes/OpenAPIs/Models/DogAllOf.swift b/samples/client/petstore/swift4/unwrapRequired/PetstoreClient/Classes/OpenAPIs/Models/DogAllOf.swift
new file mode 100644
index 0000000000..7786f8acc5
--- /dev/null
+++ b/samples/client/petstore/swift4/unwrapRequired/PetstoreClient/Classes/OpenAPIs/Models/DogAllOf.swift
@@ -0,0 +1,18 @@
+//
+// DogAllOf.swift
+//
+// Generated by openapi-generator
+// https://openapi-generator.tech
+//
+
+import Foundation
+
+public struct DogAllOf: Codable {
+
+    public var breed: String?
+
+    public init(breed: String?) {
+        self.breed = breed
+    }
+
+}
diff --git a/samples/client/petstore/swift4/unwrapRequired/PetstoreClient/Classes/OpenAPIs/Models/EnumArrays.swift b/samples/client/petstore/swift4/unwrapRequired/PetstoreClient/Classes/OpenAPIs/Models/EnumArrays.swift
index 8713961520..5034ff0b8c 100644
--- a/samples/client/petstore/swift4/unwrapRequired/PetstoreClient/Classes/OpenAPIs/Models/EnumArrays.swift
+++ b/samples/client/petstore/swift4/unwrapRequired/PetstoreClient/Classes/OpenAPIs/Models/EnumArrays.swift
@@ -7,8 +7,6 @@
 
 import Foundation
 
-
-
 public struct EnumArrays: Codable {
 
     public enum JustSymbol: String, Codable {
@@ -27,11 +25,9 @@ public struct EnumArrays: Codable {
         self.arrayEnum = arrayEnum
     }
 
-    public enum CodingKeys: String, CodingKey { 
+    public enum CodingKeys: String, CodingKey {
         case justSymbol = "just_symbol"
         case arrayEnum = "array_enum"
     }
 
-
 }
-
diff --git a/samples/client/petstore/swift4/unwrapRequired/PetstoreClient/Classes/OpenAPIs/Models/EnumClass.swift b/samples/client/petstore/swift4/unwrapRequired/PetstoreClient/Classes/OpenAPIs/Models/EnumClass.swift
index 7280a621fe..3c1dfcac57 100644
--- a/samples/client/petstore/swift4/unwrapRequired/PetstoreClient/Classes/OpenAPIs/Models/EnumClass.swift
+++ b/samples/client/petstore/swift4/unwrapRequired/PetstoreClient/Classes/OpenAPIs/Models/EnumClass.swift
@@ -7,7 +7,6 @@
 
 import Foundation
 
-
 public enum EnumClass: String, Codable {
     case abc = "_abc"
     case efg = "-efg"
diff --git a/samples/client/petstore/swift4/unwrapRequired/PetstoreClient/Classes/OpenAPIs/Models/EnumTest.swift b/samples/client/petstore/swift4/unwrapRequired/PetstoreClient/Classes/OpenAPIs/Models/EnumTest.swift
index ed93ec357b..b1eb8e98f8 100644
--- a/samples/client/petstore/swift4/unwrapRequired/PetstoreClient/Classes/OpenAPIs/Models/EnumTest.swift
+++ b/samples/client/petstore/swift4/unwrapRequired/PetstoreClient/Classes/OpenAPIs/Models/EnumTest.swift
@@ -7,8 +7,6 @@
 
 import Foundation
 
-
-
 public struct EnumTest: Codable {
 
     public enum EnumString: String, Codable {
@@ -43,7 +41,7 @@ public struct EnumTest: Codable {
         self.outerEnum = outerEnum
     }
 
-    public enum CodingKeys: String, CodingKey { 
+    public enum CodingKeys: String, CodingKey {
         case enumString = "enum_string"
         case enumStringRequired = "enum_string_required"
         case enumInteger = "enum_integer"
@@ -51,6 +49,4 @@ public struct EnumTest: Codable {
         case outerEnum
     }
 
-
 }
-
diff --git a/samples/client/petstore/swift4/unwrapRequired/PetstoreClient/Classes/OpenAPIs/Models/File.swift b/samples/client/petstore/swift4/unwrapRequired/PetstoreClient/Classes/OpenAPIs/Models/File.swift
index c8bd1f1958..ea3520f053 100644
--- a/samples/client/petstore/swift4/unwrapRequired/PetstoreClient/Classes/OpenAPIs/Models/File.swift
+++ b/samples/client/petstore/swift4/unwrapRequired/PetstoreClient/Classes/OpenAPIs/Models/File.swift
@@ -7,7 +7,6 @@
 
 import Foundation
 
-
 /** Must be named &#x60;File&#x60; for test. */
 
 public struct File: Codable {
@@ -19,6 +18,4 @@ public struct File: Codable {
         self.sourceURI = sourceURI
     }
 
-
 }
-
diff --git a/samples/client/petstore/swift4/unwrapRequired/PetstoreClient/Classes/OpenAPIs/Models/FileSchemaTestClass.swift b/samples/client/petstore/swift4/unwrapRequired/PetstoreClient/Classes/OpenAPIs/Models/FileSchemaTestClass.swift
index 64d0250680..532f145793 100644
--- a/samples/client/petstore/swift4/unwrapRequired/PetstoreClient/Classes/OpenAPIs/Models/FileSchemaTestClass.swift
+++ b/samples/client/petstore/swift4/unwrapRequired/PetstoreClient/Classes/OpenAPIs/Models/FileSchemaTestClass.swift
@@ -7,8 +7,6 @@
 
 import Foundation
 
-
-
 public struct FileSchemaTestClass: Codable {
 
     public var file: File?
@@ -19,6 +17,4 @@ public struct FileSchemaTestClass: Codable {
         self.files = files
     }
 
-
 }
-
diff --git a/samples/client/petstore/swift4/unwrapRequired/PetstoreClient/Classes/OpenAPIs/Models/FormatTest.swift b/samples/client/petstore/swift4/unwrapRequired/PetstoreClient/Classes/OpenAPIs/Models/FormatTest.swift
index 7b26d8d80e..4eed10b95a 100644
--- a/samples/client/petstore/swift4/unwrapRequired/PetstoreClient/Classes/OpenAPIs/Models/FormatTest.swift
+++ b/samples/client/petstore/swift4/unwrapRequired/PetstoreClient/Classes/OpenAPIs/Models/FormatTest.swift
@@ -7,8 +7,6 @@
 
 import Foundation
 
-
-
 public struct FormatTest: Codable {
 
     public var integer: Int?
@@ -41,6 +39,4 @@ public struct FormatTest: Codable {
         self.password = password
     }
 
-
 }
-
diff --git a/samples/client/petstore/swift4/unwrapRequired/PetstoreClient/Classes/OpenAPIs/Models/HasOnlyReadOnly.swift b/samples/client/petstore/swift4/unwrapRequired/PetstoreClient/Classes/OpenAPIs/Models/HasOnlyReadOnly.swift
index 554aee1081..906ddb06fb 100644
--- a/samples/client/petstore/swift4/unwrapRequired/PetstoreClient/Classes/OpenAPIs/Models/HasOnlyReadOnly.swift
+++ b/samples/client/petstore/swift4/unwrapRequired/PetstoreClient/Classes/OpenAPIs/Models/HasOnlyReadOnly.swift
@@ -7,8 +7,6 @@
 
 import Foundation
 
-
-
 public struct HasOnlyReadOnly: Codable {
 
     public var bar: String?
@@ -19,6 +17,4 @@ public struct HasOnlyReadOnly: Codable {
         self.foo = foo
     }
 
-
 }
-
diff --git a/samples/client/petstore/swift4/unwrapRequired/PetstoreClient/Classes/OpenAPIs/Models/List.swift b/samples/client/petstore/swift4/unwrapRequired/PetstoreClient/Classes/OpenAPIs/Models/List.swift
index 8997340ff4..08d5995387 100644
--- a/samples/client/petstore/swift4/unwrapRequired/PetstoreClient/Classes/OpenAPIs/Models/List.swift
+++ b/samples/client/petstore/swift4/unwrapRequired/PetstoreClient/Classes/OpenAPIs/Models/List.swift
@@ -7,8 +7,6 @@
 
 import Foundation
 
-
-
 public struct List: Codable {
 
     public var _123list: String?
@@ -17,10 +15,8 @@ public struct List: Codable {
         self._123list = _123list
     }
 
-    public enum CodingKeys: String, CodingKey { 
+    public enum CodingKeys: String, CodingKey {
         case _123list = "123-list"
     }
 
-
 }
-
diff --git a/samples/client/petstore/swift4/unwrapRequired/PetstoreClient/Classes/OpenAPIs/Models/MapTest.swift b/samples/client/petstore/swift4/unwrapRequired/PetstoreClient/Classes/OpenAPIs/Models/MapTest.swift
index 2d3a45d35a..3a10a7dfca 100644
--- a/samples/client/petstore/swift4/unwrapRequired/PetstoreClient/Classes/OpenAPIs/Models/MapTest.swift
+++ b/samples/client/petstore/swift4/unwrapRequired/PetstoreClient/Classes/OpenAPIs/Models/MapTest.swift
@@ -7,33 +7,29 @@
 
 import Foundation
 
-
-
 public struct MapTest: Codable {
 
     public enum MapOfEnumString: String, Codable {
         case upper = "UPPER"
         case lower = "lower"
     }
-    public var mapMapOfString: [String:[String:String]]?
-    public var mapOfEnumString: [String:String]?
-    public var directMap: [String:Bool]?
+    public var mapMapOfString: [String: [String: String]]?
+    public var mapOfEnumString: [String: String]?
+    public var directMap: [String: Bool]?
     public var indirectMap: StringBooleanMap?
 
-    public init(mapMapOfString: [String:[String:String]]?, mapOfEnumString: [String:String]?, directMap: [String:Bool]?, indirectMap: StringBooleanMap?) {
+    public init(mapMapOfString: [String: [String: String]]?, mapOfEnumString: [String: String]?, directMap: [String: Bool]?, indirectMap: StringBooleanMap?) {
         self.mapMapOfString = mapMapOfString
         self.mapOfEnumString = mapOfEnumString
         self.directMap = directMap
         self.indirectMap = indirectMap
     }
 
-    public enum CodingKeys: String, CodingKey { 
+    public enum CodingKeys: String, CodingKey {
         case mapMapOfString = "map_map_of_string"
         case mapOfEnumString = "map_of_enum_string"
         case directMap = "direct_map"
         case indirectMap = "indirect_map"
     }
 
-
 }
-
diff --git a/samples/client/petstore/swift4/unwrapRequired/PetstoreClient/Classes/OpenAPIs/Models/MixedPropertiesAndAdditionalPropertiesClass.swift b/samples/client/petstore/swift4/unwrapRequired/PetstoreClient/Classes/OpenAPIs/Models/MixedPropertiesAndAdditionalPropertiesClass.swift
index 7116108fd7..c3deb2f289 100644
--- a/samples/client/petstore/swift4/unwrapRequired/PetstoreClient/Classes/OpenAPIs/Models/MixedPropertiesAndAdditionalPropertiesClass.swift
+++ b/samples/client/petstore/swift4/unwrapRequired/PetstoreClient/Classes/OpenAPIs/Models/MixedPropertiesAndAdditionalPropertiesClass.swift
@@ -7,20 +7,16 @@
 
 import Foundation
 
-
-
 public struct MixedPropertiesAndAdditionalPropertiesClass: Codable {
 
     public var uuid: UUID?
     public var dateTime: Date?
-    public var map: [String:Animal]?
+    public var map: [String: Animal]?
 
-    public init(uuid: UUID?, dateTime: Date?, map: [String:Animal]?) {
+    public init(uuid: UUID?, dateTime: Date?, map: [String: Animal]?) {
         self.uuid = uuid
         self.dateTime = dateTime
         self.map = map
     }
 
-
 }
-
diff --git a/samples/client/petstore/swift4/unwrapRequired/PetstoreClient/Classes/OpenAPIs/Models/Model200Response.swift b/samples/client/petstore/swift4/unwrapRequired/PetstoreClient/Classes/OpenAPIs/Models/Model200Response.swift
index fc1d0606b7..7ed6aad907 100644
--- a/samples/client/petstore/swift4/unwrapRequired/PetstoreClient/Classes/OpenAPIs/Models/Model200Response.swift
+++ b/samples/client/petstore/swift4/unwrapRequired/PetstoreClient/Classes/OpenAPIs/Models/Model200Response.swift
@@ -7,7 +7,6 @@
 
 import Foundation
 
-
 /** Model for testing model name starting with number */
 
 public struct Model200Response: Codable {
@@ -20,11 +19,9 @@ public struct Model200Response: Codable {
         self._class = _class
     }
 
-    public enum CodingKeys: String, CodingKey { 
+    public enum CodingKeys: String, CodingKey {
         case name
         case _class = "class"
     }
 
-
 }
-
diff --git a/samples/client/petstore/swift4/unwrapRequired/PetstoreClient/Classes/OpenAPIs/Models/Name.swift b/samples/client/petstore/swift4/unwrapRequired/PetstoreClient/Classes/OpenAPIs/Models/Name.swift
index bd7ad7ee6f..71ba4c05dc 100644
--- a/samples/client/petstore/swift4/unwrapRequired/PetstoreClient/Classes/OpenAPIs/Models/Name.swift
+++ b/samples/client/petstore/swift4/unwrapRequired/PetstoreClient/Classes/OpenAPIs/Models/Name.swift
@@ -7,7 +7,6 @@
 
 import Foundation
 
-
 /** Model for testing model name same as property name */
 
 public struct Name: Codable {
@@ -24,13 +23,11 @@ public struct Name: Codable {
         self._123number = _123number
     }
 
-    public enum CodingKeys: String, CodingKey { 
+    public enum CodingKeys: String, CodingKey {
         case name
         case snakeCase = "snake_case"
         case property
         case _123number = "123Number"
     }
 
-
 }
-
diff --git a/samples/client/petstore/swift4/unwrapRequired/PetstoreClient/Classes/OpenAPIs/Models/NumberOnly.swift b/samples/client/petstore/swift4/unwrapRequired/PetstoreClient/Classes/OpenAPIs/Models/NumberOnly.swift
index e6fb206093..abd2269e8e 100644
--- a/samples/client/petstore/swift4/unwrapRequired/PetstoreClient/Classes/OpenAPIs/Models/NumberOnly.swift
+++ b/samples/client/petstore/swift4/unwrapRequired/PetstoreClient/Classes/OpenAPIs/Models/NumberOnly.swift
@@ -7,8 +7,6 @@
 
 import Foundation
 
-
-
 public struct NumberOnly: Codable {
 
     public var justNumber: Double?
@@ -17,10 +15,8 @@ public struct NumberOnly: Codable {
         self.justNumber = justNumber
     }
 
-    public enum CodingKeys: String, CodingKey { 
+    public enum CodingKeys: String, CodingKey {
         case justNumber = "JustNumber"
     }
 
-
 }
-
diff --git a/samples/client/petstore/swift4/unwrapRequired/PetstoreClient/Classes/OpenAPIs/Models/Order.swift b/samples/client/petstore/swift4/unwrapRequired/PetstoreClient/Classes/OpenAPIs/Models/Order.swift
index 83c3b85e66..a6e1b1d2e5 100644
--- a/samples/client/petstore/swift4/unwrapRequired/PetstoreClient/Classes/OpenAPIs/Models/Order.swift
+++ b/samples/client/petstore/swift4/unwrapRequired/PetstoreClient/Classes/OpenAPIs/Models/Order.swift
@@ -7,8 +7,6 @@
 
 import Foundation
 
-
-
 public struct Order: Codable {
 
     public enum Status: String, Codable {
@@ -33,6 +31,4 @@ public struct Order: Codable {
         self.complete = complete
     }
 
-
 }
-
diff --git a/samples/client/petstore/swift4/unwrapRequired/PetstoreClient/Classes/OpenAPIs/Models/OuterComposite.swift b/samples/client/petstore/swift4/unwrapRequired/PetstoreClient/Classes/OpenAPIs/Models/OuterComposite.swift
index edc4523d9f..49aec001c5 100644
--- a/samples/client/petstore/swift4/unwrapRequired/PetstoreClient/Classes/OpenAPIs/Models/OuterComposite.swift
+++ b/samples/client/petstore/swift4/unwrapRequired/PetstoreClient/Classes/OpenAPIs/Models/OuterComposite.swift
@@ -7,8 +7,6 @@
 
 import Foundation
 
-
-
 public struct OuterComposite: Codable {
 
     public var myNumber: Double?
@@ -21,12 +19,10 @@ public struct OuterComposite: Codable {
         self.myBoolean = myBoolean
     }
 
-    public enum CodingKeys: String, CodingKey { 
+    public enum CodingKeys: String, CodingKey {
         case myNumber = "my_number"
         case myString = "my_string"
         case myBoolean = "my_boolean"
     }
 
-
 }
-
diff --git a/samples/client/petstore/swift4/unwrapRequired/PetstoreClient/Classes/OpenAPIs/Models/OuterEnum.swift b/samples/client/petstore/swift4/unwrapRequired/PetstoreClient/Classes/OpenAPIs/Models/OuterEnum.swift
index bd1643d279..9f80fc95ec 100644
--- a/samples/client/petstore/swift4/unwrapRequired/PetstoreClient/Classes/OpenAPIs/Models/OuterEnum.swift
+++ b/samples/client/petstore/swift4/unwrapRequired/PetstoreClient/Classes/OpenAPIs/Models/OuterEnum.swift
@@ -7,7 +7,6 @@
 
 import Foundation
 
-
 public enum OuterEnum: String, Codable {
     case placed = "placed"
     case approved = "approved"
diff --git a/samples/client/petstore/swift4/unwrapRequired/PetstoreClient/Classes/OpenAPIs/Models/Pet.swift b/samples/client/petstore/swift4/unwrapRequired/PetstoreClient/Classes/OpenAPIs/Models/Pet.swift
index 9880907ec9..99eaa1329e 100644
--- a/samples/client/petstore/swift4/unwrapRequired/PetstoreClient/Classes/OpenAPIs/Models/Pet.swift
+++ b/samples/client/petstore/swift4/unwrapRequired/PetstoreClient/Classes/OpenAPIs/Models/Pet.swift
@@ -7,8 +7,6 @@
 
 import Foundation
 
-
-
 public struct Pet: Codable {
 
     public enum Status: String, Codable {
@@ -33,6 +31,4 @@ public struct Pet: Codable {
         self.status = status
     }
 
-
 }
-
diff --git a/samples/client/petstore/swift4/unwrapRequired/PetstoreClient/Classes/OpenAPIs/Models/ReadOnlyFirst.swift b/samples/client/petstore/swift4/unwrapRequired/PetstoreClient/Classes/OpenAPIs/Models/ReadOnlyFirst.swift
index 48b655a5b0..0acd21fd10 100644
--- a/samples/client/petstore/swift4/unwrapRequired/PetstoreClient/Classes/OpenAPIs/Models/ReadOnlyFirst.swift
+++ b/samples/client/petstore/swift4/unwrapRequired/PetstoreClient/Classes/OpenAPIs/Models/ReadOnlyFirst.swift
@@ -7,8 +7,6 @@
 
 import Foundation
 
-
-
 public struct ReadOnlyFirst: Codable {
 
     public var bar: String?
@@ -19,6 +17,4 @@ public struct ReadOnlyFirst: Codable {
         self.baz = baz
     }
 
-
 }
-
diff --git a/samples/client/petstore/swift4/unwrapRequired/PetstoreClient/Classes/OpenAPIs/Models/Return.swift b/samples/client/petstore/swift4/unwrapRequired/PetstoreClient/Classes/OpenAPIs/Models/Return.swift
index de4b218999..076082af84 100644
--- a/samples/client/petstore/swift4/unwrapRequired/PetstoreClient/Classes/OpenAPIs/Models/Return.swift
+++ b/samples/client/petstore/swift4/unwrapRequired/PetstoreClient/Classes/OpenAPIs/Models/Return.swift
@@ -7,7 +7,6 @@
 
 import Foundation
 
-
 /** Model for testing reserved words */
 
 public struct Return: Codable {
@@ -18,10 +17,8 @@ public struct Return: Codable {
         self._return = _return
     }
 
-    public enum CodingKeys: String, CodingKey { 
+    public enum CodingKeys: String, CodingKey {
         case _return = "return"
     }
 
-
 }
-
diff --git a/samples/client/petstore/swift4/unwrapRequired/PetstoreClient/Classes/OpenAPIs/Models/SpecialModelName.swift b/samples/client/petstore/swift4/unwrapRequired/PetstoreClient/Classes/OpenAPIs/Models/SpecialModelName.swift
index 213d896ba9..e79fc45c0e 100644
--- a/samples/client/petstore/swift4/unwrapRequired/PetstoreClient/Classes/OpenAPIs/Models/SpecialModelName.swift
+++ b/samples/client/petstore/swift4/unwrapRequired/PetstoreClient/Classes/OpenAPIs/Models/SpecialModelName.swift
@@ -7,8 +7,6 @@
 
 import Foundation
 
-
-
 public struct SpecialModelName: Codable {
 
     public var specialPropertyName: Int64?
@@ -17,10 +15,8 @@ public struct SpecialModelName: Codable {
         self.specialPropertyName = specialPropertyName
     }
 
-    public enum CodingKeys: String, CodingKey { 
+    public enum CodingKeys: String, CodingKey {
         case specialPropertyName = "$special[property.name]"
     }
 
-
 }
-
diff --git a/samples/client/petstore/swift4/unwrapRequired/PetstoreClient/Classes/OpenAPIs/Models/StringBooleanMap.swift b/samples/client/petstore/swift4/unwrapRequired/PetstoreClient/Classes/OpenAPIs/Models/StringBooleanMap.swift
index ae15e87d94..3f1237fee4 100644
--- a/samples/client/petstore/swift4/unwrapRequired/PetstoreClient/Classes/OpenAPIs/Models/StringBooleanMap.swift
+++ b/samples/client/petstore/swift4/unwrapRequired/PetstoreClient/Classes/OpenAPIs/Models/StringBooleanMap.swift
@@ -7,12 +7,9 @@
 
 import Foundation
 
-
-
 public struct StringBooleanMap: Codable {
 
-
-    public var additionalProperties: [String:Bool] = [:]
+    public var additionalProperties: [String: Bool] = [:]
 
     public subscript(key: String) -> Bool? {
         get {
@@ -45,7 +42,4 @@ public struct StringBooleanMap: Codable {
         additionalProperties = try container.decodeMap(Bool.self, excludedKeys: nonAdditionalPropertyKeys)
     }
 
-
-
 }
-
diff --git a/samples/client/petstore/swift4/unwrapRequired/PetstoreClient/Classes/OpenAPIs/Models/Tag.swift b/samples/client/petstore/swift4/unwrapRequired/PetstoreClient/Classes/OpenAPIs/Models/Tag.swift
index 32ee33a1a1..4dd8a9a9f5 100644
--- a/samples/client/petstore/swift4/unwrapRequired/PetstoreClient/Classes/OpenAPIs/Models/Tag.swift
+++ b/samples/client/petstore/swift4/unwrapRequired/PetstoreClient/Classes/OpenAPIs/Models/Tag.swift
@@ -7,8 +7,6 @@
 
 import Foundation
 
-
-
 public struct Tag: Codable {
 
     public var id: Int64?
@@ -19,6 +17,4 @@ public struct Tag: Codable {
         self.name = name
     }
 
-
 }
-
diff --git a/samples/client/petstore/swift4/unwrapRequired/PetstoreClient/Classes/OpenAPIs/Models/TypeHolderDefault.swift b/samples/client/petstore/swift4/unwrapRequired/PetstoreClient/Classes/OpenAPIs/Models/TypeHolderDefault.swift
index a088a2ad87..07b590ab10 100644
--- a/samples/client/petstore/swift4/unwrapRequired/PetstoreClient/Classes/OpenAPIs/Models/TypeHolderDefault.swift
+++ b/samples/client/petstore/swift4/unwrapRequired/PetstoreClient/Classes/OpenAPIs/Models/TypeHolderDefault.swift
@@ -7,8 +7,6 @@
 
 import Foundation
 
-
-
 public struct TypeHolderDefault: Codable {
 
     public var stringItem: String? = "what"
@@ -25,7 +23,7 @@ public struct TypeHolderDefault: Codable {
         self.arrayItem = arrayItem
     }
 
-    public enum CodingKeys: String, CodingKey { 
+    public enum CodingKeys: String, CodingKey {
         case stringItem = "string_item"
         case numberItem = "number_item"
         case integerItem = "integer_item"
@@ -33,6 +31,4 @@ public struct TypeHolderDefault: Codable {
         case arrayItem = "array_item"
     }
 
-
 }
-
diff --git a/samples/client/petstore/swift4/unwrapRequired/PetstoreClient/Classes/OpenAPIs/Models/TypeHolderExample.swift b/samples/client/petstore/swift4/unwrapRequired/PetstoreClient/Classes/OpenAPIs/Models/TypeHolderExample.swift
index 3e91d9485c..29d0051617 100644
--- a/samples/client/petstore/swift4/unwrapRequired/PetstoreClient/Classes/OpenAPIs/Models/TypeHolderExample.swift
+++ b/samples/client/petstore/swift4/unwrapRequired/PetstoreClient/Classes/OpenAPIs/Models/TypeHolderExample.swift
@@ -7,8 +7,6 @@
 
 import Foundation
 
-
-
 public struct TypeHolderExample: Codable {
 
     public var stringItem: String?
@@ -25,7 +23,7 @@ public struct TypeHolderExample: Codable {
         self.arrayItem = arrayItem
     }
 
-    public enum CodingKeys: String, CodingKey { 
+    public enum CodingKeys: String, CodingKey {
         case stringItem = "string_item"
         case numberItem = "number_item"
         case integerItem = "integer_item"
@@ -33,6 +31,4 @@ public struct TypeHolderExample: Codable {
         case arrayItem = "array_item"
     }
 
-
 }
-
diff --git a/samples/client/petstore/swift4/unwrapRequired/PetstoreClient/Classes/OpenAPIs/Models/User.swift b/samples/client/petstore/swift4/unwrapRequired/PetstoreClient/Classes/OpenAPIs/Models/User.swift
index a61b584420..79f271ed73 100644
--- a/samples/client/petstore/swift4/unwrapRequired/PetstoreClient/Classes/OpenAPIs/Models/User.swift
+++ b/samples/client/petstore/swift4/unwrapRequired/PetstoreClient/Classes/OpenAPIs/Models/User.swift
@@ -7,8 +7,6 @@
 
 import Foundation
 
-
-
 public struct User: Codable {
 
     public var id: Int64?
@@ -32,6 +30,4 @@ public struct User: Codable {
         self.userStatus = userStatus
     }
 
-
 }
-
diff --git a/samples/client/petstore/swift4/unwrapRequired/PetstoreClient/Classes/OpenAPIs/Models/XmlItem.swift b/samples/client/petstore/swift4/unwrapRequired/PetstoreClient/Classes/OpenAPIs/Models/XmlItem.swift
index e1b1ace8b1..aa01668350 100644
--- a/samples/client/petstore/swift4/unwrapRequired/PetstoreClient/Classes/OpenAPIs/Models/XmlItem.swift
+++ b/samples/client/petstore/swift4/unwrapRequired/PetstoreClient/Classes/OpenAPIs/Models/XmlItem.swift
@@ -7,8 +7,6 @@
 
 import Foundation
 
-
-
 public struct XmlItem: Codable {
 
     public var attributeString: String?
@@ -73,7 +71,7 @@ public struct XmlItem: Codable {
         self.prefixNsWrappedArray = prefixNsWrappedArray
     }
 
-    public enum CodingKeys: String, CodingKey { 
+    public enum CodingKeys: String, CodingKey {
         case attributeString = "attribute_string"
         case attributeNumber = "attribute_number"
         case attributeInteger = "attribute_integer"
@@ -105,6 +103,4 @@ public struct XmlItem: Codable {
         case prefixNsWrappedArray = "prefix_ns_wrapped_array"
     }
 
-
 }
-
diff --git a/samples/client/petstore/swift4/unwrapRequired/README.md b/samples/client/petstore/swift4/unwrapRequired/README.md
index 1e7f0a59ea..0711eb8705 100644
--- a/samples/client/petstore/swift4/unwrapRequired/README.md
+++ b/samples/client/petstore/swift4/unwrapRequired/README.md
@@ -73,10 +73,12 @@ Class | Method | HTTP request | Description
  - [ArrayTest](docs/ArrayTest.md)
  - [Capitalization](docs/Capitalization.md)
  - [Cat](docs/Cat.md)
+ - [CatAllOf](docs/CatAllOf.md)
  - [Category](docs/Category.md)
  - [ClassModel](docs/ClassModel.md)
  - [Client](docs/Client.md)
  - [Dog](docs/Dog.md)
+ - [DogAllOf](docs/DogAllOf.md)
  - [EnumArrays](docs/EnumArrays.md)
  - [EnumClass](docs/EnumClass.md)
  - [EnumTest](docs/EnumTest.md)
diff --git a/samples/client/petstore/swift4/unwrapRequired/docs/CatAllOf.md b/samples/client/petstore/swift4/unwrapRequired/docs/CatAllOf.md
new file mode 100644
index 0000000000..79789be61c
--- /dev/null
+++ b/samples/client/petstore/swift4/unwrapRequired/docs/CatAllOf.md
@@ -0,0 +1,10 @@
+# CatAllOf
+
+## Properties
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**declawed** | **Bool** |  | [optional] 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
+
diff --git a/samples/client/petstore/swift4/unwrapRequired/docs/DogAllOf.md b/samples/client/petstore/swift4/unwrapRequired/docs/DogAllOf.md
new file mode 100644
index 0000000000..9302ef52e9
--- /dev/null
+++ b/samples/client/petstore/swift4/unwrapRequired/docs/DogAllOf.md
@@ -0,0 +1,10 @@
+# DogAllOf
+
+## Properties
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**breed** | **String** |  | [optional] 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
+
diff --git a/samples/client/petstore/swift4/unwrapRequired/docs/UserAPI.md b/samples/client/petstore/swift4/unwrapRequired/docs/UserAPI.md
index da20013482..380813bc68 100644
--- a/samples/client/petstore/swift4/unwrapRequired/docs/UserAPI.md
+++ b/samples/client/petstore/swift4/unwrapRequired/docs/UserAPI.md
@@ -95,7 +95,7 @@ UserAPI.createUsersWithArrayInput(body: body) { (response, error) in
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **body** | [**[User]**](Array.md) | List of user object | 
+ **body** | [**[User]**](User.md) | List of user object | 
 
 ### Return type
 
@@ -143,7 +143,7 @@ UserAPI.createUsersWithListInput(body: body) { (response, error) in
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **body** | [**[User]**](Array.md) | List of user object | 
+ **body** | [**[User]**](User.md) | List of user object | 
 
 ### Return type
 
diff --git a/samples/client/petstore/swift4/unwrapRequired/project.yml b/samples/client/petstore/swift4/unwrapRequired/project.yml
new file mode 100644
index 0000000000..148b42517b
--- /dev/null
+++ b/samples/client/petstore/swift4/unwrapRequired/project.yml
@@ -0,0 +1,15 @@
+name: PetstoreClient
+targets:
+  PetstoreClient:
+    type: framework
+    platform: iOS
+    deploymentTarget: "10.0"
+    sources: [PetstoreClient]
+    info:
+      path: ./Info.plist
+      version: 1.0.0
+    settings:
+      APPLICATION_EXTENSION_API_ONLY: true
+    scheme: {}
+    dependencies:
+    - carthage: Alamofire
diff --git a/samples/client/test/swift4/default/.openapi-generator/VERSION b/samples/client/test/swift4/default/.openapi-generator/VERSION
index afa6365606..83a328a922 100644
--- a/samples/client/test/swift4/default/.openapi-generator/VERSION
+++ b/samples/client/test/swift4/default/.openapi-generator/VERSION
@@ -1 +1 @@
-4.0.0-SNAPSHOT
\ No newline at end of file
+4.1.0-SNAPSHOT
\ No newline at end of file
diff --git a/samples/client/test/swift4/default/Info.plist b/samples/client/test/swift4/default/Info.plist
new file mode 100644
index 0000000000..323e5ecfc4
--- /dev/null
+++ b/samples/client/test/swift4/default/Info.plist
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>CFBundleDevelopmentRegion</key>
+	<string>$(DEVELOPMENT_LANGUAGE)</string>
+	<key>CFBundleExecutable</key>
+	<string>$(EXECUTABLE_NAME)</string>
+	<key>CFBundleIdentifier</key>
+	<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
+	<key>CFBundleInfoDictionaryVersion</key>
+	<string>6.0</string>
+	<key>CFBundleName</key>
+	<string>$(PRODUCT_NAME)</string>
+	<key>CFBundlePackageType</key>
+	<string>FMWK</string>
+	<key>CFBundleShortVersionString</key>
+	<string>1.0</string>
+	<key>CFBundleVersion</key>
+	<string>1</string>
+</dict>
+</plist>
diff --git a/samples/client/test/swift4/default/README.md b/samples/client/test/swift4/default/README.md
new file mode 100644
index 0000000000..af6b0e46c4
--- /dev/null
+++ b/samples/client/test/swift4/default/README.md
@@ -0,0 +1,58 @@
+# Swift4 API client for TestClient
+
+This is a test schema which exercises Swagger schema features for testing the swift4 language codegen module.
+
+## Overview
+This API client was generated by the [OpenAPI Generator](https://openapi-generator.tech) project.  By using the [openapi-spec from a remote server, you can easily generate an API client.
+
+- API version: 1.0
+- Package version: 
+- Build package: org.openapitools.codegen.languages.Swift4Codegen
+For more information, please visit [http://www.example.com](http://www.example.com)
+
+## Installation
+
+### Carthage
+
+Run `carthage update`
+
+### CocoaPods
+
+Run `pod install`
+
+## Documentation for API Endpoints
+
+All URIs are relative to *http://api.example.com/basePath*
+
+Class | Method | HTTP request | Description
+------------ | ------------- | ------------- | -------------
+*Swift4TestAPI* | [**getAllModels**](docs/Swift4TestAPI.md#getallmodels) | **GET** /allModels | Get all of the models
+
+
+## Documentation For Models
+
+ - [AllPrimitives](docs/AllPrimitives.md)
+ - [BaseCard](docs/BaseCard.md)
+ - [ErrorInfo](docs/ErrorInfo.md)
+ - [GetAllModelsResult](docs/GetAllModelsResult.md)
+ - [ModelWithPropertiesAndAdditionalProperties](docs/ModelWithPropertiesAndAdditionalProperties.md)
+ - [PersonCard](docs/PersonCard.md)
+ - [PersonCardAllOf](docs/PersonCardAllOf.md)
+ - [PlaceCard](docs/PlaceCard.md)
+ - [PlaceCardAllOf](docs/PlaceCardAllOf.md)
+ - [SampleBase](docs/SampleBase.md)
+ - [SampleSubClass](docs/SampleSubClass.md)
+ - [SampleSubClassAllOf](docs/SampleSubClassAllOf.md)
+ - [StringEnum](docs/StringEnum.md)
+ - [VariableNameTest](docs/VariableNameTest.md)
+
+
+## Documentation For Authorization
+
+ All endpoints do not require authorization.
+
+
+## Author
+
+jdoe@example.com
+
diff --git a/samples/client/test/swift4/default/TestClient.xcodeproj/project.pbxproj b/samples/client/test/swift4/default/TestClient.xcodeproj/project.pbxproj
new file mode 100644
index 0000000000..dbc59b12b2
--- /dev/null
+++ b/samples/client/test/swift4/default/TestClient.xcodeproj/project.pbxproj
@@ -0,0 +1,593 @@
+// !$*UTF8*$!
+{
+	archiveVersion = 1;
+	classes = {
+	};
+	objectVersion = 50;
+	objects = {
+
+/* Begin PBXBuildFile section */
+		015BD03CC4B1E0523177800208C0941C /* VariableNameTest.swift in Sources */ = {isa = PBXBuildFile; fileRef = 54860017185201A4C2A2F5445827D65E /* VariableNameTest.swift */; };
+		01B77912657B2635F5194D37366617E0 /* ModelDoubleArray.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3CB11DB8C924DADEC4055271EE72A9F7 /* ModelDoubleArray.swift */; };
+		0465C21A1C77CFA0FBB67D6A38BB6A70 /* SampleSubClassAllOf.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6555C6E30D09EAE39142D186B12DA851 /* SampleSubClassAllOf.swift */; };
+		05D8F159919BB1360370082D6B15E96F /* ModelWithPropertiesAndAdditionalProperties.swift in Sources */ = {isa = PBXBuildFile; fileRef = 05A0A03CD4A9113B9D91606FC3E78A07 /* ModelWithPropertiesAndAdditionalProperties.swift */; };
+		07A16BBDCAB4E02659E6649DC6ECD59E /* Configuration.swift in Sources */ = {isa = PBXBuildFile; fileRef = CE6DF5346C62BDE2DAFA3B4EADAB1E15 /* Configuration.swift */; };
+		0AE08DF8DEB5A721A8F1CEFF6609AF91 /* ErrorInfo.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1A813A17AF964F26FB864212260A93BA /* ErrorInfo.swift */; };
+		1548FDC096222C790A4BDAC1F9B0C7A3 /* CodableHelper.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9EAA1DBBB82C7F083B98595F00C3DB8F /* CodableHelper.swift */; };
+		1CBAE9E5347B8227EE53A7C31FFFDA8E /* APIs.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4F6F3F378FFC3FC0AC42268DFF60C672 /* APIs.swift */; };
+		247482A8C1C15C7AA16AAB1C68B7D4D3 /* SampleSubClass.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5626F1C9CCDE265EB25BBD47BB82FE20 /* SampleSubClass.swift */; };
+		29740774C4E591A43BFE5AD5D850D607 /* ModelErrorInfoArray.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B74ECB05DB9BEC1D5ECEBF80D21EC72 /* ModelErrorInfoArray.swift */; };
+		341277CE94C8DDF543DF60E31D5AAF90 /* APIs.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2F5B983EDA0E1D0C2C8FEDA73D46B99C /* APIs.swift */; };
+		36928C9EC7BF34D1ABA17C9C99F48CA1 /* AllPrimitives.swift in Sources */ = {isa = PBXBuildFile; fileRef = B2A122B51B1736ACC859570A549F5697 /* AllPrimitives.swift */; };
+		39DA43938F1273FB74FA70398E416D97 /* APIHelper.swift in Sources */ = {isa = PBXBuildFile; fileRef = C6AD136503821775A39AEEEA6068B078 /* APIHelper.swift */; };
+		3A04A4CA0C6EF8EED2A566EF631CDA38 /* AllPrimitives.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7EE13D018B8E8F7283534E949DE9C1A5 /* AllPrimitives.swift */; };
+		488FF52AADBE1FC70A2314B165608539 /* VariableNameTest.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7C09C1DB6708AB2D8997BEE265743B66 /* VariableNameTest.swift */; };
+		5783CA3FD89CF0E9EDC6687D87375645 /* SampleBase.swift in Sources */ = {isa = PBXBuildFile; fileRef = BDF35F63D7105D55BA0D3FD910934C7E /* SampleBase.swift */; };
+		597201DACC303FF640F7BEDA3677FEC9 /* AlamofireImplementations.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1E7F1C8F69E25D093E56B114A316C29B /* AlamofireImplementations.swift */; };
+		5A7FBED271D728F0381000757B16E02E /* CodableHelper.swift in Sources */ = {isa = PBXBuildFile; fileRef = 93BA682C97038055435A32D0B20421CA /* CodableHelper.swift */; };
+		6925079AF17449A1098980FD21661772 /* GetAllModelsResult.swift in Sources */ = {isa = PBXBuildFile; fileRef = CD4DAE449BCB032587594847465761DA /* GetAllModelsResult.swift */; };
+		6930D98F5DCC24DB5FA6BF4878265540 /* BaseCard.swift in Sources */ = {isa = PBXBuildFile; fileRef = C209BA7D3B7026133ACB614905CDF3DE /* BaseCard.swift */; };
+		6AF51F30439F60E4EBB0B67B9146DAEA /* SampleSubClass.swift in Sources */ = {isa = PBXBuildFile; fileRef = EA9C1F9551FB619240EC0F703D6B8C39 /* SampleSubClass.swift */; };
+		70C0212AE5CDB0BEF5657DF81250D036 /* PlaceCard.swift in Sources */ = {isa = PBXBuildFile; fileRef = 13DD01D5ABD4BE352CB6FCBF31194C69 /* PlaceCard.swift */; };
+		747AC6451754CEF1193D159865B4FDED /* ErrorInfo.swift in Sources */ = {isa = PBXBuildFile; fileRef = 671A11EAF02ED88CFFDAFBC52D66F274 /* ErrorInfo.swift */; };
+		7756C1C6B2B94E3454286401BCDEF17E /* Configuration.swift in Sources */ = {isa = PBXBuildFile; fileRef = 69A98ECBBBE9667D9847EEABC00CCBC0 /* Configuration.swift */; };
+		7948167C041B9082A9F1281E44009E0A /* APIHelper.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5EF84FF97BA833181D55A51ACBBFF218 /* APIHelper.swift */; };
+		7B8A7764281B9CD000F38C5093E0B6F7 /* JSONEncodableEncoding.swift in Sources */ = {isa = PBXBuildFile; fileRef = D7DCE280D9FD953B91C0F18EF298D613 /* JSONEncodableEncoding.swift */; };
+		7ECB25910CAB58A03AF984BEAAA9BC69 /* Extensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = D3D0164E2EEC228143968A2D8A5F2B46 /* Extensions.swift */; };
+		803C9B5F6176706F80A32958D7F9DE9E /* JSONEncodableEncoding.swift in Sources */ = {isa = PBXBuildFile; fileRef = A14BAA0CFCF5210DF11F06D36AF8AFFC /* JSONEncodableEncoding.swift */; };
+		83B8F4478931AAEEF503BCAB1CD1F0A7 /* ModelErrorInfoArray.swift in Sources */ = {isa = PBXBuildFile; fileRef = C244E3993E5EAFE0E4DEF9C9D2FD7AE3 /* ModelErrorInfoArray.swift */; };
+		8875F33BCBBF8C9813818B9CAF310935 /* PersonCard.swift in Sources */ = {isa = PBXBuildFile; fileRef = 30CDB0CB291617B59C7E29CBAE2AC857 /* PersonCard.swift */; };
+		8FB80DEE562554FFBCA968E4BF7517EA /* AlamofireImplementations.swift in Sources */ = {isa = PBXBuildFile; fileRef = B1E452EBA4D5D6D227089137C821D4A7 /* AlamofireImplementations.swift */; };
+		9538FE15480391840577909BB4FF62F9 /* Alamofire.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F082FE9586189859619C91E5CBD023DE /* Alamofire.framework */; };
+		9611B85399F5F378CADED38430D2CB4A /* Models.swift in Sources */ = {isa = PBXBuildFile; fileRef = 3CAA5D350129277E17583C27AE7EF37D /* Models.swift */; };
+		96BD8B1CF37A3E447E80D6540BF1AFBA /* Swift4TestAPI.swift in Sources */ = {isa = PBXBuildFile; fileRef = 398F88885A50B33451FCFDF126F911DA /* Swift4TestAPI.swift */; };
+		9A016EDBC3BBBA78EACEA32D67EF4666 /* PlaceCardAllOf.swift in Sources */ = {isa = PBXBuildFile; fileRef = 889ABCD292051498ACCC66E810BD8C5F /* PlaceCardAllOf.swift */; };
+		A0FF411F02DB088069D332AD6C631F33 /* JSONEncodingHelper.swift in Sources */ = {isa = PBXBuildFile; fileRef = 042A701F1D826A4F68808DE6FDF0A379 /* JSONEncodingHelper.swift */; };
+		A4DA07391D04D940BFBFE9E3FA5D3150 /* ModelWithPropertiesAndAdditionalProperties.swift in Sources */ = {isa = PBXBuildFile; fileRef = 17B59E56BC42D7F70BBC0D0802D62025 /* ModelWithPropertiesAndAdditionalProperties.swift */; };
+		A5EBF89E903775EDEC460C891C5BBD56 /* PersonCard.swift in Sources */ = {isa = PBXBuildFile; fileRef = E29C3BC88FEAF94FECA67A4264C88682 /* PersonCard.swift */; };
+		A9C82CF0CD1CFAE8913C8FCC4D5ED2C8 /* StringEnum.swift in Sources */ = {isa = PBXBuildFile; fileRef = A3BD76CE1B85046CF575F42B557C3B49 /* StringEnum.swift */; };
+		AA01F316FEED5B0AC28DEA73736220CF /* ModelWithStringAdditionalPropertiesOnly.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6BFF565190B02C5B55C36C5EBFE9D04C /* ModelWithStringAdditionalPropertiesOnly.swift */; };
+		AA5DE3AAC93AFD9345A5BDCEB7AC9293 /* ModelWithStringAdditionalPropertiesOnly.swift in Sources */ = {isa = PBXBuildFile; fileRef = 023CA47DA7B8EA5E674146768B8CB891 /* ModelWithStringAdditionalPropertiesOnly.swift */; };
+		B235AE419587D81C90450899BCF0F4B8 /* PlaceCard.swift in Sources */ = {isa = PBXBuildFile; fileRef = BF65F76D52F973768497A243985926E5 /* PlaceCard.swift */; };
+		B276B41B140C7F840DFB54F00CF7D9FA /* StringEnum.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2EAE0680C3163069E97D7699F6987C4B /* StringEnum.swift */; };
+		B807F472998820B4609FAB3CF159AC9C /* SampleBase.swift in Sources */ = {isa = PBXBuildFile; fileRef = CAB9BE4C49A34C2D3AE2D4E3E109A089 /* SampleBase.swift */; };
+		C108EE576362791F54AAAC460A6A2A5A /* ModelWithIntAdditionalPropertiesOnly.swift in Sources */ = {isa = PBXBuildFile; fileRef = 14100F82AA0E6E697613420AD32459E2 /* ModelWithIntAdditionalPropertiesOnly.swift */; };
+		C64D1517BDDB5E9E2D2FBA43212C53E6 /* GetAllModelsResult.swift in Sources */ = {isa = PBXBuildFile; fileRef = ACAEAEEB934E57798AED060221895850 /* GetAllModelsResult.swift */; };
+		C815EE6D8919A93CE7381BC35CCE9C81 /* PersonCardAllOf.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2C4F016421122219AE4DCDF97576F500 /* PersonCardAllOf.swift */; };
+		CE30C5A4E4531B8458327A6DC065DE32 /* ModelStringArray.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5DEC406D4B97E9127B278F6B56FEB63C /* ModelStringArray.swift */; };
+		D09E55499CF1D4974FBAD910AFC620F9 /* Extensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = 191E19C2F89B8663BCF4FBEAFAAA8775 /* Extensions.swift */; };
+		D91FB21ED8D8C4A270B2A0357BD2AE4A /* ModelStringArray.swift in Sources */ = {isa = PBXBuildFile; fileRef = DE1507AFE9907AC803C060934F91F241 /* ModelStringArray.swift */; };
+		DDF53E7B6B5F4ED126A83920A7DA6E7F /* ModelWithIntAdditionalPropertiesOnly.swift in Sources */ = {isa = PBXBuildFile; fileRef = 68FA5194EA643821CA1085C303146E0D /* ModelWithIntAdditionalPropertiesOnly.swift */; };
+		E87B5442792566BBD8D5EA0E6719C36E /* BaseCard.swift in Sources */ = {isa = PBXBuildFile; fileRef = C418DE3632EC3A053E7379EDCACB6115 /* BaseCard.swift */; };
+		EBFE3E5FC0A83DE3DA3971A0A1AB2EFE /* Swift4TestAPI.swift in Sources */ = {isa = PBXBuildFile; fileRef = CF9E03057B35B32AC59ADC1B90FEF850 /* Swift4TestAPI.swift */; };
+		EFF02DC14D48C2482A33645FD0E22E16 /* ModelDoubleArray.swift in Sources */ = {isa = PBXBuildFile; fileRef = EE5A2A8F47EC101841093D2CF573518A /* ModelDoubleArray.swift */; };
+		FC83769C3F6541E13ED67BD112728B8F /* Models.swift in Sources */ = {isa = PBXBuildFile; fileRef = A140137667E350EAFDE010EA34389F6A /* Models.swift */; };
+		FE104CA1062BD0AC44CAB66CD4CB271B /* JSONEncodingHelper.swift in Sources */ = {isa = PBXBuildFile; fileRef = 282DC97E6B31E9729E891D97B5A0D0C7 /* JSONEncodingHelper.swift */; };
+/* End PBXBuildFile section */
+
+/* Begin PBXFileReference section */
+		023CA47DA7B8EA5E674146768B8CB891 /* ModelWithStringAdditionalPropertiesOnly.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ModelWithStringAdditionalPropertiesOnly.swift; sourceTree = "<group>"; };
+		042A701F1D826A4F68808DE6FDF0A379 /* JSONEncodingHelper.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = JSONEncodingHelper.swift; sourceTree = "<group>"; };
+		05A0A03CD4A9113B9D91606FC3E78A07 /* ModelWithPropertiesAndAdditionalProperties.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ModelWithPropertiesAndAdditionalProperties.swift; sourceTree = "<group>"; };
+		13DD01D5ABD4BE352CB6FCBF31194C69 /* PlaceCard.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PlaceCard.swift; sourceTree = "<group>"; };
+		14100F82AA0E6E697613420AD32459E2 /* ModelWithIntAdditionalPropertiesOnly.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ModelWithIntAdditionalPropertiesOnly.swift; sourceTree = "<group>"; };
+		17B59E56BC42D7F70BBC0D0802D62025 /* ModelWithPropertiesAndAdditionalProperties.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ModelWithPropertiesAndAdditionalProperties.swift; sourceTree = "<group>"; };
+		191E19C2F89B8663BCF4FBEAFAAA8775 /* Extensions.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Extensions.swift; sourceTree = "<group>"; };
+		1A813A17AF964F26FB864212260A93BA /* ErrorInfo.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ErrorInfo.swift; sourceTree = "<group>"; };
+		1E7F1C8F69E25D093E56B114A316C29B /* AlamofireImplementations.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AlamofireImplementations.swift; sourceTree = "<group>"; };
+		282DC97E6B31E9729E891D97B5A0D0C7 /* JSONEncodingHelper.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = JSONEncodingHelper.swift; sourceTree = "<group>"; };
+		2C4F016421122219AE4DCDF97576F500 /* PersonCardAllOf.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PersonCardAllOf.swift; sourceTree = "<group>"; };
+		2EAE0680C3163069E97D7699F6987C4B /* StringEnum.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = StringEnum.swift; sourceTree = "<group>"; };
+		2F5B983EDA0E1D0C2C8FEDA73D46B99C /* APIs.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = APIs.swift; sourceTree = "<group>"; };
+		30CDB0CB291617B59C7E29CBAE2AC857 /* PersonCard.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PersonCard.swift; sourceTree = "<group>"; };
+		398F88885A50B33451FCFDF126F911DA /* Swift4TestAPI.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Swift4TestAPI.swift; sourceTree = "<group>"; };
+		3CAA5D350129277E17583C27AE7EF37D /* Models.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Models.swift; sourceTree = "<group>"; };
+		3CB11DB8C924DADEC4055271EE72A9F7 /* ModelDoubleArray.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ModelDoubleArray.swift; sourceTree = "<group>"; };
+		4B74ECB05DB9BEC1D5ECEBF80D21EC72 /* ModelErrorInfoArray.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ModelErrorInfoArray.swift; sourceTree = "<group>"; };
+		4F6F3F378FFC3FC0AC42268DFF60C672 /* APIs.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = APIs.swift; sourceTree = "<group>"; };
+		54860017185201A4C2A2F5445827D65E /* VariableNameTest.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = VariableNameTest.swift; sourceTree = "<group>"; };
+		5626F1C9CCDE265EB25BBD47BB82FE20 /* SampleSubClass.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SampleSubClass.swift; sourceTree = "<group>"; };
+		5DEC406D4B97E9127B278F6B56FEB63C /* ModelStringArray.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ModelStringArray.swift; sourceTree = "<group>"; };
+		5EF84FF97BA833181D55A51ACBBFF218 /* APIHelper.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = APIHelper.swift; sourceTree = "<group>"; };
+		6555C6E30D09EAE39142D186B12DA851 /* SampleSubClassAllOf.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SampleSubClassAllOf.swift; sourceTree = "<group>"; };
+		671A11EAF02ED88CFFDAFBC52D66F274 /* ErrorInfo.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ErrorInfo.swift; sourceTree = "<group>"; };
+		68FA5194EA643821CA1085C303146E0D /* ModelWithIntAdditionalPropertiesOnly.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ModelWithIntAdditionalPropertiesOnly.swift; sourceTree = "<group>"; };
+		69A98ECBBBE9667D9847EEABC00CCBC0 /* Configuration.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Configuration.swift; sourceTree = "<group>"; };
+		6BFF565190B02C5B55C36C5EBFE9D04C /* ModelWithStringAdditionalPropertiesOnly.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ModelWithStringAdditionalPropertiesOnly.swift; sourceTree = "<group>"; };
+		7C09C1DB6708AB2D8997BEE265743B66 /* VariableNameTest.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = VariableNameTest.swift; sourceTree = "<group>"; };
+		7EE13D018B8E8F7283534E949DE9C1A5 /* AllPrimitives.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AllPrimitives.swift; sourceTree = "<group>"; };
+		889ABCD292051498ACCC66E810BD8C5F /* PlaceCardAllOf.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PlaceCardAllOf.swift; sourceTree = "<group>"; };
+		93BA682C97038055435A32D0B20421CA /* CodableHelper.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CodableHelper.swift; sourceTree = "<group>"; };
+		9EAA1DBBB82C7F083B98595F00C3DB8F /* CodableHelper.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CodableHelper.swift; sourceTree = "<group>"; };
+		9FD147676BF8F2DD7E471810E3DCBBDA /* TestClient.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = TestClient.framework; sourceTree = BUILT_PRODUCTS_DIR; };
+		A140137667E350EAFDE010EA34389F6A /* Models.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Models.swift; sourceTree = "<group>"; };
+		A14BAA0CFCF5210DF11F06D36AF8AFFC /* JSONEncodableEncoding.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = JSONEncodableEncoding.swift; sourceTree = "<group>"; };
+		A3BD76CE1B85046CF575F42B557C3B49 /* StringEnum.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = StringEnum.swift; sourceTree = "<group>"; };
+		ACAEAEEB934E57798AED060221895850 /* GetAllModelsResult.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GetAllModelsResult.swift; sourceTree = "<group>"; };
+		B1E452EBA4D5D6D227089137C821D4A7 /* AlamofireImplementations.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AlamofireImplementations.swift; sourceTree = "<group>"; };
+		B2A122B51B1736ACC859570A549F5697 /* AllPrimitives.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AllPrimitives.swift; sourceTree = "<group>"; };
+		BDF35F63D7105D55BA0D3FD910934C7E /* SampleBase.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SampleBase.swift; sourceTree = "<group>"; };
+		BF65F76D52F973768497A243985926E5 /* PlaceCard.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PlaceCard.swift; sourceTree = "<group>"; };
+		C209BA7D3B7026133ACB614905CDF3DE /* BaseCard.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BaseCard.swift; sourceTree = "<group>"; };
+		C244E3993E5EAFE0E4DEF9C9D2FD7AE3 /* ModelErrorInfoArray.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ModelErrorInfoArray.swift; sourceTree = "<group>"; };
+		C418DE3632EC3A053E7379EDCACB6115 /* BaseCard.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BaseCard.swift; sourceTree = "<group>"; };
+		C6AD136503821775A39AEEEA6068B078 /* APIHelper.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = APIHelper.swift; sourceTree = "<group>"; };
+		CAB9BE4C49A34C2D3AE2D4E3E109A089 /* SampleBase.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SampleBase.swift; sourceTree = "<group>"; };
+		CD4DAE449BCB032587594847465761DA /* GetAllModelsResult.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GetAllModelsResult.swift; sourceTree = "<group>"; };
+		CE6DF5346C62BDE2DAFA3B4EADAB1E15 /* Configuration.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Configuration.swift; sourceTree = "<group>"; };
+		CF9E03057B35B32AC59ADC1B90FEF850 /* Swift4TestAPI.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Swift4TestAPI.swift; sourceTree = "<group>"; };
+		D3D0164E2EEC228143968A2D8A5F2B46 /* Extensions.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Extensions.swift; sourceTree = "<group>"; };
+		D7DCE280D9FD953B91C0F18EF298D613 /* JSONEncodableEncoding.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = JSONEncodableEncoding.swift; sourceTree = "<group>"; };
+		DE1507AFE9907AC803C060934F91F241 /* ModelStringArray.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ModelStringArray.swift; sourceTree = "<group>"; };
+		E29C3BC88FEAF94FECA67A4264C88682 /* PersonCard.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PersonCard.swift; sourceTree = "<group>"; };
+		EA9C1F9551FB619240EC0F703D6B8C39 /* SampleSubClass.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SampleSubClass.swift; sourceTree = "<group>"; };
+		EE5A2A8F47EC101841093D2CF573518A /* ModelDoubleArray.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ModelDoubleArray.swift; sourceTree = "<group>"; };
+		F082FE9586189859619C91E5CBD023DE /* Alamofire.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = Alamofire.framework; sourceTree = "<group>"; };
+/* End PBXFileReference section */
+
+/* Begin PBXFrameworksBuildPhase section */
+		F915CBFBD18EAF6362CE8399303327CB /* Frameworks */ = {
+			isa = PBXFrameworksBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				9538FE15480391840577909BB4FF62F9 /* Alamofire.framework in Frameworks */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+/* End PBXFrameworksBuildPhase section */
+
+/* Begin PBXGroup section */
+		2539B43B44954BFCB19E44BE7750AFF4 /* Models */ = {
+			isa = PBXGroup;
+			children = (
+				B2A122B51B1736ACC859570A549F5697 /* AllPrimitives.swift */,
+				C418DE3632EC3A053E7379EDCACB6115 /* BaseCard.swift */,
+				671A11EAF02ED88CFFDAFBC52D66F274 /* ErrorInfo.swift */,
+				CD4DAE449BCB032587594847465761DA /* GetAllModelsResult.swift */,
+				3CB11DB8C924DADEC4055271EE72A9F7 /* ModelDoubleArray.swift */,
+				4B74ECB05DB9BEC1D5ECEBF80D21EC72 /* ModelErrorInfoArray.swift */,
+				DE1507AFE9907AC803C060934F91F241 /* ModelStringArray.swift */,
+				14100F82AA0E6E697613420AD32459E2 /* ModelWithIntAdditionalPropertiesOnly.swift */,
+				05A0A03CD4A9113B9D91606FC3E78A07 /* ModelWithPropertiesAndAdditionalProperties.swift */,
+				023CA47DA7B8EA5E674146768B8CB891 /* ModelWithStringAdditionalPropertiesOnly.swift */,
+				E29C3BC88FEAF94FECA67A4264C88682 /* PersonCard.swift */,
+				BF65F76D52F973768497A243985926E5 /* PlaceCard.swift */,
+				BDF35F63D7105D55BA0D3FD910934C7E /* SampleBase.swift */,
+				5626F1C9CCDE265EB25BBD47BB82FE20 /* SampleSubClass.swift */,
+				2EAE0680C3163069E97D7699F6987C4B /* StringEnum.swift */,
+				54860017185201A4C2A2F5445827D65E /* VariableNameTest.swift */,
+			);
+			path = Models;
+			sourceTree = "<group>";
+		};
+		26F3607B28A0AD360F5100F5BC4A640C /* Swaggers */ = {
+			isa = PBXGroup;
+			children = (
+				1E7F1C8F69E25D093E56B114A316C29B /* AlamofireImplementations.swift */,
+				5EF84FF97BA833181D55A51ACBBFF218 /* APIHelper.swift */,
+				2F5B983EDA0E1D0C2C8FEDA73D46B99C /* APIs.swift */,
+				9EAA1DBBB82C7F083B98595F00C3DB8F /* CodableHelper.swift */,
+				69A98ECBBBE9667D9847EEABC00CCBC0 /* Configuration.swift */,
+				191E19C2F89B8663BCF4FBEAFAAA8775 /* Extensions.swift */,
+				A14BAA0CFCF5210DF11F06D36AF8AFFC /* JSONEncodableEncoding.swift */,
+				282DC97E6B31E9729E891D97B5A0D0C7 /* JSONEncodingHelper.swift */,
+				3CAA5D350129277E17583C27AE7EF37D /* Models.swift */,
+				357449309E73CA39C88139611B93904B /* APIs */,
+				2539B43B44954BFCB19E44BE7750AFF4 /* Models */,
+			);
+			path = Swaggers;
+			sourceTree = "<group>";
+		};
+		3049D31996790CF8E31B6F01065B684D = {
+			isa = PBXGroup;
+			children = (
+				8C649F3AF4A7C6D66B52AA38EA7D579A /* TestClient */,
+				FDF67B74659AE43B939D6A0D2F133D38 /* Frameworks */,
+				CBA5AD47CD6A6AF075403DD13F84D75F /* Products */,
+			);
+			sourceTree = "<group>";
+		};
+		357449309E73CA39C88139611B93904B /* APIs */ = {
+			isa = PBXGroup;
+			children = (
+				398F88885A50B33451FCFDF126F911DA /* Swift4TestAPI.swift */,
+			);
+			path = APIs;
+			sourceTree = "<group>";
+		};
+		3A1CFAB4CC75547815260F88D6BF9BAC /* OpenAPIs */ = {
+			isa = PBXGroup;
+			children = (
+				B1E452EBA4D5D6D227089137C821D4A7 /* AlamofireImplementations.swift */,
+				C6AD136503821775A39AEEEA6068B078 /* APIHelper.swift */,
+				4F6F3F378FFC3FC0AC42268DFF60C672 /* APIs.swift */,
+				93BA682C97038055435A32D0B20421CA /* CodableHelper.swift */,
+				CE6DF5346C62BDE2DAFA3B4EADAB1E15 /* Configuration.swift */,
+				D3D0164E2EEC228143968A2D8A5F2B46 /* Extensions.swift */,
+				D7DCE280D9FD953B91C0F18EF298D613 /* JSONEncodableEncoding.swift */,
+				042A701F1D826A4F68808DE6FDF0A379 /* JSONEncodingHelper.swift */,
+				A140137667E350EAFDE010EA34389F6A /* Models.swift */,
+				AC6589BAFE1BDABB49267C33B4B99539 /* APIs */,
+				9A5460679035417A84B6C8845A45CF47 /* Models */,
+			);
+			path = OpenAPIs;
+			sourceTree = "<group>";
+		};
+		3E4B2B40F4EEE4F7E6149EBF68AECB77 /* Classes */ = {
+			isa = PBXGroup;
+			children = (
+				3A1CFAB4CC75547815260F88D6BF9BAC /* OpenAPIs */,
+				26F3607B28A0AD360F5100F5BC4A640C /* Swaggers */,
+			);
+			path = Classes;
+			sourceTree = "<group>";
+		};
+		7B6E2BAF77019A8E9F4FFB571089D69E /* iOS */ = {
+			isa = PBXGroup;
+			children = (
+				F082FE9586189859619C91E5CBD023DE /* Alamofire.framework */,
+			);
+			path = iOS;
+			sourceTree = "<group>";
+		};
+		8C649F3AF4A7C6D66B52AA38EA7D579A /* TestClient */ = {
+			isa = PBXGroup;
+			children = (
+				3E4B2B40F4EEE4F7E6149EBF68AECB77 /* Classes */,
+			);
+			path = TestClient;
+			sourceTree = "<group>";
+		};
+		9A5460679035417A84B6C8845A45CF47 /* Models */ = {
+			isa = PBXGroup;
+			children = (
+				7EE13D018B8E8F7283534E949DE9C1A5 /* AllPrimitives.swift */,
+				C209BA7D3B7026133ACB614905CDF3DE /* BaseCard.swift */,
+				1A813A17AF964F26FB864212260A93BA /* ErrorInfo.swift */,
+				ACAEAEEB934E57798AED060221895850 /* GetAllModelsResult.swift */,
+				EE5A2A8F47EC101841093D2CF573518A /* ModelDoubleArray.swift */,
+				C244E3993E5EAFE0E4DEF9C9D2FD7AE3 /* ModelErrorInfoArray.swift */,
+				5DEC406D4B97E9127B278F6B56FEB63C /* ModelStringArray.swift */,
+				68FA5194EA643821CA1085C303146E0D /* ModelWithIntAdditionalPropertiesOnly.swift */,
+				17B59E56BC42D7F70BBC0D0802D62025 /* ModelWithPropertiesAndAdditionalProperties.swift */,
+				6BFF565190B02C5B55C36C5EBFE9D04C /* ModelWithStringAdditionalPropertiesOnly.swift */,
+				30CDB0CB291617B59C7E29CBAE2AC857 /* PersonCard.swift */,
+				2C4F016421122219AE4DCDF97576F500 /* PersonCardAllOf.swift */,
+				13DD01D5ABD4BE352CB6FCBF31194C69 /* PlaceCard.swift */,
+				889ABCD292051498ACCC66E810BD8C5F /* PlaceCardAllOf.swift */,
+				CAB9BE4C49A34C2D3AE2D4E3E109A089 /* SampleBase.swift */,
+				EA9C1F9551FB619240EC0F703D6B8C39 /* SampleSubClass.swift */,
+				6555C6E30D09EAE39142D186B12DA851 /* SampleSubClassAllOf.swift */,
+				A3BD76CE1B85046CF575F42B557C3B49 /* StringEnum.swift */,
+				7C09C1DB6708AB2D8997BEE265743B66 /* VariableNameTest.swift */,
+			);
+			path = Models;
+			sourceTree = "<group>";
+		};
+		AC6589BAFE1BDABB49267C33B4B99539 /* APIs */ = {
+			isa = PBXGroup;
+			children = (
+				CF9E03057B35B32AC59ADC1B90FEF850 /* Swift4TestAPI.swift */,
+			);
+			path = APIs;
+			sourceTree = "<group>";
+		};
+		CBA5AD47CD6A6AF075403DD13F84D75F /* Products */ = {
+			isa = PBXGroup;
+			children = (
+				9FD147676BF8F2DD7E471810E3DCBBDA /* TestClient.framework */,
+			);
+			name = Products;
+			sourceTree = "<group>";
+		};
+		FA683CC04EA50A59799FB6574AE7EEBB /* Carthage */ = {
+			isa = PBXGroup;
+			children = (
+				7B6E2BAF77019A8E9F4FFB571089D69E /* iOS */,
+			);
+			name = Carthage;
+			path = Carthage/Build;
+			sourceTree = "<group>";
+		};
+		FDF67B74659AE43B939D6A0D2F133D38 /* Frameworks */ = {
+			isa = PBXGroup;
+			children = (
+				FA683CC04EA50A59799FB6574AE7EEBB /* Carthage */,
+			);
+			name = Frameworks;
+			sourceTree = "<group>";
+		};
+/* End PBXGroup section */
+
+/* Begin PBXNativeTarget section */
+		57071453919863518A53B6C49465271E /* TestClient */ = {
+			isa = PBXNativeTarget;
+			buildConfigurationList = 8C5DAAB4D2F2BC3EB2A18339A4724ACC /* Build configuration list for PBXNativeTarget "TestClient" */;
+			buildPhases = (
+				411C0E7C892A38659291062123603A2E /* Sources */,
+				F915CBFBD18EAF6362CE8399303327CB /* Frameworks */,
+			);
+			buildRules = (
+			);
+			dependencies = (
+			);
+			name = TestClient;
+			productName = TestClient;
+			productReference = 9FD147676BF8F2DD7E471810E3DCBBDA /* TestClient.framework */;
+			productType = "com.apple.product-type.framework";
+		};
+/* End PBXNativeTarget section */
+
+/* Begin PBXProject section */
+		498565B44CD0696E30C61F1F5667D8C7 /* Project object */ = {
+			isa = PBXProject;
+			attributes = {
+				LastUpgradeCheck = 1000;
+			};
+			buildConfigurationList = 87FDCE50021B77EB5CF8EF080B65BDD1 /* Build configuration list for PBXProject "TestClient" */;
+			compatibilityVersion = "Xcode 9.3";
+			developmentRegion = en;
+			hasScannedForEncodings = 0;
+			knownRegions = (
+				en,
+			);
+			mainGroup = 3049D31996790CF8E31B6F01065B684D;
+			projectDirPath = "";
+			projectRoot = "";
+			targets = (
+				57071453919863518A53B6C49465271E /* TestClient */,
+			);
+		};
+/* End PBXProject section */
+
+/* Begin PBXSourcesBuildPhase section */
+		411C0E7C892A38659291062123603A2E /* Sources */ = {
+			isa = PBXSourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				7948167C041B9082A9F1281E44009E0A /* APIHelper.swift in Sources */,
+				39DA43938F1273FB74FA70398E416D97 /* APIHelper.swift in Sources */,
+				1CBAE9E5347B8227EE53A7C31FFFDA8E /* APIs.swift in Sources */,
+				341277CE94C8DDF543DF60E31D5AAF90 /* APIs.swift in Sources */,
+				597201DACC303FF640F7BEDA3677FEC9 /* AlamofireImplementations.swift in Sources */,
+				8FB80DEE562554FFBCA968E4BF7517EA /* AlamofireImplementations.swift in Sources */,
+				3A04A4CA0C6EF8EED2A566EF631CDA38 /* AllPrimitives.swift in Sources */,
+				36928C9EC7BF34D1ABA17C9C99F48CA1 /* AllPrimitives.swift in Sources */,
+				6930D98F5DCC24DB5FA6BF4878265540 /* BaseCard.swift in Sources */,
+				E87B5442792566BBD8D5EA0E6719C36E /* BaseCard.swift in Sources */,
+				5A7FBED271D728F0381000757B16E02E /* CodableHelper.swift in Sources */,
+				1548FDC096222C790A4BDAC1F9B0C7A3 /* CodableHelper.swift in Sources */,
+				7756C1C6B2B94E3454286401BCDEF17E /* Configuration.swift in Sources */,
+				07A16BBDCAB4E02659E6649DC6ECD59E /* Configuration.swift in Sources */,
+				0AE08DF8DEB5A721A8F1CEFF6609AF91 /* ErrorInfo.swift in Sources */,
+				747AC6451754CEF1193D159865B4FDED /* ErrorInfo.swift in Sources */,
+				D09E55499CF1D4974FBAD910AFC620F9 /* Extensions.swift in Sources */,
+				7ECB25910CAB58A03AF984BEAAA9BC69 /* Extensions.swift in Sources */,
+				C64D1517BDDB5E9E2D2FBA43212C53E6 /* GetAllModelsResult.swift in Sources */,
+				6925079AF17449A1098980FD21661772 /* GetAllModelsResult.swift in Sources */,
+				803C9B5F6176706F80A32958D7F9DE9E /* JSONEncodableEncoding.swift in Sources */,
+				7B8A7764281B9CD000F38C5093E0B6F7 /* JSONEncodableEncoding.swift in Sources */,
+				FE104CA1062BD0AC44CAB66CD4CB271B /* JSONEncodingHelper.swift in Sources */,
+				A0FF411F02DB088069D332AD6C631F33 /* JSONEncodingHelper.swift in Sources */,
+				01B77912657B2635F5194D37366617E0 /* ModelDoubleArray.swift in Sources */,
+				EFF02DC14D48C2482A33645FD0E22E16 /* ModelDoubleArray.swift in Sources */,
+				83B8F4478931AAEEF503BCAB1CD1F0A7 /* ModelErrorInfoArray.swift in Sources */,
+				29740774C4E591A43BFE5AD5D850D607 /* ModelErrorInfoArray.swift in Sources */,
+				CE30C5A4E4531B8458327A6DC065DE32 /* ModelStringArray.swift in Sources */,
+				D91FB21ED8D8C4A270B2A0357BD2AE4A /* ModelStringArray.swift in Sources */,
+				DDF53E7B6B5F4ED126A83920A7DA6E7F /* ModelWithIntAdditionalPropertiesOnly.swift in Sources */,
+				C108EE576362791F54AAAC460A6A2A5A /* ModelWithIntAdditionalPropertiesOnly.swift in Sources */,
+				A4DA07391D04D940BFBFE9E3FA5D3150 /* ModelWithPropertiesAndAdditionalProperties.swift in Sources */,
+				05D8F159919BB1360370082D6B15E96F /* ModelWithPropertiesAndAdditionalProperties.swift in Sources */,
+				AA01F316FEED5B0AC28DEA73736220CF /* ModelWithStringAdditionalPropertiesOnly.swift in Sources */,
+				AA5DE3AAC93AFD9345A5BDCEB7AC9293 /* ModelWithStringAdditionalPropertiesOnly.swift in Sources */,
+				FC83769C3F6541E13ED67BD112728B8F /* Models.swift in Sources */,
+				9611B85399F5F378CADED38430D2CB4A /* Models.swift in Sources */,
+				A5EBF89E903775EDEC460C891C5BBD56 /* PersonCard.swift in Sources */,
+				8875F33BCBBF8C9813818B9CAF310935 /* PersonCard.swift in Sources */,
+				C815EE6D8919A93CE7381BC35CCE9C81 /* PersonCardAllOf.swift in Sources */,
+				70C0212AE5CDB0BEF5657DF81250D036 /* PlaceCard.swift in Sources */,
+				B235AE419587D81C90450899BCF0F4B8 /* PlaceCard.swift in Sources */,
+				9A016EDBC3BBBA78EACEA32D67EF4666 /* PlaceCardAllOf.swift in Sources */,
+				B807F472998820B4609FAB3CF159AC9C /* SampleBase.swift in Sources */,
+				5783CA3FD89CF0E9EDC6687D87375645 /* SampleBase.swift in Sources */,
+				6AF51F30439F60E4EBB0B67B9146DAEA /* SampleSubClass.swift in Sources */,
+				247482A8C1C15C7AA16AAB1C68B7D4D3 /* SampleSubClass.swift in Sources */,
+				0465C21A1C77CFA0FBB67D6A38BB6A70 /* SampleSubClassAllOf.swift in Sources */,
+				A9C82CF0CD1CFAE8913C8FCC4D5ED2C8 /* StringEnum.swift in Sources */,
+				B276B41B140C7F840DFB54F00CF7D9FA /* StringEnum.swift in Sources */,
+				96BD8B1CF37A3E447E80D6540BF1AFBA /* Swift4TestAPI.swift in Sources */,
+				EBFE3E5FC0A83DE3DA3971A0A1AB2EFE /* Swift4TestAPI.swift in Sources */,
+				015BD03CC4B1E0523177800208C0941C /* VariableNameTest.swift in Sources */,
+				488FF52AADBE1FC70A2314B165608539 /* VariableNameTest.swift in Sources */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+/* End PBXSourcesBuildPhase section */
+
+/* Begin XCBuildConfiguration section */
+		1D58A58AE8D976D68029505FF608CA04 /* Debug */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				APPLICATION_EXTENSION_API_ONLY = YES;
+				CODE_SIGN_IDENTITY = "";
+				CURRENT_PROJECT_VERSION = 1;
+				DEFINES_MODULE = YES;
+				DYLIB_COMPATIBILITY_VERSION = 1;
+				DYLIB_CURRENT_VERSION = 1;
+				DYLIB_INSTALL_NAME_BASE = "@rpath";
+				FRAMEWORK_SEARCH_PATHS = (
+					"$(inherited)",
+					"$(PROJECT_DIR)/Carthage/Build/iOS",
+				);
+				INFOPLIST_FILE = Info.plist;
+				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
+				IPHONEOS_DEPLOYMENT_TARGET = 10.0;
+				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
+				SDKROOT = iphoneos;
+				SKIP_INSTALL = YES;
+				TARGETED_DEVICE_FAMILY = "1,2";
+				VERSIONING_SYSTEM = "apple-generic";
+			};
+			name = Debug;
+		};
+		20BF9E8F2FA4569489A9CEACF182CB4F /* Debug */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				ALWAYS_SEARCH_USER_PATHS = NO;
+				CLANG_ANALYZER_NONNULL = YES;
+				CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
+				CLANG_CXX_LANGUAGE_STANDARD = "gnu++14";
+				CLANG_CXX_LIBRARY = "libc++";
+				CLANG_ENABLE_MODULES = YES;
+				CLANG_ENABLE_OBJC_ARC = YES;
+				CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
+				CLANG_WARN_BOOL_CONVERSION = YES;
+				CLANG_WARN_COMMA = YES;
+				CLANG_WARN_CONSTANT_CONVERSION = YES;
+				CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
+				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
+				CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
+				CLANG_WARN_EMPTY_BODY = YES;
+				CLANG_WARN_ENUM_CONVERSION = YES;
+				CLANG_WARN_INFINITE_RECURSION = YES;
+				CLANG_WARN_INT_CONVERSION = YES;
+				CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
+				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
+				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
+				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
+				CLANG_WARN_STRICT_PROTOTYPES = YES;
+				CLANG_WARN_SUSPICIOUS_MOVE = YES;
+				CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
+				CLANG_WARN_UNREACHABLE_CODE = YES;
+				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
+				COPY_PHASE_STRIP = NO;
+				DEBUG_INFORMATION_FORMAT = dwarf;
+				ENABLE_STRICT_OBJC_MSGSEND = YES;
+				ENABLE_TESTABILITY = YES;
+				GCC_C_LANGUAGE_STANDARD = gnu11;
+				GCC_DYNAMIC_NO_PIC = NO;
+				GCC_NO_COMMON_BLOCKS = YES;
+				GCC_OPTIMIZATION_LEVEL = 0;
+				GCC_PREPROCESSOR_DEFINITIONS = (
+					"$(inherited)",
+					"DEBUG=1",
+				);
+				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
+				GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
+				GCC_WARN_UNDECLARED_SELECTOR = YES;
+				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
+				GCC_WARN_UNUSED_FUNCTION = YES;
+				GCC_WARN_UNUSED_VARIABLE = YES;
+				MTL_ENABLE_DEBUG_INFO = YES;
+				ONLY_ACTIVE_ARCH = YES;
+				PRODUCT_NAME = "$(TARGET_NAME)";
+				SDKROOT = iphoneos;
+				SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
+				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
+				SWIFT_VERSION = 4.2;
+			};
+			name = Debug;
+		};
+		295215B264B439F2CFBEFBA238635BEB /* Release */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				ALWAYS_SEARCH_USER_PATHS = NO;
+				CLANG_ANALYZER_NONNULL = YES;
+				CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
+				CLANG_CXX_LANGUAGE_STANDARD = "gnu++14";
+				CLANG_CXX_LIBRARY = "libc++";
+				CLANG_ENABLE_MODULES = YES;
+				CLANG_ENABLE_OBJC_ARC = YES;
+				CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
+				CLANG_WARN_BOOL_CONVERSION = YES;
+				CLANG_WARN_COMMA = YES;
+				CLANG_WARN_CONSTANT_CONVERSION = YES;
+				CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
+				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
+				CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
+				CLANG_WARN_EMPTY_BODY = YES;
+				CLANG_WARN_ENUM_CONVERSION = YES;
+				CLANG_WARN_INFINITE_RECURSION = YES;
+				CLANG_WARN_INT_CONVERSION = YES;
+				CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
+				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
+				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
+				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
+				CLANG_WARN_STRICT_PROTOTYPES = YES;
+				CLANG_WARN_SUSPICIOUS_MOVE = YES;
+				CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
+				CLANG_WARN_UNREACHABLE_CODE = YES;
+				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
+				COPY_PHASE_STRIP = NO;
+				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
+				ENABLE_NS_ASSERTIONS = NO;
+				ENABLE_STRICT_OBJC_MSGSEND = YES;
+				GCC_C_LANGUAGE_STANDARD = gnu11;
+				GCC_NO_COMMON_BLOCKS = YES;
+				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
+				GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
+				GCC_WARN_UNDECLARED_SELECTOR = YES;
+				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
+				GCC_WARN_UNUSED_FUNCTION = YES;
+				GCC_WARN_UNUSED_VARIABLE = YES;
+				PRODUCT_NAME = "$(TARGET_NAME)";
+				SDKROOT = iphoneos;
+				SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
+				SWIFT_VERSION = 4.2;
+				VALIDATE_PRODUCT = YES;
+			};
+			name = Release;
+		};
+		4CDAC84BFAB424A21776ADCA2E9573B0 /* Release */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				APPLICATION_EXTENSION_API_ONLY = YES;
+				CODE_SIGN_IDENTITY = "";
+				CURRENT_PROJECT_VERSION = 1;
+				DEFINES_MODULE = YES;
+				DYLIB_COMPATIBILITY_VERSION = 1;
+				DYLIB_CURRENT_VERSION = 1;
+				DYLIB_INSTALL_NAME_BASE = "@rpath";
+				FRAMEWORK_SEARCH_PATHS = (
+					"$(inherited)",
+					"$(PROJECT_DIR)/Carthage/Build/iOS",
+				);
+				INFOPLIST_FILE = Info.plist;
+				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
+				IPHONEOS_DEPLOYMENT_TARGET = 10.0;
+				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
+				SDKROOT = iphoneos;
+				SKIP_INSTALL = YES;
+				TARGETED_DEVICE_FAMILY = "1,2";
+				VERSIONING_SYSTEM = "apple-generic";
+			};
+			name = Release;
+		};
+/* End XCBuildConfiguration section */
+
+/* Begin XCConfigurationList section */
+		87FDCE50021B77EB5CF8EF080B65BDD1 /* Build configuration list for PBXProject "TestClient" */ = {
+			isa = XCConfigurationList;
+			buildConfigurations = (
+				20BF9E8F2FA4569489A9CEACF182CB4F /* Debug */,
+				295215B264B439F2CFBEFBA238635BEB /* Release */,
+			);
+			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Debug;
+		};
+		8C5DAAB4D2F2BC3EB2A18339A4724ACC /* Build configuration list for PBXNativeTarget "TestClient" */ = {
+			isa = XCConfigurationList;
+			buildConfigurations = (
+				1D58A58AE8D976D68029505FF608CA04 /* Debug */,
+				4CDAC84BFAB424A21776ADCA2E9573B0 /* Release */,
+			);
+			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = "";
+		};
+/* End XCConfigurationList section */
+	};
+	rootObject = 498565B44CD0696E30C61F1F5667D8C7 /* Project object */;
+}
diff --git a/samples/client/test/swift4/default/TestClient.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/samples/client/test/swift4/default/TestClient.xcodeproj/project.xcworkspace/contents.xcworkspacedata
new file mode 100644
index 0000000000..919434a625
--- /dev/null
+++ b/samples/client/test/swift4/default/TestClient.xcodeproj/project.xcworkspace/contents.xcworkspacedata
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Workspace
+   version = "1.0">
+   <FileRef
+      location = "self:">
+   </FileRef>
+</Workspace>
diff --git a/samples/client/test/swift4/default/TestClient.xcodeproj/xcshareddata/xcschemes/TestClient.xcscheme b/samples/client/test/swift4/default/TestClient.xcodeproj/xcshareddata/xcschemes/TestClient.xcscheme
new file mode 100644
index 0000000000..f9f59ff5ae
--- /dev/null
+++ b/samples/client/test/swift4/default/TestClient.xcodeproj/xcshareddata/xcschemes/TestClient.xcscheme
@@ -0,0 +1,96 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Scheme
+   LastUpgradeVersion = "1000"
+   version = "1.3">
+   <BuildAction
+      parallelizeBuildables = "YES"
+      buildImplicitDependencies = "YES">
+      <BuildActionEntries>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "YES"
+            buildForProfiling = "YES"
+            buildForArchiving = "YES"
+            buildForAnalyzing = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "57071453919863518A53B6C49465271E"
+               BuildableName = "TestClient.framework"
+               BlueprintName = "TestClient"
+               ReferencedContainer = "container:TestClient.xcodeproj">
+            </BuildableReference>
+         </BuildActionEntry>
+      </BuildActionEntries>
+   </BuildAction>
+   <TestAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      shouldUseLaunchSchemeArgsEnv = "YES">
+      <Testables>
+      </Testables>
+      <MacroExpansion>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "57071453919863518A53B6C49465271E"
+            BuildableName = "TestClient.framework"
+            BlueprintName = "TestClient"
+            ReferencedContainer = "container:TestClient.xcodeproj">
+         </BuildableReference>
+      </MacroExpansion>
+      <CommandLineArguments>
+      </CommandLineArguments>
+      <AdditionalOptions>
+      </AdditionalOptions>
+   </TestAction>
+   <LaunchAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      launchStyle = "0"
+      useCustomWorkingDirectory = "NO"
+      ignoresPersistentStateOnLaunch = "NO"
+      debugDocumentVersioning = "YES"
+      debugServiceExtension = "internal"
+      allowLocationSimulation = "YES">
+      <MacroExpansion>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "57071453919863518A53B6C49465271E"
+            BuildableName = "TestClient.framework"
+            BlueprintName = "TestClient"
+            ReferencedContainer = "container:TestClient.xcodeproj">
+         </BuildableReference>
+      </MacroExpansion>
+      <CommandLineArguments>
+      </CommandLineArguments>
+      <AdditionalOptions>
+      </AdditionalOptions>
+   </LaunchAction>
+   <ProfileAction
+      buildConfiguration = "Release"
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      savedToolIdentifier = ""
+      useCustomWorkingDirectory = "NO"
+      debugDocumentVersioning = "YES">
+      <BuildableProductRunnable
+         runnableDebuggingMode = "0">
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "57071453919863518A53B6C49465271E"
+            BuildableName = "TestClient.framework"
+            BlueprintName = "TestClient"
+            ReferencedContainer = "container:TestClient.xcodeproj">
+         </BuildableReference>
+      </BuildableProductRunnable>
+      <CommandLineArguments>
+      </CommandLineArguments>
+   </ProfileAction>
+   <AnalyzeAction
+      buildConfiguration = "Debug">
+   </AnalyzeAction>
+   <ArchiveAction
+      buildConfiguration = "Release"
+      revealArchiveInOrganizer = "YES">
+   </ArchiveAction>
+</Scheme>
diff --git a/samples/client/test/swift4/default/TestClient/Classes/OpenAPIs/APIHelper.swift b/samples/client/test/swift4/default/TestClient/Classes/OpenAPIs/APIHelper.swift
index 3c7b53f814..75dea24395 100644
--- a/samples/client/test/swift4/default/TestClient/Classes/OpenAPIs/APIHelper.swift
+++ b/samples/client/test/swift4/default/TestClient/Classes/OpenAPIs/APIHelper.swift
@@ -7,7 +7,7 @@
 import Foundation
 
 public struct APIHelper {
-    public static func rejectNil(_ source: [String:Any?]) -> [String:Any]? {
+    public static func rejectNil(_ source: [String: Any?]) -> [String: Any]? {
         let destination = source.reduce(into: [String: Any]()) { (result, item) in
             if let value = item.value {
                 result[item.key] = value
@@ -20,17 +20,17 @@ public struct APIHelper {
         return destination
     }
 
-    public static func rejectNilHeaders(_ source: [String:Any?]) -> [String:String] {
+    public static func rejectNilHeaders(_ source: [String: Any?]) -> [String: String] {
         return source.reduce(into: [String: String]()) { (result, item) in
             if let collection = item.value as? Array<Any?> {
-                result[item.key] = collection.filter({ $0 != nil }).map{ "\($0!)" }.joined(separator: ",")
+                result[item.key] = collection.filter({ $0 != nil }).map { "\($0!)" }.joined(separator: ",")
             } else if let value: Any = item.value {
                 result[item.key] = "\(value)"
             }
         }
     }
 
-    public static func convertBoolToString(_ source: [String: Any]?) -> [String:Any]? {
+    public static func convertBoolToString(_ source: [String: Any]?) -> [String: Any]? {
         guard let source = source else {
             return nil
         }
@@ -45,8 +45,14 @@ public struct APIHelper {
         })
     }
 
+    public static func mapValueToPathItem(_ source: Any) -> Any {
+        if let collection = source as? Array<Any?> {
+            return collection.filter({ $0 != nil }).map({"\($0!)"}).joined(separator: ",")
+        }
+        return source
+    }
 
-    public static func mapValuesToQueryItems(_ source: [String:Any?]) -> [URLQueryItem]? {
+    public static func mapValuesToQueryItems(_ source: [String: Any?]) -> [URLQueryItem]? {
         let destination = source.filter({ $0.value != nil}).reduce(into: [URLQueryItem]()) { (result, item) in
             if let collection = item.value as? Array<Any?> {
                 let value = collection.filter({ $0 != nil }).map({"\($0!)"}).joined(separator: ",")
@@ -62,4 +68,3 @@ public struct APIHelper {
         return destination
     }
 }
-
diff --git a/samples/client/test/swift4/default/TestClient/Classes/OpenAPIs/APIs.swift b/samples/client/test/swift4/default/TestClient/Classes/OpenAPIs/APIs.swift
index 88a72b1c67..e60b615400 100644
--- a/samples/client/test/swift4/default/TestClient/Classes/OpenAPIs/APIs.swift
+++ b/samples/client/test/swift4/default/TestClient/Classes/OpenAPIs/APIs.swift
@@ -9,22 +9,22 @@ import Foundation
 open class TestClientAPI {
     public static var basePath = "http://api.example.com/basePath"
     public static var credential: URLCredential?
-    public static var customHeaders: [String:String] = [:]
+    public static var customHeaders: [String: String] = [:]
     public static var requestBuilderFactory: RequestBuilderFactory = AlamofireRequestBuilderFactory()
 }
 
 open class RequestBuilder<T> {
     var credential: URLCredential?
-    var headers: [String:String]
-    public let parameters: [String:Any]?
+    var headers: [String: String]
+    public let parameters: [String: Any]?
     public let isBody: Bool
     public let method: String
     public let URLString: String
 
     /// Optional block to obtain a reference to the request's progress instance when available.
-    public var onProgressReady: ((Progress) -> ())?
+    public var onProgressReady: ((Progress) -> Void)?
 
-    required public init(method: String, URLString: String, parameters: [String:Any]?, isBody: Bool, headers: [String:String] = [:]) {
+    required public init(method: String, URLString: String, parameters: [String: Any]?, isBody: Bool, headers: [String: String] = [:]) {
         self.method = method
         self.URLString = URLString
         self.parameters = parameters
@@ -34,7 +34,7 @@ open class RequestBuilder<T> {
         addHeaders(TestClientAPI.customHeaders)
     }
 
-    open func addHeaders(_ aHeaders:[String:String]) {
+    open func addHeaders(_ aHeaders: [String: String]) {
         for (header, value) in aHeaders {
             headers[header] = value
         }
@@ -57,5 +57,5 @@ open class RequestBuilder<T> {
 
 public protocol RequestBuilderFactory {
     func getNonDecodableBuilder<T>() -> RequestBuilder<T>.Type
-    func getBuilder<T:Decodable>() -> RequestBuilder<T>.Type
+    func getBuilder<T: Decodable>() -> RequestBuilder<T>.Type
 }
diff --git a/samples/client/test/swift4/default/TestClient/Classes/OpenAPIs/APIs/Swift4TestAPI.swift b/samples/client/test/swift4/default/TestClient/Classes/OpenAPIs/APIs/Swift4TestAPI.swift
index a0b90ee6a8..a775c2aaaa 100644
--- a/samples/client/test/swift4/default/TestClient/Classes/OpenAPIs/APIs/Swift4TestAPI.swift
+++ b/samples/client/test/swift4/default/TestClient/Classes/OpenAPIs/APIs/Swift4TestAPI.swift
@@ -8,8 +8,6 @@
 import Foundation
 import Alamofire
 
-
-
 open class Swift4TestAPI {
     /**
      Get all of the models
@@ -17,7 +15,7 @@ open class Swift4TestAPI {
      - parameter clientId: (query) id that represent the Api client 
      - parameter completion: completion handler to receive the data and the error objects
      */
-    open class func getAllModels(clientId: String, completion: @escaping ((_ data: GetAllModelsResult?,_ error: Error?) -> Void)) {
+    open class func getAllModels(clientId: String, completion: @escaping ((_ data: GetAllModelsResult?, _ error: Error?) -> Void)) {
         getAllModelsWithRequestBuilder(clientId: clientId).execute { (response, error) -> Void in
             completion(response?.body, error)
         }
@@ -33,8 +31,8 @@ open class Swift4TestAPI {
     open class func getAllModelsWithRequestBuilder(clientId: String) -> RequestBuilder<GetAllModelsResult> {
         let path = "/allModels"
         let URLString = TestClientAPI.basePath + path
-        let parameters: [String:Any]? = nil
-        
+        let parameters: [String: Any]? = nil
+
         var url = URLComponents(string: URLString)
         url?.queryItems = APIHelper.mapValuesToQueryItems([
             "client_id": clientId
diff --git a/samples/client/test/swift4/default/TestClient/Classes/OpenAPIs/AlamofireImplementations.swift b/samples/client/test/swift4/default/TestClient/Classes/OpenAPIs/AlamofireImplementations.swift
index dac40e9a31..04ad02a5ce 100644
--- a/samples/client/test/swift4/default/TestClient/Classes/OpenAPIs/AlamofireImplementations.swift
+++ b/samples/client/test/swift4/default/TestClient/Classes/OpenAPIs/AlamofireImplementations.swift
@@ -12,7 +12,7 @@ class AlamofireRequestBuilderFactory: RequestBuilderFactory {
         return AlamofireRequestBuilder<T>.self
     }
 
-    func getBuilder<T:Decodable>() -> RequestBuilder<T>.Type {
+    func getBuilder<T: Decodable>() -> RequestBuilder<T>.Type {
         return AlamofireDecodableRequestBuilder<T>.self
     }
 }
@@ -50,7 +50,7 @@ private struct SynchronizedDictionary<K: Hashable, V> {
 private var managerStore = SynchronizedDictionary<String, Alamofire.SessionManager>()
 
 open class AlamofireRequestBuilder<T>: RequestBuilder<T> {
-    required public init(method: String, URLString: String, parameters: [String : Any]?, isBody: Bool, headers: [String : String] = [:]) {
+    required public init(method: String, URLString: String, parameters: [String: Any]?, isBody: Bool, headers: [String: String] = [:]) {
         super.init(method: method, URLString: URLString, parameters: parameters, isBody: isBody, headers: headers)
     }
 
@@ -88,17 +88,17 @@ open class AlamofireRequestBuilder<T>: RequestBuilder<T> {
      May be overridden by a subclass if you want to control the request
      configuration (e.g. to override the cache policy).
      */
-    open func makeRequest(manager: SessionManager, method: HTTPMethod, encoding: ParameterEncoding, headers: [String:String]) -> DataRequest {
+    open func makeRequest(manager: SessionManager, method: HTTPMethod, encoding: ParameterEncoding, headers: [String: String]) -> DataRequest {
         return manager.request(URLString, method: method, parameters: parameters, encoding: encoding, headers: headers)
     }
 
     override open func execute(_ completion: @escaping (_ response: Response<T>?, _ error: Error?) -> Void) {
-        let managerId:String = UUID().uuidString
+        let managerId: String = UUID().uuidString
         // Create a new manager for each request to customize its request header
         let manager = createSessionManager()
         managerStore[managerId] = manager
 
-        let encoding:ParameterEncoding = isBody ? JSONDataEncoding() : URLEncoding()
+        let encoding: ParameterEncoding = isBody ? JSONDataEncoding() : URLEncoding()
 
         let xMethod = Alamofire.HTTPMethod(rawValue: method)
         let fileKeys = parameters == nil ? [] : parameters!.filter { $1 is NSURL }
@@ -111,8 +111,7 @@ open class AlamofireRequestBuilder<T>: RequestBuilder<T> {
                     case let fileURL as URL:
                         if let mimeType = self.contentTypeForFormPart(fileURL: fileURL) {
                             mpForm.append(fileURL, withName: k, fileName: fileURL.lastPathComponent, mimeType: mimeType)
-                        }
-                        else {
+                        } else {
                             mpForm.append(fileURL, withName: k)
                         }
                     case let string as String:
@@ -276,7 +275,7 @@ open class AlamofireRequestBuilder<T>: RequestBuilder<T> {
         return httpHeaders
     }
 
-    fileprivate func getFileName(fromContentDisposition contentDisposition : String?) -> String? {
+    fileprivate func getFileName(fromContentDisposition contentDisposition: String?) -> String? {
 
         guard let contentDisposition = contentDisposition else {
             return nil
@@ -284,7 +283,7 @@ open class AlamofireRequestBuilder<T>: RequestBuilder<T> {
 
         let items = contentDisposition.components(separatedBy: ";")
 
-        var filename : String? = nil
+        var filename: String? = nil
 
         for contentItem in items {
 
@@ -304,7 +303,7 @@ open class AlamofireRequestBuilder<T>: RequestBuilder<T> {
 
     }
 
-    fileprivate func getPath(from url : URL) throws -> String {
+    fileprivate func getPath(from url: URL) throws -> String {
 
         guard var path = URLComponents(url: url, resolvingAgainstBaseURL: true)?.path else {
             throw DownloadException.requestMissingPath
@@ -318,7 +317,7 @@ open class AlamofireRequestBuilder<T>: RequestBuilder<T> {
 
     }
 
-    fileprivate func getURL(from urlRequest : URLRequest) throws -> URL {
+    fileprivate func getURL(from urlRequest: URLRequest) throws -> URL {
 
         guard let url = urlRequest.url else {
             throw DownloadException.requestMissingURL
@@ -329,7 +328,7 @@ open class AlamofireRequestBuilder<T>: RequestBuilder<T> {
 
 }
 
-fileprivate enum DownloadException : Error {
+private enum DownloadException: Error {
     case responseDataMissing
     case responseFailed
     case requestMissing
@@ -344,7 +343,7 @@ public enum AlamofireDecodableRequestBuilderError: Error {
     case generalError(Error)
 }
 
-open class AlamofireDecodableRequestBuilder<T:Decodable>: AlamofireRequestBuilder<T> {
+open class AlamofireDecodableRequestBuilder<T: Decodable>: AlamofireRequestBuilder<T> {
 
     override fileprivate func processRequest(request: DataRequest, _ managerId: String, _ completion: @escaping (_ response: Response<T>?, _ error: Error?) -> Void) {
         if let credential = self.credential {
diff --git a/samples/client/test/swift4/default/TestClient/Classes/OpenAPIs/CodableHelper.swift b/samples/client/test/swift4/default/TestClient/Classes/OpenAPIs/CodableHelper.swift
index 584de8c3d5..111d5a3a8c 100644
--- a/samples/client/test/swift4/default/TestClient/Classes/OpenAPIs/CodableHelper.swift
+++ b/samples/client/test/swift4/default/TestClient/Classes/OpenAPIs/CodableHelper.swift
@@ -13,7 +13,7 @@ open class CodableHelper {
 
     public static var dateformatter: DateFormatter?
 
-    open class func decode<T>(_ type: T.Type, from data: Data) -> (decodableObj: T?, error: Error?) where T : Decodable {
+    open class func decode<T>(_ type: T.Type, from data: Data) -> (decodableObj: T?, error: Error?) where T: Decodable {
         var returnedDecodable: T? = nil
         var returnedError: Error? = nil
 
@@ -39,7 +39,7 @@ open class CodableHelper {
         return (returnedDecodable, returnedError)
     }
 
-    open class func encode<T>(_ value: T, prettyPrint: Bool = false) -> EncodeResult where T : Encodable {
+    open class func encode<T>(_ value: T, prettyPrint: Bool = false) -> EncodeResult where T: Encodable {
         var returnedData: Data?
         var returnedError: Error? = nil
 
diff --git a/samples/client/test/swift4/default/TestClient/Classes/OpenAPIs/Configuration.swift b/samples/client/test/swift4/default/TestClient/Classes/OpenAPIs/Configuration.swift
index 516590da5d..e1ecb39726 100644
--- a/samples/client/test/swift4/default/TestClient/Classes/OpenAPIs/Configuration.swift
+++ b/samples/client/test/swift4/default/TestClient/Classes/OpenAPIs/Configuration.swift
@@ -7,9 +7,9 @@
 import Foundation
 
 open class Configuration {
-	
+
 	// This value is used to configure the date formatter that is used to serialize dates into JSON format. 
 	// You must set it prior to encoding any dates, and it will only be read once. 
     public static var dateFormat = "yyyy-MM-dd'T'HH:mm:ss.SSSZZZZZ"
-    
-}
\ No newline at end of file
+
+}
diff --git a/samples/client/test/swift4/default/TestClient/Classes/OpenAPIs/Extensions.swift b/samples/client/test/swift4/default/TestClient/Classes/OpenAPIs/Extensions.swift
index 8bf1829ba8..24c128daad 100644
--- a/samples/client/test/swift4/default/TestClient/Classes/OpenAPIs/Extensions.swift
+++ b/samples/client/test/swift4/default/TestClient/Classes/OpenAPIs/Extensions.swift
@@ -112,24 +112,24 @@ extension String: CodingKey {
 
 extension KeyedEncodingContainerProtocol {
 
-    public mutating func encodeArray<T>(_ values: [T], forKey key: Self.Key) throws where T : Encodable {
+    public mutating func encodeArray<T>(_ values: [T], forKey key: Self.Key) throws where T: Encodable {
         var arrayContainer = nestedUnkeyedContainer(forKey: key)
         try arrayContainer.encode(contentsOf: values)
     }
 
-    public mutating func encodeArrayIfPresent<T>(_ values: [T]?, forKey key: Self.Key) throws where T : Encodable {
+    public mutating func encodeArrayIfPresent<T>(_ values: [T]?, forKey key: Self.Key) throws where T: Encodable {
         if let values = values {
             try encodeArray(values, forKey: key)
         }
     }
 
-    public mutating func encodeMap<T>(_ pairs: [Self.Key: T]) throws where T : Encodable {
+    public mutating func encodeMap<T>(_ pairs: [Self.Key: T]) throws where T: Encodable {
         for (key, value) in pairs {
             try encode(value, forKey: key)
         }
     }
 
-    public mutating func encodeMapIfPresent<T>(_ pairs: [Self.Key: T]?) throws where T : Encodable {
+    public mutating func encodeMapIfPresent<T>(_ pairs: [Self.Key: T]?) throws where T: Encodable {
         if let pairs = pairs {
             try encodeMap(pairs)
         }
@@ -139,7 +139,7 @@ extension KeyedEncodingContainerProtocol {
 
 extension KeyedDecodingContainerProtocol {
 
-    public func decodeArray<T>(_ type: T.Type, forKey key: Self.Key) throws -> [T] where T : Decodable {
+    public func decodeArray<T>(_ type: T.Type, forKey key: Self.Key) throws -> [T] where T: Decodable {
         var tmpArray = [T]()
 
         var nestedContainer = try nestedUnkeyedContainer(forKey: key)
@@ -151,7 +151,7 @@ extension KeyedDecodingContainerProtocol {
         return tmpArray
     }
 
-    public func decodeArrayIfPresent<T>(_ type: T.Type, forKey key: Self.Key) throws -> [T]? where T : Decodable {
+    public func decodeArrayIfPresent<T>(_ type: T.Type, forKey key: Self.Key) throws -> [T]? where T: Decodable {
         var tmpArray: [T]? = nil
 
         if contains(key) {
@@ -161,8 +161,8 @@ extension KeyedDecodingContainerProtocol {
         return tmpArray
     }
 
-    public func decodeMap<T>(_ type: T.Type, excludedKeys: Set<Self.Key>) throws -> [Self.Key: T] where T : Decodable {
-        var map: [Self.Key : T] = [:]
+    public func decodeMap<T>(_ type: T.Type, excludedKeys: Set<Self.Key>) throws -> [Self.Key: T] where T: Decodable {
+        var map: [Self.Key: T] = [:]
 
         for key in allKeys {
             if !excludedKeys.contains(key) {
@@ -175,5 +175,3 @@ extension KeyedDecodingContainerProtocol {
     }
 
 }
-
-
diff --git a/samples/client/test/swift4/default/TestClient/Classes/OpenAPIs/JSONEncodingHelper.swift b/samples/client/test/swift4/default/TestClient/Classes/OpenAPIs/JSONEncodingHelper.swift
index 7044951584..3e68bb5d4a 100644
--- a/samples/client/test/swift4/default/TestClient/Classes/OpenAPIs/JSONEncodingHelper.swift
+++ b/samples/client/test/swift4/default/TestClient/Classes/OpenAPIs/JSONEncodingHelper.swift
@@ -10,7 +10,7 @@ import Alamofire
 
 open class JSONEncodingHelper {
 
-    open class func encodingParameters<T:Encodable>(forEncodableObject encodableObj: T?) -> Parameters? {
+    open class func encodingParameters<T: Encodable>(forEncodableObject encodableObj: T?) -> Parameters? {
         var params: Parameters? = nil
 
         // Encode the Encodable object
@@ -39,5 +39,5 @@ open class JSONEncodingHelper {
 
         return params
     }
-    
+
 }
diff --git a/samples/client/test/swift4/default/TestClient/Classes/OpenAPIs/Models.swift b/samples/client/test/swift4/default/TestClient/Classes/OpenAPIs/Models.swift
index 4085638903..e87ce399c7 100644
--- a/samples/client/test/swift4/default/TestClient/Classes/OpenAPIs/Models.swift
+++ b/samples/client/test/swift4/default/TestClient/Classes/OpenAPIs/Models.swift
@@ -10,7 +10,7 @@ protocol JSONEncodable {
     func encodeToJSON() -> Any
 }
 
-public enum ErrorResponse : Error {
+public enum ErrorResponse: Error {
     case error(Int, Data?, Error)
 }
 
diff --git a/samples/client/test/swift4/default/TestClient/Classes/OpenAPIs/Models/AllPrimitives.swift b/samples/client/test/swift4/default/TestClient/Classes/OpenAPIs/Models/AllPrimitives.swift
index 3ce27fcd98..0087792f20 100644
--- a/samples/client/test/swift4/default/TestClient/Classes/OpenAPIs/Models/AllPrimitives.swift
+++ b/samples/client/test/swift4/default/TestClient/Classes/OpenAPIs/Models/AllPrimitives.swift
@@ -7,7 +7,6 @@
 
 import Foundation
 
-
 /** Object which contains lots of different primitive Swagger types */
 
 public struct AllPrimitives: Codable {
@@ -71,6 +70,4 @@ public struct AllPrimitives: Codable {
         self.myInlineStringEnum = myInlineStringEnum
     }
 
-
 }
-
diff --git a/samples/client/test/swift4/default/TestClient/Classes/OpenAPIs/Models/BaseCard.swift b/samples/client/test/swift4/default/TestClient/Classes/OpenAPIs/Models/BaseCard.swift
index 7e4bb2c0cd..51055d8573 100644
--- a/samples/client/test/swift4/default/TestClient/Classes/OpenAPIs/Models/BaseCard.swift
+++ b/samples/client/test/swift4/default/TestClient/Classes/OpenAPIs/Models/BaseCard.swift
@@ -7,7 +7,6 @@
 
 import Foundation
 
-
 /** This is a base card object which uses a &#39;cardType&#39; discriminator. */
 
 public struct BaseCard: Codable {
@@ -18,6 +17,4 @@ public struct BaseCard: Codable {
         self.cardType = cardType
     }
 
-
 }
-
diff --git a/samples/client/test/swift4/default/TestClient/Classes/OpenAPIs/Models/ErrorInfo.swift b/samples/client/test/swift4/default/TestClient/Classes/OpenAPIs/Models/ErrorInfo.swift
index ae5327eda3..a603717abe 100644
--- a/samples/client/test/swift4/default/TestClient/Classes/OpenAPIs/Models/ErrorInfo.swift
+++ b/samples/client/test/swift4/default/TestClient/Classes/OpenAPIs/Models/ErrorInfo.swift
@@ -7,7 +7,6 @@
 
 import Foundation
 
-
 /** Example Error object */
 
 public struct ErrorInfo: Codable {
@@ -22,6 +21,4 @@ public struct ErrorInfo: Codable {
         self.details = details
     }
 
-
 }
-
diff --git a/samples/client/test/swift4/default/TestClient/Classes/OpenAPIs/Models/GetAllModelsResult.swift b/samples/client/test/swift4/default/TestClient/Classes/OpenAPIs/Models/GetAllModelsResult.swift
index 286c5a7a35..cc3992e748 100644
--- a/samples/client/test/swift4/default/TestClient/Classes/OpenAPIs/Models/GetAllModelsResult.swift
+++ b/samples/client/test/swift4/default/TestClient/Classes/OpenAPIs/Models/GetAllModelsResult.swift
@@ -7,7 +7,6 @@
 
 import Foundation
 
-
 /** Response object containing AllPrimitives object */
 
 public struct GetAllModelsResult: Codable {
@@ -22,6 +21,4 @@ public struct GetAllModelsResult: Codable {
         self.myVariableNameTest = myVariableNameTest
     }
 
-
 }
-
diff --git a/samples/client/test/swift4/default/TestClient/Classes/OpenAPIs/Models/ModelDoubleArray.swift b/samples/client/test/swift4/default/TestClient/Classes/OpenAPIs/Models/ModelDoubleArray.swift
index e6e986dce6..9e523219a4 100644
--- a/samples/client/test/swift4/default/TestClient/Classes/OpenAPIs/Models/ModelDoubleArray.swift
+++ b/samples/client/test/swift4/default/TestClient/Classes/OpenAPIs/Models/ModelDoubleArray.swift
@@ -7,6 +7,5 @@
 
 import Foundation
 
-
 /** This defines an array of doubles. */
 public typealias ModelDoubleArray = [Double]
diff --git a/samples/client/test/swift4/default/TestClient/Classes/OpenAPIs/Models/ModelErrorInfoArray.swift b/samples/client/test/swift4/default/TestClient/Classes/OpenAPIs/Models/ModelErrorInfoArray.swift
index 6656e6abe8..358c83dc7a 100644
--- a/samples/client/test/swift4/default/TestClient/Classes/OpenAPIs/Models/ModelErrorInfoArray.swift
+++ b/samples/client/test/swift4/default/TestClient/Classes/OpenAPIs/Models/ModelErrorInfoArray.swift
@@ -7,6 +7,5 @@
 
 import Foundation
 
-
 /** This defines an array of ErrorInfo objects. */
 public typealias ModelErrorInfoArray = [ErrorInfo]
diff --git a/samples/client/test/swift4/default/TestClient/Classes/OpenAPIs/Models/ModelStringArray.swift b/samples/client/test/swift4/default/TestClient/Classes/OpenAPIs/Models/ModelStringArray.swift
index 7f0e0cbd13..6a614cc360 100644
--- a/samples/client/test/swift4/default/TestClient/Classes/OpenAPIs/Models/ModelStringArray.swift
+++ b/samples/client/test/swift4/default/TestClient/Classes/OpenAPIs/Models/ModelStringArray.swift
@@ -7,6 +7,5 @@
 
 import Foundation
 
-
 /** This defines an array of strings. */
 public typealias ModelStringArray = [String]
diff --git a/samples/client/test/swift4/default/TestClient/Classes/OpenAPIs/Models/ModelWithIntAdditionalPropertiesOnly.swift b/samples/client/test/swift4/default/TestClient/Classes/OpenAPIs/Models/ModelWithIntAdditionalPropertiesOnly.swift
index 16d9a784fb..7070e5d16c 100644
--- a/samples/client/test/swift4/default/TestClient/Classes/OpenAPIs/Models/ModelWithIntAdditionalPropertiesOnly.swift
+++ b/samples/client/test/swift4/default/TestClient/Classes/OpenAPIs/Models/ModelWithIntAdditionalPropertiesOnly.swift
@@ -7,13 +7,11 @@
 
 import Foundation
 
-
 /** This is an empty model with no properties and only additionalProperties of type int32 */
 
 public struct ModelWithIntAdditionalPropertiesOnly: Codable {
 
-
-    public var additionalProperties: [String:Int] = [:]
+    public var additionalProperties: [String: Int] = [:]
 
     public subscript(key: String) -> Int? {
         get {
@@ -46,7 +44,4 @@ public struct ModelWithIntAdditionalPropertiesOnly: Codable {
         additionalProperties = try container.decodeMap(Int.self, excludedKeys: nonAdditionalPropertyKeys)
     }
 
-
-
 }
-
diff --git a/samples/client/test/swift4/default/TestClient/Classes/OpenAPIs/Models/ModelWithPropertiesAndAdditionalProperties.swift b/samples/client/test/swift4/default/TestClient/Classes/OpenAPIs/Models/ModelWithPropertiesAndAdditionalProperties.swift
index d7f2ca1526..c00da2ea9f 100644
--- a/samples/client/test/swift4/default/TestClient/Classes/OpenAPIs/Models/ModelWithPropertiesAndAdditionalProperties.swift
+++ b/samples/client/test/swift4/default/TestClient/Classes/OpenAPIs/Models/ModelWithPropertiesAndAdditionalProperties.swift
@@ -7,7 +7,6 @@
 
 import Foundation
 
-
 /** This is an empty model with no properties and only additionalProperties of type int32 */
 
 public struct ModelWithPropertiesAndAdditionalProperties: Codable {
@@ -31,7 +30,7 @@ public struct ModelWithPropertiesAndAdditionalProperties: Codable {
         self.myPrimitiveArrayReq = myPrimitiveArrayReq
         self.myPrimitiveArrayOpt = myPrimitiveArrayOpt
     }
-    public var additionalProperties: [String:String] = [:]
+    public var additionalProperties: [String: String] = [:]
 
     public subscript(key: String) -> String? {
         get {
@@ -88,7 +87,4 @@ public struct ModelWithPropertiesAndAdditionalProperties: Codable {
         additionalProperties = try container.decodeMap(String.self, excludedKeys: nonAdditionalPropertyKeys)
     }
 
-
-
 }
-
diff --git a/samples/client/test/swift4/default/TestClient/Classes/OpenAPIs/Models/ModelWithStringAdditionalPropertiesOnly.swift b/samples/client/test/swift4/default/TestClient/Classes/OpenAPIs/Models/ModelWithStringAdditionalPropertiesOnly.swift
index ae87d68a22..81f9dede43 100644
--- a/samples/client/test/swift4/default/TestClient/Classes/OpenAPIs/Models/ModelWithStringAdditionalPropertiesOnly.swift
+++ b/samples/client/test/swift4/default/TestClient/Classes/OpenAPIs/Models/ModelWithStringAdditionalPropertiesOnly.swift
@@ -7,13 +7,11 @@
 
 import Foundation
 
-
 /** This is an empty model with no properties and only additionalProperties of type string */
 
 public struct ModelWithStringAdditionalPropertiesOnly: Codable {
 
-
-    public var additionalProperties: [String:String] = [:]
+    public var additionalProperties: [String: String] = [:]
 
     public subscript(key: String) -> String? {
         get {
@@ -46,7 +44,4 @@ public struct ModelWithStringAdditionalPropertiesOnly: Codable {
         additionalProperties = try container.decodeMap(String.self, excludedKeys: nonAdditionalPropertyKeys)
     }
 
-
-
 }
-
diff --git a/samples/client/test/swift4/default/TestClient/Classes/OpenAPIs/Models/PersonCard.swift b/samples/client/test/swift4/default/TestClient/Classes/OpenAPIs/Models/PersonCard.swift
index 9ce70e0b95..0f60362765 100644
--- a/samples/client/test/swift4/default/TestClient/Classes/OpenAPIs/Models/PersonCard.swift
+++ b/samples/client/test/swift4/default/TestClient/Classes/OpenAPIs/Models/PersonCard.swift
@@ -7,7 +7,6 @@
 
 import Foundation
 
-
 /** This is a card object for a Person derived from BaseCard. */
 
 public struct PersonCard: Codable {
@@ -22,6 +21,4 @@ public struct PersonCard: Codable {
         self.lastName = lastName
     }
 
-
 }
-
diff --git a/samples/client/test/swift4/default/TestClient/Classes/OpenAPIs/Models/PersonCardAllOf.swift b/samples/client/test/swift4/default/TestClient/Classes/OpenAPIs/Models/PersonCardAllOf.swift
new file mode 100644
index 0000000000..e11d38985a
--- /dev/null
+++ b/samples/client/test/swift4/default/TestClient/Classes/OpenAPIs/Models/PersonCardAllOf.swift
@@ -0,0 +1,20 @@
+//
+// PersonCardAllOf.swift
+//
+// Generated by openapi-generator
+// https://openapi-generator.tech
+//
+
+import Foundation
+
+public struct PersonCardAllOf: Codable {
+
+    public var firstName: String?
+    public var lastName: String?
+
+    public init(firstName: String?, lastName: String?) {
+        self.firstName = firstName
+        self.lastName = lastName
+    }
+
+}
diff --git a/samples/client/test/swift4/default/TestClient/Classes/OpenAPIs/Models/PlaceCard.swift b/samples/client/test/swift4/default/TestClient/Classes/OpenAPIs/Models/PlaceCard.swift
index 905b80ae52..d292636040 100644
--- a/samples/client/test/swift4/default/TestClient/Classes/OpenAPIs/Models/PlaceCard.swift
+++ b/samples/client/test/swift4/default/TestClient/Classes/OpenAPIs/Models/PlaceCard.swift
@@ -7,7 +7,6 @@
 
 import Foundation
 
-
 /** This is a card object for a Person derived from BaseCard. */
 
 public struct PlaceCard: Codable {
@@ -22,6 +21,4 @@ public struct PlaceCard: Codable {
         self.placeAddress = placeAddress
     }
 
-
 }
-
diff --git a/samples/client/test/swift4/default/TestClient/Classes/OpenAPIs/Models/PlaceCardAllOf.swift b/samples/client/test/swift4/default/TestClient/Classes/OpenAPIs/Models/PlaceCardAllOf.swift
new file mode 100644
index 0000000000..c5e89a15e0
--- /dev/null
+++ b/samples/client/test/swift4/default/TestClient/Classes/OpenAPIs/Models/PlaceCardAllOf.swift
@@ -0,0 +1,20 @@
+//
+// PlaceCardAllOf.swift
+//
+// Generated by openapi-generator
+// https://openapi-generator.tech
+//
+
+import Foundation
+
+public struct PlaceCardAllOf: Codable {
+
+    public var placeName: String?
+    public var placeAddress: String?
+
+    public init(placeName: String?, placeAddress: String?) {
+        self.placeName = placeName
+        self.placeAddress = placeAddress
+    }
+
+}
diff --git a/samples/client/test/swift4/default/TestClient/Classes/OpenAPIs/Models/SampleBase.swift b/samples/client/test/swift4/default/TestClient/Classes/OpenAPIs/Models/SampleBase.swift
index 77f8897cdf..42b32eee43 100644
--- a/samples/client/test/swift4/default/TestClient/Classes/OpenAPIs/Models/SampleBase.swift
+++ b/samples/client/test/swift4/default/TestClient/Classes/OpenAPIs/Models/SampleBase.swift
@@ -7,7 +7,6 @@
 
 import Foundation
 
-
 /** This is a base class object from which other classes will derive. */
 
 public struct SampleBase: Codable {
@@ -20,6 +19,4 @@ public struct SampleBase: Codable {
         self.baseClassIntegerProp = baseClassIntegerProp
     }
 
-
 }
-
diff --git a/samples/client/test/swift4/default/TestClient/Classes/OpenAPIs/Models/SampleSubClass.swift b/samples/client/test/swift4/default/TestClient/Classes/OpenAPIs/Models/SampleSubClass.swift
index b4e8210bab..a33ee92f22 100644
--- a/samples/client/test/swift4/default/TestClient/Classes/OpenAPIs/Models/SampleSubClass.swift
+++ b/samples/client/test/swift4/default/TestClient/Classes/OpenAPIs/Models/SampleSubClass.swift
@@ -7,19 +7,11 @@
 
 import Foundation
 
-
 /** This is a subclass defived from the SampleBase class. */
 
 public struct SampleSubClass: Codable {
 
-    public var subClassStringProp: String?
-    public var subClassIntegerProp: Int?
-
-    public init(subClassStringProp: String?, subClassIntegerProp: Int?) {
-        self.subClassStringProp = subClassStringProp
-        self.subClassIntegerProp = subClassIntegerProp
+    public init() {
     }
 
-
 }
-
diff --git a/samples/client/test/swift4/default/TestClient/Classes/OpenAPIs/Models/SampleSubClassAllOf.swift b/samples/client/test/swift4/default/TestClient/Classes/OpenAPIs/Models/SampleSubClassAllOf.swift
new file mode 100644
index 0000000000..7f52bb9fef
--- /dev/null
+++ b/samples/client/test/swift4/default/TestClient/Classes/OpenAPIs/Models/SampleSubClassAllOf.swift
@@ -0,0 +1,20 @@
+//
+// SampleSubClassAllOf.swift
+//
+// Generated by openapi-generator
+// https://openapi-generator.tech
+//
+
+import Foundation
+
+public struct SampleSubClassAllOf: Codable {
+
+    public var subClassStringProp: String?
+    public var subClassIntegerProp: Int?
+
+    public init(subClassStringProp: String?, subClassIntegerProp: Int?) {
+        self.subClassStringProp = subClassStringProp
+        self.subClassIntegerProp = subClassIntegerProp
+    }
+
+}
diff --git a/samples/client/test/swift4/default/TestClient/Classes/OpenAPIs/Models/StringEnum.swift b/samples/client/test/swift4/default/TestClient/Classes/OpenAPIs/Models/StringEnum.swift
index d4cce19e6d..67c1c22ded 100644
--- a/samples/client/test/swift4/default/TestClient/Classes/OpenAPIs/Models/StringEnum.swift
+++ b/samples/client/test/swift4/default/TestClient/Classes/OpenAPIs/Models/StringEnum.swift
@@ -7,7 +7,6 @@
 
 import Foundation
 
-
 public enum StringEnum: String, Codable {
     case stringenumvalue1 = "stringEnumValue1"
     case stringenumvalue2 = "stringEnumValue2"
diff --git a/samples/client/test/swift4/default/TestClient/Classes/OpenAPIs/Models/VariableNameTest.swift b/samples/client/test/swift4/default/TestClient/Classes/OpenAPIs/Models/VariableNameTest.swift
index 1248e645c6..6592d3f1ee 100644
--- a/samples/client/test/swift4/default/TestClient/Classes/OpenAPIs/Models/VariableNameTest.swift
+++ b/samples/client/test/swift4/default/TestClient/Classes/OpenAPIs/Models/VariableNameTest.swift
@@ -7,7 +7,6 @@
 
 import Foundation
 
-
 /** This object contains property names which we know will be different from their variable name. Examples of this include snake case property names and property names which are Swift 4 reserved words. */
 
 public struct VariableNameTest: Codable {
@@ -25,12 +24,10 @@ public struct VariableNameTest: Codable {
         self.normalName = normalName
     }
 
-    public enum CodingKeys: String, CodingKey { 
+    public enum CodingKeys: String, CodingKey {
         case exampleName = "example_name"
         case _for = "for"
         case normalName
     }
 
-
 }
-
diff --git a/samples/client/test/swift4/default/TestClient/Classes/Swaggers/APIHelper.swift b/samples/client/test/swift4/default/TestClient/Classes/Swaggers/APIHelper.swift
index 3c7b53f814..447a87c094 100644
--- a/samples/client/test/swift4/default/TestClient/Classes/Swaggers/APIHelper.swift
+++ b/samples/client/test/swift4/default/TestClient/Classes/Swaggers/APIHelper.swift
@@ -7,7 +7,7 @@
 import Foundation
 
 public struct APIHelper {
-    public static func rejectNil(_ source: [String:Any?]) -> [String:Any]? {
+    public static func rejectNil(_ source: [String: Any?]) -> [String: Any]? {
         let destination = source.reduce(into: [String: Any]()) { (result, item) in
             if let value = item.value {
                 result[item.key] = value
@@ -20,17 +20,17 @@ public struct APIHelper {
         return destination
     }
 
-    public static func rejectNilHeaders(_ source: [String:Any?]) -> [String:String] {
+    public static func rejectNilHeaders(_ source: [String: Any?]) -> [String: String] {
         return source.reduce(into: [String: String]()) { (result, item) in
             if let collection = item.value as? Array<Any?> {
-                result[item.key] = collection.filter({ $0 != nil }).map{ "\($0!)" }.joined(separator: ",")
+                result[item.key] = collection.filter({ $0 != nil }).map { "\($0!)" }.joined(separator: ",")
             } else if let value: Any = item.value {
                 result[item.key] = "\(value)"
             }
         }
     }
 
-    public static func convertBoolToString(_ source: [String: Any]?) -> [String:Any]? {
+    public static func convertBoolToString(_ source: [String: Any]?) -> [String: Any]? {
         guard let source = source else {
             return nil
         }
@@ -45,8 +45,7 @@ public struct APIHelper {
         })
     }
 
-
-    public static func mapValuesToQueryItems(_ source: [String:Any?]) -> [URLQueryItem]? {
+    public static func mapValuesToQueryItems(_ source: [String: Any?]) -> [URLQueryItem]? {
         let destination = source.filter({ $0.value != nil}).reduce(into: [URLQueryItem]()) { (result, item) in
             if let collection = item.value as? Array<Any?> {
                 let value = collection.filter({ $0 != nil }).map({"\($0!)"}).joined(separator: ",")
@@ -62,4 +61,3 @@ public struct APIHelper {
         return destination
     }
 }
-
diff --git a/samples/client/test/swift4/default/TestClient/Classes/Swaggers/APIs.swift b/samples/client/test/swift4/default/TestClient/Classes/Swaggers/APIs.swift
index 6835520c99..718622c4db 100644
--- a/samples/client/test/swift4/default/TestClient/Classes/Swaggers/APIs.swift
+++ b/samples/client/test/swift4/default/TestClient/Classes/Swaggers/APIs.swift
@@ -9,22 +9,22 @@ import Foundation
 open class TestClientAPI {
     open static var basePath = "http://api.example.com/basePath"
     open static var credential: URLCredential?
-    open static var customHeaders: [String:String] = [:]
+    open static var customHeaders: [String: String] = [:]
     open static var requestBuilderFactory: RequestBuilderFactory = AlamofireRequestBuilderFactory()
 }
 
 open class RequestBuilder<T> {
     var credential: URLCredential?
-    var headers: [String:String]
-    public let parameters: [String:Any]?
+    var headers: [String: String]
+    public let parameters: [String: Any]?
     public let isBody: Bool
     public let method: String
     public let URLString: String
 
     /// Optional block to obtain a reference to the request's progress instance when available.
-    public var onProgressReady: ((Progress) -> ())?
+    public var onProgressReady: ((Progress) -> Void)?
 
-    required public init(method: String, URLString: String, parameters: [String:Any]?, isBody: Bool, headers: [String:String] = [:]) {
+    required public init(method: String, URLString: String, parameters: [String: Any]?, isBody: Bool, headers: [String: String] = [:]) {
         self.method = method
         self.URLString = URLString
         self.parameters = parameters
@@ -34,7 +34,7 @@ open class RequestBuilder<T> {
         addHeaders(TestClientAPI.customHeaders)
     }
 
-    open func addHeaders(_ aHeaders:[String:String]) {
+    open func addHeaders(_ aHeaders: [String: String]) {
         for (header, value) in aHeaders {
             headers[header] = value
         }
@@ -57,5 +57,5 @@ open class RequestBuilder<T> {
 
 public protocol RequestBuilderFactory {
     func getNonDecodableBuilder<T>() -> RequestBuilder<T>.Type
-    func getBuilder<T:Decodable>() -> RequestBuilder<T>.Type
+    func getBuilder<T: Decodable>() -> RequestBuilder<T>.Type
 }
diff --git a/samples/client/test/swift4/default/TestClient/Classes/Swaggers/APIs/Swift4TestAPI.swift b/samples/client/test/swift4/default/TestClient/Classes/Swaggers/APIs/Swift4TestAPI.swift
index 9a06790017..bcdaad6241 100644
--- a/samples/client/test/swift4/default/TestClient/Classes/Swaggers/APIs/Swift4TestAPI.swift
+++ b/samples/client/test/swift4/default/TestClient/Classes/Swaggers/APIs/Swift4TestAPI.swift
@@ -8,8 +8,6 @@
 import Foundation
 import Alamofire
 
-
-
 open class Swift4TestAPI {
     /**
      Get all of the models
@@ -17,13 +15,12 @@ open class Swift4TestAPI {
      - parameter clientId: (query) id that represent the Api client 
      - parameter completion: completion handler to receive the data and the error objects
      */
-    open class func getAllModels(clientId: String, completion: @escaping ((_ data: GetAllModelsResult?,_ error: Error?) -> Void)) {
+    open class func getAllModels(clientId: String, completion: @escaping ((_ data: GetAllModelsResult?, _ error: Error?) -> Void)) {
         getAllModelsWithRequestBuilder(clientId: clientId).execute { (response, error) -> Void in
             completion(response?.body, error)
         }
     }
 
-
     /**
      Get all of the models
      - GET /allModels
@@ -118,8 +115,8 @@ open class Swift4TestAPI {
     open class func getAllModelsWithRequestBuilder(clientId: String) -> RequestBuilder<GetAllModelsResult> {
         let path = "/allModels"
         let URLString = TestClientAPI.basePath + path
-        let parameters: [String:Any]? = nil
-        
+        let parameters: [String: Any]? = nil
+
         var url = URLComponents(string: URLString)
         url?.queryItems = APIHelper.mapValuesToQueryItems([
             "client_id": clientId
diff --git a/samples/client/test/swift4/default/TestClient/Classes/Swaggers/AlamofireImplementations.swift b/samples/client/test/swift4/default/TestClient/Classes/Swaggers/AlamofireImplementations.swift
index 280b4e5338..8fc48ccbed 100644
--- a/samples/client/test/swift4/default/TestClient/Classes/Swaggers/AlamofireImplementations.swift
+++ b/samples/client/test/swift4/default/TestClient/Classes/Swaggers/AlamofireImplementations.swift
@@ -12,7 +12,7 @@ class AlamofireRequestBuilderFactory: RequestBuilderFactory {
         return AlamofireRequestBuilder<T>.self
     }
 
-    func getBuilder<T:Decodable>() -> RequestBuilder<T>.Type {
+    func getBuilder<T: Decodable>() -> RequestBuilder<T>.Type {
         return AlamofireDecodableRequestBuilder<T>.self
     }
 }
@@ -21,7 +21,7 @@ class AlamofireRequestBuilderFactory: RequestBuilderFactory {
 private var managerStore: [String: Alamofire.SessionManager] = [:]
 
 open class AlamofireRequestBuilder<T>: RequestBuilder<T> {
-    required public init(method: String, URLString: String, parameters: [String : Any]?, isBody: Bool, headers: [String : String] = [:]) {
+    required public init(method: String, URLString: String, parameters: [String: Any]?, isBody: Bool, headers: [String: String] = [:]) {
         super.init(method: method, URLString: URLString, parameters: parameters, isBody: isBody, headers: headers)
     }
 
@@ -50,17 +50,17 @@ open class AlamofireRequestBuilder<T>: RequestBuilder<T> {
      May be overridden by a subclass if you want to control the request
      configuration (e.g. to override the cache policy).
      */
-    open func makeRequest(manager: SessionManager, method: HTTPMethod, encoding: ParameterEncoding, headers: [String:String]) -> DataRequest {
+    open func makeRequest(manager: SessionManager, method: HTTPMethod, encoding: ParameterEncoding, headers: [String: String]) -> DataRequest {
         return manager.request(URLString, method: method, parameters: parameters, encoding: encoding, headers: headers)
     }
 
     override open func execute(_ completion: @escaping (_ response: Response<T>?, _ error: Error?) -> Void) {
-        let managerId:String = UUID().uuidString
+        let managerId: String = UUID().uuidString
         // Create a new manager for each request to customize its request header
         let manager = createSessionManager()
         managerStore[managerId] = manager
 
-        let encoding:ParameterEncoding = isBody ? JSONDataEncoding() : URLEncoding()
+        let encoding: ParameterEncoding = isBody ? JSONDataEncoding() : URLEncoding()
 
         let xMethod = Alamofire.HTTPMethod(rawValue: method)
         let fileKeys = parameters == nil ? [] : parameters!.filter { $1 is NSURL }
@@ -73,8 +73,7 @@ open class AlamofireRequestBuilder<T>: RequestBuilder<T> {
                     case let fileURL as URL:
                         if let mimeType = self.contentTypeForFormPart(fileURL: fileURL) {
                             mpForm.append(fileURL, withName: k, fileName: fileURL.lastPathComponent, mimeType: mimeType)
-                        }
-                        else {
+                        } else {
                             mpForm.append(fileURL, withName: k)
                         }
                     case let string as String:
@@ -238,7 +237,7 @@ open class AlamofireRequestBuilder<T>: RequestBuilder<T> {
         return httpHeaders
     }
 
-    fileprivate func getFileName(fromContentDisposition contentDisposition : String?) -> String? {
+    fileprivate func getFileName(fromContentDisposition contentDisposition: String?) -> String? {
 
         guard let contentDisposition = contentDisposition else {
             return nil
@@ -246,7 +245,7 @@ open class AlamofireRequestBuilder<T>: RequestBuilder<T> {
 
         let items = contentDisposition.components(separatedBy: ";")
 
-        var filename : String? = nil
+        var filename: String?
 
         for contentItem in items {
 
@@ -257,7 +256,7 @@ open class AlamofireRequestBuilder<T>: RequestBuilder<T> {
 
             filename = contentItem
             return filename?
-                .replacingCharacters(in: range, with:"")
+                .replacingCharacters(in: range, with: "")
                 .replacingOccurrences(of: "\"", with: "")
                 .trimmingCharacters(in: .whitespacesAndNewlines)
         }
@@ -266,7 +265,7 @@ open class AlamofireRequestBuilder<T>: RequestBuilder<T> {
 
     }
 
-    fileprivate func getPath(from url : URL) throws -> String {
+    fileprivate func getPath(from url: URL) throws -> String {
 
         guard var path = URLComponents(url: url, resolvingAgainstBaseURL: true)?.path else {
             throw DownloadException.requestMissingPath
@@ -280,7 +279,7 @@ open class AlamofireRequestBuilder<T>: RequestBuilder<T> {
 
     }
 
-    fileprivate func getURL(from urlRequest : URLRequest) throws -> URL {
+    fileprivate func getURL(from urlRequest: URLRequest) throws -> URL {
 
         guard let url = urlRequest.url else {
             throw DownloadException.requestMissingURL
@@ -291,7 +290,7 @@ open class AlamofireRequestBuilder<T>: RequestBuilder<T> {
 
 }
 
-fileprivate enum DownloadException : Error {
+private enum DownloadException: Error {
     case responseDataMissing
     case responseFailed
     case requestMissing
@@ -306,7 +305,7 @@ public enum AlamofireDecodableRequestBuilderError: Error {
     case generalError(Error)
 }
 
-open class AlamofireDecodableRequestBuilder<T:Decodable>: AlamofireRequestBuilder<T> {
+open class AlamofireDecodableRequestBuilder<T: Decodable>: AlamofireRequestBuilder<T> {
 
     override fileprivate func processRequest(request: DataRequest, _ managerId: String, _ completion: @escaping (_ response: Response<T>?, _ error: Error?) -> Void) {
         if let credential = self.credential {
@@ -398,7 +397,7 @@ open class AlamofireDecodableRequestBuilder<T:Decodable>: AlamofireRequestBuilde
                     return
                 }
 
-                var responseObj: Response<T>? = nil
+                var responseObj: Response<T>?
 
                 let decodeResult: (decodableObj: T?, error: Error?) = CodableHelper.decode(T.self, from: data)
                 if decodeResult.error == nil {
diff --git a/samples/client/test/swift4/default/TestClient/Classes/Swaggers/CodableHelper.swift b/samples/client/test/swift4/default/TestClient/Classes/Swaggers/CodableHelper.swift
index 2d50e463ae..27e6a28761 100644
--- a/samples/client/test/swift4/default/TestClient/Classes/Swaggers/CodableHelper.swift
+++ b/samples/client/test/swift4/default/TestClient/Classes/Swaggers/CodableHelper.swift
@@ -13,9 +13,9 @@ open class CodableHelper {
 
     open static var dateformatter: DateFormatter?
 
-    open class func decode<T>(_ type: T.Type, from data: Data) -> (decodableObj: T?, error: Error?) where T : Decodable {
-        var returnedDecodable: T? = nil
-        var returnedError: Error? = nil
+    open class func decode<T>(_ type: T.Type, from data: Data) -> (decodableObj: T?, error: Error?) where T: Decodable {
+        var returnedDecodable: T?
+        var returnedError: Error?
 
         let decoder = JSONDecoder()
         if let df = self.dateformatter {
@@ -39,9 +39,9 @@ open class CodableHelper {
         return (returnedDecodable, returnedError)
     }
 
-    open class func encode<T>(_ value: T, prettyPrint: Bool = false) -> EncodeResult where T : Encodable {
+    open class func encode<T>(_ value: T, prettyPrint: Bool = false) -> EncodeResult where T: Encodable {
         var returnedData: Data?
-        var returnedError: Error? = nil
+        var returnedError: Error?
 
         let encoder = JSONEncoder()
         if prettyPrint {
diff --git a/samples/client/test/swift4/default/TestClient/Classes/Swaggers/Configuration.swift b/samples/client/test/swift4/default/TestClient/Classes/Swaggers/Configuration.swift
index f8180752b6..eb61a73c0b 100644
--- a/samples/client/test/swift4/default/TestClient/Classes/Swaggers/Configuration.swift
+++ b/samples/client/test/swift4/default/TestClient/Classes/Swaggers/Configuration.swift
@@ -7,9 +7,9 @@
 import Foundation
 
 open class Configuration {
-	
+
 	// This value is used to configure the date formatter that is used to serialize dates into JSON format. 
 	// You must set it prior to encoding any dates, and it will only be read once. 
     open static var dateFormat = "yyyy-MM-dd'T'HH:mm:ss.SSSZZZZZ"
-    
-}
\ No newline at end of file
+
+}
diff --git a/samples/client/test/swift4/default/TestClient/Classes/Swaggers/Extensions.swift b/samples/client/test/swift4/default/TestClient/Classes/Swaggers/Extensions.swift
index abe218b4e7..47967f9248 100644
--- a/samples/client/test/swift4/default/TestClient/Classes/Swaggers/Extensions.swift
+++ b/samples/client/test/swift4/default/TestClient/Classes/Swaggers/Extensions.swift
@@ -106,24 +106,24 @@ extension String: CodingKey {
 
 extension KeyedEncodingContainerProtocol {
 
-    public mutating func encodeArray<T>(_ values: [T], forKey key: Self.Key) throws where T : Encodable {
+    public mutating func encodeArray<T>(_ values: [T], forKey key: Self.Key) throws where T: Encodable {
         var arrayContainer = nestedUnkeyedContainer(forKey: key)
         try arrayContainer.encode(contentsOf: values)
     }
 
-    public mutating func encodeArrayIfPresent<T>(_ values: [T]?, forKey key: Self.Key) throws where T : Encodable {
+    public mutating func encodeArrayIfPresent<T>(_ values: [T]?, forKey key: Self.Key) throws where T: Encodable {
         if let values = values {
             try encodeArray(values, forKey: key)
         }
     }
 
-    public mutating func encodeMap<T>(_ pairs: [Self.Key: T]) throws where T : Encodable {
+    public mutating func encodeMap<T>(_ pairs: [Self.Key: T]) throws where T: Encodable {
         for (key, value) in pairs {
             try encode(value, forKey: key)
         }
     }
 
-    public mutating func encodeMapIfPresent<T>(_ pairs: [Self.Key: T]?) throws where T : Encodable {
+    public mutating func encodeMapIfPresent<T>(_ pairs: [Self.Key: T]?) throws where T: Encodable {
         if let pairs = pairs {
             try encodeMap(pairs)
         }
@@ -133,7 +133,7 @@ extension KeyedEncodingContainerProtocol {
 
 extension KeyedDecodingContainerProtocol {
 
-    public func decodeArray<T>(_ type: T.Type, forKey key: Self.Key) throws -> [T] where T : Decodable {
+    public func decodeArray<T>(_ type: T.Type, forKey key: Self.Key) throws -> [T] where T: Decodable {
         var tmpArray = [T]()
 
         var nestedContainer = try nestedUnkeyedContainer(forKey: key)
@@ -145,8 +145,8 @@ extension KeyedDecodingContainerProtocol {
         return tmpArray
     }
 
-    public func decodeArrayIfPresent<T>(_ type: T.Type, forKey key: Self.Key) throws -> [T]? where T : Decodable {
-        var tmpArray: [T]? = nil
+    public func decodeArrayIfPresent<T>(_ type: T.Type, forKey key: Self.Key) throws -> [T]? where T: Decodable {
+        var tmpArray: [T]?
 
         if contains(key) {
             tmpArray = try decodeArray(T.self, forKey: key)
@@ -155,8 +155,8 @@ extension KeyedDecodingContainerProtocol {
         return tmpArray
     }
 
-    public func decodeMap<T>(_ type: T.Type, excludedKeys: Set<Self.Key>) throws -> [Self.Key: T] where T : Decodable {
-        var map: [Self.Key : T] = [:]
+    public func decodeMap<T>(_ type: T.Type, excludedKeys: Set<Self.Key>) throws -> [Self.Key: T] where T: Decodable {
+        var map: [Self.Key: T] = [:]
 
         for key in allKeys {
             if !excludedKeys.contains(key) {
@@ -169,5 +169,3 @@ extension KeyedDecodingContainerProtocol {
     }
 
 }
-
-
diff --git a/samples/client/test/swift4/default/TestClient/Classes/Swaggers/JSONEncodableEncoding.swift b/samples/client/test/swift4/default/TestClient/Classes/Swaggers/JSONEncodableEncoding.swift
index ca05906d42..fb76bbed26 100644
--- a/samples/client/test/swift4/default/TestClient/Classes/Swaggers/JSONEncodableEncoding.swift
+++ b/samples/client/test/swift4/default/TestClient/Classes/Swaggers/JSONEncodableEncoding.swift
@@ -42,7 +42,7 @@ public struct JSONDataEncoding: ParameterEncoding {
     }
 
     public static func encodingParameters(jsonData: Data?) -> Parameters? {
-        var returnedParams: Parameters? = nil
+        var returnedParams: Parameters?
         if let jsonData = jsonData, !jsonData.isEmpty {
             var params = Parameters()
             params[jsonDataKey] = jsonData
diff --git a/samples/client/test/swift4/default/TestClient/Classes/Swaggers/JSONEncodingHelper.swift b/samples/client/test/swift4/default/TestClient/Classes/Swaggers/JSONEncodingHelper.swift
index 7044951584..7bd1267e95 100644
--- a/samples/client/test/swift4/default/TestClient/Classes/Swaggers/JSONEncodingHelper.swift
+++ b/samples/client/test/swift4/default/TestClient/Classes/Swaggers/JSONEncodingHelper.swift
@@ -10,8 +10,8 @@ import Alamofire
 
 open class JSONEncodingHelper {
 
-    open class func encodingParameters<T:Encodable>(forEncodableObject encodableObj: T?) -> Parameters? {
-        var params: Parameters? = nil
+    open class func encodingParameters<T: Encodable>(forEncodableObject encodableObj: T?) -> Parameters? {
+        var params: Parameters?
 
         // Encode the Encodable object
         if let encodableObj = encodableObj {
@@ -25,7 +25,7 @@ open class JSONEncodingHelper {
     }
 
     open class func encodingParameters(forEncodableObject encodableObj: Any?) -> Parameters? {
-        var params: Parameters? = nil
+        var params: Parameters?
 
         if let encodableObj = encodableObj {
             do {
@@ -39,5 +39,5 @@ open class JSONEncodingHelper {
 
         return params
     }
-    
+
 }
diff --git a/samples/client/test/swift4/default/TestClient/Classes/Swaggers/Models.swift b/samples/client/test/swift4/default/TestClient/Classes/Swaggers/Models.swift
index 42f8186ae4..9d4101c3cd 100644
--- a/samples/client/test/swift4/default/TestClient/Classes/Swaggers/Models.swift
+++ b/samples/client/test/swift4/default/TestClient/Classes/Swaggers/Models.swift
@@ -10,7 +10,7 @@ protocol JSONEncodable {
     func encodeToJSON() -> Any
 }
 
-public enum ErrorResponse : Error {
+public enum ErrorResponse: Error {
     case error(Int, Data?, Error)
 }
 
@@ -27,7 +27,7 @@ open class Response<T> {
 
     public convenience init(response: HTTPURLResponse, body: T?) {
         let rawHeader = response.allHeaderFields
-        var header = [String:String]()
+        var header = [String: String]()
         for case let (key, value) as (String, String) in rawHeader {
             header[key] = value
         }
diff --git a/samples/client/test/swift4/default/TestClient/Classes/Swaggers/Models/AllPrimitives.swift b/samples/client/test/swift4/default/TestClient/Classes/Swaggers/Models/AllPrimitives.swift
index 3ce27fcd98..0087792f20 100644
--- a/samples/client/test/swift4/default/TestClient/Classes/Swaggers/Models/AllPrimitives.swift
+++ b/samples/client/test/swift4/default/TestClient/Classes/Swaggers/Models/AllPrimitives.swift
@@ -7,7 +7,6 @@
 
 import Foundation
 
-
 /** Object which contains lots of different primitive Swagger types */
 
 public struct AllPrimitives: Codable {
@@ -71,6 +70,4 @@ public struct AllPrimitives: Codable {
         self.myInlineStringEnum = myInlineStringEnum
     }
 
-
 }
-
diff --git a/samples/client/test/swift4/default/TestClient/Classes/Swaggers/Models/BaseCard.swift b/samples/client/test/swift4/default/TestClient/Classes/Swaggers/Models/BaseCard.swift
index 7e4bb2c0cd..51055d8573 100644
--- a/samples/client/test/swift4/default/TestClient/Classes/Swaggers/Models/BaseCard.swift
+++ b/samples/client/test/swift4/default/TestClient/Classes/Swaggers/Models/BaseCard.swift
@@ -7,7 +7,6 @@
 
 import Foundation
 
-
 /** This is a base card object which uses a &#39;cardType&#39; discriminator. */
 
 public struct BaseCard: Codable {
@@ -18,6 +17,4 @@ public struct BaseCard: Codable {
         self.cardType = cardType
     }
 
-
 }
-
diff --git a/samples/client/test/swift4/default/TestClient/Classes/Swaggers/Models/ErrorInfo.swift b/samples/client/test/swift4/default/TestClient/Classes/Swaggers/Models/ErrorInfo.swift
index ae5327eda3..a603717abe 100644
--- a/samples/client/test/swift4/default/TestClient/Classes/Swaggers/Models/ErrorInfo.swift
+++ b/samples/client/test/swift4/default/TestClient/Classes/Swaggers/Models/ErrorInfo.swift
@@ -7,7 +7,6 @@
 
 import Foundation
 
-
 /** Example Error object */
 
 public struct ErrorInfo: Codable {
@@ -22,6 +21,4 @@ public struct ErrorInfo: Codable {
         self.details = details
     }
 
-
 }
-
diff --git a/samples/client/test/swift4/default/TestClient/Classes/Swaggers/Models/GetAllModelsResult.swift b/samples/client/test/swift4/default/TestClient/Classes/Swaggers/Models/GetAllModelsResult.swift
index 286c5a7a35..cc3992e748 100644
--- a/samples/client/test/swift4/default/TestClient/Classes/Swaggers/Models/GetAllModelsResult.swift
+++ b/samples/client/test/swift4/default/TestClient/Classes/Swaggers/Models/GetAllModelsResult.swift
@@ -7,7 +7,6 @@
 
 import Foundation
 
-
 /** Response object containing AllPrimitives object */
 
 public struct GetAllModelsResult: Codable {
@@ -22,6 +21,4 @@ public struct GetAllModelsResult: Codable {
         self.myVariableNameTest = myVariableNameTest
     }
 
-
 }
-
diff --git a/samples/client/test/swift4/default/TestClient/Classes/Swaggers/Models/ModelDoubleArray.swift b/samples/client/test/swift4/default/TestClient/Classes/Swaggers/Models/ModelDoubleArray.swift
index e6e986dce6..9e523219a4 100644
--- a/samples/client/test/swift4/default/TestClient/Classes/Swaggers/Models/ModelDoubleArray.swift
+++ b/samples/client/test/swift4/default/TestClient/Classes/Swaggers/Models/ModelDoubleArray.swift
@@ -7,6 +7,5 @@
 
 import Foundation
 
-
 /** This defines an array of doubles. */
 public typealias ModelDoubleArray = [Double]
diff --git a/samples/client/test/swift4/default/TestClient/Classes/Swaggers/Models/ModelErrorInfoArray.swift b/samples/client/test/swift4/default/TestClient/Classes/Swaggers/Models/ModelErrorInfoArray.swift
index 6656e6abe8..358c83dc7a 100644
--- a/samples/client/test/swift4/default/TestClient/Classes/Swaggers/Models/ModelErrorInfoArray.swift
+++ b/samples/client/test/swift4/default/TestClient/Classes/Swaggers/Models/ModelErrorInfoArray.swift
@@ -7,6 +7,5 @@
 
 import Foundation
 
-
 /** This defines an array of ErrorInfo objects. */
 public typealias ModelErrorInfoArray = [ErrorInfo]
diff --git a/samples/client/test/swift4/default/TestClient/Classes/Swaggers/Models/ModelStringArray.swift b/samples/client/test/swift4/default/TestClient/Classes/Swaggers/Models/ModelStringArray.swift
index 7f0e0cbd13..6a614cc360 100644
--- a/samples/client/test/swift4/default/TestClient/Classes/Swaggers/Models/ModelStringArray.swift
+++ b/samples/client/test/swift4/default/TestClient/Classes/Swaggers/Models/ModelStringArray.swift
@@ -7,6 +7,5 @@
 
 import Foundation
 
-
 /** This defines an array of strings. */
 public typealias ModelStringArray = [String]
diff --git a/samples/client/test/swift4/default/TestClient/Classes/Swaggers/Models/ModelWithIntAdditionalPropertiesOnly.swift b/samples/client/test/swift4/default/TestClient/Classes/Swaggers/Models/ModelWithIntAdditionalPropertiesOnly.swift
index bad857a6cf..35834374b0 100644
--- a/samples/client/test/swift4/default/TestClient/Classes/Swaggers/Models/ModelWithIntAdditionalPropertiesOnly.swift
+++ b/samples/client/test/swift4/default/TestClient/Classes/Swaggers/Models/ModelWithIntAdditionalPropertiesOnly.swift
@@ -7,13 +7,11 @@
 
 import Foundation
 
-
 /** This is an empty model with no properties and only additionalProperties of type int32 */
 
 public struct ModelWithIntAdditionalPropertiesOnly: Codable {
 
-
-    public var additionalProperties: [String:Int] = [:]
+    public var additionalProperties: [String: Int] = [:]
 
     public subscript(key: String) -> Int? {
         get {
@@ -46,7 +44,4 @@ public struct ModelWithIntAdditionalPropertiesOnly: Codable {
         additionalProperties = try container.decodeMap(Int.self, excludedKeys: nonAdditionalPropertyKeys)
     }
 
-
-
 }
-
diff --git a/samples/client/test/swift4/default/TestClient/Classes/Swaggers/Models/ModelWithPropertiesAndAdditionalProperties.swift b/samples/client/test/swift4/default/TestClient/Classes/Swaggers/Models/ModelWithPropertiesAndAdditionalProperties.swift
index dac9f4a6e2..de3ca37450 100644
--- a/samples/client/test/swift4/default/TestClient/Classes/Swaggers/Models/ModelWithPropertiesAndAdditionalProperties.swift
+++ b/samples/client/test/swift4/default/TestClient/Classes/Swaggers/Models/ModelWithPropertiesAndAdditionalProperties.swift
@@ -7,7 +7,6 @@
 
 import Foundation
 
-
 /** This is an empty model with no properties and only additionalProperties of type int32 */
 
 public struct ModelWithPropertiesAndAdditionalProperties: Codable {
@@ -31,7 +30,7 @@ public struct ModelWithPropertiesAndAdditionalProperties: Codable {
         self.myPrimitiveArrayReq = myPrimitiveArrayReq
         self.myPrimitiveArrayOpt = myPrimitiveArrayOpt
     }
-    public var additionalProperties: [String:String] = [:]
+    public var additionalProperties: [String: String] = [:]
 
     public subscript(key: String) -> String? {
         get {
@@ -88,7 +87,4 @@ public struct ModelWithPropertiesAndAdditionalProperties: Codable {
         additionalProperties = try container.decodeMap(String.self, excludedKeys: nonAdditionalPropertyKeys)
     }
 
-
-
 }
-
diff --git a/samples/client/test/swift4/default/TestClient/Classes/Swaggers/Models/ModelWithStringAdditionalPropertiesOnly.swift b/samples/client/test/swift4/default/TestClient/Classes/Swaggers/Models/ModelWithStringAdditionalPropertiesOnly.swift
index ebc3c48d85..5f085f47ae 100644
--- a/samples/client/test/swift4/default/TestClient/Classes/Swaggers/Models/ModelWithStringAdditionalPropertiesOnly.swift
+++ b/samples/client/test/swift4/default/TestClient/Classes/Swaggers/Models/ModelWithStringAdditionalPropertiesOnly.swift
@@ -7,13 +7,11 @@
 
 import Foundation
 
-
 /** This is an empty model with no properties and only additionalProperties of type string */
 
 public struct ModelWithStringAdditionalPropertiesOnly: Codable {
 
-
-    public var additionalProperties: [String:String] = [:]
+    public var additionalProperties: [String: String] = [:]
 
     public subscript(key: String) -> String? {
         get {
@@ -46,7 +44,4 @@ public struct ModelWithStringAdditionalPropertiesOnly: Codable {
         additionalProperties = try container.decodeMap(String.self, excludedKeys: nonAdditionalPropertyKeys)
     }
 
-
-
 }
-
diff --git a/samples/client/test/swift4/default/TestClient/Classes/Swaggers/Models/PersonCard.swift b/samples/client/test/swift4/default/TestClient/Classes/Swaggers/Models/PersonCard.swift
index b2e7ea67c5..dd4196af07 100644
--- a/samples/client/test/swift4/default/TestClient/Classes/Swaggers/Models/PersonCard.swift
+++ b/samples/client/test/swift4/default/TestClient/Classes/Swaggers/Models/PersonCard.swift
@@ -7,7 +7,6 @@
 
 import Foundation
 
-
 /** This is an card object for a Person derived from BaseCard. */
 
 public struct PersonCard: Codable {
@@ -22,6 +21,4 @@ public struct PersonCard: Codable {
         self.lastName = lastName
     }
 
-
 }
-
diff --git a/samples/client/test/swift4/default/TestClient/Classes/Swaggers/Models/PlaceCard.swift b/samples/client/test/swift4/default/TestClient/Classes/Swaggers/Models/PlaceCard.swift
index fa48a17c21..c1435ae76d 100644
--- a/samples/client/test/swift4/default/TestClient/Classes/Swaggers/Models/PlaceCard.swift
+++ b/samples/client/test/swift4/default/TestClient/Classes/Swaggers/Models/PlaceCard.swift
@@ -7,7 +7,6 @@
 
 import Foundation
 
-
 /** This is an card object for a Person derived from BaseCard. */
 
 public struct PlaceCard: Codable {
@@ -22,6 +21,4 @@ public struct PlaceCard: Codable {
         self.placeAddress = placeAddress
     }
 
-
 }
-
diff --git a/samples/client/test/swift4/default/TestClient/Classes/Swaggers/Models/SampleBase.swift b/samples/client/test/swift4/default/TestClient/Classes/Swaggers/Models/SampleBase.swift
index 49c5f1f662..aea8656680 100644
--- a/samples/client/test/swift4/default/TestClient/Classes/Swaggers/Models/SampleBase.swift
+++ b/samples/client/test/swift4/default/TestClient/Classes/Swaggers/Models/SampleBase.swift
@@ -7,7 +7,6 @@
 
 import Foundation
 
-
 /** This is an base class object from which other classes will derive. */
 
 public struct SampleBase: Codable {
@@ -20,6 +19,4 @@ public struct SampleBase: Codable {
         self.baseClassIntegerProp = baseClassIntegerProp
     }
 
-
 }
-
diff --git a/samples/client/test/swift4/default/TestClient/Classes/Swaggers/Models/SampleSubClass.swift b/samples/client/test/swift4/default/TestClient/Classes/Swaggers/Models/SampleSubClass.swift
index 582d7d2fee..fa000279e0 100644
--- a/samples/client/test/swift4/default/TestClient/Classes/Swaggers/Models/SampleSubClass.swift
+++ b/samples/client/test/swift4/default/TestClient/Classes/Swaggers/Models/SampleSubClass.swift
@@ -7,7 +7,6 @@
 
 import Foundation
 
-
 /** This is an subclass defived from the SampleBase class. */
 
 public struct SampleSubClass: Codable {
@@ -24,6 +23,4 @@ public struct SampleSubClass: Codable {
         self.subClassIntegerProp = subClassIntegerProp
     }
 
-
 }
-
diff --git a/samples/client/test/swift4/default/TestClient/Classes/Swaggers/Models/StringEnum.swift b/samples/client/test/swift4/default/TestClient/Classes/Swaggers/Models/StringEnum.swift
index d4cce19e6d..67c1c22ded 100644
--- a/samples/client/test/swift4/default/TestClient/Classes/Swaggers/Models/StringEnum.swift
+++ b/samples/client/test/swift4/default/TestClient/Classes/Swaggers/Models/StringEnum.swift
@@ -7,7 +7,6 @@
 
 import Foundation
 
-
 public enum StringEnum: String, Codable {
     case stringenumvalue1 = "stringEnumValue1"
     case stringenumvalue2 = "stringEnumValue2"
diff --git a/samples/client/test/swift4/default/TestClient/Classes/Swaggers/Models/VariableNameTest.swift b/samples/client/test/swift4/default/TestClient/Classes/Swaggers/Models/VariableNameTest.swift
index 1248e645c6..6592d3f1ee 100644
--- a/samples/client/test/swift4/default/TestClient/Classes/Swaggers/Models/VariableNameTest.swift
+++ b/samples/client/test/swift4/default/TestClient/Classes/Swaggers/Models/VariableNameTest.swift
@@ -7,7 +7,6 @@
 
 import Foundation
 
-
 /** This object contains property names which we know will be different from their variable name. Examples of this include snake case property names and property names which are Swift 4 reserved words. */
 
 public struct VariableNameTest: Codable {
@@ -25,12 +24,10 @@ public struct VariableNameTest: Codable {
         self.normalName = normalName
     }
 
-    public enum CodingKeys: String, CodingKey { 
+    public enum CodingKeys: String, CodingKey {
         case exampleName = "example_name"
         case _for = "for"
         case normalName
     }
 
-
 }
-
diff --git a/samples/client/test/swift4/default/TestClientApp/Pods/Alamofire/Source/Alamofire.swift b/samples/client/test/swift4/default/TestClientApp/Pods/Alamofire/Source/Alamofire.swift
index e9716131ad..e28ff5f332 100644
--- a/samples/client/test/swift4/default/TestClientApp/Pods/Alamofire/Source/Alamofire.swift
+++ b/samples/client/test/swift4/default/TestClientApp/Pods/Alamofire/Source/Alamofire.swift
@@ -135,8 +135,7 @@ public func request(
     parameters: Parameters? = nil,
     encoding: ParameterEncoding = URLEncoding.default,
     headers: HTTPHeaders? = nil)
-    -> DataRequest
-{
+    -> DataRequest {
     return SessionManager.default.request(
         url,
         method: method,
@@ -183,8 +182,7 @@ public func download(
     encoding: ParameterEncoding = URLEncoding.default,
     headers: HTTPHeaders? = nil,
     to destination: DownloadRequest.DownloadFileDestination? = nil)
-    -> DownloadRequest
-{
+    -> DownloadRequest {
     return SessionManager.default.download(
         url,
         method: method,
@@ -209,8 +207,7 @@ public func download(
 public func download(
     _ urlRequest: URLRequestConvertible,
     to destination: DownloadRequest.DownloadFileDestination? = nil)
-    -> DownloadRequest
-{
+    -> DownloadRequest {
     return SessionManager.default.download(urlRequest, to: destination)
 }
 
@@ -239,8 +236,7 @@ public func download(
 public func download(
     resumingWith resumeData: Data,
     to destination: DownloadRequest.DownloadFileDestination? = nil)
-    -> DownloadRequest
-{
+    -> DownloadRequest {
     return SessionManager.default.download(resumingWith: resumeData, to: destination)
 }
 
@@ -263,8 +259,7 @@ public func upload(
     to url: URLConvertible,
     method: HTTPMethod = .post,
     headers: HTTPHeaders? = nil)
-    -> UploadRequest
-{
+    -> UploadRequest {
     return SessionManager.default.upload(fileURL, to: url, method: method, headers: headers)
 }
 
@@ -297,8 +292,7 @@ public func upload(
     to url: URLConvertible,
     method: HTTPMethod = .post,
     headers: HTTPHeaders? = nil)
-    -> UploadRequest
-{
+    -> UploadRequest {
     return SessionManager.default.upload(data, to: url, method: method, headers: headers)
 }
 
@@ -331,8 +325,7 @@ public func upload(
     to url: URLConvertible,
     method: HTTPMethod = .post,
     headers: HTTPHeaders? = nil)
-    -> UploadRequest
-{
+    -> UploadRequest {
     return SessionManager.default.upload(stream, to: url, method: method, headers: headers)
 }
 
@@ -379,8 +372,7 @@ public func upload(
     to url: URLConvertible,
     method: HTTPMethod = .post,
     headers: HTTPHeaders? = nil,
-    encodingCompletion: ((SessionManager.MultipartFormDataEncodingResult) -> Void)?)
-{
+    encodingCompletion: ((SessionManager.MultipartFormDataEncodingResult) -> Void)?) {
     return SessionManager.default.upload(
         multipartFormData: multipartFormData,
         usingThreshold: encodingMemoryThreshold,
@@ -416,8 +408,7 @@ public func upload(
     multipartFormData: @escaping (MultipartFormData) -> Void,
     usingThreshold encodingMemoryThreshold: UInt64 = SessionManager.multipartFormDataEncodingMemoryThreshold,
     with urlRequest: URLRequestConvertible,
-    encodingCompletion: ((SessionManager.MultipartFormDataEncodingResult) -> Void)?)
-{
+    encodingCompletion: ((SessionManager.MultipartFormDataEncodingResult) -> Void)?) {
     return SessionManager.default.upload(
         multipartFormData: multipartFormData,
         usingThreshold: encodingMemoryThreshold,
diff --git a/samples/client/test/swift4/default/TestClientApp/Pods/Alamofire/Source/MultipartFormData.swift b/samples/client/test/swift4/default/TestClientApp/Pods/Alamofire/Source/MultipartFormData.swift
index ba02d24f23..7f559f351c 100644
--- a/samples/client/test/swift4/default/TestClientApp/Pods/Alamofire/Source/MultipartFormData.swift
+++ b/samples/client/test/swift4/default/TestClientApp/Pods/Alamofire/Source/MultipartFormData.swift
@@ -275,8 +275,7 @@ open class MultipartFormData {
             }
 
             bodyContentLength = fileSize.uint64Value
-        }
-        catch {
+        } catch {
             setBodyPartError(withReason: .bodyPartFileSizeQueryFailedWithError(forURL: fileURL, error: error))
             return
         }
@@ -312,8 +311,7 @@ open class MultipartFormData {
         withLength length: UInt64,
         name: String,
         fileName: String,
-        mimeType: String)
-    {
+        mimeType: String) {
         let headers = contentHeaders(withName: name, fileName: fileName, mimeType: mimeType)
         append(stream, withLength: length, headers: headers)
     }
diff --git a/samples/client/test/swift4/default/TestClientApp/Pods/Alamofire/Source/NetworkReachabilityManager.swift b/samples/client/test/swift4/default/TestClientApp/Pods/Alamofire/Source/NetworkReachabilityManager.swift
index cdb5a02d31..834c21ed07 100644
--- a/samples/client/test/swift4/default/TestClientApp/Pods/Alamofire/Source/NetworkReachabilityManager.swift
+++ b/samples/client/test/swift4/default/TestClientApp/Pods/Alamofire/Source/NetworkReachabilityManager.swift
@@ -146,8 +146,7 @@ public class NetworkReachabilityManager {
         context.info = Unmanaged.passUnretained(self).toOpaque()
 
         let callbackEnabled = SCNetworkReachabilitySetCallback(
-            reachability,
-            { (_, flags, info) in
+            reachability, { (_, flags, info) in
                 let reachability = Unmanaged<NetworkReachabilityManager>.fromOpaque(info!).takeUnretainedValue()
                 reachability.notifyListener(flags)
             },
@@ -216,8 +215,7 @@ extension NetworkReachabilityManager.NetworkReachabilityStatus: Equatable {}
 public func ==(
     lhs: NetworkReachabilityManager.NetworkReachabilityStatus,
     rhs: NetworkReachabilityManager.NetworkReachabilityStatus)
-    -> Bool
-{
+    -> Bool {
     switch (lhs, rhs) {
     case (.unknown, .unknown):
         return true
diff --git a/samples/client/test/swift4/default/TestClientApp/Pods/Alamofire/Source/ParameterEncoding.swift b/samples/client/test/swift4/default/TestClientApp/Pods/Alamofire/Source/ParameterEncoding.swift
index dabb56223c..0cbe7139dd 100644
--- a/samples/client/test/swift4/default/TestClientApp/Pods/Alamofire/Source/ParameterEncoding.swift
+++ b/samples/client/test/swift4/default/TestClientApp/Pods/Alamofire/Source/ParameterEncoding.swift
@@ -384,8 +384,7 @@ public struct PropertyListEncoding: ParameterEncoding {
     /// - returns: The new `PropertyListEncoding` instance.
     public init(
         format: PropertyListSerialization.PropertyListFormat = .xml,
-        options: PropertyListSerialization.WriteOptions = 0)
-    {
+        options: PropertyListSerialization.WriteOptions = 0) {
         self.format = format
         self.options = options
     }
diff --git a/samples/client/test/swift4/default/TestClientApp/Pods/Alamofire/Source/Request.swift b/samples/client/test/swift4/default/TestClientApp/Pods/Alamofire/Source/Request.swift
index d93c52d100..8ed59add4d 100644
--- a/samples/client/test/swift4/default/TestClientApp/Pods/Alamofire/Source/Request.swift
+++ b/samples/client/test/swift4/default/TestClientApp/Pods/Alamofire/Source/Request.swift
@@ -161,8 +161,7 @@ open class Request {
         user: String,
         password: String,
         persistence: URLCredential.Persistence = .forSession)
-        -> Self
-    {
+        -> Self {
         let credential = URLCredential(user: user, password: password, persistence: persistence)
         return authenticate(usingCredential: credential)
     }
@@ -537,8 +536,7 @@ open class DownloadRequest: Request {
     open class func suggestedDownloadDestination(
         for directory: FileManager.SearchPathDirectory = .documentDirectory,
         in domain: FileManager.SearchPathDomainMask = .userDomainMask)
-        -> DownloadFileDestination
-    {
+        -> DownloadFileDestination {
         return { temporaryURL, response in
             let directoryURLs = FileManager.default.urls(for: directory, in: domain)
 
diff --git a/samples/client/test/swift4/default/TestClientApp/Pods/Alamofire/Source/Response.swift b/samples/client/test/swift4/default/TestClientApp/Pods/Alamofire/Source/Response.swift
index 703eeb4d36..dbfb3c03ae 100644
--- a/samples/client/test/swift4/default/TestClientApp/Pods/Alamofire/Source/Response.swift
+++ b/samples/client/test/swift4/default/TestClientApp/Pods/Alamofire/Source/Response.swift
@@ -58,8 +58,7 @@ public struct DefaultDataResponse {
         data: Data?,
         error: Error?,
         timeline: Timeline = Timeline(),
-        metrics: AnyObject? = nil)
-    {
+        metrics: AnyObject? = nil) {
         self.request = request
         self.response = response
         self.data = data
@@ -109,8 +108,7 @@ public struct DataResponse<Value> {
         response: HTTPURLResponse?,
         data: Data?,
         result: Result<Value>,
-        timeline: Timeline = Timeline())
-    {
+        timeline: Timeline = Timeline()) {
         self.request = request
         self.response = response
         self.data = data
@@ -247,8 +245,7 @@ public struct DefaultDownloadResponse {
         resumeData: Data?,
         error: Error?,
         timeline: Timeline = Timeline(),
-        metrics: AnyObject? = nil)
-    {
+        metrics: AnyObject? = nil) {
         self.request = request
         self.response = response
         self.temporaryURL = temporaryURL
@@ -310,8 +307,7 @@ public struct DownloadResponse<Value> {
         destinationURL: URL?,
         resumeData: Data?,
         result: Result<Value>,
-        timeline: Timeline = Timeline())
-    {
+        timeline: Timeline = Timeline()) {
         self.request = request
         self.response = response
         self.temporaryURL = temporaryURL
diff --git a/samples/client/test/swift4/default/TestClientApp/Pods/Alamofire/Source/ResponseSerialization.swift b/samples/client/test/swift4/default/TestClientApp/Pods/Alamofire/Source/ResponseSerialization.swift
index 1f29ed8504..76d905997c 100644
--- a/samples/client/test/swift4/default/TestClientApp/Pods/Alamofire/Source/ResponseSerialization.swift
+++ b/samples/client/test/swift4/default/TestClientApp/Pods/Alamofire/Source/ResponseSerialization.swift
@@ -144,8 +144,7 @@ extension DataRequest {
         queue: DispatchQueue? = nil,
         responseSerializer: T,
         completionHandler: @escaping (DataResponse<T.SerializedObject>) -> Void)
-        -> Self
-    {
+        -> Self {
         delegate.queue.addOperation {
             let result = responseSerializer.serializeResponse(
                 self.request,
@@ -182,8 +181,7 @@ extension DownloadRequest {
     public func response(
         queue: DispatchQueue? = nil,
         completionHandler: @escaping (DefaultDownloadResponse) -> Void)
-        -> Self
-    {
+        -> Self {
         delegate.queue.addOperation {
             (queue ?? DispatchQueue.main).async {
                 var downloadResponse = DefaultDownloadResponse(
@@ -218,8 +216,7 @@ extension DownloadRequest {
         queue: DispatchQueue? = nil,
         responseSerializer: T,
         completionHandler: @escaping (DownloadResponse<T.SerializedObject>) -> Void)
-        -> Self
-    {
+        -> Self {
         delegate.queue.addOperation {
             let result = responseSerializer.serializeResponse(
                 self.request,
@@ -289,8 +286,7 @@ extension DataRequest {
     public func responseData(
         queue: DispatchQueue? = nil,
         completionHandler: @escaping (DataResponse<Data>) -> Void)
-        -> Self
-    {
+        -> Self {
         return response(
             queue: queue,
             responseSerializer: DataRequest.dataResponseSerializer(),
@@ -329,8 +325,7 @@ extension DownloadRequest {
     public func responseData(
         queue: DispatchQueue? = nil,
         completionHandler: @escaping (DownloadResponse<Data>) -> Void)
-        -> Self
-    {
+        -> Self {
         return response(
             queue: queue,
             responseSerializer: DownloadRequest.dataResponseSerializer(),
@@ -356,8 +351,7 @@ extension Request {
         response: HTTPURLResponse?,
         data: Data?,
         error: Error?)
-        -> Result<String>
-    {
+        -> Result<String> {
         guard error == nil else { return .failure(error!) }
 
         if let response = response, emptyDataStatusCodes.contains(response.statusCode) { return .success("") }
@@ -411,8 +405,7 @@ extension DataRequest {
         queue: DispatchQueue? = nil,
         encoding: String.Encoding? = nil,
         completionHandler: @escaping (DataResponse<String>) -> Void)
-        -> Self
-    {
+        -> Self {
         return response(
             queue: queue,
             responseSerializer: DataRequest.stringResponseSerializer(encoding: encoding),
@@ -459,8 +452,7 @@ extension DownloadRequest {
         queue: DispatchQueue? = nil,
         encoding: String.Encoding? = nil,
         completionHandler: @escaping (DownloadResponse<String>) -> Void)
-        -> Self
-    {
+        -> Self {
         return response(
             queue: queue,
             responseSerializer: DownloadRequest.stringResponseSerializer(encoding: encoding),
@@ -486,8 +478,7 @@ extension Request {
         response: HTTPURLResponse?,
         data: Data?,
         error: Error?)
-        -> Result<Any>
-    {
+        -> Result<Any> {
         guard error == nil else { return .failure(error!) }
 
         if let response = response, emptyDataStatusCodes.contains(response.statusCode) { return .success(NSNull()) }
@@ -514,8 +505,7 @@ extension DataRequest {
     /// - returns: A JSON object response serializer.
     public static func jsonResponseSerializer(
         options: JSONSerialization.ReadingOptions = .allowFragments)
-        -> DataResponseSerializer<Any>
-    {
+        -> DataResponseSerializer<Any> {
         return DataResponseSerializer { _, response, data, error in
             return Request.serializeResponseJSON(options: options, response: response, data: data, error: error)
         }
@@ -532,8 +522,7 @@ extension DataRequest {
         queue: DispatchQueue? = nil,
         options: JSONSerialization.ReadingOptions = .allowFragments,
         completionHandler: @escaping (DataResponse<Any>) -> Void)
-        -> Self
-    {
+        -> Self {
         return response(
             queue: queue,
             responseSerializer: DataRequest.jsonResponseSerializer(options: options),
@@ -551,8 +540,7 @@ extension DownloadRequest {
     /// - returns: A JSON object response serializer.
     public static func jsonResponseSerializer(
         options: JSONSerialization.ReadingOptions = .allowFragments)
-        -> DownloadResponseSerializer<Any>
-    {
+        -> DownloadResponseSerializer<Any> {
         return DownloadResponseSerializer { _, response, fileURL, error in
             guard error == nil else { return .failure(error!) }
 
@@ -580,8 +568,7 @@ extension DownloadRequest {
         queue: DispatchQueue? = nil,
         options: JSONSerialization.ReadingOptions = .allowFragments,
         completionHandler: @escaping (DownloadResponse<Any>) -> Void)
-        -> Self
-    {
+        -> Self {
         return response(
             queue: queue,
             responseSerializer: DownloadRequest.jsonResponseSerializer(options: options),
@@ -607,8 +594,7 @@ extension Request {
         response: HTTPURLResponse?,
         data: Data?,
         error: Error?)
-        -> Result<Any>
-    {
+        -> Result<Any> {
         guard error == nil else { return .failure(error!) }
 
         if let response = response, emptyDataStatusCodes.contains(response.statusCode) { return .success(NSNull()) }
@@ -635,8 +621,7 @@ extension DataRequest {
     /// - returns: A property list object response serializer.
     public static func propertyListResponseSerializer(
         options: PropertyListSerialization.ReadOptions = [])
-        -> DataResponseSerializer<Any>
-    {
+        -> DataResponseSerializer<Any> {
         return DataResponseSerializer { _, response, data, error in
             return Request.serializeResponsePropertyList(options: options, response: response, data: data, error: error)
         }
@@ -653,8 +638,7 @@ extension DataRequest {
         queue: DispatchQueue? = nil,
         options: PropertyListSerialization.ReadOptions = [],
         completionHandler: @escaping (DataResponse<Any>) -> Void)
-        -> Self
-    {
+        -> Self {
         return response(
             queue: queue,
             responseSerializer: DataRequest.propertyListResponseSerializer(options: options),
@@ -672,8 +656,7 @@ extension DownloadRequest {
     /// - returns: A property list object response serializer.
     public static func propertyListResponseSerializer(
         options: PropertyListSerialization.ReadOptions = [])
-        -> DownloadResponseSerializer<Any>
-    {
+        -> DownloadResponseSerializer<Any> {
         return DownloadResponseSerializer { _, response, fileURL, error in
             guard error == nil else { return .failure(error!) }
 
@@ -701,8 +684,7 @@ extension DownloadRequest {
         queue: DispatchQueue? = nil,
         options: PropertyListSerialization.ReadOptions = [],
         completionHandler: @escaping (DownloadResponse<Any>) -> Void)
-        -> Self
-    {
+        -> Self {
         return response(
             queue: queue,
             responseSerializer: DownloadRequest.propertyListResponseSerializer(options: options),
diff --git a/samples/client/test/swift4/default/TestClientApp/Pods/Alamofire/Source/ServerTrustPolicy.swift b/samples/client/test/swift4/default/TestClientApp/Pods/Alamofire/Source/ServerTrustPolicy.swift
index 1ad3530b23..1553357c4c 100644
--- a/samples/client/test/swift4/default/TestClientApp/Pods/Alamofire/Source/ServerTrustPolicy.swift
+++ b/samples/client/test/swift4/default/TestClientApp/Pods/Alamofire/Source/ServerTrustPolicy.swift
@@ -249,7 +249,6 @@ public enum ServerTrustPolicy {
             let unspecified = SecTrustResultType.unspecified
             let proceed = SecTrustResultType.proceed
 
-
             isValid = result == unspecified || result == proceed
         }
 
diff --git a/samples/client/test/swift4/default/TestClientApp/Pods/Alamofire/Source/SessionDelegate.swift b/samples/client/test/swift4/default/TestClientApp/Pods/Alamofire/Source/SessionDelegate.swift
index d38c253ba5..6de31dbe4d 100644
--- a/samples/client/test/swift4/default/TestClientApp/Pods/Alamofire/Source/SessionDelegate.swift
+++ b/samples/client/test/swift4/default/TestClientApp/Pods/Alamofire/Source/SessionDelegate.swift
@@ -255,8 +255,7 @@ extension SessionDelegate: URLSessionDelegate {
     open func urlSession(
         _ session: URLSession,
         didReceive challenge: URLAuthenticationChallenge,
-        completionHandler: @escaping (URLSession.AuthChallengeDisposition, URLCredential?) -> Void)
-    {
+        completionHandler: @escaping (URLSession.AuthChallengeDisposition, URLCredential?) -> Void) {
         guard sessionDidReceiveChallengeWithCompletion == nil else {
             sessionDidReceiveChallengeWithCompletion?(session, challenge, completionHandler)
             return
@@ -315,8 +314,7 @@ extension SessionDelegate: URLSessionTaskDelegate {
         task: URLSessionTask,
         willPerformHTTPRedirection response: HTTPURLResponse,
         newRequest request: URLRequest,
-        completionHandler: @escaping (URLRequest?) -> Void)
-    {
+        completionHandler: @escaping (URLRequest?) -> Void) {
         guard taskWillPerformHTTPRedirectionWithCompletion == nil else {
             taskWillPerformHTTPRedirectionWithCompletion?(session, task, response, request, completionHandler)
             return
@@ -342,8 +340,7 @@ extension SessionDelegate: URLSessionTaskDelegate {
         _ session: URLSession,
         task: URLSessionTask,
         didReceive challenge: URLAuthenticationChallenge,
-        completionHandler: @escaping (URLSession.AuthChallengeDisposition, URLCredential?) -> Void)
-    {
+        completionHandler: @escaping (URLSession.AuthChallengeDisposition, URLCredential?) -> Void) {
         guard taskDidReceiveChallengeWithCompletion == nil else {
             taskDidReceiveChallengeWithCompletion?(session, task, challenge, completionHandler)
             return
@@ -372,8 +369,7 @@ extension SessionDelegate: URLSessionTaskDelegate {
     open func urlSession(
         _ session: URLSession,
         task: URLSessionTask,
-        needNewBodyStream completionHandler: @escaping (InputStream?) -> Void)
-    {
+        needNewBodyStream completionHandler: @escaping (InputStream?) -> Void) {
         guard taskNeedNewBodyStreamWithCompletion == nil else {
             taskNeedNewBodyStreamWithCompletion?(session, task, completionHandler)
             return
@@ -398,8 +394,7 @@ extension SessionDelegate: URLSessionTaskDelegate {
         task: URLSessionTask,
         didSendBodyData bytesSent: Int64,
         totalBytesSent: Int64,
-        totalBytesExpectedToSend: Int64)
-    {
+        totalBytesExpectedToSend: Int64) {
         if let taskDidSendBodyData = taskDidSendBodyData {
             taskDidSendBodyData(session, task, bytesSent, totalBytesSent, totalBytesExpectedToSend)
         } else if let delegate = self[task]?.delegate as? UploadTaskDelegate {
@@ -506,8 +501,7 @@ extension SessionDelegate: URLSessionDataDelegate {
         _ session: URLSession,
         dataTask: URLSessionDataTask,
         didReceive response: URLResponse,
-        completionHandler: @escaping (URLSession.ResponseDisposition) -> Void)
-    {
+        completionHandler: @escaping (URLSession.ResponseDisposition) -> Void) {
         guard dataTaskDidReceiveResponseWithCompletion == nil else {
             dataTaskDidReceiveResponseWithCompletion?(session, dataTask, response, completionHandler)
             return
@@ -530,8 +524,7 @@ extension SessionDelegate: URLSessionDataDelegate {
     open func urlSession(
         _ session: URLSession,
         dataTask: URLSessionDataTask,
-        didBecome downloadTask: URLSessionDownloadTask)
-    {
+        didBecome downloadTask: URLSessionDownloadTask) {
         if let dataTaskDidBecomeDownloadTask = dataTaskDidBecomeDownloadTask {
             dataTaskDidBecomeDownloadTask(session, dataTask, downloadTask)
         } else {
@@ -567,8 +560,7 @@ extension SessionDelegate: URLSessionDataDelegate {
         _ session: URLSession,
         dataTask: URLSessionDataTask,
         willCacheResponse proposedResponse: CachedURLResponse,
-        completionHandler: @escaping (CachedURLResponse?) -> Void)
-    {
+        completionHandler: @escaping (CachedURLResponse?) -> Void) {
         guard dataTaskWillCacheResponseWithCompletion == nil else {
             dataTaskWillCacheResponseWithCompletion?(session, dataTask, proposedResponse, completionHandler)
             return
@@ -602,8 +594,7 @@ extension SessionDelegate: URLSessionDownloadDelegate {
     open func urlSession(
         _ session: URLSession,
         downloadTask: URLSessionDownloadTask,
-        didFinishDownloadingTo location: URL)
-    {
+        didFinishDownloadingTo location: URL) {
         if let downloadTaskDidFinishDownloadingToURL = downloadTaskDidFinishDownloadingToURL {
             downloadTaskDidFinishDownloadingToURL(session, downloadTask, location)
         } else if let delegate = self[downloadTask]?.delegate as? DownloadTaskDelegate {
@@ -626,8 +617,7 @@ extension SessionDelegate: URLSessionDownloadDelegate {
         downloadTask: URLSessionDownloadTask,
         didWriteData bytesWritten: Int64,
         totalBytesWritten: Int64,
-        totalBytesExpectedToWrite: Int64)
-    {
+        totalBytesExpectedToWrite: Int64) {
         if let downloadTaskDidWriteData = downloadTaskDidWriteData {
             downloadTaskDidWriteData(session, downloadTask, bytesWritten, totalBytesWritten, totalBytesExpectedToWrite)
         } else if let delegate = self[downloadTask]?.delegate as? DownloadTaskDelegate {
@@ -655,8 +645,7 @@ extension SessionDelegate: URLSessionDownloadDelegate {
         _ session: URLSession,
         downloadTask: URLSessionDownloadTask,
         didResumeAtOffset fileOffset: Int64,
-        expectedTotalBytes: Int64)
-    {
+        expectedTotalBytes: Int64) {
         if let downloadTaskDidResumeAtOffset = downloadTaskDidResumeAtOffset {
             downloadTaskDidResumeAtOffset(session, downloadTask, fileOffset, expectedTotalBytes)
         } else if let delegate = self[downloadTask]?.delegate as? DownloadTaskDelegate {
@@ -710,8 +699,7 @@ extension SessionDelegate: URLSessionStreamDelegate {
         _ session: URLSession,
         streamTask: URLSessionStreamTask,
         didBecome inputStream: InputStream,
-        outputStream: OutputStream)
-    {
+        outputStream: OutputStream) {
         streamTaskDidBecomeInputAndOutputStreams?(session, streamTask, inputStream, outputStream)
     }
 }
diff --git a/samples/client/test/swift4/default/TestClientApp/Pods/Alamofire/Source/SessionManager.swift b/samples/client/test/swift4/default/TestClientApp/Pods/Alamofire/Source/SessionManager.swift
index 9bd8b540ae..dac27dae99 100644
--- a/samples/client/test/swift4/default/TestClientApp/Pods/Alamofire/Source/SessionManager.swift
+++ b/samples/client/test/swift4/default/TestClientApp/Pods/Alamofire/Source/SessionManager.swift
@@ -166,8 +166,7 @@ open class SessionManager {
     public init(
         configuration: URLSessionConfiguration = URLSessionConfiguration.default,
         delegate: SessionDelegate = SessionDelegate(),
-        serverTrustPolicyManager: ServerTrustPolicyManager? = nil)
-    {
+        serverTrustPolicyManager: ServerTrustPolicyManager? = nil) {
         self.delegate = delegate
         self.session = URLSession(configuration: configuration, delegate: delegate, delegateQueue: nil)
 
@@ -185,8 +184,7 @@ open class SessionManager {
     public init?(
         session: URLSession,
         delegate: SessionDelegate,
-        serverTrustPolicyManager: ServerTrustPolicyManager? = nil)
-    {
+        serverTrustPolicyManager: ServerTrustPolicyManager? = nil) {
         guard delegate === session.delegate else { return nil }
 
         self.delegate = delegate
@@ -229,8 +227,7 @@ open class SessionManager {
         parameters: Parameters? = nil,
         encoding: ParameterEncoding = URLEncoding.default,
         headers: HTTPHeaders? = nil)
-        -> DataRequest
-    {
+        -> DataRequest {
         var originalRequest: URLRequest?
 
         do {
@@ -319,8 +316,7 @@ open class SessionManager {
         encoding: ParameterEncoding = URLEncoding.default,
         headers: HTTPHeaders? = nil,
         to destination: DownloadRequest.DownloadFileDestination? = nil)
-        -> DownloadRequest
-    {
+        -> DownloadRequest {
         do {
             let urlRequest = try URLRequest(url: url, method: method, headers: headers)
             let encodedURLRequest = try encoding.encode(urlRequest, with: parameters)
@@ -346,8 +342,7 @@ open class SessionManager {
     open func download(
         _ urlRequest: URLRequestConvertible,
         to destination: DownloadRequest.DownloadFileDestination? = nil)
-        -> DownloadRequest
-    {
+        -> DownloadRequest {
         do {
             let urlRequest = try urlRequest.asURLRequest()
             return download(.request(urlRequest), to: destination)
@@ -383,8 +378,7 @@ open class SessionManager {
     open func download(
         resumingWith resumeData: Data,
         to destination: DownloadRequest.DownloadFileDestination? = nil)
-        -> DownloadRequest
-    {
+        -> DownloadRequest {
         return download(.resumeData(resumeData), to: destination)
     }
 
@@ -393,8 +387,7 @@ open class SessionManager {
     private func download(
         _ downloadable: DownloadRequest.Downloadable,
         to destination: DownloadRequest.DownloadFileDestination?)
-        -> DownloadRequest
-    {
+        -> DownloadRequest {
         do {
             let task = try downloadable.task(session: session, adapter: adapter, queue: queue)
             let download = DownloadRequest(session: session, requestTask: .download(downloadable, task))
@@ -415,8 +408,7 @@ open class SessionManager {
         _ downloadable: DownloadRequest.Downloadable?,
         to destination: DownloadRequest.DownloadFileDestination?,
         failedWith error: Error)
-        -> DownloadRequest
-    {
+        -> DownloadRequest {
         var downloadTask: Request.RequestTask = .download(nil, nil)
 
         if let downloadable = downloadable {
@@ -457,8 +449,7 @@ open class SessionManager {
         to url: URLConvertible,
         method: HTTPMethod = .post,
         headers: HTTPHeaders? = nil)
-        -> UploadRequest
-    {
+        -> UploadRequest {
         do {
             let urlRequest = try URLRequest(url: url, method: method, headers: headers)
             return upload(fileURL, with: urlRequest)
@@ -503,8 +494,7 @@ open class SessionManager {
         to url: URLConvertible,
         method: HTTPMethod = .post,
         headers: HTTPHeaders? = nil)
-        -> UploadRequest
-    {
+        -> UploadRequest {
         do {
             let urlRequest = try URLRequest(url: url, method: method, headers: headers)
             return upload(data, with: urlRequest)
@@ -549,8 +539,7 @@ open class SessionManager {
         to url: URLConvertible,
         method: HTTPMethod = .post,
         headers: HTTPHeaders? = nil)
-        -> UploadRequest
-    {
+        -> UploadRequest {
         do {
             let urlRequest = try URLRequest(url: url, method: method, headers: headers)
             return upload(stream, with: urlRequest)
@@ -610,8 +599,7 @@ open class SessionManager {
         to url: URLConvertible,
         method: HTTPMethod = .post,
         headers: HTTPHeaders? = nil,
-        encodingCompletion: ((MultipartFormDataEncodingResult) -> Void)?)
-    {
+        encodingCompletion: ((MultipartFormDataEncodingResult) -> Void)?) {
         do {
             let urlRequest = try URLRequest(url: url, method: method, headers: headers)
 
@@ -653,8 +641,7 @@ open class SessionManager {
         multipartFormData: @escaping (MultipartFormData) -> Void,
         usingThreshold encodingMemoryThreshold: UInt64 = SessionManager.multipartFormDataEncodingMemoryThreshold,
         with urlRequest: URLRequestConvertible,
-        encodingCompletion: ((MultipartFormDataEncodingResult) -> Void)?)
-    {
+        encodingCompletion: ((MultipartFormDataEncodingResult) -> Void)?) {
         DispatchQueue.global(qos: .utility).async {
             let formData = MultipartFormData()
             multipartFormData(formData)
diff --git a/samples/client/test/swift4/default/TestClientApp/Pods/Alamofire/Source/TaskDelegate.swift b/samples/client/test/swift4/default/TestClientApp/Pods/Alamofire/Source/TaskDelegate.swift
index 06077587d2..74491f14e8 100644
--- a/samples/client/test/swift4/default/TestClientApp/Pods/Alamofire/Source/TaskDelegate.swift
+++ b/samples/client/test/swift4/default/TestClientApp/Pods/Alamofire/Source/TaskDelegate.swift
@@ -94,8 +94,7 @@ open class TaskDelegate: NSObject {
         task: URLSessionTask,
         willPerformHTTPRedirection response: HTTPURLResponse,
         newRequest request: URLRequest,
-        completionHandler: @escaping (URLRequest?) -> Void)
-    {
+        completionHandler: @escaping (URLRequest?) -> Void) {
         var redirectRequest: URLRequest? = request
 
         if let taskWillPerformHTTPRedirection = taskWillPerformHTTPRedirection {
@@ -110,8 +109,7 @@ open class TaskDelegate: NSObject {
         _ session: URLSession,
         task: URLSessionTask,
         didReceive challenge: URLAuthenticationChallenge,
-        completionHandler: @escaping (URLSession.AuthChallengeDisposition, URLCredential?) -> Void)
-    {
+        completionHandler: @escaping (URLSession.AuthChallengeDisposition, URLCredential?) -> Void) {
         var disposition: URLSession.AuthChallengeDisposition = .performDefaultHandling
         var credential: URLCredential?
 
@@ -150,8 +148,7 @@ open class TaskDelegate: NSObject {
     func urlSession(
         _ session: URLSession,
         task: URLSessionTask,
-        needNewBodyStream completionHandler: @escaping (InputStream?) -> Void)
-    {
+        needNewBodyStream completionHandler: @escaping (InputStream?) -> Void) {
         var bodyStream: InputStream?
 
         if let taskNeedNewBodyStream = taskNeedNewBodyStream {
@@ -237,8 +234,7 @@ class DataTaskDelegate: TaskDelegate, URLSessionDataDelegate {
         _ session: URLSession,
         dataTask: URLSessionDataTask,
         didReceive response: URLResponse,
-        completionHandler: @escaping (URLSession.ResponseDisposition) -> Void)
-    {
+        completionHandler: @escaping (URLSession.ResponseDisposition) -> Void) {
         var disposition: URLSession.ResponseDisposition = .allow
 
         expectedContentLength = response.expectedContentLength
@@ -253,8 +249,7 @@ class DataTaskDelegate: TaskDelegate, URLSessionDataDelegate {
     func urlSession(
         _ session: URLSession,
         dataTask: URLSessionDataTask,
-        didBecome downloadTask: URLSessionDownloadTask)
-    {
+        didBecome downloadTask: URLSessionDownloadTask) {
         dataTaskDidBecomeDownloadTask?(session, dataTask, downloadTask)
     }
 
@@ -287,8 +282,7 @@ class DataTaskDelegate: TaskDelegate, URLSessionDataDelegate {
         _ session: URLSession,
         dataTask: URLSessionDataTask,
         willCacheResponse proposedResponse: CachedURLResponse,
-        completionHandler: @escaping (CachedURLResponse?) -> Void)
-    {
+        completionHandler: @escaping (CachedURLResponse?) -> Void) {
         var cachedResponse: CachedURLResponse? = proposedResponse
 
         if let dataTaskWillCacheResponse = dataTaskWillCacheResponse {
@@ -343,8 +337,7 @@ class DownloadTaskDelegate: TaskDelegate, URLSessionDownloadDelegate {
     func urlSession(
         _ session: URLSession,
         downloadTask: URLSessionDownloadTask,
-        didFinishDownloadingTo location: URL)
-    {
+        didFinishDownloadingTo location: URL) {
         temporaryURL = location
 
         guard
@@ -379,8 +372,7 @@ class DownloadTaskDelegate: TaskDelegate, URLSessionDownloadDelegate {
         downloadTask: URLSessionDownloadTask,
         didWriteData bytesWritten: Int64,
         totalBytesWritten: Int64,
-        totalBytesExpectedToWrite: Int64)
-    {
+        totalBytesExpectedToWrite: Int64) {
         if initialResponseTime == nil { initialResponseTime = CFAbsoluteTimeGetCurrent() }
 
         if let downloadTaskDidWriteData = downloadTaskDidWriteData {
@@ -405,8 +397,7 @@ class DownloadTaskDelegate: TaskDelegate, URLSessionDownloadDelegate {
         _ session: URLSession,
         downloadTask: URLSessionDownloadTask,
         didResumeAtOffset fileOffset: Int64,
-        expectedTotalBytes: Int64)
-    {
+        expectedTotalBytes: Int64) {
         if let downloadTaskDidResumeAtOffset = downloadTaskDidResumeAtOffset {
             downloadTaskDidResumeAtOffset(session, downloadTask, fileOffset, expectedTotalBytes)
         } else {
@@ -448,8 +439,7 @@ class UploadTaskDelegate: DataTaskDelegate {
         task: URLSessionTask,
         didSendBodyData bytesSent: Int64,
         totalBytesSent: Int64,
-        totalBytesExpectedToSend: Int64)
-    {
+        totalBytesExpectedToSend: Int64) {
         if initialResponseTime == nil { initialResponseTime = CFAbsoluteTimeGetCurrent() }
 
         if let taskDidSendBodyData = taskDidSendBodyData {
diff --git a/samples/client/test/swift4/default/TestClientApp/Pods/Alamofire/Source/Timeline.swift b/samples/client/test/swift4/default/TestClientApp/Pods/Alamofire/Source/Timeline.swift
index c5dabd14fe..df3797e396 100644
--- a/samples/client/test/swift4/default/TestClientApp/Pods/Alamofire/Source/Timeline.swift
+++ b/samples/client/test/swift4/default/TestClientApp/Pods/Alamofire/Source/Timeline.swift
@@ -64,8 +64,7 @@ public struct Timeline {
         requestStartTime: CFAbsoluteTime = 0.0,
         initialResponseTime: CFAbsoluteTime = 0.0,
         requestCompletedTime: CFAbsoluteTime = 0.0,
-        serializationCompletedTime: CFAbsoluteTime = 0.0)
-    {
+        serializationCompletedTime: CFAbsoluteTime = 0.0) {
         self.requestStartTime = requestStartTime
         self.initialResponseTime = initialResponseTime
         self.requestCompletedTime = requestCompletedTime
diff --git a/samples/client/test/swift4/default/TestClientApp/Pods/Alamofire/Source/Validation.swift b/samples/client/test/swift4/default/TestClientApp/Pods/Alamofire/Source/Validation.swift
index 989ac20091..d1ddcccf15 100644
--- a/samples/client/test/swift4/default/TestClientApp/Pods/Alamofire/Source/Validation.swift
+++ b/samples/client/test/swift4/default/TestClientApp/Pods/Alamofire/Source/Validation.swift
@@ -94,8 +94,7 @@ extension Request {
         statusCode acceptableStatusCodes: S,
         response: HTTPURLResponse)
         -> ValidationResult
-        where S.Iterator.Element == Int
-    {
+        where S.Iterator.Element == Int {
         if acceptableStatusCodes.contains(response.statusCode) {
             return .success
         } else {
@@ -111,8 +110,7 @@ extension Request {
         response: HTTPURLResponse,
         data: Data?)
         -> ValidationResult
-        where S.Iterator.Element == String
-    {
+        where S.Iterator.Element == String {
         guard let data = data, data.count > 0 else { return .success }
 
         guard
diff --git a/samples/client/test/swift4/default/TestClientApp/TestClientApp/AppDelegate.swift b/samples/client/test/swift4/default/TestClientApp/TestClientApp/AppDelegate.swift
index 14cf44ed13..f8a7b948d8 100644
--- a/samples/client/test/swift4/default/TestClientApp/TestClientApp/AppDelegate.swift
+++ b/samples/client/test/swift4/default/TestClientApp/TestClientApp/AppDelegate.swift
@@ -13,7 +13,6 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
 
     var window: UIWindow?
 
-
     func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplicationLaunchOptionsKey: Any]?) -> Bool {
         // Override point for customization after application launch.
         return true
@@ -41,6 +40,4 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
         // Called when the application is about to terminate. Save data if appropriate. See also applicationDidEnterBackground:.
     }
 
-
 }
-
diff --git a/samples/client/test/swift4/default/TestClientApp/TestClientApp/ViewController.swift b/samples/client/test/swift4/default/TestClientApp/TestClientApp/ViewController.swift
index b42e16de1e..a5f289c421 100644
--- a/samples/client/test/swift4/default/TestClientApp/TestClientApp/ViewController.swift
+++ b/samples/client/test/swift4/default/TestClientApp/TestClientApp/ViewController.swift
@@ -20,6 +20,4 @@ class ViewController: UIViewController {
         // Dispose of any resources that can be recreated.
     }
 
-
 }
-
diff --git a/samples/client/test/swift4/default/TestClientApp/TestClientAppTests/TestClientAppTests.swift b/samples/client/test/swift4/default/TestClientApp/TestClientAppTests/TestClientAppTests.swift
index 7e5522ed7a..7a33147fbf 100644
--- a/samples/client/test/swift4/default/TestClientApp/TestClientAppTests/TestClientAppTests.swift
+++ b/samples/client/test/swift4/default/TestClientApp/TestClientAppTests/TestClientAppTests.swift
@@ -12,7 +12,6 @@ import TestClient
 
 class TestClientAppTests: XCTestCase {
 
-
     func testWhenVariableNameIsDifferentFromPropertyName() {
         // This tests to make sure that the swift4 language can handle when
         // we have property names which map to variable names that are not the same.
@@ -39,5 +38,4 @@ class TestClientAppTests: XCTestCase {
         XCTAssertTrue(variableNameTest._for == "Some reason", "Did not decode property name that is a reserved word correctly.")
     }
 
-
 }
diff --git a/samples/client/test/swift4/default/docs/AllPrimitives.md b/samples/client/test/swift4/default/docs/AllPrimitives.md
new file mode 100644
index 0000000000..1cfa94eaf7
--- /dev/null
+++ b/samples/client/test/swift4/default/docs/AllPrimitives.md
@@ -0,0 +1,34 @@
+# AllPrimitives
+
+## Properties
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**myInteger** | **Int** |  | [optional] 
+**myIntegerArray** | **[Int]** |  | [optional] 
+**myLong** | **Int64** |  | [optional] 
+**myLongArray** | **[Int64]** |  | [optional] 
+**myFloat** | **Float** |  | [optional] 
+**myFloatArray** | **[Float]** |  | [optional] 
+**myDouble** | **Double** |  | [optional] 
+**myDoubleArray** | **[Double]** |  | [optional] 
+**myString** | **String** |  | [optional] 
+**myStringArray** | **[String]** |  | [optional] 
+**myBytes** | **Data** |  | [optional] 
+**myBytesArray** | **[Data]** |  | [optional] 
+**myBoolean** | **Bool** |  | [optional] 
+**myBooleanArray** | **[Bool]** |  | [optional] 
+**myDate** | **Date** |  | [optional] 
+**myDateArray** | **[Date]** |  | [optional] 
+**myDateTime** | **Date** |  | [optional] 
+**myDateTimeArray** | **[Date]** |  | [optional] 
+**myFile** | **URL** |  | [optional] 
+**myFileArray** | **[URL]** |  | [optional] 
+**myUUID** | **UUID** |  | [optional] 
+**myUUIDArray** | **[UUID]** |  | [optional] 
+**myStringEnum** | [**StringEnum**](StringEnum.md) |  | [optional] 
+**myStringEnumArray** | [StringEnum] |  | [optional] 
+**myInlineStringEnum** | **String** |  | [optional] 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
+
diff --git a/samples/client/test/swift4/default/docs/BaseCard.md b/samples/client/test/swift4/default/docs/BaseCard.md
new file mode 100644
index 0000000000..42d41b7db1
--- /dev/null
+++ b/samples/client/test/swift4/default/docs/BaseCard.md
@@ -0,0 +1,10 @@
+# BaseCard
+
+## Properties
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**cardType** | **String** |  | 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
+
diff --git a/samples/client/test/swift4/default/docs/ErrorInfo.md b/samples/client/test/swift4/default/docs/ErrorInfo.md
new file mode 100644
index 0000000000..5cc21d73ae
--- /dev/null
+++ b/samples/client/test/swift4/default/docs/ErrorInfo.md
@@ -0,0 +1,12 @@
+# ErrorInfo
+
+## Properties
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**code** | **Int** |  | [optional] 
+**message** | **String** |  | [optional] 
+**details** | **[String]** |  | [optional] 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
+
diff --git a/samples/client/test/swift4/default/docs/GetAllModelsResult.md b/samples/client/test/swift4/default/docs/GetAllModelsResult.md
new file mode 100644
index 0000000000..4de449547a
--- /dev/null
+++ b/samples/client/test/swift4/default/docs/GetAllModelsResult.md
@@ -0,0 +1,12 @@
+# GetAllModelsResult
+
+## Properties
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**myPrimitiveArray** | [AllPrimitives] |  | [optional] 
+**myPrimitive** | [**AllPrimitives**](AllPrimitives.md) |  | [optional] 
+**myVariableNameTest** | [**VariableNameTest**](VariableNameTest.md) |  | [optional] 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
+
diff --git a/samples/client/test/swift4/default/docs/ModelWithPropertiesAndAdditionalProperties.md b/samples/client/test/swift4/default/docs/ModelWithPropertiesAndAdditionalProperties.md
new file mode 100644
index 0000000000..098c03d688
--- /dev/null
+++ b/samples/client/test/swift4/default/docs/ModelWithPropertiesAndAdditionalProperties.md
@@ -0,0 +1,17 @@
+# ModelWithPropertiesAndAdditionalProperties
+
+## Properties
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**myIntegerReq** | **Int** |  | 
+**myIntegerOpt** | **Int** |  | [optional] 
+**myPrimitiveReq** | [**AllPrimitives**](AllPrimitives.md) |  | 
+**myPrimitiveOpt** | [**AllPrimitives**](AllPrimitives.md) |  | [optional] 
+**myStringArrayReq** | **[String]** |  | 
+**myStringArrayOpt** | **[String]** |  | [optional] 
+**myPrimitiveArrayReq** | [AllPrimitives] |  | 
+**myPrimitiveArrayOpt** | [AllPrimitives] |  | [optional] 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
+
diff --git a/samples/client/test/swift4/default/docs/PersonCard.md b/samples/client/test/swift4/default/docs/PersonCard.md
new file mode 100644
index 0000000000..385299f876
--- /dev/null
+++ b/samples/client/test/swift4/default/docs/PersonCard.md
@@ -0,0 +1,11 @@
+# PersonCard
+
+## Properties
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**firstName** | **String** |  | [optional] 
+**lastName** | **String** |  | [optional] 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
+
diff --git a/samples/client/test/swift4/default/docs/PersonCardAllOf.md b/samples/client/test/swift4/default/docs/PersonCardAllOf.md
new file mode 100644
index 0000000000..e4b78f76c9
--- /dev/null
+++ b/samples/client/test/swift4/default/docs/PersonCardAllOf.md
@@ -0,0 +1,11 @@
+# PersonCardAllOf
+
+## Properties
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**firstName** | **String** |  | [optional] 
+**lastName** | **String** |  | [optional] 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
+
diff --git a/samples/client/test/swift4/default/docs/PlaceCard.md b/samples/client/test/swift4/default/docs/PlaceCard.md
new file mode 100644
index 0000000000..87002357ce
--- /dev/null
+++ b/samples/client/test/swift4/default/docs/PlaceCard.md
@@ -0,0 +1,11 @@
+# PlaceCard
+
+## Properties
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**placeName** | **String** |  | [optional] 
+**placeAddress** | **String** |  | [optional] 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
+
diff --git a/samples/client/test/swift4/default/docs/PlaceCardAllOf.md b/samples/client/test/swift4/default/docs/PlaceCardAllOf.md
new file mode 100644
index 0000000000..5ed8d8a4d0
--- /dev/null
+++ b/samples/client/test/swift4/default/docs/PlaceCardAllOf.md
@@ -0,0 +1,11 @@
+# PlaceCardAllOf
+
+## Properties
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**placeName** | **String** |  | [optional] 
+**placeAddress** | **String** |  | [optional] 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
+
diff --git a/samples/client/test/swift4/default/docs/SampleBase.md b/samples/client/test/swift4/default/docs/SampleBase.md
new file mode 100644
index 0000000000..a7c7ac9722
--- /dev/null
+++ b/samples/client/test/swift4/default/docs/SampleBase.md
@@ -0,0 +1,11 @@
+# SampleBase
+
+## Properties
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**baseClassStringProp** | **String** |  | [optional] 
+**baseClassIntegerProp** | **Int** |  | [optional] 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
+
diff --git a/samples/client/test/swift4/default/docs/SampleSubClass.md b/samples/client/test/swift4/default/docs/SampleSubClass.md
new file mode 100644
index 0000000000..435633ccde
--- /dev/null
+++ b/samples/client/test/swift4/default/docs/SampleSubClass.md
@@ -0,0 +1,13 @@
+# SampleSubClass
+
+## Properties
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**baseClassStringProp** | **String** |  | [optional] 
+**baseClassIntegerProp** | **Int** |  | [optional] 
+**subClassStringProp** | **String** |  | [optional] 
+**subClassIntegerProp** | **Int** |  | [optional] 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
+
diff --git a/samples/client/test/swift4/default/docs/SampleSubClassAllOf.md b/samples/client/test/swift4/default/docs/SampleSubClassAllOf.md
new file mode 100644
index 0000000000..50a64944e8
--- /dev/null
+++ b/samples/client/test/swift4/default/docs/SampleSubClassAllOf.md
@@ -0,0 +1,11 @@
+# SampleSubClassAllOf
+
+## Properties
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**subClassStringProp** | **String** |  | [optional] 
+**subClassIntegerProp** | **Int** |  | [optional] 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
+
diff --git a/samples/client/test/swift4/default/docs/StringEnum.md b/samples/client/test/swift4/default/docs/StringEnum.md
new file mode 100644
index 0000000000..b0009f7e82
--- /dev/null
+++ b/samples/client/test/swift4/default/docs/StringEnum.md
@@ -0,0 +1,9 @@
+# StringEnum
+
+## Properties
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
+
diff --git a/samples/client/test/swift4/default/docs/Swift4TestAPI.md b/samples/client/test/swift4/default/docs/Swift4TestAPI.md
new file mode 100644
index 0000000000..b6ea64ba25
--- /dev/null
+++ b/samples/client/test/swift4/default/docs/Swift4TestAPI.md
@@ -0,0 +1,59 @@
+# Swift4TestAPI
+
+All URIs are relative to *http://api.example.com/basePath*
+
+Method | HTTP request | Description
+------------- | ------------- | -------------
+[**getAllModels**](Swift4TestAPI.md#getallmodels) | **GET** /allModels | Get all of the models
+
+
+# **getAllModels**
+```swift
+    open class func getAllModels(clientId: String, completion: @escaping (_ data: GetAllModelsResult?, _ error: Error?) -> Void)
+```
+
+Get all of the models
+
+This endpoint tests get a dictionary which contains examples of all of the models.
+
+### Example 
+```swift
+// The following code samples are still beta. For any issue, please report via http://github.com/OpenAPITools/openapi-generator/issues/new
+import TestClient
+
+let clientId = "clientId_example" // String | id that represent the Api client
+
+// Get all of the models
+Swift4TestAPI.getAllModels(clientId: clientId) { (response, error) in
+    guard error == nil else {
+        print(error)
+        return
+    }
+
+    if (response) {
+        dump(response)
+    }
+}
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **clientId** | **String** | id that represent the Api client | 
+
+### Return type
+
+[**GetAllModelsResult**](GetAllModelsResult.md)
+
+### Authorization
+
+No authorization required
+
+### HTTP request headers
+
+ - **Content-Type**: Not defined
+ - **Accept**: application/json
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
diff --git a/samples/client/test/swift4/default/docs/VariableNameTest.md b/samples/client/test/swift4/default/docs/VariableNameTest.md
new file mode 100644
index 0000000000..d5369e75f1
--- /dev/null
+++ b/samples/client/test/swift4/default/docs/VariableNameTest.md
@@ -0,0 +1,12 @@
+# VariableNameTest
+
+## Properties
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**exampleName** | **String** | This snake-case examle_name property name should be converted to a camelCase variable name like exampleName | [optional] 
+**_for** | **String** | This property name is a reserved word in most languages, including Swift 4. | [optional] 
+**normalName** | **String** | This model object property name should be unchanged from the JSON property name. | [optional] 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
+
diff --git a/samples/client/test/swift4/default/project.yml b/samples/client/test/swift4/default/project.yml
new file mode 100644
index 0000000000..6fe83fbc9d
--- /dev/null
+++ b/samples/client/test/swift4/default/project.yml
@@ -0,0 +1,15 @@
+name: TestClient
+targets:
+  TestClient:
+    type: framework
+    platform: iOS
+    deploymentTarget: "10.0"
+    sources: [TestClient]
+    info:
+      path: ./Info.plist
+      version: 1.0
+    settings:
+      APPLICATION_EXTENSION_API_ONLY: true
+    scheme: {}
+    dependencies:
+    - carthage: Alamofire

From f436904359d0389be5c762ac1f0d3653d32a9c84 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Gr=C3=BCnberger?= <mobile@cubido.at>
Date: Mon, 22 Jul 2019 10:54:14 +0200
Subject: [PATCH 35/62] [typescript-angular] Add encoder configuration, fix
 default encoder (#3372) (#3389)

* [typescript-angular] Add encoder configuration and fix default encoder (#3372)

* Add encoder to configuration
* Fix import indention
* Default encoder workaround for https://github.com/angular/angular/issues/18261

* [typescript-angular] Refactor api.service template

* Extract encoder class variable initialized in constructor

* [typescript-angular] Updated samples

* [typescript-angular] Add missing imports

* [typescript-angular] Update samples

* [typescript-angular] Update samples

* [typescript-angular] Fix tests

* Fix typo
* Add missing interface method implementation
* Update samples
---
 .../typescript-angular/api.service.mustache   | 31 +++++++++++++------
 .../typescript-angular/configuration.mustache | 20 ++++++++++++
 .../typescript-angular/encoder.mustache       | 25 ++++++++-------
 .../default/api/pet.service.ts                | 17 +++++-----
 .../default/api/store.service.ts              |  9 +++---
 .../default/api/user.service.ts               | 11 ++++---
 .../default/configuration.ts                  |  5 +++
 .../typescript-angular-v2/default/encoder.ts  |  4 +--
 .../npm/api/pet.service.ts                    | 17 +++++-----
 .../npm/api/store.service.ts                  |  9 +++---
 .../npm/api/user.service.ts                   | 11 ++++---
 .../npm/configuration.ts                      |  5 +++
 .../typescript-angular-v2/npm/encoder.ts      |  4 +--
 .../with-interfaces/api/pet.service.ts        | 17 +++++-----
 .../with-interfaces/api/store.service.ts      |  9 +++---
 .../with-interfaces/api/user.service.ts       | 11 ++++---
 .../with-interfaces/configuration.ts          |  5 +++
 .../with-interfaces/encoder.ts                |  4 +--
 .../npm/api/pet.service.ts                    | 15 ++++-----
 .../npm/api/store.service.ts                  |  7 +++--
 .../npm/api/user.service.ts                   |  9 +++---
 .../npm/configuration.ts                      |  5 +++
 .../typescript-angular-v4.3/npm/encoder.ts    | 21 +++++++------
 .../npm/api/pet.service.ts                    | 17 +++++-----
 .../npm/api/store.service.ts                  |  9 +++---
 .../npm/api/user.service.ts                   | 11 ++++---
 .../npm/configuration.ts                      |  5 +++
 .../typescript-angular-v4/npm/encoder.ts      |  4 +--
 .../builds/default/api/pet.service.ts         | 15 ++++-----
 .../builds/default/api/store.service.ts       |  7 +++--
 .../builds/default/api/user.service.ts        |  9 +++---
 .../builds/default/configuration.ts           |  5 +++
 .../builds/default/encoder.ts                 | 21 +++++++------
 .../builds/with-npm/api/pet.service.ts        | 15 ++++-----
 .../builds/with-npm/api/store.service.ts      |  7 +++--
 .../builds/with-npm/api/user.service.ts       |  9 +++---
 .../builds/with-npm/configuration.ts          |  5 +++
 .../builds/with-npm/encoder.ts                | 21 +++++++------
 .../builds/default/api/pet.service.ts         | 15 ++++-----
 .../builds/default/api/store.service.ts       |  7 +++--
 .../builds/default/api/user.service.ts        |  9 +++---
 .../builds/default/configuration.ts           |  5 +++
 .../builds/default/encoder.ts                 | 21 +++++++------
 .../builds/with-npm/api/pet.service.ts        | 15 ++++-----
 .../builds/with-npm/api/store.service.ts      |  7 +++--
 .../builds/with-npm/api/user.service.ts       |  9 +++---
 .../builds/with-npm/configuration.ts          |  5 +++
 .../builds/with-npm/encoder.ts                | 21 +++++++------
 .../builds/default/api/pet.service.ts         | 15 ++++-----
 .../builds/default/api/store.service.ts       |  7 +++--
 .../builds/default/api/user.service.ts        |  9 +++---
 .../builds/default/configuration.ts           |  5 +++
 .../builds/default/encoder.ts                 | 21 +++++++------
 .../builds/with-npm/api/pet.service.ts        | 15 ++++-----
 .../builds/with-npm/api/store.service.ts      |  7 +++--
 .../builds/with-npm/api/user.service.ts       |  9 +++---
 .../builds/with-npm/configuration.ts          |  5 +++
 .../builds/with-npm/encoder.ts                | 21 +++++++------
 .../builds/default/api/pet.service.ts         | 15 ++++-----
 .../builds/default/api/store.service.ts       |  7 +++--
 .../builds/default/api/user.service.ts        |  9 +++---
 .../builds/default/configuration.ts           |  5 +++
 .../builds/default/encoder.ts                 | 21 +++++++------
 .../builds/with-npm/api/pet.service.ts        | 15 ++++-----
 .../builds/with-npm/api/store.service.ts      |  7 +++--
 .../builds/with-npm/api/user.service.ts       |  9 +++---
 .../builds/with-npm/configuration.ts          |  5 +++
 .../builds/with-npm/encoder.ts                | 21 +++++++------
 68 files changed, 469 insertions(+), 304 deletions(-)

diff --git a/modules/openapi-generator/src/main/resources/typescript-angular/api.service.mustache b/modules/openapi-generator/src/main/resources/typescript-angular/api.service.mustache
index 0ad35d6b14..85573aa8b1 100644
--- a/modules/openapi-generator/src/main/resources/typescript-angular/api.service.mustache
+++ b/modules/openapi-generator/src/main/resources/typescript-angular/api.service.mustache
@@ -4,16 +4,15 @@
 import { Inject, Injectable, Optional }                      from '@angular/core';
 {{#useHttpClient}}
 import { HttpClient, HttpHeaders, HttpParams,
-         HttpResponse, HttpEvent }                           from '@angular/common/http';
-import { CustomHttpUrlEncodingCodec }                        from '../encoder';
+         HttpResponse, HttpEvent, HttpParameterCodec }       from '@angular/common/http';
+import { CustomHttpParameterCodec }                          from '../encoder';
 {{/useHttpClient}}
 {{^useHttpClient}}
-import { Http, Headers, URLSearchParams }                    from '@angular/http';
-import { RequestMethod, RequestOptions, RequestOptionsArgs } from '@angular/http';
-import { Response, ResponseContentType }                     from '@angular/http';
+import { Http, Headers, URLSearchParams,
+        RequestMethod, RequestOptions, RequestOptionsArgs,
+        Response, ResponseContentType, QueryEncoder }        from '@angular/http';
 import { CustomQueryEncoderHelper }                          from '../encoder';
 {{/useHttpClient}}
-
 {{^useRxJS6}}
 import { Observable }                                        from 'rxjs/Observable';
 {{/useRxJS6}}
@@ -59,6 +58,12 @@ export class {{classname}} {
     protected basePath = '{{{basePath}}}';
     public defaultHeaders = new {{#useHttpClient}}Http{{/useHttpClient}}Headers();
     public configuration = new Configuration();
+{{#useHttpClient}}
+    public encoder: HttpParameterCodec;
+{{/useHttpClient}}
+{{^useHttpClient}}
+    public encoder: QueryEncoder;
+{{/useHttpClient}}
 
     constructor(protected {{#useHttpClient}}httpClient: HttpClient{{/useHttpClient}}{{^useHttpClient}}http: Http{{/useHttpClient}}, @Optional()@Inject(BASE_PATH) basePath: string, @Optional() configuration: Configuration) {
 
@@ -69,6 +74,12 @@ export class {{classname}} {
         } else {
             this.configuration.basePath = basePath || this.basePath;
         }
+{{#useHttpClient}}
+        this.encoder = this.configuration.encoder || new CustomHttpParameterCodec();
+{{/useHttpClient}}
+{{^useHttpClient}}
+        this.encoder = this.configuration.encoder || new CustomQueryEncoderHelper();
+{{/useHttpClient}}
     }
 
     /**
@@ -143,10 +154,10 @@ export class {{classname}} {
 
 {{#hasQueryParams}}
         {{#useHttpClient}}
-        let queryParameters = new HttpParams({encoder: new CustomHttpUrlEncodingCodec()});
+        let queryParameters = new HttpParams({encoder: this.encoder});
         {{/useHttpClient}}
         {{^useHttpClient}}
-        let queryParameters = new URLSearchParams('', new CustomQueryEncoderHelper());
+        let queryParameters = new URLSearchParams('', this.encoder);
         {{/useHttpClient}}
 {{#queryParams}}
         {{#isListContainer}}
@@ -280,12 +291,12 @@ export class {{classname}} {
             formParams = new FormData();
         } else {
 {{#useHttpClient}}
-            formParams = new HttpParams({encoder: new CustomHttpUrlEncodingCodec()});
+            formParams = new HttpParams({encoder: this.encoder});
 {{/useHttpClient}}
 {{^useHttpClient}}
             // TODO: this fails if a parameter is a file, the api can't consume "multipart/form-data" and a blob is passed.
             convertFormParamsToString = true;
-            formParams = new URLSearchParams('', new CustomQueryEncoderHelper());
+            formParams = new URLSearchParams('', this.encoder);
             // set the content-type explicitly to avoid having it set to 'text/plain'
             headers.set('Content-Type', 'application/x-www-form-urlencoded;charset=UTF-8');
 {{/useHttpClient}}
diff --git a/modules/openapi-generator/src/main/resources/typescript-angular/configuration.mustache b/modules/openapi-generator/src/main/resources/typescript-angular/configuration.mustache
index 1132f4adc1..272608be3a 100644
--- a/modules/openapi-generator/src/main/resources/typescript-angular/configuration.mustache
+++ b/modules/openapi-generator/src/main/resources/typescript-angular/configuration.mustache
@@ -1,3 +1,10 @@
+{{#useHttpClient}}
+import { HttpParameterCodec } from '@angular/common/http';
+{{/useHttpClient}}
+{{^useHttpClient}}
+import { QueryEncoder } from '@angular/http';
+{{/useHttpClient}}
+
 export interface ConfigurationParameters {
     apiKeys?: {[ key: string ]: string};
     username?: string;
@@ -5,6 +12,12 @@ export interface ConfigurationParameters {
     accessToken?: string | (() => string);
     basePath?: string;
     withCredentials?: boolean;
+{{#useHttpClient}}
+    encoder?: HttpParameterCodec;
+{{/useHttpClient}}
+{{^useHttpClient}}
+    encoder?: QueryEncoder;
+{{/useHttpClient}}
 }
 
 export class Configuration {
@@ -14,6 +27,12 @@ export class Configuration {
     accessToken?: string | (() => string);
     basePath?: string;
     withCredentials?: boolean;
+{{#useHttpClient}}
+    encoder?: HttpParameterCodec;
+{{/useHttpClient}}
+{{^useHttpClient}}
+    encoder?: QueryEncoder;
+{{/useHttpClient}}
 
     constructor(configurationParameters: ConfigurationParameters = {}) {
         this.apiKeys = configurationParameters.apiKeys;
@@ -22,6 +41,7 @@ export class Configuration {
         this.accessToken = configurationParameters.accessToken;
         this.basePath = configurationParameters.basePath;
         this.withCredentials = configurationParameters.withCredentials;
+        this.encoder = configurationParameters.encoder;
     }
 
     /**
diff --git a/modules/openapi-generator/src/main/resources/typescript-angular/encoder.mustache b/modules/openapi-generator/src/main/resources/typescript-angular/encoder.mustache
index c3ac784124..b3685b0bd9 100644
--- a/modules/openapi-generator/src/main/resources/typescript-angular/encoder.mustache
+++ b/modules/openapi-generator/src/main/resources/typescript-angular/encoder.mustache
@@ -1,30 +1,33 @@
 {{#useHttpClient}}
-    import { HttpUrlEncodingCodec } from '@angular/common/http';
+import { HttpParameterCodec } from '@angular/common/http';
 {{/useHttpClient}}
 {{^useHttpClient}}
-    import { QueryEncoder } from '@angular/http';
+import { QueryEncoder } from '@angular/http';
 {{/useHttpClient}}
 
 {{#useHttpClient}}
 /**
-* CustomHttpUrlEncodingCodec
-* Fix plus sign (+) not encoding, so sent as blank space
-* See: https://github.com/angular/angular/issues/11058#issuecomment-247367318
+* Custom HttpParameterCodec
+* Workaround for https://github.com/angular/angular/issues/18261
 */
-export class CustomHttpUrlEncodingCodec extends HttpUrlEncodingCodec {
+export class CustomHttpParameterCodec implements HttpParameterCodec {
     encodeKey(k: string): string {
-        k = super.encodeKey(k);
-        return k.replace(/\+/gi, '%2B');
+        return encodeURIComponent(k);
     }
     encodeValue(v: string): string {
-        v = super.encodeValue(v);
-        return v.replace(/\+/gi, '%2B');
+        return encodeURIComponent(v);
+    }
+    decodeKey(k: string): string {
+        return decodeURIComponent(k);
+    }
+    decodeValue(v: string): string {
+        return decodeURIComponent(v);
     }
 }
 {{/useHttpClient}}
 {{^useHttpClient}}
 /**
-* CustomQueryEncoderHelper
+* Custom QueryEncoder
 * Fix plus sign (+) not encoding, so sent as blank space
 * See: https://github.com/angular/angular/issues/11058#issuecomment-247367318
 */
diff --git a/samples/client/petstore/typescript-angular-v2/default/api/pet.service.ts b/samples/client/petstore/typescript-angular-v2/default/api/pet.service.ts
index b08cd7bb35..ff2ed68baa 100644
--- a/samples/client/petstore/typescript-angular-v2/default/api/pet.service.ts
+++ b/samples/client/petstore/typescript-angular-v2/default/api/pet.service.ts
@@ -12,11 +12,10 @@
 /* tslint:disable:no-unused-variable member-ordering */
 
 import { Inject, Injectable, Optional }                      from '@angular/core';
-import { Http, Headers, URLSearchParams }                    from '@angular/http';
-import { RequestMethod, RequestOptions, RequestOptionsArgs } from '@angular/http';
-import { Response, ResponseContentType }                     from '@angular/http';
+import { Http, Headers, URLSearchParams,
+        RequestMethod, RequestOptions, RequestOptionsArgs,
+        Response, ResponseContentType, QueryEncoder }        from '@angular/http';
 import { CustomQueryEncoderHelper }                          from '../encoder';
-
 import { Observable }                                        from 'rxjs/Observable';
 import '../rxjs-operators';
 
@@ -33,6 +32,7 @@ export class PetService {
     protected basePath = 'http://petstore.swagger.io/v2';
     public defaultHeaders = new Headers();
     public configuration = new Configuration();
+    public encoder: QueryEncoder;
 
     constructor(protected http: Http, @Optional()@Inject(BASE_PATH) basePath: string, @Optional() configuration: Configuration) {
 
@@ -43,6 +43,7 @@ export class PetService {
         } else {
             this.configuration.basePath = basePath || this.basePath;
         }
+        this.encoder = this.configuration.encoder || new CustomQueryEncoderHelper();
     }
 
     /**
@@ -307,7 +308,7 @@ export class PetService {
             throw new Error('Required parameter status was null or undefined when calling findPetsByStatus.');
         }
 
-        let queryParameters = new URLSearchParams('', new CustomQueryEncoderHelper());
+        let queryParameters = new URLSearchParams('', this.encoder);
         if (status) {
             queryParameters.set('status', status.join(COLLECTION_FORMATS['csv']));
         }
@@ -361,7 +362,7 @@ export class PetService {
             throw new Error('Required parameter tags was null or undefined when calling findPetsByTags.');
         }
 
-        let queryParameters = new URLSearchParams('', new CustomQueryEncoderHelper());
+        let queryParameters = new URLSearchParams('', this.encoder);
         if (tags) {
             queryParameters.set('tags', tags.join(COLLECTION_FORMATS['csv']));
         }
@@ -548,7 +549,7 @@ export class PetService {
         } else {
             // TODO: this fails if a parameter is a file, the api can't consume "multipart/form-data" and a blob is passed.
             convertFormParamsToString = true;
-            formParams = new URLSearchParams('', new CustomQueryEncoderHelper());
+            formParams = new URLSearchParams('', this.encoder);
             // set the content-type explicitly to avoid having it set to 'text/plain'
             headers.set('Content-Type', 'application/x-www-form-urlencoded;charset=UTF-8');
         }
@@ -624,7 +625,7 @@ export class PetService {
         } else {
             // TODO: this fails if a parameter is a file, the api can't consume "multipart/form-data" and a blob is passed.
             convertFormParamsToString = true;
-            formParams = new URLSearchParams('', new CustomQueryEncoderHelper());
+            formParams = new URLSearchParams('', this.encoder);
             // set the content-type explicitly to avoid having it set to 'text/plain'
             headers.set('Content-Type', 'application/x-www-form-urlencoded;charset=UTF-8');
         }
diff --git a/samples/client/petstore/typescript-angular-v2/default/api/store.service.ts b/samples/client/petstore/typescript-angular-v2/default/api/store.service.ts
index f954cd0ecb..e774b1f93a 100644
--- a/samples/client/petstore/typescript-angular-v2/default/api/store.service.ts
+++ b/samples/client/petstore/typescript-angular-v2/default/api/store.service.ts
@@ -12,11 +12,10 @@
 /* tslint:disable:no-unused-variable member-ordering */
 
 import { Inject, Injectable, Optional }                      from '@angular/core';
-import { Http, Headers, URLSearchParams }                    from '@angular/http';
-import { RequestMethod, RequestOptions, RequestOptionsArgs } from '@angular/http';
-import { Response, ResponseContentType }                     from '@angular/http';
+import { Http, Headers, URLSearchParams,
+        RequestMethod, RequestOptions, RequestOptionsArgs,
+        Response, ResponseContentType, QueryEncoder }        from '@angular/http';
 import { CustomQueryEncoderHelper }                          from '../encoder';
-
 import { Observable }                                        from 'rxjs/Observable';
 import '../rxjs-operators';
 
@@ -32,6 +31,7 @@ export class StoreService {
     protected basePath = 'http://petstore.swagger.io/v2';
     public defaultHeaders = new Headers();
     public configuration = new Configuration();
+    public encoder: QueryEncoder;
 
     constructor(protected http: Http, @Optional()@Inject(BASE_PATH) basePath: string, @Optional() configuration: Configuration) {
 
@@ -42,6 +42,7 @@ export class StoreService {
         } else {
             this.configuration.basePath = basePath || this.basePath;
         }
+        this.encoder = this.configuration.encoder || new CustomQueryEncoderHelper();
     }
 
     /**
diff --git a/samples/client/petstore/typescript-angular-v2/default/api/user.service.ts b/samples/client/petstore/typescript-angular-v2/default/api/user.service.ts
index b28057cfb8..a1ab3ad595 100644
--- a/samples/client/petstore/typescript-angular-v2/default/api/user.service.ts
+++ b/samples/client/petstore/typescript-angular-v2/default/api/user.service.ts
@@ -12,11 +12,10 @@
 /* tslint:disable:no-unused-variable member-ordering */
 
 import { Inject, Injectable, Optional }                      from '@angular/core';
-import { Http, Headers, URLSearchParams }                    from '@angular/http';
-import { RequestMethod, RequestOptions, RequestOptionsArgs } from '@angular/http';
-import { Response, ResponseContentType }                     from '@angular/http';
+import { Http, Headers, URLSearchParams,
+        RequestMethod, RequestOptions, RequestOptionsArgs,
+        Response, ResponseContentType, QueryEncoder }        from '@angular/http';
 import { CustomQueryEncoderHelper }                          from '../encoder';
-
 import { Observable }                                        from 'rxjs/Observable';
 import '../rxjs-operators';
 
@@ -32,6 +31,7 @@ export class UserService {
     protected basePath = 'http://petstore.swagger.io/v2';
     public defaultHeaders = new Headers();
     public configuration = new Configuration();
+    public encoder: QueryEncoder;
 
     constructor(protected http: Http, @Optional()@Inject(BASE_PATH) basePath: string, @Optional() configuration: Configuration) {
 
@@ -42,6 +42,7 @@ export class UserService {
         } else {
             this.configuration.basePath = basePath || this.basePath;
         }
+        this.encoder = this.configuration.encoder || new CustomQueryEncoderHelper();
     }
 
     /**
@@ -410,7 +411,7 @@ export class UserService {
             throw new Error('Required parameter password was null or undefined when calling loginUser.');
         }
 
-        let queryParameters = new URLSearchParams('', new CustomQueryEncoderHelper());
+        let queryParameters = new URLSearchParams('', this.encoder);
         if (username !== undefined && username !== null) {
             queryParameters.set('username', <any>username);
         }
diff --git a/samples/client/petstore/typescript-angular-v2/default/configuration.ts b/samples/client/petstore/typescript-angular-v2/default/configuration.ts
index 1132f4adc1..a442747dfc 100644
--- a/samples/client/petstore/typescript-angular-v2/default/configuration.ts
+++ b/samples/client/petstore/typescript-angular-v2/default/configuration.ts
@@ -1,3 +1,5 @@
+import { QueryEncoder } from '@angular/http';
+
 export interface ConfigurationParameters {
     apiKeys?: {[ key: string ]: string};
     username?: string;
@@ -5,6 +7,7 @@ export interface ConfigurationParameters {
     accessToken?: string | (() => string);
     basePath?: string;
     withCredentials?: boolean;
+    encoder?: QueryEncoder;
 }
 
 export class Configuration {
@@ -14,6 +17,7 @@ export class Configuration {
     accessToken?: string | (() => string);
     basePath?: string;
     withCredentials?: boolean;
+    encoder?: QueryEncoder;
 
     constructor(configurationParameters: ConfigurationParameters = {}) {
         this.apiKeys = configurationParameters.apiKeys;
@@ -22,6 +26,7 @@ export class Configuration {
         this.accessToken = configurationParameters.accessToken;
         this.basePath = configurationParameters.basePath;
         this.withCredentials = configurationParameters.withCredentials;
+        this.encoder = configurationParameters.encoder;
     }
 
     /**
diff --git a/samples/client/petstore/typescript-angular-v2/default/encoder.ts b/samples/client/petstore/typescript-angular-v2/default/encoder.ts
index 6fcda7b246..2a26942bee 100644
--- a/samples/client/petstore/typescript-angular-v2/default/encoder.ts
+++ b/samples/client/petstore/typescript-angular-v2/default/encoder.ts
@@ -1,7 +1,7 @@
-    import { QueryEncoder } from '@angular/http';
+import { QueryEncoder } from '@angular/http';
 
 /**
-* CustomQueryEncoderHelper
+* Custom QueryEncoder
 * Fix plus sign (+) not encoding, so sent as blank space
 * See: https://github.com/angular/angular/issues/11058#issuecomment-247367318
 */
diff --git a/samples/client/petstore/typescript-angular-v2/npm/api/pet.service.ts b/samples/client/petstore/typescript-angular-v2/npm/api/pet.service.ts
index b08cd7bb35..ff2ed68baa 100644
--- a/samples/client/petstore/typescript-angular-v2/npm/api/pet.service.ts
+++ b/samples/client/petstore/typescript-angular-v2/npm/api/pet.service.ts
@@ -12,11 +12,10 @@
 /* tslint:disable:no-unused-variable member-ordering */
 
 import { Inject, Injectable, Optional }                      from '@angular/core';
-import { Http, Headers, URLSearchParams }                    from '@angular/http';
-import { RequestMethod, RequestOptions, RequestOptionsArgs } from '@angular/http';
-import { Response, ResponseContentType }                     from '@angular/http';
+import { Http, Headers, URLSearchParams,
+        RequestMethod, RequestOptions, RequestOptionsArgs,
+        Response, ResponseContentType, QueryEncoder }        from '@angular/http';
 import { CustomQueryEncoderHelper }                          from '../encoder';
-
 import { Observable }                                        from 'rxjs/Observable';
 import '../rxjs-operators';
 
@@ -33,6 +32,7 @@ export class PetService {
     protected basePath = 'http://petstore.swagger.io/v2';
     public defaultHeaders = new Headers();
     public configuration = new Configuration();
+    public encoder: QueryEncoder;
 
     constructor(protected http: Http, @Optional()@Inject(BASE_PATH) basePath: string, @Optional() configuration: Configuration) {
 
@@ -43,6 +43,7 @@ export class PetService {
         } else {
             this.configuration.basePath = basePath || this.basePath;
         }
+        this.encoder = this.configuration.encoder || new CustomQueryEncoderHelper();
     }
 
     /**
@@ -307,7 +308,7 @@ export class PetService {
             throw new Error('Required parameter status was null or undefined when calling findPetsByStatus.');
         }
 
-        let queryParameters = new URLSearchParams('', new CustomQueryEncoderHelper());
+        let queryParameters = new URLSearchParams('', this.encoder);
         if (status) {
             queryParameters.set('status', status.join(COLLECTION_FORMATS['csv']));
         }
@@ -361,7 +362,7 @@ export class PetService {
             throw new Error('Required parameter tags was null or undefined when calling findPetsByTags.');
         }
 
-        let queryParameters = new URLSearchParams('', new CustomQueryEncoderHelper());
+        let queryParameters = new URLSearchParams('', this.encoder);
         if (tags) {
             queryParameters.set('tags', tags.join(COLLECTION_FORMATS['csv']));
         }
@@ -548,7 +549,7 @@ export class PetService {
         } else {
             // TODO: this fails if a parameter is a file, the api can't consume "multipart/form-data" and a blob is passed.
             convertFormParamsToString = true;
-            formParams = new URLSearchParams('', new CustomQueryEncoderHelper());
+            formParams = new URLSearchParams('', this.encoder);
             // set the content-type explicitly to avoid having it set to 'text/plain'
             headers.set('Content-Type', 'application/x-www-form-urlencoded;charset=UTF-8');
         }
@@ -624,7 +625,7 @@ export class PetService {
         } else {
             // TODO: this fails if a parameter is a file, the api can't consume "multipart/form-data" and a blob is passed.
             convertFormParamsToString = true;
-            formParams = new URLSearchParams('', new CustomQueryEncoderHelper());
+            formParams = new URLSearchParams('', this.encoder);
             // set the content-type explicitly to avoid having it set to 'text/plain'
             headers.set('Content-Type', 'application/x-www-form-urlencoded;charset=UTF-8');
         }
diff --git a/samples/client/petstore/typescript-angular-v2/npm/api/store.service.ts b/samples/client/petstore/typescript-angular-v2/npm/api/store.service.ts
index f954cd0ecb..e774b1f93a 100644
--- a/samples/client/petstore/typescript-angular-v2/npm/api/store.service.ts
+++ b/samples/client/petstore/typescript-angular-v2/npm/api/store.service.ts
@@ -12,11 +12,10 @@
 /* tslint:disable:no-unused-variable member-ordering */
 
 import { Inject, Injectable, Optional }                      from '@angular/core';
-import { Http, Headers, URLSearchParams }                    from '@angular/http';
-import { RequestMethod, RequestOptions, RequestOptionsArgs } from '@angular/http';
-import { Response, ResponseContentType }                     from '@angular/http';
+import { Http, Headers, URLSearchParams,
+        RequestMethod, RequestOptions, RequestOptionsArgs,
+        Response, ResponseContentType, QueryEncoder }        from '@angular/http';
 import { CustomQueryEncoderHelper }                          from '../encoder';
-
 import { Observable }                                        from 'rxjs/Observable';
 import '../rxjs-operators';
 
@@ -32,6 +31,7 @@ export class StoreService {
     protected basePath = 'http://petstore.swagger.io/v2';
     public defaultHeaders = new Headers();
     public configuration = new Configuration();
+    public encoder: QueryEncoder;
 
     constructor(protected http: Http, @Optional()@Inject(BASE_PATH) basePath: string, @Optional() configuration: Configuration) {
 
@@ -42,6 +42,7 @@ export class StoreService {
         } else {
             this.configuration.basePath = basePath || this.basePath;
         }
+        this.encoder = this.configuration.encoder || new CustomQueryEncoderHelper();
     }
 
     /**
diff --git a/samples/client/petstore/typescript-angular-v2/npm/api/user.service.ts b/samples/client/petstore/typescript-angular-v2/npm/api/user.service.ts
index b28057cfb8..a1ab3ad595 100644
--- a/samples/client/petstore/typescript-angular-v2/npm/api/user.service.ts
+++ b/samples/client/petstore/typescript-angular-v2/npm/api/user.service.ts
@@ -12,11 +12,10 @@
 /* tslint:disable:no-unused-variable member-ordering */
 
 import { Inject, Injectable, Optional }                      from '@angular/core';
-import { Http, Headers, URLSearchParams }                    from '@angular/http';
-import { RequestMethod, RequestOptions, RequestOptionsArgs } from '@angular/http';
-import { Response, ResponseContentType }                     from '@angular/http';
+import { Http, Headers, URLSearchParams,
+        RequestMethod, RequestOptions, RequestOptionsArgs,
+        Response, ResponseContentType, QueryEncoder }        from '@angular/http';
 import { CustomQueryEncoderHelper }                          from '../encoder';
-
 import { Observable }                                        from 'rxjs/Observable';
 import '../rxjs-operators';
 
@@ -32,6 +31,7 @@ export class UserService {
     protected basePath = 'http://petstore.swagger.io/v2';
     public defaultHeaders = new Headers();
     public configuration = new Configuration();
+    public encoder: QueryEncoder;
 
     constructor(protected http: Http, @Optional()@Inject(BASE_PATH) basePath: string, @Optional() configuration: Configuration) {
 
@@ -42,6 +42,7 @@ export class UserService {
         } else {
             this.configuration.basePath = basePath || this.basePath;
         }
+        this.encoder = this.configuration.encoder || new CustomQueryEncoderHelper();
     }
 
     /**
@@ -410,7 +411,7 @@ export class UserService {
             throw new Error('Required parameter password was null or undefined when calling loginUser.');
         }
 
-        let queryParameters = new URLSearchParams('', new CustomQueryEncoderHelper());
+        let queryParameters = new URLSearchParams('', this.encoder);
         if (username !== undefined && username !== null) {
             queryParameters.set('username', <any>username);
         }
diff --git a/samples/client/petstore/typescript-angular-v2/npm/configuration.ts b/samples/client/petstore/typescript-angular-v2/npm/configuration.ts
index 1132f4adc1..a442747dfc 100644
--- a/samples/client/petstore/typescript-angular-v2/npm/configuration.ts
+++ b/samples/client/petstore/typescript-angular-v2/npm/configuration.ts
@@ -1,3 +1,5 @@
+import { QueryEncoder } from '@angular/http';
+
 export interface ConfigurationParameters {
     apiKeys?: {[ key: string ]: string};
     username?: string;
@@ -5,6 +7,7 @@ export interface ConfigurationParameters {
     accessToken?: string | (() => string);
     basePath?: string;
     withCredentials?: boolean;
+    encoder?: QueryEncoder;
 }
 
 export class Configuration {
@@ -14,6 +17,7 @@ export class Configuration {
     accessToken?: string | (() => string);
     basePath?: string;
     withCredentials?: boolean;
+    encoder?: QueryEncoder;
 
     constructor(configurationParameters: ConfigurationParameters = {}) {
         this.apiKeys = configurationParameters.apiKeys;
@@ -22,6 +26,7 @@ export class Configuration {
         this.accessToken = configurationParameters.accessToken;
         this.basePath = configurationParameters.basePath;
         this.withCredentials = configurationParameters.withCredentials;
+        this.encoder = configurationParameters.encoder;
     }
 
     /**
diff --git a/samples/client/petstore/typescript-angular-v2/npm/encoder.ts b/samples/client/petstore/typescript-angular-v2/npm/encoder.ts
index 6fcda7b246..2a26942bee 100644
--- a/samples/client/petstore/typescript-angular-v2/npm/encoder.ts
+++ b/samples/client/petstore/typescript-angular-v2/npm/encoder.ts
@@ -1,7 +1,7 @@
-    import { QueryEncoder } from '@angular/http';
+import { QueryEncoder } from '@angular/http';
 
 /**
-* CustomQueryEncoderHelper
+* Custom QueryEncoder
 * Fix plus sign (+) not encoding, so sent as blank space
 * See: https://github.com/angular/angular/issues/11058#issuecomment-247367318
 */
diff --git a/samples/client/petstore/typescript-angular-v2/with-interfaces/api/pet.service.ts b/samples/client/petstore/typescript-angular-v2/with-interfaces/api/pet.service.ts
index 2a233a4095..5f26d9ad2b 100644
--- a/samples/client/petstore/typescript-angular-v2/with-interfaces/api/pet.service.ts
+++ b/samples/client/petstore/typescript-angular-v2/with-interfaces/api/pet.service.ts
@@ -12,11 +12,10 @@
 /* tslint:disable:no-unused-variable member-ordering */
 
 import { Inject, Injectable, Optional }                      from '@angular/core';
-import { Http, Headers, URLSearchParams }                    from '@angular/http';
-import { RequestMethod, RequestOptions, RequestOptionsArgs } from '@angular/http';
-import { Response, ResponseContentType }                     from '@angular/http';
+import { Http, Headers, URLSearchParams,
+        RequestMethod, RequestOptions, RequestOptionsArgs,
+        Response, ResponseContentType, QueryEncoder }        from '@angular/http';
 import { CustomQueryEncoderHelper }                          from '../encoder';
-
 import { Observable }                                        from 'rxjs/Observable';
 import '../rxjs-operators';
 
@@ -34,6 +33,7 @@ export class PetService implements PetServiceInterface {
     protected basePath = 'http://petstore.swagger.io/v2';
     public defaultHeaders = new Headers();
     public configuration = new Configuration();
+    public encoder: QueryEncoder;
 
     constructor(protected http: Http, @Optional()@Inject(BASE_PATH) basePath: string, @Optional() configuration: Configuration) {
 
@@ -44,6 +44,7 @@ export class PetService implements PetServiceInterface {
         } else {
             this.configuration.basePath = basePath || this.basePath;
         }
+        this.encoder = this.configuration.encoder || new CustomQueryEncoderHelper();
     }
 
     /**
@@ -308,7 +309,7 @@ export class PetService implements PetServiceInterface {
             throw new Error('Required parameter status was null or undefined when calling findPetsByStatus.');
         }
 
-        let queryParameters = new URLSearchParams('', new CustomQueryEncoderHelper());
+        let queryParameters = new URLSearchParams('', this.encoder);
         if (status) {
             queryParameters.set('status', status.join(COLLECTION_FORMATS['csv']));
         }
@@ -362,7 +363,7 @@ export class PetService implements PetServiceInterface {
             throw new Error('Required parameter tags was null or undefined when calling findPetsByTags.');
         }
 
-        let queryParameters = new URLSearchParams('', new CustomQueryEncoderHelper());
+        let queryParameters = new URLSearchParams('', this.encoder);
         if (tags) {
             queryParameters.set('tags', tags.join(COLLECTION_FORMATS['csv']));
         }
@@ -549,7 +550,7 @@ export class PetService implements PetServiceInterface {
         } else {
             // TODO: this fails if a parameter is a file, the api can't consume "multipart/form-data" and a blob is passed.
             convertFormParamsToString = true;
-            formParams = new URLSearchParams('', new CustomQueryEncoderHelper());
+            formParams = new URLSearchParams('', this.encoder);
             // set the content-type explicitly to avoid having it set to 'text/plain'
             headers.set('Content-Type', 'application/x-www-form-urlencoded;charset=UTF-8');
         }
@@ -625,7 +626,7 @@ export class PetService implements PetServiceInterface {
         } else {
             // TODO: this fails if a parameter is a file, the api can't consume "multipart/form-data" and a blob is passed.
             convertFormParamsToString = true;
-            formParams = new URLSearchParams('', new CustomQueryEncoderHelper());
+            formParams = new URLSearchParams('', this.encoder);
             // set the content-type explicitly to avoid having it set to 'text/plain'
             headers.set('Content-Type', 'application/x-www-form-urlencoded;charset=UTF-8');
         }
diff --git a/samples/client/petstore/typescript-angular-v2/with-interfaces/api/store.service.ts b/samples/client/petstore/typescript-angular-v2/with-interfaces/api/store.service.ts
index 429e98b007..f048d9575e 100644
--- a/samples/client/petstore/typescript-angular-v2/with-interfaces/api/store.service.ts
+++ b/samples/client/petstore/typescript-angular-v2/with-interfaces/api/store.service.ts
@@ -12,11 +12,10 @@
 /* tslint:disable:no-unused-variable member-ordering */
 
 import { Inject, Injectable, Optional }                      from '@angular/core';
-import { Http, Headers, URLSearchParams }                    from '@angular/http';
-import { RequestMethod, RequestOptions, RequestOptionsArgs } from '@angular/http';
-import { Response, ResponseContentType }                     from '@angular/http';
+import { Http, Headers, URLSearchParams,
+        RequestMethod, RequestOptions, RequestOptionsArgs,
+        Response, ResponseContentType, QueryEncoder }        from '@angular/http';
 import { CustomQueryEncoderHelper }                          from '../encoder';
-
 import { Observable }                                        from 'rxjs/Observable';
 import '../rxjs-operators';
 
@@ -33,6 +32,7 @@ export class StoreService implements StoreServiceInterface {
     protected basePath = 'http://petstore.swagger.io/v2';
     public defaultHeaders = new Headers();
     public configuration = new Configuration();
+    public encoder: QueryEncoder;
 
     constructor(protected http: Http, @Optional()@Inject(BASE_PATH) basePath: string, @Optional() configuration: Configuration) {
 
@@ -43,6 +43,7 @@ export class StoreService implements StoreServiceInterface {
         } else {
             this.configuration.basePath = basePath || this.basePath;
         }
+        this.encoder = this.configuration.encoder || new CustomQueryEncoderHelper();
     }
 
     /**
diff --git a/samples/client/petstore/typescript-angular-v2/with-interfaces/api/user.service.ts b/samples/client/petstore/typescript-angular-v2/with-interfaces/api/user.service.ts
index eff56586b3..d89810de1e 100644
--- a/samples/client/petstore/typescript-angular-v2/with-interfaces/api/user.service.ts
+++ b/samples/client/petstore/typescript-angular-v2/with-interfaces/api/user.service.ts
@@ -12,11 +12,10 @@
 /* tslint:disable:no-unused-variable member-ordering */
 
 import { Inject, Injectable, Optional }                      from '@angular/core';
-import { Http, Headers, URLSearchParams }                    from '@angular/http';
-import { RequestMethod, RequestOptions, RequestOptionsArgs } from '@angular/http';
-import { Response, ResponseContentType }                     from '@angular/http';
+import { Http, Headers, URLSearchParams,
+        RequestMethod, RequestOptions, RequestOptionsArgs,
+        Response, ResponseContentType, QueryEncoder }        from '@angular/http';
 import { CustomQueryEncoderHelper }                          from '../encoder';
-
 import { Observable }                                        from 'rxjs/Observable';
 import '../rxjs-operators';
 
@@ -33,6 +32,7 @@ export class UserService implements UserServiceInterface {
     protected basePath = 'http://petstore.swagger.io/v2';
     public defaultHeaders = new Headers();
     public configuration = new Configuration();
+    public encoder: QueryEncoder;
 
     constructor(protected http: Http, @Optional()@Inject(BASE_PATH) basePath: string, @Optional() configuration: Configuration) {
 
@@ -43,6 +43,7 @@ export class UserService implements UserServiceInterface {
         } else {
             this.configuration.basePath = basePath || this.basePath;
         }
+        this.encoder = this.configuration.encoder || new CustomQueryEncoderHelper();
     }
 
     /**
@@ -411,7 +412,7 @@ export class UserService implements UserServiceInterface {
             throw new Error('Required parameter password was null or undefined when calling loginUser.');
         }
 
-        let queryParameters = new URLSearchParams('', new CustomQueryEncoderHelper());
+        let queryParameters = new URLSearchParams('', this.encoder);
         if (username !== undefined && username !== null) {
             queryParameters.set('username', <any>username);
         }
diff --git a/samples/client/petstore/typescript-angular-v2/with-interfaces/configuration.ts b/samples/client/petstore/typescript-angular-v2/with-interfaces/configuration.ts
index 1132f4adc1..a442747dfc 100644
--- a/samples/client/petstore/typescript-angular-v2/with-interfaces/configuration.ts
+++ b/samples/client/petstore/typescript-angular-v2/with-interfaces/configuration.ts
@@ -1,3 +1,5 @@
+import { QueryEncoder } from '@angular/http';
+
 export interface ConfigurationParameters {
     apiKeys?: {[ key: string ]: string};
     username?: string;
@@ -5,6 +7,7 @@ export interface ConfigurationParameters {
     accessToken?: string | (() => string);
     basePath?: string;
     withCredentials?: boolean;
+    encoder?: QueryEncoder;
 }
 
 export class Configuration {
@@ -14,6 +17,7 @@ export class Configuration {
     accessToken?: string | (() => string);
     basePath?: string;
     withCredentials?: boolean;
+    encoder?: QueryEncoder;
 
     constructor(configurationParameters: ConfigurationParameters = {}) {
         this.apiKeys = configurationParameters.apiKeys;
@@ -22,6 +26,7 @@ export class Configuration {
         this.accessToken = configurationParameters.accessToken;
         this.basePath = configurationParameters.basePath;
         this.withCredentials = configurationParameters.withCredentials;
+        this.encoder = configurationParameters.encoder;
     }
 
     /**
diff --git a/samples/client/petstore/typescript-angular-v2/with-interfaces/encoder.ts b/samples/client/petstore/typescript-angular-v2/with-interfaces/encoder.ts
index 6fcda7b246..2a26942bee 100644
--- a/samples/client/petstore/typescript-angular-v2/with-interfaces/encoder.ts
+++ b/samples/client/petstore/typescript-angular-v2/with-interfaces/encoder.ts
@@ -1,7 +1,7 @@
-    import { QueryEncoder } from '@angular/http';
+import { QueryEncoder } from '@angular/http';
 
 /**
-* CustomQueryEncoderHelper
+* Custom QueryEncoder
 * Fix plus sign (+) not encoding, so sent as blank space
 * See: https://github.com/angular/angular/issues/11058#issuecomment-247367318
 */
diff --git a/samples/client/petstore/typescript-angular-v4.3/npm/api/pet.service.ts b/samples/client/petstore/typescript-angular-v4.3/npm/api/pet.service.ts
index 9d44aede08..5cd7568a7b 100644
--- a/samples/client/petstore/typescript-angular-v4.3/npm/api/pet.service.ts
+++ b/samples/client/petstore/typescript-angular-v4.3/npm/api/pet.service.ts
@@ -13,9 +13,8 @@
 
 import { Inject, Injectable, Optional }                      from '@angular/core';
 import { HttpClient, HttpHeaders, HttpParams,
-         HttpResponse, HttpEvent }                           from '@angular/common/http';
-import { CustomHttpUrlEncodingCodec }                        from '../encoder';
-
+         HttpResponse, HttpEvent, HttpParameterCodec }       from '@angular/common/http';
+import { CustomHttpParameterCodec }                          from '../encoder';
 import { Observable }                                        from 'rxjs/Observable';
 
 import { ApiResponse } from '../model/apiResponse';
@@ -31,6 +30,7 @@ export class PetService {
     protected basePath = 'http://petstore.swagger.io/v2';
     public defaultHeaders = new HttpHeaders();
     public configuration = new Configuration();
+    public encoder: HttpParameterCodec;
 
     constructor(protected httpClient: HttpClient, @Optional()@Inject(BASE_PATH) basePath: string, @Optional() configuration: Configuration) {
 
@@ -41,6 +41,7 @@ export class PetService {
         } else {
             this.configuration.basePath = basePath || this.basePath;
         }
+        this.encoder = this.configuration.encoder || new CustomHttpParameterCodec();
     }
 
     /**
@@ -178,7 +179,7 @@ export class PetService {
             throw new Error('Required parameter status was null or undefined when calling findPetsByStatus.');
         }
 
-        let queryParameters = new HttpParams({encoder: new CustomHttpUrlEncodingCodec()});
+        let queryParameters = new HttpParams({encoder: this.encoder});
         if (status) {
             queryParameters = queryParameters.set('status', status.join(COLLECTION_FORMATS['csv']));
         }
@@ -233,7 +234,7 @@ export class PetService {
             throw new Error('Required parameter tags was null or undefined when calling findPetsByTags.');
         }
 
-        let queryParameters = new HttpParams({encoder: new CustomHttpUrlEncodingCodec()});
+        let queryParameters = new HttpParams({encoder: this.encoder});
         if (tags) {
             queryParameters = queryParameters.set('tags', tags.join(COLLECTION_FORMATS['csv']));
         }
@@ -421,7 +422,7 @@ export class PetService {
         if (useForm) {
             formParams = new FormData();
         } else {
-            formParams = new HttpParams({encoder: new CustomHttpUrlEncodingCodec()});
+            formParams = new HttpParams({encoder: this.encoder});
         }
 
         if (name !== undefined) {
@@ -494,7 +495,7 @@ export class PetService {
         if (useForm) {
             formParams = new FormData();
         } else {
-            formParams = new HttpParams({encoder: new CustomHttpUrlEncodingCodec()});
+            formParams = new HttpParams({encoder: this.encoder});
         }
 
         if (additionalMetadata !== undefined) {
diff --git a/samples/client/petstore/typescript-angular-v4.3/npm/api/store.service.ts b/samples/client/petstore/typescript-angular-v4.3/npm/api/store.service.ts
index d2708f2abf..7f97217dc1 100644
--- a/samples/client/petstore/typescript-angular-v4.3/npm/api/store.service.ts
+++ b/samples/client/petstore/typescript-angular-v4.3/npm/api/store.service.ts
@@ -13,9 +13,8 @@
 
 import { Inject, Injectable, Optional }                      from '@angular/core';
 import { HttpClient, HttpHeaders, HttpParams,
-         HttpResponse, HttpEvent }                           from '@angular/common/http';
-import { CustomHttpUrlEncodingCodec }                        from '../encoder';
-
+         HttpResponse, HttpEvent, HttpParameterCodec }       from '@angular/common/http';
+import { CustomHttpParameterCodec }                          from '../encoder';
 import { Observable }                                        from 'rxjs/Observable';
 
 import { Order } from '../model/order';
@@ -30,6 +29,7 @@ export class StoreService {
     protected basePath = 'http://petstore.swagger.io/v2';
     public defaultHeaders = new HttpHeaders();
     public configuration = new Configuration();
+    public encoder: HttpParameterCodec;
 
     constructor(protected httpClient: HttpClient, @Optional()@Inject(BASE_PATH) basePath: string, @Optional() configuration: Configuration) {
 
@@ -40,6 +40,7 @@ export class StoreService {
         } else {
             this.configuration.basePath = basePath || this.basePath;
         }
+        this.encoder = this.configuration.encoder || new CustomHttpParameterCodec();
     }
 
     /**
diff --git a/samples/client/petstore/typescript-angular-v4.3/npm/api/user.service.ts b/samples/client/petstore/typescript-angular-v4.3/npm/api/user.service.ts
index 39b86c1b58..34379e25ae 100644
--- a/samples/client/petstore/typescript-angular-v4.3/npm/api/user.service.ts
+++ b/samples/client/petstore/typescript-angular-v4.3/npm/api/user.service.ts
@@ -13,9 +13,8 @@
 
 import { Inject, Injectable, Optional }                      from '@angular/core';
 import { HttpClient, HttpHeaders, HttpParams,
-         HttpResponse, HttpEvent }                           from '@angular/common/http';
-import { CustomHttpUrlEncodingCodec }                        from '../encoder';
-
+         HttpResponse, HttpEvent, HttpParameterCodec }       from '@angular/common/http';
+import { CustomHttpParameterCodec }                          from '../encoder';
 import { Observable }                                        from 'rxjs/Observable';
 
 import { User } from '../model/user';
@@ -30,6 +29,7 @@ export class UserService {
     protected basePath = 'http://petstore.swagger.io/v2';
     public defaultHeaders = new HttpHeaders();
     public configuration = new Configuration();
+    public encoder: HttpParameterCodec;
 
     constructor(protected httpClient: HttpClient, @Optional()@Inject(BASE_PATH) basePath: string, @Optional() configuration: Configuration) {
 
@@ -40,6 +40,7 @@ export class UserService {
         } else {
             this.configuration.basePath = basePath || this.basePath;
         }
+        this.encoder = this.configuration.encoder || new CustomHttpParameterCodec();
     }
 
     /**
@@ -288,7 +289,7 @@ export class UserService {
             throw new Error('Required parameter password was null or undefined when calling loginUser.');
         }
 
-        let queryParameters = new HttpParams({encoder: new CustomHttpUrlEncodingCodec()});
+        let queryParameters = new HttpParams({encoder: this.encoder});
         if (username !== undefined && username !== null) {
             queryParameters = queryParameters.set('username', <any>username);
         }
diff --git a/samples/client/petstore/typescript-angular-v4.3/npm/configuration.ts b/samples/client/petstore/typescript-angular-v4.3/npm/configuration.ts
index 1132f4adc1..c038bbc947 100644
--- a/samples/client/petstore/typescript-angular-v4.3/npm/configuration.ts
+++ b/samples/client/petstore/typescript-angular-v4.3/npm/configuration.ts
@@ -1,3 +1,5 @@
+import { HttpParameterCodec } from '@angular/common/http';
+
 export interface ConfigurationParameters {
     apiKeys?: {[ key: string ]: string};
     username?: string;
@@ -5,6 +7,7 @@ export interface ConfigurationParameters {
     accessToken?: string | (() => string);
     basePath?: string;
     withCredentials?: boolean;
+    encoder?: HttpParameterCodec;
 }
 
 export class Configuration {
@@ -14,6 +17,7 @@ export class Configuration {
     accessToken?: string | (() => string);
     basePath?: string;
     withCredentials?: boolean;
+    encoder?: HttpParameterCodec;
 
     constructor(configurationParameters: ConfigurationParameters = {}) {
         this.apiKeys = configurationParameters.apiKeys;
@@ -22,6 +26,7 @@ export class Configuration {
         this.accessToken = configurationParameters.accessToken;
         this.basePath = configurationParameters.basePath;
         this.withCredentials = configurationParameters.withCredentials;
+        this.encoder = configurationParameters.encoder;
     }
 
     /**
diff --git a/samples/client/petstore/typescript-angular-v4.3/npm/encoder.ts b/samples/client/petstore/typescript-angular-v4.3/npm/encoder.ts
index f1c6b78c9c..f3e504196f 100644
--- a/samples/client/petstore/typescript-angular-v4.3/npm/encoder.ts
+++ b/samples/client/petstore/typescript-angular-v4.3/npm/encoder.ts
@@ -1,18 +1,21 @@
-    import { HttpUrlEncodingCodec } from '@angular/common/http';
+import { HttpParameterCodec } from '@angular/common/http';
 
 /**
-* CustomHttpUrlEncodingCodec
-* Fix plus sign (+) not encoding, so sent as blank space
-* See: https://github.com/angular/angular/issues/11058#issuecomment-247367318
+* Custom HttpParameterCodec
+* Workaround for https://github.com/angular/angular/issues/18261
 */
-export class CustomHttpUrlEncodingCodec extends HttpUrlEncodingCodec {
+export class CustomHttpParameterCodec implements HttpParameterCodec {
     encodeKey(k: string): string {
-        k = super.encodeKey(k);
-        return k.replace(/\+/gi, '%2B');
+        return encodeURIComponent(k);
     }
     encodeValue(v: string): string {
-        v = super.encodeValue(v);
-        return v.replace(/\+/gi, '%2B');
+        return encodeURIComponent(v);
+    }
+    decodeKey(k: string): string {
+        return decodeURIComponent(k);
+    }
+    decodeValue(v: string): string {
+        return decodeURIComponent(v);
     }
 }
 
diff --git a/samples/client/petstore/typescript-angular-v4/npm/api/pet.service.ts b/samples/client/petstore/typescript-angular-v4/npm/api/pet.service.ts
index b08cd7bb35..ff2ed68baa 100644
--- a/samples/client/petstore/typescript-angular-v4/npm/api/pet.service.ts
+++ b/samples/client/petstore/typescript-angular-v4/npm/api/pet.service.ts
@@ -12,11 +12,10 @@
 /* tslint:disable:no-unused-variable member-ordering */
 
 import { Inject, Injectable, Optional }                      from '@angular/core';
-import { Http, Headers, URLSearchParams }                    from '@angular/http';
-import { RequestMethod, RequestOptions, RequestOptionsArgs } from '@angular/http';
-import { Response, ResponseContentType }                     from '@angular/http';
+import { Http, Headers, URLSearchParams,
+        RequestMethod, RequestOptions, RequestOptionsArgs,
+        Response, ResponseContentType, QueryEncoder }        from '@angular/http';
 import { CustomQueryEncoderHelper }                          from '../encoder';
-
 import { Observable }                                        from 'rxjs/Observable';
 import '../rxjs-operators';
 
@@ -33,6 +32,7 @@ export class PetService {
     protected basePath = 'http://petstore.swagger.io/v2';
     public defaultHeaders = new Headers();
     public configuration = new Configuration();
+    public encoder: QueryEncoder;
 
     constructor(protected http: Http, @Optional()@Inject(BASE_PATH) basePath: string, @Optional() configuration: Configuration) {
 
@@ -43,6 +43,7 @@ export class PetService {
         } else {
             this.configuration.basePath = basePath || this.basePath;
         }
+        this.encoder = this.configuration.encoder || new CustomQueryEncoderHelper();
     }
 
     /**
@@ -307,7 +308,7 @@ export class PetService {
             throw new Error('Required parameter status was null or undefined when calling findPetsByStatus.');
         }
 
-        let queryParameters = new URLSearchParams('', new CustomQueryEncoderHelper());
+        let queryParameters = new URLSearchParams('', this.encoder);
         if (status) {
             queryParameters.set('status', status.join(COLLECTION_FORMATS['csv']));
         }
@@ -361,7 +362,7 @@ export class PetService {
             throw new Error('Required parameter tags was null or undefined when calling findPetsByTags.');
         }
 
-        let queryParameters = new URLSearchParams('', new CustomQueryEncoderHelper());
+        let queryParameters = new URLSearchParams('', this.encoder);
         if (tags) {
             queryParameters.set('tags', tags.join(COLLECTION_FORMATS['csv']));
         }
@@ -548,7 +549,7 @@ export class PetService {
         } else {
             // TODO: this fails if a parameter is a file, the api can't consume "multipart/form-data" and a blob is passed.
             convertFormParamsToString = true;
-            formParams = new URLSearchParams('', new CustomQueryEncoderHelper());
+            formParams = new URLSearchParams('', this.encoder);
             // set the content-type explicitly to avoid having it set to 'text/plain'
             headers.set('Content-Type', 'application/x-www-form-urlencoded;charset=UTF-8');
         }
@@ -624,7 +625,7 @@ export class PetService {
         } else {
             // TODO: this fails if a parameter is a file, the api can't consume "multipart/form-data" and a blob is passed.
             convertFormParamsToString = true;
-            formParams = new URLSearchParams('', new CustomQueryEncoderHelper());
+            formParams = new URLSearchParams('', this.encoder);
             // set the content-type explicitly to avoid having it set to 'text/plain'
             headers.set('Content-Type', 'application/x-www-form-urlencoded;charset=UTF-8');
         }
diff --git a/samples/client/petstore/typescript-angular-v4/npm/api/store.service.ts b/samples/client/petstore/typescript-angular-v4/npm/api/store.service.ts
index f954cd0ecb..e774b1f93a 100644
--- a/samples/client/petstore/typescript-angular-v4/npm/api/store.service.ts
+++ b/samples/client/petstore/typescript-angular-v4/npm/api/store.service.ts
@@ -12,11 +12,10 @@
 /* tslint:disable:no-unused-variable member-ordering */
 
 import { Inject, Injectable, Optional }                      from '@angular/core';
-import { Http, Headers, URLSearchParams }                    from '@angular/http';
-import { RequestMethod, RequestOptions, RequestOptionsArgs } from '@angular/http';
-import { Response, ResponseContentType }                     from '@angular/http';
+import { Http, Headers, URLSearchParams,
+        RequestMethod, RequestOptions, RequestOptionsArgs,
+        Response, ResponseContentType, QueryEncoder }        from '@angular/http';
 import { CustomQueryEncoderHelper }                          from '../encoder';
-
 import { Observable }                                        from 'rxjs/Observable';
 import '../rxjs-operators';
 
@@ -32,6 +31,7 @@ export class StoreService {
     protected basePath = 'http://petstore.swagger.io/v2';
     public defaultHeaders = new Headers();
     public configuration = new Configuration();
+    public encoder: QueryEncoder;
 
     constructor(protected http: Http, @Optional()@Inject(BASE_PATH) basePath: string, @Optional() configuration: Configuration) {
 
@@ -42,6 +42,7 @@ export class StoreService {
         } else {
             this.configuration.basePath = basePath || this.basePath;
         }
+        this.encoder = this.configuration.encoder || new CustomQueryEncoderHelper();
     }
 
     /**
diff --git a/samples/client/petstore/typescript-angular-v4/npm/api/user.service.ts b/samples/client/petstore/typescript-angular-v4/npm/api/user.service.ts
index b28057cfb8..a1ab3ad595 100644
--- a/samples/client/petstore/typescript-angular-v4/npm/api/user.service.ts
+++ b/samples/client/petstore/typescript-angular-v4/npm/api/user.service.ts
@@ -12,11 +12,10 @@
 /* tslint:disable:no-unused-variable member-ordering */
 
 import { Inject, Injectable, Optional }                      from '@angular/core';
-import { Http, Headers, URLSearchParams }                    from '@angular/http';
-import { RequestMethod, RequestOptions, RequestOptionsArgs } from '@angular/http';
-import { Response, ResponseContentType }                     from '@angular/http';
+import { Http, Headers, URLSearchParams,
+        RequestMethod, RequestOptions, RequestOptionsArgs,
+        Response, ResponseContentType, QueryEncoder }        from '@angular/http';
 import { CustomQueryEncoderHelper }                          from '../encoder';
-
 import { Observable }                                        from 'rxjs/Observable';
 import '../rxjs-operators';
 
@@ -32,6 +31,7 @@ export class UserService {
     protected basePath = 'http://petstore.swagger.io/v2';
     public defaultHeaders = new Headers();
     public configuration = new Configuration();
+    public encoder: QueryEncoder;
 
     constructor(protected http: Http, @Optional()@Inject(BASE_PATH) basePath: string, @Optional() configuration: Configuration) {
 
@@ -42,6 +42,7 @@ export class UserService {
         } else {
             this.configuration.basePath = basePath || this.basePath;
         }
+        this.encoder = this.configuration.encoder || new CustomQueryEncoderHelper();
     }
 
     /**
@@ -410,7 +411,7 @@ export class UserService {
             throw new Error('Required parameter password was null or undefined when calling loginUser.');
         }
 
-        let queryParameters = new URLSearchParams('', new CustomQueryEncoderHelper());
+        let queryParameters = new URLSearchParams('', this.encoder);
         if (username !== undefined && username !== null) {
             queryParameters.set('username', <any>username);
         }
diff --git a/samples/client/petstore/typescript-angular-v4/npm/configuration.ts b/samples/client/petstore/typescript-angular-v4/npm/configuration.ts
index 1132f4adc1..a442747dfc 100644
--- a/samples/client/petstore/typescript-angular-v4/npm/configuration.ts
+++ b/samples/client/petstore/typescript-angular-v4/npm/configuration.ts
@@ -1,3 +1,5 @@
+import { QueryEncoder } from '@angular/http';
+
 export interface ConfigurationParameters {
     apiKeys?: {[ key: string ]: string};
     username?: string;
@@ -5,6 +7,7 @@ export interface ConfigurationParameters {
     accessToken?: string | (() => string);
     basePath?: string;
     withCredentials?: boolean;
+    encoder?: QueryEncoder;
 }
 
 export class Configuration {
@@ -14,6 +17,7 @@ export class Configuration {
     accessToken?: string | (() => string);
     basePath?: string;
     withCredentials?: boolean;
+    encoder?: QueryEncoder;
 
     constructor(configurationParameters: ConfigurationParameters = {}) {
         this.apiKeys = configurationParameters.apiKeys;
@@ -22,6 +26,7 @@ export class Configuration {
         this.accessToken = configurationParameters.accessToken;
         this.basePath = configurationParameters.basePath;
         this.withCredentials = configurationParameters.withCredentials;
+        this.encoder = configurationParameters.encoder;
     }
 
     /**
diff --git a/samples/client/petstore/typescript-angular-v4/npm/encoder.ts b/samples/client/petstore/typescript-angular-v4/npm/encoder.ts
index 6fcda7b246..2a26942bee 100644
--- a/samples/client/petstore/typescript-angular-v4/npm/encoder.ts
+++ b/samples/client/petstore/typescript-angular-v4/npm/encoder.ts
@@ -1,7 +1,7 @@
-    import { QueryEncoder } from '@angular/http';
+import { QueryEncoder } from '@angular/http';
 
 /**
-* CustomQueryEncoderHelper
+* Custom QueryEncoder
 * Fix plus sign (+) not encoding, so sent as blank space
 * See: https://github.com/angular/angular/issues/11058#issuecomment-247367318
 */
diff --git a/samples/client/petstore/typescript-angular-v6-not-provided-in-root/builds/default/api/pet.service.ts b/samples/client/petstore/typescript-angular-v6-not-provided-in-root/builds/default/api/pet.service.ts
index 5f392341a9..d7085113ed 100644
--- a/samples/client/petstore/typescript-angular-v6-not-provided-in-root/builds/default/api/pet.service.ts
+++ b/samples/client/petstore/typescript-angular-v6-not-provided-in-root/builds/default/api/pet.service.ts
@@ -13,9 +13,8 @@
 
 import { Inject, Injectable, Optional }                      from '@angular/core';
 import { HttpClient, HttpHeaders, HttpParams,
-         HttpResponse, HttpEvent }                           from '@angular/common/http';
-import { CustomHttpUrlEncodingCodec }                        from '../encoder';
-
+         HttpResponse, HttpEvent, HttpParameterCodec }       from '@angular/common/http';
+import { CustomHttpParameterCodec }                          from '../encoder';
 import { Observable }                                        from 'rxjs';
 
 import { ApiResponse } from '../model/apiResponse';
@@ -31,6 +30,7 @@ export class PetService {
     protected basePath = 'http://petstore.swagger.io/v2';
     public defaultHeaders = new HttpHeaders();
     public configuration = new Configuration();
+    public encoder: HttpParameterCodec;
 
     constructor(protected httpClient: HttpClient, @Optional()@Inject(BASE_PATH) basePath: string, @Optional() configuration: Configuration) {
 
@@ -41,6 +41,7 @@ export class PetService {
         } else {
             this.configuration.basePath = basePath || this.basePath;
         }
+        this.encoder = this.configuration.encoder || new CustomHttpParameterCodec();
     }
 
     /**
@@ -178,7 +179,7 @@ export class PetService {
             throw new Error('Required parameter status was null or undefined when calling findPetsByStatus.');
         }
 
-        let queryParameters = new HttpParams({encoder: new CustomHttpUrlEncodingCodec()});
+        let queryParameters = new HttpParams({encoder: this.encoder});
         if (status) {
             queryParameters = queryParameters.set('status', status.join(COLLECTION_FORMATS['csv']));
         }
@@ -233,7 +234,7 @@ export class PetService {
             throw new Error('Required parameter tags was null or undefined when calling findPetsByTags.');
         }
 
-        let queryParameters = new HttpParams({encoder: new CustomHttpUrlEncodingCodec()});
+        let queryParameters = new HttpParams({encoder: this.encoder});
         if (tags) {
             queryParameters = queryParameters.set('tags', tags.join(COLLECTION_FORMATS['csv']));
         }
@@ -421,7 +422,7 @@ export class PetService {
         if (useForm) {
             formParams = new FormData();
         } else {
-            formParams = new HttpParams({encoder: new CustomHttpUrlEncodingCodec()});
+            formParams = new HttpParams({encoder: this.encoder});
         }
 
         if (name !== undefined) {
@@ -494,7 +495,7 @@ export class PetService {
         if (useForm) {
             formParams = new FormData();
         } else {
-            formParams = new HttpParams({encoder: new CustomHttpUrlEncodingCodec()});
+            formParams = new HttpParams({encoder: this.encoder});
         }
 
         if (additionalMetadata !== undefined) {
diff --git a/samples/client/petstore/typescript-angular-v6-not-provided-in-root/builds/default/api/store.service.ts b/samples/client/petstore/typescript-angular-v6-not-provided-in-root/builds/default/api/store.service.ts
index 003cb591c1..04d518a149 100644
--- a/samples/client/petstore/typescript-angular-v6-not-provided-in-root/builds/default/api/store.service.ts
+++ b/samples/client/petstore/typescript-angular-v6-not-provided-in-root/builds/default/api/store.service.ts
@@ -13,9 +13,8 @@
 
 import { Inject, Injectable, Optional }                      from '@angular/core';
 import { HttpClient, HttpHeaders, HttpParams,
-         HttpResponse, HttpEvent }                           from '@angular/common/http';
-import { CustomHttpUrlEncodingCodec }                        from '../encoder';
-
+         HttpResponse, HttpEvent, HttpParameterCodec }       from '@angular/common/http';
+import { CustomHttpParameterCodec }                          from '../encoder';
 import { Observable }                                        from 'rxjs';
 
 import { Order } from '../model/order';
@@ -30,6 +29,7 @@ export class StoreService {
     protected basePath = 'http://petstore.swagger.io/v2';
     public defaultHeaders = new HttpHeaders();
     public configuration = new Configuration();
+    public encoder: HttpParameterCodec;
 
     constructor(protected httpClient: HttpClient, @Optional()@Inject(BASE_PATH) basePath: string, @Optional() configuration: Configuration) {
 
@@ -40,6 +40,7 @@ export class StoreService {
         } else {
             this.configuration.basePath = basePath || this.basePath;
         }
+        this.encoder = this.configuration.encoder || new CustomHttpParameterCodec();
     }
 
     /**
diff --git a/samples/client/petstore/typescript-angular-v6-not-provided-in-root/builds/default/api/user.service.ts b/samples/client/petstore/typescript-angular-v6-not-provided-in-root/builds/default/api/user.service.ts
index 302a73c389..446f5c51c2 100644
--- a/samples/client/petstore/typescript-angular-v6-not-provided-in-root/builds/default/api/user.service.ts
+++ b/samples/client/petstore/typescript-angular-v6-not-provided-in-root/builds/default/api/user.service.ts
@@ -13,9 +13,8 @@
 
 import { Inject, Injectable, Optional }                      from '@angular/core';
 import { HttpClient, HttpHeaders, HttpParams,
-         HttpResponse, HttpEvent }                           from '@angular/common/http';
-import { CustomHttpUrlEncodingCodec }                        from '../encoder';
-
+         HttpResponse, HttpEvent, HttpParameterCodec }       from '@angular/common/http';
+import { CustomHttpParameterCodec }                          from '../encoder';
 import { Observable }                                        from 'rxjs';
 
 import { User } from '../model/user';
@@ -30,6 +29,7 @@ export class UserService {
     protected basePath = 'http://petstore.swagger.io/v2';
     public defaultHeaders = new HttpHeaders();
     public configuration = new Configuration();
+    public encoder: HttpParameterCodec;
 
     constructor(protected httpClient: HttpClient, @Optional()@Inject(BASE_PATH) basePath: string, @Optional() configuration: Configuration) {
 
@@ -40,6 +40,7 @@ export class UserService {
         } else {
             this.configuration.basePath = basePath || this.basePath;
         }
+        this.encoder = this.configuration.encoder || new CustomHttpParameterCodec();
     }
 
     /**
@@ -288,7 +289,7 @@ export class UserService {
             throw new Error('Required parameter password was null or undefined when calling loginUser.');
         }
 
-        let queryParameters = new HttpParams({encoder: new CustomHttpUrlEncodingCodec()});
+        let queryParameters = new HttpParams({encoder: this.encoder});
         if (username !== undefined && username !== null) {
             queryParameters = queryParameters.set('username', <any>username);
         }
diff --git a/samples/client/petstore/typescript-angular-v6-not-provided-in-root/builds/default/configuration.ts b/samples/client/petstore/typescript-angular-v6-not-provided-in-root/builds/default/configuration.ts
index 1132f4adc1..c038bbc947 100644
--- a/samples/client/petstore/typescript-angular-v6-not-provided-in-root/builds/default/configuration.ts
+++ b/samples/client/petstore/typescript-angular-v6-not-provided-in-root/builds/default/configuration.ts
@@ -1,3 +1,5 @@
+import { HttpParameterCodec } from '@angular/common/http';
+
 export interface ConfigurationParameters {
     apiKeys?: {[ key: string ]: string};
     username?: string;
@@ -5,6 +7,7 @@ export interface ConfigurationParameters {
     accessToken?: string | (() => string);
     basePath?: string;
     withCredentials?: boolean;
+    encoder?: HttpParameterCodec;
 }
 
 export class Configuration {
@@ -14,6 +17,7 @@ export class Configuration {
     accessToken?: string | (() => string);
     basePath?: string;
     withCredentials?: boolean;
+    encoder?: HttpParameterCodec;
 
     constructor(configurationParameters: ConfigurationParameters = {}) {
         this.apiKeys = configurationParameters.apiKeys;
@@ -22,6 +26,7 @@ export class Configuration {
         this.accessToken = configurationParameters.accessToken;
         this.basePath = configurationParameters.basePath;
         this.withCredentials = configurationParameters.withCredentials;
+        this.encoder = configurationParameters.encoder;
     }
 
     /**
diff --git a/samples/client/petstore/typescript-angular-v6-not-provided-in-root/builds/default/encoder.ts b/samples/client/petstore/typescript-angular-v6-not-provided-in-root/builds/default/encoder.ts
index f1c6b78c9c..f3e504196f 100644
--- a/samples/client/petstore/typescript-angular-v6-not-provided-in-root/builds/default/encoder.ts
+++ b/samples/client/petstore/typescript-angular-v6-not-provided-in-root/builds/default/encoder.ts
@@ -1,18 +1,21 @@
-    import { HttpUrlEncodingCodec } from '@angular/common/http';
+import { HttpParameterCodec } from '@angular/common/http';
 
 /**
-* CustomHttpUrlEncodingCodec
-* Fix plus sign (+) not encoding, so sent as blank space
-* See: https://github.com/angular/angular/issues/11058#issuecomment-247367318
+* Custom HttpParameterCodec
+* Workaround for https://github.com/angular/angular/issues/18261
 */
-export class CustomHttpUrlEncodingCodec extends HttpUrlEncodingCodec {
+export class CustomHttpParameterCodec implements HttpParameterCodec {
     encodeKey(k: string): string {
-        k = super.encodeKey(k);
-        return k.replace(/\+/gi, '%2B');
+        return encodeURIComponent(k);
     }
     encodeValue(v: string): string {
-        v = super.encodeValue(v);
-        return v.replace(/\+/gi, '%2B');
+        return encodeURIComponent(v);
+    }
+    decodeKey(k: string): string {
+        return decodeURIComponent(k);
+    }
+    decodeValue(v: string): string {
+        return decodeURIComponent(v);
     }
 }
 
diff --git a/samples/client/petstore/typescript-angular-v6-not-provided-in-root/builds/with-npm/api/pet.service.ts b/samples/client/petstore/typescript-angular-v6-not-provided-in-root/builds/with-npm/api/pet.service.ts
index 5f392341a9..d7085113ed 100644
--- a/samples/client/petstore/typescript-angular-v6-not-provided-in-root/builds/with-npm/api/pet.service.ts
+++ b/samples/client/petstore/typescript-angular-v6-not-provided-in-root/builds/with-npm/api/pet.service.ts
@@ -13,9 +13,8 @@
 
 import { Inject, Injectable, Optional }                      from '@angular/core';
 import { HttpClient, HttpHeaders, HttpParams,
-         HttpResponse, HttpEvent }                           from '@angular/common/http';
-import { CustomHttpUrlEncodingCodec }                        from '../encoder';
-
+         HttpResponse, HttpEvent, HttpParameterCodec }       from '@angular/common/http';
+import { CustomHttpParameterCodec }                          from '../encoder';
 import { Observable }                                        from 'rxjs';
 
 import { ApiResponse } from '../model/apiResponse';
@@ -31,6 +30,7 @@ export class PetService {
     protected basePath = 'http://petstore.swagger.io/v2';
     public defaultHeaders = new HttpHeaders();
     public configuration = new Configuration();
+    public encoder: HttpParameterCodec;
 
     constructor(protected httpClient: HttpClient, @Optional()@Inject(BASE_PATH) basePath: string, @Optional() configuration: Configuration) {
 
@@ -41,6 +41,7 @@ export class PetService {
         } else {
             this.configuration.basePath = basePath || this.basePath;
         }
+        this.encoder = this.configuration.encoder || new CustomHttpParameterCodec();
     }
 
     /**
@@ -178,7 +179,7 @@ export class PetService {
             throw new Error('Required parameter status was null or undefined when calling findPetsByStatus.');
         }
 
-        let queryParameters = new HttpParams({encoder: new CustomHttpUrlEncodingCodec()});
+        let queryParameters = new HttpParams({encoder: this.encoder});
         if (status) {
             queryParameters = queryParameters.set('status', status.join(COLLECTION_FORMATS['csv']));
         }
@@ -233,7 +234,7 @@ export class PetService {
             throw new Error('Required parameter tags was null or undefined when calling findPetsByTags.');
         }
 
-        let queryParameters = new HttpParams({encoder: new CustomHttpUrlEncodingCodec()});
+        let queryParameters = new HttpParams({encoder: this.encoder});
         if (tags) {
             queryParameters = queryParameters.set('tags', tags.join(COLLECTION_FORMATS['csv']));
         }
@@ -421,7 +422,7 @@ export class PetService {
         if (useForm) {
             formParams = new FormData();
         } else {
-            formParams = new HttpParams({encoder: new CustomHttpUrlEncodingCodec()});
+            formParams = new HttpParams({encoder: this.encoder});
         }
 
         if (name !== undefined) {
@@ -494,7 +495,7 @@ export class PetService {
         if (useForm) {
             formParams = new FormData();
         } else {
-            formParams = new HttpParams({encoder: new CustomHttpUrlEncodingCodec()});
+            formParams = new HttpParams({encoder: this.encoder});
         }
 
         if (additionalMetadata !== undefined) {
diff --git a/samples/client/petstore/typescript-angular-v6-not-provided-in-root/builds/with-npm/api/store.service.ts b/samples/client/petstore/typescript-angular-v6-not-provided-in-root/builds/with-npm/api/store.service.ts
index 003cb591c1..04d518a149 100644
--- a/samples/client/petstore/typescript-angular-v6-not-provided-in-root/builds/with-npm/api/store.service.ts
+++ b/samples/client/petstore/typescript-angular-v6-not-provided-in-root/builds/with-npm/api/store.service.ts
@@ -13,9 +13,8 @@
 
 import { Inject, Injectable, Optional }                      from '@angular/core';
 import { HttpClient, HttpHeaders, HttpParams,
-         HttpResponse, HttpEvent }                           from '@angular/common/http';
-import { CustomHttpUrlEncodingCodec }                        from '../encoder';
-
+         HttpResponse, HttpEvent, HttpParameterCodec }       from '@angular/common/http';
+import { CustomHttpParameterCodec }                          from '../encoder';
 import { Observable }                                        from 'rxjs';
 
 import { Order } from '../model/order';
@@ -30,6 +29,7 @@ export class StoreService {
     protected basePath = 'http://petstore.swagger.io/v2';
     public defaultHeaders = new HttpHeaders();
     public configuration = new Configuration();
+    public encoder: HttpParameterCodec;
 
     constructor(protected httpClient: HttpClient, @Optional()@Inject(BASE_PATH) basePath: string, @Optional() configuration: Configuration) {
 
@@ -40,6 +40,7 @@ export class StoreService {
         } else {
             this.configuration.basePath = basePath || this.basePath;
         }
+        this.encoder = this.configuration.encoder || new CustomHttpParameterCodec();
     }
 
     /**
diff --git a/samples/client/petstore/typescript-angular-v6-not-provided-in-root/builds/with-npm/api/user.service.ts b/samples/client/petstore/typescript-angular-v6-not-provided-in-root/builds/with-npm/api/user.service.ts
index 302a73c389..446f5c51c2 100644
--- a/samples/client/petstore/typescript-angular-v6-not-provided-in-root/builds/with-npm/api/user.service.ts
+++ b/samples/client/petstore/typescript-angular-v6-not-provided-in-root/builds/with-npm/api/user.service.ts
@@ -13,9 +13,8 @@
 
 import { Inject, Injectable, Optional }                      from '@angular/core';
 import { HttpClient, HttpHeaders, HttpParams,
-         HttpResponse, HttpEvent }                           from '@angular/common/http';
-import { CustomHttpUrlEncodingCodec }                        from '../encoder';
-
+         HttpResponse, HttpEvent, HttpParameterCodec }       from '@angular/common/http';
+import { CustomHttpParameterCodec }                          from '../encoder';
 import { Observable }                                        from 'rxjs';
 
 import { User } from '../model/user';
@@ -30,6 +29,7 @@ export class UserService {
     protected basePath = 'http://petstore.swagger.io/v2';
     public defaultHeaders = new HttpHeaders();
     public configuration = new Configuration();
+    public encoder: HttpParameterCodec;
 
     constructor(protected httpClient: HttpClient, @Optional()@Inject(BASE_PATH) basePath: string, @Optional() configuration: Configuration) {
 
@@ -40,6 +40,7 @@ export class UserService {
         } else {
             this.configuration.basePath = basePath || this.basePath;
         }
+        this.encoder = this.configuration.encoder || new CustomHttpParameterCodec();
     }
 
     /**
@@ -288,7 +289,7 @@ export class UserService {
             throw new Error('Required parameter password was null or undefined when calling loginUser.');
         }
 
-        let queryParameters = new HttpParams({encoder: new CustomHttpUrlEncodingCodec()});
+        let queryParameters = new HttpParams({encoder: this.encoder});
         if (username !== undefined && username !== null) {
             queryParameters = queryParameters.set('username', <any>username);
         }
diff --git a/samples/client/petstore/typescript-angular-v6-not-provided-in-root/builds/with-npm/configuration.ts b/samples/client/petstore/typescript-angular-v6-not-provided-in-root/builds/with-npm/configuration.ts
index 1132f4adc1..c038bbc947 100644
--- a/samples/client/petstore/typescript-angular-v6-not-provided-in-root/builds/with-npm/configuration.ts
+++ b/samples/client/petstore/typescript-angular-v6-not-provided-in-root/builds/with-npm/configuration.ts
@@ -1,3 +1,5 @@
+import { HttpParameterCodec } from '@angular/common/http';
+
 export interface ConfigurationParameters {
     apiKeys?: {[ key: string ]: string};
     username?: string;
@@ -5,6 +7,7 @@ export interface ConfigurationParameters {
     accessToken?: string | (() => string);
     basePath?: string;
     withCredentials?: boolean;
+    encoder?: HttpParameterCodec;
 }
 
 export class Configuration {
@@ -14,6 +17,7 @@ export class Configuration {
     accessToken?: string | (() => string);
     basePath?: string;
     withCredentials?: boolean;
+    encoder?: HttpParameterCodec;
 
     constructor(configurationParameters: ConfigurationParameters = {}) {
         this.apiKeys = configurationParameters.apiKeys;
@@ -22,6 +26,7 @@ export class Configuration {
         this.accessToken = configurationParameters.accessToken;
         this.basePath = configurationParameters.basePath;
         this.withCredentials = configurationParameters.withCredentials;
+        this.encoder = configurationParameters.encoder;
     }
 
     /**
diff --git a/samples/client/petstore/typescript-angular-v6-not-provided-in-root/builds/with-npm/encoder.ts b/samples/client/petstore/typescript-angular-v6-not-provided-in-root/builds/with-npm/encoder.ts
index f1c6b78c9c..f3e504196f 100644
--- a/samples/client/petstore/typescript-angular-v6-not-provided-in-root/builds/with-npm/encoder.ts
+++ b/samples/client/petstore/typescript-angular-v6-not-provided-in-root/builds/with-npm/encoder.ts
@@ -1,18 +1,21 @@
-    import { HttpUrlEncodingCodec } from '@angular/common/http';
+import { HttpParameterCodec } from '@angular/common/http';
 
 /**
-* CustomHttpUrlEncodingCodec
-* Fix plus sign (+) not encoding, so sent as blank space
-* See: https://github.com/angular/angular/issues/11058#issuecomment-247367318
+* Custom HttpParameterCodec
+* Workaround for https://github.com/angular/angular/issues/18261
 */
-export class CustomHttpUrlEncodingCodec extends HttpUrlEncodingCodec {
+export class CustomHttpParameterCodec implements HttpParameterCodec {
     encodeKey(k: string): string {
-        k = super.encodeKey(k);
-        return k.replace(/\+/gi, '%2B');
+        return encodeURIComponent(k);
     }
     encodeValue(v: string): string {
-        v = super.encodeValue(v);
-        return v.replace(/\+/gi, '%2B');
+        return encodeURIComponent(v);
+    }
+    decodeKey(k: string): string {
+        return decodeURIComponent(k);
+    }
+    decodeValue(v: string): string {
+        return decodeURIComponent(v);
     }
 }
 
diff --git a/samples/client/petstore/typescript-angular-v6-provided-in-root/builds/default/api/pet.service.ts b/samples/client/petstore/typescript-angular-v6-provided-in-root/builds/default/api/pet.service.ts
index b10ba96444..de386b6ee4 100644
--- a/samples/client/petstore/typescript-angular-v6-provided-in-root/builds/default/api/pet.service.ts
+++ b/samples/client/petstore/typescript-angular-v6-provided-in-root/builds/default/api/pet.service.ts
@@ -13,9 +13,8 @@
 
 import { Inject, Injectable, Optional }                      from '@angular/core';
 import { HttpClient, HttpHeaders, HttpParams,
-         HttpResponse, HttpEvent }                           from '@angular/common/http';
-import { CustomHttpUrlEncodingCodec }                        from '../encoder';
-
+         HttpResponse, HttpEvent, HttpParameterCodec }       from '@angular/common/http';
+import { CustomHttpParameterCodec }                          from '../encoder';
 import { Observable }                                        from 'rxjs';
 
 import { ApiResponse } from '../model/apiResponse';
@@ -33,6 +32,7 @@ export class PetService {
     protected basePath = 'http://petstore.swagger.io/v2';
     public defaultHeaders = new HttpHeaders();
     public configuration = new Configuration();
+    public encoder: HttpParameterCodec;
 
     constructor(protected httpClient: HttpClient, @Optional()@Inject(BASE_PATH) basePath: string, @Optional() configuration: Configuration) {
 
@@ -43,6 +43,7 @@ export class PetService {
         } else {
             this.configuration.basePath = basePath || this.basePath;
         }
+        this.encoder = this.configuration.encoder || new CustomHttpParameterCodec();
     }
 
     /**
@@ -180,7 +181,7 @@ export class PetService {
             throw new Error('Required parameter status was null or undefined when calling findPetsByStatus.');
         }
 
-        let queryParameters = new HttpParams({encoder: new CustomHttpUrlEncodingCodec()});
+        let queryParameters = new HttpParams({encoder: this.encoder});
         if (status) {
             queryParameters = queryParameters.set('status', status.join(COLLECTION_FORMATS['csv']));
         }
@@ -235,7 +236,7 @@ export class PetService {
             throw new Error('Required parameter tags was null or undefined when calling findPetsByTags.');
         }
 
-        let queryParameters = new HttpParams({encoder: new CustomHttpUrlEncodingCodec()});
+        let queryParameters = new HttpParams({encoder: this.encoder});
         if (tags) {
             queryParameters = queryParameters.set('tags', tags.join(COLLECTION_FORMATS['csv']));
         }
@@ -423,7 +424,7 @@ export class PetService {
         if (useForm) {
             formParams = new FormData();
         } else {
-            formParams = new HttpParams({encoder: new CustomHttpUrlEncodingCodec()});
+            formParams = new HttpParams({encoder: this.encoder});
         }
 
         if (name !== undefined) {
@@ -496,7 +497,7 @@ export class PetService {
         if (useForm) {
             formParams = new FormData();
         } else {
-            formParams = new HttpParams({encoder: new CustomHttpUrlEncodingCodec()});
+            formParams = new HttpParams({encoder: this.encoder});
         }
 
         if (additionalMetadata !== undefined) {
diff --git a/samples/client/petstore/typescript-angular-v6-provided-in-root/builds/default/api/store.service.ts b/samples/client/petstore/typescript-angular-v6-provided-in-root/builds/default/api/store.service.ts
index f8dda35287..2fa5e819b0 100644
--- a/samples/client/petstore/typescript-angular-v6-provided-in-root/builds/default/api/store.service.ts
+++ b/samples/client/petstore/typescript-angular-v6-provided-in-root/builds/default/api/store.service.ts
@@ -13,9 +13,8 @@
 
 import { Inject, Injectable, Optional }                      from '@angular/core';
 import { HttpClient, HttpHeaders, HttpParams,
-         HttpResponse, HttpEvent }                           from '@angular/common/http';
-import { CustomHttpUrlEncodingCodec }                        from '../encoder';
-
+         HttpResponse, HttpEvent, HttpParameterCodec }       from '@angular/common/http';
+import { CustomHttpParameterCodec }                          from '../encoder';
 import { Observable }                                        from 'rxjs';
 
 import { Order } from '../model/order';
@@ -32,6 +31,7 @@ export class StoreService {
     protected basePath = 'http://petstore.swagger.io/v2';
     public defaultHeaders = new HttpHeaders();
     public configuration = new Configuration();
+    public encoder: HttpParameterCodec;
 
     constructor(protected httpClient: HttpClient, @Optional()@Inject(BASE_PATH) basePath: string, @Optional() configuration: Configuration) {
 
@@ -42,6 +42,7 @@ export class StoreService {
         } else {
             this.configuration.basePath = basePath || this.basePath;
         }
+        this.encoder = this.configuration.encoder || new CustomHttpParameterCodec();
     }
 
     /**
diff --git a/samples/client/petstore/typescript-angular-v6-provided-in-root/builds/default/api/user.service.ts b/samples/client/petstore/typescript-angular-v6-provided-in-root/builds/default/api/user.service.ts
index 29c60328bd..c86088f8a6 100644
--- a/samples/client/petstore/typescript-angular-v6-provided-in-root/builds/default/api/user.service.ts
+++ b/samples/client/petstore/typescript-angular-v6-provided-in-root/builds/default/api/user.service.ts
@@ -13,9 +13,8 @@
 
 import { Inject, Injectable, Optional }                      from '@angular/core';
 import { HttpClient, HttpHeaders, HttpParams,
-         HttpResponse, HttpEvent }                           from '@angular/common/http';
-import { CustomHttpUrlEncodingCodec }                        from '../encoder';
-
+         HttpResponse, HttpEvent, HttpParameterCodec }       from '@angular/common/http';
+import { CustomHttpParameterCodec }                          from '../encoder';
 import { Observable }                                        from 'rxjs';
 
 import { User } from '../model/user';
@@ -32,6 +31,7 @@ export class UserService {
     protected basePath = 'http://petstore.swagger.io/v2';
     public defaultHeaders = new HttpHeaders();
     public configuration = new Configuration();
+    public encoder: HttpParameterCodec;
 
     constructor(protected httpClient: HttpClient, @Optional()@Inject(BASE_PATH) basePath: string, @Optional() configuration: Configuration) {
 
@@ -42,6 +42,7 @@ export class UserService {
         } else {
             this.configuration.basePath = basePath || this.basePath;
         }
+        this.encoder = this.configuration.encoder || new CustomHttpParameterCodec();
     }
 
     /**
@@ -290,7 +291,7 @@ export class UserService {
             throw new Error('Required parameter password was null or undefined when calling loginUser.');
         }
 
-        let queryParameters = new HttpParams({encoder: new CustomHttpUrlEncodingCodec()});
+        let queryParameters = new HttpParams({encoder: this.encoder});
         if (username !== undefined && username !== null) {
             queryParameters = queryParameters.set('username', <any>username);
         }
diff --git a/samples/client/petstore/typescript-angular-v6-provided-in-root/builds/default/configuration.ts b/samples/client/petstore/typescript-angular-v6-provided-in-root/builds/default/configuration.ts
index 1132f4adc1..c038bbc947 100644
--- a/samples/client/petstore/typescript-angular-v6-provided-in-root/builds/default/configuration.ts
+++ b/samples/client/petstore/typescript-angular-v6-provided-in-root/builds/default/configuration.ts
@@ -1,3 +1,5 @@
+import { HttpParameterCodec } from '@angular/common/http';
+
 export interface ConfigurationParameters {
     apiKeys?: {[ key: string ]: string};
     username?: string;
@@ -5,6 +7,7 @@ export interface ConfigurationParameters {
     accessToken?: string | (() => string);
     basePath?: string;
     withCredentials?: boolean;
+    encoder?: HttpParameterCodec;
 }
 
 export class Configuration {
@@ -14,6 +17,7 @@ export class Configuration {
     accessToken?: string | (() => string);
     basePath?: string;
     withCredentials?: boolean;
+    encoder?: HttpParameterCodec;
 
     constructor(configurationParameters: ConfigurationParameters = {}) {
         this.apiKeys = configurationParameters.apiKeys;
@@ -22,6 +26,7 @@ export class Configuration {
         this.accessToken = configurationParameters.accessToken;
         this.basePath = configurationParameters.basePath;
         this.withCredentials = configurationParameters.withCredentials;
+        this.encoder = configurationParameters.encoder;
     }
 
     /**
diff --git a/samples/client/petstore/typescript-angular-v6-provided-in-root/builds/default/encoder.ts b/samples/client/petstore/typescript-angular-v6-provided-in-root/builds/default/encoder.ts
index f1c6b78c9c..f3e504196f 100644
--- a/samples/client/petstore/typescript-angular-v6-provided-in-root/builds/default/encoder.ts
+++ b/samples/client/petstore/typescript-angular-v6-provided-in-root/builds/default/encoder.ts
@@ -1,18 +1,21 @@
-    import { HttpUrlEncodingCodec } from '@angular/common/http';
+import { HttpParameterCodec } from '@angular/common/http';
 
 /**
-* CustomHttpUrlEncodingCodec
-* Fix plus sign (+) not encoding, so sent as blank space
-* See: https://github.com/angular/angular/issues/11058#issuecomment-247367318
+* Custom HttpParameterCodec
+* Workaround for https://github.com/angular/angular/issues/18261
 */
-export class CustomHttpUrlEncodingCodec extends HttpUrlEncodingCodec {
+export class CustomHttpParameterCodec implements HttpParameterCodec {
     encodeKey(k: string): string {
-        k = super.encodeKey(k);
-        return k.replace(/\+/gi, '%2B');
+        return encodeURIComponent(k);
     }
     encodeValue(v: string): string {
-        v = super.encodeValue(v);
-        return v.replace(/\+/gi, '%2B');
+        return encodeURIComponent(v);
+    }
+    decodeKey(k: string): string {
+        return decodeURIComponent(k);
+    }
+    decodeValue(v: string): string {
+        return decodeURIComponent(v);
     }
 }
 
diff --git a/samples/client/petstore/typescript-angular-v6-provided-in-root/builds/with-npm/api/pet.service.ts b/samples/client/petstore/typescript-angular-v6-provided-in-root/builds/with-npm/api/pet.service.ts
index b10ba96444..de386b6ee4 100644
--- a/samples/client/petstore/typescript-angular-v6-provided-in-root/builds/with-npm/api/pet.service.ts
+++ b/samples/client/petstore/typescript-angular-v6-provided-in-root/builds/with-npm/api/pet.service.ts
@@ -13,9 +13,8 @@
 
 import { Inject, Injectable, Optional }                      from '@angular/core';
 import { HttpClient, HttpHeaders, HttpParams,
-         HttpResponse, HttpEvent }                           from '@angular/common/http';
-import { CustomHttpUrlEncodingCodec }                        from '../encoder';
-
+         HttpResponse, HttpEvent, HttpParameterCodec }       from '@angular/common/http';
+import { CustomHttpParameterCodec }                          from '../encoder';
 import { Observable }                                        from 'rxjs';
 
 import { ApiResponse } from '../model/apiResponse';
@@ -33,6 +32,7 @@ export class PetService {
     protected basePath = 'http://petstore.swagger.io/v2';
     public defaultHeaders = new HttpHeaders();
     public configuration = new Configuration();
+    public encoder: HttpParameterCodec;
 
     constructor(protected httpClient: HttpClient, @Optional()@Inject(BASE_PATH) basePath: string, @Optional() configuration: Configuration) {
 
@@ -43,6 +43,7 @@ export class PetService {
         } else {
             this.configuration.basePath = basePath || this.basePath;
         }
+        this.encoder = this.configuration.encoder || new CustomHttpParameterCodec();
     }
 
     /**
@@ -180,7 +181,7 @@ export class PetService {
             throw new Error('Required parameter status was null or undefined when calling findPetsByStatus.');
         }
 
-        let queryParameters = new HttpParams({encoder: new CustomHttpUrlEncodingCodec()});
+        let queryParameters = new HttpParams({encoder: this.encoder});
         if (status) {
             queryParameters = queryParameters.set('status', status.join(COLLECTION_FORMATS['csv']));
         }
@@ -235,7 +236,7 @@ export class PetService {
             throw new Error('Required parameter tags was null or undefined when calling findPetsByTags.');
         }
 
-        let queryParameters = new HttpParams({encoder: new CustomHttpUrlEncodingCodec()});
+        let queryParameters = new HttpParams({encoder: this.encoder});
         if (tags) {
             queryParameters = queryParameters.set('tags', tags.join(COLLECTION_FORMATS['csv']));
         }
@@ -423,7 +424,7 @@ export class PetService {
         if (useForm) {
             formParams = new FormData();
         } else {
-            formParams = new HttpParams({encoder: new CustomHttpUrlEncodingCodec()});
+            formParams = new HttpParams({encoder: this.encoder});
         }
 
         if (name !== undefined) {
@@ -496,7 +497,7 @@ export class PetService {
         if (useForm) {
             formParams = new FormData();
         } else {
-            formParams = new HttpParams({encoder: new CustomHttpUrlEncodingCodec()});
+            formParams = new HttpParams({encoder: this.encoder});
         }
 
         if (additionalMetadata !== undefined) {
diff --git a/samples/client/petstore/typescript-angular-v6-provided-in-root/builds/with-npm/api/store.service.ts b/samples/client/petstore/typescript-angular-v6-provided-in-root/builds/with-npm/api/store.service.ts
index f8dda35287..2fa5e819b0 100644
--- a/samples/client/petstore/typescript-angular-v6-provided-in-root/builds/with-npm/api/store.service.ts
+++ b/samples/client/petstore/typescript-angular-v6-provided-in-root/builds/with-npm/api/store.service.ts
@@ -13,9 +13,8 @@
 
 import { Inject, Injectable, Optional }                      from '@angular/core';
 import { HttpClient, HttpHeaders, HttpParams,
-         HttpResponse, HttpEvent }                           from '@angular/common/http';
-import { CustomHttpUrlEncodingCodec }                        from '../encoder';
-
+         HttpResponse, HttpEvent, HttpParameterCodec }       from '@angular/common/http';
+import { CustomHttpParameterCodec }                          from '../encoder';
 import { Observable }                                        from 'rxjs';
 
 import { Order } from '../model/order';
@@ -32,6 +31,7 @@ export class StoreService {
     protected basePath = 'http://petstore.swagger.io/v2';
     public defaultHeaders = new HttpHeaders();
     public configuration = new Configuration();
+    public encoder: HttpParameterCodec;
 
     constructor(protected httpClient: HttpClient, @Optional()@Inject(BASE_PATH) basePath: string, @Optional() configuration: Configuration) {
 
@@ -42,6 +42,7 @@ export class StoreService {
         } else {
             this.configuration.basePath = basePath || this.basePath;
         }
+        this.encoder = this.configuration.encoder || new CustomHttpParameterCodec();
     }
 
     /**
diff --git a/samples/client/petstore/typescript-angular-v6-provided-in-root/builds/with-npm/api/user.service.ts b/samples/client/petstore/typescript-angular-v6-provided-in-root/builds/with-npm/api/user.service.ts
index 29c60328bd..c86088f8a6 100644
--- a/samples/client/petstore/typescript-angular-v6-provided-in-root/builds/with-npm/api/user.service.ts
+++ b/samples/client/petstore/typescript-angular-v6-provided-in-root/builds/with-npm/api/user.service.ts
@@ -13,9 +13,8 @@
 
 import { Inject, Injectable, Optional }                      from '@angular/core';
 import { HttpClient, HttpHeaders, HttpParams,
-         HttpResponse, HttpEvent }                           from '@angular/common/http';
-import { CustomHttpUrlEncodingCodec }                        from '../encoder';
-
+         HttpResponse, HttpEvent, HttpParameterCodec }       from '@angular/common/http';
+import { CustomHttpParameterCodec }                          from '../encoder';
 import { Observable }                                        from 'rxjs';
 
 import { User } from '../model/user';
@@ -32,6 +31,7 @@ export class UserService {
     protected basePath = 'http://petstore.swagger.io/v2';
     public defaultHeaders = new HttpHeaders();
     public configuration = new Configuration();
+    public encoder: HttpParameterCodec;
 
     constructor(protected httpClient: HttpClient, @Optional()@Inject(BASE_PATH) basePath: string, @Optional() configuration: Configuration) {
 
@@ -42,6 +42,7 @@ export class UserService {
         } else {
             this.configuration.basePath = basePath || this.basePath;
         }
+        this.encoder = this.configuration.encoder || new CustomHttpParameterCodec();
     }
 
     /**
@@ -290,7 +291,7 @@ export class UserService {
             throw new Error('Required parameter password was null or undefined when calling loginUser.');
         }
 
-        let queryParameters = new HttpParams({encoder: new CustomHttpUrlEncodingCodec()});
+        let queryParameters = new HttpParams({encoder: this.encoder});
         if (username !== undefined && username !== null) {
             queryParameters = queryParameters.set('username', <any>username);
         }
diff --git a/samples/client/petstore/typescript-angular-v6-provided-in-root/builds/with-npm/configuration.ts b/samples/client/petstore/typescript-angular-v6-provided-in-root/builds/with-npm/configuration.ts
index 1132f4adc1..c038bbc947 100644
--- a/samples/client/petstore/typescript-angular-v6-provided-in-root/builds/with-npm/configuration.ts
+++ b/samples/client/petstore/typescript-angular-v6-provided-in-root/builds/with-npm/configuration.ts
@@ -1,3 +1,5 @@
+import { HttpParameterCodec } from '@angular/common/http';
+
 export interface ConfigurationParameters {
     apiKeys?: {[ key: string ]: string};
     username?: string;
@@ -5,6 +7,7 @@ export interface ConfigurationParameters {
     accessToken?: string | (() => string);
     basePath?: string;
     withCredentials?: boolean;
+    encoder?: HttpParameterCodec;
 }
 
 export class Configuration {
@@ -14,6 +17,7 @@ export class Configuration {
     accessToken?: string | (() => string);
     basePath?: string;
     withCredentials?: boolean;
+    encoder?: HttpParameterCodec;
 
     constructor(configurationParameters: ConfigurationParameters = {}) {
         this.apiKeys = configurationParameters.apiKeys;
@@ -22,6 +26,7 @@ export class Configuration {
         this.accessToken = configurationParameters.accessToken;
         this.basePath = configurationParameters.basePath;
         this.withCredentials = configurationParameters.withCredentials;
+        this.encoder = configurationParameters.encoder;
     }
 
     /**
diff --git a/samples/client/petstore/typescript-angular-v6-provided-in-root/builds/with-npm/encoder.ts b/samples/client/petstore/typescript-angular-v6-provided-in-root/builds/with-npm/encoder.ts
index f1c6b78c9c..f3e504196f 100644
--- a/samples/client/petstore/typescript-angular-v6-provided-in-root/builds/with-npm/encoder.ts
+++ b/samples/client/petstore/typescript-angular-v6-provided-in-root/builds/with-npm/encoder.ts
@@ -1,18 +1,21 @@
-    import { HttpUrlEncodingCodec } from '@angular/common/http';
+import { HttpParameterCodec } from '@angular/common/http';
 
 /**
-* CustomHttpUrlEncodingCodec
-* Fix plus sign (+) not encoding, so sent as blank space
-* See: https://github.com/angular/angular/issues/11058#issuecomment-247367318
+* Custom HttpParameterCodec
+* Workaround for https://github.com/angular/angular/issues/18261
 */
-export class CustomHttpUrlEncodingCodec extends HttpUrlEncodingCodec {
+export class CustomHttpParameterCodec implements HttpParameterCodec {
     encodeKey(k: string): string {
-        k = super.encodeKey(k);
-        return k.replace(/\+/gi, '%2B');
+        return encodeURIComponent(k);
     }
     encodeValue(v: string): string {
-        v = super.encodeValue(v);
-        return v.replace(/\+/gi, '%2B');
+        return encodeURIComponent(v);
+    }
+    decodeKey(k: string): string {
+        return decodeURIComponent(k);
+    }
+    decodeValue(v: string): string {
+        return decodeURIComponent(v);
     }
 }
 
diff --git a/samples/client/petstore/typescript-angular-v7-not-provided-in-root/builds/default/api/pet.service.ts b/samples/client/petstore/typescript-angular-v7-not-provided-in-root/builds/default/api/pet.service.ts
index 5f392341a9..d7085113ed 100644
--- a/samples/client/petstore/typescript-angular-v7-not-provided-in-root/builds/default/api/pet.service.ts
+++ b/samples/client/petstore/typescript-angular-v7-not-provided-in-root/builds/default/api/pet.service.ts
@@ -13,9 +13,8 @@
 
 import { Inject, Injectable, Optional }                      from '@angular/core';
 import { HttpClient, HttpHeaders, HttpParams,
-         HttpResponse, HttpEvent }                           from '@angular/common/http';
-import { CustomHttpUrlEncodingCodec }                        from '../encoder';
-
+         HttpResponse, HttpEvent, HttpParameterCodec }       from '@angular/common/http';
+import { CustomHttpParameterCodec }                          from '../encoder';
 import { Observable }                                        from 'rxjs';
 
 import { ApiResponse } from '../model/apiResponse';
@@ -31,6 +30,7 @@ export class PetService {
     protected basePath = 'http://petstore.swagger.io/v2';
     public defaultHeaders = new HttpHeaders();
     public configuration = new Configuration();
+    public encoder: HttpParameterCodec;
 
     constructor(protected httpClient: HttpClient, @Optional()@Inject(BASE_PATH) basePath: string, @Optional() configuration: Configuration) {
 
@@ -41,6 +41,7 @@ export class PetService {
         } else {
             this.configuration.basePath = basePath || this.basePath;
         }
+        this.encoder = this.configuration.encoder || new CustomHttpParameterCodec();
     }
 
     /**
@@ -178,7 +179,7 @@ export class PetService {
             throw new Error('Required parameter status was null or undefined when calling findPetsByStatus.');
         }
 
-        let queryParameters = new HttpParams({encoder: new CustomHttpUrlEncodingCodec()});
+        let queryParameters = new HttpParams({encoder: this.encoder});
         if (status) {
             queryParameters = queryParameters.set('status', status.join(COLLECTION_FORMATS['csv']));
         }
@@ -233,7 +234,7 @@ export class PetService {
             throw new Error('Required parameter tags was null or undefined when calling findPetsByTags.');
         }
 
-        let queryParameters = new HttpParams({encoder: new CustomHttpUrlEncodingCodec()});
+        let queryParameters = new HttpParams({encoder: this.encoder});
         if (tags) {
             queryParameters = queryParameters.set('tags', tags.join(COLLECTION_FORMATS['csv']));
         }
@@ -421,7 +422,7 @@ export class PetService {
         if (useForm) {
             formParams = new FormData();
         } else {
-            formParams = new HttpParams({encoder: new CustomHttpUrlEncodingCodec()});
+            formParams = new HttpParams({encoder: this.encoder});
         }
 
         if (name !== undefined) {
@@ -494,7 +495,7 @@ export class PetService {
         if (useForm) {
             formParams = new FormData();
         } else {
-            formParams = new HttpParams({encoder: new CustomHttpUrlEncodingCodec()});
+            formParams = new HttpParams({encoder: this.encoder});
         }
 
         if (additionalMetadata !== undefined) {
diff --git a/samples/client/petstore/typescript-angular-v7-not-provided-in-root/builds/default/api/store.service.ts b/samples/client/petstore/typescript-angular-v7-not-provided-in-root/builds/default/api/store.service.ts
index 003cb591c1..04d518a149 100644
--- a/samples/client/petstore/typescript-angular-v7-not-provided-in-root/builds/default/api/store.service.ts
+++ b/samples/client/petstore/typescript-angular-v7-not-provided-in-root/builds/default/api/store.service.ts
@@ -13,9 +13,8 @@
 
 import { Inject, Injectable, Optional }                      from '@angular/core';
 import { HttpClient, HttpHeaders, HttpParams,
-         HttpResponse, HttpEvent }                           from '@angular/common/http';
-import { CustomHttpUrlEncodingCodec }                        from '../encoder';
-
+         HttpResponse, HttpEvent, HttpParameterCodec }       from '@angular/common/http';
+import { CustomHttpParameterCodec }                          from '../encoder';
 import { Observable }                                        from 'rxjs';
 
 import { Order } from '../model/order';
@@ -30,6 +29,7 @@ export class StoreService {
     protected basePath = 'http://petstore.swagger.io/v2';
     public defaultHeaders = new HttpHeaders();
     public configuration = new Configuration();
+    public encoder: HttpParameterCodec;
 
     constructor(protected httpClient: HttpClient, @Optional()@Inject(BASE_PATH) basePath: string, @Optional() configuration: Configuration) {
 
@@ -40,6 +40,7 @@ export class StoreService {
         } else {
             this.configuration.basePath = basePath || this.basePath;
         }
+        this.encoder = this.configuration.encoder || new CustomHttpParameterCodec();
     }
 
     /**
diff --git a/samples/client/petstore/typescript-angular-v7-not-provided-in-root/builds/default/api/user.service.ts b/samples/client/petstore/typescript-angular-v7-not-provided-in-root/builds/default/api/user.service.ts
index 302a73c389..446f5c51c2 100644
--- a/samples/client/petstore/typescript-angular-v7-not-provided-in-root/builds/default/api/user.service.ts
+++ b/samples/client/petstore/typescript-angular-v7-not-provided-in-root/builds/default/api/user.service.ts
@@ -13,9 +13,8 @@
 
 import { Inject, Injectable, Optional }                      from '@angular/core';
 import { HttpClient, HttpHeaders, HttpParams,
-         HttpResponse, HttpEvent }                           from '@angular/common/http';
-import { CustomHttpUrlEncodingCodec }                        from '../encoder';
-
+         HttpResponse, HttpEvent, HttpParameterCodec }       from '@angular/common/http';
+import { CustomHttpParameterCodec }                          from '../encoder';
 import { Observable }                                        from 'rxjs';
 
 import { User } from '../model/user';
@@ -30,6 +29,7 @@ export class UserService {
     protected basePath = 'http://petstore.swagger.io/v2';
     public defaultHeaders = new HttpHeaders();
     public configuration = new Configuration();
+    public encoder: HttpParameterCodec;
 
     constructor(protected httpClient: HttpClient, @Optional()@Inject(BASE_PATH) basePath: string, @Optional() configuration: Configuration) {
 
@@ -40,6 +40,7 @@ export class UserService {
         } else {
             this.configuration.basePath = basePath || this.basePath;
         }
+        this.encoder = this.configuration.encoder || new CustomHttpParameterCodec();
     }
 
     /**
@@ -288,7 +289,7 @@ export class UserService {
             throw new Error('Required parameter password was null or undefined when calling loginUser.');
         }
 
-        let queryParameters = new HttpParams({encoder: new CustomHttpUrlEncodingCodec()});
+        let queryParameters = new HttpParams({encoder: this.encoder});
         if (username !== undefined && username !== null) {
             queryParameters = queryParameters.set('username', <any>username);
         }
diff --git a/samples/client/petstore/typescript-angular-v7-not-provided-in-root/builds/default/configuration.ts b/samples/client/petstore/typescript-angular-v7-not-provided-in-root/builds/default/configuration.ts
index 1132f4adc1..c038bbc947 100644
--- a/samples/client/petstore/typescript-angular-v7-not-provided-in-root/builds/default/configuration.ts
+++ b/samples/client/petstore/typescript-angular-v7-not-provided-in-root/builds/default/configuration.ts
@@ -1,3 +1,5 @@
+import { HttpParameterCodec } from '@angular/common/http';
+
 export interface ConfigurationParameters {
     apiKeys?: {[ key: string ]: string};
     username?: string;
@@ -5,6 +7,7 @@ export interface ConfigurationParameters {
     accessToken?: string | (() => string);
     basePath?: string;
     withCredentials?: boolean;
+    encoder?: HttpParameterCodec;
 }
 
 export class Configuration {
@@ -14,6 +17,7 @@ export class Configuration {
     accessToken?: string | (() => string);
     basePath?: string;
     withCredentials?: boolean;
+    encoder?: HttpParameterCodec;
 
     constructor(configurationParameters: ConfigurationParameters = {}) {
         this.apiKeys = configurationParameters.apiKeys;
@@ -22,6 +26,7 @@ export class Configuration {
         this.accessToken = configurationParameters.accessToken;
         this.basePath = configurationParameters.basePath;
         this.withCredentials = configurationParameters.withCredentials;
+        this.encoder = configurationParameters.encoder;
     }
 
     /**
diff --git a/samples/client/petstore/typescript-angular-v7-not-provided-in-root/builds/default/encoder.ts b/samples/client/petstore/typescript-angular-v7-not-provided-in-root/builds/default/encoder.ts
index f1c6b78c9c..f3e504196f 100644
--- a/samples/client/petstore/typescript-angular-v7-not-provided-in-root/builds/default/encoder.ts
+++ b/samples/client/petstore/typescript-angular-v7-not-provided-in-root/builds/default/encoder.ts
@@ -1,18 +1,21 @@
-    import { HttpUrlEncodingCodec } from '@angular/common/http';
+import { HttpParameterCodec } from '@angular/common/http';
 
 /**
-* CustomHttpUrlEncodingCodec
-* Fix plus sign (+) not encoding, so sent as blank space
-* See: https://github.com/angular/angular/issues/11058#issuecomment-247367318
+* Custom HttpParameterCodec
+* Workaround for https://github.com/angular/angular/issues/18261
 */
-export class CustomHttpUrlEncodingCodec extends HttpUrlEncodingCodec {
+export class CustomHttpParameterCodec implements HttpParameterCodec {
     encodeKey(k: string): string {
-        k = super.encodeKey(k);
-        return k.replace(/\+/gi, '%2B');
+        return encodeURIComponent(k);
     }
     encodeValue(v: string): string {
-        v = super.encodeValue(v);
-        return v.replace(/\+/gi, '%2B');
+        return encodeURIComponent(v);
+    }
+    decodeKey(k: string): string {
+        return decodeURIComponent(k);
+    }
+    decodeValue(v: string): string {
+        return decodeURIComponent(v);
     }
 }
 
diff --git a/samples/client/petstore/typescript-angular-v7-not-provided-in-root/builds/with-npm/api/pet.service.ts b/samples/client/petstore/typescript-angular-v7-not-provided-in-root/builds/with-npm/api/pet.service.ts
index 5f392341a9..d7085113ed 100644
--- a/samples/client/petstore/typescript-angular-v7-not-provided-in-root/builds/with-npm/api/pet.service.ts
+++ b/samples/client/petstore/typescript-angular-v7-not-provided-in-root/builds/with-npm/api/pet.service.ts
@@ -13,9 +13,8 @@
 
 import { Inject, Injectable, Optional }                      from '@angular/core';
 import { HttpClient, HttpHeaders, HttpParams,
-         HttpResponse, HttpEvent }                           from '@angular/common/http';
-import { CustomHttpUrlEncodingCodec }                        from '../encoder';
-
+         HttpResponse, HttpEvent, HttpParameterCodec }       from '@angular/common/http';
+import { CustomHttpParameterCodec }                          from '../encoder';
 import { Observable }                                        from 'rxjs';
 
 import { ApiResponse } from '../model/apiResponse';
@@ -31,6 +30,7 @@ export class PetService {
     protected basePath = 'http://petstore.swagger.io/v2';
     public defaultHeaders = new HttpHeaders();
     public configuration = new Configuration();
+    public encoder: HttpParameterCodec;
 
     constructor(protected httpClient: HttpClient, @Optional()@Inject(BASE_PATH) basePath: string, @Optional() configuration: Configuration) {
 
@@ -41,6 +41,7 @@ export class PetService {
         } else {
             this.configuration.basePath = basePath || this.basePath;
         }
+        this.encoder = this.configuration.encoder || new CustomHttpParameterCodec();
     }
 
     /**
@@ -178,7 +179,7 @@ export class PetService {
             throw new Error('Required parameter status was null or undefined when calling findPetsByStatus.');
         }
 
-        let queryParameters = new HttpParams({encoder: new CustomHttpUrlEncodingCodec()});
+        let queryParameters = new HttpParams({encoder: this.encoder});
         if (status) {
             queryParameters = queryParameters.set('status', status.join(COLLECTION_FORMATS['csv']));
         }
@@ -233,7 +234,7 @@ export class PetService {
             throw new Error('Required parameter tags was null or undefined when calling findPetsByTags.');
         }
 
-        let queryParameters = new HttpParams({encoder: new CustomHttpUrlEncodingCodec()});
+        let queryParameters = new HttpParams({encoder: this.encoder});
         if (tags) {
             queryParameters = queryParameters.set('tags', tags.join(COLLECTION_FORMATS['csv']));
         }
@@ -421,7 +422,7 @@ export class PetService {
         if (useForm) {
             formParams = new FormData();
         } else {
-            formParams = new HttpParams({encoder: new CustomHttpUrlEncodingCodec()});
+            formParams = new HttpParams({encoder: this.encoder});
         }
 
         if (name !== undefined) {
@@ -494,7 +495,7 @@ export class PetService {
         if (useForm) {
             formParams = new FormData();
         } else {
-            formParams = new HttpParams({encoder: new CustomHttpUrlEncodingCodec()});
+            formParams = new HttpParams({encoder: this.encoder});
         }
 
         if (additionalMetadata !== undefined) {
diff --git a/samples/client/petstore/typescript-angular-v7-not-provided-in-root/builds/with-npm/api/store.service.ts b/samples/client/petstore/typescript-angular-v7-not-provided-in-root/builds/with-npm/api/store.service.ts
index 003cb591c1..04d518a149 100644
--- a/samples/client/petstore/typescript-angular-v7-not-provided-in-root/builds/with-npm/api/store.service.ts
+++ b/samples/client/petstore/typescript-angular-v7-not-provided-in-root/builds/with-npm/api/store.service.ts
@@ -13,9 +13,8 @@
 
 import { Inject, Injectable, Optional }                      from '@angular/core';
 import { HttpClient, HttpHeaders, HttpParams,
-         HttpResponse, HttpEvent }                           from '@angular/common/http';
-import { CustomHttpUrlEncodingCodec }                        from '../encoder';
-
+         HttpResponse, HttpEvent, HttpParameterCodec }       from '@angular/common/http';
+import { CustomHttpParameterCodec }                          from '../encoder';
 import { Observable }                                        from 'rxjs';
 
 import { Order } from '../model/order';
@@ -30,6 +29,7 @@ export class StoreService {
     protected basePath = 'http://petstore.swagger.io/v2';
     public defaultHeaders = new HttpHeaders();
     public configuration = new Configuration();
+    public encoder: HttpParameterCodec;
 
     constructor(protected httpClient: HttpClient, @Optional()@Inject(BASE_PATH) basePath: string, @Optional() configuration: Configuration) {
 
@@ -40,6 +40,7 @@ export class StoreService {
         } else {
             this.configuration.basePath = basePath || this.basePath;
         }
+        this.encoder = this.configuration.encoder || new CustomHttpParameterCodec();
     }
 
     /**
diff --git a/samples/client/petstore/typescript-angular-v7-not-provided-in-root/builds/with-npm/api/user.service.ts b/samples/client/petstore/typescript-angular-v7-not-provided-in-root/builds/with-npm/api/user.service.ts
index 302a73c389..446f5c51c2 100644
--- a/samples/client/petstore/typescript-angular-v7-not-provided-in-root/builds/with-npm/api/user.service.ts
+++ b/samples/client/petstore/typescript-angular-v7-not-provided-in-root/builds/with-npm/api/user.service.ts
@@ -13,9 +13,8 @@
 
 import { Inject, Injectable, Optional }                      from '@angular/core';
 import { HttpClient, HttpHeaders, HttpParams,
-         HttpResponse, HttpEvent }                           from '@angular/common/http';
-import { CustomHttpUrlEncodingCodec }                        from '../encoder';
-
+         HttpResponse, HttpEvent, HttpParameterCodec }       from '@angular/common/http';
+import { CustomHttpParameterCodec }                          from '../encoder';
 import { Observable }                                        from 'rxjs';
 
 import { User } from '../model/user';
@@ -30,6 +29,7 @@ export class UserService {
     protected basePath = 'http://petstore.swagger.io/v2';
     public defaultHeaders = new HttpHeaders();
     public configuration = new Configuration();
+    public encoder: HttpParameterCodec;
 
     constructor(protected httpClient: HttpClient, @Optional()@Inject(BASE_PATH) basePath: string, @Optional() configuration: Configuration) {
 
@@ -40,6 +40,7 @@ export class UserService {
         } else {
             this.configuration.basePath = basePath || this.basePath;
         }
+        this.encoder = this.configuration.encoder || new CustomHttpParameterCodec();
     }
 
     /**
@@ -288,7 +289,7 @@ export class UserService {
             throw new Error('Required parameter password was null or undefined when calling loginUser.');
         }
 
-        let queryParameters = new HttpParams({encoder: new CustomHttpUrlEncodingCodec()});
+        let queryParameters = new HttpParams({encoder: this.encoder});
         if (username !== undefined && username !== null) {
             queryParameters = queryParameters.set('username', <any>username);
         }
diff --git a/samples/client/petstore/typescript-angular-v7-not-provided-in-root/builds/with-npm/configuration.ts b/samples/client/petstore/typescript-angular-v7-not-provided-in-root/builds/with-npm/configuration.ts
index 1132f4adc1..c038bbc947 100644
--- a/samples/client/petstore/typescript-angular-v7-not-provided-in-root/builds/with-npm/configuration.ts
+++ b/samples/client/petstore/typescript-angular-v7-not-provided-in-root/builds/with-npm/configuration.ts
@@ -1,3 +1,5 @@
+import { HttpParameterCodec } from '@angular/common/http';
+
 export interface ConfigurationParameters {
     apiKeys?: {[ key: string ]: string};
     username?: string;
@@ -5,6 +7,7 @@ export interface ConfigurationParameters {
     accessToken?: string | (() => string);
     basePath?: string;
     withCredentials?: boolean;
+    encoder?: HttpParameterCodec;
 }
 
 export class Configuration {
@@ -14,6 +17,7 @@ export class Configuration {
     accessToken?: string | (() => string);
     basePath?: string;
     withCredentials?: boolean;
+    encoder?: HttpParameterCodec;
 
     constructor(configurationParameters: ConfigurationParameters = {}) {
         this.apiKeys = configurationParameters.apiKeys;
@@ -22,6 +26,7 @@ export class Configuration {
         this.accessToken = configurationParameters.accessToken;
         this.basePath = configurationParameters.basePath;
         this.withCredentials = configurationParameters.withCredentials;
+        this.encoder = configurationParameters.encoder;
     }
 
     /**
diff --git a/samples/client/petstore/typescript-angular-v7-not-provided-in-root/builds/with-npm/encoder.ts b/samples/client/petstore/typescript-angular-v7-not-provided-in-root/builds/with-npm/encoder.ts
index f1c6b78c9c..f3e504196f 100644
--- a/samples/client/petstore/typescript-angular-v7-not-provided-in-root/builds/with-npm/encoder.ts
+++ b/samples/client/petstore/typescript-angular-v7-not-provided-in-root/builds/with-npm/encoder.ts
@@ -1,18 +1,21 @@
-    import { HttpUrlEncodingCodec } from '@angular/common/http';
+import { HttpParameterCodec } from '@angular/common/http';
 
 /**
-* CustomHttpUrlEncodingCodec
-* Fix plus sign (+) not encoding, so sent as blank space
-* See: https://github.com/angular/angular/issues/11058#issuecomment-247367318
+* Custom HttpParameterCodec
+* Workaround for https://github.com/angular/angular/issues/18261
 */
-export class CustomHttpUrlEncodingCodec extends HttpUrlEncodingCodec {
+export class CustomHttpParameterCodec implements HttpParameterCodec {
     encodeKey(k: string): string {
-        k = super.encodeKey(k);
-        return k.replace(/\+/gi, '%2B');
+        return encodeURIComponent(k);
     }
     encodeValue(v: string): string {
-        v = super.encodeValue(v);
-        return v.replace(/\+/gi, '%2B');
+        return encodeURIComponent(v);
+    }
+    decodeKey(k: string): string {
+        return decodeURIComponent(k);
+    }
+    decodeValue(v: string): string {
+        return decodeURIComponent(v);
     }
 }
 
diff --git a/samples/client/petstore/typescript-angular-v7-provided-in-root/builds/default/api/pet.service.ts b/samples/client/petstore/typescript-angular-v7-provided-in-root/builds/default/api/pet.service.ts
index b10ba96444..de386b6ee4 100644
--- a/samples/client/petstore/typescript-angular-v7-provided-in-root/builds/default/api/pet.service.ts
+++ b/samples/client/petstore/typescript-angular-v7-provided-in-root/builds/default/api/pet.service.ts
@@ -13,9 +13,8 @@
 
 import { Inject, Injectable, Optional }                      from '@angular/core';
 import { HttpClient, HttpHeaders, HttpParams,
-         HttpResponse, HttpEvent }                           from '@angular/common/http';
-import { CustomHttpUrlEncodingCodec }                        from '../encoder';
-
+         HttpResponse, HttpEvent, HttpParameterCodec }       from '@angular/common/http';
+import { CustomHttpParameterCodec }                          from '../encoder';
 import { Observable }                                        from 'rxjs';
 
 import { ApiResponse } from '../model/apiResponse';
@@ -33,6 +32,7 @@ export class PetService {
     protected basePath = 'http://petstore.swagger.io/v2';
     public defaultHeaders = new HttpHeaders();
     public configuration = new Configuration();
+    public encoder: HttpParameterCodec;
 
     constructor(protected httpClient: HttpClient, @Optional()@Inject(BASE_PATH) basePath: string, @Optional() configuration: Configuration) {
 
@@ -43,6 +43,7 @@ export class PetService {
         } else {
             this.configuration.basePath = basePath || this.basePath;
         }
+        this.encoder = this.configuration.encoder || new CustomHttpParameterCodec();
     }
 
     /**
@@ -180,7 +181,7 @@ export class PetService {
             throw new Error('Required parameter status was null or undefined when calling findPetsByStatus.');
         }
 
-        let queryParameters = new HttpParams({encoder: new CustomHttpUrlEncodingCodec()});
+        let queryParameters = new HttpParams({encoder: this.encoder});
         if (status) {
             queryParameters = queryParameters.set('status', status.join(COLLECTION_FORMATS['csv']));
         }
@@ -235,7 +236,7 @@ export class PetService {
             throw new Error('Required parameter tags was null or undefined when calling findPetsByTags.');
         }
 
-        let queryParameters = new HttpParams({encoder: new CustomHttpUrlEncodingCodec()});
+        let queryParameters = new HttpParams({encoder: this.encoder});
         if (tags) {
             queryParameters = queryParameters.set('tags', tags.join(COLLECTION_FORMATS['csv']));
         }
@@ -423,7 +424,7 @@ export class PetService {
         if (useForm) {
             formParams = new FormData();
         } else {
-            formParams = new HttpParams({encoder: new CustomHttpUrlEncodingCodec()});
+            formParams = new HttpParams({encoder: this.encoder});
         }
 
         if (name !== undefined) {
@@ -496,7 +497,7 @@ export class PetService {
         if (useForm) {
             formParams = new FormData();
         } else {
-            formParams = new HttpParams({encoder: new CustomHttpUrlEncodingCodec()});
+            formParams = new HttpParams({encoder: this.encoder});
         }
 
         if (additionalMetadata !== undefined) {
diff --git a/samples/client/petstore/typescript-angular-v7-provided-in-root/builds/default/api/store.service.ts b/samples/client/petstore/typescript-angular-v7-provided-in-root/builds/default/api/store.service.ts
index f8dda35287..2fa5e819b0 100644
--- a/samples/client/petstore/typescript-angular-v7-provided-in-root/builds/default/api/store.service.ts
+++ b/samples/client/petstore/typescript-angular-v7-provided-in-root/builds/default/api/store.service.ts
@@ -13,9 +13,8 @@
 
 import { Inject, Injectable, Optional }                      from '@angular/core';
 import { HttpClient, HttpHeaders, HttpParams,
-         HttpResponse, HttpEvent }                           from '@angular/common/http';
-import { CustomHttpUrlEncodingCodec }                        from '../encoder';
-
+         HttpResponse, HttpEvent, HttpParameterCodec }       from '@angular/common/http';
+import { CustomHttpParameterCodec }                          from '../encoder';
 import { Observable }                                        from 'rxjs';
 
 import { Order } from '../model/order';
@@ -32,6 +31,7 @@ export class StoreService {
     protected basePath = 'http://petstore.swagger.io/v2';
     public defaultHeaders = new HttpHeaders();
     public configuration = new Configuration();
+    public encoder: HttpParameterCodec;
 
     constructor(protected httpClient: HttpClient, @Optional()@Inject(BASE_PATH) basePath: string, @Optional() configuration: Configuration) {
 
@@ -42,6 +42,7 @@ export class StoreService {
         } else {
             this.configuration.basePath = basePath || this.basePath;
         }
+        this.encoder = this.configuration.encoder || new CustomHttpParameterCodec();
     }
 
     /**
diff --git a/samples/client/petstore/typescript-angular-v7-provided-in-root/builds/default/api/user.service.ts b/samples/client/petstore/typescript-angular-v7-provided-in-root/builds/default/api/user.service.ts
index 29c60328bd..c86088f8a6 100644
--- a/samples/client/petstore/typescript-angular-v7-provided-in-root/builds/default/api/user.service.ts
+++ b/samples/client/petstore/typescript-angular-v7-provided-in-root/builds/default/api/user.service.ts
@@ -13,9 +13,8 @@
 
 import { Inject, Injectable, Optional }                      from '@angular/core';
 import { HttpClient, HttpHeaders, HttpParams,
-         HttpResponse, HttpEvent }                           from '@angular/common/http';
-import { CustomHttpUrlEncodingCodec }                        from '../encoder';
-
+         HttpResponse, HttpEvent, HttpParameterCodec }       from '@angular/common/http';
+import { CustomHttpParameterCodec }                          from '../encoder';
 import { Observable }                                        from 'rxjs';
 
 import { User } from '../model/user';
@@ -32,6 +31,7 @@ export class UserService {
     protected basePath = 'http://petstore.swagger.io/v2';
     public defaultHeaders = new HttpHeaders();
     public configuration = new Configuration();
+    public encoder: HttpParameterCodec;
 
     constructor(protected httpClient: HttpClient, @Optional()@Inject(BASE_PATH) basePath: string, @Optional() configuration: Configuration) {
 
@@ -42,6 +42,7 @@ export class UserService {
         } else {
             this.configuration.basePath = basePath || this.basePath;
         }
+        this.encoder = this.configuration.encoder || new CustomHttpParameterCodec();
     }
 
     /**
@@ -290,7 +291,7 @@ export class UserService {
             throw new Error('Required parameter password was null or undefined when calling loginUser.');
         }
 
-        let queryParameters = new HttpParams({encoder: new CustomHttpUrlEncodingCodec()});
+        let queryParameters = new HttpParams({encoder: this.encoder});
         if (username !== undefined && username !== null) {
             queryParameters = queryParameters.set('username', <any>username);
         }
diff --git a/samples/client/petstore/typescript-angular-v7-provided-in-root/builds/default/configuration.ts b/samples/client/petstore/typescript-angular-v7-provided-in-root/builds/default/configuration.ts
index 1132f4adc1..c038bbc947 100644
--- a/samples/client/petstore/typescript-angular-v7-provided-in-root/builds/default/configuration.ts
+++ b/samples/client/petstore/typescript-angular-v7-provided-in-root/builds/default/configuration.ts
@@ -1,3 +1,5 @@
+import { HttpParameterCodec } from '@angular/common/http';
+
 export interface ConfigurationParameters {
     apiKeys?: {[ key: string ]: string};
     username?: string;
@@ -5,6 +7,7 @@ export interface ConfigurationParameters {
     accessToken?: string | (() => string);
     basePath?: string;
     withCredentials?: boolean;
+    encoder?: HttpParameterCodec;
 }
 
 export class Configuration {
@@ -14,6 +17,7 @@ export class Configuration {
     accessToken?: string | (() => string);
     basePath?: string;
     withCredentials?: boolean;
+    encoder?: HttpParameterCodec;
 
     constructor(configurationParameters: ConfigurationParameters = {}) {
         this.apiKeys = configurationParameters.apiKeys;
@@ -22,6 +26,7 @@ export class Configuration {
         this.accessToken = configurationParameters.accessToken;
         this.basePath = configurationParameters.basePath;
         this.withCredentials = configurationParameters.withCredentials;
+        this.encoder = configurationParameters.encoder;
     }
 
     /**
diff --git a/samples/client/petstore/typescript-angular-v7-provided-in-root/builds/default/encoder.ts b/samples/client/petstore/typescript-angular-v7-provided-in-root/builds/default/encoder.ts
index f1c6b78c9c..f3e504196f 100644
--- a/samples/client/petstore/typescript-angular-v7-provided-in-root/builds/default/encoder.ts
+++ b/samples/client/petstore/typescript-angular-v7-provided-in-root/builds/default/encoder.ts
@@ -1,18 +1,21 @@
-    import { HttpUrlEncodingCodec } from '@angular/common/http';
+import { HttpParameterCodec } from '@angular/common/http';
 
 /**
-* CustomHttpUrlEncodingCodec
-* Fix plus sign (+) not encoding, so sent as blank space
-* See: https://github.com/angular/angular/issues/11058#issuecomment-247367318
+* Custom HttpParameterCodec
+* Workaround for https://github.com/angular/angular/issues/18261
 */
-export class CustomHttpUrlEncodingCodec extends HttpUrlEncodingCodec {
+export class CustomHttpParameterCodec implements HttpParameterCodec {
     encodeKey(k: string): string {
-        k = super.encodeKey(k);
-        return k.replace(/\+/gi, '%2B');
+        return encodeURIComponent(k);
     }
     encodeValue(v: string): string {
-        v = super.encodeValue(v);
-        return v.replace(/\+/gi, '%2B');
+        return encodeURIComponent(v);
+    }
+    decodeKey(k: string): string {
+        return decodeURIComponent(k);
+    }
+    decodeValue(v: string): string {
+        return decodeURIComponent(v);
     }
 }
 
diff --git a/samples/client/petstore/typescript-angular-v7-provided-in-root/builds/with-npm/api/pet.service.ts b/samples/client/petstore/typescript-angular-v7-provided-in-root/builds/with-npm/api/pet.service.ts
index b10ba96444..de386b6ee4 100644
--- a/samples/client/petstore/typescript-angular-v7-provided-in-root/builds/with-npm/api/pet.service.ts
+++ b/samples/client/petstore/typescript-angular-v7-provided-in-root/builds/with-npm/api/pet.service.ts
@@ -13,9 +13,8 @@
 
 import { Inject, Injectable, Optional }                      from '@angular/core';
 import { HttpClient, HttpHeaders, HttpParams,
-         HttpResponse, HttpEvent }                           from '@angular/common/http';
-import { CustomHttpUrlEncodingCodec }                        from '../encoder';
-
+         HttpResponse, HttpEvent, HttpParameterCodec }       from '@angular/common/http';
+import { CustomHttpParameterCodec }                          from '../encoder';
 import { Observable }                                        from 'rxjs';
 
 import { ApiResponse } from '../model/apiResponse';
@@ -33,6 +32,7 @@ export class PetService {
     protected basePath = 'http://petstore.swagger.io/v2';
     public defaultHeaders = new HttpHeaders();
     public configuration = new Configuration();
+    public encoder: HttpParameterCodec;
 
     constructor(protected httpClient: HttpClient, @Optional()@Inject(BASE_PATH) basePath: string, @Optional() configuration: Configuration) {
 
@@ -43,6 +43,7 @@ export class PetService {
         } else {
             this.configuration.basePath = basePath || this.basePath;
         }
+        this.encoder = this.configuration.encoder || new CustomHttpParameterCodec();
     }
 
     /**
@@ -180,7 +181,7 @@ export class PetService {
             throw new Error('Required parameter status was null or undefined when calling findPetsByStatus.');
         }
 
-        let queryParameters = new HttpParams({encoder: new CustomHttpUrlEncodingCodec()});
+        let queryParameters = new HttpParams({encoder: this.encoder});
         if (status) {
             queryParameters = queryParameters.set('status', status.join(COLLECTION_FORMATS['csv']));
         }
@@ -235,7 +236,7 @@ export class PetService {
             throw new Error('Required parameter tags was null or undefined when calling findPetsByTags.');
         }
 
-        let queryParameters = new HttpParams({encoder: new CustomHttpUrlEncodingCodec()});
+        let queryParameters = new HttpParams({encoder: this.encoder});
         if (tags) {
             queryParameters = queryParameters.set('tags', tags.join(COLLECTION_FORMATS['csv']));
         }
@@ -423,7 +424,7 @@ export class PetService {
         if (useForm) {
             formParams = new FormData();
         } else {
-            formParams = new HttpParams({encoder: new CustomHttpUrlEncodingCodec()});
+            formParams = new HttpParams({encoder: this.encoder});
         }
 
         if (name !== undefined) {
@@ -496,7 +497,7 @@ export class PetService {
         if (useForm) {
             formParams = new FormData();
         } else {
-            formParams = new HttpParams({encoder: new CustomHttpUrlEncodingCodec()});
+            formParams = new HttpParams({encoder: this.encoder});
         }
 
         if (additionalMetadata !== undefined) {
diff --git a/samples/client/petstore/typescript-angular-v7-provided-in-root/builds/with-npm/api/store.service.ts b/samples/client/petstore/typescript-angular-v7-provided-in-root/builds/with-npm/api/store.service.ts
index f8dda35287..2fa5e819b0 100644
--- a/samples/client/petstore/typescript-angular-v7-provided-in-root/builds/with-npm/api/store.service.ts
+++ b/samples/client/petstore/typescript-angular-v7-provided-in-root/builds/with-npm/api/store.service.ts
@@ -13,9 +13,8 @@
 
 import { Inject, Injectable, Optional }                      from '@angular/core';
 import { HttpClient, HttpHeaders, HttpParams,
-         HttpResponse, HttpEvent }                           from '@angular/common/http';
-import { CustomHttpUrlEncodingCodec }                        from '../encoder';
-
+         HttpResponse, HttpEvent, HttpParameterCodec }       from '@angular/common/http';
+import { CustomHttpParameterCodec }                          from '../encoder';
 import { Observable }                                        from 'rxjs';
 
 import { Order } from '../model/order';
@@ -32,6 +31,7 @@ export class StoreService {
     protected basePath = 'http://petstore.swagger.io/v2';
     public defaultHeaders = new HttpHeaders();
     public configuration = new Configuration();
+    public encoder: HttpParameterCodec;
 
     constructor(protected httpClient: HttpClient, @Optional()@Inject(BASE_PATH) basePath: string, @Optional() configuration: Configuration) {
 
@@ -42,6 +42,7 @@ export class StoreService {
         } else {
             this.configuration.basePath = basePath || this.basePath;
         }
+        this.encoder = this.configuration.encoder || new CustomHttpParameterCodec();
     }
 
     /**
diff --git a/samples/client/petstore/typescript-angular-v7-provided-in-root/builds/with-npm/api/user.service.ts b/samples/client/petstore/typescript-angular-v7-provided-in-root/builds/with-npm/api/user.service.ts
index 29c60328bd..c86088f8a6 100644
--- a/samples/client/petstore/typescript-angular-v7-provided-in-root/builds/with-npm/api/user.service.ts
+++ b/samples/client/petstore/typescript-angular-v7-provided-in-root/builds/with-npm/api/user.service.ts
@@ -13,9 +13,8 @@
 
 import { Inject, Injectable, Optional }                      from '@angular/core';
 import { HttpClient, HttpHeaders, HttpParams,
-         HttpResponse, HttpEvent }                           from '@angular/common/http';
-import { CustomHttpUrlEncodingCodec }                        from '../encoder';
-
+         HttpResponse, HttpEvent, HttpParameterCodec }       from '@angular/common/http';
+import { CustomHttpParameterCodec }                          from '../encoder';
 import { Observable }                                        from 'rxjs';
 
 import { User } from '../model/user';
@@ -32,6 +31,7 @@ export class UserService {
     protected basePath = 'http://petstore.swagger.io/v2';
     public defaultHeaders = new HttpHeaders();
     public configuration = new Configuration();
+    public encoder: HttpParameterCodec;
 
     constructor(protected httpClient: HttpClient, @Optional()@Inject(BASE_PATH) basePath: string, @Optional() configuration: Configuration) {
 
@@ -42,6 +42,7 @@ export class UserService {
         } else {
             this.configuration.basePath = basePath || this.basePath;
         }
+        this.encoder = this.configuration.encoder || new CustomHttpParameterCodec();
     }
 
     /**
@@ -290,7 +291,7 @@ export class UserService {
             throw new Error('Required parameter password was null or undefined when calling loginUser.');
         }
 
-        let queryParameters = new HttpParams({encoder: new CustomHttpUrlEncodingCodec()});
+        let queryParameters = new HttpParams({encoder: this.encoder});
         if (username !== undefined && username !== null) {
             queryParameters = queryParameters.set('username', <any>username);
         }
diff --git a/samples/client/petstore/typescript-angular-v7-provided-in-root/builds/with-npm/configuration.ts b/samples/client/petstore/typescript-angular-v7-provided-in-root/builds/with-npm/configuration.ts
index 1132f4adc1..c038bbc947 100644
--- a/samples/client/petstore/typescript-angular-v7-provided-in-root/builds/with-npm/configuration.ts
+++ b/samples/client/petstore/typescript-angular-v7-provided-in-root/builds/with-npm/configuration.ts
@@ -1,3 +1,5 @@
+import { HttpParameterCodec } from '@angular/common/http';
+
 export interface ConfigurationParameters {
     apiKeys?: {[ key: string ]: string};
     username?: string;
@@ -5,6 +7,7 @@ export interface ConfigurationParameters {
     accessToken?: string | (() => string);
     basePath?: string;
     withCredentials?: boolean;
+    encoder?: HttpParameterCodec;
 }
 
 export class Configuration {
@@ -14,6 +17,7 @@ export class Configuration {
     accessToken?: string | (() => string);
     basePath?: string;
     withCredentials?: boolean;
+    encoder?: HttpParameterCodec;
 
     constructor(configurationParameters: ConfigurationParameters = {}) {
         this.apiKeys = configurationParameters.apiKeys;
@@ -22,6 +26,7 @@ export class Configuration {
         this.accessToken = configurationParameters.accessToken;
         this.basePath = configurationParameters.basePath;
         this.withCredentials = configurationParameters.withCredentials;
+        this.encoder = configurationParameters.encoder;
     }
 
     /**
diff --git a/samples/client/petstore/typescript-angular-v7-provided-in-root/builds/with-npm/encoder.ts b/samples/client/petstore/typescript-angular-v7-provided-in-root/builds/with-npm/encoder.ts
index f1c6b78c9c..f3e504196f 100644
--- a/samples/client/petstore/typescript-angular-v7-provided-in-root/builds/with-npm/encoder.ts
+++ b/samples/client/petstore/typescript-angular-v7-provided-in-root/builds/with-npm/encoder.ts
@@ -1,18 +1,21 @@
-    import { HttpUrlEncodingCodec } from '@angular/common/http';
+import { HttpParameterCodec } from '@angular/common/http';
 
 /**
-* CustomHttpUrlEncodingCodec
-* Fix plus sign (+) not encoding, so sent as blank space
-* See: https://github.com/angular/angular/issues/11058#issuecomment-247367318
+* Custom HttpParameterCodec
+* Workaround for https://github.com/angular/angular/issues/18261
 */
-export class CustomHttpUrlEncodingCodec extends HttpUrlEncodingCodec {
+export class CustomHttpParameterCodec implements HttpParameterCodec {
     encodeKey(k: string): string {
-        k = super.encodeKey(k);
-        return k.replace(/\+/gi, '%2B');
+        return encodeURIComponent(k);
     }
     encodeValue(v: string): string {
-        v = super.encodeValue(v);
-        return v.replace(/\+/gi, '%2B');
+        return encodeURIComponent(v);
+    }
+    decodeKey(k: string): string {
+        return decodeURIComponent(k);
+    }
+    decodeValue(v: string): string {
+        return decodeURIComponent(v);
     }
 }
 

From 76fecf744b0f88b400efe04cceb31f3e88f5e387 Mon Sep 17 00:00:00 2001
From: Silas Boyd-Wickizer <silasbw@gmail.com>
Date: Mon, 22 Jul 2019 01:54:48 -0700
Subject: [PATCH 36/62] [typescript-node] Promise-based Authentication
 interface (#3408)

---
 .../typescript-node/api-single.mustache       |  46 +--
 .../resources/typescript-node/models.mustache |   2 +-
 .../typescript-node/default/api/petApi.ts     | 328 +++++++++---------
 .../typescript-node/default/api/storeApi.ts   | 160 +++++----
 .../typescript-node/default/api/userApi.ts    | 308 ++++++++--------
 .../typescript-node/default/model/models.ts   |   2 +-
 .../typescript-node/npm/api/petApi.ts         | 328 +++++++++---------
 .../typescript-node/npm/api/storeApi.ts       | 160 +++++----
 .../typescript-node/npm/api/userApi.ts        | 308 ++++++++--------
 .../typescript-node/npm/model/models.ts       |   2 +-
 10 files changed, 863 insertions(+), 781 deletions(-)

diff --git a/modules/openapi-generator/src/main/resources/typescript-node/api-single.mustache b/modules/openapi-generator/src/main/resources/typescript-node/api-single.mustache
index c4227e75de..91b263cb5d 100644
--- a/modules/openapi-generator/src/main/resources/typescript-node/api-single.mustache
+++ b/modules/openapi-generator/src/main/resources/typescript-node/api-single.mustache
@@ -197,33 +197,35 @@ export class {{classname}} {
 {{/bodyParam}}
         };
 
+        let authenticationPromise = Promise.resolve();
 {{#authMethods}}
-        this.authentications.{{name}}.applyToRequest(localVarRequestOptions);
+        authenticationPromise = authenticationPromise.then(() => this.authentications.{{name}}.applyToRequest(localVarRequestOptions));
 
 {{/authMethods}}
-        this.authentications.default.applyToRequest(localVarRequestOptions);
-
-        if (Object.keys(localVarFormParams).length) {
-            if (localVarUseFormData) {
-                (<any>localVarRequestOptions).formData = localVarFormParams;
-            } else {
-                localVarRequestOptions.form = localVarFormParams;
-            }
-        }
-        return new Promise<{ response: http.{{#supportsES6}}IncomingMessage{{/supportsES6}}{{^supportsES6}}ClientResponse{{/supportsES6}}; {{#returnType}}body: {{{returnType}}}; {{/returnType}}{{^returnType}}body?: any; {{/returnType}} }>((resolve, reject) => {
-            localVarRequest(localVarRequestOptions, (error, response, body) => {
-                if (error) {
-                    reject(error);
+        authenticationPromise = authenticationPromise.then(() => this.authentications.default.applyToRequest(localVarRequestOptions));
+        return authenticationPromise.then(() => {
+            if (Object.keys(localVarFormParams).length) {
+                if (localVarUseFormData) {
+                    (<any>localVarRequestOptions).formData = localVarFormParams;
                 } else {
-                    {{#returnType}}
-                    body = ObjectSerializer.deserialize(body, "{{{returnType}}}");
-                    {{/returnType}}
-                    if (response.statusCode && response.statusCode >= 200 && response.statusCode <= 299) {
-                        resolve({ response: response, body: body });
-                    } else {
-                        reject({ response: response, body: body });
-                    }
+                    localVarRequestOptions.form = localVarFormParams;
                 }
+            }
+            return new Promise<{ response: http.{{#supportsES6}}IncomingMessage{{/supportsES6}}{{^supportsES6}}ClientResponse{{/supportsES6}}; {{#returnType}}body: {{{returnType}}}; {{/returnType}}{{^returnType}}body?: any; {{/returnType}} }>((resolve, reject) => {
+                localVarRequest(localVarRequestOptions, (error, response, body) => {
+                    if (error) {
+                        reject(error);
+                    } else {
+                        {{#returnType}}
+                        body = ObjectSerializer.deserialize(body, "{{{returnType}}}");
+                        {{/returnType}}
+                        if (response.statusCode && response.statusCode >= 200 && response.statusCode <= 299) {
+                            resolve({ response: response, body: body });
+                        } else {
+                            reject({ response: response, body: body });
+                        }
+                    }
+                });
             });
         });
     }
diff --git a/modules/openapi-generator/src/main/resources/typescript-node/models.mustache b/modules/openapi-generator/src/main/resources/typescript-node/models.mustache
index 39c7da727e..0bd709c2dd 100644
--- a/modules/openapi-generator/src/main/resources/typescript-node/models.mustache
+++ b/modules/openapi-generator/src/main/resources/typescript-node/models.mustache
@@ -166,7 +166,7 @@ export interface Authentication {
     /**
     * Apply authentication settings to header and query params.
     */
-    applyToRequest(requestOptions: localVarRequest.Options): void;
+    applyToRequest(requestOptions: localVarRequest.Options): Promise<void> | void;
 }
 
 export class HttpBasicAuth implements Authentication {
diff --git a/samples/client/petstore/typescript-node/default/api/petApi.ts b/samples/client/petstore/typescript-node/default/api/petApi.ts
index c37458099c..2566d2b935 100644
--- a/samples/client/petstore/typescript-node/default/api/petApi.ts
+++ b/samples/client/petstore/typescript-node/default/api/petApi.ts
@@ -109,28 +109,30 @@ export class PetApi {
             body: ObjectSerializer.serialize(body, "Pet")
         };
 
-        this.authentications.petstore_auth.applyToRequest(localVarRequestOptions);
+        let authenticationPromise = Promise.resolve();
+        authenticationPromise = authenticationPromise.then(() => this.authentications.petstore_auth.applyToRequest(localVarRequestOptions));
 
-        this.authentications.default.applyToRequest(localVarRequestOptions);
-
-        if (Object.keys(localVarFormParams).length) {
-            if (localVarUseFormData) {
-                (<any>localVarRequestOptions).formData = localVarFormParams;
-            } else {
-                localVarRequestOptions.form = localVarFormParams;
-            }
-        }
-        return new Promise<{ response: http.ClientResponse; body?: any;  }>((resolve, reject) => {
-            localVarRequest(localVarRequestOptions, (error, response, body) => {
-                if (error) {
-                    reject(error);
+        authenticationPromise = authenticationPromise.then(() => this.authentications.default.applyToRequest(localVarRequestOptions));
+        return authenticationPromise.then(() => {
+            if (Object.keys(localVarFormParams).length) {
+                if (localVarUseFormData) {
+                    (<any>localVarRequestOptions).formData = localVarFormParams;
                 } else {
-                    if (response.statusCode && response.statusCode >= 200 && response.statusCode <= 299) {
-                        resolve({ response: response, body: body });
-                    } else {
-                        reject({ response: response, body: body });
-                    }
+                    localVarRequestOptions.form = localVarFormParams;
                 }
+            }
+            return new Promise<{ response: http.ClientResponse; body?: any;  }>((resolve, reject) => {
+                localVarRequest(localVarRequestOptions, (error, response, body) => {
+                    if (error) {
+                        reject(error);
+                    } else {
+                        if (response.statusCode && response.statusCode >= 200 && response.statusCode <= 299) {
+                            resolve({ response: response, body: body });
+                        } else {
+                            reject({ response: response, body: body });
+                        }
+                    }
+                });
             });
         });
     }
@@ -166,28 +168,30 @@ export class PetApi {
             json: true,
         };
 
-        this.authentications.petstore_auth.applyToRequest(localVarRequestOptions);
+        let authenticationPromise = Promise.resolve();
+        authenticationPromise = authenticationPromise.then(() => this.authentications.petstore_auth.applyToRequest(localVarRequestOptions));
 
-        this.authentications.default.applyToRequest(localVarRequestOptions);
-
-        if (Object.keys(localVarFormParams).length) {
-            if (localVarUseFormData) {
-                (<any>localVarRequestOptions).formData = localVarFormParams;
-            } else {
-                localVarRequestOptions.form = localVarFormParams;
-            }
-        }
-        return new Promise<{ response: http.ClientResponse; body?: any;  }>((resolve, reject) => {
-            localVarRequest(localVarRequestOptions, (error, response, body) => {
-                if (error) {
-                    reject(error);
+        authenticationPromise = authenticationPromise.then(() => this.authentications.default.applyToRequest(localVarRequestOptions));
+        return authenticationPromise.then(() => {
+            if (Object.keys(localVarFormParams).length) {
+                if (localVarUseFormData) {
+                    (<any>localVarRequestOptions).formData = localVarFormParams;
                 } else {
-                    if (response.statusCode && response.statusCode >= 200 && response.statusCode <= 299) {
-                        resolve({ response: response, body: body });
-                    } else {
-                        reject({ response: response, body: body });
-                    }
+                    localVarRequestOptions.form = localVarFormParams;
                 }
+            }
+            return new Promise<{ response: http.ClientResponse; body?: any;  }>((resolve, reject) => {
+                localVarRequest(localVarRequestOptions, (error, response, body) => {
+                    if (error) {
+                        reject(error);
+                    } else {
+                        if (response.statusCode && response.statusCode >= 200 && response.statusCode <= 299) {
+                            resolve({ response: response, body: body });
+                        } else {
+                            reject({ response: response, body: body });
+                        }
+                    }
+                });
             });
         });
     }
@@ -224,29 +228,31 @@ export class PetApi {
             json: true,
         };
 
-        this.authentications.petstore_auth.applyToRequest(localVarRequestOptions);
+        let authenticationPromise = Promise.resolve();
+        authenticationPromise = authenticationPromise.then(() => this.authentications.petstore_auth.applyToRequest(localVarRequestOptions));
 
-        this.authentications.default.applyToRequest(localVarRequestOptions);
-
-        if (Object.keys(localVarFormParams).length) {
-            if (localVarUseFormData) {
-                (<any>localVarRequestOptions).formData = localVarFormParams;
-            } else {
-                localVarRequestOptions.form = localVarFormParams;
-            }
-        }
-        return new Promise<{ response: http.ClientResponse; body: Array<Pet>;  }>((resolve, reject) => {
-            localVarRequest(localVarRequestOptions, (error, response, body) => {
-                if (error) {
-                    reject(error);
+        authenticationPromise = authenticationPromise.then(() => this.authentications.default.applyToRequest(localVarRequestOptions));
+        return authenticationPromise.then(() => {
+            if (Object.keys(localVarFormParams).length) {
+                if (localVarUseFormData) {
+                    (<any>localVarRequestOptions).formData = localVarFormParams;
                 } else {
-                    body = ObjectSerializer.deserialize(body, "Array<Pet>");
-                    if (response.statusCode && response.statusCode >= 200 && response.statusCode <= 299) {
-                        resolve({ response: response, body: body });
-                    } else {
-                        reject({ response: response, body: body });
-                    }
+                    localVarRequestOptions.form = localVarFormParams;
                 }
+            }
+            return new Promise<{ response: http.ClientResponse; body: Array<Pet>;  }>((resolve, reject) => {
+                localVarRequest(localVarRequestOptions, (error, response, body) => {
+                    if (error) {
+                        reject(error);
+                    } else {
+                        body = ObjectSerializer.deserialize(body, "Array<Pet>");
+                        if (response.statusCode && response.statusCode >= 200 && response.statusCode <= 299) {
+                            resolve({ response: response, body: body });
+                        } else {
+                            reject({ response: response, body: body });
+                        }
+                    }
+                });
             });
         });
     }
@@ -283,29 +289,31 @@ export class PetApi {
             json: true,
         };
 
-        this.authentications.petstore_auth.applyToRequest(localVarRequestOptions);
+        let authenticationPromise = Promise.resolve();
+        authenticationPromise = authenticationPromise.then(() => this.authentications.petstore_auth.applyToRequest(localVarRequestOptions));
 
-        this.authentications.default.applyToRequest(localVarRequestOptions);
-
-        if (Object.keys(localVarFormParams).length) {
-            if (localVarUseFormData) {
-                (<any>localVarRequestOptions).formData = localVarFormParams;
-            } else {
-                localVarRequestOptions.form = localVarFormParams;
-            }
-        }
-        return new Promise<{ response: http.ClientResponse; body: Array<Pet>;  }>((resolve, reject) => {
-            localVarRequest(localVarRequestOptions, (error, response, body) => {
-                if (error) {
-                    reject(error);
+        authenticationPromise = authenticationPromise.then(() => this.authentications.default.applyToRequest(localVarRequestOptions));
+        return authenticationPromise.then(() => {
+            if (Object.keys(localVarFormParams).length) {
+                if (localVarUseFormData) {
+                    (<any>localVarRequestOptions).formData = localVarFormParams;
                 } else {
-                    body = ObjectSerializer.deserialize(body, "Array<Pet>");
-                    if (response.statusCode && response.statusCode >= 200 && response.statusCode <= 299) {
-                        resolve({ response: response, body: body });
-                    } else {
-                        reject({ response: response, body: body });
-                    }
+                    localVarRequestOptions.form = localVarFormParams;
                 }
+            }
+            return new Promise<{ response: http.ClientResponse; body: Array<Pet>;  }>((resolve, reject) => {
+                localVarRequest(localVarRequestOptions, (error, response, body) => {
+                    if (error) {
+                        reject(error);
+                    } else {
+                        body = ObjectSerializer.deserialize(body, "Array<Pet>");
+                        if (response.statusCode && response.statusCode >= 200 && response.statusCode <= 299) {
+                            resolve({ response: response, body: body });
+                        } else {
+                            reject({ response: response, body: body });
+                        }
+                    }
+                });
             });
         });
     }
@@ -339,29 +347,31 @@ export class PetApi {
             json: true,
         };
 
-        this.authentications.api_key.applyToRequest(localVarRequestOptions);
+        let authenticationPromise = Promise.resolve();
+        authenticationPromise = authenticationPromise.then(() => this.authentications.api_key.applyToRequest(localVarRequestOptions));
 
-        this.authentications.default.applyToRequest(localVarRequestOptions);
-
-        if (Object.keys(localVarFormParams).length) {
-            if (localVarUseFormData) {
-                (<any>localVarRequestOptions).formData = localVarFormParams;
-            } else {
-                localVarRequestOptions.form = localVarFormParams;
-            }
-        }
-        return new Promise<{ response: http.ClientResponse; body: Pet;  }>((resolve, reject) => {
-            localVarRequest(localVarRequestOptions, (error, response, body) => {
-                if (error) {
-                    reject(error);
+        authenticationPromise = authenticationPromise.then(() => this.authentications.default.applyToRequest(localVarRequestOptions));
+        return authenticationPromise.then(() => {
+            if (Object.keys(localVarFormParams).length) {
+                if (localVarUseFormData) {
+                    (<any>localVarRequestOptions).formData = localVarFormParams;
                 } else {
-                    body = ObjectSerializer.deserialize(body, "Pet");
-                    if (response.statusCode && response.statusCode >= 200 && response.statusCode <= 299) {
-                        resolve({ response: response, body: body });
-                    } else {
-                        reject({ response: response, body: body });
-                    }
+                    localVarRequestOptions.form = localVarFormParams;
                 }
+            }
+            return new Promise<{ response: http.ClientResponse; body: Pet;  }>((resolve, reject) => {
+                localVarRequest(localVarRequestOptions, (error, response, body) => {
+                    if (error) {
+                        reject(error);
+                    } else {
+                        body = ObjectSerializer.deserialize(body, "Pet");
+                        if (response.statusCode && response.statusCode >= 200 && response.statusCode <= 299) {
+                            resolve({ response: response, body: body });
+                        } else {
+                            reject({ response: response, body: body });
+                        }
+                    }
+                });
             });
         });
     }
@@ -395,28 +405,30 @@ export class PetApi {
             body: ObjectSerializer.serialize(body, "Pet")
         };
 
-        this.authentications.petstore_auth.applyToRequest(localVarRequestOptions);
+        let authenticationPromise = Promise.resolve();
+        authenticationPromise = authenticationPromise.then(() => this.authentications.petstore_auth.applyToRequest(localVarRequestOptions));
 
-        this.authentications.default.applyToRequest(localVarRequestOptions);
-
-        if (Object.keys(localVarFormParams).length) {
-            if (localVarUseFormData) {
-                (<any>localVarRequestOptions).formData = localVarFormParams;
-            } else {
-                localVarRequestOptions.form = localVarFormParams;
-            }
-        }
-        return new Promise<{ response: http.ClientResponse; body?: any;  }>((resolve, reject) => {
-            localVarRequest(localVarRequestOptions, (error, response, body) => {
-                if (error) {
-                    reject(error);
+        authenticationPromise = authenticationPromise.then(() => this.authentications.default.applyToRequest(localVarRequestOptions));
+        return authenticationPromise.then(() => {
+            if (Object.keys(localVarFormParams).length) {
+                if (localVarUseFormData) {
+                    (<any>localVarRequestOptions).formData = localVarFormParams;
                 } else {
-                    if (response.statusCode && response.statusCode >= 200 && response.statusCode <= 299) {
-                        resolve({ response: response, body: body });
-                    } else {
-                        reject({ response: response, body: body });
-                    }
+                    localVarRequestOptions.form = localVarFormParams;
                 }
+            }
+            return new Promise<{ response: http.ClientResponse; body?: any;  }>((resolve, reject) => {
+                localVarRequest(localVarRequestOptions, (error, response, body) => {
+                    if (error) {
+                        reject(error);
+                    } else {
+                        if (response.statusCode && response.statusCode >= 200 && response.statusCode <= 299) {
+                            resolve({ response: response, body: body });
+                        } else {
+                            reject({ response: response, body: body });
+                        }
+                    }
+                });
             });
         });
     }
@@ -460,28 +472,30 @@ export class PetApi {
             json: true,
         };
 
-        this.authentications.petstore_auth.applyToRequest(localVarRequestOptions);
+        let authenticationPromise = Promise.resolve();
+        authenticationPromise = authenticationPromise.then(() => this.authentications.petstore_auth.applyToRequest(localVarRequestOptions));
 
-        this.authentications.default.applyToRequest(localVarRequestOptions);
-
-        if (Object.keys(localVarFormParams).length) {
-            if (localVarUseFormData) {
-                (<any>localVarRequestOptions).formData = localVarFormParams;
-            } else {
-                localVarRequestOptions.form = localVarFormParams;
-            }
-        }
-        return new Promise<{ response: http.ClientResponse; body?: any;  }>((resolve, reject) => {
-            localVarRequest(localVarRequestOptions, (error, response, body) => {
-                if (error) {
-                    reject(error);
+        authenticationPromise = authenticationPromise.then(() => this.authentications.default.applyToRequest(localVarRequestOptions));
+        return authenticationPromise.then(() => {
+            if (Object.keys(localVarFormParams).length) {
+                if (localVarUseFormData) {
+                    (<any>localVarRequestOptions).formData = localVarFormParams;
                 } else {
-                    if (response.statusCode && response.statusCode >= 200 && response.statusCode <= 299) {
-                        resolve({ response: response, body: body });
-                    } else {
-                        reject({ response: response, body: body });
-                    }
+                    localVarRequestOptions.form = localVarFormParams;
                 }
+            }
+            return new Promise<{ response: http.ClientResponse; body?: any;  }>((resolve, reject) => {
+                localVarRequest(localVarRequestOptions, (error, response, body) => {
+                    if (error) {
+                        reject(error);
+                    } else {
+                        if (response.statusCode && response.statusCode >= 200 && response.statusCode <= 299) {
+                            resolve({ response: response, body: body });
+                        } else {
+                            reject({ response: response, body: body });
+                        }
+                    }
+                });
             });
         });
     }
@@ -526,29 +540,31 @@ export class PetApi {
             json: true,
         };
 
-        this.authentications.petstore_auth.applyToRequest(localVarRequestOptions);
+        let authenticationPromise = Promise.resolve();
+        authenticationPromise = authenticationPromise.then(() => this.authentications.petstore_auth.applyToRequest(localVarRequestOptions));
 
-        this.authentications.default.applyToRequest(localVarRequestOptions);
-
-        if (Object.keys(localVarFormParams).length) {
-            if (localVarUseFormData) {
-                (<any>localVarRequestOptions).formData = localVarFormParams;
-            } else {
-                localVarRequestOptions.form = localVarFormParams;
-            }
-        }
-        return new Promise<{ response: http.ClientResponse; body: ApiResponse;  }>((resolve, reject) => {
-            localVarRequest(localVarRequestOptions, (error, response, body) => {
-                if (error) {
-                    reject(error);
+        authenticationPromise = authenticationPromise.then(() => this.authentications.default.applyToRequest(localVarRequestOptions));
+        return authenticationPromise.then(() => {
+            if (Object.keys(localVarFormParams).length) {
+                if (localVarUseFormData) {
+                    (<any>localVarRequestOptions).formData = localVarFormParams;
                 } else {
-                    body = ObjectSerializer.deserialize(body, "ApiResponse");
-                    if (response.statusCode && response.statusCode >= 200 && response.statusCode <= 299) {
-                        resolve({ response: response, body: body });
-                    } else {
-                        reject({ response: response, body: body });
-                    }
+                    localVarRequestOptions.form = localVarFormParams;
                 }
+            }
+            return new Promise<{ response: http.ClientResponse; body: ApiResponse;  }>((resolve, reject) => {
+                localVarRequest(localVarRequestOptions, (error, response, body) => {
+                    if (error) {
+                        reject(error);
+                    } else {
+                        body = ObjectSerializer.deserialize(body, "ApiResponse");
+                        if (response.statusCode && response.statusCode >= 200 && response.statusCode <= 299) {
+                            resolve({ response: response, body: body });
+                        } else {
+                            reject({ response: response, body: body });
+                        }
+                    }
+                });
             });
         });
     }
diff --git a/samples/client/petstore/typescript-node/default/api/storeApi.ts b/samples/client/petstore/typescript-node/default/api/storeApi.ts
index 23f0fb73bf..cf3b545a3d 100644
--- a/samples/client/petstore/typescript-node/default/api/storeApi.ts
+++ b/samples/client/petstore/typescript-node/default/api/storeApi.ts
@@ -102,26 +102,28 @@ export class StoreApi {
             json: true,
         };
 
-        this.authentications.default.applyToRequest(localVarRequestOptions);
-
-        if (Object.keys(localVarFormParams).length) {
-            if (localVarUseFormData) {
-                (<any>localVarRequestOptions).formData = localVarFormParams;
-            } else {
-                localVarRequestOptions.form = localVarFormParams;
-            }
-        }
-        return new Promise<{ response: http.ClientResponse; body?: any;  }>((resolve, reject) => {
-            localVarRequest(localVarRequestOptions, (error, response, body) => {
-                if (error) {
-                    reject(error);
+        let authenticationPromise = Promise.resolve();
+        authenticationPromise = authenticationPromise.then(() => this.authentications.default.applyToRequest(localVarRequestOptions));
+        return authenticationPromise.then(() => {
+            if (Object.keys(localVarFormParams).length) {
+                if (localVarUseFormData) {
+                    (<any>localVarRequestOptions).formData = localVarFormParams;
                 } else {
-                    if (response.statusCode && response.statusCode >= 200 && response.statusCode <= 299) {
-                        resolve({ response: response, body: body });
-                    } else {
-                        reject({ response: response, body: body });
-                    }
+                    localVarRequestOptions.form = localVarFormParams;
                 }
+            }
+            return new Promise<{ response: http.ClientResponse; body?: any;  }>((resolve, reject) => {
+                localVarRequest(localVarRequestOptions, (error, response, body) => {
+                    if (error) {
+                        reject(error);
+                    } else {
+                        if (response.statusCode && response.statusCode >= 200 && response.statusCode <= 299) {
+                            resolve({ response: response, body: body });
+                        } else {
+                            reject({ response: response, body: body });
+                        }
+                    }
+                });
             });
         });
     }
@@ -148,29 +150,31 @@ export class StoreApi {
             json: true,
         };
 
-        this.authentications.api_key.applyToRequest(localVarRequestOptions);
+        let authenticationPromise = Promise.resolve();
+        authenticationPromise = authenticationPromise.then(() => this.authentications.api_key.applyToRequest(localVarRequestOptions));
 
-        this.authentications.default.applyToRequest(localVarRequestOptions);
-
-        if (Object.keys(localVarFormParams).length) {
-            if (localVarUseFormData) {
-                (<any>localVarRequestOptions).formData = localVarFormParams;
-            } else {
-                localVarRequestOptions.form = localVarFormParams;
-            }
-        }
-        return new Promise<{ response: http.ClientResponse; body: { [key: string]: number; };  }>((resolve, reject) => {
-            localVarRequest(localVarRequestOptions, (error, response, body) => {
-                if (error) {
-                    reject(error);
+        authenticationPromise = authenticationPromise.then(() => this.authentications.default.applyToRequest(localVarRequestOptions));
+        return authenticationPromise.then(() => {
+            if (Object.keys(localVarFormParams).length) {
+                if (localVarUseFormData) {
+                    (<any>localVarRequestOptions).formData = localVarFormParams;
                 } else {
-                    body = ObjectSerializer.deserialize(body, "{ [key: string]: number; }");
-                    if (response.statusCode && response.statusCode >= 200 && response.statusCode <= 299) {
-                        resolve({ response: response, body: body });
-                    } else {
-                        reject({ response: response, body: body });
-                    }
+                    localVarRequestOptions.form = localVarFormParams;
                 }
+            }
+            return new Promise<{ response: http.ClientResponse; body: { [key: string]: number; };  }>((resolve, reject) => {
+                localVarRequest(localVarRequestOptions, (error, response, body) => {
+                    if (error) {
+                        reject(error);
+                    } else {
+                        body = ObjectSerializer.deserialize(body, "{ [key: string]: number; }");
+                        if (response.statusCode && response.statusCode >= 200 && response.statusCode <= 299) {
+                            resolve({ response: response, body: body });
+                        } else {
+                            reject({ response: response, body: body });
+                        }
+                    }
+                });
             });
         });
     }
@@ -204,27 +208,29 @@ export class StoreApi {
             json: true,
         };
 
-        this.authentications.default.applyToRequest(localVarRequestOptions);
-
-        if (Object.keys(localVarFormParams).length) {
-            if (localVarUseFormData) {
-                (<any>localVarRequestOptions).formData = localVarFormParams;
-            } else {
-                localVarRequestOptions.form = localVarFormParams;
-            }
-        }
-        return new Promise<{ response: http.ClientResponse; body: Order;  }>((resolve, reject) => {
-            localVarRequest(localVarRequestOptions, (error, response, body) => {
-                if (error) {
-                    reject(error);
+        let authenticationPromise = Promise.resolve();
+        authenticationPromise = authenticationPromise.then(() => this.authentications.default.applyToRequest(localVarRequestOptions));
+        return authenticationPromise.then(() => {
+            if (Object.keys(localVarFormParams).length) {
+                if (localVarUseFormData) {
+                    (<any>localVarRequestOptions).formData = localVarFormParams;
                 } else {
-                    body = ObjectSerializer.deserialize(body, "Order");
-                    if (response.statusCode && response.statusCode >= 200 && response.statusCode <= 299) {
-                        resolve({ response: response, body: body });
-                    } else {
-                        reject({ response: response, body: body });
-                    }
+                    localVarRequestOptions.form = localVarFormParams;
                 }
+            }
+            return new Promise<{ response: http.ClientResponse; body: Order;  }>((resolve, reject) => {
+                localVarRequest(localVarRequestOptions, (error, response, body) => {
+                    if (error) {
+                        reject(error);
+                    } else {
+                        body = ObjectSerializer.deserialize(body, "Order");
+                        if (response.statusCode && response.statusCode >= 200 && response.statusCode <= 299) {
+                            resolve({ response: response, body: body });
+                        } else {
+                            reject({ response: response, body: body });
+                        }
+                    }
+                });
             });
         });
     }
@@ -258,27 +264,29 @@ export class StoreApi {
             body: ObjectSerializer.serialize(body, "Order")
         };
 
-        this.authentications.default.applyToRequest(localVarRequestOptions);
-
-        if (Object.keys(localVarFormParams).length) {
-            if (localVarUseFormData) {
-                (<any>localVarRequestOptions).formData = localVarFormParams;
-            } else {
-                localVarRequestOptions.form = localVarFormParams;
-            }
-        }
-        return new Promise<{ response: http.ClientResponse; body: Order;  }>((resolve, reject) => {
-            localVarRequest(localVarRequestOptions, (error, response, body) => {
-                if (error) {
-                    reject(error);
+        let authenticationPromise = Promise.resolve();
+        authenticationPromise = authenticationPromise.then(() => this.authentications.default.applyToRequest(localVarRequestOptions));
+        return authenticationPromise.then(() => {
+            if (Object.keys(localVarFormParams).length) {
+                if (localVarUseFormData) {
+                    (<any>localVarRequestOptions).formData = localVarFormParams;
                 } else {
-                    body = ObjectSerializer.deserialize(body, "Order");
-                    if (response.statusCode && response.statusCode >= 200 && response.statusCode <= 299) {
-                        resolve({ response: response, body: body });
-                    } else {
-                        reject({ response: response, body: body });
-                    }
+                    localVarRequestOptions.form = localVarFormParams;
                 }
+            }
+            return new Promise<{ response: http.ClientResponse; body: Order;  }>((resolve, reject) => {
+                localVarRequest(localVarRequestOptions, (error, response, body) => {
+                    if (error) {
+                        reject(error);
+                    } else {
+                        body = ObjectSerializer.deserialize(body, "Order");
+                        if (response.statusCode && response.statusCode >= 200 && response.statusCode <= 299) {
+                            resolve({ response: response, body: body });
+                        } else {
+                            reject({ response: response, body: body });
+                        }
+                    }
+                });
             });
         });
     }
diff --git a/samples/client/petstore/typescript-node/default/api/userApi.ts b/samples/client/petstore/typescript-node/default/api/userApi.ts
index 5a7a179f04..374daf1f1b 100644
--- a/samples/client/petstore/typescript-node/default/api/userApi.ts
+++ b/samples/client/petstore/typescript-node/default/api/userApi.ts
@@ -99,26 +99,28 @@ export class UserApi {
             body: ObjectSerializer.serialize(body, "User")
         };
 
-        this.authentications.default.applyToRequest(localVarRequestOptions);
-
-        if (Object.keys(localVarFormParams).length) {
-            if (localVarUseFormData) {
-                (<any>localVarRequestOptions).formData = localVarFormParams;
-            } else {
-                localVarRequestOptions.form = localVarFormParams;
-            }
-        }
-        return new Promise<{ response: http.ClientResponse; body?: any;  }>((resolve, reject) => {
-            localVarRequest(localVarRequestOptions, (error, response, body) => {
-                if (error) {
-                    reject(error);
+        let authenticationPromise = Promise.resolve();
+        authenticationPromise = authenticationPromise.then(() => this.authentications.default.applyToRequest(localVarRequestOptions));
+        return authenticationPromise.then(() => {
+            if (Object.keys(localVarFormParams).length) {
+                if (localVarUseFormData) {
+                    (<any>localVarRequestOptions).formData = localVarFormParams;
                 } else {
-                    if (response.statusCode && response.statusCode >= 200 && response.statusCode <= 299) {
-                        resolve({ response: response, body: body });
-                    } else {
-                        reject({ response: response, body: body });
-                    }
+                    localVarRequestOptions.form = localVarFormParams;
                 }
+            }
+            return new Promise<{ response: http.ClientResponse; body?: any;  }>((resolve, reject) => {
+                localVarRequest(localVarRequestOptions, (error, response, body) => {
+                    if (error) {
+                        reject(error);
+                    } else {
+                        if (response.statusCode && response.statusCode >= 200 && response.statusCode <= 299) {
+                            resolve({ response: response, body: body });
+                        } else {
+                            reject({ response: response, body: body });
+                        }
+                    }
+                });
             });
         });
     }
@@ -152,26 +154,28 @@ export class UserApi {
             body: ObjectSerializer.serialize(body, "Array<User>")
         };
 
-        this.authentications.default.applyToRequest(localVarRequestOptions);
-
-        if (Object.keys(localVarFormParams).length) {
-            if (localVarUseFormData) {
-                (<any>localVarRequestOptions).formData = localVarFormParams;
-            } else {
-                localVarRequestOptions.form = localVarFormParams;
-            }
-        }
-        return new Promise<{ response: http.ClientResponse; body?: any;  }>((resolve, reject) => {
-            localVarRequest(localVarRequestOptions, (error, response, body) => {
-                if (error) {
-                    reject(error);
+        let authenticationPromise = Promise.resolve();
+        authenticationPromise = authenticationPromise.then(() => this.authentications.default.applyToRequest(localVarRequestOptions));
+        return authenticationPromise.then(() => {
+            if (Object.keys(localVarFormParams).length) {
+                if (localVarUseFormData) {
+                    (<any>localVarRequestOptions).formData = localVarFormParams;
                 } else {
-                    if (response.statusCode && response.statusCode >= 200 && response.statusCode <= 299) {
-                        resolve({ response: response, body: body });
-                    } else {
-                        reject({ response: response, body: body });
-                    }
+                    localVarRequestOptions.form = localVarFormParams;
                 }
+            }
+            return new Promise<{ response: http.ClientResponse; body?: any;  }>((resolve, reject) => {
+                localVarRequest(localVarRequestOptions, (error, response, body) => {
+                    if (error) {
+                        reject(error);
+                    } else {
+                        if (response.statusCode && response.statusCode >= 200 && response.statusCode <= 299) {
+                            resolve({ response: response, body: body });
+                        } else {
+                            reject({ response: response, body: body });
+                        }
+                    }
+                });
             });
         });
     }
@@ -205,26 +209,28 @@ export class UserApi {
             body: ObjectSerializer.serialize(body, "Array<User>")
         };
 
-        this.authentications.default.applyToRequest(localVarRequestOptions);
-
-        if (Object.keys(localVarFormParams).length) {
-            if (localVarUseFormData) {
-                (<any>localVarRequestOptions).formData = localVarFormParams;
-            } else {
-                localVarRequestOptions.form = localVarFormParams;
-            }
-        }
-        return new Promise<{ response: http.ClientResponse; body?: any;  }>((resolve, reject) => {
-            localVarRequest(localVarRequestOptions, (error, response, body) => {
-                if (error) {
-                    reject(error);
+        let authenticationPromise = Promise.resolve();
+        authenticationPromise = authenticationPromise.then(() => this.authentications.default.applyToRequest(localVarRequestOptions));
+        return authenticationPromise.then(() => {
+            if (Object.keys(localVarFormParams).length) {
+                if (localVarUseFormData) {
+                    (<any>localVarRequestOptions).formData = localVarFormParams;
                 } else {
-                    if (response.statusCode && response.statusCode >= 200 && response.statusCode <= 299) {
-                        resolve({ response: response, body: body });
-                    } else {
-                        reject({ response: response, body: body });
-                    }
+                    localVarRequestOptions.form = localVarFormParams;
                 }
+            }
+            return new Promise<{ response: http.ClientResponse; body?: any;  }>((resolve, reject) => {
+                localVarRequest(localVarRequestOptions, (error, response, body) => {
+                    if (error) {
+                        reject(error);
+                    } else {
+                        if (response.statusCode && response.statusCode >= 200 && response.statusCode <= 299) {
+                            resolve({ response: response, body: body });
+                        } else {
+                            reject({ response: response, body: body });
+                        }
+                    }
+                });
             });
         });
     }
@@ -258,26 +264,28 @@ export class UserApi {
             json: true,
         };
 
-        this.authentications.default.applyToRequest(localVarRequestOptions);
-
-        if (Object.keys(localVarFormParams).length) {
-            if (localVarUseFormData) {
-                (<any>localVarRequestOptions).formData = localVarFormParams;
-            } else {
-                localVarRequestOptions.form = localVarFormParams;
-            }
-        }
-        return new Promise<{ response: http.ClientResponse; body?: any;  }>((resolve, reject) => {
-            localVarRequest(localVarRequestOptions, (error, response, body) => {
-                if (error) {
-                    reject(error);
+        let authenticationPromise = Promise.resolve();
+        authenticationPromise = authenticationPromise.then(() => this.authentications.default.applyToRequest(localVarRequestOptions));
+        return authenticationPromise.then(() => {
+            if (Object.keys(localVarFormParams).length) {
+                if (localVarUseFormData) {
+                    (<any>localVarRequestOptions).formData = localVarFormParams;
                 } else {
-                    if (response.statusCode && response.statusCode >= 200 && response.statusCode <= 299) {
-                        resolve({ response: response, body: body });
-                    } else {
-                        reject({ response: response, body: body });
-                    }
+                    localVarRequestOptions.form = localVarFormParams;
                 }
+            }
+            return new Promise<{ response: http.ClientResponse; body?: any;  }>((resolve, reject) => {
+                localVarRequest(localVarRequestOptions, (error, response, body) => {
+                    if (error) {
+                        reject(error);
+                    } else {
+                        if (response.statusCode && response.statusCode >= 200 && response.statusCode <= 299) {
+                            resolve({ response: response, body: body });
+                        } else {
+                            reject({ response: response, body: body });
+                        }
+                    }
+                });
             });
         });
     }
@@ -311,27 +319,29 @@ export class UserApi {
             json: true,
         };
 
-        this.authentications.default.applyToRequest(localVarRequestOptions);
-
-        if (Object.keys(localVarFormParams).length) {
-            if (localVarUseFormData) {
-                (<any>localVarRequestOptions).formData = localVarFormParams;
-            } else {
-                localVarRequestOptions.form = localVarFormParams;
-            }
-        }
-        return new Promise<{ response: http.ClientResponse; body: User;  }>((resolve, reject) => {
-            localVarRequest(localVarRequestOptions, (error, response, body) => {
-                if (error) {
-                    reject(error);
+        let authenticationPromise = Promise.resolve();
+        authenticationPromise = authenticationPromise.then(() => this.authentications.default.applyToRequest(localVarRequestOptions));
+        return authenticationPromise.then(() => {
+            if (Object.keys(localVarFormParams).length) {
+                if (localVarUseFormData) {
+                    (<any>localVarRequestOptions).formData = localVarFormParams;
                 } else {
-                    body = ObjectSerializer.deserialize(body, "User");
-                    if (response.statusCode && response.statusCode >= 200 && response.statusCode <= 299) {
-                        resolve({ response: response, body: body });
-                    } else {
-                        reject({ response: response, body: body });
-                    }
+                    localVarRequestOptions.form = localVarFormParams;
                 }
+            }
+            return new Promise<{ response: http.ClientResponse; body: User;  }>((resolve, reject) => {
+                localVarRequest(localVarRequestOptions, (error, response, body) => {
+                    if (error) {
+                        reject(error);
+                    } else {
+                        body = ObjectSerializer.deserialize(body, "User");
+                        if (response.statusCode && response.statusCode >= 200 && response.statusCode <= 299) {
+                            resolve({ response: response, body: body });
+                        } else {
+                            reject({ response: response, body: body });
+                        }
+                    }
+                });
             });
         });
     }
@@ -378,27 +388,29 @@ export class UserApi {
             json: true,
         };
 
-        this.authentications.default.applyToRequest(localVarRequestOptions);
-
-        if (Object.keys(localVarFormParams).length) {
-            if (localVarUseFormData) {
-                (<any>localVarRequestOptions).formData = localVarFormParams;
-            } else {
-                localVarRequestOptions.form = localVarFormParams;
-            }
-        }
-        return new Promise<{ response: http.ClientResponse; body: string;  }>((resolve, reject) => {
-            localVarRequest(localVarRequestOptions, (error, response, body) => {
-                if (error) {
-                    reject(error);
+        let authenticationPromise = Promise.resolve();
+        authenticationPromise = authenticationPromise.then(() => this.authentications.default.applyToRequest(localVarRequestOptions));
+        return authenticationPromise.then(() => {
+            if (Object.keys(localVarFormParams).length) {
+                if (localVarUseFormData) {
+                    (<any>localVarRequestOptions).formData = localVarFormParams;
                 } else {
-                    body = ObjectSerializer.deserialize(body, "string");
-                    if (response.statusCode && response.statusCode >= 200 && response.statusCode <= 299) {
-                        resolve({ response: response, body: body });
-                    } else {
-                        reject({ response: response, body: body });
-                    }
+                    localVarRequestOptions.form = localVarFormParams;
                 }
+            }
+            return new Promise<{ response: http.ClientResponse; body: string;  }>((resolve, reject) => {
+                localVarRequest(localVarRequestOptions, (error, response, body) => {
+                    if (error) {
+                        reject(error);
+                    } else {
+                        body = ObjectSerializer.deserialize(body, "string");
+                        if (response.statusCode && response.statusCode >= 200 && response.statusCode <= 299) {
+                            resolve({ response: response, body: body });
+                        } else {
+                            reject({ response: response, body: body });
+                        }
+                    }
+                });
             });
         });
     }
@@ -425,26 +437,28 @@ export class UserApi {
             json: true,
         };
 
-        this.authentications.default.applyToRequest(localVarRequestOptions);
-
-        if (Object.keys(localVarFormParams).length) {
-            if (localVarUseFormData) {
-                (<any>localVarRequestOptions).formData = localVarFormParams;
-            } else {
-                localVarRequestOptions.form = localVarFormParams;
-            }
-        }
-        return new Promise<{ response: http.ClientResponse; body?: any;  }>((resolve, reject) => {
-            localVarRequest(localVarRequestOptions, (error, response, body) => {
-                if (error) {
-                    reject(error);
+        let authenticationPromise = Promise.resolve();
+        authenticationPromise = authenticationPromise.then(() => this.authentications.default.applyToRequest(localVarRequestOptions));
+        return authenticationPromise.then(() => {
+            if (Object.keys(localVarFormParams).length) {
+                if (localVarUseFormData) {
+                    (<any>localVarRequestOptions).formData = localVarFormParams;
                 } else {
-                    if (response.statusCode && response.statusCode >= 200 && response.statusCode <= 299) {
-                        resolve({ response: response, body: body });
-                    } else {
-                        reject({ response: response, body: body });
-                    }
+                    localVarRequestOptions.form = localVarFormParams;
                 }
+            }
+            return new Promise<{ response: http.ClientResponse; body?: any;  }>((resolve, reject) => {
+                localVarRequest(localVarRequestOptions, (error, response, body) => {
+                    if (error) {
+                        reject(error);
+                    } else {
+                        if (response.statusCode && response.statusCode >= 200 && response.statusCode <= 299) {
+                            resolve({ response: response, body: body });
+                        } else {
+                            reject({ response: response, body: body });
+                        }
+                    }
+                });
             });
         });
     }
@@ -485,26 +499,28 @@ export class UserApi {
             body: ObjectSerializer.serialize(body, "User")
         };
 
-        this.authentications.default.applyToRequest(localVarRequestOptions);
-
-        if (Object.keys(localVarFormParams).length) {
-            if (localVarUseFormData) {
-                (<any>localVarRequestOptions).formData = localVarFormParams;
-            } else {
-                localVarRequestOptions.form = localVarFormParams;
-            }
-        }
-        return new Promise<{ response: http.ClientResponse; body?: any;  }>((resolve, reject) => {
-            localVarRequest(localVarRequestOptions, (error, response, body) => {
-                if (error) {
-                    reject(error);
+        let authenticationPromise = Promise.resolve();
+        authenticationPromise = authenticationPromise.then(() => this.authentications.default.applyToRequest(localVarRequestOptions));
+        return authenticationPromise.then(() => {
+            if (Object.keys(localVarFormParams).length) {
+                if (localVarUseFormData) {
+                    (<any>localVarRequestOptions).formData = localVarFormParams;
                 } else {
-                    if (response.statusCode && response.statusCode >= 200 && response.statusCode <= 299) {
-                        resolve({ response: response, body: body });
-                    } else {
-                        reject({ response: response, body: body });
-                    }
+                    localVarRequestOptions.form = localVarFormParams;
                 }
+            }
+            return new Promise<{ response: http.ClientResponse; body?: any;  }>((resolve, reject) => {
+                localVarRequest(localVarRequestOptions, (error, response, body) => {
+                    if (error) {
+                        reject(error);
+                    } else {
+                        if (response.statusCode && response.statusCode >= 200 && response.statusCode <= 299) {
+                            resolve({ response: response, body: body });
+                        } else {
+                            reject({ response: response, body: body });
+                        }
+                    }
+                });
             });
         });
     }
diff --git a/samples/client/petstore/typescript-node/default/model/models.ts b/samples/client/petstore/typescript-node/default/model/models.ts
index 7b0dc89cbf..73d5122442 100644
--- a/samples/client/petstore/typescript-node/default/model/models.ts
+++ b/samples/client/petstore/typescript-node/default/model/models.ts
@@ -155,7 +155,7 @@ export interface Authentication {
     /**
     * Apply authentication settings to header and query params.
     */
-    applyToRequest(requestOptions: localVarRequest.Options): void;
+    applyToRequest(requestOptions: localVarRequest.Options): Promise<void> | void;
 }
 
 export class HttpBasicAuth implements Authentication {
diff --git a/samples/client/petstore/typescript-node/npm/api/petApi.ts b/samples/client/petstore/typescript-node/npm/api/petApi.ts
index c37458099c..2566d2b935 100644
--- a/samples/client/petstore/typescript-node/npm/api/petApi.ts
+++ b/samples/client/petstore/typescript-node/npm/api/petApi.ts
@@ -109,28 +109,30 @@ export class PetApi {
             body: ObjectSerializer.serialize(body, "Pet")
         };
 
-        this.authentications.petstore_auth.applyToRequest(localVarRequestOptions);
+        let authenticationPromise = Promise.resolve();
+        authenticationPromise = authenticationPromise.then(() => this.authentications.petstore_auth.applyToRequest(localVarRequestOptions));
 
-        this.authentications.default.applyToRequest(localVarRequestOptions);
-
-        if (Object.keys(localVarFormParams).length) {
-            if (localVarUseFormData) {
-                (<any>localVarRequestOptions).formData = localVarFormParams;
-            } else {
-                localVarRequestOptions.form = localVarFormParams;
-            }
-        }
-        return new Promise<{ response: http.ClientResponse; body?: any;  }>((resolve, reject) => {
-            localVarRequest(localVarRequestOptions, (error, response, body) => {
-                if (error) {
-                    reject(error);
+        authenticationPromise = authenticationPromise.then(() => this.authentications.default.applyToRequest(localVarRequestOptions));
+        return authenticationPromise.then(() => {
+            if (Object.keys(localVarFormParams).length) {
+                if (localVarUseFormData) {
+                    (<any>localVarRequestOptions).formData = localVarFormParams;
                 } else {
-                    if (response.statusCode && response.statusCode >= 200 && response.statusCode <= 299) {
-                        resolve({ response: response, body: body });
-                    } else {
-                        reject({ response: response, body: body });
-                    }
+                    localVarRequestOptions.form = localVarFormParams;
                 }
+            }
+            return new Promise<{ response: http.ClientResponse; body?: any;  }>((resolve, reject) => {
+                localVarRequest(localVarRequestOptions, (error, response, body) => {
+                    if (error) {
+                        reject(error);
+                    } else {
+                        if (response.statusCode && response.statusCode >= 200 && response.statusCode <= 299) {
+                            resolve({ response: response, body: body });
+                        } else {
+                            reject({ response: response, body: body });
+                        }
+                    }
+                });
             });
         });
     }
@@ -166,28 +168,30 @@ export class PetApi {
             json: true,
         };
 
-        this.authentications.petstore_auth.applyToRequest(localVarRequestOptions);
+        let authenticationPromise = Promise.resolve();
+        authenticationPromise = authenticationPromise.then(() => this.authentications.petstore_auth.applyToRequest(localVarRequestOptions));
 
-        this.authentications.default.applyToRequest(localVarRequestOptions);
-
-        if (Object.keys(localVarFormParams).length) {
-            if (localVarUseFormData) {
-                (<any>localVarRequestOptions).formData = localVarFormParams;
-            } else {
-                localVarRequestOptions.form = localVarFormParams;
-            }
-        }
-        return new Promise<{ response: http.ClientResponse; body?: any;  }>((resolve, reject) => {
-            localVarRequest(localVarRequestOptions, (error, response, body) => {
-                if (error) {
-                    reject(error);
+        authenticationPromise = authenticationPromise.then(() => this.authentications.default.applyToRequest(localVarRequestOptions));
+        return authenticationPromise.then(() => {
+            if (Object.keys(localVarFormParams).length) {
+                if (localVarUseFormData) {
+                    (<any>localVarRequestOptions).formData = localVarFormParams;
                 } else {
-                    if (response.statusCode && response.statusCode >= 200 && response.statusCode <= 299) {
-                        resolve({ response: response, body: body });
-                    } else {
-                        reject({ response: response, body: body });
-                    }
+                    localVarRequestOptions.form = localVarFormParams;
                 }
+            }
+            return new Promise<{ response: http.ClientResponse; body?: any;  }>((resolve, reject) => {
+                localVarRequest(localVarRequestOptions, (error, response, body) => {
+                    if (error) {
+                        reject(error);
+                    } else {
+                        if (response.statusCode && response.statusCode >= 200 && response.statusCode <= 299) {
+                            resolve({ response: response, body: body });
+                        } else {
+                            reject({ response: response, body: body });
+                        }
+                    }
+                });
             });
         });
     }
@@ -224,29 +228,31 @@ export class PetApi {
             json: true,
         };
 
-        this.authentications.petstore_auth.applyToRequest(localVarRequestOptions);
+        let authenticationPromise = Promise.resolve();
+        authenticationPromise = authenticationPromise.then(() => this.authentications.petstore_auth.applyToRequest(localVarRequestOptions));
 
-        this.authentications.default.applyToRequest(localVarRequestOptions);
-
-        if (Object.keys(localVarFormParams).length) {
-            if (localVarUseFormData) {
-                (<any>localVarRequestOptions).formData = localVarFormParams;
-            } else {
-                localVarRequestOptions.form = localVarFormParams;
-            }
-        }
-        return new Promise<{ response: http.ClientResponse; body: Array<Pet>;  }>((resolve, reject) => {
-            localVarRequest(localVarRequestOptions, (error, response, body) => {
-                if (error) {
-                    reject(error);
+        authenticationPromise = authenticationPromise.then(() => this.authentications.default.applyToRequest(localVarRequestOptions));
+        return authenticationPromise.then(() => {
+            if (Object.keys(localVarFormParams).length) {
+                if (localVarUseFormData) {
+                    (<any>localVarRequestOptions).formData = localVarFormParams;
                 } else {
-                    body = ObjectSerializer.deserialize(body, "Array<Pet>");
-                    if (response.statusCode && response.statusCode >= 200 && response.statusCode <= 299) {
-                        resolve({ response: response, body: body });
-                    } else {
-                        reject({ response: response, body: body });
-                    }
+                    localVarRequestOptions.form = localVarFormParams;
                 }
+            }
+            return new Promise<{ response: http.ClientResponse; body: Array<Pet>;  }>((resolve, reject) => {
+                localVarRequest(localVarRequestOptions, (error, response, body) => {
+                    if (error) {
+                        reject(error);
+                    } else {
+                        body = ObjectSerializer.deserialize(body, "Array<Pet>");
+                        if (response.statusCode && response.statusCode >= 200 && response.statusCode <= 299) {
+                            resolve({ response: response, body: body });
+                        } else {
+                            reject({ response: response, body: body });
+                        }
+                    }
+                });
             });
         });
     }
@@ -283,29 +289,31 @@ export class PetApi {
             json: true,
         };
 
-        this.authentications.petstore_auth.applyToRequest(localVarRequestOptions);
+        let authenticationPromise = Promise.resolve();
+        authenticationPromise = authenticationPromise.then(() => this.authentications.petstore_auth.applyToRequest(localVarRequestOptions));
 
-        this.authentications.default.applyToRequest(localVarRequestOptions);
-
-        if (Object.keys(localVarFormParams).length) {
-            if (localVarUseFormData) {
-                (<any>localVarRequestOptions).formData = localVarFormParams;
-            } else {
-                localVarRequestOptions.form = localVarFormParams;
-            }
-        }
-        return new Promise<{ response: http.ClientResponse; body: Array<Pet>;  }>((resolve, reject) => {
-            localVarRequest(localVarRequestOptions, (error, response, body) => {
-                if (error) {
-                    reject(error);
+        authenticationPromise = authenticationPromise.then(() => this.authentications.default.applyToRequest(localVarRequestOptions));
+        return authenticationPromise.then(() => {
+            if (Object.keys(localVarFormParams).length) {
+                if (localVarUseFormData) {
+                    (<any>localVarRequestOptions).formData = localVarFormParams;
                 } else {
-                    body = ObjectSerializer.deserialize(body, "Array<Pet>");
-                    if (response.statusCode && response.statusCode >= 200 && response.statusCode <= 299) {
-                        resolve({ response: response, body: body });
-                    } else {
-                        reject({ response: response, body: body });
-                    }
+                    localVarRequestOptions.form = localVarFormParams;
                 }
+            }
+            return new Promise<{ response: http.ClientResponse; body: Array<Pet>;  }>((resolve, reject) => {
+                localVarRequest(localVarRequestOptions, (error, response, body) => {
+                    if (error) {
+                        reject(error);
+                    } else {
+                        body = ObjectSerializer.deserialize(body, "Array<Pet>");
+                        if (response.statusCode && response.statusCode >= 200 && response.statusCode <= 299) {
+                            resolve({ response: response, body: body });
+                        } else {
+                            reject({ response: response, body: body });
+                        }
+                    }
+                });
             });
         });
     }
@@ -339,29 +347,31 @@ export class PetApi {
             json: true,
         };
 
-        this.authentications.api_key.applyToRequest(localVarRequestOptions);
+        let authenticationPromise = Promise.resolve();
+        authenticationPromise = authenticationPromise.then(() => this.authentications.api_key.applyToRequest(localVarRequestOptions));
 
-        this.authentications.default.applyToRequest(localVarRequestOptions);
-
-        if (Object.keys(localVarFormParams).length) {
-            if (localVarUseFormData) {
-                (<any>localVarRequestOptions).formData = localVarFormParams;
-            } else {
-                localVarRequestOptions.form = localVarFormParams;
-            }
-        }
-        return new Promise<{ response: http.ClientResponse; body: Pet;  }>((resolve, reject) => {
-            localVarRequest(localVarRequestOptions, (error, response, body) => {
-                if (error) {
-                    reject(error);
+        authenticationPromise = authenticationPromise.then(() => this.authentications.default.applyToRequest(localVarRequestOptions));
+        return authenticationPromise.then(() => {
+            if (Object.keys(localVarFormParams).length) {
+                if (localVarUseFormData) {
+                    (<any>localVarRequestOptions).formData = localVarFormParams;
                 } else {
-                    body = ObjectSerializer.deserialize(body, "Pet");
-                    if (response.statusCode && response.statusCode >= 200 && response.statusCode <= 299) {
-                        resolve({ response: response, body: body });
-                    } else {
-                        reject({ response: response, body: body });
-                    }
+                    localVarRequestOptions.form = localVarFormParams;
                 }
+            }
+            return new Promise<{ response: http.ClientResponse; body: Pet;  }>((resolve, reject) => {
+                localVarRequest(localVarRequestOptions, (error, response, body) => {
+                    if (error) {
+                        reject(error);
+                    } else {
+                        body = ObjectSerializer.deserialize(body, "Pet");
+                        if (response.statusCode && response.statusCode >= 200 && response.statusCode <= 299) {
+                            resolve({ response: response, body: body });
+                        } else {
+                            reject({ response: response, body: body });
+                        }
+                    }
+                });
             });
         });
     }
@@ -395,28 +405,30 @@ export class PetApi {
             body: ObjectSerializer.serialize(body, "Pet")
         };
 
-        this.authentications.petstore_auth.applyToRequest(localVarRequestOptions);
+        let authenticationPromise = Promise.resolve();
+        authenticationPromise = authenticationPromise.then(() => this.authentications.petstore_auth.applyToRequest(localVarRequestOptions));
 
-        this.authentications.default.applyToRequest(localVarRequestOptions);
-
-        if (Object.keys(localVarFormParams).length) {
-            if (localVarUseFormData) {
-                (<any>localVarRequestOptions).formData = localVarFormParams;
-            } else {
-                localVarRequestOptions.form = localVarFormParams;
-            }
-        }
-        return new Promise<{ response: http.ClientResponse; body?: any;  }>((resolve, reject) => {
-            localVarRequest(localVarRequestOptions, (error, response, body) => {
-                if (error) {
-                    reject(error);
+        authenticationPromise = authenticationPromise.then(() => this.authentications.default.applyToRequest(localVarRequestOptions));
+        return authenticationPromise.then(() => {
+            if (Object.keys(localVarFormParams).length) {
+                if (localVarUseFormData) {
+                    (<any>localVarRequestOptions).formData = localVarFormParams;
                 } else {
-                    if (response.statusCode && response.statusCode >= 200 && response.statusCode <= 299) {
-                        resolve({ response: response, body: body });
-                    } else {
-                        reject({ response: response, body: body });
-                    }
+                    localVarRequestOptions.form = localVarFormParams;
                 }
+            }
+            return new Promise<{ response: http.ClientResponse; body?: any;  }>((resolve, reject) => {
+                localVarRequest(localVarRequestOptions, (error, response, body) => {
+                    if (error) {
+                        reject(error);
+                    } else {
+                        if (response.statusCode && response.statusCode >= 200 && response.statusCode <= 299) {
+                            resolve({ response: response, body: body });
+                        } else {
+                            reject({ response: response, body: body });
+                        }
+                    }
+                });
             });
         });
     }
@@ -460,28 +472,30 @@ export class PetApi {
             json: true,
         };
 
-        this.authentications.petstore_auth.applyToRequest(localVarRequestOptions);
+        let authenticationPromise = Promise.resolve();
+        authenticationPromise = authenticationPromise.then(() => this.authentications.petstore_auth.applyToRequest(localVarRequestOptions));
 
-        this.authentications.default.applyToRequest(localVarRequestOptions);
-
-        if (Object.keys(localVarFormParams).length) {
-            if (localVarUseFormData) {
-                (<any>localVarRequestOptions).formData = localVarFormParams;
-            } else {
-                localVarRequestOptions.form = localVarFormParams;
-            }
-        }
-        return new Promise<{ response: http.ClientResponse; body?: any;  }>((resolve, reject) => {
-            localVarRequest(localVarRequestOptions, (error, response, body) => {
-                if (error) {
-                    reject(error);
+        authenticationPromise = authenticationPromise.then(() => this.authentications.default.applyToRequest(localVarRequestOptions));
+        return authenticationPromise.then(() => {
+            if (Object.keys(localVarFormParams).length) {
+                if (localVarUseFormData) {
+                    (<any>localVarRequestOptions).formData = localVarFormParams;
                 } else {
-                    if (response.statusCode && response.statusCode >= 200 && response.statusCode <= 299) {
-                        resolve({ response: response, body: body });
-                    } else {
-                        reject({ response: response, body: body });
-                    }
+                    localVarRequestOptions.form = localVarFormParams;
                 }
+            }
+            return new Promise<{ response: http.ClientResponse; body?: any;  }>((resolve, reject) => {
+                localVarRequest(localVarRequestOptions, (error, response, body) => {
+                    if (error) {
+                        reject(error);
+                    } else {
+                        if (response.statusCode && response.statusCode >= 200 && response.statusCode <= 299) {
+                            resolve({ response: response, body: body });
+                        } else {
+                            reject({ response: response, body: body });
+                        }
+                    }
+                });
             });
         });
     }
@@ -526,29 +540,31 @@ export class PetApi {
             json: true,
         };
 
-        this.authentications.petstore_auth.applyToRequest(localVarRequestOptions);
+        let authenticationPromise = Promise.resolve();
+        authenticationPromise = authenticationPromise.then(() => this.authentications.petstore_auth.applyToRequest(localVarRequestOptions));
 
-        this.authentications.default.applyToRequest(localVarRequestOptions);
-
-        if (Object.keys(localVarFormParams).length) {
-            if (localVarUseFormData) {
-                (<any>localVarRequestOptions).formData = localVarFormParams;
-            } else {
-                localVarRequestOptions.form = localVarFormParams;
-            }
-        }
-        return new Promise<{ response: http.ClientResponse; body: ApiResponse;  }>((resolve, reject) => {
-            localVarRequest(localVarRequestOptions, (error, response, body) => {
-                if (error) {
-                    reject(error);
+        authenticationPromise = authenticationPromise.then(() => this.authentications.default.applyToRequest(localVarRequestOptions));
+        return authenticationPromise.then(() => {
+            if (Object.keys(localVarFormParams).length) {
+                if (localVarUseFormData) {
+                    (<any>localVarRequestOptions).formData = localVarFormParams;
                 } else {
-                    body = ObjectSerializer.deserialize(body, "ApiResponse");
-                    if (response.statusCode && response.statusCode >= 200 && response.statusCode <= 299) {
-                        resolve({ response: response, body: body });
-                    } else {
-                        reject({ response: response, body: body });
-                    }
+                    localVarRequestOptions.form = localVarFormParams;
                 }
+            }
+            return new Promise<{ response: http.ClientResponse; body: ApiResponse;  }>((resolve, reject) => {
+                localVarRequest(localVarRequestOptions, (error, response, body) => {
+                    if (error) {
+                        reject(error);
+                    } else {
+                        body = ObjectSerializer.deserialize(body, "ApiResponse");
+                        if (response.statusCode && response.statusCode >= 200 && response.statusCode <= 299) {
+                            resolve({ response: response, body: body });
+                        } else {
+                            reject({ response: response, body: body });
+                        }
+                    }
+                });
             });
         });
     }
diff --git a/samples/client/petstore/typescript-node/npm/api/storeApi.ts b/samples/client/petstore/typescript-node/npm/api/storeApi.ts
index 23f0fb73bf..cf3b545a3d 100644
--- a/samples/client/petstore/typescript-node/npm/api/storeApi.ts
+++ b/samples/client/petstore/typescript-node/npm/api/storeApi.ts
@@ -102,26 +102,28 @@ export class StoreApi {
             json: true,
         };
 
-        this.authentications.default.applyToRequest(localVarRequestOptions);
-
-        if (Object.keys(localVarFormParams).length) {
-            if (localVarUseFormData) {
-                (<any>localVarRequestOptions).formData = localVarFormParams;
-            } else {
-                localVarRequestOptions.form = localVarFormParams;
-            }
-        }
-        return new Promise<{ response: http.ClientResponse; body?: any;  }>((resolve, reject) => {
-            localVarRequest(localVarRequestOptions, (error, response, body) => {
-                if (error) {
-                    reject(error);
+        let authenticationPromise = Promise.resolve();
+        authenticationPromise = authenticationPromise.then(() => this.authentications.default.applyToRequest(localVarRequestOptions));
+        return authenticationPromise.then(() => {
+            if (Object.keys(localVarFormParams).length) {
+                if (localVarUseFormData) {
+                    (<any>localVarRequestOptions).formData = localVarFormParams;
                 } else {
-                    if (response.statusCode && response.statusCode >= 200 && response.statusCode <= 299) {
-                        resolve({ response: response, body: body });
-                    } else {
-                        reject({ response: response, body: body });
-                    }
+                    localVarRequestOptions.form = localVarFormParams;
                 }
+            }
+            return new Promise<{ response: http.ClientResponse; body?: any;  }>((resolve, reject) => {
+                localVarRequest(localVarRequestOptions, (error, response, body) => {
+                    if (error) {
+                        reject(error);
+                    } else {
+                        if (response.statusCode && response.statusCode >= 200 && response.statusCode <= 299) {
+                            resolve({ response: response, body: body });
+                        } else {
+                            reject({ response: response, body: body });
+                        }
+                    }
+                });
             });
         });
     }
@@ -148,29 +150,31 @@ export class StoreApi {
             json: true,
         };
 
-        this.authentications.api_key.applyToRequest(localVarRequestOptions);
+        let authenticationPromise = Promise.resolve();
+        authenticationPromise = authenticationPromise.then(() => this.authentications.api_key.applyToRequest(localVarRequestOptions));
 
-        this.authentications.default.applyToRequest(localVarRequestOptions);
-
-        if (Object.keys(localVarFormParams).length) {
-            if (localVarUseFormData) {
-                (<any>localVarRequestOptions).formData = localVarFormParams;
-            } else {
-                localVarRequestOptions.form = localVarFormParams;
-            }
-        }
-        return new Promise<{ response: http.ClientResponse; body: { [key: string]: number; };  }>((resolve, reject) => {
-            localVarRequest(localVarRequestOptions, (error, response, body) => {
-                if (error) {
-                    reject(error);
+        authenticationPromise = authenticationPromise.then(() => this.authentications.default.applyToRequest(localVarRequestOptions));
+        return authenticationPromise.then(() => {
+            if (Object.keys(localVarFormParams).length) {
+                if (localVarUseFormData) {
+                    (<any>localVarRequestOptions).formData = localVarFormParams;
                 } else {
-                    body = ObjectSerializer.deserialize(body, "{ [key: string]: number; }");
-                    if (response.statusCode && response.statusCode >= 200 && response.statusCode <= 299) {
-                        resolve({ response: response, body: body });
-                    } else {
-                        reject({ response: response, body: body });
-                    }
+                    localVarRequestOptions.form = localVarFormParams;
                 }
+            }
+            return new Promise<{ response: http.ClientResponse; body: { [key: string]: number; };  }>((resolve, reject) => {
+                localVarRequest(localVarRequestOptions, (error, response, body) => {
+                    if (error) {
+                        reject(error);
+                    } else {
+                        body = ObjectSerializer.deserialize(body, "{ [key: string]: number; }");
+                        if (response.statusCode && response.statusCode >= 200 && response.statusCode <= 299) {
+                            resolve({ response: response, body: body });
+                        } else {
+                            reject({ response: response, body: body });
+                        }
+                    }
+                });
             });
         });
     }
@@ -204,27 +208,29 @@ export class StoreApi {
             json: true,
         };
 
-        this.authentications.default.applyToRequest(localVarRequestOptions);
-
-        if (Object.keys(localVarFormParams).length) {
-            if (localVarUseFormData) {
-                (<any>localVarRequestOptions).formData = localVarFormParams;
-            } else {
-                localVarRequestOptions.form = localVarFormParams;
-            }
-        }
-        return new Promise<{ response: http.ClientResponse; body: Order;  }>((resolve, reject) => {
-            localVarRequest(localVarRequestOptions, (error, response, body) => {
-                if (error) {
-                    reject(error);
+        let authenticationPromise = Promise.resolve();
+        authenticationPromise = authenticationPromise.then(() => this.authentications.default.applyToRequest(localVarRequestOptions));
+        return authenticationPromise.then(() => {
+            if (Object.keys(localVarFormParams).length) {
+                if (localVarUseFormData) {
+                    (<any>localVarRequestOptions).formData = localVarFormParams;
                 } else {
-                    body = ObjectSerializer.deserialize(body, "Order");
-                    if (response.statusCode && response.statusCode >= 200 && response.statusCode <= 299) {
-                        resolve({ response: response, body: body });
-                    } else {
-                        reject({ response: response, body: body });
-                    }
+                    localVarRequestOptions.form = localVarFormParams;
                 }
+            }
+            return new Promise<{ response: http.ClientResponse; body: Order;  }>((resolve, reject) => {
+                localVarRequest(localVarRequestOptions, (error, response, body) => {
+                    if (error) {
+                        reject(error);
+                    } else {
+                        body = ObjectSerializer.deserialize(body, "Order");
+                        if (response.statusCode && response.statusCode >= 200 && response.statusCode <= 299) {
+                            resolve({ response: response, body: body });
+                        } else {
+                            reject({ response: response, body: body });
+                        }
+                    }
+                });
             });
         });
     }
@@ -258,27 +264,29 @@ export class StoreApi {
             body: ObjectSerializer.serialize(body, "Order")
         };
 
-        this.authentications.default.applyToRequest(localVarRequestOptions);
-
-        if (Object.keys(localVarFormParams).length) {
-            if (localVarUseFormData) {
-                (<any>localVarRequestOptions).formData = localVarFormParams;
-            } else {
-                localVarRequestOptions.form = localVarFormParams;
-            }
-        }
-        return new Promise<{ response: http.ClientResponse; body: Order;  }>((resolve, reject) => {
-            localVarRequest(localVarRequestOptions, (error, response, body) => {
-                if (error) {
-                    reject(error);
+        let authenticationPromise = Promise.resolve();
+        authenticationPromise = authenticationPromise.then(() => this.authentications.default.applyToRequest(localVarRequestOptions));
+        return authenticationPromise.then(() => {
+            if (Object.keys(localVarFormParams).length) {
+                if (localVarUseFormData) {
+                    (<any>localVarRequestOptions).formData = localVarFormParams;
                 } else {
-                    body = ObjectSerializer.deserialize(body, "Order");
-                    if (response.statusCode && response.statusCode >= 200 && response.statusCode <= 299) {
-                        resolve({ response: response, body: body });
-                    } else {
-                        reject({ response: response, body: body });
-                    }
+                    localVarRequestOptions.form = localVarFormParams;
                 }
+            }
+            return new Promise<{ response: http.ClientResponse; body: Order;  }>((resolve, reject) => {
+                localVarRequest(localVarRequestOptions, (error, response, body) => {
+                    if (error) {
+                        reject(error);
+                    } else {
+                        body = ObjectSerializer.deserialize(body, "Order");
+                        if (response.statusCode && response.statusCode >= 200 && response.statusCode <= 299) {
+                            resolve({ response: response, body: body });
+                        } else {
+                            reject({ response: response, body: body });
+                        }
+                    }
+                });
             });
         });
     }
diff --git a/samples/client/petstore/typescript-node/npm/api/userApi.ts b/samples/client/petstore/typescript-node/npm/api/userApi.ts
index 5a7a179f04..374daf1f1b 100644
--- a/samples/client/petstore/typescript-node/npm/api/userApi.ts
+++ b/samples/client/petstore/typescript-node/npm/api/userApi.ts
@@ -99,26 +99,28 @@ export class UserApi {
             body: ObjectSerializer.serialize(body, "User")
         };
 
-        this.authentications.default.applyToRequest(localVarRequestOptions);
-
-        if (Object.keys(localVarFormParams).length) {
-            if (localVarUseFormData) {
-                (<any>localVarRequestOptions).formData = localVarFormParams;
-            } else {
-                localVarRequestOptions.form = localVarFormParams;
-            }
-        }
-        return new Promise<{ response: http.ClientResponse; body?: any;  }>((resolve, reject) => {
-            localVarRequest(localVarRequestOptions, (error, response, body) => {
-                if (error) {
-                    reject(error);
+        let authenticationPromise = Promise.resolve();
+        authenticationPromise = authenticationPromise.then(() => this.authentications.default.applyToRequest(localVarRequestOptions));
+        return authenticationPromise.then(() => {
+            if (Object.keys(localVarFormParams).length) {
+                if (localVarUseFormData) {
+                    (<any>localVarRequestOptions).formData = localVarFormParams;
                 } else {
-                    if (response.statusCode && response.statusCode >= 200 && response.statusCode <= 299) {
-                        resolve({ response: response, body: body });
-                    } else {
-                        reject({ response: response, body: body });
-                    }
+                    localVarRequestOptions.form = localVarFormParams;
                 }
+            }
+            return new Promise<{ response: http.ClientResponse; body?: any;  }>((resolve, reject) => {
+                localVarRequest(localVarRequestOptions, (error, response, body) => {
+                    if (error) {
+                        reject(error);
+                    } else {
+                        if (response.statusCode && response.statusCode >= 200 && response.statusCode <= 299) {
+                            resolve({ response: response, body: body });
+                        } else {
+                            reject({ response: response, body: body });
+                        }
+                    }
+                });
             });
         });
     }
@@ -152,26 +154,28 @@ export class UserApi {
             body: ObjectSerializer.serialize(body, "Array<User>")
         };
 
-        this.authentications.default.applyToRequest(localVarRequestOptions);
-
-        if (Object.keys(localVarFormParams).length) {
-            if (localVarUseFormData) {
-                (<any>localVarRequestOptions).formData = localVarFormParams;
-            } else {
-                localVarRequestOptions.form = localVarFormParams;
-            }
-        }
-        return new Promise<{ response: http.ClientResponse; body?: any;  }>((resolve, reject) => {
-            localVarRequest(localVarRequestOptions, (error, response, body) => {
-                if (error) {
-                    reject(error);
+        let authenticationPromise = Promise.resolve();
+        authenticationPromise = authenticationPromise.then(() => this.authentications.default.applyToRequest(localVarRequestOptions));
+        return authenticationPromise.then(() => {
+            if (Object.keys(localVarFormParams).length) {
+                if (localVarUseFormData) {
+                    (<any>localVarRequestOptions).formData = localVarFormParams;
                 } else {
-                    if (response.statusCode && response.statusCode >= 200 && response.statusCode <= 299) {
-                        resolve({ response: response, body: body });
-                    } else {
-                        reject({ response: response, body: body });
-                    }
+                    localVarRequestOptions.form = localVarFormParams;
                 }
+            }
+            return new Promise<{ response: http.ClientResponse; body?: any;  }>((resolve, reject) => {
+                localVarRequest(localVarRequestOptions, (error, response, body) => {
+                    if (error) {
+                        reject(error);
+                    } else {
+                        if (response.statusCode && response.statusCode >= 200 && response.statusCode <= 299) {
+                            resolve({ response: response, body: body });
+                        } else {
+                            reject({ response: response, body: body });
+                        }
+                    }
+                });
             });
         });
     }
@@ -205,26 +209,28 @@ export class UserApi {
             body: ObjectSerializer.serialize(body, "Array<User>")
         };
 
-        this.authentications.default.applyToRequest(localVarRequestOptions);
-
-        if (Object.keys(localVarFormParams).length) {
-            if (localVarUseFormData) {
-                (<any>localVarRequestOptions).formData = localVarFormParams;
-            } else {
-                localVarRequestOptions.form = localVarFormParams;
-            }
-        }
-        return new Promise<{ response: http.ClientResponse; body?: any;  }>((resolve, reject) => {
-            localVarRequest(localVarRequestOptions, (error, response, body) => {
-                if (error) {
-                    reject(error);
+        let authenticationPromise = Promise.resolve();
+        authenticationPromise = authenticationPromise.then(() => this.authentications.default.applyToRequest(localVarRequestOptions));
+        return authenticationPromise.then(() => {
+            if (Object.keys(localVarFormParams).length) {
+                if (localVarUseFormData) {
+                    (<any>localVarRequestOptions).formData = localVarFormParams;
                 } else {
-                    if (response.statusCode && response.statusCode >= 200 && response.statusCode <= 299) {
-                        resolve({ response: response, body: body });
-                    } else {
-                        reject({ response: response, body: body });
-                    }
+                    localVarRequestOptions.form = localVarFormParams;
                 }
+            }
+            return new Promise<{ response: http.ClientResponse; body?: any;  }>((resolve, reject) => {
+                localVarRequest(localVarRequestOptions, (error, response, body) => {
+                    if (error) {
+                        reject(error);
+                    } else {
+                        if (response.statusCode && response.statusCode >= 200 && response.statusCode <= 299) {
+                            resolve({ response: response, body: body });
+                        } else {
+                            reject({ response: response, body: body });
+                        }
+                    }
+                });
             });
         });
     }
@@ -258,26 +264,28 @@ export class UserApi {
             json: true,
         };
 
-        this.authentications.default.applyToRequest(localVarRequestOptions);
-
-        if (Object.keys(localVarFormParams).length) {
-            if (localVarUseFormData) {
-                (<any>localVarRequestOptions).formData = localVarFormParams;
-            } else {
-                localVarRequestOptions.form = localVarFormParams;
-            }
-        }
-        return new Promise<{ response: http.ClientResponse; body?: any;  }>((resolve, reject) => {
-            localVarRequest(localVarRequestOptions, (error, response, body) => {
-                if (error) {
-                    reject(error);
+        let authenticationPromise = Promise.resolve();
+        authenticationPromise = authenticationPromise.then(() => this.authentications.default.applyToRequest(localVarRequestOptions));
+        return authenticationPromise.then(() => {
+            if (Object.keys(localVarFormParams).length) {
+                if (localVarUseFormData) {
+                    (<any>localVarRequestOptions).formData = localVarFormParams;
                 } else {
-                    if (response.statusCode && response.statusCode >= 200 && response.statusCode <= 299) {
-                        resolve({ response: response, body: body });
-                    } else {
-                        reject({ response: response, body: body });
-                    }
+                    localVarRequestOptions.form = localVarFormParams;
                 }
+            }
+            return new Promise<{ response: http.ClientResponse; body?: any;  }>((resolve, reject) => {
+                localVarRequest(localVarRequestOptions, (error, response, body) => {
+                    if (error) {
+                        reject(error);
+                    } else {
+                        if (response.statusCode && response.statusCode >= 200 && response.statusCode <= 299) {
+                            resolve({ response: response, body: body });
+                        } else {
+                            reject({ response: response, body: body });
+                        }
+                    }
+                });
             });
         });
     }
@@ -311,27 +319,29 @@ export class UserApi {
             json: true,
         };
 
-        this.authentications.default.applyToRequest(localVarRequestOptions);
-
-        if (Object.keys(localVarFormParams).length) {
-            if (localVarUseFormData) {
-                (<any>localVarRequestOptions).formData = localVarFormParams;
-            } else {
-                localVarRequestOptions.form = localVarFormParams;
-            }
-        }
-        return new Promise<{ response: http.ClientResponse; body: User;  }>((resolve, reject) => {
-            localVarRequest(localVarRequestOptions, (error, response, body) => {
-                if (error) {
-                    reject(error);
+        let authenticationPromise = Promise.resolve();
+        authenticationPromise = authenticationPromise.then(() => this.authentications.default.applyToRequest(localVarRequestOptions));
+        return authenticationPromise.then(() => {
+            if (Object.keys(localVarFormParams).length) {
+                if (localVarUseFormData) {
+                    (<any>localVarRequestOptions).formData = localVarFormParams;
                 } else {
-                    body = ObjectSerializer.deserialize(body, "User");
-                    if (response.statusCode && response.statusCode >= 200 && response.statusCode <= 299) {
-                        resolve({ response: response, body: body });
-                    } else {
-                        reject({ response: response, body: body });
-                    }
+                    localVarRequestOptions.form = localVarFormParams;
                 }
+            }
+            return new Promise<{ response: http.ClientResponse; body: User;  }>((resolve, reject) => {
+                localVarRequest(localVarRequestOptions, (error, response, body) => {
+                    if (error) {
+                        reject(error);
+                    } else {
+                        body = ObjectSerializer.deserialize(body, "User");
+                        if (response.statusCode && response.statusCode >= 200 && response.statusCode <= 299) {
+                            resolve({ response: response, body: body });
+                        } else {
+                            reject({ response: response, body: body });
+                        }
+                    }
+                });
             });
         });
     }
@@ -378,27 +388,29 @@ export class UserApi {
             json: true,
         };
 
-        this.authentications.default.applyToRequest(localVarRequestOptions);
-
-        if (Object.keys(localVarFormParams).length) {
-            if (localVarUseFormData) {
-                (<any>localVarRequestOptions).formData = localVarFormParams;
-            } else {
-                localVarRequestOptions.form = localVarFormParams;
-            }
-        }
-        return new Promise<{ response: http.ClientResponse; body: string;  }>((resolve, reject) => {
-            localVarRequest(localVarRequestOptions, (error, response, body) => {
-                if (error) {
-                    reject(error);
+        let authenticationPromise = Promise.resolve();
+        authenticationPromise = authenticationPromise.then(() => this.authentications.default.applyToRequest(localVarRequestOptions));
+        return authenticationPromise.then(() => {
+            if (Object.keys(localVarFormParams).length) {
+                if (localVarUseFormData) {
+                    (<any>localVarRequestOptions).formData = localVarFormParams;
                 } else {
-                    body = ObjectSerializer.deserialize(body, "string");
-                    if (response.statusCode && response.statusCode >= 200 && response.statusCode <= 299) {
-                        resolve({ response: response, body: body });
-                    } else {
-                        reject({ response: response, body: body });
-                    }
+                    localVarRequestOptions.form = localVarFormParams;
                 }
+            }
+            return new Promise<{ response: http.ClientResponse; body: string;  }>((resolve, reject) => {
+                localVarRequest(localVarRequestOptions, (error, response, body) => {
+                    if (error) {
+                        reject(error);
+                    } else {
+                        body = ObjectSerializer.deserialize(body, "string");
+                        if (response.statusCode && response.statusCode >= 200 && response.statusCode <= 299) {
+                            resolve({ response: response, body: body });
+                        } else {
+                            reject({ response: response, body: body });
+                        }
+                    }
+                });
             });
         });
     }
@@ -425,26 +437,28 @@ export class UserApi {
             json: true,
         };
 
-        this.authentications.default.applyToRequest(localVarRequestOptions);
-
-        if (Object.keys(localVarFormParams).length) {
-            if (localVarUseFormData) {
-                (<any>localVarRequestOptions).formData = localVarFormParams;
-            } else {
-                localVarRequestOptions.form = localVarFormParams;
-            }
-        }
-        return new Promise<{ response: http.ClientResponse; body?: any;  }>((resolve, reject) => {
-            localVarRequest(localVarRequestOptions, (error, response, body) => {
-                if (error) {
-                    reject(error);
+        let authenticationPromise = Promise.resolve();
+        authenticationPromise = authenticationPromise.then(() => this.authentications.default.applyToRequest(localVarRequestOptions));
+        return authenticationPromise.then(() => {
+            if (Object.keys(localVarFormParams).length) {
+                if (localVarUseFormData) {
+                    (<any>localVarRequestOptions).formData = localVarFormParams;
                 } else {
-                    if (response.statusCode && response.statusCode >= 200 && response.statusCode <= 299) {
-                        resolve({ response: response, body: body });
-                    } else {
-                        reject({ response: response, body: body });
-                    }
+                    localVarRequestOptions.form = localVarFormParams;
                 }
+            }
+            return new Promise<{ response: http.ClientResponse; body?: any;  }>((resolve, reject) => {
+                localVarRequest(localVarRequestOptions, (error, response, body) => {
+                    if (error) {
+                        reject(error);
+                    } else {
+                        if (response.statusCode && response.statusCode >= 200 && response.statusCode <= 299) {
+                            resolve({ response: response, body: body });
+                        } else {
+                            reject({ response: response, body: body });
+                        }
+                    }
+                });
             });
         });
     }
@@ -485,26 +499,28 @@ export class UserApi {
             body: ObjectSerializer.serialize(body, "User")
         };
 
-        this.authentications.default.applyToRequest(localVarRequestOptions);
-
-        if (Object.keys(localVarFormParams).length) {
-            if (localVarUseFormData) {
-                (<any>localVarRequestOptions).formData = localVarFormParams;
-            } else {
-                localVarRequestOptions.form = localVarFormParams;
-            }
-        }
-        return new Promise<{ response: http.ClientResponse; body?: any;  }>((resolve, reject) => {
-            localVarRequest(localVarRequestOptions, (error, response, body) => {
-                if (error) {
-                    reject(error);
+        let authenticationPromise = Promise.resolve();
+        authenticationPromise = authenticationPromise.then(() => this.authentications.default.applyToRequest(localVarRequestOptions));
+        return authenticationPromise.then(() => {
+            if (Object.keys(localVarFormParams).length) {
+                if (localVarUseFormData) {
+                    (<any>localVarRequestOptions).formData = localVarFormParams;
                 } else {
-                    if (response.statusCode && response.statusCode >= 200 && response.statusCode <= 299) {
-                        resolve({ response: response, body: body });
-                    } else {
-                        reject({ response: response, body: body });
-                    }
+                    localVarRequestOptions.form = localVarFormParams;
                 }
+            }
+            return new Promise<{ response: http.ClientResponse; body?: any;  }>((resolve, reject) => {
+                localVarRequest(localVarRequestOptions, (error, response, body) => {
+                    if (error) {
+                        reject(error);
+                    } else {
+                        if (response.statusCode && response.statusCode >= 200 && response.statusCode <= 299) {
+                            resolve({ response: response, body: body });
+                        } else {
+                            reject({ response: response, body: body });
+                        }
+                    }
+                });
             });
         });
     }
diff --git a/samples/client/petstore/typescript-node/npm/model/models.ts b/samples/client/petstore/typescript-node/npm/model/models.ts
index 7b0dc89cbf..73d5122442 100644
--- a/samples/client/petstore/typescript-node/npm/model/models.ts
+++ b/samples/client/petstore/typescript-node/npm/model/models.ts
@@ -155,7 +155,7 @@ export interface Authentication {
     /**
     * Apply authentication settings to header and query params.
     */
-    applyToRequest(requestOptions: localVarRequest.Options): void;
+    applyToRequest(requestOptions: localVarRequest.Options): Promise<void> | void;
 }
 
 export class HttpBasicAuth implements Authentication {

From d2576f411e0222c3f4fe998037a76b08b472db12 Mon Sep 17 00:00:00 2001
From: Bernd Hacker <hacker.bernd@gmail.com>
Date: Mon, 22 Jul 2019 11:21:37 +0200
Subject: [PATCH 37/62] [typescript-rxjs] runtime and api cleanup (#3316)

* feat(typescript-rxjs): use interfaces from rxjs/ajax, use shorthands

* feat(typescript-rxjs): regenerate samples

* docs(typescript-rxjs): extend readme by middleware howto

* feat(typescript-rxjs): stop generating empty comment when there is no description in model

* feat(typescript-rxjs): import throwIfRequired and COLLECTION_FORMATS only when needed

* feat(typescript-rxjs): generate HttpHeaders and HttpQuery only if needed, improve formatting

* feat(typescript-rxjs): conditionally import HttpHeaders and HttpQuery

* feat(typescript-rxjs): add encodeURI helper, refactor queryString helper

* feat(typescript-rxjs): improve condition for hasListContainers

* feat(typescript-rxjs): regenerate samples
---
 .../TypeScriptRxjsClientCodegen.java          | 159 ++++++++++++++++--
 .../resources/typescript-rxjs/README.mustache |  44 ++++-
 .../resources/typescript-rxjs/apis.mustache   |  14 +-
 .../typescript-rxjs/modelGeneric.mustache     |   4 +-
 .../typescript-rxjs/runtime.mustache          |  76 ++++-----
 .../builds/default/apis/PetApi.ts             |  42 +----
 .../builds/default/apis/StoreApi.ts           |  35 +---
 .../builds/default/apis/UserApi.ts            |  63 +------
 .../builds/default/models/ApiResponse.ts      |   3 -
 .../builds/default/models/Category.ts         |   2 -
 .../builds/default/models/Order.ts            |   5 -
 .../builds/default/models/Pet.ts              |   5 -
 .../builds/default/models/Tag.ts              |   2 -
 .../builds/default/models/User.ts             |   7 -
 .../typescript-rxjs/builds/default/runtime.ts |  76 ++++-----
 .../builds/es6-target/README.md               |  44 ++++-
 .../builds/es6-target/apis/PetApi.ts          |  42 +----
 .../builds/es6-target/apis/StoreApi.ts        |  35 +---
 .../builds/es6-target/apis/UserApi.ts         |  63 +------
 .../builds/es6-target/models/ApiResponse.ts   |   3 -
 .../builds/es6-target/models/Category.ts      |   2 -
 .../builds/es6-target/models/Order.ts         |   5 -
 .../builds/es6-target/models/Pet.ts           |   5 -
 .../builds/es6-target/models/Tag.ts           |   2 -
 .../builds/es6-target/models/User.ts          |   7 -
 .../builds/es6-target/runtime.ts              |  76 ++++-----
 .../builds/with-interfaces/apis/PetApi.ts     |  42 +----
 .../builds/with-interfaces/apis/StoreApi.ts   |  35 +---
 .../builds/with-interfaces/apis/UserApi.ts    |  63 +------
 .../with-interfaces/models/ApiResponse.ts     |   3 -
 .../builds/with-interfaces/models/Category.ts |   2 -
 .../builds/with-interfaces/models/Order.ts    |   5 -
 .../builds/with-interfaces/models/Pet.ts      |   5 -
 .../builds/with-interfaces/models/Tag.ts      |   2 -
 .../builds/with-interfaces/models/User.ts     |   7 -
 .../builds/with-interfaces/runtime.ts         |  76 ++++-----
 .../builds/with-npm-version/README.md         |  44 ++++-
 .../builds/with-npm-version/apis/PetApi.ts    |  42 +----
 .../builds/with-npm-version/apis/StoreApi.ts  |  35 +---
 .../builds/with-npm-version/apis/UserApi.ts   |  63 +------
 .../with-npm-version/models/ApiResponse.ts    |   3 -
 .../with-npm-version/models/Category.ts       |   2 -
 .../builds/with-npm-version/models/Order.ts   |   5 -
 .../builds/with-npm-version/models/Pet.ts     |   5 -
 .../builds/with-npm-version/models/Tag.ts     |   2 -
 .../builds/with-npm-version/models/User.ts    |   7 -
 .../builds/with-npm-version/runtime.ts        |  76 ++++-----
 47 files changed, 537 insertions(+), 808 deletions(-)

diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/TypeScriptRxjsClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/TypeScriptRxjsClientCodegen.java
index f7f96501dd..267711f961 100644
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/TypeScriptRxjsClientCodegen.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/TypeScriptRxjsClientCodegen.java
@@ -28,6 +28,7 @@ import java.text.SimpleDateFormat;
 import java.util.TreeSet;
 import java.util.Date;
 import java.util.List;
+import java.util.ArrayList;
 import java.util.Locale;
 import java.util.Map;
 
@@ -162,26 +163,36 @@ public class TypeScriptRxjsClientCodegen extends AbstractTypeScriptClientCodegen
     }
 
     private void addNpmPackageGeneration() {
-
         if (additionalProperties.containsKey(NPM_REPOSITORY)) {
             this.setNpmRepository(additionalProperties.get(NPM_REPOSITORY).toString());
         }
 
-        //Files for building our lib
+        // Files for building our lib
         supportingFiles.add(new SupportingFile("README.mustache", "", "README.md"));
         supportingFiles.add(new SupportingFile("package.mustache", "", "package.json"));
     }
 
     @Override
     public Map<String, Object> postProcessOperationsWithModels(Map<String, Object> operations, List<Object> allModels) {
-        this.addOperationModelImportInfomation(operations);
+        // Convert List of CodegenOperation to List of ExtendedCodegenOperation
+        Map<String, Object> _operations = (Map<String, Object>) operations.get("operations");
+        List<CodegenOperation> os = (List<CodegenOperation>) _operations.get("operation");
+        List<ExtendedCodegenOperation> newOs = new ArrayList<ExtendedCodegenOperation>();
+        for (CodegenOperation o : os) {
+            newOs.add(new ExtendedCodegenOperation(o));
+        }
+        _operations.put("operation", newOs);
+
+        this.addOperationModelImportInformation(operations);
         this.updateOperationParameterEnumInformation(operations);
+        this.addConditionalImportInformation(operations);
+
         return operations;
     }
 
-    private void addOperationModelImportInfomation(Map<String, Object> operations) {
-        // This method will add extra infomation to the operations.imports array.
-        // The api template uses this infomation to import all the required
+    private void addOperationModelImportInformation(Map<String, Object> operations) {
+        // This method will add extra information to the operations.imports array.
+        // The api template uses this information to import all the required
         // models for a given operation.
         List<Map<String, Object>> imports = (List<Map<String, Object>>) operations.get("imports");
         for (Map<String, Object> im : imports) {
@@ -190,22 +201,79 @@ public class TypeScriptRxjsClientCodegen extends AbstractTypeScriptClientCodegen
     }
 
     private void updateOperationParameterEnumInformation(Map<String, Object> operations) {
-        // This method will add extra infomation as to whether or not we have enums and
+        // This method will add extra information as to whether or not we have enums and
         // update their names with the operation.id prefixed.
         Map<String, Object> _operations = (Map<String, Object>) operations.get("operations");
-        List<CodegenOperation> operationList = (List<CodegenOperation>) _operations.get("operation");
-        boolean hasEnum = false;
-        for (CodegenOperation op : operationList) {
+        List<ExtendedCodegenOperation> operationList = (List<ExtendedCodegenOperation>) _operations.get("operation");
+        boolean hasEnums = false;
+        for (ExtendedCodegenOperation op : operationList) {
             for (CodegenParameter param : op.allParams) {
                 if (Boolean.TRUE.equals(param.isEnum)) {
-                    hasEnum = true;
+                    hasEnums = true;
                     param.datatypeWithEnum = param.datatypeWithEnum
                             .replace(param.enumName, op.operationIdCamelCase + param.enumName);
                 }
             }
         }
 
-        operations.put("hasEnums", hasEnum);
+        operations.put("hasEnums", hasEnums);
+    }
+
+    private void addConditionalImportInformation(Map<String, Object> operations) {
+        // This method will determine if there are required parameters and if there are list containers
+        Map<String, Object> _operations = (Map<String, Object>) operations.get("operations");
+        List<ExtendedCodegenOperation> operationList = (List<ExtendedCodegenOperation>) _operations.get("operation");
+        
+        boolean hasRequiredParameters = false;
+        boolean hasListContainers = false;
+        boolean hasHttpHeaders = false;
+        boolean hasQueryParams = false;
+        boolean hasPathParams = false;
+
+        for (ExtendedCodegenOperation op : operationList) {
+            if (op.getHasRequiredParams()) {
+                hasRequiredParameters = true;
+            }
+            
+            for (CodegenParameter param : op.headerParams) {
+                if (param.isListContainer) {
+                    hasListContainers = true;
+                    break;
+                }
+            }
+            for (CodegenParameter param : op.queryParams) {
+                if (param.isListContainer && !param.isCollectionFormatMulti) {
+                    hasListContainers = true;
+                    break;
+                }
+            }
+            for (CodegenParameter param : op.formParams) {
+                if (param.isListContainer && !param.isCollectionFormatMulti) {
+                    hasListContainers = true;
+                    break;
+                }
+            }
+
+            if (op.hasHttpHeaders) {
+                hasHttpHeaders = true;
+            }
+            if (op.getHasQueryParams()) {
+                hasQueryParams = true;
+            }
+            if (op.getHasPathParams()) {
+                hasPathParams = true;
+            }
+
+            if(hasRequiredParameters && hasListContainers && hasHttpHeaders && hasQueryParams && hasPathParams){
+                break;
+            }
+        }
+
+        operations.put("hasRequiredParameters", hasRequiredParameters);
+        operations.put("hasListContainers", hasListContainers);
+        operations.put("hasHttpHeaders", hasHttpHeaders);
+        operations.put("hasQueryParams", hasQueryParams);
+        operations.put("hasPathParams", hasPathParams);
     }
 
     private void addExtraReservedWords() {
@@ -228,4 +296,71 @@ public class TypeScriptRxjsClientCodegen extends AbstractTypeScriptClientCodegen
         this.reservedWords.add("Middleware");
         this.reservedWords.add("AjaxResponse");
     }
+
+    class ExtendedCodegenOperation extends CodegenOperation {
+        public boolean hasHttpHeaders;
+
+        public ExtendedCodegenOperation(CodegenOperation o) {
+            super();
+
+            // Copy all fields of CodegenOperation
+            this.responseHeaders.addAll(o.responseHeaders);
+            this.hasAuthMethods = o.hasAuthMethods;
+            this.hasConsumes = o.hasConsumes;
+            this.hasProduces = o.hasProduces;
+            this.hasParams = o.hasParams;
+            this.hasOptionalParams = o.hasOptionalParams;
+            this.returnTypeIsPrimitive = o.returnTypeIsPrimitive;
+            this.returnSimpleType = o.returnSimpleType;
+            this.subresourceOperation = o.subresourceOperation;
+            this.isMapContainer = o.isMapContainer;
+            this.isListContainer = o.isListContainer;
+            this.isMultipart = o.isMultipart;
+            this.hasMore = o.hasMore;
+            this.isResponseBinary = o.isResponseBinary;
+            this.hasReference = o.hasReference;
+            this.isRestfulIndex = o.isRestfulIndex;
+            this.isRestfulShow = o.isRestfulShow;
+            this.isRestfulCreate = o.isRestfulCreate;
+            this.isRestfulUpdate = o.isRestfulUpdate;
+            this.isRestfulDestroy = o.isRestfulDestroy;
+            this.isRestful = o.isRestful;
+            this.path = o.path;
+            this.operationId = o.operationId;
+            this.returnType = o.returnType;
+            this.httpMethod = o.httpMethod;
+            this.returnBaseType = o.returnBaseType;
+            this.returnContainer = o.returnContainer;
+            this.summary = o.summary;
+            this.unescapedNotes = o.unescapedNotes;
+            this.notes = o.notes;
+            this.baseName = o.baseName;
+            this.defaultResponse = o.defaultResponse;
+            this.discriminator = o.discriminator;
+            this.consumes = o.consumes;
+            this.produces = o.produces;
+            this.bodyParam = o.bodyParam;
+            this.allParams = o.allParams;
+            this.bodyParams = o.bodyParams;
+            this.pathParams = o.pathParams;
+            this.queryParams = o.queryParams;
+            this.headerParams = o.headerParams;
+            this.formParams = o.formParams;
+            this.requiredParams = o.requiredParams;
+            this.optionalParams = o.optionalParams;
+            this.authMethods = o.authMethods;
+            this.tags = o.tags;
+            this.responses = o.responses;
+            this.imports = o.imports;
+            this.examples = o.examples;
+            this.externalDocs = o.externalDocs;
+            this.vendorExtensions = o.vendorExtensions;
+            this.nickname = o.nickname;
+            this.operationIdLowerCase = o.operationIdLowerCase;
+            this.operationIdCamelCase = o.operationIdCamelCase;
+
+            // new fields
+            this.hasHttpHeaders = o.getHasHeaderParams() || o.getHasBodyParam() || o.hasAuthMethods;
+        }
+    }
 }
diff --git a/modules/openapi-generator/src/main/resources/typescript-rxjs/README.mustache b/modules/openapi-generator/src/main/resources/typescript-rxjs/README.mustache
index 624571727a..017994bbe8 100644
--- a/modules/openapi-generator/src/main/resources/typescript-rxjs/README.mustache
+++ b/modules/openapi-generator/src/main/resources/typescript-rxjs/README.mustache
@@ -27,7 +27,7 @@ npm run build
 
 ### Publishing
 
-First build the package then run ```npm publish```
+First build the package then run `npm publish`
 
 ### Consuming
 
@@ -43,3 +43,45 @@ _unPublished (not recommended):_
 
 ```
 npm install PATH_TO_GENERATED_PACKAGE --save
+```
+
+### How to apply middleware
+
+First, add a singleton class that extends the generated `Configuration` class.
+
+```
+export class AuthInterceptor extends Configuration {
+  private static config: AuthInterceptor;
+
+  private constructor() {
+    const middleware: Middleware[] = [
+      {
+        pre(request: RequestArgs): RequestArgs {
+          const token = getAuthToken();
+
+          return {
+            ...request,
+            headers: {
+              ...request.headers,
+              Authorization: `Bearer ${token}`,
+            },
+          };
+        },
+      },
+    ];
+
+    super({ middleware });
+  }
+
+  public static get Instance() {
+    return AuthInterceptor.config || (AuthInterceptor.config = new this());
+  }
+}
+```
+
+Next, pass it to the generated api controller.
+
+```
+const api = new StoreApi(AuthInterceptor.Instance);
+
+```
diff --git a/modules/openapi-generator/src/main/resources/typescript-rxjs/apis.mustache b/modules/openapi-generator/src/main/resources/typescript-rxjs/apis.mustache
index fe486821da..70b0ea8872 100644
--- a/modules/openapi-generator/src/main/resources/typescript-rxjs/apis.mustache
+++ b/modules/openapi-generator/src/main/resources/typescript-rxjs/apis.mustache
@@ -1,7 +1,7 @@
 // tslint:disable
 {{>licenseInfo}}
 import { Observable } from 'rxjs';
-import { BaseAPI, throwIfRequired, HttpHeaders, HttpQuery, COLLECTION_FORMATS } from '../runtime';
+import { BaseAPI{{#hasHttpHeaders}}, HttpHeaders{{/hasHttpHeaders}}{{#hasQueryParams}}, HttpQuery{{/hasQueryParams}}{{#hasRequiredParameters}}, throwIfRequired{{/hasRequiredParameters}}{{#hasPathParams}}, encodeURI{{/hasPathParams}}{{#hasListContainers}}, COLLECTION_FORMATS{{/hasListContainers}} } from '../runtime';
 {{#imports.0}}
 import {
     {{#imports}}
@@ -38,12 +38,15 @@ export class {{classname}} extends BaseAPI {
      {{/summary}}
      */
     {{nickname}} = ({{#allParams.0}}requestParameters: {{operationIdCamelCase}}Request{{/allParams.0}}): Observable<{{#returnType}}{{{returnType}}}{{/returnType}}{{^returnType}}void{{/returnType}}> => {
+        {{#hasParams}}
         {{#allParams}}
         {{#required}}
         throwIfRequired(requestParameters, '{{paramName}}', '{{nickname}}');
         {{/required}}
         {{/allParams}}
 
+        {{/hasParams}}
+        {{#hasHttpHeaders}}
         const headers: HttpHeaders = {
             {{#bodyParam}}
             {{^consumes}}
@@ -81,6 +84,8 @@ export class {{classname}} extends BaseAPI {
             {{/authMethods}}
         };
 
+        {{/hasHttpHeaders}}
+        {{#hasQueryParams}}
         const query: HttpQuery = {
             {{#queryParams}}
             {{#isListContainer}}
@@ -114,6 +119,7 @@ export class {{classname}} extends BaseAPI {
             {{/authMethods}}
         };
 
+        {{/hasQueryParams}}
         {{#hasFormParams}}
         const formData = new FormData();
         {{/hasFormParams}}
@@ -139,10 +145,14 @@ export class {{classname}} extends BaseAPI {
         {{/isListContainer}}
         {{/formParams}}
         return this.request<{{#returnType}}{{{returnType}}}{{/returnType}}{{^returnType}}void{{/returnType}}>({
-            path: `{{{path}}}`{{#pathParams}}.replace({{=<% %>=}}`{<%baseName%>}`<%={{ }}=%>, encodeURIComponent(String(requestParameters.{{paramName}}))){{/pathParams}},
+            path: '{{{path}}}'{{#pathParams}}.replace({{=<% %>=}}'{<%baseName%>}'<%={{ }}=%>, encodeURI(requestParameters.{{paramName}})){{/pathParams}},
             method: '{{httpMethod}}',
+            {{#hasHttpHeaders}}
             headers,
+            {{/hasHttpHeaders}}
+            {{#hasQueryParams}}
             query,
+            {{/hasQueryParams}}
             {{#hasBodyParam}}
             {{#bodyParam}}
             {{#isContainer}}
diff --git a/modules/openapi-generator/src/main/resources/typescript-rxjs/modelGeneric.mustache b/modules/openapi-generator/src/main/resources/typescript-rxjs/modelGeneric.mustache
index ce0cc74bbd..543ab776e4 100644
--- a/modules/openapi-generator/src/main/resources/typescript-rxjs/modelGeneric.mustache
+++ b/modules/openapi-generator/src/main/resources/typescript-rxjs/modelGeneric.mustache
@@ -16,8 +16,8 @@ export interface {{classname}} {{#parent}}extends {{{parent}}} {{/parent}}{
     [key: string]: {{{additionalPropertiesType}}}{{#hasVars}} | any{{/hasVars}};
 {{/additionalPropertiesType}}
 {{#vars}}
-    /**
-     * {{{description}}}
+    /**{{#description}}
+     * {{{description}}}{{/description}}
      * @type {{=<% %>=}}{<%&datatype%>}<%={{ }}=%>
      * @memberof {{classname}}
      */
diff --git a/modules/openapi-generator/src/main/resources/typescript-rxjs/runtime.mustache b/modules/openapi-generator/src/main/resources/typescript-rxjs/runtime.mustache
index b426f80ab0..9592c345d1 100644
--- a/modules/openapi-generator/src/main/resources/typescript-rxjs/runtime.mustache
+++ b/modules/openapi-generator/src/main/resources/typescript-rxjs/runtime.mustache
@@ -1,7 +1,7 @@
 // tslint:disable
 {{>licenseInfo}}
 import { Observable, of } from 'rxjs';
-import { ajax, AjaxResponse } from 'rxjs/ajax';
+import { ajax, AjaxRequest, AjaxResponse } from 'rxjs/ajax';
 import { map, concatMap } from 'rxjs/operators';
 
 export const BASE_PATH = '{{{basePath}}}'.replace(/\/+$/, '');
@@ -73,8 +73,8 @@ export class BaseAPI {
     withPostMiddleware = <T extends BaseAPI>(postMiddlewares: Array<Middleware['post']>) =>
         this.withMiddleware<T>(postMiddlewares.map((post) => ({ post })));
 
-    protected request = <T>(context: RequestOpts): Observable<T> => 
-        this.rxjsRequest(this.createRequestArgs(context)).pipe(
+    protected request = <T>(requestOpts: RequestOpts): Observable<T> => 
+        this.rxjsRequest(this.createRequestArgs(requestOpts)).pipe(
             map((res) => {
                 if (res.status >= 200 && res.status < 300) {
                     return res.response as T;
@@ -83,46 +83,38 @@ export class BaseAPI {
             })
         );
 
-    private createRequestArgs = (context: RequestOpts): RequestArgs => {
-        let url = this.configuration.basePath + context.path;
-        if (context.query !== undefined && Object.keys(context.query).length !== 0) {
+    private createRequestArgs = (requestOpts: RequestOpts): RequestArgs => {
+        let url = this.configuration.basePath + requestOpts.path;
+        if (requestOpts.query !== undefined && Object.keys(requestOpts.query).length !== 0) {
             // only add the queryString to the URL if there are query parameters.
             // this is done to avoid urls ending with a '?' character which buggy webservers
             // do not handle correctly sometimes.
-            url += '?' + queryString(context.query);
+            url += '?' + queryString(requestOpts.query);
         }
-        const body = context.body instanceof FormData ? context.body : JSON.stringify(context.body);
-        const options = {
-            method: context.method,
-            headers: context.headers,
-            body,
+        
+        return {
+            url,
+            method: requestOpts.method,
+            headers: requestOpts.headers,
+            body: requestOpts.body instanceof FormData ? requestOpts.body : JSON.stringify(requestOpts.body),
         };
-        return { url, options };
     }
 
-    private rxjsRequest = (params: RequestContext): Observable<AjaxResponse> => {
-        const preMiddlewares = this.middleware.filter((item) => item.pre);
-        const postMiddlewares = this.middleware.filter((item) => item.post);
-
-        return of(params).pipe(
-            map((args) => {
-                if (preMiddlewares) {
-                    preMiddlewares.forEach((mw) => (args = mw.pre!({ ...args })));
-                }
-                return args;
+    private rxjsRequest = (params: RequestArgs): Observable<AjaxResponse> => 
+        of(params).pipe(
+            map((request) => {
+                this.middleware.filter((item) => item.pre).forEach((mw) => (request = mw.pre!(request)));
+                return request;
             }),
             concatMap((args) =>
-                ajax({ url: args.url, ...args.options }).pipe(
+                ajax(args).pipe(
                     map((response) => {
-                        if (postMiddlewares) {
-                            postMiddlewares.forEach((mw) => (response = mw.post!({ ...params, response })));
-                        }
+                        this.middleware.filter((item) => item.post).forEach((mw) => (response = mw.post!(response)));
                         return response;
                     })
                 )
             )
         );
-    }
 
     /**
      * Create a shallow clone of `this` by constructing a new instance
@@ -151,27 +143,22 @@ export type HttpQuery = { [key: string]: string | number | null | boolean | Arra
 export type HttpBody = Json | FormData;
 export type ModelPropertyNaming = 'camelCase' | 'snake_case' | 'PascalCase' | 'original';
 
-export interface RequestArgs {
-    url: string;
-    options: RequestInit;
-}
-
 export interface RequestOpts {
     path: string;
     method: HttpMethod;
-    headers: HttpHeaders;
+    headers?: HttpHeaders;
     query?: HttpQuery;
     body?: HttpBody;
 }
 
+export const encodeURI = (value: any) => encodeURIComponent(String(value))
+
 const queryString = (params: HttpQuery): string => Object.keys(params)
     .map((key) => {
         const value = params[key];
-        if (value instanceof Array) {
-            return value.map((val) => `${encodeURIComponent(key)}=${encodeURIComponent(String(val))}`)
-                .join('&');
-        }
-        return `${encodeURIComponent(key)}=${encodeURIComponent(String(value))}`;
+        return (value instanceof Array)
+            ? value.map((val) => `${encodeURI(key)}=${encodeURI(val)}`).join('&')
+            : `${encodeURI(key)}=${encodeURI(value)}`;
     })
     .join('&');
 
@@ -184,12 +171,11 @@ export const throwIfRequired = (params: {[key: string]: any}, key: string, nickn
     }
 }
 
-export interface RequestContext extends RequestArgs {}
-export interface ResponseContext extends RequestArgs {
-    response: AjaxResponse;
-}
+// alias for easier importing
+export interface RequestArgs extends AjaxRequest {}
+export interface ResponseArgs extends AjaxResponse {}
 
 export interface Middleware {
-    pre?(context: RequestContext): RequestArgs;
-    post?(context: ResponseContext): AjaxResponse;
+    pre?(request: RequestArgs): RequestArgs;
+    post?(response: ResponseArgs): ResponseArgs;
 }
diff --git a/samples/client/petstore/typescript-rxjs/builds/default/apis/PetApi.ts b/samples/client/petstore/typescript-rxjs/builds/default/apis/PetApi.ts
index 8f8db90ce7..1d8a5f0011 100644
--- a/samples/client/petstore/typescript-rxjs/builds/default/apis/PetApi.ts
+++ b/samples/client/petstore/typescript-rxjs/builds/default/apis/PetApi.ts
@@ -12,7 +12,7 @@
  */
 
 import { Observable } from 'rxjs';
-import { BaseAPI, throwIfRequired, HttpHeaders, HttpQuery, COLLECTION_FORMATS } from '../runtime';
+import { BaseAPI, HttpHeaders, HttpQuery, throwIfRequired, encodeURI, COLLECTION_FORMATS } from '../runtime';
 import {
     ApiResponse,
     Pet,
@@ -76,14 +76,10 @@ export class PetApi extends BaseAPI {
             }),
         };
 
-        const query: HttpQuery = {
-        };
-
         return this.request<void>({
-            path: `/pet`,
+            path: '/pet',
             method: 'POST',
             headers,
-            query,
             body: requestParameters.body,
         });
     }
@@ -104,14 +100,10 @@ export class PetApi extends BaseAPI {
             }),
         };
 
-        const query: HttpQuery = {
-        };
-
         return this.request<void>({
-            path: `/pet/{petId}`.replace(`{petId}`, encodeURIComponent(String(requestParameters.petId))),
+            path: '/pet/{petId}'.replace('{petId}', encodeURI(requestParameters.petId)),
             method: 'DELETE',
             headers,
-            query,
         });
     }
 
@@ -136,7 +128,7 @@ export class PetApi extends BaseAPI {
         };
 
         return this.request<Array<Pet>>({
-            path: `/pet/findByStatus`,
+            path: '/pet/findByStatus',
             method: 'GET',
             headers,
             query,
@@ -164,7 +156,7 @@ export class PetApi extends BaseAPI {
         };
 
         return this.request<Array<Pet>>({
-            path: `/pet/findByTags`,
+            path: '/pet/findByTags',
             method: 'GET',
             headers,
             query,
@@ -182,14 +174,10 @@ export class PetApi extends BaseAPI {
             ...(this.configuration.apiKey && { 'api_key': this.configuration.apiKey('api_key') }), // api_key authentication
         };
 
-        const query: HttpQuery = {
-        };
-
         return this.request<Pet>({
-            path: `/pet/{petId}`.replace(`{petId}`, encodeURIComponent(String(requestParameters.petId))),
+            path: '/pet/{petId}'.replace('{petId}', encodeURI(requestParameters.petId)),
             method: 'GET',
             headers,
-            query,
         });
     }
 
@@ -209,14 +197,10 @@ export class PetApi extends BaseAPI {
             }),
         };
 
-        const query: HttpQuery = {
-        };
-
         return this.request<void>({
-            path: `/pet`,
+            path: '/pet',
             method: 'PUT',
             headers,
-            query,
             body: requestParameters.body,
         });
     }
@@ -236,9 +220,6 @@ export class PetApi extends BaseAPI {
             }),
         };
 
-        const query: HttpQuery = {
-        };
-
         const formData = new FormData();
         if (requestParameters.name !== undefined) {
             formData.append('name', requestParameters.name as any);
@@ -249,10 +230,9 @@ export class PetApi extends BaseAPI {
         }
 
         return this.request<void>({
-            path: `/pet/{petId}`.replace(`{petId}`, encodeURIComponent(String(requestParameters.petId))),
+            path: '/pet/{petId}'.replace('{petId}', encodeURI(requestParameters.petId)),
             method: 'POST',
             headers,
-            query,
             body: formData,
         });
     }
@@ -272,9 +252,6 @@ export class PetApi extends BaseAPI {
             }),
         };
 
-        const query: HttpQuery = {
-        };
-
         const formData = new FormData();
         if (requestParameters.additionalMetadata !== undefined) {
             formData.append('additionalMetadata', requestParameters.additionalMetadata as any);
@@ -285,10 +262,9 @@ export class PetApi extends BaseAPI {
         }
 
         return this.request<ApiResponse>({
-            path: `/pet/{petId}/uploadImage`.replace(`{petId}`, encodeURIComponent(String(requestParameters.petId))),
+            path: '/pet/{petId}/uploadImage'.replace('{petId}', encodeURI(requestParameters.petId)),
             method: 'POST',
             headers,
-            query,
             body: formData,
         });
     }
diff --git a/samples/client/petstore/typescript-rxjs/builds/default/apis/StoreApi.ts b/samples/client/petstore/typescript-rxjs/builds/default/apis/StoreApi.ts
index d7350a8151..b3e038e894 100644
--- a/samples/client/petstore/typescript-rxjs/builds/default/apis/StoreApi.ts
+++ b/samples/client/petstore/typescript-rxjs/builds/default/apis/StoreApi.ts
@@ -12,7 +12,7 @@
  */
 
 import { Observable } from 'rxjs';
-import { BaseAPI, throwIfRequired, HttpHeaders, HttpQuery, COLLECTION_FORMATS } from '../runtime';
+import { BaseAPI, HttpHeaders, throwIfRequired, encodeURI } from '../runtime';
 import {
     Order,
 } from '../models';
@@ -41,17 +41,9 @@ export class StoreApi extends BaseAPI {
     deleteOrder = (requestParameters: DeleteOrderRequest): Observable<void> => {
         throwIfRequired(requestParameters, 'orderId', 'deleteOrder');
 
-        const headers: HttpHeaders = {
-        };
-
-        const query: HttpQuery = {
-        };
-
         return this.request<void>({
-            path: `/store/order/{orderId}`.replace(`{orderId}`, encodeURIComponent(String(requestParameters.orderId))),
+            path: '/store/order/{orderId}'.replace('{orderId}', encodeURI(requestParameters.orderId)),
             method: 'DELETE',
-            headers,
-            query,
         });
     }
 
@@ -60,19 +52,14 @@ export class StoreApi extends BaseAPI {
      * Returns pet inventories by status
      */
     getInventory = (): Observable<{ [key: string]: number; }> => {
-
         const headers: HttpHeaders = {
             ...(this.configuration.apiKey && { 'api_key': this.configuration.apiKey('api_key') }), // api_key authentication
         };
 
-        const query: HttpQuery = {
-        };
-
         return this.request<{ [key: string]: number; }>({
-            path: `/store/inventory`,
+            path: '/store/inventory',
             method: 'GET',
             headers,
-            query,
         });
     }
 
@@ -83,17 +70,9 @@ export class StoreApi extends BaseAPI {
     getOrderById = (requestParameters: GetOrderByIdRequest): Observable<Order> => {
         throwIfRequired(requestParameters, 'orderId', 'getOrderById');
 
-        const headers: HttpHeaders = {
-        };
-
-        const query: HttpQuery = {
-        };
-
         return this.request<Order>({
-            path: `/store/order/{orderId}`.replace(`{orderId}`, encodeURIComponent(String(requestParameters.orderId))),
+            path: '/store/order/{orderId}'.replace('{orderId}', encodeURI(requestParameters.orderId)),
             method: 'GET',
-            headers,
-            query,
         });
     }
 
@@ -107,14 +86,10 @@ export class StoreApi extends BaseAPI {
             'Content-Type': 'application/json',
         };
 
-        const query: HttpQuery = {
-        };
-
         return this.request<Order>({
-            path: `/store/order`,
+            path: '/store/order',
             method: 'POST',
             headers,
-            query,
             body: requestParameters.body,
         });
     }
diff --git a/samples/client/petstore/typescript-rxjs/builds/default/apis/UserApi.ts b/samples/client/petstore/typescript-rxjs/builds/default/apis/UserApi.ts
index 8b994caf6c..c356d96e91 100644
--- a/samples/client/petstore/typescript-rxjs/builds/default/apis/UserApi.ts
+++ b/samples/client/petstore/typescript-rxjs/builds/default/apis/UserApi.ts
@@ -12,7 +12,7 @@
  */
 
 import { Observable } from 'rxjs';
-import { BaseAPI, throwIfRequired, HttpHeaders, HttpQuery, COLLECTION_FORMATS } from '../runtime';
+import { BaseAPI, HttpHeaders, HttpQuery, throwIfRequired, encodeURI } from '../runtime';
 import {
     User,
 } from '../models';
@@ -63,14 +63,10 @@ export class UserApi extends BaseAPI {
             'Content-Type': 'application/json',
         };
 
-        const query: HttpQuery = {
-        };
-
         return this.request<void>({
-            path: `/user`,
+            path: '/user',
             method: 'POST',
             headers,
-            query,
             body: requestParameters.body,
         });
     }
@@ -85,14 +81,10 @@ export class UserApi extends BaseAPI {
             'Content-Type': 'application/json',
         };
 
-        const query: HttpQuery = {
-        };
-
         return this.request<void>({
-            path: `/user/createWithArray`,
+            path: '/user/createWithArray',
             method: 'POST',
             headers,
-            query,
             body: requestParameters.body,
         });
     }
@@ -107,14 +99,10 @@ export class UserApi extends BaseAPI {
             'Content-Type': 'application/json',
         };
 
-        const query: HttpQuery = {
-        };
-
         return this.request<void>({
-            path: `/user/createWithList`,
+            path: '/user/createWithList',
             method: 'POST',
             headers,
-            query,
             body: requestParameters.body,
         });
     }
@@ -126,17 +114,9 @@ export class UserApi extends BaseAPI {
     deleteUser = (requestParameters: DeleteUserRequest): Observable<void> => {
         throwIfRequired(requestParameters, 'username', 'deleteUser');
 
-        const headers: HttpHeaders = {
-        };
-
-        const query: HttpQuery = {
-        };
-
         return this.request<void>({
-            path: `/user/{username}`.replace(`{username}`, encodeURIComponent(String(requestParameters.username))),
+            path: '/user/{username}'.replace('{username}', encodeURI(requestParameters.username)),
             method: 'DELETE',
-            headers,
-            query,
         });
     }
 
@@ -146,17 +126,9 @@ export class UserApi extends BaseAPI {
     getUserByName = (requestParameters: GetUserByNameRequest): Observable<User> => {
         throwIfRequired(requestParameters, 'username', 'getUserByName');
 
-        const headers: HttpHeaders = {
-        };
-
-        const query: HttpQuery = {
-        };
-
         return this.request<User>({
-            path: `/user/{username}`.replace(`{username}`, encodeURIComponent(String(requestParameters.username))),
+            path: '/user/{username}'.replace('{username}', encodeURI(requestParameters.username)),
             method: 'GET',
-            headers,
-            query,
         });
     }
 
@@ -167,18 +139,14 @@ export class UserApi extends BaseAPI {
         throwIfRequired(requestParameters, 'username', 'loginUser');
         throwIfRequired(requestParameters, 'password', 'loginUser');
 
-        const headers: HttpHeaders = {
-        };
-
         const query: HttpQuery = {
             ...(requestParameters.username && { 'username': requestParameters.username }),
             ...(requestParameters.password && { 'password': requestParameters.password }),
         };
 
         return this.request<string>({
-            path: `/user/login`,
+            path: '/user/login',
             method: 'GET',
-            headers,
             query,
         });
     }
@@ -187,18 +155,9 @@ export class UserApi extends BaseAPI {
      * Logs out current logged in user session
      */
     logoutUser = (): Observable<void> => {
-
-        const headers: HttpHeaders = {
-        };
-
-        const query: HttpQuery = {
-        };
-
         return this.request<void>({
-            path: `/user/logout`,
+            path: '/user/logout',
             method: 'GET',
-            headers,
-            query,
         });
     }
 
@@ -214,14 +173,10 @@ export class UserApi extends BaseAPI {
             'Content-Type': 'application/json',
         };
 
-        const query: HttpQuery = {
-        };
-
         return this.request<void>({
-            path: `/user/{username}`.replace(`{username}`, encodeURIComponent(String(requestParameters.username))),
+            path: '/user/{username}'.replace('{username}', encodeURI(requestParameters.username)),
             method: 'PUT',
             headers,
-            query,
             body: requestParameters.body,
         });
     }
diff --git a/samples/client/petstore/typescript-rxjs/builds/default/models/ApiResponse.ts b/samples/client/petstore/typescript-rxjs/builds/default/models/ApiResponse.ts
index c622c4e083..942e4b992b 100644
--- a/samples/client/petstore/typescript-rxjs/builds/default/models/ApiResponse.ts
+++ b/samples/client/petstore/typescript-rxjs/builds/default/models/ApiResponse.ts
@@ -18,19 +18,16 @@
  */
 export interface ApiResponse {
     /**
-     * 
      * @type {number}
      * @memberof ApiResponse
      */
     code?: number;
     /**
-     * 
      * @type {string}
      * @memberof ApiResponse
      */
     type?: string;
     /**
-     * 
      * @type {string}
      * @memberof ApiResponse
      */
diff --git a/samples/client/petstore/typescript-rxjs/builds/default/models/Category.ts b/samples/client/petstore/typescript-rxjs/builds/default/models/Category.ts
index ca5f1029a9..4e1d3e51e2 100644
--- a/samples/client/petstore/typescript-rxjs/builds/default/models/Category.ts
+++ b/samples/client/petstore/typescript-rxjs/builds/default/models/Category.ts
@@ -18,13 +18,11 @@
  */
 export interface Category {
     /**
-     * 
      * @type {number}
      * @memberof Category
      */
     id?: number;
     /**
-     * 
      * @type {string}
      * @memberof Category
      */
diff --git a/samples/client/petstore/typescript-rxjs/builds/default/models/Order.ts b/samples/client/petstore/typescript-rxjs/builds/default/models/Order.ts
index f0a7d3ab91..b2fb531cc1 100644
--- a/samples/client/petstore/typescript-rxjs/builds/default/models/Order.ts
+++ b/samples/client/petstore/typescript-rxjs/builds/default/models/Order.ts
@@ -18,25 +18,21 @@
  */
 export interface Order {
     /**
-     * 
      * @type {number}
      * @memberof Order
      */
     id?: number;
     /**
-     * 
      * @type {number}
      * @memberof Order
      */
     petId?: number;
     /**
-     * 
      * @type {number}
      * @memberof Order
      */
     quantity?: number;
     /**
-     * 
      * @type {Date}
      * @memberof Order
      */
@@ -48,7 +44,6 @@ export interface Order {
      */
     status?: OrderStatusEnum;
     /**
-     * 
      * @type {boolean}
      * @memberof Order
      */
diff --git a/samples/client/petstore/typescript-rxjs/builds/default/models/Pet.ts b/samples/client/petstore/typescript-rxjs/builds/default/models/Pet.ts
index b94dd76999..972ae15fe0 100644
--- a/samples/client/petstore/typescript-rxjs/builds/default/models/Pet.ts
+++ b/samples/client/petstore/typescript-rxjs/builds/default/models/Pet.ts
@@ -23,31 +23,26 @@ import {
  */
 export interface Pet {
     /**
-     * 
      * @type {number}
      * @memberof Pet
      */
     id?: number;
     /**
-     * 
      * @type {Category}
      * @memberof Pet
      */
     category?: Category;
     /**
-     * 
      * @type {string}
      * @memberof Pet
      */
     name: string;
     /**
-     * 
      * @type {Array<string>}
      * @memberof Pet
      */
     photoUrls: Array<string>;
     /**
-     * 
      * @type {Array<Tag>}
      * @memberof Pet
      */
diff --git a/samples/client/petstore/typescript-rxjs/builds/default/models/Tag.ts b/samples/client/petstore/typescript-rxjs/builds/default/models/Tag.ts
index b6f1411981..58792b18e6 100644
--- a/samples/client/petstore/typescript-rxjs/builds/default/models/Tag.ts
+++ b/samples/client/petstore/typescript-rxjs/builds/default/models/Tag.ts
@@ -18,13 +18,11 @@
  */
 export interface Tag {
     /**
-     * 
      * @type {number}
      * @memberof Tag
      */
     id?: number;
     /**
-     * 
      * @type {string}
      * @memberof Tag
      */
diff --git a/samples/client/petstore/typescript-rxjs/builds/default/models/User.ts b/samples/client/petstore/typescript-rxjs/builds/default/models/User.ts
index 169976a496..a642d97bf8 100644
--- a/samples/client/petstore/typescript-rxjs/builds/default/models/User.ts
+++ b/samples/client/petstore/typescript-rxjs/builds/default/models/User.ts
@@ -18,43 +18,36 @@
  */
 export interface User {
     /**
-     * 
      * @type {number}
      * @memberof User
      */
     id?: number;
     /**
-     * 
      * @type {string}
      * @memberof User
      */
     username?: string;
     /**
-     * 
      * @type {string}
      * @memberof User
      */
     firstName?: string;
     /**
-     * 
      * @type {string}
      * @memberof User
      */
     lastName?: string;
     /**
-     * 
      * @type {string}
      * @memberof User
      */
     email?: string;
     /**
-     * 
      * @type {string}
      * @memberof User
      */
     password?: string;
     /**
-     * 
      * @type {string}
      * @memberof User
      */
diff --git a/samples/client/petstore/typescript-rxjs/builds/default/runtime.ts b/samples/client/petstore/typescript-rxjs/builds/default/runtime.ts
index 25f845417a..9b29b9be67 100644
--- a/samples/client/petstore/typescript-rxjs/builds/default/runtime.ts
+++ b/samples/client/petstore/typescript-rxjs/builds/default/runtime.ts
@@ -12,7 +12,7 @@
  */
 
 import { Observable, of } from 'rxjs';
-import { ajax, AjaxResponse } from 'rxjs/ajax';
+import { ajax, AjaxRequest, AjaxResponse } from 'rxjs/ajax';
 import { map, concatMap } from 'rxjs/operators';
 
 export const BASE_PATH = 'http://petstore.swagger.io/v2'.replace(/\/+$/, '');
@@ -84,8 +84,8 @@ export class BaseAPI {
     withPostMiddleware = <T extends BaseAPI>(postMiddlewares: Array<Middleware['post']>) =>
         this.withMiddleware<T>(postMiddlewares.map((post) => ({ post })));
 
-    protected request = <T>(context: RequestOpts): Observable<T> => 
-        this.rxjsRequest(this.createRequestArgs(context)).pipe(
+    protected request = <T>(requestOpts: RequestOpts): Observable<T> => 
+        this.rxjsRequest(this.createRequestArgs(requestOpts)).pipe(
             map((res) => {
                 if (res.status >= 200 && res.status < 300) {
                     return res.response as T;
@@ -94,46 +94,38 @@ export class BaseAPI {
             })
         );
 
-    private createRequestArgs = (context: RequestOpts): RequestArgs => {
-        let url = this.configuration.basePath + context.path;
-        if (context.query !== undefined && Object.keys(context.query).length !== 0) {
+    private createRequestArgs = (requestOpts: RequestOpts): RequestArgs => {
+        let url = this.configuration.basePath + requestOpts.path;
+        if (requestOpts.query !== undefined && Object.keys(requestOpts.query).length !== 0) {
             // only add the queryString to the URL if there are query parameters.
             // this is done to avoid urls ending with a '?' character which buggy webservers
             // do not handle correctly sometimes.
-            url += '?' + queryString(context.query);
+            url += '?' + queryString(requestOpts.query);
         }
-        const body = context.body instanceof FormData ? context.body : JSON.stringify(context.body);
-        const options = {
-            method: context.method,
-            headers: context.headers,
-            body,
+        
+        return {
+            url,
+            method: requestOpts.method,
+            headers: requestOpts.headers,
+            body: requestOpts.body instanceof FormData ? requestOpts.body : JSON.stringify(requestOpts.body),
         };
-        return { url, options };
     }
 
-    private rxjsRequest = (params: RequestContext): Observable<AjaxResponse> => {
-        const preMiddlewares = this.middleware.filter((item) => item.pre);
-        const postMiddlewares = this.middleware.filter((item) => item.post);
-
-        return of(params).pipe(
-            map((args) => {
-                if (preMiddlewares) {
-                    preMiddlewares.forEach((mw) => (args = mw.pre!({ ...args })));
-                }
-                return args;
+    private rxjsRequest = (params: RequestArgs): Observable<AjaxResponse> => 
+        of(params).pipe(
+            map((request) => {
+                this.middleware.filter((item) => item.pre).forEach((mw) => (request = mw.pre!(request)));
+                return request;
             }),
             concatMap((args) =>
-                ajax({ url: args.url, ...args.options }).pipe(
+                ajax(args).pipe(
                     map((response) => {
-                        if (postMiddlewares) {
-                            postMiddlewares.forEach((mw) => (response = mw.post!({ ...params, response })));
-                        }
+                        this.middleware.filter((item) => item.post).forEach((mw) => (response = mw.post!(response)));
                         return response;
                     })
                 )
             )
         );
-    }
 
     /**
      * Create a shallow clone of `this` by constructing a new instance
@@ -162,27 +154,22 @@ export type HttpQuery = { [key: string]: string | number | null | boolean | Arra
 export type HttpBody = Json | FormData;
 export type ModelPropertyNaming = 'camelCase' | 'snake_case' | 'PascalCase' | 'original';
 
-export interface RequestArgs {
-    url: string;
-    options: RequestInit;
-}
-
 export interface RequestOpts {
     path: string;
     method: HttpMethod;
-    headers: HttpHeaders;
+    headers?: HttpHeaders;
     query?: HttpQuery;
     body?: HttpBody;
 }
 
+export const encodeURI = (value: any) => encodeURIComponent(String(value))
+
 const queryString = (params: HttpQuery): string => Object.keys(params)
     .map((key) => {
         const value = params[key];
-        if (value instanceof Array) {
-            return value.map((val) => `${encodeURIComponent(key)}=${encodeURIComponent(String(val))}`)
-                .join('&');
-        }
-        return `${encodeURIComponent(key)}=${encodeURIComponent(String(value))}`;
+        return (value instanceof Array)
+            ? value.map((val) => `${encodeURI(key)}=${encodeURI(val)}`).join('&')
+            : `${encodeURI(key)}=${encodeURI(value)}`;
     })
     .join('&');
 
@@ -195,12 +182,11 @@ export const throwIfRequired = (params: {[key: string]: any}, key: string, nickn
     }
 }
 
-export interface RequestContext extends RequestArgs {}
-export interface ResponseContext extends RequestArgs {
-    response: AjaxResponse;
-}
+// alias for easier importing
+export interface RequestArgs extends AjaxRequest {}
+export interface ResponseArgs extends AjaxResponse {}
 
 export interface Middleware {
-    pre?(context: RequestContext): RequestArgs;
-    post?(context: ResponseContext): AjaxResponse;
+    pre?(request: RequestArgs): RequestArgs;
+    post?(response: ResponseArgs): ResponseArgs;
 }
diff --git a/samples/client/petstore/typescript-rxjs/builds/es6-target/README.md b/samples/client/petstore/typescript-rxjs/builds/es6-target/README.md
index 44f4e2bc5b..2c35cd552d 100644
--- a/samples/client/petstore/typescript-rxjs/builds/es6-target/README.md
+++ b/samples/client/petstore/typescript-rxjs/builds/es6-target/README.md
@@ -27,7 +27,7 @@ npm run build
 
 ### Publishing
 
-First build the package then run ```npm publish```
+First build the package then run `npm publish`
 
 ### Consuming
 
@@ -43,3 +43,45 @@ _unPublished (not recommended):_
 
 ```
 npm install PATH_TO_GENERATED_PACKAGE --save
+```
+
+### How to apply middleware
+
+First, add a singleton class that extends the generated `Configuration` class.
+
+```
+export class AuthInterceptor extends Configuration {
+  private static config: AuthInterceptor;
+
+  private constructor() {
+    const middleware: Middleware[] = [
+      {
+        pre(request: RequestArgs): RequestArgs {
+          const token = getAuthToken();
+
+          return {
+            ...request,
+            headers: {
+              ...request.headers,
+              Authorization: `Bearer ${token}`,
+            },
+          };
+        },
+      },
+    ];
+
+    super({ middleware });
+  }
+
+  public static get Instance() {
+    return AuthInterceptor.config || (AuthInterceptor.config = new this());
+  }
+}
+```
+
+Next, pass it to the generated api controller.
+
+```
+const api = new StoreApi(AuthInterceptor.Instance);
+
+```
diff --git a/samples/client/petstore/typescript-rxjs/builds/es6-target/apis/PetApi.ts b/samples/client/petstore/typescript-rxjs/builds/es6-target/apis/PetApi.ts
index 8f8db90ce7..1d8a5f0011 100644
--- a/samples/client/petstore/typescript-rxjs/builds/es6-target/apis/PetApi.ts
+++ b/samples/client/petstore/typescript-rxjs/builds/es6-target/apis/PetApi.ts
@@ -12,7 +12,7 @@
  */
 
 import { Observable } from 'rxjs';
-import { BaseAPI, throwIfRequired, HttpHeaders, HttpQuery, COLLECTION_FORMATS } from '../runtime';
+import { BaseAPI, HttpHeaders, HttpQuery, throwIfRequired, encodeURI, COLLECTION_FORMATS } from '../runtime';
 import {
     ApiResponse,
     Pet,
@@ -76,14 +76,10 @@ export class PetApi extends BaseAPI {
             }),
         };
 
-        const query: HttpQuery = {
-        };
-
         return this.request<void>({
-            path: `/pet`,
+            path: '/pet',
             method: 'POST',
             headers,
-            query,
             body: requestParameters.body,
         });
     }
@@ -104,14 +100,10 @@ export class PetApi extends BaseAPI {
             }),
         };
 
-        const query: HttpQuery = {
-        };
-
         return this.request<void>({
-            path: `/pet/{petId}`.replace(`{petId}`, encodeURIComponent(String(requestParameters.petId))),
+            path: '/pet/{petId}'.replace('{petId}', encodeURI(requestParameters.petId)),
             method: 'DELETE',
             headers,
-            query,
         });
     }
 
@@ -136,7 +128,7 @@ export class PetApi extends BaseAPI {
         };
 
         return this.request<Array<Pet>>({
-            path: `/pet/findByStatus`,
+            path: '/pet/findByStatus',
             method: 'GET',
             headers,
             query,
@@ -164,7 +156,7 @@ export class PetApi extends BaseAPI {
         };
 
         return this.request<Array<Pet>>({
-            path: `/pet/findByTags`,
+            path: '/pet/findByTags',
             method: 'GET',
             headers,
             query,
@@ -182,14 +174,10 @@ export class PetApi extends BaseAPI {
             ...(this.configuration.apiKey && { 'api_key': this.configuration.apiKey('api_key') }), // api_key authentication
         };
 
-        const query: HttpQuery = {
-        };
-
         return this.request<Pet>({
-            path: `/pet/{petId}`.replace(`{petId}`, encodeURIComponent(String(requestParameters.petId))),
+            path: '/pet/{petId}'.replace('{petId}', encodeURI(requestParameters.petId)),
             method: 'GET',
             headers,
-            query,
         });
     }
 
@@ -209,14 +197,10 @@ export class PetApi extends BaseAPI {
             }),
         };
 
-        const query: HttpQuery = {
-        };
-
         return this.request<void>({
-            path: `/pet`,
+            path: '/pet',
             method: 'PUT',
             headers,
-            query,
             body: requestParameters.body,
         });
     }
@@ -236,9 +220,6 @@ export class PetApi extends BaseAPI {
             }),
         };
 
-        const query: HttpQuery = {
-        };
-
         const formData = new FormData();
         if (requestParameters.name !== undefined) {
             formData.append('name', requestParameters.name as any);
@@ -249,10 +230,9 @@ export class PetApi extends BaseAPI {
         }
 
         return this.request<void>({
-            path: `/pet/{petId}`.replace(`{petId}`, encodeURIComponent(String(requestParameters.petId))),
+            path: '/pet/{petId}'.replace('{petId}', encodeURI(requestParameters.petId)),
             method: 'POST',
             headers,
-            query,
             body: formData,
         });
     }
@@ -272,9 +252,6 @@ export class PetApi extends BaseAPI {
             }),
         };
 
-        const query: HttpQuery = {
-        };
-
         const formData = new FormData();
         if (requestParameters.additionalMetadata !== undefined) {
             formData.append('additionalMetadata', requestParameters.additionalMetadata as any);
@@ -285,10 +262,9 @@ export class PetApi extends BaseAPI {
         }
 
         return this.request<ApiResponse>({
-            path: `/pet/{petId}/uploadImage`.replace(`{petId}`, encodeURIComponent(String(requestParameters.petId))),
+            path: '/pet/{petId}/uploadImage'.replace('{petId}', encodeURI(requestParameters.petId)),
             method: 'POST',
             headers,
-            query,
             body: formData,
         });
     }
diff --git a/samples/client/petstore/typescript-rxjs/builds/es6-target/apis/StoreApi.ts b/samples/client/petstore/typescript-rxjs/builds/es6-target/apis/StoreApi.ts
index d7350a8151..b3e038e894 100644
--- a/samples/client/petstore/typescript-rxjs/builds/es6-target/apis/StoreApi.ts
+++ b/samples/client/petstore/typescript-rxjs/builds/es6-target/apis/StoreApi.ts
@@ -12,7 +12,7 @@
  */
 
 import { Observable } from 'rxjs';
-import { BaseAPI, throwIfRequired, HttpHeaders, HttpQuery, COLLECTION_FORMATS } from '../runtime';
+import { BaseAPI, HttpHeaders, throwIfRequired, encodeURI } from '../runtime';
 import {
     Order,
 } from '../models';
@@ -41,17 +41,9 @@ export class StoreApi extends BaseAPI {
     deleteOrder = (requestParameters: DeleteOrderRequest): Observable<void> => {
         throwIfRequired(requestParameters, 'orderId', 'deleteOrder');
 
-        const headers: HttpHeaders = {
-        };
-
-        const query: HttpQuery = {
-        };
-
         return this.request<void>({
-            path: `/store/order/{orderId}`.replace(`{orderId}`, encodeURIComponent(String(requestParameters.orderId))),
+            path: '/store/order/{orderId}'.replace('{orderId}', encodeURI(requestParameters.orderId)),
             method: 'DELETE',
-            headers,
-            query,
         });
     }
 
@@ -60,19 +52,14 @@ export class StoreApi extends BaseAPI {
      * Returns pet inventories by status
      */
     getInventory = (): Observable<{ [key: string]: number; }> => {
-
         const headers: HttpHeaders = {
             ...(this.configuration.apiKey && { 'api_key': this.configuration.apiKey('api_key') }), // api_key authentication
         };
 
-        const query: HttpQuery = {
-        };
-
         return this.request<{ [key: string]: number; }>({
-            path: `/store/inventory`,
+            path: '/store/inventory',
             method: 'GET',
             headers,
-            query,
         });
     }
 
@@ -83,17 +70,9 @@ export class StoreApi extends BaseAPI {
     getOrderById = (requestParameters: GetOrderByIdRequest): Observable<Order> => {
         throwIfRequired(requestParameters, 'orderId', 'getOrderById');
 
-        const headers: HttpHeaders = {
-        };
-
-        const query: HttpQuery = {
-        };
-
         return this.request<Order>({
-            path: `/store/order/{orderId}`.replace(`{orderId}`, encodeURIComponent(String(requestParameters.orderId))),
+            path: '/store/order/{orderId}'.replace('{orderId}', encodeURI(requestParameters.orderId)),
             method: 'GET',
-            headers,
-            query,
         });
     }
 
@@ -107,14 +86,10 @@ export class StoreApi extends BaseAPI {
             'Content-Type': 'application/json',
         };
 
-        const query: HttpQuery = {
-        };
-
         return this.request<Order>({
-            path: `/store/order`,
+            path: '/store/order',
             method: 'POST',
             headers,
-            query,
             body: requestParameters.body,
         });
     }
diff --git a/samples/client/petstore/typescript-rxjs/builds/es6-target/apis/UserApi.ts b/samples/client/petstore/typescript-rxjs/builds/es6-target/apis/UserApi.ts
index 8b994caf6c..c356d96e91 100644
--- a/samples/client/petstore/typescript-rxjs/builds/es6-target/apis/UserApi.ts
+++ b/samples/client/petstore/typescript-rxjs/builds/es6-target/apis/UserApi.ts
@@ -12,7 +12,7 @@
  */
 
 import { Observable } from 'rxjs';
-import { BaseAPI, throwIfRequired, HttpHeaders, HttpQuery, COLLECTION_FORMATS } from '../runtime';
+import { BaseAPI, HttpHeaders, HttpQuery, throwIfRequired, encodeURI } from '../runtime';
 import {
     User,
 } from '../models';
@@ -63,14 +63,10 @@ export class UserApi extends BaseAPI {
             'Content-Type': 'application/json',
         };
 
-        const query: HttpQuery = {
-        };
-
         return this.request<void>({
-            path: `/user`,
+            path: '/user',
             method: 'POST',
             headers,
-            query,
             body: requestParameters.body,
         });
     }
@@ -85,14 +81,10 @@ export class UserApi extends BaseAPI {
             'Content-Type': 'application/json',
         };
 
-        const query: HttpQuery = {
-        };
-
         return this.request<void>({
-            path: `/user/createWithArray`,
+            path: '/user/createWithArray',
             method: 'POST',
             headers,
-            query,
             body: requestParameters.body,
         });
     }
@@ -107,14 +99,10 @@ export class UserApi extends BaseAPI {
             'Content-Type': 'application/json',
         };
 
-        const query: HttpQuery = {
-        };
-
         return this.request<void>({
-            path: `/user/createWithList`,
+            path: '/user/createWithList',
             method: 'POST',
             headers,
-            query,
             body: requestParameters.body,
         });
     }
@@ -126,17 +114,9 @@ export class UserApi extends BaseAPI {
     deleteUser = (requestParameters: DeleteUserRequest): Observable<void> => {
         throwIfRequired(requestParameters, 'username', 'deleteUser');
 
-        const headers: HttpHeaders = {
-        };
-
-        const query: HttpQuery = {
-        };
-
         return this.request<void>({
-            path: `/user/{username}`.replace(`{username}`, encodeURIComponent(String(requestParameters.username))),
+            path: '/user/{username}'.replace('{username}', encodeURI(requestParameters.username)),
             method: 'DELETE',
-            headers,
-            query,
         });
     }
 
@@ -146,17 +126,9 @@ export class UserApi extends BaseAPI {
     getUserByName = (requestParameters: GetUserByNameRequest): Observable<User> => {
         throwIfRequired(requestParameters, 'username', 'getUserByName');
 
-        const headers: HttpHeaders = {
-        };
-
-        const query: HttpQuery = {
-        };
-
         return this.request<User>({
-            path: `/user/{username}`.replace(`{username}`, encodeURIComponent(String(requestParameters.username))),
+            path: '/user/{username}'.replace('{username}', encodeURI(requestParameters.username)),
             method: 'GET',
-            headers,
-            query,
         });
     }
 
@@ -167,18 +139,14 @@ export class UserApi extends BaseAPI {
         throwIfRequired(requestParameters, 'username', 'loginUser');
         throwIfRequired(requestParameters, 'password', 'loginUser');
 
-        const headers: HttpHeaders = {
-        };
-
         const query: HttpQuery = {
             ...(requestParameters.username && { 'username': requestParameters.username }),
             ...(requestParameters.password && { 'password': requestParameters.password }),
         };
 
         return this.request<string>({
-            path: `/user/login`,
+            path: '/user/login',
             method: 'GET',
-            headers,
             query,
         });
     }
@@ -187,18 +155,9 @@ export class UserApi extends BaseAPI {
      * Logs out current logged in user session
      */
     logoutUser = (): Observable<void> => {
-
-        const headers: HttpHeaders = {
-        };
-
-        const query: HttpQuery = {
-        };
-
         return this.request<void>({
-            path: `/user/logout`,
+            path: '/user/logout',
             method: 'GET',
-            headers,
-            query,
         });
     }
 
@@ -214,14 +173,10 @@ export class UserApi extends BaseAPI {
             'Content-Type': 'application/json',
         };
 
-        const query: HttpQuery = {
-        };
-
         return this.request<void>({
-            path: `/user/{username}`.replace(`{username}`, encodeURIComponent(String(requestParameters.username))),
+            path: '/user/{username}'.replace('{username}', encodeURI(requestParameters.username)),
             method: 'PUT',
             headers,
-            query,
             body: requestParameters.body,
         });
     }
diff --git a/samples/client/petstore/typescript-rxjs/builds/es6-target/models/ApiResponse.ts b/samples/client/petstore/typescript-rxjs/builds/es6-target/models/ApiResponse.ts
index c622c4e083..942e4b992b 100644
--- a/samples/client/petstore/typescript-rxjs/builds/es6-target/models/ApiResponse.ts
+++ b/samples/client/petstore/typescript-rxjs/builds/es6-target/models/ApiResponse.ts
@@ -18,19 +18,16 @@
  */
 export interface ApiResponse {
     /**
-     * 
      * @type {number}
      * @memberof ApiResponse
      */
     code?: number;
     /**
-     * 
      * @type {string}
      * @memberof ApiResponse
      */
     type?: string;
     /**
-     * 
      * @type {string}
      * @memberof ApiResponse
      */
diff --git a/samples/client/petstore/typescript-rxjs/builds/es6-target/models/Category.ts b/samples/client/petstore/typescript-rxjs/builds/es6-target/models/Category.ts
index ca5f1029a9..4e1d3e51e2 100644
--- a/samples/client/petstore/typescript-rxjs/builds/es6-target/models/Category.ts
+++ b/samples/client/petstore/typescript-rxjs/builds/es6-target/models/Category.ts
@@ -18,13 +18,11 @@
  */
 export interface Category {
     /**
-     * 
      * @type {number}
      * @memberof Category
      */
     id?: number;
     /**
-     * 
      * @type {string}
      * @memberof Category
      */
diff --git a/samples/client/petstore/typescript-rxjs/builds/es6-target/models/Order.ts b/samples/client/petstore/typescript-rxjs/builds/es6-target/models/Order.ts
index f0a7d3ab91..b2fb531cc1 100644
--- a/samples/client/petstore/typescript-rxjs/builds/es6-target/models/Order.ts
+++ b/samples/client/petstore/typescript-rxjs/builds/es6-target/models/Order.ts
@@ -18,25 +18,21 @@
  */
 export interface Order {
     /**
-     * 
      * @type {number}
      * @memberof Order
      */
     id?: number;
     /**
-     * 
      * @type {number}
      * @memberof Order
      */
     petId?: number;
     /**
-     * 
      * @type {number}
      * @memberof Order
      */
     quantity?: number;
     /**
-     * 
      * @type {Date}
      * @memberof Order
      */
@@ -48,7 +44,6 @@ export interface Order {
      */
     status?: OrderStatusEnum;
     /**
-     * 
      * @type {boolean}
      * @memberof Order
      */
diff --git a/samples/client/petstore/typescript-rxjs/builds/es6-target/models/Pet.ts b/samples/client/petstore/typescript-rxjs/builds/es6-target/models/Pet.ts
index b94dd76999..972ae15fe0 100644
--- a/samples/client/petstore/typescript-rxjs/builds/es6-target/models/Pet.ts
+++ b/samples/client/petstore/typescript-rxjs/builds/es6-target/models/Pet.ts
@@ -23,31 +23,26 @@ import {
  */
 export interface Pet {
     /**
-     * 
      * @type {number}
      * @memberof Pet
      */
     id?: number;
     /**
-     * 
      * @type {Category}
      * @memberof Pet
      */
     category?: Category;
     /**
-     * 
      * @type {string}
      * @memberof Pet
      */
     name: string;
     /**
-     * 
      * @type {Array<string>}
      * @memberof Pet
      */
     photoUrls: Array<string>;
     /**
-     * 
      * @type {Array<Tag>}
      * @memberof Pet
      */
diff --git a/samples/client/petstore/typescript-rxjs/builds/es6-target/models/Tag.ts b/samples/client/petstore/typescript-rxjs/builds/es6-target/models/Tag.ts
index b6f1411981..58792b18e6 100644
--- a/samples/client/petstore/typescript-rxjs/builds/es6-target/models/Tag.ts
+++ b/samples/client/petstore/typescript-rxjs/builds/es6-target/models/Tag.ts
@@ -18,13 +18,11 @@
  */
 export interface Tag {
     /**
-     * 
      * @type {number}
      * @memberof Tag
      */
     id?: number;
     /**
-     * 
      * @type {string}
      * @memberof Tag
      */
diff --git a/samples/client/petstore/typescript-rxjs/builds/es6-target/models/User.ts b/samples/client/petstore/typescript-rxjs/builds/es6-target/models/User.ts
index 169976a496..a642d97bf8 100644
--- a/samples/client/petstore/typescript-rxjs/builds/es6-target/models/User.ts
+++ b/samples/client/petstore/typescript-rxjs/builds/es6-target/models/User.ts
@@ -18,43 +18,36 @@
  */
 export interface User {
     /**
-     * 
      * @type {number}
      * @memberof User
      */
     id?: number;
     /**
-     * 
      * @type {string}
      * @memberof User
      */
     username?: string;
     /**
-     * 
      * @type {string}
      * @memberof User
      */
     firstName?: string;
     /**
-     * 
      * @type {string}
      * @memberof User
      */
     lastName?: string;
     /**
-     * 
      * @type {string}
      * @memberof User
      */
     email?: string;
     /**
-     * 
      * @type {string}
      * @memberof User
      */
     password?: string;
     /**
-     * 
      * @type {string}
      * @memberof User
      */
diff --git a/samples/client/petstore/typescript-rxjs/builds/es6-target/runtime.ts b/samples/client/petstore/typescript-rxjs/builds/es6-target/runtime.ts
index 25f845417a..9b29b9be67 100644
--- a/samples/client/petstore/typescript-rxjs/builds/es6-target/runtime.ts
+++ b/samples/client/petstore/typescript-rxjs/builds/es6-target/runtime.ts
@@ -12,7 +12,7 @@
  */
 
 import { Observable, of } from 'rxjs';
-import { ajax, AjaxResponse } from 'rxjs/ajax';
+import { ajax, AjaxRequest, AjaxResponse } from 'rxjs/ajax';
 import { map, concatMap } from 'rxjs/operators';
 
 export const BASE_PATH = 'http://petstore.swagger.io/v2'.replace(/\/+$/, '');
@@ -84,8 +84,8 @@ export class BaseAPI {
     withPostMiddleware = <T extends BaseAPI>(postMiddlewares: Array<Middleware['post']>) =>
         this.withMiddleware<T>(postMiddlewares.map((post) => ({ post })));
 
-    protected request = <T>(context: RequestOpts): Observable<T> => 
-        this.rxjsRequest(this.createRequestArgs(context)).pipe(
+    protected request = <T>(requestOpts: RequestOpts): Observable<T> => 
+        this.rxjsRequest(this.createRequestArgs(requestOpts)).pipe(
             map((res) => {
                 if (res.status >= 200 && res.status < 300) {
                     return res.response as T;
@@ -94,46 +94,38 @@ export class BaseAPI {
             })
         );
 
-    private createRequestArgs = (context: RequestOpts): RequestArgs => {
-        let url = this.configuration.basePath + context.path;
-        if (context.query !== undefined && Object.keys(context.query).length !== 0) {
+    private createRequestArgs = (requestOpts: RequestOpts): RequestArgs => {
+        let url = this.configuration.basePath + requestOpts.path;
+        if (requestOpts.query !== undefined && Object.keys(requestOpts.query).length !== 0) {
             // only add the queryString to the URL if there are query parameters.
             // this is done to avoid urls ending with a '?' character which buggy webservers
             // do not handle correctly sometimes.
-            url += '?' + queryString(context.query);
+            url += '?' + queryString(requestOpts.query);
         }
-        const body = context.body instanceof FormData ? context.body : JSON.stringify(context.body);
-        const options = {
-            method: context.method,
-            headers: context.headers,
-            body,
+        
+        return {
+            url,
+            method: requestOpts.method,
+            headers: requestOpts.headers,
+            body: requestOpts.body instanceof FormData ? requestOpts.body : JSON.stringify(requestOpts.body),
         };
-        return { url, options };
     }
 
-    private rxjsRequest = (params: RequestContext): Observable<AjaxResponse> => {
-        const preMiddlewares = this.middleware.filter((item) => item.pre);
-        const postMiddlewares = this.middleware.filter((item) => item.post);
-
-        return of(params).pipe(
-            map((args) => {
-                if (preMiddlewares) {
-                    preMiddlewares.forEach((mw) => (args = mw.pre!({ ...args })));
-                }
-                return args;
+    private rxjsRequest = (params: RequestArgs): Observable<AjaxResponse> => 
+        of(params).pipe(
+            map((request) => {
+                this.middleware.filter((item) => item.pre).forEach((mw) => (request = mw.pre!(request)));
+                return request;
             }),
             concatMap((args) =>
-                ajax({ url: args.url, ...args.options }).pipe(
+                ajax(args).pipe(
                     map((response) => {
-                        if (postMiddlewares) {
-                            postMiddlewares.forEach((mw) => (response = mw.post!({ ...params, response })));
-                        }
+                        this.middleware.filter((item) => item.post).forEach((mw) => (response = mw.post!(response)));
                         return response;
                     })
                 )
             )
         );
-    }
 
     /**
      * Create a shallow clone of `this` by constructing a new instance
@@ -162,27 +154,22 @@ export type HttpQuery = { [key: string]: string | number | null | boolean | Arra
 export type HttpBody = Json | FormData;
 export type ModelPropertyNaming = 'camelCase' | 'snake_case' | 'PascalCase' | 'original';
 
-export interface RequestArgs {
-    url: string;
-    options: RequestInit;
-}
-
 export interface RequestOpts {
     path: string;
     method: HttpMethod;
-    headers: HttpHeaders;
+    headers?: HttpHeaders;
     query?: HttpQuery;
     body?: HttpBody;
 }
 
+export const encodeURI = (value: any) => encodeURIComponent(String(value))
+
 const queryString = (params: HttpQuery): string => Object.keys(params)
     .map((key) => {
         const value = params[key];
-        if (value instanceof Array) {
-            return value.map((val) => `${encodeURIComponent(key)}=${encodeURIComponent(String(val))}`)
-                .join('&');
-        }
-        return `${encodeURIComponent(key)}=${encodeURIComponent(String(value))}`;
+        return (value instanceof Array)
+            ? value.map((val) => `${encodeURI(key)}=${encodeURI(val)}`).join('&')
+            : `${encodeURI(key)}=${encodeURI(value)}`;
     })
     .join('&');
 
@@ -195,12 +182,11 @@ export const throwIfRequired = (params: {[key: string]: any}, key: string, nickn
     }
 }
 
-export interface RequestContext extends RequestArgs {}
-export interface ResponseContext extends RequestArgs {
-    response: AjaxResponse;
-}
+// alias for easier importing
+export interface RequestArgs extends AjaxRequest {}
+export interface ResponseArgs extends AjaxResponse {}
 
 export interface Middleware {
-    pre?(context: RequestContext): RequestArgs;
-    post?(context: ResponseContext): AjaxResponse;
+    pre?(request: RequestArgs): RequestArgs;
+    post?(response: ResponseArgs): ResponseArgs;
 }
diff --git a/samples/client/petstore/typescript-rxjs/builds/with-interfaces/apis/PetApi.ts b/samples/client/petstore/typescript-rxjs/builds/with-interfaces/apis/PetApi.ts
index 8f8db90ce7..1d8a5f0011 100644
--- a/samples/client/petstore/typescript-rxjs/builds/with-interfaces/apis/PetApi.ts
+++ b/samples/client/petstore/typescript-rxjs/builds/with-interfaces/apis/PetApi.ts
@@ -12,7 +12,7 @@
  */
 
 import { Observable } from 'rxjs';
-import { BaseAPI, throwIfRequired, HttpHeaders, HttpQuery, COLLECTION_FORMATS } from '../runtime';
+import { BaseAPI, HttpHeaders, HttpQuery, throwIfRequired, encodeURI, COLLECTION_FORMATS } from '../runtime';
 import {
     ApiResponse,
     Pet,
@@ -76,14 +76,10 @@ export class PetApi extends BaseAPI {
             }),
         };
 
-        const query: HttpQuery = {
-        };
-
         return this.request<void>({
-            path: `/pet`,
+            path: '/pet',
             method: 'POST',
             headers,
-            query,
             body: requestParameters.body,
         });
     }
@@ -104,14 +100,10 @@ export class PetApi extends BaseAPI {
             }),
         };
 
-        const query: HttpQuery = {
-        };
-
         return this.request<void>({
-            path: `/pet/{petId}`.replace(`{petId}`, encodeURIComponent(String(requestParameters.petId))),
+            path: '/pet/{petId}'.replace('{petId}', encodeURI(requestParameters.petId)),
             method: 'DELETE',
             headers,
-            query,
         });
     }
 
@@ -136,7 +128,7 @@ export class PetApi extends BaseAPI {
         };
 
         return this.request<Array<Pet>>({
-            path: `/pet/findByStatus`,
+            path: '/pet/findByStatus',
             method: 'GET',
             headers,
             query,
@@ -164,7 +156,7 @@ export class PetApi extends BaseAPI {
         };
 
         return this.request<Array<Pet>>({
-            path: `/pet/findByTags`,
+            path: '/pet/findByTags',
             method: 'GET',
             headers,
             query,
@@ -182,14 +174,10 @@ export class PetApi extends BaseAPI {
             ...(this.configuration.apiKey && { 'api_key': this.configuration.apiKey('api_key') }), // api_key authentication
         };
 
-        const query: HttpQuery = {
-        };
-
         return this.request<Pet>({
-            path: `/pet/{petId}`.replace(`{petId}`, encodeURIComponent(String(requestParameters.petId))),
+            path: '/pet/{petId}'.replace('{petId}', encodeURI(requestParameters.petId)),
             method: 'GET',
             headers,
-            query,
         });
     }
 
@@ -209,14 +197,10 @@ export class PetApi extends BaseAPI {
             }),
         };
 
-        const query: HttpQuery = {
-        };
-
         return this.request<void>({
-            path: `/pet`,
+            path: '/pet',
             method: 'PUT',
             headers,
-            query,
             body: requestParameters.body,
         });
     }
@@ -236,9 +220,6 @@ export class PetApi extends BaseAPI {
             }),
         };
 
-        const query: HttpQuery = {
-        };
-
         const formData = new FormData();
         if (requestParameters.name !== undefined) {
             formData.append('name', requestParameters.name as any);
@@ -249,10 +230,9 @@ export class PetApi extends BaseAPI {
         }
 
         return this.request<void>({
-            path: `/pet/{petId}`.replace(`{petId}`, encodeURIComponent(String(requestParameters.petId))),
+            path: '/pet/{petId}'.replace('{petId}', encodeURI(requestParameters.petId)),
             method: 'POST',
             headers,
-            query,
             body: formData,
         });
     }
@@ -272,9 +252,6 @@ export class PetApi extends BaseAPI {
             }),
         };
 
-        const query: HttpQuery = {
-        };
-
         const formData = new FormData();
         if (requestParameters.additionalMetadata !== undefined) {
             formData.append('additionalMetadata', requestParameters.additionalMetadata as any);
@@ -285,10 +262,9 @@ export class PetApi extends BaseAPI {
         }
 
         return this.request<ApiResponse>({
-            path: `/pet/{petId}/uploadImage`.replace(`{petId}`, encodeURIComponent(String(requestParameters.petId))),
+            path: '/pet/{petId}/uploadImage'.replace('{petId}', encodeURI(requestParameters.petId)),
             method: 'POST',
             headers,
-            query,
             body: formData,
         });
     }
diff --git a/samples/client/petstore/typescript-rxjs/builds/with-interfaces/apis/StoreApi.ts b/samples/client/petstore/typescript-rxjs/builds/with-interfaces/apis/StoreApi.ts
index d7350a8151..b3e038e894 100644
--- a/samples/client/petstore/typescript-rxjs/builds/with-interfaces/apis/StoreApi.ts
+++ b/samples/client/petstore/typescript-rxjs/builds/with-interfaces/apis/StoreApi.ts
@@ -12,7 +12,7 @@
  */
 
 import { Observable } from 'rxjs';
-import { BaseAPI, throwIfRequired, HttpHeaders, HttpQuery, COLLECTION_FORMATS } from '../runtime';
+import { BaseAPI, HttpHeaders, throwIfRequired, encodeURI } from '../runtime';
 import {
     Order,
 } from '../models';
@@ -41,17 +41,9 @@ export class StoreApi extends BaseAPI {
     deleteOrder = (requestParameters: DeleteOrderRequest): Observable<void> => {
         throwIfRequired(requestParameters, 'orderId', 'deleteOrder');
 
-        const headers: HttpHeaders = {
-        };
-
-        const query: HttpQuery = {
-        };
-
         return this.request<void>({
-            path: `/store/order/{orderId}`.replace(`{orderId}`, encodeURIComponent(String(requestParameters.orderId))),
+            path: '/store/order/{orderId}'.replace('{orderId}', encodeURI(requestParameters.orderId)),
             method: 'DELETE',
-            headers,
-            query,
         });
     }
 
@@ -60,19 +52,14 @@ export class StoreApi extends BaseAPI {
      * Returns pet inventories by status
      */
     getInventory = (): Observable<{ [key: string]: number; }> => {
-
         const headers: HttpHeaders = {
             ...(this.configuration.apiKey && { 'api_key': this.configuration.apiKey('api_key') }), // api_key authentication
         };
 
-        const query: HttpQuery = {
-        };
-
         return this.request<{ [key: string]: number; }>({
-            path: `/store/inventory`,
+            path: '/store/inventory',
             method: 'GET',
             headers,
-            query,
         });
     }
 
@@ -83,17 +70,9 @@ export class StoreApi extends BaseAPI {
     getOrderById = (requestParameters: GetOrderByIdRequest): Observable<Order> => {
         throwIfRequired(requestParameters, 'orderId', 'getOrderById');
 
-        const headers: HttpHeaders = {
-        };
-
-        const query: HttpQuery = {
-        };
-
         return this.request<Order>({
-            path: `/store/order/{orderId}`.replace(`{orderId}`, encodeURIComponent(String(requestParameters.orderId))),
+            path: '/store/order/{orderId}'.replace('{orderId}', encodeURI(requestParameters.orderId)),
             method: 'GET',
-            headers,
-            query,
         });
     }
 
@@ -107,14 +86,10 @@ export class StoreApi extends BaseAPI {
             'Content-Type': 'application/json',
         };
 
-        const query: HttpQuery = {
-        };
-
         return this.request<Order>({
-            path: `/store/order`,
+            path: '/store/order',
             method: 'POST',
             headers,
-            query,
             body: requestParameters.body,
         });
     }
diff --git a/samples/client/petstore/typescript-rxjs/builds/with-interfaces/apis/UserApi.ts b/samples/client/petstore/typescript-rxjs/builds/with-interfaces/apis/UserApi.ts
index 8b994caf6c..c356d96e91 100644
--- a/samples/client/petstore/typescript-rxjs/builds/with-interfaces/apis/UserApi.ts
+++ b/samples/client/petstore/typescript-rxjs/builds/with-interfaces/apis/UserApi.ts
@@ -12,7 +12,7 @@
  */
 
 import { Observable } from 'rxjs';
-import { BaseAPI, throwIfRequired, HttpHeaders, HttpQuery, COLLECTION_FORMATS } from '../runtime';
+import { BaseAPI, HttpHeaders, HttpQuery, throwIfRequired, encodeURI } from '../runtime';
 import {
     User,
 } from '../models';
@@ -63,14 +63,10 @@ export class UserApi extends BaseAPI {
             'Content-Type': 'application/json',
         };
 
-        const query: HttpQuery = {
-        };
-
         return this.request<void>({
-            path: `/user`,
+            path: '/user',
             method: 'POST',
             headers,
-            query,
             body: requestParameters.body,
         });
     }
@@ -85,14 +81,10 @@ export class UserApi extends BaseAPI {
             'Content-Type': 'application/json',
         };
 
-        const query: HttpQuery = {
-        };
-
         return this.request<void>({
-            path: `/user/createWithArray`,
+            path: '/user/createWithArray',
             method: 'POST',
             headers,
-            query,
             body: requestParameters.body,
         });
     }
@@ -107,14 +99,10 @@ export class UserApi extends BaseAPI {
             'Content-Type': 'application/json',
         };
 
-        const query: HttpQuery = {
-        };
-
         return this.request<void>({
-            path: `/user/createWithList`,
+            path: '/user/createWithList',
             method: 'POST',
             headers,
-            query,
             body: requestParameters.body,
         });
     }
@@ -126,17 +114,9 @@ export class UserApi extends BaseAPI {
     deleteUser = (requestParameters: DeleteUserRequest): Observable<void> => {
         throwIfRequired(requestParameters, 'username', 'deleteUser');
 
-        const headers: HttpHeaders = {
-        };
-
-        const query: HttpQuery = {
-        };
-
         return this.request<void>({
-            path: `/user/{username}`.replace(`{username}`, encodeURIComponent(String(requestParameters.username))),
+            path: '/user/{username}'.replace('{username}', encodeURI(requestParameters.username)),
             method: 'DELETE',
-            headers,
-            query,
         });
     }
 
@@ -146,17 +126,9 @@ export class UserApi extends BaseAPI {
     getUserByName = (requestParameters: GetUserByNameRequest): Observable<User> => {
         throwIfRequired(requestParameters, 'username', 'getUserByName');
 
-        const headers: HttpHeaders = {
-        };
-
-        const query: HttpQuery = {
-        };
-
         return this.request<User>({
-            path: `/user/{username}`.replace(`{username}`, encodeURIComponent(String(requestParameters.username))),
+            path: '/user/{username}'.replace('{username}', encodeURI(requestParameters.username)),
             method: 'GET',
-            headers,
-            query,
         });
     }
 
@@ -167,18 +139,14 @@ export class UserApi extends BaseAPI {
         throwIfRequired(requestParameters, 'username', 'loginUser');
         throwIfRequired(requestParameters, 'password', 'loginUser');
 
-        const headers: HttpHeaders = {
-        };
-
         const query: HttpQuery = {
             ...(requestParameters.username && { 'username': requestParameters.username }),
             ...(requestParameters.password && { 'password': requestParameters.password }),
         };
 
         return this.request<string>({
-            path: `/user/login`,
+            path: '/user/login',
             method: 'GET',
-            headers,
             query,
         });
     }
@@ -187,18 +155,9 @@ export class UserApi extends BaseAPI {
      * Logs out current logged in user session
      */
     logoutUser = (): Observable<void> => {
-
-        const headers: HttpHeaders = {
-        };
-
-        const query: HttpQuery = {
-        };
-
         return this.request<void>({
-            path: `/user/logout`,
+            path: '/user/logout',
             method: 'GET',
-            headers,
-            query,
         });
     }
 
@@ -214,14 +173,10 @@ export class UserApi extends BaseAPI {
             'Content-Type': 'application/json',
         };
 
-        const query: HttpQuery = {
-        };
-
         return this.request<void>({
-            path: `/user/{username}`.replace(`{username}`, encodeURIComponent(String(requestParameters.username))),
+            path: '/user/{username}'.replace('{username}', encodeURI(requestParameters.username)),
             method: 'PUT',
             headers,
-            query,
             body: requestParameters.body,
         });
     }
diff --git a/samples/client/petstore/typescript-rxjs/builds/with-interfaces/models/ApiResponse.ts b/samples/client/petstore/typescript-rxjs/builds/with-interfaces/models/ApiResponse.ts
index c622c4e083..942e4b992b 100644
--- a/samples/client/petstore/typescript-rxjs/builds/with-interfaces/models/ApiResponse.ts
+++ b/samples/client/petstore/typescript-rxjs/builds/with-interfaces/models/ApiResponse.ts
@@ -18,19 +18,16 @@
  */
 export interface ApiResponse {
     /**
-     * 
      * @type {number}
      * @memberof ApiResponse
      */
     code?: number;
     /**
-     * 
      * @type {string}
      * @memberof ApiResponse
      */
     type?: string;
     /**
-     * 
      * @type {string}
      * @memberof ApiResponse
      */
diff --git a/samples/client/petstore/typescript-rxjs/builds/with-interfaces/models/Category.ts b/samples/client/petstore/typescript-rxjs/builds/with-interfaces/models/Category.ts
index ca5f1029a9..4e1d3e51e2 100644
--- a/samples/client/petstore/typescript-rxjs/builds/with-interfaces/models/Category.ts
+++ b/samples/client/petstore/typescript-rxjs/builds/with-interfaces/models/Category.ts
@@ -18,13 +18,11 @@
  */
 export interface Category {
     /**
-     * 
      * @type {number}
      * @memberof Category
      */
     id?: number;
     /**
-     * 
      * @type {string}
      * @memberof Category
      */
diff --git a/samples/client/petstore/typescript-rxjs/builds/with-interfaces/models/Order.ts b/samples/client/petstore/typescript-rxjs/builds/with-interfaces/models/Order.ts
index f0a7d3ab91..b2fb531cc1 100644
--- a/samples/client/petstore/typescript-rxjs/builds/with-interfaces/models/Order.ts
+++ b/samples/client/petstore/typescript-rxjs/builds/with-interfaces/models/Order.ts
@@ -18,25 +18,21 @@
  */
 export interface Order {
     /**
-     * 
      * @type {number}
      * @memberof Order
      */
     id?: number;
     /**
-     * 
      * @type {number}
      * @memberof Order
      */
     petId?: number;
     /**
-     * 
      * @type {number}
      * @memberof Order
      */
     quantity?: number;
     /**
-     * 
      * @type {Date}
      * @memberof Order
      */
@@ -48,7 +44,6 @@ export interface Order {
      */
     status?: OrderStatusEnum;
     /**
-     * 
      * @type {boolean}
      * @memberof Order
      */
diff --git a/samples/client/petstore/typescript-rxjs/builds/with-interfaces/models/Pet.ts b/samples/client/petstore/typescript-rxjs/builds/with-interfaces/models/Pet.ts
index b94dd76999..972ae15fe0 100644
--- a/samples/client/petstore/typescript-rxjs/builds/with-interfaces/models/Pet.ts
+++ b/samples/client/petstore/typescript-rxjs/builds/with-interfaces/models/Pet.ts
@@ -23,31 +23,26 @@ import {
  */
 export interface Pet {
     /**
-     * 
      * @type {number}
      * @memberof Pet
      */
     id?: number;
     /**
-     * 
      * @type {Category}
      * @memberof Pet
      */
     category?: Category;
     /**
-     * 
      * @type {string}
      * @memberof Pet
      */
     name: string;
     /**
-     * 
      * @type {Array<string>}
      * @memberof Pet
      */
     photoUrls: Array<string>;
     /**
-     * 
      * @type {Array<Tag>}
      * @memberof Pet
      */
diff --git a/samples/client/petstore/typescript-rxjs/builds/with-interfaces/models/Tag.ts b/samples/client/petstore/typescript-rxjs/builds/with-interfaces/models/Tag.ts
index b6f1411981..58792b18e6 100644
--- a/samples/client/petstore/typescript-rxjs/builds/with-interfaces/models/Tag.ts
+++ b/samples/client/petstore/typescript-rxjs/builds/with-interfaces/models/Tag.ts
@@ -18,13 +18,11 @@
  */
 export interface Tag {
     /**
-     * 
      * @type {number}
      * @memberof Tag
      */
     id?: number;
     /**
-     * 
      * @type {string}
      * @memberof Tag
      */
diff --git a/samples/client/petstore/typescript-rxjs/builds/with-interfaces/models/User.ts b/samples/client/petstore/typescript-rxjs/builds/with-interfaces/models/User.ts
index 169976a496..a642d97bf8 100644
--- a/samples/client/petstore/typescript-rxjs/builds/with-interfaces/models/User.ts
+++ b/samples/client/petstore/typescript-rxjs/builds/with-interfaces/models/User.ts
@@ -18,43 +18,36 @@
  */
 export interface User {
     /**
-     * 
      * @type {number}
      * @memberof User
      */
     id?: number;
     /**
-     * 
      * @type {string}
      * @memberof User
      */
     username?: string;
     /**
-     * 
      * @type {string}
      * @memberof User
      */
     firstName?: string;
     /**
-     * 
      * @type {string}
      * @memberof User
      */
     lastName?: string;
     /**
-     * 
      * @type {string}
      * @memberof User
      */
     email?: string;
     /**
-     * 
      * @type {string}
      * @memberof User
      */
     password?: string;
     /**
-     * 
      * @type {string}
      * @memberof User
      */
diff --git a/samples/client/petstore/typescript-rxjs/builds/with-interfaces/runtime.ts b/samples/client/petstore/typescript-rxjs/builds/with-interfaces/runtime.ts
index 25f845417a..9b29b9be67 100644
--- a/samples/client/petstore/typescript-rxjs/builds/with-interfaces/runtime.ts
+++ b/samples/client/petstore/typescript-rxjs/builds/with-interfaces/runtime.ts
@@ -12,7 +12,7 @@
  */
 
 import { Observable, of } from 'rxjs';
-import { ajax, AjaxResponse } from 'rxjs/ajax';
+import { ajax, AjaxRequest, AjaxResponse } from 'rxjs/ajax';
 import { map, concatMap } from 'rxjs/operators';
 
 export const BASE_PATH = 'http://petstore.swagger.io/v2'.replace(/\/+$/, '');
@@ -84,8 +84,8 @@ export class BaseAPI {
     withPostMiddleware = <T extends BaseAPI>(postMiddlewares: Array<Middleware['post']>) =>
         this.withMiddleware<T>(postMiddlewares.map((post) => ({ post })));
 
-    protected request = <T>(context: RequestOpts): Observable<T> => 
-        this.rxjsRequest(this.createRequestArgs(context)).pipe(
+    protected request = <T>(requestOpts: RequestOpts): Observable<T> => 
+        this.rxjsRequest(this.createRequestArgs(requestOpts)).pipe(
             map((res) => {
                 if (res.status >= 200 && res.status < 300) {
                     return res.response as T;
@@ -94,46 +94,38 @@ export class BaseAPI {
             })
         );
 
-    private createRequestArgs = (context: RequestOpts): RequestArgs => {
-        let url = this.configuration.basePath + context.path;
-        if (context.query !== undefined && Object.keys(context.query).length !== 0) {
+    private createRequestArgs = (requestOpts: RequestOpts): RequestArgs => {
+        let url = this.configuration.basePath + requestOpts.path;
+        if (requestOpts.query !== undefined && Object.keys(requestOpts.query).length !== 0) {
             // only add the queryString to the URL if there are query parameters.
             // this is done to avoid urls ending with a '?' character which buggy webservers
             // do not handle correctly sometimes.
-            url += '?' + queryString(context.query);
+            url += '?' + queryString(requestOpts.query);
         }
-        const body = context.body instanceof FormData ? context.body : JSON.stringify(context.body);
-        const options = {
-            method: context.method,
-            headers: context.headers,
-            body,
+        
+        return {
+            url,
+            method: requestOpts.method,
+            headers: requestOpts.headers,
+            body: requestOpts.body instanceof FormData ? requestOpts.body : JSON.stringify(requestOpts.body),
         };
-        return { url, options };
     }
 
-    private rxjsRequest = (params: RequestContext): Observable<AjaxResponse> => {
-        const preMiddlewares = this.middleware.filter((item) => item.pre);
-        const postMiddlewares = this.middleware.filter((item) => item.post);
-
-        return of(params).pipe(
-            map((args) => {
-                if (preMiddlewares) {
-                    preMiddlewares.forEach((mw) => (args = mw.pre!({ ...args })));
-                }
-                return args;
+    private rxjsRequest = (params: RequestArgs): Observable<AjaxResponse> => 
+        of(params).pipe(
+            map((request) => {
+                this.middleware.filter((item) => item.pre).forEach((mw) => (request = mw.pre!(request)));
+                return request;
             }),
             concatMap((args) =>
-                ajax({ url: args.url, ...args.options }).pipe(
+                ajax(args).pipe(
                     map((response) => {
-                        if (postMiddlewares) {
-                            postMiddlewares.forEach((mw) => (response = mw.post!({ ...params, response })));
-                        }
+                        this.middleware.filter((item) => item.post).forEach((mw) => (response = mw.post!(response)));
                         return response;
                     })
                 )
             )
         );
-    }
 
     /**
      * Create a shallow clone of `this` by constructing a new instance
@@ -162,27 +154,22 @@ export type HttpQuery = { [key: string]: string | number | null | boolean | Arra
 export type HttpBody = Json | FormData;
 export type ModelPropertyNaming = 'camelCase' | 'snake_case' | 'PascalCase' | 'original';
 
-export interface RequestArgs {
-    url: string;
-    options: RequestInit;
-}
-
 export interface RequestOpts {
     path: string;
     method: HttpMethod;
-    headers: HttpHeaders;
+    headers?: HttpHeaders;
     query?: HttpQuery;
     body?: HttpBody;
 }
 
+export const encodeURI = (value: any) => encodeURIComponent(String(value))
+
 const queryString = (params: HttpQuery): string => Object.keys(params)
     .map((key) => {
         const value = params[key];
-        if (value instanceof Array) {
-            return value.map((val) => `${encodeURIComponent(key)}=${encodeURIComponent(String(val))}`)
-                .join('&');
-        }
-        return `${encodeURIComponent(key)}=${encodeURIComponent(String(value))}`;
+        return (value instanceof Array)
+            ? value.map((val) => `${encodeURI(key)}=${encodeURI(val)}`).join('&')
+            : `${encodeURI(key)}=${encodeURI(value)}`;
     })
     .join('&');
 
@@ -195,12 +182,11 @@ export const throwIfRequired = (params: {[key: string]: any}, key: string, nickn
     }
 }
 
-export interface RequestContext extends RequestArgs {}
-export interface ResponseContext extends RequestArgs {
-    response: AjaxResponse;
-}
+// alias for easier importing
+export interface RequestArgs extends AjaxRequest {}
+export interface ResponseArgs extends AjaxResponse {}
 
 export interface Middleware {
-    pre?(context: RequestContext): RequestArgs;
-    post?(context: ResponseContext): AjaxResponse;
+    pre?(request: RequestArgs): RequestArgs;
+    post?(response: ResponseArgs): ResponseArgs;
 }
diff --git a/samples/client/petstore/typescript-rxjs/builds/with-npm-version/README.md b/samples/client/petstore/typescript-rxjs/builds/with-npm-version/README.md
index 44f4e2bc5b..2c35cd552d 100644
--- a/samples/client/petstore/typescript-rxjs/builds/with-npm-version/README.md
+++ b/samples/client/petstore/typescript-rxjs/builds/with-npm-version/README.md
@@ -27,7 +27,7 @@ npm run build
 
 ### Publishing
 
-First build the package then run ```npm publish```
+First build the package then run `npm publish`
 
 ### Consuming
 
@@ -43,3 +43,45 @@ _unPublished (not recommended):_
 
 ```
 npm install PATH_TO_GENERATED_PACKAGE --save
+```
+
+### How to apply middleware
+
+First, add a singleton class that extends the generated `Configuration` class.
+
+```
+export class AuthInterceptor extends Configuration {
+  private static config: AuthInterceptor;
+
+  private constructor() {
+    const middleware: Middleware[] = [
+      {
+        pre(request: RequestArgs): RequestArgs {
+          const token = getAuthToken();
+
+          return {
+            ...request,
+            headers: {
+              ...request.headers,
+              Authorization: `Bearer ${token}`,
+            },
+          };
+        },
+      },
+    ];
+
+    super({ middleware });
+  }
+
+  public static get Instance() {
+    return AuthInterceptor.config || (AuthInterceptor.config = new this());
+  }
+}
+```
+
+Next, pass it to the generated api controller.
+
+```
+const api = new StoreApi(AuthInterceptor.Instance);
+
+```
diff --git a/samples/client/petstore/typescript-rxjs/builds/with-npm-version/apis/PetApi.ts b/samples/client/petstore/typescript-rxjs/builds/with-npm-version/apis/PetApi.ts
index 8f8db90ce7..1d8a5f0011 100644
--- a/samples/client/petstore/typescript-rxjs/builds/with-npm-version/apis/PetApi.ts
+++ b/samples/client/petstore/typescript-rxjs/builds/with-npm-version/apis/PetApi.ts
@@ -12,7 +12,7 @@
  */
 
 import { Observable } from 'rxjs';
-import { BaseAPI, throwIfRequired, HttpHeaders, HttpQuery, COLLECTION_FORMATS } from '../runtime';
+import { BaseAPI, HttpHeaders, HttpQuery, throwIfRequired, encodeURI, COLLECTION_FORMATS } from '../runtime';
 import {
     ApiResponse,
     Pet,
@@ -76,14 +76,10 @@ export class PetApi extends BaseAPI {
             }),
         };
 
-        const query: HttpQuery = {
-        };
-
         return this.request<void>({
-            path: `/pet`,
+            path: '/pet',
             method: 'POST',
             headers,
-            query,
             body: requestParameters.body,
         });
     }
@@ -104,14 +100,10 @@ export class PetApi extends BaseAPI {
             }),
         };
 
-        const query: HttpQuery = {
-        };
-
         return this.request<void>({
-            path: `/pet/{petId}`.replace(`{petId}`, encodeURIComponent(String(requestParameters.petId))),
+            path: '/pet/{petId}'.replace('{petId}', encodeURI(requestParameters.petId)),
             method: 'DELETE',
             headers,
-            query,
         });
     }
 
@@ -136,7 +128,7 @@ export class PetApi extends BaseAPI {
         };
 
         return this.request<Array<Pet>>({
-            path: `/pet/findByStatus`,
+            path: '/pet/findByStatus',
             method: 'GET',
             headers,
             query,
@@ -164,7 +156,7 @@ export class PetApi extends BaseAPI {
         };
 
         return this.request<Array<Pet>>({
-            path: `/pet/findByTags`,
+            path: '/pet/findByTags',
             method: 'GET',
             headers,
             query,
@@ -182,14 +174,10 @@ export class PetApi extends BaseAPI {
             ...(this.configuration.apiKey && { 'api_key': this.configuration.apiKey('api_key') }), // api_key authentication
         };
 
-        const query: HttpQuery = {
-        };
-
         return this.request<Pet>({
-            path: `/pet/{petId}`.replace(`{petId}`, encodeURIComponent(String(requestParameters.petId))),
+            path: '/pet/{petId}'.replace('{petId}', encodeURI(requestParameters.petId)),
             method: 'GET',
             headers,
-            query,
         });
     }
 
@@ -209,14 +197,10 @@ export class PetApi extends BaseAPI {
             }),
         };
 
-        const query: HttpQuery = {
-        };
-
         return this.request<void>({
-            path: `/pet`,
+            path: '/pet',
             method: 'PUT',
             headers,
-            query,
             body: requestParameters.body,
         });
     }
@@ -236,9 +220,6 @@ export class PetApi extends BaseAPI {
             }),
         };
 
-        const query: HttpQuery = {
-        };
-
         const formData = new FormData();
         if (requestParameters.name !== undefined) {
             formData.append('name', requestParameters.name as any);
@@ -249,10 +230,9 @@ export class PetApi extends BaseAPI {
         }
 
         return this.request<void>({
-            path: `/pet/{petId}`.replace(`{petId}`, encodeURIComponent(String(requestParameters.petId))),
+            path: '/pet/{petId}'.replace('{petId}', encodeURI(requestParameters.petId)),
             method: 'POST',
             headers,
-            query,
             body: formData,
         });
     }
@@ -272,9 +252,6 @@ export class PetApi extends BaseAPI {
             }),
         };
 
-        const query: HttpQuery = {
-        };
-
         const formData = new FormData();
         if (requestParameters.additionalMetadata !== undefined) {
             formData.append('additionalMetadata', requestParameters.additionalMetadata as any);
@@ -285,10 +262,9 @@ export class PetApi extends BaseAPI {
         }
 
         return this.request<ApiResponse>({
-            path: `/pet/{petId}/uploadImage`.replace(`{petId}`, encodeURIComponent(String(requestParameters.petId))),
+            path: '/pet/{petId}/uploadImage'.replace('{petId}', encodeURI(requestParameters.petId)),
             method: 'POST',
             headers,
-            query,
             body: formData,
         });
     }
diff --git a/samples/client/petstore/typescript-rxjs/builds/with-npm-version/apis/StoreApi.ts b/samples/client/petstore/typescript-rxjs/builds/with-npm-version/apis/StoreApi.ts
index d7350a8151..b3e038e894 100644
--- a/samples/client/petstore/typescript-rxjs/builds/with-npm-version/apis/StoreApi.ts
+++ b/samples/client/petstore/typescript-rxjs/builds/with-npm-version/apis/StoreApi.ts
@@ -12,7 +12,7 @@
  */
 
 import { Observable } from 'rxjs';
-import { BaseAPI, throwIfRequired, HttpHeaders, HttpQuery, COLLECTION_FORMATS } from '../runtime';
+import { BaseAPI, HttpHeaders, throwIfRequired, encodeURI } from '../runtime';
 import {
     Order,
 } from '../models';
@@ -41,17 +41,9 @@ export class StoreApi extends BaseAPI {
     deleteOrder = (requestParameters: DeleteOrderRequest): Observable<void> => {
         throwIfRequired(requestParameters, 'orderId', 'deleteOrder');
 
-        const headers: HttpHeaders = {
-        };
-
-        const query: HttpQuery = {
-        };
-
         return this.request<void>({
-            path: `/store/order/{orderId}`.replace(`{orderId}`, encodeURIComponent(String(requestParameters.orderId))),
+            path: '/store/order/{orderId}'.replace('{orderId}', encodeURI(requestParameters.orderId)),
             method: 'DELETE',
-            headers,
-            query,
         });
     }
 
@@ -60,19 +52,14 @@ export class StoreApi extends BaseAPI {
      * Returns pet inventories by status
      */
     getInventory = (): Observable<{ [key: string]: number; }> => {
-
         const headers: HttpHeaders = {
             ...(this.configuration.apiKey && { 'api_key': this.configuration.apiKey('api_key') }), // api_key authentication
         };
 
-        const query: HttpQuery = {
-        };
-
         return this.request<{ [key: string]: number; }>({
-            path: `/store/inventory`,
+            path: '/store/inventory',
             method: 'GET',
             headers,
-            query,
         });
     }
 
@@ -83,17 +70,9 @@ export class StoreApi extends BaseAPI {
     getOrderById = (requestParameters: GetOrderByIdRequest): Observable<Order> => {
         throwIfRequired(requestParameters, 'orderId', 'getOrderById');
 
-        const headers: HttpHeaders = {
-        };
-
-        const query: HttpQuery = {
-        };
-
         return this.request<Order>({
-            path: `/store/order/{orderId}`.replace(`{orderId}`, encodeURIComponent(String(requestParameters.orderId))),
+            path: '/store/order/{orderId}'.replace('{orderId}', encodeURI(requestParameters.orderId)),
             method: 'GET',
-            headers,
-            query,
         });
     }
 
@@ -107,14 +86,10 @@ export class StoreApi extends BaseAPI {
             'Content-Type': 'application/json',
         };
 
-        const query: HttpQuery = {
-        };
-
         return this.request<Order>({
-            path: `/store/order`,
+            path: '/store/order',
             method: 'POST',
             headers,
-            query,
             body: requestParameters.body,
         });
     }
diff --git a/samples/client/petstore/typescript-rxjs/builds/with-npm-version/apis/UserApi.ts b/samples/client/petstore/typescript-rxjs/builds/with-npm-version/apis/UserApi.ts
index 8b994caf6c..c356d96e91 100644
--- a/samples/client/petstore/typescript-rxjs/builds/with-npm-version/apis/UserApi.ts
+++ b/samples/client/petstore/typescript-rxjs/builds/with-npm-version/apis/UserApi.ts
@@ -12,7 +12,7 @@
  */
 
 import { Observable } from 'rxjs';
-import { BaseAPI, throwIfRequired, HttpHeaders, HttpQuery, COLLECTION_FORMATS } from '../runtime';
+import { BaseAPI, HttpHeaders, HttpQuery, throwIfRequired, encodeURI } from '../runtime';
 import {
     User,
 } from '../models';
@@ -63,14 +63,10 @@ export class UserApi extends BaseAPI {
             'Content-Type': 'application/json',
         };
 
-        const query: HttpQuery = {
-        };
-
         return this.request<void>({
-            path: `/user`,
+            path: '/user',
             method: 'POST',
             headers,
-            query,
             body: requestParameters.body,
         });
     }
@@ -85,14 +81,10 @@ export class UserApi extends BaseAPI {
             'Content-Type': 'application/json',
         };
 
-        const query: HttpQuery = {
-        };
-
         return this.request<void>({
-            path: `/user/createWithArray`,
+            path: '/user/createWithArray',
             method: 'POST',
             headers,
-            query,
             body: requestParameters.body,
         });
     }
@@ -107,14 +99,10 @@ export class UserApi extends BaseAPI {
             'Content-Type': 'application/json',
         };
 
-        const query: HttpQuery = {
-        };
-
         return this.request<void>({
-            path: `/user/createWithList`,
+            path: '/user/createWithList',
             method: 'POST',
             headers,
-            query,
             body: requestParameters.body,
         });
     }
@@ -126,17 +114,9 @@ export class UserApi extends BaseAPI {
     deleteUser = (requestParameters: DeleteUserRequest): Observable<void> => {
         throwIfRequired(requestParameters, 'username', 'deleteUser');
 
-        const headers: HttpHeaders = {
-        };
-
-        const query: HttpQuery = {
-        };
-
         return this.request<void>({
-            path: `/user/{username}`.replace(`{username}`, encodeURIComponent(String(requestParameters.username))),
+            path: '/user/{username}'.replace('{username}', encodeURI(requestParameters.username)),
             method: 'DELETE',
-            headers,
-            query,
         });
     }
 
@@ -146,17 +126,9 @@ export class UserApi extends BaseAPI {
     getUserByName = (requestParameters: GetUserByNameRequest): Observable<User> => {
         throwIfRequired(requestParameters, 'username', 'getUserByName');
 
-        const headers: HttpHeaders = {
-        };
-
-        const query: HttpQuery = {
-        };
-
         return this.request<User>({
-            path: `/user/{username}`.replace(`{username}`, encodeURIComponent(String(requestParameters.username))),
+            path: '/user/{username}'.replace('{username}', encodeURI(requestParameters.username)),
             method: 'GET',
-            headers,
-            query,
         });
     }
 
@@ -167,18 +139,14 @@ export class UserApi extends BaseAPI {
         throwIfRequired(requestParameters, 'username', 'loginUser');
         throwIfRequired(requestParameters, 'password', 'loginUser');
 
-        const headers: HttpHeaders = {
-        };
-
         const query: HttpQuery = {
             ...(requestParameters.username && { 'username': requestParameters.username }),
             ...(requestParameters.password && { 'password': requestParameters.password }),
         };
 
         return this.request<string>({
-            path: `/user/login`,
+            path: '/user/login',
             method: 'GET',
-            headers,
             query,
         });
     }
@@ -187,18 +155,9 @@ export class UserApi extends BaseAPI {
      * Logs out current logged in user session
      */
     logoutUser = (): Observable<void> => {
-
-        const headers: HttpHeaders = {
-        };
-
-        const query: HttpQuery = {
-        };
-
         return this.request<void>({
-            path: `/user/logout`,
+            path: '/user/logout',
             method: 'GET',
-            headers,
-            query,
         });
     }
 
@@ -214,14 +173,10 @@ export class UserApi extends BaseAPI {
             'Content-Type': 'application/json',
         };
 
-        const query: HttpQuery = {
-        };
-
         return this.request<void>({
-            path: `/user/{username}`.replace(`{username}`, encodeURIComponent(String(requestParameters.username))),
+            path: '/user/{username}'.replace('{username}', encodeURI(requestParameters.username)),
             method: 'PUT',
             headers,
-            query,
             body: requestParameters.body,
         });
     }
diff --git a/samples/client/petstore/typescript-rxjs/builds/with-npm-version/models/ApiResponse.ts b/samples/client/petstore/typescript-rxjs/builds/with-npm-version/models/ApiResponse.ts
index c622c4e083..942e4b992b 100644
--- a/samples/client/petstore/typescript-rxjs/builds/with-npm-version/models/ApiResponse.ts
+++ b/samples/client/petstore/typescript-rxjs/builds/with-npm-version/models/ApiResponse.ts
@@ -18,19 +18,16 @@
  */
 export interface ApiResponse {
     /**
-     * 
      * @type {number}
      * @memberof ApiResponse
      */
     code?: number;
     /**
-     * 
      * @type {string}
      * @memberof ApiResponse
      */
     type?: string;
     /**
-     * 
      * @type {string}
      * @memberof ApiResponse
      */
diff --git a/samples/client/petstore/typescript-rxjs/builds/with-npm-version/models/Category.ts b/samples/client/petstore/typescript-rxjs/builds/with-npm-version/models/Category.ts
index ca5f1029a9..4e1d3e51e2 100644
--- a/samples/client/petstore/typescript-rxjs/builds/with-npm-version/models/Category.ts
+++ b/samples/client/petstore/typescript-rxjs/builds/with-npm-version/models/Category.ts
@@ -18,13 +18,11 @@
  */
 export interface Category {
     /**
-     * 
      * @type {number}
      * @memberof Category
      */
     id?: number;
     /**
-     * 
      * @type {string}
      * @memberof Category
      */
diff --git a/samples/client/petstore/typescript-rxjs/builds/with-npm-version/models/Order.ts b/samples/client/petstore/typescript-rxjs/builds/with-npm-version/models/Order.ts
index f0a7d3ab91..b2fb531cc1 100644
--- a/samples/client/petstore/typescript-rxjs/builds/with-npm-version/models/Order.ts
+++ b/samples/client/petstore/typescript-rxjs/builds/with-npm-version/models/Order.ts
@@ -18,25 +18,21 @@
  */
 export interface Order {
     /**
-     * 
      * @type {number}
      * @memberof Order
      */
     id?: number;
     /**
-     * 
      * @type {number}
      * @memberof Order
      */
     petId?: number;
     /**
-     * 
      * @type {number}
      * @memberof Order
      */
     quantity?: number;
     /**
-     * 
      * @type {Date}
      * @memberof Order
      */
@@ -48,7 +44,6 @@ export interface Order {
      */
     status?: OrderStatusEnum;
     /**
-     * 
      * @type {boolean}
      * @memberof Order
      */
diff --git a/samples/client/petstore/typescript-rxjs/builds/with-npm-version/models/Pet.ts b/samples/client/petstore/typescript-rxjs/builds/with-npm-version/models/Pet.ts
index b94dd76999..972ae15fe0 100644
--- a/samples/client/petstore/typescript-rxjs/builds/with-npm-version/models/Pet.ts
+++ b/samples/client/petstore/typescript-rxjs/builds/with-npm-version/models/Pet.ts
@@ -23,31 +23,26 @@ import {
  */
 export interface Pet {
     /**
-     * 
      * @type {number}
      * @memberof Pet
      */
     id?: number;
     /**
-     * 
      * @type {Category}
      * @memberof Pet
      */
     category?: Category;
     /**
-     * 
      * @type {string}
      * @memberof Pet
      */
     name: string;
     /**
-     * 
      * @type {Array<string>}
      * @memberof Pet
      */
     photoUrls: Array<string>;
     /**
-     * 
      * @type {Array<Tag>}
      * @memberof Pet
      */
diff --git a/samples/client/petstore/typescript-rxjs/builds/with-npm-version/models/Tag.ts b/samples/client/petstore/typescript-rxjs/builds/with-npm-version/models/Tag.ts
index b6f1411981..58792b18e6 100644
--- a/samples/client/petstore/typescript-rxjs/builds/with-npm-version/models/Tag.ts
+++ b/samples/client/petstore/typescript-rxjs/builds/with-npm-version/models/Tag.ts
@@ -18,13 +18,11 @@
  */
 export interface Tag {
     /**
-     * 
      * @type {number}
      * @memberof Tag
      */
     id?: number;
     /**
-     * 
      * @type {string}
      * @memberof Tag
      */
diff --git a/samples/client/petstore/typescript-rxjs/builds/with-npm-version/models/User.ts b/samples/client/petstore/typescript-rxjs/builds/with-npm-version/models/User.ts
index 169976a496..a642d97bf8 100644
--- a/samples/client/petstore/typescript-rxjs/builds/with-npm-version/models/User.ts
+++ b/samples/client/petstore/typescript-rxjs/builds/with-npm-version/models/User.ts
@@ -18,43 +18,36 @@
  */
 export interface User {
     /**
-     * 
      * @type {number}
      * @memberof User
      */
     id?: number;
     /**
-     * 
      * @type {string}
      * @memberof User
      */
     username?: string;
     /**
-     * 
      * @type {string}
      * @memberof User
      */
     firstName?: string;
     /**
-     * 
      * @type {string}
      * @memberof User
      */
     lastName?: string;
     /**
-     * 
      * @type {string}
      * @memberof User
      */
     email?: string;
     /**
-     * 
      * @type {string}
      * @memberof User
      */
     password?: string;
     /**
-     * 
      * @type {string}
      * @memberof User
      */
diff --git a/samples/client/petstore/typescript-rxjs/builds/with-npm-version/runtime.ts b/samples/client/petstore/typescript-rxjs/builds/with-npm-version/runtime.ts
index 25f845417a..9b29b9be67 100644
--- a/samples/client/petstore/typescript-rxjs/builds/with-npm-version/runtime.ts
+++ b/samples/client/petstore/typescript-rxjs/builds/with-npm-version/runtime.ts
@@ -12,7 +12,7 @@
  */
 
 import { Observable, of } from 'rxjs';
-import { ajax, AjaxResponse } from 'rxjs/ajax';
+import { ajax, AjaxRequest, AjaxResponse } from 'rxjs/ajax';
 import { map, concatMap } from 'rxjs/operators';
 
 export const BASE_PATH = 'http://petstore.swagger.io/v2'.replace(/\/+$/, '');
@@ -84,8 +84,8 @@ export class BaseAPI {
     withPostMiddleware = <T extends BaseAPI>(postMiddlewares: Array<Middleware['post']>) =>
         this.withMiddleware<T>(postMiddlewares.map((post) => ({ post })));
 
-    protected request = <T>(context: RequestOpts): Observable<T> => 
-        this.rxjsRequest(this.createRequestArgs(context)).pipe(
+    protected request = <T>(requestOpts: RequestOpts): Observable<T> => 
+        this.rxjsRequest(this.createRequestArgs(requestOpts)).pipe(
             map((res) => {
                 if (res.status >= 200 && res.status < 300) {
                     return res.response as T;
@@ -94,46 +94,38 @@ export class BaseAPI {
             })
         );
 
-    private createRequestArgs = (context: RequestOpts): RequestArgs => {
-        let url = this.configuration.basePath + context.path;
-        if (context.query !== undefined && Object.keys(context.query).length !== 0) {
+    private createRequestArgs = (requestOpts: RequestOpts): RequestArgs => {
+        let url = this.configuration.basePath + requestOpts.path;
+        if (requestOpts.query !== undefined && Object.keys(requestOpts.query).length !== 0) {
             // only add the queryString to the URL if there are query parameters.
             // this is done to avoid urls ending with a '?' character which buggy webservers
             // do not handle correctly sometimes.
-            url += '?' + queryString(context.query);
+            url += '?' + queryString(requestOpts.query);
         }
-        const body = context.body instanceof FormData ? context.body : JSON.stringify(context.body);
-        const options = {
-            method: context.method,
-            headers: context.headers,
-            body,
+        
+        return {
+            url,
+            method: requestOpts.method,
+            headers: requestOpts.headers,
+            body: requestOpts.body instanceof FormData ? requestOpts.body : JSON.stringify(requestOpts.body),
         };
-        return { url, options };
     }
 
-    private rxjsRequest = (params: RequestContext): Observable<AjaxResponse> => {
-        const preMiddlewares = this.middleware.filter((item) => item.pre);
-        const postMiddlewares = this.middleware.filter((item) => item.post);
-
-        return of(params).pipe(
-            map((args) => {
-                if (preMiddlewares) {
-                    preMiddlewares.forEach((mw) => (args = mw.pre!({ ...args })));
-                }
-                return args;
+    private rxjsRequest = (params: RequestArgs): Observable<AjaxResponse> => 
+        of(params).pipe(
+            map((request) => {
+                this.middleware.filter((item) => item.pre).forEach((mw) => (request = mw.pre!(request)));
+                return request;
             }),
             concatMap((args) =>
-                ajax({ url: args.url, ...args.options }).pipe(
+                ajax(args).pipe(
                     map((response) => {
-                        if (postMiddlewares) {
-                            postMiddlewares.forEach((mw) => (response = mw.post!({ ...params, response })));
-                        }
+                        this.middleware.filter((item) => item.post).forEach((mw) => (response = mw.post!(response)));
                         return response;
                     })
                 )
             )
         );
-    }
 
     /**
      * Create a shallow clone of `this` by constructing a new instance
@@ -162,27 +154,22 @@ export type HttpQuery = { [key: string]: string | number | null | boolean | Arra
 export type HttpBody = Json | FormData;
 export type ModelPropertyNaming = 'camelCase' | 'snake_case' | 'PascalCase' | 'original';
 
-export interface RequestArgs {
-    url: string;
-    options: RequestInit;
-}
-
 export interface RequestOpts {
     path: string;
     method: HttpMethod;
-    headers: HttpHeaders;
+    headers?: HttpHeaders;
     query?: HttpQuery;
     body?: HttpBody;
 }
 
+export const encodeURI = (value: any) => encodeURIComponent(String(value))
+
 const queryString = (params: HttpQuery): string => Object.keys(params)
     .map((key) => {
         const value = params[key];
-        if (value instanceof Array) {
-            return value.map((val) => `${encodeURIComponent(key)}=${encodeURIComponent(String(val))}`)
-                .join('&');
-        }
-        return `${encodeURIComponent(key)}=${encodeURIComponent(String(value))}`;
+        return (value instanceof Array)
+            ? value.map((val) => `${encodeURI(key)}=${encodeURI(val)}`).join('&')
+            : `${encodeURI(key)}=${encodeURI(value)}`;
     })
     .join('&');
 
@@ -195,12 +182,11 @@ export const throwIfRequired = (params: {[key: string]: any}, key: string, nickn
     }
 }
 
-export interface RequestContext extends RequestArgs {}
-export interface ResponseContext extends RequestArgs {
-    response: AjaxResponse;
-}
+// alias for easier importing
+export interface RequestArgs extends AjaxRequest {}
+export interface ResponseArgs extends AjaxResponse {}
 
 export interface Middleware {
-    pre?(context: RequestContext): RequestArgs;
-    post?(context: ResponseContext): AjaxResponse;
+    pre?(request: RequestArgs): RequestArgs;
+    post?(response: ResponseArgs): ResponseArgs;
 }

From 577581303155461fc4fbef4f664ddbdba2350ceb Mon Sep 17 00:00:00 2001
From: Jeremy Bohrer <35938078+tsiq-jeremy@users.noreply.github.com>
Date: Tue, 23 Jul 2019 09:44:34 -0400
Subject: [PATCH 38/62] 2745 typescript date format (#3423)

* fix axios issue

* fix typo
---
 .../src/main/resources/typescript-axios/apiInner.mustache     | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/modules/openapi-generator/src/main/resources/typescript-axios/apiInner.mustache b/modules/openapi-generator/src/main/resources/typescript-axios/apiInner.mustache
index 36f96f299a..52c5354446 100644
--- a/modules/openapi-generator/src/main/resources/typescript-axios/apiInner.mustache
+++ b/modules/openapi-generator/src/main/resources/typescript-axios/apiInner.mustache
@@ -118,7 +118,9 @@ export const {{classname}}AxiosParamCreator = function (configuration?: Configur
                 {{/isDateTime}}
                 {{^isDateTime}}
                 {{#isDate}}
-                localVarQueryParameter['{{baseName}}'] = ({{paramName}} as any).toISOString();
+                localVarQueryParameter['{{baseName}}'] = ({{paramName}} as any instanceof Date) ?
+                    ({{paramName}} as any).toISOString().substr(0,10) :
+                    {{paramName}};
                 {{/isDate}}
                 {{^isDate}}
                 localVarQueryParameter['{{baseName}}'] = {{paramName}};

From 40f1f920dfa03c2c172d196e6ad4dd5950f17405 Mon Sep 17 00:00:00 2001
From: Martin Delille <martin@delille.org>
Date: Tue, 23 Jul 2019 22:26:42 +0200
Subject: [PATCH 39/62] qt5 client: use openapi 3 spec (#3400)

---
 bin/cpp-qt5-petstore.sh                       |   2 +-
 .../cpp-qt5/client/OAIInline_object.cpp       | 127 ++++++++++++++++++
 .../cpp-qt5/client/OAIInline_object.h         |  73 ++++++++++
 .../cpp-qt5/client/OAIInline_object_1.cpp     | 127 ++++++++++++++++++
 .../cpp-qt5/client/OAIInline_object_1.h       |  74 ++++++++++
 .../petstore/cpp-qt5/client/OAIPetApi.cpp     |  18 ++-
 .../petstore/cpp-qt5/client/OAIPetApi.h       |   6 +-
 .../petstore/cpp-qt5/client/OAIStoreApi.cpp   |   4 +-
 .../petstore/cpp-qt5/client/OAIStoreApi.h     |   2 +-
 .../petstore/cpp-qt5/client/OAIUserApi.cpp    |  16 +--
 .../petstore/cpp-qt5/client/OAIUserApi.h      |   8 +-
 .../client/petstore/cpp-qt5/client/client.pri |   4 +
 12 files changed, 437 insertions(+), 24 deletions(-)
 create mode 100644 samples/client/petstore/cpp-qt5/client/OAIInline_object.cpp
 create mode 100644 samples/client/petstore/cpp-qt5/client/OAIInline_object.h
 create mode 100644 samples/client/petstore/cpp-qt5/client/OAIInline_object_1.cpp
 create mode 100644 samples/client/petstore/cpp-qt5/client/OAIInline_object_1.h

diff --git a/bin/cpp-qt5-petstore.sh b/bin/cpp-qt5-petstore.sh
index ee4f311199..56db53e7fa 100755
--- a/bin/cpp-qt5-petstore.sh
+++ b/bin/cpp-qt5-petstore.sh
@@ -27,6 +27,6 @@ fi
 
 # if you've executed sbt assembly previously it will use that instead.
 export JAVA_OPTS="${JAVA_OPTS} -Xmx1024M -DloggerPath=conf/log4j.properties"
-ags="generate -t modules/openapi-generator/src/main/resources/cpp-qt5-client -i modules/openapi-generator/src/test/resources/2_0/petstore.yaml -g cpp-qt5-client -o samples/client/petstore/cpp-qt5 $@"
+ags="generate -t modules/openapi-generator/src/main/resources/cpp-qt5-client -i modules/openapi-generator/src/test/resources/3_0/petstore.yaml -g cpp-qt5-client -o samples/client/petstore/cpp-qt5 $@"
 
 java $JAVA_OPTS -jar $executable $ags
diff --git a/samples/client/petstore/cpp-qt5/client/OAIInline_object.cpp b/samples/client/petstore/cpp-qt5/client/OAIInline_object.cpp
new file mode 100644
index 0000000000..5d5218fb10
--- /dev/null
+++ b/samples/client/petstore/cpp-qt5/client/OAIInline_object.cpp
@@ -0,0 +1,127 @@
+/**
+ * OpenAPI Petstore
+ * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters.
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+
+#include "OAIInline_object.h"
+
+#include "OAIHelpers.h"
+
+#include <QJsonDocument>
+#include <QJsonArray>
+#include <QObject>
+#include <QDebug>
+
+namespace OpenAPI {
+
+OAIInline_object::OAIInline_object(QString json) {
+    this->init();
+    this->fromJson(json);
+}
+
+OAIInline_object::OAIInline_object() {
+    this->init();
+}
+
+OAIInline_object::~OAIInline_object() {
+
+}
+
+void
+OAIInline_object::init() {
+    
+    m_name_isSet = false;
+    m_name_isValid = false;
+    
+    m_status_isSet = false;
+    m_status_isValid = false;
+    }
+
+void
+OAIInline_object::fromJson(QString jsonString) {
+    QByteArray array (jsonString.toStdString().c_str());
+    QJsonDocument doc = QJsonDocument::fromJson(array);
+    QJsonObject jsonObject = doc.object();
+    this->fromJsonObject(jsonObject);
+}
+
+void
+OAIInline_object::fromJsonObject(QJsonObject json) {
+    
+    m_name_isValid = ::OpenAPI::fromJsonValue(name, json[QString("name")]);
+    
+    
+    m_status_isValid = ::OpenAPI::fromJsonValue(status, json[QString("status")]);
+    
+    
+}
+
+QString
+OAIInline_object::asJson () const {
+    QJsonObject obj = this->asJsonObject();
+    QJsonDocument doc(obj);
+    QByteArray bytes = doc.toJson();
+    return QString(bytes);
+}
+
+QJsonObject
+OAIInline_object::asJsonObject() const {
+    QJsonObject obj;
+	if(m_name_isSet){
+        obj.insert(QString("name"), ::OpenAPI::toJsonValue(name));
+    }
+	if(m_status_isSet){
+        obj.insert(QString("status"), ::OpenAPI::toJsonValue(status));
+    }
+    return obj;
+}
+
+
+QString
+OAIInline_object::getName() const {
+    return name;
+}
+void
+OAIInline_object::setName(const QString &name) {
+    this->name = name;
+    this->m_name_isSet = true;
+}
+
+
+QString
+OAIInline_object::getStatus() const {
+    return status;
+}
+void
+OAIInline_object::setStatus(const QString &status) {
+    this->status = status;
+    this->m_status_isSet = true;
+}
+
+bool
+OAIInline_object::isSet() const {
+    bool isObjectUpdated = false;
+    do{ 
+        if(m_name_isSet){ isObjectUpdated = true; break;}
+    
+        if(m_status_isSet){ isObjectUpdated = true; break;}
+    }while(false);
+    return isObjectUpdated;
+}
+
+bool
+OAIInline_object::isValid() const {
+    // only required properties are required for the object to be considered valid
+    return true;
+}
+
+}
+
diff --git a/samples/client/petstore/cpp-qt5/client/OAIInline_object.h b/samples/client/petstore/cpp-qt5/client/OAIInline_object.h
new file mode 100644
index 0000000000..cde555a97c
--- /dev/null
+++ b/samples/client/petstore/cpp-qt5/client/OAIInline_object.h
@@ -0,0 +1,73 @@
+/**
+ * OpenAPI Petstore
+ * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters.
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+/*
+ * OAIInline_object.h
+ *
+ * 
+ */
+
+#ifndef OAIInline_object_H
+#define OAIInline_object_H
+
+#include <QJsonObject>
+
+
+#include <QString>
+
+#include "OAIObject.h"
+#include "OAIEnum.h"
+
+namespace OpenAPI {
+
+class OAIInline_object: public OAIObject {
+public:
+    OAIInline_object();
+    OAIInline_object(QString json);
+    ~OAIInline_object() override;
+
+    QString asJson () const override;
+    QJsonObject asJsonObject() const override;
+    void fromJsonObject(QJsonObject json) override;
+    void fromJson(QString jsonString) override;
+
+    
+    QString getName() const;
+    void setName(const QString &name);
+
+    
+    QString getStatus() const;
+    void setStatus(const QString &status);
+
+    
+
+    virtual bool isSet() const override;
+    virtual bool isValid() const override;
+
+private:
+    void init();
+    
+    QString name;
+    bool m_name_isSet;
+    bool m_name_isValid;
+    
+    QString status;
+    bool m_status_isSet;
+    bool m_status_isValid;
+    
+    };
+
+}
+
+Q_DECLARE_METATYPE(OpenAPI::OAIInline_object)
+
+#endif // OAIInline_object_H
diff --git a/samples/client/petstore/cpp-qt5/client/OAIInline_object_1.cpp b/samples/client/petstore/cpp-qt5/client/OAIInline_object_1.cpp
new file mode 100644
index 0000000000..3624546e32
--- /dev/null
+++ b/samples/client/petstore/cpp-qt5/client/OAIInline_object_1.cpp
@@ -0,0 +1,127 @@
+/**
+ * OpenAPI Petstore
+ * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters.
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+
+#include "OAIInline_object_1.h"
+
+#include "OAIHelpers.h"
+
+#include <QJsonDocument>
+#include <QJsonArray>
+#include <QObject>
+#include <QDebug>
+
+namespace OpenAPI {
+
+OAIInline_object_1::OAIInline_object_1(QString json) {
+    this->init();
+    this->fromJson(json);
+}
+
+OAIInline_object_1::OAIInline_object_1() {
+    this->init();
+}
+
+OAIInline_object_1::~OAIInline_object_1() {
+
+}
+
+void
+OAIInline_object_1::init() {
+    
+    m_additional_metadata_isSet = false;
+    m_additional_metadata_isValid = false;
+    
+    m_file_isSet = false;
+    m_file_isValid = false;
+    }
+
+void
+OAIInline_object_1::fromJson(QString jsonString) {
+    QByteArray array (jsonString.toStdString().c_str());
+    QJsonDocument doc = QJsonDocument::fromJson(array);
+    QJsonObject jsonObject = doc.object();
+    this->fromJsonObject(jsonObject);
+}
+
+void
+OAIInline_object_1::fromJsonObject(QJsonObject json) {
+    
+    m_additional_metadata_isValid = ::OpenAPI::fromJsonValue(additional_metadata, json[QString("additionalMetadata")]);
+    
+    
+    m_file_isValid = ::OpenAPI::fromJsonValue(file, json[QString("file")]);
+    
+    
+}
+
+QString
+OAIInline_object_1::asJson () const {
+    QJsonObject obj = this->asJsonObject();
+    QJsonDocument doc(obj);
+    QByteArray bytes = doc.toJson();
+    return QString(bytes);
+}
+
+QJsonObject
+OAIInline_object_1::asJsonObject() const {
+    QJsonObject obj;
+	if(m_additional_metadata_isSet){
+        obj.insert(QString("additionalMetadata"), ::OpenAPI::toJsonValue(additional_metadata));
+    }
+	if(file.isSet()){
+        obj.insert(QString("file"), ::OpenAPI::toJsonValue(file));
+    }
+    return obj;
+}
+
+
+QString
+OAIInline_object_1::getAdditionalMetadata() const {
+    return additional_metadata;
+}
+void
+OAIInline_object_1::setAdditionalMetadata(const QString &additional_metadata) {
+    this->additional_metadata = additional_metadata;
+    this->m_additional_metadata_isSet = true;
+}
+
+
+OAIHttpRequestInputFileElement*
+OAIInline_object_1::getFile() const {
+    return file;
+}
+void
+OAIInline_object_1::setFile(const OAIHttpRequestInputFileElement* &file) {
+    this->file = file;
+    this->m_file_isSet = true;
+}
+
+bool
+OAIInline_object_1::isSet() const {
+    bool isObjectUpdated = false;
+    do{ 
+        if(m_additional_metadata_isSet){ isObjectUpdated = true; break;}
+    
+        if(file.isSet()){ isObjectUpdated = true; break;}
+    }while(false);
+    return isObjectUpdated;
+}
+
+bool
+OAIInline_object_1::isValid() const {
+    // only required properties are required for the object to be considered valid
+    return true;
+}
+
+}
+
diff --git a/samples/client/petstore/cpp-qt5/client/OAIInline_object_1.h b/samples/client/petstore/cpp-qt5/client/OAIInline_object_1.h
new file mode 100644
index 0000000000..3f2ff572ee
--- /dev/null
+++ b/samples/client/petstore/cpp-qt5/client/OAIInline_object_1.h
@@ -0,0 +1,74 @@
+/**
+ * OpenAPI Petstore
+ * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters.
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+/*
+ * OAIInline_object_1.h
+ *
+ * 
+ */
+
+#ifndef OAIInline_object_1_H
+#define OAIInline_object_1_H
+
+#include <QJsonObject>
+
+
+#include "OAIHttpRequest.h"
+#include <QString>
+
+#include "OAIObject.h"
+#include "OAIEnum.h"
+
+namespace OpenAPI {
+
+class OAIInline_object_1: public OAIObject {
+public:
+    OAIInline_object_1();
+    OAIInline_object_1(QString json);
+    ~OAIInline_object_1() override;
+
+    QString asJson () const override;
+    QJsonObject asJsonObject() const override;
+    void fromJsonObject(QJsonObject json) override;
+    void fromJson(QString jsonString) override;
+
+    
+    QString getAdditionalMetadata() const;
+    void setAdditionalMetadata(const QString &additional_metadata);
+
+    
+    OAIHttpRequestInputFileElement* getFile() const;
+    void setFile(const OAIHttpRequestInputFileElement* &file);
+
+    
+
+    virtual bool isSet() const override;
+    virtual bool isValid() const override;
+
+private:
+    void init();
+    
+    QString additional_metadata;
+    bool m_additional_metadata_isSet;
+    bool m_additional_metadata_isValid;
+    
+    OAIHttpRequestInputFileElement* file;
+    bool m_file_isSet;
+    bool m_file_isValid;
+    
+    };
+
+}
+
+Q_DECLARE_METATYPE(OpenAPI::OAIInline_object_1)
+
+#endif // OAIInline_object_1_H
diff --git a/samples/client/petstore/cpp-qt5/client/OAIPetApi.cpp b/samples/client/petstore/cpp-qt5/client/OAIPetApi.cpp
index 1341a73c3b..808206ac29 100644
--- a/samples/client/petstore/cpp-qt5/client/OAIPetApi.cpp
+++ b/samples/client/petstore/cpp-qt5/client/OAIPetApi.cpp
@@ -52,7 +52,7 @@ void OAIPetApi::addHeaders(const QString& key, const QString& value){
 
 
 void
-OAIPetApi::addPet(const OAIPet& body) {
+OAIPetApi::addPet(const OAIPet& oai_pet) {
     QString fullPath;
     fullPath.append(this->host).append(this->basePath).append("/pet");
     
@@ -61,7 +61,7 @@ OAIPetApi::addPet(const OAIPet& body) {
     OAIHttpRequestInput input(fullPath, "POST");
 
     
-    QString output = body.asJson();
+    QString output = oai_pet.asJson();
     input.request_body.append(output);
     
 
@@ -247,7 +247,7 @@ OAIPetApi::findPetsByStatusCallback(OAIHttpRequestWorker * worker) {
 }
 
 void
-OAIPetApi::findPetsByTags(const QList<QString>& tags) {
+OAIPetApi::findPetsByTags(const QList<QString>& tags, const qint32& max_count) {
     QString fullPath;
     fullPath.append(this->host).append(this->basePath).append("/pet/findByTags");
     
@@ -291,6 +291,14 @@ OAIPetApi::findPetsByTags(const QList<QString>& tags) {
       }
     }
     
+    if (fullPath.indexOf("?") > 0)
+      fullPath.append("&");
+    else
+      fullPath.append("?");
+    fullPath.append(QUrl::toPercentEncoding("maxCount"))
+        .append("=")
+        .append(QUrl::toPercentEncoding(::OpenAPI::toStringValue(max_count)));
+    
     OAIHttpRequestWorker *worker = new OAIHttpRequestWorker();
     worker->setTimeOut(timeout);
     OAIHttpRequestInput input(fullPath, "GET");
@@ -391,7 +399,7 @@ OAIPetApi::getPetByIdCallback(OAIHttpRequestWorker * worker) {
 }
 
 void
-OAIPetApi::updatePet(const OAIPet& body) {
+OAIPetApi::updatePet(const OAIPet& oai_pet) {
     QString fullPath;
     fullPath.append(this->host).append(this->basePath).append("/pet");
     
@@ -400,7 +408,7 @@ OAIPetApi::updatePet(const OAIPet& body) {
     OAIHttpRequestInput input(fullPath, "PUT");
 
     
-    QString output = body.asJson();
+    QString output = oai_pet.asJson();
     input.request_body.append(output);
     
 
diff --git a/samples/client/petstore/cpp-qt5/client/OAIPetApi.h b/samples/client/petstore/cpp-qt5/client/OAIPetApi.h
index 449de95853..2e89093994 100644
--- a/samples/client/petstore/cpp-qt5/client/OAIPetApi.h
+++ b/samples/client/petstore/cpp-qt5/client/OAIPetApi.h
@@ -37,12 +37,12 @@ public:
     void setApiTimeOutMs(const int tout);
     void addHeaders(const QString& key, const QString& value);
 
-    void addPet(const OAIPet& body);
+    void addPet(const OAIPet& oai_pet);
     void deletePet(const qint64& pet_id, const QString& api_key);
     void findPetsByStatus(const QList<QString>& status);
-    void findPetsByTags(const QList<QString>& tags);
+    void findPetsByTags(const QList<QString>& tags, const qint32& max_count);
     void getPetById(const qint64& pet_id);
-    void updatePet(const OAIPet& body);
+    void updatePet(const OAIPet& oai_pet);
     void updatePetWithForm(const qint64& pet_id, const QString& name, const QString& status);
     void uploadFile(const qint64& pet_id, const QString& additional_metadata, const OAIHttpRequestInputFileElement*& file);
     
diff --git a/samples/client/petstore/cpp-qt5/client/OAIStoreApi.cpp b/samples/client/petstore/cpp-qt5/client/OAIStoreApi.cpp
index 7b2e37f635..681dc87f76 100644
--- a/samples/client/petstore/cpp-qt5/client/OAIStoreApi.cpp
+++ b/samples/client/petstore/cpp-qt5/client/OAIStoreApi.cpp
@@ -204,7 +204,7 @@ OAIStoreApi::getOrderByIdCallback(OAIHttpRequestWorker * worker) {
 }
 
 void
-OAIStoreApi::placeOrder(const OAIOrder& body) {
+OAIStoreApi::placeOrder(const OAIOrder& oai_order) {
     QString fullPath;
     fullPath.append(this->host).append(this->basePath).append("/store/order");
     
@@ -213,7 +213,7 @@ OAIStoreApi::placeOrder(const OAIOrder& body) {
     OAIHttpRequestInput input(fullPath, "POST");
 
     
-    QString output = body.asJson();
+    QString output = oai_order.asJson();
     input.request_body.append(output);
     
 
diff --git a/samples/client/petstore/cpp-qt5/client/OAIStoreApi.h b/samples/client/petstore/cpp-qt5/client/OAIStoreApi.h
index 2f9d41b998..ebda579b9b 100644
--- a/samples/client/petstore/cpp-qt5/client/OAIStoreApi.h
+++ b/samples/client/petstore/cpp-qt5/client/OAIStoreApi.h
@@ -39,7 +39,7 @@ public:
     void deleteOrder(const QString& order_id);
     void getInventory();
     void getOrderById(const qint64& order_id);
-    void placeOrder(const OAIOrder& body);
+    void placeOrder(const OAIOrder& oai_order);
     
 private:
     QString basePath;
diff --git a/samples/client/petstore/cpp-qt5/client/OAIUserApi.cpp b/samples/client/petstore/cpp-qt5/client/OAIUserApi.cpp
index 57556eab78..f14ab4d08d 100644
--- a/samples/client/petstore/cpp-qt5/client/OAIUserApi.cpp
+++ b/samples/client/petstore/cpp-qt5/client/OAIUserApi.cpp
@@ -52,7 +52,7 @@ void OAIUserApi::addHeaders(const QString& key, const QString& value){
 
 
 void
-OAIUserApi::createUser(const OAIUser& body) {
+OAIUserApi::createUser(const OAIUser& oai_user) {
     QString fullPath;
     fullPath.append(this->host).append(this->basePath).append("/user");
     
@@ -61,7 +61,7 @@ OAIUserApi::createUser(const OAIUser& body) {
     OAIHttpRequestInput input(fullPath, "POST");
 
     
-    QString output = body.asJson();
+    QString output = oai_user.asJson();
     input.request_body.append(output);
     
 
@@ -101,7 +101,7 @@ OAIUserApi::createUserCallback(OAIHttpRequestWorker * worker) {
 }
 
 void
-OAIUserApi::createUsersWithArrayInput(const QList<OAIUser>& body) {
+OAIUserApi::createUsersWithArrayInput(const QList<OAIUser>& oai_user) {
     QString fullPath;
     fullPath.append(this->host).append(this->basePath).append("/user/createWithArray");
     
@@ -110,7 +110,7 @@ OAIUserApi::createUsersWithArrayInput(const QList<OAIUser>& body) {
     OAIHttpRequestInput input(fullPath, "POST");
 
     
-    QJsonDocument doc(::OpenAPI::toJsonValue(body).toArray());
+    QJsonDocument doc(::OpenAPI::toJsonValue(oai_user).toArray());
     QByteArray bytes = doc.toJson();
     input.request_body.append(bytes);
     
@@ -151,7 +151,7 @@ OAIUserApi::createUsersWithArrayInputCallback(OAIHttpRequestWorker * worker) {
 }
 
 void
-OAIUserApi::createUsersWithListInput(const QList<OAIUser>& body) {
+OAIUserApi::createUsersWithListInput(const QList<OAIUser>& oai_user) {
     QString fullPath;
     fullPath.append(this->host).append(this->basePath).append("/user/createWithList");
     
@@ -160,7 +160,7 @@ OAIUserApi::createUsersWithListInput(const QList<OAIUser>& body) {
     OAIHttpRequestInput input(fullPath, "POST");
 
     
-    QJsonDocument doc(::OpenAPI::toJsonValue(body).toArray());
+    QJsonDocument doc(::OpenAPI::toJsonValue(oai_user).toArray());
     QByteArray bytes = doc.toJson();
     input.request_body.append(bytes);
     
@@ -406,7 +406,7 @@ OAIUserApi::logoutUserCallback(OAIHttpRequestWorker * worker) {
 }
 
 void
-OAIUserApi::updateUser(const QString& username, const OAIUser& body) {
+OAIUserApi::updateUser(const QString& username, const OAIUser& oai_user) {
     QString fullPath;
     fullPath.append(this->host).append(this->basePath).append("/user/{username}");
     QString usernamePathParam("{");
@@ -418,7 +418,7 @@ OAIUserApi::updateUser(const QString& username, const OAIUser& body) {
     OAIHttpRequestInput input(fullPath, "PUT");
 
     
-    QString output = body.asJson();
+    QString output = oai_user.asJson();
     input.request_body.append(output);
     
 
diff --git a/samples/client/petstore/cpp-qt5/client/OAIUserApi.h b/samples/client/petstore/cpp-qt5/client/OAIUserApi.h
index 454210caa6..b72cc28e42 100644
--- a/samples/client/petstore/cpp-qt5/client/OAIUserApi.h
+++ b/samples/client/petstore/cpp-qt5/client/OAIUserApi.h
@@ -36,14 +36,14 @@ public:
     void setApiTimeOutMs(const int tout);
     void addHeaders(const QString& key, const QString& value);
 
-    void createUser(const OAIUser& body);
-    void createUsersWithArrayInput(const QList<OAIUser>& body);
-    void createUsersWithListInput(const QList<OAIUser>& body);
+    void createUser(const OAIUser& oai_user);
+    void createUsersWithArrayInput(const QList<OAIUser>& oai_user);
+    void createUsersWithListInput(const QList<OAIUser>& oai_user);
     void deleteUser(const QString& username);
     void getUserByName(const QString& username);
     void loginUser(const QString& username, const QString& password);
     void logoutUser();
-    void updateUser(const QString& username, const OAIUser& body);
+    void updateUser(const QString& username, const OAIUser& oai_user);
     
 private:
     QString basePath;
diff --git a/samples/client/petstore/cpp-qt5/client/client.pri b/samples/client/petstore/cpp-qt5/client/client.pri
index ca6c9b5524..e51b4c3108 100644
--- a/samples/client/petstore/cpp-qt5/client/client.pri
+++ b/samples/client/petstore/cpp-qt5/client/client.pri
@@ -4,6 +4,8 @@ HEADERS += \
 # Models
     $${PWD}/OAIApiResponse.h \
     $${PWD}/OAICategory.h \
+    $${PWD}/OAIInline_object.h \
+    $${PWD}/OAIInline_object_1.h \
     $${PWD}/OAIOrder.h \
     $${PWD}/OAIPet.h \
     $${PWD}/OAITag.h \
@@ -22,6 +24,8 @@ SOURCES += \
 # Models
     $${PWD}/OAIApiResponse.cpp \
     $${PWD}/OAICategory.cpp \
+    $${PWD}/OAIInline_object.cpp \
+    $${PWD}/OAIInline_object_1.cpp \
     $${PWD}/OAIOrder.cpp \
     $${PWD}/OAIPet.cpp \
     $${PWD}/OAITag.cpp \

From 00c7d6f46ba62ed31c3517e95472327e30bf6573 Mon Sep 17 00:00:00 2001
From: Aadi Bajpai <me@aadibajpai.me>
Date: Wed, 24 Jul 2019 10:16:10 +0530
Subject: [PATCH 40/62] Add back Flask tests (#3387)

fixes #3286
---
 pom.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pom.xml b/pom.xml
index 2656ce0d4e..0f999b90f0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1064,8 +1064,8 @@
                 <!--<module>samples/client/petstore/bash</module>-->
                 <module>samples/server/petstore/rust-server</module>
                 <module>samples/server/petstore/python-aiohttp</module>
-                <!--<module>samples/server/petstore/python-flask</module>
-                <module>samples/server/petstore/python-flask-python2</module>-->
+                <module>samples/server/petstore/python-flask</module>
+                <module>samples/server/petstore/python-flask-python2</module>
             </modules>
         </profile>
         <!-- test with JDK8 in CircleCI -->

From 2c4fdd079207374822269b58b4f7a93378456b3c Mon Sep 17 00:00:00 2001
From: Akihito Nakano <sora.akatsuki@gmail.com>
Date: Wed, 24 Jul 2019 13:48:17 +0900
Subject: [PATCH 41/62] Update links (#3410)

---
 README.md | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/README.md b/README.md
index fb598b1b9f..084b9e40a8 100644
--- a/README.md
+++ b/README.md
@@ -217,9 +217,9 @@ openapi-generator-cli version # is always 3.0.2, unless any of the above overrid
 
 To build from source, you need the following installed and available in your `$PATH:`
 
-* [Java 8](http://java.oracle.com)
+* [Java 8](https://www.oracle.com/technetwork/java/index.html)
 
-* [Apache Maven 3.3.4 or greater](http://maven.apache.org/)
+* [Apache Maven 3.3.4 or greater](https://maven.apache.org/)
 
 After cloning the project, you can build it from source with this command:
 ```sh
@@ -342,7 +342,7 @@ Right now: no solution for this one :|
 #### Run Docker in Vagrant
 Prerequisite: install [Vagrant](https://www.vagrantup.com/downloads.html) and [VirtualBox](https://www.virtualbox.org/wiki/Downloads).
  ```sh
-git clone http://github.com/openapitools/openapi-generator.git
+git clone https://github.com/openapitools/openapi-generator.git
 cd openapi-generator
 vagrant up
 vagrant ssh
@@ -500,8 +500,8 @@ Please refer to [integration.md](docs/integration.md) on how to integrate OpenAP
 
 Here are the public online services:
 
-- latest stable version: http://api.openapi-generator.tech
-- latest master: http://api-latest-master.openapi-generator.tech (updated with latest master every hour)
+- latest stable version: https://api.openapi-generator.tech
+- latest master: https://api-latest-master.openapi-generator.tech (updated with latest master every hour)
 
 The server is sponsored by [Linode](https://www.linode.com/) [![Linode Logo](https://www.linode.com/media/images/logos/standard/light/linode-logo_standard_light_small.png)](https://www.linode.com/)
 
@@ -862,7 +862,7 @@ Copyright 2018 SmartBear Software
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
-You may obtain a copy of the License at [apache.org/licenses/LICENSE-2.0](http://www.apache.org/licenses/LICENSE-2.0)
+You may obtain a copy of the License at [apache.org/licenses/LICENSE-2.0](https://www.apache.org/licenses/LICENSE-2.0)
 
 Unless required by applicable law or agreed to in writing, software
 distributed under the License is distributed on an "AS IS" BASIS,

From a4b1c269d868fd188112b0d9181f4dd0d26f13a1 Mon Sep 17 00:00:00 2001
From: Ramanth Addala <addalaramanth@gmail.com>
Date: Wed, 24 Jul 2019 20:45:21 +0530
Subject: [PATCH 42/62] fix(r): updated example in doc(.md) file (#3429)

* fix(r): updated doc(.md) files

* fix(r): changed enum representation
---
 .../src/main/resources/r/api_doc.mustache     | 29 ++++++++++++++++---
 samples/client/petstore/R/docs/PetApi.md      |  4 +--
 samples/client/petstore/R/docs/UserApi.md     |  4 +--
 3 files changed, 29 insertions(+), 8 deletions(-)

diff --git a/modules/openapi-generator/src/main/resources/r/api_doc.mustache b/modules/openapi-generator/src/main/resources/r/api_doc.mustache
index 9473cf7c13..8a3af45edd 100644
--- a/modules/openapi-generator/src/main/resources/r/api_doc.mustache
+++ b/modules/openapi-generator/src/main/resources/r/api_doc.mustache
@@ -46,20 +46,41 @@ api.instance$apiClient$accessToken <- 'TODO_YOUR_ACCESS_TOKEN';
 {{/isOAuth}}
 {{/authMethods}}
 {{/hasAuthMethods}}
+{{#returnExceptionOnFailure}}
+{{#useRlangExceptionHandling}}
+result <- tryCatch(
+             api.instance${{{operationId}}}({{#requiredParams}}var.{{{paramName}}}{{^-last}}, {{/-last}}{{/requiredParams}}{{#optionalParams}}{{#-first}}{{#requiredParams.0}}, {{/requiredParams.0}}{{/-first}}{{{paramName}}}=var.{{{paramName}}}{{^-last}}, {{/-last}}{{/optionalParams}}),
+             ApiException = function(ex) ex 
+          )
+# In case of error, print the error object 
+if(!is.null(result$ApiException)) {
+  cat(result$ApiException$toString())
+ } else {
+{{#returnType}}
+# deserialized response object
+response.object <- result$content
+{{/returnType}}
+# response headers
+response.headers <- result$response$headers
+# response status code
+response.status.code <- result$response$status_code
+}
+{{/useRlangExceptionHandling}}
+{{/returnExceptionOnFailure}}
+{{^useRlangExceptionHandling}}
 {{#returnType}}result <- {{/returnType}}api.instance${{{operationId}}}({{#requiredParams}}var.{{{paramName}}}{{^-last}}, {{/-last}}{{/requiredParams}}{{#optionalParams}}{{#-first}}{{#requiredParams.0}}, {{/requiredParams.0}}{{/-first}}{{{paramName}}}=var.{{{paramName}}}{{^-last}}, {{/-last}}{{/optionalParams}})
 {{#returnType}}
 dput(result)
 {{/returnType}}
+{{/useRlangExceptionHandling}}
 ```
 
 ### Parameters
 {{^allParams}}This endpoint does not need any parameter.{{/allParams}}{{#allParams}}{{#-last}}
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------{{/-last}}{{/allParams}}
-{{#requiredParams}} **{{paramName}}** | {{#isPrimitiveType}}**{{dataType}}**{{/isPrimitiveType}}{{^isPrimitiveType}}{{#isFile}}**{{dataType}}**{{/isFile}}{{^isFile}}[**{{dataType}}**]({{baseType}}.md){{/isFile}}{{/isPrimitiveType}}| {{description}} | {{^required}}[optional] {{/required}}{{#defaultValue}}[default to {{defaultValue}}]{{/defaultValue}}
-{{/requiredParams}}
-{{#optionalParams}} **{{paramName}}** | {{#isPrimitiveType}}**{{dataType}}**{{/isPrimitiveType}}{{^isPrimitiveType}}{{#isFile}}**{{dataType}}**{{/isFile}}{{^isFile}}[**{{dataType}}**]({{baseType}}.md){{/isFile}}{{/isPrimitiveType}}| {{description}} | {{^required}}[optional] {{/required}}{{#defaultValue}}[default to {{defaultValue}}]{{/defaultValue}}
-{{/optionalParams}}
+{{#allParams}} **{{paramName}}** | {{#isEnum}}Enum {{#allowableValues}}{{values}}{{/allowableValues}} {{/isEnum}}{{^isEnum}}{{#isContainer}}{{#isListContainer}}{{#items}}{{#isPrimitiveType}}list( **{{dataType}}** ){{/isPrimitiveType}}{{^isPrimitiveType}}{{#isFile}}**{{dataType}}**{{/isFile}}{{^isFile}}list( [**{{dataType}}**]({{baseType}}.md) ){{/isFile}}{{/isPrimitiveType}}{{/items}}{{/isListContainer}}{{#isMapContainer}}{{#isPrimitiveType}}named list( **{{dataType}}** ){{/isPrimitiveType}}{{^isPrimitiveType}}{{#isFile}}**{{dataType}}**{{/isFile}}{{^isFile}}named list( [**{{dataType}}**]({{baseType}}.md) ){{/isFile}}{{/isPrimitiveType}}{{/isMapContainer}}{{/isContainer}}{{^isContainer}}{{#isPrimitiveType}}**{{dataType}}**{{/isPrimitiveType}}{{^isPrimitiveType}}{{#isFile}}**{{dataType}}**{{/isFile}}{{^isFile}}[**{{dataType}}**]({{baseType}}.md){{/isFile}}{{/isPrimitiveType}}{{/isContainer}}{{/isEnum}}| {{description}} | {{^required}}[optional] {{/required}}{{#defaultValue}}[default to {{defaultValue}}]{{/defaultValue}}
+{{/allParams}}
 
 ### Return type
 
diff --git a/samples/client/petstore/R/docs/PetApi.md b/samples/client/petstore/R/docs/PetApi.md
index fe69ffb556..1e782619f4 100644
--- a/samples/client/petstore/R/docs/PetApi.md
+++ b/samples/client/petstore/R/docs/PetApi.md
@@ -119,7 +119,7 @@ dput(result)
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **status** | [**array[character]**](character.md)| Status values that need to be considered for filter | 
+ **status** | Enum [available, pending, sold] | Status values that need to be considered for filter | 
 
 ### Return type
 
@@ -161,7 +161,7 @@ dput(result)
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **tags** | [**array[character]**](character.md)| Tags to filter by | 
+ **tags** | list( **character** )| Tags to filter by | 
 
 ### Return type
 
diff --git a/samples/client/petstore/R/docs/UserApi.md b/samples/client/petstore/R/docs/UserApi.md
index c69c5987ed..a0fe81e5fe 100644
--- a/samples/client/petstore/R/docs/UserApi.md
+++ b/samples/client/petstore/R/docs/UserApi.md
@@ -73,7 +73,7 @@ api.instance$CreateUsersWithArrayInput(var.body)
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **body** | [**array[User]**](User.md)| List of user object | 
+ **body** | list( [**User**](User.md) )| List of user object | 
 
 ### Return type
 
@@ -110,7 +110,7 @@ api.instance$CreateUsersWithListInput(var.body)
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **body** | [**array[User]**](User.md)| List of user object | 
+ **body** | list( [**User**](User.md) )| List of user object | 
 
 ### Return type
 

From 2e81e612fc6a6d7f54381b833869927ae6132b6c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gabriel=20F=C3=A9ron?=
 <420581+gferon@users.noreply.github.com>
Date: Wed, 24 Jul 2019 18:29:43 +0200
Subject: [PATCH 43/62] Fix enum types in structs (#3309)

I already contributed proper enum supports a few weeks ago, but somehow missed actually using them when they're used as a property. This PR fixes that.

I also took the liberty of fixing a bunch of unused warnings.

* Make sure we use the enum types in Rust

* Fix unused warnings in Rust and regenerate samples

* Use crate:: import path that works both with Rust 2015 and 2018

* Derive PartialEq and Eq in generated Rust structs and enums
---
 .../resources/rust/hyper/api_mod.mustache     |  2 --
 .../main/resources/rust/hyper/client.mustache |  8 ++---
 .../rust/hyper/configuration.mustache         |  1 -
 .../src/main/resources/rust/model.mustache    |  8 ++---
 .../src/main/resources/rust/request.rs        |  1 +
 .../main/resources/rust/reqwest/api.mustache  |  4 +--
 .../resources/rust/reqwest/api_mod.mustache   |  2 --
 .../resources/rust/reqwest/client.mustache    |  2 --
 .../.openapi-generator/VERSION.orig           |  1 +
 .../petstore/rust-reqwest/src/apis/client.rs  |  2 --
 .../rust-reqwest/src/apis/client.rs.orig      | 34 ++++++++++++++++++
 .../petstore/rust-reqwest/src/apis/mod.rs     |  2 --
 .../petstore/rust-reqwest/src/apis/pet_api.rs |  2 +-
 .../rust-reqwest/src/apis/store_api.rs        |  4 +--
 .../rust-reqwest/src/apis/user_api.rs         |  8 ++---
 .../rust-reqwest/src/models/api_response.rs   |  2 +-
 .../rust-reqwest/src/models/category.rs       |  2 +-
 .../petstore/rust-reqwest/src/models/order.rs |  6 ++--
 .../petstore/rust-reqwest/src/models/pet.rs   |  6 ++--
 .../petstore/rust-reqwest/src/models/tag.rs   |  2 +-
 .../petstore/rust-reqwest/src/models/user.rs  |  2 +-
 .../rust/.openapi-generator/VERSION.orig      |  1 +
 .../client/petstore/rust/src/apis/client.rs   |  8 ++---
 .../petstore/rust/src/apis/client.rs.orig     | 35 +++++++++++++++++++
 .../petstore/rust/src/apis/configuration.rs   |  1 -
 samples/client/petstore/rust/src/apis/mod.rs  |  2 --
 .../client/petstore/rust/src/apis/request.rs  |  1 +
 .../petstore/rust/src/models/api_response.rs  |  2 +-
 .../petstore/rust/src/models/category.rs      |  2 +-
 .../client/petstore/rust/src/models/order.rs  |  6 ++--
 .../client/petstore/rust/src/models/pet.rs    |  6 ++--
 .../client/petstore/rust/src/models/tag.rs    |  2 +-
 .../client/petstore/rust/src/models/user.rs   |  2 +-
 33 files changed, 112 insertions(+), 57 deletions(-)
 create mode 100644 samples/client/petstore/rust-reqwest/.openapi-generator/VERSION.orig
 create mode 100644 samples/client/petstore/rust-reqwest/src/apis/client.rs.orig
 create mode 100644 samples/client/petstore/rust/.openapi-generator/VERSION.orig
 create mode 100644 samples/client/petstore/rust/src/apis/client.rs.orig

diff --git a/modules/openapi-generator/src/main/resources/rust/hyper/api_mod.mustache b/modules/openapi-generator/src/main/resources/rust/hyper/api_mod.mustache
index 1deca998a0..d2b4312085 100644
--- a/modules/openapi-generator/src/main/resources/rust/hyper/api_mod.mustache
+++ b/modules/openapi-generator/src/main/resources/rust/hyper/api_mod.mustache
@@ -49,8 +49,6 @@ impl<T> From<serde_json::Error> for Error<T> {
     }
 }
 
-use super::models::*;
-
 mod request;
 
 {{#apiInfo}}
diff --git a/modules/openapi-generator/src/main/resources/rust/hyper/client.mustache b/modules/openapi-generator/src/main/resources/rust/hyper/client.mustache
index a0648b758b..2aa7338b4b 100644
--- a/modules/openapi-generator/src/main/resources/rust/hyper/client.mustache
+++ b/modules/openapi-generator/src/main/resources/rust/hyper/client.mustache
@@ -3,8 +3,7 @@ use std::rc::Rc;
 use hyper;
 use super::configuration::Configuration;
 
-pub struct APIClient<C: hyper::client::Connect> {
-    configuration: Rc<Configuration<C>>,
+pub struct APIClient {
 {{#apiInfo}}
 {{#apis}}
 {{#operations}}
@@ -18,12 +17,11 @@ pub struct APIClient<C: hyper::client::Connect> {
 {{/apiInfo}}
 }
 
-impl<C: hyper::client::Connect> APIClient<C> {
-    pub fn new(configuration: Configuration<C>) -> APIClient<C> {
+impl APIClient {
+    pub fn new<C: hyper::client::Connect>(configuration: Configuration<C>) -> APIClient {
         let rc = Rc::new(configuration);
 
         APIClient {
-            configuration: rc.clone(),
 {{#apiInfo}}
 {{#apis}}
 {{#operations}}
diff --git a/modules/openapi-generator/src/main/resources/rust/hyper/configuration.mustache b/modules/openapi-generator/src/main/resources/rust/hyper/configuration.mustache
index 449cc61c5d..adb51d6e92 100644
--- a/modules/openapi-generator/src/main/resources/rust/hyper/configuration.mustache
+++ b/modules/openapi-generator/src/main/resources/rust/hyper/configuration.mustache
@@ -1,6 +1,5 @@
 {{>partial_header}}
 use hyper;
-use std::collections::HashMap;
 
 pub struct Configuration<C: hyper::client::Connect> {
     pub base_path: String,
diff --git a/modules/openapi-generator/src/main/resources/rust/model.mustache b/modules/openapi-generator/src/main/resources/rust/model.mustache
index 37a3ff77bc..f371e0e703 100644
--- a/modules/openapi-generator/src/main/resources/rust/model.mustache
+++ b/modules/openapi-generator/src/main/resources/rust/model.mustache
@@ -20,14 +20,14 @@ pub enum {{classname}} {
 
 {{!-- for non-enum schemas --}}
 {{^isEnum}}
-#[derive(Debug, Serialize, Deserialize)]
+#[derive(Debug, PartialEq, Eq, Serialize, Deserialize)]
 pub struct {{{classname}}} {
 {{#vars}}
     {{#description}}
     /// {{{description}}}
     {{/description}}
     #[serde(rename = "{{{baseName}}}"{{^required}}, skip_serializing_if = "Option::is_none"{{/required}})]
-    pub {{{name}}}: {{#required}}{{#isNullable}}Option<{{/isNullable}}{{/required}}{{^required}}Option<{{/required}}{{{dataType}}}{{#required}}{{#isNullable}}>{{/isNullable}}{{/required}}{{^required}}>{{/required}},
+    pub {{{name}}}: {{#required}}{{#isNullable}}Option<{{/isNullable}}{{/required}}{{^required}}Option<{{/required}}{{#isEnum}}{{{enumName}}}{{/isEnum}}{{^isEnum}}{{{dataType}}}{{/isEnum}}{{#required}}{{#isNullable}}>{{/isNullable}}{{/required}}{{^required}}>{{/required}},
 {{/vars}}
 }
 
@@ -35,7 +35,7 @@ impl {{{classname}}} {
     {{#description}}
     /// {{{description}}}
     {{/description}}
-    pub fn new({{#requiredVars}}{{{name}}}: {{#isNullable}}Option<{{/isNullable}}{{{dataType}}}{{#isNullable}}>{{/isNullable}}{{^-last}}, {{/-last}}{{/requiredVars}}) -> {{{classname}}} {
+    pub fn new({{#requiredVars}}{{{name}}}: {{#isNullable}}Option<{{/isNullable}}{{#isEnum}}{{{enumName}}}{{/isEnum}}{{^isEnum}}{{{dataType}}}{{/isEnum}}{{#isNullable}}>{{/isNullable}}{{^-last}}, {{/-last}}{{/requiredVars}}) -> {{{classname}}} {
         {{{classname}}} {
             {{#vars}}
             {{{name}}}: {{#required}}{{{name}}}{{/required}}{{^required}}{{#isListContainer}}None{{/isListContainer}}{{#isMapContainer}}None{{/isMapContainer}}{{^isContainer}}None{{/isContainer}}{{/required}},
@@ -49,7 +49,7 @@ impl {{{classname}}} {
 {{#vars}}
 {{#isEnum}}
 /// {{{description}}}
-#[derive(Debug, Serialize, Deserialize)]
+#[derive(Debug, PartialEq, Eq, Serialize, Deserialize)]
 pub enum {{enumName}} {
 {{#allowableValues}}
 {{#enumVars}}
diff --git a/modules/openapi-generator/src/main/resources/rust/request.rs b/modules/openapi-generator/src/main/resources/rust/request.rs
index 383a409542..2d5c7eb5a6 100644
--- a/modules/openapi-generator/src/main/resources/rust/request.rs
+++ b/modules/openapi-generator/src/main/resources/rust/request.rs
@@ -24,6 +24,7 @@ impl ApiKey {
     }
 }
 
+#[allow(dead_code)]
 pub(crate) enum Auth {
     None,
     ApiKey(ApiKey),
diff --git a/modules/openapi-generator/src/main/resources/rust/reqwest/api.mustache b/modules/openapi-generator/src/main/resources/rust/reqwest/api.mustache
index 038284ec6c..35d25dfde7 100644
--- a/modules/openapi-generator/src/main/resources/rust/reqwest/api.mustache
+++ b/modules/openapi-generator/src/main/resources/rust/reqwest/api.mustache
@@ -4,7 +4,7 @@ use std::borrow::Borrow;
 
 use reqwest;
 
-use super::{Error, configuration, urlencode};
+use super::{Error, configuration};
 
 pub struct {{{classname}}}Client {
     configuration: Rc<configuration::Configuration>,
@@ -33,7 +33,7 @@ impl {{{classname}}} for {{{classname}}}Client {
         let configuration: &configuration::Configuration = self.configuration.borrow();
         let client = &configuration.client;
 
-        let uri_str = format!("{}{{{path}}}", configuration.base_path{{#pathParams}}, {{{baseName}}}={{#isString}}urlencode({{/isString}}{{{paramName}}}{{#isListContainer}}.join(",").as_ref(){{/isListContainer}}{{#isString}}){{/isString}}{{/pathParams}});
+        let uri_str = format!("{}{{{path}}}", configuration.base_path{{#pathParams}}, {{{baseName}}}={{#isString}}crate::apis::urlencode({{/isString}}{{{paramName}}}{{#isListContainer}}.join(",").as_ref(){{/isListContainer}}{{#isString}}){{/isString}}{{/pathParams}});
         let mut req_builder = client.{{{httpMethod}}}(uri_str.as_str());
 
         {{#queryParams}}
diff --git a/modules/openapi-generator/src/main/resources/rust/reqwest/api_mod.mustache b/modules/openapi-generator/src/main/resources/rust/reqwest/api_mod.mustache
index 318b0f7a0d..93123e31fa 100644
--- a/modules/openapi-generator/src/main/resources/rust/reqwest/api_mod.mustache
+++ b/modules/openapi-generator/src/main/resources/rust/reqwest/api_mod.mustache
@@ -30,8 +30,6 @@ pub fn urlencode<T: AsRef<str>>(s: T) -> String {
     ::url::form_urlencoded::byte_serialize(s.as_ref().as_bytes()).collect()
 }
 
-use super::models::*;
-
 {{#apiInfo}}
 {{#apis}}
 mod {{{classFilename}}};
diff --git a/modules/openapi-generator/src/main/resources/rust/reqwest/client.mustache b/modules/openapi-generator/src/main/resources/rust/reqwest/client.mustache
index 5fdede09c4..9eab132865 100644
--- a/modules/openapi-generator/src/main/resources/rust/reqwest/client.mustache
+++ b/modules/openapi-generator/src/main/resources/rust/reqwest/client.mustache
@@ -3,7 +3,6 @@ use std::rc::Rc;
 use super::configuration::Configuration;
 
 pub struct APIClient {
-    configuration: Rc<Configuration>,
 {{#apiInfo}}
 {{#apis}}
 {{#operations}}
@@ -22,7 +21,6 @@ impl APIClient {
         let rc = Rc::new(configuration);
 
         APIClient {
-            configuration: rc.clone(),
 {{#apiInfo}}
 {{#apis}}
 {{#operations}}
diff --git a/samples/client/petstore/rust-reqwest/.openapi-generator/VERSION.orig b/samples/client/petstore/rust-reqwest/.openapi-generator/VERSION.orig
new file mode 100644
index 0000000000..479c313e87
--- /dev/null
+++ b/samples/client/petstore/rust-reqwest/.openapi-generator/VERSION.orig
@@ -0,0 +1 @@
+4.0.3-SNAPSHOT
\ No newline at end of file
diff --git a/samples/client/petstore/rust-reqwest/src/apis/client.rs b/samples/client/petstore/rust-reqwest/src/apis/client.rs
index 14088cbe30..f231908832 100644
--- a/samples/client/petstore/rust-reqwest/src/apis/client.rs
+++ b/samples/client/petstore/rust-reqwest/src/apis/client.rs
@@ -3,7 +3,6 @@ use std::rc::Rc;
 use super::configuration::Configuration;
 
 pub struct APIClient {
-    configuration: Rc<Configuration>,
     pet_api: Box<crate::apis::PetApi>,
     store_api: Box<crate::apis::StoreApi>,
     user_api: Box<crate::apis::UserApi>,
@@ -14,7 +13,6 @@ impl APIClient {
         let rc = Rc::new(configuration);
 
         APIClient {
-            configuration: rc.clone(),
             pet_api: Box::new(crate::apis::PetApiClient::new(rc.clone())),
             store_api: Box::new(crate::apis::StoreApiClient::new(rc.clone())),
             user_api: Box::new(crate::apis::UserApiClient::new(rc.clone())),
diff --git a/samples/client/petstore/rust-reqwest/src/apis/client.rs.orig b/samples/client/petstore/rust-reqwest/src/apis/client.rs.orig
new file mode 100644
index 0000000000..f231908832
--- /dev/null
+++ b/samples/client/petstore/rust-reqwest/src/apis/client.rs.orig
@@ -0,0 +1,34 @@
+use std::rc::Rc;
+
+use super::configuration::Configuration;
+
+pub struct APIClient {
+    pet_api: Box<crate::apis::PetApi>,
+    store_api: Box<crate::apis::StoreApi>,
+    user_api: Box<crate::apis::UserApi>,
+}
+
+impl APIClient {
+    pub fn new(configuration: Configuration) -> APIClient {
+        let rc = Rc::new(configuration);
+
+        APIClient {
+            pet_api: Box::new(crate::apis::PetApiClient::new(rc.clone())),
+            store_api: Box::new(crate::apis::StoreApiClient::new(rc.clone())),
+            user_api: Box::new(crate::apis::UserApiClient::new(rc.clone())),
+        }
+    }
+
+    pub fn pet_api(&self) -> &crate::apis::PetApi{
+        self.pet_api.as_ref()
+    }
+
+    pub fn store_api(&self) -> &crate::apis::StoreApi{
+        self.store_api.as_ref()
+    }
+
+    pub fn user_api(&self) -> &crate::apis::UserApi{
+        self.user_api.as_ref()
+    }
+
+}
diff --git a/samples/client/petstore/rust-reqwest/src/apis/mod.rs b/samples/client/petstore/rust-reqwest/src/apis/mod.rs
index 8ca9138588..c14d751153 100644
--- a/samples/client/petstore/rust-reqwest/src/apis/mod.rs
+++ b/samples/client/petstore/rust-reqwest/src/apis/mod.rs
@@ -30,8 +30,6 @@ pub fn urlencode<T: AsRef<str>>(s: T) -> String {
     ::url::form_urlencoded::byte_serialize(s.as_ref().as_bytes()).collect()
 }
 
-use super::models::*;
-
 mod pet_api;
 pub use self::pet_api::{ PetApi, PetApiClient };
 mod store_api;
diff --git a/samples/client/petstore/rust-reqwest/src/apis/pet_api.rs b/samples/client/petstore/rust-reqwest/src/apis/pet_api.rs
index 264fc30e68..428e75bbea 100644
--- a/samples/client/petstore/rust-reqwest/src/apis/pet_api.rs
+++ b/samples/client/petstore/rust-reqwest/src/apis/pet_api.rs
@@ -13,7 +13,7 @@ use std::borrow::Borrow;
 
 use reqwest;
 
-use super::{Error, configuration, urlencode};
+use super::{Error, configuration};
 
 pub struct PetApiClient {
     configuration: Rc<configuration::Configuration>,
diff --git a/samples/client/petstore/rust-reqwest/src/apis/store_api.rs b/samples/client/petstore/rust-reqwest/src/apis/store_api.rs
index dac744b3b2..16b4176562 100644
--- a/samples/client/petstore/rust-reqwest/src/apis/store_api.rs
+++ b/samples/client/petstore/rust-reqwest/src/apis/store_api.rs
@@ -13,7 +13,7 @@ use std::borrow::Borrow;
 
 use reqwest;
 
-use super::{Error, configuration, urlencode};
+use super::{Error, configuration};
 
 pub struct StoreApiClient {
     configuration: Rc<configuration::Configuration>,
@@ -39,7 +39,7 @@ impl StoreApi for StoreApiClient {
         let configuration: &configuration::Configuration = self.configuration.borrow();
         let client = &configuration.client;
 
-        let uri_str = format!("{}/store/order/{orderId}", configuration.base_path, orderId=urlencode(order_id));
+        let uri_str = format!("{}/store/order/{orderId}", configuration.base_path, orderId=crate::apis::urlencode(order_id));
         let mut req_builder = client.delete(uri_str.as_str());
 
         if let Some(ref user_agent) = configuration.user_agent {
diff --git a/samples/client/petstore/rust-reqwest/src/apis/user_api.rs b/samples/client/petstore/rust-reqwest/src/apis/user_api.rs
index e2321b3daa..3c82ab1502 100644
--- a/samples/client/petstore/rust-reqwest/src/apis/user_api.rs
+++ b/samples/client/petstore/rust-reqwest/src/apis/user_api.rs
@@ -13,7 +13,7 @@ use std::borrow::Borrow;
 
 use reqwest;
 
-use super::{Error, configuration, urlencode};
+use super::{Error, configuration};
 
 pub struct UserApiClient {
     configuration: Rc<configuration::Configuration>,
@@ -100,7 +100,7 @@ impl UserApi for UserApiClient {
         let configuration: &configuration::Configuration = self.configuration.borrow();
         let client = &configuration.client;
 
-        let uri_str = format!("{}/user/{username}", configuration.base_path, username=urlencode(username));
+        let uri_str = format!("{}/user/{username}", configuration.base_path, username=crate::apis::urlencode(username));
         let mut req_builder = client.delete(uri_str.as_str());
 
         if let Some(ref user_agent) = configuration.user_agent {
@@ -118,7 +118,7 @@ impl UserApi for UserApiClient {
         let configuration: &configuration::Configuration = self.configuration.borrow();
         let client = &configuration.client;
 
-        let uri_str = format!("{}/user/{username}", configuration.base_path, username=urlencode(username));
+        let uri_str = format!("{}/user/{username}", configuration.base_path, username=crate::apis::urlencode(username));
         let mut req_builder = client.get(uri_str.as_str());
 
         if let Some(ref user_agent) = configuration.user_agent {
@@ -172,7 +172,7 @@ impl UserApi for UserApiClient {
         let configuration: &configuration::Configuration = self.configuration.borrow();
         let client = &configuration.client;
 
-        let uri_str = format!("{}/user/{username}", configuration.base_path, username=urlencode(username));
+        let uri_str = format!("{}/user/{username}", configuration.base_path, username=crate::apis::urlencode(username));
         let mut req_builder = client.put(uri_str.as_str());
 
         if let Some(ref user_agent) = configuration.user_agent {
diff --git a/samples/client/petstore/rust-reqwest/src/models/api_response.rs b/samples/client/petstore/rust-reqwest/src/models/api_response.rs
index 814483602d..d83716a9a1 100644
--- a/samples/client/petstore/rust-reqwest/src/models/api_response.rs
+++ b/samples/client/petstore/rust-reqwest/src/models/api_response.rs
@@ -11,7 +11,7 @@
 /// ApiResponse : Describes the result of uploading an image resource
 
 
-#[derive(Debug, Serialize, Deserialize)]
+#[derive(Debug, PartialEq, Eq, Serialize, Deserialize)]
 pub struct ApiResponse {
     #[serde(rename = "code", skip_serializing_if = "Option::is_none")]
     pub code: Option<i32>,
diff --git a/samples/client/petstore/rust-reqwest/src/models/category.rs b/samples/client/petstore/rust-reqwest/src/models/category.rs
index 8cb5797ee1..4b2c812339 100644
--- a/samples/client/petstore/rust-reqwest/src/models/category.rs
+++ b/samples/client/petstore/rust-reqwest/src/models/category.rs
@@ -11,7 +11,7 @@
 /// Category : A category for a pet
 
 
-#[derive(Debug, Serialize, Deserialize)]
+#[derive(Debug, PartialEq, Eq, Serialize, Deserialize)]
 pub struct Category {
     #[serde(rename = "id", skip_serializing_if = "Option::is_none")]
     pub id: Option<i64>,
diff --git a/samples/client/petstore/rust-reqwest/src/models/order.rs b/samples/client/petstore/rust-reqwest/src/models/order.rs
index 24ad342497..637dd71cde 100644
--- a/samples/client/petstore/rust-reqwest/src/models/order.rs
+++ b/samples/client/petstore/rust-reqwest/src/models/order.rs
@@ -11,7 +11,7 @@
 /// Order : An order for a pets from the pet store
 
 
-#[derive(Debug, Serialize, Deserialize)]
+#[derive(Debug, PartialEq, Eq, Serialize, Deserialize)]
 pub struct Order {
     #[serde(rename = "id", skip_serializing_if = "Option::is_none")]
     pub id: Option<i64>,
@@ -23,7 +23,7 @@ pub struct Order {
     pub ship_date: Option<String>,
     /// Order Status
     #[serde(rename = "status", skip_serializing_if = "Option::is_none")]
-    pub status: Option<String>,
+    pub status: Option<Status>,
     #[serde(rename = "complete", skip_serializing_if = "Option::is_none")]
     pub complete: Option<bool>,
 }
@@ -43,7 +43,7 @@ impl Order {
 }
 
 /// Order Status
-#[derive(Debug, Serialize, Deserialize)]
+#[derive(Debug, PartialEq, Eq, Serialize, Deserialize)]
 pub enum Status {
     #[serde(rename = "placed")]
     Placed,
diff --git a/samples/client/petstore/rust-reqwest/src/models/pet.rs b/samples/client/petstore/rust-reqwest/src/models/pet.rs
index e3c61239cd..efc6f370ff 100644
--- a/samples/client/petstore/rust-reqwest/src/models/pet.rs
+++ b/samples/client/petstore/rust-reqwest/src/models/pet.rs
@@ -11,7 +11,7 @@
 /// Pet : A pet for sale in the pet store
 
 
-#[derive(Debug, Serialize, Deserialize)]
+#[derive(Debug, PartialEq, Eq, Serialize, Deserialize)]
 pub struct Pet {
     #[serde(rename = "id", skip_serializing_if = "Option::is_none")]
     pub id: Option<i64>,
@@ -25,7 +25,7 @@ pub struct Pet {
     pub tags: Option<Vec<crate::models::Tag>>,
     /// pet status in the store
     #[serde(rename = "status", skip_serializing_if = "Option::is_none")]
-    pub status: Option<String>,
+    pub status: Option<Status>,
 }
 
 impl Pet {
@@ -43,7 +43,7 @@ impl Pet {
 }
 
 /// pet status in the store
-#[derive(Debug, Serialize, Deserialize)]
+#[derive(Debug, PartialEq, Eq, Serialize, Deserialize)]
 pub enum Status {
     #[serde(rename = "available")]
     Available,
diff --git a/samples/client/petstore/rust-reqwest/src/models/tag.rs b/samples/client/petstore/rust-reqwest/src/models/tag.rs
index c7cbdf2cc0..69e361463e 100644
--- a/samples/client/petstore/rust-reqwest/src/models/tag.rs
+++ b/samples/client/petstore/rust-reqwest/src/models/tag.rs
@@ -11,7 +11,7 @@
 /// Tag : A tag for a pet
 
 
-#[derive(Debug, Serialize, Deserialize)]
+#[derive(Debug, PartialEq, Eq, Serialize, Deserialize)]
 pub struct Tag {
     #[serde(rename = "id", skip_serializing_if = "Option::is_none")]
     pub id: Option<i64>,
diff --git a/samples/client/petstore/rust-reqwest/src/models/user.rs b/samples/client/petstore/rust-reqwest/src/models/user.rs
index e54ed70130..e204a5e325 100644
--- a/samples/client/petstore/rust-reqwest/src/models/user.rs
+++ b/samples/client/petstore/rust-reqwest/src/models/user.rs
@@ -11,7 +11,7 @@
 /// User : A User who is purchasing from the pet store
 
 
-#[derive(Debug, Serialize, Deserialize)]
+#[derive(Debug, PartialEq, Eq, Serialize, Deserialize)]
 pub struct User {
     #[serde(rename = "id", skip_serializing_if = "Option::is_none")]
     pub id: Option<i64>,
diff --git a/samples/client/petstore/rust/.openapi-generator/VERSION.orig b/samples/client/petstore/rust/.openapi-generator/VERSION.orig
new file mode 100644
index 0000000000..479c313e87
--- /dev/null
+++ b/samples/client/petstore/rust/.openapi-generator/VERSION.orig
@@ -0,0 +1 @@
+4.0.3-SNAPSHOT
\ No newline at end of file
diff --git a/samples/client/petstore/rust/src/apis/client.rs b/samples/client/petstore/rust/src/apis/client.rs
index dd0de97eb5..39175e119e 100644
--- a/samples/client/petstore/rust/src/apis/client.rs
+++ b/samples/client/petstore/rust/src/apis/client.rs
@@ -3,19 +3,17 @@ use std::rc::Rc;
 use hyper;
 use super::configuration::Configuration;
 
-pub struct APIClient<C: hyper::client::Connect> {
-    configuration: Rc<Configuration<C>>,
+pub struct APIClient {
     pet_api: Box<crate::apis::PetApi>,
     store_api: Box<crate::apis::StoreApi>,
     user_api: Box<crate::apis::UserApi>,
 }
 
-impl<C: hyper::client::Connect> APIClient<C> {
-    pub fn new(configuration: Configuration<C>) -> APIClient<C> {
+impl APIClient {
+    pub fn new<C: hyper::client::Connect>(configuration: Configuration<C>) -> APIClient {
         let rc = Rc::new(configuration);
 
         APIClient {
-            configuration: rc.clone(),
             pet_api: Box::new(crate::apis::PetApiClient::new(rc.clone())),
             store_api: Box::new(crate::apis::StoreApiClient::new(rc.clone())),
             user_api: Box::new(crate::apis::UserApiClient::new(rc.clone())),
diff --git a/samples/client/petstore/rust/src/apis/client.rs.orig b/samples/client/petstore/rust/src/apis/client.rs.orig
new file mode 100644
index 0000000000..39175e119e
--- /dev/null
+++ b/samples/client/petstore/rust/src/apis/client.rs.orig
@@ -0,0 +1,35 @@
+use std::rc::Rc;
+
+use hyper;
+use super::configuration::Configuration;
+
+pub struct APIClient {
+    pet_api: Box<crate::apis::PetApi>,
+    store_api: Box<crate::apis::StoreApi>,
+    user_api: Box<crate::apis::UserApi>,
+}
+
+impl APIClient {
+    pub fn new<C: hyper::client::Connect>(configuration: Configuration<C>) -> APIClient {
+        let rc = Rc::new(configuration);
+
+        APIClient {
+            pet_api: Box::new(crate::apis::PetApiClient::new(rc.clone())),
+            store_api: Box::new(crate::apis::StoreApiClient::new(rc.clone())),
+            user_api: Box::new(crate::apis::UserApiClient::new(rc.clone())),
+        }
+    }
+
+    pub fn pet_api(&self) -> &crate::apis::PetApi{
+        self.pet_api.as_ref()
+    }
+
+    pub fn store_api(&self) -> &crate::apis::StoreApi{
+        self.store_api.as_ref()
+    }
+
+    pub fn user_api(&self) -> &crate::apis::UserApi{
+        self.user_api.as_ref()
+    }
+
+}
diff --git a/samples/client/petstore/rust/src/apis/configuration.rs b/samples/client/petstore/rust/src/apis/configuration.rs
index c282a0c30d..83d5f1c3d0 100644
--- a/samples/client/petstore/rust/src/apis/configuration.rs
+++ b/samples/client/petstore/rust/src/apis/configuration.rs
@@ -9,7 +9,6 @@
  */
 
 use hyper;
-use std::collections::HashMap;
 
 pub struct Configuration<C: hyper::client::Connect> {
     pub base_path: String,
diff --git a/samples/client/petstore/rust/src/apis/mod.rs b/samples/client/petstore/rust/src/apis/mod.rs
index 06935c28a9..8e1f9cc2ad 100644
--- a/samples/client/petstore/rust/src/apis/mod.rs
+++ b/samples/client/petstore/rust/src/apis/mod.rs
@@ -49,8 +49,6 @@ impl<T> From<serde_json::Error> for Error<T> {
     }
 }
 
-use super::models::*;
-
 mod request;
 
 mod pet_api;
diff --git a/samples/client/petstore/rust/src/apis/request.rs b/samples/client/petstore/rust/src/apis/request.rs
index 383a409542..2d5c7eb5a6 100644
--- a/samples/client/petstore/rust/src/apis/request.rs
+++ b/samples/client/petstore/rust/src/apis/request.rs
@@ -24,6 +24,7 @@ impl ApiKey {
     }
 }
 
+#[allow(dead_code)]
 pub(crate) enum Auth {
     None,
     ApiKey(ApiKey),
diff --git a/samples/client/petstore/rust/src/models/api_response.rs b/samples/client/petstore/rust/src/models/api_response.rs
index 814483602d..d83716a9a1 100644
--- a/samples/client/petstore/rust/src/models/api_response.rs
+++ b/samples/client/petstore/rust/src/models/api_response.rs
@@ -11,7 +11,7 @@
 /// ApiResponse : Describes the result of uploading an image resource
 
 
-#[derive(Debug, Serialize, Deserialize)]
+#[derive(Debug, PartialEq, Eq, Serialize, Deserialize)]
 pub struct ApiResponse {
     #[serde(rename = "code", skip_serializing_if = "Option::is_none")]
     pub code: Option<i32>,
diff --git a/samples/client/petstore/rust/src/models/category.rs b/samples/client/petstore/rust/src/models/category.rs
index 8cb5797ee1..4b2c812339 100644
--- a/samples/client/petstore/rust/src/models/category.rs
+++ b/samples/client/petstore/rust/src/models/category.rs
@@ -11,7 +11,7 @@
 /// Category : A category for a pet
 
 
-#[derive(Debug, Serialize, Deserialize)]
+#[derive(Debug, PartialEq, Eq, Serialize, Deserialize)]
 pub struct Category {
     #[serde(rename = "id", skip_serializing_if = "Option::is_none")]
     pub id: Option<i64>,
diff --git a/samples/client/petstore/rust/src/models/order.rs b/samples/client/petstore/rust/src/models/order.rs
index 24ad342497..637dd71cde 100644
--- a/samples/client/petstore/rust/src/models/order.rs
+++ b/samples/client/petstore/rust/src/models/order.rs
@@ -11,7 +11,7 @@
 /// Order : An order for a pets from the pet store
 
 
-#[derive(Debug, Serialize, Deserialize)]
+#[derive(Debug, PartialEq, Eq, Serialize, Deserialize)]
 pub struct Order {
     #[serde(rename = "id", skip_serializing_if = "Option::is_none")]
     pub id: Option<i64>,
@@ -23,7 +23,7 @@ pub struct Order {
     pub ship_date: Option<String>,
     /// Order Status
     #[serde(rename = "status", skip_serializing_if = "Option::is_none")]
-    pub status: Option<String>,
+    pub status: Option<Status>,
     #[serde(rename = "complete", skip_serializing_if = "Option::is_none")]
     pub complete: Option<bool>,
 }
@@ -43,7 +43,7 @@ impl Order {
 }
 
 /// Order Status
-#[derive(Debug, Serialize, Deserialize)]
+#[derive(Debug, PartialEq, Eq, Serialize, Deserialize)]
 pub enum Status {
     #[serde(rename = "placed")]
     Placed,
diff --git a/samples/client/petstore/rust/src/models/pet.rs b/samples/client/petstore/rust/src/models/pet.rs
index e3c61239cd..efc6f370ff 100644
--- a/samples/client/petstore/rust/src/models/pet.rs
+++ b/samples/client/petstore/rust/src/models/pet.rs
@@ -11,7 +11,7 @@
 /// Pet : A pet for sale in the pet store
 
 
-#[derive(Debug, Serialize, Deserialize)]
+#[derive(Debug, PartialEq, Eq, Serialize, Deserialize)]
 pub struct Pet {
     #[serde(rename = "id", skip_serializing_if = "Option::is_none")]
     pub id: Option<i64>,
@@ -25,7 +25,7 @@ pub struct Pet {
     pub tags: Option<Vec<crate::models::Tag>>,
     /// pet status in the store
     #[serde(rename = "status", skip_serializing_if = "Option::is_none")]
-    pub status: Option<String>,
+    pub status: Option<Status>,
 }
 
 impl Pet {
@@ -43,7 +43,7 @@ impl Pet {
 }
 
 /// pet status in the store
-#[derive(Debug, Serialize, Deserialize)]
+#[derive(Debug, PartialEq, Eq, Serialize, Deserialize)]
 pub enum Status {
     #[serde(rename = "available")]
     Available,
diff --git a/samples/client/petstore/rust/src/models/tag.rs b/samples/client/petstore/rust/src/models/tag.rs
index c7cbdf2cc0..69e361463e 100644
--- a/samples/client/petstore/rust/src/models/tag.rs
+++ b/samples/client/petstore/rust/src/models/tag.rs
@@ -11,7 +11,7 @@
 /// Tag : A tag for a pet
 
 
-#[derive(Debug, Serialize, Deserialize)]
+#[derive(Debug, PartialEq, Eq, Serialize, Deserialize)]
 pub struct Tag {
     #[serde(rename = "id", skip_serializing_if = "Option::is_none")]
     pub id: Option<i64>,
diff --git a/samples/client/petstore/rust/src/models/user.rs b/samples/client/petstore/rust/src/models/user.rs
index e54ed70130..e204a5e325 100644
--- a/samples/client/petstore/rust/src/models/user.rs
+++ b/samples/client/petstore/rust/src/models/user.rs
@@ -11,7 +11,7 @@
 /// User : A User who is purchasing from the pet store
 
 
-#[derive(Debug, Serialize, Deserialize)]
+#[derive(Debug, PartialEq, Eq, Serialize, Deserialize)]
 pub struct User {
     #[serde(rename = "id", skip_serializing_if = "Option::is_none")]
     pub id: Option<i64>,

From 28a16bea2421fff1224e08b5f06c136116fdf3ec Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Beno=C3=AEt=20Courtine?= <benoit.courtine@gmail.com>
Date: Wed, 24 Jul 2019 18:33:11 +0200
Subject: [PATCH 44/62] [Rust][Client] Correct the Rust client generated
 documentation (#3419)

Fixes #3418. Only generated API markdown files are impacted.
---
 .../src/main/resources/rust/api_doc.mustache  |  22 +--
 .../petstore/rust-reqwest/docs/PetApi.md      | 125 +++++++-----------
 .../petstore/rust-reqwest/docs/StoreApi.md    |  28 ++--
 .../petstore/rust-reqwest/docs/UserApi.md     |  62 ++++-----
 samples/client/petstore/rust/docs/PetApi.md   | 125 +++++++-----------
 samples/client/petstore/rust/docs/StoreApi.md |  28 ++--
 samples/client/petstore/rust/docs/UserApi.md  |  62 ++++-----
 7 files changed, 187 insertions(+), 265 deletions(-)

diff --git a/modules/openapi-generator/src/main/resources/rust/api_doc.mustache b/modules/openapi-generator/src/main/resources/rust/api_doc.mustache
index 772afe7a2c..df4b7d7f14 100644
--- a/modules/openapi-generator/src/main/resources/rust/api_doc.mustache
+++ b/modules/openapi-generator/src/main/resources/rust/api_doc.mustache
@@ -14,27 +14,19 @@ Method | HTTP request | Description
 
 ## {{{operationId}}}
 
-> {{#returnType}}{{{returnType}}} {{/returnType}}{{{operationId}}}({{#authMethods}}ctx, {{/authMethods}}{{#allParams}}{{#required}}{{{paramName}}}{{#hasMore}}, {{/hasMore}}{{/required}}{{/allParams}}{{#hasOptionalParams}}optional{{/hasOptionalParams}})
+> {{#returnType}}{{{returnType}}} {{/returnType}}{{{operationId}}}({{#allParams}}{{{paramName}}}{{#hasMore}}, {{/hasMore}}{{/allParams}})
 {{{summary}}}{{#notes}}
 
 {{{notes}}}{{/notes}}
 
-### Required Parameters
+### Parameters
 
 {{^allParams}}This endpoint does not need any parameter.{{/allParams}}{{#allParams}}{{#-last}}
-Name | Type | Description  | Notes
-------------- | ------------- | ------------- | -------------{{#authMethods}}
- **ctx** | **context.Context** | context containing the authentication | nil if no authentication{{/authMethods}}{{/-last}}{{/allParams}}{{#allParams}}{{#required}}
-  **{{{paramName}}}** | {{#isPrimitiveType}}**{{{dataType}}}**{{/isPrimitiveType}}{{^isPrimitiveType}}[**{{{dataType}}}**]({{{baseType}}}.md){{/isPrimitiveType}}| {{{description}}} | {{#defaultValue}}[default to {{{defaultValue}}}]{{/defaultValue}}{{/required}}{{/allParams}}{{#hasOptionalParams}}
- **optional** | **map[string]interface{}** | optional parameters | nil if no parameters
-
-### Optional Parameters
-
-Optional parameters are passed through a map[string]interface{}.
-{{#allParams}}{{#-last}}
-Name | Type | Description  | Notes
-------------- | ------------- | ------------- | -------------{{/-last}}{{/allParams}}{{#allParams}}
- **{{{paramName}}}** | {{#isPrimitiveType}}**{{{dataType}}}**{{/isPrimitiveType}}{{^isPrimitiveType}}[**{{{dataType}}}**]({{{baseType}}}.md){{/isPrimitiveType}}| {{{description}}} | {{#defaultValue}}[default to {{{defaultValue}}}]{{/defaultValue}}{{/allParams}}{{/hasOptionalParams}}
+Name | Type | Description  | Required | Notes
+------------- | ------------- | ------------- | ------------- | -------------{{/-last}}{{/allParams}}
+{{#allParams}}
+**{{{paramName}}}** | {{#isPrimitiveType}}**{{{dataType}}}**{{/isPrimitiveType}}{{^isPrimitiveType}}[**{{{dataType}}}**]({{{baseType}}}.md){{/isPrimitiveType}} | {{{description}}} | {{#required}}Required{{/required}} | {{#defaultValue}}[default to {{{defaultValue}}}]{{/defaultValue}}
+{{/allParams}}
 
 ### Return type
 
diff --git a/samples/client/petstore/rust-reqwest/docs/PetApi.md b/samples/client/petstore/rust-reqwest/docs/PetApi.md
index 336116bee5..b97fb9e156 100644
--- a/samples/client/petstore/rust-reqwest/docs/PetApi.md
+++ b/samples/client/petstore/rust-reqwest/docs/PetApi.md
@@ -17,16 +17,15 @@ Method | HTTP request | Description
 
 ## add_pet
 
-> add_pet(ctx, body)
+> add_pet(body)
 Add a new pet to the store
 
-### Required Parameters
+### Parameters
 
 
-Name | Type | Description  | Notes
-------------- | ------------- | ------------- | -------------
- **ctx** | **context.Context** | context containing the authentication | nil if no authentication
-  **body** | [**Pet**](Pet.md)| Pet object that needs to be added to the store | 
+Name | Type | Description  | Required | Notes
+------------- | ------------- | ------------- | ------------- | -------------
+**body** | [**Pet**](Pet.md) | Pet object that needs to be added to the store | Required | 
 
 ### Return type
 
@@ -46,26 +45,16 @@ Name | Type | Description  | Notes
 
 ## delete_pet
 
-> delete_pet(ctx, pet_id, optional)
+> delete_pet(pet_id, api_key)
 Deletes a pet
 
-### Required Parameters
+### Parameters
 
 
-Name | Type | Description  | Notes
-------------- | ------------- | ------------- | -------------
- **ctx** | **context.Context** | context containing the authentication | nil if no authentication
-  **pet_id** | **i64**| Pet id to delete | 
- **optional** | **map[string]interface{}** | optional parameters | nil if no parameters
-
-### Optional Parameters
-
-Optional parameters are passed through a map[string]interface{}.
-
-Name | Type | Description  | Notes
-------------- | ------------- | ------------- | -------------
- **pet_id** | **i64**| Pet id to delete | 
- **api_key** | **String**|  | 
+Name | Type | Description  | Required | Notes
+------------- | ------------- | ------------- | ------------- | -------------
+**pet_id** | **i64** | Pet id to delete | Required | 
+**api_key** | **String** |  |  | 
 
 ### Return type
 
@@ -85,18 +74,17 @@ Name | Type | Description  | Notes
 
 ## find_pets_by_status
 
-> Vec<crate::models::Pet> find_pets_by_status(ctx, status)
+> Vec<crate::models::Pet> find_pets_by_status(status)
 Finds Pets by status
 
 Multiple status values can be provided with comma separated strings
 
-### Required Parameters
+### Parameters
 
 
-Name | Type | Description  | Notes
-------------- | ------------- | ------------- | -------------
- **ctx** | **context.Context** | context containing the authentication | nil if no authentication
-  **status** | [**Vec<String>**](String.md)| Status values that need to be considered for filter | 
+Name | Type | Description  | Required | Notes
+------------- | ------------- | ------------- | ------------- | -------------
+**status** | [**Vec<String>**](String.md) | Status values that need to be considered for filter | Required | 
 
 ### Return type
 
@@ -116,18 +104,17 @@ Name | Type | Description  | Notes
 
 ## find_pets_by_tags
 
-> Vec<crate::models::Pet> find_pets_by_tags(ctx, tags)
+> Vec<crate::models::Pet> find_pets_by_tags(tags)
 Finds Pets by tags
 
 Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3 for testing.
 
-### Required Parameters
+### Parameters
 
 
-Name | Type | Description  | Notes
-------------- | ------------- | ------------- | -------------
- **ctx** | **context.Context** | context containing the authentication | nil if no authentication
-  **tags** | [**Vec<String>**](String.md)| Tags to filter by | 
+Name | Type | Description  | Required | Notes
+------------- | ------------- | ------------- | ------------- | -------------
+**tags** | [**Vec<String>**](String.md) | Tags to filter by | Required | 
 
 ### Return type
 
@@ -147,18 +134,17 @@ Name | Type | Description  | Notes
 
 ## get_pet_by_id
 
-> crate::models::Pet get_pet_by_id(ctx, pet_id)
+> crate::models::Pet get_pet_by_id(pet_id)
 Find pet by ID
 
 Returns a single pet
 
-### Required Parameters
+### Parameters
 
 
-Name | Type | Description  | Notes
-------------- | ------------- | ------------- | -------------
- **ctx** | **context.Context** | context containing the authentication | nil if no authentication
-  **pet_id** | **i64**| ID of pet to return | 
+Name | Type | Description  | Required | Notes
+------------- | ------------- | ------------- | ------------- | -------------
+**pet_id** | **i64** | ID of pet to return | Required | 
 
 ### Return type
 
@@ -178,16 +164,15 @@ Name | Type | Description  | Notes
 
 ## update_pet
 
-> update_pet(ctx, body)
+> update_pet(body)
 Update an existing pet
 
-### Required Parameters
+### Parameters
 
 
-Name | Type | Description  | Notes
-------------- | ------------- | ------------- | -------------
- **ctx** | **context.Context** | context containing the authentication | nil if no authentication
-  **body** | [**Pet**](Pet.md)| Pet object that needs to be added to the store | 
+Name | Type | Description  | Required | Notes
+------------- | ------------- | ------------- | ------------- | -------------
+**body** | [**Pet**](Pet.md) | Pet object that needs to be added to the store | Required | 
 
 ### Return type
 
@@ -207,27 +192,17 @@ Name | Type | Description  | Notes
 
 ## update_pet_with_form
 
-> update_pet_with_form(ctx, pet_id, optional)
+> update_pet_with_form(pet_id, name, status)
 Updates a pet in the store with form data
 
-### Required Parameters
+### Parameters
 
 
-Name | Type | Description  | Notes
-------------- | ------------- | ------------- | -------------
- **ctx** | **context.Context** | context containing the authentication | nil if no authentication
-  **pet_id** | **i64**| ID of pet that needs to be updated | 
- **optional** | **map[string]interface{}** | optional parameters | nil if no parameters
-
-### Optional Parameters
-
-Optional parameters are passed through a map[string]interface{}.
-
-Name | Type | Description  | Notes
-------------- | ------------- | ------------- | -------------
- **pet_id** | **i64**| ID of pet that needs to be updated | 
- **name** | **String**| Updated name of the pet | 
- **status** | **String**| Updated status of the pet | 
+Name | Type | Description  | Required | Notes
+------------- | ------------- | ------------- | ------------- | -------------
+**pet_id** | **i64** | ID of pet that needs to be updated | Required | 
+**name** | **String** | Updated name of the pet |  | 
+**status** | **String** | Updated status of the pet |  | 
 
 ### Return type
 
@@ -247,27 +222,17 @@ Name | Type | Description  | Notes
 
 ## upload_file
 
-> crate::models::ApiResponse upload_file(ctx, pet_id, optional)
+> crate::models::ApiResponse upload_file(pet_id, additional_metadata, file)
 uploads an image
 
-### Required Parameters
+### Parameters
 
 
-Name | Type | Description  | Notes
-------------- | ------------- | ------------- | -------------
- **ctx** | **context.Context** | context containing the authentication | nil if no authentication
-  **pet_id** | **i64**| ID of pet to update | 
- **optional** | **map[string]interface{}** | optional parameters | nil if no parameters
-
-### Optional Parameters
-
-Optional parameters are passed through a map[string]interface{}.
-
-Name | Type | Description  | Notes
-------------- | ------------- | ------------- | -------------
- **pet_id** | **i64**| ID of pet to update | 
- **additional_metadata** | **String**| Additional data to pass to server | 
- **file** | **std::path::PathBuf**| file to upload | 
+Name | Type | Description  | Required | Notes
+------------- | ------------- | ------------- | ------------- | -------------
+**pet_id** | **i64** | ID of pet to update | Required | 
+**additional_metadata** | **String** | Additional data to pass to server |  | 
+**file** | **std::path::PathBuf** | file to upload |  | 
 
 ### Return type
 
diff --git a/samples/client/petstore/rust-reqwest/docs/StoreApi.md b/samples/client/petstore/rust-reqwest/docs/StoreApi.md
index 28ae8c60af..02b0edbdfd 100644
--- a/samples/client/petstore/rust-reqwest/docs/StoreApi.md
+++ b/samples/client/petstore/rust-reqwest/docs/StoreApi.md
@@ -18,12 +18,12 @@ Delete purchase order by ID
 
 For valid response try integer IDs with value < 1000. Anything above 1000 or nonintegers will generate API errors
 
-### Required Parameters
+### Parameters
 
 
-Name | Type | Description  | Notes
-------------- | ------------- | ------------- | -------------
-  **order_id** | **String**| ID of the order that needs to be deleted | 
+Name | Type | Description  | Required | Notes
+------------- | ------------- | ------------- | ------------- | -------------
+**order_id** | **String** | ID of the order that needs to be deleted | Required | 
 
 ### Return type
 
@@ -43,12 +43,12 @@ No authorization required
 
 ## get_inventory
 
-> ::std::collections::HashMap<String, i32> get_inventory(ctx, )
+> ::std::collections::HashMap<String, i32> get_inventory()
 Returns pet inventories by status
 
 Returns a map of status codes to quantities
 
-### Required Parameters
+### Parameters
 
 This endpoint does not need any parameter.
 
@@ -75,12 +75,12 @@ Find purchase order by ID
 
 For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
 
-### Required Parameters
+### Parameters
 
 
-Name | Type | Description  | Notes
-------------- | ------------- | ------------- | -------------
-  **order_id** | **i64**| ID of pet that needs to be fetched | 
+Name | Type | Description  | Required | Notes
+------------- | ------------- | ------------- | ------------- | -------------
+**order_id** | **i64** | ID of pet that needs to be fetched | Required | 
 
 ### Return type
 
@@ -103,12 +103,12 @@ No authorization required
 > crate::models::Order place_order(body)
 Place an order for a pet
 
-### Required Parameters
+### Parameters
 
 
-Name | Type | Description  | Notes
-------------- | ------------- | ------------- | -------------
-  **body** | [**Order**](Order.md)| order placed for purchasing the pet | 
+Name | Type | Description  | Required | Notes
+------------- | ------------- | ------------- | ------------- | -------------
+**body** | [**Order**](Order.md) | order placed for purchasing the pet | Required | 
 
 ### Return type
 
diff --git a/samples/client/petstore/rust-reqwest/docs/UserApi.md b/samples/client/petstore/rust-reqwest/docs/UserApi.md
index ce5490e806..afa1d6cd63 100644
--- a/samples/client/petstore/rust-reqwest/docs/UserApi.md
+++ b/samples/client/petstore/rust-reqwest/docs/UserApi.md
@@ -22,12 +22,12 @@ Create user
 
 This can only be done by the logged in user.
 
-### Required Parameters
+### Parameters
 
 
-Name | Type | Description  | Notes
-------------- | ------------- | ------------- | -------------
-  **body** | [**User**](User.md)| Created user object | 
+Name | Type | Description  | Required | Notes
+------------- | ------------- | ------------- | ------------- | -------------
+**body** | [**User**](User.md) | Created user object | Required | 
 
 ### Return type
 
@@ -50,12 +50,12 @@ No authorization required
 > create_users_with_array_input(body)
 Creates list of users with given input array
 
-### Required Parameters
+### Parameters
 
 
-Name | Type | Description  | Notes
-------------- | ------------- | ------------- | -------------
-  **body** | [**Vec<crate::models::User>**](User.md)| List of user object | 
+Name | Type | Description  | Required | Notes
+------------- | ------------- | ------------- | ------------- | -------------
+**body** | [**Vec<crate::models::User>**](User.md) | List of user object | Required | 
 
 ### Return type
 
@@ -78,12 +78,12 @@ No authorization required
 > create_users_with_list_input(body)
 Creates list of users with given input array
 
-### Required Parameters
+### Parameters
 
 
-Name | Type | Description  | Notes
-------------- | ------------- | ------------- | -------------
-  **body** | [**Vec<crate::models::User>**](User.md)| List of user object | 
+Name | Type | Description  | Required | Notes
+------------- | ------------- | ------------- | ------------- | -------------
+**body** | [**Vec<crate::models::User>**](User.md) | List of user object | Required | 
 
 ### Return type
 
@@ -108,12 +108,12 @@ Delete user
 
 This can only be done by the logged in user.
 
-### Required Parameters
+### Parameters
 
 
-Name | Type | Description  | Notes
-------------- | ------------- | ------------- | -------------
-  **username** | **String**| The name that needs to be deleted | 
+Name | Type | Description  | Required | Notes
+------------- | ------------- | ------------- | ------------- | -------------
+**username** | **String** | The name that needs to be deleted | Required | 
 
 ### Return type
 
@@ -136,12 +136,12 @@ No authorization required
 > crate::models::User get_user_by_name(username)
 Get user by user name
 
-### Required Parameters
+### Parameters
 
 
-Name | Type | Description  | Notes
-------------- | ------------- | ------------- | -------------
-  **username** | **String**| The name that needs to be fetched. Use user1 for testing. | 
+Name | Type | Description  | Required | Notes
+------------- | ------------- | ------------- | ------------- | -------------
+**username** | **String** | The name that needs to be fetched. Use user1 for testing. | Required | 
 
 ### Return type
 
@@ -164,13 +164,13 @@ No authorization required
 > String login_user(username, password)
 Logs user into the system
 
-### Required Parameters
+### Parameters
 
 
-Name | Type | Description  | Notes
-------------- | ------------- | ------------- | -------------
-  **username** | **String**| The user name for login | 
-  **password** | **String**| The password for login in clear text | 
+Name | Type | Description  | Required | Notes
+------------- | ------------- | ------------- | ------------- | -------------
+**username** | **String** | The user name for login | Required | 
+**password** | **String** | The password for login in clear text | Required | 
 
 ### Return type
 
@@ -193,7 +193,7 @@ No authorization required
 > logout_user()
 Logs out current logged in user session
 
-### Required Parameters
+### Parameters
 
 This endpoint does not need any parameter.
 
@@ -220,13 +220,13 @@ Updated user
 
 This can only be done by the logged in user.
 
-### Required Parameters
+### Parameters
 
 
-Name | Type | Description  | Notes
-------------- | ------------- | ------------- | -------------
-  **username** | **String**| name that need to be deleted | 
-  **body** | [**User**](User.md)| Updated user object | 
+Name | Type | Description  | Required | Notes
+------------- | ------------- | ------------- | ------------- | -------------
+**username** | **String** | name that need to be deleted | Required | 
+**body** | [**User**](User.md) | Updated user object | Required | 
 
 ### Return type
 
diff --git a/samples/client/petstore/rust/docs/PetApi.md b/samples/client/petstore/rust/docs/PetApi.md
index 4d5e4c7839..f6f1929b42 100644
--- a/samples/client/petstore/rust/docs/PetApi.md
+++ b/samples/client/petstore/rust/docs/PetApi.md
@@ -17,16 +17,15 @@ Method | HTTP request | Description
 
 ## add_pet
 
-> add_pet(ctx, body)
+> add_pet(body)
 Add a new pet to the store
 
-### Required Parameters
+### Parameters
 
 
-Name | Type | Description  | Notes
-------------- | ------------- | ------------- | -------------
- **ctx** | **context.Context** | context containing the authentication | nil if no authentication
-  **body** | [**Pet**](Pet.md)| Pet object that needs to be added to the store | 
+Name | Type | Description  | Required | Notes
+------------- | ------------- | ------------- | ------------- | -------------
+**body** | [**Pet**](Pet.md) | Pet object that needs to be added to the store | Required | 
 
 ### Return type
 
@@ -46,26 +45,16 @@ Name | Type | Description  | Notes
 
 ## delete_pet
 
-> delete_pet(ctx, pet_id, optional)
+> delete_pet(pet_id, api_key)
 Deletes a pet
 
-### Required Parameters
+### Parameters
 
 
-Name | Type | Description  | Notes
-------------- | ------------- | ------------- | -------------
- **ctx** | **context.Context** | context containing the authentication | nil if no authentication
-  **pet_id** | **i64**| Pet id to delete | 
- **optional** | **map[string]interface{}** | optional parameters | nil if no parameters
-
-### Optional Parameters
-
-Optional parameters are passed through a map[string]interface{}.
-
-Name | Type | Description  | Notes
-------------- | ------------- | ------------- | -------------
- **pet_id** | **i64**| Pet id to delete | 
- **api_key** | **String**|  | 
+Name | Type | Description  | Required | Notes
+------------- | ------------- | ------------- | ------------- | -------------
+**pet_id** | **i64** | Pet id to delete | Required | 
+**api_key** | **String** |  |  | 
 
 ### Return type
 
@@ -85,18 +74,17 @@ Name | Type | Description  | Notes
 
 ## find_pets_by_status
 
-> Vec<crate::models::Pet> find_pets_by_status(ctx, status)
+> Vec<crate::models::Pet> find_pets_by_status(status)
 Finds Pets by status
 
 Multiple status values can be provided with comma separated strings
 
-### Required Parameters
+### Parameters
 
 
-Name | Type | Description  | Notes
-------------- | ------------- | ------------- | -------------
- **ctx** | **context.Context** | context containing the authentication | nil if no authentication
-  **status** | [**Vec<String>**](String.md)| Status values that need to be considered for filter | 
+Name | Type | Description  | Required | Notes
+------------- | ------------- | ------------- | ------------- | -------------
+**status** | [**Vec<String>**](String.md) | Status values that need to be considered for filter | Required | 
 
 ### Return type
 
@@ -116,18 +104,17 @@ Name | Type | Description  | Notes
 
 ## find_pets_by_tags
 
-> Vec<crate::models::Pet> find_pets_by_tags(ctx, tags)
+> Vec<crate::models::Pet> find_pets_by_tags(tags)
 Finds Pets by tags
 
 Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3 for testing.
 
-### Required Parameters
+### Parameters
 
 
-Name | Type | Description  | Notes
-------------- | ------------- | ------------- | -------------
- **ctx** | **context.Context** | context containing the authentication | nil if no authentication
-  **tags** | [**Vec<String>**](String.md)| Tags to filter by | 
+Name | Type | Description  | Required | Notes
+------------- | ------------- | ------------- | ------------- | -------------
+**tags** | [**Vec<String>**](String.md) | Tags to filter by | Required | 
 
 ### Return type
 
@@ -147,18 +134,17 @@ Name | Type | Description  | Notes
 
 ## get_pet_by_id
 
-> crate::models::Pet get_pet_by_id(ctx, pet_id)
+> crate::models::Pet get_pet_by_id(pet_id)
 Find pet by ID
 
 Returns a single pet
 
-### Required Parameters
+### Parameters
 
 
-Name | Type | Description  | Notes
-------------- | ------------- | ------------- | -------------
- **ctx** | **context.Context** | context containing the authentication | nil if no authentication
-  **pet_id** | **i64**| ID of pet to return | 
+Name | Type | Description  | Required | Notes
+------------- | ------------- | ------------- | ------------- | -------------
+**pet_id** | **i64** | ID of pet to return | Required | 
 
 ### Return type
 
@@ -178,16 +164,15 @@ Name | Type | Description  | Notes
 
 ## update_pet
 
-> update_pet(ctx, body)
+> update_pet(body)
 Update an existing pet
 
-### Required Parameters
+### Parameters
 
 
-Name | Type | Description  | Notes
-------------- | ------------- | ------------- | -------------
- **ctx** | **context.Context** | context containing the authentication | nil if no authentication
-  **body** | [**Pet**](Pet.md)| Pet object that needs to be added to the store | 
+Name | Type | Description  | Required | Notes
+------------- | ------------- | ------------- | ------------- | -------------
+**body** | [**Pet**](Pet.md) | Pet object that needs to be added to the store | Required | 
 
 ### Return type
 
@@ -207,27 +192,17 @@ Name | Type | Description  | Notes
 
 ## update_pet_with_form
 
-> update_pet_with_form(ctx, pet_id, optional)
+> update_pet_with_form(pet_id, name, status)
 Updates a pet in the store with form data
 
-### Required Parameters
+### Parameters
 
 
-Name | Type | Description  | Notes
-------------- | ------------- | ------------- | -------------
- **ctx** | **context.Context** | context containing the authentication | nil if no authentication
-  **pet_id** | **i64**| ID of pet that needs to be updated | 
- **optional** | **map[string]interface{}** | optional parameters | nil if no parameters
-
-### Optional Parameters
-
-Optional parameters are passed through a map[string]interface{}.
-
-Name | Type | Description  | Notes
-------------- | ------------- | ------------- | -------------
- **pet_id** | **i64**| ID of pet that needs to be updated | 
- **name** | **String**| Updated name of the pet | 
- **status** | **String**| Updated status of the pet | 
+Name | Type | Description  | Required | Notes
+------------- | ------------- | ------------- | ------------- | -------------
+**pet_id** | **i64** | ID of pet that needs to be updated | Required | 
+**name** | **String** | Updated name of the pet |  | 
+**status** | **String** | Updated status of the pet |  | 
 
 ### Return type
 
@@ -247,27 +222,17 @@ Name | Type | Description  | Notes
 
 ## upload_file
 
-> crate::models::ApiResponse upload_file(ctx, pet_id, optional)
+> crate::models::ApiResponse upload_file(pet_id, additional_metadata, file)
 uploads an image
 
-### Required Parameters
+### Parameters
 
 
-Name | Type | Description  | Notes
-------------- | ------------- | ------------- | -------------
- **ctx** | **context.Context** | context containing the authentication | nil if no authentication
-  **pet_id** | **i64**| ID of pet to update | 
- **optional** | **map[string]interface{}** | optional parameters | nil if no parameters
-
-### Optional Parameters
-
-Optional parameters are passed through a map[string]interface{}.
-
-Name | Type | Description  | Notes
-------------- | ------------- | ------------- | -------------
- **pet_id** | **i64**| ID of pet to update | 
- **additional_metadata** | **String**| Additional data to pass to server | 
- **file** | **std::path::PathBuf**| file to upload | 
+Name | Type | Description  | Required | Notes
+------------- | ------------- | ------------- | ------------- | -------------
+**pet_id** | **i64** | ID of pet to update | Required | 
+**additional_metadata** | **String** | Additional data to pass to server |  | 
+**file** | **std::path::PathBuf** | file to upload |  | 
 
 ### Return type
 
diff --git a/samples/client/petstore/rust/docs/StoreApi.md b/samples/client/petstore/rust/docs/StoreApi.md
index 16a09fae3f..44aa5e83a3 100644
--- a/samples/client/petstore/rust/docs/StoreApi.md
+++ b/samples/client/petstore/rust/docs/StoreApi.md
@@ -18,12 +18,12 @@ Delete purchase order by ID
 
 For valid response try integer IDs with value < 1000. Anything above 1000 or nonintegers will generate API errors
 
-### Required Parameters
+### Parameters
 
 
-Name | Type | Description  | Notes
-------------- | ------------- | ------------- | -------------
-  **order_id** | **String**| ID of the order that needs to be deleted | 
+Name | Type | Description  | Required | Notes
+------------- | ------------- | ------------- | ------------- | -------------
+**order_id** | **String** | ID of the order that needs to be deleted | Required | 
 
 ### Return type
 
@@ -43,12 +43,12 @@ No authorization required
 
 ## get_inventory
 
-> ::std::collections::HashMap<String, i32> get_inventory(ctx, )
+> ::std::collections::HashMap<String, i32> get_inventory()
 Returns pet inventories by status
 
 Returns a map of status codes to quantities
 
-### Required Parameters
+### Parameters
 
 This endpoint does not need any parameter.
 
@@ -75,12 +75,12 @@ Find purchase order by ID
 
 For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
 
-### Required Parameters
+### Parameters
 
 
-Name | Type | Description  | Notes
-------------- | ------------- | ------------- | -------------
-  **order_id** | **i64**| ID of pet that needs to be fetched | 
+Name | Type | Description  | Required | Notes
+------------- | ------------- | ------------- | ------------- | -------------
+**order_id** | **i64** | ID of pet that needs to be fetched | Required | 
 
 ### Return type
 
@@ -103,12 +103,12 @@ No authorization required
 > crate::models::Order place_order(body)
 Place an order for a pet
 
-### Required Parameters
+### Parameters
 
 
-Name | Type | Description  | Notes
-------------- | ------------- | ------------- | -------------
-  **body** | [**Order**](Order.md)| order placed for purchasing the pet | 
+Name | Type | Description  | Required | Notes
+------------- | ------------- | ------------- | ------------- | -------------
+**body** | [**Order**](Order.md) | order placed for purchasing the pet | Required | 
 
 ### Return type
 
diff --git a/samples/client/petstore/rust/docs/UserApi.md b/samples/client/petstore/rust/docs/UserApi.md
index 9c4af81392..051a6a15ff 100644
--- a/samples/client/petstore/rust/docs/UserApi.md
+++ b/samples/client/petstore/rust/docs/UserApi.md
@@ -22,12 +22,12 @@ Create user
 
 This can only be done by the logged in user.
 
-### Required Parameters
+### Parameters
 
 
-Name | Type | Description  | Notes
-------------- | ------------- | ------------- | -------------
-  **body** | [**User**](User.md)| Created user object | 
+Name | Type | Description  | Required | Notes
+------------- | ------------- | ------------- | ------------- | -------------
+**body** | [**User**](User.md) | Created user object | Required | 
 
 ### Return type
 
@@ -50,12 +50,12 @@ No authorization required
 > create_users_with_array_input(body)
 Creates list of users with given input array
 
-### Required Parameters
+### Parameters
 
 
-Name | Type | Description  | Notes
-------------- | ------------- | ------------- | -------------
-  **body** | [**Vec<crate::models::User>**](User.md)| List of user object | 
+Name | Type | Description  | Required | Notes
+------------- | ------------- | ------------- | ------------- | -------------
+**body** | [**Vec<crate::models::User>**](User.md) | List of user object | Required | 
 
 ### Return type
 
@@ -78,12 +78,12 @@ No authorization required
 > create_users_with_list_input(body)
 Creates list of users with given input array
 
-### Required Parameters
+### Parameters
 
 
-Name | Type | Description  | Notes
-------------- | ------------- | ------------- | -------------
-  **body** | [**Vec<crate::models::User>**](User.md)| List of user object | 
+Name | Type | Description  | Required | Notes
+------------- | ------------- | ------------- | ------------- | -------------
+**body** | [**Vec<crate::models::User>**](User.md) | List of user object | Required | 
 
 ### Return type
 
@@ -108,12 +108,12 @@ Delete user
 
 This can only be done by the logged in user.
 
-### Required Parameters
+### Parameters
 
 
-Name | Type | Description  | Notes
-------------- | ------------- | ------------- | -------------
-  **username** | **String**| The name that needs to be deleted | 
+Name | Type | Description  | Required | Notes
+------------- | ------------- | ------------- | ------------- | -------------
+**username** | **String** | The name that needs to be deleted | Required | 
 
 ### Return type
 
@@ -136,12 +136,12 @@ No authorization required
 > crate::models::User get_user_by_name(username)
 Get user by user name
 
-### Required Parameters
+### Parameters
 
 
-Name | Type | Description  | Notes
-------------- | ------------- | ------------- | -------------
-  **username** | **String**| The name that needs to be fetched. Use user1 for testing. | 
+Name | Type | Description  | Required | Notes
+------------- | ------------- | ------------- | ------------- | -------------
+**username** | **String** | The name that needs to be fetched. Use user1 for testing. | Required | 
 
 ### Return type
 
@@ -164,13 +164,13 @@ No authorization required
 > String login_user(username, password)
 Logs user into the system
 
-### Required Parameters
+### Parameters
 
 
-Name | Type | Description  | Notes
-------------- | ------------- | ------------- | -------------
-  **username** | **String**| The user name for login | 
-  **password** | **String**| The password for login in clear text | 
+Name | Type | Description  | Required | Notes
+------------- | ------------- | ------------- | ------------- | -------------
+**username** | **String** | The user name for login | Required | 
+**password** | **String** | The password for login in clear text | Required | 
 
 ### Return type
 
@@ -193,7 +193,7 @@ No authorization required
 > logout_user()
 Logs out current logged in user session
 
-### Required Parameters
+### Parameters
 
 This endpoint does not need any parameter.
 
@@ -220,13 +220,13 @@ Updated user
 
 This can only be done by the logged in user.
 
-### Required Parameters
+### Parameters
 
 
-Name | Type | Description  | Notes
-------------- | ------------- | ------------- | -------------
-  **username** | **String**| name that need to be deleted | 
-  **body** | [**User**](User.md)| Updated user object | 
+Name | Type | Description  | Required | Notes
+------------- | ------------- | ------------- | ------------- | -------------
+**username** | **String** | name that need to be deleted | Required | 
+**body** | [**User**](User.md) | Updated user object | Required | 
 
 ### Return type
 

From ab644f991294e6f0ea536f7ae91cb04a6270f54f Mon Sep 17 00:00:00 2001
From: William Cheng <wing328hk@gmail.com>
Date: Thu, 25 Jul 2019 00:43:19 +0800
Subject: [PATCH 45/62] Add GoDaddy as domain name sponsor (#3443)

* add godaddy as domain name sponsor

* resize godaddy logo

* add back new line

* remove space

* highlight sponsor
---
 README.md | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 084b9e40a8..e74b1c0b2f 100644
--- a/README.md
+++ b/README.md
@@ -46,12 +46,18 @@ If you find OpenAPI Generator useful for work, please consider asking your compa
 [![NamSor](https://openapi-generator.tech/img/companies/namsor.png)](https://www.namsor.com/?utm_source=openapi_generator&utm_medium=github_webpage&utm_campaign=sponsor)
 [![LightBow](https://openapi-generator.tech/img/companies/lightbow.png)](https://www.lightbow.net/?utm_source=openapi_generator&utm_medium=github_webpage&utm_campaign=sponsor)
 
+#### Thank you GoDaddy for sponsoring the domain names and Linode for sponsoring the VPS
+
+[<img src="https://openapi-generator.tech/img/companies/godaddy.png" width="150">](https://www.godaddy.com/?utm_source=openapi_generator&utm_medium=github_webpage&utm_campaign=sponsor)
+[![Linode](https://www.linode.com/media/images/logos/standard/light/linode-logo_standard_light_small.png)](https://www.linode.com/?utm_source=openapi_generator&utm_medium=github_webpage&utm_campaign=sponsor)
+
+
 ## Overview
 OpenAPI Generator allows generation of API client libraries (SDK generation), server stubs,  documentation and configuration automatically given an [OpenAPI Spec](https://github.com/OAI/OpenAPI-Specification) (both 2.0 and 3.0 are supported). Currently, the following languages/frameworks are supported:
 
 |                                | Languages/Frameworks |
 |-|-|
-**API clients**                  | **ActionScript**, **Ada**, **Apex**, **Bash**, **C**, **C#** (.net 2.0, 3.5 or later), **C++** (cpp-restsdk, Qt5, Tizen), **Clojure**, **Dart (1.x, 2.x)**, **Elixir**, **Elm**, **Eiffel**, **Erlang**, **Go**, **Groovy**, **Haskell** (http-client, Servant), **Java** (Jersey1.x, Jersey2.x, OkHttp, Retrofit1.x, Retrofit2.x, Feign, RestTemplate, RESTEasy, Vertx, Google API Client Library for Java, Rest-assured, Spring 5 Web Client), **Kotlin**, **Lua**, **Node.js** (ES5, ES6, AngularJS with Google Closure Compiler annotations, Flow types) **Objective-C**, **Perl**, **PHP**, **PowerShell**, **Python**, **R**, **Ruby**, **Rust** (rust, rust-server), **Scala** (akka, http4s, scalaz, swagger-async-httpclient), **Swift** (2.x, 3.x, 4.x), **Typescript** (AngularJS, Angular (2.x - 7.x), Aurelia, Axios, Fetch, Inversify, jQuery, Node, Rxjs)
+**API clients**                  | **ActionScript**, **Ada**, **Apex**, **Bash**, **C**, **C#** (.net 2.0, 3.5 or later), **C++** (cpp-restsdk, Qt5, Tizen), **Clojure**, **Dart (1.x, 2.x)**, **Elixir**, **Elm**, **Eiffel**, **Erlang**, **Go**, **Groovy**, **Haskell** (http-client, Servant), **Java** (Jersey1.x, Jersey2.x, OkHttp, Retrofit1.x, Retrofit2.x, Feign, RestTemplate, RESTEasy, Vertx, Google API Client Library for Java, Rest-assured, Spring 5 Web Client), **Kotlin**, **Lua**, **Node.js/JavaScript** (ES5, ES6, AngularJS with Google Closure Compiler annotations, Flow types) **Objective-C**, **Perl**, **PHP**, **PowerShell**, **Python**, **R**, **Ruby**, **Rust** (rust, rust-server), **Scala** (akka, http4s, scalaz, swagger-async-httpclient), **Swift** (2.x, 3.x, 4.x), **Typescript** (AngularJS, Angular (2.x - 7.x), Aurelia, Axios, Fetch, Inversify, jQuery, Node, Rxjs)
 **Server stubs**                 | **Ada**, **C#** (ASP.NET Core, NancyFx), **C++** (Pistache, Restbed, Qt5 QHTTPEngine), **Erlang**, **F#** (Giraffe), **Go** (net/http, Gin), **Haskell** (Servant), **Java** (MSF4J, Spring, Undertow, JAX-RS: CDI, CXF, Inflector, RestEasy, Play Framework, [PKMST](https://github.com/ProKarma-Inc/pkmst-getting-started-examples)), **Kotlin** (Spring Boot, Ktor), **PHP** (Laravel, Lumen, Slim, Silex, [Symfony](https://symfony.com/), [Zend Expressive](https://github.com/zendframework/zend-expressive)), **Python** (Flask), **NodeJS**, **Ruby** (Sinatra, Rails5), **Rust** (rust-server), **Scala** ([Finch](https://github.com/finagle/finch), [Lagom](https://github.com/lagom/lagom), [Play](https://www.playframework.com/), Scalatra)
 **API documentation generators** | **HTML**, **Confluence Wiki**
 **Configuration files**          | [**Apache2**](https://httpd.apache.org/)

From 3f7725c9e23dc4a8cbc4970819483a9f7da6d3db Mon Sep 17 00:00:00 2001
From: William Cheng <wing328hk@gmail.com>
Date: Thu, 25 Jul 2019 10:19:40 +0800
Subject: [PATCH 46/62] update brew instruction (#3445)

---
 README.md | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/README.md b/README.md
index e74b1c0b2f..7402e2c152 100644
--- a/README.md
+++ b/README.md
@@ -248,6 +248,17 @@ openapi-generator generate -i https://raw.githubusercontent.com/openapitools/ope
 
 To reinstall with the latest master, run `brew uninstall openapi-generator && brew install --HEAD openapi-generator`
 
+To install OpenJDK (pre-requisites), please run
+```sh
+brew cask install adoptopenjdk12
+export JAVA_HOME=/Library/Java/JavaVirtualMachines/jdk-12.0.2.jdk/Contents/Home/
+```
+
+To install Maven, please run
+```sh
+brew install maven
+```
+
 ### [1.6 - Docker](#table-of-contents)
 
 #### Public Pre-built Docker images

From a0dd7394ac555c11020ebfe6342c950a28cb1770 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A9r=C3=A9mie=20Bresson?= <dev@jmini.fr>
Date: Thu, 25 Jul 2019 04:32:50 +0200
Subject: [PATCH 47/62] [java] Support for number enum (#3328)

* [java] Support for number enum

*  [core] add isLong, isNumber, isNumeric, isFloat, isDouble to CodegenModel

* [java-gson] fix Enum TypeAdapter in BigDecimal case.
---
 .../openapitools/codegen/CodegenModel.java    |   7 +-
 .../openapitools/codegen/DefaultCodegen.java  |  21 ++-
 .../languages/AbstractJavaCodegen.java        |   9 +-
 .../main/resources/Java/modelEnum.mustache    |   4 +-
 .../resources/Java/modelInnerEnum.mustache    |   4 +-
 .../codegen/DefaultCodegenTest.java           | 160 ++++++++++++++++++
 6 files changed, 195 insertions(+), 10 deletions(-)

diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/CodegenModel.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/CodegenModel.java
index 760033ec35..b9e93fbf26 100644
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/CodegenModel.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/CodegenModel.java
@@ -46,7 +46,7 @@ public class CodegenModel {
     public String defaultValue;
     public String arrayModelType;
     public boolean isAlias; // Is this effectively an alias of another simple type
-    public boolean isString, isInteger;
+    public boolean isString, isInteger, isLong, isNumber, isNumeric, isFloat, isDouble;
     public List<CodegenProperty> vars = new ArrayList<CodegenProperty>(); // all properties (without parent's properties)
     public List<CodegenProperty> allVars = new ArrayList<CodegenProperty>(); // all properties (with parent's properties)
     public List<CodegenProperty> requiredVars = new ArrayList<CodegenProperty>(); // a list of required properties
@@ -96,7 +96,12 @@ public class CodegenModel {
                 .append("arrayModelType", arrayModelType)
                 .append("isAlias", isAlias)
                 .append("isString", isString)
+                .append("isNumeric", isNumeric)
                 .append("isInteger", isInteger)
+                .append("isLong", isLong)
+                .append("isNumber", isNumber)
+                .append("isFloat", isFloat)
+                .append("isDouble", isDouble)
                 .append("vars", vars)
                 .append("requiredVars", requiredVars)
                 .append("optionalVars", optionalVars)
diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/DefaultCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/DefaultCodegen.java
index 639f8448c3..ba5c09b2fa 100644
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/DefaultCodegen.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/DefaultCodegen.java
@@ -1885,14 +1885,27 @@ public class DefaultCodegen implements CodegenConfig {
                 addAdditionPropertiesToCodeGenModel(m, schema);
                 m.isMapModel = true;
             }
-            if (ModelUtils.isIntegerSchema(schema)) { // integer type
-                if (!ModelUtils.isLongSchema(schema)) { // long type is not integer
+            else if (ModelUtils.isIntegerSchema(schema)) { // integer type
+                m.isNumeric = Boolean.TRUE;
+                if (ModelUtils.isLongSchema(schema)) { // int64/long format
+                    m.isLong = Boolean.TRUE;
+                } else { // int32 format
                     m.isInteger = Boolean.TRUE;
                 }
             }
-            if (ModelUtils.isStringSchema(schema)) {
+            else if (ModelUtils.isStringSchema(schema)) {
                 m.isString = Boolean.TRUE;
             }
+            else if (ModelUtils.isNumberSchema(schema)) {
+                m.isNumeric = Boolean.TRUE;
+                if (ModelUtils.isFloatSchema(schema)) { // float
+                    m.isFloat = Boolean.TRUE;
+                } else if (ModelUtils.isDoubleSchema(schema)) { // double
+                    m.isDouble = Boolean.TRUE;
+                } else { // type is number and without format
+                    m.isNumber = Boolean.TRUE;
+                }
+            }
 
             // passing null to allProperties and allRequired as there's no parent
             addVars(m, unaliasPropertySchema(schema.getProperties()), schema.getRequired(), null, null);
@@ -2059,7 +2072,7 @@ public class DefaultCodegen implements CodegenConfig {
         String type = getSchemaType(p);
         if (ModelUtils.isIntegerSchema(p)) { // integer type
             property.isNumeric = Boolean.TRUE;
-            if (SchemaTypeUtil.INTEGER64_FORMAT.equals(p.getFormat())) { // int64/long format
+            if (ModelUtils.isLongSchema(p)) { // int64/long format
                 property.isLong = Boolean.TRUE;
             } else { // int32 format
                 property.isInteger = Boolean.TRUE;
diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractJavaCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractJavaCodegen.java
index 066f424bfa..8a51194cc7 100644
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractJavaCodegen.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractJavaCodegen.java
@@ -417,6 +417,7 @@ public abstract class AbstractJavaCodegen extends DefaultCodegen implements Code
         // imports for pojos
         importMapping.put("ApiModelProperty", "io.swagger.annotations.ApiModelProperty");
         importMapping.put("ApiModel", "io.swagger.annotations.ApiModel");
+        importMapping.put("BigDecimal", "java.math.BigDecimal");
         importMapping.put("JsonProperty", "com.fasterxml.jackson.annotation.JsonProperty");
         importMapping.put("JsonSubTypes", "com.fasterxml.jackson.annotation.JsonSubTypes");
         importMapping.put("JsonTypeInfo", "com.fasterxml.jackson.annotation.JsonTypeInfo");
@@ -944,6 +945,9 @@ public abstract class AbstractJavaCodegen extends DefaultCodegen implements Code
             final CodegenModel parentCodegenModel = super.fromModel(codegenModel.parent, parentModel);
             codegenModel = AbstractJavaCodegen.reconcileInlineEnums(codegenModel, parentCodegenModel);
         }
+        if ("BigDecimal".equals(codegenModel.dataType)) {
+            codegenModel.imports.add("BigDecimal");
+        }
         return codegenModel;
     }
 
@@ -1107,7 +1111,7 @@ public abstract class AbstractJavaCodegen extends DefaultCodegen implements Code
 
         // number
         if ("Integer".equals(datatype) || "Long".equals(datatype) ||
-                "Float".equals(datatype) || "Double".equals(datatype)) {
+                "Float".equals(datatype) || "Double".equals(datatype) || "BigDecimal".equals(datatype)) {
             String varName = "NUMBER_" + value;
             varName = varName.replaceAll("-", "MINUS_");
             varName = varName.replaceAll("\\+", "PLUS_");
@@ -1134,6 +1138,9 @@ public abstract class AbstractJavaCodegen extends DefaultCodegen implements Code
         } else if ("Float".equals(datatype)) {
             // add f to number, e.g. 3.14 => 3.14f
             return value + "f";
+        } else if ("BigDecimal".equals(datatype)) {
+            // use BigDecimal String constructor
+            return "new BigDecimal(\"" + value + "\")";
         } else {
             return "\"" + escapeText(value) + "\"";
         }
diff --git a/modules/openapi-generator/src/main/resources/Java/modelEnum.mustache b/modules/openapi-generator/src/main/resources/Java/modelEnum.mustache
index e22a8e6ece..f9136b1a20 100644
--- a/modules/openapi-generator/src/main/resources/Java/modelEnum.mustache
+++ b/modules/openapi-generator/src/main/resources/Java/modelEnum.mustache
@@ -65,8 +65,8 @@ public enum {{#datatypeWithEnum}}{{{.}}}{{/datatypeWithEnum}}{{^datatypeWithEnum
 
     @Override
     public {{#datatypeWithEnum}}{{{.}}}{{/datatypeWithEnum}}{{^datatypeWithEnum}}{{{classname}}}{{/datatypeWithEnum}} read(final JsonReader jsonReader) throws IOException {
-      {{{dataType}}} value = jsonReader.{{#isInteger}}nextInt(){{/isInteger}}{{^isInteger}}next{{{dataType}}}(){{/isInteger}};
-      return {{#datatypeWithEnum}}{{{.}}}{{/datatypeWithEnum}}{{^datatypeWithEnum}}{{{classname}}}{{/datatypeWithEnum}}.fromValue(value);
+      {{^isNumber}}{{{dataType}}}{{/isNumber}}{{#isNumber}}String{{/isNumber}} value = jsonReader.{{#isNumber}}nextString(){{/isNumber}}{{#isInteger}}nextInt(){{/isInteger}}{{^isNumber}}{{^isInteger}}next{{{dataType}}}(){{/isInteger}}{{/isNumber}};
+      return {{#datatypeWithEnum}}{{{.}}}{{/datatypeWithEnum}}{{^datatypeWithEnum}}{{{classname}}}{{/datatypeWithEnum}}.fromValue({{#isNumber}}new BigDecimal({{/isNumber}}value{{#isNumber}}){{/isNumber}});
     }
   }
 {{/gson}}
diff --git a/modules/openapi-generator/src/main/resources/Java/modelInnerEnum.mustache b/modules/openapi-generator/src/main/resources/Java/modelInnerEnum.mustache
index 87c23108c1..ea0656c2dd 100644
--- a/modules/openapi-generator/src/main/resources/Java/modelInnerEnum.mustache
+++ b/modules/openapi-generator/src/main/resources/Java/modelInnerEnum.mustache
@@ -56,8 +56,8 @@
 
       @Override
       public {{#datatypeWithEnum}}{{{.}}}{{/datatypeWithEnum}}{{^datatypeWithEnum}}{{classname}}{{/datatypeWithEnum}} read(final JsonReader jsonReader) throws IOException {
-        {{{dataType}}} value = jsonReader.{{#isInteger}}nextInt(){{/isInteger}}{{^isInteger}}next{{{dataType}}}(){{/isInteger}};
-        return {{#datatypeWithEnum}}{{{.}}}{{/datatypeWithEnum}}{{^datatypeWithEnum}}{{classname}}{{/datatypeWithEnum}}.fromValue(value);
+        {{^isNumber}}{{{dataType}}}{{/isNumber}}{{#isNumber}}String{{/isNumber}} value = jsonReader.{{#isNumber}}nextString(){{/isNumber}}{{#isInteger}}nextInt(){{/isInteger}}{{^isNumber}}{{^isInteger}}next{{{dataType}}}(){{/isInteger}}{{/isNumber}};
+        return {{#datatypeWithEnum}}{{{.}}}{{/datatypeWithEnum}}{{^datatypeWithEnum}}{{classname}}{{/datatypeWithEnum}}.fromValue({{#isNumber}}new BigDecimal({{/isNumber}}value{{#isNumber}}){{/isNumber}});
       }
     }
 {{/gson}}
diff --git a/modules/openapi-generator/src/test/java/org/openapitools/codegen/DefaultCodegenTest.java b/modules/openapi-generator/src/test/java/org/openapitools/codegen/DefaultCodegenTest.java
index a95b6f106b..871958108e 100644
--- a/modules/openapi-generator/src/test/java/org/openapitools/codegen/DefaultCodegenTest.java
+++ b/modules/openapi-generator/src/test/java/org/openapitools/codegen/DefaultCodegenTest.java
@@ -578,6 +578,166 @@ public class DefaultCodegenTest {
         Assert.assertTrue(property.isNullable);
     }
 
+    @Test
+    public void integerSchemaPropertyAndModelTest() {
+        OpenAPI openAPI = TestUtils.createOpenAPI();
+        final Schema schema = new IntegerSchema().format("int32");
+        final DefaultCodegen codegen = new DefaultCodegen();
+        codegen.setOpenAPI(openAPI);
+
+        //Property:
+        final CodegenProperty cp = codegen.fromProperty("someProperty", schema);
+        Assert.assertEquals(cp.baseType, "integer");
+        Assert.assertEquals(cp.baseName, "someProperty");
+        Assert.assertFalse(cp.isString);
+        Assert.assertTrue(cp.isInteger);
+        Assert.assertFalse(cp.isLong);
+        Assert.assertFalse(cp.isNumber);
+        Assert.assertTrue(cp.isNumeric);
+        Assert.assertFalse(cp.isFloat);
+        Assert.assertFalse(cp.isDouble);
+
+        //Model:
+        final CodegenModel cm = codegen.fromModel("someModel", schema);
+        Assert.assertEquals(cm.dataType, "integer");
+        Assert.assertEquals(cm.name, "someModel");
+        Assert.assertFalse(cm.isString);
+        Assert.assertTrue(cm.isInteger);
+        Assert.assertFalse(cm.isLong);
+        Assert.assertFalse(cm.isNumber);
+        Assert.assertTrue(cm.isNumeric);
+        Assert.assertFalse(cm.isFloat);
+        Assert.assertFalse(cm.isDouble);
+    }
+
+    @Test
+    public void longSchemaPropertyAndModelTest() {
+        OpenAPI openAPI = TestUtils.createOpenAPI();
+        final Schema schema = new IntegerSchema().format("int64");
+        final DefaultCodegen codegen = new DefaultCodegen();
+        codegen.setOpenAPI(openAPI);
+
+        //Property:
+        final CodegenProperty cp = codegen.fromProperty("someProperty", schema);
+        Assert.assertEquals(cp.baseType, "long");
+        Assert.assertEquals(cp.baseName, "someProperty");
+        Assert.assertFalse(cp.isString);
+        Assert.assertFalse(cp.isInteger);
+        Assert.assertTrue(cp.isLong);
+        Assert.assertFalse(cp.isNumber);
+        Assert.assertTrue(cp.isNumeric);
+        Assert.assertFalse(cp.isFloat);
+        Assert.assertFalse(cp.isDouble);
+
+        //Model:
+        final CodegenModel cm = codegen.fromModel("someModel", schema);
+        Assert.assertEquals(cm.dataType, "long");
+        Assert.assertEquals(cm.name, "someModel");
+        Assert.assertFalse(cm.isString);
+        Assert.assertFalse(cm.isInteger);
+        Assert.assertTrue(cm.isLong);
+        Assert.assertFalse(cm.isNumber);
+        Assert.assertTrue(cm.isNumeric);
+        Assert.assertFalse(cm.isFloat);
+        Assert.assertFalse(cm.isDouble);
+    }
+
+    @Test
+    public void numberSchemaPropertyAndModelTest() {
+        OpenAPI openAPI = TestUtils.createOpenAPI();
+        final Schema schema = new NumberSchema();
+        final DefaultCodegen codegen = new DefaultCodegen();
+        codegen.setOpenAPI(openAPI);
+
+        //Property:
+        final CodegenProperty cp = codegen.fromProperty("someProperty", schema);
+        Assert.assertEquals(cp.baseType, "number");
+        Assert.assertEquals(cp.baseName, "someProperty");
+        Assert.assertFalse(cp.isString);
+        Assert.assertFalse(cp.isInteger);
+        Assert.assertFalse(cp.isLong);
+        Assert.assertTrue(cp.isNumber);
+        Assert.assertTrue(cp.isNumeric);
+        Assert.assertFalse(cp.isFloat);
+        Assert.assertFalse(cp.isDouble);
+
+        //Model:
+        final CodegenModel cm = codegen.fromModel("someModel", schema);
+        Assert.assertEquals(cm.dataType, "number");
+        Assert.assertEquals(cm.name, "someModel");
+        Assert.assertFalse(cm.isString);
+        Assert.assertFalse(cm.isInteger);
+        Assert.assertFalse(cm.isLong);
+        Assert.assertTrue(cm.isNumber);
+        Assert.assertTrue(cm.isNumeric);
+        Assert.assertFalse(cm.isFloat);
+        Assert.assertFalse(cm.isDouble);
+    }
+
+    @Test
+    public void numberFloatSchemaPropertyAndModelTest() {
+        OpenAPI openAPI = TestUtils.createOpenAPI();
+        final Schema schema = new NumberSchema().format("float");
+        final DefaultCodegen codegen = new DefaultCodegen();
+        codegen.setOpenAPI(openAPI);
+
+        //Property:
+        final CodegenProperty cp = codegen.fromProperty("someProperty", schema);
+        Assert.assertEquals(cp.baseType, "float");
+        Assert.assertEquals(cp.baseName, "someProperty");
+        Assert.assertFalse(cp.isString);
+        Assert.assertFalse(cp.isInteger);
+        Assert.assertFalse(cp.isLong);
+        Assert.assertFalse(cp.isNumber);
+        Assert.assertTrue(cp.isNumeric);
+        Assert.assertTrue(cp.isFloat);
+        Assert.assertFalse(cp.isDouble);
+
+        //Model:
+        final CodegenModel cm = codegen.fromModel("someModel", schema);
+        Assert.assertEquals(cm.dataType, "float");
+        Assert.assertEquals(cm.name, "someModel");
+        Assert.assertFalse(cm.isString);
+        Assert.assertFalse(cm.isInteger);
+        Assert.assertFalse(cm.isLong);
+        Assert.assertFalse(cm.isNumber);
+        Assert.assertTrue(cm.isNumeric);
+        Assert.assertTrue(cm.isFloat);
+        Assert.assertFalse(cm.isDouble);
+    }
+
+    @Test
+    public void numberDoubleSchemaPropertyAndModelTest() {
+        OpenAPI openAPI = TestUtils.createOpenAPI();
+        final Schema schema = new NumberSchema().format("double");
+        final DefaultCodegen codegen = new DefaultCodegen();
+        codegen.setOpenAPI(openAPI);
+
+        //Property:
+        final CodegenProperty cp = codegen.fromProperty("someProperty", schema);
+        Assert.assertEquals(cp.baseType, "double");
+        Assert.assertEquals(cp.baseName, "someProperty");
+        Assert.assertFalse(cp.isString);
+        Assert.assertFalse(cp.isInteger);
+        Assert.assertFalse(cp.isLong);
+        Assert.assertFalse(cp.isNumber);
+        Assert.assertTrue(cp.isNumeric);
+        Assert.assertFalse(cp.isFloat);
+        Assert.assertTrue(cp.isDouble);
+
+        //Model:
+        final CodegenModel cm = codegen.fromModel("someModel", schema);
+        Assert.assertEquals(cm.dataType, "double");
+        Assert.assertEquals(cm.name, "someModel");
+        Assert.assertFalse(cm.isString);
+        Assert.assertFalse(cm.isInteger);
+        Assert.assertFalse(cm.isLong);
+        Assert.assertFalse(cm.isNumber);
+        Assert.assertTrue(cm.isNumeric);
+        Assert.assertFalse(cm.isFloat);
+        Assert.assertTrue(cm.isDouble);
+    }
+
     private void verifyPersonDiscriminator(CodegenDiscriminator discriminator) {
         CodegenDiscriminator test = new CodegenDiscriminator();
         test.setPropertyName("DollarUnderscoretype");

From ee538be9647a93f86eb5ec47e4d223cceb2f94f0 Mon Sep 17 00:00:00 2001
From: kassim <kassim@users.noreply.github.com>
Date: Thu, 25 Jul 2019 04:35:18 +0200
Subject: [PATCH 48/62] [Java] add nullable annotation to pojo template for
 non-required fields (#3409)

* add nullable annotation to pojo template

* add jsr305 dependency

* jsr305 dependency on all java build.gradle files

* jsr305 dependency on all java pom.xml files

* update samples

* more pom updates

* more sample/template updates
---
 .../main/resources/Java/build.gradle.mustache |  1 +
 .../libraries/feign/build.gradle.mustache     |  1 +
 .../Java/libraries/feign/pom.mustache         |  7 +++++
 .../google-api-client/build.gradle.mustache   |  1 +
 .../libraries/google-api-client/pom.mustache  |  6 ++++
 .../libraries/jersey2/build.gradle.mustache   |  1 +
 .../Java/libraries/jersey2/pom.mustache       |  7 +++++
 .../okhttp-gson/build.gradle.mustache         |  1 +
 .../Java/libraries/okhttp-gson/pom.mustache   |  6 ++++
 .../rest-assured/build.gradle.mustache        |  1 +
 .../Java/libraries/rest-assured/pom.mustache  |  6 ++++
 .../libraries/resteasy/build.gradle.mustache  |  1 +
 .../Java/libraries/resteasy/pom.mustache      |  6 ++++
 .../resttemplate/build.gradle.mustache        |  1 +
 .../Java/libraries/resttemplate/pom.mustache  |  7 +++++
 .../libraries/retrofit/build.gradle.mustache  |  1 +
 .../Java/libraries/retrofit/pom.mustache      |  6 ++++
 .../libraries/retrofit2/build.gradle.mustache |  1 +
 .../Java/libraries/retrofit2/pom.mustache     |  6 ++++
 .../libraries/vertx/build.gradle.mustache     |  1 +
 .../Java/libraries/vertx/pom.mustache         |  7 +++++
 .../Java/libraries/webclient/pom.mustache     |  7 +++++
 .../src/main/resources/Java/pojo.mustache     |  1 +
 .../src/main/resources/Java/pom.mustache      |  8 +++++
 .../resources/JavaJaxRS/cxf-cdi/pom.mustache  |  7 +++++
 .../resources/JavaJaxRS/resteasy/pom.mustache |  6 ++++
 .../resources/JavaJaxRS/spec/pom.mustache     |  6 ++++
 .../libraries/spring-boot/pom.mustache        |  6 ++++
 .../libraries/spring-cloud/pom.mustache       |  6 ++++
 .../libraries/spring-mvc/pom.mustache         |  6 ++++
 .../android/libraries/volley/pom.mustache     |  6 ++++
 .../src/main/resources/android/pom.mustache   |  6 ++++
 .../java-undertow-server/pom.mustache         |  6 ++++
 .../libraries/spring-boot/pom.mustache        |  6 ++++
 .../petstore/android/httpclient/pom.xml       |  6 ++++
 .../client/petstore/java/feign/build.gradle   |  1 +
 samples/client/petstore/java/feign/pom.xml    |  7 +++++
 .../model/AdditionalPropertiesAnyType.java    |  1 +
 .../model/AdditionalPropertiesArray.java      |  1 +
 .../model/AdditionalPropertiesBoolean.java    |  1 +
 .../model/AdditionalPropertiesClass.java      | 11 +++++++
 .../model/AdditionalPropertiesInteger.java    |  1 +
 .../model/AdditionalPropertiesNumber.java     |  1 +
 .../model/AdditionalPropertiesObject.java     |  1 +
 .../model/AdditionalPropertiesString.java     |  1 +
 .../org/openapitools/client/model/Animal.java |  2 ++
 .../model/ArrayOfArrayOfNumberOnly.java       |  1 +
 .../client/model/ArrayOfNumberOnly.java       |  1 +
 .../openapitools/client/model/ArrayTest.java  |  3 ++
 .../client/model/Capitalization.java          |  6 ++++
 .../org/openapitools/client/model/Cat.java    |  1 +
 .../openapitools/client/model/CatAllOf.java   |  1 +
 .../openapitools/client/model/Category.java   |  2 ++
 .../openapitools/client/model/ClassModel.java |  1 +
 .../org/openapitools/client/model/Client.java |  1 +
 .../org/openapitools/client/model/Dog.java    |  1 +
 .../openapitools/client/model/DogAllOf.java   |  1 +
 .../openapitools/client/model/EnumArrays.java |  2 ++
 .../openapitools/client/model/EnumTest.java   |  5 ++++
 .../client/model/FileSchemaTestClass.java     |  2 ++
 .../openapitools/client/model/FormatTest.java | 13 +++++++++
 .../client/model/HasOnlyReadOnly.java         |  2 ++
 .../openapitools/client/model/MapTest.java    |  4 +++
 ...ropertiesAndAdditionalPropertiesClass.java |  3 ++
 .../client/model/Model200Response.java        |  2 ++
 .../client/model/ModelApiResponse.java        |  3 ++
 .../client/model/ModelReturn.java             |  1 +
 .../org/openapitools/client/model/Name.java   |  4 +++
 .../openapitools/client/model/NumberOnly.java |  1 +
 .../org/openapitools/client/model/Order.java  |  6 ++++
 .../client/model/OuterComposite.java          |  3 ++
 .../org/openapitools/client/model/Pet.java    |  6 ++++
 .../client/model/ReadOnlyFirst.java           |  2 ++
 .../client/model/SpecialModelName.java        |  1 +
 .../org/openapitools/client/model/Tag.java    |  2 ++
 .../client/model/TypeHolderDefault.java       |  5 ++++
 .../client/model/TypeHolderExample.java       |  5 ++++
 .../org/openapitools/client/model/User.java   |  8 +++++
 .../openapitools/client/model/XmlItem.java    | 29 +++++++++++++++++++
 .../petstore/java/feign10x/build.gradle       |  1 +
 samples/client/petstore/java/feign10x/pom.xml |  7 +++++
 .../model/AdditionalPropertiesAnyType.java    |  1 +
 .../model/AdditionalPropertiesArray.java      |  1 +
 .../model/AdditionalPropertiesBoolean.java    |  1 +
 .../model/AdditionalPropertiesClass.java      | 11 +++++++
 .../model/AdditionalPropertiesInteger.java    |  1 +
 .../model/AdditionalPropertiesNumber.java     |  1 +
 .../model/AdditionalPropertiesObject.java     |  1 +
 .../model/AdditionalPropertiesString.java     |  1 +
 .../org/openapitools/client/model/Animal.java |  2 ++
 .../model/ArrayOfArrayOfNumberOnly.java       |  1 +
 .../client/model/ArrayOfNumberOnly.java       |  1 +
 .../openapitools/client/model/ArrayTest.java  |  3 ++
 .../client/model/Capitalization.java          |  6 ++++
 .../org/openapitools/client/model/Cat.java    |  1 +
 .../openapitools/client/model/CatAllOf.java   |  1 +
 .../openapitools/client/model/Category.java   |  2 ++
 .../openapitools/client/model/ClassModel.java |  1 +
 .../org/openapitools/client/model/Client.java |  1 +
 .../org/openapitools/client/model/Dog.java    |  1 +
 .../openapitools/client/model/DogAllOf.java   |  1 +
 .../openapitools/client/model/EnumArrays.java |  2 ++
 .../openapitools/client/model/EnumTest.java   |  5 ++++
 .../client/model/FileSchemaTestClass.java     |  2 ++
 .../openapitools/client/model/FormatTest.java | 13 +++++++++
 .../client/model/HasOnlyReadOnly.java         |  2 ++
 .../openapitools/client/model/MapTest.java    |  4 +++
 ...ropertiesAndAdditionalPropertiesClass.java |  3 ++
 .../client/model/Model200Response.java        |  2 ++
 .../client/model/ModelApiResponse.java        |  3 ++
 .../client/model/ModelReturn.java             |  1 +
 .../org/openapitools/client/model/Name.java   |  4 +++
 .../openapitools/client/model/NumberOnly.java |  1 +
 .../org/openapitools/client/model/Order.java  |  6 ++++
 .../client/model/OuterComposite.java          |  3 ++
 .../org/openapitools/client/model/Pet.java    |  6 ++++
 .../client/model/ReadOnlyFirst.java           |  2 ++
 .../client/model/SpecialModelName.java        |  1 +
 .../org/openapitools/client/model/Tag.java    |  2 ++
 .../client/model/TypeHolderDefault.java       |  5 ++++
 .../client/model/TypeHolderExample.java       |  5 ++++
 .../org/openapitools/client/model/User.java   |  8 +++++
 .../openapitools/client/model/XmlItem.java    | 29 +++++++++++++++++++
 .../java/google-api-client/build.gradle       |  1 +
 .../petstore/java/google-api-client/pom.xml   |  6 ++++
 .../model/AdditionalPropertiesAnyType.java    |  1 +
 .../model/AdditionalPropertiesArray.java      |  1 +
 .../model/AdditionalPropertiesBoolean.java    |  1 +
 .../model/AdditionalPropertiesClass.java      | 11 +++++++
 .../model/AdditionalPropertiesInteger.java    |  1 +
 .../model/AdditionalPropertiesNumber.java     |  1 +
 .../model/AdditionalPropertiesObject.java     |  1 +
 .../model/AdditionalPropertiesString.java     |  1 +
 .../org/openapitools/client/model/Animal.java |  2 ++
 .../model/ArrayOfArrayOfNumberOnly.java       |  1 +
 .../client/model/ArrayOfNumberOnly.java       |  1 +
 .../openapitools/client/model/ArrayTest.java  |  3 ++
 .../client/model/Capitalization.java          |  6 ++++
 .../org/openapitools/client/model/Cat.java    |  1 +
 .../openapitools/client/model/CatAllOf.java   |  1 +
 .../openapitools/client/model/Category.java   |  2 ++
 .../openapitools/client/model/ClassModel.java |  1 +
 .../org/openapitools/client/model/Client.java |  1 +
 .../org/openapitools/client/model/Dog.java    |  1 +
 .../openapitools/client/model/DogAllOf.java   |  1 +
 .../openapitools/client/model/EnumArrays.java |  2 ++
 .../openapitools/client/model/EnumTest.java   |  5 ++++
 .../client/model/FileSchemaTestClass.java     |  2 ++
 .../openapitools/client/model/FormatTest.java | 13 +++++++++
 .../client/model/HasOnlyReadOnly.java         |  2 ++
 .../openapitools/client/model/MapTest.java    |  4 +++
 ...ropertiesAndAdditionalPropertiesClass.java |  3 ++
 .../client/model/Model200Response.java        |  2 ++
 .../client/model/ModelApiResponse.java        |  3 ++
 .../client/model/ModelReturn.java             |  1 +
 .../org/openapitools/client/model/Name.java   |  4 +++
 .../openapitools/client/model/NumberOnly.java |  1 +
 .../org/openapitools/client/model/Order.java  |  6 ++++
 .../client/model/OuterComposite.java          |  3 ++
 .../org/openapitools/client/model/Pet.java    |  6 ++++
 .../client/model/ReadOnlyFirst.java           |  2 ++
 .../client/model/SpecialModelName.java        |  1 +
 .../org/openapitools/client/model/Tag.java    |  2 ++
 .../client/model/TypeHolderDefault.java       |  5 ++++
 .../client/model/TypeHolderExample.java       |  5 ++++
 .../org/openapitools/client/model/User.java   |  8 +++++
 .../openapitools/client/model/XmlItem.java    | 29 +++++++++++++++++++
 .../client/petstore/java/jersey1/build.gradle |  1 +
 samples/client/petstore/java/jersey1/pom.xml  |  8 +++++
 .../model/AdditionalPropertiesAnyType.java    |  1 +
 .../model/AdditionalPropertiesArray.java      |  1 +
 .../model/AdditionalPropertiesBoolean.java    |  1 +
 .../model/AdditionalPropertiesClass.java      | 11 +++++++
 .../model/AdditionalPropertiesInteger.java    |  1 +
 .../model/AdditionalPropertiesNumber.java     |  1 +
 .../model/AdditionalPropertiesObject.java     |  1 +
 .../model/AdditionalPropertiesString.java     |  1 +
 .../org/openapitools/client/model/Animal.java |  2 ++
 .../model/ArrayOfArrayOfNumberOnly.java       |  1 +
 .../client/model/ArrayOfNumberOnly.java       |  1 +
 .../openapitools/client/model/ArrayTest.java  |  3 ++
 .../client/model/Capitalization.java          |  6 ++++
 .../org/openapitools/client/model/Cat.java    |  1 +
 .../openapitools/client/model/CatAllOf.java   |  1 +
 .../openapitools/client/model/Category.java   |  2 ++
 .../openapitools/client/model/ClassModel.java |  1 +
 .../org/openapitools/client/model/Client.java |  1 +
 .../org/openapitools/client/model/Dog.java    |  1 +
 .../openapitools/client/model/DogAllOf.java   |  1 +
 .../openapitools/client/model/EnumArrays.java |  2 ++
 .../openapitools/client/model/EnumTest.java   |  5 ++++
 .../client/model/FileSchemaTestClass.java     |  2 ++
 .../openapitools/client/model/FormatTest.java | 13 +++++++++
 .../client/model/HasOnlyReadOnly.java         |  2 ++
 .../openapitools/client/model/MapTest.java    |  4 +++
 ...ropertiesAndAdditionalPropertiesClass.java |  3 ++
 .../client/model/Model200Response.java        |  2 ++
 .../client/model/ModelApiResponse.java        |  3 ++
 .../client/model/ModelReturn.java             |  1 +
 .../org/openapitools/client/model/Name.java   |  4 +++
 .../openapitools/client/model/NumberOnly.java |  1 +
 .../org/openapitools/client/model/Order.java  |  6 ++++
 .../client/model/OuterComposite.java          |  3 ++
 .../org/openapitools/client/model/Pet.java    |  6 ++++
 .../client/model/ReadOnlyFirst.java           |  2 ++
 .../client/model/SpecialModelName.java        |  1 +
 .../org/openapitools/client/model/Tag.java    |  2 ++
 .../client/model/TypeHolderDefault.java       |  5 ++++
 .../client/model/TypeHolderExample.java       |  5 ++++
 .../org/openapitools/client/model/User.java   |  8 +++++
 .../openapitools/client/model/XmlItem.java    | 29 +++++++++++++++++++
 .../model/AdditionalPropertiesAnyType.java    |  1 +
 .../model/AdditionalPropertiesArray.java      |  1 +
 .../model/AdditionalPropertiesBoolean.java    |  1 +
 .../model/AdditionalPropertiesClass.java      | 11 +++++++
 .../model/AdditionalPropertiesInteger.java    |  1 +
 .../model/AdditionalPropertiesNumber.java     |  1 +
 .../model/AdditionalPropertiesObject.java     |  1 +
 .../model/AdditionalPropertiesString.java     |  1 +
 .../org/openapitools/client/model/Animal.java |  2 ++
 .../model/ArrayOfArrayOfNumberOnly.java       |  1 +
 .../client/model/ArrayOfNumberOnly.java       |  1 +
 .../openapitools/client/model/ArrayTest.java  |  3 ++
 .../client/model/Capitalization.java          |  6 ++++
 .../org/openapitools/client/model/Cat.java    |  1 +
 .../openapitools/client/model/CatAllOf.java   |  1 +
 .../openapitools/client/model/Category.java   |  2 ++
 .../openapitools/client/model/ClassModel.java |  1 +
 .../org/openapitools/client/model/Client.java |  1 +
 .../org/openapitools/client/model/Dog.java    |  1 +
 .../openapitools/client/model/DogAllOf.java   |  1 +
 .../openapitools/client/model/EnumArrays.java |  2 ++
 .../openapitools/client/model/EnumTest.java   |  5 ++++
 .../client/model/FileSchemaTestClass.java     |  2 ++
 .../openapitools/client/model/FormatTest.java | 13 +++++++++
 .../client/model/HasOnlyReadOnly.java         |  2 ++
 .../openapitools/client/model/MapTest.java    |  4 +++
 ...ropertiesAndAdditionalPropertiesClass.java |  3 ++
 .../client/model/Model200Response.java        |  2 ++
 .../client/model/ModelApiResponse.java        |  3 ++
 .../client/model/ModelReturn.java             |  1 +
 .../org/openapitools/client/model/Name.java   |  4 +++
 .../openapitools/client/model/NumberOnly.java |  1 +
 .../org/openapitools/client/model/Order.java  |  6 ++++
 .../client/model/OuterComposite.java          |  3 ++
 .../org/openapitools/client/model/Pet.java    |  6 ++++
 .../client/model/ReadOnlyFirst.java           |  2 ++
 .../client/model/SpecialModelName.java        |  1 +
 .../org/openapitools/client/model/Tag.java    |  2 ++
 .../client/model/TypeHolderDefault.java       |  5 ++++
 .../client/model/TypeHolderExample.java       |  5 ++++
 .../org/openapitools/client/model/User.java   |  8 +++++
 .../openapitools/client/model/XmlItem.java    | 29 +++++++++++++++++++
 .../petstore/java/jersey2-java8/build.gradle  |  1 +
 .../model/AdditionalPropertiesAnyType.java    |  1 +
 .../model/AdditionalPropertiesArray.java      |  1 +
 .../model/AdditionalPropertiesBoolean.java    |  1 +
 .../model/AdditionalPropertiesClass.java      | 11 +++++++
 .../model/AdditionalPropertiesInteger.java    |  1 +
 .../model/AdditionalPropertiesNumber.java     |  1 +
 .../model/AdditionalPropertiesObject.java     |  1 +
 .../model/AdditionalPropertiesString.java     |  1 +
 .../org/openapitools/client/model/Animal.java |  2 ++
 .../model/ArrayOfArrayOfNumberOnly.java       |  1 +
 .../client/model/ArrayOfNumberOnly.java       |  1 +
 .../openapitools/client/model/ArrayTest.java  |  3 ++
 .../client/model/Capitalization.java          |  6 ++++
 .../org/openapitools/client/model/Cat.java    |  1 +
 .../openapitools/client/model/CatAllOf.java   |  1 +
 .../openapitools/client/model/Category.java   |  2 ++
 .../openapitools/client/model/ClassModel.java |  1 +
 .../org/openapitools/client/model/Client.java |  1 +
 .../org/openapitools/client/model/Dog.java    |  1 +
 .../openapitools/client/model/DogAllOf.java   |  1 +
 .../openapitools/client/model/EnumArrays.java |  2 ++
 .../openapitools/client/model/EnumTest.java   |  5 ++++
 .../client/model/FileSchemaTestClass.java     |  2 ++
 .../openapitools/client/model/FormatTest.java | 13 +++++++++
 .../client/model/HasOnlyReadOnly.java         |  2 ++
 .../openapitools/client/model/MapTest.java    |  4 +++
 ...ropertiesAndAdditionalPropertiesClass.java |  3 ++
 .../client/model/Model200Response.java        |  2 ++
 .../client/model/ModelApiResponse.java        |  3 ++
 .../client/model/ModelReturn.java             |  1 +
 .../org/openapitools/client/model/Name.java   |  4 +++
 .../openapitools/client/model/NumberOnly.java |  1 +
 .../org/openapitools/client/model/Order.java  |  6 ++++
 .../client/model/OuterComposite.java          |  3 ++
 .../org/openapitools/client/model/Pet.java    |  6 ++++
 .../client/model/ReadOnlyFirst.java           |  2 ++
 .../client/model/SpecialModelName.java        |  1 +
 .../org/openapitools/client/model/Tag.java    |  2 ++
 .../client/model/TypeHolderDefault.java       |  5 ++++
 .../client/model/TypeHolderExample.java       |  5 ++++
 .../org/openapitools/client/model/User.java   |  8 +++++
 .../openapitools/client/model/XmlItem.java    | 29 +++++++++++++++++++
 .../client/petstore/java/jersey2/build.gradle |  1 +
 samples/client/petstore/java/jersey2/pom.xml  |  7 +++++
 .../model/AdditionalPropertiesAnyType.java    |  1 +
 .../model/AdditionalPropertiesArray.java      |  1 +
 .../model/AdditionalPropertiesBoolean.java    |  1 +
 .../model/AdditionalPropertiesClass.java      | 11 +++++++
 .../model/AdditionalPropertiesInteger.java    |  1 +
 .../model/AdditionalPropertiesNumber.java     |  1 +
 .../model/AdditionalPropertiesObject.java     |  1 +
 .../model/AdditionalPropertiesString.java     |  1 +
 .../org/openapitools/client/model/Animal.java |  2 ++
 .../model/ArrayOfArrayOfNumberOnly.java       |  1 +
 .../client/model/ArrayOfNumberOnly.java       |  1 +
 .../openapitools/client/model/ArrayTest.java  |  3 ++
 .../client/model/Capitalization.java          |  6 ++++
 .../org/openapitools/client/model/Cat.java    |  1 +
 .../openapitools/client/model/CatAllOf.java   |  1 +
 .../openapitools/client/model/Category.java   |  2 ++
 .../openapitools/client/model/ClassModel.java |  1 +
 .../org/openapitools/client/model/Client.java |  1 +
 .../org/openapitools/client/model/Dog.java    |  1 +
 .../openapitools/client/model/DogAllOf.java   |  1 +
 .../openapitools/client/model/EnumArrays.java |  2 ++
 .../openapitools/client/model/EnumTest.java   |  5 ++++
 .../client/model/FileSchemaTestClass.java     |  2 ++
 .../openapitools/client/model/FormatTest.java | 13 +++++++++
 .../client/model/HasOnlyReadOnly.java         |  2 ++
 .../openapitools/client/model/MapTest.java    |  4 +++
 ...ropertiesAndAdditionalPropertiesClass.java |  3 ++
 .../client/model/Model200Response.java        |  2 ++
 .../client/model/ModelApiResponse.java        |  3 ++
 .../client/model/ModelReturn.java             |  1 +
 .../org/openapitools/client/model/Name.java   |  4 +++
 .../openapitools/client/model/NumberOnly.java |  1 +
 .../org/openapitools/client/model/Order.java  |  6 ++++
 .../client/model/OuterComposite.java          |  3 ++
 .../org/openapitools/client/model/Pet.java    |  6 ++++
 .../client/model/ReadOnlyFirst.java           |  2 ++
 .../client/model/SpecialModelName.java        |  1 +
 .../org/openapitools/client/model/Tag.java    |  2 ++
 .../client/model/TypeHolderDefault.java       |  5 ++++
 .../client/model/TypeHolderExample.java       |  5 ++++
 .../org/openapitools/client/model/User.java   |  8 +++++
 .../openapitools/client/model/XmlItem.java    | 29 +++++++++++++++++++
 .../okhttp-gson-parcelableModel/build.gradle  |  1 +
 .../java/okhttp-gson-parcelableModel/pom.xml  |  6 ++++
 .../model/AdditionalPropertiesAnyType.java    |  1 +
 .../model/AdditionalPropertiesArray.java      |  1 +
 .../model/AdditionalPropertiesBoolean.java    |  1 +
 .../model/AdditionalPropertiesClass.java      | 11 +++++++
 .../model/AdditionalPropertiesInteger.java    |  1 +
 .../model/AdditionalPropertiesNumber.java     |  1 +
 .../model/AdditionalPropertiesObject.java     |  1 +
 .../model/AdditionalPropertiesString.java     |  1 +
 .../org/openapitools/client/model/Animal.java |  2 ++
 .../model/ArrayOfArrayOfNumberOnly.java       |  1 +
 .../client/model/ArrayOfNumberOnly.java       |  1 +
 .../openapitools/client/model/ArrayTest.java  |  3 ++
 .../client/model/Capitalization.java          |  6 ++++
 .../org/openapitools/client/model/Cat.java    |  1 +
 .../openapitools/client/model/CatAllOf.java   |  1 +
 .../openapitools/client/model/Category.java   |  2 ++
 .../openapitools/client/model/ClassModel.java |  1 +
 .../org/openapitools/client/model/Client.java |  1 +
 .../org/openapitools/client/model/Dog.java    |  1 +
 .../openapitools/client/model/DogAllOf.java   |  1 +
 .../openapitools/client/model/EnumArrays.java |  2 ++
 .../openapitools/client/model/EnumTest.java   |  5 ++++
 .../client/model/FileSchemaTestClass.java     |  2 ++
 .../openapitools/client/model/FormatTest.java | 13 +++++++++
 .../client/model/HasOnlyReadOnly.java         |  2 ++
 .../openapitools/client/model/MapTest.java    |  4 +++
 ...ropertiesAndAdditionalPropertiesClass.java |  3 ++
 .../client/model/Model200Response.java        |  2 ++
 .../client/model/ModelApiResponse.java        |  3 ++
 .../client/model/ModelReturn.java             |  1 +
 .../org/openapitools/client/model/Name.java   |  4 +++
 .../openapitools/client/model/NumberOnly.java |  1 +
 .../org/openapitools/client/model/Order.java  |  6 ++++
 .../client/model/OuterComposite.java          |  3 ++
 .../org/openapitools/client/model/Pet.java    |  6 ++++
 .../client/model/ReadOnlyFirst.java           |  2 ++
 .../client/model/SpecialModelName.java        |  1 +
 .../org/openapitools/client/model/Tag.java    |  2 ++
 .../client/model/TypeHolderDefault.java       |  5 ++++
 .../client/model/TypeHolderExample.java       |  5 ++++
 .../org/openapitools/client/model/User.java   |  8 +++++
 .../openapitools/client/model/XmlItem.java    | 29 +++++++++++++++++++
 .../petstore/java/okhttp-gson/build.gradle    |  1 +
 .../client/petstore/java/okhttp-gson/pom.xml  |  6 ++++
 .../model/AdditionalPropertiesAnyType.java    |  1 +
 .../model/AdditionalPropertiesArray.java      |  1 +
 .../model/AdditionalPropertiesBoolean.java    |  1 +
 .../model/AdditionalPropertiesClass.java      | 11 +++++++
 .../model/AdditionalPropertiesInteger.java    |  1 +
 .../model/AdditionalPropertiesNumber.java     |  1 +
 .../model/AdditionalPropertiesObject.java     |  1 +
 .../model/AdditionalPropertiesString.java     |  1 +
 .../org/openapitools/client/model/Animal.java |  2 ++
 .../model/ArrayOfArrayOfNumberOnly.java       |  1 +
 .../client/model/ArrayOfNumberOnly.java       |  1 +
 .../openapitools/client/model/ArrayTest.java  |  3 ++
 .../client/model/Capitalization.java          |  6 ++++
 .../org/openapitools/client/model/Cat.java    |  1 +
 .../openapitools/client/model/CatAllOf.java   |  1 +
 .../openapitools/client/model/Category.java   |  2 ++
 .../openapitools/client/model/ClassModel.java |  1 +
 .../org/openapitools/client/model/Client.java |  1 +
 .../org/openapitools/client/model/Dog.java    |  1 +
 .../openapitools/client/model/DogAllOf.java   |  1 +
 .../openapitools/client/model/EnumArrays.java |  2 ++
 .../openapitools/client/model/EnumTest.java   |  5 ++++
 .../client/model/FileSchemaTestClass.java     |  2 ++
 .../openapitools/client/model/FormatTest.java | 13 +++++++++
 .../client/model/HasOnlyReadOnly.java         |  2 ++
 .../openapitools/client/model/MapTest.java    |  4 +++
 ...ropertiesAndAdditionalPropertiesClass.java |  3 ++
 .../client/model/Model200Response.java        |  2 ++
 .../client/model/ModelApiResponse.java        |  3 ++
 .../client/model/ModelReturn.java             |  1 +
 .../org/openapitools/client/model/Name.java   |  4 +++
 .../openapitools/client/model/NumberOnly.java |  1 +
 .../org/openapitools/client/model/Order.java  |  6 ++++
 .../client/model/OuterComposite.java          |  3 ++
 .../org/openapitools/client/model/Pet.java    |  6 ++++
 .../client/model/ReadOnlyFirst.java           |  2 ++
 .../client/model/SpecialModelName.java        |  1 +
 .../org/openapitools/client/model/Tag.java    |  2 ++
 .../client/model/TypeHolderDefault.java       |  5 ++++
 .../client/model/TypeHolderExample.java       |  5 ++++
 .../org/openapitools/client/model/User.java   |  8 +++++
 .../openapitools/client/model/XmlItem.java    | 29 +++++++++++++++++++
 .../petstore/java/rest-assured/build.gradle   |  1 +
 .../client/petstore/java/rest-assured/pom.xml |  6 ++++
 .../model/AdditionalPropertiesAnyType.java    |  1 +
 .../model/AdditionalPropertiesArray.java      |  1 +
 .../model/AdditionalPropertiesBoolean.java    |  1 +
 .../model/AdditionalPropertiesClass.java      | 11 +++++++
 .../model/AdditionalPropertiesInteger.java    |  1 +
 .../model/AdditionalPropertiesNumber.java     |  1 +
 .../model/AdditionalPropertiesObject.java     |  1 +
 .../model/AdditionalPropertiesString.java     |  1 +
 .../org/openapitools/client/model/Animal.java |  2 ++
 .../model/ArrayOfArrayOfNumberOnly.java       |  1 +
 .../client/model/ArrayOfNumberOnly.java       |  1 +
 .../openapitools/client/model/ArrayTest.java  |  3 ++
 .../client/model/Capitalization.java          |  6 ++++
 .../org/openapitools/client/model/Cat.java    |  1 +
 .../openapitools/client/model/CatAllOf.java   |  1 +
 .../openapitools/client/model/Category.java   |  2 ++
 .../openapitools/client/model/ClassModel.java |  1 +
 .../org/openapitools/client/model/Client.java |  1 +
 .../org/openapitools/client/model/Dog.java    |  1 +
 .../openapitools/client/model/DogAllOf.java   |  1 +
 .../openapitools/client/model/EnumArrays.java |  2 ++
 .../openapitools/client/model/EnumTest.java   |  5 ++++
 .../client/model/FileSchemaTestClass.java     |  2 ++
 .../openapitools/client/model/FormatTest.java | 13 +++++++++
 .../client/model/HasOnlyReadOnly.java         |  2 ++
 .../openapitools/client/model/MapTest.java    |  4 +++
 ...ropertiesAndAdditionalPropertiesClass.java |  3 ++
 .../client/model/Model200Response.java        |  2 ++
 .../client/model/ModelApiResponse.java        |  3 ++
 .../client/model/ModelReturn.java             |  1 +
 .../org/openapitools/client/model/Name.java   |  4 +++
 .../openapitools/client/model/NumberOnly.java |  1 +
 .../org/openapitools/client/model/Order.java  |  6 ++++
 .../client/model/OuterComposite.java          |  3 ++
 .../org/openapitools/client/model/Pet.java    |  6 ++++
 .../client/model/ReadOnlyFirst.java           |  2 ++
 .../client/model/SpecialModelName.java        |  1 +
 .../org/openapitools/client/model/Tag.java    |  2 ++
 .../client/model/TypeHolderDefault.java       |  5 ++++
 .../client/model/TypeHolderExample.java       |  5 ++++
 .../org/openapitools/client/model/User.java   |  8 +++++
 .../openapitools/client/model/XmlItem.java    | 29 +++++++++++++++++++
 .../petstore/java/resteasy/build.gradle       |  1 +
 .../model/AdditionalPropertiesAnyType.java    |  1 +
 .../model/AdditionalPropertiesArray.java      |  1 +
 .../model/AdditionalPropertiesBoolean.java    |  1 +
 .../model/AdditionalPropertiesClass.java      | 11 +++++++
 .../model/AdditionalPropertiesInteger.java    |  1 +
 .../model/AdditionalPropertiesNumber.java     |  1 +
 .../model/AdditionalPropertiesObject.java     |  1 +
 .../model/AdditionalPropertiesString.java     |  1 +
 .../org/openapitools/client/model/Animal.java |  2 ++
 .../model/ArrayOfArrayOfNumberOnly.java       |  1 +
 .../client/model/ArrayOfNumberOnly.java       |  1 +
 .../openapitools/client/model/ArrayTest.java  |  3 ++
 .../client/model/Capitalization.java          |  6 ++++
 .../org/openapitools/client/model/Cat.java    |  1 +
 .../openapitools/client/model/CatAllOf.java   |  1 +
 .../openapitools/client/model/Category.java   |  2 ++
 .../openapitools/client/model/ClassModel.java |  1 +
 .../org/openapitools/client/model/Client.java |  1 +
 .../org/openapitools/client/model/Dog.java    |  1 +
 .../openapitools/client/model/DogAllOf.java   |  1 +
 .../openapitools/client/model/EnumArrays.java |  2 ++
 .../openapitools/client/model/EnumTest.java   |  5 ++++
 .../client/model/FileSchemaTestClass.java     |  2 ++
 .../openapitools/client/model/FormatTest.java | 13 +++++++++
 .../client/model/HasOnlyReadOnly.java         |  2 ++
 .../openapitools/client/model/MapTest.java    |  4 +++
 ...ropertiesAndAdditionalPropertiesClass.java |  3 ++
 .../client/model/Model200Response.java        |  2 ++
 .../client/model/ModelApiResponse.java        |  3 ++
 .../client/model/ModelReturn.java             |  1 +
 .../org/openapitools/client/model/Name.java   |  4 +++
 .../openapitools/client/model/NumberOnly.java |  1 +
 .../org/openapitools/client/model/Order.java  |  6 ++++
 .../client/model/OuterComposite.java          |  3 ++
 .../org/openapitools/client/model/Pet.java    |  6 ++++
 .../client/model/ReadOnlyFirst.java           |  2 ++
 .../client/model/SpecialModelName.java        |  1 +
 .../org/openapitools/client/model/Tag.java    |  2 ++
 .../client/model/TypeHolderDefault.java       |  5 ++++
 .../client/model/TypeHolderExample.java       |  5 ++++
 .../org/openapitools/client/model/User.java   |  8 +++++
 .../openapitools/client/model/XmlItem.java    | 29 +++++++++++++++++++
 .../java/resttemplate-withXml/build.gradle    |  1 +
 .../model/AdditionalPropertiesAnyType.java    |  1 +
 .../model/AdditionalPropertiesArray.java      |  1 +
 .../model/AdditionalPropertiesBoolean.java    |  1 +
 .../model/AdditionalPropertiesClass.java      | 11 +++++++
 .../model/AdditionalPropertiesInteger.java    |  1 +
 .../model/AdditionalPropertiesNumber.java     |  1 +
 .../model/AdditionalPropertiesObject.java     |  1 +
 .../model/AdditionalPropertiesString.java     |  1 +
 .../org/openapitools/client/model/Animal.java |  2 ++
 .../model/ArrayOfArrayOfNumberOnly.java       |  1 +
 .../client/model/ArrayOfNumberOnly.java       |  1 +
 .../openapitools/client/model/ArrayTest.java  |  3 ++
 .../client/model/Capitalization.java          |  6 ++++
 .../org/openapitools/client/model/Cat.java    |  1 +
 .../openapitools/client/model/CatAllOf.java   |  1 +
 .../openapitools/client/model/Category.java   |  2 ++
 .../openapitools/client/model/ClassModel.java |  1 +
 .../org/openapitools/client/model/Client.java |  1 +
 .../org/openapitools/client/model/Dog.java    |  1 +
 .../openapitools/client/model/DogAllOf.java   |  1 +
 .../openapitools/client/model/EnumArrays.java |  2 ++
 .../openapitools/client/model/EnumTest.java   |  5 ++++
 .../client/model/FileSchemaTestClass.java     |  2 ++
 .../openapitools/client/model/FormatTest.java | 13 +++++++++
 .../client/model/HasOnlyReadOnly.java         |  2 ++
 .../openapitools/client/model/MapTest.java    |  4 +++
 ...ropertiesAndAdditionalPropertiesClass.java |  3 ++
 .../client/model/Model200Response.java        |  2 ++
 .../client/model/ModelApiResponse.java        |  3 ++
 .../client/model/ModelReturn.java             |  1 +
 .../org/openapitools/client/model/Name.java   |  4 +++
 .../openapitools/client/model/NumberOnly.java |  1 +
 .../org/openapitools/client/model/Order.java  |  6 ++++
 .../client/model/OuterComposite.java          |  3 ++
 .../org/openapitools/client/model/Pet.java    |  6 ++++
 .../client/model/ReadOnlyFirst.java           |  2 ++
 .../client/model/SpecialModelName.java        |  1 +
 .../org/openapitools/client/model/Tag.java    |  2 ++
 .../client/model/TypeHolderDefault.java       |  5 ++++
 .../client/model/TypeHolderExample.java       |  5 ++++
 .../org/openapitools/client/model/User.java   |  8 +++++
 .../openapitools/client/model/XmlItem.java    | 29 +++++++++++++++++++
 .../petstore/java/resttemplate/build.gradle   |  1 +
 .../model/AdditionalPropertiesAnyType.java    |  1 +
 .../model/AdditionalPropertiesArray.java      |  1 +
 .../model/AdditionalPropertiesBoolean.java    |  1 +
 .../model/AdditionalPropertiesClass.java      | 11 +++++++
 .../model/AdditionalPropertiesInteger.java    |  1 +
 .../model/AdditionalPropertiesNumber.java     |  1 +
 .../model/AdditionalPropertiesObject.java     |  1 +
 .../model/AdditionalPropertiesString.java     |  1 +
 .../org/openapitools/client/model/Animal.java |  2 ++
 .../model/ArrayOfArrayOfNumberOnly.java       |  1 +
 .../client/model/ArrayOfNumberOnly.java       |  1 +
 .../openapitools/client/model/ArrayTest.java  |  3 ++
 .../client/model/Capitalization.java          |  6 ++++
 .../org/openapitools/client/model/Cat.java    |  1 +
 .../openapitools/client/model/CatAllOf.java   |  1 +
 .../openapitools/client/model/Category.java   |  2 ++
 .../openapitools/client/model/ClassModel.java |  1 +
 .../org/openapitools/client/model/Client.java |  1 +
 .../org/openapitools/client/model/Dog.java    |  1 +
 .../openapitools/client/model/DogAllOf.java   |  1 +
 .../openapitools/client/model/EnumArrays.java |  2 ++
 .../openapitools/client/model/EnumTest.java   |  5 ++++
 .../client/model/FileSchemaTestClass.java     |  2 ++
 .../openapitools/client/model/FormatTest.java | 13 +++++++++
 .../client/model/HasOnlyReadOnly.java         |  2 ++
 .../openapitools/client/model/MapTest.java    |  4 +++
 ...ropertiesAndAdditionalPropertiesClass.java |  3 ++
 .../client/model/Model200Response.java        |  2 ++
 .../client/model/ModelApiResponse.java        |  3 ++
 .../client/model/ModelReturn.java             |  1 +
 .../org/openapitools/client/model/Name.java   |  4 +++
 .../openapitools/client/model/NumberOnly.java |  1 +
 .../org/openapitools/client/model/Order.java  |  6 ++++
 .../client/model/OuterComposite.java          |  3 ++
 .../org/openapitools/client/model/Pet.java    |  6 ++++
 .../client/model/ReadOnlyFirst.java           |  2 ++
 .../client/model/SpecialModelName.java        |  1 +
 .../org/openapitools/client/model/Tag.java    |  2 ++
 .../client/model/TypeHolderDefault.java       |  5 ++++
 .../client/model/TypeHolderExample.java       |  5 ++++
 .../org/openapitools/client/model/User.java   |  8 +++++
 .../openapitools/client/model/XmlItem.java    | 29 +++++++++++++++++++
 .../petstore/java/retrofit/build.gradle       |  1 +
 .../model/AdditionalPropertiesAnyType.java    |  1 +
 .../model/AdditionalPropertiesArray.java      |  1 +
 .../model/AdditionalPropertiesBoolean.java    |  1 +
 .../model/AdditionalPropertiesClass.java      | 11 +++++++
 .../model/AdditionalPropertiesInteger.java    |  1 +
 .../model/AdditionalPropertiesNumber.java     |  1 +
 .../model/AdditionalPropertiesObject.java     |  1 +
 .../model/AdditionalPropertiesString.java     |  1 +
 .../org/openapitools/client/model/Animal.java |  2 ++
 .../model/ArrayOfArrayOfNumberOnly.java       |  1 +
 .../client/model/ArrayOfNumberOnly.java       |  1 +
 .../openapitools/client/model/ArrayTest.java  |  3 ++
 .../client/model/Capitalization.java          |  6 ++++
 .../org/openapitools/client/model/Cat.java    |  1 +
 .../openapitools/client/model/CatAllOf.java   |  1 +
 .../openapitools/client/model/Category.java   |  2 ++
 .../openapitools/client/model/ClassModel.java |  1 +
 .../org/openapitools/client/model/Client.java |  1 +
 .../org/openapitools/client/model/Dog.java    |  1 +
 .../openapitools/client/model/DogAllOf.java   |  1 +
 .../openapitools/client/model/EnumArrays.java |  2 ++
 .../openapitools/client/model/EnumTest.java   |  5 ++++
 .../client/model/FileSchemaTestClass.java     |  2 ++
 .../openapitools/client/model/FormatTest.java | 13 +++++++++
 .../client/model/HasOnlyReadOnly.java         |  2 ++
 .../openapitools/client/model/MapTest.java    |  4 +++
 ...ropertiesAndAdditionalPropertiesClass.java |  3 ++
 .../client/model/Model200Response.java        |  2 ++
 .../client/model/ModelApiResponse.java        |  3 ++
 .../client/model/ModelReturn.java             |  1 +
 .../org/openapitools/client/model/Name.java   |  4 +++
 .../openapitools/client/model/NumberOnly.java |  1 +
 .../org/openapitools/client/model/Order.java  |  6 ++++
 .../client/model/OuterComposite.java          |  3 ++
 .../org/openapitools/client/model/Pet.java    |  6 ++++
 .../client/model/ReadOnlyFirst.java           |  2 ++
 .../client/model/SpecialModelName.java        |  1 +
 .../org/openapitools/client/model/Tag.java    |  2 ++
 .../client/model/TypeHolderDefault.java       |  5 ++++
 .../client/model/TypeHolderExample.java       |  5 ++++
 .../org/openapitools/client/model/User.java   |  8 +++++
 .../openapitools/client/model/XmlItem.java    | 29 +++++++++++++++++++
 .../java/retrofit2-play24/build.gradle        |  1 +
 .../model/AdditionalPropertiesAnyType.java    |  1 +
 .../model/AdditionalPropertiesArray.java      |  1 +
 .../model/AdditionalPropertiesBoolean.java    |  1 +
 .../model/AdditionalPropertiesClass.java      | 11 +++++++
 .../model/AdditionalPropertiesInteger.java    |  1 +
 .../model/AdditionalPropertiesNumber.java     |  1 +
 .../model/AdditionalPropertiesObject.java     |  1 +
 .../model/AdditionalPropertiesString.java     |  1 +
 .../org/openapitools/client/model/Animal.java |  2 ++
 .../model/ArrayOfArrayOfNumberOnly.java       |  1 +
 .../client/model/ArrayOfNumberOnly.java       |  1 +
 .../openapitools/client/model/ArrayTest.java  |  3 ++
 .../client/model/Capitalization.java          |  6 ++++
 .../org/openapitools/client/model/Cat.java    |  1 +
 .../openapitools/client/model/CatAllOf.java   |  1 +
 .../openapitools/client/model/Category.java   |  2 ++
 .../openapitools/client/model/ClassModel.java |  1 +
 .../org/openapitools/client/model/Client.java |  1 +
 .../org/openapitools/client/model/Dog.java    |  1 +
 .../openapitools/client/model/DogAllOf.java   |  1 +
 .../openapitools/client/model/EnumArrays.java |  2 ++
 .../openapitools/client/model/EnumTest.java   |  5 ++++
 .../client/model/FileSchemaTestClass.java     |  2 ++
 .../openapitools/client/model/FormatTest.java | 13 +++++++++
 .../client/model/HasOnlyReadOnly.java         |  2 ++
 .../openapitools/client/model/MapTest.java    |  4 +++
 ...ropertiesAndAdditionalPropertiesClass.java |  3 ++
 .../client/model/Model200Response.java        |  2 ++
 .../client/model/ModelApiResponse.java        |  3 ++
 .../client/model/ModelReturn.java             |  1 +
 .../org/openapitools/client/model/Name.java   |  4 +++
 .../openapitools/client/model/NumberOnly.java |  1 +
 .../org/openapitools/client/model/Order.java  |  6 ++++
 .../client/model/OuterComposite.java          |  3 ++
 .../org/openapitools/client/model/Pet.java    |  6 ++++
 .../client/model/ReadOnlyFirst.java           |  2 ++
 .../client/model/SpecialModelName.java        |  1 +
 .../org/openapitools/client/model/Tag.java    |  2 ++
 .../client/model/TypeHolderDefault.java       |  5 ++++
 .../client/model/TypeHolderExample.java       |  5 ++++
 .../org/openapitools/client/model/User.java   |  8 +++++
 .../openapitools/client/model/XmlItem.java    | 29 +++++++++++++++++++
 .../java/retrofit2-play25/build.gradle        |  1 +
 .../model/AdditionalPropertiesAnyType.java    |  1 +
 .../model/AdditionalPropertiesArray.java      |  1 +
 .../model/AdditionalPropertiesBoolean.java    |  1 +
 .../model/AdditionalPropertiesClass.java      | 11 +++++++
 .../model/AdditionalPropertiesInteger.java    |  1 +
 .../model/AdditionalPropertiesNumber.java     |  1 +
 .../model/AdditionalPropertiesObject.java     |  1 +
 .../model/AdditionalPropertiesString.java     |  1 +
 .../org/openapitools/client/model/Animal.java |  2 ++
 .../model/ArrayOfArrayOfNumberOnly.java       |  1 +
 .../client/model/ArrayOfNumberOnly.java       |  1 +
 .../openapitools/client/model/ArrayTest.java  |  3 ++
 .../client/model/Capitalization.java          |  6 ++++
 .../org/openapitools/client/model/Cat.java    |  1 +
 .../openapitools/client/model/CatAllOf.java   |  1 +
 .../openapitools/client/model/Category.java   |  2 ++
 .../openapitools/client/model/ClassModel.java |  1 +
 .../org/openapitools/client/model/Client.java |  1 +
 .../org/openapitools/client/model/Dog.java    |  1 +
 .../openapitools/client/model/DogAllOf.java   |  1 +
 .../openapitools/client/model/EnumArrays.java |  2 ++
 .../openapitools/client/model/EnumTest.java   |  5 ++++
 .../client/model/FileSchemaTestClass.java     |  2 ++
 .../openapitools/client/model/FormatTest.java | 13 +++++++++
 .../client/model/HasOnlyReadOnly.java         |  2 ++
 .../openapitools/client/model/MapTest.java    |  4 +++
 ...ropertiesAndAdditionalPropertiesClass.java |  3 ++
 .../client/model/Model200Response.java        |  2 ++
 .../client/model/ModelApiResponse.java        |  3 ++
 .../client/model/ModelReturn.java             |  1 +
 .../org/openapitools/client/model/Name.java   |  4 +++
 .../openapitools/client/model/NumberOnly.java |  1 +
 .../org/openapitools/client/model/Order.java  |  6 ++++
 .../client/model/OuterComposite.java          |  3 ++
 .../org/openapitools/client/model/Pet.java    |  6 ++++
 .../client/model/ReadOnlyFirst.java           |  2 ++
 .../client/model/SpecialModelName.java        |  1 +
 .../org/openapitools/client/model/Tag.java    |  2 ++
 .../client/model/TypeHolderDefault.java       |  5 ++++
 .../client/model/TypeHolderExample.java       |  5 ++++
 .../org/openapitools/client/model/User.java   |  8 +++++
 .../openapitools/client/model/XmlItem.java    | 29 +++++++++++++++++++
 .../java/retrofit2-play26/build.gradle        |  1 +
 .../model/AdditionalPropertiesAnyType.java    |  1 +
 .../model/AdditionalPropertiesArray.java      |  1 +
 .../model/AdditionalPropertiesBoolean.java    |  1 +
 .../model/AdditionalPropertiesClass.java      | 11 +++++++
 .../model/AdditionalPropertiesInteger.java    |  1 +
 .../model/AdditionalPropertiesNumber.java     |  1 +
 .../model/AdditionalPropertiesObject.java     |  1 +
 .../model/AdditionalPropertiesString.java     |  1 +
 .../org/openapitools/client/model/Animal.java |  2 ++
 .../model/ArrayOfArrayOfNumberOnly.java       |  1 +
 .../client/model/ArrayOfNumberOnly.java       |  1 +
 .../openapitools/client/model/ArrayTest.java  |  3 ++
 .../client/model/Capitalization.java          |  6 ++++
 .../org/openapitools/client/model/Cat.java    |  1 +
 .../openapitools/client/model/CatAllOf.java   |  1 +
 .../openapitools/client/model/Category.java   |  2 ++
 .../openapitools/client/model/ClassModel.java |  1 +
 .../org/openapitools/client/model/Client.java |  1 +
 .../org/openapitools/client/model/Dog.java    |  1 +
 .../openapitools/client/model/DogAllOf.java   |  1 +
 .../openapitools/client/model/EnumArrays.java |  2 ++
 .../openapitools/client/model/EnumTest.java   |  5 ++++
 .../client/model/FileSchemaTestClass.java     |  2 ++
 .../openapitools/client/model/FormatTest.java | 13 +++++++++
 .../client/model/HasOnlyReadOnly.java         |  2 ++
 .../openapitools/client/model/MapTest.java    |  4 +++
 ...ropertiesAndAdditionalPropertiesClass.java |  3 ++
 .../client/model/Model200Response.java        |  2 ++
 .../client/model/ModelApiResponse.java        |  3 ++
 .../client/model/ModelReturn.java             |  1 +
 .../org/openapitools/client/model/Name.java   |  4 +++
 .../openapitools/client/model/NumberOnly.java |  1 +
 .../org/openapitools/client/model/Order.java  |  6 ++++
 .../client/model/OuterComposite.java          |  3 ++
 .../org/openapitools/client/model/Pet.java    |  6 ++++
 .../client/model/ReadOnlyFirst.java           |  2 ++
 .../client/model/SpecialModelName.java        |  1 +
 .../org/openapitools/client/model/Tag.java    |  2 ++
 .../client/model/TypeHolderDefault.java       |  5 ++++
 .../client/model/TypeHolderExample.java       |  5 ++++
 .../org/openapitools/client/model/User.java   |  8 +++++
 .../openapitools/client/model/XmlItem.java    | 29 +++++++++++++++++++
 .../petstore/java/retrofit2/build.gradle      |  1 +
 .../client/petstore/java/retrofit2/pom.xml    |  6 ++++
 .../model/AdditionalPropertiesAnyType.java    |  1 +
 .../model/AdditionalPropertiesArray.java      |  1 +
 .../model/AdditionalPropertiesBoolean.java    |  1 +
 .../model/AdditionalPropertiesClass.java      | 11 +++++++
 .../model/AdditionalPropertiesInteger.java    |  1 +
 .../model/AdditionalPropertiesNumber.java     |  1 +
 .../model/AdditionalPropertiesObject.java     |  1 +
 .../model/AdditionalPropertiesString.java     |  1 +
 .../org/openapitools/client/model/Animal.java |  2 ++
 .../model/ArrayOfArrayOfNumberOnly.java       |  1 +
 .../client/model/ArrayOfNumberOnly.java       |  1 +
 .../openapitools/client/model/ArrayTest.java  |  3 ++
 .../client/model/Capitalization.java          |  6 ++++
 .../org/openapitools/client/model/Cat.java    |  1 +
 .../openapitools/client/model/CatAllOf.java   |  1 +
 .../openapitools/client/model/Category.java   |  2 ++
 .../openapitools/client/model/ClassModel.java |  1 +
 .../org/openapitools/client/model/Client.java |  1 +
 .../org/openapitools/client/model/Dog.java    |  1 +
 .../openapitools/client/model/DogAllOf.java   |  1 +
 .../openapitools/client/model/EnumArrays.java |  2 ++
 .../openapitools/client/model/EnumTest.java   |  5 ++++
 .../client/model/FileSchemaTestClass.java     |  2 ++
 .../openapitools/client/model/FormatTest.java | 13 +++++++++
 .../client/model/HasOnlyReadOnly.java         |  2 ++
 .../openapitools/client/model/MapTest.java    |  4 +++
 ...ropertiesAndAdditionalPropertiesClass.java |  3 ++
 .../client/model/Model200Response.java        |  2 ++
 .../client/model/ModelApiResponse.java        |  3 ++
 .../client/model/ModelReturn.java             |  1 +
 .../org/openapitools/client/model/Name.java   |  4 +++
 .../openapitools/client/model/NumberOnly.java |  1 +
 .../org/openapitools/client/model/Order.java  |  6 ++++
 .../client/model/OuterComposite.java          |  3 ++
 .../org/openapitools/client/model/Pet.java    |  6 ++++
 .../client/model/ReadOnlyFirst.java           |  2 ++
 .../client/model/SpecialModelName.java        |  1 +
 .../org/openapitools/client/model/Tag.java    |  2 ++
 .../client/model/TypeHolderDefault.java       |  5 ++++
 .../client/model/TypeHolderExample.java       |  5 ++++
 .../org/openapitools/client/model/User.java   |  8 +++++
 .../openapitools/client/model/XmlItem.java    | 29 +++++++++++++++++++
 .../petstore/java/retrofit2rx/build.gradle    |  1 +
 .../client/petstore/java/retrofit2rx/pom.xml  |  6 ++++
 .../model/AdditionalPropertiesAnyType.java    |  1 +
 .../model/AdditionalPropertiesArray.java      |  1 +
 .../model/AdditionalPropertiesBoolean.java    |  1 +
 .../model/AdditionalPropertiesClass.java      | 11 +++++++
 .../model/AdditionalPropertiesInteger.java    |  1 +
 .../model/AdditionalPropertiesNumber.java     |  1 +
 .../model/AdditionalPropertiesObject.java     |  1 +
 .../model/AdditionalPropertiesString.java     |  1 +
 .../org/openapitools/client/model/Animal.java |  2 ++
 .../model/ArrayOfArrayOfNumberOnly.java       |  1 +
 .../client/model/ArrayOfNumberOnly.java       |  1 +
 .../openapitools/client/model/ArrayTest.java  |  3 ++
 .../client/model/Capitalization.java          |  6 ++++
 .../org/openapitools/client/model/Cat.java    |  1 +
 .../openapitools/client/model/CatAllOf.java   |  1 +
 .../openapitools/client/model/Category.java   |  2 ++
 .../openapitools/client/model/ClassModel.java |  1 +
 .../org/openapitools/client/model/Client.java |  1 +
 .../org/openapitools/client/model/Dog.java    |  1 +
 .../openapitools/client/model/DogAllOf.java   |  1 +
 .../openapitools/client/model/EnumArrays.java |  2 ++
 .../openapitools/client/model/EnumTest.java   |  5 ++++
 .../client/model/FileSchemaTestClass.java     |  2 ++
 .../openapitools/client/model/FormatTest.java | 13 +++++++++
 .../client/model/HasOnlyReadOnly.java         |  2 ++
 .../openapitools/client/model/MapTest.java    |  4 +++
 ...ropertiesAndAdditionalPropertiesClass.java |  3 ++
 .../client/model/Model200Response.java        |  2 ++
 .../client/model/ModelApiResponse.java        |  3 ++
 .../client/model/ModelReturn.java             |  1 +
 .../org/openapitools/client/model/Name.java   |  4 +++
 .../openapitools/client/model/NumberOnly.java |  1 +
 .../org/openapitools/client/model/Order.java  |  6 ++++
 .../client/model/OuterComposite.java          |  3 ++
 .../org/openapitools/client/model/Pet.java    |  6 ++++
 .../client/model/ReadOnlyFirst.java           |  2 ++
 .../client/model/SpecialModelName.java        |  1 +
 .../org/openapitools/client/model/Tag.java    |  2 ++
 .../client/model/TypeHolderDefault.java       |  5 ++++
 .../client/model/TypeHolderExample.java       |  5 ++++
 .../org/openapitools/client/model/User.java   |  8 +++++
 .../openapitools/client/model/XmlItem.java    | 29 +++++++++++++++++++
 .../petstore/java/retrofit2rx2/build.gradle   |  1 +
 .../client/petstore/java/retrofit2rx2/pom.xml |  6 ++++
 .../model/AdditionalPropertiesAnyType.java    |  1 +
 .../model/AdditionalPropertiesArray.java      |  1 +
 .../model/AdditionalPropertiesBoolean.java    |  1 +
 .../model/AdditionalPropertiesClass.java      | 11 +++++++
 .../model/AdditionalPropertiesInteger.java    |  1 +
 .../model/AdditionalPropertiesNumber.java     |  1 +
 .../model/AdditionalPropertiesObject.java     |  1 +
 .../model/AdditionalPropertiesString.java     |  1 +
 .../org/openapitools/client/model/Animal.java |  2 ++
 .../model/ArrayOfArrayOfNumberOnly.java       |  1 +
 .../client/model/ArrayOfNumberOnly.java       |  1 +
 .../openapitools/client/model/ArrayTest.java  |  3 ++
 .../client/model/Capitalization.java          |  6 ++++
 .../org/openapitools/client/model/Cat.java    |  1 +
 .../openapitools/client/model/CatAllOf.java   |  1 +
 .../openapitools/client/model/Category.java   |  2 ++
 .../openapitools/client/model/ClassModel.java |  1 +
 .../org/openapitools/client/model/Client.java |  1 +
 .../org/openapitools/client/model/Dog.java    |  1 +
 .../openapitools/client/model/DogAllOf.java   |  1 +
 .../openapitools/client/model/EnumArrays.java |  2 ++
 .../openapitools/client/model/EnumTest.java   |  5 ++++
 .../client/model/FileSchemaTestClass.java     |  2 ++
 .../openapitools/client/model/FormatTest.java | 13 +++++++++
 .../client/model/HasOnlyReadOnly.java         |  2 ++
 .../openapitools/client/model/MapTest.java    |  4 +++
 ...ropertiesAndAdditionalPropertiesClass.java |  3 ++
 .../client/model/Model200Response.java        |  2 ++
 .../client/model/ModelApiResponse.java        |  3 ++
 .../client/model/ModelReturn.java             |  1 +
 .../org/openapitools/client/model/Name.java   |  4 +++
 .../openapitools/client/model/NumberOnly.java |  1 +
 .../org/openapitools/client/model/Order.java  |  6 ++++
 .../client/model/OuterComposite.java          |  3 ++
 .../org/openapitools/client/model/Pet.java    |  6 ++++
 .../client/model/ReadOnlyFirst.java           |  2 ++
 .../client/model/SpecialModelName.java        |  1 +
 .../org/openapitools/client/model/Tag.java    |  2 ++
 .../client/model/TypeHolderDefault.java       |  5 ++++
 .../client/model/TypeHolderExample.java       |  5 ++++
 .../org/openapitools/client/model/User.java   |  8 +++++
 .../openapitools/client/model/XmlItem.java    | 29 +++++++++++++++++++
 .../client/petstore/java/vertx/build.gradle   |  1 +
 samples/client/petstore/java/vertx/pom.xml    |  7 +++++
 .../model/AdditionalPropertiesAnyType.java    |  1 +
 .../model/AdditionalPropertiesArray.java      |  1 +
 .../model/AdditionalPropertiesBoolean.java    |  1 +
 .../model/AdditionalPropertiesClass.java      | 11 +++++++
 .../model/AdditionalPropertiesInteger.java    |  1 +
 .../model/AdditionalPropertiesNumber.java     |  1 +
 .../model/AdditionalPropertiesObject.java     |  1 +
 .../model/AdditionalPropertiesString.java     |  1 +
 .../org/openapitools/client/model/Animal.java |  2 ++
 .../model/ArrayOfArrayOfNumberOnly.java       |  1 +
 .../client/model/ArrayOfNumberOnly.java       |  1 +
 .../openapitools/client/model/ArrayTest.java  |  3 ++
 .../client/model/Capitalization.java          |  6 ++++
 .../org/openapitools/client/model/Cat.java    |  1 +
 .../openapitools/client/model/CatAllOf.java   |  1 +
 .../openapitools/client/model/Category.java   |  2 ++
 .../openapitools/client/model/ClassModel.java |  1 +
 .../org/openapitools/client/model/Client.java |  1 +
 .../org/openapitools/client/model/Dog.java    |  1 +
 .../openapitools/client/model/DogAllOf.java   |  1 +
 .../openapitools/client/model/EnumArrays.java |  2 ++
 .../openapitools/client/model/EnumTest.java   |  5 ++++
 .../client/model/FileSchemaTestClass.java     |  2 ++
 .../openapitools/client/model/FormatTest.java | 13 +++++++++
 .../client/model/HasOnlyReadOnly.java         |  2 ++
 .../openapitools/client/model/MapTest.java    |  4 +++
 ...ropertiesAndAdditionalPropertiesClass.java |  3 ++
 .../client/model/Model200Response.java        |  2 ++
 .../client/model/ModelApiResponse.java        |  3 ++
 .../client/model/ModelReturn.java             |  1 +
 .../org/openapitools/client/model/Name.java   |  4 +++
 .../openapitools/client/model/NumberOnly.java |  1 +
 .../org/openapitools/client/model/Order.java  |  6 ++++
 .../client/model/OuterComposite.java          |  3 ++
 .../org/openapitools/client/model/Pet.java    |  6 ++++
 .../client/model/ReadOnlyFirst.java           |  2 ++
 .../client/model/SpecialModelName.java        |  1 +
 .../org/openapitools/client/model/Tag.java    |  2 ++
 .../client/model/TypeHolderDefault.java       |  5 ++++
 .../client/model/TypeHolderExample.java       |  5 ++++
 .../org/openapitools/client/model/User.java   |  8 +++++
 .../openapitools/client/model/XmlItem.java    | 29 +++++++++++++++++++
 .../petstore/java/webclient/build.gradle      |  1 +
 .../model/AdditionalPropertiesAnyType.java    |  1 +
 .../model/AdditionalPropertiesArray.java      |  1 +
 .../model/AdditionalPropertiesBoolean.java    |  1 +
 .../model/AdditionalPropertiesClass.java      | 11 +++++++
 .../model/AdditionalPropertiesInteger.java    |  1 +
 .../model/AdditionalPropertiesNumber.java     |  1 +
 .../model/AdditionalPropertiesObject.java     |  1 +
 .../model/AdditionalPropertiesString.java     |  1 +
 .../org/openapitools/client/model/Animal.java |  2 ++
 .../model/ArrayOfArrayOfNumberOnly.java       |  1 +
 .../client/model/ArrayOfNumberOnly.java       |  1 +
 .../openapitools/client/model/ArrayTest.java  |  3 ++
 .../client/model/Capitalization.java          |  6 ++++
 .../org/openapitools/client/model/Cat.java    |  1 +
 .../openapitools/client/model/CatAllOf.java   |  1 +
 .../openapitools/client/model/Category.java   |  2 ++
 .../openapitools/client/model/ClassModel.java |  1 +
 .../org/openapitools/client/model/Client.java |  1 +
 .../org/openapitools/client/model/Dog.java    |  1 +
 .../openapitools/client/model/DogAllOf.java   |  1 +
 .../openapitools/client/model/EnumArrays.java |  2 ++
 .../openapitools/client/model/EnumTest.java   |  5 ++++
 .../client/model/FileSchemaTestClass.java     |  2 ++
 .../openapitools/client/model/FormatTest.java | 13 +++++++++
 .../client/model/HasOnlyReadOnly.java         |  2 ++
 .../openapitools/client/model/MapTest.java    |  4 +++
 ...ropertiesAndAdditionalPropertiesClass.java |  3 ++
 .../client/model/Model200Response.java        |  2 ++
 .../client/model/ModelApiResponse.java        |  3 ++
 .../client/model/ModelReturn.java             |  1 +
 .../org/openapitools/client/model/Name.java   |  4 +++
 .../openapitools/client/model/NumberOnly.java |  1 +
 .../org/openapitools/client/model/Order.java  |  6 ++++
 .../client/model/OuterComposite.java          |  3 ++
 .../org/openapitools/client/model/Pet.java    |  6 ++++
 .../client/model/ReadOnlyFirst.java           |  2 ++
 .../client/model/SpecialModelName.java        |  1 +
 .../org/openapitools/client/model/Tag.java    |  2 ++
 .../client/model/TypeHolderDefault.java       |  5 ++++
 .../client/model/TypeHolderExample.java       |  5 ++++
 .../org/openapitools/client/model/User.java   |  8 +++++
 .../openapitools/client/model/XmlItem.java    | 29 +++++++++++++++++++
 samples/client/petstore/spring-cloud/pom.xml  |  6 ++++
 .../petstore/springboot-reactive/pom.xml      |  6 ++++
 994 files changed, 3525 insertions(+)

diff --git a/modules/openapi-generator/src/main/resources/Java/build.gradle.mustache b/modules/openapi-generator/src/main/resources/Java/build.gradle.mustache
index 2e00ae91d1..c65fb3cea2 100644
--- a/modules/openapi-generator/src/main/resources/Java/build.gradle.mustache
+++ b/modules/openapi-generator/src/main/resources/Java/build.gradle.mustache
@@ -145,6 +145,7 @@ ext {
 
 dependencies {
     compile "io.swagger:swagger-annotations:$swagger_annotations_version"
+    compile "com.google.code.findbugs:jsr305:3.0.2"
     compile "com.sun.jersey:jersey-client:$jersey_version"
     compile "com.sun.jersey.contribs:jersey-multipart:$jersey_version"
     compile "com.fasterxml.jackson.core:jackson-core:$jackson_version"
diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/feign/build.gradle.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/feign/build.gradle.mustache
index 24e5e816ca..982faaa462 100644
--- a/modules/openapi-generator/src/main/resources/Java/libraries/feign/build.gradle.mustache
+++ b/modules/openapi-generator/src/main/resources/Java/libraries/feign/build.gradle.mustache
@@ -133,6 +133,7 @@ ext {
 
 dependencies {
     compile "io.swagger:swagger-annotations:$swagger_annotations_version"
+    compile "com.google.code.findbugs:jsr305:3.0.2"
     compile "io.github.openfeign:feign-core:$feign_version"
     compile "io.github.openfeign:feign-jackson:$feign_version"
     compile "io.github.openfeign:feign-slf4j:$feign_version"
diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/feign/pom.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/feign/pom.mustache
index 21954ad8ad..d2634ca5df 100644
--- a/modules/openapi-generator/src/main/resources/Java/libraries/feign/pom.mustache
+++ b/modules/openapi-generator/src/main/resources/Java/libraries/feign/pom.mustache
@@ -199,6 +199,13 @@
             <version>${swagger-annotations-version}</version>
         </dependency>
 
+        <!-- @Nullable annotation -->
+        <dependency>
+            <groupId>com.google.code.findbugs</groupId>
+            <artifactId>jsr305</artifactId>
+            <version>3.0.2</version>
+        </dependency>
+        
         <!-- HTTP client: Netflix Feign -->
         <dependency>
             <groupId>io.github.openfeign</groupId>
diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/google-api-client/build.gradle.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/google-api-client/build.gradle.mustache
index f8d3ce9d78..84ae616aad 100644
--- a/modules/openapi-generator/src/main/resources/Java/libraries/google-api-client/build.gradle.mustache
+++ b/modules/openapi-generator/src/main/resources/Java/libraries/google-api-client/build.gradle.mustache
@@ -133,6 +133,7 @@ ext {
 
 dependencies {
     compile "io.swagger:swagger-annotations:$swagger_annotations_version"
+    compile "com.google.code.findbugs:jsr305:3.0.2"
     compile "com.google.api-client:google-api-client:${google_api_client_version}"
     compile "org.glassfish.jersey.core:jersey-common:${jersey_common_version}"
     compile "com.fasterxml.jackson.core:jackson-core:$jackson_version"
diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/google-api-client/pom.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/google-api-client/pom.mustache
index 35f0cafdf9..0269a88c3b 100644
--- a/modules/openapi-generator/src/main/resources/Java/libraries/google-api-client/pom.mustache
+++ b/modules/openapi-generator/src/main/resources/Java/libraries/google-api-client/pom.mustache
@@ -219,6 +219,12 @@
             <artifactId>swagger-annotations</artifactId>
             <version>${swagger-annotations-version}</version>
         </dependency>
+        <!-- @Nullable annotation -->
+        <dependency>
+            <groupId>com.google.code.findbugs</groupId>
+            <artifactId>jsr305</artifactId>
+            <version>3.0.2</version>
+        </dependency>
         <!-- HTTP client: google-api-client -->
         <dependency>
             <groupId>com.google.api-client</groupId>
diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/jersey2/build.gradle.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/jersey2/build.gradle.mustache
index 08462012dd..3f192edafd 100644
--- a/modules/openapi-generator/src/main/resources/Java/libraries/jersey2/build.gradle.mustache
+++ b/modules/openapi-generator/src/main/resources/Java/libraries/jersey2/build.gradle.mustache
@@ -137,6 +137,7 @@ ext {
 
 dependencies {
     compile "io.swagger:swagger-annotations:$swagger_annotations_version"
+    compile "com.google.code.findbugs:jsr305:3.0.2"
     compile "org.glassfish.jersey.core:jersey-client:$jersey_version"
     compile "org.glassfish.jersey.media:jersey-media-multipart:$jersey_version"
     compile "org.glassfish.jersey.media:jersey-media-json-jackson:$jersey_version"
diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/jersey2/pom.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/jersey2/pom.mustache
index a6b6d039f8..27a94b5631 100644
--- a/modules/openapi-generator/src/main/resources/Java/libraries/jersey2/pom.mustache
+++ b/modules/openapi-generator/src/main/resources/Java/libraries/jersey2/pom.mustache
@@ -229,6 +229,13 @@
             <version>${swagger-annotations-version}</version>
         </dependency>
 
+        <!-- @Nullable annotation -->
+        <dependency>
+            <groupId>com.google.code.findbugs</groupId>
+            <artifactId>jsr305</artifactId>
+            <version>3.0.2</version>
+        </dependency>
+        
         <!-- HTTP client: jersey-client -->
         <dependency>
             <groupId>org.glassfish.jersey.core</groupId>
diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/okhttp-gson/build.gradle.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/okhttp-gson/build.gradle.mustache
index f255d0123c..d6ae8e3146 100644
--- a/modules/openapi-generator/src/main/resources/Java/libraries/okhttp-gson/build.gradle.mustache
+++ b/modules/openapi-generator/src/main/resources/Java/libraries/okhttp-gson/build.gradle.mustache
@@ -127,6 +127,7 @@ if(hasProperty('target') && target == 'android') {
 
 dependencies {
     compile 'io.swagger:swagger-annotations:1.5.22'
+    compile "com.google.code.findbugs:jsr305:3.0.2"
     compile 'com.squareup.okhttp3:okhttp:3.14.2'
     compile 'com.squareup.okhttp3:logging-interceptor:3.14.2'
     compile 'com.google.code.gson:gson:2.8.5'
diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/okhttp-gson/pom.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/okhttp-gson/pom.mustache
index 7aa9c2c8a8..759b9fe824 100644
--- a/modules/openapi-generator/src/main/resources/Java/libraries/okhttp-gson/pom.mustache
+++ b/modules/openapi-generator/src/main/resources/Java/libraries/okhttp-gson/pom.mustache
@@ -207,6 +207,12 @@
             <artifactId>swagger-annotations</artifactId>
             <version>${swagger-core-version}</version>
         </dependency>
+        <!-- @Nullable annotation -->
+        <dependency>
+            <groupId>com.google.code.findbugs</groupId>
+            <artifactId>jsr305</artifactId>
+            <version>3.0.2</version>
+        </dependency>
         <dependency>
             <groupId>com.squareup.okhttp3</groupId>
             <artifactId>okhttp</artifactId>
diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/rest-assured/build.gradle.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/rest-assured/build.gradle.mustache
index 285f42e475..b2d8683d3a 100644
--- a/modules/openapi-generator/src/main/resources/Java/libraries/rest-assured/build.gradle.mustache
+++ b/modules/openapi-generator/src/main/resources/Java/libraries/rest-assured/build.gradle.mustache
@@ -111,6 +111,7 @@ ext {
 
 dependencies {
     compile "io.swagger:swagger-annotations:$swagger_annotations_version"
+    compile "com.google.code.findbugs:jsr305:3.0.2"
     compile "io.rest-assured:scala-support:$rest_assured_version"
     compile "io.gsonfire:gson-fire:$gson_fire_version"
 {{#joda}}
diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/rest-assured/pom.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/rest-assured/pom.mustache
index 5aa3ab7c61..f8a8b5a1c8 100644
--- a/modules/openapi-generator/src/main/resources/Java/libraries/rest-assured/pom.mustache
+++ b/modules/openapi-generator/src/main/resources/Java/libraries/rest-assured/pom.mustache
@@ -206,6 +206,12 @@
             <artifactId>swagger-annotations</artifactId>
             <version>${swagger-annotations-version}</version>
         </dependency>
+        <!-- @Nullable annotation -->
+        <dependency>
+            <groupId>com.google.code.findbugs</groupId>
+            <artifactId>jsr305</artifactId>
+            <version>3.0.2</version>
+        </dependency>
         <dependency>
             <groupId>io.rest-assured</groupId>
             <artifactId>rest-assured</artifactId>
diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/resteasy/build.gradle.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/resteasy/build.gradle.mustache
index 16da888f26..4232b110be 100644
--- a/modules/openapi-generator/src/main/resources/Java/libraries/resteasy/build.gradle.mustache
+++ b/modules/openapi-generator/src/main/resources/Java/libraries/resteasy/build.gradle.mustache
@@ -135,6 +135,7 @@ ext {
 
 dependencies {
     compile "io.swagger:swagger-annotations:$swagger_annotations_version"
+    compile "com.google.code.findbugs:jsr305:3.0.2"
     compile "org.jboss.resteasy:resteasy-client:$resteasy_version"
     compile "org.jboss.resteasy:resteasy-multipart-provider:$resteasy_version"
     compile "org.jboss.resteasy:resteasy-jackson2-provider:$resteasy_version"
diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/resteasy/pom.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/resteasy/pom.mustache
index 48b5241973..7d6927871f 100644
--- a/modules/openapi-generator/src/main/resources/Java/libraries/resteasy/pom.mustache
+++ b/modules/openapi-generator/src/main/resources/Java/libraries/resteasy/pom.mustache
@@ -179,6 +179,12 @@
             <artifactId>swagger-annotations</artifactId>
             <version>${swagger-annotations-version}</version>
         </dependency>
+        <!-- @Nullable annotation -->
+        <dependency>
+            <groupId>com.google.code.findbugs</groupId>
+            <artifactId>jsr305</artifactId>
+            <version>3.0.2</version>
+        </dependency>
         <!-- HTTP client: jersey-client -->
         <dependency>
             <groupId>org.jboss.resteasy</groupId>
diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/resttemplate/build.gradle.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/resttemplate/build.gradle.mustache
index eae0fa4e4a..a3a9716286 100644
--- a/modules/openapi-generator/src/main/resources/Java/libraries/resttemplate/build.gradle.mustache
+++ b/modules/openapi-generator/src/main/resources/Java/libraries/resttemplate/build.gradle.mustache
@@ -132,6 +132,7 @@ ext {
 
 dependencies {
     compile "io.swagger:swagger-annotations:$swagger_annotations_version"
+    compile "com.google.code.findbugs:jsr305:3.0.2"
     compile "org.springframework:spring-web:$spring_web_version"
     compile "com.fasterxml.jackson.core:jackson-core:$jackson_version"
     compile "com.fasterxml.jackson.core:jackson-annotations:$jackson_version"
diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/resttemplate/pom.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/resttemplate/pom.mustache
index 39a4a7c8d8..77d021644d 100644
--- a/modules/openapi-generator/src/main/resources/Java/libraries/resttemplate/pom.mustache
+++ b/modules/openapi-generator/src/main/resources/Java/libraries/resttemplate/pom.mustache
@@ -219,6 +219,13 @@
             <artifactId>swagger-annotations</artifactId>
             <version>${swagger-annotations-version}</version>
         </dependency>
+        
+        <!-- @Nullable annotation -->
+        <dependency>
+            <groupId>com.google.code.findbugs</groupId>
+            <artifactId>jsr305</artifactId>
+            <version>3.0.2</version>
+        </dependency>
 
         <!-- HTTP client: Spring RestTemplate -->
         <dependency>
diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/retrofit/build.gradle.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/retrofit/build.gradle.mustache
index dc0acee384..3927003a31 100644
--- a/modules/openapi-generator/src/main/resources/Java/libraries/retrofit/build.gradle.mustache
+++ b/modules/openapi-generator/src/main/resources/Java/libraries/retrofit/build.gradle.mustache
@@ -120,6 +120,7 @@ ext {
 
 dependencies {
     compile "com.squareup.okhttp:okhttp:$okhttp_version"
+    compile "com.google.code.findbugs:jsr305:3.0.2"
     compile "com.squareup.retrofit:retrofit:$retrofit_version"
     compile "io.swagger:swagger-annotations:$swagger_annotations_version"
     compile "org.apache.oltu.oauth2:org.apache.oltu.oauth2.client:$oltu_version"
diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/retrofit/pom.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/retrofit/pom.mustache
index c2a5eeced6..5e91585eed 100644
--- a/modules/openapi-generator/src/main/resources/Java/libraries/retrofit/pom.mustache
+++ b/modules/openapi-generator/src/main/resources/Java/libraries/retrofit/pom.mustache
@@ -219,6 +219,12 @@
             <artifactId>swagger-annotations</artifactId>
             <version>${swagger-annotations-version}</version>
         </dependency>
+        <!-- @Nullable annotation -->
+        <dependency>
+            <groupId>com.google.code.findbugs</groupId>
+            <artifactId>jsr305</artifactId>
+            <version>3.0.2</version>
+        </dependency>
         <dependency>
             <groupId>com.squareup.retrofit</groupId>
             <artifactId>retrofit</artifactId>
diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/retrofit2/build.gradle.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/retrofit2/build.gradle.mustache
index 39574a5755..41ba481134 100644
--- a/modules/openapi-generator/src/main/resources/Java/libraries/retrofit2/build.gradle.mustache
+++ b/modules/openapi-generator/src/main/resources/Java/libraries/retrofit2/build.gradle.mustache
@@ -166,6 +166,7 @@ dependencies {
     compile "io.reactivex.rxjava2:rxjava:$rx_java_version"
     {{/useRxJava2}}
     compile "io.swagger:swagger-annotations:$swagger_annotations_version"
+    compile "com.google.code.findbugs:jsr305:3.0.2"
     compile ("org.apache.oltu.oauth2:org.apache.oltu.oauth2.client:$oltu_version"){
         exclude group:'org.apache.oltu.oauth2' , module: 'org.apache.oltu.oauth2.common'
     }
diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/retrofit2/pom.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/retrofit2/pom.mustache
index 4653b6650a..aef50309c1 100644
--- a/modules/openapi-generator/src/main/resources/Java/libraries/retrofit2/pom.mustache
+++ b/modules/openapi-generator/src/main/resources/Java/libraries/retrofit2/pom.mustache
@@ -198,6 +198,12 @@
             <artifactId>swagger-annotations</artifactId>
             <version>${swagger-annotations-version}</version>
         </dependency>
+        <!-- @Nullable annotation -->
+        <dependency>
+            <groupId>com.google.code.findbugs</groupId>
+            <artifactId>jsr305</artifactId>
+            <version>3.0.2</version>
+        </dependency>
         <dependency>
             <groupId>com.squareup.retrofit2</groupId>
             <artifactId>converter-gson</artifactId>
diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/vertx/build.gradle.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/vertx/build.gradle.mustache
index 1e97c1e259..cf71f23769 100644
--- a/modules/openapi-generator/src/main/resources/Java/libraries/vertx/build.gradle.mustache
+++ b/modules/openapi-generator/src/main/resources/Java/libraries/vertx/build.gradle.mustache
@@ -36,6 +36,7 @@ ext {
 
 dependencies {
     compile "io.swagger:swagger-annotations:$swagger_annotations_version"
+    compile "com.google.code.findbugs:jsr305:3.0.2"
     compile "io.vertx:vertx-web-client:$vertx_version"
     compile "io.vertx:vertx-rx-java:$vertx_version"
     compile "com.fasterxml.jackson.core:jackson-core:$jackson_version"
diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/vertx/pom.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/vertx/pom.mustache
index c3976600d9..db6ef66924 100644
--- a/modules/openapi-generator/src/main/resources/Java/libraries/vertx/pom.mustache
+++ b/modules/openapi-generator/src/main/resources/Java/libraries/vertx/pom.mustache
@@ -208,6 +208,13 @@
             <version>${swagger-annotations-version}</version>
         </dependency>
 
+        <!-- @Nullable annotation -->
+        <dependency>
+            <groupId>com.google.code.findbugs</groupId>
+            <artifactId>jsr305</artifactId>
+            <version>3.0.2</version>
+        </dependency>
+        
         <!-- Vertx -->
         <dependency>
             <groupId>io.vertx</groupId>
diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/webclient/pom.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/webclient/pom.mustache
index 8919c3d481..44098edb0f 100644
--- a/modules/openapi-generator/src/main/resources/Java/libraries/webclient/pom.mustache
+++ b/modules/openapi-generator/src/main/resources/Java/libraries/webclient/pom.mustache
@@ -72,6 +72,13 @@
             <artifactId>swagger-annotations</artifactId>
             <version>${swagger-annotations-version}</version>
         </dependency>
+        
+        <!-- @Nullable annotation -->
+        <dependency>
+            <groupId>com.google.code.findbugs</groupId>
+            <artifactId>jsr305</artifactId>
+            <version>3.0.2</version>
+        </dependency>
 
         <dependency>
             <groupId>io.projectreactor</groupId>
diff --git a/modules/openapi-generator/src/main/resources/Java/pojo.mustache b/modules/openapi-generator/src/main/resources/Java/pojo.mustache
index e021bf24b2..276de9b66e 100644
--- a/modules/openapi-generator/src/main/resources/Java/pojo.mustache
+++ b/modules/openapi-generator/src/main/resources/Java/pojo.mustache
@@ -129,6 +129,7 @@ public class {{classname}} {{#parent}}extends {{{parent}}} {{/parent}}{{#parcela
   {{/maximum}}
    * @return {{name}}
   **/
+{{^required}}  @javax.annotation.Nullable {{/required}}
 {{#useBeanValidation}}{{>beanValidation}}{{/useBeanValidation}}  @ApiModelProperty({{#example}}example = "{{{example}}}", {{/example}}{{#required}}required = {{required}}, {{/required}}value = "{{{description}}}")
 {{#vendorExtensions.extraAnnotation}}
   {{{vendorExtensions.extraAnnotation}}}
diff --git a/modules/openapi-generator/src/main/resources/Java/pom.mustache b/modules/openapi-generator/src/main/resources/Java/pom.mustache
index ed6e39c78e..7dde4b12d9 100644
--- a/modules/openapi-generator/src/main/resources/Java/pom.mustache
+++ b/modules/openapi-generator/src/main/resources/Java/pom.mustache
@@ -220,6 +220,14 @@
             <version>${swagger-annotations-version}</version>
         </dependency>
 
+        <!-- @Nullable annotation -->
+        <dependency>
+            <groupId>com.google.code.findbugs</groupId>
+            <artifactId>jsr305</artifactId>
+            <version>3.0.2</version>
+        </dependency>
+
+
         <!-- HTTP client: jersey-client -->
         <dependency>
             <groupId>com.sun.jersey</groupId>
diff --git a/modules/openapi-generator/src/main/resources/JavaJaxRS/cxf-cdi/pom.mustache b/modules/openapi-generator/src/main/resources/JavaJaxRS/cxf-cdi/pom.mustache
index 99a7dea415..2e4a164927 100644
--- a/modules/openapi-generator/src/main/resources/JavaJaxRS/cxf-cdi/pom.mustache
+++ b/modules/openapi-generator/src/main/resources/JavaJaxRS/cxf-cdi/pom.mustache
@@ -77,6 +77,13 @@
             <version>[1.5.3,1.5.16]</version>
         </dependency>
         
+        <!-- @Nullable annotation -->
+        <dependency>
+            <groupId>com.google.code.findbugs</groupId>
+            <artifactId>jsr305</artifactId>
+            <version>3.0.2</version>
+        </dependency>
+        
 {{#useBeanValidation}}
        <!-- Bean Validation API support -->
        <dependency>
diff --git a/modules/openapi-generator/src/main/resources/JavaJaxRS/resteasy/pom.mustache b/modules/openapi-generator/src/main/resources/JavaJaxRS/resteasy/pom.mustache
index d0000c1cd5..d6389cce09 100644
--- a/modules/openapi-generator/src/main/resources/JavaJaxRS/resteasy/pom.mustache
+++ b/modules/openapi-generator/src/main/resources/JavaJaxRS/resteasy/pom.mustache
@@ -71,6 +71,12 @@
             <artifactId>swagger-annotations</artifactId>
             <version>${swagger-core-version}</version>
         </dependency>
+        <!-- @Nullable annotation -->
+        <dependency>
+            <groupId>com.google.code.findbugs</groupId>
+            <artifactId>jsr305</artifactId>
+            <version>3.0.2</version>
+        </dependency>
         <dependency>
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-log4j12</artifactId>
diff --git a/modules/openapi-generator/src/main/resources/JavaJaxRS/spec/pom.mustache b/modules/openapi-generator/src/main/resources/JavaJaxRS/spec/pom.mustache
index 40d6eba4c6..a770196382 100644
--- a/modules/openapi-generator/src/main/resources/JavaJaxRS/spec/pom.mustache
+++ b/modules/openapi-generator/src/main/resources/JavaJaxRS/spec/pom.mustache
@@ -88,6 +88,12 @@
       <version>1.5.3</version>
     </dependency>
     {{/useSwaggerAnnotations}}
+    <!-- @Nullable annotation -->
+    <dependency>
+        <groupId>com.google.code.findbugs</groupId>
+        <artifactId>jsr305</artifactId>
+        <version>3.0.2</version>
+    </dependency>
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
diff --git a/modules/openapi-generator/src/main/resources/JavaSpring/libraries/spring-boot/pom.mustache b/modules/openapi-generator/src/main/resources/JavaSpring/libraries/spring-boot/pom.mustache
index 5c396de030..e3cf4da321 100644
--- a/modules/openapi-generator/src/main/resources/JavaSpring/libraries/spring-boot/pom.mustache
+++ b/modules/openapi-generator/src/main/resources/JavaSpring/libraries/spring-boot/pom.mustache
@@ -111,6 +111,12 @@
             <artifactId>swagger-annotations</artifactId>
             <version>1.5.14</version>
         </dependency>
+        <!-- @Nullable annotation -->
+        <dependency>
+            <groupId>com.google.code.findbugs</groupId>
+            <artifactId>jsr305</artifactId>
+            <version>3.0.2</version>
+        </dependency>
         <dependency>
             <groupId>com.fasterxml.jackson.dataformat</groupId>
             <artifactId>jackson-dataformat-yaml</artifactId>
diff --git a/modules/openapi-generator/src/main/resources/JavaSpring/libraries/spring-cloud/pom.mustache b/modules/openapi-generator/src/main/resources/JavaSpring/libraries/spring-cloud/pom.mustache
index 4e1f61b8ae..1ba3588ac5 100644
--- a/modules/openapi-generator/src/main/resources/JavaSpring/libraries/spring-cloud/pom.mustache
+++ b/modules/openapi-generator/src/main/resources/JavaSpring/libraries/spring-cloud/pom.mustache
@@ -47,6 +47,12 @@
             <artifactId>swagger-annotations</artifactId>
             <version>${swagger-core-version}</version>
         </dependency>
+        <!-- @Nullable annotation -->
+        <dependency>
+            <groupId>com.google.code.findbugs</groupId>
+            <artifactId>jsr305</artifactId>
+            <version>3.0.2</version>
+        </dependency>
         <dependency>
             <groupId>org.springframework.cloud</groupId>
             <artifactId>spring-cloud-starter-openfeign</artifactId>
diff --git a/modules/openapi-generator/src/main/resources/JavaSpring/libraries/spring-mvc/pom.mustache b/modules/openapi-generator/src/main/resources/JavaSpring/libraries/spring-mvc/pom.mustache
index dc9c843bc2..842a9926d1 100644
--- a/modules/openapi-generator/src/main/resources/JavaSpring/libraries/spring-mvc/pom.mustache
+++ b/modules/openapi-generator/src/main/resources/JavaSpring/libraries/spring-mvc/pom.mustache
@@ -177,6 +177,12 @@
             <artifactId>swagger-annotations</artifactId>
             <version>1.5.14</version>
         </dependency>
+        <!-- @Nullable annotation -->
+        <dependency>
+            <groupId>com.google.code.findbugs</groupId>
+            <artifactId>jsr305</artifactId>
+            <version>3.0.2</version>
+        </dependency>
         <dependency>
             <groupId>com.fasterxml.jackson.dataformat</groupId>
             <artifactId>jackson-dataformat-yaml</artifactId>
diff --git a/modules/openapi-generator/src/main/resources/android/libraries/volley/pom.mustache b/modules/openapi-generator/src/main/resources/android/libraries/volley/pom.mustache
index 0ba404590b..66f1be9033 100644
--- a/modules/openapi-generator/src/main/resources/android/libraries/volley/pom.mustache
+++ b/modules/openapi-generator/src/main/resources/android/libraries/volley/pom.mustache
@@ -11,6 +11,12 @@
       <artifactId>swagger-annotations</artifactId>
       <version>${swagger-annotations-version}</version>
     </dependency>
+    <!-- @Nullable annotation -->
+    <dependency>
+        <groupId>com.google.code.findbugs</groupId>
+        <artifactId>jsr305</artifactId>
+        <version>3.0.2</version>
+    </dependency>
     <dependency>
       <groupId>org.apache.httpcomponents</groupId>
       <artifactId>httpcore</artifactId>
diff --git a/modules/openapi-generator/src/main/resources/android/pom.mustache b/modules/openapi-generator/src/main/resources/android/pom.mustache
index 375a52a374..ec8f2759cc 100644
--- a/modules/openapi-generator/src/main/resources/android/pom.mustache
+++ b/modules/openapi-generator/src/main/resources/android/pom.mustache
@@ -131,6 +131,12 @@
             <artifactId>swagger-annotations</artifactId>
             <version>${swagger-core-version}</version>
         </dependency>
+        <!-- @Nullable annotation -->
+        <dependency>
+            <groupId>com.google.code.findbugs</groupId>
+            <artifactId>jsr305</artifactId>
+            <version>3.0.2</version>
+        </dependency>
         <dependency>
             <groupId>com.google.code.gson</groupId>
             <artifactId>gson</artifactId>
diff --git a/modules/openapi-generator/src/main/resources/java-undertow-server/pom.mustache b/modules/openapi-generator/src/main/resources/java-undertow-server/pom.mustache
index b45ae15ccd..8938a5ad3f 100644
--- a/modules/openapi-generator/src/main/resources/java-undertow-server/pom.mustache
+++ b/modules/openapi-generator/src/main/resources/java-undertow-server/pom.mustache
@@ -108,6 +108,12 @@
             <artifactId>swagger-annotations</artifactId>
             <version>${version.swagger}</version>
         </dependency>
+        <!-- @Nullable annotation -->
+        <dependency>
+            <groupId>com.google.code.findbugs</groupId>
+            <artifactId>jsr305</artifactId>
+            <version>3.0.2</version>
+        </dependency>
 
         <!-- Test Dependencies -->
         <dependency>
diff --git a/modules/openapi-generator/src/main/resources/kotlin-spring/libraries/spring-boot/pom.mustache b/modules/openapi-generator/src/main/resources/kotlin-spring/libraries/spring-boot/pom.mustache
index bd65158500..e05425fc5c 100644
--- a/modules/openapi-generator/src/main/resources/kotlin-spring/libraries/spring-boot/pom.mustache
+++ b/modules/openapi-generator/src/main/resources/kotlin-spring/libraries/spring-boot/pom.mustache
@@ -105,6 +105,12 @@
             <version>1.5.21</version>
         </dependency>
         {{/swaggerAnnotations}}
+        <!-- @Nullable annotation -->
+        <dependency>
+            <groupId>com.google.code.findbugs</groupId>
+            <artifactId>jsr305</artifactId>
+            <version>3.0.2</version>
+        </dependency>
         <dependency>
             <groupId>com.fasterxml.jackson.dataformat</groupId>
             <artifactId>jackson-dataformat-yaml</artifactId>
diff --git a/samples/client/petstore/android/httpclient/pom.xml b/samples/client/petstore/android/httpclient/pom.xml
index 981fbebda6..455f6be5ff 100644
--- a/samples/client/petstore/android/httpclient/pom.xml
+++ b/samples/client/petstore/android/httpclient/pom.xml
@@ -131,6 +131,12 @@
             <artifactId>swagger-annotations</artifactId>
             <version>${swagger-core-version}</version>
         </dependency>
+        <!-- @Nullable annotation -->
+        <dependency>
+            <groupId>com.google.code.findbugs</groupId>
+            <artifactId>jsr305</artifactId>
+            <version>3.0.2</version>
+        </dependency>
         <dependency>
             <groupId>com.google.code.gson</groupId>
             <artifactId>gson</artifactId>
diff --git a/samples/client/petstore/java/feign/build.gradle b/samples/client/petstore/java/feign/build.gradle
index af30107a4f..f05dc55cd7 100644
--- a/samples/client/petstore/java/feign/build.gradle
+++ b/samples/client/petstore/java/feign/build.gradle
@@ -107,6 +107,7 @@ ext {
 
 dependencies {
     compile "io.swagger:swagger-annotations:$swagger_annotations_version"
+    compile "com.google.code.findbugs:jsr305:3.0.2"
     compile "io.github.openfeign:feign-core:$feign_version"
     compile "io.github.openfeign:feign-jackson:$feign_version"
     compile "io.github.openfeign:feign-slf4j:$feign_version"
diff --git a/samples/client/petstore/java/feign/pom.xml b/samples/client/petstore/java/feign/pom.xml
index d354a95b03..a55c44d654 100644
--- a/samples/client/petstore/java/feign/pom.xml
+++ b/samples/client/petstore/java/feign/pom.xml
@@ -192,6 +192,13 @@
             <version>${swagger-annotations-version}</version>
         </dependency>
 
+        <!-- @Nullable annotation -->
+        <dependency>
+            <groupId>com.google.code.findbugs</groupId>
+            <artifactId>jsr305</artifactId>
+            <version>3.0.2</version>
+        </dependency>
+        
         <!-- HTTP client: Netflix Feign -->
         <dependency>
             <groupId>io.github.openfeign</groupId>
diff --git a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/AdditionalPropertiesAnyType.java b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/AdditionalPropertiesAnyType.java
index d223a661f8..1abb2d8a64 100644
--- a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/AdditionalPropertiesAnyType.java
+++ b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/AdditionalPropertiesAnyType.java
@@ -40,6 +40,7 @@ public class AdditionalPropertiesAnyType extends HashMap<String, Object> {
    * Get name
    * @return name
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getName() {
     return name;
diff --git a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/AdditionalPropertiesArray.java b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/AdditionalPropertiesArray.java
index db738129d0..1821c243e1 100644
--- a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/AdditionalPropertiesArray.java
+++ b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/AdditionalPropertiesArray.java
@@ -41,6 +41,7 @@ public class AdditionalPropertiesArray extends HashMap<String, List> {
    * Get name
    * @return name
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getName() {
     return name;
diff --git a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/AdditionalPropertiesBoolean.java b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/AdditionalPropertiesBoolean.java
index 754ff32555..78f7ac79b2 100644
--- a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/AdditionalPropertiesBoolean.java
+++ b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/AdditionalPropertiesBoolean.java
@@ -40,6 +40,7 @@ public class AdditionalPropertiesBoolean extends HashMap<String, Boolean> {
    * Get name
    * @return name
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getName() {
     return name;
diff --git a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java
index 2de7a27185..406bccc278 100644
--- a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java
+++ b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java
@@ -80,6 +80,7 @@ public class AdditionalPropertiesClass {
    * Get mapString
    * @return mapString
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Map<String, String> getMapString() {
     return mapString;
@@ -106,6 +107,7 @@ public class AdditionalPropertiesClass {
    * Get mapNumber
    * @return mapNumber
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Map<String, BigDecimal> getMapNumber() {
     return mapNumber;
@@ -132,6 +134,7 @@ public class AdditionalPropertiesClass {
    * Get mapInteger
    * @return mapInteger
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Map<String, Integer> getMapInteger() {
     return mapInteger;
@@ -158,6 +161,7 @@ public class AdditionalPropertiesClass {
    * Get mapBoolean
    * @return mapBoolean
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Map<String, Boolean> getMapBoolean() {
     return mapBoolean;
@@ -184,6 +188,7 @@ public class AdditionalPropertiesClass {
    * Get mapArrayInteger
    * @return mapArrayInteger
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Map<String, List<Integer>> getMapArrayInteger() {
     return mapArrayInteger;
@@ -210,6 +215,7 @@ public class AdditionalPropertiesClass {
    * Get mapArrayAnytype
    * @return mapArrayAnytype
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Map<String, List<Object>> getMapArrayAnytype() {
     return mapArrayAnytype;
@@ -236,6 +242,7 @@ public class AdditionalPropertiesClass {
    * Get mapMapString
    * @return mapMapString
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Map<String, Map<String, String>> getMapMapString() {
     return mapMapString;
@@ -262,6 +269,7 @@ public class AdditionalPropertiesClass {
    * Get mapMapAnytype
    * @return mapMapAnytype
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Map<String, Map<String, Object>> getMapMapAnytype() {
     return mapMapAnytype;
@@ -280,6 +288,7 @@ public class AdditionalPropertiesClass {
    * Get anytype1
    * @return anytype1
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Object getAnytype1() {
     return anytype1;
@@ -298,6 +307,7 @@ public class AdditionalPropertiesClass {
    * Get anytype2
    * @return anytype2
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Object getAnytype2() {
     return anytype2;
@@ -316,6 +326,7 @@ public class AdditionalPropertiesClass {
    * Get anytype3
    * @return anytype3
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Object getAnytype3() {
     return anytype3;
diff --git a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/AdditionalPropertiesInteger.java b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/AdditionalPropertiesInteger.java
index 1f61976466..6e5159d404 100644
--- a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/AdditionalPropertiesInteger.java
+++ b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/AdditionalPropertiesInteger.java
@@ -40,6 +40,7 @@ public class AdditionalPropertiesInteger extends HashMap<String, Integer> {
    * Get name
    * @return name
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getName() {
     return name;
diff --git a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/AdditionalPropertiesNumber.java b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/AdditionalPropertiesNumber.java
index 474d7b8f04..ddc8146dea 100644
--- a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/AdditionalPropertiesNumber.java
+++ b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/AdditionalPropertiesNumber.java
@@ -41,6 +41,7 @@ public class AdditionalPropertiesNumber extends HashMap<String, BigDecimal> {
    * Get name
    * @return name
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getName() {
     return name;
diff --git a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/AdditionalPropertiesObject.java b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/AdditionalPropertiesObject.java
index 40ff424fe4..cc29400029 100644
--- a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/AdditionalPropertiesObject.java
+++ b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/AdditionalPropertiesObject.java
@@ -40,6 +40,7 @@ public class AdditionalPropertiesObject extends HashMap<String, Map> {
    * Get name
    * @return name
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getName() {
     return name;
diff --git a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/AdditionalPropertiesString.java b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/AdditionalPropertiesString.java
index eeaedf3bda..fb3368dfed 100644
--- a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/AdditionalPropertiesString.java
+++ b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/AdditionalPropertiesString.java
@@ -40,6 +40,7 @@ public class AdditionalPropertiesString extends HashMap<String, String> {
    * Get name
    * @return name
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getName() {
     return name;
diff --git a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/Animal.java b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/Animal.java
index f210737e12..53a0eec339 100644
--- a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/Animal.java
+++ b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/Animal.java
@@ -49,6 +49,7 @@ public class Animal {
    * Get className
    * @return className
   **/
+
   @ApiModelProperty(required = true, value = "")
   public String getClassName() {
     return className;
@@ -67,6 +68,7 @@ public class Animal {
    * Get color
    * @return color
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getColor() {
     return color;
diff --git a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java
index f5c02b2326..de49df3fbd 100644
--- a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java
+++ b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java
@@ -49,6 +49,7 @@ public class ArrayOfArrayOfNumberOnly {
    * Get arrayArrayNumber
    * @return arrayArrayNumber
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public List<List<BigDecimal>> getArrayArrayNumber() {
     return arrayArrayNumber;
diff --git a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java
index 2dcfdf3c78..f4399ff42d 100644
--- a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java
+++ b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java
@@ -49,6 +49,7 @@ public class ArrayOfNumberOnly {
    * Get arrayNumber
    * @return arrayNumber
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public List<BigDecimal> getArrayNumber() {
     return arrayNumber;
diff --git a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/ArrayTest.java b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/ArrayTest.java
index 0778fc2d8f..7483fa96ce 100644
--- a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/ArrayTest.java
+++ b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/ArrayTest.java
@@ -55,6 +55,7 @@ public class ArrayTest {
    * Get arrayOfString
    * @return arrayOfString
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public List<String> getArrayOfString() {
     return arrayOfString;
@@ -81,6 +82,7 @@ public class ArrayTest {
    * Get arrayArrayOfInteger
    * @return arrayArrayOfInteger
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public List<List<Long>> getArrayArrayOfInteger() {
     return arrayArrayOfInteger;
@@ -107,6 +109,7 @@ public class ArrayTest {
    * Get arrayArrayOfModel
    * @return arrayArrayOfModel
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public List<List<ReadOnlyFirst>> getArrayArrayOfModel() {
     return arrayArrayOfModel;
diff --git a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/Capitalization.java b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/Capitalization.java
index cedbd8c9db..bb83be97fe 100644
--- a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/Capitalization.java
+++ b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/Capitalization.java
@@ -53,6 +53,7 @@ public class Capitalization {
    * Get smallCamel
    * @return smallCamel
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getSmallCamel() {
     return smallCamel;
@@ -71,6 +72,7 @@ public class Capitalization {
    * Get capitalCamel
    * @return capitalCamel
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getCapitalCamel() {
     return capitalCamel;
@@ -89,6 +91,7 @@ public class Capitalization {
    * Get smallSnake
    * @return smallSnake
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getSmallSnake() {
     return smallSnake;
@@ -107,6 +110,7 @@ public class Capitalization {
    * Get capitalSnake
    * @return capitalSnake
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getCapitalSnake() {
     return capitalSnake;
@@ -125,6 +129,7 @@ public class Capitalization {
    * Get scAETHFlowPoints
    * @return scAETHFlowPoints
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getScAETHFlowPoints() {
     return scAETHFlowPoints;
@@ -143,6 +148,7 @@ public class Capitalization {
    * Name of the pet 
    * @return ATT_NAME
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "Name of the pet ")
   public String getATTNAME() {
     return ATT_NAME;
diff --git a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/Cat.java b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/Cat.java
index 91cffa9f32..6992ec21ca 100644
--- a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/Cat.java
+++ b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/Cat.java
@@ -40,6 +40,7 @@ public class Cat extends Animal {
    * Get declawed
    * @return declawed
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Boolean isDeclawed() {
     return declawed;
diff --git a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/CatAllOf.java b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/CatAllOf.java
index 93f6f6d59c..0a5eed53e7 100644
--- a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/CatAllOf.java
+++ b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/CatAllOf.java
@@ -38,6 +38,7 @@ public class CatAllOf {
    * Get declawed
    * @return declawed
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Boolean isDeclawed() {
     return declawed;
diff --git a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/Category.java b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/Category.java
index baf44c948a..03efdd4be8 100644
--- a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/Category.java
+++ b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/Category.java
@@ -41,6 +41,7 @@ public class Category {
    * Get id
    * @return id
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Long getId() {
     return id;
@@ -59,6 +60,7 @@ public class Category {
    * Get name
    * @return name
   **/
+
   @ApiModelProperty(required = true, value = "")
   public String getName() {
     return name;
diff --git a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/ClassModel.java b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/ClassModel.java
index 0904f531de..def421a670 100644
--- a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/ClassModel.java
+++ b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/ClassModel.java
@@ -39,6 +39,7 @@ public class ClassModel {
    * Get propertyClass
    * @return propertyClass
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getPropertyClass() {
     return propertyClass;
diff --git a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/Client.java b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/Client.java
index 9ebcc7294e..c0bd0743e5 100644
--- a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/Client.java
+++ b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/Client.java
@@ -38,6 +38,7 @@ public class Client {
    * Get client
    * @return client
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getClient() {
     return client;
diff --git a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/Dog.java b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/Dog.java
index 3b1c570cb4..6b79c59606 100644
--- a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/Dog.java
+++ b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/Dog.java
@@ -40,6 +40,7 @@ public class Dog extends Animal {
    * Get breed
    * @return breed
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getBreed() {
     return breed;
diff --git a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/DogAllOf.java b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/DogAllOf.java
index cb95a6a372..1a4496d8f0 100644
--- a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/DogAllOf.java
+++ b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/DogAllOf.java
@@ -38,6 +38,7 @@ public class DogAllOf {
    * Get breed
    * @return breed
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getBreed() {
     return breed;
diff --git a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/EnumArrays.java b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/EnumArrays.java
index cb8d45860a..40e31bf3ca 100644
--- a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/EnumArrays.java
+++ b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/EnumArrays.java
@@ -113,6 +113,7 @@ public class EnumArrays {
    * Get justSymbol
    * @return justSymbol
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public JustSymbolEnum getJustSymbol() {
     return justSymbol;
@@ -139,6 +140,7 @@ public class EnumArrays {
    * Get arrayEnum
    * @return arrayEnum
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public List<ArrayEnumEnum> getArrayEnum() {
     return arrayEnum;
diff --git a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/EnumTest.java b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/EnumTest.java
index bdf61d52c9..d4b36798ee 100644
--- a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/EnumTest.java
+++ b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/EnumTest.java
@@ -195,6 +195,7 @@ public class EnumTest {
    * Get enumString
    * @return enumString
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public EnumStringEnum getEnumString() {
     return enumString;
@@ -213,6 +214,7 @@ public class EnumTest {
    * Get enumStringRequired
    * @return enumStringRequired
   **/
+
   @ApiModelProperty(required = true, value = "")
   public EnumStringRequiredEnum getEnumStringRequired() {
     return enumStringRequired;
@@ -231,6 +233,7 @@ public class EnumTest {
    * Get enumInteger
    * @return enumInteger
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public EnumIntegerEnum getEnumInteger() {
     return enumInteger;
@@ -249,6 +252,7 @@ public class EnumTest {
    * Get enumNumber
    * @return enumNumber
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public EnumNumberEnum getEnumNumber() {
     return enumNumber;
@@ -267,6 +271,7 @@ public class EnumTest {
    * Get outerEnum
    * @return outerEnum
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public OuterEnum getOuterEnum() {
     return outerEnum;
diff --git a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java
index 326b1a90a3..bee77a8cec 100644
--- a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java
+++ b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java
@@ -43,6 +43,7 @@ public class FileSchemaTestClass {
    * Get file
    * @return file
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public java.io.File getFile() {
     return file;
@@ -69,6 +70,7 @@ public class FileSchemaTestClass {
    * Get files
    * @return files
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public List<java.io.File> getFiles() {
     return files;
diff --git a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/FormatTest.java b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/FormatTest.java
index dd1c2d2f58..c017f57a80 100644
--- a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/FormatTest.java
+++ b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/FormatTest.java
@@ -81,6 +81,7 @@ public class FormatTest {
    * maximum: 100
    * @return integer
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Integer getInteger() {
     return integer;
@@ -101,6 +102,7 @@ public class FormatTest {
    * maximum: 200
    * @return int32
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Integer getInt32() {
     return int32;
@@ -119,6 +121,7 @@ public class FormatTest {
    * Get int64
    * @return int64
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Long getInt64() {
     return int64;
@@ -139,6 +142,7 @@ public class FormatTest {
    * maximum: 543.2
    * @return number
   **/
+
   @ApiModelProperty(required = true, value = "")
   public BigDecimal getNumber() {
     return number;
@@ -159,6 +163,7 @@ public class FormatTest {
    * maximum: 987.6
    * @return _float
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Float getFloat() {
     return _float;
@@ -179,6 +184,7 @@ public class FormatTest {
    * maximum: 123.4
    * @return _double
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Double getDouble() {
     return _double;
@@ -197,6 +203,7 @@ public class FormatTest {
    * Get string
    * @return string
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getString() {
     return string;
@@ -215,6 +222,7 @@ public class FormatTest {
    * Get _byte
    * @return _byte
   **/
+
   @ApiModelProperty(required = true, value = "")
   public byte[] getByte() {
     return _byte;
@@ -233,6 +241,7 @@ public class FormatTest {
    * Get binary
    * @return binary
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public File getBinary() {
     return binary;
@@ -251,6 +260,7 @@ public class FormatTest {
    * Get date
    * @return date
   **/
+
   @ApiModelProperty(required = true, value = "")
   public LocalDate getDate() {
     return date;
@@ -269,6 +279,7 @@ public class FormatTest {
    * Get dateTime
    * @return dateTime
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public OffsetDateTime getDateTime() {
     return dateTime;
@@ -287,6 +298,7 @@ public class FormatTest {
    * Get uuid
    * @return uuid
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(example = "72f98069-206d-4f12-9f12-3d1e525a8e84", value = "")
   public UUID getUuid() {
     return uuid;
@@ -305,6 +317,7 @@ public class FormatTest {
    * Get password
    * @return password
   **/
+
   @ApiModelProperty(required = true, value = "")
   public String getPassword() {
     return password;
diff --git a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java
index 4dbede6b7d..44159e08e8 100644
--- a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java
+++ b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java
@@ -36,6 +36,7 @@ public class HasOnlyReadOnly {
    * Get bar
    * @return bar
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getBar() {
     return bar;
@@ -45,6 +46,7 @@ public class HasOnlyReadOnly {
    * Get foo
    * @return foo
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getFoo() {
     return foo;
diff --git a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/MapTest.java b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/MapTest.java
index 625b6be97d..a7a141bb9b 100644
--- a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/MapTest.java
+++ b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/MapTest.java
@@ -93,6 +93,7 @@ public class MapTest {
    * Get mapMapOfString
    * @return mapMapOfString
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Map<String, Map<String, String>> getMapMapOfString() {
     return mapMapOfString;
@@ -119,6 +120,7 @@ public class MapTest {
    * Get mapOfEnumString
    * @return mapOfEnumString
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Map<String, InnerEnum> getMapOfEnumString() {
     return mapOfEnumString;
@@ -145,6 +147,7 @@ public class MapTest {
    * Get directMap
    * @return directMap
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Map<String, Boolean> getDirectMap() {
     return directMap;
@@ -171,6 +174,7 @@ public class MapTest {
    * Get indirectMap
    * @return indirectMap
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Map<String, Boolean> getIndirectMap() {
     return indirectMap;
diff --git a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java
index 0adbe0caa7..ea930e3e2e 100644
--- a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java
+++ b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java
@@ -50,6 +50,7 @@ public class MixedPropertiesAndAdditionalPropertiesClass {
    * Get uuid
    * @return uuid
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public UUID getUuid() {
     return uuid;
@@ -68,6 +69,7 @@ public class MixedPropertiesAndAdditionalPropertiesClass {
    * Get dateTime
    * @return dateTime
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public OffsetDateTime getDateTime() {
     return dateTime;
@@ -94,6 +96,7 @@ public class MixedPropertiesAndAdditionalPropertiesClass {
    * Get map
    * @return map
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Map<String, Animal> getMap() {
     return map;
diff --git a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/Model200Response.java b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/Model200Response.java
index 3be60ea3ae..bd3244dd57 100644
--- a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/Model200Response.java
+++ b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/Model200Response.java
@@ -42,6 +42,7 @@ public class Model200Response {
    * Get name
    * @return name
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Integer getName() {
     return name;
@@ -60,6 +61,7 @@ public class Model200Response {
    * Get propertyClass
    * @return propertyClass
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getPropertyClass() {
     return propertyClass;
diff --git a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/ModelApiResponse.java b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/ModelApiResponse.java
index 6e458e38dc..ed335cdca1 100644
--- a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/ModelApiResponse.java
+++ b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/ModelApiResponse.java
@@ -44,6 +44,7 @@ public class ModelApiResponse {
    * Get code
    * @return code
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Integer getCode() {
     return code;
@@ -62,6 +63,7 @@ public class ModelApiResponse {
    * Get type
    * @return type
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getType() {
     return type;
@@ -80,6 +82,7 @@ public class ModelApiResponse {
    * Get message
    * @return message
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getMessage() {
     return message;
diff --git a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/ModelReturn.java b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/ModelReturn.java
index 62e5295212..04c0bcd33f 100644
--- a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/ModelReturn.java
+++ b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/ModelReturn.java
@@ -39,6 +39,7 @@ public class ModelReturn {
    * Get _return
    * @return _return
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Integer getReturn() {
     return _return;
diff --git a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/Name.java b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/Name.java
index 852a999035..af27c6e45f 100644
--- a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/Name.java
+++ b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/Name.java
@@ -48,6 +48,7 @@ public class Name {
    * Get name
    * @return name
   **/
+
   @ApiModelProperty(required = true, value = "")
   public Integer getName() {
     return name;
@@ -61,6 +62,7 @@ public class Name {
    * Get snakeCase
    * @return snakeCase
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Integer getSnakeCase() {
     return snakeCase;
@@ -75,6 +77,7 @@ public class Name {
    * Get property
    * @return property
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getProperty() {
     return property;
@@ -88,6 +91,7 @@ public class Name {
    * Get _123number
    * @return _123number
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Integer get123number() {
     return _123number;
diff --git a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/NumberOnly.java b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/NumberOnly.java
index 530a4d5818..4e29c814cc 100644
--- a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/NumberOnly.java
+++ b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/NumberOnly.java
@@ -39,6 +39,7 @@ public class NumberOnly {
    * Get justNumber
    * @return justNumber
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public BigDecimal getJustNumber() {
     return justNumber;
diff --git a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/Order.java b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/Order.java
index 7e705c58a2..7867042746 100644
--- a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/Order.java
+++ b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/Order.java
@@ -91,6 +91,7 @@ public class Order {
    * Get id
    * @return id
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Long getId() {
     return id;
@@ -109,6 +110,7 @@ public class Order {
    * Get petId
    * @return petId
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Long getPetId() {
     return petId;
@@ -127,6 +129,7 @@ public class Order {
    * Get quantity
    * @return quantity
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Integer getQuantity() {
     return quantity;
@@ -145,6 +148,7 @@ public class Order {
    * Get shipDate
    * @return shipDate
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public OffsetDateTime getShipDate() {
     return shipDate;
@@ -163,6 +167,7 @@ public class Order {
    * Order Status
    * @return status
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "Order Status")
   public StatusEnum getStatus() {
     return status;
@@ -181,6 +186,7 @@ public class Order {
    * Get complete
    * @return complete
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Boolean isComplete() {
     return complete;
diff --git a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/OuterComposite.java b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/OuterComposite.java
index 3a99006820..b075f7395a 100644
--- a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/OuterComposite.java
+++ b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/OuterComposite.java
@@ -45,6 +45,7 @@ public class OuterComposite {
    * Get myNumber
    * @return myNumber
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public BigDecimal getMyNumber() {
     return myNumber;
@@ -63,6 +64,7 @@ public class OuterComposite {
    * Get myString
    * @return myString
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getMyString() {
     return myString;
@@ -81,6 +83,7 @@ public class OuterComposite {
    * Get myBoolean
    * @return myBoolean
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Boolean isMyBoolean() {
     return myBoolean;
diff --git a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/Pet.java b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/Pet.java
index 8a2408a296..63e9b4ff5d 100644
--- a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/Pet.java
+++ b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/Pet.java
@@ -94,6 +94,7 @@ public class Pet {
    * Get id
    * @return id
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Long getId() {
     return id;
@@ -112,6 +113,7 @@ public class Pet {
    * Get category
    * @return category
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Category getCategory() {
     return category;
@@ -130,6 +132,7 @@ public class Pet {
    * Get name
    * @return name
   **/
+
   @ApiModelProperty(example = "doggie", required = true, value = "")
   public String getName() {
     return name;
@@ -153,6 +156,7 @@ public class Pet {
    * Get photoUrls
    * @return photoUrls
   **/
+
   @ApiModelProperty(required = true, value = "")
   public List<String> getPhotoUrls() {
     return photoUrls;
@@ -179,6 +183,7 @@ public class Pet {
    * Get tags
    * @return tags
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public List<Tag> getTags() {
     return tags;
@@ -197,6 +202,7 @@ public class Pet {
    * pet status in the store
    * @return status
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "pet status in the store")
   public StatusEnum getStatus() {
     return status;
diff --git a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/ReadOnlyFirst.java b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/ReadOnlyFirst.java
index 83f25c7923..a2c9e99699 100644
--- a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/ReadOnlyFirst.java
+++ b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/ReadOnlyFirst.java
@@ -36,6 +36,7 @@ public class ReadOnlyFirst {
    * Get bar
    * @return bar
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getBar() {
     return bar;
@@ -50,6 +51,7 @@ public class ReadOnlyFirst {
    * Get baz
    * @return baz
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getBaz() {
     return baz;
diff --git a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/SpecialModelName.java b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/SpecialModelName.java
index 5abfc132ad..a5ddb0b638 100644
--- a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/SpecialModelName.java
+++ b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/SpecialModelName.java
@@ -38,6 +38,7 @@ public class SpecialModelName {
    * Get $specialPropertyName
    * @return $specialPropertyName
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Long get$SpecialPropertyName() {
     return $specialPropertyName;
diff --git a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/Tag.java b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/Tag.java
index e2e947b84a..8255ad8298 100644
--- a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/Tag.java
+++ b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/Tag.java
@@ -41,6 +41,7 @@ public class Tag {
    * Get id
    * @return id
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Long getId() {
     return id;
@@ -59,6 +60,7 @@ public class Tag {
    * Get name
    * @return name
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getName() {
     return name;
diff --git a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/TypeHolderDefault.java b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/TypeHolderDefault.java
index c7988712cc..04a11d85a5 100644
--- a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/TypeHolderDefault.java
+++ b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/TypeHolderDefault.java
@@ -53,6 +53,7 @@ public class TypeHolderDefault {
    * Get stringItem
    * @return stringItem
   **/
+
   @ApiModelProperty(required = true, value = "")
   public String getStringItem() {
     return stringItem;
@@ -71,6 +72,7 @@ public class TypeHolderDefault {
    * Get numberItem
    * @return numberItem
   **/
+
   @ApiModelProperty(required = true, value = "")
   public BigDecimal getNumberItem() {
     return numberItem;
@@ -89,6 +91,7 @@ public class TypeHolderDefault {
    * Get integerItem
    * @return integerItem
   **/
+
   @ApiModelProperty(required = true, value = "")
   public Integer getIntegerItem() {
     return integerItem;
@@ -107,6 +110,7 @@ public class TypeHolderDefault {
    * Get boolItem
    * @return boolItem
   **/
+
   @ApiModelProperty(required = true, value = "")
   public Boolean isBoolItem() {
     return boolItem;
@@ -130,6 +134,7 @@ public class TypeHolderDefault {
    * Get arrayItem
    * @return arrayItem
   **/
+
   @ApiModelProperty(required = true, value = "")
   public List<Integer> getArrayItem() {
     return arrayItem;
diff --git a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/TypeHolderExample.java b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/TypeHolderExample.java
index cca1c01efd..a9bf8de899 100644
--- a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/TypeHolderExample.java
+++ b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/TypeHolderExample.java
@@ -53,6 +53,7 @@ public class TypeHolderExample {
    * Get stringItem
    * @return stringItem
   **/
+
   @ApiModelProperty(example = "what", required = true, value = "")
   public String getStringItem() {
     return stringItem;
@@ -71,6 +72,7 @@ public class TypeHolderExample {
    * Get numberItem
    * @return numberItem
   **/
+
   @ApiModelProperty(example = "1.234", required = true, value = "")
   public BigDecimal getNumberItem() {
     return numberItem;
@@ -89,6 +91,7 @@ public class TypeHolderExample {
    * Get integerItem
    * @return integerItem
   **/
+
   @ApiModelProperty(example = "-2", required = true, value = "")
   public Integer getIntegerItem() {
     return integerItem;
@@ -107,6 +110,7 @@ public class TypeHolderExample {
    * Get boolItem
    * @return boolItem
   **/
+
   @ApiModelProperty(example = "true", required = true, value = "")
   public Boolean isBoolItem() {
     return boolItem;
@@ -130,6 +134,7 @@ public class TypeHolderExample {
    * Get arrayItem
    * @return arrayItem
   **/
+
   @ApiModelProperty(example = "[0, 1, 2, 3]", required = true, value = "")
   public List<Integer> getArrayItem() {
     return arrayItem;
diff --git a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/User.java b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/User.java
index ee3f656a1a..6e6c4ac102 100644
--- a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/User.java
+++ b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/User.java
@@ -59,6 +59,7 @@ public class User {
    * Get id
    * @return id
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Long getId() {
     return id;
@@ -77,6 +78,7 @@ public class User {
    * Get username
    * @return username
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getUsername() {
     return username;
@@ -95,6 +97,7 @@ public class User {
    * Get firstName
    * @return firstName
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getFirstName() {
     return firstName;
@@ -113,6 +116,7 @@ public class User {
    * Get lastName
    * @return lastName
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getLastName() {
     return lastName;
@@ -131,6 +135,7 @@ public class User {
    * Get email
    * @return email
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getEmail() {
     return email;
@@ -149,6 +154,7 @@ public class User {
    * Get password
    * @return password
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getPassword() {
     return password;
@@ -167,6 +173,7 @@ public class User {
    * Get phone
    * @return phone
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getPhone() {
     return phone;
@@ -185,6 +192,7 @@ public class User {
    * User Status
    * @return userStatus
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "User Status")
   public Integer getUserStatus() {
     return userStatus;
diff --git a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/XmlItem.java b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/XmlItem.java
index 85c9dc3eb4..2665c57a91 100644
--- a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/XmlItem.java
+++ b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/XmlItem.java
@@ -125,6 +125,7 @@ public class XmlItem {
    * Get attributeString
    * @return attributeString
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(example = "string", value = "")
   public String getAttributeString() {
     return attributeString;
@@ -143,6 +144,7 @@ public class XmlItem {
    * Get attributeNumber
    * @return attributeNumber
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(example = "1.234", value = "")
   public BigDecimal getAttributeNumber() {
     return attributeNumber;
@@ -161,6 +163,7 @@ public class XmlItem {
    * Get attributeInteger
    * @return attributeInteger
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(example = "-2", value = "")
   public Integer getAttributeInteger() {
     return attributeInteger;
@@ -179,6 +182,7 @@ public class XmlItem {
    * Get attributeBoolean
    * @return attributeBoolean
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(example = "true", value = "")
   public Boolean isAttributeBoolean() {
     return attributeBoolean;
@@ -205,6 +209,7 @@ public class XmlItem {
    * Get wrappedArray
    * @return wrappedArray
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public List<Integer> getWrappedArray() {
     return wrappedArray;
@@ -223,6 +228,7 @@ public class XmlItem {
    * Get nameString
    * @return nameString
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(example = "string", value = "")
   public String getNameString() {
     return nameString;
@@ -241,6 +247,7 @@ public class XmlItem {
    * Get nameNumber
    * @return nameNumber
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(example = "1.234", value = "")
   public BigDecimal getNameNumber() {
     return nameNumber;
@@ -259,6 +266,7 @@ public class XmlItem {
    * Get nameInteger
    * @return nameInteger
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(example = "-2", value = "")
   public Integer getNameInteger() {
     return nameInteger;
@@ -277,6 +285,7 @@ public class XmlItem {
    * Get nameBoolean
    * @return nameBoolean
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(example = "true", value = "")
   public Boolean isNameBoolean() {
     return nameBoolean;
@@ -303,6 +312,7 @@ public class XmlItem {
    * Get nameArray
    * @return nameArray
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public List<Integer> getNameArray() {
     return nameArray;
@@ -329,6 +339,7 @@ public class XmlItem {
    * Get nameWrappedArray
    * @return nameWrappedArray
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public List<Integer> getNameWrappedArray() {
     return nameWrappedArray;
@@ -347,6 +358,7 @@ public class XmlItem {
    * Get prefixString
    * @return prefixString
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(example = "string", value = "")
   public String getPrefixString() {
     return prefixString;
@@ -365,6 +377,7 @@ public class XmlItem {
    * Get prefixNumber
    * @return prefixNumber
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(example = "1.234", value = "")
   public BigDecimal getPrefixNumber() {
     return prefixNumber;
@@ -383,6 +396,7 @@ public class XmlItem {
    * Get prefixInteger
    * @return prefixInteger
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(example = "-2", value = "")
   public Integer getPrefixInteger() {
     return prefixInteger;
@@ -401,6 +415,7 @@ public class XmlItem {
    * Get prefixBoolean
    * @return prefixBoolean
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(example = "true", value = "")
   public Boolean isPrefixBoolean() {
     return prefixBoolean;
@@ -427,6 +442,7 @@ public class XmlItem {
    * Get prefixArray
    * @return prefixArray
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public List<Integer> getPrefixArray() {
     return prefixArray;
@@ -453,6 +469,7 @@ public class XmlItem {
    * Get prefixWrappedArray
    * @return prefixWrappedArray
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public List<Integer> getPrefixWrappedArray() {
     return prefixWrappedArray;
@@ -471,6 +488,7 @@ public class XmlItem {
    * Get namespaceString
    * @return namespaceString
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(example = "string", value = "")
   public String getNamespaceString() {
     return namespaceString;
@@ -489,6 +507,7 @@ public class XmlItem {
    * Get namespaceNumber
    * @return namespaceNumber
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(example = "1.234", value = "")
   public BigDecimal getNamespaceNumber() {
     return namespaceNumber;
@@ -507,6 +526,7 @@ public class XmlItem {
    * Get namespaceInteger
    * @return namespaceInteger
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(example = "-2", value = "")
   public Integer getNamespaceInteger() {
     return namespaceInteger;
@@ -525,6 +545,7 @@ public class XmlItem {
    * Get namespaceBoolean
    * @return namespaceBoolean
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(example = "true", value = "")
   public Boolean isNamespaceBoolean() {
     return namespaceBoolean;
@@ -551,6 +572,7 @@ public class XmlItem {
    * Get namespaceArray
    * @return namespaceArray
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public List<Integer> getNamespaceArray() {
     return namespaceArray;
@@ -577,6 +599,7 @@ public class XmlItem {
    * Get namespaceWrappedArray
    * @return namespaceWrappedArray
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public List<Integer> getNamespaceWrappedArray() {
     return namespaceWrappedArray;
@@ -595,6 +618,7 @@ public class XmlItem {
    * Get prefixNsString
    * @return prefixNsString
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(example = "string", value = "")
   public String getPrefixNsString() {
     return prefixNsString;
@@ -613,6 +637,7 @@ public class XmlItem {
    * Get prefixNsNumber
    * @return prefixNsNumber
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(example = "1.234", value = "")
   public BigDecimal getPrefixNsNumber() {
     return prefixNsNumber;
@@ -631,6 +656,7 @@ public class XmlItem {
    * Get prefixNsInteger
    * @return prefixNsInteger
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(example = "-2", value = "")
   public Integer getPrefixNsInteger() {
     return prefixNsInteger;
@@ -649,6 +675,7 @@ public class XmlItem {
    * Get prefixNsBoolean
    * @return prefixNsBoolean
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(example = "true", value = "")
   public Boolean isPrefixNsBoolean() {
     return prefixNsBoolean;
@@ -675,6 +702,7 @@ public class XmlItem {
    * Get prefixNsArray
    * @return prefixNsArray
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public List<Integer> getPrefixNsArray() {
     return prefixNsArray;
@@ -701,6 +729,7 @@ public class XmlItem {
    * Get prefixNsWrappedArray
    * @return prefixNsWrappedArray
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public List<Integer> getPrefixNsWrappedArray() {
     return prefixNsWrappedArray;
diff --git a/samples/client/petstore/java/feign10x/build.gradle b/samples/client/petstore/java/feign10x/build.gradle
index 6eaeb4b872..39c2746905 100644
--- a/samples/client/petstore/java/feign10x/build.gradle
+++ b/samples/client/petstore/java/feign10x/build.gradle
@@ -107,6 +107,7 @@ ext {
 
 dependencies {
     compile "io.swagger:swagger-annotations:$swagger_annotations_version"
+    compile "com.google.code.findbugs:jsr305:3.0.2"
     compile "io.github.openfeign:feign-core:$feign_version"
     compile "io.github.openfeign:feign-jackson:$feign_version"
     compile "io.github.openfeign:feign-slf4j:$feign_version"
diff --git a/samples/client/petstore/java/feign10x/pom.xml b/samples/client/petstore/java/feign10x/pom.xml
index 7f402f8e0e..0bf621890f 100644
--- a/samples/client/petstore/java/feign10x/pom.xml
+++ b/samples/client/petstore/java/feign10x/pom.xml
@@ -192,6 +192,13 @@
             <version>${swagger-annotations-version}</version>
         </dependency>
 
+        <!-- @Nullable annotation -->
+        <dependency>
+            <groupId>com.google.code.findbugs</groupId>
+            <artifactId>jsr305</artifactId>
+            <version>3.0.2</version>
+        </dependency>
+        
         <!-- HTTP client: Netflix Feign -->
         <dependency>
             <groupId>io.github.openfeign</groupId>
diff --git a/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/AdditionalPropertiesAnyType.java b/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/AdditionalPropertiesAnyType.java
index d223a661f8..1abb2d8a64 100644
--- a/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/AdditionalPropertiesAnyType.java
+++ b/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/AdditionalPropertiesAnyType.java
@@ -40,6 +40,7 @@ public class AdditionalPropertiesAnyType extends HashMap<String, Object> {
    * Get name
    * @return name
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getName() {
     return name;
diff --git a/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/AdditionalPropertiesArray.java b/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/AdditionalPropertiesArray.java
index db738129d0..1821c243e1 100644
--- a/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/AdditionalPropertiesArray.java
+++ b/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/AdditionalPropertiesArray.java
@@ -41,6 +41,7 @@ public class AdditionalPropertiesArray extends HashMap<String, List> {
    * Get name
    * @return name
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getName() {
     return name;
diff --git a/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/AdditionalPropertiesBoolean.java b/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/AdditionalPropertiesBoolean.java
index 754ff32555..78f7ac79b2 100644
--- a/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/AdditionalPropertiesBoolean.java
+++ b/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/AdditionalPropertiesBoolean.java
@@ -40,6 +40,7 @@ public class AdditionalPropertiesBoolean extends HashMap<String, Boolean> {
    * Get name
    * @return name
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getName() {
     return name;
diff --git a/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java b/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java
index 2de7a27185..406bccc278 100644
--- a/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java
+++ b/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java
@@ -80,6 +80,7 @@ public class AdditionalPropertiesClass {
    * Get mapString
    * @return mapString
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Map<String, String> getMapString() {
     return mapString;
@@ -106,6 +107,7 @@ public class AdditionalPropertiesClass {
    * Get mapNumber
    * @return mapNumber
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Map<String, BigDecimal> getMapNumber() {
     return mapNumber;
@@ -132,6 +134,7 @@ public class AdditionalPropertiesClass {
    * Get mapInteger
    * @return mapInteger
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Map<String, Integer> getMapInteger() {
     return mapInteger;
@@ -158,6 +161,7 @@ public class AdditionalPropertiesClass {
    * Get mapBoolean
    * @return mapBoolean
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Map<String, Boolean> getMapBoolean() {
     return mapBoolean;
@@ -184,6 +188,7 @@ public class AdditionalPropertiesClass {
    * Get mapArrayInteger
    * @return mapArrayInteger
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Map<String, List<Integer>> getMapArrayInteger() {
     return mapArrayInteger;
@@ -210,6 +215,7 @@ public class AdditionalPropertiesClass {
    * Get mapArrayAnytype
    * @return mapArrayAnytype
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Map<String, List<Object>> getMapArrayAnytype() {
     return mapArrayAnytype;
@@ -236,6 +242,7 @@ public class AdditionalPropertiesClass {
    * Get mapMapString
    * @return mapMapString
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Map<String, Map<String, String>> getMapMapString() {
     return mapMapString;
@@ -262,6 +269,7 @@ public class AdditionalPropertiesClass {
    * Get mapMapAnytype
    * @return mapMapAnytype
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Map<String, Map<String, Object>> getMapMapAnytype() {
     return mapMapAnytype;
@@ -280,6 +288,7 @@ public class AdditionalPropertiesClass {
    * Get anytype1
    * @return anytype1
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Object getAnytype1() {
     return anytype1;
@@ -298,6 +307,7 @@ public class AdditionalPropertiesClass {
    * Get anytype2
    * @return anytype2
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Object getAnytype2() {
     return anytype2;
@@ -316,6 +326,7 @@ public class AdditionalPropertiesClass {
    * Get anytype3
    * @return anytype3
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Object getAnytype3() {
     return anytype3;
diff --git a/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/AdditionalPropertiesInteger.java b/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/AdditionalPropertiesInteger.java
index 1f61976466..6e5159d404 100644
--- a/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/AdditionalPropertiesInteger.java
+++ b/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/AdditionalPropertiesInteger.java
@@ -40,6 +40,7 @@ public class AdditionalPropertiesInteger extends HashMap<String, Integer> {
    * Get name
    * @return name
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getName() {
     return name;
diff --git a/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/AdditionalPropertiesNumber.java b/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/AdditionalPropertiesNumber.java
index 474d7b8f04..ddc8146dea 100644
--- a/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/AdditionalPropertiesNumber.java
+++ b/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/AdditionalPropertiesNumber.java
@@ -41,6 +41,7 @@ public class AdditionalPropertiesNumber extends HashMap<String, BigDecimal> {
    * Get name
    * @return name
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getName() {
     return name;
diff --git a/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/AdditionalPropertiesObject.java b/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/AdditionalPropertiesObject.java
index 40ff424fe4..cc29400029 100644
--- a/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/AdditionalPropertiesObject.java
+++ b/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/AdditionalPropertiesObject.java
@@ -40,6 +40,7 @@ public class AdditionalPropertiesObject extends HashMap<String, Map> {
    * Get name
    * @return name
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getName() {
     return name;
diff --git a/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/AdditionalPropertiesString.java b/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/AdditionalPropertiesString.java
index eeaedf3bda..fb3368dfed 100644
--- a/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/AdditionalPropertiesString.java
+++ b/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/AdditionalPropertiesString.java
@@ -40,6 +40,7 @@ public class AdditionalPropertiesString extends HashMap<String, String> {
    * Get name
    * @return name
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getName() {
     return name;
diff --git a/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/Animal.java b/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/Animal.java
index f210737e12..53a0eec339 100644
--- a/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/Animal.java
+++ b/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/Animal.java
@@ -49,6 +49,7 @@ public class Animal {
    * Get className
    * @return className
   **/
+
   @ApiModelProperty(required = true, value = "")
   public String getClassName() {
     return className;
@@ -67,6 +68,7 @@ public class Animal {
    * Get color
    * @return color
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getColor() {
     return color;
diff --git a/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java b/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java
index f5c02b2326..de49df3fbd 100644
--- a/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java
+++ b/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java
@@ -49,6 +49,7 @@ public class ArrayOfArrayOfNumberOnly {
    * Get arrayArrayNumber
    * @return arrayArrayNumber
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public List<List<BigDecimal>> getArrayArrayNumber() {
     return arrayArrayNumber;
diff --git a/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java b/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java
index 2dcfdf3c78..f4399ff42d 100644
--- a/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java
+++ b/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java
@@ -49,6 +49,7 @@ public class ArrayOfNumberOnly {
    * Get arrayNumber
    * @return arrayNumber
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public List<BigDecimal> getArrayNumber() {
     return arrayNumber;
diff --git a/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/ArrayTest.java b/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/ArrayTest.java
index 0778fc2d8f..7483fa96ce 100644
--- a/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/ArrayTest.java
+++ b/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/ArrayTest.java
@@ -55,6 +55,7 @@ public class ArrayTest {
    * Get arrayOfString
    * @return arrayOfString
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public List<String> getArrayOfString() {
     return arrayOfString;
@@ -81,6 +82,7 @@ public class ArrayTest {
    * Get arrayArrayOfInteger
    * @return arrayArrayOfInteger
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public List<List<Long>> getArrayArrayOfInteger() {
     return arrayArrayOfInteger;
@@ -107,6 +109,7 @@ public class ArrayTest {
    * Get arrayArrayOfModel
    * @return arrayArrayOfModel
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public List<List<ReadOnlyFirst>> getArrayArrayOfModel() {
     return arrayArrayOfModel;
diff --git a/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/Capitalization.java b/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/Capitalization.java
index cedbd8c9db..bb83be97fe 100644
--- a/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/Capitalization.java
+++ b/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/Capitalization.java
@@ -53,6 +53,7 @@ public class Capitalization {
    * Get smallCamel
    * @return smallCamel
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getSmallCamel() {
     return smallCamel;
@@ -71,6 +72,7 @@ public class Capitalization {
    * Get capitalCamel
    * @return capitalCamel
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getCapitalCamel() {
     return capitalCamel;
@@ -89,6 +91,7 @@ public class Capitalization {
    * Get smallSnake
    * @return smallSnake
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getSmallSnake() {
     return smallSnake;
@@ -107,6 +110,7 @@ public class Capitalization {
    * Get capitalSnake
    * @return capitalSnake
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getCapitalSnake() {
     return capitalSnake;
@@ -125,6 +129,7 @@ public class Capitalization {
    * Get scAETHFlowPoints
    * @return scAETHFlowPoints
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getScAETHFlowPoints() {
     return scAETHFlowPoints;
@@ -143,6 +148,7 @@ public class Capitalization {
    * Name of the pet 
    * @return ATT_NAME
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "Name of the pet ")
   public String getATTNAME() {
     return ATT_NAME;
diff --git a/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/Cat.java b/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/Cat.java
index 91cffa9f32..6992ec21ca 100644
--- a/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/Cat.java
+++ b/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/Cat.java
@@ -40,6 +40,7 @@ public class Cat extends Animal {
    * Get declawed
    * @return declawed
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Boolean isDeclawed() {
     return declawed;
diff --git a/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/CatAllOf.java b/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/CatAllOf.java
index 93f6f6d59c..0a5eed53e7 100644
--- a/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/CatAllOf.java
+++ b/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/CatAllOf.java
@@ -38,6 +38,7 @@ public class CatAllOf {
    * Get declawed
    * @return declawed
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Boolean isDeclawed() {
     return declawed;
diff --git a/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/Category.java b/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/Category.java
index baf44c948a..03efdd4be8 100644
--- a/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/Category.java
+++ b/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/Category.java
@@ -41,6 +41,7 @@ public class Category {
    * Get id
    * @return id
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Long getId() {
     return id;
@@ -59,6 +60,7 @@ public class Category {
    * Get name
    * @return name
   **/
+
   @ApiModelProperty(required = true, value = "")
   public String getName() {
     return name;
diff --git a/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/ClassModel.java b/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/ClassModel.java
index 0904f531de..def421a670 100644
--- a/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/ClassModel.java
+++ b/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/ClassModel.java
@@ -39,6 +39,7 @@ public class ClassModel {
    * Get propertyClass
    * @return propertyClass
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getPropertyClass() {
     return propertyClass;
diff --git a/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/Client.java b/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/Client.java
index 9ebcc7294e..c0bd0743e5 100644
--- a/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/Client.java
+++ b/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/Client.java
@@ -38,6 +38,7 @@ public class Client {
    * Get client
    * @return client
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getClient() {
     return client;
diff --git a/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/Dog.java b/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/Dog.java
index 3b1c570cb4..6b79c59606 100644
--- a/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/Dog.java
+++ b/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/Dog.java
@@ -40,6 +40,7 @@ public class Dog extends Animal {
    * Get breed
    * @return breed
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getBreed() {
     return breed;
diff --git a/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/DogAllOf.java b/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/DogAllOf.java
index cb95a6a372..1a4496d8f0 100644
--- a/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/DogAllOf.java
+++ b/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/DogAllOf.java
@@ -38,6 +38,7 @@ public class DogAllOf {
    * Get breed
    * @return breed
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getBreed() {
     return breed;
diff --git a/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/EnumArrays.java b/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/EnumArrays.java
index cb8d45860a..40e31bf3ca 100644
--- a/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/EnumArrays.java
+++ b/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/EnumArrays.java
@@ -113,6 +113,7 @@ public class EnumArrays {
    * Get justSymbol
    * @return justSymbol
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public JustSymbolEnum getJustSymbol() {
     return justSymbol;
@@ -139,6 +140,7 @@ public class EnumArrays {
    * Get arrayEnum
    * @return arrayEnum
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public List<ArrayEnumEnum> getArrayEnum() {
     return arrayEnum;
diff --git a/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/EnumTest.java b/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/EnumTest.java
index bdf61d52c9..d4b36798ee 100644
--- a/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/EnumTest.java
+++ b/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/EnumTest.java
@@ -195,6 +195,7 @@ public class EnumTest {
    * Get enumString
    * @return enumString
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public EnumStringEnum getEnumString() {
     return enumString;
@@ -213,6 +214,7 @@ public class EnumTest {
    * Get enumStringRequired
    * @return enumStringRequired
   **/
+
   @ApiModelProperty(required = true, value = "")
   public EnumStringRequiredEnum getEnumStringRequired() {
     return enumStringRequired;
@@ -231,6 +233,7 @@ public class EnumTest {
    * Get enumInteger
    * @return enumInteger
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public EnumIntegerEnum getEnumInteger() {
     return enumInteger;
@@ -249,6 +252,7 @@ public class EnumTest {
    * Get enumNumber
    * @return enumNumber
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public EnumNumberEnum getEnumNumber() {
     return enumNumber;
@@ -267,6 +271,7 @@ public class EnumTest {
    * Get outerEnum
    * @return outerEnum
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public OuterEnum getOuterEnum() {
     return outerEnum;
diff --git a/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java b/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java
index 326b1a90a3..bee77a8cec 100644
--- a/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java
+++ b/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java
@@ -43,6 +43,7 @@ public class FileSchemaTestClass {
    * Get file
    * @return file
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public java.io.File getFile() {
     return file;
@@ -69,6 +70,7 @@ public class FileSchemaTestClass {
    * Get files
    * @return files
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public List<java.io.File> getFiles() {
     return files;
diff --git a/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/FormatTest.java b/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/FormatTest.java
index dd1c2d2f58..c017f57a80 100644
--- a/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/FormatTest.java
+++ b/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/FormatTest.java
@@ -81,6 +81,7 @@ public class FormatTest {
    * maximum: 100
    * @return integer
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Integer getInteger() {
     return integer;
@@ -101,6 +102,7 @@ public class FormatTest {
    * maximum: 200
    * @return int32
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Integer getInt32() {
     return int32;
@@ -119,6 +121,7 @@ public class FormatTest {
    * Get int64
    * @return int64
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Long getInt64() {
     return int64;
@@ -139,6 +142,7 @@ public class FormatTest {
    * maximum: 543.2
    * @return number
   **/
+
   @ApiModelProperty(required = true, value = "")
   public BigDecimal getNumber() {
     return number;
@@ -159,6 +163,7 @@ public class FormatTest {
    * maximum: 987.6
    * @return _float
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Float getFloat() {
     return _float;
@@ -179,6 +184,7 @@ public class FormatTest {
    * maximum: 123.4
    * @return _double
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Double getDouble() {
     return _double;
@@ -197,6 +203,7 @@ public class FormatTest {
    * Get string
    * @return string
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getString() {
     return string;
@@ -215,6 +222,7 @@ public class FormatTest {
    * Get _byte
    * @return _byte
   **/
+
   @ApiModelProperty(required = true, value = "")
   public byte[] getByte() {
     return _byte;
@@ -233,6 +241,7 @@ public class FormatTest {
    * Get binary
    * @return binary
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public File getBinary() {
     return binary;
@@ -251,6 +260,7 @@ public class FormatTest {
    * Get date
    * @return date
   **/
+
   @ApiModelProperty(required = true, value = "")
   public LocalDate getDate() {
     return date;
@@ -269,6 +279,7 @@ public class FormatTest {
    * Get dateTime
    * @return dateTime
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public OffsetDateTime getDateTime() {
     return dateTime;
@@ -287,6 +298,7 @@ public class FormatTest {
    * Get uuid
    * @return uuid
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(example = "72f98069-206d-4f12-9f12-3d1e525a8e84", value = "")
   public UUID getUuid() {
     return uuid;
@@ -305,6 +317,7 @@ public class FormatTest {
    * Get password
    * @return password
   **/
+
   @ApiModelProperty(required = true, value = "")
   public String getPassword() {
     return password;
diff --git a/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java b/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java
index 4dbede6b7d..44159e08e8 100644
--- a/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java
+++ b/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java
@@ -36,6 +36,7 @@ public class HasOnlyReadOnly {
    * Get bar
    * @return bar
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getBar() {
     return bar;
@@ -45,6 +46,7 @@ public class HasOnlyReadOnly {
    * Get foo
    * @return foo
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getFoo() {
     return foo;
diff --git a/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/MapTest.java b/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/MapTest.java
index 625b6be97d..a7a141bb9b 100644
--- a/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/MapTest.java
+++ b/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/MapTest.java
@@ -93,6 +93,7 @@ public class MapTest {
    * Get mapMapOfString
    * @return mapMapOfString
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Map<String, Map<String, String>> getMapMapOfString() {
     return mapMapOfString;
@@ -119,6 +120,7 @@ public class MapTest {
    * Get mapOfEnumString
    * @return mapOfEnumString
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Map<String, InnerEnum> getMapOfEnumString() {
     return mapOfEnumString;
@@ -145,6 +147,7 @@ public class MapTest {
    * Get directMap
    * @return directMap
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Map<String, Boolean> getDirectMap() {
     return directMap;
@@ -171,6 +174,7 @@ public class MapTest {
    * Get indirectMap
    * @return indirectMap
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Map<String, Boolean> getIndirectMap() {
     return indirectMap;
diff --git a/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java
index 0adbe0caa7..ea930e3e2e 100644
--- a/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java
+++ b/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java
@@ -50,6 +50,7 @@ public class MixedPropertiesAndAdditionalPropertiesClass {
    * Get uuid
    * @return uuid
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public UUID getUuid() {
     return uuid;
@@ -68,6 +69,7 @@ public class MixedPropertiesAndAdditionalPropertiesClass {
    * Get dateTime
    * @return dateTime
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public OffsetDateTime getDateTime() {
     return dateTime;
@@ -94,6 +96,7 @@ public class MixedPropertiesAndAdditionalPropertiesClass {
    * Get map
    * @return map
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Map<String, Animal> getMap() {
     return map;
diff --git a/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/Model200Response.java b/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/Model200Response.java
index 3be60ea3ae..bd3244dd57 100644
--- a/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/Model200Response.java
+++ b/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/Model200Response.java
@@ -42,6 +42,7 @@ public class Model200Response {
    * Get name
    * @return name
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Integer getName() {
     return name;
@@ -60,6 +61,7 @@ public class Model200Response {
    * Get propertyClass
    * @return propertyClass
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getPropertyClass() {
     return propertyClass;
diff --git a/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/ModelApiResponse.java b/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/ModelApiResponse.java
index 6e458e38dc..ed335cdca1 100644
--- a/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/ModelApiResponse.java
+++ b/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/ModelApiResponse.java
@@ -44,6 +44,7 @@ public class ModelApiResponse {
    * Get code
    * @return code
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Integer getCode() {
     return code;
@@ -62,6 +63,7 @@ public class ModelApiResponse {
    * Get type
    * @return type
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getType() {
     return type;
@@ -80,6 +82,7 @@ public class ModelApiResponse {
    * Get message
    * @return message
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getMessage() {
     return message;
diff --git a/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/ModelReturn.java b/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/ModelReturn.java
index 62e5295212..04c0bcd33f 100644
--- a/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/ModelReturn.java
+++ b/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/ModelReturn.java
@@ -39,6 +39,7 @@ public class ModelReturn {
    * Get _return
    * @return _return
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Integer getReturn() {
     return _return;
diff --git a/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/Name.java b/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/Name.java
index 852a999035..af27c6e45f 100644
--- a/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/Name.java
+++ b/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/Name.java
@@ -48,6 +48,7 @@ public class Name {
    * Get name
    * @return name
   **/
+
   @ApiModelProperty(required = true, value = "")
   public Integer getName() {
     return name;
@@ -61,6 +62,7 @@ public class Name {
    * Get snakeCase
    * @return snakeCase
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Integer getSnakeCase() {
     return snakeCase;
@@ -75,6 +77,7 @@ public class Name {
    * Get property
    * @return property
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getProperty() {
     return property;
@@ -88,6 +91,7 @@ public class Name {
    * Get _123number
    * @return _123number
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Integer get123number() {
     return _123number;
diff --git a/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/NumberOnly.java b/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/NumberOnly.java
index 530a4d5818..4e29c814cc 100644
--- a/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/NumberOnly.java
+++ b/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/NumberOnly.java
@@ -39,6 +39,7 @@ public class NumberOnly {
    * Get justNumber
    * @return justNumber
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public BigDecimal getJustNumber() {
     return justNumber;
diff --git a/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/Order.java b/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/Order.java
index 7e705c58a2..7867042746 100644
--- a/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/Order.java
+++ b/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/Order.java
@@ -91,6 +91,7 @@ public class Order {
    * Get id
    * @return id
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Long getId() {
     return id;
@@ -109,6 +110,7 @@ public class Order {
    * Get petId
    * @return petId
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Long getPetId() {
     return petId;
@@ -127,6 +129,7 @@ public class Order {
    * Get quantity
    * @return quantity
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Integer getQuantity() {
     return quantity;
@@ -145,6 +148,7 @@ public class Order {
    * Get shipDate
    * @return shipDate
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public OffsetDateTime getShipDate() {
     return shipDate;
@@ -163,6 +167,7 @@ public class Order {
    * Order Status
    * @return status
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "Order Status")
   public StatusEnum getStatus() {
     return status;
@@ -181,6 +186,7 @@ public class Order {
    * Get complete
    * @return complete
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Boolean isComplete() {
     return complete;
diff --git a/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/OuterComposite.java b/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/OuterComposite.java
index 3a99006820..b075f7395a 100644
--- a/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/OuterComposite.java
+++ b/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/OuterComposite.java
@@ -45,6 +45,7 @@ public class OuterComposite {
    * Get myNumber
    * @return myNumber
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public BigDecimal getMyNumber() {
     return myNumber;
@@ -63,6 +64,7 @@ public class OuterComposite {
    * Get myString
    * @return myString
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getMyString() {
     return myString;
@@ -81,6 +83,7 @@ public class OuterComposite {
    * Get myBoolean
    * @return myBoolean
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Boolean isMyBoolean() {
     return myBoolean;
diff --git a/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/Pet.java b/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/Pet.java
index 8a2408a296..63e9b4ff5d 100644
--- a/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/Pet.java
+++ b/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/Pet.java
@@ -94,6 +94,7 @@ public class Pet {
    * Get id
    * @return id
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Long getId() {
     return id;
@@ -112,6 +113,7 @@ public class Pet {
    * Get category
    * @return category
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Category getCategory() {
     return category;
@@ -130,6 +132,7 @@ public class Pet {
    * Get name
    * @return name
   **/
+
   @ApiModelProperty(example = "doggie", required = true, value = "")
   public String getName() {
     return name;
@@ -153,6 +156,7 @@ public class Pet {
    * Get photoUrls
    * @return photoUrls
   **/
+
   @ApiModelProperty(required = true, value = "")
   public List<String> getPhotoUrls() {
     return photoUrls;
@@ -179,6 +183,7 @@ public class Pet {
    * Get tags
    * @return tags
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public List<Tag> getTags() {
     return tags;
@@ -197,6 +202,7 @@ public class Pet {
    * pet status in the store
    * @return status
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "pet status in the store")
   public StatusEnum getStatus() {
     return status;
diff --git a/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/ReadOnlyFirst.java b/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/ReadOnlyFirst.java
index 83f25c7923..a2c9e99699 100644
--- a/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/ReadOnlyFirst.java
+++ b/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/ReadOnlyFirst.java
@@ -36,6 +36,7 @@ public class ReadOnlyFirst {
    * Get bar
    * @return bar
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getBar() {
     return bar;
@@ -50,6 +51,7 @@ public class ReadOnlyFirst {
    * Get baz
    * @return baz
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getBaz() {
     return baz;
diff --git a/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/SpecialModelName.java b/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/SpecialModelName.java
index 5abfc132ad..a5ddb0b638 100644
--- a/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/SpecialModelName.java
+++ b/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/SpecialModelName.java
@@ -38,6 +38,7 @@ public class SpecialModelName {
    * Get $specialPropertyName
    * @return $specialPropertyName
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Long get$SpecialPropertyName() {
     return $specialPropertyName;
diff --git a/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/Tag.java b/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/Tag.java
index e2e947b84a..8255ad8298 100644
--- a/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/Tag.java
+++ b/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/Tag.java
@@ -41,6 +41,7 @@ public class Tag {
    * Get id
    * @return id
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Long getId() {
     return id;
@@ -59,6 +60,7 @@ public class Tag {
    * Get name
    * @return name
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getName() {
     return name;
diff --git a/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/TypeHolderDefault.java b/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/TypeHolderDefault.java
index c7988712cc..04a11d85a5 100644
--- a/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/TypeHolderDefault.java
+++ b/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/TypeHolderDefault.java
@@ -53,6 +53,7 @@ public class TypeHolderDefault {
    * Get stringItem
    * @return stringItem
   **/
+
   @ApiModelProperty(required = true, value = "")
   public String getStringItem() {
     return stringItem;
@@ -71,6 +72,7 @@ public class TypeHolderDefault {
    * Get numberItem
    * @return numberItem
   **/
+
   @ApiModelProperty(required = true, value = "")
   public BigDecimal getNumberItem() {
     return numberItem;
@@ -89,6 +91,7 @@ public class TypeHolderDefault {
    * Get integerItem
    * @return integerItem
   **/
+
   @ApiModelProperty(required = true, value = "")
   public Integer getIntegerItem() {
     return integerItem;
@@ -107,6 +110,7 @@ public class TypeHolderDefault {
    * Get boolItem
    * @return boolItem
   **/
+
   @ApiModelProperty(required = true, value = "")
   public Boolean isBoolItem() {
     return boolItem;
@@ -130,6 +134,7 @@ public class TypeHolderDefault {
    * Get arrayItem
    * @return arrayItem
   **/
+
   @ApiModelProperty(required = true, value = "")
   public List<Integer> getArrayItem() {
     return arrayItem;
diff --git a/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/TypeHolderExample.java b/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/TypeHolderExample.java
index cca1c01efd..a9bf8de899 100644
--- a/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/TypeHolderExample.java
+++ b/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/TypeHolderExample.java
@@ -53,6 +53,7 @@ public class TypeHolderExample {
    * Get stringItem
    * @return stringItem
   **/
+
   @ApiModelProperty(example = "what", required = true, value = "")
   public String getStringItem() {
     return stringItem;
@@ -71,6 +72,7 @@ public class TypeHolderExample {
    * Get numberItem
    * @return numberItem
   **/
+
   @ApiModelProperty(example = "1.234", required = true, value = "")
   public BigDecimal getNumberItem() {
     return numberItem;
@@ -89,6 +91,7 @@ public class TypeHolderExample {
    * Get integerItem
    * @return integerItem
   **/
+
   @ApiModelProperty(example = "-2", required = true, value = "")
   public Integer getIntegerItem() {
     return integerItem;
@@ -107,6 +110,7 @@ public class TypeHolderExample {
    * Get boolItem
    * @return boolItem
   **/
+
   @ApiModelProperty(example = "true", required = true, value = "")
   public Boolean isBoolItem() {
     return boolItem;
@@ -130,6 +134,7 @@ public class TypeHolderExample {
    * Get arrayItem
    * @return arrayItem
   **/
+
   @ApiModelProperty(example = "[0, 1, 2, 3]", required = true, value = "")
   public List<Integer> getArrayItem() {
     return arrayItem;
diff --git a/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/User.java b/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/User.java
index ee3f656a1a..6e6c4ac102 100644
--- a/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/User.java
+++ b/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/User.java
@@ -59,6 +59,7 @@ public class User {
    * Get id
    * @return id
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Long getId() {
     return id;
@@ -77,6 +78,7 @@ public class User {
    * Get username
    * @return username
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getUsername() {
     return username;
@@ -95,6 +97,7 @@ public class User {
    * Get firstName
    * @return firstName
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getFirstName() {
     return firstName;
@@ -113,6 +116,7 @@ public class User {
    * Get lastName
    * @return lastName
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getLastName() {
     return lastName;
@@ -131,6 +135,7 @@ public class User {
    * Get email
    * @return email
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getEmail() {
     return email;
@@ -149,6 +154,7 @@ public class User {
    * Get password
    * @return password
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getPassword() {
     return password;
@@ -167,6 +173,7 @@ public class User {
    * Get phone
    * @return phone
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getPhone() {
     return phone;
@@ -185,6 +192,7 @@ public class User {
    * User Status
    * @return userStatus
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "User Status")
   public Integer getUserStatus() {
     return userStatus;
diff --git a/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/XmlItem.java b/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/XmlItem.java
index 85c9dc3eb4..2665c57a91 100644
--- a/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/XmlItem.java
+++ b/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/XmlItem.java
@@ -125,6 +125,7 @@ public class XmlItem {
    * Get attributeString
    * @return attributeString
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(example = "string", value = "")
   public String getAttributeString() {
     return attributeString;
@@ -143,6 +144,7 @@ public class XmlItem {
    * Get attributeNumber
    * @return attributeNumber
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(example = "1.234", value = "")
   public BigDecimal getAttributeNumber() {
     return attributeNumber;
@@ -161,6 +163,7 @@ public class XmlItem {
    * Get attributeInteger
    * @return attributeInteger
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(example = "-2", value = "")
   public Integer getAttributeInteger() {
     return attributeInteger;
@@ -179,6 +182,7 @@ public class XmlItem {
    * Get attributeBoolean
    * @return attributeBoolean
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(example = "true", value = "")
   public Boolean isAttributeBoolean() {
     return attributeBoolean;
@@ -205,6 +209,7 @@ public class XmlItem {
    * Get wrappedArray
    * @return wrappedArray
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public List<Integer> getWrappedArray() {
     return wrappedArray;
@@ -223,6 +228,7 @@ public class XmlItem {
    * Get nameString
    * @return nameString
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(example = "string", value = "")
   public String getNameString() {
     return nameString;
@@ -241,6 +247,7 @@ public class XmlItem {
    * Get nameNumber
    * @return nameNumber
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(example = "1.234", value = "")
   public BigDecimal getNameNumber() {
     return nameNumber;
@@ -259,6 +266,7 @@ public class XmlItem {
    * Get nameInteger
    * @return nameInteger
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(example = "-2", value = "")
   public Integer getNameInteger() {
     return nameInteger;
@@ -277,6 +285,7 @@ public class XmlItem {
    * Get nameBoolean
    * @return nameBoolean
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(example = "true", value = "")
   public Boolean isNameBoolean() {
     return nameBoolean;
@@ -303,6 +312,7 @@ public class XmlItem {
    * Get nameArray
    * @return nameArray
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public List<Integer> getNameArray() {
     return nameArray;
@@ -329,6 +339,7 @@ public class XmlItem {
    * Get nameWrappedArray
    * @return nameWrappedArray
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public List<Integer> getNameWrappedArray() {
     return nameWrappedArray;
@@ -347,6 +358,7 @@ public class XmlItem {
    * Get prefixString
    * @return prefixString
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(example = "string", value = "")
   public String getPrefixString() {
     return prefixString;
@@ -365,6 +377,7 @@ public class XmlItem {
    * Get prefixNumber
    * @return prefixNumber
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(example = "1.234", value = "")
   public BigDecimal getPrefixNumber() {
     return prefixNumber;
@@ -383,6 +396,7 @@ public class XmlItem {
    * Get prefixInteger
    * @return prefixInteger
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(example = "-2", value = "")
   public Integer getPrefixInteger() {
     return prefixInteger;
@@ -401,6 +415,7 @@ public class XmlItem {
    * Get prefixBoolean
    * @return prefixBoolean
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(example = "true", value = "")
   public Boolean isPrefixBoolean() {
     return prefixBoolean;
@@ -427,6 +442,7 @@ public class XmlItem {
    * Get prefixArray
    * @return prefixArray
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public List<Integer> getPrefixArray() {
     return prefixArray;
@@ -453,6 +469,7 @@ public class XmlItem {
    * Get prefixWrappedArray
    * @return prefixWrappedArray
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public List<Integer> getPrefixWrappedArray() {
     return prefixWrappedArray;
@@ -471,6 +488,7 @@ public class XmlItem {
    * Get namespaceString
    * @return namespaceString
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(example = "string", value = "")
   public String getNamespaceString() {
     return namespaceString;
@@ -489,6 +507,7 @@ public class XmlItem {
    * Get namespaceNumber
    * @return namespaceNumber
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(example = "1.234", value = "")
   public BigDecimal getNamespaceNumber() {
     return namespaceNumber;
@@ -507,6 +526,7 @@ public class XmlItem {
    * Get namespaceInteger
    * @return namespaceInteger
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(example = "-2", value = "")
   public Integer getNamespaceInteger() {
     return namespaceInteger;
@@ -525,6 +545,7 @@ public class XmlItem {
    * Get namespaceBoolean
    * @return namespaceBoolean
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(example = "true", value = "")
   public Boolean isNamespaceBoolean() {
     return namespaceBoolean;
@@ -551,6 +572,7 @@ public class XmlItem {
    * Get namespaceArray
    * @return namespaceArray
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public List<Integer> getNamespaceArray() {
     return namespaceArray;
@@ -577,6 +599,7 @@ public class XmlItem {
    * Get namespaceWrappedArray
    * @return namespaceWrappedArray
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public List<Integer> getNamespaceWrappedArray() {
     return namespaceWrappedArray;
@@ -595,6 +618,7 @@ public class XmlItem {
    * Get prefixNsString
    * @return prefixNsString
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(example = "string", value = "")
   public String getPrefixNsString() {
     return prefixNsString;
@@ -613,6 +637,7 @@ public class XmlItem {
    * Get prefixNsNumber
    * @return prefixNsNumber
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(example = "1.234", value = "")
   public BigDecimal getPrefixNsNumber() {
     return prefixNsNumber;
@@ -631,6 +656,7 @@ public class XmlItem {
    * Get prefixNsInteger
    * @return prefixNsInteger
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(example = "-2", value = "")
   public Integer getPrefixNsInteger() {
     return prefixNsInteger;
@@ -649,6 +675,7 @@ public class XmlItem {
    * Get prefixNsBoolean
    * @return prefixNsBoolean
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(example = "true", value = "")
   public Boolean isPrefixNsBoolean() {
     return prefixNsBoolean;
@@ -675,6 +702,7 @@ public class XmlItem {
    * Get prefixNsArray
    * @return prefixNsArray
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public List<Integer> getPrefixNsArray() {
     return prefixNsArray;
@@ -701,6 +729,7 @@ public class XmlItem {
    * Get prefixNsWrappedArray
    * @return prefixNsWrappedArray
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public List<Integer> getPrefixNsWrappedArray() {
     return prefixNsWrappedArray;
diff --git a/samples/client/petstore/java/google-api-client/build.gradle b/samples/client/petstore/java/google-api-client/build.gradle
index 67e159bb94..ea26f68752 100644
--- a/samples/client/petstore/java/google-api-client/build.gradle
+++ b/samples/client/petstore/java/google-api-client/build.gradle
@@ -107,6 +107,7 @@ ext {
 
 dependencies {
     compile "io.swagger:swagger-annotations:$swagger_annotations_version"
+    compile "com.google.code.findbugs:jsr305:3.0.2"
     compile "com.google.api-client:google-api-client:${google_api_client_version}"
     compile "org.glassfish.jersey.core:jersey-common:${jersey_common_version}"
     compile "com.fasterxml.jackson.core:jackson-core:$jackson_version"
diff --git a/samples/client/petstore/java/google-api-client/pom.xml b/samples/client/petstore/java/google-api-client/pom.xml
index a030fdb321..314ca64233 100644
--- a/samples/client/petstore/java/google-api-client/pom.xml
+++ b/samples/client/petstore/java/google-api-client/pom.xml
@@ -200,6 +200,12 @@
             <artifactId>swagger-annotations</artifactId>
             <version>${swagger-annotations-version}</version>
         </dependency>
+        <!-- @Nullable annotation -->
+        <dependency>
+            <groupId>com.google.code.findbugs</groupId>
+            <artifactId>jsr305</artifactId>
+            <version>3.0.2</version>
+        </dependency>
         <!-- HTTP client: google-api-client -->
         <dependency>
             <groupId>com.google.api-client</groupId>
diff --git a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/AdditionalPropertiesAnyType.java b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/AdditionalPropertiesAnyType.java
index d223a661f8..1abb2d8a64 100644
--- a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/AdditionalPropertiesAnyType.java
+++ b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/AdditionalPropertiesAnyType.java
@@ -40,6 +40,7 @@ public class AdditionalPropertiesAnyType extends HashMap<String, Object> {
    * Get name
    * @return name
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getName() {
     return name;
diff --git a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/AdditionalPropertiesArray.java b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/AdditionalPropertiesArray.java
index db738129d0..1821c243e1 100644
--- a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/AdditionalPropertiesArray.java
+++ b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/AdditionalPropertiesArray.java
@@ -41,6 +41,7 @@ public class AdditionalPropertiesArray extends HashMap<String, List> {
    * Get name
    * @return name
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getName() {
     return name;
diff --git a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/AdditionalPropertiesBoolean.java b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/AdditionalPropertiesBoolean.java
index 754ff32555..78f7ac79b2 100644
--- a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/AdditionalPropertiesBoolean.java
+++ b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/AdditionalPropertiesBoolean.java
@@ -40,6 +40,7 @@ public class AdditionalPropertiesBoolean extends HashMap<String, Boolean> {
    * Get name
    * @return name
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getName() {
     return name;
diff --git a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java
index 2de7a27185..406bccc278 100644
--- a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java
+++ b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java
@@ -80,6 +80,7 @@ public class AdditionalPropertiesClass {
    * Get mapString
    * @return mapString
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Map<String, String> getMapString() {
     return mapString;
@@ -106,6 +107,7 @@ public class AdditionalPropertiesClass {
    * Get mapNumber
    * @return mapNumber
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Map<String, BigDecimal> getMapNumber() {
     return mapNumber;
@@ -132,6 +134,7 @@ public class AdditionalPropertiesClass {
    * Get mapInteger
    * @return mapInteger
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Map<String, Integer> getMapInteger() {
     return mapInteger;
@@ -158,6 +161,7 @@ public class AdditionalPropertiesClass {
    * Get mapBoolean
    * @return mapBoolean
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Map<String, Boolean> getMapBoolean() {
     return mapBoolean;
@@ -184,6 +188,7 @@ public class AdditionalPropertiesClass {
    * Get mapArrayInteger
    * @return mapArrayInteger
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Map<String, List<Integer>> getMapArrayInteger() {
     return mapArrayInteger;
@@ -210,6 +215,7 @@ public class AdditionalPropertiesClass {
    * Get mapArrayAnytype
    * @return mapArrayAnytype
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Map<String, List<Object>> getMapArrayAnytype() {
     return mapArrayAnytype;
@@ -236,6 +242,7 @@ public class AdditionalPropertiesClass {
    * Get mapMapString
    * @return mapMapString
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Map<String, Map<String, String>> getMapMapString() {
     return mapMapString;
@@ -262,6 +269,7 @@ public class AdditionalPropertiesClass {
    * Get mapMapAnytype
    * @return mapMapAnytype
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Map<String, Map<String, Object>> getMapMapAnytype() {
     return mapMapAnytype;
@@ -280,6 +288,7 @@ public class AdditionalPropertiesClass {
    * Get anytype1
    * @return anytype1
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Object getAnytype1() {
     return anytype1;
@@ -298,6 +307,7 @@ public class AdditionalPropertiesClass {
    * Get anytype2
    * @return anytype2
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Object getAnytype2() {
     return anytype2;
@@ -316,6 +326,7 @@ public class AdditionalPropertiesClass {
    * Get anytype3
    * @return anytype3
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Object getAnytype3() {
     return anytype3;
diff --git a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/AdditionalPropertiesInteger.java b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/AdditionalPropertiesInteger.java
index 1f61976466..6e5159d404 100644
--- a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/AdditionalPropertiesInteger.java
+++ b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/AdditionalPropertiesInteger.java
@@ -40,6 +40,7 @@ public class AdditionalPropertiesInteger extends HashMap<String, Integer> {
    * Get name
    * @return name
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getName() {
     return name;
diff --git a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/AdditionalPropertiesNumber.java b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/AdditionalPropertiesNumber.java
index 474d7b8f04..ddc8146dea 100644
--- a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/AdditionalPropertiesNumber.java
+++ b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/AdditionalPropertiesNumber.java
@@ -41,6 +41,7 @@ public class AdditionalPropertiesNumber extends HashMap<String, BigDecimal> {
    * Get name
    * @return name
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getName() {
     return name;
diff --git a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/AdditionalPropertiesObject.java b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/AdditionalPropertiesObject.java
index 40ff424fe4..cc29400029 100644
--- a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/AdditionalPropertiesObject.java
+++ b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/AdditionalPropertiesObject.java
@@ -40,6 +40,7 @@ public class AdditionalPropertiesObject extends HashMap<String, Map> {
    * Get name
    * @return name
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getName() {
     return name;
diff --git a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/AdditionalPropertiesString.java b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/AdditionalPropertiesString.java
index eeaedf3bda..fb3368dfed 100644
--- a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/AdditionalPropertiesString.java
+++ b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/AdditionalPropertiesString.java
@@ -40,6 +40,7 @@ public class AdditionalPropertiesString extends HashMap<String, String> {
    * Get name
    * @return name
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getName() {
     return name;
diff --git a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/Animal.java b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/Animal.java
index f210737e12..53a0eec339 100644
--- a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/Animal.java
+++ b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/Animal.java
@@ -49,6 +49,7 @@ public class Animal {
    * Get className
    * @return className
   **/
+
   @ApiModelProperty(required = true, value = "")
   public String getClassName() {
     return className;
@@ -67,6 +68,7 @@ public class Animal {
    * Get color
    * @return color
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getColor() {
     return color;
diff --git a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java
index f5c02b2326..de49df3fbd 100644
--- a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java
+++ b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java
@@ -49,6 +49,7 @@ public class ArrayOfArrayOfNumberOnly {
    * Get arrayArrayNumber
    * @return arrayArrayNumber
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public List<List<BigDecimal>> getArrayArrayNumber() {
     return arrayArrayNumber;
diff --git a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java
index 2dcfdf3c78..f4399ff42d 100644
--- a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java
+++ b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java
@@ -49,6 +49,7 @@ public class ArrayOfNumberOnly {
    * Get arrayNumber
    * @return arrayNumber
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public List<BigDecimal> getArrayNumber() {
     return arrayNumber;
diff --git a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/ArrayTest.java b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/ArrayTest.java
index 0778fc2d8f..7483fa96ce 100644
--- a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/ArrayTest.java
+++ b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/ArrayTest.java
@@ -55,6 +55,7 @@ public class ArrayTest {
    * Get arrayOfString
    * @return arrayOfString
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public List<String> getArrayOfString() {
     return arrayOfString;
@@ -81,6 +82,7 @@ public class ArrayTest {
    * Get arrayArrayOfInteger
    * @return arrayArrayOfInteger
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public List<List<Long>> getArrayArrayOfInteger() {
     return arrayArrayOfInteger;
@@ -107,6 +109,7 @@ public class ArrayTest {
    * Get arrayArrayOfModel
    * @return arrayArrayOfModel
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public List<List<ReadOnlyFirst>> getArrayArrayOfModel() {
     return arrayArrayOfModel;
diff --git a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/Capitalization.java b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/Capitalization.java
index cedbd8c9db..bb83be97fe 100644
--- a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/Capitalization.java
+++ b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/Capitalization.java
@@ -53,6 +53,7 @@ public class Capitalization {
    * Get smallCamel
    * @return smallCamel
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getSmallCamel() {
     return smallCamel;
@@ -71,6 +72,7 @@ public class Capitalization {
    * Get capitalCamel
    * @return capitalCamel
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getCapitalCamel() {
     return capitalCamel;
@@ -89,6 +91,7 @@ public class Capitalization {
    * Get smallSnake
    * @return smallSnake
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getSmallSnake() {
     return smallSnake;
@@ -107,6 +110,7 @@ public class Capitalization {
    * Get capitalSnake
    * @return capitalSnake
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getCapitalSnake() {
     return capitalSnake;
@@ -125,6 +129,7 @@ public class Capitalization {
    * Get scAETHFlowPoints
    * @return scAETHFlowPoints
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getScAETHFlowPoints() {
     return scAETHFlowPoints;
@@ -143,6 +148,7 @@ public class Capitalization {
    * Name of the pet 
    * @return ATT_NAME
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "Name of the pet ")
   public String getATTNAME() {
     return ATT_NAME;
diff --git a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/Cat.java b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/Cat.java
index 40f40f869e..ce456c8647 100644
--- a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/Cat.java
+++ b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/Cat.java
@@ -40,6 +40,7 @@ public class Cat extends Animal {
    * Get declawed
    * @return declawed
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Boolean getDeclawed() {
     return declawed;
diff --git a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/CatAllOf.java b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/CatAllOf.java
index 0e8a7f8fa9..224c08671c 100644
--- a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/CatAllOf.java
+++ b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/CatAllOf.java
@@ -38,6 +38,7 @@ public class CatAllOf {
    * Get declawed
    * @return declawed
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Boolean getDeclawed() {
     return declawed;
diff --git a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/Category.java b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/Category.java
index baf44c948a..03efdd4be8 100644
--- a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/Category.java
+++ b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/Category.java
@@ -41,6 +41,7 @@ public class Category {
    * Get id
    * @return id
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Long getId() {
     return id;
@@ -59,6 +60,7 @@ public class Category {
    * Get name
    * @return name
   **/
+
   @ApiModelProperty(required = true, value = "")
   public String getName() {
     return name;
diff --git a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/ClassModel.java b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/ClassModel.java
index 0904f531de..def421a670 100644
--- a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/ClassModel.java
+++ b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/ClassModel.java
@@ -39,6 +39,7 @@ public class ClassModel {
    * Get propertyClass
    * @return propertyClass
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getPropertyClass() {
     return propertyClass;
diff --git a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/Client.java b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/Client.java
index 9ebcc7294e..c0bd0743e5 100644
--- a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/Client.java
+++ b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/Client.java
@@ -38,6 +38,7 @@ public class Client {
    * Get client
    * @return client
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getClient() {
     return client;
diff --git a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/Dog.java b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/Dog.java
index 3b1c570cb4..6b79c59606 100644
--- a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/Dog.java
+++ b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/Dog.java
@@ -40,6 +40,7 @@ public class Dog extends Animal {
    * Get breed
    * @return breed
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getBreed() {
     return breed;
diff --git a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/DogAllOf.java b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/DogAllOf.java
index cb95a6a372..1a4496d8f0 100644
--- a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/DogAllOf.java
+++ b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/DogAllOf.java
@@ -38,6 +38,7 @@ public class DogAllOf {
    * Get breed
    * @return breed
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getBreed() {
     return breed;
diff --git a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/EnumArrays.java b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/EnumArrays.java
index cb8d45860a..40e31bf3ca 100644
--- a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/EnumArrays.java
+++ b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/EnumArrays.java
@@ -113,6 +113,7 @@ public class EnumArrays {
    * Get justSymbol
    * @return justSymbol
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public JustSymbolEnum getJustSymbol() {
     return justSymbol;
@@ -139,6 +140,7 @@ public class EnumArrays {
    * Get arrayEnum
    * @return arrayEnum
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public List<ArrayEnumEnum> getArrayEnum() {
     return arrayEnum;
diff --git a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/EnumTest.java b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/EnumTest.java
index bdf61d52c9..d4b36798ee 100644
--- a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/EnumTest.java
+++ b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/EnumTest.java
@@ -195,6 +195,7 @@ public class EnumTest {
    * Get enumString
    * @return enumString
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public EnumStringEnum getEnumString() {
     return enumString;
@@ -213,6 +214,7 @@ public class EnumTest {
    * Get enumStringRequired
    * @return enumStringRequired
   **/
+
   @ApiModelProperty(required = true, value = "")
   public EnumStringRequiredEnum getEnumStringRequired() {
     return enumStringRequired;
@@ -231,6 +233,7 @@ public class EnumTest {
    * Get enumInteger
    * @return enumInteger
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public EnumIntegerEnum getEnumInteger() {
     return enumInteger;
@@ -249,6 +252,7 @@ public class EnumTest {
    * Get enumNumber
    * @return enumNumber
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public EnumNumberEnum getEnumNumber() {
     return enumNumber;
@@ -267,6 +271,7 @@ public class EnumTest {
    * Get outerEnum
    * @return outerEnum
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public OuterEnum getOuterEnum() {
     return outerEnum;
diff --git a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java
index 326b1a90a3..bee77a8cec 100644
--- a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java
+++ b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java
@@ -43,6 +43,7 @@ public class FileSchemaTestClass {
    * Get file
    * @return file
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public java.io.File getFile() {
     return file;
@@ -69,6 +70,7 @@ public class FileSchemaTestClass {
    * Get files
    * @return files
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public List<java.io.File> getFiles() {
     return files;
diff --git a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/FormatTest.java b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/FormatTest.java
index dd1c2d2f58..c017f57a80 100644
--- a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/FormatTest.java
+++ b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/FormatTest.java
@@ -81,6 +81,7 @@ public class FormatTest {
    * maximum: 100
    * @return integer
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Integer getInteger() {
     return integer;
@@ -101,6 +102,7 @@ public class FormatTest {
    * maximum: 200
    * @return int32
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Integer getInt32() {
     return int32;
@@ -119,6 +121,7 @@ public class FormatTest {
    * Get int64
    * @return int64
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Long getInt64() {
     return int64;
@@ -139,6 +142,7 @@ public class FormatTest {
    * maximum: 543.2
    * @return number
   **/
+
   @ApiModelProperty(required = true, value = "")
   public BigDecimal getNumber() {
     return number;
@@ -159,6 +163,7 @@ public class FormatTest {
    * maximum: 987.6
    * @return _float
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Float getFloat() {
     return _float;
@@ -179,6 +184,7 @@ public class FormatTest {
    * maximum: 123.4
    * @return _double
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Double getDouble() {
     return _double;
@@ -197,6 +203,7 @@ public class FormatTest {
    * Get string
    * @return string
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getString() {
     return string;
@@ -215,6 +222,7 @@ public class FormatTest {
    * Get _byte
    * @return _byte
   **/
+
   @ApiModelProperty(required = true, value = "")
   public byte[] getByte() {
     return _byte;
@@ -233,6 +241,7 @@ public class FormatTest {
    * Get binary
    * @return binary
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public File getBinary() {
     return binary;
@@ -251,6 +260,7 @@ public class FormatTest {
    * Get date
    * @return date
   **/
+
   @ApiModelProperty(required = true, value = "")
   public LocalDate getDate() {
     return date;
@@ -269,6 +279,7 @@ public class FormatTest {
    * Get dateTime
    * @return dateTime
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public OffsetDateTime getDateTime() {
     return dateTime;
@@ -287,6 +298,7 @@ public class FormatTest {
    * Get uuid
    * @return uuid
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(example = "72f98069-206d-4f12-9f12-3d1e525a8e84", value = "")
   public UUID getUuid() {
     return uuid;
@@ -305,6 +317,7 @@ public class FormatTest {
    * Get password
    * @return password
   **/
+
   @ApiModelProperty(required = true, value = "")
   public String getPassword() {
     return password;
diff --git a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java
index 4dbede6b7d..44159e08e8 100644
--- a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java
+++ b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java
@@ -36,6 +36,7 @@ public class HasOnlyReadOnly {
    * Get bar
    * @return bar
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getBar() {
     return bar;
@@ -45,6 +46,7 @@ public class HasOnlyReadOnly {
    * Get foo
    * @return foo
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getFoo() {
     return foo;
diff --git a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/MapTest.java b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/MapTest.java
index 625b6be97d..a7a141bb9b 100644
--- a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/MapTest.java
+++ b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/MapTest.java
@@ -93,6 +93,7 @@ public class MapTest {
    * Get mapMapOfString
    * @return mapMapOfString
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Map<String, Map<String, String>> getMapMapOfString() {
     return mapMapOfString;
@@ -119,6 +120,7 @@ public class MapTest {
    * Get mapOfEnumString
    * @return mapOfEnumString
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Map<String, InnerEnum> getMapOfEnumString() {
     return mapOfEnumString;
@@ -145,6 +147,7 @@ public class MapTest {
    * Get directMap
    * @return directMap
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Map<String, Boolean> getDirectMap() {
     return directMap;
@@ -171,6 +174,7 @@ public class MapTest {
    * Get indirectMap
    * @return indirectMap
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Map<String, Boolean> getIndirectMap() {
     return indirectMap;
diff --git a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java
index 0adbe0caa7..ea930e3e2e 100644
--- a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java
+++ b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java
@@ -50,6 +50,7 @@ public class MixedPropertiesAndAdditionalPropertiesClass {
    * Get uuid
    * @return uuid
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public UUID getUuid() {
     return uuid;
@@ -68,6 +69,7 @@ public class MixedPropertiesAndAdditionalPropertiesClass {
    * Get dateTime
    * @return dateTime
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public OffsetDateTime getDateTime() {
     return dateTime;
@@ -94,6 +96,7 @@ public class MixedPropertiesAndAdditionalPropertiesClass {
    * Get map
    * @return map
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Map<String, Animal> getMap() {
     return map;
diff --git a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/Model200Response.java b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/Model200Response.java
index 3be60ea3ae..bd3244dd57 100644
--- a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/Model200Response.java
+++ b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/Model200Response.java
@@ -42,6 +42,7 @@ public class Model200Response {
    * Get name
    * @return name
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Integer getName() {
     return name;
@@ -60,6 +61,7 @@ public class Model200Response {
    * Get propertyClass
    * @return propertyClass
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getPropertyClass() {
     return propertyClass;
diff --git a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/ModelApiResponse.java b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/ModelApiResponse.java
index 6e458e38dc..ed335cdca1 100644
--- a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/ModelApiResponse.java
+++ b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/ModelApiResponse.java
@@ -44,6 +44,7 @@ public class ModelApiResponse {
    * Get code
    * @return code
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Integer getCode() {
     return code;
@@ -62,6 +63,7 @@ public class ModelApiResponse {
    * Get type
    * @return type
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getType() {
     return type;
@@ -80,6 +82,7 @@ public class ModelApiResponse {
    * Get message
    * @return message
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getMessage() {
     return message;
diff --git a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/ModelReturn.java b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/ModelReturn.java
index 62e5295212..04c0bcd33f 100644
--- a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/ModelReturn.java
+++ b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/ModelReturn.java
@@ -39,6 +39,7 @@ public class ModelReturn {
    * Get _return
    * @return _return
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Integer getReturn() {
     return _return;
diff --git a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/Name.java b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/Name.java
index 852a999035..af27c6e45f 100644
--- a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/Name.java
+++ b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/Name.java
@@ -48,6 +48,7 @@ public class Name {
    * Get name
    * @return name
   **/
+
   @ApiModelProperty(required = true, value = "")
   public Integer getName() {
     return name;
@@ -61,6 +62,7 @@ public class Name {
    * Get snakeCase
    * @return snakeCase
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Integer getSnakeCase() {
     return snakeCase;
@@ -75,6 +77,7 @@ public class Name {
    * Get property
    * @return property
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getProperty() {
     return property;
@@ -88,6 +91,7 @@ public class Name {
    * Get _123number
    * @return _123number
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Integer get123number() {
     return _123number;
diff --git a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/NumberOnly.java b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/NumberOnly.java
index 530a4d5818..4e29c814cc 100644
--- a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/NumberOnly.java
+++ b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/NumberOnly.java
@@ -39,6 +39,7 @@ public class NumberOnly {
    * Get justNumber
    * @return justNumber
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public BigDecimal getJustNumber() {
     return justNumber;
diff --git a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/Order.java b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/Order.java
index c6cee16a58..9e935d606e 100644
--- a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/Order.java
+++ b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/Order.java
@@ -91,6 +91,7 @@ public class Order {
    * Get id
    * @return id
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Long getId() {
     return id;
@@ -109,6 +110,7 @@ public class Order {
    * Get petId
    * @return petId
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Long getPetId() {
     return petId;
@@ -127,6 +129,7 @@ public class Order {
    * Get quantity
    * @return quantity
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Integer getQuantity() {
     return quantity;
@@ -145,6 +148,7 @@ public class Order {
    * Get shipDate
    * @return shipDate
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public OffsetDateTime getShipDate() {
     return shipDate;
@@ -163,6 +167,7 @@ public class Order {
    * Order Status
    * @return status
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "Order Status")
   public StatusEnum getStatus() {
     return status;
@@ -181,6 +186,7 @@ public class Order {
    * Get complete
    * @return complete
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Boolean getComplete() {
     return complete;
diff --git a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/OuterComposite.java b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/OuterComposite.java
index 6e71242384..f6515126a8 100644
--- a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/OuterComposite.java
+++ b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/OuterComposite.java
@@ -45,6 +45,7 @@ public class OuterComposite {
    * Get myNumber
    * @return myNumber
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public BigDecimal getMyNumber() {
     return myNumber;
@@ -63,6 +64,7 @@ public class OuterComposite {
    * Get myString
    * @return myString
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getMyString() {
     return myString;
@@ -81,6 +83,7 @@ public class OuterComposite {
    * Get myBoolean
    * @return myBoolean
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Boolean getMyBoolean() {
     return myBoolean;
diff --git a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/Pet.java b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/Pet.java
index 8a2408a296..63e9b4ff5d 100644
--- a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/Pet.java
+++ b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/Pet.java
@@ -94,6 +94,7 @@ public class Pet {
    * Get id
    * @return id
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Long getId() {
     return id;
@@ -112,6 +113,7 @@ public class Pet {
    * Get category
    * @return category
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Category getCategory() {
     return category;
@@ -130,6 +132,7 @@ public class Pet {
    * Get name
    * @return name
   **/
+
   @ApiModelProperty(example = "doggie", required = true, value = "")
   public String getName() {
     return name;
@@ -153,6 +156,7 @@ public class Pet {
    * Get photoUrls
    * @return photoUrls
   **/
+
   @ApiModelProperty(required = true, value = "")
   public List<String> getPhotoUrls() {
     return photoUrls;
@@ -179,6 +183,7 @@ public class Pet {
    * Get tags
    * @return tags
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public List<Tag> getTags() {
     return tags;
@@ -197,6 +202,7 @@ public class Pet {
    * pet status in the store
    * @return status
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "pet status in the store")
   public StatusEnum getStatus() {
     return status;
diff --git a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/ReadOnlyFirst.java b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/ReadOnlyFirst.java
index 83f25c7923..a2c9e99699 100644
--- a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/ReadOnlyFirst.java
+++ b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/ReadOnlyFirst.java
@@ -36,6 +36,7 @@ public class ReadOnlyFirst {
    * Get bar
    * @return bar
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getBar() {
     return bar;
@@ -50,6 +51,7 @@ public class ReadOnlyFirst {
    * Get baz
    * @return baz
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getBaz() {
     return baz;
diff --git a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/SpecialModelName.java b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/SpecialModelName.java
index 5abfc132ad..a5ddb0b638 100644
--- a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/SpecialModelName.java
+++ b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/SpecialModelName.java
@@ -38,6 +38,7 @@ public class SpecialModelName {
    * Get $specialPropertyName
    * @return $specialPropertyName
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Long get$SpecialPropertyName() {
     return $specialPropertyName;
diff --git a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/Tag.java b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/Tag.java
index e2e947b84a..8255ad8298 100644
--- a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/Tag.java
+++ b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/Tag.java
@@ -41,6 +41,7 @@ public class Tag {
    * Get id
    * @return id
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Long getId() {
     return id;
@@ -59,6 +60,7 @@ public class Tag {
    * Get name
    * @return name
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getName() {
     return name;
diff --git a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/TypeHolderDefault.java b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/TypeHolderDefault.java
index 9d0f5b2fbe..d8c7b3efdd 100644
--- a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/TypeHolderDefault.java
+++ b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/TypeHolderDefault.java
@@ -53,6 +53,7 @@ public class TypeHolderDefault {
    * Get stringItem
    * @return stringItem
   **/
+
   @ApiModelProperty(required = true, value = "")
   public String getStringItem() {
     return stringItem;
@@ -71,6 +72,7 @@ public class TypeHolderDefault {
    * Get numberItem
    * @return numberItem
   **/
+
   @ApiModelProperty(required = true, value = "")
   public BigDecimal getNumberItem() {
     return numberItem;
@@ -89,6 +91,7 @@ public class TypeHolderDefault {
    * Get integerItem
    * @return integerItem
   **/
+
   @ApiModelProperty(required = true, value = "")
   public Integer getIntegerItem() {
     return integerItem;
@@ -107,6 +110,7 @@ public class TypeHolderDefault {
    * Get boolItem
    * @return boolItem
   **/
+
   @ApiModelProperty(required = true, value = "")
   public Boolean getBoolItem() {
     return boolItem;
@@ -130,6 +134,7 @@ public class TypeHolderDefault {
    * Get arrayItem
    * @return arrayItem
   **/
+
   @ApiModelProperty(required = true, value = "")
   public List<Integer> getArrayItem() {
     return arrayItem;
diff --git a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/TypeHolderExample.java b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/TypeHolderExample.java
index 94d3c57b6f..c1d5ea30f8 100644
--- a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/TypeHolderExample.java
+++ b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/TypeHolderExample.java
@@ -53,6 +53,7 @@ public class TypeHolderExample {
    * Get stringItem
    * @return stringItem
   **/
+
   @ApiModelProperty(example = "what", required = true, value = "")
   public String getStringItem() {
     return stringItem;
@@ -71,6 +72,7 @@ public class TypeHolderExample {
    * Get numberItem
    * @return numberItem
   **/
+
   @ApiModelProperty(example = "1.234", required = true, value = "")
   public BigDecimal getNumberItem() {
     return numberItem;
@@ -89,6 +91,7 @@ public class TypeHolderExample {
    * Get integerItem
    * @return integerItem
   **/
+
   @ApiModelProperty(example = "-2", required = true, value = "")
   public Integer getIntegerItem() {
     return integerItem;
@@ -107,6 +110,7 @@ public class TypeHolderExample {
    * Get boolItem
    * @return boolItem
   **/
+
   @ApiModelProperty(example = "true", required = true, value = "")
   public Boolean getBoolItem() {
     return boolItem;
@@ -130,6 +134,7 @@ public class TypeHolderExample {
    * Get arrayItem
    * @return arrayItem
   **/
+
   @ApiModelProperty(example = "[0, 1, 2, 3]", required = true, value = "")
   public List<Integer> getArrayItem() {
     return arrayItem;
diff --git a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/User.java b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/User.java
index ee3f656a1a..6e6c4ac102 100644
--- a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/User.java
+++ b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/User.java
@@ -59,6 +59,7 @@ public class User {
    * Get id
    * @return id
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Long getId() {
     return id;
@@ -77,6 +78,7 @@ public class User {
    * Get username
    * @return username
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getUsername() {
     return username;
@@ -95,6 +97,7 @@ public class User {
    * Get firstName
    * @return firstName
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getFirstName() {
     return firstName;
@@ -113,6 +116,7 @@ public class User {
    * Get lastName
    * @return lastName
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getLastName() {
     return lastName;
@@ -131,6 +135,7 @@ public class User {
    * Get email
    * @return email
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getEmail() {
     return email;
@@ -149,6 +154,7 @@ public class User {
    * Get password
    * @return password
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getPassword() {
     return password;
@@ -167,6 +173,7 @@ public class User {
    * Get phone
    * @return phone
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getPhone() {
     return phone;
@@ -185,6 +192,7 @@ public class User {
    * User Status
    * @return userStatus
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "User Status")
   public Integer getUserStatus() {
     return userStatus;
diff --git a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/XmlItem.java b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/XmlItem.java
index cb31157306..ce4af3e8b9 100644
--- a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/XmlItem.java
+++ b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/XmlItem.java
@@ -125,6 +125,7 @@ public class XmlItem {
    * Get attributeString
    * @return attributeString
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(example = "string", value = "")
   public String getAttributeString() {
     return attributeString;
@@ -143,6 +144,7 @@ public class XmlItem {
    * Get attributeNumber
    * @return attributeNumber
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(example = "1.234", value = "")
   public BigDecimal getAttributeNumber() {
     return attributeNumber;
@@ -161,6 +163,7 @@ public class XmlItem {
    * Get attributeInteger
    * @return attributeInteger
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(example = "-2", value = "")
   public Integer getAttributeInteger() {
     return attributeInteger;
@@ -179,6 +182,7 @@ public class XmlItem {
    * Get attributeBoolean
    * @return attributeBoolean
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(example = "true", value = "")
   public Boolean getAttributeBoolean() {
     return attributeBoolean;
@@ -205,6 +209,7 @@ public class XmlItem {
    * Get wrappedArray
    * @return wrappedArray
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public List<Integer> getWrappedArray() {
     return wrappedArray;
@@ -223,6 +228,7 @@ public class XmlItem {
    * Get nameString
    * @return nameString
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(example = "string", value = "")
   public String getNameString() {
     return nameString;
@@ -241,6 +247,7 @@ public class XmlItem {
    * Get nameNumber
    * @return nameNumber
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(example = "1.234", value = "")
   public BigDecimal getNameNumber() {
     return nameNumber;
@@ -259,6 +266,7 @@ public class XmlItem {
    * Get nameInteger
    * @return nameInteger
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(example = "-2", value = "")
   public Integer getNameInteger() {
     return nameInteger;
@@ -277,6 +285,7 @@ public class XmlItem {
    * Get nameBoolean
    * @return nameBoolean
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(example = "true", value = "")
   public Boolean getNameBoolean() {
     return nameBoolean;
@@ -303,6 +312,7 @@ public class XmlItem {
    * Get nameArray
    * @return nameArray
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public List<Integer> getNameArray() {
     return nameArray;
@@ -329,6 +339,7 @@ public class XmlItem {
    * Get nameWrappedArray
    * @return nameWrappedArray
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public List<Integer> getNameWrappedArray() {
     return nameWrappedArray;
@@ -347,6 +358,7 @@ public class XmlItem {
    * Get prefixString
    * @return prefixString
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(example = "string", value = "")
   public String getPrefixString() {
     return prefixString;
@@ -365,6 +377,7 @@ public class XmlItem {
    * Get prefixNumber
    * @return prefixNumber
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(example = "1.234", value = "")
   public BigDecimal getPrefixNumber() {
     return prefixNumber;
@@ -383,6 +396,7 @@ public class XmlItem {
    * Get prefixInteger
    * @return prefixInteger
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(example = "-2", value = "")
   public Integer getPrefixInteger() {
     return prefixInteger;
@@ -401,6 +415,7 @@ public class XmlItem {
    * Get prefixBoolean
    * @return prefixBoolean
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(example = "true", value = "")
   public Boolean getPrefixBoolean() {
     return prefixBoolean;
@@ -427,6 +442,7 @@ public class XmlItem {
    * Get prefixArray
    * @return prefixArray
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public List<Integer> getPrefixArray() {
     return prefixArray;
@@ -453,6 +469,7 @@ public class XmlItem {
    * Get prefixWrappedArray
    * @return prefixWrappedArray
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public List<Integer> getPrefixWrappedArray() {
     return prefixWrappedArray;
@@ -471,6 +488,7 @@ public class XmlItem {
    * Get namespaceString
    * @return namespaceString
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(example = "string", value = "")
   public String getNamespaceString() {
     return namespaceString;
@@ -489,6 +507,7 @@ public class XmlItem {
    * Get namespaceNumber
    * @return namespaceNumber
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(example = "1.234", value = "")
   public BigDecimal getNamespaceNumber() {
     return namespaceNumber;
@@ -507,6 +526,7 @@ public class XmlItem {
    * Get namespaceInteger
    * @return namespaceInteger
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(example = "-2", value = "")
   public Integer getNamespaceInteger() {
     return namespaceInteger;
@@ -525,6 +545,7 @@ public class XmlItem {
    * Get namespaceBoolean
    * @return namespaceBoolean
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(example = "true", value = "")
   public Boolean getNamespaceBoolean() {
     return namespaceBoolean;
@@ -551,6 +572,7 @@ public class XmlItem {
    * Get namespaceArray
    * @return namespaceArray
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public List<Integer> getNamespaceArray() {
     return namespaceArray;
@@ -577,6 +599,7 @@ public class XmlItem {
    * Get namespaceWrappedArray
    * @return namespaceWrappedArray
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public List<Integer> getNamespaceWrappedArray() {
     return namespaceWrappedArray;
@@ -595,6 +618,7 @@ public class XmlItem {
    * Get prefixNsString
    * @return prefixNsString
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(example = "string", value = "")
   public String getPrefixNsString() {
     return prefixNsString;
@@ -613,6 +637,7 @@ public class XmlItem {
    * Get prefixNsNumber
    * @return prefixNsNumber
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(example = "1.234", value = "")
   public BigDecimal getPrefixNsNumber() {
     return prefixNsNumber;
@@ -631,6 +656,7 @@ public class XmlItem {
    * Get prefixNsInteger
    * @return prefixNsInteger
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(example = "-2", value = "")
   public Integer getPrefixNsInteger() {
     return prefixNsInteger;
@@ -649,6 +675,7 @@ public class XmlItem {
    * Get prefixNsBoolean
    * @return prefixNsBoolean
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(example = "true", value = "")
   public Boolean getPrefixNsBoolean() {
     return prefixNsBoolean;
@@ -675,6 +702,7 @@ public class XmlItem {
    * Get prefixNsArray
    * @return prefixNsArray
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public List<Integer> getPrefixNsArray() {
     return prefixNsArray;
@@ -701,6 +729,7 @@ public class XmlItem {
    * Get prefixNsWrappedArray
    * @return prefixNsWrappedArray
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public List<Integer> getPrefixNsWrappedArray() {
     return prefixNsWrappedArray;
diff --git a/samples/client/petstore/java/jersey1/build.gradle b/samples/client/petstore/java/jersey1/build.gradle
index 1fbe205a65..111b509b38 100644
--- a/samples/client/petstore/java/jersey1/build.gradle
+++ b/samples/client/petstore/java/jersey1/build.gradle
@@ -121,6 +121,7 @@ ext {
 
 dependencies {
     compile "io.swagger:swagger-annotations:$swagger_annotations_version"
+    compile "com.google.code.findbugs:jsr305:3.0.2"
     compile "com.sun.jersey:jersey-client:$jersey_version"
     compile "com.sun.jersey.contribs:jersey-multipart:$jersey_version"
     compile "com.fasterxml.jackson.core:jackson-core:$jackson_version"
diff --git a/samples/client/petstore/java/jersey1/pom.xml b/samples/client/petstore/java/jersey1/pom.xml
index a6c96d94d1..80243d26d1 100644
--- a/samples/client/petstore/java/jersey1/pom.xml
+++ b/samples/client/petstore/java/jersey1/pom.xml
@@ -201,6 +201,14 @@
             <version>${swagger-annotations-version}</version>
         </dependency>
 
+        <!-- @Nullable annotation -->
+        <dependency>
+            <groupId>com.google.code.findbugs</groupId>
+            <artifactId>jsr305</artifactId>
+            <version>3.0.2</version>
+        </dependency>
+
+
         <!-- HTTP client: jersey-client -->
         <dependency>
             <groupId>com.sun.jersey</groupId>
diff --git a/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/AdditionalPropertiesAnyType.java b/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/AdditionalPropertiesAnyType.java
index d223a661f8..1abb2d8a64 100644
--- a/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/AdditionalPropertiesAnyType.java
+++ b/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/AdditionalPropertiesAnyType.java
@@ -40,6 +40,7 @@ public class AdditionalPropertiesAnyType extends HashMap<String, Object> {
    * Get name
    * @return name
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getName() {
     return name;
diff --git a/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/AdditionalPropertiesArray.java b/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/AdditionalPropertiesArray.java
index db738129d0..1821c243e1 100644
--- a/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/AdditionalPropertiesArray.java
+++ b/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/AdditionalPropertiesArray.java
@@ -41,6 +41,7 @@ public class AdditionalPropertiesArray extends HashMap<String, List> {
    * Get name
    * @return name
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getName() {
     return name;
diff --git a/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/AdditionalPropertiesBoolean.java b/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/AdditionalPropertiesBoolean.java
index 754ff32555..78f7ac79b2 100644
--- a/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/AdditionalPropertiesBoolean.java
+++ b/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/AdditionalPropertiesBoolean.java
@@ -40,6 +40,7 @@ public class AdditionalPropertiesBoolean extends HashMap<String, Boolean> {
    * Get name
    * @return name
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getName() {
     return name;
diff --git a/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java b/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java
index 2de7a27185..406bccc278 100644
--- a/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java
+++ b/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java
@@ -80,6 +80,7 @@ public class AdditionalPropertiesClass {
    * Get mapString
    * @return mapString
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Map<String, String> getMapString() {
     return mapString;
@@ -106,6 +107,7 @@ public class AdditionalPropertiesClass {
    * Get mapNumber
    * @return mapNumber
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Map<String, BigDecimal> getMapNumber() {
     return mapNumber;
@@ -132,6 +134,7 @@ public class AdditionalPropertiesClass {
    * Get mapInteger
    * @return mapInteger
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Map<String, Integer> getMapInteger() {
     return mapInteger;
@@ -158,6 +161,7 @@ public class AdditionalPropertiesClass {
    * Get mapBoolean
    * @return mapBoolean
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Map<String, Boolean> getMapBoolean() {
     return mapBoolean;
@@ -184,6 +188,7 @@ public class AdditionalPropertiesClass {
    * Get mapArrayInteger
    * @return mapArrayInteger
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Map<String, List<Integer>> getMapArrayInteger() {
     return mapArrayInteger;
@@ -210,6 +215,7 @@ public class AdditionalPropertiesClass {
    * Get mapArrayAnytype
    * @return mapArrayAnytype
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Map<String, List<Object>> getMapArrayAnytype() {
     return mapArrayAnytype;
@@ -236,6 +242,7 @@ public class AdditionalPropertiesClass {
    * Get mapMapString
    * @return mapMapString
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Map<String, Map<String, String>> getMapMapString() {
     return mapMapString;
@@ -262,6 +269,7 @@ public class AdditionalPropertiesClass {
    * Get mapMapAnytype
    * @return mapMapAnytype
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Map<String, Map<String, Object>> getMapMapAnytype() {
     return mapMapAnytype;
@@ -280,6 +288,7 @@ public class AdditionalPropertiesClass {
    * Get anytype1
    * @return anytype1
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Object getAnytype1() {
     return anytype1;
@@ -298,6 +307,7 @@ public class AdditionalPropertiesClass {
    * Get anytype2
    * @return anytype2
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Object getAnytype2() {
     return anytype2;
@@ -316,6 +326,7 @@ public class AdditionalPropertiesClass {
    * Get anytype3
    * @return anytype3
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Object getAnytype3() {
     return anytype3;
diff --git a/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/AdditionalPropertiesInteger.java b/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/AdditionalPropertiesInteger.java
index 1f61976466..6e5159d404 100644
--- a/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/AdditionalPropertiesInteger.java
+++ b/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/AdditionalPropertiesInteger.java
@@ -40,6 +40,7 @@ public class AdditionalPropertiesInteger extends HashMap<String, Integer> {
    * Get name
    * @return name
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getName() {
     return name;
diff --git a/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/AdditionalPropertiesNumber.java b/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/AdditionalPropertiesNumber.java
index 474d7b8f04..ddc8146dea 100644
--- a/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/AdditionalPropertiesNumber.java
+++ b/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/AdditionalPropertiesNumber.java
@@ -41,6 +41,7 @@ public class AdditionalPropertiesNumber extends HashMap<String, BigDecimal> {
    * Get name
    * @return name
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getName() {
     return name;
diff --git a/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/AdditionalPropertiesObject.java b/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/AdditionalPropertiesObject.java
index 40ff424fe4..cc29400029 100644
--- a/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/AdditionalPropertiesObject.java
+++ b/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/AdditionalPropertiesObject.java
@@ -40,6 +40,7 @@ public class AdditionalPropertiesObject extends HashMap<String, Map> {
    * Get name
    * @return name
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getName() {
     return name;
diff --git a/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/AdditionalPropertiesString.java b/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/AdditionalPropertiesString.java
index eeaedf3bda..fb3368dfed 100644
--- a/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/AdditionalPropertiesString.java
+++ b/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/AdditionalPropertiesString.java
@@ -40,6 +40,7 @@ public class AdditionalPropertiesString extends HashMap<String, String> {
    * Get name
    * @return name
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getName() {
     return name;
diff --git a/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/Animal.java b/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/Animal.java
index f210737e12..53a0eec339 100644
--- a/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/Animal.java
+++ b/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/Animal.java
@@ -49,6 +49,7 @@ public class Animal {
    * Get className
    * @return className
   **/
+
   @ApiModelProperty(required = true, value = "")
   public String getClassName() {
     return className;
@@ -67,6 +68,7 @@ public class Animal {
    * Get color
    * @return color
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getColor() {
     return color;
diff --git a/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java b/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java
index f5c02b2326..de49df3fbd 100644
--- a/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java
+++ b/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java
@@ -49,6 +49,7 @@ public class ArrayOfArrayOfNumberOnly {
    * Get arrayArrayNumber
    * @return arrayArrayNumber
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public List<List<BigDecimal>> getArrayArrayNumber() {
     return arrayArrayNumber;
diff --git a/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java b/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java
index 2dcfdf3c78..f4399ff42d 100644
--- a/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java
+++ b/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java
@@ -49,6 +49,7 @@ public class ArrayOfNumberOnly {
    * Get arrayNumber
    * @return arrayNumber
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public List<BigDecimal> getArrayNumber() {
     return arrayNumber;
diff --git a/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/ArrayTest.java b/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/ArrayTest.java
index 0778fc2d8f..7483fa96ce 100644
--- a/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/ArrayTest.java
+++ b/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/ArrayTest.java
@@ -55,6 +55,7 @@ public class ArrayTest {
    * Get arrayOfString
    * @return arrayOfString
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public List<String> getArrayOfString() {
     return arrayOfString;
@@ -81,6 +82,7 @@ public class ArrayTest {
    * Get arrayArrayOfInteger
    * @return arrayArrayOfInteger
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public List<List<Long>> getArrayArrayOfInteger() {
     return arrayArrayOfInteger;
@@ -107,6 +109,7 @@ public class ArrayTest {
    * Get arrayArrayOfModel
    * @return arrayArrayOfModel
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public List<List<ReadOnlyFirst>> getArrayArrayOfModel() {
     return arrayArrayOfModel;
diff --git a/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/Capitalization.java b/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/Capitalization.java
index cedbd8c9db..bb83be97fe 100644
--- a/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/Capitalization.java
+++ b/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/Capitalization.java
@@ -53,6 +53,7 @@ public class Capitalization {
    * Get smallCamel
    * @return smallCamel
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getSmallCamel() {
     return smallCamel;
@@ -71,6 +72,7 @@ public class Capitalization {
    * Get capitalCamel
    * @return capitalCamel
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getCapitalCamel() {
     return capitalCamel;
@@ -89,6 +91,7 @@ public class Capitalization {
    * Get smallSnake
    * @return smallSnake
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getSmallSnake() {
     return smallSnake;
@@ -107,6 +110,7 @@ public class Capitalization {
    * Get capitalSnake
    * @return capitalSnake
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getCapitalSnake() {
     return capitalSnake;
@@ -125,6 +129,7 @@ public class Capitalization {
    * Get scAETHFlowPoints
    * @return scAETHFlowPoints
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getScAETHFlowPoints() {
     return scAETHFlowPoints;
@@ -143,6 +148,7 @@ public class Capitalization {
    * Name of the pet 
    * @return ATT_NAME
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "Name of the pet ")
   public String getATTNAME() {
     return ATT_NAME;
diff --git a/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/Cat.java b/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/Cat.java
index 40f40f869e..ce456c8647 100644
--- a/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/Cat.java
+++ b/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/Cat.java
@@ -40,6 +40,7 @@ public class Cat extends Animal {
    * Get declawed
    * @return declawed
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Boolean getDeclawed() {
     return declawed;
diff --git a/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/CatAllOf.java b/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/CatAllOf.java
index 0e8a7f8fa9..224c08671c 100644
--- a/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/CatAllOf.java
+++ b/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/CatAllOf.java
@@ -38,6 +38,7 @@ public class CatAllOf {
    * Get declawed
    * @return declawed
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Boolean getDeclawed() {
     return declawed;
diff --git a/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/Category.java b/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/Category.java
index baf44c948a..03efdd4be8 100644
--- a/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/Category.java
+++ b/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/Category.java
@@ -41,6 +41,7 @@ public class Category {
    * Get id
    * @return id
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Long getId() {
     return id;
@@ -59,6 +60,7 @@ public class Category {
    * Get name
    * @return name
   **/
+
   @ApiModelProperty(required = true, value = "")
   public String getName() {
     return name;
diff --git a/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/ClassModel.java b/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/ClassModel.java
index 0904f531de..def421a670 100644
--- a/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/ClassModel.java
+++ b/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/ClassModel.java
@@ -39,6 +39,7 @@ public class ClassModel {
    * Get propertyClass
    * @return propertyClass
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getPropertyClass() {
     return propertyClass;
diff --git a/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/Client.java b/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/Client.java
index 9ebcc7294e..c0bd0743e5 100644
--- a/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/Client.java
+++ b/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/Client.java
@@ -38,6 +38,7 @@ public class Client {
    * Get client
    * @return client
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getClient() {
     return client;
diff --git a/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/Dog.java b/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/Dog.java
index 3b1c570cb4..6b79c59606 100644
--- a/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/Dog.java
+++ b/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/Dog.java
@@ -40,6 +40,7 @@ public class Dog extends Animal {
    * Get breed
    * @return breed
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getBreed() {
     return breed;
diff --git a/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/DogAllOf.java b/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/DogAllOf.java
index cb95a6a372..1a4496d8f0 100644
--- a/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/DogAllOf.java
+++ b/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/DogAllOf.java
@@ -38,6 +38,7 @@ public class DogAllOf {
    * Get breed
    * @return breed
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getBreed() {
     return breed;
diff --git a/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/EnumArrays.java b/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/EnumArrays.java
index 03bcbcbd1f..e0b5a0b760 100644
--- a/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/EnumArrays.java
+++ b/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/EnumArrays.java
@@ -113,6 +113,7 @@ public class EnumArrays {
    * Get justSymbol
    * @return justSymbol
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public JustSymbolEnum getJustSymbol() {
     return justSymbol;
@@ -139,6 +140,7 @@ public class EnumArrays {
    * Get arrayEnum
    * @return arrayEnum
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public List<ArrayEnumEnum> getArrayEnum() {
     return arrayEnum;
diff --git a/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/EnumTest.java b/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/EnumTest.java
index d7c41d3017..3d5976cb9e 100644
--- a/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/EnumTest.java
+++ b/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/EnumTest.java
@@ -195,6 +195,7 @@ public class EnumTest {
    * Get enumString
    * @return enumString
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public EnumStringEnum getEnumString() {
     return enumString;
@@ -213,6 +214,7 @@ public class EnumTest {
    * Get enumStringRequired
    * @return enumStringRequired
   **/
+
   @ApiModelProperty(required = true, value = "")
   public EnumStringRequiredEnum getEnumStringRequired() {
     return enumStringRequired;
@@ -231,6 +233,7 @@ public class EnumTest {
    * Get enumInteger
    * @return enumInteger
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public EnumIntegerEnum getEnumInteger() {
     return enumInteger;
@@ -249,6 +252,7 @@ public class EnumTest {
    * Get enumNumber
    * @return enumNumber
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public EnumNumberEnum getEnumNumber() {
     return enumNumber;
@@ -267,6 +271,7 @@ public class EnumTest {
    * Get outerEnum
    * @return outerEnum
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public OuterEnum getOuterEnum() {
     return outerEnum;
diff --git a/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java b/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java
index 326b1a90a3..bee77a8cec 100644
--- a/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java
+++ b/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java
@@ -43,6 +43,7 @@ public class FileSchemaTestClass {
    * Get file
    * @return file
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public java.io.File getFile() {
     return file;
@@ -69,6 +70,7 @@ public class FileSchemaTestClass {
    * Get files
    * @return files
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public List<java.io.File> getFiles() {
     return files;
diff --git a/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/FormatTest.java b/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/FormatTest.java
index dd1c2d2f58..c017f57a80 100644
--- a/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/FormatTest.java
+++ b/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/FormatTest.java
@@ -81,6 +81,7 @@ public class FormatTest {
    * maximum: 100
    * @return integer
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Integer getInteger() {
     return integer;
@@ -101,6 +102,7 @@ public class FormatTest {
    * maximum: 200
    * @return int32
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Integer getInt32() {
     return int32;
@@ -119,6 +121,7 @@ public class FormatTest {
    * Get int64
    * @return int64
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Long getInt64() {
     return int64;
@@ -139,6 +142,7 @@ public class FormatTest {
    * maximum: 543.2
    * @return number
   **/
+
   @ApiModelProperty(required = true, value = "")
   public BigDecimal getNumber() {
     return number;
@@ -159,6 +163,7 @@ public class FormatTest {
    * maximum: 987.6
    * @return _float
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Float getFloat() {
     return _float;
@@ -179,6 +184,7 @@ public class FormatTest {
    * maximum: 123.4
    * @return _double
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Double getDouble() {
     return _double;
@@ -197,6 +203,7 @@ public class FormatTest {
    * Get string
    * @return string
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getString() {
     return string;
@@ -215,6 +222,7 @@ public class FormatTest {
    * Get _byte
    * @return _byte
   **/
+
   @ApiModelProperty(required = true, value = "")
   public byte[] getByte() {
     return _byte;
@@ -233,6 +241,7 @@ public class FormatTest {
    * Get binary
    * @return binary
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public File getBinary() {
     return binary;
@@ -251,6 +260,7 @@ public class FormatTest {
    * Get date
    * @return date
   **/
+
   @ApiModelProperty(required = true, value = "")
   public LocalDate getDate() {
     return date;
@@ -269,6 +279,7 @@ public class FormatTest {
    * Get dateTime
    * @return dateTime
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public OffsetDateTime getDateTime() {
     return dateTime;
@@ -287,6 +298,7 @@ public class FormatTest {
    * Get uuid
    * @return uuid
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(example = "72f98069-206d-4f12-9f12-3d1e525a8e84", value = "")
   public UUID getUuid() {
     return uuid;
@@ -305,6 +317,7 @@ public class FormatTest {
    * Get password
    * @return password
   **/
+
   @ApiModelProperty(required = true, value = "")
   public String getPassword() {
     return password;
diff --git a/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java b/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java
index 4dbede6b7d..44159e08e8 100644
--- a/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java
+++ b/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java
@@ -36,6 +36,7 @@ public class HasOnlyReadOnly {
    * Get bar
    * @return bar
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getBar() {
     return bar;
@@ -45,6 +46,7 @@ public class HasOnlyReadOnly {
    * Get foo
    * @return foo
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getFoo() {
     return foo;
diff --git a/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/MapTest.java b/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/MapTest.java
index c47f037575..65ab3afca0 100644
--- a/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/MapTest.java
+++ b/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/MapTest.java
@@ -93,6 +93,7 @@ public class MapTest {
    * Get mapMapOfString
    * @return mapMapOfString
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Map<String, Map<String, String>> getMapMapOfString() {
     return mapMapOfString;
@@ -119,6 +120,7 @@ public class MapTest {
    * Get mapOfEnumString
    * @return mapOfEnumString
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Map<String, InnerEnum> getMapOfEnumString() {
     return mapOfEnumString;
@@ -145,6 +147,7 @@ public class MapTest {
    * Get directMap
    * @return directMap
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Map<String, Boolean> getDirectMap() {
     return directMap;
@@ -171,6 +174,7 @@ public class MapTest {
    * Get indirectMap
    * @return indirectMap
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Map<String, Boolean> getIndirectMap() {
     return indirectMap;
diff --git a/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java
index 0adbe0caa7..ea930e3e2e 100644
--- a/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java
+++ b/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java
@@ -50,6 +50,7 @@ public class MixedPropertiesAndAdditionalPropertiesClass {
    * Get uuid
    * @return uuid
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public UUID getUuid() {
     return uuid;
@@ -68,6 +69,7 @@ public class MixedPropertiesAndAdditionalPropertiesClass {
    * Get dateTime
    * @return dateTime
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public OffsetDateTime getDateTime() {
     return dateTime;
@@ -94,6 +96,7 @@ public class MixedPropertiesAndAdditionalPropertiesClass {
    * Get map
    * @return map
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Map<String, Animal> getMap() {
     return map;
diff --git a/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/Model200Response.java b/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/Model200Response.java
index 3be60ea3ae..bd3244dd57 100644
--- a/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/Model200Response.java
+++ b/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/Model200Response.java
@@ -42,6 +42,7 @@ public class Model200Response {
    * Get name
    * @return name
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Integer getName() {
     return name;
@@ -60,6 +61,7 @@ public class Model200Response {
    * Get propertyClass
    * @return propertyClass
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getPropertyClass() {
     return propertyClass;
diff --git a/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/ModelApiResponse.java b/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/ModelApiResponse.java
index 6e458e38dc..ed335cdca1 100644
--- a/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/ModelApiResponse.java
+++ b/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/ModelApiResponse.java
@@ -44,6 +44,7 @@ public class ModelApiResponse {
    * Get code
    * @return code
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Integer getCode() {
     return code;
@@ -62,6 +63,7 @@ public class ModelApiResponse {
    * Get type
    * @return type
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getType() {
     return type;
@@ -80,6 +82,7 @@ public class ModelApiResponse {
    * Get message
    * @return message
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getMessage() {
     return message;
diff --git a/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/ModelReturn.java b/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/ModelReturn.java
index 62e5295212..04c0bcd33f 100644
--- a/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/ModelReturn.java
+++ b/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/ModelReturn.java
@@ -39,6 +39,7 @@ public class ModelReturn {
    * Get _return
    * @return _return
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Integer getReturn() {
     return _return;
diff --git a/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/Name.java b/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/Name.java
index 852a999035..af27c6e45f 100644
--- a/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/Name.java
+++ b/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/Name.java
@@ -48,6 +48,7 @@ public class Name {
    * Get name
    * @return name
   **/
+
   @ApiModelProperty(required = true, value = "")
   public Integer getName() {
     return name;
@@ -61,6 +62,7 @@ public class Name {
    * Get snakeCase
    * @return snakeCase
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Integer getSnakeCase() {
     return snakeCase;
@@ -75,6 +77,7 @@ public class Name {
    * Get property
    * @return property
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getProperty() {
     return property;
@@ -88,6 +91,7 @@ public class Name {
    * Get _123number
    * @return _123number
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Integer get123number() {
     return _123number;
diff --git a/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/NumberOnly.java b/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/NumberOnly.java
index 530a4d5818..4e29c814cc 100644
--- a/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/NumberOnly.java
+++ b/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/NumberOnly.java
@@ -39,6 +39,7 @@ public class NumberOnly {
    * Get justNumber
    * @return justNumber
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public BigDecimal getJustNumber() {
     return justNumber;
diff --git a/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/Order.java b/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/Order.java
index 3a7801b65b..18197114a2 100644
--- a/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/Order.java
+++ b/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/Order.java
@@ -91,6 +91,7 @@ public class Order {
    * Get id
    * @return id
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Long getId() {
     return id;
@@ -109,6 +110,7 @@ public class Order {
    * Get petId
    * @return petId
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Long getPetId() {
     return petId;
@@ -127,6 +129,7 @@ public class Order {
    * Get quantity
    * @return quantity
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Integer getQuantity() {
     return quantity;
@@ -145,6 +148,7 @@ public class Order {
    * Get shipDate
    * @return shipDate
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public OffsetDateTime getShipDate() {
     return shipDate;
@@ -163,6 +167,7 @@ public class Order {
    * Order Status
    * @return status
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "Order Status")
   public StatusEnum getStatus() {
     return status;
@@ -181,6 +186,7 @@ public class Order {
    * Get complete
    * @return complete
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Boolean getComplete() {
     return complete;
diff --git a/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/OuterComposite.java b/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/OuterComposite.java
index 6e71242384..f6515126a8 100644
--- a/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/OuterComposite.java
+++ b/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/OuterComposite.java
@@ -45,6 +45,7 @@ public class OuterComposite {
    * Get myNumber
    * @return myNumber
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public BigDecimal getMyNumber() {
     return myNumber;
@@ -63,6 +64,7 @@ public class OuterComposite {
    * Get myString
    * @return myString
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getMyString() {
     return myString;
@@ -81,6 +83,7 @@ public class OuterComposite {
    * Get myBoolean
    * @return myBoolean
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Boolean getMyBoolean() {
     return myBoolean;
diff --git a/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/Pet.java b/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/Pet.java
index f604115ce9..0e52f36237 100644
--- a/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/Pet.java
+++ b/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/Pet.java
@@ -94,6 +94,7 @@ public class Pet {
    * Get id
    * @return id
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Long getId() {
     return id;
@@ -112,6 +113,7 @@ public class Pet {
    * Get category
    * @return category
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Category getCategory() {
     return category;
@@ -130,6 +132,7 @@ public class Pet {
    * Get name
    * @return name
   **/
+
   @ApiModelProperty(example = "doggie", required = true, value = "")
   public String getName() {
     return name;
@@ -153,6 +156,7 @@ public class Pet {
    * Get photoUrls
    * @return photoUrls
   **/
+
   @ApiModelProperty(required = true, value = "")
   public List<String> getPhotoUrls() {
     return photoUrls;
@@ -179,6 +183,7 @@ public class Pet {
    * Get tags
    * @return tags
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public List<Tag> getTags() {
     return tags;
@@ -197,6 +202,7 @@ public class Pet {
    * pet status in the store
    * @return status
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "pet status in the store")
   public StatusEnum getStatus() {
     return status;
diff --git a/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/ReadOnlyFirst.java b/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/ReadOnlyFirst.java
index 83f25c7923..a2c9e99699 100644
--- a/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/ReadOnlyFirst.java
+++ b/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/ReadOnlyFirst.java
@@ -36,6 +36,7 @@ public class ReadOnlyFirst {
    * Get bar
    * @return bar
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getBar() {
     return bar;
@@ -50,6 +51,7 @@ public class ReadOnlyFirst {
    * Get baz
    * @return baz
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getBaz() {
     return baz;
diff --git a/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/SpecialModelName.java b/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/SpecialModelName.java
index 5abfc132ad..a5ddb0b638 100644
--- a/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/SpecialModelName.java
+++ b/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/SpecialModelName.java
@@ -38,6 +38,7 @@ public class SpecialModelName {
    * Get $specialPropertyName
    * @return $specialPropertyName
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Long get$SpecialPropertyName() {
     return $specialPropertyName;
diff --git a/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/Tag.java b/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/Tag.java
index e2e947b84a..8255ad8298 100644
--- a/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/Tag.java
+++ b/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/Tag.java
@@ -41,6 +41,7 @@ public class Tag {
    * Get id
    * @return id
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Long getId() {
     return id;
@@ -59,6 +60,7 @@ public class Tag {
    * Get name
    * @return name
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getName() {
     return name;
diff --git a/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/TypeHolderDefault.java b/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/TypeHolderDefault.java
index 9d0f5b2fbe..d8c7b3efdd 100644
--- a/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/TypeHolderDefault.java
+++ b/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/TypeHolderDefault.java
@@ -53,6 +53,7 @@ public class TypeHolderDefault {
    * Get stringItem
    * @return stringItem
   **/
+
   @ApiModelProperty(required = true, value = "")
   public String getStringItem() {
     return stringItem;
@@ -71,6 +72,7 @@ public class TypeHolderDefault {
    * Get numberItem
    * @return numberItem
   **/
+
   @ApiModelProperty(required = true, value = "")
   public BigDecimal getNumberItem() {
     return numberItem;
@@ -89,6 +91,7 @@ public class TypeHolderDefault {
    * Get integerItem
    * @return integerItem
   **/
+
   @ApiModelProperty(required = true, value = "")
   public Integer getIntegerItem() {
     return integerItem;
@@ -107,6 +110,7 @@ public class TypeHolderDefault {
    * Get boolItem
    * @return boolItem
   **/
+
   @ApiModelProperty(required = true, value = "")
   public Boolean getBoolItem() {
     return boolItem;
@@ -130,6 +134,7 @@ public class TypeHolderDefault {
    * Get arrayItem
    * @return arrayItem
   **/
+
   @ApiModelProperty(required = true, value = "")
   public List<Integer> getArrayItem() {
     return arrayItem;
diff --git a/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/TypeHolderExample.java b/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/TypeHolderExample.java
index 94d3c57b6f..c1d5ea30f8 100644
--- a/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/TypeHolderExample.java
+++ b/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/TypeHolderExample.java
@@ -53,6 +53,7 @@ public class TypeHolderExample {
    * Get stringItem
    * @return stringItem
   **/
+
   @ApiModelProperty(example = "what", required = true, value = "")
   public String getStringItem() {
     return stringItem;
@@ -71,6 +72,7 @@ public class TypeHolderExample {
    * Get numberItem
    * @return numberItem
   **/
+
   @ApiModelProperty(example = "1.234", required = true, value = "")
   public BigDecimal getNumberItem() {
     return numberItem;
@@ -89,6 +91,7 @@ public class TypeHolderExample {
    * Get integerItem
    * @return integerItem
   **/
+
   @ApiModelProperty(example = "-2", required = true, value = "")
   public Integer getIntegerItem() {
     return integerItem;
@@ -107,6 +110,7 @@ public class TypeHolderExample {
    * Get boolItem
    * @return boolItem
   **/
+
   @ApiModelProperty(example = "true", required = true, value = "")
   public Boolean getBoolItem() {
     return boolItem;
@@ -130,6 +134,7 @@ public class TypeHolderExample {
    * Get arrayItem
    * @return arrayItem
   **/
+
   @ApiModelProperty(example = "[0, 1, 2, 3]", required = true, value = "")
   public List<Integer> getArrayItem() {
     return arrayItem;
diff --git a/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/User.java b/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/User.java
index ee3f656a1a..6e6c4ac102 100644
--- a/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/User.java
+++ b/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/User.java
@@ -59,6 +59,7 @@ public class User {
    * Get id
    * @return id
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Long getId() {
     return id;
@@ -77,6 +78,7 @@ public class User {
    * Get username
    * @return username
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getUsername() {
     return username;
@@ -95,6 +97,7 @@ public class User {
    * Get firstName
    * @return firstName
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getFirstName() {
     return firstName;
@@ -113,6 +116,7 @@ public class User {
    * Get lastName
    * @return lastName
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getLastName() {
     return lastName;
@@ -131,6 +135,7 @@ public class User {
    * Get email
    * @return email
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getEmail() {
     return email;
@@ -149,6 +154,7 @@ public class User {
    * Get password
    * @return password
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getPassword() {
     return password;
@@ -167,6 +173,7 @@ public class User {
    * Get phone
    * @return phone
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getPhone() {
     return phone;
@@ -185,6 +192,7 @@ public class User {
    * User Status
    * @return userStatus
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "User Status")
   public Integer getUserStatus() {
     return userStatus;
diff --git a/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/XmlItem.java b/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/XmlItem.java
index cb31157306..ce4af3e8b9 100644
--- a/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/XmlItem.java
+++ b/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/XmlItem.java
@@ -125,6 +125,7 @@ public class XmlItem {
    * Get attributeString
    * @return attributeString
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(example = "string", value = "")
   public String getAttributeString() {
     return attributeString;
@@ -143,6 +144,7 @@ public class XmlItem {
    * Get attributeNumber
    * @return attributeNumber
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(example = "1.234", value = "")
   public BigDecimal getAttributeNumber() {
     return attributeNumber;
@@ -161,6 +163,7 @@ public class XmlItem {
    * Get attributeInteger
    * @return attributeInteger
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(example = "-2", value = "")
   public Integer getAttributeInteger() {
     return attributeInteger;
@@ -179,6 +182,7 @@ public class XmlItem {
    * Get attributeBoolean
    * @return attributeBoolean
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(example = "true", value = "")
   public Boolean getAttributeBoolean() {
     return attributeBoolean;
@@ -205,6 +209,7 @@ public class XmlItem {
    * Get wrappedArray
    * @return wrappedArray
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public List<Integer> getWrappedArray() {
     return wrappedArray;
@@ -223,6 +228,7 @@ public class XmlItem {
    * Get nameString
    * @return nameString
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(example = "string", value = "")
   public String getNameString() {
     return nameString;
@@ -241,6 +247,7 @@ public class XmlItem {
    * Get nameNumber
    * @return nameNumber
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(example = "1.234", value = "")
   public BigDecimal getNameNumber() {
     return nameNumber;
@@ -259,6 +266,7 @@ public class XmlItem {
    * Get nameInteger
    * @return nameInteger
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(example = "-2", value = "")
   public Integer getNameInteger() {
     return nameInteger;
@@ -277,6 +285,7 @@ public class XmlItem {
    * Get nameBoolean
    * @return nameBoolean
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(example = "true", value = "")
   public Boolean getNameBoolean() {
     return nameBoolean;
@@ -303,6 +312,7 @@ public class XmlItem {
    * Get nameArray
    * @return nameArray
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public List<Integer> getNameArray() {
     return nameArray;
@@ -329,6 +339,7 @@ public class XmlItem {
    * Get nameWrappedArray
    * @return nameWrappedArray
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public List<Integer> getNameWrappedArray() {
     return nameWrappedArray;
@@ -347,6 +358,7 @@ public class XmlItem {
    * Get prefixString
    * @return prefixString
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(example = "string", value = "")
   public String getPrefixString() {
     return prefixString;
@@ -365,6 +377,7 @@ public class XmlItem {
    * Get prefixNumber
    * @return prefixNumber
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(example = "1.234", value = "")
   public BigDecimal getPrefixNumber() {
     return prefixNumber;
@@ -383,6 +396,7 @@ public class XmlItem {
    * Get prefixInteger
    * @return prefixInteger
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(example = "-2", value = "")
   public Integer getPrefixInteger() {
     return prefixInteger;
@@ -401,6 +415,7 @@ public class XmlItem {
    * Get prefixBoolean
    * @return prefixBoolean
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(example = "true", value = "")
   public Boolean getPrefixBoolean() {
     return prefixBoolean;
@@ -427,6 +442,7 @@ public class XmlItem {
    * Get prefixArray
    * @return prefixArray
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public List<Integer> getPrefixArray() {
     return prefixArray;
@@ -453,6 +469,7 @@ public class XmlItem {
    * Get prefixWrappedArray
    * @return prefixWrappedArray
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public List<Integer> getPrefixWrappedArray() {
     return prefixWrappedArray;
@@ -471,6 +488,7 @@ public class XmlItem {
    * Get namespaceString
    * @return namespaceString
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(example = "string", value = "")
   public String getNamespaceString() {
     return namespaceString;
@@ -489,6 +507,7 @@ public class XmlItem {
    * Get namespaceNumber
    * @return namespaceNumber
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(example = "1.234", value = "")
   public BigDecimal getNamespaceNumber() {
     return namespaceNumber;
@@ -507,6 +526,7 @@ public class XmlItem {
    * Get namespaceInteger
    * @return namespaceInteger
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(example = "-2", value = "")
   public Integer getNamespaceInteger() {
     return namespaceInteger;
@@ -525,6 +545,7 @@ public class XmlItem {
    * Get namespaceBoolean
    * @return namespaceBoolean
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(example = "true", value = "")
   public Boolean getNamespaceBoolean() {
     return namespaceBoolean;
@@ -551,6 +572,7 @@ public class XmlItem {
    * Get namespaceArray
    * @return namespaceArray
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public List<Integer> getNamespaceArray() {
     return namespaceArray;
@@ -577,6 +599,7 @@ public class XmlItem {
    * Get namespaceWrappedArray
    * @return namespaceWrappedArray
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public List<Integer> getNamespaceWrappedArray() {
     return namespaceWrappedArray;
@@ -595,6 +618,7 @@ public class XmlItem {
    * Get prefixNsString
    * @return prefixNsString
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(example = "string", value = "")
   public String getPrefixNsString() {
     return prefixNsString;
@@ -613,6 +637,7 @@ public class XmlItem {
    * Get prefixNsNumber
    * @return prefixNsNumber
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(example = "1.234", value = "")
   public BigDecimal getPrefixNsNumber() {
     return prefixNsNumber;
@@ -631,6 +656,7 @@ public class XmlItem {
    * Get prefixNsInteger
    * @return prefixNsInteger
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(example = "-2", value = "")
   public Integer getPrefixNsInteger() {
     return prefixNsInteger;
@@ -649,6 +675,7 @@ public class XmlItem {
    * Get prefixNsBoolean
    * @return prefixNsBoolean
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(example = "true", value = "")
   public Boolean getPrefixNsBoolean() {
     return prefixNsBoolean;
@@ -675,6 +702,7 @@ public class XmlItem {
    * Get prefixNsArray
    * @return prefixNsArray
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public List<Integer> getPrefixNsArray() {
     return prefixNsArray;
@@ -701,6 +729,7 @@ public class XmlItem {
    * Get prefixNsWrappedArray
    * @return prefixNsWrappedArray
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public List<Integer> getPrefixNsWrappedArray() {
     return prefixNsWrappedArray;
diff --git a/samples/client/petstore/java/jersey2-java6/src/main/java/org/openapitools/client/model/AdditionalPropertiesAnyType.java b/samples/client/petstore/java/jersey2-java6/src/main/java/org/openapitools/client/model/AdditionalPropertiesAnyType.java
index 8a40c40388..6f77fd208c 100644
--- a/samples/client/petstore/java/jersey2-java6/src/main/java/org/openapitools/client/model/AdditionalPropertiesAnyType.java
+++ b/samples/client/petstore/java/jersey2-java6/src/main/java/org/openapitools/client/model/AdditionalPropertiesAnyType.java
@@ -39,6 +39,7 @@ public class AdditionalPropertiesAnyType extends HashMap<String, Object> {
    * Get name
    * @return name
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getName() {
     return name;
diff --git a/samples/client/petstore/java/jersey2-java6/src/main/java/org/openapitools/client/model/AdditionalPropertiesArray.java b/samples/client/petstore/java/jersey2-java6/src/main/java/org/openapitools/client/model/AdditionalPropertiesArray.java
index 591e8ff0cd..154f47fc70 100644
--- a/samples/client/petstore/java/jersey2-java6/src/main/java/org/openapitools/client/model/AdditionalPropertiesArray.java
+++ b/samples/client/petstore/java/jersey2-java6/src/main/java/org/openapitools/client/model/AdditionalPropertiesArray.java
@@ -40,6 +40,7 @@ public class AdditionalPropertiesArray extends HashMap<String, List> {
    * Get name
    * @return name
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getName() {
     return name;
diff --git a/samples/client/petstore/java/jersey2-java6/src/main/java/org/openapitools/client/model/AdditionalPropertiesBoolean.java b/samples/client/petstore/java/jersey2-java6/src/main/java/org/openapitools/client/model/AdditionalPropertiesBoolean.java
index d46e61f636..a0bec91daa 100644
--- a/samples/client/petstore/java/jersey2-java6/src/main/java/org/openapitools/client/model/AdditionalPropertiesBoolean.java
+++ b/samples/client/petstore/java/jersey2-java6/src/main/java/org/openapitools/client/model/AdditionalPropertiesBoolean.java
@@ -39,6 +39,7 @@ public class AdditionalPropertiesBoolean extends HashMap<String, Boolean> {
    * Get name
    * @return name
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getName() {
     return name;
diff --git a/samples/client/petstore/java/jersey2-java6/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java b/samples/client/petstore/java/jersey2-java6/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java
index d33ea1ab12..e179b284c1 100644
--- a/samples/client/petstore/java/jersey2-java6/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java
+++ b/samples/client/petstore/java/jersey2-java6/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java
@@ -79,6 +79,7 @@ public class AdditionalPropertiesClass {
    * Get mapString
    * @return mapString
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Map<String, String> getMapString() {
     return mapString;
@@ -105,6 +106,7 @@ public class AdditionalPropertiesClass {
    * Get mapNumber
    * @return mapNumber
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Map<String, BigDecimal> getMapNumber() {
     return mapNumber;
@@ -131,6 +133,7 @@ public class AdditionalPropertiesClass {
    * Get mapInteger
    * @return mapInteger
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Map<String, Integer> getMapInteger() {
     return mapInteger;
@@ -157,6 +160,7 @@ public class AdditionalPropertiesClass {
    * Get mapBoolean
    * @return mapBoolean
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Map<String, Boolean> getMapBoolean() {
     return mapBoolean;
@@ -183,6 +187,7 @@ public class AdditionalPropertiesClass {
    * Get mapArrayInteger
    * @return mapArrayInteger
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Map<String, List<Integer>> getMapArrayInteger() {
     return mapArrayInteger;
@@ -209,6 +214,7 @@ public class AdditionalPropertiesClass {
    * Get mapArrayAnytype
    * @return mapArrayAnytype
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Map<String, List<Object>> getMapArrayAnytype() {
     return mapArrayAnytype;
@@ -235,6 +241,7 @@ public class AdditionalPropertiesClass {
    * Get mapMapString
    * @return mapMapString
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Map<String, Map<String, String>> getMapMapString() {
     return mapMapString;
@@ -261,6 +268,7 @@ public class AdditionalPropertiesClass {
    * Get mapMapAnytype
    * @return mapMapAnytype
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Map<String, Map<String, Object>> getMapMapAnytype() {
     return mapMapAnytype;
@@ -279,6 +287,7 @@ public class AdditionalPropertiesClass {
    * Get anytype1
    * @return anytype1
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Object getAnytype1() {
     return anytype1;
@@ -297,6 +306,7 @@ public class AdditionalPropertiesClass {
    * Get anytype2
    * @return anytype2
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Object getAnytype2() {
     return anytype2;
@@ -315,6 +325,7 @@ public class AdditionalPropertiesClass {
    * Get anytype3
    * @return anytype3
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Object getAnytype3() {
     return anytype3;
diff --git a/samples/client/petstore/java/jersey2-java6/src/main/java/org/openapitools/client/model/AdditionalPropertiesInteger.java b/samples/client/petstore/java/jersey2-java6/src/main/java/org/openapitools/client/model/AdditionalPropertiesInteger.java
index 455c8c3d9d..bb45326e0f 100644
--- a/samples/client/petstore/java/jersey2-java6/src/main/java/org/openapitools/client/model/AdditionalPropertiesInteger.java
+++ b/samples/client/petstore/java/jersey2-java6/src/main/java/org/openapitools/client/model/AdditionalPropertiesInteger.java
@@ -39,6 +39,7 @@ public class AdditionalPropertiesInteger extends HashMap<String, Integer> {
    * Get name
    * @return name
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getName() {
     return name;
diff --git a/samples/client/petstore/java/jersey2-java6/src/main/java/org/openapitools/client/model/AdditionalPropertiesNumber.java b/samples/client/petstore/java/jersey2-java6/src/main/java/org/openapitools/client/model/AdditionalPropertiesNumber.java
index c82df7f17e..4dd2fe4248 100644
--- a/samples/client/petstore/java/jersey2-java6/src/main/java/org/openapitools/client/model/AdditionalPropertiesNumber.java
+++ b/samples/client/petstore/java/jersey2-java6/src/main/java/org/openapitools/client/model/AdditionalPropertiesNumber.java
@@ -40,6 +40,7 @@ public class AdditionalPropertiesNumber extends HashMap<String, BigDecimal> {
    * Get name
    * @return name
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getName() {
     return name;
diff --git a/samples/client/petstore/java/jersey2-java6/src/main/java/org/openapitools/client/model/AdditionalPropertiesObject.java b/samples/client/petstore/java/jersey2-java6/src/main/java/org/openapitools/client/model/AdditionalPropertiesObject.java
index af85c7f600..58987c7c19 100644
--- a/samples/client/petstore/java/jersey2-java6/src/main/java/org/openapitools/client/model/AdditionalPropertiesObject.java
+++ b/samples/client/petstore/java/jersey2-java6/src/main/java/org/openapitools/client/model/AdditionalPropertiesObject.java
@@ -39,6 +39,7 @@ public class AdditionalPropertiesObject extends HashMap<String, Map> {
    * Get name
    * @return name
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getName() {
     return name;
diff --git a/samples/client/petstore/java/jersey2-java6/src/main/java/org/openapitools/client/model/AdditionalPropertiesString.java b/samples/client/petstore/java/jersey2-java6/src/main/java/org/openapitools/client/model/AdditionalPropertiesString.java
index bffda40c98..f923fd81ab 100644
--- a/samples/client/petstore/java/jersey2-java6/src/main/java/org/openapitools/client/model/AdditionalPropertiesString.java
+++ b/samples/client/petstore/java/jersey2-java6/src/main/java/org/openapitools/client/model/AdditionalPropertiesString.java
@@ -39,6 +39,7 @@ public class AdditionalPropertiesString extends HashMap<String, String> {
    * Get name
    * @return name
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getName() {
     return name;
diff --git a/samples/client/petstore/java/jersey2-java6/src/main/java/org/openapitools/client/model/Animal.java b/samples/client/petstore/java/jersey2-java6/src/main/java/org/openapitools/client/model/Animal.java
index 80e1234cd7..463999716e 100644
--- a/samples/client/petstore/java/jersey2-java6/src/main/java/org/openapitools/client/model/Animal.java
+++ b/samples/client/petstore/java/jersey2-java6/src/main/java/org/openapitools/client/model/Animal.java
@@ -48,6 +48,7 @@ public class Animal {
    * Get className
    * @return className
   **/
+
   @ApiModelProperty(required = true, value = "")
   public String getClassName() {
     return className;
@@ -66,6 +67,7 @@ public class Animal {
    * Get color
    * @return color
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getColor() {
     return color;
diff --git a/samples/client/petstore/java/jersey2-java6/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java b/samples/client/petstore/java/jersey2-java6/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java
index 04da42d041..620e0f0452 100644
--- a/samples/client/petstore/java/jersey2-java6/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java
+++ b/samples/client/petstore/java/jersey2-java6/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java
@@ -48,6 +48,7 @@ public class ArrayOfArrayOfNumberOnly {
    * Get arrayArrayNumber
    * @return arrayArrayNumber
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public List<List<BigDecimal>> getArrayArrayNumber() {
     return arrayArrayNumber;
diff --git a/samples/client/petstore/java/jersey2-java6/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java b/samples/client/petstore/java/jersey2-java6/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java
index 325216dcac..23ca3ec520 100644
--- a/samples/client/petstore/java/jersey2-java6/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java
+++ b/samples/client/petstore/java/jersey2-java6/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java
@@ -48,6 +48,7 @@ public class ArrayOfNumberOnly {
    * Get arrayNumber
    * @return arrayNumber
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public List<BigDecimal> getArrayNumber() {
     return arrayNumber;
diff --git a/samples/client/petstore/java/jersey2-java6/src/main/java/org/openapitools/client/model/ArrayTest.java b/samples/client/petstore/java/jersey2-java6/src/main/java/org/openapitools/client/model/ArrayTest.java
index a660663312..a739327142 100644
--- a/samples/client/petstore/java/jersey2-java6/src/main/java/org/openapitools/client/model/ArrayTest.java
+++ b/samples/client/petstore/java/jersey2-java6/src/main/java/org/openapitools/client/model/ArrayTest.java
@@ -54,6 +54,7 @@ public class ArrayTest {
    * Get arrayOfString
    * @return arrayOfString
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public List<String> getArrayOfString() {
     return arrayOfString;
@@ -80,6 +81,7 @@ public class ArrayTest {
    * Get arrayArrayOfInteger
    * @return arrayArrayOfInteger
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public List<List<Long>> getArrayArrayOfInteger() {
     return arrayArrayOfInteger;
@@ -106,6 +108,7 @@ public class ArrayTest {
    * Get arrayArrayOfModel
    * @return arrayArrayOfModel
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public List<List<ReadOnlyFirst>> getArrayArrayOfModel() {
     return arrayArrayOfModel;
diff --git a/samples/client/petstore/java/jersey2-java6/src/main/java/org/openapitools/client/model/Capitalization.java b/samples/client/petstore/java/jersey2-java6/src/main/java/org/openapitools/client/model/Capitalization.java
index 0f17cc4a23..4cb3722a0d 100644
--- a/samples/client/petstore/java/jersey2-java6/src/main/java/org/openapitools/client/model/Capitalization.java
+++ b/samples/client/petstore/java/jersey2-java6/src/main/java/org/openapitools/client/model/Capitalization.java
@@ -52,6 +52,7 @@ public class Capitalization {
    * Get smallCamel
    * @return smallCamel
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getSmallCamel() {
     return smallCamel;
@@ -70,6 +71,7 @@ public class Capitalization {
    * Get capitalCamel
    * @return capitalCamel
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getCapitalCamel() {
     return capitalCamel;
@@ -88,6 +90,7 @@ public class Capitalization {
    * Get smallSnake
    * @return smallSnake
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getSmallSnake() {
     return smallSnake;
@@ -106,6 +109,7 @@ public class Capitalization {
    * Get capitalSnake
    * @return capitalSnake
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getCapitalSnake() {
     return capitalSnake;
@@ -124,6 +128,7 @@ public class Capitalization {
    * Get scAETHFlowPoints
    * @return scAETHFlowPoints
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getScAETHFlowPoints() {
     return scAETHFlowPoints;
@@ -142,6 +147,7 @@ public class Capitalization {
    * Name of the pet 
    * @return ATT_NAME
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "Name of the pet ")
   public String getATTNAME() {
     return ATT_NAME;
diff --git a/samples/client/petstore/java/jersey2-java6/src/main/java/org/openapitools/client/model/Cat.java b/samples/client/petstore/java/jersey2-java6/src/main/java/org/openapitools/client/model/Cat.java
index 8f877d01b0..b1bc3a3259 100644
--- a/samples/client/petstore/java/jersey2-java6/src/main/java/org/openapitools/client/model/Cat.java
+++ b/samples/client/petstore/java/jersey2-java6/src/main/java/org/openapitools/client/model/Cat.java
@@ -39,6 +39,7 @@ public class Cat extends Animal {
    * Get declawed
    * @return declawed
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Boolean isDeclawed() {
     return declawed;
diff --git a/samples/client/petstore/java/jersey2-java6/src/main/java/org/openapitools/client/model/CatAllOf.java b/samples/client/petstore/java/jersey2-java6/src/main/java/org/openapitools/client/model/CatAllOf.java
index 313bcbed99..f0b7eba67d 100644
--- a/samples/client/petstore/java/jersey2-java6/src/main/java/org/openapitools/client/model/CatAllOf.java
+++ b/samples/client/petstore/java/jersey2-java6/src/main/java/org/openapitools/client/model/CatAllOf.java
@@ -37,6 +37,7 @@ public class CatAllOf {
    * Get declawed
    * @return declawed
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Boolean isDeclawed() {
     return declawed;
diff --git a/samples/client/petstore/java/jersey2-java6/src/main/java/org/openapitools/client/model/Category.java b/samples/client/petstore/java/jersey2-java6/src/main/java/org/openapitools/client/model/Category.java
index e6713bf4eb..71b7375870 100644
--- a/samples/client/petstore/java/jersey2-java6/src/main/java/org/openapitools/client/model/Category.java
+++ b/samples/client/petstore/java/jersey2-java6/src/main/java/org/openapitools/client/model/Category.java
@@ -40,6 +40,7 @@ public class Category {
    * Get id
    * @return id
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Long getId() {
     return id;
@@ -58,6 +59,7 @@ public class Category {
    * Get name
    * @return name
   **/
+
   @ApiModelProperty(required = true, value = "")
   public String getName() {
     return name;
diff --git a/samples/client/petstore/java/jersey2-java6/src/main/java/org/openapitools/client/model/ClassModel.java b/samples/client/petstore/java/jersey2-java6/src/main/java/org/openapitools/client/model/ClassModel.java
index b18e6d32d1..8a670d59fb 100644
--- a/samples/client/petstore/java/jersey2-java6/src/main/java/org/openapitools/client/model/ClassModel.java
+++ b/samples/client/petstore/java/jersey2-java6/src/main/java/org/openapitools/client/model/ClassModel.java
@@ -38,6 +38,7 @@ public class ClassModel {
    * Get propertyClass
    * @return propertyClass
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getPropertyClass() {
     return propertyClass;
diff --git a/samples/client/petstore/java/jersey2-java6/src/main/java/org/openapitools/client/model/Client.java b/samples/client/petstore/java/jersey2-java6/src/main/java/org/openapitools/client/model/Client.java
index 57ba8c8a11..a3a58de1fe 100644
--- a/samples/client/petstore/java/jersey2-java6/src/main/java/org/openapitools/client/model/Client.java
+++ b/samples/client/petstore/java/jersey2-java6/src/main/java/org/openapitools/client/model/Client.java
@@ -37,6 +37,7 @@ public class Client {
    * Get client
    * @return client
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getClient() {
     return client;
diff --git a/samples/client/petstore/java/jersey2-java6/src/main/java/org/openapitools/client/model/Dog.java b/samples/client/petstore/java/jersey2-java6/src/main/java/org/openapitools/client/model/Dog.java
index 586108892c..2d3e7d4fe9 100644
--- a/samples/client/petstore/java/jersey2-java6/src/main/java/org/openapitools/client/model/Dog.java
+++ b/samples/client/petstore/java/jersey2-java6/src/main/java/org/openapitools/client/model/Dog.java
@@ -39,6 +39,7 @@ public class Dog extends Animal {
    * Get breed
    * @return breed
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getBreed() {
     return breed;
diff --git a/samples/client/petstore/java/jersey2-java6/src/main/java/org/openapitools/client/model/DogAllOf.java b/samples/client/petstore/java/jersey2-java6/src/main/java/org/openapitools/client/model/DogAllOf.java
index 2fe492b320..3a33a542db 100644
--- a/samples/client/petstore/java/jersey2-java6/src/main/java/org/openapitools/client/model/DogAllOf.java
+++ b/samples/client/petstore/java/jersey2-java6/src/main/java/org/openapitools/client/model/DogAllOf.java
@@ -37,6 +37,7 @@ public class DogAllOf {
    * Get breed
    * @return breed
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getBreed() {
     return breed;
diff --git a/samples/client/petstore/java/jersey2-java6/src/main/java/org/openapitools/client/model/EnumArrays.java b/samples/client/petstore/java/jersey2-java6/src/main/java/org/openapitools/client/model/EnumArrays.java
index a8d3853b59..a8b71af7f4 100644
--- a/samples/client/petstore/java/jersey2-java6/src/main/java/org/openapitools/client/model/EnumArrays.java
+++ b/samples/client/petstore/java/jersey2-java6/src/main/java/org/openapitools/client/model/EnumArrays.java
@@ -112,6 +112,7 @@ public class EnumArrays {
    * Get justSymbol
    * @return justSymbol
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public JustSymbolEnum getJustSymbol() {
     return justSymbol;
@@ -138,6 +139,7 @@ public class EnumArrays {
    * Get arrayEnum
    * @return arrayEnum
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public List<ArrayEnumEnum> getArrayEnum() {
     return arrayEnum;
diff --git a/samples/client/petstore/java/jersey2-java6/src/main/java/org/openapitools/client/model/EnumTest.java b/samples/client/petstore/java/jersey2-java6/src/main/java/org/openapitools/client/model/EnumTest.java
index 5460354919..a6fa726f69 100644
--- a/samples/client/petstore/java/jersey2-java6/src/main/java/org/openapitools/client/model/EnumTest.java
+++ b/samples/client/petstore/java/jersey2-java6/src/main/java/org/openapitools/client/model/EnumTest.java
@@ -194,6 +194,7 @@ public class EnumTest {
    * Get enumString
    * @return enumString
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public EnumStringEnum getEnumString() {
     return enumString;
@@ -212,6 +213,7 @@ public class EnumTest {
    * Get enumStringRequired
    * @return enumStringRequired
   **/
+
   @ApiModelProperty(required = true, value = "")
   public EnumStringRequiredEnum getEnumStringRequired() {
     return enumStringRequired;
@@ -230,6 +232,7 @@ public class EnumTest {
    * Get enumInteger
    * @return enumInteger
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public EnumIntegerEnum getEnumInteger() {
     return enumInteger;
@@ -248,6 +251,7 @@ public class EnumTest {
    * Get enumNumber
    * @return enumNumber
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public EnumNumberEnum getEnumNumber() {
     return enumNumber;
@@ -266,6 +270,7 @@ public class EnumTest {
    * Get outerEnum
    * @return outerEnum
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public OuterEnum getOuterEnum() {
     return outerEnum;
diff --git a/samples/client/petstore/java/jersey2-java6/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java b/samples/client/petstore/java/jersey2-java6/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java
index 30b5b41c7c..62e4346f1c 100644
--- a/samples/client/petstore/java/jersey2-java6/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java
+++ b/samples/client/petstore/java/jersey2-java6/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java
@@ -42,6 +42,7 @@ public class FileSchemaTestClass {
    * Get file
    * @return file
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public java.io.File getFile() {
     return file;
@@ -68,6 +69,7 @@ public class FileSchemaTestClass {
    * Get files
    * @return files
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public List<java.io.File> getFiles() {
     return files;
diff --git a/samples/client/petstore/java/jersey2-java6/src/main/java/org/openapitools/client/model/FormatTest.java b/samples/client/petstore/java/jersey2-java6/src/main/java/org/openapitools/client/model/FormatTest.java
index e2bb76ca01..c9688e4e4a 100644
--- a/samples/client/petstore/java/jersey2-java6/src/main/java/org/openapitools/client/model/FormatTest.java
+++ b/samples/client/petstore/java/jersey2-java6/src/main/java/org/openapitools/client/model/FormatTest.java
@@ -80,6 +80,7 @@ public class FormatTest {
    * maximum: 100
    * @return integer
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Integer getInteger() {
     return integer;
@@ -100,6 +101,7 @@ public class FormatTest {
    * maximum: 200
    * @return int32
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Integer getInt32() {
     return int32;
@@ -118,6 +120,7 @@ public class FormatTest {
    * Get int64
    * @return int64
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Long getInt64() {
     return int64;
@@ -138,6 +141,7 @@ public class FormatTest {
    * maximum: 543.2
    * @return number
   **/
+
   @ApiModelProperty(required = true, value = "")
   public BigDecimal getNumber() {
     return number;
@@ -158,6 +162,7 @@ public class FormatTest {
    * maximum: 987.6
    * @return _float
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Float getFloat() {
     return _float;
@@ -178,6 +183,7 @@ public class FormatTest {
    * maximum: 123.4
    * @return _double
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Double getDouble() {
     return _double;
@@ -196,6 +202,7 @@ public class FormatTest {
    * Get string
    * @return string
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getString() {
     return string;
@@ -214,6 +221,7 @@ public class FormatTest {
    * Get _byte
    * @return _byte
   **/
+
   @ApiModelProperty(required = true, value = "")
   public byte[] getByte() {
     return _byte;
@@ -232,6 +240,7 @@ public class FormatTest {
    * Get binary
    * @return binary
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public File getBinary() {
     return binary;
@@ -250,6 +259,7 @@ public class FormatTest {
    * Get date
    * @return date
   **/
+
   @ApiModelProperty(required = true, value = "")
   public LocalDate getDate() {
     return date;
@@ -268,6 +278,7 @@ public class FormatTest {
    * Get dateTime
    * @return dateTime
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public OffsetDateTime getDateTime() {
     return dateTime;
@@ -286,6 +297,7 @@ public class FormatTest {
    * Get uuid
    * @return uuid
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(example = "72f98069-206d-4f12-9f12-3d1e525a8e84", value = "")
   public UUID getUuid() {
     return uuid;
@@ -304,6 +316,7 @@ public class FormatTest {
    * Get password
    * @return password
   **/
+
   @ApiModelProperty(required = true, value = "")
   public String getPassword() {
     return password;
diff --git a/samples/client/petstore/java/jersey2-java6/src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java b/samples/client/petstore/java/jersey2-java6/src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java
index 57c24eda70..67943f4066 100644
--- a/samples/client/petstore/java/jersey2-java6/src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java
+++ b/samples/client/petstore/java/jersey2-java6/src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java
@@ -35,6 +35,7 @@ public class HasOnlyReadOnly {
    * Get bar
    * @return bar
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getBar() {
     return bar;
@@ -44,6 +45,7 @@ public class HasOnlyReadOnly {
    * Get foo
    * @return foo
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getFoo() {
     return foo;
diff --git a/samples/client/petstore/java/jersey2-java6/src/main/java/org/openapitools/client/model/MapTest.java b/samples/client/petstore/java/jersey2-java6/src/main/java/org/openapitools/client/model/MapTest.java
index c140f59e87..b3e327d66b 100644
--- a/samples/client/petstore/java/jersey2-java6/src/main/java/org/openapitools/client/model/MapTest.java
+++ b/samples/client/petstore/java/jersey2-java6/src/main/java/org/openapitools/client/model/MapTest.java
@@ -92,6 +92,7 @@ public class MapTest {
    * Get mapMapOfString
    * @return mapMapOfString
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Map<String, Map<String, String>> getMapMapOfString() {
     return mapMapOfString;
@@ -118,6 +119,7 @@ public class MapTest {
    * Get mapOfEnumString
    * @return mapOfEnumString
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Map<String, InnerEnum> getMapOfEnumString() {
     return mapOfEnumString;
@@ -144,6 +146,7 @@ public class MapTest {
    * Get directMap
    * @return directMap
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Map<String, Boolean> getDirectMap() {
     return directMap;
@@ -170,6 +173,7 @@ public class MapTest {
    * Get indirectMap
    * @return indirectMap
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Map<String, Boolean> getIndirectMap() {
     return indirectMap;
diff --git a/samples/client/petstore/java/jersey2-java6/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/client/petstore/java/jersey2-java6/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java
index 63c980543c..e6244b5ba0 100644
--- a/samples/client/petstore/java/jersey2-java6/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java
+++ b/samples/client/petstore/java/jersey2-java6/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java
@@ -49,6 +49,7 @@ public class MixedPropertiesAndAdditionalPropertiesClass {
    * Get uuid
    * @return uuid
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public UUID getUuid() {
     return uuid;
@@ -67,6 +68,7 @@ public class MixedPropertiesAndAdditionalPropertiesClass {
    * Get dateTime
    * @return dateTime
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public OffsetDateTime getDateTime() {
     return dateTime;
@@ -93,6 +95,7 @@ public class MixedPropertiesAndAdditionalPropertiesClass {
    * Get map
    * @return map
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Map<String, Animal> getMap() {
     return map;
diff --git a/samples/client/petstore/java/jersey2-java6/src/main/java/org/openapitools/client/model/Model200Response.java b/samples/client/petstore/java/jersey2-java6/src/main/java/org/openapitools/client/model/Model200Response.java
index ba12138db1..b6e7dd4bb9 100644
--- a/samples/client/petstore/java/jersey2-java6/src/main/java/org/openapitools/client/model/Model200Response.java
+++ b/samples/client/petstore/java/jersey2-java6/src/main/java/org/openapitools/client/model/Model200Response.java
@@ -41,6 +41,7 @@ public class Model200Response {
    * Get name
    * @return name
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Integer getName() {
     return name;
@@ -59,6 +60,7 @@ public class Model200Response {
    * Get propertyClass
    * @return propertyClass
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getPropertyClass() {
     return propertyClass;
diff --git a/samples/client/petstore/java/jersey2-java6/src/main/java/org/openapitools/client/model/ModelApiResponse.java b/samples/client/petstore/java/jersey2-java6/src/main/java/org/openapitools/client/model/ModelApiResponse.java
index 2461cf36c4..828793964c 100644
--- a/samples/client/petstore/java/jersey2-java6/src/main/java/org/openapitools/client/model/ModelApiResponse.java
+++ b/samples/client/petstore/java/jersey2-java6/src/main/java/org/openapitools/client/model/ModelApiResponse.java
@@ -43,6 +43,7 @@ public class ModelApiResponse {
    * Get code
    * @return code
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Integer getCode() {
     return code;
@@ -61,6 +62,7 @@ public class ModelApiResponse {
    * Get type
    * @return type
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getType() {
     return type;
@@ -79,6 +81,7 @@ public class ModelApiResponse {
    * Get message
    * @return message
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getMessage() {
     return message;
diff --git a/samples/client/petstore/java/jersey2-java6/src/main/java/org/openapitools/client/model/ModelReturn.java b/samples/client/petstore/java/jersey2-java6/src/main/java/org/openapitools/client/model/ModelReturn.java
index 4f2ab40fc9..75e7536150 100644
--- a/samples/client/petstore/java/jersey2-java6/src/main/java/org/openapitools/client/model/ModelReturn.java
+++ b/samples/client/petstore/java/jersey2-java6/src/main/java/org/openapitools/client/model/ModelReturn.java
@@ -38,6 +38,7 @@ public class ModelReturn {
    * Get _return
    * @return _return
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Integer getReturn() {
     return _return;
diff --git a/samples/client/petstore/java/jersey2-java6/src/main/java/org/openapitools/client/model/Name.java b/samples/client/petstore/java/jersey2-java6/src/main/java/org/openapitools/client/model/Name.java
index afbc512017..9ae7b37e07 100644
--- a/samples/client/petstore/java/jersey2-java6/src/main/java/org/openapitools/client/model/Name.java
+++ b/samples/client/petstore/java/jersey2-java6/src/main/java/org/openapitools/client/model/Name.java
@@ -47,6 +47,7 @@ public class Name {
    * Get name
    * @return name
   **/
+
   @ApiModelProperty(required = true, value = "")
   public Integer getName() {
     return name;
@@ -60,6 +61,7 @@ public class Name {
    * Get snakeCase
    * @return snakeCase
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Integer getSnakeCase() {
     return snakeCase;
@@ -74,6 +76,7 @@ public class Name {
    * Get property
    * @return property
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getProperty() {
     return property;
@@ -87,6 +90,7 @@ public class Name {
    * Get _123number
    * @return _123number
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Integer get123number() {
     return _123number;
diff --git a/samples/client/petstore/java/jersey2-java6/src/main/java/org/openapitools/client/model/NumberOnly.java b/samples/client/petstore/java/jersey2-java6/src/main/java/org/openapitools/client/model/NumberOnly.java
index 94a9d9105c..c58c1fd75b 100644
--- a/samples/client/petstore/java/jersey2-java6/src/main/java/org/openapitools/client/model/NumberOnly.java
+++ b/samples/client/petstore/java/jersey2-java6/src/main/java/org/openapitools/client/model/NumberOnly.java
@@ -38,6 +38,7 @@ public class NumberOnly {
    * Get justNumber
    * @return justNumber
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public BigDecimal getJustNumber() {
     return justNumber;
diff --git a/samples/client/petstore/java/jersey2-java6/src/main/java/org/openapitools/client/model/Order.java b/samples/client/petstore/java/jersey2-java6/src/main/java/org/openapitools/client/model/Order.java
index 2879cd2f5a..55a9be17bf 100644
--- a/samples/client/petstore/java/jersey2-java6/src/main/java/org/openapitools/client/model/Order.java
+++ b/samples/client/petstore/java/jersey2-java6/src/main/java/org/openapitools/client/model/Order.java
@@ -90,6 +90,7 @@ public class Order {
    * Get id
    * @return id
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Long getId() {
     return id;
@@ -108,6 +109,7 @@ public class Order {
    * Get petId
    * @return petId
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Long getPetId() {
     return petId;
@@ -126,6 +128,7 @@ public class Order {
    * Get quantity
    * @return quantity
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Integer getQuantity() {
     return quantity;
@@ -144,6 +147,7 @@ public class Order {
    * Get shipDate
    * @return shipDate
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public OffsetDateTime getShipDate() {
     return shipDate;
@@ -162,6 +166,7 @@ public class Order {
    * Order Status
    * @return status
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "Order Status")
   public StatusEnum getStatus() {
     return status;
@@ -180,6 +185,7 @@ public class Order {
    * Get complete
    * @return complete
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Boolean isComplete() {
     return complete;
diff --git a/samples/client/petstore/java/jersey2-java6/src/main/java/org/openapitools/client/model/OuterComposite.java b/samples/client/petstore/java/jersey2-java6/src/main/java/org/openapitools/client/model/OuterComposite.java
index 6130da589d..d989f08146 100644
--- a/samples/client/petstore/java/jersey2-java6/src/main/java/org/openapitools/client/model/OuterComposite.java
+++ b/samples/client/petstore/java/jersey2-java6/src/main/java/org/openapitools/client/model/OuterComposite.java
@@ -44,6 +44,7 @@ public class OuterComposite {
    * Get myNumber
    * @return myNumber
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public BigDecimal getMyNumber() {
     return myNumber;
@@ -62,6 +63,7 @@ public class OuterComposite {
    * Get myString
    * @return myString
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getMyString() {
     return myString;
@@ -80,6 +82,7 @@ public class OuterComposite {
    * Get myBoolean
    * @return myBoolean
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Boolean isMyBoolean() {
     return myBoolean;
diff --git a/samples/client/petstore/java/jersey2-java6/src/main/java/org/openapitools/client/model/Pet.java b/samples/client/petstore/java/jersey2-java6/src/main/java/org/openapitools/client/model/Pet.java
index 2bcbda44b2..5347514db0 100644
--- a/samples/client/petstore/java/jersey2-java6/src/main/java/org/openapitools/client/model/Pet.java
+++ b/samples/client/petstore/java/jersey2-java6/src/main/java/org/openapitools/client/model/Pet.java
@@ -93,6 +93,7 @@ public class Pet {
    * Get id
    * @return id
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Long getId() {
     return id;
@@ -111,6 +112,7 @@ public class Pet {
    * Get category
    * @return category
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Category getCategory() {
     return category;
@@ -129,6 +131,7 @@ public class Pet {
    * Get name
    * @return name
   **/
+
   @ApiModelProperty(example = "doggie", required = true, value = "")
   public String getName() {
     return name;
@@ -152,6 +155,7 @@ public class Pet {
    * Get photoUrls
    * @return photoUrls
   **/
+
   @ApiModelProperty(required = true, value = "")
   public List<String> getPhotoUrls() {
     return photoUrls;
@@ -178,6 +182,7 @@ public class Pet {
    * Get tags
    * @return tags
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public List<Tag> getTags() {
     return tags;
@@ -196,6 +201,7 @@ public class Pet {
    * pet status in the store
    * @return status
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "pet status in the store")
   public StatusEnum getStatus() {
     return status;
diff --git a/samples/client/petstore/java/jersey2-java6/src/main/java/org/openapitools/client/model/ReadOnlyFirst.java b/samples/client/petstore/java/jersey2-java6/src/main/java/org/openapitools/client/model/ReadOnlyFirst.java
index d05ced1a76..0b4f41ef51 100644
--- a/samples/client/petstore/java/jersey2-java6/src/main/java/org/openapitools/client/model/ReadOnlyFirst.java
+++ b/samples/client/petstore/java/jersey2-java6/src/main/java/org/openapitools/client/model/ReadOnlyFirst.java
@@ -35,6 +35,7 @@ public class ReadOnlyFirst {
    * Get bar
    * @return bar
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getBar() {
     return bar;
@@ -49,6 +50,7 @@ public class ReadOnlyFirst {
    * Get baz
    * @return baz
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getBaz() {
     return baz;
diff --git a/samples/client/petstore/java/jersey2-java6/src/main/java/org/openapitools/client/model/SpecialModelName.java b/samples/client/petstore/java/jersey2-java6/src/main/java/org/openapitools/client/model/SpecialModelName.java
index 0624bfbe33..015646fa51 100644
--- a/samples/client/petstore/java/jersey2-java6/src/main/java/org/openapitools/client/model/SpecialModelName.java
+++ b/samples/client/petstore/java/jersey2-java6/src/main/java/org/openapitools/client/model/SpecialModelName.java
@@ -37,6 +37,7 @@ public class SpecialModelName {
    * Get $specialPropertyName
    * @return $specialPropertyName
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Long get$SpecialPropertyName() {
     return $specialPropertyName;
diff --git a/samples/client/petstore/java/jersey2-java6/src/main/java/org/openapitools/client/model/Tag.java b/samples/client/petstore/java/jersey2-java6/src/main/java/org/openapitools/client/model/Tag.java
index 6f6d230a7d..9103978339 100644
--- a/samples/client/petstore/java/jersey2-java6/src/main/java/org/openapitools/client/model/Tag.java
+++ b/samples/client/petstore/java/jersey2-java6/src/main/java/org/openapitools/client/model/Tag.java
@@ -40,6 +40,7 @@ public class Tag {
    * Get id
    * @return id
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Long getId() {
     return id;
@@ -58,6 +59,7 @@ public class Tag {
    * Get name
    * @return name
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getName() {
     return name;
diff --git a/samples/client/petstore/java/jersey2-java6/src/main/java/org/openapitools/client/model/TypeHolderDefault.java b/samples/client/petstore/java/jersey2-java6/src/main/java/org/openapitools/client/model/TypeHolderDefault.java
index 113b0da0ae..5d457b4179 100644
--- a/samples/client/petstore/java/jersey2-java6/src/main/java/org/openapitools/client/model/TypeHolderDefault.java
+++ b/samples/client/petstore/java/jersey2-java6/src/main/java/org/openapitools/client/model/TypeHolderDefault.java
@@ -52,6 +52,7 @@ public class TypeHolderDefault {
    * Get stringItem
    * @return stringItem
   **/
+
   @ApiModelProperty(required = true, value = "")
   public String getStringItem() {
     return stringItem;
@@ -70,6 +71,7 @@ public class TypeHolderDefault {
    * Get numberItem
    * @return numberItem
   **/
+
   @ApiModelProperty(required = true, value = "")
   public BigDecimal getNumberItem() {
     return numberItem;
@@ -88,6 +90,7 @@ public class TypeHolderDefault {
    * Get integerItem
    * @return integerItem
   **/
+
   @ApiModelProperty(required = true, value = "")
   public Integer getIntegerItem() {
     return integerItem;
@@ -106,6 +109,7 @@ public class TypeHolderDefault {
    * Get boolItem
    * @return boolItem
   **/
+
   @ApiModelProperty(required = true, value = "")
   public Boolean isBoolItem() {
     return boolItem;
@@ -129,6 +133,7 @@ public class TypeHolderDefault {
    * Get arrayItem
    * @return arrayItem
   **/
+
   @ApiModelProperty(required = true, value = "")
   public List<Integer> getArrayItem() {
     return arrayItem;
diff --git a/samples/client/petstore/java/jersey2-java6/src/main/java/org/openapitools/client/model/TypeHolderExample.java b/samples/client/petstore/java/jersey2-java6/src/main/java/org/openapitools/client/model/TypeHolderExample.java
index 8c48c33c63..c59b6b8408 100644
--- a/samples/client/petstore/java/jersey2-java6/src/main/java/org/openapitools/client/model/TypeHolderExample.java
+++ b/samples/client/petstore/java/jersey2-java6/src/main/java/org/openapitools/client/model/TypeHolderExample.java
@@ -52,6 +52,7 @@ public class TypeHolderExample {
    * Get stringItem
    * @return stringItem
   **/
+
   @ApiModelProperty(example = "what", required = true, value = "")
   public String getStringItem() {
     return stringItem;
@@ -70,6 +71,7 @@ public class TypeHolderExample {
    * Get numberItem
    * @return numberItem
   **/
+
   @ApiModelProperty(example = "1.234", required = true, value = "")
   public BigDecimal getNumberItem() {
     return numberItem;
@@ -88,6 +90,7 @@ public class TypeHolderExample {
    * Get integerItem
    * @return integerItem
   **/
+
   @ApiModelProperty(example = "-2", required = true, value = "")
   public Integer getIntegerItem() {
     return integerItem;
@@ -106,6 +109,7 @@ public class TypeHolderExample {
    * Get boolItem
    * @return boolItem
   **/
+
   @ApiModelProperty(example = "true", required = true, value = "")
   public Boolean isBoolItem() {
     return boolItem;
@@ -129,6 +133,7 @@ public class TypeHolderExample {
    * Get arrayItem
    * @return arrayItem
   **/
+
   @ApiModelProperty(example = "[0, 1, 2, 3]", required = true, value = "")
   public List<Integer> getArrayItem() {
     return arrayItem;
diff --git a/samples/client/petstore/java/jersey2-java6/src/main/java/org/openapitools/client/model/User.java b/samples/client/petstore/java/jersey2-java6/src/main/java/org/openapitools/client/model/User.java
index b3619fee85..14fa403765 100644
--- a/samples/client/petstore/java/jersey2-java6/src/main/java/org/openapitools/client/model/User.java
+++ b/samples/client/petstore/java/jersey2-java6/src/main/java/org/openapitools/client/model/User.java
@@ -58,6 +58,7 @@ public class User {
    * Get id
    * @return id
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Long getId() {
     return id;
@@ -76,6 +77,7 @@ public class User {
    * Get username
    * @return username
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getUsername() {
     return username;
@@ -94,6 +96,7 @@ public class User {
    * Get firstName
    * @return firstName
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getFirstName() {
     return firstName;
@@ -112,6 +115,7 @@ public class User {
    * Get lastName
    * @return lastName
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getLastName() {
     return lastName;
@@ -130,6 +134,7 @@ public class User {
    * Get email
    * @return email
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getEmail() {
     return email;
@@ -148,6 +153,7 @@ public class User {
    * Get password
    * @return password
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getPassword() {
     return password;
@@ -166,6 +172,7 @@ public class User {
    * Get phone
    * @return phone
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getPhone() {
     return phone;
@@ -184,6 +191,7 @@ public class User {
    * User Status
    * @return userStatus
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "User Status")
   public Integer getUserStatus() {
     return userStatus;
diff --git a/samples/client/petstore/java/jersey2-java6/src/main/java/org/openapitools/client/model/XmlItem.java b/samples/client/petstore/java/jersey2-java6/src/main/java/org/openapitools/client/model/XmlItem.java
index 04f3618d83..db0a1c96d3 100644
--- a/samples/client/petstore/java/jersey2-java6/src/main/java/org/openapitools/client/model/XmlItem.java
+++ b/samples/client/petstore/java/jersey2-java6/src/main/java/org/openapitools/client/model/XmlItem.java
@@ -124,6 +124,7 @@ public class XmlItem {
    * Get attributeString
    * @return attributeString
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(example = "string", value = "")
   public String getAttributeString() {
     return attributeString;
@@ -142,6 +143,7 @@ public class XmlItem {
    * Get attributeNumber
    * @return attributeNumber
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(example = "1.234", value = "")
   public BigDecimal getAttributeNumber() {
     return attributeNumber;
@@ -160,6 +162,7 @@ public class XmlItem {
    * Get attributeInteger
    * @return attributeInteger
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(example = "-2", value = "")
   public Integer getAttributeInteger() {
     return attributeInteger;
@@ -178,6 +181,7 @@ public class XmlItem {
    * Get attributeBoolean
    * @return attributeBoolean
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(example = "true", value = "")
   public Boolean isAttributeBoolean() {
     return attributeBoolean;
@@ -204,6 +208,7 @@ public class XmlItem {
    * Get wrappedArray
    * @return wrappedArray
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public List<Integer> getWrappedArray() {
     return wrappedArray;
@@ -222,6 +227,7 @@ public class XmlItem {
    * Get nameString
    * @return nameString
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(example = "string", value = "")
   public String getNameString() {
     return nameString;
@@ -240,6 +246,7 @@ public class XmlItem {
    * Get nameNumber
    * @return nameNumber
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(example = "1.234", value = "")
   public BigDecimal getNameNumber() {
     return nameNumber;
@@ -258,6 +265,7 @@ public class XmlItem {
    * Get nameInteger
    * @return nameInteger
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(example = "-2", value = "")
   public Integer getNameInteger() {
     return nameInteger;
@@ -276,6 +284,7 @@ public class XmlItem {
    * Get nameBoolean
    * @return nameBoolean
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(example = "true", value = "")
   public Boolean isNameBoolean() {
     return nameBoolean;
@@ -302,6 +311,7 @@ public class XmlItem {
    * Get nameArray
    * @return nameArray
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public List<Integer> getNameArray() {
     return nameArray;
@@ -328,6 +338,7 @@ public class XmlItem {
    * Get nameWrappedArray
    * @return nameWrappedArray
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public List<Integer> getNameWrappedArray() {
     return nameWrappedArray;
@@ -346,6 +357,7 @@ public class XmlItem {
    * Get prefixString
    * @return prefixString
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(example = "string", value = "")
   public String getPrefixString() {
     return prefixString;
@@ -364,6 +376,7 @@ public class XmlItem {
    * Get prefixNumber
    * @return prefixNumber
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(example = "1.234", value = "")
   public BigDecimal getPrefixNumber() {
     return prefixNumber;
@@ -382,6 +395,7 @@ public class XmlItem {
    * Get prefixInteger
    * @return prefixInteger
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(example = "-2", value = "")
   public Integer getPrefixInteger() {
     return prefixInteger;
@@ -400,6 +414,7 @@ public class XmlItem {
    * Get prefixBoolean
    * @return prefixBoolean
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(example = "true", value = "")
   public Boolean isPrefixBoolean() {
     return prefixBoolean;
@@ -426,6 +441,7 @@ public class XmlItem {
    * Get prefixArray
    * @return prefixArray
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public List<Integer> getPrefixArray() {
     return prefixArray;
@@ -452,6 +468,7 @@ public class XmlItem {
    * Get prefixWrappedArray
    * @return prefixWrappedArray
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public List<Integer> getPrefixWrappedArray() {
     return prefixWrappedArray;
@@ -470,6 +487,7 @@ public class XmlItem {
    * Get namespaceString
    * @return namespaceString
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(example = "string", value = "")
   public String getNamespaceString() {
     return namespaceString;
@@ -488,6 +506,7 @@ public class XmlItem {
    * Get namespaceNumber
    * @return namespaceNumber
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(example = "1.234", value = "")
   public BigDecimal getNamespaceNumber() {
     return namespaceNumber;
@@ -506,6 +525,7 @@ public class XmlItem {
    * Get namespaceInteger
    * @return namespaceInteger
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(example = "-2", value = "")
   public Integer getNamespaceInteger() {
     return namespaceInteger;
@@ -524,6 +544,7 @@ public class XmlItem {
    * Get namespaceBoolean
    * @return namespaceBoolean
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(example = "true", value = "")
   public Boolean isNamespaceBoolean() {
     return namespaceBoolean;
@@ -550,6 +571,7 @@ public class XmlItem {
    * Get namespaceArray
    * @return namespaceArray
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public List<Integer> getNamespaceArray() {
     return namespaceArray;
@@ -576,6 +598,7 @@ public class XmlItem {
    * Get namespaceWrappedArray
    * @return namespaceWrappedArray
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public List<Integer> getNamespaceWrappedArray() {
     return namespaceWrappedArray;
@@ -594,6 +617,7 @@ public class XmlItem {
    * Get prefixNsString
    * @return prefixNsString
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(example = "string", value = "")
   public String getPrefixNsString() {
     return prefixNsString;
@@ -612,6 +636,7 @@ public class XmlItem {
    * Get prefixNsNumber
    * @return prefixNsNumber
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(example = "1.234", value = "")
   public BigDecimal getPrefixNsNumber() {
     return prefixNsNumber;
@@ -630,6 +655,7 @@ public class XmlItem {
    * Get prefixNsInteger
    * @return prefixNsInteger
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(example = "-2", value = "")
   public Integer getPrefixNsInteger() {
     return prefixNsInteger;
@@ -648,6 +674,7 @@ public class XmlItem {
    * Get prefixNsBoolean
    * @return prefixNsBoolean
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(example = "true", value = "")
   public Boolean isPrefixNsBoolean() {
     return prefixNsBoolean;
@@ -674,6 +701,7 @@ public class XmlItem {
    * Get prefixNsArray
    * @return prefixNsArray
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public List<Integer> getPrefixNsArray() {
     return prefixNsArray;
@@ -700,6 +728,7 @@ public class XmlItem {
    * Get prefixNsWrappedArray
    * @return prefixNsWrappedArray
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public List<Integer> getPrefixNsWrappedArray() {
     return prefixNsWrappedArray;
diff --git a/samples/client/petstore/java/jersey2-java8/build.gradle b/samples/client/petstore/java/jersey2-java8/build.gradle
index 5966274ea7..b3382a0779 100644
--- a/samples/client/petstore/java/jersey2-java8/build.gradle
+++ b/samples/client/petstore/java/jersey2-java8/build.gradle
@@ -103,6 +103,7 @@ ext {
 
 dependencies {
     compile "io.swagger:swagger-annotations:$swagger_annotations_version"
+    compile "com.google.code.findbugs:jsr305:3.0.2"
     compile "org.glassfish.jersey.core:jersey-client:$jersey_version"
     compile "org.glassfish.jersey.media:jersey-media-multipart:$jersey_version"
     compile "org.glassfish.jersey.media:jersey-media-json-jackson:$jersey_version"
diff --git a/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/AdditionalPropertiesAnyType.java b/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/AdditionalPropertiesAnyType.java
index d223a661f8..1abb2d8a64 100644
--- a/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/AdditionalPropertiesAnyType.java
+++ b/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/AdditionalPropertiesAnyType.java
@@ -40,6 +40,7 @@ public class AdditionalPropertiesAnyType extends HashMap<String, Object> {
    * Get name
    * @return name
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getName() {
     return name;
diff --git a/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/AdditionalPropertiesArray.java b/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/AdditionalPropertiesArray.java
index db738129d0..1821c243e1 100644
--- a/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/AdditionalPropertiesArray.java
+++ b/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/AdditionalPropertiesArray.java
@@ -41,6 +41,7 @@ public class AdditionalPropertiesArray extends HashMap<String, List> {
    * Get name
    * @return name
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getName() {
     return name;
diff --git a/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/AdditionalPropertiesBoolean.java b/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/AdditionalPropertiesBoolean.java
index 754ff32555..78f7ac79b2 100644
--- a/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/AdditionalPropertiesBoolean.java
+++ b/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/AdditionalPropertiesBoolean.java
@@ -40,6 +40,7 @@ public class AdditionalPropertiesBoolean extends HashMap<String, Boolean> {
    * Get name
    * @return name
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getName() {
     return name;
diff --git a/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java b/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java
index abba0b86e7..fc52759bc8 100644
--- a/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java
+++ b/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java
@@ -80,6 +80,7 @@ public class AdditionalPropertiesClass {
    * Get mapString
    * @return mapString
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Map<String, String> getMapString() {
     return mapString;
@@ -106,6 +107,7 @@ public class AdditionalPropertiesClass {
    * Get mapNumber
    * @return mapNumber
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Map<String, BigDecimal> getMapNumber() {
     return mapNumber;
@@ -132,6 +134,7 @@ public class AdditionalPropertiesClass {
    * Get mapInteger
    * @return mapInteger
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Map<String, Integer> getMapInteger() {
     return mapInteger;
@@ -158,6 +161,7 @@ public class AdditionalPropertiesClass {
    * Get mapBoolean
    * @return mapBoolean
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Map<String, Boolean> getMapBoolean() {
     return mapBoolean;
@@ -184,6 +188,7 @@ public class AdditionalPropertiesClass {
    * Get mapArrayInteger
    * @return mapArrayInteger
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Map<String, List<Integer>> getMapArrayInteger() {
     return mapArrayInteger;
@@ -210,6 +215,7 @@ public class AdditionalPropertiesClass {
    * Get mapArrayAnytype
    * @return mapArrayAnytype
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Map<String, List<Object>> getMapArrayAnytype() {
     return mapArrayAnytype;
@@ -236,6 +242,7 @@ public class AdditionalPropertiesClass {
    * Get mapMapString
    * @return mapMapString
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Map<String, Map<String, String>> getMapMapString() {
     return mapMapString;
@@ -262,6 +269,7 @@ public class AdditionalPropertiesClass {
    * Get mapMapAnytype
    * @return mapMapAnytype
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Map<String, Map<String, Object>> getMapMapAnytype() {
     return mapMapAnytype;
@@ -280,6 +288,7 @@ public class AdditionalPropertiesClass {
    * Get anytype1
    * @return anytype1
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Object getAnytype1() {
     return anytype1;
@@ -298,6 +307,7 @@ public class AdditionalPropertiesClass {
    * Get anytype2
    * @return anytype2
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Object getAnytype2() {
     return anytype2;
@@ -316,6 +326,7 @@ public class AdditionalPropertiesClass {
    * Get anytype3
    * @return anytype3
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Object getAnytype3() {
     return anytype3;
diff --git a/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/AdditionalPropertiesInteger.java b/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/AdditionalPropertiesInteger.java
index 1f61976466..6e5159d404 100644
--- a/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/AdditionalPropertiesInteger.java
+++ b/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/AdditionalPropertiesInteger.java
@@ -40,6 +40,7 @@ public class AdditionalPropertiesInteger extends HashMap<String, Integer> {
    * Get name
    * @return name
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getName() {
     return name;
diff --git a/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/AdditionalPropertiesNumber.java b/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/AdditionalPropertiesNumber.java
index 474d7b8f04..ddc8146dea 100644
--- a/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/AdditionalPropertiesNumber.java
+++ b/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/AdditionalPropertiesNumber.java
@@ -41,6 +41,7 @@ public class AdditionalPropertiesNumber extends HashMap<String, BigDecimal> {
    * Get name
    * @return name
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getName() {
     return name;
diff --git a/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/AdditionalPropertiesObject.java b/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/AdditionalPropertiesObject.java
index 40ff424fe4..cc29400029 100644
--- a/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/AdditionalPropertiesObject.java
+++ b/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/AdditionalPropertiesObject.java
@@ -40,6 +40,7 @@ public class AdditionalPropertiesObject extends HashMap<String, Map> {
    * Get name
    * @return name
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getName() {
     return name;
diff --git a/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/AdditionalPropertiesString.java b/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/AdditionalPropertiesString.java
index eeaedf3bda..fb3368dfed 100644
--- a/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/AdditionalPropertiesString.java
+++ b/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/AdditionalPropertiesString.java
@@ -40,6 +40,7 @@ public class AdditionalPropertiesString extends HashMap<String, String> {
    * Get name
    * @return name
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getName() {
     return name;
diff --git a/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Animal.java b/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Animal.java
index f210737e12..53a0eec339 100644
--- a/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Animal.java
+++ b/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Animal.java
@@ -49,6 +49,7 @@ public class Animal {
    * Get className
    * @return className
   **/
+
   @ApiModelProperty(required = true, value = "")
   public String getClassName() {
     return className;
@@ -67,6 +68,7 @@ public class Animal {
    * Get color
    * @return color
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getColor() {
     return color;
diff --git a/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java b/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java
index 4f767a55cb..49b5c55250 100644
--- a/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java
+++ b/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java
@@ -49,6 +49,7 @@ public class ArrayOfArrayOfNumberOnly {
    * Get arrayArrayNumber
    * @return arrayArrayNumber
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public List<List<BigDecimal>> getArrayArrayNumber() {
     return arrayArrayNumber;
diff --git a/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java b/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java
index 727da04e54..ef2555974d 100644
--- a/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java
+++ b/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java
@@ -49,6 +49,7 @@ public class ArrayOfNumberOnly {
    * Get arrayNumber
    * @return arrayNumber
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public List<BigDecimal> getArrayNumber() {
     return arrayNumber;
diff --git a/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/ArrayTest.java b/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/ArrayTest.java
index 1c4f1195f7..b6b98aa275 100644
--- a/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/ArrayTest.java
+++ b/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/ArrayTest.java
@@ -55,6 +55,7 @@ public class ArrayTest {
    * Get arrayOfString
    * @return arrayOfString
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public List<String> getArrayOfString() {
     return arrayOfString;
@@ -81,6 +82,7 @@ public class ArrayTest {
    * Get arrayArrayOfInteger
    * @return arrayArrayOfInteger
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public List<List<Long>> getArrayArrayOfInteger() {
     return arrayArrayOfInteger;
@@ -107,6 +109,7 @@ public class ArrayTest {
    * Get arrayArrayOfModel
    * @return arrayArrayOfModel
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public List<List<ReadOnlyFirst>> getArrayArrayOfModel() {
     return arrayArrayOfModel;
diff --git a/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Capitalization.java b/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Capitalization.java
index cedbd8c9db..bb83be97fe 100644
--- a/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Capitalization.java
+++ b/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Capitalization.java
@@ -53,6 +53,7 @@ public class Capitalization {
    * Get smallCamel
    * @return smallCamel
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getSmallCamel() {
     return smallCamel;
@@ -71,6 +72,7 @@ public class Capitalization {
    * Get capitalCamel
    * @return capitalCamel
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getCapitalCamel() {
     return capitalCamel;
@@ -89,6 +91,7 @@ public class Capitalization {
    * Get smallSnake
    * @return smallSnake
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getSmallSnake() {
     return smallSnake;
@@ -107,6 +110,7 @@ public class Capitalization {
    * Get capitalSnake
    * @return capitalSnake
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getCapitalSnake() {
     return capitalSnake;
@@ -125,6 +129,7 @@ public class Capitalization {
    * Get scAETHFlowPoints
    * @return scAETHFlowPoints
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getScAETHFlowPoints() {
     return scAETHFlowPoints;
@@ -143,6 +148,7 @@ public class Capitalization {
    * Name of the pet 
    * @return ATT_NAME
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "Name of the pet ")
   public String getATTNAME() {
     return ATT_NAME;
diff --git a/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Cat.java b/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Cat.java
index 40f40f869e..ce456c8647 100644
--- a/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Cat.java
+++ b/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Cat.java
@@ -40,6 +40,7 @@ public class Cat extends Animal {
    * Get declawed
    * @return declawed
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Boolean getDeclawed() {
     return declawed;
diff --git a/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/CatAllOf.java b/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/CatAllOf.java
index 0e8a7f8fa9..224c08671c 100644
--- a/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/CatAllOf.java
+++ b/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/CatAllOf.java
@@ -38,6 +38,7 @@ public class CatAllOf {
    * Get declawed
    * @return declawed
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Boolean getDeclawed() {
     return declawed;
diff --git a/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Category.java b/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Category.java
index baf44c948a..03efdd4be8 100644
--- a/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Category.java
+++ b/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Category.java
@@ -41,6 +41,7 @@ public class Category {
    * Get id
    * @return id
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Long getId() {
     return id;
@@ -59,6 +60,7 @@ public class Category {
    * Get name
    * @return name
   **/
+
   @ApiModelProperty(required = true, value = "")
   public String getName() {
     return name;
diff --git a/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/ClassModel.java b/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/ClassModel.java
index 0904f531de..def421a670 100644
--- a/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/ClassModel.java
+++ b/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/ClassModel.java
@@ -39,6 +39,7 @@ public class ClassModel {
    * Get propertyClass
    * @return propertyClass
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getPropertyClass() {
     return propertyClass;
diff --git a/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Client.java b/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Client.java
index 9ebcc7294e..c0bd0743e5 100644
--- a/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Client.java
+++ b/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Client.java
@@ -38,6 +38,7 @@ public class Client {
    * Get client
    * @return client
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getClient() {
     return client;
diff --git a/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Dog.java b/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Dog.java
index 3b1c570cb4..6b79c59606 100644
--- a/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Dog.java
+++ b/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Dog.java
@@ -40,6 +40,7 @@ public class Dog extends Animal {
    * Get breed
    * @return breed
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getBreed() {
     return breed;
diff --git a/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/DogAllOf.java b/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/DogAllOf.java
index cb95a6a372..1a4496d8f0 100644
--- a/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/DogAllOf.java
+++ b/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/DogAllOf.java
@@ -38,6 +38,7 @@ public class DogAllOf {
    * Get breed
    * @return breed
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getBreed() {
     return breed;
diff --git a/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/EnumArrays.java b/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/EnumArrays.java
index 38f41757f0..fff7f65c72 100644
--- a/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/EnumArrays.java
+++ b/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/EnumArrays.java
@@ -113,6 +113,7 @@ public class EnumArrays {
    * Get justSymbol
    * @return justSymbol
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public JustSymbolEnum getJustSymbol() {
     return justSymbol;
@@ -139,6 +140,7 @@ public class EnumArrays {
    * Get arrayEnum
    * @return arrayEnum
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public List<ArrayEnumEnum> getArrayEnum() {
     return arrayEnum;
diff --git a/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/EnumTest.java b/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/EnumTest.java
index bdf61d52c9..d4b36798ee 100644
--- a/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/EnumTest.java
+++ b/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/EnumTest.java
@@ -195,6 +195,7 @@ public class EnumTest {
    * Get enumString
    * @return enumString
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public EnumStringEnum getEnumString() {
     return enumString;
@@ -213,6 +214,7 @@ public class EnumTest {
    * Get enumStringRequired
    * @return enumStringRequired
   **/
+
   @ApiModelProperty(required = true, value = "")
   public EnumStringRequiredEnum getEnumStringRequired() {
     return enumStringRequired;
@@ -231,6 +233,7 @@ public class EnumTest {
    * Get enumInteger
    * @return enumInteger
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public EnumIntegerEnum getEnumInteger() {
     return enumInteger;
@@ -249,6 +252,7 @@ public class EnumTest {
    * Get enumNumber
    * @return enumNumber
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public EnumNumberEnum getEnumNumber() {
     return enumNumber;
@@ -267,6 +271,7 @@ public class EnumTest {
    * Get outerEnum
    * @return outerEnum
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public OuterEnum getOuterEnum() {
     return outerEnum;
diff --git a/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java b/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java
index c8e26deafa..ebbb0fb9f3 100644
--- a/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java
+++ b/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java
@@ -43,6 +43,7 @@ public class FileSchemaTestClass {
    * Get file
    * @return file
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public java.io.File getFile() {
     return file;
@@ -69,6 +70,7 @@ public class FileSchemaTestClass {
    * Get files
    * @return files
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public List<java.io.File> getFiles() {
     return files;
diff --git a/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/FormatTest.java b/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/FormatTest.java
index a7ff05e63e..518432caff 100644
--- a/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/FormatTest.java
+++ b/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/FormatTest.java
@@ -81,6 +81,7 @@ public class FormatTest {
    * maximum: 100
    * @return integer
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Integer getInteger() {
     return integer;
@@ -101,6 +102,7 @@ public class FormatTest {
    * maximum: 200
    * @return int32
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Integer getInt32() {
     return int32;
@@ -119,6 +121,7 @@ public class FormatTest {
    * Get int64
    * @return int64
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Long getInt64() {
     return int64;
@@ -139,6 +142,7 @@ public class FormatTest {
    * maximum: 543.2
    * @return number
   **/
+
   @ApiModelProperty(required = true, value = "")
   public BigDecimal getNumber() {
     return number;
@@ -159,6 +163,7 @@ public class FormatTest {
    * maximum: 987.6
    * @return _float
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Float getFloat() {
     return _float;
@@ -179,6 +184,7 @@ public class FormatTest {
    * maximum: 123.4
    * @return _double
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Double getDouble() {
     return _double;
@@ -197,6 +203,7 @@ public class FormatTest {
    * Get string
    * @return string
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getString() {
     return string;
@@ -215,6 +222,7 @@ public class FormatTest {
    * Get _byte
    * @return _byte
   **/
+
   @ApiModelProperty(required = true, value = "")
   public byte[] getByte() {
     return _byte;
@@ -233,6 +241,7 @@ public class FormatTest {
    * Get binary
    * @return binary
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public File getBinary() {
     return binary;
@@ -251,6 +260,7 @@ public class FormatTest {
    * Get date
    * @return date
   **/
+
   @ApiModelProperty(required = true, value = "")
   public LocalDate getDate() {
     return date;
@@ -269,6 +279,7 @@ public class FormatTest {
    * Get dateTime
    * @return dateTime
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public OffsetDateTime getDateTime() {
     return dateTime;
@@ -287,6 +298,7 @@ public class FormatTest {
    * Get uuid
    * @return uuid
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(example = "72f98069-206d-4f12-9f12-3d1e525a8e84", value = "")
   public UUID getUuid() {
     return uuid;
@@ -305,6 +317,7 @@ public class FormatTest {
    * Get password
    * @return password
   **/
+
   @ApiModelProperty(required = true, value = "")
   public String getPassword() {
     return password;
diff --git a/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java b/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java
index 4dbede6b7d..44159e08e8 100644
--- a/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java
+++ b/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java
@@ -36,6 +36,7 @@ public class HasOnlyReadOnly {
    * Get bar
    * @return bar
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getBar() {
     return bar;
@@ -45,6 +46,7 @@ public class HasOnlyReadOnly {
    * Get foo
    * @return foo
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getFoo() {
     return foo;
diff --git a/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/MapTest.java b/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/MapTest.java
index e4c090189f..2caabbea07 100644
--- a/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/MapTest.java
+++ b/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/MapTest.java
@@ -93,6 +93,7 @@ public class MapTest {
    * Get mapMapOfString
    * @return mapMapOfString
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Map<String, Map<String, String>> getMapMapOfString() {
     return mapMapOfString;
@@ -119,6 +120,7 @@ public class MapTest {
    * Get mapOfEnumString
    * @return mapOfEnumString
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Map<String, InnerEnum> getMapOfEnumString() {
     return mapOfEnumString;
@@ -145,6 +147,7 @@ public class MapTest {
    * Get directMap
    * @return directMap
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Map<String, Boolean> getDirectMap() {
     return directMap;
@@ -171,6 +174,7 @@ public class MapTest {
    * Get indirectMap
    * @return indirectMap
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Map<String, Boolean> getIndirectMap() {
     return indirectMap;
diff --git a/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java
index 3e4d20688e..8d97329c31 100644
--- a/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java
+++ b/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java
@@ -50,6 +50,7 @@ public class MixedPropertiesAndAdditionalPropertiesClass {
    * Get uuid
    * @return uuid
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public UUID getUuid() {
     return uuid;
@@ -68,6 +69,7 @@ public class MixedPropertiesAndAdditionalPropertiesClass {
    * Get dateTime
    * @return dateTime
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public OffsetDateTime getDateTime() {
     return dateTime;
@@ -94,6 +96,7 @@ public class MixedPropertiesAndAdditionalPropertiesClass {
    * Get map
    * @return map
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Map<String, Animal> getMap() {
     return map;
diff --git a/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Model200Response.java b/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Model200Response.java
index 3be60ea3ae..bd3244dd57 100644
--- a/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Model200Response.java
+++ b/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Model200Response.java
@@ -42,6 +42,7 @@ public class Model200Response {
    * Get name
    * @return name
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Integer getName() {
     return name;
@@ -60,6 +61,7 @@ public class Model200Response {
    * Get propertyClass
    * @return propertyClass
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getPropertyClass() {
     return propertyClass;
diff --git a/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/ModelApiResponse.java b/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/ModelApiResponse.java
index 6e458e38dc..ed335cdca1 100644
--- a/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/ModelApiResponse.java
+++ b/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/ModelApiResponse.java
@@ -44,6 +44,7 @@ public class ModelApiResponse {
    * Get code
    * @return code
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Integer getCode() {
     return code;
@@ -62,6 +63,7 @@ public class ModelApiResponse {
    * Get type
    * @return type
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getType() {
     return type;
@@ -80,6 +82,7 @@ public class ModelApiResponse {
    * Get message
    * @return message
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getMessage() {
     return message;
diff --git a/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/ModelReturn.java b/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/ModelReturn.java
index 62e5295212..04c0bcd33f 100644
--- a/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/ModelReturn.java
+++ b/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/ModelReturn.java
@@ -39,6 +39,7 @@ public class ModelReturn {
    * Get _return
    * @return _return
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Integer getReturn() {
     return _return;
diff --git a/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Name.java b/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Name.java
index 852a999035..af27c6e45f 100644
--- a/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Name.java
+++ b/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Name.java
@@ -48,6 +48,7 @@ public class Name {
    * Get name
    * @return name
   **/
+
   @ApiModelProperty(required = true, value = "")
   public Integer getName() {
     return name;
@@ -61,6 +62,7 @@ public class Name {
    * Get snakeCase
    * @return snakeCase
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Integer getSnakeCase() {
     return snakeCase;
@@ -75,6 +77,7 @@ public class Name {
    * Get property
    * @return property
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getProperty() {
     return property;
@@ -88,6 +91,7 @@ public class Name {
    * Get _123number
    * @return _123number
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Integer get123number() {
     return _123number;
diff --git a/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/NumberOnly.java b/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/NumberOnly.java
index 530a4d5818..4e29c814cc 100644
--- a/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/NumberOnly.java
+++ b/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/NumberOnly.java
@@ -39,6 +39,7 @@ public class NumberOnly {
    * Get justNumber
    * @return justNumber
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public BigDecimal getJustNumber() {
     return justNumber;
diff --git a/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Order.java b/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Order.java
index 67680cd7e6..1735b41d31 100644
--- a/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Order.java
+++ b/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Order.java
@@ -91,6 +91,7 @@ public class Order {
    * Get id
    * @return id
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Long getId() {
     return id;
@@ -109,6 +110,7 @@ public class Order {
    * Get petId
    * @return petId
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Long getPetId() {
     return petId;
@@ -127,6 +129,7 @@ public class Order {
    * Get quantity
    * @return quantity
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Integer getQuantity() {
     return quantity;
@@ -145,6 +148,7 @@ public class Order {
    * Get shipDate
    * @return shipDate
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public OffsetDateTime getShipDate() {
     return shipDate;
@@ -163,6 +167,7 @@ public class Order {
    * Order Status
    * @return status
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "Order Status")
   public StatusEnum getStatus() {
     return status;
@@ -181,6 +186,7 @@ public class Order {
    * Get complete
    * @return complete
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Boolean getComplete() {
     return complete;
diff --git a/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/OuterComposite.java b/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/OuterComposite.java
index 6e71242384..f6515126a8 100644
--- a/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/OuterComposite.java
+++ b/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/OuterComposite.java
@@ -45,6 +45,7 @@ public class OuterComposite {
    * Get myNumber
    * @return myNumber
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public BigDecimal getMyNumber() {
     return myNumber;
@@ -63,6 +64,7 @@ public class OuterComposite {
    * Get myString
    * @return myString
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getMyString() {
     return myString;
@@ -81,6 +83,7 @@ public class OuterComposite {
    * Get myBoolean
    * @return myBoolean
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Boolean getMyBoolean() {
     return myBoolean;
diff --git a/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Pet.java b/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Pet.java
index a2305bf1d9..ace85c42aa 100644
--- a/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Pet.java
+++ b/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Pet.java
@@ -94,6 +94,7 @@ public class Pet {
    * Get id
    * @return id
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Long getId() {
     return id;
@@ -112,6 +113,7 @@ public class Pet {
    * Get category
    * @return category
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Category getCategory() {
     return category;
@@ -130,6 +132,7 @@ public class Pet {
    * Get name
    * @return name
   **/
+
   @ApiModelProperty(example = "doggie", required = true, value = "")
   public String getName() {
     return name;
@@ -153,6 +156,7 @@ public class Pet {
    * Get photoUrls
    * @return photoUrls
   **/
+
   @ApiModelProperty(required = true, value = "")
   public List<String> getPhotoUrls() {
     return photoUrls;
@@ -179,6 +183,7 @@ public class Pet {
    * Get tags
    * @return tags
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public List<Tag> getTags() {
     return tags;
@@ -197,6 +202,7 @@ public class Pet {
    * pet status in the store
    * @return status
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "pet status in the store")
   public StatusEnum getStatus() {
     return status;
diff --git a/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/ReadOnlyFirst.java b/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/ReadOnlyFirst.java
index 83f25c7923..a2c9e99699 100644
--- a/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/ReadOnlyFirst.java
+++ b/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/ReadOnlyFirst.java
@@ -36,6 +36,7 @@ public class ReadOnlyFirst {
    * Get bar
    * @return bar
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getBar() {
     return bar;
@@ -50,6 +51,7 @@ public class ReadOnlyFirst {
    * Get baz
    * @return baz
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getBaz() {
     return baz;
diff --git a/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/SpecialModelName.java b/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/SpecialModelName.java
index 5abfc132ad..a5ddb0b638 100644
--- a/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/SpecialModelName.java
+++ b/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/SpecialModelName.java
@@ -38,6 +38,7 @@ public class SpecialModelName {
    * Get $specialPropertyName
    * @return $specialPropertyName
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Long get$SpecialPropertyName() {
     return $specialPropertyName;
diff --git a/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Tag.java b/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Tag.java
index e2e947b84a..8255ad8298 100644
--- a/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Tag.java
+++ b/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Tag.java
@@ -41,6 +41,7 @@ public class Tag {
    * Get id
    * @return id
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Long getId() {
     return id;
@@ -59,6 +60,7 @@ public class Tag {
    * Get name
    * @return name
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getName() {
     return name;
diff --git a/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/TypeHolderDefault.java b/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/TypeHolderDefault.java
index 3c6488d270..786a681fb3 100644
--- a/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/TypeHolderDefault.java
+++ b/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/TypeHolderDefault.java
@@ -53,6 +53,7 @@ public class TypeHolderDefault {
    * Get stringItem
    * @return stringItem
   **/
+
   @ApiModelProperty(required = true, value = "")
   public String getStringItem() {
     return stringItem;
@@ -71,6 +72,7 @@ public class TypeHolderDefault {
    * Get numberItem
    * @return numberItem
   **/
+
   @ApiModelProperty(required = true, value = "")
   public BigDecimal getNumberItem() {
     return numberItem;
@@ -89,6 +91,7 @@ public class TypeHolderDefault {
    * Get integerItem
    * @return integerItem
   **/
+
   @ApiModelProperty(required = true, value = "")
   public Integer getIntegerItem() {
     return integerItem;
@@ -107,6 +110,7 @@ public class TypeHolderDefault {
    * Get boolItem
    * @return boolItem
   **/
+
   @ApiModelProperty(required = true, value = "")
   public Boolean getBoolItem() {
     return boolItem;
@@ -130,6 +134,7 @@ public class TypeHolderDefault {
    * Get arrayItem
    * @return arrayItem
   **/
+
   @ApiModelProperty(required = true, value = "")
   public List<Integer> getArrayItem() {
     return arrayItem;
diff --git a/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/TypeHolderExample.java b/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/TypeHolderExample.java
index 812b5839aa..701e4db843 100644
--- a/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/TypeHolderExample.java
+++ b/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/TypeHolderExample.java
@@ -53,6 +53,7 @@ public class TypeHolderExample {
    * Get stringItem
    * @return stringItem
   **/
+
   @ApiModelProperty(example = "what", required = true, value = "")
   public String getStringItem() {
     return stringItem;
@@ -71,6 +72,7 @@ public class TypeHolderExample {
    * Get numberItem
    * @return numberItem
   **/
+
   @ApiModelProperty(example = "1.234", required = true, value = "")
   public BigDecimal getNumberItem() {
     return numberItem;
@@ -89,6 +91,7 @@ public class TypeHolderExample {
    * Get integerItem
    * @return integerItem
   **/
+
   @ApiModelProperty(example = "-2", required = true, value = "")
   public Integer getIntegerItem() {
     return integerItem;
@@ -107,6 +110,7 @@ public class TypeHolderExample {
    * Get boolItem
    * @return boolItem
   **/
+
   @ApiModelProperty(example = "true", required = true, value = "")
   public Boolean getBoolItem() {
     return boolItem;
@@ -130,6 +134,7 @@ public class TypeHolderExample {
    * Get arrayItem
    * @return arrayItem
   **/
+
   @ApiModelProperty(example = "[0, 1, 2, 3]", required = true, value = "")
   public List<Integer> getArrayItem() {
     return arrayItem;
diff --git a/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/User.java b/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/User.java
index ee3f656a1a..6e6c4ac102 100644
--- a/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/User.java
+++ b/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/User.java
@@ -59,6 +59,7 @@ public class User {
    * Get id
    * @return id
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Long getId() {
     return id;
@@ -77,6 +78,7 @@ public class User {
    * Get username
    * @return username
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getUsername() {
     return username;
@@ -95,6 +97,7 @@ public class User {
    * Get firstName
    * @return firstName
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getFirstName() {
     return firstName;
@@ -113,6 +116,7 @@ public class User {
    * Get lastName
    * @return lastName
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getLastName() {
     return lastName;
@@ -131,6 +135,7 @@ public class User {
    * Get email
    * @return email
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getEmail() {
     return email;
@@ -149,6 +154,7 @@ public class User {
    * Get password
    * @return password
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getPassword() {
     return password;
@@ -167,6 +173,7 @@ public class User {
    * Get phone
    * @return phone
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getPhone() {
     return phone;
@@ -185,6 +192,7 @@ public class User {
    * User Status
    * @return userStatus
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "User Status")
   public Integer getUserStatus() {
     return userStatus;
diff --git a/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/XmlItem.java b/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/XmlItem.java
index 7cb8000561..2af459e5ae 100644
--- a/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/XmlItem.java
+++ b/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/XmlItem.java
@@ -125,6 +125,7 @@ public class XmlItem {
    * Get attributeString
    * @return attributeString
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(example = "string", value = "")
   public String getAttributeString() {
     return attributeString;
@@ -143,6 +144,7 @@ public class XmlItem {
    * Get attributeNumber
    * @return attributeNumber
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(example = "1.234", value = "")
   public BigDecimal getAttributeNumber() {
     return attributeNumber;
@@ -161,6 +163,7 @@ public class XmlItem {
    * Get attributeInteger
    * @return attributeInteger
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(example = "-2", value = "")
   public Integer getAttributeInteger() {
     return attributeInteger;
@@ -179,6 +182,7 @@ public class XmlItem {
    * Get attributeBoolean
    * @return attributeBoolean
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(example = "true", value = "")
   public Boolean getAttributeBoolean() {
     return attributeBoolean;
@@ -205,6 +209,7 @@ public class XmlItem {
    * Get wrappedArray
    * @return wrappedArray
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public List<Integer> getWrappedArray() {
     return wrappedArray;
@@ -223,6 +228,7 @@ public class XmlItem {
    * Get nameString
    * @return nameString
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(example = "string", value = "")
   public String getNameString() {
     return nameString;
@@ -241,6 +247,7 @@ public class XmlItem {
    * Get nameNumber
    * @return nameNumber
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(example = "1.234", value = "")
   public BigDecimal getNameNumber() {
     return nameNumber;
@@ -259,6 +266,7 @@ public class XmlItem {
    * Get nameInteger
    * @return nameInteger
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(example = "-2", value = "")
   public Integer getNameInteger() {
     return nameInteger;
@@ -277,6 +285,7 @@ public class XmlItem {
    * Get nameBoolean
    * @return nameBoolean
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(example = "true", value = "")
   public Boolean getNameBoolean() {
     return nameBoolean;
@@ -303,6 +312,7 @@ public class XmlItem {
    * Get nameArray
    * @return nameArray
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public List<Integer> getNameArray() {
     return nameArray;
@@ -329,6 +339,7 @@ public class XmlItem {
    * Get nameWrappedArray
    * @return nameWrappedArray
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public List<Integer> getNameWrappedArray() {
     return nameWrappedArray;
@@ -347,6 +358,7 @@ public class XmlItem {
    * Get prefixString
    * @return prefixString
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(example = "string", value = "")
   public String getPrefixString() {
     return prefixString;
@@ -365,6 +377,7 @@ public class XmlItem {
    * Get prefixNumber
    * @return prefixNumber
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(example = "1.234", value = "")
   public BigDecimal getPrefixNumber() {
     return prefixNumber;
@@ -383,6 +396,7 @@ public class XmlItem {
    * Get prefixInteger
    * @return prefixInteger
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(example = "-2", value = "")
   public Integer getPrefixInteger() {
     return prefixInteger;
@@ -401,6 +415,7 @@ public class XmlItem {
    * Get prefixBoolean
    * @return prefixBoolean
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(example = "true", value = "")
   public Boolean getPrefixBoolean() {
     return prefixBoolean;
@@ -427,6 +442,7 @@ public class XmlItem {
    * Get prefixArray
    * @return prefixArray
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public List<Integer> getPrefixArray() {
     return prefixArray;
@@ -453,6 +469,7 @@ public class XmlItem {
    * Get prefixWrappedArray
    * @return prefixWrappedArray
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public List<Integer> getPrefixWrappedArray() {
     return prefixWrappedArray;
@@ -471,6 +488,7 @@ public class XmlItem {
    * Get namespaceString
    * @return namespaceString
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(example = "string", value = "")
   public String getNamespaceString() {
     return namespaceString;
@@ -489,6 +507,7 @@ public class XmlItem {
    * Get namespaceNumber
    * @return namespaceNumber
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(example = "1.234", value = "")
   public BigDecimal getNamespaceNumber() {
     return namespaceNumber;
@@ -507,6 +526,7 @@ public class XmlItem {
    * Get namespaceInteger
    * @return namespaceInteger
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(example = "-2", value = "")
   public Integer getNamespaceInteger() {
     return namespaceInteger;
@@ -525,6 +545,7 @@ public class XmlItem {
    * Get namespaceBoolean
    * @return namespaceBoolean
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(example = "true", value = "")
   public Boolean getNamespaceBoolean() {
     return namespaceBoolean;
@@ -551,6 +572,7 @@ public class XmlItem {
    * Get namespaceArray
    * @return namespaceArray
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public List<Integer> getNamespaceArray() {
     return namespaceArray;
@@ -577,6 +599,7 @@ public class XmlItem {
    * Get namespaceWrappedArray
    * @return namespaceWrappedArray
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public List<Integer> getNamespaceWrappedArray() {
     return namespaceWrappedArray;
@@ -595,6 +618,7 @@ public class XmlItem {
    * Get prefixNsString
    * @return prefixNsString
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(example = "string", value = "")
   public String getPrefixNsString() {
     return prefixNsString;
@@ -613,6 +637,7 @@ public class XmlItem {
    * Get prefixNsNumber
    * @return prefixNsNumber
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(example = "1.234", value = "")
   public BigDecimal getPrefixNsNumber() {
     return prefixNsNumber;
@@ -631,6 +656,7 @@ public class XmlItem {
    * Get prefixNsInteger
    * @return prefixNsInteger
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(example = "-2", value = "")
   public Integer getPrefixNsInteger() {
     return prefixNsInteger;
@@ -649,6 +675,7 @@ public class XmlItem {
    * Get prefixNsBoolean
    * @return prefixNsBoolean
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(example = "true", value = "")
   public Boolean getPrefixNsBoolean() {
     return prefixNsBoolean;
@@ -675,6 +702,7 @@ public class XmlItem {
    * Get prefixNsArray
    * @return prefixNsArray
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public List<Integer> getPrefixNsArray() {
     return prefixNsArray;
@@ -701,6 +729,7 @@ public class XmlItem {
    * Get prefixNsWrappedArray
    * @return prefixNsWrappedArray
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public List<Integer> getPrefixNsWrappedArray() {
     return prefixNsWrappedArray;
diff --git a/samples/client/petstore/java/jersey2/build.gradle b/samples/client/petstore/java/jersey2/build.gradle
index 22f7fde908..0c9c756cdc 100644
--- a/samples/client/petstore/java/jersey2/build.gradle
+++ b/samples/client/petstore/java/jersey2/build.gradle
@@ -104,6 +104,7 @@ ext {
 
 dependencies {
     compile "io.swagger:swagger-annotations:$swagger_annotations_version"
+    compile "com.google.code.findbugs:jsr305:3.0.2"
     compile "org.glassfish.jersey.core:jersey-client:$jersey_version"
     compile "org.glassfish.jersey.media:jersey-media-multipart:$jersey_version"
     compile "org.glassfish.jersey.media:jersey-media-json-jackson:$jersey_version"
diff --git a/samples/client/petstore/java/jersey2/pom.xml b/samples/client/petstore/java/jersey2/pom.xml
index 51899df37e..d162686c0c 100644
--- a/samples/client/petstore/java/jersey2/pom.xml
+++ b/samples/client/petstore/java/jersey2/pom.xml
@@ -210,6 +210,13 @@
             <version>${swagger-annotations-version}</version>
         </dependency>
 
+        <!-- @Nullable annotation -->
+        <dependency>
+            <groupId>com.google.code.findbugs</groupId>
+            <artifactId>jsr305</artifactId>
+            <version>3.0.2</version>
+        </dependency>
+        
         <!-- HTTP client: jersey-client -->
         <dependency>
             <groupId>org.glassfish.jersey.core</groupId>
diff --git a/samples/client/petstore/java/jersey2/src/main/java/org/openapitools/client/model/AdditionalPropertiesAnyType.java b/samples/client/petstore/java/jersey2/src/main/java/org/openapitools/client/model/AdditionalPropertiesAnyType.java
index d223a661f8..1abb2d8a64 100644
--- a/samples/client/petstore/java/jersey2/src/main/java/org/openapitools/client/model/AdditionalPropertiesAnyType.java
+++ b/samples/client/petstore/java/jersey2/src/main/java/org/openapitools/client/model/AdditionalPropertiesAnyType.java
@@ -40,6 +40,7 @@ public class AdditionalPropertiesAnyType extends HashMap<String, Object> {
    * Get name
    * @return name
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getName() {
     return name;
diff --git a/samples/client/petstore/java/jersey2/src/main/java/org/openapitools/client/model/AdditionalPropertiesArray.java b/samples/client/petstore/java/jersey2/src/main/java/org/openapitools/client/model/AdditionalPropertiesArray.java
index db738129d0..1821c243e1 100644
--- a/samples/client/petstore/java/jersey2/src/main/java/org/openapitools/client/model/AdditionalPropertiesArray.java
+++ b/samples/client/petstore/java/jersey2/src/main/java/org/openapitools/client/model/AdditionalPropertiesArray.java
@@ -41,6 +41,7 @@ public class AdditionalPropertiesArray extends HashMap<String, List> {
    * Get name
    * @return name
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getName() {
     return name;
diff --git a/samples/client/petstore/java/jersey2/src/main/java/org/openapitools/client/model/AdditionalPropertiesBoolean.java b/samples/client/petstore/java/jersey2/src/main/java/org/openapitools/client/model/AdditionalPropertiesBoolean.java
index 754ff32555..78f7ac79b2 100644
--- a/samples/client/petstore/java/jersey2/src/main/java/org/openapitools/client/model/AdditionalPropertiesBoolean.java
+++ b/samples/client/petstore/java/jersey2/src/main/java/org/openapitools/client/model/AdditionalPropertiesBoolean.java
@@ -40,6 +40,7 @@ public class AdditionalPropertiesBoolean extends HashMap<String, Boolean> {
    * Get name
    * @return name
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getName() {
     return name;
diff --git a/samples/client/petstore/java/jersey2/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java b/samples/client/petstore/java/jersey2/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java
index 2de7a27185..406bccc278 100644
--- a/samples/client/petstore/java/jersey2/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java
+++ b/samples/client/petstore/java/jersey2/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java
@@ -80,6 +80,7 @@ public class AdditionalPropertiesClass {
    * Get mapString
    * @return mapString
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Map<String, String> getMapString() {
     return mapString;
@@ -106,6 +107,7 @@ public class AdditionalPropertiesClass {
    * Get mapNumber
    * @return mapNumber
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Map<String, BigDecimal> getMapNumber() {
     return mapNumber;
@@ -132,6 +134,7 @@ public class AdditionalPropertiesClass {
    * Get mapInteger
    * @return mapInteger
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Map<String, Integer> getMapInteger() {
     return mapInteger;
@@ -158,6 +161,7 @@ public class AdditionalPropertiesClass {
    * Get mapBoolean
    * @return mapBoolean
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Map<String, Boolean> getMapBoolean() {
     return mapBoolean;
@@ -184,6 +188,7 @@ public class AdditionalPropertiesClass {
    * Get mapArrayInteger
    * @return mapArrayInteger
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Map<String, List<Integer>> getMapArrayInteger() {
     return mapArrayInteger;
@@ -210,6 +215,7 @@ public class AdditionalPropertiesClass {
    * Get mapArrayAnytype
    * @return mapArrayAnytype
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Map<String, List<Object>> getMapArrayAnytype() {
     return mapArrayAnytype;
@@ -236,6 +242,7 @@ public class AdditionalPropertiesClass {
    * Get mapMapString
    * @return mapMapString
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Map<String, Map<String, String>> getMapMapString() {
     return mapMapString;
@@ -262,6 +269,7 @@ public class AdditionalPropertiesClass {
    * Get mapMapAnytype
    * @return mapMapAnytype
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Map<String, Map<String, Object>> getMapMapAnytype() {
     return mapMapAnytype;
@@ -280,6 +288,7 @@ public class AdditionalPropertiesClass {
    * Get anytype1
    * @return anytype1
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Object getAnytype1() {
     return anytype1;
@@ -298,6 +307,7 @@ public class AdditionalPropertiesClass {
    * Get anytype2
    * @return anytype2
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Object getAnytype2() {
     return anytype2;
@@ -316,6 +326,7 @@ public class AdditionalPropertiesClass {
    * Get anytype3
    * @return anytype3
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Object getAnytype3() {
     return anytype3;
diff --git a/samples/client/petstore/java/jersey2/src/main/java/org/openapitools/client/model/AdditionalPropertiesInteger.java b/samples/client/petstore/java/jersey2/src/main/java/org/openapitools/client/model/AdditionalPropertiesInteger.java
index 1f61976466..6e5159d404 100644
--- a/samples/client/petstore/java/jersey2/src/main/java/org/openapitools/client/model/AdditionalPropertiesInteger.java
+++ b/samples/client/petstore/java/jersey2/src/main/java/org/openapitools/client/model/AdditionalPropertiesInteger.java
@@ -40,6 +40,7 @@ public class AdditionalPropertiesInteger extends HashMap<String, Integer> {
    * Get name
    * @return name
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getName() {
     return name;
diff --git a/samples/client/petstore/java/jersey2/src/main/java/org/openapitools/client/model/AdditionalPropertiesNumber.java b/samples/client/petstore/java/jersey2/src/main/java/org/openapitools/client/model/AdditionalPropertiesNumber.java
index 474d7b8f04..ddc8146dea 100644
--- a/samples/client/petstore/java/jersey2/src/main/java/org/openapitools/client/model/AdditionalPropertiesNumber.java
+++ b/samples/client/petstore/java/jersey2/src/main/java/org/openapitools/client/model/AdditionalPropertiesNumber.java
@@ -41,6 +41,7 @@ public class AdditionalPropertiesNumber extends HashMap<String, BigDecimal> {
    * Get name
    * @return name
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getName() {
     return name;
diff --git a/samples/client/petstore/java/jersey2/src/main/java/org/openapitools/client/model/AdditionalPropertiesObject.java b/samples/client/petstore/java/jersey2/src/main/java/org/openapitools/client/model/AdditionalPropertiesObject.java
index 40ff424fe4..cc29400029 100644
--- a/samples/client/petstore/java/jersey2/src/main/java/org/openapitools/client/model/AdditionalPropertiesObject.java
+++ b/samples/client/petstore/java/jersey2/src/main/java/org/openapitools/client/model/AdditionalPropertiesObject.java
@@ -40,6 +40,7 @@ public class AdditionalPropertiesObject extends HashMap<String, Map> {
    * Get name
    * @return name
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getName() {
     return name;
diff --git a/samples/client/petstore/java/jersey2/src/main/java/org/openapitools/client/model/AdditionalPropertiesString.java b/samples/client/petstore/java/jersey2/src/main/java/org/openapitools/client/model/AdditionalPropertiesString.java
index eeaedf3bda..fb3368dfed 100644
--- a/samples/client/petstore/java/jersey2/src/main/java/org/openapitools/client/model/AdditionalPropertiesString.java
+++ b/samples/client/petstore/java/jersey2/src/main/java/org/openapitools/client/model/AdditionalPropertiesString.java
@@ -40,6 +40,7 @@ public class AdditionalPropertiesString extends HashMap<String, String> {
    * Get name
    * @return name
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getName() {
     return name;
diff --git a/samples/client/petstore/java/jersey2/src/main/java/org/openapitools/client/model/Animal.java b/samples/client/petstore/java/jersey2/src/main/java/org/openapitools/client/model/Animal.java
index f210737e12..53a0eec339 100644
--- a/samples/client/petstore/java/jersey2/src/main/java/org/openapitools/client/model/Animal.java
+++ b/samples/client/petstore/java/jersey2/src/main/java/org/openapitools/client/model/Animal.java
@@ -49,6 +49,7 @@ public class Animal {
    * Get className
    * @return className
   **/
+
   @ApiModelProperty(required = true, value = "")
   public String getClassName() {
     return className;
@@ -67,6 +68,7 @@ public class Animal {
    * Get color
    * @return color
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getColor() {
     return color;
diff --git a/samples/client/petstore/java/jersey2/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java b/samples/client/petstore/java/jersey2/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java
index f5c02b2326..de49df3fbd 100644
--- a/samples/client/petstore/java/jersey2/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java
+++ b/samples/client/petstore/java/jersey2/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java
@@ -49,6 +49,7 @@ public class ArrayOfArrayOfNumberOnly {
    * Get arrayArrayNumber
    * @return arrayArrayNumber
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public List<List<BigDecimal>> getArrayArrayNumber() {
     return arrayArrayNumber;
diff --git a/samples/client/petstore/java/jersey2/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java b/samples/client/petstore/java/jersey2/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java
index 2dcfdf3c78..f4399ff42d 100644
--- a/samples/client/petstore/java/jersey2/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java
+++ b/samples/client/petstore/java/jersey2/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java
@@ -49,6 +49,7 @@ public class ArrayOfNumberOnly {
    * Get arrayNumber
    * @return arrayNumber
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public List<BigDecimal> getArrayNumber() {
     return arrayNumber;
diff --git a/samples/client/petstore/java/jersey2/src/main/java/org/openapitools/client/model/ArrayTest.java b/samples/client/petstore/java/jersey2/src/main/java/org/openapitools/client/model/ArrayTest.java
index 0778fc2d8f..7483fa96ce 100644
--- a/samples/client/petstore/java/jersey2/src/main/java/org/openapitools/client/model/ArrayTest.java
+++ b/samples/client/petstore/java/jersey2/src/main/java/org/openapitools/client/model/ArrayTest.java
@@ -55,6 +55,7 @@ public class ArrayTest {
    * Get arrayOfString
    * @return arrayOfString
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public List<String> getArrayOfString() {
     return arrayOfString;
@@ -81,6 +82,7 @@ public class ArrayTest {
    * Get arrayArrayOfInteger
    * @return arrayArrayOfInteger
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public List<List<Long>> getArrayArrayOfInteger() {
     return arrayArrayOfInteger;
@@ -107,6 +109,7 @@ public class ArrayTest {
    * Get arrayArrayOfModel
    * @return arrayArrayOfModel
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public List<List<ReadOnlyFirst>> getArrayArrayOfModel() {
     return arrayArrayOfModel;
diff --git a/samples/client/petstore/java/jersey2/src/main/java/org/openapitools/client/model/Capitalization.java b/samples/client/petstore/java/jersey2/src/main/java/org/openapitools/client/model/Capitalization.java
index cedbd8c9db..bb83be97fe 100644
--- a/samples/client/petstore/java/jersey2/src/main/java/org/openapitools/client/model/Capitalization.java
+++ b/samples/client/petstore/java/jersey2/src/main/java/org/openapitools/client/model/Capitalization.java
@@ -53,6 +53,7 @@ public class Capitalization {
    * Get smallCamel
    * @return smallCamel
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getSmallCamel() {
     return smallCamel;
@@ -71,6 +72,7 @@ public class Capitalization {
    * Get capitalCamel
    * @return capitalCamel
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getCapitalCamel() {
     return capitalCamel;
@@ -89,6 +91,7 @@ public class Capitalization {
    * Get smallSnake
    * @return smallSnake
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getSmallSnake() {
     return smallSnake;
@@ -107,6 +110,7 @@ public class Capitalization {
    * Get capitalSnake
    * @return capitalSnake
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getCapitalSnake() {
     return capitalSnake;
@@ -125,6 +129,7 @@ public class Capitalization {
    * Get scAETHFlowPoints
    * @return scAETHFlowPoints
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getScAETHFlowPoints() {
     return scAETHFlowPoints;
@@ -143,6 +148,7 @@ public class Capitalization {
    * Name of the pet 
    * @return ATT_NAME
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "Name of the pet ")
   public String getATTNAME() {
     return ATT_NAME;
diff --git a/samples/client/petstore/java/jersey2/src/main/java/org/openapitools/client/model/Cat.java b/samples/client/petstore/java/jersey2/src/main/java/org/openapitools/client/model/Cat.java
index 40f40f869e..ce456c8647 100644
--- a/samples/client/petstore/java/jersey2/src/main/java/org/openapitools/client/model/Cat.java
+++ b/samples/client/petstore/java/jersey2/src/main/java/org/openapitools/client/model/Cat.java
@@ -40,6 +40,7 @@ public class Cat extends Animal {
    * Get declawed
    * @return declawed
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Boolean getDeclawed() {
     return declawed;
diff --git a/samples/client/petstore/java/jersey2/src/main/java/org/openapitools/client/model/CatAllOf.java b/samples/client/petstore/java/jersey2/src/main/java/org/openapitools/client/model/CatAllOf.java
index 0e8a7f8fa9..224c08671c 100644
--- a/samples/client/petstore/java/jersey2/src/main/java/org/openapitools/client/model/CatAllOf.java
+++ b/samples/client/petstore/java/jersey2/src/main/java/org/openapitools/client/model/CatAllOf.java
@@ -38,6 +38,7 @@ public class CatAllOf {
    * Get declawed
    * @return declawed
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Boolean getDeclawed() {
     return declawed;
diff --git a/samples/client/petstore/java/jersey2/src/main/java/org/openapitools/client/model/Category.java b/samples/client/petstore/java/jersey2/src/main/java/org/openapitools/client/model/Category.java
index baf44c948a..03efdd4be8 100644
--- a/samples/client/petstore/java/jersey2/src/main/java/org/openapitools/client/model/Category.java
+++ b/samples/client/petstore/java/jersey2/src/main/java/org/openapitools/client/model/Category.java
@@ -41,6 +41,7 @@ public class Category {
    * Get id
    * @return id
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Long getId() {
     return id;
@@ -59,6 +60,7 @@ public class Category {
    * Get name
    * @return name
   **/
+
   @ApiModelProperty(required = true, value = "")
   public String getName() {
     return name;
diff --git a/samples/client/petstore/java/jersey2/src/main/java/org/openapitools/client/model/ClassModel.java b/samples/client/petstore/java/jersey2/src/main/java/org/openapitools/client/model/ClassModel.java
index 0904f531de..def421a670 100644
--- a/samples/client/petstore/java/jersey2/src/main/java/org/openapitools/client/model/ClassModel.java
+++ b/samples/client/petstore/java/jersey2/src/main/java/org/openapitools/client/model/ClassModel.java
@@ -39,6 +39,7 @@ public class ClassModel {
    * Get propertyClass
    * @return propertyClass
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getPropertyClass() {
     return propertyClass;
diff --git a/samples/client/petstore/java/jersey2/src/main/java/org/openapitools/client/model/Client.java b/samples/client/petstore/java/jersey2/src/main/java/org/openapitools/client/model/Client.java
index 9ebcc7294e..c0bd0743e5 100644
--- a/samples/client/petstore/java/jersey2/src/main/java/org/openapitools/client/model/Client.java
+++ b/samples/client/petstore/java/jersey2/src/main/java/org/openapitools/client/model/Client.java
@@ -38,6 +38,7 @@ public class Client {
    * Get client
    * @return client
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getClient() {
     return client;
diff --git a/samples/client/petstore/java/jersey2/src/main/java/org/openapitools/client/model/Dog.java b/samples/client/petstore/java/jersey2/src/main/java/org/openapitools/client/model/Dog.java
index 3b1c570cb4..6b79c59606 100644
--- a/samples/client/petstore/java/jersey2/src/main/java/org/openapitools/client/model/Dog.java
+++ b/samples/client/petstore/java/jersey2/src/main/java/org/openapitools/client/model/Dog.java
@@ -40,6 +40,7 @@ public class Dog extends Animal {
    * Get breed
    * @return breed
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getBreed() {
     return breed;
diff --git a/samples/client/petstore/java/jersey2/src/main/java/org/openapitools/client/model/DogAllOf.java b/samples/client/petstore/java/jersey2/src/main/java/org/openapitools/client/model/DogAllOf.java
index cb95a6a372..1a4496d8f0 100644
--- a/samples/client/petstore/java/jersey2/src/main/java/org/openapitools/client/model/DogAllOf.java
+++ b/samples/client/petstore/java/jersey2/src/main/java/org/openapitools/client/model/DogAllOf.java
@@ -38,6 +38,7 @@ public class DogAllOf {
    * Get breed
    * @return breed
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getBreed() {
     return breed;
diff --git a/samples/client/petstore/java/jersey2/src/main/java/org/openapitools/client/model/EnumArrays.java b/samples/client/petstore/java/jersey2/src/main/java/org/openapitools/client/model/EnumArrays.java
index cb8d45860a..40e31bf3ca 100644
--- a/samples/client/petstore/java/jersey2/src/main/java/org/openapitools/client/model/EnumArrays.java
+++ b/samples/client/petstore/java/jersey2/src/main/java/org/openapitools/client/model/EnumArrays.java
@@ -113,6 +113,7 @@ public class EnumArrays {
    * Get justSymbol
    * @return justSymbol
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public JustSymbolEnum getJustSymbol() {
     return justSymbol;
@@ -139,6 +140,7 @@ public class EnumArrays {
    * Get arrayEnum
    * @return arrayEnum
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public List<ArrayEnumEnum> getArrayEnum() {
     return arrayEnum;
diff --git a/samples/client/petstore/java/jersey2/src/main/java/org/openapitools/client/model/EnumTest.java b/samples/client/petstore/java/jersey2/src/main/java/org/openapitools/client/model/EnumTest.java
index bdf61d52c9..d4b36798ee 100644
--- a/samples/client/petstore/java/jersey2/src/main/java/org/openapitools/client/model/EnumTest.java
+++ b/samples/client/petstore/java/jersey2/src/main/java/org/openapitools/client/model/EnumTest.java
@@ -195,6 +195,7 @@ public class EnumTest {
    * Get enumString
    * @return enumString
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public EnumStringEnum getEnumString() {
     return enumString;
@@ -213,6 +214,7 @@ public class EnumTest {
    * Get enumStringRequired
    * @return enumStringRequired
   **/
+
   @ApiModelProperty(required = true, value = "")
   public EnumStringRequiredEnum getEnumStringRequired() {
     return enumStringRequired;
@@ -231,6 +233,7 @@ public class EnumTest {
    * Get enumInteger
    * @return enumInteger
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public EnumIntegerEnum getEnumInteger() {
     return enumInteger;
@@ -249,6 +252,7 @@ public class EnumTest {
    * Get enumNumber
    * @return enumNumber
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public EnumNumberEnum getEnumNumber() {
     return enumNumber;
@@ -267,6 +271,7 @@ public class EnumTest {
    * Get outerEnum
    * @return outerEnum
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public OuterEnum getOuterEnum() {
     return outerEnum;
diff --git a/samples/client/petstore/java/jersey2/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java b/samples/client/petstore/java/jersey2/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java
index 326b1a90a3..bee77a8cec 100644
--- a/samples/client/petstore/java/jersey2/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java
+++ b/samples/client/petstore/java/jersey2/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java
@@ -43,6 +43,7 @@ public class FileSchemaTestClass {
    * Get file
    * @return file
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public java.io.File getFile() {
     return file;
@@ -69,6 +70,7 @@ public class FileSchemaTestClass {
    * Get files
    * @return files
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public List<java.io.File> getFiles() {
     return files;
diff --git a/samples/client/petstore/java/jersey2/src/main/java/org/openapitools/client/model/FormatTest.java b/samples/client/petstore/java/jersey2/src/main/java/org/openapitools/client/model/FormatTest.java
index dd1c2d2f58..c017f57a80 100644
--- a/samples/client/petstore/java/jersey2/src/main/java/org/openapitools/client/model/FormatTest.java
+++ b/samples/client/petstore/java/jersey2/src/main/java/org/openapitools/client/model/FormatTest.java
@@ -81,6 +81,7 @@ public class FormatTest {
    * maximum: 100
    * @return integer
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Integer getInteger() {
     return integer;
@@ -101,6 +102,7 @@ public class FormatTest {
    * maximum: 200
    * @return int32
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Integer getInt32() {
     return int32;
@@ -119,6 +121,7 @@ public class FormatTest {
    * Get int64
    * @return int64
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Long getInt64() {
     return int64;
@@ -139,6 +142,7 @@ public class FormatTest {
    * maximum: 543.2
    * @return number
   **/
+
   @ApiModelProperty(required = true, value = "")
   public BigDecimal getNumber() {
     return number;
@@ -159,6 +163,7 @@ public class FormatTest {
    * maximum: 987.6
    * @return _float
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Float getFloat() {
     return _float;
@@ -179,6 +184,7 @@ public class FormatTest {
    * maximum: 123.4
    * @return _double
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Double getDouble() {
     return _double;
@@ -197,6 +203,7 @@ public class FormatTest {
    * Get string
    * @return string
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getString() {
     return string;
@@ -215,6 +222,7 @@ public class FormatTest {
    * Get _byte
    * @return _byte
   **/
+
   @ApiModelProperty(required = true, value = "")
   public byte[] getByte() {
     return _byte;
@@ -233,6 +241,7 @@ public class FormatTest {
    * Get binary
    * @return binary
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public File getBinary() {
     return binary;
@@ -251,6 +260,7 @@ public class FormatTest {
    * Get date
    * @return date
   **/
+
   @ApiModelProperty(required = true, value = "")
   public LocalDate getDate() {
     return date;
@@ -269,6 +279,7 @@ public class FormatTest {
    * Get dateTime
    * @return dateTime
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public OffsetDateTime getDateTime() {
     return dateTime;
@@ -287,6 +298,7 @@ public class FormatTest {
    * Get uuid
    * @return uuid
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(example = "72f98069-206d-4f12-9f12-3d1e525a8e84", value = "")
   public UUID getUuid() {
     return uuid;
@@ -305,6 +317,7 @@ public class FormatTest {
    * Get password
    * @return password
   **/
+
   @ApiModelProperty(required = true, value = "")
   public String getPassword() {
     return password;
diff --git a/samples/client/petstore/java/jersey2/src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java b/samples/client/petstore/java/jersey2/src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java
index 4dbede6b7d..44159e08e8 100644
--- a/samples/client/petstore/java/jersey2/src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java
+++ b/samples/client/petstore/java/jersey2/src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java
@@ -36,6 +36,7 @@ public class HasOnlyReadOnly {
    * Get bar
    * @return bar
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getBar() {
     return bar;
@@ -45,6 +46,7 @@ public class HasOnlyReadOnly {
    * Get foo
    * @return foo
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getFoo() {
     return foo;
diff --git a/samples/client/petstore/java/jersey2/src/main/java/org/openapitools/client/model/MapTest.java b/samples/client/petstore/java/jersey2/src/main/java/org/openapitools/client/model/MapTest.java
index 625b6be97d..a7a141bb9b 100644
--- a/samples/client/petstore/java/jersey2/src/main/java/org/openapitools/client/model/MapTest.java
+++ b/samples/client/petstore/java/jersey2/src/main/java/org/openapitools/client/model/MapTest.java
@@ -93,6 +93,7 @@ public class MapTest {
    * Get mapMapOfString
    * @return mapMapOfString
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Map<String, Map<String, String>> getMapMapOfString() {
     return mapMapOfString;
@@ -119,6 +120,7 @@ public class MapTest {
    * Get mapOfEnumString
    * @return mapOfEnumString
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Map<String, InnerEnum> getMapOfEnumString() {
     return mapOfEnumString;
@@ -145,6 +147,7 @@ public class MapTest {
    * Get directMap
    * @return directMap
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Map<String, Boolean> getDirectMap() {
     return directMap;
@@ -171,6 +174,7 @@ public class MapTest {
    * Get indirectMap
    * @return indirectMap
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Map<String, Boolean> getIndirectMap() {
     return indirectMap;
diff --git a/samples/client/petstore/java/jersey2/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/client/petstore/java/jersey2/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java
index 0adbe0caa7..ea930e3e2e 100644
--- a/samples/client/petstore/java/jersey2/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java
+++ b/samples/client/petstore/java/jersey2/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java
@@ -50,6 +50,7 @@ public class MixedPropertiesAndAdditionalPropertiesClass {
    * Get uuid
    * @return uuid
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public UUID getUuid() {
     return uuid;
@@ -68,6 +69,7 @@ public class MixedPropertiesAndAdditionalPropertiesClass {
    * Get dateTime
    * @return dateTime
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public OffsetDateTime getDateTime() {
     return dateTime;
@@ -94,6 +96,7 @@ public class MixedPropertiesAndAdditionalPropertiesClass {
    * Get map
    * @return map
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Map<String, Animal> getMap() {
     return map;
diff --git a/samples/client/petstore/java/jersey2/src/main/java/org/openapitools/client/model/Model200Response.java b/samples/client/petstore/java/jersey2/src/main/java/org/openapitools/client/model/Model200Response.java
index 3be60ea3ae..bd3244dd57 100644
--- a/samples/client/petstore/java/jersey2/src/main/java/org/openapitools/client/model/Model200Response.java
+++ b/samples/client/petstore/java/jersey2/src/main/java/org/openapitools/client/model/Model200Response.java
@@ -42,6 +42,7 @@ public class Model200Response {
    * Get name
    * @return name
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Integer getName() {
     return name;
@@ -60,6 +61,7 @@ public class Model200Response {
    * Get propertyClass
    * @return propertyClass
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getPropertyClass() {
     return propertyClass;
diff --git a/samples/client/petstore/java/jersey2/src/main/java/org/openapitools/client/model/ModelApiResponse.java b/samples/client/petstore/java/jersey2/src/main/java/org/openapitools/client/model/ModelApiResponse.java
index 6e458e38dc..ed335cdca1 100644
--- a/samples/client/petstore/java/jersey2/src/main/java/org/openapitools/client/model/ModelApiResponse.java
+++ b/samples/client/petstore/java/jersey2/src/main/java/org/openapitools/client/model/ModelApiResponse.java
@@ -44,6 +44,7 @@ public class ModelApiResponse {
    * Get code
    * @return code
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Integer getCode() {
     return code;
@@ -62,6 +63,7 @@ public class ModelApiResponse {
    * Get type
    * @return type
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getType() {
     return type;
@@ -80,6 +82,7 @@ public class ModelApiResponse {
    * Get message
    * @return message
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getMessage() {
     return message;
diff --git a/samples/client/petstore/java/jersey2/src/main/java/org/openapitools/client/model/ModelReturn.java b/samples/client/petstore/java/jersey2/src/main/java/org/openapitools/client/model/ModelReturn.java
index 62e5295212..04c0bcd33f 100644
--- a/samples/client/petstore/java/jersey2/src/main/java/org/openapitools/client/model/ModelReturn.java
+++ b/samples/client/petstore/java/jersey2/src/main/java/org/openapitools/client/model/ModelReturn.java
@@ -39,6 +39,7 @@ public class ModelReturn {
    * Get _return
    * @return _return
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Integer getReturn() {
     return _return;
diff --git a/samples/client/petstore/java/jersey2/src/main/java/org/openapitools/client/model/Name.java b/samples/client/petstore/java/jersey2/src/main/java/org/openapitools/client/model/Name.java
index 852a999035..af27c6e45f 100644
--- a/samples/client/petstore/java/jersey2/src/main/java/org/openapitools/client/model/Name.java
+++ b/samples/client/petstore/java/jersey2/src/main/java/org/openapitools/client/model/Name.java
@@ -48,6 +48,7 @@ public class Name {
    * Get name
    * @return name
   **/
+
   @ApiModelProperty(required = true, value = "")
   public Integer getName() {
     return name;
@@ -61,6 +62,7 @@ public class Name {
    * Get snakeCase
    * @return snakeCase
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Integer getSnakeCase() {
     return snakeCase;
@@ -75,6 +77,7 @@ public class Name {
    * Get property
    * @return property
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getProperty() {
     return property;
@@ -88,6 +91,7 @@ public class Name {
    * Get _123number
    * @return _123number
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Integer get123number() {
     return _123number;
diff --git a/samples/client/petstore/java/jersey2/src/main/java/org/openapitools/client/model/NumberOnly.java b/samples/client/petstore/java/jersey2/src/main/java/org/openapitools/client/model/NumberOnly.java
index 530a4d5818..4e29c814cc 100644
--- a/samples/client/petstore/java/jersey2/src/main/java/org/openapitools/client/model/NumberOnly.java
+++ b/samples/client/petstore/java/jersey2/src/main/java/org/openapitools/client/model/NumberOnly.java
@@ -39,6 +39,7 @@ public class NumberOnly {
    * Get justNumber
    * @return justNumber
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public BigDecimal getJustNumber() {
     return justNumber;
diff --git a/samples/client/petstore/java/jersey2/src/main/java/org/openapitools/client/model/Order.java b/samples/client/petstore/java/jersey2/src/main/java/org/openapitools/client/model/Order.java
index c6cee16a58..9e935d606e 100644
--- a/samples/client/petstore/java/jersey2/src/main/java/org/openapitools/client/model/Order.java
+++ b/samples/client/petstore/java/jersey2/src/main/java/org/openapitools/client/model/Order.java
@@ -91,6 +91,7 @@ public class Order {
    * Get id
    * @return id
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Long getId() {
     return id;
@@ -109,6 +110,7 @@ public class Order {
    * Get petId
    * @return petId
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Long getPetId() {
     return petId;
@@ -127,6 +129,7 @@ public class Order {
    * Get quantity
    * @return quantity
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Integer getQuantity() {
     return quantity;
@@ -145,6 +148,7 @@ public class Order {
    * Get shipDate
    * @return shipDate
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public OffsetDateTime getShipDate() {
     return shipDate;
@@ -163,6 +167,7 @@ public class Order {
    * Order Status
    * @return status
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "Order Status")
   public StatusEnum getStatus() {
     return status;
@@ -181,6 +186,7 @@ public class Order {
    * Get complete
    * @return complete
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Boolean getComplete() {
     return complete;
diff --git a/samples/client/petstore/java/jersey2/src/main/java/org/openapitools/client/model/OuterComposite.java b/samples/client/petstore/java/jersey2/src/main/java/org/openapitools/client/model/OuterComposite.java
index 6e71242384..f6515126a8 100644
--- a/samples/client/petstore/java/jersey2/src/main/java/org/openapitools/client/model/OuterComposite.java
+++ b/samples/client/petstore/java/jersey2/src/main/java/org/openapitools/client/model/OuterComposite.java
@@ -45,6 +45,7 @@ public class OuterComposite {
    * Get myNumber
    * @return myNumber
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public BigDecimal getMyNumber() {
     return myNumber;
@@ -63,6 +64,7 @@ public class OuterComposite {
    * Get myString
    * @return myString
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getMyString() {
     return myString;
@@ -81,6 +83,7 @@ public class OuterComposite {
    * Get myBoolean
    * @return myBoolean
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Boolean getMyBoolean() {
     return myBoolean;
diff --git a/samples/client/petstore/java/jersey2/src/main/java/org/openapitools/client/model/Pet.java b/samples/client/petstore/java/jersey2/src/main/java/org/openapitools/client/model/Pet.java
index 8a2408a296..63e9b4ff5d 100644
--- a/samples/client/petstore/java/jersey2/src/main/java/org/openapitools/client/model/Pet.java
+++ b/samples/client/petstore/java/jersey2/src/main/java/org/openapitools/client/model/Pet.java
@@ -94,6 +94,7 @@ public class Pet {
    * Get id
    * @return id
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Long getId() {
     return id;
@@ -112,6 +113,7 @@ public class Pet {
    * Get category
    * @return category
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Category getCategory() {
     return category;
@@ -130,6 +132,7 @@ public class Pet {
    * Get name
    * @return name
   **/
+
   @ApiModelProperty(example = "doggie", required = true, value = "")
   public String getName() {
     return name;
@@ -153,6 +156,7 @@ public class Pet {
    * Get photoUrls
    * @return photoUrls
   **/
+
   @ApiModelProperty(required = true, value = "")
   public List<String> getPhotoUrls() {
     return photoUrls;
@@ -179,6 +183,7 @@ public class Pet {
    * Get tags
    * @return tags
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public List<Tag> getTags() {
     return tags;
@@ -197,6 +202,7 @@ public class Pet {
    * pet status in the store
    * @return status
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "pet status in the store")
   public StatusEnum getStatus() {
     return status;
diff --git a/samples/client/petstore/java/jersey2/src/main/java/org/openapitools/client/model/ReadOnlyFirst.java b/samples/client/petstore/java/jersey2/src/main/java/org/openapitools/client/model/ReadOnlyFirst.java
index 83f25c7923..a2c9e99699 100644
--- a/samples/client/petstore/java/jersey2/src/main/java/org/openapitools/client/model/ReadOnlyFirst.java
+++ b/samples/client/petstore/java/jersey2/src/main/java/org/openapitools/client/model/ReadOnlyFirst.java
@@ -36,6 +36,7 @@ public class ReadOnlyFirst {
    * Get bar
    * @return bar
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getBar() {
     return bar;
@@ -50,6 +51,7 @@ public class ReadOnlyFirst {
    * Get baz
    * @return baz
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getBaz() {
     return baz;
diff --git a/samples/client/petstore/java/jersey2/src/main/java/org/openapitools/client/model/SpecialModelName.java b/samples/client/petstore/java/jersey2/src/main/java/org/openapitools/client/model/SpecialModelName.java
index 5abfc132ad..a5ddb0b638 100644
--- a/samples/client/petstore/java/jersey2/src/main/java/org/openapitools/client/model/SpecialModelName.java
+++ b/samples/client/petstore/java/jersey2/src/main/java/org/openapitools/client/model/SpecialModelName.java
@@ -38,6 +38,7 @@ public class SpecialModelName {
    * Get $specialPropertyName
    * @return $specialPropertyName
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Long get$SpecialPropertyName() {
     return $specialPropertyName;
diff --git a/samples/client/petstore/java/jersey2/src/main/java/org/openapitools/client/model/Tag.java b/samples/client/petstore/java/jersey2/src/main/java/org/openapitools/client/model/Tag.java
index e2e947b84a..8255ad8298 100644
--- a/samples/client/petstore/java/jersey2/src/main/java/org/openapitools/client/model/Tag.java
+++ b/samples/client/petstore/java/jersey2/src/main/java/org/openapitools/client/model/Tag.java
@@ -41,6 +41,7 @@ public class Tag {
    * Get id
    * @return id
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Long getId() {
     return id;
@@ -59,6 +60,7 @@ public class Tag {
    * Get name
    * @return name
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getName() {
     return name;
diff --git a/samples/client/petstore/java/jersey2/src/main/java/org/openapitools/client/model/TypeHolderDefault.java b/samples/client/petstore/java/jersey2/src/main/java/org/openapitools/client/model/TypeHolderDefault.java
index 9d0f5b2fbe..d8c7b3efdd 100644
--- a/samples/client/petstore/java/jersey2/src/main/java/org/openapitools/client/model/TypeHolderDefault.java
+++ b/samples/client/petstore/java/jersey2/src/main/java/org/openapitools/client/model/TypeHolderDefault.java
@@ -53,6 +53,7 @@ public class TypeHolderDefault {
    * Get stringItem
    * @return stringItem
   **/
+
   @ApiModelProperty(required = true, value = "")
   public String getStringItem() {
     return stringItem;
@@ -71,6 +72,7 @@ public class TypeHolderDefault {
    * Get numberItem
    * @return numberItem
   **/
+
   @ApiModelProperty(required = true, value = "")
   public BigDecimal getNumberItem() {
     return numberItem;
@@ -89,6 +91,7 @@ public class TypeHolderDefault {
    * Get integerItem
    * @return integerItem
   **/
+
   @ApiModelProperty(required = true, value = "")
   public Integer getIntegerItem() {
     return integerItem;
@@ -107,6 +110,7 @@ public class TypeHolderDefault {
    * Get boolItem
    * @return boolItem
   **/
+
   @ApiModelProperty(required = true, value = "")
   public Boolean getBoolItem() {
     return boolItem;
@@ -130,6 +134,7 @@ public class TypeHolderDefault {
    * Get arrayItem
    * @return arrayItem
   **/
+
   @ApiModelProperty(required = true, value = "")
   public List<Integer> getArrayItem() {
     return arrayItem;
diff --git a/samples/client/petstore/java/jersey2/src/main/java/org/openapitools/client/model/TypeHolderExample.java b/samples/client/petstore/java/jersey2/src/main/java/org/openapitools/client/model/TypeHolderExample.java
index 94d3c57b6f..c1d5ea30f8 100644
--- a/samples/client/petstore/java/jersey2/src/main/java/org/openapitools/client/model/TypeHolderExample.java
+++ b/samples/client/petstore/java/jersey2/src/main/java/org/openapitools/client/model/TypeHolderExample.java
@@ -53,6 +53,7 @@ public class TypeHolderExample {
    * Get stringItem
    * @return stringItem
   **/
+
   @ApiModelProperty(example = "what", required = true, value = "")
   public String getStringItem() {
     return stringItem;
@@ -71,6 +72,7 @@ public class TypeHolderExample {
    * Get numberItem
    * @return numberItem
   **/
+
   @ApiModelProperty(example = "1.234", required = true, value = "")
   public BigDecimal getNumberItem() {
     return numberItem;
@@ -89,6 +91,7 @@ public class TypeHolderExample {
    * Get integerItem
    * @return integerItem
   **/
+
   @ApiModelProperty(example = "-2", required = true, value = "")
   public Integer getIntegerItem() {
     return integerItem;
@@ -107,6 +110,7 @@ public class TypeHolderExample {
    * Get boolItem
    * @return boolItem
   **/
+
   @ApiModelProperty(example = "true", required = true, value = "")
   public Boolean getBoolItem() {
     return boolItem;
@@ -130,6 +134,7 @@ public class TypeHolderExample {
    * Get arrayItem
    * @return arrayItem
   **/
+
   @ApiModelProperty(example = "[0, 1, 2, 3]", required = true, value = "")
   public List<Integer> getArrayItem() {
     return arrayItem;
diff --git a/samples/client/petstore/java/jersey2/src/main/java/org/openapitools/client/model/User.java b/samples/client/petstore/java/jersey2/src/main/java/org/openapitools/client/model/User.java
index ee3f656a1a..6e6c4ac102 100644
--- a/samples/client/petstore/java/jersey2/src/main/java/org/openapitools/client/model/User.java
+++ b/samples/client/petstore/java/jersey2/src/main/java/org/openapitools/client/model/User.java
@@ -59,6 +59,7 @@ public class User {
    * Get id
    * @return id
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Long getId() {
     return id;
@@ -77,6 +78,7 @@ public class User {
    * Get username
    * @return username
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getUsername() {
     return username;
@@ -95,6 +97,7 @@ public class User {
    * Get firstName
    * @return firstName
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getFirstName() {
     return firstName;
@@ -113,6 +116,7 @@ public class User {
    * Get lastName
    * @return lastName
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getLastName() {
     return lastName;
@@ -131,6 +135,7 @@ public class User {
    * Get email
    * @return email
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getEmail() {
     return email;
@@ -149,6 +154,7 @@ public class User {
    * Get password
    * @return password
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getPassword() {
     return password;
@@ -167,6 +173,7 @@ public class User {
    * Get phone
    * @return phone
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getPhone() {
     return phone;
@@ -185,6 +192,7 @@ public class User {
    * User Status
    * @return userStatus
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "User Status")
   public Integer getUserStatus() {
     return userStatus;
diff --git a/samples/client/petstore/java/jersey2/src/main/java/org/openapitools/client/model/XmlItem.java b/samples/client/petstore/java/jersey2/src/main/java/org/openapitools/client/model/XmlItem.java
index cb31157306..ce4af3e8b9 100644
--- a/samples/client/petstore/java/jersey2/src/main/java/org/openapitools/client/model/XmlItem.java
+++ b/samples/client/petstore/java/jersey2/src/main/java/org/openapitools/client/model/XmlItem.java
@@ -125,6 +125,7 @@ public class XmlItem {
    * Get attributeString
    * @return attributeString
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(example = "string", value = "")
   public String getAttributeString() {
     return attributeString;
@@ -143,6 +144,7 @@ public class XmlItem {
    * Get attributeNumber
    * @return attributeNumber
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(example = "1.234", value = "")
   public BigDecimal getAttributeNumber() {
     return attributeNumber;
@@ -161,6 +163,7 @@ public class XmlItem {
    * Get attributeInteger
    * @return attributeInteger
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(example = "-2", value = "")
   public Integer getAttributeInteger() {
     return attributeInteger;
@@ -179,6 +182,7 @@ public class XmlItem {
    * Get attributeBoolean
    * @return attributeBoolean
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(example = "true", value = "")
   public Boolean getAttributeBoolean() {
     return attributeBoolean;
@@ -205,6 +209,7 @@ public class XmlItem {
    * Get wrappedArray
    * @return wrappedArray
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public List<Integer> getWrappedArray() {
     return wrappedArray;
@@ -223,6 +228,7 @@ public class XmlItem {
    * Get nameString
    * @return nameString
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(example = "string", value = "")
   public String getNameString() {
     return nameString;
@@ -241,6 +247,7 @@ public class XmlItem {
    * Get nameNumber
    * @return nameNumber
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(example = "1.234", value = "")
   public BigDecimal getNameNumber() {
     return nameNumber;
@@ -259,6 +266,7 @@ public class XmlItem {
    * Get nameInteger
    * @return nameInteger
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(example = "-2", value = "")
   public Integer getNameInteger() {
     return nameInteger;
@@ -277,6 +285,7 @@ public class XmlItem {
    * Get nameBoolean
    * @return nameBoolean
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(example = "true", value = "")
   public Boolean getNameBoolean() {
     return nameBoolean;
@@ -303,6 +312,7 @@ public class XmlItem {
    * Get nameArray
    * @return nameArray
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public List<Integer> getNameArray() {
     return nameArray;
@@ -329,6 +339,7 @@ public class XmlItem {
    * Get nameWrappedArray
    * @return nameWrappedArray
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public List<Integer> getNameWrappedArray() {
     return nameWrappedArray;
@@ -347,6 +358,7 @@ public class XmlItem {
    * Get prefixString
    * @return prefixString
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(example = "string", value = "")
   public String getPrefixString() {
     return prefixString;
@@ -365,6 +377,7 @@ public class XmlItem {
    * Get prefixNumber
    * @return prefixNumber
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(example = "1.234", value = "")
   public BigDecimal getPrefixNumber() {
     return prefixNumber;
@@ -383,6 +396,7 @@ public class XmlItem {
    * Get prefixInteger
    * @return prefixInteger
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(example = "-2", value = "")
   public Integer getPrefixInteger() {
     return prefixInteger;
@@ -401,6 +415,7 @@ public class XmlItem {
    * Get prefixBoolean
    * @return prefixBoolean
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(example = "true", value = "")
   public Boolean getPrefixBoolean() {
     return prefixBoolean;
@@ -427,6 +442,7 @@ public class XmlItem {
    * Get prefixArray
    * @return prefixArray
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public List<Integer> getPrefixArray() {
     return prefixArray;
@@ -453,6 +469,7 @@ public class XmlItem {
    * Get prefixWrappedArray
    * @return prefixWrappedArray
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public List<Integer> getPrefixWrappedArray() {
     return prefixWrappedArray;
@@ -471,6 +488,7 @@ public class XmlItem {
    * Get namespaceString
    * @return namespaceString
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(example = "string", value = "")
   public String getNamespaceString() {
     return namespaceString;
@@ -489,6 +507,7 @@ public class XmlItem {
    * Get namespaceNumber
    * @return namespaceNumber
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(example = "1.234", value = "")
   public BigDecimal getNamespaceNumber() {
     return namespaceNumber;
@@ -507,6 +526,7 @@ public class XmlItem {
    * Get namespaceInteger
    * @return namespaceInteger
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(example = "-2", value = "")
   public Integer getNamespaceInteger() {
     return namespaceInteger;
@@ -525,6 +545,7 @@ public class XmlItem {
    * Get namespaceBoolean
    * @return namespaceBoolean
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(example = "true", value = "")
   public Boolean getNamespaceBoolean() {
     return namespaceBoolean;
@@ -551,6 +572,7 @@ public class XmlItem {
    * Get namespaceArray
    * @return namespaceArray
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public List<Integer> getNamespaceArray() {
     return namespaceArray;
@@ -577,6 +599,7 @@ public class XmlItem {
    * Get namespaceWrappedArray
    * @return namespaceWrappedArray
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public List<Integer> getNamespaceWrappedArray() {
     return namespaceWrappedArray;
@@ -595,6 +618,7 @@ public class XmlItem {
    * Get prefixNsString
    * @return prefixNsString
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(example = "string", value = "")
   public String getPrefixNsString() {
     return prefixNsString;
@@ -613,6 +637,7 @@ public class XmlItem {
    * Get prefixNsNumber
    * @return prefixNsNumber
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(example = "1.234", value = "")
   public BigDecimal getPrefixNsNumber() {
     return prefixNsNumber;
@@ -631,6 +656,7 @@ public class XmlItem {
    * Get prefixNsInteger
    * @return prefixNsInteger
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(example = "-2", value = "")
   public Integer getPrefixNsInteger() {
     return prefixNsInteger;
@@ -649,6 +675,7 @@ public class XmlItem {
    * Get prefixNsBoolean
    * @return prefixNsBoolean
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(example = "true", value = "")
   public Boolean getPrefixNsBoolean() {
     return prefixNsBoolean;
@@ -675,6 +702,7 @@ public class XmlItem {
    * Get prefixNsArray
    * @return prefixNsArray
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public List<Integer> getPrefixNsArray() {
     return prefixNsArray;
@@ -701,6 +729,7 @@ public class XmlItem {
    * Get prefixNsWrappedArray
    * @return prefixNsWrappedArray
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public List<Integer> getPrefixNsWrappedArray() {
     return prefixNsWrappedArray;
diff --git a/samples/client/petstore/java/okhttp-gson-parcelableModel/build.gradle b/samples/client/petstore/java/okhttp-gson-parcelableModel/build.gradle
index bef53f3625..3093757fe3 100644
--- a/samples/client/petstore/java/okhttp-gson-parcelableModel/build.gradle
+++ b/samples/client/petstore/java/okhttp-gson-parcelableModel/build.gradle
@@ -99,6 +99,7 @@ if(hasProperty('target') && target == 'android') {
 
 dependencies {
     compile 'io.swagger:swagger-annotations:1.5.22'
+    compile "com.google.code.findbugs:jsr305:3.0.2"
     compile 'com.squareup.okhttp3:okhttp:3.14.2'
     compile 'com.squareup.okhttp3:logging-interceptor:3.14.2'
     compile 'com.google.code.gson:gson:2.8.5'
diff --git a/samples/client/petstore/java/okhttp-gson-parcelableModel/pom.xml b/samples/client/petstore/java/okhttp-gson-parcelableModel/pom.xml
index 2f7acab2c8..40b0cc6b2a 100644
--- a/samples/client/petstore/java/okhttp-gson-parcelableModel/pom.xml
+++ b/samples/client/petstore/java/okhttp-gson-parcelableModel/pom.xml
@@ -200,6 +200,12 @@
             <artifactId>swagger-annotations</artifactId>
             <version>${swagger-core-version}</version>
         </dependency>
+        <!-- @Nullable annotation -->
+        <dependency>
+            <groupId>com.google.code.findbugs</groupId>
+            <artifactId>jsr305</artifactId>
+            <version>3.0.2</version>
+        </dependency>
         <dependency>
             <groupId>com.squareup.okhttp3</groupId>
             <artifactId>okhttp</artifactId>
diff --git a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/AdditionalPropertiesAnyType.java b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/AdditionalPropertiesAnyType.java
index 457466ce45..952e43c3b4 100644
--- a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/AdditionalPropertiesAnyType.java
+++ b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/AdditionalPropertiesAnyType.java
@@ -49,6 +49,7 @@ public class AdditionalPropertiesAnyType extends HashMap<String, Object> impleme
    * Get name
    * @return name
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getName() {
     return name;
diff --git a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/AdditionalPropertiesArray.java b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/AdditionalPropertiesArray.java
index 1d943a98dc..fcb9a8b7b6 100644
--- a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/AdditionalPropertiesArray.java
+++ b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/AdditionalPropertiesArray.java
@@ -50,6 +50,7 @@ public class AdditionalPropertiesArray extends HashMap<String, List> implements
    * Get name
    * @return name
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getName() {
     return name;
diff --git a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/AdditionalPropertiesBoolean.java b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/AdditionalPropertiesBoolean.java
index 84303e2de9..08bd0adcf1 100644
--- a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/AdditionalPropertiesBoolean.java
+++ b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/AdditionalPropertiesBoolean.java
@@ -49,6 +49,7 @@ public class AdditionalPropertiesBoolean extends HashMap<String, Boolean> implem
    * Get name
    * @return name
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getName() {
     return name;
diff --git a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java
index ba12ac9648..affc9e2c1a 100644
--- a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java
+++ b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java
@@ -98,6 +98,7 @@ public class AdditionalPropertiesClass implements Parcelable {
    * Get mapString
    * @return mapString
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Map<String, String> getMapString() {
     return mapString;
@@ -124,6 +125,7 @@ public class AdditionalPropertiesClass implements Parcelable {
    * Get mapNumber
    * @return mapNumber
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Map<String, BigDecimal> getMapNumber() {
     return mapNumber;
@@ -150,6 +152,7 @@ public class AdditionalPropertiesClass implements Parcelable {
    * Get mapInteger
    * @return mapInteger
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Map<String, Integer> getMapInteger() {
     return mapInteger;
@@ -176,6 +179,7 @@ public class AdditionalPropertiesClass implements Parcelable {
    * Get mapBoolean
    * @return mapBoolean
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Map<String, Boolean> getMapBoolean() {
     return mapBoolean;
@@ -202,6 +206,7 @@ public class AdditionalPropertiesClass implements Parcelable {
    * Get mapArrayInteger
    * @return mapArrayInteger
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Map<String, List<Integer>> getMapArrayInteger() {
     return mapArrayInteger;
@@ -228,6 +233,7 @@ public class AdditionalPropertiesClass implements Parcelable {
    * Get mapArrayAnytype
    * @return mapArrayAnytype
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Map<String, List<Object>> getMapArrayAnytype() {
     return mapArrayAnytype;
@@ -254,6 +260,7 @@ public class AdditionalPropertiesClass implements Parcelable {
    * Get mapMapString
    * @return mapMapString
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Map<String, Map<String, String>> getMapMapString() {
     return mapMapString;
@@ -280,6 +287,7 @@ public class AdditionalPropertiesClass implements Parcelable {
    * Get mapMapAnytype
    * @return mapMapAnytype
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Map<String, Map<String, Object>> getMapMapAnytype() {
     return mapMapAnytype;
@@ -298,6 +306,7 @@ public class AdditionalPropertiesClass implements Parcelable {
    * Get anytype1
    * @return anytype1
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Object getAnytype1() {
     return anytype1;
@@ -316,6 +325,7 @@ public class AdditionalPropertiesClass implements Parcelable {
    * Get anytype2
    * @return anytype2
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Object getAnytype2() {
     return anytype2;
@@ -334,6 +344,7 @@ public class AdditionalPropertiesClass implements Parcelable {
    * Get anytype3
    * @return anytype3
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Object getAnytype3() {
     return anytype3;
diff --git a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/AdditionalPropertiesInteger.java b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/AdditionalPropertiesInteger.java
index 372cc6a674..ba0e3c55c0 100644
--- a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/AdditionalPropertiesInteger.java
+++ b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/AdditionalPropertiesInteger.java
@@ -49,6 +49,7 @@ public class AdditionalPropertiesInteger extends HashMap<String, Integer> implem
    * Get name
    * @return name
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getName() {
     return name;
diff --git a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/AdditionalPropertiesNumber.java b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/AdditionalPropertiesNumber.java
index 4903894a3f..6e0da4f662 100644
--- a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/AdditionalPropertiesNumber.java
+++ b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/AdditionalPropertiesNumber.java
@@ -50,6 +50,7 @@ public class AdditionalPropertiesNumber extends HashMap<String, BigDecimal> impl
    * Get name
    * @return name
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getName() {
     return name;
diff --git a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/AdditionalPropertiesObject.java b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/AdditionalPropertiesObject.java
index b4ee226440..5321ee5f30 100644
--- a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/AdditionalPropertiesObject.java
+++ b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/AdditionalPropertiesObject.java
@@ -49,6 +49,7 @@ public class AdditionalPropertiesObject extends HashMap<String, Map> implements
    * Get name
    * @return name
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getName() {
     return name;
diff --git a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/AdditionalPropertiesString.java b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/AdditionalPropertiesString.java
index 3d52496d48..f044148baf 100644
--- a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/AdditionalPropertiesString.java
+++ b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/AdditionalPropertiesString.java
@@ -49,6 +49,7 @@ public class AdditionalPropertiesString extends HashMap<String, String> implemen
    * Get name
    * @return name
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getName() {
     return name;
diff --git a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/Animal.java b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/Animal.java
index d07f96de3e..90fabbb107 100644
--- a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/Animal.java
+++ b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/Animal.java
@@ -52,6 +52,7 @@ public class Animal implements Parcelable {
    * Get className
    * @return className
   **/
+
   @ApiModelProperty(required = true, value = "")
   public String getClassName() {
     return className;
@@ -70,6 +71,7 @@ public class Animal implements Parcelable {
    * Get color
    * @return color
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getColor() {
     return color;
diff --git a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java
index 56f9e682f3..026761eec6 100644
--- a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java
+++ b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java
@@ -57,6 +57,7 @@ public class ArrayOfArrayOfNumberOnly implements Parcelable {
    * Get arrayArrayNumber
    * @return arrayArrayNumber
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public List<List<BigDecimal>> getArrayArrayNumber() {
     return arrayArrayNumber;
diff --git a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java
index fe87014433..3f9f9ea40c 100644
--- a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java
+++ b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java
@@ -57,6 +57,7 @@ public class ArrayOfNumberOnly implements Parcelable {
    * Get arrayNumber
    * @return arrayNumber
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public List<BigDecimal> getArrayNumber() {
     return arrayNumber;
diff --git a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/ArrayTest.java b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/ArrayTest.java
index ac9dc2a2c5..91b99633fd 100644
--- a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/ArrayTest.java
+++ b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/ArrayTest.java
@@ -65,6 +65,7 @@ public class ArrayTest implements Parcelable {
    * Get arrayOfString
    * @return arrayOfString
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public List<String> getArrayOfString() {
     return arrayOfString;
@@ -91,6 +92,7 @@ public class ArrayTest implements Parcelable {
    * Get arrayArrayOfInteger
    * @return arrayArrayOfInteger
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public List<List<Long>> getArrayArrayOfInteger() {
     return arrayArrayOfInteger;
@@ -117,6 +119,7 @@ public class ArrayTest implements Parcelable {
    * Get arrayArrayOfModel
    * @return arrayArrayOfModel
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public List<List<ReadOnlyFirst>> getArrayArrayOfModel() {
     return arrayArrayOfModel;
diff --git a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/Capitalization.java b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/Capitalization.java
index 170a41781e..7c85088f6c 100644
--- a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/Capitalization.java
+++ b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/Capitalization.java
@@ -66,6 +66,7 @@ public class Capitalization implements Parcelable {
    * Get smallCamel
    * @return smallCamel
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getSmallCamel() {
     return smallCamel;
@@ -84,6 +85,7 @@ public class Capitalization implements Parcelable {
    * Get capitalCamel
    * @return capitalCamel
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getCapitalCamel() {
     return capitalCamel;
@@ -102,6 +104,7 @@ public class Capitalization implements Parcelable {
    * Get smallSnake
    * @return smallSnake
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getSmallSnake() {
     return smallSnake;
@@ -120,6 +123,7 @@ public class Capitalization implements Parcelable {
    * Get capitalSnake
    * @return capitalSnake
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getCapitalSnake() {
     return capitalSnake;
@@ -138,6 +142,7 @@ public class Capitalization implements Parcelable {
    * Get scAETHFlowPoints
    * @return scAETHFlowPoints
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getScAETHFlowPoints() {
     return scAETHFlowPoints;
@@ -156,6 +161,7 @@ public class Capitalization implements Parcelable {
    * Name of the pet 
    * @return ATT_NAME
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "Name of the pet ")
   public String getATTNAME() {
     return ATT_NAME;
diff --git a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/Cat.java b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/Cat.java
index 6a81c3eb17..dcb1df4846 100644
--- a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/Cat.java
+++ b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/Cat.java
@@ -49,6 +49,7 @@ public class Cat extends Animal implements Parcelable {
    * Get declawed
    * @return declawed
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Boolean getDeclawed() {
     return declawed;
diff --git a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/CatAllOf.java b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/CatAllOf.java
index bf0452bc5e..eb92c2ad1a 100644
--- a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/CatAllOf.java
+++ b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/CatAllOf.java
@@ -46,6 +46,7 @@ public class CatAllOf implements Parcelable {
    * Get declawed
    * @return declawed
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Boolean getDeclawed() {
     return declawed;
diff --git a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/Category.java b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/Category.java
index a7d04d63f6..66b4c8b3f6 100644
--- a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/Category.java
+++ b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/Category.java
@@ -50,6 +50,7 @@ public class Category implements Parcelable {
    * Get id
    * @return id
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Long getId() {
     return id;
@@ -68,6 +69,7 @@ public class Category implements Parcelable {
    * Get name
    * @return name
   **/
+
   @ApiModelProperty(required = true, value = "")
   public String getName() {
     return name;
diff --git a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/ClassModel.java b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/ClassModel.java
index 7b4237ddb4..028d713c96 100644
--- a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/ClassModel.java
+++ b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/ClassModel.java
@@ -47,6 +47,7 @@ public class ClassModel implements Parcelable {
    * Get propertyClass
    * @return propertyClass
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getPropertyClass() {
     return propertyClass;
diff --git a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/Client.java b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/Client.java
index b8124e586f..ce5cf8deee 100644
--- a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/Client.java
+++ b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/Client.java
@@ -46,6 +46,7 @@ public class Client implements Parcelable {
    * Get client
    * @return client
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getClient() {
     return client;
diff --git a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/Dog.java b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/Dog.java
index 1aec5a8df7..934c359ee9 100644
--- a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/Dog.java
+++ b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/Dog.java
@@ -49,6 +49,7 @@ public class Dog extends Animal implements Parcelable {
    * Get breed
    * @return breed
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getBreed() {
     return breed;
diff --git a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/DogAllOf.java b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/DogAllOf.java
index f5c3487d72..714ecb307b 100644
--- a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/DogAllOf.java
+++ b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/DogAllOf.java
@@ -46,6 +46,7 @@ public class DogAllOf implements Parcelable {
    * Get breed
    * @return breed
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getBreed() {
     return breed;
diff --git a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/EnumArrays.java b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/EnumArrays.java
index 2ab33a012d..6984f387df 100644
--- a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/EnumArrays.java
+++ b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/EnumArrays.java
@@ -146,6 +146,7 @@ public class EnumArrays implements Parcelable {
    * Get justSymbol
    * @return justSymbol
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public JustSymbolEnum getJustSymbol() {
     return justSymbol;
@@ -172,6 +173,7 @@ public class EnumArrays implements Parcelable {
    * Get arrayEnum
    * @return arrayEnum
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public List<ArrayEnumEnum> getArrayEnum() {
     return arrayEnum;
diff --git a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/EnumTest.java b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/EnumTest.java
index af3152bb0c..42d3a54b5b 100644
--- a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/EnumTest.java
+++ b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/EnumTest.java
@@ -255,6 +255,7 @@ public class EnumTest implements Parcelable {
    * Get enumString
    * @return enumString
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public EnumStringEnum getEnumString() {
     return enumString;
@@ -273,6 +274,7 @@ public class EnumTest implements Parcelable {
    * Get enumStringRequired
    * @return enumStringRequired
   **/
+
   @ApiModelProperty(required = true, value = "")
   public EnumStringRequiredEnum getEnumStringRequired() {
     return enumStringRequired;
@@ -291,6 +293,7 @@ public class EnumTest implements Parcelable {
    * Get enumInteger
    * @return enumInteger
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public EnumIntegerEnum getEnumInteger() {
     return enumInteger;
@@ -309,6 +312,7 @@ public class EnumTest implements Parcelable {
    * Get enumNumber
    * @return enumNumber
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public EnumNumberEnum getEnumNumber() {
     return enumNumber;
@@ -327,6 +331,7 @@ public class EnumTest implements Parcelable {
    * Get outerEnum
    * @return outerEnum
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public OuterEnum getOuterEnum() {
     return outerEnum;
diff --git a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java
index 954717a4c0..d3992e5424 100644
--- a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java
+++ b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java
@@ -52,6 +52,7 @@ public class FileSchemaTestClass implements Parcelable {
    * Get file
    * @return file
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public java.io.File getFile() {
     return file;
@@ -78,6 +79,7 @@ public class FileSchemaTestClass implements Parcelable {
    * Get files
    * @return files
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public List<java.io.File> getFiles() {
     return files;
diff --git a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/FormatTest.java b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/FormatTest.java
index 3b782f4215..a16260f07c 100644
--- a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/FormatTest.java
+++ b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/FormatTest.java
@@ -101,6 +101,7 @@ public class FormatTest implements Parcelable {
    * maximum: 100
    * @return integer
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Integer getInteger() {
     return integer;
@@ -121,6 +122,7 @@ public class FormatTest implements Parcelable {
    * maximum: 200
    * @return int32
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Integer getInt32() {
     return int32;
@@ -139,6 +141,7 @@ public class FormatTest implements Parcelable {
    * Get int64
    * @return int64
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Long getInt64() {
     return int64;
@@ -159,6 +162,7 @@ public class FormatTest implements Parcelable {
    * maximum: 543.2
    * @return number
   **/
+
   @ApiModelProperty(required = true, value = "")
   public BigDecimal getNumber() {
     return number;
@@ -179,6 +183,7 @@ public class FormatTest implements Parcelable {
    * maximum: 987.6
    * @return _float
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Float getFloat() {
     return _float;
@@ -199,6 +204,7 @@ public class FormatTest implements Parcelable {
    * maximum: 123.4
    * @return _double
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Double getDouble() {
     return _double;
@@ -217,6 +223,7 @@ public class FormatTest implements Parcelable {
    * Get string
    * @return string
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getString() {
     return string;
@@ -235,6 +242,7 @@ public class FormatTest implements Parcelable {
    * Get _byte
    * @return _byte
   **/
+
   @ApiModelProperty(required = true, value = "")
   public byte[] getByte() {
     return _byte;
@@ -253,6 +261,7 @@ public class FormatTest implements Parcelable {
    * Get binary
    * @return binary
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public File getBinary() {
     return binary;
@@ -271,6 +280,7 @@ public class FormatTest implements Parcelable {
    * Get date
    * @return date
   **/
+
   @ApiModelProperty(required = true, value = "")
   public LocalDate getDate() {
     return date;
@@ -289,6 +299,7 @@ public class FormatTest implements Parcelable {
    * Get dateTime
    * @return dateTime
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public OffsetDateTime getDateTime() {
     return dateTime;
@@ -307,6 +318,7 @@ public class FormatTest implements Parcelable {
    * Get uuid
    * @return uuid
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(example = "72f98069-206d-4f12-9f12-3d1e525a8e84", value = "")
   public UUID getUuid() {
     return uuid;
@@ -325,6 +337,7 @@ public class FormatTest implements Parcelable {
    * Get password
    * @return password
   **/
+
   @ApiModelProperty(required = true, value = "")
   public String getPassword() {
     return password;
diff --git a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java
index c742a3188b..021055bb59 100644
--- a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java
+++ b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java
@@ -45,6 +45,7 @@ public class HasOnlyReadOnly implements Parcelable {
    * Get bar
    * @return bar
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getBar() {
     return bar;
@@ -54,6 +55,7 @@ public class HasOnlyReadOnly implements Parcelable {
    * Get foo
    * @return foo
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getFoo() {
     return foo;
diff --git a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/MapTest.java b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/MapTest.java
index 87a854a3b9..9796dcbdb1 100644
--- a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/MapTest.java
+++ b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/MapTest.java
@@ -116,6 +116,7 @@ public class MapTest implements Parcelable {
    * Get mapMapOfString
    * @return mapMapOfString
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Map<String, Map<String, String>> getMapMapOfString() {
     return mapMapOfString;
@@ -142,6 +143,7 @@ public class MapTest implements Parcelable {
    * Get mapOfEnumString
    * @return mapOfEnumString
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Map<String, InnerEnum> getMapOfEnumString() {
     return mapOfEnumString;
@@ -168,6 +170,7 @@ public class MapTest implements Parcelable {
    * Get directMap
    * @return directMap
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Map<String, Boolean> getDirectMap() {
     return directMap;
@@ -194,6 +197,7 @@ public class MapTest implements Parcelable {
    * Get indirectMap
    * @return indirectMap
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Map<String, Boolean> getIndirectMap() {
     return indirectMap;
diff --git a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java
index 3c9bef98c5..4df2bf6539 100644
--- a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java
+++ b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java
@@ -60,6 +60,7 @@ public class MixedPropertiesAndAdditionalPropertiesClass implements Parcelable {
    * Get uuid
    * @return uuid
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public UUID getUuid() {
     return uuid;
@@ -78,6 +79,7 @@ public class MixedPropertiesAndAdditionalPropertiesClass implements Parcelable {
    * Get dateTime
    * @return dateTime
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public OffsetDateTime getDateTime() {
     return dateTime;
@@ -104,6 +106,7 @@ public class MixedPropertiesAndAdditionalPropertiesClass implements Parcelable {
    * Get map
    * @return map
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Map<String, Animal> getMap() {
     return map;
diff --git a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/Model200Response.java b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/Model200Response.java
index f16499bf32..6aaf741507 100644
--- a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/Model200Response.java
+++ b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/Model200Response.java
@@ -51,6 +51,7 @@ public class Model200Response implements Parcelable {
    * Get name
    * @return name
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Integer getName() {
     return name;
@@ -69,6 +70,7 @@ public class Model200Response implements Parcelable {
    * Get propertyClass
    * @return propertyClass
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getPropertyClass() {
     return propertyClass;
diff --git a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/ModelApiResponse.java b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/ModelApiResponse.java
index 6c93b81770..3bcfa5c703 100644
--- a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/ModelApiResponse.java
+++ b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/ModelApiResponse.java
@@ -54,6 +54,7 @@ public class ModelApiResponse implements Parcelable {
    * Get code
    * @return code
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Integer getCode() {
     return code;
@@ -72,6 +73,7 @@ public class ModelApiResponse implements Parcelable {
    * Get type
    * @return type
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getType() {
     return type;
@@ -90,6 +92,7 @@ public class ModelApiResponse implements Parcelable {
    * Get message
    * @return message
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getMessage() {
     return message;
diff --git a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/ModelReturn.java b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/ModelReturn.java
index 6aa68b09c5..b58da7220f 100644
--- a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/ModelReturn.java
+++ b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/ModelReturn.java
@@ -47,6 +47,7 @@ public class ModelReturn implements Parcelable {
    * Get _return
    * @return _return
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Integer getReturn() {
     return _return;
diff --git a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/Name.java b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/Name.java
index 743ea42dcf..6231fae2c4 100644
--- a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/Name.java
+++ b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/Name.java
@@ -59,6 +59,7 @@ public class Name implements Parcelable {
    * Get name
    * @return name
   **/
+
   @ApiModelProperty(required = true, value = "")
   public Integer getName() {
     return name;
@@ -72,6 +73,7 @@ public class Name implements Parcelable {
    * Get snakeCase
    * @return snakeCase
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Integer getSnakeCase() {
     return snakeCase;
@@ -86,6 +88,7 @@ public class Name implements Parcelable {
    * Get property
    * @return property
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getProperty() {
     return property;
@@ -99,6 +102,7 @@ public class Name implements Parcelable {
    * Get _123number
    * @return _123number
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Integer get123number() {
     return _123number;
diff --git a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/NumberOnly.java b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/NumberOnly.java
index eb7e492e0d..2f89147e01 100644
--- a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/NumberOnly.java
+++ b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/NumberOnly.java
@@ -47,6 +47,7 @@ public class NumberOnly implements Parcelable {
    * Get justNumber
    * @return justNumber
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public BigDecimal getJustNumber() {
     return justNumber;
diff --git a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/Order.java b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/Order.java
index e86ec3c425..42a0bae7e7 100644
--- a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/Order.java
+++ b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/Order.java
@@ -116,6 +116,7 @@ public class Order implements Parcelable {
    * Get id
    * @return id
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Long getId() {
     return id;
@@ -134,6 +135,7 @@ public class Order implements Parcelable {
    * Get petId
    * @return petId
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Long getPetId() {
     return petId;
@@ -152,6 +154,7 @@ public class Order implements Parcelable {
    * Get quantity
    * @return quantity
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Integer getQuantity() {
     return quantity;
@@ -170,6 +173,7 @@ public class Order implements Parcelable {
    * Get shipDate
    * @return shipDate
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public OffsetDateTime getShipDate() {
     return shipDate;
@@ -188,6 +192,7 @@ public class Order implements Parcelable {
    * Order Status
    * @return status
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "Order Status")
   public StatusEnum getStatus() {
     return status;
@@ -206,6 +211,7 @@ public class Order implements Parcelable {
    * Get complete
    * @return complete
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Boolean getComplete() {
     return complete;
diff --git a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/OuterComposite.java b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/OuterComposite.java
index 1c53b63eb0..6aff10110b 100644
--- a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/OuterComposite.java
+++ b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/OuterComposite.java
@@ -55,6 +55,7 @@ public class OuterComposite implements Parcelable {
    * Get myNumber
    * @return myNumber
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public BigDecimal getMyNumber() {
     return myNumber;
@@ -73,6 +74,7 @@ public class OuterComposite implements Parcelable {
    * Get myString
    * @return myString
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getMyString() {
     return myString;
@@ -91,6 +93,7 @@ public class OuterComposite implements Parcelable {
    * Get myBoolean
    * @return myBoolean
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Boolean getMyBoolean() {
     return myBoolean;
diff --git a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/Pet.java b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/Pet.java
index 0cba24a831..dd736e58d3 100644
--- a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/Pet.java
+++ b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/Pet.java
@@ -119,6 +119,7 @@ public class Pet implements Parcelable {
    * Get id
    * @return id
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Long getId() {
     return id;
@@ -137,6 +138,7 @@ public class Pet implements Parcelable {
    * Get category
    * @return category
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Category getCategory() {
     return category;
@@ -155,6 +157,7 @@ public class Pet implements Parcelable {
    * Get name
    * @return name
   **/
+
   @ApiModelProperty(example = "doggie", required = true, value = "")
   public String getName() {
     return name;
@@ -178,6 +181,7 @@ public class Pet implements Parcelable {
    * Get photoUrls
    * @return photoUrls
   **/
+
   @ApiModelProperty(required = true, value = "")
   public List<String> getPhotoUrls() {
     return photoUrls;
@@ -204,6 +208,7 @@ public class Pet implements Parcelable {
    * Get tags
    * @return tags
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public List<Tag> getTags() {
     return tags;
@@ -222,6 +227,7 @@ public class Pet implements Parcelable {
    * pet status in the store
    * @return status
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "pet status in the store")
   public StatusEnum getStatus() {
     return status;
diff --git a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/ReadOnlyFirst.java b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/ReadOnlyFirst.java
index 13c8230834..3a590451f0 100644
--- a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/ReadOnlyFirst.java
+++ b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/ReadOnlyFirst.java
@@ -45,6 +45,7 @@ public class ReadOnlyFirst implements Parcelable {
    * Get bar
    * @return bar
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getBar() {
     return bar;
@@ -59,6 +60,7 @@ public class ReadOnlyFirst implements Parcelable {
    * Get baz
    * @return baz
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getBaz() {
     return baz;
diff --git a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/SpecialModelName.java b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/SpecialModelName.java
index 09f7ce2c5d..569679be73 100644
--- a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/SpecialModelName.java
+++ b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/SpecialModelName.java
@@ -46,6 +46,7 @@ public class SpecialModelName implements Parcelable {
    * Get $specialPropertyName
    * @return $specialPropertyName
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Long get$SpecialPropertyName() {
     return $specialPropertyName;
diff --git a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/Tag.java b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/Tag.java
index 7da3af30d0..1d23f3ff18 100644
--- a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/Tag.java
+++ b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/Tag.java
@@ -50,6 +50,7 @@ public class Tag implements Parcelable {
    * Get id
    * @return id
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Long getId() {
     return id;
@@ -68,6 +69,7 @@ public class Tag implements Parcelable {
    * Get name
    * @return name
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getName() {
     return name;
diff --git a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/TypeHolderDefault.java b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/TypeHolderDefault.java
index 8cb0ab9868..1a42510215 100644
--- a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/TypeHolderDefault.java
+++ b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/TypeHolderDefault.java
@@ -65,6 +65,7 @@ public class TypeHolderDefault implements Parcelable {
    * Get stringItem
    * @return stringItem
   **/
+
   @ApiModelProperty(required = true, value = "")
   public String getStringItem() {
     return stringItem;
@@ -83,6 +84,7 @@ public class TypeHolderDefault implements Parcelable {
    * Get numberItem
    * @return numberItem
   **/
+
   @ApiModelProperty(required = true, value = "")
   public BigDecimal getNumberItem() {
     return numberItem;
@@ -101,6 +103,7 @@ public class TypeHolderDefault implements Parcelable {
    * Get integerItem
    * @return integerItem
   **/
+
   @ApiModelProperty(required = true, value = "")
   public Integer getIntegerItem() {
     return integerItem;
@@ -119,6 +122,7 @@ public class TypeHolderDefault implements Parcelable {
    * Get boolItem
    * @return boolItem
   **/
+
   @ApiModelProperty(required = true, value = "")
   public Boolean getBoolItem() {
     return boolItem;
@@ -142,6 +146,7 @@ public class TypeHolderDefault implements Parcelable {
    * Get arrayItem
    * @return arrayItem
   **/
+
   @ApiModelProperty(required = true, value = "")
   public List<Integer> getArrayItem() {
     return arrayItem;
diff --git a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/TypeHolderExample.java b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/TypeHolderExample.java
index 4945a5b35a..8c9cbe0679 100644
--- a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/TypeHolderExample.java
+++ b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/TypeHolderExample.java
@@ -65,6 +65,7 @@ public class TypeHolderExample implements Parcelable {
    * Get stringItem
    * @return stringItem
   **/
+
   @ApiModelProperty(example = "what", required = true, value = "")
   public String getStringItem() {
     return stringItem;
@@ -83,6 +84,7 @@ public class TypeHolderExample implements Parcelable {
    * Get numberItem
    * @return numberItem
   **/
+
   @ApiModelProperty(example = "1.234", required = true, value = "")
   public BigDecimal getNumberItem() {
     return numberItem;
@@ -101,6 +103,7 @@ public class TypeHolderExample implements Parcelable {
    * Get integerItem
    * @return integerItem
   **/
+
   @ApiModelProperty(example = "-2", required = true, value = "")
   public Integer getIntegerItem() {
     return integerItem;
@@ -119,6 +122,7 @@ public class TypeHolderExample implements Parcelable {
    * Get boolItem
    * @return boolItem
   **/
+
   @ApiModelProperty(example = "true", required = true, value = "")
   public Boolean getBoolItem() {
     return boolItem;
@@ -142,6 +146,7 @@ public class TypeHolderExample implements Parcelable {
    * Get arrayItem
    * @return arrayItem
   **/
+
   @ApiModelProperty(example = "[0, 1, 2, 3]", required = true, value = "")
   public List<Integer> getArrayItem() {
     return arrayItem;
diff --git a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/User.java b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/User.java
index e5eac528a2..00a1e51b84 100644
--- a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/User.java
+++ b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/User.java
@@ -74,6 +74,7 @@ public class User implements Parcelable {
    * Get id
    * @return id
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Long getId() {
     return id;
@@ -92,6 +93,7 @@ public class User implements Parcelable {
    * Get username
    * @return username
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getUsername() {
     return username;
@@ -110,6 +112,7 @@ public class User implements Parcelable {
    * Get firstName
    * @return firstName
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getFirstName() {
     return firstName;
@@ -128,6 +131,7 @@ public class User implements Parcelable {
    * Get lastName
    * @return lastName
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getLastName() {
     return lastName;
@@ -146,6 +150,7 @@ public class User implements Parcelable {
    * Get email
    * @return email
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getEmail() {
     return email;
@@ -164,6 +169,7 @@ public class User implements Parcelable {
    * Get password
    * @return password
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getPassword() {
     return password;
@@ -182,6 +188,7 @@ public class User implements Parcelable {
    * Get phone
    * @return phone
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getPhone() {
     return phone;
@@ -200,6 +207,7 @@ public class User implements Parcelable {
    * User Status
    * @return userStatus
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "User Status")
   public Integer getUserStatus() {
     return userStatus;
diff --git a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/XmlItem.java b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/XmlItem.java
index 93a649100a..c2e9c058b3 100644
--- a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/XmlItem.java
+++ b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/XmlItem.java
@@ -161,6 +161,7 @@ public class XmlItem implements Parcelable {
    * Get attributeString
    * @return attributeString
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(example = "string", value = "")
   public String getAttributeString() {
     return attributeString;
@@ -179,6 +180,7 @@ public class XmlItem implements Parcelable {
    * Get attributeNumber
    * @return attributeNumber
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(example = "1.234", value = "")
   public BigDecimal getAttributeNumber() {
     return attributeNumber;
@@ -197,6 +199,7 @@ public class XmlItem implements Parcelable {
    * Get attributeInteger
    * @return attributeInteger
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(example = "-2", value = "")
   public Integer getAttributeInteger() {
     return attributeInteger;
@@ -215,6 +218,7 @@ public class XmlItem implements Parcelable {
    * Get attributeBoolean
    * @return attributeBoolean
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(example = "true", value = "")
   public Boolean getAttributeBoolean() {
     return attributeBoolean;
@@ -241,6 +245,7 @@ public class XmlItem implements Parcelable {
    * Get wrappedArray
    * @return wrappedArray
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public List<Integer> getWrappedArray() {
     return wrappedArray;
@@ -259,6 +264,7 @@ public class XmlItem implements Parcelable {
    * Get nameString
    * @return nameString
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(example = "string", value = "")
   public String getNameString() {
     return nameString;
@@ -277,6 +283,7 @@ public class XmlItem implements Parcelable {
    * Get nameNumber
    * @return nameNumber
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(example = "1.234", value = "")
   public BigDecimal getNameNumber() {
     return nameNumber;
@@ -295,6 +302,7 @@ public class XmlItem implements Parcelable {
    * Get nameInteger
    * @return nameInteger
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(example = "-2", value = "")
   public Integer getNameInteger() {
     return nameInteger;
@@ -313,6 +321,7 @@ public class XmlItem implements Parcelable {
    * Get nameBoolean
    * @return nameBoolean
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(example = "true", value = "")
   public Boolean getNameBoolean() {
     return nameBoolean;
@@ -339,6 +348,7 @@ public class XmlItem implements Parcelable {
    * Get nameArray
    * @return nameArray
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public List<Integer> getNameArray() {
     return nameArray;
@@ -365,6 +375,7 @@ public class XmlItem implements Parcelable {
    * Get nameWrappedArray
    * @return nameWrappedArray
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public List<Integer> getNameWrappedArray() {
     return nameWrappedArray;
@@ -383,6 +394,7 @@ public class XmlItem implements Parcelable {
    * Get prefixString
    * @return prefixString
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(example = "string", value = "")
   public String getPrefixString() {
     return prefixString;
@@ -401,6 +413,7 @@ public class XmlItem implements Parcelable {
    * Get prefixNumber
    * @return prefixNumber
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(example = "1.234", value = "")
   public BigDecimal getPrefixNumber() {
     return prefixNumber;
@@ -419,6 +432,7 @@ public class XmlItem implements Parcelable {
    * Get prefixInteger
    * @return prefixInteger
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(example = "-2", value = "")
   public Integer getPrefixInteger() {
     return prefixInteger;
@@ -437,6 +451,7 @@ public class XmlItem implements Parcelable {
    * Get prefixBoolean
    * @return prefixBoolean
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(example = "true", value = "")
   public Boolean getPrefixBoolean() {
     return prefixBoolean;
@@ -463,6 +478,7 @@ public class XmlItem implements Parcelable {
    * Get prefixArray
    * @return prefixArray
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public List<Integer> getPrefixArray() {
     return prefixArray;
@@ -489,6 +505,7 @@ public class XmlItem implements Parcelable {
    * Get prefixWrappedArray
    * @return prefixWrappedArray
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public List<Integer> getPrefixWrappedArray() {
     return prefixWrappedArray;
@@ -507,6 +524,7 @@ public class XmlItem implements Parcelable {
    * Get namespaceString
    * @return namespaceString
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(example = "string", value = "")
   public String getNamespaceString() {
     return namespaceString;
@@ -525,6 +543,7 @@ public class XmlItem implements Parcelable {
    * Get namespaceNumber
    * @return namespaceNumber
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(example = "1.234", value = "")
   public BigDecimal getNamespaceNumber() {
     return namespaceNumber;
@@ -543,6 +562,7 @@ public class XmlItem implements Parcelable {
    * Get namespaceInteger
    * @return namespaceInteger
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(example = "-2", value = "")
   public Integer getNamespaceInteger() {
     return namespaceInteger;
@@ -561,6 +581,7 @@ public class XmlItem implements Parcelable {
    * Get namespaceBoolean
    * @return namespaceBoolean
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(example = "true", value = "")
   public Boolean getNamespaceBoolean() {
     return namespaceBoolean;
@@ -587,6 +608,7 @@ public class XmlItem implements Parcelable {
    * Get namespaceArray
    * @return namespaceArray
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public List<Integer> getNamespaceArray() {
     return namespaceArray;
@@ -613,6 +635,7 @@ public class XmlItem implements Parcelable {
    * Get namespaceWrappedArray
    * @return namespaceWrappedArray
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public List<Integer> getNamespaceWrappedArray() {
     return namespaceWrappedArray;
@@ -631,6 +654,7 @@ public class XmlItem implements Parcelable {
    * Get prefixNsString
    * @return prefixNsString
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(example = "string", value = "")
   public String getPrefixNsString() {
     return prefixNsString;
@@ -649,6 +673,7 @@ public class XmlItem implements Parcelable {
    * Get prefixNsNumber
    * @return prefixNsNumber
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(example = "1.234", value = "")
   public BigDecimal getPrefixNsNumber() {
     return prefixNsNumber;
@@ -667,6 +692,7 @@ public class XmlItem implements Parcelable {
    * Get prefixNsInteger
    * @return prefixNsInteger
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(example = "-2", value = "")
   public Integer getPrefixNsInteger() {
     return prefixNsInteger;
@@ -685,6 +711,7 @@ public class XmlItem implements Parcelable {
    * Get prefixNsBoolean
    * @return prefixNsBoolean
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(example = "true", value = "")
   public Boolean getPrefixNsBoolean() {
     return prefixNsBoolean;
@@ -711,6 +738,7 @@ public class XmlItem implements Parcelable {
    * Get prefixNsArray
    * @return prefixNsArray
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public List<Integer> getPrefixNsArray() {
     return prefixNsArray;
@@ -737,6 +765,7 @@ public class XmlItem implements Parcelable {
    * Get prefixNsWrappedArray
    * @return prefixNsWrappedArray
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public List<Integer> getPrefixNsWrappedArray() {
     return prefixNsWrappedArray;
diff --git a/samples/client/petstore/java/okhttp-gson/build.gradle b/samples/client/petstore/java/okhttp-gson/build.gradle
index 72c122a516..f06992506a 100644
--- a/samples/client/petstore/java/okhttp-gson/build.gradle
+++ b/samples/client/petstore/java/okhttp-gson/build.gradle
@@ -99,6 +99,7 @@ if(hasProperty('target') && target == 'android') {
 
 dependencies {
     compile 'io.swagger:swagger-annotations:1.5.22'
+    compile "com.google.code.findbugs:jsr305:3.0.2"
     compile 'com.squareup.okhttp3:okhttp:3.14.2'
     compile 'com.squareup.okhttp3:logging-interceptor:3.14.2'
     compile 'com.google.code.gson:gson:2.8.5'
diff --git a/samples/client/petstore/java/okhttp-gson/pom.xml b/samples/client/petstore/java/okhttp-gson/pom.xml
index 733a77dee4..bedbc32a43 100644
--- a/samples/client/petstore/java/okhttp-gson/pom.xml
+++ b/samples/client/petstore/java/okhttp-gson/pom.xml
@@ -200,6 +200,12 @@
             <artifactId>swagger-annotations</artifactId>
             <version>${swagger-core-version}</version>
         </dependency>
+        <!-- @Nullable annotation -->
+        <dependency>
+            <groupId>com.google.code.findbugs</groupId>
+            <artifactId>jsr305</artifactId>
+            <version>3.0.2</version>
+        </dependency>
         <dependency>
             <groupId>com.squareup.okhttp3</groupId>
             <artifactId>okhttp</artifactId>
diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/AdditionalPropertiesAnyType.java b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/AdditionalPropertiesAnyType.java
index 9c47737ced..e98f74f8ae 100644
--- a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/AdditionalPropertiesAnyType.java
+++ b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/AdditionalPropertiesAnyType.java
@@ -44,6 +44,7 @@ public class AdditionalPropertiesAnyType extends HashMap<String, Object> {
    * Get name
    * @return name
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getName() {
     return name;
diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/AdditionalPropertiesArray.java b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/AdditionalPropertiesArray.java
index c5eed6cdac..1d86faad3e 100644
--- a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/AdditionalPropertiesArray.java
+++ b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/AdditionalPropertiesArray.java
@@ -45,6 +45,7 @@ public class AdditionalPropertiesArray extends HashMap<String, List> {
    * Get name
    * @return name
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getName() {
     return name;
diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/AdditionalPropertiesBoolean.java b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/AdditionalPropertiesBoolean.java
index 390777ff37..a3b37161da 100644
--- a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/AdditionalPropertiesBoolean.java
+++ b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/AdditionalPropertiesBoolean.java
@@ -44,6 +44,7 @@ public class AdditionalPropertiesBoolean extends HashMap<String, Boolean> {
    * Get name
    * @return name
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getName() {
     return name;
diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java
index 3c1a02c33c..8819f4a024 100644
--- a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java
+++ b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java
@@ -94,6 +94,7 @@ public class AdditionalPropertiesClass {
    * Get mapString
    * @return mapString
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Map<String, String> getMapString() {
     return mapString;
@@ -120,6 +121,7 @@ public class AdditionalPropertiesClass {
    * Get mapNumber
    * @return mapNumber
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Map<String, BigDecimal> getMapNumber() {
     return mapNumber;
@@ -146,6 +148,7 @@ public class AdditionalPropertiesClass {
    * Get mapInteger
    * @return mapInteger
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Map<String, Integer> getMapInteger() {
     return mapInteger;
@@ -172,6 +175,7 @@ public class AdditionalPropertiesClass {
    * Get mapBoolean
    * @return mapBoolean
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Map<String, Boolean> getMapBoolean() {
     return mapBoolean;
@@ -198,6 +202,7 @@ public class AdditionalPropertiesClass {
    * Get mapArrayInteger
    * @return mapArrayInteger
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Map<String, List<Integer>> getMapArrayInteger() {
     return mapArrayInteger;
@@ -224,6 +229,7 @@ public class AdditionalPropertiesClass {
    * Get mapArrayAnytype
    * @return mapArrayAnytype
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Map<String, List<Object>> getMapArrayAnytype() {
     return mapArrayAnytype;
@@ -250,6 +256,7 @@ public class AdditionalPropertiesClass {
    * Get mapMapString
    * @return mapMapString
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Map<String, Map<String, String>> getMapMapString() {
     return mapMapString;
@@ -276,6 +283,7 @@ public class AdditionalPropertiesClass {
    * Get mapMapAnytype
    * @return mapMapAnytype
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Map<String, Map<String, Object>> getMapMapAnytype() {
     return mapMapAnytype;
@@ -294,6 +302,7 @@ public class AdditionalPropertiesClass {
    * Get anytype1
    * @return anytype1
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Object getAnytype1() {
     return anytype1;
@@ -312,6 +321,7 @@ public class AdditionalPropertiesClass {
    * Get anytype2
    * @return anytype2
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Object getAnytype2() {
     return anytype2;
@@ -330,6 +340,7 @@ public class AdditionalPropertiesClass {
    * Get anytype3
    * @return anytype3
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Object getAnytype3() {
     return anytype3;
diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/AdditionalPropertiesInteger.java b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/AdditionalPropertiesInteger.java
index df6e865593..b8f956cbed 100644
--- a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/AdditionalPropertiesInteger.java
+++ b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/AdditionalPropertiesInteger.java
@@ -44,6 +44,7 @@ public class AdditionalPropertiesInteger extends HashMap<String, Integer> {
    * Get name
    * @return name
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getName() {
     return name;
diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/AdditionalPropertiesNumber.java b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/AdditionalPropertiesNumber.java
index 8a9118cf85..03d923ab1d 100644
--- a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/AdditionalPropertiesNumber.java
+++ b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/AdditionalPropertiesNumber.java
@@ -45,6 +45,7 @@ public class AdditionalPropertiesNumber extends HashMap<String, BigDecimal> {
    * Get name
    * @return name
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getName() {
     return name;
diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/AdditionalPropertiesObject.java b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/AdditionalPropertiesObject.java
index b67f12d840..c0e696dbd5 100644
--- a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/AdditionalPropertiesObject.java
+++ b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/AdditionalPropertiesObject.java
@@ -44,6 +44,7 @@ public class AdditionalPropertiesObject extends HashMap<String, Map> {
    * Get name
    * @return name
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getName() {
     return name;
diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/AdditionalPropertiesString.java b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/AdditionalPropertiesString.java
index 6e54b260fd..67e597e3cf 100644
--- a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/AdditionalPropertiesString.java
+++ b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/AdditionalPropertiesString.java
@@ -44,6 +44,7 @@ public class AdditionalPropertiesString extends HashMap<String, String> {
    * Get name
    * @return name
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getName() {
     return name;
diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/Animal.java b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/Animal.java
index 06342bce06..1738bdaf47 100644
--- a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/Animal.java
+++ b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/Animal.java
@@ -50,6 +50,7 @@ public class Animal {
    * Get className
    * @return className
   **/
+
   @ApiModelProperty(required = true, value = "")
   public String getClassName() {
     return className;
@@ -68,6 +69,7 @@ public class Animal {
    * Get color
    * @return color
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getColor() {
     return color;
diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java
index 87429212a6..69c0cacb05 100644
--- a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java
+++ b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java
@@ -53,6 +53,7 @@ public class ArrayOfArrayOfNumberOnly {
    * Get arrayArrayNumber
    * @return arrayArrayNumber
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public List<List<BigDecimal>> getArrayArrayNumber() {
     return arrayArrayNumber;
diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java
index c21e45d438..a85aa96af7 100644
--- a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java
+++ b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java
@@ -53,6 +53,7 @@ public class ArrayOfNumberOnly {
    * Get arrayNumber
    * @return arrayNumber
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public List<BigDecimal> getArrayNumber() {
     return arrayNumber;
diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/ArrayTest.java b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/ArrayTest.java
index 8ae596291a..986ac5aa17 100644
--- a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/ArrayTest.java
+++ b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/ArrayTest.java
@@ -61,6 +61,7 @@ public class ArrayTest {
    * Get arrayOfString
    * @return arrayOfString
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public List<String> getArrayOfString() {
     return arrayOfString;
@@ -87,6 +88,7 @@ public class ArrayTest {
    * Get arrayArrayOfInteger
    * @return arrayArrayOfInteger
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public List<List<Long>> getArrayArrayOfInteger() {
     return arrayArrayOfInteger;
@@ -113,6 +115,7 @@ public class ArrayTest {
    * Get arrayArrayOfModel
    * @return arrayArrayOfModel
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public List<List<ReadOnlyFirst>> getArrayArrayOfModel() {
     return arrayArrayOfModel;
diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/Capitalization.java b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/Capitalization.java
index 3f05d95d60..36f8853e1c 100644
--- a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/Capitalization.java
+++ b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/Capitalization.java
@@ -62,6 +62,7 @@ public class Capitalization {
    * Get smallCamel
    * @return smallCamel
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getSmallCamel() {
     return smallCamel;
@@ -80,6 +81,7 @@ public class Capitalization {
    * Get capitalCamel
    * @return capitalCamel
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getCapitalCamel() {
     return capitalCamel;
@@ -98,6 +100,7 @@ public class Capitalization {
    * Get smallSnake
    * @return smallSnake
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getSmallSnake() {
     return smallSnake;
@@ -116,6 +119,7 @@ public class Capitalization {
    * Get capitalSnake
    * @return capitalSnake
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getCapitalSnake() {
     return capitalSnake;
@@ -134,6 +138,7 @@ public class Capitalization {
    * Get scAETHFlowPoints
    * @return scAETHFlowPoints
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getScAETHFlowPoints() {
     return scAETHFlowPoints;
@@ -152,6 +157,7 @@ public class Capitalization {
    * Name of the pet 
    * @return ATT_NAME
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "Name of the pet ")
   public String getATTNAME() {
     return ATT_NAME;
diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/Cat.java b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/Cat.java
index 4a12050bc8..965461a8be 100644
--- a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/Cat.java
+++ b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/Cat.java
@@ -44,6 +44,7 @@ public class Cat extends Animal {
    * Get declawed
    * @return declawed
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Boolean getDeclawed() {
     return declawed;
diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/CatAllOf.java b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/CatAllOf.java
index 1424f55ddb..124db9b8ba 100644
--- a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/CatAllOf.java
+++ b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/CatAllOf.java
@@ -42,6 +42,7 @@ public class CatAllOf {
    * Get declawed
    * @return declawed
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Boolean getDeclawed() {
     return declawed;
diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/Category.java b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/Category.java
index eb41569576..d4e121847a 100644
--- a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/Category.java
+++ b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/Category.java
@@ -46,6 +46,7 @@ public class Category {
    * Get id
    * @return id
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Long getId() {
     return id;
@@ -64,6 +65,7 @@ public class Category {
    * Get name
    * @return name
   **/
+
   @ApiModelProperty(required = true, value = "")
   public String getName() {
     return name;
diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/ClassModel.java b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/ClassModel.java
index 91632a4f68..cbdd8f317b 100644
--- a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/ClassModel.java
+++ b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/ClassModel.java
@@ -43,6 +43,7 @@ public class ClassModel {
    * Get propertyClass
    * @return propertyClass
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getPropertyClass() {
     return propertyClass;
diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/Client.java b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/Client.java
index 3067e8d184..5d9c5c4a71 100644
--- a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/Client.java
+++ b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/Client.java
@@ -42,6 +42,7 @@ public class Client {
    * Get client
    * @return client
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getClient() {
     return client;
diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/Dog.java b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/Dog.java
index 63ff1ffbec..4da9ba4364 100644
--- a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/Dog.java
+++ b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/Dog.java
@@ -44,6 +44,7 @@ public class Dog extends Animal {
    * Get breed
    * @return breed
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getBreed() {
     return breed;
diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/DogAllOf.java b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/DogAllOf.java
index 7214ddd07e..e505d1dbc3 100644
--- a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/DogAllOf.java
+++ b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/DogAllOf.java
@@ -42,6 +42,7 @@ public class DogAllOf {
    * Get breed
    * @return breed
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getBreed() {
     return breed;
diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/EnumArrays.java b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/EnumArrays.java
index bd8d680339..8748c9fa37 100644
--- a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/EnumArrays.java
+++ b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/EnumArrays.java
@@ -142,6 +142,7 @@ public class EnumArrays {
    * Get justSymbol
    * @return justSymbol
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public JustSymbolEnum getJustSymbol() {
     return justSymbol;
@@ -168,6 +169,7 @@ public class EnumArrays {
    * Get arrayEnum
    * @return arrayEnum
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public List<ArrayEnumEnum> getArrayEnum() {
     return arrayEnum;
diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/EnumTest.java b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/EnumTest.java
index 6c05a8f967..1960c24ac2 100644
--- a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/EnumTest.java
+++ b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/EnumTest.java
@@ -251,6 +251,7 @@ public class EnumTest {
    * Get enumString
    * @return enumString
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public EnumStringEnum getEnumString() {
     return enumString;
@@ -269,6 +270,7 @@ public class EnumTest {
    * Get enumStringRequired
    * @return enumStringRequired
   **/
+
   @ApiModelProperty(required = true, value = "")
   public EnumStringRequiredEnum getEnumStringRequired() {
     return enumStringRequired;
@@ -287,6 +289,7 @@ public class EnumTest {
    * Get enumInteger
    * @return enumInteger
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public EnumIntegerEnum getEnumInteger() {
     return enumInteger;
@@ -305,6 +308,7 @@ public class EnumTest {
    * Get enumNumber
    * @return enumNumber
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public EnumNumberEnum getEnumNumber() {
     return enumNumber;
@@ -323,6 +327,7 @@ public class EnumTest {
    * Get outerEnum
    * @return outerEnum
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public OuterEnum getOuterEnum() {
     return outerEnum;
diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java
index 8ebc84c044..3c7fcaabdf 100644
--- a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java
+++ b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java
@@ -48,6 +48,7 @@ public class FileSchemaTestClass {
    * Get file
    * @return file
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public java.io.File getFile() {
     return file;
@@ -74,6 +75,7 @@ public class FileSchemaTestClass {
    * Get files
    * @return files
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public List<java.io.File> getFiles() {
     return files;
diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/FormatTest.java b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/FormatTest.java
index 29058abb17..e7b28a4737 100644
--- a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/FormatTest.java
+++ b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/FormatTest.java
@@ -97,6 +97,7 @@ public class FormatTest {
    * maximum: 100
    * @return integer
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Integer getInteger() {
     return integer;
@@ -117,6 +118,7 @@ public class FormatTest {
    * maximum: 200
    * @return int32
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Integer getInt32() {
     return int32;
@@ -135,6 +137,7 @@ public class FormatTest {
    * Get int64
    * @return int64
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Long getInt64() {
     return int64;
@@ -155,6 +158,7 @@ public class FormatTest {
    * maximum: 543.2
    * @return number
   **/
+
   @ApiModelProperty(required = true, value = "")
   public BigDecimal getNumber() {
     return number;
@@ -175,6 +179,7 @@ public class FormatTest {
    * maximum: 987.6
    * @return _float
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Float getFloat() {
     return _float;
@@ -195,6 +200,7 @@ public class FormatTest {
    * maximum: 123.4
    * @return _double
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Double getDouble() {
     return _double;
@@ -213,6 +219,7 @@ public class FormatTest {
    * Get string
    * @return string
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getString() {
     return string;
@@ -231,6 +238,7 @@ public class FormatTest {
    * Get _byte
    * @return _byte
   **/
+
   @ApiModelProperty(required = true, value = "")
   public byte[] getByte() {
     return _byte;
@@ -249,6 +257,7 @@ public class FormatTest {
    * Get binary
    * @return binary
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public File getBinary() {
     return binary;
@@ -267,6 +276,7 @@ public class FormatTest {
    * Get date
    * @return date
   **/
+
   @ApiModelProperty(required = true, value = "")
   public LocalDate getDate() {
     return date;
@@ -285,6 +295,7 @@ public class FormatTest {
    * Get dateTime
    * @return dateTime
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public OffsetDateTime getDateTime() {
     return dateTime;
@@ -303,6 +314,7 @@ public class FormatTest {
    * Get uuid
    * @return uuid
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(example = "72f98069-206d-4f12-9f12-3d1e525a8e84", value = "")
   public UUID getUuid() {
     return uuid;
@@ -321,6 +333,7 @@ public class FormatTest {
    * Get password
    * @return password
   **/
+
   @ApiModelProperty(required = true, value = "")
   public String getPassword() {
     return password;
diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java
index bb1394ea1f..72fcaa8993 100644
--- a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java
+++ b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java
@@ -41,6 +41,7 @@ public class HasOnlyReadOnly {
    * Get bar
    * @return bar
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getBar() {
     return bar;
@@ -50,6 +51,7 @@ public class HasOnlyReadOnly {
    * Get foo
    * @return foo
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getFoo() {
     return foo;
diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/MapTest.java b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/MapTest.java
index cb95334e61..43f0d2e998 100644
--- a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/MapTest.java
+++ b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/MapTest.java
@@ -112,6 +112,7 @@ public class MapTest {
    * Get mapMapOfString
    * @return mapMapOfString
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Map<String, Map<String, String>> getMapMapOfString() {
     return mapMapOfString;
@@ -138,6 +139,7 @@ public class MapTest {
    * Get mapOfEnumString
    * @return mapOfEnumString
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Map<String, InnerEnum> getMapOfEnumString() {
     return mapOfEnumString;
@@ -164,6 +166,7 @@ public class MapTest {
    * Get directMap
    * @return directMap
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Map<String, Boolean> getDirectMap() {
     return directMap;
@@ -190,6 +193,7 @@ public class MapTest {
    * Get indirectMap
    * @return indirectMap
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Map<String, Boolean> getIndirectMap() {
     return indirectMap;
diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java
index 7417b41271..78d80bd7f0 100644
--- a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java
+++ b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java
@@ -56,6 +56,7 @@ public class MixedPropertiesAndAdditionalPropertiesClass {
    * Get uuid
    * @return uuid
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public UUID getUuid() {
     return uuid;
@@ -74,6 +75,7 @@ public class MixedPropertiesAndAdditionalPropertiesClass {
    * Get dateTime
    * @return dateTime
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public OffsetDateTime getDateTime() {
     return dateTime;
@@ -100,6 +102,7 @@ public class MixedPropertiesAndAdditionalPropertiesClass {
    * Get map
    * @return map
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Map<String, Animal> getMap() {
     return map;
diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/Model200Response.java b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/Model200Response.java
index 3981e9696a..0c0fc9710d 100644
--- a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/Model200Response.java
+++ b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/Model200Response.java
@@ -47,6 +47,7 @@ public class Model200Response {
    * Get name
    * @return name
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Integer getName() {
     return name;
@@ -65,6 +66,7 @@ public class Model200Response {
    * Get propertyClass
    * @return propertyClass
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getPropertyClass() {
     return propertyClass;
diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/ModelApiResponse.java b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/ModelApiResponse.java
index 8a0b10b4e2..777b1a8a7c 100644
--- a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/ModelApiResponse.java
+++ b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/ModelApiResponse.java
@@ -50,6 +50,7 @@ public class ModelApiResponse {
    * Get code
    * @return code
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Integer getCode() {
     return code;
@@ -68,6 +69,7 @@ public class ModelApiResponse {
    * Get type
    * @return type
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getType() {
     return type;
@@ -86,6 +88,7 @@ public class ModelApiResponse {
    * Get message
    * @return message
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getMessage() {
     return message;
diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/ModelReturn.java b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/ModelReturn.java
index f045378132..225df7f4e8 100644
--- a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/ModelReturn.java
+++ b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/ModelReturn.java
@@ -43,6 +43,7 @@ public class ModelReturn {
    * Get _return
    * @return _return
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Integer getReturn() {
     return _return;
diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/Name.java b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/Name.java
index dab0c2d48f..c5a5691688 100644
--- a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/Name.java
+++ b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/Name.java
@@ -55,6 +55,7 @@ public class Name {
    * Get name
    * @return name
   **/
+
   @ApiModelProperty(required = true, value = "")
   public Integer getName() {
     return name;
@@ -68,6 +69,7 @@ public class Name {
    * Get snakeCase
    * @return snakeCase
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Integer getSnakeCase() {
     return snakeCase;
@@ -82,6 +84,7 @@ public class Name {
    * Get property
    * @return property
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getProperty() {
     return property;
@@ -95,6 +98,7 @@ public class Name {
    * Get _123number
    * @return _123number
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Integer get123number() {
     return _123number;
diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/NumberOnly.java b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/NumberOnly.java
index 17cb112586..00ffd2f67e 100644
--- a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/NumberOnly.java
+++ b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/NumberOnly.java
@@ -43,6 +43,7 @@ public class NumberOnly {
    * Get justNumber
    * @return justNumber
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public BigDecimal getJustNumber() {
     return justNumber;
diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/Order.java b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/Order.java
index 66e43825e2..cfb3d04776 100644
--- a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/Order.java
+++ b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/Order.java
@@ -112,6 +112,7 @@ public class Order {
    * Get id
    * @return id
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Long getId() {
     return id;
@@ -130,6 +131,7 @@ public class Order {
    * Get petId
    * @return petId
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Long getPetId() {
     return petId;
@@ -148,6 +150,7 @@ public class Order {
    * Get quantity
    * @return quantity
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Integer getQuantity() {
     return quantity;
@@ -166,6 +169,7 @@ public class Order {
    * Get shipDate
    * @return shipDate
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public OffsetDateTime getShipDate() {
     return shipDate;
@@ -184,6 +188,7 @@ public class Order {
    * Order Status
    * @return status
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "Order Status")
   public StatusEnum getStatus() {
     return status;
@@ -202,6 +207,7 @@ public class Order {
    * Get complete
    * @return complete
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Boolean getComplete() {
     return complete;
diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/OuterComposite.java b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/OuterComposite.java
index 65f05e3fa4..9e2a78d57f 100644
--- a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/OuterComposite.java
+++ b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/OuterComposite.java
@@ -51,6 +51,7 @@ public class OuterComposite {
    * Get myNumber
    * @return myNumber
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public BigDecimal getMyNumber() {
     return myNumber;
@@ -69,6 +70,7 @@ public class OuterComposite {
    * Get myString
    * @return myString
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getMyString() {
     return myString;
@@ -87,6 +89,7 @@ public class OuterComposite {
    * Get myBoolean
    * @return myBoolean
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Boolean getMyBoolean() {
     return myBoolean;
diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/Pet.java b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/Pet.java
index a95a0c9dd0..5ac8165f7f 100644
--- a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/Pet.java
+++ b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/Pet.java
@@ -115,6 +115,7 @@ public class Pet {
    * Get id
    * @return id
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Long getId() {
     return id;
@@ -133,6 +134,7 @@ public class Pet {
    * Get category
    * @return category
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Category getCategory() {
     return category;
@@ -151,6 +153,7 @@ public class Pet {
    * Get name
    * @return name
   **/
+
   @ApiModelProperty(example = "doggie", required = true, value = "")
   public String getName() {
     return name;
@@ -174,6 +177,7 @@ public class Pet {
    * Get photoUrls
    * @return photoUrls
   **/
+
   @ApiModelProperty(required = true, value = "")
   public List<String> getPhotoUrls() {
     return photoUrls;
@@ -200,6 +204,7 @@ public class Pet {
    * Get tags
    * @return tags
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public List<Tag> getTags() {
     return tags;
@@ -218,6 +223,7 @@ public class Pet {
    * pet status in the store
    * @return status
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "pet status in the store")
   public StatusEnum getStatus() {
     return status;
diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/ReadOnlyFirst.java b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/ReadOnlyFirst.java
index 2872f78893..23ec5576c0 100644
--- a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/ReadOnlyFirst.java
+++ b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/ReadOnlyFirst.java
@@ -41,6 +41,7 @@ public class ReadOnlyFirst {
    * Get bar
    * @return bar
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getBar() {
     return bar;
@@ -55,6 +56,7 @@ public class ReadOnlyFirst {
    * Get baz
    * @return baz
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getBaz() {
     return baz;
diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/SpecialModelName.java b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/SpecialModelName.java
index 8fab5e0b27..f4a7d343a7 100644
--- a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/SpecialModelName.java
+++ b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/SpecialModelName.java
@@ -42,6 +42,7 @@ public class SpecialModelName {
    * Get $specialPropertyName
    * @return $specialPropertyName
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Long get$SpecialPropertyName() {
     return $specialPropertyName;
diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/Tag.java b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/Tag.java
index ab153ca672..bce1fc934d 100644
--- a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/Tag.java
+++ b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/Tag.java
@@ -46,6 +46,7 @@ public class Tag {
    * Get id
    * @return id
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Long getId() {
     return id;
@@ -64,6 +65,7 @@ public class Tag {
    * Get name
    * @return name
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getName() {
     return name;
diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/TypeHolderDefault.java b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/TypeHolderDefault.java
index 8fc321bc0a..8c7e1fa55d 100644
--- a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/TypeHolderDefault.java
+++ b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/TypeHolderDefault.java
@@ -61,6 +61,7 @@ public class TypeHolderDefault {
    * Get stringItem
    * @return stringItem
   **/
+
   @ApiModelProperty(required = true, value = "")
   public String getStringItem() {
     return stringItem;
@@ -79,6 +80,7 @@ public class TypeHolderDefault {
    * Get numberItem
    * @return numberItem
   **/
+
   @ApiModelProperty(required = true, value = "")
   public BigDecimal getNumberItem() {
     return numberItem;
@@ -97,6 +99,7 @@ public class TypeHolderDefault {
    * Get integerItem
    * @return integerItem
   **/
+
   @ApiModelProperty(required = true, value = "")
   public Integer getIntegerItem() {
     return integerItem;
@@ -115,6 +118,7 @@ public class TypeHolderDefault {
    * Get boolItem
    * @return boolItem
   **/
+
   @ApiModelProperty(required = true, value = "")
   public Boolean getBoolItem() {
     return boolItem;
@@ -138,6 +142,7 @@ public class TypeHolderDefault {
    * Get arrayItem
    * @return arrayItem
   **/
+
   @ApiModelProperty(required = true, value = "")
   public List<Integer> getArrayItem() {
     return arrayItem;
diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/TypeHolderExample.java b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/TypeHolderExample.java
index d9496cbd79..8315f422ea 100644
--- a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/TypeHolderExample.java
+++ b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/TypeHolderExample.java
@@ -61,6 +61,7 @@ public class TypeHolderExample {
    * Get stringItem
    * @return stringItem
   **/
+
   @ApiModelProperty(example = "what", required = true, value = "")
   public String getStringItem() {
     return stringItem;
@@ -79,6 +80,7 @@ public class TypeHolderExample {
    * Get numberItem
    * @return numberItem
   **/
+
   @ApiModelProperty(example = "1.234", required = true, value = "")
   public BigDecimal getNumberItem() {
     return numberItem;
@@ -97,6 +99,7 @@ public class TypeHolderExample {
    * Get integerItem
    * @return integerItem
   **/
+
   @ApiModelProperty(example = "-2", required = true, value = "")
   public Integer getIntegerItem() {
     return integerItem;
@@ -115,6 +118,7 @@ public class TypeHolderExample {
    * Get boolItem
    * @return boolItem
   **/
+
   @ApiModelProperty(example = "true", required = true, value = "")
   public Boolean getBoolItem() {
     return boolItem;
@@ -138,6 +142,7 @@ public class TypeHolderExample {
    * Get arrayItem
    * @return arrayItem
   **/
+
   @ApiModelProperty(example = "[0, 1, 2, 3]", required = true, value = "")
   public List<Integer> getArrayItem() {
     return arrayItem;
diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/User.java b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/User.java
index 74b9a66a24..3f9eb4bb8a 100644
--- a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/User.java
+++ b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/User.java
@@ -70,6 +70,7 @@ public class User {
    * Get id
    * @return id
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Long getId() {
     return id;
@@ -88,6 +89,7 @@ public class User {
    * Get username
    * @return username
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getUsername() {
     return username;
@@ -106,6 +108,7 @@ public class User {
    * Get firstName
    * @return firstName
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getFirstName() {
     return firstName;
@@ -124,6 +127,7 @@ public class User {
    * Get lastName
    * @return lastName
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getLastName() {
     return lastName;
@@ -142,6 +146,7 @@ public class User {
    * Get email
    * @return email
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getEmail() {
     return email;
@@ -160,6 +165,7 @@ public class User {
    * Get password
    * @return password
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getPassword() {
     return password;
@@ -178,6 +184,7 @@ public class User {
    * Get phone
    * @return phone
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getPhone() {
     return phone;
@@ -196,6 +203,7 @@ public class User {
    * User Status
    * @return userStatus
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "User Status")
   public Integer getUserStatus() {
     return userStatus;
diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/XmlItem.java b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/XmlItem.java
index ac66ad77de..67910352a7 100644
--- a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/XmlItem.java
+++ b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/XmlItem.java
@@ -157,6 +157,7 @@ public class XmlItem {
    * Get attributeString
    * @return attributeString
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(example = "string", value = "")
   public String getAttributeString() {
     return attributeString;
@@ -175,6 +176,7 @@ public class XmlItem {
    * Get attributeNumber
    * @return attributeNumber
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(example = "1.234", value = "")
   public BigDecimal getAttributeNumber() {
     return attributeNumber;
@@ -193,6 +195,7 @@ public class XmlItem {
    * Get attributeInteger
    * @return attributeInteger
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(example = "-2", value = "")
   public Integer getAttributeInteger() {
     return attributeInteger;
@@ -211,6 +214,7 @@ public class XmlItem {
    * Get attributeBoolean
    * @return attributeBoolean
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(example = "true", value = "")
   public Boolean getAttributeBoolean() {
     return attributeBoolean;
@@ -237,6 +241,7 @@ public class XmlItem {
    * Get wrappedArray
    * @return wrappedArray
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public List<Integer> getWrappedArray() {
     return wrappedArray;
@@ -255,6 +260,7 @@ public class XmlItem {
    * Get nameString
    * @return nameString
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(example = "string", value = "")
   public String getNameString() {
     return nameString;
@@ -273,6 +279,7 @@ public class XmlItem {
    * Get nameNumber
    * @return nameNumber
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(example = "1.234", value = "")
   public BigDecimal getNameNumber() {
     return nameNumber;
@@ -291,6 +298,7 @@ public class XmlItem {
    * Get nameInteger
    * @return nameInteger
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(example = "-2", value = "")
   public Integer getNameInteger() {
     return nameInteger;
@@ -309,6 +317,7 @@ public class XmlItem {
    * Get nameBoolean
    * @return nameBoolean
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(example = "true", value = "")
   public Boolean getNameBoolean() {
     return nameBoolean;
@@ -335,6 +344,7 @@ public class XmlItem {
    * Get nameArray
    * @return nameArray
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public List<Integer> getNameArray() {
     return nameArray;
@@ -361,6 +371,7 @@ public class XmlItem {
    * Get nameWrappedArray
    * @return nameWrappedArray
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public List<Integer> getNameWrappedArray() {
     return nameWrappedArray;
@@ -379,6 +390,7 @@ public class XmlItem {
    * Get prefixString
    * @return prefixString
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(example = "string", value = "")
   public String getPrefixString() {
     return prefixString;
@@ -397,6 +409,7 @@ public class XmlItem {
    * Get prefixNumber
    * @return prefixNumber
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(example = "1.234", value = "")
   public BigDecimal getPrefixNumber() {
     return prefixNumber;
@@ -415,6 +428,7 @@ public class XmlItem {
    * Get prefixInteger
    * @return prefixInteger
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(example = "-2", value = "")
   public Integer getPrefixInteger() {
     return prefixInteger;
@@ -433,6 +447,7 @@ public class XmlItem {
    * Get prefixBoolean
    * @return prefixBoolean
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(example = "true", value = "")
   public Boolean getPrefixBoolean() {
     return prefixBoolean;
@@ -459,6 +474,7 @@ public class XmlItem {
    * Get prefixArray
    * @return prefixArray
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public List<Integer> getPrefixArray() {
     return prefixArray;
@@ -485,6 +501,7 @@ public class XmlItem {
    * Get prefixWrappedArray
    * @return prefixWrappedArray
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public List<Integer> getPrefixWrappedArray() {
     return prefixWrappedArray;
@@ -503,6 +520,7 @@ public class XmlItem {
    * Get namespaceString
    * @return namespaceString
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(example = "string", value = "")
   public String getNamespaceString() {
     return namespaceString;
@@ -521,6 +539,7 @@ public class XmlItem {
    * Get namespaceNumber
    * @return namespaceNumber
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(example = "1.234", value = "")
   public BigDecimal getNamespaceNumber() {
     return namespaceNumber;
@@ -539,6 +558,7 @@ public class XmlItem {
    * Get namespaceInteger
    * @return namespaceInteger
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(example = "-2", value = "")
   public Integer getNamespaceInteger() {
     return namespaceInteger;
@@ -557,6 +577,7 @@ public class XmlItem {
    * Get namespaceBoolean
    * @return namespaceBoolean
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(example = "true", value = "")
   public Boolean getNamespaceBoolean() {
     return namespaceBoolean;
@@ -583,6 +604,7 @@ public class XmlItem {
    * Get namespaceArray
    * @return namespaceArray
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public List<Integer> getNamespaceArray() {
     return namespaceArray;
@@ -609,6 +631,7 @@ public class XmlItem {
    * Get namespaceWrappedArray
    * @return namespaceWrappedArray
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public List<Integer> getNamespaceWrappedArray() {
     return namespaceWrappedArray;
@@ -627,6 +650,7 @@ public class XmlItem {
    * Get prefixNsString
    * @return prefixNsString
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(example = "string", value = "")
   public String getPrefixNsString() {
     return prefixNsString;
@@ -645,6 +669,7 @@ public class XmlItem {
    * Get prefixNsNumber
    * @return prefixNsNumber
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(example = "1.234", value = "")
   public BigDecimal getPrefixNsNumber() {
     return prefixNsNumber;
@@ -663,6 +688,7 @@ public class XmlItem {
    * Get prefixNsInteger
    * @return prefixNsInteger
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(example = "-2", value = "")
   public Integer getPrefixNsInteger() {
     return prefixNsInteger;
@@ -681,6 +707,7 @@ public class XmlItem {
    * Get prefixNsBoolean
    * @return prefixNsBoolean
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(example = "true", value = "")
   public Boolean getPrefixNsBoolean() {
     return prefixNsBoolean;
@@ -707,6 +734,7 @@ public class XmlItem {
    * Get prefixNsArray
    * @return prefixNsArray
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public List<Integer> getPrefixNsArray() {
     return prefixNsArray;
@@ -733,6 +761,7 @@ public class XmlItem {
    * Get prefixNsWrappedArray
    * @return prefixNsWrappedArray
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public List<Integer> getPrefixNsWrappedArray() {
     return prefixNsWrappedArray;
diff --git a/samples/client/petstore/java/rest-assured/build.gradle b/samples/client/petstore/java/rest-assured/build.gradle
index c758bd3388..b05326008f 100644
--- a/samples/client/petstore/java/rest-assured/build.gradle
+++ b/samples/client/petstore/java/rest-assured/build.gradle
@@ -106,6 +106,7 @@ ext {
 
 dependencies {
     compile "io.swagger:swagger-annotations:$swagger_annotations_version"
+    compile "com.google.code.findbugs:jsr305:3.0.2"
     compile "io.rest-assured:scala-support:$rest_assured_version"
     compile "io.gsonfire:gson-fire:$gson_fire_version"
     compile "org.threeten:threetenbp:$threetenbp_version"
diff --git a/samples/client/petstore/java/rest-assured/pom.xml b/samples/client/petstore/java/rest-assured/pom.xml
index f6d82e8701..5dd9a1b8f4 100644
--- a/samples/client/petstore/java/rest-assured/pom.xml
+++ b/samples/client/petstore/java/rest-assured/pom.xml
@@ -199,6 +199,12 @@
             <artifactId>swagger-annotations</artifactId>
             <version>${swagger-annotations-version}</version>
         </dependency>
+        <!-- @Nullable annotation -->
+        <dependency>
+            <groupId>com.google.code.findbugs</groupId>
+            <artifactId>jsr305</artifactId>
+            <version>3.0.2</version>
+        </dependency>
         <dependency>
             <groupId>io.rest-assured</groupId>
             <artifactId>rest-assured</artifactId>
diff --git a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/AdditionalPropertiesAnyType.java b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/AdditionalPropertiesAnyType.java
index 9c47737ced..e98f74f8ae 100644
--- a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/AdditionalPropertiesAnyType.java
+++ b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/AdditionalPropertiesAnyType.java
@@ -44,6 +44,7 @@ public class AdditionalPropertiesAnyType extends HashMap<String, Object> {
    * Get name
    * @return name
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getName() {
     return name;
diff --git a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/AdditionalPropertiesArray.java b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/AdditionalPropertiesArray.java
index c5eed6cdac..1d86faad3e 100644
--- a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/AdditionalPropertiesArray.java
+++ b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/AdditionalPropertiesArray.java
@@ -45,6 +45,7 @@ public class AdditionalPropertiesArray extends HashMap<String, List> {
    * Get name
    * @return name
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getName() {
     return name;
diff --git a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/AdditionalPropertiesBoolean.java b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/AdditionalPropertiesBoolean.java
index 390777ff37..a3b37161da 100644
--- a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/AdditionalPropertiesBoolean.java
+++ b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/AdditionalPropertiesBoolean.java
@@ -44,6 +44,7 @@ public class AdditionalPropertiesBoolean extends HashMap<String, Boolean> {
    * Get name
    * @return name
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getName() {
     return name;
diff --git a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java
index 3c1a02c33c..8819f4a024 100644
--- a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java
+++ b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java
@@ -94,6 +94,7 @@ public class AdditionalPropertiesClass {
    * Get mapString
    * @return mapString
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Map<String, String> getMapString() {
     return mapString;
@@ -120,6 +121,7 @@ public class AdditionalPropertiesClass {
    * Get mapNumber
    * @return mapNumber
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Map<String, BigDecimal> getMapNumber() {
     return mapNumber;
@@ -146,6 +148,7 @@ public class AdditionalPropertiesClass {
    * Get mapInteger
    * @return mapInteger
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Map<String, Integer> getMapInteger() {
     return mapInteger;
@@ -172,6 +175,7 @@ public class AdditionalPropertiesClass {
    * Get mapBoolean
    * @return mapBoolean
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Map<String, Boolean> getMapBoolean() {
     return mapBoolean;
@@ -198,6 +202,7 @@ public class AdditionalPropertiesClass {
    * Get mapArrayInteger
    * @return mapArrayInteger
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Map<String, List<Integer>> getMapArrayInteger() {
     return mapArrayInteger;
@@ -224,6 +229,7 @@ public class AdditionalPropertiesClass {
    * Get mapArrayAnytype
    * @return mapArrayAnytype
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Map<String, List<Object>> getMapArrayAnytype() {
     return mapArrayAnytype;
@@ -250,6 +256,7 @@ public class AdditionalPropertiesClass {
    * Get mapMapString
    * @return mapMapString
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Map<String, Map<String, String>> getMapMapString() {
     return mapMapString;
@@ -276,6 +283,7 @@ public class AdditionalPropertiesClass {
    * Get mapMapAnytype
    * @return mapMapAnytype
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Map<String, Map<String, Object>> getMapMapAnytype() {
     return mapMapAnytype;
@@ -294,6 +302,7 @@ public class AdditionalPropertiesClass {
    * Get anytype1
    * @return anytype1
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Object getAnytype1() {
     return anytype1;
@@ -312,6 +321,7 @@ public class AdditionalPropertiesClass {
    * Get anytype2
    * @return anytype2
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Object getAnytype2() {
     return anytype2;
@@ -330,6 +340,7 @@ public class AdditionalPropertiesClass {
    * Get anytype3
    * @return anytype3
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Object getAnytype3() {
     return anytype3;
diff --git a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/AdditionalPropertiesInteger.java b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/AdditionalPropertiesInteger.java
index df6e865593..b8f956cbed 100644
--- a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/AdditionalPropertiesInteger.java
+++ b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/AdditionalPropertiesInteger.java
@@ -44,6 +44,7 @@ public class AdditionalPropertiesInteger extends HashMap<String, Integer> {
    * Get name
    * @return name
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getName() {
     return name;
diff --git a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/AdditionalPropertiesNumber.java b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/AdditionalPropertiesNumber.java
index 8a9118cf85..03d923ab1d 100644
--- a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/AdditionalPropertiesNumber.java
+++ b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/AdditionalPropertiesNumber.java
@@ -45,6 +45,7 @@ public class AdditionalPropertiesNumber extends HashMap<String, BigDecimal> {
    * Get name
    * @return name
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getName() {
     return name;
diff --git a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/AdditionalPropertiesObject.java b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/AdditionalPropertiesObject.java
index b67f12d840..c0e696dbd5 100644
--- a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/AdditionalPropertiesObject.java
+++ b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/AdditionalPropertiesObject.java
@@ -44,6 +44,7 @@ public class AdditionalPropertiesObject extends HashMap<String, Map> {
    * Get name
    * @return name
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getName() {
     return name;
diff --git a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/AdditionalPropertiesString.java b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/AdditionalPropertiesString.java
index 6e54b260fd..67e597e3cf 100644
--- a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/AdditionalPropertiesString.java
+++ b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/AdditionalPropertiesString.java
@@ -44,6 +44,7 @@ public class AdditionalPropertiesString extends HashMap<String, String> {
    * Get name
    * @return name
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getName() {
     return name;
diff --git a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/Animal.java b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/Animal.java
index 06342bce06..1738bdaf47 100644
--- a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/Animal.java
+++ b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/Animal.java
@@ -50,6 +50,7 @@ public class Animal {
    * Get className
    * @return className
   **/
+
   @ApiModelProperty(required = true, value = "")
   public String getClassName() {
     return className;
@@ -68,6 +69,7 @@ public class Animal {
    * Get color
    * @return color
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getColor() {
     return color;
diff --git a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java
index 87429212a6..69c0cacb05 100644
--- a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java
+++ b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java
@@ -53,6 +53,7 @@ public class ArrayOfArrayOfNumberOnly {
    * Get arrayArrayNumber
    * @return arrayArrayNumber
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public List<List<BigDecimal>> getArrayArrayNumber() {
     return arrayArrayNumber;
diff --git a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java
index c21e45d438..a85aa96af7 100644
--- a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java
+++ b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java
@@ -53,6 +53,7 @@ public class ArrayOfNumberOnly {
    * Get arrayNumber
    * @return arrayNumber
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public List<BigDecimal> getArrayNumber() {
     return arrayNumber;
diff --git a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/ArrayTest.java b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/ArrayTest.java
index 8ae596291a..986ac5aa17 100644
--- a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/ArrayTest.java
+++ b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/ArrayTest.java
@@ -61,6 +61,7 @@ public class ArrayTest {
    * Get arrayOfString
    * @return arrayOfString
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public List<String> getArrayOfString() {
     return arrayOfString;
@@ -87,6 +88,7 @@ public class ArrayTest {
    * Get arrayArrayOfInteger
    * @return arrayArrayOfInteger
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public List<List<Long>> getArrayArrayOfInteger() {
     return arrayArrayOfInteger;
@@ -113,6 +115,7 @@ public class ArrayTest {
    * Get arrayArrayOfModel
    * @return arrayArrayOfModel
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public List<List<ReadOnlyFirst>> getArrayArrayOfModel() {
     return arrayArrayOfModel;
diff --git a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/Capitalization.java b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/Capitalization.java
index 3f05d95d60..36f8853e1c 100644
--- a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/Capitalization.java
+++ b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/Capitalization.java
@@ -62,6 +62,7 @@ public class Capitalization {
    * Get smallCamel
    * @return smallCamel
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getSmallCamel() {
     return smallCamel;
@@ -80,6 +81,7 @@ public class Capitalization {
    * Get capitalCamel
    * @return capitalCamel
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getCapitalCamel() {
     return capitalCamel;
@@ -98,6 +100,7 @@ public class Capitalization {
    * Get smallSnake
    * @return smallSnake
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getSmallSnake() {
     return smallSnake;
@@ -116,6 +119,7 @@ public class Capitalization {
    * Get capitalSnake
    * @return capitalSnake
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getCapitalSnake() {
     return capitalSnake;
@@ -134,6 +138,7 @@ public class Capitalization {
    * Get scAETHFlowPoints
    * @return scAETHFlowPoints
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getScAETHFlowPoints() {
     return scAETHFlowPoints;
@@ -152,6 +157,7 @@ public class Capitalization {
    * Name of the pet 
    * @return ATT_NAME
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "Name of the pet ")
   public String getATTNAME() {
     return ATT_NAME;
diff --git a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/Cat.java b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/Cat.java
index afa7286f29..a8b8feb2ae 100644
--- a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/Cat.java
+++ b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/Cat.java
@@ -44,6 +44,7 @@ public class Cat extends Animal {
    * Get declawed
    * @return declawed
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Boolean isDeclawed() {
     return declawed;
diff --git a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/CatAllOf.java b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/CatAllOf.java
index d6fb1fa1b7..bcff151472 100644
--- a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/CatAllOf.java
+++ b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/CatAllOf.java
@@ -42,6 +42,7 @@ public class CatAllOf {
    * Get declawed
    * @return declawed
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Boolean isDeclawed() {
     return declawed;
diff --git a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/Category.java b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/Category.java
index eb41569576..d4e121847a 100644
--- a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/Category.java
+++ b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/Category.java
@@ -46,6 +46,7 @@ public class Category {
    * Get id
    * @return id
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Long getId() {
     return id;
@@ -64,6 +65,7 @@ public class Category {
    * Get name
    * @return name
   **/
+
   @ApiModelProperty(required = true, value = "")
   public String getName() {
     return name;
diff --git a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/ClassModel.java b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/ClassModel.java
index 91632a4f68..cbdd8f317b 100644
--- a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/ClassModel.java
+++ b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/ClassModel.java
@@ -43,6 +43,7 @@ public class ClassModel {
    * Get propertyClass
    * @return propertyClass
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getPropertyClass() {
     return propertyClass;
diff --git a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/Client.java b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/Client.java
index 3067e8d184..5d9c5c4a71 100644
--- a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/Client.java
+++ b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/Client.java
@@ -42,6 +42,7 @@ public class Client {
    * Get client
    * @return client
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getClient() {
     return client;
diff --git a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/Dog.java b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/Dog.java
index 63ff1ffbec..4da9ba4364 100644
--- a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/Dog.java
+++ b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/Dog.java
@@ -44,6 +44,7 @@ public class Dog extends Animal {
    * Get breed
    * @return breed
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getBreed() {
     return breed;
diff --git a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/DogAllOf.java b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/DogAllOf.java
index 7214ddd07e..e505d1dbc3 100644
--- a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/DogAllOf.java
+++ b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/DogAllOf.java
@@ -42,6 +42,7 @@ public class DogAllOf {
    * Get breed
    * @return breed
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getBreed() {
     return breed;
diff --git a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/EnumArrays.java b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/EnumArrays.java
index bd8d680339..8748c9fa37 100644
--- a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/EnumArrays.java
+++ b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/EnumArrays.java
@@ -142,6 +142,7 @@ public class EnumArrays {
    * Get justSymbol
    * @return justSymbol
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public JustSymbolEnum getJustSymbol() {
     return justSymbol;
@@ -168,6 +169,7 @@ public class EnumArrays {
    * Get arrayEnum
    * @return arrayEnum
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public List<ArrayEnumEnum> getArrayEnum() {
     return arrayEnum;
diff --git a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/EnumTest.java b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/EnumTest.java
index 6c05a8f967..1960c24ac2 100644
--- a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/EnumTest.java
+++ b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/EnumTest.java
@@ -251,6 +251,7 @@ public class EnumTest {
    * Get enumString
    * @return enumString
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public EnumStringEnum getEnumString() {
     return enumString;
@@ -269,6 +270,7 @@ public class EnumTest {
    * Get enumStringRequired
    * @return enumStringRequired
   **/
+
   @ApiModelProperty(required = true, value = "")
   public EnumStringRequiredEnum getEnumStringRequired() {
     return enumStringRequired;
@@ -287,6 +289,7 @@ public class EnumTest {
    * Get enumInteger
    * @return enumInteger
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public EnumIntegerEnum getEnumInteger() {
     return enumInteger;
@@ -305,6 +308,7 @@ public class EnumTest {
    * Get enumNumber
    * @return enumNumber
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public EnumNumberEnum getEnumNumber() {
     return enumNumber;
@@ -323,6 +327,7 @@ public class EnumTest {
    * Get outerEnum
    * @return outerEnum
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public OuterEnum getOuterEnum() {
     return outerEnum;
diff --git a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java
index 8ebc84c044..3c7fcaabdf 100644
--- a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java
+++ b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java
@@ -48,6 +48,7 @@ public class FileSchemaTestClass {
    * Get file
    * @return file
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public java.io.File getFile() {
     return file;
@@ -74,6 +75,7 @@ public class FileSchemaTestClass {
    * Get files
    * @return files
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public List<java.io.File> getFiles() {
     return files;
diff --git a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/FormatTest.java b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/FormatTest.java
index 29058abb17..e7b28a4737 100644
--- a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/FormatTest.java
+++ b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/FormatTest.java
@@ -97,6 +97,7 @@ public class FormatTest {
    * maximum: 100
    * @return integer
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Integer getInteger() {
     return integer;
@@ -117,6 +118,7 @@ public class FormatTest {
    * maximum: 200
    * @return int32
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Integer getInt32() {
     return int32;
@@ -135,6 +137,7 @@ public class FormatTest {
    * Get int64
    * @return int64
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Long getInt64() {
     return int64;
@@ -155,6 +158,7 @@ public class FormatTest {
    * maximum: 543.2
    * @return number
   **/
+
   @ApiModelProperty(required = true, value = "")
   public BigDecimal getNumber() {
     return number;
@@ -175,6 +179,7 @@ public class FormatTest {
    * maximum: 987.6
    * @return _float
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Float getFloat() {
     return _float;
@@ -195,6 +200,7 @@ public class FormatTest {
    * maximum: 123.4
    * @return _double
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Double getDouble() {
     return _double;
@@ -213,6 +219,7 @@ public class FormatTest {
    * Get string
    * @return string
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getString() {
     return string;
@@ -231,6 +238,7 @@ public class FormatTest {
    * Get _byte
    * @return _byte
   **/
+
   @ApiModelProperty(required = true, value = "")
   public byte[] getByte() {
     return _byte;
@@ -249,6 +257,7 @@ public class FormatTest {
    * Get binary
    * @return binary
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public File getBinary() {
     return binary;
@@ -267,6 +276,7 @@ public class FormatTest {
    * Get date
    * @return date
   **/
+
   @ApiModelProperty(required = true, value = "")
   public LocalDate getDate() {
     return date;
@@ -285,6 +295,7 @@ public class FormatTest {
    * Get dateTime
    * @return dateTime
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public OffsetDateTime getDateTime() {
     return dateTime;
@@ -303,6 +314,7 @@ public class FormatTest {
    * Get uuid
    * @return uuid
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(example = "72f98069-206d-4f12-9f12-3d1e525a8e84", value = "")
   public UUID getUuid() {
     return uuid;
@@ -321,6 +333,7 @@ public class FormatTest {
    * Get password
    * @return password
   **/
+
   @ApiModelProperty(required = true, value = "")
   public String getPassword() {
     return password;
diff --git a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java
index bb1394ea1f..72fcaa8993 100644
--- a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java
+++ b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java
@@ -41,6 +41,7 @@ public class HasOnlyReadOnly {
    * Get bar
    * @return bar
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getBar() {
     return bar;
@@ -50,6 +51,7 @@ public class HasOnlyReadOnly {
    * Get foo
    * @return foo
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getFoo() {
     return foo;
diff --git a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/MapTest.java b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/MapTest.java
index cb95334e61..43f0d2e998 100644
--- a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/MapTest.java
+++ b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/MapTest.java
@@ -112,6 +112,7 @@ public class MapTest {
    * Get mapMapOfString
    * @return mapMapOfString
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Map<String, Map<String, String>> getMapMapOfString() {
     return mapMapOfString;
@@ -138,6 +139,7 @@ public class MapTest {
    * Get mapOfEnumString
    * @return mapOfEnumString
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Map<String, InnerEnum> getMapOfEnumString() {
     return mapOfEnumString;
@@ -164,6 +166,7 @@ public class MapTest {
    * Get directMap
    * @return directMap
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Map<String, Boolean> getDirectMap() {
     return directMap;
@@ -190,6 +193,7 @@ public class MapTest {
    * Get indirectMap
    * @return indirectMap
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Map<String, Boolean> getIndirectMap() {
     return indirectMap;
diff --git a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java
index 7417b41271..78d80bd7f0 100644
--- a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java
+++ b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java
@@ -56,6 +56,7 @@ public class MixedPropertiesAndAdditionalPropertiesClass {
    * Get uuid
    * @return uuid
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public UUID getUuid() {
     return uuid;
@@ -74,6 +75,7 @@ public class MixedPropertiesAndAdditionalPropertiesClass {
    * Get dateTime
    * @return dateTime
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public OffsetDateTime getDateTime() {
     return dateTime;
@@ -100,6 +102,7 @@ public class MixedPropertiesAndAdditionalPropertiesClass {
    * Get map
    * @return map
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Map<String, Animal> getMap() {
     return map;
diff --git a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/Model200Response.java b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/Model200Response.java
index 3981e9696a..0c0fc9710d 100644
--- a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/Model200Response.java
+++ b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/Model200Response.java
@@ -47,6 +47,7 @@ public class Model200Response {
    * Get name
    * @return name
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Integer getName() {
     return name;
@@ -65,6 +66,7 @@ public class Model200Response {
    * Get propertyClass
    * @return propertyClass
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getPropertyClass() {
     return propertyClass;
diff --git a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/ModelApiResponse.java b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/ModelApiResponse.java
index 8a0b10b4e2..777b1a8a7c 100644
--- a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/ModelApiResponse.java
+++ b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/ModelApiResponse.java
@@ -50,6 +50,7 @@ public class ModelApiResponse {
    * Get code
    * @return code
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Integer getCode() {
     return code;
@@ -68,6 +69,7 @@ public class ModelApiResponse {
    * Get type
    * @return type
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getType() {
     return type;
@@ -86,6 +88,7 @@ public class ModelApiResponse {
    * Get message
    * @return message
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getMessage() {
     return message;
diff --git a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/ModelReturn.java b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/ModelReturn.java
index f045378132..225df7f4e8 100644
--- a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/ModelReturn.java
+++ b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/ModelReturn.java
@@ -43,6 +43,7 @@ public class ModelReturn {
    * Get _return
    * @return _return
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Integer getReturn() {
     return _return;
diff --git a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/Name.java b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/Name.java
index dab0c2d48f..c5a5691688 100644
--- a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/Name.java
+++ b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/Name.java
@@ -55,6 +55,7 @@ public class Name {
    * Get name
    * @return name
   **/
+
   @ApiModelProperty(required = true, value = "")
   public Integer getName() {
     return name;
@@ -68,6 +69,7 @@ public class Name {
    * Get snakeCase
    * @return snakeCase
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Integer getSnakeCase() {
     return snakeCase;
@@ -82,6 +84,7 @@ public class Name {
    * Get property
    * @return property
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getProperty() {
     return property;
@@ -95,6 +98,7 @@ public class Name {
    * Get _123number
    * @return _123number
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Integer get123number() {
     return _123number;
diff --git a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/NumberOnly.java b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/NumberOnly.java
index 17cb112586..00ffd2f67e 100644
--- a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/NumberOnly.java
+++ b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/NumberOnly.java
@@ -43,6 +43,7 @@ public class NumberOnly {
    * Get justNumber
    * @return justNumber
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public BigDecimal getJustNumber() {
     return justNumber;
diff --git a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/Order.java b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/Order.java
index 512d11e6d2..75a8568707 100644
--- a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/Order.java
+++ b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/Order.java
@@ -112,6 +112,7 @@ public class Order {
    * Get id
    * @return id
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Long getId() {
     return id;
@@ -130,6 +131,7 @@ public class Order {
    * Get petId
    * @return petId
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Long getPetId() {
     return petId;
@@ -148,6 +150,7 @@ public class Order {
    * Get quantity
    * @return quantity
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Integer getQuantity() {
     return quantity;
@@ -166,6 +169,7 @@ public class Order {
    * Get shipDate
    * @return shipDate
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public OffsetDateTime getShipDate() {
     return shipDate;
@@ -184,6 +188,7 @@ public class Order {
    * Order Status
    * @return status
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "Order Status")
   public StatusEnum getStatus() {
     return status;
@@ -202,6 +207,7 @@ public class Order {
    * Get complete
    * @return complete
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Boolean isComplete() {
     return complete;
diff --git a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/OuterComposite.java b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/OuterComposite.java
index 1a39366bea..0c3317899b 100644
--- a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/OuterComposite.java
+++ b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/OuterComposite.java
@@ -51,6 +51,7 @@ public class OuterComposite {
    * Get myNumber
    * @return myNumber
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public BigDecimal getMyNumber() {
     return myNumber;
@@ -69,6 +70,7 @@ public class OuterComposite {
    * Get myString
    * @return myString
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getMyString() {
     return myString;
@@ -87,6 +89,7 @@ public class OuterComposite {
    * Get myBoolean
    * @return myBoolean
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Boolean isMyBoolean() {
     return myBoolean;
diff --git a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/Pet.java b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/Pet.java
index a95a0c9dd0..5ac8165f7f 100644
--- a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/Pet.java
+++ b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/Pet.java
@@ -115,6 +115,7 @@ public class Pet {
    * Get id
    * @return id
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Long getId() {
     return id;
@@ -133,6 +134,7 @@ public class Pet {
    * Get category
    * @return category
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Category getCategory() {
     return category;
@@ -151,6 +153,7 @@ public class Pet {
    * Get name
    * @return name
   **/
+
   @ApiModelProperty(example = "doggie", required = true, value = "")
   public String getName() {
     return name;
@@ -174,6 +177,7 @@ public class Pet {
    * Get photoUrls
    * @return photoUrls
   **/
+
   @ApiModelProperty(required = true, value = "")
   public List<String> getPhotoUrls() {
     return photoUrls;
@@ -200,6 +204,7 @@ public class Pet {
    * Get tags
    * @return tags
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public List<Tag> getTags() {
     return tags;
@@ -218,6 +223,7 @@ public class Pet {
    * pet status in the store
    * @return status
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "pet status in the store")
   public StatusEnum getStatus() {
     return status;
diff --git a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/ReadOnlyFirst.java b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/ReadOnlyFirst.java
index 2872f78893..23ec5576c0 100644
--- a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/ReadOnlyFirst.java
+++ b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/ReadOnlyFirst.java
@@ -41,6 +41,7 @@ public class ReadOnlyFirst {
    * Get bar
    * @return bar
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getBar() {
     return bar;
@@ -55,6 +56,7 @@ public class ReadOnlyFirst {
    * Get baz
    * @return baz
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getBaz() {
     return baz;
diff --git a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/SpecialModelName.java b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/SpecialModelName.java
index 8fab5e0b27..f4a7d343a7 100644
--- a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/SpecialModelName.java
+++ b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/SpecialModelName.java
@@ -42,6 +42,7 @@ public class SpecialModelName {
    * Get $specialPropertyName
    * @return $specialPropertyName
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Long get$SpecialPropertyName() {
     return $specialPropertyName;
diff --git a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/Tag.java b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/Tag.java
index ab153ca672..bce1fc934d 100644
--- a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/Tag.java
+++ b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/Tag.java
@@ -46,6 +46,7 @@ public class Tag {
    * Get id
    * @return id
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Long getId() {
     return id;
@@ -64,6 +65,7 @@ public class Tag {
    * Get name
    * @return name
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getName() {
     return name;
diff --git a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/TypeHolderDefault.java b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/TypeHolderDefault.java
index 13d9a5ad67..e302fc33c0 100644
--- a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/TypeHolderDefault.java
+++ b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/TypeHolderDefault.java
@@ -61,6 +61,7 @@ public class TypeHolderDefault {
    * Get stringItem
    * @return stringItem
   **/
+
   @ApiModelProperty(required = true, value = "")
   public String getStringItem() {
     return stringItem;
@@ -79,6 +80,7 @@ public class TypeHolderDefault {
    * Get numberItem
    * @return numberItem
   **/
+
   @ApiModelProperty(required = true, value = "")
   public BigDecimal getNumberItem() {
     return numberItem;
@@ -97,6 +99,7 @@ public class TypeHolderDefault {
    * Get integerItem
    * @return integerItem
   **/
+
   @ApiModelProperty(required = true, value = "")
   public Integer getIntegerItem() {
     return integerItem;
@@ -115,6 +118,7 @@ public class TypeHolderDefault {
    * Get boolItem
    * @return boolItem
   **/
+
   @ApiModelProperty(required = true, value = "")
   public Boolean isBoolItem() {
     return boolItem;
@@ -138,6 +142,7 @@ public class TypeHolderDefault {
    * Get arrayItem
    * @return arrayItem
   **/
+
   @ApiModelProperty(required = true, value = "")
   public List<Integer> getArrayItem() {
     return arrayItem;
diff --git a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/TypeHolderExample.java b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/TypeHolderExample.java
index adf66b7c65..26d4b5c120 100644
--- a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/TypeHolderExample.java
+++ b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/TypeHolderExample.java
@@ -61,6 +61,7 @@ public class TypeHolderExample {
    * Get stringItem
    * @return stringItem
   **/
+
   @ApiModelProperty(example = "what", required = true, value = "")
   public String getStringItem() {
     return stringItem;
@@ -79,6 +80,7 @@ public class TypeHolderExample {
    * Get numberItem
    * @return numberItem
   **/
+
   @ApiModelProperty(example = "1.234", required = true, value = "")
   public BigDecimal getNumberItem() {
     return numberItem;
@@ -97,6 +99,7 @@ public class TypeHolderExample {
    * Get integerItem
    * @return integerItem
   **/
+
   @ApiModelProperty(example = "-2", required = true, value = "")
   public Integer getIntegerItem() {
     return integerItem;
@@ -115,6 +118,7 @@ public class TypeHolderExample {
    * Get boolItem
    * @return boolItem
   **/
+
   @ApiModelProperty(example = "true", required = true, value = "")
   public Boolean isBoolItem() {
     return boolItem;
@@ -138,6 +142,7 @@ public class TypeHolderExample {
    * Get arrayItem
    * @return arrayItem
   **/
+
   @ApiModelProperty(example = "[0, 1, 2, 3]", required = true, value = "")
   public List<Integer> getArrayItem() {
     return arrayItem;
diff --git a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/User.java b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/User.java
index 74b9a66a24..3f9eb4bb8a 100644
--- a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/User.java
+++ b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/User.java
@@ -70,6 +70,7 @@ public class User {
    * Get id
    * @return id
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Long getId() {
     return id;
@@ -88,6 +89,7 @@ public class User {
    * Get username
    * @return username
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getUsername() {
     return username;
@@ -106,6 +108,7 @@ public class User {
    * Get firstName
    * @return firstName
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getFirstName() {
     return firstName;
@@ -124,6 +127,7 @@ public class User {
    * Get lastName
    * @return lastName
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getLastName() {
     return lastName;
@@ -142,6 +146,7 @@ public class User {
    * Get email
    * @return email
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getEmail() {
     return email;
@@ -160,6 +165,7 @@ public class User {
    * Get password
    * @return password
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getPassword() {
     return password;
@@ -178,6 +184,7 @@ public class User {
    * Get phone
    * @return phone
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getPhone() {
     return phone;
@@ -196,6 +203,7 @@ public class User {
    * User Status
    * @return userStatus
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "User Status")
   public Integer getUserStatus() {
     return userStatus;
diff --git a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/XmlItem.java b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/XmlItem.java
index 5125780e94..bbd0fce821 100644
--- a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/XmlItem.java
+++ b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/XmlItem.java
@@ -157,6 +157,7 @@ public class XmlItem {
    * Get attributeString
    * @return attributeString
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(example = "string", value = "")
   public String getAttributeString() {
     return attributeString;
@@ -175,6 +176,7 @@ public class XmlItem {
    * Get attributeNumber
    * @return attributeNumber
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(example = "1.234", value = "")
   public BigDecimal getAttributeNumber() {
     return attributeNumber;
@@ -193,6 +195,7 @@ public class XmlItem {
    * Get attributeInteger
    * @return attributeInteger
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(example = "-2", value = "")
   public Integer getAttributeInteger() {
     return attributeInteger;
@@ -211,6 +214,7 @@ public class XmlItem {
    * Get attributeBoolean
    * @return attributeBoolean
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(example = "true", value = "")
   public Boolean isAttributeBoolean() {
     return attributeBoolean;
@@ -237,6 +241,7 @@ public class XmlItem {
    * Get wrappedArray
    * @return wrappedArray
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public List<Integer> getWrappedArray() {
     return wrappedArray;
@@ -255,6 +260,7 @@ public class XmlItem {
    * Get nameString
    * @return nameString
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(example = "string", value = "")
   public String getNameString() {
     return nameString;
@@ -273,6 +279,7 @@ public class XmlItem {
    * Get nameNumber
    * @return nameNumber
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(example = "1.234", value = "")
   public BigDecimal getNameNumber() {
     return nameNumber;
@@ -291,6 +298,7 @@ public class XmlItem {
    * Get nameInteger
    * @return nameInteger
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(example = "-2", value = "")
   public Integer getNameInteger() {
     return nameInteger;
@@ -309,6 +317,7 @@ public class XmlItem {
    * Get nameBoolean
    * @return nameBoolean
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(example = "true", value = "")
   public Boolean isNameBoolean() {
     return nameBoolean;
@@ -335,6 +344,7 @@ public class XmlItem {
    * Get nameArray
    * @return nameArray
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public List<Integer> getNameArray() {
     return nameArray;
@@ -361,6 +371,7 @@ public class XmlItem {
    * Get nameWrappedArray
    * @return nameWrappedArray
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public List<Integer> getNameWrappedArray() {
     return nameWrappedArray;
@@ -379,6 +390,7 @@ public class XmlItem {
    * Get prefixString
    * @return prefixString
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(example = "string", value = "")
   public String getPrefixString() {
     return prefixString;
@@ -397,6 +409,7 @@ public class XmlItem {
    * Get prefixNumber
    * @return prefixNumber
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(example = "1.234", value = "")
   public BigDecimal getPrefixNumber() {
     return prefixNumber;
@@ -415,6 +428,7 @@ public class XmlItem {
    * Get prefixInteger
    * @return prefixInteger
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(example = "-2", value = "")
   public Integer getPrefixInteger() {
     return prefixInteger;
@@ -433,6 +447,7 @@ public class XmlItem {
    * Get prefixBoolean
    * @return prefixBoolean
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(example = "true", value = "")
   public Boolean isPrefixBoolean() {
     return prefixBoolean;
@@ -459,6 +474,7 @@ public class XmlItem {
    * Get prefixArray
    * @return prefixArray
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public List<Integer> getPrefixArray() {
     return prefixArray;
@@ -485,6 +501,7 @@ public class XmlItem {
    * Get prefixWrappedArray
    * @return prefixWrappedArray
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public List<Integer> getPrefixWrappedArray() {
     return prefixWrappedArray;
@@ -503,6 +520,7 @@ public class XmlItem {
    * Get namespaceString
    * @return namespaceString
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(example = "string", value = "")
   public String getNamespaceString() {
     return namespaceString;
@@ -521,6 +539,7 @@ public class XmlItem {
    * Get namespaceNumber
    * @return namespaceNumber
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(example = "1.234", value = "")
   public BigDecimal getNamespaceNumber() {
     return namespaceNumber;
@@ -539,6 +558,7 @@ public class XmlItem {
    * Get namespaceInteger
    * @return namespaceInteger
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(example = "-2", value = "")
   public Integer getNamespaceInteger() {
     return namespaceInteger;
@@ -557,6 +577,7 @@ public class XmlItem {
    * Get namespaceBoolean
    * @return namespaceBoolean
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(example = "true", value = "")
   public Boolean isNamespaceBoolean() {
     return namespaceBoolean;
@@ -583,6 +604,7 @@ public class XmlItem {
    * Get namespaceArray
    * @return namespaceArray
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public List<Integer> getNamespaceArray() {
     return namespaceArray;
@@ -609,6 +631,7 @@ public class XmlItem {
    * Get namespaceWrappedArray
    * @return namespaceWrappedArray
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public List<Integer> getNamespaceWrappedArray() {
     return namespaceWrappedArray;
@@ -627,6 +650,7 @@ public class XmlItem {
    * Get prefixNsString
    * @return prefixNsString
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(example = "string", value = "")
   public String getPrefixNsString() {
     return prefixNsString;
@@ -645,6 +669,7 @@ public class XmlItem {
    * Get prefixNsNumber
    * @return prefixNsNumber
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(example = "1.234", value = "")
   public BigDecimal getPrefixNsNumber() {
     return prefixNsNumber;
@@ -663,6 +688,7 @@ public class XmlItem {
    * Get prefixNsInteger
    * @return prefixNsInteger
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(example = "-2", value = "")
   public Integer getPrefixNsInteger() {
     return prefixNsInteger;
@@ -681,6 +707,7 @@ public class XmlItem {
    * Get prefixNsBoolean
    * @return prefixNsBoolean
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(example = "true", value = "")
   public Boolean isPrefixNsBoolean() {
     return prefixNsBoolean;
@@ -707,6 +734,7 @@ public class XmlItem {
    * Get prefixNsArray
    * @return prefixNsArray
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public List<Integer> getPrefixNsArray() {
     return prefixNsArray;
@@ -733,6 +761,7 @@ public class XmlItem {
    * Get prefixNsWrappedArray
    * @return prefixNsWrappedArray
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public List<Integer> getPrefixNsWrappedArray() {
     return prefixNsWrappedArray;
diff --git a/samples/client/petstore/java/resteasy/build.gradle b/samples/client/petstore/java/resteasy/build.gradle
index 05c630abf5..eddbfd1e84 100644
--- a/samples/client/petstore/java/resteasy/build.gradle
+++ b/samples/client/petstore/java/resteasy/build.gradle
@@ -105,6 +105,7 @@ ext {
 
 dependencies {
     compile "io.swagger:swagger-annotations:$swagger_annotations_version"
+    compile "com.google.code.findbugs:jsr305:3.0.2"
     compile "org.jboss.resteasy:resteasy-client:$resteasy_version"
     compile "org.jboss.resteasy:resteasy-multipart-provider:$resteasy_version"
     compile "org.jboss.resteasy:resteasy-jackson2-provider:$resteasy_version"
diff --git a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/AdditionalPropertiesAnyType.java b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/AdditionalPropertiesAnyType.java
index d223a661f8..1abb2d8a64 100644
--- a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/AdditionalPropertiesAnyType.java
+++ b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/AdditionalPropertiesAnyType.java
@@ -40,6 +40,7 @@ public class AdditionalPropertiesAnyType extends HashMap<String, Object> {
    * Get name
    * @return name
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getName() {
     return name;
diff --git a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/AdditionalPropertiesArray.java b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/AdditionalPropertiesArray.java
index db738129d0..1821c243e1 100644
--- a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/AdditionalPropertiesArray.java
+++ b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/AdditionalPropertiesArray.java
@@ -41,6 +41,7 @@ public class AdditionalPropertiesArray extends HashMap<String, List> {
    * Get name
    * @return name
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getName() {
     return name;
diff --git a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/AdditionalPropertiesBoolean.java b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/AdditionalPropertiesBoolean.java
index 754ff32555..78f7ac79b2 100644
--- a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/AdditionalPropertiesBoolean.java
+++ b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/AdditionalPropertiesBoolean.java
@@ -40,6 +40,7 @@ public class AdditionalPropertiesBoolean extends HashMap<String, Boolean> {
    * Get name
    * @return name
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getName() {
     return name;
diff --git a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java
index 2de7a27185..406bccc278 100644
--- a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java
+++ b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java
@@ -80,6 +80,7 @@ public class AdditionalPropertiesClass {
    * Get mapString
    * @return mapString
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Map<String, String> getMapString() {
     return mapString;
@@ -106,6 +107,7 @@ public class AdditionalPropertiesClass {
    * Get mapNumber
    * @return mapNumber
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Map<String, BigDecimal> getMapNumber() {
     return mapNumber;
@@ -132,6 +134,7 @@ public class AdditionalPropertiesClass {
    * Get mapInteger
    * @return mapInteger
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Map<String, Integer> getMapInteger() {
     return mapInteger;
@@ -158,6 +161,7 @@ public class AdditionalPropertiesClass {
    * Get mapBoolean
    * @return mapBoolean
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Map<String, Boolean> getMapBoolean() {
     return mapBoolean;
@@ -184,6 +188,7 @@ public class AdditionalPropertiesClass {
    * Get mapArrayInteger
    * @return mapArrayInteger
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Map<String, List<Integer>> getMapArrayInteger() {
     return mapArrayInteger;
@@ -210,6 +215,7 @@ public class AdditionalPropertiesClass {
    * Get mapArrayAnytype
    * @return mapArrayAnytype
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Map<String, List<Object>> getMapArrayAnytype() {
     return mapArrayAnytype;
@@ -236,6 +242,7 @@ public class AdditionalPropertiesClass {
    * Get mapMapString
    * @return mapMapString
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Map<String, Map<String, String>> getMapMapString() {
     return mapMapString;
@@ -262,6 +269,7 @@ public class AdditionalPropertiesClass {
    * Get mapMapAnytype
    * @return mapMapAnytype
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Map<String, Map<String, Object>> getMapMapAnytype() {
     return mapMapAnytype;
@@ -280,6 +288,7 @@ public class AdditionalPropertiesClass {
    * Get anytype1
    * @return anytype1
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Object getAnytype1() {
     return anytype1;
@@ -298,6 +307,7 @@ public class AdditionalPropertiesClass {
    * Get anytype2
    * @return anytype2
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Object getAnytype2() {
     return anytype2;
@@ -316,6 +326,7 @@ public class AdditionalPropertiesClass {
    * Get anytype3
    * @return anytype3
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Object getAnytype3() {
     return anytype3;
diff --git a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/AdditionalPropertiesInteger.java b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/AdditionalPropertiesInteger.java
index 1f61976466..6e5159d404 100644
--- a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/AdditionalPropertiesInteger.java
+++ b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/AdditionalPropertiesInteger.java
@@ -40,6 +40,7 @@ public class AdditionalPropertiesInteger extends HashMap<String, Integer> {
    * Get name
    * @return name
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getName() {
     return name;
diff --git a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/AdditionalPropertiesNumber.java b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/AdditionalPropertiesNumber.java
index 474d7b8f04..ddc8146dea 100644
--- a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/AdditionalPropertiesNumber.java
+++ b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/AdditionalPropertiesNumber.java
@@ -41,6 +41,7 @@ public class AdditionalPropertiesNumber extends HashMap<String, BigDecimal> {
    * Get name
    * @return name
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getName() {
     return name;
diff --git a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/AdditionalPropertiesObject.java b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/AdditionalPropertiesObject.java
index 40ff424fe4..cc29400029 100644
--- a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/AdditionalPropertiesObject.java
+++ b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/AdditionalPropertiesObject.java
@@ -40,6 +40,7 @@ public class AdditionalPropertiesObject extends HashMap<String, Map> {
    * Get name
    * @return name
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getName() {
     return name;
diff --git a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/AdditionalPropertiesString.java b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/AdditionalPropertiesString.java
index eeaedf3bda..fb3368dfed 100644
--- a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/AdditionalPropertiesString.java
+++ b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/AdditionalPropertiesString.java
@@ -40,6 +40,7 @@ public class AdditionalPropertiesString extends HashMap<String, String> {
    * Get name
    * @return name
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getName() {
     return name;
diff --git a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/Animal.java b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/Animal.java
index f210737e12..53a0eec339 100644
--- a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/Animal.java
+++ b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/Animal.java
@@ -49,6 +49,7 @@ public class Animal {
    * Get className
    * @return className
   **/
+
   @ApiModelProperty(required = true, value = "")
   public String getClassName() {
     return className;
@@ -67,6 +68,7 @@ public class Animal {
    * Get color
    * @return color
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getColor() {
     return color;
diff --git a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java
index f5c02b2326..de49df3fbd 100644
--- a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java
+++ b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java
@@ -49,6 +49,7 @@ public class ArrayOfArrayOfNumberOnly {
    * Get arrayArrayNumber
    * @return arrayArrayNumber
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public List<List<BigDecimal>> getArrayArrayNumber() {
     return arrayArrayNumber;
diff --git a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java
index 2dcfdf3c78..f4399ff42d 100644
--- a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java
+++ b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java
@@ -49,6 +49,7 @@ public class ArrayOfNumberOnly {
    * Get arrayNumber
    * @return arrayNumber
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public List<BigDecimal> getArrayNumber() {
     return arrayNumber;
diff --git a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/ArrayTest.java b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/ArrayTest.java
index 0778fc2d8f..7483fa96ce 100644
--- a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/ArrayTest.java
+++ b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/ArrayTest.java
@@ -55,6 +55,7 @@ public class ArrayTest {
    * Get arrayOfString
    * @return arrayOfString
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public List<String> getArrayOfString() {
     return arrayOfString;
@@ -81,6 +82,7 @@ public class ArrayTest {
    * Get arrayArrayOfInteger
    * @return arrayArrayOfInteger
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public List<List<Long>> getArrayArrayOfInteger() {
     return arrayArrayOfInteger;
@@ -107,6 +109,7 @@ public class ArrayTest {
    * Get arrayArrayOfModel
    * @return arrayArrayOfModel
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public List<List<ReadOnlyFirst>> getArrayArrayOfModel() {
     return arrayArrayOfModel;
diff --git a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/Capitalization.java b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/Capitalization.java
index cedbd8c9db..bb83be97fe 100644
--- a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/Capitalization.java
+++ b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/Capitalization.java
@@ -53,6 +53,7 @@ public class Capitalization {
    * Get smallCamel
    * @return smallCamel
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getSmallCamel() {
     return smallCamel;
@@ -71,6 +72,7 @@ public class Capitalization {
    * Get capitalCamel
    * @return capitalCamel
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getCapitalCamel() {
     return capitalCamel;
@@ -89,6 +91,7 @@ public class Capitalization {
    * Get smallSnake
    * @return smallSnake
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getSmallSnake() {
     return smallSnake;
@@ -107,6 +110,7 @@ public class Capitalization {
    * Get capitalSnake
    * @return capitalSnake
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getCapitalSnake() {
     return capitalSnake;
@@ -125,6 +129,7 @@ public class Capitalization {
    * Get scAETHFlowPoints
    * @return scAETHFlowPoints
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getScAETHFlowPoints() {
     return scAETHFlowPoints;
@@ -143,6 +148,7 @@ public class Capitalization {
    * Name of the pet 
    * @return ATT_NAME
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "Name of the pet ")
   public String getATTNAME() {
     return ATT_NAME;
diff --git a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/Cat.java b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/Cat.java
index 40f40f869e..ce456c8647 100644
--- a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/Cat.java
+++ b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/Cat.java
@@ -40,6 +40,7 @@ public class Cat extends Animal {
    * Get declawed
    * @return declawed
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Boolean getDeclawed() {
     return declawed;
diff --git a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/CatAllOf.java b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/CatAllOf.java
index 0e8a7f8fa9..224c08671c 100644
--- a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/CatAllOf.java
+++ b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/CatAllOf.java
@@ -38,6 +38,7 @@ public class CatAllOf {
    * Get declawed
    * @return declawed
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Boolean getDeclawed() {
     return declawed;
diff --git a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/Category.java b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/Category.java
index baf44c948a..03efdd4be8 100644
--- a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/Category.java
+++ b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/Category.java
@@ -41,6 +41,7 @@ public class Category {
    * Get id
    * @return id
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Long getId() {
     return id;
@@ -59,6 +60,7 @@ public class Category {
    * Get name
    * @return name
   **/
+
   @ApiModelProperty(required = true, value = "")
   public String getName() {
     return name;
diff --git a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/ClassModel.java b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/ClassModel.java
index 0904f531de..def421a670 100644
--- a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/ClassModel.java
+++ b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/ClassModel.java
@@ -39,6 +39,7 @@ public class ClassModel {
    * Get propertyClass
    * @return propertyClass
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getPropertyClass() {
     return propertyClass;
diff --git a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/Client.java b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/Client.java
index 9ebcc7294e..c0bd0743e5 100644
--- a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/Client.java
+++ b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/Client.java
@@ -38,6 +38,7 @@ public class Client {
    * Get client
    * @return client
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getClient() {
     return client;
diff --git a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/Dog.java b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/Dog.java
index 3b1c570cb4..6b79c59606 100644
--- a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/Dog.java
+++ b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/Dog.java
@@ -40,6 +40,7 @@ public class Dog extends Animal {
    * Get breed
    * @return breed
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getBreed() {
     return breed;
diff --git a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/DogAllOf.java b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/DogAllOf.java
index cb95a6a372..1a4496d8f0 100644
--- a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/DogAllOf.java
+++ b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/DogAllOf.java
@@ -38,6 +38,7 @@ public class DogAllOf {
    * Get breed
    * @return breed
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getBreed() {
     return breed;
diff --git a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/EnumArrays.java b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/EnumArrays.java
index cb8d45860a..40e31bf3ca 100644
--- a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/EnumArrays.java
+++ b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/EnumArrays.java
@@ -113,6 +113,7 @@ public class EnumArrays {
    * Get justSymbol
    * @return justSymbol
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public JustSymbolEnum getJustSymbol() {
     return justSymbol;
@@ -139,6 +140,7 @@ public class EnumArrays {
    * Get arrayEnum
    * @return arrayEnum
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public List<ArrayEnumEnum> getArrayEnum() {
     return arrayEnum;
diff --git a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/EnumTest.java b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/EnumTest.java
index bdf61d52c9..d4b36798ee 100644
--- a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/EnumTest.java
+++ b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/EnumTest.java
@@ -195,6 +195,7 @@ public class EnumTest {
    * Get enumString
    * @return enumString
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public EnumStringEnum getEnumString() {
     return enumString;
@@ -213,6 +214,7 @@ public class EnumTest {
    * Get enumStringRequired
    * @return enumStringRequired
   **/
+
   @ApiModelProperty(required = true, value = "")
   public EnumStringRequiredEnum getEnumStringRequired() {
     return enumStringRequired;
@@ -231,6 +233,7 @@ public class EnumTest {
    * Get enumInteger
    * @return enumInteger
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public EnumIntegerEnum getEnumInteger() {
     return enumInteger;
@@ -249,6 +252,7 @@ public class EnumTest {
    * Get enumNumber
    * @return enumNumber
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public EnumNumberEnum getEnumNumber() {
     return enumNumber;
@@ -267,6 +271,7 @@ public class EnumTest {
    * Get outerEnum
    * @return outerEnum
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public OuterEnum getOuterEnum() {
     return outerEnum;
diff --git a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java
index 326b1a90a3..bee77a8cec 100644
--- a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java
+++ b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java
@@ -43,6 +43,7 @@ public class FileSchemaTestClass {
    * Get file
    * @return file
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public java.io.File getFile() {
     return file;
@@ -69,6 +70,7 @@ public class FileSchemaTestClass {
    * Get files
    * @return files
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public List<java.io.File> getFiles() {
     return files;
diff --git a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/FormatTest.java b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/FormatTest.java
index dd1c2d2f58..c017f57a80 100644
--- a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/FormatTest.java
+++ b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/FormatTest.java
@@ -81,6 +81,7 @@ public class FormatTest {
    * maximum: 100
    * @return integer
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Integer getInteger() {
     return integer;
@@ -101,6 +102,7 @@ public class FormatTest {
    * maximum: 200
    * @return int32
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Integer getInt32() {
     return int32;
@@ -119,6 +121,7 @@ public class FormatTest {
    * Get int64
    * @return int64
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Long getInt64() {
     return int64;
@@ -139,6 +142,7 @@ public class FormatTest {
    * maximum: 543.2
    * @return number
   **/
+
   @ApiModelProperty(required = true, value = "")
   public BigDecimal getNumber() {
     return number;
@@ -159,6 +163,7 @@ public class FormatTest {
    * maximum: 987.6
    * @return _float
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Float getFloat() {
     return _float;
@@ -179,6 +184,7 @@ public class FormatTest {
    * maximum: 123.4
    * @return _double
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Double getDouble() {
     return _double;
@@ -197,6 +203,7 @@ public class FormatTest {
    * Get string
    * @return string
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getString() {
     return string;
@@ -215,6 +222,7 @@ public class FormatTest {
    * Get _byte
    * @return _byte
   **/
+
   @ApiModelProperty(required = true, value = "")
   public byte[] getByte() {
     return _byte;
@@ -233,6 +241,7 @@ public class FormatTest {
    * Get binary
    * @return binary
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public File getBinary() {
     return binary;
@@ -251,6 +260,7 @@ public class FormatTest {
    * Get date
    * @return date
   **/
+
   @ApiModelProperty(required = true, value = "")
   public LocalDate getDate() {
     return date;
@@ -269,6 +279,7 @@ public class FormatTest {
    * Get dateTime
    * @return dateTime
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public OffsetDateTime getDateTime() {
     return dateTime;
@@ -287,6 +298,7 @@ public class FormatTest {
    * Get uuid
    * @return uuid
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(example = "72f98069-206d-4f12-9f12-3d1e525a8e84", value = "")
   public UUID getUuid() {
     return uuid;
@@ -305,6 +317,7 @@ public class FormatTest {
    * Get password
    * @return password
   **/
+
   @ApiModelProperty(required = true, value = "")
   public String getPassword() {
     return password;
diff --git a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java
index 4dbede6b7d..44159e08e8 100644
--- a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java
+++ b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java
@@ -36,6 +36,7 @@ public class HasOnlyReadOnly {
    * Get bar
    * @return bar
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getBar() {
     return bar;
@@ -45,6 +46,7 @@ public class HasOnlyReadOnly {
    * Get foo
    * @return foo
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getFoo() {
     return foo;
diff --git a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/MapTest.java b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/MapTest.java
index 625b6be97d..a7a141bb9b 100644
--- a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/MapTest.java
+++ b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/MapTest.java
@@ -93,6 +93,7 @@ public class MapTest {
    * Get mapMapOfString
    * @return mapMapOfString
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Map<String, Map<String, String>> getMapMapOfString() {
     return mapMapOfString;
@@ -119,6 +120,7 @@ public class MapTest {
    * Get mapOfEnumString
    * @return mapOfEnumString
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Map<String, InnerEnum> getMapOfEnumString() {
     return mapOfEnumString;
@@ -145,6 +147,7 @@ public class MapTest {
    * Get directMap
    * @return directMap
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Map<String, Boolean> getDirectMap() {
     return directMap;
@@ -171,6 +174,7 @@ public class MapTest {
    * Get indirectMap
    * @return indirectMap
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Map<String, Boolean> getIndirectMap() {
     return indirectMap;
diff --git a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java
index 0adbe0caa7..ea930e3e2e 100644
--- a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java
+++ b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java
@@ -50,6 +50,7 @@ public class MixedPropertiesAndAdditionalPropertiesClass {
    * Get uuid
    * @return uuid
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public UUID getUuid() {
     return uuid;
@@ -68,6 +69,7 @@ public class MixedPropertiesAndAdditionalPropertiesClass {
    * Get dateTime
    * @return dateTime
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public OffsetDateTime getDateTime() {
     return dateTime;
@@ -94,6 +96,7 @@ public class MixedPropertiesAndAdditionalPropertiesClass {
    * Get map
    * @return map
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Map<String, Animal> getMap() {
     return map;
diff --git a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/Model200Response.java b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/Model200Response.java
index 3be60ea3ae..bd3244dd57 100644
--- a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/Model200Response.java
+++ b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/Model200Response.java
@@ -42,6 +42,7 @@ public class Model200Response {
    * Get name
    * @return name
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Integer getName() {
     return name;
@@ -60,6 +61,7 @@ public class Model200Response {
    * Get propertyClass
    * @return propertyClass
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getPropertyClass() {
     return propertyClass;
diff --git a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/ModelApiResponse.java b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/ModelApiResponse.java
index 6e458e38dc..ed335cdca1 100644
--- a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/ModelApiResponse.java
+++ b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/ModelApiResponse.java
@@ -44,6 +44,7 @@ public class ModelApiResponse {
    * Get code
    * @return code
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Integer getCode() {
     return code;
@@ -62,6 +63,7 @@ public class ModelApiResponse {
    * Get type
    * @return type
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getType() {
     return type;
@@ -80,6 +82,7 @@ public class ModelApiResponse {
    * Get message
    * @return message
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getMessage() {
     return message;
diff --git a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/ModelReturn.java b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/ModelReturn.java
index 62e5295212..04c0bcd33f 100644
--- a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/ModelReturn.java
+++ b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/ModelReturn.java
@@ -39,6 +39,7 @@ public class ModelReturn {
    * Get _return
    * @return _return
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Integer getReturn() {
     return _return;
diff --git a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/Name.java b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/Name.java
index 852a999035..af27c6e45f 100644
--- a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/Name.java
+++ b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/Name.java
@@ -48,6 +48,7 @@ public class Name {
    * Get name
    * @return name
   **/
+
   @ApiModelProperty(required = true, value = "")
   public Integer getName() {
     return name;
@@ -61,6 +62,7 @@ public class Name {
    * Get snakeCase
    * @return snakeCase
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Integer getSnakeCase() {
     return snakeCase;
@@ -75,6 +77,7 @@ public class Name {
    * Get property
    * @return property
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getProperty() {
     return property;
@@ -88,6 +91,7 @@ public class Name {
    * Get _123number
    * @return _123number
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Integer get123number() {
     return _123number;
diff --git a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/NumberOnly.java b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/NumberOnly.java
index 530a4d5818..4e29c814cc 100644
--- a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/NumberOnly.java
+++ b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/NumberOnly.java
@@ -39,6 +39,7 @@ public class NumberOnly {
    * Get justNumber
    * @return justNumber
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public BigDecimal getJustNumber() {
     return justNumber;
diff --git a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/Order.java b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/Order.java
index c6cee16a58..9e935d606e 100644
--- a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/Order.java
+++ b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/Order.java
@@ -91,6 +91,7 @@ public class Order {
    * Get id
    * @return id
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Long getId() {
     return id;
@@ -109,6 +110,7 @@ public class Order {
    * Get petId
    * @return petId
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Long getPetId() {
     return petId;
@@ -127,6 +129,7 @@ public class Order {
    * Get quantity
    * @return quantity
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Integer getQuantity() {
     return quantity;
@@ -145,6 +148,7 @@ public class Order {
    * Get shipDate
    * @return shipDate
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public OffsetDateTime getShipDate() {
     return shipDate;
@@ -163,6 +167,7 @@ public class Order {
    * Order Status
    * @return status
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "Order Status")
   public StatusEnum getStatus() {
     return status;
@@ -181,6 +186,7 @@ public class Order {
    * Get complete
    * @return complete
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Boolean getComplete() {
     return complete;
diff --git a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/OuterComposite.java b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/OuterComposite.java
index 6e71242384..f6515126a8 100644
--- a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/OuterComposite.java
+++ b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/OuterComposite.java
@@ -45,6 +45,7 @@ public class OuterComposite {
    * Get myNumber
    * @return myNumber
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public BigDecimal getMyNumber() {
     return myNumber;
@@ -63,6 +64,7 @@ public class OuterComposite {
    * Get myString
    * @return myString
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getMyString() {
     return myString;
@@ -81,6 +83,7 @@ public class OuterComposite {
    * Get myBoolean
    * @return myBoolean
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Boolean getMyBoolean() {
     return myBoolean;
diff --git a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/Pet.java b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/Pet.java
index 8a2408a296..63e9b4ff5d 100644
--- a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/Pet.java
+++ b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/Pet.java
@@ -94,6 +94,7 @@ public class Pet {
    * Get id
    * @return id
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Long getId() {
     return id;
@@ -112,6 +113,7 @@ public class Pet {
    * Get category
    * @return category
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Category getCategory() {
     return category;
@@ -130,6 +132,7 @@ public class Pet {
    * Get name
    * @return name
   **/
+
   @ApiModelProperty(example = "doggie", required = true, value = "")
   public String getName() {
     return name;
@@ -153,6 +156,7 @@ public class Pet {
    * Get photoUrls
    * @return photoUrls
   **/
+
   @ApiModelProperty(required = true, value = "")
   public List<String> getPhotoUrls() {
     return photoUrls;
@@ -179,6 +183,7 @@ public class Pet {
    * Get tags
    * @return tags
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public List<Tag> getTags() {
     return tags;
@@ -197,6 +202,7 @@ public class Pet {
    * pet status in the store
    * @return status
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "pet status in the store")
   public StatusEnum getStatus() {
     return status;
diff --git a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/ReadOnlyFirst.java b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/ReadOnlyFirst.java
index 83f25c7923..a2c9e99699 100644
--- a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/ReadOnlyFirst.java
+++ b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/ReadOnlyFirst.java
@@ -36,6 +36,7 @@ public class ReadOnlyFirst {
    * Get bar
    * @return bar
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getBar() {
     return bar;
@@ -50,6 +51,7 @@ public class ReadOnlyFirst {
    * Get baz
    * @return baz
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getBaz() {
     return baz;
diff --git a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/SpecialModelName.java b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/SpecialModelName.java
index 5abfc132ad..a5ddb0b638 100644
--- a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/SpecialModelName.java
+++ b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/SpecialModelName.java
@@ -38,6 +38,7 @@ public class SpecialModelName {
    * Get $specialPropertyName
    * @return $specialPropertyName
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Long get$SpecialPropertyName() {
     return $specialPropertyName;
diff --git a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/Tag.java b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/Tag.java
index e2e947b84a..8255ad8298 100644
--- a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/Tag.java
+++ b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/Tag.java
@@ -41,6 +41,7 @@ public class Tag {
    * Get id
    * @return id
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Long getId() {
     return id;
@@ -59,6 +60,7 @@ public class Tag {
    * Get name
    * @return name
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getName() {
     return name;
diff --git a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/TypeHolderDefault.java b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/TypeHolderDefault.java
index 9d0f5b2fbe..d8c7b3efdd 100644
--- a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/TypeHolderDefault.java
+++ b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/TypeHolderDefault.java
@@ -53,6 +53,7 @@ public class TypeHolderDefault {
    * Get stringItem
    * @return stringItem
   **/
+
   @ApiModelProperty(required = true, value = "")
   public String getStringItem() {
     return stringItem;
@@ -71,6 +72,7 @@ public class TypeHolderDefault {
    * Get numberItem
    * @return numberItem
   **/
+
   @ApiModelProperty(required = true, value = "")
   public BigDecimal getNumberItem() {
     return numberItem;
@@ -89,6 +91,7 @@ public class TypeHolderDefault {
    * Get integerItem
    * @return integerItem
   **/
+
   @ApiModelProperty(required = true, value = "")
   public Integer getIntegerItem() {
     return integerItem;
@@ -107,6 +110,7 @@ public class TypeHolderDefault {
    * Get boolItem
    * @return boolItem
   **/
+
   @ApiModelProperty(required = true, value = "")
   public Boolean getBoolItem() {
     return boolItem;
@@ -130,6 +134,7 @@ public class TypeHolderDefault {
    * Get arrayItem
    * @return arrayItem
   **/
+
   @ApiModelProperty(required = true, value = "")
   public List<Integer> getArrayItem() {
     return arrayItem;
diff --git a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/TypeHolderExample.java b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/TypeHolderExample.java
index 94d3c57b6f..c1d5ea30f8 100644
--- a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/TypeHolderExample.java
+++ b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/TypeHolderExample.java
@@ -53,6 +53,7 @@ public class TypeHolderExample {
    * Get stringItem
    * @return stringItem
   **/
+
   @ApiModelProperty(example = "what", required = true, value = "")
   public String getStringItem() {
     return stringItem;
@@ -71,6 +72,7 @@ public class TypeHolderExample {
    * Get numberItem
    * @return numberItem
   **/
+
   @ApiModelProperty(example = "1.234", required = true, value = "")
   public BigDecimal getNumberItem() {
     return numberItem;
@@ -89,6 +91,7 @@ public class TypeHolderExample {
    * Get integerItem
    * @return integerItem
   **/
+
   @ApiModelProperty(example = "-2", required = true, value = "")
   public Integer getIntegerItem() {
     return integerItem;
@@ -107,6 +110,7 @@ public class TypeHolderExample {
    * Get boolItem
    * @return boolItem
   **/
+
   @ApiModelProperty(example = "true", required = true, value = "")
   public Boolean getBoolItem() {
     return boolItem;
@@ -130,6 +134,7 @@ public class TypeHolderExample {
    * Get arrayItem
    * @return arrayItem
   **/
+
   @ApiModelProperty(example = "[0, 1, 2, 3]", required = true, value = "")
   public List<Integer> getArrayItem() {
     return arrayItem;
diff --git a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/User.java b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/User.java
index ee3f656a1a..6e6c4ac102 100644
--- a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/User.java
+++ b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/User.java
@@ -59,6 +59,7 @@ public class User {
    * Get id
    * @return id
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Long getId() {
     return id;
@@ -77,6 +78,7 @@ public class User {
    * Get username
    * @return username
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getUsername() {
     return username;
@@ -95,6 +97,7 @@ public class User {
    * Get firstName
    * @return firstName
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getFirstName() {
     return firstName;
@@ -113,6 +116,7 @@ public class User {
    * Get lastName
    * @return lastName
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getLastName() {
     return lastName;
@@ -131,6 +135,7 @@ public class User {
    * Get email
    * @return email
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getEmail() {
     return email;
@@ -149,6 +154,7 @@ public class User {
    * Get password
    * @return password
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getPassword() {
     return password;
@@ -167,6 +173,7 @@ public class User {
    * Get phone
    * @return phone
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getPhone() {
     return phone;
@@ -185,6 +192,7 @@ public class User {
    * User Status
    * @return userStatus
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "User Status")
   public Integer getUserStatus() {
     return userStatus;
diff --git a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/XmlItem.java b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/XmlItem.java
index cb31157306..ce4af3e8b9 100644
--- a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/XmlItem.java
+++ b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/XmlItem.java
@@ -125,6 +125,7 @@ public class XmlItem {
    * Get attributeString
    * @return attributeString
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(example = "string", value = "")
   public String getAttributeString() {
     return attributeString;
@@ -143,6 +144,7 @@ public class XmlItem {
    * Get attributeNumber
    * @return attributeNumber
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(example = "1.234", value = "")
   public BigDecimal getAttributeNumber() {
     return attributeNumber;
@@ -161,6 +163,7 @@ public class XmlItem {
    * Get attributeInteger
    * @return attributeInteger
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(example = "-2", value = "")
   public Integer getAttributeInteger() {
     return attributeInteger;
@@ -179,6 +182,7 @@ public class XmlItem {
    * Get attributeBoolean
    * @return attributeBoolean
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(example = "true", value = "")
   public Boolean getAttributeBoolean() {
     return attributeBoolean;
@@ -205,6 +209,7 @@ public class XmlItem {
    * Get wrappedArray
    * @return wrappedArray
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public List<Integer> getWrappedArray() {
     return wrappedArray;
@@ -223,6 +228,7 @@ public class XmlItem {
    * Get nameString
    * @return nameString
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(example = "string", value = "")
   public String getNameString() {
     return nameString;
@@ -241,6 +247,7 @@ public class XmlItem {
    * Get nameNumber
    * @return nameNumber
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(example = "1.234", value = "")
   public BigDecimal getNameNumber() {
     return nameNumber;
@@ -259,6 +266,7 @@ public class XmlItem {
    * Get nameInteger
    * @return nameInteger
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(example = "-2", value = "")
   public Integer getNameInteger() {
     return nameInteger;
@@ -277,6 +285,7 @@ public class XmlItem {
    * Get nameBoolean
    * @return nameBoolean
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(example = "true", value = "")
   public Boolean getNameBoolean() {
     return nameBoolean;
@@ -303,6 +312,7 @@ public class XmlItem {
    * Get nameArray
    * @return nameArray
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public List<Integer> getNameArray() {
     return nameArray;
@@ -329,6 +339,7 @@ public class XmlItem {
    * Get nameWrappedArray
    * @return nameWrappedArray
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public List<Integer> getNameWrappedArray() {
     return nameWrappedArray;
@@ -347,6 +358,7 @@ public class XmlItem {
    * Get prefixString
    * @return prefixString
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(example = "string", value = "")
   public String getPrefixString() {
     return prefixString;
@@ -365,6 +377,7 @@ public class XmlItem {
    * Get prefixNumber
    * @return prefixNumber
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(example = "1.234", value = "")
   public BigDecimal getPrefixNumber() {
     return prefixNumber;
@@ -383,6 +396,7 @@ public class XmlItem {
    * Get prefixInteger
    * @return prefixInteger
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(example = "-2", value = "")
   public Integer getPrefixInteger() {
     return prefixInteger;
@@ -401,6 +415,7 @@ public class XmlItem {
    * Get prefixBoolean
    * @return prefixBoolean
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(example = "true", value = "")
   public Boolean getPrefixBoolean() {
     return prefixBoolean;
@@ -427,6 +442,7 @@ public class XmlItem {
    * Get prefixArray
    * @return prefixArray
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public List<Integer> getPrefixArray() {
     return prefixArray;
@@ -453,6 +469,7 @@ public class XmlItem {
    * Get prefixWrappedArray
    * @return prefixWrappedArray
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public List<Integer> getPrefixWrappedArray() {
     return prefixWrappedArray;
@@ -471,6 +488,7 @@ public class XmlItem {
    * Get namespaceString
    * @return namespaceString
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(example = "string", value = "")
   public String getNamespaceString() {
     return namespaceString;
@@ -489,6 +507,7 @@ public class XmlItem {
    * Get namespaceNumber
    * @return namespaceNumber
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(example = "1.234", value = "")
   public BigDecimal getNamespaceNumber() {
     return namespaceNumber;
@@ -507,6 +526,7 @@ public class XmlItem {
    * Get namespaceInteger
    * @return namespaceInteger
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(example = "-2", value = "")
   public Integer getNamespaceInteger() {
     return namespaceInteger;
@@ -525,6 +545,7 @@ public class XmlItem {
    * Get namespaceBoolean
    * @return namespaceBoolean
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(example = "true", value = "")
   public Boolean getNamespaceBoolean() {
     return namespaceBoolean;
@@ -551,6 +572,7 @@ public class XmlItem {
    * Get namespaceArray
    * @return namespaceArray
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public List<Integer> getNamespaceArray() {
     return namespaceArray;
@@ -577,6 +599,7 @@ public class XmlItem {
    * Get namespaceWrappedArray
    * @return namespaceWrappedArray
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public List<Integer> getNamespaceWrappedArray() {
     return namespaceWrappedArray;
@@ -595,6 +618,7 @@ public class XmlItem {
    * Get prefixNsString
    * @return prefixNsString
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(example = "string", value = "")
   public String getPrefixNsString() {
     return prefixNsString;
@@ -613,6 +637,7 @@ public class XmlItem {
    * Get prefixNsNumber
    * @return prefixNsNumber
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(example = "1.234", value = "")
   public BigDecimal getPrefixNsNumber() {
     return prefixNsNumber;
@@ -631,6 +656,7 @@ public class XmlItem {
    * Get prefixNsInteger
    * @return prefixNsInteger
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(example = "-2", value = "")
   public Integer getPrefixNsInteger() {
     return prefixNsInteger;
@@ -649,6 +675,7 @@ public class XmlItem {
    * Get prefixNsBoolean
    * @return prefixNsBoolean
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(example = "true", value = "")
   public Boolean getPrefixNsBoolean() {
     return prefixNsBoolean;
@@ -675,6 +702,7 @@ public class XmlItem {
    * Get prefixNsArray
    * @return prefixNsArray
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public List<Integer> getPrefixNsArray() {
     return prefixNsArray;
@@ -701,6 +729,7 @@ public class XmlItem {
    * Get prefixNsWrappedArray
    * @return prefixNsWrappedArray
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public List<Integer> getPrefixNsWrappedArray() {
     return prefixNsWrappedArray;
diff --git a/samples/client/petstore/java/resttemplate-withXml/build.gradle b/samples/client/petstore/java/resttemplate-withXml/build.gradle
index 98c7c36ba5..c72c59f98a 100644
--- a/samples/client/petstore/java/resttemplate-withXml/build.gradle
+++ b/samples/client/petstore/java/resttemplate-withXml/build.gradle
@@ -106,6 +106,7 @@ ext {
 
 dependencies {
     compile "io.swagger:swagger-annotations:$swagger_annotations_version"
+    compile "com.google.code.findbugs:jsr305:3.0.2"
     compile "org.springframework:spring-web:$spring_web_version"
     compile "com.fasterxml.jackson.core:jackson-core:$jackson_version"
     compile "com.fasterxml.jackson.core:jackson-annotations:$jackson_version"
diff --git a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/AdditionalPropertiesAnyType.java b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/AdditionalPropertiesAnyType.java
index ec797a32eb..9cd410caea 100644
--- a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/AdditionalPropertiesAnyType.java
+++ b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/AdditionalPropertiesAnyType.java
@@ -47,6 +47,7 @@ public class AdditionalPropertiesAnyType extends HashMap<String, Object> {
    * Get name
    * @return name
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getName() {
     return name;
diff --git a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/AdditionalPropertiesArray.java b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/AdditionalPropertiesArray.java
index 58cd266a32..40ec8821a8 100644
--- a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/AdditionalPropertiesArray.java
+++ b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/AdditionalPropertiesArray.java
@@ -48,6 +48,7 @@ public class AdditionalPropertiesArray extends HashMap<String, List> {
    * Get name
    * @return name
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getName() {
     return name;
diff --git a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/AdditionalPropertiesBoolean.java b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/AdditionalPropertiesBoolean.java
index ec67ce4579..1572d5e26a 100644
--- a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/AdditionalPropertiesBoolean.java
+++ b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/AdditionalPropertiesBoolean.java
@@ -47,6 +47,7 @@ public class AdditionalPropertiesBoolean extends HashMap<String, Boolean> {
    * Get name
    * @return name
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getName() {
     return name;
diff --git a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java
index 2c3157cba4..1fb68be349 100644
--- a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java
+++ b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java
@@ -123,6 +123,7 @@ public class AdditionalPropertiesClass {
    * Get mapString
    * @return mapString
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Map<String, String> getMapString() {
     return mapString;
@@ -149,6 +150,7 @@ public class AdditionalPropertiesClass {
    * Get mapNumber
    * @return mapNumber
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Map<String, BigDecimal> getMapNumber() {
     return mapNumber;
@@ -175,6 +177,7 @@ public class AdditionalPropertiesClass {
    * Get mapInteger
    * @return mapInteger
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Map<String, Integer> getMapInteger() {
     return mapInteger;
@@ -201,6 +204,7 @@ public class AdditionalPropertiesClass {
    * Get mapBoolean
    * @return mapBoolean
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Map<String, Boolean> getMapBoolean() {
     return mapBoolean;
@@ -227,6 +231,7 @@ public class AdditionalPropertiesClass {
    * Get mapArrayInteger
    * @return mapArrayInteger
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Map<String, List<Integer>> getMapArrayInteger() {
     return mapArrayInteger;
@@ -253,6 +258,7 @@ public class AdditionalPropertiesClass {
    * Get mapArrayAnytype
    * @return mapArrayAnytype
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Map<String, List<Object>> getMapArrayAnytype() {
     return mapArrayAnytype;
@@ -279,6 +285,7 @@ public class AdditionalPropertiesClass {
    * Get mapMapString
    * @return mapMapString
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Map<String, Map<String, String>> getMapMapString() {
     return mapMapString;
@@ -305,6 +312,7 @@ public class AdditionalPropertiesClass {
    * Get mapMapAnytype
    * @return mapMapAnytype
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Map<String, Map<String, Object>> getMapMapAnytype() {
     return mapMapAnytype;
@@ -323,6 +331,7 @@ public class AdditionalPropertiesClass {
    * Get anytype1
    * @return anytype1
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Object getAnytype1() {
     return anytype1;
@@ -341,6 +350,7 @@ public class AdditionalPropertiesClass {
    * Get anytype2
    * @return anytype2
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Object getAnytype2() {
     return anytype2;
@@ -359,6 +369,7 @@ public class AdditionalPropertiesClass {
    * Get anytype3
    * @return anytype3
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Object getAnytype3() {
     return anytype3;
diff --git a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/AdditionalPropertiesInteger.java b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/AdditionalPropertiesInteger.java
index 31e685eb65..6c5869d49a 100644
--- a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/AdditionalPropertiesInteger.java
+++ b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/AdditionalPropertiesInteger.java
@@ -47,6 +47,7 @@ public class AdditionalPropertiesInteger extends HashMap<String, Integer> {
    * Get name
    * @return name
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getName() {
     return name;
diff --git a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/AdditionalPropertiesNumber.java b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/AdditionalPropertiesNumber.java
index 05fca9be35..2ddabab3ad 100644
--- a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/AdditionalPropertiesNumber.java
+++ b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/AdditionalPropertiesNumber.java
@@ -48,6 +48,7 @@ public class AdditionalPropertiesNumber extends HashMap<String, BigDecimal> {
    * Get name
    * @return name
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getName() {
     return name;
diff --git a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/AdditionalPropertiesObject.java b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/AdditionalPropertiesObject.java
index aeb4f5fc93..57f36622cb 100644
--- a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/AdditionalPropertiesObject.java
+++ b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/AdditionalPropertiesObject.java
@@ -47,6 +47,7 @@ public class AdditionalPropertiesObject extends HashMap<String, Map> {
    * Get name
    * @return name
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getName() {
     return name;
diff --git a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/AdditionalPropertiesString.java b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/AdditionalPropertiesString.java
index d65012b24e..5040129cca 100644
--- a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/AdditionalPropertiesString.java
+++ b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/AdditionalPropertiesString.java
@@ -47,6 +47,7 @@ public class AdditionalPropertiesString extends HashMap<String, String> {
    * Get name
    * @return name
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getName() {
     return name;
diff --git a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/Animal.java b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/Animal.java
index 162fa4ce11..6cea07ff0a 100644
--- a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/Animal.java
+++ b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/Animal.java
@@ -58,6 +58,7 @@ public class Animal {
    * Get className
    * @return className
   **/
+
   @ApiModelProperty(required = true, value = "")
   public String getClassName() {
     return className;
@@ -76,6 +77,7 @@ public class Animal {
    * Get color
    * @return color
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getColor() {
     return color;
diff --git a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java
index c3435cdf25..b72cc84541 100644
--- a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java
+++ b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java
@@ -58,6 +58,7 @@ public class ArrayOfArrayOfNumberOnly {
    * Get arrayArrayNumber
    * @return arrayArrayNumber
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public List<List<BigDecimal>> getArrayArrayNumber() {
     return arrayArrayNumber;
diff --git a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java
index 656ab79ca6..adef6e226e 100644
--- a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java
+++ b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java
@@ -58,6 +58,7 @@ public class ArrayOfNumberOnly {
    * Get arrayNumber
    * @return arrayNumber
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public List<BigDecimal> getArrayNumber() {
     return arrayNumber;
diff --git a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/ArrayTest.java b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/ArrayTest.java
index da26b0ca62..99fb1aae1e 100644
--- a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/ArrayTest.java
+++ b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/ArrayTest.java
@@ -72,6 +72,7 @@ public class ArrayTest {
    * Get arrayOfString
    * @return arrayOfString
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public List<String> getArrayOfString() {
     return arrayOfString;
@@ -98,6 +99,7 @@ public class ArrayTest {
    * Get arrayArrayOfInteger
    * @return arrayArrayOfInteger
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public List<List<Long>> getArrayArrayOfInteger() {
     return arrayArrayOfInteger;
@@ -124,6 +126,7 @@ public class ArrayTest {
    * Get arrayArrayOfModel
    * @return arrayArrayOfModel
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public List<List<ReadOnlyFirst>> getArrayArrayOfModel() {
     return arrayArrayOfModel;
diff --git a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/Capitalization.java b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/Capitalization.java
index 50bf96ac10..bad598c320 100644
--- a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/Capitalization.java
+++ b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/Capitalization.java
@@ -70,6 +70,7 @@ public class Capitalization {
    * Get smallCamel
    * @return smallCamel
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getSmallCamel() {
     return smallCamel;
@@ -88,6 +89,7 @@ public class Capitalization {
    * Get capitalCamel
    * @return capitalCamel
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getCapitalCamel() {
     return capitalCamel;
@@ -106,6 +108,7 @@ public class Capitalization {
    * Get smallSnake
    * @return smallSnake
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getSmallSnake() {
     return smallSnake;
@@ -124,6 +127,7 @@ public class Capitalization {
    * Get capitalSnake
    * @return capitalSnake
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getCapitalSnake() {
     return capitalSnake;
@@ -142,6 +146,7 @@ public class Capitalization {
    * Get scAETHFlowPoints
    * @return scAETHFlowPoints
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getScAETHFlowPoints() {
     return scAETHFlowPoints;
@@ -160,6 +165,7 @@ public class Capitalization {
    * Name of the pet 
    * @return ATT_NAME
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "Name of the pet ")
   public String getATTNAME() {
     return ATT_NAME;
diff --git a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/Cat.java b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/Cat.java
index 32029be0ab..d7015f214e 100644
--- a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/Cat.java
+++ b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/Cat.java
@@ -47,6 +47,7 @@ public class Cat extends Animal {
    * Get declawed
    * @return declawed
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Boolean getDeclawed() {
     return declawed;
diff --git a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/CatAllOf.java b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/CatAllOf.java
index eabaff8a05..ac93255d17 100644
--- a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/CatAllOf.java
+++ b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/CatAllOf.java
@@ -45,6 +45,7 @@ public class CatAllOf {
    * Get declawed
    * @return declawed
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Boolean getDeclawed() {
     return declawed;
diff --git a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/Category.java b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/Category.java
index d5a5ed0cbd..665d1deefc 100644
--- a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/Category.java
+++ b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/Category.java
@@ -50,6 +50,7 @@ public class Category {
    * Get id
    * @return id
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Long getId() {
     return id;
@@ -68,6 +69,7 @@ public class Category {
    * Get name
    * @return name
   **/
+
   @ApiModelProperty(required = true, value = "")
   public String getName() {
     return name;
diff --git a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/ClassModel.java b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/ClassModel.java
index aa20612b85..928c12ea45 100644
--- a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/ClassModel.java
+++ b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/ClassModel.java
@@ -46,6 +46,7 @@ public class ClassModel {
    * Get propertyClass
    * @return propertyClass
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getPropertyClass() {
     return propertyClass;
diff --git a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/Client.java b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/Client.java
index 979a88dfee..017b2fca26 100644
--- a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/Client.java
+++ b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/Client.java
@@ -45,6 +45,7 @@ public class Client {
    * Get client
    * @return client
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getClient() {
     return client;
diff --git a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/Dog.java b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/Dog.java
index 48d73e1423..09c52412f4 100644
--- a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/Dog.java
+++ b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/Dog.java
@@ -47,6 +47,7 @@ public class Dog extends Animal {
    * Get breed
    * @return breed
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getBreed() {
     return breed;
diff --git a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/DogAllOf.java b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/DogAllOf.java
index d2285edfe1..c62cc1655a 100644
--- a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/DogAllOf.java
+++ b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/DogAllOf.java
@@ -45,6 +45,7 @@ public class DogAllOf {
    * Get breed
    * @return breed
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getBreed() {
     return breed;
diff --git a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/EnumArrays.java b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/EnumArrays.java
index 6aa98909a5..af0d449c65 100644
--- a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/EnumArrays.java
+++ b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/EnumArrays.java
@@ -124,6 +124,7 @@ public class EnumArrays {
    * Get justSymbol
    * @return justSymbol
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public JustSymbolEnum getJustSymbol() {
     return justSymbol;
@@ -150,6 +151,7 @@ public class EnumArrays {
    * Get arrayEnum
    * @return arrayEnum
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public List<ArrayEnumEnum> getArrayEnum() {
     return arrayEnum;
diff --git a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/EnumTest.java b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/EnumTest.java
index 150c449175..4a3faa788b 100644
--- a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/EnumTest.java
+++ b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/EnumTest.java
@@ -210,6 +210,7 @@ public class EnumTest {
    * Get enumString
    * @return enumString
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public EnumStringEnum getEnumString() {
     return enumString;
@@ -228,6 +229,7 @@ public class EnumTest {
    * Get enumStringRequired
    * @return enumStringRequired
   **/
+
   @ApiModelProperty(required = true, value = "")
   public EnumStringRequiredEnum getEnumStringRequired() {
     return enumStringRequired;
@@ -246,6 +248,7 @@ public class EnumTest {
    * Get enumInteger
    * @return enumInteger
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public EnumIntegerEnum getEnumInteger() {
     return enumInteger;
@@ -264,6 +267,7 @@ public class EnumTest {
    * Get enumNumber
    * @return enumNumber
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public EnumNumberEnum getEnumNumber() {
     return enumNumber;
@@ -282,6 +286,7 @@ public class EnumTest {
    * Get outerEnum
    * @return outerEnum
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public OuterEnum getOuterEnum() {
     return outerEnum;
diff --git a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java
index 504d2ec990..06defab3d5 100644
--- a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java
+++ b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java
@@ -54,6 +54,7 @@ public class FileSchemaTestClass {
    * Get file
    * @return file
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public java.io.File getFile() {
     return file;
@@ -80,6 +81,7 @@ public class FileSchemaTestClass {
    * Get files
    * @return files
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public List<java.io.File> getFiles() {
     return files;
diff --git a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/FormatTest.java b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/FormatTest.java
index a65a29395f..c9ec8cfd5f 100644
--- a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/FormatTest.java
+++ b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/FormatTest.java
@@ -112,6 +112,7 @@ public class FormatTest {
    * maximum: 100
    * @return integer
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Integer getInteger() {
     return integer;
@@ -132,6 +133,7 @@ public class FormatTest {
    * maximum: 200
    * @return int32
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Integer getInt32() {
     return int32;
@@ -150,6 +152,7 @@ public class FormatTest {
    * Get int64
    * @return int64
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Long getInt64() {
     return int64;
@@ -170,6 +173,7 @@ public class FormatTest {
    * maximum: 543.2
    * @return number
   **/
+
   @ApiModelProperty(required = true, value = "")
   public BigDecimal getNumber() {
     return number;
@@ -190,6 +194,7 @@ public class FormatTest {
    * maximum: 987.6
    * @return _float
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Float getFloat() {
     return _float;
@@ -210,6 +215,7 @@ public class FormatTest {
    * maximum: 123.4
    * @return _double
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Double getDouble() {
     return _double;
@@ -228,6 +234,7 @@ public class FormatTest {
    * Get string
    * @return string
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getString() {
     return string;
@@ -246,6 +253,7 @@ public class FormatTest {
    * Get _byte
    * @return _byte
   **/
+
   @ApiModelProperty(required = true, value = "")
   public byte[] getByte() {
     return _byte;
@@ -264,6 +272,7 @@ public class FormatTest {
    * Get binary
    * @return binary
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public File getBinary() {
     return binary;
@@ -282,6 +291,7 @@ public class FormatTest {
    * Get date
    * @return date
   **/
+
   @ApiModelProperty(required = true, value = "")
   public LocalDate getDate() {
     return date;
@@ -300,6 +310,7 @@ public class FormatTest {
    * Get dateTime
    * @return dateTime
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public OffsetDateTime getDateTime() {
     return dateTime;
@@ -318,6 +329,7 @@ public class FormatTest {
    * Get uuid
    * @return uuid
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(example = "72f98069-206d-4f12-9f12-3d1e525a8e84", value = "")
   public UUID getUuid() {
     return uuid;
@@ -336,6 +348,7 @@ public class FormatTest {
    * Get password
    * @return password
   **/
+
   @ApiModelProperty(required = true, value = "")
   public String getPassword() {
     return password;
diff --git a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java
index c490587934..907592d8e8 100644
--- a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java
+++ b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java
@@ -45,6 +45,7 @@ public class HasOnlyReadOnly {
    * Get bar
    * @return bar
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getBar() {
     return bar;
@@ -54,6 +55,7 @@ public class HasOnlyReadOnly {
    * Get foo
    * @return foo
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getFoo() {
     return foo;
diff --git a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/MapTest.java b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/MapTest.java
index 92536ba727..812a680e75 100644
--- a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/MapTest.java
+++ b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/MapTest.java
@@ -114,6 +114,7 @@ public class MapTest {
    * Get mapMapOfString
    * @return mapMapOfString
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Map<String, Map<String, String>> getMapMapOfString() {
     return mapMapOfString;
@@ -140,6 +141,7 @@ public class MapTest {
    * Get mapOfEnumString
    * @return mapOfEnumString
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Map<String, InnerEnum> getMapOfEnumString() {
     return mapOfEnumString;
@@ -166,6 +168,7 @@ public class MapTest {
    * Get directMap
    * @return directMap
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Map<String, Boolean> getDirectMap() {
     return directMap;
@@ -192,6 +195,7 @@ public class MapTest {
    * Get indirectMap
    * @return indirectMap
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Map<String, Boolean> getIndirectMap() {
     return indirectMap;
diff --git a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java
index b0987dedce..815679fe5f 100644
--- a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java
+++ b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java
@@ -63,6 +63,7 @@ public class MixedPropertiesAndAdditionalPropertiesClass {
    * Get uuid
    * @return uuid
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public UUID getUuid() {
     return uuid;
@@ -81,6 +82,7 @@ public class MixedPropertiesAndAdditionalPropertiesClass {
    * Get dateTime
    * @return dateTime
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public OffsetDateTime getDateTime() {
     return dateTime;
@@ -107,6 +109,7 @@ public class MixedPropertiesAndAdditionalPropertiesClass {
    * Get map
    * @return map
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Map<String, Animal> getMap() {
     return map;
diff --git a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/Model200Response.java b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/Model200Response.java
index ba38bba5fc..2a3c0b5965 100644
--- a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/Model200Response.java
+++ b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/Model200Response.java
@@ -51,6 +51,7 @@ public class Model200Response {
    * Get name
    * @return name
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Integer getName() {
     return name;
@@ -69,6 +70,7 @@ public class Model200Response {
    * Get propertyClass
    * @return propertyClass
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getPropertyClass() {
     return propertyClass;
diff --git a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/ModelApiResponse.java b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/ModelApiResponse.java
index cb05dd9d97..5ae9239007 100644
--- a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/ModelApiResponse.java
+++ b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/ModelApiResponse.java
@@ -55,6 +55,7 @@ public class ModelApiResponse {
    * Get code
    * @return code
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Integer getCode() {
     return code;
@@ -73,6 +74,7 @@ public class ModelApiResponse {
    * Get type
    * @return type
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getType() {
     return type;
@@ -91,6 +93,7 @@ public class ModelApiResponse {
    * Get message
    * @return message
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getMessage() {
     return message;
diff --git a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/ModelReturn.java b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/ModelReturn.java
index a27a57348a..7e3591fe6f 100644
--- a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/ModelReturn.java
+++ b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/ModelReturn.java
@@ -46,6 +46,7 @@ public class ModelReturn {
    * Get _return
    * @return _return
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Integer getReturn() {
     return _return;
diff --git a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/Name.java b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/Name.java
index b240e2e74c..47dbe54104 100644
--- a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/Name.java
+++ b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/Name.java
@@ -61,6 +61,7 @@ public class Name {
    * Get name
    * @return name
   **/
+
   @ApiModelProperty(required = true, value = "")
   public Integer getName() {
     return name;
@@ -74,6 +75,7 @@ public class Name {
    * Get snakeCase
    * @return snakeCase
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Integer getSnakeCase() {
     return snakeCase;
@@ -88,6 +90,7 @@ public class Name {
    * Get property
    * @return property
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getProperty() {
     return property;
@@ -101,6 +104,7 @@ public class Name {
    * Get _123number
    * @return _123number
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Integer get123number() {
     return _123number;
diff --git a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/NumberOnly.java b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/NumberOnly.java
index 20f6262884..c2dcc40b6d 100644
--- a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/NumberOnly.java
+++ b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/NumberOnly.java
@@ -46,6 +46,7 @@ public class NumberOnly {
    * Get justNumber
    * @return justNumber
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public BigDecimal getJustNumber() {
     return justNumber;
diff --git a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/Order.java b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/Order.java
index df94e8560d..f41d6cb7f9 100644
--- a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/Order.java
+++ b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/Order.java
@@ -108,6 +108,7 @@ public class Order {
    * Get id
    * @return id
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Long getId() {
     return id;
@@ -126,6 +127,7 @@ public class Order {
    * Get petId
    * @return petId
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Long getPetId() {
     return petId;
@@ -144,6 +146,7 @@ public class Order {
    * Get quantity
    * @return quantity
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Integer getQuantity() {
     return quantity;
@@ -162,6 +165,7 @@ public class Order {
    * Get shipDate
    * @return shipDate
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public OffsetDateTime getShipDate() {
     return shipDate;
@@ -180,6 +184,7 @@ public class Order {
    * Order Status
    * @return status
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "Order Status")
   public StatusEnum getStatus() {
     return status;
@@ -198,6 +203,7 @@ public class Order {
    * Get complete
    * @return complete
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Boolean getComplete() {
     return complete;
diff --git a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/OuterComposite.java b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/OuterComposite.java
index 9b45b19710..412283913c 100644
--- a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/OuterComposite.java
+++ b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/OuterComposite.java
@@ -56,6 +56,7 @@ public class OuterComposite {
    * Get myNumber
    * @return myNumber
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public BigDecimal getMyNumber() {
     return myNumber;
@@ -74,6 +75,7 @@ public class OuterComposite {
    * Get myString
    * @return myString
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getMyString() {
     return myString;
@@ -92,6 +94,7 @@ public class OuterComposite {
    * Get myBoolean
    * @return myBoolean
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Boolean getMyBoolean() {
     return myBoolean;
diff --git a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/Pet.java b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/Pet.java
index 0c6e28a590..0953836a6f 100644
--- a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/Pet.java
+++ b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/Pet.java
@@ -121,6 +121,7 @@ public class Pet {
    * Get id
    * @return id
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Long getId() {
     return id;
@@ -139,6 +140,7 @@ public class Pet {
    * Get category
    * @return category
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Category getCategory() {
     return category;
@@ -157,6 +159,7 @@ public class Pet {
    * Get name
    * @return name
   **/
+
   @ApiModelProperty(example = "doggie", required = true, value = "")
   public String getName() {
     return name;
@@ -180,6 +183,7 @@ public class Pet {
    * Get photoUrls
    * @return photoUrls
   **/
+
   @ApiModelProperty(required = true, value = "")
   public List<String> getPhotoUrls() {
     return photoUrls;
@@ -206,6 +210,7 @@ public class Pet {
    * Get tags
    * @return tags
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public List<Tag> getTags() {
     return tags;
@@ -224,6 +229,7 @@ public class Pet {
    * pet status in the store
    * @return status
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "pet status in the store")
   public StatusEnum getStatus() {
     return status;
diff --git a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/ReadOnlyFirst.java b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/ReadOnlyFirst.java
index 218301b540..b01224ff98 100644
--- a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/ReadOnlyFirst.java
+++ b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/ReadOnlyFirst.java
@@ -45,6 +45,7 @@ public class ReadOnlyFirst {
    * Get bar
    * @return bar
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getBar() {
     return bar;
@@ -59,6 +60,7 @@ public class ReadOnlyFirst {
    * Get baz
    * @return baz
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getBaz() {
     return baz;
diff --git a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/SpecialModelName.java b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/SpecialModelName.java
index 2dddd39323..0dce1b2135 100644
--- a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/SpecialModelName.java
+++ b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/SpecialModelName.java
@@ -45,6 +45,7 @@ public class SpecialModelName {
    * Get $specialPropertyName
    * @return $specialPropertyName
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Long get$SpecialPropertyName() {
     return $specialPropertyName;
diff --git a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/Tag.java b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/Tag.java
index eda4cbefac..0aeb3e8642 100644
--- a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/Tag.java
+++ b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/Tag.java
@@ -50,6 +50,7 @@ public class Tag {
    * Get id
    * @return id
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Long getId() {
     return id;
@@ -68,6 +69,7 @@ public class Tag {
    * Get name
    * @return name
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getName() {
     return name;
diff --git a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/TypeHolderDefault.java b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/TypeHolderDefault.java
index 6a1a1c4600..4c40efd2bd 100644
--- a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/TypeHolderDefault.java
+++ b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/TypeHolderDefault.java
@@ -70,6 +70,7 @@ public class TypeHolderDefault {
    * Get stringItem
    * @return stringItem
   **/
+
   @ApiModelProperty(required = true, value = "")
   public String getStringItem() {
     return stringItem;
@@ -88,6 +89,7 @@ public class TypeHolderDefault {
    * Get numberItem
    * @return numberItem
   **/
+
   @ApiModelProperty(required = true, value = "")
   public BigDecimal getNumberItem() {
     return numberItem;
@@ -106,6 +108,7 @@ public class TypeHolderDefault {
    * Get integerItem
    * @return integerItem
   **/
+
   @ApiModelProperty(required = true, value = "")
   public Integer getIntegerItem() {
     return integerItem;
@@ -124,6 +127,7 @@ public class TypeHolderDefault {
    * Get boolItem
    * @return boolItem
   **/
+
   @ApiModelProperty(required = true, value = "")
   public Boolean getBoolItem() {
     return boolItem;
@@ -147,6 +151,7 @@ public class TypeHolderDefault {
    * Get arrayItem
    * @return arrayItem
   **/
+
   @ApiModelProperty(required = true, value = "")
   public List<Integer> getArrayItem() {
     return arrayItem;
diff --git a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/TypeHolderExample.java b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/TypeHolderExample.java
index 290f1d2d47..e24eaa0e19 100644
--- a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/TypeHolderExample.java
+++ b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/TypeHolderExample.java
@@ -70,6 +70,7 @@ public class TypeHolderExample {
    * Get stringItem
    * @return stringItem
   **/
+
   @ApiModelProperty(example = "what", required = true, value = "")
   public String getStringItem() {
     return stringItem;
@@ -88,6 +89,7 @@ public class TypeHolderExample {
    * Get numberItem
    * @return numberItem
   **/
+
   @ApiModelProperty(example = "1.234", required = true, value = "")
   public BigDecimal getNumberItem() {
     return numberItem;
@@ -106,6 +108,7 @@ public class TypeHolderExample {
    * Get integerItem
    * @return integerItem
   **/
+
   @ApiModelProperty(example = "-2", required = true, value = "")
   public Integer getIntegerItem() {
     return integerItem;
@@ -124,6 +127,7 @@ public class TypeHolderExample {
    * Get boolItem
    * @return boolItem
   **/
+
   @ApiModelProperty(example = "true", required = true, value = "")
   public Boolean getBoolItem() {
     return boolItem;
@@ -147,6 +151,7 @@ public class TypeHolderExample {
    * Get arrayItem
    * @return arrayItem
   **/
+
   @ApiModelProperty(example = "[0, 1, 2, 3]", required = true, value = "")
   public List<Integer> getArrayItem() {
     return arrayItem;
diff --git a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/User.java b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/User.java
index b5ed7ac2c0..13acd447aa 100644
--- a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/User.java
+++ b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/User.java
@@ -80,6 +80,7 @@ public class User {
    * Get id
    * @return id
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Long getId() {
     return id;
@@ -98,6 +99,7 @@ public class User {
    * Get username
    * @return username
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getUsername() {
     return username;
@@ -116,6 +118,7 @@ public class User {
    * Get firstName
    * @return firstName
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getFirstName() {
     return firstName;
@@ -134,6 +137,7 @@ public class User {
    * Get lastName
    * @return lastName
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getLastName() {
     return lastName;
@@ -152,6 +156,7 @@ public class User {
    * Get email
    * @return email
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getEmail() {
     return email;
@@ -170,6 +175,7 @@ public class User {
    * Get password
    * @return password
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getPassword() {
     return password;
@@ -188,6 +194,7 @@ public class User {
    * Get phone
    * @return phone
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getPhone() {
     return phone;
@@ -206,6 +213,7 @@ public class User {
    * User Status
    * @return userStatus
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "User Status")
   public Integer getUserStatus() {
     return userStatus;
diff --git a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/XmlItem.java b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/XmlItem.java
index 9ddc41a806..ce8aa206a8 100644
--- a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/XmlItem.java
+++ b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/XmlItem.java
@@ -221,6 +221,7 @@ public class XmlItem {
    * Get attributeString
    * @return attributeString
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(example = "string", value = "")
   public String getAttributeString() {
     return attributeString;
@@ -239,6 +240,7 @@ public class XmlItem {
    * Get attributeNumber
    * @return attributeNumber
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(example = "1.234", value = "")
   public BigDecimal getAttributeNumber() {
     return attributeNumber;
@@ -257,6 +259,7 @@ public class XmlItem {
    * Get attributeInteger
    * @return attributeInteger
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(example = "-2", value = "")
   public Integer getAttributeInteger() {
     return attributeInteger;
@@ -275,6 +278,7 @@ public class XmlItem {
    * Get attributeBoolean
    * @return attributeBoolean
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(example = "true", value = "")
   public Boolean getAttributeBoolean() {
     return attributeBoolean;
@@ -301,6 +305,7 @@ public class XmlItem {
    * Get wrappedArray
    * @return wrappedArray
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public List<Integer> getWrappedArray() {
     return wrappedArray;
@@ -319,6 +324,7 @@ public class XmlItem {
    * Get nameString
    * @return nameString
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(example = "string", value = "")
   public String getNameString() {
     return nameString;
@@ -337,6 +343,7 @@ public class XmlItem {
    * Get nameNumber
    * @return nameNumber
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(example = "1.234", value = "")
   public BigDecimal getNameNumber() {
     return nameNumber;
@@ -355,6 +362,7 @@ public class XmlItem {
    * Get nameInteger
    * @return nameInteger
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(example = "-2", value = "")
   public Integer getNameInteger() {
     return nameInteger;
@@ -373,6 +381,7 @@ public class XmlItem {
    * Get nameBoolean
    * @return nameBoolean
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(example = "true", value = "")
   public Boolean getNameBoolean() {
     return nameBoolean;
@@ -399,6 +408,7 @@ public class XmlItem {
    * Get nameArray
    * @return nameArray
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public List<Integer> getNameArray() {
     return nameArray;
@@ -425,6 +435,7 @@ public class XmlItem {
    * Get nameWrappedArray
    * @return nameWrappedArray
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public List<Integer> getNameWrappedArray() {
     return nameWrappedArray;
@@ -443,6 +454,7 @@ public class XmlItem {
    * Get prefixString
    * @return prefixString
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(example = "string", value = "")
   public String getPrefixString() {
     return prefixString;
@@ -461,6 +473,7 @@ public class XmlItem {
    * Get prefixNumber
    * @return prefixNumber
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(example = "1.234", value = "")
   public BigDecimal getPrefixNumber() {
     return prefixNumber;
@@ -479,6 +492,7 @@ public class XmlItem {
    * Get prefixInteger
    * @return prefixInteger
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(example = "-2", value = "")
   public Integer getPrefixInteger() {
     return prefixInteger;
@@ -497,6 +511,7 @@ public class XmlItem {
    * Get prefixBoolean
    * @return prefixBoolean
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(example = "true", value = "")
   public Boolean getPrefixBoolean() {
     return prefixBoolean;
@@ -523,6 +538,7 @@ public class XmlItem {
    * Get prefixArray
    * @return prefixArray
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public List<Integer> getPrefixArray() {
     return prefixArray;
@@ -549,6 +565,7 @@ public class XmlItem {
    * Get prefixWrappedArray
    * @return prefixWrappedArray
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public List<Integer> getPrefixWrappedArray() {
     return prefixWrappedArray;
@@ -567,6 +584,7 @@ public class XmlItem {
    * Get namespaceString
    * @return namespaceString
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(example = "string", value = "")
   public String getNamespaceString() {
     return namespaceString;
@@ -585,6 +603,7 @@ public class XmlItem {
    * Get namespaceNumber
    * @return namespaceNumber
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(example = "1.234", value = "")
   public BigDecimal getNamespaceNumber() {
     return namespaceNumber;
@@ -603,6 +622,7 @@ public class XmlItem {
    * Get namespaceInteger
    * @return namespaceInteger
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(example = "-2", value = "")
   public Integer getNamespaceInteger() {
     return namespaceInteger;
@@ -621,6 +641,7 @@ public class XmlItem {
    * Get namespaceBoolean
    * @return namespaceBoolean
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(example = "true", value = "")
   public Boolean getNamespaceBoolean() {
     return namespaceBoolean;
@@ -647,6 +668,7 @@ public class XmlItem {
    * Get namespaceArray
    * @return namespaceArray
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public List<Integer> getNamespaceArray() {
     return namespaceArray;
@@ -673,6 +695,7 @@ public class XmlItem {
    * Get namespaceWrappedArray
    * @return namespaceWrappedArray
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public List<Integer> getNamespaceWrappedArray() {
     return namespaceWrappedArray;
@@ -691,6 +714,7 @@ public class XmlItem {
    * Get prefixNsString
    * @return prefixNsString
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(example = "string", value = "")
   public String getPrefixNsString() {
     return prefixNsString;
@@ -709,6 +733,7 @@ public class XmlItem {
    * Get prefixNsNumber
    * @return prefixNsNumber
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(example = "1.234", value = "")
   public BigDecimal getPrefixNsNumber() {
     return prefixNsNumber;
@@ -727,6 +752,7 @@ public class XmlItem {
    * Get prefixNsInteger
    * @return prefixNsInteger
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(example = "-2", value = "")
   public Integer getPrefixNsInteger() {
     return prefixNsInteger;
@@ -745,6 +771,7 @@ public class XmlItem {
    * Get prefixNsBoolean
    * @return prefixNsBoolean
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(example = "true", value = "")
   public Boolean getPrefixNsBoolean() {
     return prefixNsBoolean;
@@ -771,6 +798,7 @@ public class XmlItem {
    * Get prefixNsArray
    * @return prefixNsArray
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public List<Integer> getPrefixNsArray() {
     return prefixNsArray;
@@ -797,6 +825,7 @@ public class XmlItem {
    * Get prefixNsWrappedArray
    * @return prefixNsWrappedArray
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public List<Integer> getPrefixNsWrappedArray() {
     return prefixNsWrappedArray;
diff --git a/samples/client/petstore/java/resttemplate/build.gradle b/samples/client/petstore/java/resttemplate/build.gradle
index 583a0a3059..9aa0a46fcc 100644
--- a/samples/client/petstore/java/resttemplate/build.gradle
+++ b/samples/client/petstore/java/resttemplate/build.gradle
@@ -106,6 +106,7 @@ ext {
 
 dependencies {
     compile "io.swagger:swagger-annotations:$swagger_annotations_version"
+    compile "com.google.code.findbugs:jsr305:3.0.2"
     compile "org.springframework:spring-web:$spring_web_version"
     compile "com.fasterxml.jackson.core:jackson-core:$jackson_version"
     compile "com.fasterxml.jackson.core:jackson-annotations:$jackson_version"
diff --git a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/AdditionalPropertiesAnyType.java b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/AdditionalPropertiesAnyType.java
index d223a661f8..1abb2d8a64 100644
--- a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/AdditionalPropertiesAnyType.java
+++ b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/AdditionalPropertiesAnyType.java
@@ -40,6 +40,7 @@ public class AdditionalPropertiesAnyType extends HashMap<String, Object> {
    * Get name
    * @return name
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getName() {
     return name;
diff --git a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/AdditionalPropertiesArray.java b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/AdditionalPropertiesArray.java
index db738129d0..1821c243e1 100644
--- a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/AdditionalPropertiesArray.java
+++ b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/AdditionalPropertiesArray.java
@@ -41,6 +41,7 @@ public class AdditionalPropertiesArray extends HashMap<String, List> {
    * Get name
    * @return name
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getName() {
     return name;
diff --git a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/AdditionalPropertiesBoolean.java b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/AdditionalPropertiesBoolean.java
index 754ff32555..78f7ac79b2 100644
--- a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/AdditionalPropertiesBoolean.java
+++ b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/AdditionalPropertiesBoolean.java
@@ -40,6 +40,7 @@ public class AdditionalPropertiesBoolean extends HashMap<String, Boolean> {
    * Get name
    * @return name
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getName() {
     return name;
diff --git a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java
index 2de7a27185..406bccc278 100644
--- a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java
+++ b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java
@@ -80,6 +80,7 @@ public class AdditionalPropertiesClass {
    * Get mapString
    * @return mapString
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Map<String, String> getMapString() {
     return mapString;
@@ -106,6 +107,7 @@ public class AdditionalPropertiesClass {
    * Get mapNumber
    * @return mapNumber
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Map<String, BigDecimal> getMapNumber() {
     return mapNumber;
@@ -132,6 +134,7 @@ public class AdditionalPropertiesClass {
    * Get mapInteger
    * @return mapInteger
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Map<String, Integer> getMapInteger() {
     return mapInteger;
@@ -158,6 +161,7 @@ public class AdditionalPropertiesClass {
    * Get mapBoolean
    * @return mapBoolean
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Map<String, Boolean> getMapBoolean() {
     return mapBoolean;
@@ -184,6 +188,7 @@ public class AdditionalPropertiesClass {
    * Get mapArrayInteger
    * @return mapArrayInteger
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Map<String, List<Integer>> getMapArrayInteger() {
     return mapArrayInteger;
@@ -210,6 +215,7 @@ public class AdditionalPropertiesClass {
    * Get mapArrayAnytype
    * @return mapArrayAnytype
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Map<String, List<Object>> getMapArrayAnytype() {
     return mapArrayAnytype;
@@ -236,6 +242,7 @@ public class AdditionalPropertiesClass {
    * Get mapMapString
    * @return mapMapString
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Map<String, Map<String, String>> getMapMapString() {
     return mapMapString;
@@ -262,6 +269,7 @@ public class AdditionalPropertiesClass {
    * Get mapMapAnytype
    * @return mapMapAnytype
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Map<String, Map<String, Object>> getMapMapAnytype() {
     return mapMapAnytype;
@@ -280,6 +288,7 @@ public class AdditionalPropertiesClass {
    * Get anytype1
    * @return anytype1
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Object getAnytype1() {
     return anytype1;
@@ -298,6 +307,7 @@ public class AdditionalPropertiesClass {
    * Get anytype2
    * @return anytype2
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Object getAnytype2() {
     return anytype2;
@@ -316,6 +326,7 @@ public class AdditionalPropertiesClass {
    * Get anytype3
    * @return anytype3
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Object getAnytype3() {
     return anytype3;
diff --git a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/AdditionalPropertiesInteger.java b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/AdditionalPropertiesInteger.java
index 1f61976466..6e5159d404 100644
--- a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/AdditionalPropertiesInteger.java
+++ b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/AdditionalPropertiesInteger.java
@@ -40,6 +40,7 @@ public class AdditionalPropertiesInteger extends HashMap<String, Integer> {
    * Get name
    * @return name
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getName() {
     return name;
diff --git a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/AdditionalPropertiesNumber.java b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/AdditionalPropertiesNumber.java
index 474d7b8f04..ddc8146dea 100644
--- a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/AdditionalPropertiesNumber.java
+++ b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/AdditionalPropertiesNumber.java
@@ -41,6 +41,7 @@ public class AdditionalPropertiesNumber extends HashMap<String, BigDecimal> {
    * Get name
    * @return name
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getName() {
     return name;
diff --git a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/AdditionalPropertiesObject.java b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/AdditionalPropertiesObject.java
index 40ff424fe4..cc29400029 100644
--- a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/AdditionalPropertiesObject.java
+++ b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/AdditionalPropertiesObject.java
@@ -40,6 +40,7 @@ public class AdditionalPropertiesObject extends HashMap<String, Map> {
    * Get name
    * @return name
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getName() {
     return name;
diff --git a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/AdditionalPropertiesString.java b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/AdditionalPropertiesString.java
index eeaedf3bda..fb3368dfed 100644
--- a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/AdditionalPropertiesString.java
+++ b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/AdditionalPropertiesString.java
@@ -40,6 +40,7 @@ public class AdditionalPropertiesString extends HashMap<String, String> {
    * Get name
    * @return name
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getName() {
     return name;
diff --git a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/Animal.java b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/Animal.java
index f210737e12..53a0eec339 100644
--- a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/Animal.java
+++ b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/Animal.java
@@ -49,6 +49,7 @@ public class Animal {
    * Get className
    * @return className
   **/
+
   @ApiModelProperty(required = true, value = "")
   public String getClassName() {
     return className;
@@ -67,6 +68,7 @@ public class Animal {
    * Get color
    * @return color
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getColor() {
     return color;
diff --git a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java
index f5c02b2326..de49df3fbd 100644
--- a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java
+++ b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java
@@ -49,6 +49,7 @@ public class ArrayOfArrayOfNumberOnly {
    * Get arrayArrayNumber
    * @return arrayArrayNumber
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public List<List<BigDecimal>> getArrayArrayNumber() {
     return arrayArrayNumber;
diff --git a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java
index 2dcfdf3c78..f4399ff42d 100644
--- a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java
+++ b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java
@@ -49,6 +49,7 @@ public class ArrayOfNumberOnly {
    * Get arrayNumber
    * @return arrayNumber
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public List<BigDecimal> getArrayNumber() {
     return arrayNumber;
diff --git a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/ArrayTest.java b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/ArrayTest.java
index 0778fc2d8f..7483fa96ce 100644
--- a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/ArrayTest.java
+++ b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/ArrayTest.java
@@ -55,6 +55,7 @@ public class ArrayTest {
    * Get arrayOfString
    * @return arrayOfString
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public List<String> getArrayOfString() {
     return arrayOfString;
@@ -81,6 +82,7 @@ public class ArrayTest {
    * Get arrayArrayOfInteger
    * @return arrayArrayOfInteger
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public List<List<Long>> getArrayArrayOfInteger() {
     return arrayArrayOfInteger;
@@ -107,6 +109,7 @@ public class ArrayTest {
    * Get arrayArrayOfModel
    * @return arrayArrayOfModel
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public List<List<ReadOnlyFirst>> getArrayArrayOfModel() {
     return arrayArrayOfModel;
diff --git a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/Capitalization.java b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/Capitalization.java
index cedbd8c9db..bb83be97fe 100644
--- a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/Capitalization.java
+++ b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/Capitalization.java
@@ -53,6 +53,7 @@ public class Capitalization {
    * Get smallCamel
    * @return smallCamel
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getSmallCamel() {
     return smallCamel;
@@ -71,6 +72,7 @@ public class Capitalization {
    * Get capitalCamel
    * @return capitalCamel
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getCapitalCamel() {
     return capitalCamel;
@@ -89,6 +91,7 @@ public class Capitalization {
    * Get smallSnake
    * @return smallSnake
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getSmallSnake() {
     return smallSnake;
@@ -107,6 +110,7 @@ public class Capitalization {
    * Get capitalSnake
    * @return capitalSnake
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getCapitalSnake() {
     return capitalSnake;
@@ -125,6 +129,7 @@ public class Capitalization {
    * Get scAETHFlowPoints
    * @return scAETHFlowPoints
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getScAETHFlowPoints() {
     return scAETHFlowPoints;
@@ -143,6 +148,7 @@ public class Capitalization {
    * Name of the pet 
    * @return ATT_NAME
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "Name of the pet ")
   public String getATTNAME() {
     return ATT_NAME;
diff --git a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/Cat.java b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/Cat.java
index 40f40f869e..ce456c8647 100644
--- a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/Cat.java
+++ b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/Cat.java
@@ -40,6 +40,7 @@ public class Cat extends Animal {
    * Get declawed
    * @return declawed
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Boolean getDeclawed() {
     return declawed;
diff --git a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/CatAllOf.java b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/CatAllOf.java
index 0e8a7f8fa9..224c08671c 100644
--- a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/CatAllOf.java
+++ b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/CatAllOf.java
@@ -38,6 +38,7 @@ public class CatAllOf {
    * Get declawed
    * @return declawed
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Boolean getDeclawed() {
     return declawed;
diff --git a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/Category.java b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/Category.java
index baf44c948a..03efdd4be8 100644
--- a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/Category.java
+++ b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/Category.java
@@ -41,6 +41,7 @@ public class Category {
    * Get id
    * @return id
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Long getId() {
     return id;
@@ -59,6 +60,7 @@ public class Category {
    * Get name
    * @return name
   **/
+
   @ApiModelProperty(required = true, value = "")
   public String getName() {
     return name;
diff --git a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/ClassModel.java b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/ClassModel.java
index 0904f531de..def421a670 100644
--- a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/ClassModel.java
+++ b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/ClassModel.java
@@ -39,6 +39,7 @@ public class ClassModel {
    * Get propertyClass
    * @return propertyClass
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getPropertyClass() {
     return propertyClass;
diff --git a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/Client.java b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/Client.java
index 9ebcc7294e..c0bd0743e5 100644
--- a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/Client.java
+++ b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/Client.java
@@ -38,6 +38,7 @@ public class Client {
    * Get client
    * @return client
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getClient() {
     return client;
diff --git a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/Dog.java b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/Dog.java
index 3b1c570cb4..6b79c59606 100644
--- a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/Dog.java
+++ b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/Dog.java
@@ -40,6 +40,7 @@ public class Dog extends Animal {
    * Get breed
    * @return breed
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getBreed() {
     return breed;
diff --git a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/DogAllOf.java b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/DogAllOf.java
index cb95a6a372..1a4496d8f0 100644
--- a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/DogAllOf.java
+++ b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/DogAllOf.java
@@ -38,6 +38,7 @@ public class DogAllOf {
    * Get breed
    * @return breed
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getBreed() {
     return breed;
diff --git a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/EnumArrays.java b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/EnumArrays.java
index cb8d45860a..40e31bf3ca 100644
--- a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/EnumArrays.java
+++ b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/EnumArrays.java
@@ -113,6 +113,7 @@ public class EnumArrays {
    * Get justSymbol
    * @return justSymbol
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public JustSymbolEnum getJustSymbol() {
     return justSymbol;
@@ -139,6 +140,7 @@ public class EnumArrays {
    * Get arrayEnum
    * @return arrayEnum
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public List<ArrayEnumEnum> getArrayEnum() {
     return arrayEnum;
diff --git a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/EnumTest.java b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/EnumTest.java
index bdf61d52c9..d4b36798ee 100644
--- a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/EnumTest.java
+++ b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/EnumTest.java
@@ -195,6 +195,7 @@ public class EnumTest {
    * Get enumString
    * @return enumString
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public EnumStringEnum getEnumString() {
     return enumString;
@@ -213,6 +214,7 @@ public class EnumTest {
    * Get enumStringRequired
    * @return enumStringRequired
   **/
+
   @ApiModelProperty(required = true, value = "")
   public EnumStringRequiredEnum getEnumStringRequired() {
     return enumStringRequired;
@@ -231,6 +233,7 @@ public class EnumTest {
    * Get enumInteger
    * @return enumInteger
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public EnumIntegerEnum getEnumInteger() {
     return enumInteger;
@@ -249,6 +252,7 @@ public class EnumTest {
    * Get enumNumber
    * @return enumNumber
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public EnumNumberEnum getEnumNumber() {
     return enumNumber;
@@ -267,6 +271,7 @@ public class EnumTest {
    * Get outerEnum
    * @return outerEnum
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public OuterEnum getOuterEnum() {
     return outerEnum;
diff --git a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java
index 326b1a90a3..bee77a8cec 100644
--- a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java
+++ b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java
@@ -43,6 +43,7 @@ public class FileSchemaTestClass {
    * Get file
    * @return file
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public java.io.File getFile() {
     return file;
@@ -69,6 +70,7 @@ public class FileSchemaTestClass {
    * Get files
    * @return files
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public List<java.io.File> getFiles() {
     return files;
diff --git a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/FormatTest.java b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/FormatTest.java
index dd1c2d2f58..c017f57a80 100644
--- a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/FormatTest.java
+++ b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/FormatTest.java
@@ -81,6 +81,7 @@ public class FormatTest {
    * maximum: 100
    * @return integer
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Integer getInteger() {
     return integer;
@@ -101,6 +102,7 @@ public class FormatTest {
    * maximum: 200
    * @return int32
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Integer getInt32() {
     return int32;
@@ -119,6 +121,7 @@ public class FormatTest {
    * Get int64
    * @return int64
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Long getInt64() {
     return int64;
@@ -139,6 +142,7 @@ public class FormatTest {
    * maximum: 543.2
    * @return number
   **/
+
   @ApiModelProperty(required = true, value = "")
   public BigDecimal getNumber() {
     return number;
@@ -159,6 +163,7 @@ public class FormatTest {
    * maximum: 987.6
    * @return _float
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Float getFloat() {
     return _float;
@@ -179,6 +184,7 @@ public class FormatTest {
    * maximum: 123.4
    * @return _double
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Double getDouble() {
     return _double;
@@ -197,6 +203,7 @@ public class FormatTest {
    * Get string
    * @return string
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getString() {
     return string;
@@ -215,6 +222,7 @@ public class FormatTest {
    * Get _byte
    * @return _byte
   **/
+
   @ApiModelProperty(required = true, value = "")
   public byte[] getByte() {
     return _byte;
@@ -233,6 +241,7 @@ public class FormatTest {
    * Get binary
    * @return binary
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public File getBinary() {
     return binary;
@@ -251,6 +260,7 @@ public class FormatTest {
    * Get date
    * @return date
   **/
+
   @ApiModelProperty(required = true, value = "")
   public LocalDate getDate() {
     return date;
@@ -269,6 +279,7 @@ public class FormatTest {
    * Get dateTime
    * @return dateTime
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public OffsetDateTime getDateTime() {
     return dateTime;
@@ -287,6 +298,7 @@ public class FormatTest {
    * Get uuid
    * @return uuid
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(example = "72f98069-206d-4f12-9f12-3d1e525a8e84", value = "")
   public UUID getUuid() {
     return uuid;
@@ -305,6 +317,7 @@ public class FormatTest {
    * Get password
    * @return password
   **/
+
   @ApiModelProperty(required = true, value = "")
   public String getPassword() {
     return password;
diff --git a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java
index 4dbede6b7d..44159e08e8 100644
--- a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java
+++ b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java
@@ -36,6 +36,7 @@ public class HasOnlyReadOnly {
    * Get bar
    * @return bar
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getBar() {
     return bar;
@@ -45,6 +46,7 @@ public class HasOnlyReadOnly {
    * Get foo
    * @return foo
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getFoo() {
     return foo;
diff --git a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/MapTest.java b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/MapTest.java
index 625b6be97d..a7a141bb9b 100644
--- a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/MapTest.java
+++ b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/MapTest.java
@@ -93,6 +93,7 @@ public class MapTest {
    * Get mapMapOfString
    * @return mapMapOfString
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Map<String, Map<String, String>> getMapMapOfString() {
     return mapMapOfString;
@@ -119,6 +120,7 @@ public class MapTest {
    * Get mapOfEnumString
    * @return mapOfEnumString
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Map<String, InnerEnum> getMapOfEnumString() {
     return mapOfEnumString;
@@ -145,6 +147,7 @@ public class MapTest {
    * Get directMap
    * @return directMap
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Map<String, Boolean> getDirectMap() {
     return directMap;
@@ -171,6 +174,7 @@ public class MapTest {
    * Get indirectMap
    * @return indirectMap
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Map<String, Boolean> getIndirectMap() {
     return indirectMap;
diff --git a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java
index 0adbe0caa7..ea930e3e2e 100644
--- a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java
+++ b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java
@@ -50,6 +50,7 @@ public class MixedPropertiesAndAdditionalPropertiesClass {
    * Get uuid
    * @return uuid
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public UUID getUuid() {
     return uuid;
@@ -68,6 +69,7 @@ public class MixedPropertiesAndAdditionalPropertiesClass {
    * Get dateTime
    * @return dateTime
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public OffsetDateTime getDateTime() {
     return dateTime;
@@ -94,6 +96,7 @@ public class MixedPropertiesAndAdditionalPropertiesClass {
    * Get map
    * @return map
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Map<String, Animal> getMap() {
     return map;
diff --git a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/Model200Response.java b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/Model200Response.java
index 3be60ea3ae..bd3244dd57 100644
--- a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/Model200Response.java
+++ b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/Model200Response.java
@@ -42,6 +42,7 @@ public class Model200Response {
    * Get name
    * @return name
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Integer getName() {
     return name;
@@ -60,6 +61,7 @@ public class Model200Response {
    * Get propertyClass
    * @return propertyClass
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getPropertyClass() {
     return propertyClass;
diff --git a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/ModelApiResponse.java b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/ModelApiResponse.java
index 6e458e38dc..ed335cdca1 100644
--- a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/ModelApiResponse.java
+++ b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/ModelApiResponse.java
@@ -44,6 +44,7 @@ public class ModelApiResponse {
    * Get code
    * @return code
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Integer getCode() {
     return code;
@@ -62,6 +63,7 @@ public class ModelApiResponse {
    * Get type
    * @return type
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getType() {
     return type;
@@ -80,6 +82,7 @@ public class ModelApiResponse {
    * Get message
    * @return message
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getMessage() {
     return message;
diff --git a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/ModelReturn.java b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/ModelReturn.java
index 62e5295212..04c0bcd33f 100644
--- a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/ModelReturn.java
+++ b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/ModelReturn.java
@@ -39,6 +39,7 @@ public class ModelReturn {
    * Get _return
    * @return _return
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Integer getReturn() {
     return _return;
diff --git a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/Name.java b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/Name.java
index 852a999035..af27c6e45f 100644
--- a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/Name.java
+++ b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/Name.java
@@ -48,6 +48,7 @@ public class Name {
    * Get name
    * @return name
   **/
+
   @ApiModelProperty(required = true, value = "")
   public Integer getName() {
     return name;
@@ -61,6 +62,7 @@ public class Name {
    * Get snakeCase
    * @return snakeCase
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Integer getSnakeCase() {
     return snakeCase;
@@ -75,6 +77,7 @@ public class Name {
    * Get property
    * @return property
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getProperty() {
     return property;
@@ -88,6 +91,7 @@ public class Name {
    * Get _123number
    * @return _123number
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Integer get123number() {
     return _123number;
diff --git a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/NumberOnly.java b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/NumberOnly.java
index 530a4d5818..4e29c814cc 100644
--- a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/NumberOnly.java
+++ b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/NumberOnly.java
@@ -39,6 +39,7 @@ public class NumberOnly {
    * Get justNumber
    * @return justNumber
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public BigDecimal getJustNumber() {
     return justNumber;
diff --git a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/Order.java b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/Order.java
index c6cee16a58..9e935d606e 100644
--- a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/Order.java
+++ b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/Order.java
@@ -91,6 +91,7 @@ public class Order {
    * Get id
    * @return id
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Long getId() {
     return id;
@@ -109,6 +110,7 @@ public class Order {
    * Get petId
    * @return petId
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Long getPetId() {
     return petId;
@@ -127,6 +129,7 @@ public class Order {
    * Get quantity
    * @return quantity
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Integer getQuantity() {
     return quantity;
@@ -145,6 +148,7 @@ public class Order {
    * Get shipDate
    * @return shipDate
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public OffsetDateTime getShipDate() {
     return shipDate;
@@ -163,6 +167,7 @@ public class Order {
    * Order Status
    * @return status
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "Order Status")
   public StatusEnum getStatus() {
     return status;
@@ -181,6 +186,7 @@ public class Order {
    * Get complete
    * @return complete
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Boolean getComplete() {
     return complete;
diff --git a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/OuterComposite.java b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/OuterComposite.java
index 6e71242384..f6515126a8 100644
--- a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/OuterComposite.java
+++ b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/OuterComposite.java
@@ -45,6 +45,7 @@ public class OuterComposite {
    * Get myNumber
    * @return myNumber
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public BigDecimal getMyNumber() {
     return myNumber;
@@ -63,6 +64,7 @@ public class OuterComposite {
    * Get myString
    * @return myString
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getMyString() {
     return myString;
@@ -81,6 +83,7 @@ public class OuterComposite {
    * Get myBoolean
    * @return myBoolean
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Boolean getMyBoolean() {
     return myBoolean;
diff --git a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/Pet.java b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/Pet.java
index 8a2408a296..63e9b4ff5d 100644
--- a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/Pet.java
+++ b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/Pet.java
@@ -94,6 +94,7 @@ public class Pet {
    * Get id
    * @return id
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Long getId() {
     return id;
@@ -112,6 +113,7 @@ public class Pet {
    * Get category
    * @return category
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Category getCategory() {
     return category;
@@ -130,6 +132,7 @@ public class Pet {
    * Get name
    * @return name
   **/
+
   @ApiModelProperty(example = "doggie", required = true, value = "")
   public String getName() {
     return name;
@@ -153,6 +156,7 @@ public class Pet {
    * Get photoUrls
    * @return photoUrls
   **/
+
   @ApiModelProperty(required = true, value = "")
   public List<String> getPhotoUrls() {
     return photoUrls;
@@ -179,6 +183,7 @@ public class Pet {
    * Get tags
    * @return tags
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public List<Tag> getTags() {
     return tags;
@@ -197,6 +202,7 @@ public class Pet {
    * pet status in the store
    * @return status
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "pet status in the store")
   public StatusEnum getStatus() {
     return status;
diff --git a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/ReadOnlyFirst.java b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/ReadOnlyFirst.java
index 83f25c7923..a2c9e99699 100644
--- a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/ReadOnlyFirst.java
+++ b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/ReadOnlyFirst.java
@@ -36,6 +36,7 @@ public class ReadOnlyFirst {
    * Get bar
    * @return bar
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getBar() {
     return bar;
@@ -50,6 +51,7 @@ public class ReadOnlyFirst {
    * Get baz
    * @return baz
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getBaz() {
     return baz;
diff --git a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/SpecialModelName.java b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/SpecialModelName.java
index 5abfc132ad..a5ddb0b638 100644
--- a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/SpecialModelName.java
+++ b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/SpecialModelName.java
@@ -38,6 +38,7 @@ public class SpecialModelName {
    * Get $specialPropertyName
    * @return $specialPropertyName
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Long get$SpecialPropertyName() {
     return $specialPropertyName;
diff --git a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/Tag.java b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/Tag.java
index e2e947b84a..8255ad8298 100644
--- a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/Tag.java
+++ b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/Tag.java
@@ -41,6 +41,7 @@ public class Tag {
    * Get id
    * @return id
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Long getId() {
     return id;
@@ -59,6 +60,7 @@ public class Tag {
    * Get name
    * @return name
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getName() {
     return name;
diff --git a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/TypeHolderDefault.java b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/TypeHolderDefault.java
index 9d0f5b2fbe..d8c7b3efdd 100644
--- a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/TypeHolderDefault.java
+++ b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/TypeHolderDefault.java
@@ -53,6 +53,7 @@ public class TypeHolderDefault {
    * Get stringItem
    * @return stringItem
   **/
+
   @ApiModelProperty(required = true, value = "")
   public String getStringItem() {
     return stringItem;
@@ -71,6 +72,7 @@ public class TypeHolderDefault {
    * Get numberItem
    * @return numberItem
   **/
+
   @ApiModelProperty(required = true, value = "")
   public BigDecimal getNumberItem() {
     return numberItem;
@@ -89,6 +91,7 @@ public class TypeHolderDefault {
    * Get integerItem
    * @return integerItem
   **/
+
   @ApiModelProperty(required = true, value = "")
   public Integer getIntegerItem() {
     return integerItem;
@@ -107,6 +110,7 @@ public class TypeHolderDefault {
    * Get boolItem
    * @return boolItem
   **/
+
   @ApiModelProperty(required = true, value = "")
   public Boolean getBoolItem() {
     return boolItem;
@@ -130,6 +134,7 @@ public class TypeHolderDefault {
    * Get arrayItem
    * @return arrayItem
   **/
+
   @ApiModelProperty(required = true, value = "")
   public List<Integer> getArrayItem() {
     return arrayItem;
diff --git a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/TypeHolderExample.java b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/TypeHolderExample.java
index 94d3c57b6f..c1d5ea30f8 100644
--- a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/TypeHolderExample.java
+++ b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/TypeHolderExample.java
@@ -53,6 +53,7 @@ public class TypeHolderExample {
    * Get stringItem
    * @return stringItem
   **/
+
   @ApiModelProperty(example = "what", required = true, value = "")
   public String getStringItem() {
     return stringItem;
@@ -71,6 +72,7 @@ public class TypeHolderExample {
    * Get numberItem
    * @return numberItem
   **/
+
   @ApiModelProperty(example = "1.234", required = true, value = "")
   public BigDecimal getNumberItem() {
     return numberItem;
@@ -89,6 +91,7 @@ public class TypeHolderExample {
    * Get integerItem
    * @return integerItem
   **/
+
   @ApiModelProperty(example = "-2", required = true, value = "")
   public Integer getIntegerItem() {
     return integerItem;
@@ -107,6 +110,7 @@ public class TypeHolderExample {
    * Get boolItem
    * @return boolItem
   **/
+
   @ApiModelProperty(example = "true", required = true, value = "")
   public Boolean getBoolItem() {
     return boolItem;
@@ -130,6 +134,7 @@ public class TypeHolderExample {
    * Get arrayItem
    * @return arrayItem
   **/
+
   @ApiModelProperty(example = "[0, 1, 2, 3]", required = true, value = "")
   public List<Integer> getArrayItem() {
     return arrayItem;
diff --git a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/User.java b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/User.java
index ee3f656a1a..6e6c4ac102 100644
--- a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/User.java
+++ b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/User.java
@@ -59,6 +59,7 @@ public class User {
    * Get id
    * @return id
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Long getId() {
     return id;
@@ -77,6 +78,7 @@ public class User {
    * Get username
    * @return username
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getUsername() {
     return username;
@@ -95,6 +97,7 @@ public class User {
    * Get firstName
    * @return firstName
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getFirstName() {
     return firstName;
@@ -113,6 +116,7 @@ public class User {
    * Get lastName
    * @return lastName
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getLastName() {
     return lastName;
@@ -131,6 +135,7 @@ public class User {
    * Get email
    * @return email
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getEmail() {
     return email;
@@ -149,6 +154,7 @@ public class User {
    * Get password
    * @return password
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getPassword() {
     return password;
@@ -167,6 +173,7 @@ public class User {
    * Get phone
    * @return phone
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getPhone() {
     return phone;
@@ -185,6 +192,7 @@ public class User {
    * User Status
    * @return userStatus
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "User Status")
   public Integer getUserStatus() {
     return userStatus;
diff --git a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/XmlItem.java b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/XmlItem.java
index cb31157306..ce4af3e8b9 100644
--- a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/XmlItem.java
+++ b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/XmlItem.java
@@ -125,6 +125,7 @@ public class XmlItem {
    * Get attributeString
    * @return attributeString
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(example = "string", value = "")
   public String getAttributeString() {
     return attributeString;
@@ -143,6 +144,7 @@ public class XmlItem {
    * Get attributeNumber
    * @return attributeNumber
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(example = "1.234", value = "")
   public BigDecimal getAttributeNumber() {
     return attributeNumber;
@@ -161,6 +163,7 @@ public class XmlItem {
    * Get attributeInteger
    * @return attributeInteger
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(example = "-2", value = "")
   public Integer getAttributeInteger() {
     return attributeInteger;
@@ -179,6 +182,7 @@ public class XmlItem {
    * Get attributeBoolean
    * @return attributeBoolean
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(example = "true", value = "")
   public Boolean getAttributeBoolean() {
     return attributeBoolean;
@@ -205,6 +209,7 @@ public class XmlItem {
    * Get wrappedArray
    * @return wrappedArray
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public List<Integer> getWrappedArray() {
     return wrappedArray;
@@ -223,6 +228,7 @@ public class XmlItem {
    * Get nameString
    * @return nameString
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(example = "string", value = "")
   public String getNameString() {
     return nameString;
@@ -241,6 +247,7 @@ public class XmlItem {
    * Get nameNumber
    * @return nameNumber
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(example = "1.234", value = "")
   public BigDecimal getNameNumber() {
     return nameNumber;
@@ -259,6 +266,7 @@ public class XmlItem {
    * Get nameInteger
    * @return nameInteger
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(example = "-2", value = "")
   public Integer getNameInteger() {
     return nameInteger;
@@ -277,6 +285,7 @@ public class XmlItem {
    * Get nameBoolean
    * @return nameBoolean
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(example = "true", value = "")
   public Boolean getNameBoolean() {
     return nameBoolean;
@@ -303,6 +312,7 @@ public class XmlItem {
    * Get nameArray
    * @return nameArray
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public List<Integer> getNameArray() {
     return nameArray;
@@ -329,6 +339,7 @@ public class XmlItem {
    * Get nameWrappedArray
    * @return nameWrappedArray
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public List<Integer> getNameWrappedArray() {
     return nameWrappedArray;
@@ -347,6 +358,7 @@ public class XmlItem {
    * Get prefixString
    * @return prefixString
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(example = "string", value = "")
   public String getPrefixString() {
     return prefixString;
@@ -365,6 +377,7 @@ public class XmlItem {
    * Get prefixNumber
    * @return prefixNumber
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(example = "1.234", value = "")
   public BigDecimal getPrefixNumber() {
     return prefixNumber;
@@ -383,6 +396,7 @@ public class XmlItem {
    * Get prefixInteger
    * @return prefixInteger
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(example = "-2", value = "")
   public Integer getPrefixInteger() {
     return prefixInteger;
@@ -401,6 +415,7 @@ public class XmlItem {
    * Get prefixBoolean
    * @return prefixBoolean
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(example = "true", value = "")
   public Boolean getPrefixBoolean() {
     return prefixBoolean;
@@ -427,6 +442,7 @@ public class XmlItem {
    * Get prefixArray
    * @return prefixArray
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public List<Integer> getPrefixArray() {
     return prefixArray;
@@ -453,6 +469,7 @@ public class XmlItem {
    * Get prefixWrappedArray
    * @return prefixWrappedArray
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public List<Integer> getPrefixWrappedArray() {
     return prefixWrappedArray;
@@ -471,6 +488,7 @@ public class XmlItem {
    * Get namespaceString
    * @return namespaceString
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(example = "string", value = "")
   public String getNamespaceString() {
     return namespaceString;
@@ -489,6 +507,7 @@ public class XmlItem {
    * Get namespaceNumber
    * @return namespaceNumber
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(example = "1.234", value = "")
   public BigDecimal getNamespaceNumber() {
     return namespaceNumber;
@@ -507,6 +526,7 @@ public class XmlItem {
    * Get namespaceInteger
    * @return namespaceInteger
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(example = "-2", value = "")
   public Integer getNamespaceInteger() {
     return namespaceInteger;
@@ -525,6 +545,7 @@ public class XmlItem {
    * Get namespaceBoolean
    * @return namespaceBoolean
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(example = "true", value = "")
   public Boolean getNamespaceBoolean() {
     return namespaceBoolean;
@@ -551,6 +572,7 @@ public class XmlItem {
    * Get namespaceArray
    * @return namespaceArray
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public List<Integer> getNamespaceArray() {
     return namespaceArray;
@@ -577,6 +599,7 @@ public class XmlItem {
    * Get namespaceWrappedArray
    * @return namespaceWrappedArray
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public List<Integer> getNamespaceWrappedArray() {
     return namespaceWrappedArray;
@@ -595,6 +618,7 @@ public class XmlItem {
    * Get prefixNsString
    * @return prefixNsString
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(example = "string", value = "")
   public String getPrefixNsString() {
     return prefixNsString;
@@ -613,6 +637,7 @@ public class XmlItem {
    * Get prefixNsNumber
    * @return prefixNsNumber
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(example = "1.234", value = "")
   public BigDecimal getPrefixNsNumber() {
     return prefixNsNumber;
@@ -631,6 +656,7 @@ public class XmlItem {
    * Get prefixNsInteger
    * @return prefixNsInteger
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(example = "-2", value = "")
   public Integer getPrefixNsInteger() {
     return prefixNsInteger;
@@ -649,6 +675,7 @@ public class XmlItem {
    * Get prefixNsBoolean
    * @return prefixNsBoolean
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(example = "true", value = "")
   public Boolean getPrefixNsBoolean() {
     return prefixNsBoolean;
@@ -675,6 +702,7 @@ public class XmlItem {
    * Get prefixNsArray
    * @return prefixNsArray
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public List<Integer> getPrefixNsArray() {
     return prefixNsArray;
@@ -701,6 +729,7 @@ public class XmlItem {
    * Get prefixNsWrappedArray
    * @return prefixNsWrappedArray
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public List<Integer> getPrefixNsWrappedArray() {
     return prefixNsWrappedArray;
diff --git a/samples/client/petstore/java/retrofit/build.gradle b/samples/client/petstore/java/retrofit/build.gradle
index f490b47176..2bdf348905 100644
--- a/samples/client/petstore/java/retrofit/build.gradle
+++ b/samples/client/petstore/java/retrofit/build.gradle
@@ -105,6 +105,7 @@ ext {
 
 dependencies {
     compile "com.squareup.okhttp:okhttp:$okhttp_version"
+    compile "com.google.code.findbugs:jsr305:3.0.2"
     compile "com.squareup.retrofit:retrofit:$retrofit_version"
     compile "io.swagger:swagger-annotations:$swagger_annotations_version"
     compile "org.apache.oltu.oauth2:org.apache.oltu.oauth2.client:$oltu_version"
diff --git a/samples/client/petstore/java/retrofit/src/main/java/org/openapitools/client/model/AdditionalPropertiesAnyType.java b/samples/client/petstore/java/retrofit/src/main/java/org/openapitools/client/model/AdditionalPropertiesAnyType.java
index 9c47737ced..e98f74f8ae 100644
--- a/samples/client/petstore/java/retrofit/src/main/java/org/openapitools/client/model/AdditionalPropertiesAnyType.java
+++ b/samples/client/petstore/java/retrofit/src/main/java/org/openapitools/client/model/AdditionalPropertiesAnyType.java
@@ -44,6 +44,7 @@ public class AdditionalPropertiesAnyType extends HashMap<String, Object> {
    * Get name
    * @return name
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getName() {
     return name;
diff --git a/samples/client/petstore/java/retrofit/src/main/java/org/openapitools/client/model/AdditionalPropertiesArray.java b/samples/client/petstore/java/retrofit/src/main/java/org/openapitools/client/model/AdditionalPropertiesArray.java
index c5eed6cdac..1d86faad3e 100644
--- a/samples/client/petstore/java/retrofit/src/main/java/org/openapitools/client/model/AdditionalPropertiesArray.java
+++ b/samples/client/petstore/java/retrofit/src/main/java/org/openapitools/client/model/AdditionalPropertiesArray.java
@@ -45,6 +45,7 @@ public class AdditionalPropertiesArray extends HashMap<String, List> {
    * Get name
    * @return name
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getName() {
     return name;
diff --git a/samples/client/petstore/java/retrofit/src/main/java/org/openapitools/client/model/AdditionalPropertiesBoolean.java b/samples/client/petstore/java/retrofit/src/main/java/org/openapitools/client/model/AdditionalPropertiesBoolean.java
index 390777ff37..a3b37161da 100644
--- a/samples/client/petstore/java/retrofit/src/main/java/org/openapitools/client/model/AdditionalPropertiesBoolean.java
+++ b/samples/client/petstore/java/retrofit/src/main/java/org/openapitools/client/model/AdditionalPropertiesBoolean.java
@@ -44,6 +44,7 @@ public class AdditionalPropertiesBoolean extends HashMap<String, Boolean> {
    * Get name
    * @return name
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getName() {
     return name;
diff --git a/samples/client/petstore/java/retrofit/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java b/samples/client/petstore/java/retrofit/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java
index 3c1a02c33c..8819f4a024 100644
--- a/samples/client/petstore/java/retrofit/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java
+++ b/samples/client/petstore/java/retrofit/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java
@@ -94,6 +94,7 @@ public class AdditionalPropertiesClass {
    * Get mapString
    * @return mapString
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Map<String, String> getMapString() {
     return mapString;
@@ -120,6 +121,7 @@ public class AdditionalPropertiesClass {
    * Get mapNumber
    * @return mapNumber
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Map<String, BigDecimal> getMapNumber() {
     return mapNumber;
@@ -146,6 +148,7 @@ public class AdditionalPropertiesClass {
    * Get mapInteger
    * @return mapInteger
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Map<String, Integer> getMapInteger() {
     return mapInteger;
@@ -172,6 +175,7 @@ public class AdditionalPropertiesClass {
    * Get mapBoolean
    * @return mapBoolean
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Map<String, Boolean> getMapBoolean() {
     return mapBoolean;
@@ -198,6 +202,7 @@ public class AdditionalPropertiesClass {
    * Get mapArrayInteger
    * @return mapArrayInteger
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Map<String, List<Integer>> getMapArrayInteger() {
     return mapArrayInteger;
@@ -224,6 +229,7 @@ public class AdditionalPropertiesClass {
    * Get mapArrayAnytype
    * @return mapArrayAnytype
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Map<String, List<Object>> getMapArrayAnytype() {
     return mapArrayAnytype;
@@ -250,6 +256,7 @@ public class AdditionalPropertiesClass {
    * Get mapMapString
    * @return mapMapString
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Map<String, Map<String, String>> getMapMapString() {
     return mapMapString;
@@ -276,6 +283,7 @@ public class AdditionalPropertiesClass {
    * Get mapMapAnytype
    * @return mapMapAnytype
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Map<String, Map<String, Object>> getMapMapAnytype() {
     return mapMapAnytype;
@@ -294,6 +302,7 @@ public class AdditionalPropertiesClass {
    * Get anytype1
    * @return anytype1
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Object getAnytype1() {
     return anytype1;
@@ -312,6 +321,7 @@ public class AdditionalPropertiesClass {
    * Get anytype2
    * @return anytype2
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Object getAnytype2() {
     return anytype2;
@@ -330,6 +340,7 @@ public class AdditionalPropertiesClass {
    * Get anytype3
    * @return anytype3
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Object getAnytype3() {
     return anytype3;
diff --git a/samples/client/petstore/java/retrofit/src/main/java/org/openapitools/client/model/AdditionalPropertiesInteger.java b/samples/client/petstore/java/retrofit/src/main/java/org/openapitools/client/model/AdditionalPropertiesInteger.java
index df6e865593..b8f956cbed 100644
--- a/samples/client/petstore/java/retrofit/src/main/java/org/openapitools/client/model/AdditionalPropertiesInteger.java
+++ b/samples/client/petstore/java/retrofit/src/main/java/org/openapitools/client/model/AdditionalPropertiesInteger.java
@@ -44,6 +44,7 @@ public class AdditionalPropertiesInteger extends HashMap<String, Integer> {
    * Get name
    * @return name
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getName() {
     return name;
diff --git a/samples/client/petstore/java/retrofit/src/main/java/org/openapitools/client/model/AdditionalPropertiesNumber.java b/samples/client/petstore/java/retrofit/src/main/java/org/openapitools/client/model/AdditionalPropertiesNumber.java
index 8a9118cf85..03d923ab1d 100644
--- a/samples/client/petstore/java/retrofit/src/main/java/org/openapitools/client/model/AdditionalPropertiesNumber.java
+++ b/samples/client/petstore/java/retrofit/src/main/java/org/openapitools/client/model/AdditionalPropertiesNumber.java
@@ -45,6 +45,7 @@ public class AdditionalPropertiesNumber extends HashMap<String, BigDecimal> {
    * Get name
    * @return name
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getName() {
     return name;
diff --git a/samples/client/petstore/java/retrofit/src/main/java/org/openapitools/client/model/AdditionalPropertiesObject.java b/samples/client/petstore/java/retrofit/src/main/java/org/openapitools/client/model/AdditionalPropertiesObject.java
index b67f12d840..c0e696dbd5 100644
--- a/samples/client/petstore/java/retrofit/src/main/java/org/openapitools/client/model/AdditionalPropertiesObject.java
+++ b/samples/client/petstore/java/retrofit/src/main/java/org/openapitools/client/model/AdditionalPropertiesObject.java
@@ -44,6 +44,7 @@ public class AdditionalPropertiesObject extends HashMap<String, Map> {
    * Get name
    * @return name
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getName() {
     return name;
diff --git a/samples/client/petstore/java/retrofit/src/main/java/org/openapitools/client/model/AdditionalPropertiesString.java b/samples/client/petstore/java/retrofit/src/main/java/org/openapitools/client/model/AdditionalPropertiesString.java
index 6e54b260fd..67e597e3cf 100644
--- a/samples/client/petstore/java/retrofit/src/main/java/org/openapitools/client/model/AdditionalPropertiesString.java
+++ b/samples/client/petstore/java/retrofit/src/main/java/org/openapitools/client/model/AdditionalPropertiesString.java
@@ -44,6 +44,7 @@ public class AdditionalPropertiesString extends HashMap<String, String> {
    * Get name
    * @return name
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getName() {
     return name;
diff --git a/samples/client/petstore/java/retrofit/src/main/java/org/openapitools/client/model/Animal.java b/samples/client/petstore/java/retrofit/src/main/java/org/openapitools/client/model/Animal.java
index 06342bce06..1738bdaf47 100644
--- a/samples/client/petstore/java/retrofit/src/main/java/org/openapitools/client/model/Animal.java
+++ b/samples/client/petstore/java/retrofit/src/main/java/org/openapitools/client/model/Animal.java
@@ -50,6 +50,7 @@ public class Animal {
    * Get className
    * @return className
   **/
+
   @ApiModelProperty(required = true, value = "")
   public String getClassName() {
     return className;
@@ -68,6 +69,7 @@ public class Animal {
    * Get color
    * @return color
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getColor() {
     return color;
diff --git a/samples/client/petstore/java/retrofit/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java b/samples/client/petstore/java/retrofit/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java
index 87429212a6..69c0cacb05 100644
--- a/samples/client/petstore/java/retrofit/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java
+++ b/samples/client/petstore/java/retrofit/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java
@@ -53,6 +53,7 @@ public class ArrayOfArrayOfNumberOnly {
    * Get arrayArrayNumber
    * @return arrayArrayNumber
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public List<List<BigDecimal>> getArrayArrayNumber() {
     return arrayArrayNumber;
diff --git a/samples/client/petstore/java/retrofit/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java b/samples/client/petstore/java/retrofit/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java
index c21e45d438..a85aa96af7 100644
--- a/samples/client/petstore/java/retrofit/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java
+++ b/samples/client/petstore/java/retrofit/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java
@@ -53,6 +53,7 @@ public class ArrayOfNumberOnly {
    * Get arrayNumber
    * @return arrayNumber
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public List<BigDecimal> getArrayNumber() {
     return arrayNumber;
diff --git a/samples/client/petstore/java/retrofit/src/main/java/org/openapitools/client/model/ArrayTest.java b/samples/client/petstore/java/retrofit/src/main/java/org/openapitools/client/model/ArrayTest.java
index 8ae596291a..986ac5aa17 100644
--- a/samples/client/petstore/java/retrofit/src/main/java/org/openapitools/client/model/ArrayTest.java
+++ b/samples/client/petstore/java/retrofit/src/main/java/org/openapitools/client/model/ArrayTest.java
@@ -61,6 +61,7 @@ public class ArrayTest {
    * Get arrayOfString
    * @return arrayOfString
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public List<String> getArrayOfString() {
     return arrayOfString;
@@ -87,6 +88,7 @@ public class ArrayTest {
    * Get arrayArrayOfInteger
    * @return arrayArrayOfInteger
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public List<List<Long>> getArrayArrayOfInteger() {
     return arrayArrayOfInteger;
@@ -113,6 +115,7 @@ public class ArrayTest {
    * Get arrayArrayOfModel
    * @return arrayArrayOfModel
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public List<List<ReadOnlyFirst>> getArrayArrayOfModel() {
     return arrayArrayOfModel;
diff --git a/samples/client/petstore/java/retrofit/src/main/java/org/openapitools/client/model/Capitalization.java b/samples/client/petstore/java/retrofit/src/main/java/org/openapitools/client/model/Capitalization.java
index 3f05d95d60..36f8853e1c 100644
--- a/samples/client/petstore/java/retrofit/src/main/java/org/openapitools/client/model/Capitalization.java
+++ b/samples/client/petstore/java/retrofit/src/main/java/org/openapitools/client/model/Capitalization.java
@@ -62,6 +62,7 @@ public class Capitalization {
    * Get smallCamel
    * @return smallCamel
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getSmallCamel() {
     return smallCamel;
@@ -80,6 +81,7 @@ public class Capitalization {
    * Get capitalCamel
    * @return capitalCamel
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getCapitalCamel() {
     return capitalCamel;
@@ -98,6 +100,7 @@ public class Capitalization {
    * Get smallSnake
    * @return smallSnake
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getSmallSnake() {
     return smallSnake;
@@ -116,6 +119,7 @@ public class Capitalization {
    * Get capitalSnake
    * @return capitalSnake
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getCapitalSnake() {
     return capitalSnake;
@@ -134,6 +138,7 @@ public class Capitalization {
    * Get scAETHFlowPoints
    * @return scAETHFlowPoints
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getScAETHFlowPoints() {
     return scAETHFlowPoints;
@@ -152,6 +157,7 @@ public class Capitalization {
    * Name of the pet 
    * @return ATT_NAME
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "Name of the pet ")
   public String getATTNAME() {
     return ATT_NAME;
diff --git a/samples/client/petstore/java/retrofit/src/main/java/org/openapitools/client/model/Cat.java b/samples/client/petstore/java/retrofit/src/main/java/org/openapitools/client/model/Cat.java
index 4a12050bc8..965461a8be 100644
--- a/samples/client/petstore/java/retrofit/src/main/java/org/openapitools/client/model/Cat.java
+++ b/samples/client/petstore/java/retrofit/src/main/java/org/openapitools/client/model/Cat.java
@@ -44,6 +44,7 @@ public class Cat extends Animal {
    * Get declawed
    * @return declawed
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Boolean getDeclawed() {
     return declawed;
diff --git a/samples/client/petstore/java/retrofit/src/main/java/org/openapitools/client/model/CatAllOf.java b/samples/client/petstore/java/retrofit/src/main/java/org/openapitools/client/model/CatAllOf.java
index 1424f55ddb..124db9b8ba 100644
--- a/samples/client/petstore/java/retrofit/src/main/java/org/openapitools/client/model/CatAllOf.java
+++ b/samples/client/petstore/java/retrofit/src/main/java/org/openapitools/client/model/CatAllOf.java
@@ -42,6 +42,7 @@ public class CatAllOf {
    * Get declawed
    * @return declawed
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Boolean getDeclawed() {
     return declawed;
diff --git a/samples/client/petstore/java/retrofit/src/main/java/org/openapitools/client/model/Category.java b/samples/client/petstore/java/retrofit/src/main/java/org/openapitools/client/model/Category.java
index eb41569576..d4e121847a 100644
--- a/samples/client/petstore/java/retrofit/src/main/java/org/openapitools/client/model/Category.java
+++ b/samples/client/petstore/java/retrofit/src/main/java/org/openapitools/client/model/Category.java
@@ -46,6 +46,7 @@ public class Category {
    * Get id
    * @return id
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Long getId() {
     return id;
@@ -64,6 +65,7 @@ public class Category {
    * Get name
    * @return name
   **/
+
   @ApiModelProperty(required = true, value = "")
   public String getName() {
     return name;
diff --git a/samples/client/petstore/java/retrofit/src/main/java/org/openapitools/client/model/ClassModel.java b/samples/client/petstore/java/retrofit/src/main/java/org/openapitools/client/model/ClassModel.java
index 91632a4f68..cbdd8f317b 100644
--- a/samples/client/petstore/java/retrofit/src/main/java/org/openapitools/client/model/ClassModel.java
+++ b/samples/client/petstore/java/retrofit/src/main/java/org/openapitools/client/model/ClassModel.java
@@ -43,6 +43,7 @@ public class ClassModel {
    * Get propertyClass
    * @return propertyClass
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getPropertyClass() {
     return propertyClass;
diff --git a/samples/client/petstore/java/retrofit/src/main/java/org/openapitools/client/model/Client.java b/samples/client/petstore/java/retrofit/src/main/java/org/openapitools/client/model/Client.java
index 3067e8d184..5d9c5c4a71 100644
--- a/samples/client/petstore/java/retrofit/src/main/java/org/openapitools/client/model/Client.java
+++ b/samples/client/petstore/java/retrofit/src/main/java/org/openapitools/client/model/Client.java
@@ -42,6 +42,7 @@ public class Client {
    * Get client
    * @return client
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getClient() {
     return client;
diff --git a/samples/client/petstore/java/retrofit/src/main/java/org/openapitools/client/model/Dog.java b/samples/client/petstore/java/retrofit/src/main/java/org/openapitools/client/model/Dog.java
index 63ff1ffbec..4da9ba4364 100644
--- a/samples/client/petstore/java/retrofit/src/main/java/org/openapitools/client/model/Dog.java
+++ b/samples/client/petstore/java/retrofit/src/main/java/org/openapitools/client/model/Dog.java
@@ -44,6 +44,7 @@ public class Dog extends Animal {
    * Get breed
    * @return breed
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getBreed() {
     return breed;
diff --git a/samples/client/petstore/java/retrofit/src/main/java/org/openapitools/client/model/DogAllOf.java b/samples/client/petstore/java/retrofit/src/main/java/org/openapitools/client/model/DogAllOf.java
index 7214ddd07e..e505d1dbc3 100644
--- a/samples/client/petstore/java/retrofit/src/main/java/org/openapitools/client/model/DogAllOf.java
+++ b/samples/client/petstore/java/retrofit/src/main/java/org/openapitools/client/model/DogAllOf.java
@@ -42,6 +42,7 @@ public class DogAllOf {
    * Get breed
    * @return breed
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getBreed() {
     return breed;
diff --git a/samples/client/petstore/java/retrofit/src/main/java/org/openapitools/client/model/EnumArrays.java b/samples/client/petstore/java/retrofit/src/main/java/org/openapitools/client/model/EnumArrays.java
index bd8d680339..8748c9fa37 100644
--- a/samples/client/petstore/java/retrofit/src/main/java/org/openapitools/client/model/EnumArrays.java
+++ b/samples/client/petstore/java/retrofit/src/main/java/org/openapitools/client/model/EnumArrays.java
@@ -142,6 +142,7 @@ public class EnumArrays {
    * Get justSymbol
    * @return justSymbol
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public JustSymbolEnum getJustSymbol() {
     return justSymbol;
@@ -168,6 +169,7 @@ public class EnumArrays {
    * Get arrayEnum
    * @return arrayEnum
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public List<ArrayEnumEnum> getArrayEnum() {
     return arrayEnum;
diff --git a/samples/client/petstore/java/retrofit/src/main/java/org/openapitools/client/model/EnumTest.java b/samples/client/petstore/java/retrofit/src/main/java/org/openapitools/client/model/EnumTest.java
index 6c05a8f967..1960c24ac2 100644
--- a/samples/client/petstore/java/retrofit/src/main/java/org/openapitools/client/model/EnumTest.java
+++ b/samples/client/petstore/java/retrofit/src/main/java/org/openapitools/client/model/EnumTest.java
@@ -251,6 +251,7 @@ public class EnumTest {
    * Get enumString
    * @return enumString
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public EnumStringEnum getEnumString() {
     return enumString;
@@ -269,6 +270,7 @@ public class EnumTest {
    * Get enumStringRequired
    * @return enumStringRequired
   **/
+
   @ApiModelProperty(required = true, value = "")
   public EnumStringRequiredEnum getEnumStringRequired() {
     return enumStringRequired;
@@ -287,6 +289,7 @@ public class EnumTest {
    * Get enumInteger
    * @return enumInteger
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public EnumIntegerEnum getEnumInteger() {
     return enumInteger;
@@ -305,6 +308,7 @@ public class EnumTest {
    * Get enumNumber
    * @return enumNumber
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public EnumNumberEnum getEnumNumber() {
     return enumNumber;
@@ -323,6 +327,7 @@ public class EnumTest {
    * Get outerEnum
    * @return outerEnum
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public OuterEnum getOuterEnum() {
     return outerEnum;
diff --git a/samples/client/petstore/java/retrofit/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java b/samples/client/petstore/java/retrofit/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java
index 8ebc84c044..3c7fcaabdf 100644
--- a/samples/client/petstore/java/retrofit/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java
+++ b/samples/client/petstore/java/retrofit/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java
@@ -48,6 +48,7 @@ public class FileSchemaTestClass {
    * Get file
    * @return file
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public java.io.File getFile() {
     return file;
@@ -74,6 +75,7 @@ public class FileSchemaTestClass {
    * Get files
    * @return files
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public List<java.io.File> getFiles() {
     return files;
diff --git a/samples/client/petstore/java/retrofit/src/main/java/org/openapitools/client/model/FormatTest.java b/samples/client/petstore/java/retrofit/src/main/java/org/openapitools/client/model/FormatTest.java
index cab471e886..15f02e32f7 100644
--- a/samples/client/petstore/java/retrofit/src/main/java/org/openapitools/client/model/FormatTest.java
+++ b/samples/client/petstore/java/retrofit/src/main/java/org/openapitools/client/model/FormatTest.java
@@ -97,6 +97,7 @@ public class FormatTest {
    * maximum: 100
    * @return integer
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Integer getInteger() {
     return integer;
@@ -117,6 +118,7 @@ public class FormatTest {
    * maximum: 200
    * @return int32
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Integer getInt32() {
     return int32;
@@ -135,6 +137,7 @@ public class FormatTest {
    * Get int64
    * @return int64
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Long getInt64() {
     return int64;
@@ -155,6 +158,7 @@ public class FormatTest {
    * maximum: 543.2
    * @return number
   **/
+
   @ApiModelProperty(required = true, value = "")
   public BigDecimal getNumber() {
     return number;
@@ -175,6 +179,7 @@ public class FormatTest {
    * maximum: 987.6
    * @return _float
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Float getFloat() {
     return _float;
@@ -195,6 +200,7 @@ public class FormatTest {
    * maximum: 123.4
    * @return _double
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Double getDouble() {
     return _double;
@@ -213,6 +219,7 @@ public class FormatTest {
    * Get string
    * @return string
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getString() {
     return string;
@@ -231,6 +238,7 @@ public class FormatTest {
    * Get _byte
    * @return _byte
   **/
+
   @ApiModelProperty(required = true, value = "")
   public byte[] getByte() {
     return _byte;
@@ -249,6 +257,7 @@ public class FormatTest {
    * Get binary
    * @return binary
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public File getBinary() {
     return binary;
@@ -267,6 +276,7 @@ public class FormatTest {
    * Get date
    * @return date
   **/
+
   @ApiModelProperty(required = true, value = "")
   public LocalDate getDate() {
     return date;
@@ -285,6 +295,7 @@ public class FormatTest {
    * Get dateTime
    * @return dateTime
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public DateTime getDateTime() {
     return dateTime;
@@ -303,6 +314,7 @@ public class FormatTest {
    * Get uuid
    * @return uuid
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(example = "72f98069-206d-4f12-9f12-3d1e525a8e84", value = "")
   public UUID getUuid() {
     return uuid;
@@ -321,6 +333,7 @@ public class FormatTest {
    * Get password
    * @return password
   **/
+
   @ApiModelProperty(required = true, value = "")
   public String getPassword() {
     return password;
diff --git a/samples/client/petstore/java/retrofit/src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java b/samples/client/petstore/java/retrofit/src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java
index bb1394ea1f..72fcaa8993 100644
--- a/samples/client/petstore/java/retrofit/src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java
+++ b/samples/client/petstore/java/retrofit/src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java
@@ -41,6 +41,7 @@ public class HasOnlyReadOnly {
    * Get bar
    * @return bar
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getBar() {
     return bar;
@@ -50,6 +51,7 @@ public class HasOnlyReadOnly {
    * Get foo
    * @return foo
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getFoo() {
     return foo;
diff --git a/samples/client/petstore/java/retrofit/src/main/java/org/openapitools/client/model/MapTest.java b/samples/client/petstore/java/retrofit/src/main/java/org/openapitools/client/model/MapTest.java
index cb95334e61..43f0d2e998 100644
--- a/samples/client/petstore/java/retrofit/src/main/java/org/openapitools/client/model/MapTest.java
+++ b/samples/client/petstore/java/retrofit/src/main/java/org/openapitools/client/model/MapTest.java
@@ -112,6 +112,7 @@ public class MapTest {
    * Get mapMapOfString
    * @return mapMapOfString
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Map<String, Map<String, String>> getMapMapOfString() {
     return mapMapOfString;
@@ -138,6 +139,7 @@ public class MapTest {
    * Get mapOfEnumString
    * @return mapOfEnumString
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Map<String, InnerEnum> getMapOfEnumString() {
     return mapOfEnumString;
@@ -164,6 +166,7 @@ public class MapTest {
    * Get directMap
    * @return directMap
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Map<String, Boolean> getDirectMap() {
     return directMap;
@@ -190,6 +193,7 @@ public class MapTest {
    * Get indirectMap
    * @return indirectMap
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Map<String, Boolean> getIndirectMap() {
     return indirectMap;
diff --git a/samples/client/petstore/java/retrofit/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/client/petstore/java/retrofit/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java
index b1e93eb73a..2377586030 100644
--- a/samples/client/petstore/java/retrofit/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java
+++ b/samples/client/petstore/java/retrofit/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java
@@ -56,6 +56,7 @@ public class MixedPropertiesAndAdditionalPropertiesClass {
    * Get uuid
    * @return uuid
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public UUID getUuid() {
     return uuid;
@@ -74,6 +75,7 @@ public class MixedPropertiesAndAdditionalPropertiesClass {
    * Get dateTime
    * @return dateTime
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public DateTime getDateTime() {
     return dateTime;
@@ -100,6 +102,7 @@ public class MixedPropertiesAndAdditionalPropertiesClass {
    * Get map
    * @return map
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Map<String, Animal> getMap() {
     return map;
diff --git a/samples/client/petstore/java/retrofit/src/main/java/org/openapitools/client/model/Model200Response.java b/samples/client/petstore/java/retrofit/src/main/java/org/openapitools/client/model/Model200Response.java
index 3981e9696a..0c0fc9710d 100644
--- a/samples/client/petstore/java/retrofit/src/main/java/org/openapitools/client/model/Model200Response.java
+++ b/samples/client/petstore/java/retrofit/src/main/java/org/openapitools/client/model/Model200Response.java
@@ -47,6 +47,7 @@ public class Model200Response {
    * Get name
    * @return name
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Integer getName() {
     return name;
@@ -65,6 +66,7 @@ public class Model200Response {
    * Get propertyClass
    * @return propertyClass
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getPropertyClass() {
     return propertyClass;
diff --git a/samples/client/petstore/java/retrofit/src/main/java/org/openapitools/client/model/ModelApiResponse.java b/samples/client/petstore/java/retrofit/src/main/java/org/openapitools/client/model/ModelApiResponse.java
index 8a0b10b4e2..777b1a8a7c 100644
--- a/samples/client/petstore/java/retrofit/src/main/java/org/openapitools/client/model/ModelApiResponse.java
+++ b/samples/client/petstore/java/retrofit/src/main/java/org/openapitools/client/model/ModelApiResponse.java
@@ -50,6 +50,7 @@ public class ModelApiResponse {
    * Get code
    * @return code
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Integer getCode() {
     return code;
@@ -68,6 +69,7 @@ public class ModelApiResponse {
    * Get type
    * @return type
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getType() {
     return type;
@@ -86,6 +88,7 @@ public class ModelApiResponse {
    * Get message
    * @return message
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getMessage() {
     return message;
diff --git a/samples/client/petstore/java/retrofit/src/main/java/org/openapitools/client/model/ModelReturn.java b/samples/client/petstore/java/retrofit/src/main/java/org/openapitools/client/model/ModelReturn.java
index f045378132..225df7f4e8 100644
--- a/samples/client/petstore/java/retrofit/src/main/java/org/openapitools/client/model/ModelReturn.java
+++ b/samples/client/petstore/java/retrofit/src/main/java/org/openapitools/client/model/ModelReturn.java
@@ -43,6 +43,7 @@ public class ModelReturn {
    * Get _return
    * @return _return
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Integer getReturn() {
     return _return;
diff --git a/samples/client/petstore/java/retrofit/src/main/java/org/openapitools/client/model/Name.java b/samples/client/petstore/java/retrofit/src/main/java/org/openapitools/client/model/Name.java
index dab0c2d48f..c5a5691688 100644
--- a/samples/client/petstore/java/retrofit/src/main/java/org/openapitools/client/model/Name.java
+++ b/samples/client/petstore/java/retrofit/src/main/java/org/openapitools/client/model/Name.java
@@ -55,6 +55,7 @@ public class Name {
    * Get name
    * @return name
   **/
+
   @ApiModelProperty(required = true, value = "")
   public Integer getName() {
     return name;
@@ -68,6 +69,7 @@ public class Name {
    * Get snakeCase
    * @return snakeCase
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Integer getSnakeCase() {
     return snakeCase;
@@ -82,6 +84,7 @@ public class Name {
    * Get property
    * @return property
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getProperty() {
     return property;
@@ -95,6 +98,7 @@ public class Name {
    * Get _123number
    * @return _123number
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Integer get123number() {
     return _123number;
diff --git a/samples/client/petstore/java/retrofit/src/main/java/org/openapitools/client/model/NumberOnly.java b/samples/client/petstore/java/retrofit/src/main/java/org/openapitools/client/model/NumberOnly.java
index 17cb112586..00ffd2f67e 100644
--- a/samples/client/petstore/java/retrofit/src/main/java/org/openapitools/client/model/NumberOnly.java
+++ b/samples/client/petstore/java/retrofit/src/main/java/org/openapitools/client/model/NumberOnly.java
@@ -43,6 +43,7 @@ public class NumberOnly {
    * Get justNumber
    * @return justNumber
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public BigDecimal getJustNumber() {
     return justNumber;
diff --git a/samples/client/petstore/java/retrofit/src/main/java/org/openapitools/client/model/Order.java b/samples/client/petstore/java/retrofit/src/main/java/org/openapitools/client/model/Order.java
index c39915fa72..2fe536b25f 100644
--- a/samples/client/petstore/java/retrofit/src/main/java/org/openapitools/client/model/Order.java
+++ b/samples/client/petstore/java/retrofit/src/main/java/org/openapitools/client/model/Order.java
@@ -112,6 +112,7 @@ public class Order {
    * Get id
    * @return id
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Long getId() {
     return id;
@@ -130,6 +131,7 @@ public class Order {
    * Get petId
    * @return petId
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Long getPetId() {
     return petId;
@@ -148,6 +150,7 @@ public class Order {
    * Get quantity
    * @return quantity
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Integer getQuantity() {
     return quantity;
@@ -166,6 +169,7 @@ public class Order {
    * Get shipDate
    * @return shipDate
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public DateTime getShipDate() {
     return shipDate;
@@ -184,6 +188,7 @@ public class Order {
    * Order Status
    * @return status
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "Order Status")
   public StatusEnum getStatus() {
     return status;
@@ -202,6 +207,7 @@ public class Order {
    * Get complete
    * @return complete
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Boolean getComplete() {
     return complete;
diff --git a/samples/client/petstore/java/retrofit/src/main/java/org/openapitools/client/model/OuterComposite.java b/samples/client/petstore/java/retrofit/src/main/java/org/openapitools/client/model/OuterComposite.java
index 65f05e3fa4..9e2a78d57f 100644
--- a/samples/client/petstore/java/retrofit/src/main/java/org/openapitools/client/model/OuterComposite.java
+++ b/samples/client/petstore/java/retrofit/src/main/java/org/openapitools/client/model/OuterComposite.java
@@ -51,6 +51,7 @@ public class OuterComposite {
    * Get myNumber
    * @return myNumber
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public BigDecimal getMyNumber() {
     return myNumber;
@@ -69,6 +70,7 @@ public class OuterComposite {
    * Get myString
    * @return myString
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getMyString() {
     return myString;
@@ -87,6 +89,7 @@ public class OuterComposite {
    * Get myBoolean
    * @return myBoolean
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Boolean getMyBoolean() {
     return myBoolean;
diff --git a/samples/client/petstore/java/retrofit/src/main/java/org/openapitools/client/model/Pet.java b/samples/client/petstore/java/retrofit/src/main/java/org/openapitools/client/model/Pet.java
index a95a0c9dd0..5ac8165f7f 100644
--- a/samples/client/petstore/java/retrofit/src/main/java/org/openapitools/client/model/Pet.java
+++ b/samples/client/petstore/java/retrofit/src/main/java/org/openapitools/client/model/Pet.java
@@ -115,6 +115,7 @@ public class Pet {
    * Get id
    * @return id
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Long getId() {
     return id;
@@ -133,6 +134,7 @@ public class Pet {
    * Get category
    * @return category
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Category getCategory() {
     return category;
@@ -151,6 +153,7 @@ public class Pet {
    * Get name
    * @return name
   **/
+
   @ApiModelProperty(example = "doggie", required = true, value = "")
   public String getName() {
     return name;
@@ -174,6 +177,7 @@ public class Pet {
    * Get photoUrls
    * @return photoUrls
   **/
+
   @ApiModelProperty(required = true, value = "")
   public List<String> getPhotoUrls() {
     return photoUrls;
@@ -200,6 +204,7 @@ public class Pet {
    * Get tags
    * @return tags
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public List<Tag> getTags() {
     return tags;
@@ -218,6 +223,7 @@ public class Pet {
    * pet status in the store
    * @return status
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "pet status in the store")
   public StatusEnum getStatus() {
     return status;
diff --git a/samples/client/petstore/java/retrofit/src/main/java/org/openapitools/client/model/ReadOnlyFirst.java b/samples/client/petstore/java/retrofit/src/main/java/org/openapitools/client/model/ReadOnlyFirst.java
index 2872f78893..23ec5576c0 100644
--- a/samples/client/petstore/java/retrofit/src/main/java/org/openapitools/client/model/ReadOnlyFirst.java
+++ b/samples/client/petstore/java/retrofit/src/main/java/org/openapitools/client/model/ReadOnlyFirst.java
@@ -41,6 +41,7 @@ public class ReadOnlyFirst {
    * Get bar
    * @return bar
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getBar() {
     return bar;
@@ -55,6 +56,7 @@ public class ReadOnlyFirst {
    * Get baz
    * @return baz
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getBaz() {
     return baz;
diff --git a/samples/client/petstore/java/retrofit/src/main/java/org/openapitools/client/model/SpecialModelName.java b/samples/client/petstore/java/retrofit/src/main/java/org/openapitools/client/model/SpecialModelName.java
index 8fab5e0b27..f4a7d343a7 100644
--- a/samples/client/petstore/java/retrofit/src/main/java/org/openapitools/client/model/SpecialModelName.java
+++ b/samples/client/petstore/java/retrofit/src/main/java/org/openapitools/client/model/SpecialModelName.java
@@ -42,6 +42,7 @@ public class SpecialModelName {
    * Get $specialPropertyName
    * @return $specialPropertyName
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Long get$SpecialPropertyName() {
     return $specialPropertyName;
diff --git a/samples/client/petstore/java/retrofit/src/main/java/org/openapitools/client/model/Tag.java b/samples/client/petstore/java/retrofit/src/main/java/org/openapitools/client/model/Tag.java
index ab153ca672..bce1fc934d 100644
--- a/samples/client/petstore/java/retrofit/src/main/java/org/openapitools/client/model/Tag.java
+++ b/samples/client/petstore/java/retrofit/src/main/java/org/openapitools/client/model/Tag.java
@@ -46,6 +46,7 @@ public class Tag {
    * Get id
    * @return id
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Long getId() {
     return id;
@@ -64,6 +65,7 @@ public class Tag {
    * Get name
    * @return name
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getName() {
     return name;
diff --git a/samples/client/petstore/java/retrofit/src/main/java/org/openapitools/client/model/TypeHolderDefault.java b/samples/client/petstore/java/retrofit/src/main/java/org/openapitools/client/model/TypeHolderDefault.java
index 8fc321bc0a..8c7e1fa55d 100644
--- a/samples/client/petstore/java/retrofit/src/main/java/org/openapitools/client/model/TypeHolderDefault.java
+++ b/samples/client/petstore/java/retrofit/src/main/java/org/openapitools/client/model/TypeHolderDefault.java
@@ -61,6 +61,7 @@ public class TypeHolderDefault {
    * Get stringItem
    * @return stringItem
   **/
+
   @ApiModelProperty(required = true, value = "")
   public String getStringItem() {
     return stringItem;
@@ -79,6 +80,7 @@ public class TypeHolderDefault {
    * Get numberItem
    * @return numberItem
   **/
+
   @ApiModelProperty(required = true, value = "")
   public BigDecimal getNumberItem() {
     return numberItem;
@@ -97,6 +99,7 @@ public class TypeHolderDefault {
    * Get integerItem
    * @return integerItem
   **/
+
   @ApiModelProperty(required = true, value = "")
   public Integer getIntegerItem() {
     return integerItem;
@@ -115,6 +118,7 @@ public class TypeHolderDefault {
    * Get boolItem
    * @return boolItem
   **/
+
   @ApiModelProperty(required = true, value = "")
   public Boolean getBoolItem() {
     return boolItem;
@@ -138,6 +142,7 @@ public class TypeHolderDefault {
    * Get arrayItem
    * @return arrayItem
   **/
+
   @ApiModelProperty(required = true, value = "")
   public List<Integer> getArrayItem() {
     return arrayItem;
diff --git a/samples/client/petstore/java/retrofit/src/main/java/org/openapitools/client/model/TypeHolderExample.java b/samples/client/petstore/java/retrofit/src/main/java/org/openapitools/client/model/TypeHolderExample.java
index d9496cbd79..8315f422ea 100644
--- a/samples/client/petstore/java/retrofit/src/main/java/org/openapitools/client/model/TypeHolderExample.java
+++ b/samples/client/petstore/java/retrofit/src/main/java/org/openapitools/client/model/TypeHolderExample.java
@@ -61,6 +61,7 @@ public class TypeHolderExample {
    * Get stringItem
    * @return stringItem
   **/
+
   @ApiModelProperty(example = "what", required = true, value = "")
   public String getStringItem() {
     return stringItem;
@@ -79,6 +80,7 @@ public class TypeHolderExample {
    * Get numberItem
    * @return numberItem
   **/
+
   @ApiModelProperty(example = "1.234", required = true, value = "")
   public BigDecimal getNumberItem() {
     return numberItem;
@@ -97,6 +99,7 @@ public class TypeHolderExample {
    * Get integerItem
    * @return integerItem
   **/
+
   @ApiModelProperty(example = "-2", required = true, value = "")
   public Integer getIntegerItem() {
     return integerItem;
@@ -115,6 +118,7 @@ public class TypeHolderExample {
    * Get boolItem
    * @return boolItem
   **/
+
   @ApiModelProperty(example = "true", required = true, value = "")
   public Boolean getBoolItem() {
     return boolItem;
@@ -138,6 +142,7 @@ public class TypeHolderExample {
    * Get arrayItem
    * @return arrayItem
   **/
+
   @ApiModelProperty(example = "[0, 1, 2, 3]", required = true, value = "")
   public List<Integer> getArrayItem() {
     return arrayItem;
diff --git a/samples/client/petstore/java/retrofit/src/main/java/org/openapitools/client/model/User.java b/samples/client/petstore/java/retrofit/src/main/java/org/openapitools/client/model/User.java
index 74b9a66a24..3f9eb4bb8a 100644
--- a/samples/client/petstore/java/retrofit/src/main/java/org/openapitools/client/model/User.java
+++ b/samples/client/petstore/java/retrofit/src/main/java/org/openapitools/client/model/User.java
@@ -70,6 +70,7 @@ public class User {
    * Get id
    * @return id
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Long getId() {
     return id;
@@ -88,6 +89,7 @@ public class User {
    * Get username
    * @return username
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getUsername() {
     return username;
@@ -106,6 +108,7 @@ public class User {
    * Get firstName
    * @return firstName
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getFirstName() {
     return firstName;
@@ -124,6 +127,7 @@ public class User {
    * Get lastName
    * @return lastName
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getLastName() {
     return lastName;
@@ -142,6 +146,7 @@ public class User {
    * Get email
    * @return email
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getEmail() {
     return email;
@@ -160,6 +165,7 @@ public class User {
    * Get password
    * @return password
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getPassword() {
     return password;
@@ -178,6 +184,7 @@ public class User {
    * Get phone
    * @return phone
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getPhone() {
     return phone;
@@ -196,6 +203,7 @@ public class User {
    * User Status
    * @return userStatus
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "User Status")
   public Integer getUserStatus() {
     return userStatus;
diff --git a/samples/client/petstore/java/retrofit/src/main/java/org/openapitools/client/model/XmlItem.java b/samples/client/petstore/java/retrofit/src/main/java/org/openapitools/client/model/XmlItem.java
index ac66ad77de..67910352a7 100644
--- a/samples/client/petstore/java/retrofit/src/main/java/org/openapitools/client/model/XmlItem.java
+++ b/samples/client/petstore/java/retrofit/src/main/java/org/openapitools/client/model/XmlItem.java
@@ -157,6 +157,7 @@ public class XmlItem {
    * Get attributeString
    * @return attributeString
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(example = "string", value = "")
   public String getAttributeString() {
     return attributeString;
@@ -175,6 +176,7 @@ public class XmlItem {
    * Get attributeNumber
    * @return attributeNumber
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(example = "1.234", value = "")
   public BigDecimal getAttributeNumber() {
     return attributeNumber;
@@ -193,6 +195,7 @@ public class XmlItem {
    * Get attributeInteger
    * @return attributeInteger
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(example = "-2", value = "")
   public Integer getAttributeInteger() {
     return attributeInteger;
@@ -211,6 +214,7 @@ public class XmlItem {
    * Get attributeBoolean
    * @return attributeBoolean
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(example = "true", value = "")
   public Boolean getAttributeBoolean() {
     return attributeBoolean;
@@ -237,6 +241,7 @@ public class XmlItem {
    * Get wrappedArray
    * @return wrappedArray
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public List<Integer> getWrappedArray() {
     return wrappedArray;
@@ -255,6 +260,7 @@ public class XmlItem {
    * Get nameString
    * @return nameString
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(example = "string", value = "")
   public String getNameString() {
     return nameString;
@@ -273,6 +279,7 @@ public class XmlItem {
    * Get nameNumber
    * @return nameNumber
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(example = "1.234", value = "")
   public BigDecimal getNameNumber() {
     return nameNumber;
@@ -291,6 +298,7 @@ public class XmlItem {
    * Get nameInteger
    * @return nameInteger
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(example = "-2", value = "")
   public Integer getNameInteger() {
     return nameInteger;
@@ -309,6 +317,7 @@ public class XmlItem {
    * Get nameBoolean
    * @return nameBoolean
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(example = "true", value = "")
   public Boolean getNameBoolean() {
     return nameBoolean;
@@ -335,6 +344,7 @@ public class XmlItem {
    * Get nameArray
    * @return nameArray
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public List<Integer> getNameArray() {
     return nameArray;
@@ -361,6 +371,7 @@ public class XmlItem {
    * Get nameWrappedArray
    * @return nameWrappedArray
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public List<Integer> getNameWrappedArray() {
     return nameWrappedArray;
@@ -379,6 +390,7 @@ public class XmlItem {
    * Get prefixString
    * @return prefixString
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(example = "string", value = "")
   public String getPrefixString() {
     return prefixString;
@@ -397,6 +409,7 @@ public class XmlItem {
    * Get prefixNumber
    * @return prefixNumber
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(example = "1.234", value = "")
   public BigDecimal getPrefixNumber() {
     return prefixNumber;
@@ -415,6 +428,7 @@ public class XmlItem {
    * Get prefixInteger
    * @return prefixInteger
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(example = "-2", value = "")
   public Integer getPrefixInteger() {
     return prefixInteger;
@@ -433,6 +447,7 @@ public class XmlItem {
    * Get prefixBoolean
    * @return prefixBoolean
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(example = "true", value = "")
   public Boolean getPrefixBoolean() {
     return prefixBoolean;
@@ -459,6 +474,7 @@ public class XmlItem {
    * Get prefixArray
    * @return prefixArray
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public List<Integer> getPrefixArray() {
     return prefixArray;
@@ -485,6 +501,7 @@ public class XmlItem {
    * Get prefixWrappedArray
    * @return prefixWrappedArray
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public List<Integer> getPrefixWrappedArray() {
     return prefixWrappedArray;
@@ -503,6 +520,7 @@ public class XmlItem {
    * Get namespaceString
    * @return namespaceString
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(example = "string", value = "")
   public String getNamespaceString() {
     return namespaceString;
@@ -521,6 +539,7 @@ public class XmlItem {
    * Get namespaceNumber
    * @return namespaceNumber
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(example = "1.234", value = "")
   public BigDecimal getNamespaceNumber() {
     return namespaceNumber;
@@ -539,6 +558,7 @@ public class XmlItem {
    * Get namespaceInteger
    * @return namespaceInteger
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(example = "-2", value = "")
   public Integer getNamespaceInteger() {
     return namespaceInteger;
@@ -557,6 +577,7 @@ public class XmlItem {
    * Get namespaceBoolean
    * @return namespaceBoolean
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(example = "true", value = "")
   public Boolean getNamespaceBoolean() {
     return namespaceBoolean;
@@ -583,6 +604,7 @@ public class XmlItem {
    * Get namespaceArray
    * @return namespaceArray
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public List<Integer> getNamespaceArray() {
     return namespaceArray;
@@ -609,6 +631,7 @@ public class XmlItem {
    * Get namespaceWrappedArray
    * @return namespaceWrappedArray
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public List<Integer> getNamespaceWrappedArray() {
     return namespaceWrappedArray;
@@ -627,6 +650,7 @@ public class XmlItem {
    * Get prefixNsString
    * @return prefixNsString
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(example = "string", value = "")
   public String getPrefixNsString() {
     return prefixNsString;
@@ -645,6 +669,7 @@ public class XmlItem {
    * Get prefixNsNumber
    * @return prefixNsNumber
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(example = "1.234", value = "")
   public BigDecimal getPrefixNsNumber() {
     return prefixNsNumber;
@@ -663,6 +688,7 @@ public class XmlItem {
    * Get prefixNsInteger
    * @return prefixNsInteger
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(example = "-2", value = "")
   public Integer getPrefixNsInteger() {
     return prefixNsInteger;
@@ -681,6 +707,7 @@ public class XmlItem {
    * Get prefixNsBoolean
    * @return prefixNsBoolean
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(example = "true", value = "")
   public Boolean getPrefixNsBoolean() {
     return prefixNsBoolean;
@@ -707,6 +734,7 @@ public class XmlItem {
    * Get prefixNsArray
    * @return prefixNsArray
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public List<Integer> getPrefixNsArray() {
     return prefixNsArray;
@@ -733,6 +761,7 @@ public class XmlItem {
    * Get prefixNsWrappedArray
    * @return prefixNsWrappedArray
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public List<Integer> getPrefixNsWrappedArray() {
     return prefixNsWrappedArray;
diff --git a/samples/client/petstore/java/retrofit2-play24/build.gradle b/samples/client/petstore/java/retrofit2-play24/build.gradle
index 27249fb718..1766fa5b3a 100644
--- a/samples/client/petstore/java/retrofit2-play24/build.gradle
+++ b/samples/client/petstore/java/retrofit2-play24/build.gradle
@@ -109,6 +109,7 @@ dependencies {
     compile "com.squareup.retrofit2:converter-scalars:$retrofit_version"
     compile "com.squareup.retrofit2:converter-gson:$retrofit_version"
     compile "io.swagger:swagger-annotations:$swagger_annotations_version"
+    compile "com.google.code.findbugs:jsr305:3.0.2"
     compile ("org.apache.oltu.oauth2:org.apache.oltu.oauth2.client:$oltu_version"){
         exclude group:'org.apache.oltu.oauth2' , module: 'org.apache.oltu.oauth2.common'
     }
diff --git a/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/model/AdditionalPropertiesAnyType.java b/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/model/AdditionalPropertiesAnyType.java
index fdb2463eba..3c28034de7 100644
--- a/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/model/AdditionalPropertiesAnyType.java
+++ b/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/model/AdditionalPropertiesAnyType.java
@@ -42,6 +42,7 @@ public class AdditionalPropertiesAnyType extends HashMap<String, Object> {
    * Get name
    * @return name
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getName() {
     return name;
diff --git a/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/model/AdditionalPropertiesArray.java b/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/model/AdditionalPropertiesArray.java
index 2bbaf5fcb9..a1b662902c 100644
--- a/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/model/AdditionalPropertiesArray.java
+++ b/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/model/AdditionalPropertiesArray.java
@@ -43,6 +43,7 @@ public class AdditionalPropertiesArray extends HashMap<String, List> {
    * Get name
    * @return name
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getName() {
     return name;
diff --git a/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/model/AdditionalPropertiesBoolean.java b/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/model/AdditionalPropertiesBoolean.java
index 787e59f566..0f73cf6b2b 100644
--- a/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/model/AdditionalPropertiesBoolean.java
+++ b/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/model/AdditionalPropertiesBoolean.java
@@ -42,6 +42,7 @@ public class AdditionalPropertiesBoolean extends HashMap<String, Boolean> {
    * Get name
    * @return name
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getName() {
     return name;
diff --git a/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java b/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java
index 82e8921b20..b39b92f916 100644
--- a/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java
+++ b/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java
@@ -82,6 +82,7 @@ public class AdditionalPropertiesClass {
    * Get mapString
    * @return mapString
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Map<String, String> getMapString() {
     return mapString;
@@ -108,6 +109,7 @@ public class AdditionalPropertiesClass {
    * Get mapNumber
    * @return mapNumber
   **/
+  @javax.annotation.Nullable 
   @Valid
   @ApiModelProperty(value = "")
   public Map<String, BigDecimal> getMapNumber() {
@@ -135,6 +137,7 @@ public class AdditionalPropertiesClass {
    * Get mapInteger
    * @return mapInteger
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Map<String, Integer> getMapInteger() {
     return mapInteger;
@@ -161,6 +164,7 @@ public class AdditionalPropertiesClass {
    * Get mapBoolean
    * @return mapBoolean
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Map<String, Boolean> getMapBoolean() {
     return mapBoolean;
@@ -187,6 +191,7 @@ public class AdditionalPropertiesClass {
    * Get mapArrayInteger
    * @return mapArrayInteger
   **/
+  @javax.annotation.Nullable 
   @Valid
   @ApiModelProperty(value = "")
   public Map<String, List<Integer>> getMapArrayInteger() {
@@ -214,6 +219,7 @@ public class AdditionalPropertiesClass {
    * Get mapArrayAnytype
    * @return mapArrayAnytype
   **/
+  @javax.annotation.Nullable 
   @Valid
   @ApiModelProperty(value = "")
   public Map<String, List<Object>> getMapArrayAnytype() {
@@ -241,6 +247,7 @@ public class AdditionalPropertiesClass {
    * Get mapMapString
    * @return mapMapString
   **/
+  @javax.annotation.Nullable 
   @Valid
   @ApiModelProperty(value = "")
   public Map<String, Map<String, String>> getMapMapString() {
@@ -268,6 +275,7 @@ public class AdditionalPropertiesClass {
    * Get mapMapAnytype
    * @return mapMapAnytype
   **/
+  @javax.annotation.Nullable 
   @Valid
   @ApiModelProperty(value = "")
   public Map<String, Map<String, Object>> getMapMapAnytype() {
@@ -287,6 +295,7 @@ public class AdditionalPropertiesClass {
    * Get anytype1
    * @return anytype1
   **/
+  @javax.annotation.Nullable 
   @Valid
   @ApiModelProperty(value = "")
   public Object getAnytype1() {
@@ -306,6 +315,7 @@ public class AdditionalPropertiesClass {
    * Get anytype2
    * @return anytype2
   **/
+  @javax.annotation.Nullable 
   @Valid
   @ApiModelProperty(value = "")
   public Object getAnytype2() {
@@ -325,6 +335,7 @@ public class AdditionalPropertiesClass {
    * Get anytype3
    * @return anytype3
   **/
+  @javax.annotation.Nullable 
   @Valid
   @ApiModelProperty(value = "")
   public Object getAnytype3() {
diff --git a/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/model/AdditionalPropertiesInteger.java b/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/model/AdditionalPropertiesInteger.java
index 8ee999f00b..eafdd58e5d 100644
--- a/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/model/AdditionalPropertiesInteger.java
+++ b/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/model/AdditionalPropertiesInteger.java
@@ -42,6 +42,7 @@ public class AdditionalPropertiesInteger extends HashMap<String, Integer> {
    * Get name
    * @return name
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getName() {
     return name;
diff --git a/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/model/AdditionalPropertiesNumber.java b/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/model/AdditionalPropertiesNumber.java
index 84e4652c1b..c166cbef6d 100644
--- a/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/model/AdditionalPropertiesNumber.java
+++ b/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/model/AdditionalPropertiesNumber.java
@@ -43,6 +43,7 @@ public class AdditionalPropertiesNumber extends HashMap<String, BigDecimal> {
    * Get name
    * @return name
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getName() {
     return name;
diff --git a/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/model/AdditionalPropertiesObject.java b/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/model/AdditionalPropertiesObject.java
index 37e6d6ad96..6f7169d2eb 100644
--- a/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/model/AdditionalPropertiesObject.java
+++ b/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/model/AdditionalPropertiesObject.java
@@ -42,6 +42,7 @@ public class AdditionalPropertiesObject extends HashMap<String, Map> {
    * Get name
    * @return name
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getName() {
     return name;
diff --git a/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/model/AdditionalPropertiesString.java b/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/model/AdditionalPropertiesString.java
index 0c5e1f514a..1404d12db6 100644
--- a/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/model/AdditionalPropertiesString.java
+++ b/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/model/AdditionalPropertiesString.java
@@ -42,6 +42,7 @@ public class AdditionalPropertiesString extends HashMap<String, String> {
    * Get name
    * @return name
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getName() {
     return name;
diff --git a/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/model/Animal.java b/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/model/Animal.java
index 78b949b628..72b233aa45 100644
--- a/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/model/Animal.java
+++ b/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/model/Animal.java
@@ -51,6 +51,7 @@ public class Animal {
    * Get className
    * @return className
   **/
+
   @NotNull
   @ApiModelProperty(required = true, value = "")
   public String getClassName() {
@@ -70,6 +71,7 @@ public class Animal {
    * Get color
    * @return color
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getColor() {
     return color;
diff --git a/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java b/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java
index 4d02e387b1..dcf7fc9f48 100644
--- a/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java
+++ b/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java
@@ -51,6 +51,7 @@ public class ArrayOfArrayOfNumberOnly {
    * Get arrayArrayNumber
    * @return arrayArrayNumber
   **/
+  @javax.annotation.Nullable 
   @Valid
   @ApiModelProperty(value = "")
   public List<List<BigDecimal>> getArrayArrayNumber() {
diff --git a/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java b/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java
index 6e6b3fe2f8..520a394d26 100644
--- a/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java
+++ b/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java
@@ -51,6 +51,7 @@ public class ArrayOfNumberOnly {
    * Get arrayNumber
    * @return arrayNumber
   **/
+  @javax.annotation.Nullable 
   @Valid
   @ApiModelProperty(value = "")
   public List<BigDecimal> getArrayNumber() {
diff --git a/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/model/ArrayTest.java b/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/model/ArrayTest.java
index 83ad2d8e95..7ac5804445 100644
--- a/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/model/ArrayTest.java
+++ b/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/model/ArrayTest.java
@@ -57,6 +57,7 @@ public class ArrayTest {
    * Get arrayOfString
    * @return arrayOfString
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public List<String> getArrayOfString() {
     return arrayOfString;
@@ -83,6 +84,7 @@ public class ArrayTest {
    * Get arrayArrayOfInteger
    * @return arrayArrayOfInteger
   **/
+  @javax.annotation.Nullable 
   @Valid
   @ApiModelProperty(value = "")
   public List<List<Long>> getArrayArrayOfInteger() {
@@ -110,6 +112,7 @@ public class ArrayTest {
    * Get arrayArrayOfModel
    * @return arrayArrayOfModel
   **/
+  @javax.annotation.Nullable 
   @Valid
   @ApiModelProperty(value = "")
   public List<List<ReadOnlyFirst>> getArrayArrayOfModel() {
diff --git a/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/model/Capitalization.java b/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/model/Capitalization.java
index 49e8edc9fa..473052d303 100644
--- a/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/model/Capitalization.java
+++ b/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/model/Capitalization.java
@@ -55,6 +55,7 @@ public class Capitalization {
    * Get smallCamel
    * @return smallCamel
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getSmallCamel() {
     return smallCamel;
@@ -73,6 +74,7 @@ public class Capitalization {
    * Get capitalCamel
    * @return capitalCamel
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getCapitalCamel() {
     return capitalCamel;
@@ -91,6 +93,7 @@ public class Capitalization {
    * Get smallSnake
    * @return smallSnake
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getSmallSnake() {
     return smallSnake;
@@ -109,6 +112,7 @@ public class Capitalization {
    * Get capitalSnake
    * @return capitalSnake
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getCapitalSnake() {
     return capitalSnake;
@@ -127,6 +131,7 @@ public class Capitalization {
    * Get scAETHFlowPoints
    * @return scAETHFlowPoints
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getScAETHFlowPoints() {
     return scAETHFlowPoints;
@@ -145,6 +150,7 @@ public class Capitalization {
    * Name of the pet 
    * @return ATT_NAME
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "Name of the pet ")
   public String getATTNAME() {
     return ATT_NAME;
diff --git a/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/model/Cat.java b/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/model/Cat.java
index e534f3adff..a0b8ca3385 100644
--- a/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/model/Cat.java
+++ b/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/model/Cat.java
@@ -42,6 +42,7 @@ public class Cat extends Animal {
    * Get declawed
    * @return declawed
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Boolean getDeclawed() {
     return declawed;
diff --git a/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/model/CatAllOf.java b/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/model/CatAllOf.java
index 785656993b..997a3ef2f4 100644
--- a/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/model/CatAllOf.java
+++ b/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/model/CatAllOf.java
@@ -40,6 +40,7 @@ public class CatAllOf {
    * Get declawed
    * @return declawed
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Boolean getDeclawed() {
     return declawed;
diff --git a/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/model/Category.java b/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/model/Category.java
index 078bc70818..6db06530c3 100644
--- a/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/model/Category.java
+++ b/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/model/Category.java
@@ -43,6 +43,7 @@ public class Category {
    * Get id
    * @return id
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Long getId() {
     return id;
@@ -61,6 +62,7 @@ public class Category {
    * Get name
    * @return name
   **/
+
   @NotNull
   @ApiModelProperty(required = true, value = "")
   public String getName() {
diff --git a/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/model/ClassModel.java b/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/model/ClassModel.java
index 964f0fab15..41049c9bee 100644
--- a/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/model/ClassModel.java
+++ b/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/model/ClassModel.java
@@ -41,6 +41,7 @@ public class ClassModel {
    * Get propertyClass
    * @return propertyClass
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getPropertyClass() {
     return propertyClass;
diff --git a/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/model/Client.java b/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/model/Client.java
index 078f3e1de9..83962ddde1 100644
--- a/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/model/Client.java
+++ b/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/model/Client.java
@@ -40,6 +40,7 @@ public class Client {
    * Get client
    * @return client
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getClient() {
     return client;
diff --git a/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/model/Dog.java b/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/model/Dog.java
index 4c1bca6839..845c7aa339 100644
--- a/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/model/Dog.java
+++ b/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/model/Dog.java
@@ -42,6 +42,7 @@ public class Dog extends Animal {
    * Get breed
    * @return breed
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getBreed() {
     return breed;
diff --git a/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/model/DogAllOf.java b/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/model/DogAllOf.java
index caa98e0f41..1aa1423a91 100644
--- a/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/model/DogAllOf.java
+++ b/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/model/DogAllOf.java
@@ -40,6 +40,7 @@ public class DogAllOf {
    * Get breed
    * @return breed
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getBreed() {
     return breed;
diff --git a/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/model/EnumArrays.java b/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/model/EnumArrays.java
index 077db2b668..398db61223 100644
--- a/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/model/EnumArrays.java
+++ b/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/model/EnumArrays.java
@@ -115,6 +115,7 @@ public class EnumArrays {
    * Get justSymbol
    * @return justSymbol
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public JustSymbolEnum getJustSymbol() {
     return justSymbol;
@@ -141,6 +142,7 @@ public class EnumArrays {
    * Get arrayEnum
    * @return arrayEnum
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public List<ArrayEnumEnum> getArrayEnum() {
     return arrayEnum;
diff --git a/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/model/EnumTest.java b/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/model/EnumTest.java
index fb9f931387..88f0ab2b6e 100644
--- a/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/model/EnumTest.java
+++ b/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/model/EnumTest.java
@@ -197,6 +197,7 @@ public class EnumTest {
    * Get enumString
    * @return enumString
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public EnumStringEnum getEnumString() {
     return enumString;
@@ -215,6 +216,7 @@ public class EnumTest {
    * Get enumStringRequired
    * @return enumStringRequired
   **/
+
   @NotNull
   @ApiModelProperty(required = true, value = "")
   public EnumStringRequiredEnum getEnumStringRequired() {
@@ -234,6 +236,7 @@ public class EnumTest {
    * Get enumInteger
    * @return enumInteger
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public EnumIntegerEnum getEnumInteger() {
     return enumInteger;
@@ -252,6 +255,7 @@ public class EnumTest {
    * Get enumNumber
    * @return enumNumber
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public EnumNumberEnum getEnumNumber() {
     return enumNumber;
@@ -270,6 +274,7 @@ public class EnumTest {
    * Get outerEnum
    * @return outerEnum
   **/
+  @javax.annotation.Nullable 
   @Valid
   @ApiModelProperty(value = "")
   public OuterEnum getOuterEnum() {
diff --git a/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java b/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java
index fef73da58c..78595f7854 100644
--- a/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java
+++ b/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java
@@ -45,6 +45,7 @@ public class FileSchemaTestClass {
    * Get file
    * @return file
   **/
+  @javax.annotation.Nullable 
   @Valid
   @ApiModelProperty(value = "")
   public java.io.File getFile() {
@@ -72,6 +73,7 @@ public class FileSchemaTestClass {
    * Get files
    * @return files
   **/
+  @javax.annotation.Nullable 
   @Valid
   @ApiModelProperty(value = "")
   public List<java.io.File> getFiles() {
diff --git a/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/model/FormatTest.java b/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/model/FormatTest.java
index 18baef0ec6..cbd2563773 100644
--- a/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/model/FormatTest.java
+++ b/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/model/FormatTest.java
@@ -83,6 +83,7 @@ public class FormatTest {
    * maximum: 100
    * @return integer
   **/
+  @javax.annotation.Nullable 
  @Min(10) @Max(100)  @ApiModelProperty(value = "")
   public Integer getInteger() {
     return integer;
@@ -103,6 +104,7 @@ public class FormatTest {
    * maximum: 200
    * @return int32
   **/
+  @javax.annotation.Nullable 
  @Min(20) @Max(200)  @ApiModelProperty(value = "")
   public Integer getInt32() {
     return int32;
@@ -121,6 +123,7 @@ public class FormatTest {
    * Get int64
    * @return int64
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Long getInt64() {
     return int64;
@@ -141,6 +144,7 @@ public class FormatTest {
    * maximum: 543.2
    * @return number
   **/
+
   @NotNull
   @Valid
  @DecimalMin("32.1") @DecimalMax("543.2")  @ApiModelProperty(required = true, value = "")
@@ -163,6 +167,7 @@ public class FormatTest {
    * maximum: 987.6
    * @return _float
   **/
+  @javax.annotation.Nullable 
  @DecimalMin("54.3") @DecimalMax("987.6")  @ApiModelProperty(value = "")
   public Float getFloat() {
     return _float;
@@ -183,6 +188,7 @@ public class FormatTest {
    * maximum: 123.4
    * @return _double
   **/
+  @javax.annotation.Nullable 
  @DecimalMin("67.8") @DecimalMax("123.4")  @ApiModelProperty(value = "")
   public Double getDouble() {
     return _double;
@@ -201,6 +207,7 @@ public class FormatTest {
    * Get string
    * @return string
   **/
+  @javax.annotation.Nullable 
  @Pattern(regexp="/[a-z]/i")  @ApiModelProperty(value = "")
   public String getString() {
     return string;
@@ -219,6 +226,7 @@ public class FormatTest {
    * Get _byte
    * @return _byte
   **/
+
   @NotNull
  @Pattern(regexp="^(?:[A-Za-z0-9+/]{4})*(?:[A-Za-z0-9+/]{2}==|[A-Za-z0-9+/]{3}=)?$")  @ApiModelProperty(required = true, value = "")
   public byte[] getByte() {
@@ -238,6 +246,7 @@ public class FormatTest {
    * Get binary
    * @return binary
   **/
+  @javax.annotation.Nullable 
   @Valid
   @ApiModelProperty(value = "")
   public File getBinary() {
@@ -257,6 +266,7 @@ public class FormatTest {
    * Get date
    * @return date
   **/
+
   @NotNull
   @Valid
   @ApiModelProperty(required = true, value = "")
@@ -277,6 +287,7 @@ public class FormatTest {
    * Get dateTime
    * @return dateTime
   **/
+  @javax.annotation.Nullable 
   @Valid
   @ApiModelProperty(value = "")
   public OffsetDateTime getDateTime() {
@@ -296,6 +307,7 @@ public class FormatTest {
    * Get uuid
    * @return uuid
   **/
+  @javax.annotation.Nullable 
   @Valid
   @ApiModelProperty(example = "72f98069-206d-4f12-9f12-3d1e525a8e84", value = "")
   public UUID getUuid() {
@@ -315,6 +327,7 @@ public class FormatTest {
    * Get password
    * @return password
   **/
+
   @NotNull
  @Size(min=10,max=64)  @ApiModelProperty(required = true, value = "")
   public String getPassword() {
diff --git a/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java b/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java
index ba573ce435..17fb98f8e7 100644
--- a/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java
+++ b/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java
@@ -38,6 +38,7 @@ public class HasOnlyReadOnly {
    * Get bar
    * @return bar
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getBar() {
     return bar;
@@ -47,6 +48,7 @@ public class HasOnlyReadOnly {
    * Get foo
    * @return foo
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getFoo() {
     return foo;
diff --git a/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/model/MapTest.java b/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/model/MapTest.java
index cfebb3cb53..920717d212 100644
--- a/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/model/MapTest.java
+++ b/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/model/MapTest.java
@@ -95,6 +95,7 @@ public class MapTest {
    * Get mapMapOfString
    * @return mapMapOfString
   **/
+  @javax.annotation.Nullable 
   @Valid
   @ApiModelProperty(value = "")
   public Map<String, Map<String, String>> getMapMapOfString() {
@@ -122,6 +123,7 @@ public class MapTest {
    * Get mapOfEnumString
    * @return mapOfEnumString
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Map<String, InnerEnum> getMapOfEnumString() {
     return mapOfEnumString;
@@ -148,6 +150,7 @@ public class MapTest {
    * Get directMap
    * @return directMap
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Map<String, Boolean> getDirectMap() {
     return directMap;
@@ -174,6 +177,7 @@ public class MapTest {
    * Get indirectMap
    * @return indirectMap
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Map<String, Boolean> getIndirectMap() {
     return indirectMap;
diff --git a/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java
index a42df2c8b3..fc1d3af28e 100644
--- a/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java
+++ b/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java
@@ -52,6 +52,7 @@ public class MixedPropertiesAndAdditionalPropertiesClass {
    * Get uuid
    * @return uuid
   **/
+  @javax.annotation.Nullable 
   @Valid
   @ApiModelProperty(value = "")
   public UUID getUuid() {
@@ -71,6 +72,7 @@ public class MixedPropertiesAndAdditionalPropertiesClass {
    * Get dateTime
    * @return dateTime
   **/
+  @javax.annotation.Nullable 
   @Valid
   @ApiModelProperty(value = "")
   public OffsetDateTime getDateTime() {
@@ -98,6 +100,7 @@ public class MixedPropertiesAndAdditionalPropertiesClass {
    * Get map
    * @return map
   **/
+  @javax.annotation.Nullable 
   @Valid
   @ApiModelProperty(value = "")
   public Map<String, Animal> getMap() {
diff --git a/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/model/Model200Response.java b/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/model/Model200Response.java
index ea38c104e5..ea07d5c6a8 100644
--- a/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/model/Model200Response.java
+++ b/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/model/Model200Response.java
@@ -44,6 +44,7 @@ public class Model200Response {
    * Get name
    * @return name
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Integer getName() {
     return name;
@@ -62,6 +63,7 @@ public class Model200Response {
    * Get propertyClass
    * @return propertyClass
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getPropertyClass() {
     return propertyClass;
diff --git a/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/model/ModelApiResponse.java b/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/model/ModelApiResponse.java
index ea6b333fc7..b30186ae73 100644
--- a/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/model/ModelApiResponse.java
+++ b/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/model/ModelApiResponse.java
@@ -46,6 +46,7 @@ public class ModelApiResponse {
    * Get code
    * @return code
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Integer getCode() {
     return code;
@@ -64,6 +65,7 @@ public class ModelApiResponse {
    * Get type
    * @return type
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getType() {
     return type;
@@ -82,6 +84,7 @@ public class ModelApiResponse {
    * Get message
    * @return message
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getMessage() {
     return message;
diff --git a/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/model/ModelReturn.java b/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/model/ModelReturn.java
index a79004799a..a8010bb637 100644
--- a/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/model/ModelReturn.java
+++ b/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/model/ModelReturn.java
@@ -41,6 +41,7 @@ public class ModelReturn {
    * Get _return
    * @return _return
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Integer getReturn() {
     return _return;
diff --git a/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/model/Name.java b/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/model/Name.java
index e512a48414..8f2864ef8f 100644
--- a/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/model/Name.java
+++ b/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/model/Name.java
@@ -50,6 +50,7 @@ public class Name {
    * Get name
    * @return name
   **/
+
   @NotNull
   @ApiModelProperty(required = true, value = "")
   public Integer getName() {
@@ -64,6 +65,7 @@ public class Name {
    * Get snakeCase
    * @return snakeCase
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Integer getSnakeCase() {
     return snakeCase;
@@ -78,6 +80,7 @@ public class Name {
    * Get property
    * @return property
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getProperty() {
     return property;
@@ -91,6 +94,7 @@ public class Name {
    * Get _123number
    * @return _123number
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Integer get123number() {
     return _123number;
diff --git a/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/model/NumberOnly.java b/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/model/NumberOnly.java
index 2669d07504..6ebb9d5231 100644
--- a/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/model/NumberOnly.java
+++ b/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/model/NumberOnly.java
@@ -41,6 +41,7 @@ public class NumberOnly {
    * Get justNumber
    * @return justNumber
   **/
+  @javax.annotation.Nullable 
   @Valid
   @ApiModelProperty(value = "")
   public BigDecimal getJustNumber() {
diff --git a/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/model/Order.java b/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/model/Order.java
index c17e23a58c..b276dea919 100644
--- a/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/model/Order.java
+++ b/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/model/Order.java
@@ -93,6 +93,7 @@ public class Order {
    * Get id
    * @return id
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Long getId() {
     return id;
@@ -111,6 +112,7 @@ public class Order {
    * Get petId
    * @return petId
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Long getPetId() {
     return petId;
@@ -129,6 +131,7 @@ public class Order {
    * Get quantity
    * @return quantity
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Integer getQuantity() {
     return quantity;
@@ -147,6 +150,7 @@ public class Order {
    * Get shipDate
    * @return shipDate
   **/
+  @javax.annotation.Nullable 
   @Valid
   @ApiModelProperty(value = "")
   public OffsetDateTime getShipDate() {
@@ -166,6 +170,7 @@ public class Order {
    * Order Status
    * @return status
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "Order Status")
   public StatusEnum getStatus() {
     return status;
@@ -184,6 +189,7 @@ public class Order {
    * Get complete
    * @return complete
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Boolean getComplete() {
     return complete;
diff --git a/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/model/OuterComposite.java b/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/model/OuterComposite.java
index 5f0bfb4e59..709bad5916 100644
--- a/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/model/OuterComposite.java
+++ b/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/model/OuterComposite.java
@@ -47,6 +47,7 @@ public class OuterComposite {
    * Get myNumber
    * @return myNumber
   **/
+  @javax.annotation.Nullable 
   @Valid
   @ApiModelProperty(value = "")
   public BigDecimal getMyNumber() {
@@ -66,6 +67,7 @@ public class OuterComposite {
    * Get myString
    * @return myString
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getMyString() {
     return myString;
@@ -84,6 +86,7 @@ public class OuterComposite {
    * Get myBoolean
    * @return myBoolean
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Boolean getMyBoolean() {
     return myBoolean;
diff --git a/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/model/Pet.java b/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/model/Pet.java
index d507247710..a77cad038b 100644
--- a/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/model/Pet.java
+++ b/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/model/Pet.java
@@ -96,6 +96,7 @@ public class Pet {
    * Get id
    * @return id
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Long getId() {
     return id;
@@ -114,6 +115,7 @@ public class Pet {
    * Get category
    * @return category
   **/
+  @javax.annotation.Nullable 
   @Valid
   @ApiModelProperty(value = "")
   public Category getCategory() {
@@ -133,6 +135,7 @@ public class Pet {
    * Get name
    * @return name
   **/
+
   @NotNull
   @ApiModelProperty(example = "doggie", required = true, value = "")
   public String getName() {
@@ -157,6 +160,7 @@ public class Pet {
    * Get photoUrls
    * @return photoUrls
   **/
+
   @NotNull
   @ApiModelProperty(required = true, value = "")
   public List<String> getPhotoUrls() {
@@ -184,6 +188,7 @@ public class Pet {
    * Get tags
    * @return tags
   **/
+  @javax.annotation.Nullable 
   @Valid
   @ApiModelProperty(value = "")
   public List<Tag> getTags() {
@@ -203,6 +208,7 @@ public class Pet {
    * pet status in the store
    * @return status
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "pet status in the store")
   public StatusEnum getStatus() {
     return status;
diff --git a/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/model/ReadOnlyFirst.java b/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/model/ReadOnlyFirst.java
index 4f57c24084..b8ec9b5b58 100644
--- a/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/model/ReadOnlyFirst.java
+++ b/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/model/ReadOnlyFirst.java
@@ -38,6 +38,7 @@ public class ReadOnlyFirst {
    * Get bar
    * @return bar
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getBar() {
     return bar;
@@ -52,6 +53,7 @@ public class ReadOnlyFirst {
    * Get baz
    * @return baz
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getBaz() {
     return baz;
diff --git a/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/model/SpecialModelName.java b/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/model/SpecialModelName.java
index f6b18fb17e..37405452a3 100644
--- a/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/model/SpecialModelName.java
+++ b/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/model/SpecialModelName.java
@@ -40,6 +40,7 @@ public class SpecialModelName {
    * Get $specialPropertyName
    * @return $specialPropertyName
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Long get$SpecialPropertyName() {
     return $specialPropertyName;
diff --git a/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/model/Tag.java b/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/model/Tag.java
index 3f96effbe1..78c198db1f 100644
--- a/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/model/Tag.java
+++ b/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/model/Tag.java
@@ -43,6 +43,7 @@ public class Tag {
    * Get id
    * @return id
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Long getId() {
     return id;
@@ -61,6 +62,7 @@ public class Tag {
    * Get name
    * @return name
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getName() {
     return name;
diff --git a/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/model/TypeHolderDefault.java b/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/model/TypeHolderDefault.java
index 6f1c423706..499efa34b5 100644
--- a/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/model/TypeHolderDefault.java
+++ b/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/model/TypeHolderDefault.java
@@ -55,6 +55,7 @@ public class TypeHolderDefault {
    * Get stringItem
    * @return stringItem
   **/
+
   @NotNull
   @ApiModelProperty(required = true, value = "")
   public String getStringItem() {
@@ -74,6 +75,7 @@ public class TypeHolderDefault {
    * Get numberItem
    * @return numberItem
   **/
+
   @NotNull
   @Valid
   @ApiModelProperty(required = true, value = "")
@@ -94,6 +96,7 @@ public class TypeHolderDefault {
    * Get integerItem
    * @return integerItem
   **/
+
   @NotNull
   @ApiModelProperty(required = true, value = "")
   public Integer getIntegerItem() {
@@ -113,6 +116,7 @@ public class TypeHolderDefault {
    * Get boolItem
    * @return boolItem
   **/
+
   @NotNull
   @ApiModelProperty(required = true, value = "")
   public Boolean getBoolItem() {
@@ -137,6 +141,7 @@ public class TypeHolderDefault {
    * Get arrayItem
    * @return arrayItem
   **/
+
   @NotNull
   @ApiModelProperty(required = true, value = "")
   public List<Integer> getArrayItem() {
diff --git a/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/model/TypeHolderExample.java b/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/model/TypeHolderExample.java
index f1e1e7792a..70c0b65d80 100644
--- a/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/model/TypeHolderExample.java
+++ b/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/model/TypeHolderExample.java
@@ -55,6 +55,7 @@ public class TypeHolderExample {
    * Get stringItem
    * @return stringItem
   **/
+
   @NotNull
   @ApiModelProperty(example = "what", required = true, value = "")
   public String getStringItem() {
@@ -74,6 +75,7 @@ public class TypeHolderExample {
    * Get numberItem
    * @return numberItem
   **/
+
   @NotNull
   @Valid
   @ApiModelProperty(example = "1.234", required = true, value = "")
@@ -94,6 +96,7 @@ public class TypeHolderExample {
    * Get integerItem
    * @return integerItem
   **/
+
   @NotNull
   @ApiModelProperty(example = "-2", required = true, value = "")
   public Integer getIntegerItem() {
@@ -113,6 +116,7 @@ public class TypeHolderExample {
    * Get boolItem
    * @return boolItem
   **/
+
   @NotNull
   @ApiModelProperty(example = "true", required = true, value = "")
   public Boolean getBoolItem() {
@@ -137,6 +141,7 @@ public class TypeHolderExample {
    * Get arrayItem
    * @return arrayItem
   **/
+
   @NotNull
   @ApiModelProperty(example = "[0, 1, 2, 3]", required = true, value = "")
   public List<Integer> getArrayItem() {
diff --git a/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/model/User.java b/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/model/User.java
index 53897d1843..6baf32249c 100644
--- a/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/model/User.java
+++ b/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/model/User.java
@@ -61,6 +61,7 @@ public class User {
    * Get id
    * @return id
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Long getId() {
     return id;
@@ -79,6 +80,7 @@ public class User {
    * Get username
    * @return username
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getUsername() {
     return username;
@@ -97,6 +99,7 @@ public class User {
    * Get firstName
    * @return firstName
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getFirstName() {
     return firstName;
@@ -115,6 +118,7 @@ public class User {
    * Get lastName
    * @return lastName
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getLastName() {
     return lastName;
@@ -133,6 +137,7 @@ public class User {
    * Get email
    * @return email
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getEmail() {
     return email;
@@ -151,6 +156,7 @@ public class User {
    * Get password
    * @return password
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getPassword() {
     return password;
@@ -169,6 +175,7 @@ public class User {
    * Get phone
    * @return phone
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getPhone() {
     return phone;
@@ -187,6 +194,7 @@ public class User {
    * User Status
    * @return userStatus
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "User Status")
   public Integer getUserStatus() {
     return userStatus;
diff --git a/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/model/XmlItem.java b/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/model/XmlItem.java
index 6bd0aac094..71f0e18c5a 100644
--- a/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/model/XmlItem.java
+++ b/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/model/XmlItem.java
@@ -127,6 +127,7 @@ public class XmlItem {
    * Get attributeString
    * @return attributeString
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(example = "string", value = "")
   public String getAttributeString() {
     return attributeString;
@@ -145,6 +146,7 @@ public class XmlItem {
    * Get attributeNumber
    * @return attributeNumber
   **/
+  @javax.annotation.Nullable 
   @Valid
   @ApiModelProperty(example = "1.234", value = "")
   public BigDecimal getAttributeNumber() {
@@ -164,6 +166,7 @@ public class XmlItem {
    * Get attributeInteger
    * @return attributeInteger
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(example = "-2", value = "")
   public Integer getAttributeInteger() {
     return attributeInteger;
@@ -182,6 +185,7 @@ public class XmlItem {
    * Get attributeBoolean
    * @return attributeBoolean
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(example = "true", value = "")
   public Boolean getAttributeBoolean() {
     return attributeBoolean;
@@ -208,6 +212,7 @@ public class XmlItem {
    * Get wrappedArray
    * @return wrappedArray
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public List<Integer> getWrappedArray() {
     return wrappedArray;
@@ -226,6 +231,7 @@ public class XmlItem {
    * Get nameString
    * @return nameString
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(example = "string", value = "")
   public String getNameString() {
     return nameString;
@@ -244,6 +250,7 @@ public class XmlItem {
    * Get nameNumber
    * @return nameNumber
   **/
+  @javax.annotation.Nullable 
   @Valid
   @ApiModelProperty(example = "1.234", value = "")
   public BigDecimal getNameNumber() {
@@ -263,6 +270,7 @@ public class XmlItem {
    * Get nameInteger
    * @return nameInteger
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(example = "-2", value = "")
   public Integer getNameInteger() {
     return nameInteger;
@@ -281,6 +289,7 @@ public class XmlItem {
    * Get nameBoolean
    * @return nameBoolean
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(example = "true", value = "")
   public Boolean getNameBoolean() {
     return nameBoolean;
@@ -307,6 +316,7 @@ public class XmlItem {
    * Get nameArray
    * @return nameArray
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public List<Integer> getNameArray() {
     return nameArray;
@@ -333,6 +343,7 @@ public class XmlItem {
    * Get nameWrappedArray
    * @return nameWrappedArray
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public List<Integer> getNameWrappedArray() {
     return nameWrappedArray;
@@ -351,6 +362,7 @@ public class XmlItem {
    * Get prefixString
    * @return prefixString
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(example = "string", value = "")
   public String getPrefixString() {
     return prefixString;
@@ -369,6 +381,7 @@ public class XmlItem {
    * Get prefixNumber
    * @return prefixNumber
   **/
+  @javax.annotation.Nullable 
   @Valid
   @ApiModelProperty(example = "1.234", value = "")
   public BigDecimal getPrefixNumber() {
@@ -388,6 +401,7 @@ public class XmlItem {
    * Get prefixInteger
    * @return prefixInteger
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(example = "-2", value = "")
   public Integer getPrefixInteger() {
     return prefixInteger;
@@ -406,6 +420,7 @@ public class XmlItem {
    * Get prefixBoolean
    * @return prefixBoolean
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(example = "true", value = "")
   public Boolean getPrefixBoolean() {
     return prefixBoolean;
@@ -432,6 +447,7 @@ public class XmlItem {
    * Get prefixArray
    * @return prefixArray
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public List<Integer> getPrefixArray() {
     return prefixArray;
@@ -458,6 +474,7 @@ public class XmlItem {
    * Get prefixWrappedArray
    * @return prefixWrappedArray
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public List<Integer> getPrefixWrappedArray() {
     return prefixWrappedArray;
@@ -476,6 +493,7 @@ public class XmlItem {
    * Get namespaceString
    * @return namespaceString
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(example = "string", value = "")
   public String getNamespaceString() {
     return namespaceString;
@@ -494,6 +512,7 @@ public class XmlItem {
    * Get namespaceNumber
    * @return namespaceNumber
   **/
+  @javax.annotation.Nullable 
   @Valid
   @ApiModelProperty(example = "1.234", value = "")
   public BigDecimal getNamespaceNumber() {
@@ -513,6 +532,7 @@ public class XmlItem {
    * Get namespaceInteger
    * @return namespaceInteger
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(example = "-2", value = "")
   public Integer getNamespaceInteger() {
     return namespaceInteger;
@@ -531,6 +551,7 @@ public class XmlItem {
    * Get namespaceBoolean
    * @return namespaceBoolean
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(example = "true", value = "")
   public Boolean getNamespaceBoolean() {
     return namespaceBoolean;
@@ -557,6 +578,7 @@ public class XmlItem {
    * Get namespaceArray
    * @return namespaceArray
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public List<Integer> getNamespaceArray() {
     return namespaceArray;
@@ -583,6 +605,7 @@ public class XmlItem {
    * Get namespaceWrappedArray
    * @return namespaceWrappedArray
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public List<Integer> getNamespaceWrappedArray() {
     return namespaceWrappedArray;
@@ -601,6 +624,7 @@ public class XmlItem {
    * Get prefixNsString
    * @return prefixNsString
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(example = "string", value = "")
   public String getPrefixNsString() {
     return prefixNsString;
@@ -619,6 +643,7 @@ public class XmlItem {
    * Get prefixNsNumber
    * @return prefixNsNumber
   **/
+  @javax.annotation.Nullable 
   @Valid
   @ApiModelProperty(example = "1.234", value = "")
   public BigDecimal getPrefixNsNumber() {
@@ -638,6 +663,7 @@ public class XmlItem {
    * Get prefixNsInteger
    * @return prefixNsInteger
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(example = "-2", value = "")
   public Integer getPrefixNsInteger() {
     return prefixNsInteger;
@@ -656,6 +682,7 @@ public class XmlItem {
    * Get prefixNsBoolean
    * @return prefixNsBoolean
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(example = "true", value = "")
   public Boolean getPrefixNsBoolean() {
     return prefixNsBoolean;
@@ -682,6 +709,7 @@ public class XmlItem {
    * Get prefixNsArray
    * @return prefixNsArray
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public List<Integer> getPrefixNsArray() {
     return prefixNsArray;
@@ -708,6 +736,7 @@ public class XmlItem {
    * Get prefixNsWrappedArray
    * @return prefixNsWrappedArray
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public List<Integer> getPrefixNsWrappedArray() {
     return prefixNsWrappedArray;
diff --git a/samples/client/petstore/java/retrofit2-play25/build.gradle b/samples/client/petstore/java/retrofit2-play25/build.gradle
index 217f0b4523..1c6b07aa86 100644
--- a/samples/client/petstore/java/retrofit2-play25/build.gradle
+++ b/samples/client/petstore/java/retrofit2-play25/build.gradle
@@ -110,6 +110,7 @@ dependencies {
     compile "com.squareup.retrofit2:converter-scalars:$retrofit_version"
     compile "com.squareup.retrofit2:converter-gson:$retrofit_version"
     compile "io.swagger:swagger-annotations:$swagger_annotations_version"
+    compile "com.google.code.findbugs:jsr305:3.0.2"
     compile ("org.apache.oltu.oauth2:org.apache.oltu.oauth2.client:$oltu_version"){
         exclude group:'org.apache.oltu.oauth2' , module: 'org.apache.oltu.oauth2.common'
     }
diff --git a/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/model/AdditionalPropertiesAnyType.java b/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/model/AdditionalPropertiesAnyType.java
index fdb2463eba..3c28034de7 100644
--- a/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/model/AdditionalPropertiesAnyType.java
+++ b/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/model/AdditionalPropertiesAnyType.java
@@ -42,6 +42,7 @@ public class AdditionalPropertiesAnyType extends HashMap<String, Object> {
    * Get name
    * @return name
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getName() {
     return name;
diff --git a/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/model/AdditionalPropertiesArray.java b/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/model/AdditionalPropertiesArray.java
index 2bbaf5fcb9..a1b662902c 100644
--- a/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/model/AdditionalPropertiesArray.java
+++ b/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/model/AdditionalPropertiesArray.java
@@ -43,6 +43,7 @@ public class AdditionalPropertiesArray extends HashMap<String, List> {
    * Get name
    * @return name
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getName() {
     return name;
diff --git a/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/model/AdditionalPropertiesBoolean.java b/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/model/AdditionalPropertiesBoolean.java
index 787e59f566..0f73cf6b2b 100644
--- a/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/model/AdditionalPropertiesBoolean.java
+++ b/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/model/AdditionalPropertiesBoolean.java
@@ -42,6 +42,7 @@ public class AdditionalPropertiesBoolean extends HashMap<String, Boolean> {
    * Get name
    * @return name
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getName() {
     return name;
diff --git a/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java b/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java
index 82e8921b20..b39b92f916 100644
--- a/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java
+++ b/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java
@@ -82,6 +82,7 @@ public class AdditionalPropertiesClass {
    * Get mapString
    * @return mapString
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Map<String, String> getMapString() {
     return mapString;
@@ -108,6 +109,7 @@ public class AdditionalPropertiesClass {
    * Get mapNumber
    * @return mapNumber
   **/
+  @javax.annotation.Nullable 
   @Valid
   @ApiModelProperty(value = "")
   public Map<String, BigDecimal> getMapNumber() {
@@ -135,6 +137,7 @@ public class AdditionalPropertiesClass {
    * Get mapInteger
    * @return mapInteger
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Map<String, Integer> getMapInteger() {
     return mapInteger;
@@ -161,6 +164,7 @@ public class AdditionalPropertiesClass {
    * Get mapBoolean
    * @return mapBoolean
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Map<String, Boolean> getMapBoolean() {
     return mapBoolean;
@@ -187,6 +191,7 @@ public class AdditionalPropertiesClass {
    * Get mapArrayInteger
    * @return mapArrayInteger
   **/
+  @javax.annotation.Nullable 
   @Valid
   @ApiModelProperty(value = "")
   public Map<String, List<Integer>> getMapArrayInteger() {
@@ -214,6 +219,7 @@ public class AdditionalPropertiesClass {
    * Get mapArrayAnytype
    * @return mapArrayAnytype
   **/
+  @javax.annotation.Nullable 
   @Valid
   @ApiModelProperty(value = "")
   public Map<String, List<Object>> getMapArrayAnytype() {
@@ -241,6 +247,7 @@ public class AdditionalPropertiesClass {
    * Get mapMapString
    * @return mapMapString
   **/
+  @javax.annotation.Nullable 
   @Valid
   @ApiModelProperty(value = "")
   public Map<String, Map<String, String>> getMapMapString() {
@@ -268,6 +275,7 @@ public class AdditionalPropertiesClass {
    * Get mapMapAnytype
    * @return mapMapAnytype
   **/
+  @javax.annotation.Nullable 
   @Valid
   @ApiModelProperty(value = "")
   public Map<String, Map<String, Object>> getMapMapAnytype() {
@@ -287,6 +295,7 @@ public class AdditionalPropertiesClass {
    * Get anytype1
    * @return anytype1
   **/
+  @javax.annotation.Nullable 
   @Valid
   @ApiModelProperty(value = "")
   public Object getAnytype1() {
@@ -306,6 +315,7 @@ public class AdditionalPropertiesClass {
    * Get anytype2
    * @return anytype2
   **/
+  @javax.annotation.Nullable 
   @Valid
   @ApiModelProperty(value = "")
   public Object getAnytype2() {
@@ -325,6 +335,7 @@ public class AdditionalPropertiesClass {
    * Get anytype3
    * @return anytype3
   **/
+  @javax.annotation.Nullable 
   @Valid
   @ApiModelProperty(value = "")
   public Object getAnytype3() {
diff --git a/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/model/AdditionalPropertiesInteger.java b/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/model/AdditionalPropertiesInteger.java
index 8ee999f00b..eafdd58e5d 100644
--- a/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/model/AdditionalPropertiesInteger.java
+++ b/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/model/AdditionalPropertiesInteger.java
@@ -42,6 +42,7 @@ public class AdditionalPropertiesInteger extends HashMap<String, Integer> {
    * Get name
    * @return name
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getName() {
     return name;
diff --git a/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/model/AdditionalPropertiesNumber.java b/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/model/AdditionalPropertiesNumber.java
index 84e4652c1b..c166cbef6d 100644
--- a/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/model/AdditionalPropertiesNumber.java
+++ b/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/model/AdditionalPropertiesNumber.java
@@ -43,6 +43,7 @@ public class AdditionalPropertiesNumber extends HashMap<String, BigDecimal> {
    * Get name
    * @return name
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getName() {
     return name;
diff --git a/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/model/AdditionalPropertiesObject.java b/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/model/AdditionalPropertiesObject.java
index 37e6d6ad96..6f7169d2eb 100644
--- a/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/model/AdditionalPropertiesObject.java
+++ b/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/model/AdditionalPropertiesObject.java
@@ -42,6 +42,7 @@ public class AdditionalPropertiesObject extends HashMap<String, Map> {
    * Get name
    * @return name
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getName() {
     return name;
diff --git a/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/model/AdditionalPropertiesString.java b/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/model/AdditionalPropertiesString.java
index 0c5e1f514a..1404d12db6 100644
--- a/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/model/AdditionalPropertiesString.java
+++ b/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/model/AdditionalPropertiesString.java
@@ -42,6 +42,7 @@ public class AdditionalPropertiesString extends HashMap<String, String> {
    * Get name
    * @return name
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getName() {
     return name;
diff --git a/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/model/Animal.java b/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/model/Animal.java
index 78b949b628..72b233aa45 100644
--- a/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/model/Animal.java
+++ b/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/model/Animal.java
@@ -51,6 +51,7 @@ public class Animal {
    * Get className
    * @return className
   **/
+
   @NotNull
   @ApiModelProperty(required = true, value = "")
   public String getClassName() {
@@ -70,6 +71,7 @@ public class Animal {
    * Get color
    * @return color
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getColor() {
     return color;
diff --git a/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java b/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java
index 4d02e387b1..dcf7fc9f48 100644
--- a/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java
+++ b/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java
@@ -51,6 +51,7 @@ public class ArrayOfArrayOfNumberOnly {
    * Get arrayArrayNumber
    * @return arrayArrayNumber
   **/
+  @javax.annotation.Nullable 
   @Valid
   @ApiModelProperty(value = "")
   public List<List<BigDecimal>> getArrayArrayNumber() {
diff --git a/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java b/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java
index 6e6b3fe2f8..520a394d26 100644
--- a/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java
+++ b/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java
@@ -51,6 +51,7 @@ public class ArrayOfNumberOnly {
    * Get arrayNumber
    * @return arrayNumber
   **/
+  @javax.annotation.Nullable 
   @Valid
   @ApiModelProperty(value = "")
   public List<BigDecimal> getArrayNumber() {
diff --git a/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/model/ArrayTest.java b/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/model/ArrayTest.java
index 83ad2d8e95..7ac5804445 100644
--- a/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/model/ArrayTest.java
+++ b/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/model/ArrayTest.java
@@ -57,6 +57,7 @@ public class ArrayTest {
    * Get arrayOfString
    * @return arrayOfString
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public List<String> getArrayOfString() {
     return arrayOfString;
@@ -83,6 +84,7 @@ public class ArrayTest {
    * Get arrayArrayOfInteger
    * @return arrayArrayOfInteger
   **/
+  @javax.annotation.Nullable 
   @Valid
   @ApiModelProperty(value = "")
   public List<List<Long>> getArrayArrayOfInteger() {
@@ -110,6 +112,7 @@ public class ArrayTest {
    * Get arrayArrayOfModel
    * @return arrayArrayOfModel
   **/
+  @javax.annotation.Nullable 
   @Valid
   @ApiModelProperty(value = "")
   public List<List<ReadOnlyFirst>> getArrayArrayOfModel() {
diff --git a/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/model/Capitalization.java b/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/model/Capitalization.java
index 49e8edc9fa..473052d303 100644
--- a/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/model/Capitalization.java
+++ b/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/model/Capitalization.java
@@ -55,6 +55,7 @@ public class Capitalization {
    * Get smallCamel
    * @return smallCamel
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getSmallCamel() {
     return smallCamel;
@@ -73,6 +74,7 @@ public class Capitalization {
    * Get capitalCamel
    * @return capitalCamel
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getCapitalCamel() {
     return capitalCamel;
@@ -91,6 +93,7 @@ public class Capitalization {
    * Get smallSnake
    * @return smallSnake
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getSmallSnake() {
     return smallSnake;
@@ -109,6 +112,7 @@ public class Capitalization {
    * Get capitalSnake
    * @return capitalSnake
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getCapitalSnake() {
     return capitalSnake;
@@ -127,6 +131,7 @@ public class Capitalization {
    * Get scAETHFlowPoints
    * @return scAETHFlowPoints
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getScAETHFlowPoints() {
     return scAETHFlowPoints;
@@ -145,6 +150,7 @@ public class Capitalization {
    * Name of the pet 
    * @return ATT_NAME
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "Name of the pet ")
   public String getATTNAME() {
     return ATT_NAME;
diff --git a/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/model/Cat.java b/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/model/Cat.java
index e534f3adff..a0b8ca3385 100644
--- a/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/model/Cat.java
+++ b/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/model/Cat.java
@@ -42,6 +42,7 @@ public class Cat extends Animal {
    * Get declawed
    * @return declawed
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Boolean getDeclawed() {
     return declawed;
diff --git a/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/model/CatAllOf.java b/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/model/CatAllOf.java
index 785656993b..997a3ef2f4 100644
--- a/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/model/CatAllOf.java
+++ b/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/model/CatAllOf.java
@@ -40,6 +40,7 @@ public class CatAllOf {
    * Get declawed
    * @return declawed
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Boolean getDeclawed() {
     return declawed;
diff --git a/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/model/Category.java b/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/model/Category.java
index 078bc70818..6db06530c3 100644
--- a/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/model/Category.java
+++ b/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/model/Category.java
@@ -43,6 +43,7 @@ public class Category {
    * Get id
    * @return id
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Long getId() {
     return id;
@@ -61,6 +62,7 @@ public class Category {
    * Get name
    * @return name
   **/
+
   @NotNull
   @ApiModelProperty(required = true, value = "")
   public String getName() {
diff --git a/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/model/ClassModel.java b/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/model/ClassModel.java
index 964f0fab15..41049c9bee 100644
--- a/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/model/ClassModel.java
+++ b/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/model/ClassModel.java
@@ -41,6 +41,7 @@ public class ClassModel {
    * Get propertyClass
    * @return propertyClass
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getPropertyClass() {
     return propertyClass;
diff --git a/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/model/Client.java b/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/model/Client.java
index 078f3e1de9..83962ddde1 100644
--- a/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/model/Client.java
+++ b/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/model/Client.java
@@ -40,6 +40,7 @@ public class Client {
    * Get client
    * @return client
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getClient() {
     return client;
diff --git a/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/model/Dog.java b/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/model/Dog.java
index 4c1bca6839..845c7aa339 100644
--- a/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/model/Dog.java
+++ b/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/model/Dog.java
@@ -42,6 +42,7 @@ public class Dog extends Animal {
    * Get breed
    * @return breed
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getBreed() {
     return breed;
diff --git a/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/model/DogAllOf.java b/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/model/DogAllOf.java
index caa98e0f41..1aa1423a91 100644
--- a/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/model/DogAllOf.java
+++ b/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/model/DogAllOf.java
@@ -40,6 +40,7 @@ public class DogAllOf {
    * Get breed
    * @return breed
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getBreed() {
     return breed;
diff --git a/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/model/EnumArrays.java b/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/model/EnumArrays.java
index 077db2b668..398db61223 100644
--- a/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/model/EnumArrays.java
+++ b/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/model/EnumArrays.java
@@ -115,6 +115,7 @@ public class EnumArrays {
    * Get justSymbol
    * @return justSymbol
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public JustSymbolEnum getJustSymbol() {
     return justSymbol;
@@ -141,6 +142,7 @@ public class EnumArrays {
    * Get arrayEnum
    * @return arrayEnum
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public List<ArrayEnumEnum> getArrayEnum() {
     return arrayEnum;
diff --git a/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/model/EnumTest.java b/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/model/EnumTest.java
index fb9f931387..88f0ab2b6e 100644
--- a/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/model/EnumTest.java
+++ b/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/model/EnumTest.java
@@ -197,6 +197,7 @@ public class EnumTest {
    * Get enumString
    * @return enumString
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public EnumStringEnum getEnumString() {
     return enumString;
@@ -215,6 +216,7 @@ public class EnumTest {
    * Get enumStringRequired
    * @return enumStringRequired
   **/
+
   @NotNull
   @ApiModelProperty(required = true, value = "")
   public EnumStringRequiredEnum getEnumStringRequired() {
@@ -234,6 +236,7 @@ public class EnumTest {
    * Get enumInteger
    * @return enumInteger
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public EnumIntegerEnum getEnumInteger() {
     return enumInteger;
@@ -252,6 +255,7 @@ public class EnumTest {
    * Get enumNumber
    * @return enumNumber
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public EnumNumberEnum getEnumNumber() {
     return enumNumber;
@@ -270,6 +274,7 @@ public class EnumTest {
    * Get outerEnum
    * @return outerEnum
   **/
+  @javax.annotation.Nullable 
   @Valid
   @ApiModelProperty(value = "")
   public OuterEnum getOuterEnum() {
diff --git a/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java b/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java
index fef73da58c..78595f7854 100644
--- a/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java
+++ b/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java
@@ -45,6 +45,7 @@ public class FileSchemaTestClass {
    * Get file
    * @return file
   **/
+  @javax.annotation.Nullable 
   @Valid
   @ApiModelProperty(value = "")
   public java.io.File getFile() {
@@ -72,6 +73,7 @@ public class FileSchemaTestClass {
    * Get files
    * @return files
   **/
+  @javax.annotation.Nullable 
   @Valid
   @ApiModelProperty(value = "")
   public List<java.io.File> getFiles() {
diff --git a/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/model/FormatTest.java b/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/model/FormatTest.java
index 98bc4181f1..7ec52a2c7f 100644
--- a/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/model/FormatTest.java
+++ b/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/model/FormatTest.java
@@ -83,6 +83,7 @@ public class FormatTest {
    * maximum: 100
    * @return integer
   **/
+  @javax.annotation.Nullable 
  @Min(10) @Max(100)  @ApiModelProperty(value = "")
   public Integer getInteger() {
     return integer;
@@ -103,6 +104,7 @@ public class FormatTest {
    * maximum: 200
    * @return int32
   **/
+  @javax.annotation.Nullable 
  @Min(20) @Max(200)  @ApiModelProperty(value = "")
   public Integer getInt32() {
     return int32;
@@ -121,6 +123,7 @@ public class FormatTest {
    * Get int64
    * @return int64
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Long getInt64() {
     return int64;
@@ -141,6 +144,7 @@ public class FormatTest {
    * maximum: 543.2
    * @return number
   **/
+
   @NotNull
   @Valid
  @DecimalMin("32.1") @DecimalMax("543.2")  @ApiModelProperty(required = true, value = "")
@@ -163,6 +167,7 @@ public class FormatTest {
    * maximum: 987.6
    * @return _float
   **/
+  @javax.annotation.Nullable 
  @DecimalMin("54.3") @DecimalMax("987.6")  @ApiModelProperty(value = "")
   public Float getFloat() {
     return _float;
@@ -183,6 +188,7 @@ public class FormatTest {
    * maximum: 123.4
    * @return _double
   **/
+  @javax.annotation.Nullable 
  @DecimalMin("67.8") @DecimalMax("123.4")  @ApiModelProperty(value = "")
   public Double getDouble() {
     return _double;
@@ -201,6 +207,7 @@ public class FormatTest {
    * Get string
    * @return string
   **/
+  @javax.annotation.Nullable 
  @Pattern(regexp="/[a-z]/i")  @ApiModelProperty(value = "")
   public String getString() {
     return string;
@@ -219,6 +226,7 @@ public class FormatTest {
    * Get _byte
    * @return _byte
   **/
+
   @NotNull
  @Pattern(regexp="^(?:[A-Za-z0-9+/]{4})*(?:[A-Za-z0-9+/]{2}==|[A-Za-z0-9+/]{3}=)?$")  @ApiModelProperty(required = true, value = "")
   public byte[] getByte() {
@@ -238,6 +246,7 @@ public class FormatTest {
    * Get binary
    * @return binary
   **/
+  @javax.annotation.Nullable 
   @Valid
   @ApiModelProperty(value = "")
   public File getBinary() {
@@ -257,6 +266,7 @@ public class FormatTest {
    * Get date
    * @return date
   **/
+
   @NotNull
   @Valid
   @ApiModelProperty(required = true, value = "")
@@ -277,6 +287,7 @@ public class FormatTest {
    * Get dateTime
    * @return dateTime
   **/
+  @javax.annotation.Nullable 
   @Valid
   @ApiModelProperty(value = "")
   public OffsetDateTime getDateTime() {
@@ -296,6 +307,7 @@ public class FormatTest {
    * Get uuid
    * @return uuid
   **/
+  @javax.annotation.Nullable 
   @Valid
   @ApiModelProperty(example = "72f98069-206d-4f12-9f12-3d1e525a8e84", value = "")
   public UUID getUuid() {
@@ -315,6 +327,7 @@ public class FormatTest {
    * Get password
    * @return password
   **/
+
   @NotNull
  @Size(min=10,max=64)  @ApiModelProperty(required = true, value = "")
   public String getPassword() {
diff --git a/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java b/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java
index ba573ce435..17fb98f8e7 100644
--- a/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java
+++ b/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java
@@ -38,6 +38,7 @@ public class HasOnlyReadOnly {
    * Get bar
    * @return bar
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getBar() {
     return bar;
@@ -47,6 +48,7 @@ public class HasOnlyReadOnly {
    * Get foo
    * @return foo
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getFoo() {
     return foo;
diff --git a/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/model/MapTest.java b/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/model/MapTest.java
index cfebb3cb53..920717d212 100644
--- a/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/model/MapTest.java
+++ b/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/model/MapTest.java
@@ -95,6 +95,7 @@ public class MapTest {
    * Get mapMapOfString
    * @return mapMapOfString
   **/
+  @javax.annotation.Nullable 
   @Valid
   @ApiModelProperty(value = "")
   public Map<String, Map<String, String>> getMapMapOfString() {
@@ -122,6 +123,7 @@ public class MapTest {
    * Get mapOfEnumString
    * @return mapOfEnumString
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Map<String, InnerEnum> getMapOfEnumString() {
     return mapOfEnumString;
@@ -148,6 +150,7 @@ public class MapTest {
    * Get directMap
    * @return directMap
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Map<String, Boolean> getDirectMap() {
     return directMap;
@@ -174,6 +177,7 @@ public class MapTest {
    * Get indirectMap
    * @return indirectMap
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Map<String, Boolean> getIndirectMap() {
     return indirectMap;
diff --git a/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java
index 176fcd84fd..870ceb97f9 100644
--- a/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java
+++ b/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java
@@ -52,6 +52,7 @@ public class MixedPropertiesAndAdditionalPropertiesClass {
    * Get uuid
    * @return uuid
   **/
+  @javax.annotation.Nullable 
   @Valid
   @ApiModelProperty(value = "")
   public UUID getUuid() {
@@ -71,6 +72,7 @@ public class MixedPropertiesAndAdditionalPropertiesClass {
    * Get dateTime
    * @return dateTime
   **/
+  @javax.annotation.Nullable 
   @Valid
   @ApiModelProperty(value = "")
   public OffsetDateTime getDateTime() {
@@ -98,6 +100,7 @@ public class MixedPropertiesAndAdditionalPropertiesClass {
    * Get map
    * @return map
   **/
+  @javax.annotation.Nullable 
   @Valid
   @ApiModelProperty(value = "")
   public Map<String, Animal> getMap() {
diff --git a/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/model/Model200Response.java b/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/model/Model200Response.java
index ea38c104e5..ea07d5c6a8 100644
--- a/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/model/Model200Response.java
+++ b/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/model/Model200Response.java
@@ -44,6 +44,7 @@ public class Model200Response {
    * Get name
    * @return name
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Integer getName() {
     return name;
@@ -62,6 +63,7 @@ public class Model200Response {
    * Get propertyClass
    * @return propertyClass
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getPropertyClass() {
     return propertyClass;
diff --git a/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/model/ModelApiResponse.java b/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/model/ModelApiResponse.java
index ea6b333fc7..b30186ae73 100644
--- a/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/model/ModelApiResponse.java
+++ b/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/model/ModelApiResponse.java
@@ -46,6 +46,7 @@ public class ModelApiResponse {
    * Get code
    * @return code
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Integer getCode() {
     return code;
@@ -64,6 +65,7 @@ public class ModelApiResponse {
    * Get type
    * @return type
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getType() {
     return type;
@@ -82,6 +84,7 @@ public class ModelApiResponse {
    * Get message
    * @return message
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getMessage() {
     return message;
diff --git a/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/model/ModelReturn.java b/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/model/ModelReturn.java
index a79004799a..a8010bb637 100644
--- a/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/model/ModelReturn.java
+++ b/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/model/ModelReturn.java
@@ -41,6 +41,7 @@ public class ModelReturn {
    * Get _return
    * @return _return
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Integer getReturn() {
     return _return;
diff --git a/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/model/Name.java b/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/model/Name.java
index e512a48414..8f2864ef8f 100644
--- a/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/model/Name.java
+++ b/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/model/Name.java
@@ -50,6 +50,7 @@ public class Name {
    * Get name
    * @return name
   **/
+
   @NotNull
   @ApiModelProperty(required = true, value = "")
   public Integer getName() {
@@ -64,6 +65,7 @@ public class Name {
    * Get snakeCase
    * @return snakeCase
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Integer getSnakeCase() {
     return snakeCase;
@@ -78,6 +80,7 @@ public class Name {
    * Get property
    * @return property
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getProperty() {
     return property;
@@ -91,6 +94,7 @@ public class Name {
    * Get _123number
    * @return _123number
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Integer get123number() {
     return _123number;
diff --git a/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/model/NumberOnly.java b/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/model/NumberOnly.java
index 2669d07504..6ebb9d5231 100644
--- a/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/model/NumberOnly.java
+++ b/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/model/NumberOnly.java
@@ -41,6 +41,7 @@ public class NumberOnly {
    * Get justNumber
    * @return justNumber
   **/
+  @javax.annotation.Nullable 
   @Valid
   @ApiModelProperty(value = "")
   public BigDecimal getJustNumber() {
diff --git a/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/model/Order.java b/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/model/Order.java
index 8c33e20d07..1f009a45cf 100644
--- a/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/model/Order.java
+++ b/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/model/Order.java
@@ -93,6 +93,7 @@ public class Order {
    * Get id
    * @return id
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Long getId() {
     return id;
@@ -111,6 +112,7 @@ public class Order {
    * Get petId
    * @return petId
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Long getPetId() {
     return petId;
@@ -129,6 +131,7 @@ public class Order {
    * Get quantity
    * @return quantity
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Integer getQuantity() {
     return quantity;
@@ -147,6 +150,7 @@ public class Order {
    * Get shipDate
    * @return shipDate
   **/
+  @javax.annotation.Nullable 
   @Valid
   @ApiModelProperty(value = "")
   public OffsetDateTime getShipDate() {
@@ -166,6 +170,7 @@ public class Order {
    * Order Status
    * @return status
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "Order Status")
   public StatusEnum getStatus() {
     return status;
@@ -184,6 +189,7 @@ public class Order {
    * Get complete
    * @return complete
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Boolean getComplete() {
     return complete;
diff --git a/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/model/OuterComposite.java b/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/model/OuterComposite.java
index 5f0bfb4e59..709bad5916 100644
--- a/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/model/OuterComposite.java
+++ b/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/model/OuterComposite.java
@@ -47,6 +47,7 @@ public class OuterComposite {
    * Get myNumber
    * @return myNumber
   **/
+  @javax.annotation.Nullable 
   @Valid
   @ApiModelProperty(value = "")
   public BigDecimal getMyNumber() {
@@ -66,6 +67,7 @@ public class OuterComposite {
    * Get myString
    * @return myString
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getMyString() {
     return myString;
@@ -84,6 +86,7 @@ public class OuterComposite {
    * Get myBoolean
    * @return myBoolean
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Boolean getMyBoolean() {
     return myBoolean;
diff --git a/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/model/Pet.java b/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/model/Pet.java
index d507247710..a77cad038b 100644
--- a/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/model/Pet.java
+++ b/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/model/Pet.java
@@ -96,6 +96,7 @@ public class Pet {
    * Get id
    * @return id
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Long getId() {
     return id;
@@ -114,6 +115,7 @@ public class Pet {
    * Get category
    * @return category
   **/
+  @javax.annotation.Nullable 
   @Valid
   @ApiModelProperty(value = "")
   public Category getCategory() {
@@ -133,6 +135,7 @@ public class Pet {
    * Get name
    * @return name
   **/
+
   @NotNull
   @ApiModelProperty(example = "doggie", required = true, value = "")
   public String getName() {
@@ -157,6 +160,7 @@ public class Pet {
    * Get photoUrls
    * @return photoUrls
   **/
+
   @NotNull
   @ApiModelProperty(required = true, value = "")
   public List<String> getPhotoUrls() {
@@ -184,6 +188,7 @@ public class Pet {
    * Get tags
    * @return tags
   **/
+  @javax.annotation.Nullable 
   @Valid
   @ApiModelProperty(value = "")
   public List<Tag> getTags() {
@@ -203,6 +208,7 @@ public class Pet {
    * pet status in the store
    * @return status
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "pet status in the store")
   public StatusEnum getStatus() {
     return status;
diff --git a/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/model/ReadOnlyFirst.java b/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/model/ReadOnlyFirst.java
index 4f57c24084..b8ec9b5b58 100644
--- a/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/model/ReadOnlyFirst.java
+++ b/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/model/ReadOnlyFirst.java
@@ -38,6 +38,7 @@ public class ReadOnlyFirst {
    * Get bar
    * @return bar
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getBar() {
     return bar;
@@ -52,6 +53,7 @@ public class ReadOnlyFirst {
    * Get baz
    * @return baz
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getBaz() {
     return baz;
diff --git a/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/model/SpecialModelName.java b/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/model/SpecialModelName.java
index f6b18fb17e..37405452a3 100644
--- a/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/model/SpecialModelName.java
+++ b/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/model/SpecialModelName.java
@@ -40,6 +40,7 @@ public class SpecialModelName {
    * Get $specialPropertyName
    * @return $specialPropertyName
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Long get$SpecialPropertyName() {
     return $specialPropertyName;
diff --git a/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/model/Tag.java b/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/model/Tag.java
index 3f96effbe1..78c198db1f 100644
--- a/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/model/Tag.java
+++ b/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/model/Tag.java
@@ -43,6 +43,7 @@ public class Tag {
    * Get id
    * @return id
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Long getId() {
     return id;
@@ -61,6 +62,7 @@ public class Tag {
    * Get name
    * @return name
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getName() {
     return name;
diff --git a/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/model/TypeHolderDefault.java b/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/model/TypeHolderDefault.java
index 6f1c423706..499efa34b5 100644
--- a/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/model/TypeHolderDefault.java
+++ b/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/model/TypeHolderDefault.java
@@ -55,6 +55,7 @@ public class TypeHolderDefault {
    * Get stringItem
    * @return stringItem
   **/
+
   @NotNull
   @ApiModelProperty(required = true, value = "")
   public String getStringItem() {
@@ -74,6 +75,7 @@ public class TypeHolderDefault {
    * Get numberItem
    * @return numberItem
   **/
+
   @NotNull
   @Valid
   @ApiModelProperty(required = true, value = "")
@@ -94,6 +96,7 @@ public class TypeHolderDefault {
    * Get integerItem
    * @return integerItem
   **/
+
   @NotNull
   @ApiModelProperty(required = true, value = "")
   public Integer getIntegerItem() {
@@ -113,6 +116,7 @@ public class TypeHolderDefault {
    * Get boolItem
    * @return boolItem
   **/
+
   @NotNull
   @ApiModelProperty(required = true, value = "")
   public Boolean getBoolItem() {
@@ -137,6 +141,7 @@ public class TypeHolderDefault {
    * Get arrayItem
    * @return arrayItem
   **/
+
   @NotNull
   @ApiModelProperty(required = true, value = "")
   public List<Integer> getArrayItem() {
diff --git a/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/model/TypeHolderExample.java b/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/model/TypeHolderExample.java
index f1e1e7792a..70c0b65d80 100644
--- a/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/model/TypeHolderExample.java
+++ b/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/model/TypeHolderExample.java
@@ -55,6 +55,7 @@ public class TypeHolderExample {
    * Get stringItem
    * @return stringItem
   **/
+
   @NotNull
   @ApiModelProperty(example = "what", required = true, value = "")
   public String getStringItem() {
@@ -74,6 +75,7 @@ public class TypeHolderExample {
    * Get numberItem
    * @return numberItem
   **/
+
   @NotNull
   @Valid
   @ApiModelProperty(example = "1.234", required = true, value = "")
@@ -94,6 +96,7 @@ public class TypeHolderExample {
    * Get integerItem
    * @return integerItem
   **/
+
   @NotNull
   @ApiModelProperty(example = "-2", required = true, value = "")
   public Integer getIntegerItem() {
@@ -113,6 +116,7 @@ public class TypeHolderExample {
    * Get boolItem
    * @return boolItem
   **/
+
   @NotNull
   @ApiModelProperty(example = "true", required = true, value = "")
   public Boolean getBoolItem() {
@@ -137,6 +141,7 @@ public class TypeHolderExample {
    * Get arrayItem
    * @return arrayItem
   **/
+
   @NotNull
   @ApiModelProperty(example = "[0, 1, 2, 3]", required = true, value = "")
   public List<Integer> getArrayItem() {
diff --git a/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/model/User.java b/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/model/User.java
index 53897d1843..6baf32249c 100644
--- a/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/model/User.java
+++ b/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/model/User.java
@@ -61,6 +61,7 @@ public class User {
    * Get id
    * @return id
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Long getId() {
     return id;
@@ -79,6 +80,7 @@ public class User {
    * Get username
    * @return username
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getUsername() {
     return username;
@@ -97,6 +99,7 @@ public class User {
    * Get firstName
    * @return firstName
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getFirstName() {
     return firstName;
@@ -115,6 +118,7 @@ public class User {
    * Get lastName
    * @return lastName
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getLastName() {
     return lastName;
@@ -133,6 +137,7 @@ public class User {
    * Get email
    * @return email
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getEmail() {
     return email;
@@ -151,6 +156,7 @@ public class User {
    * Get password
    * @return password
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getPassword() {
     return password;
@@ -169,6 +175,7 @@ public class User {
    * Get phone
    * @return phone
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getPhone() {
     return phone;
@@ -187,6 +194,7 @@ public class User {
    * User Status
    * @return userStatus
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "User Status")
   public Integer getUserStatus() {
     return userStatus;
diff --git a/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/model/XmlItem.java b/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/model/XmlItem.java
index 6bd0aac094..71f0e18c5a 100644
--- a/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/model/XmlItem.java
+++ b/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/model/XmlItem.java
@@ -127,6 +127,7 @@ public class XmlItem {
    * Get attributeString
    * @return attributeString
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(example = "string", value = "")
   public String getAttributeString() {
     return attributeString;
@@ -145,6 +146,7 @@ public class XmlItem {
    * Get attributeNumber
    * @return attributeNumber
   **/
+  @javax.annotation.Nullable 
   @Valid
   @ApiModelProperty(example = "1.234", value = "")
   public BigDecimal getAttributeNumber() {
@@ -164,6 +166,7 @@ public class XmlItem {
    * Get attributeInteger
    * @return attributeInteger
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(example = "-2", value = "")
   public Integer getAttributeInteger() {
     return attributeInteger;
@@ -182,6 +185,7 @@ public class XmlItem {
    * Get attributeBoolean
    * @return attributeBoolean
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(example = "true", value = "")
   public Boolean getAttributeBoolean() {
     return attributeBoolean;
@@ -208,6 +212,7 @@ public class XmlItem {
    * Get wrappedArray
    * @return wrappedArray
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public List<Integer> getWrappedArray() {
     return wrappedArray;
@@ -226,6 +231,7 @@ public class XmlItem {
    * Get nameString
    * @return nameString
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(example = "string", value = "")
   public String getNameString() {
     return nameString;
@@ -244,6 +250,7 @@ public class XmlItem {
    * Get nameNumber
    * @return nameNumber
   **/
+  @javax.annotation.Nullable 
   @Valid
   @ApiModelProperty(example = "1.234", value = "")
   public BigDecimal getNameNumber() {
@@ -263,6 +270,7 @@ public class XmlItem {
    * Get nameInteger
    * @return nameInteger
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(example = "-2", value = "")
   public Integer getNameInteger() {
     return nameInteger;
@@ -281,6 +289,7 @@ public class XmlItem {
    * Get nameBoolean
    * @return nameBoolean
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(example = "true", value = "")
   public Boolean getNameBoolean() {
     return nameBoolean;
@@ -307,6 +316,7 @@ public class XmlItem {
    * Get nameArray
    * @return nameArray
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public List<Integer> getNameArray() {
     return nameArray;
@@ -333,6 +343,7 @@ public class XmlItem {
    * Get nameWrappedArray
    * @return nameWrappedArray
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public List<Integer> getNameWrappedArray() {
     return nameWrappedArray;
@@ -351,6 +362,7 @@ public class XmlItem {
    * Get prefixString
    * @return prefixString
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(example = "string", value = "")
   public String getPrefixString() {
     return prefixString;
@@ -369,6 +381,7 @@ public class XmlItem {
    * Get prefixNumber
    * @return prefixNumber
   **/
+  @javax.annotation.Nullable 
   @Valid
   @ApiModelProperty(example = "1.234", value = "")
   public BigDecimal getPrefixNumber() {
@@ -388,6 +401,7 @@ public class XmlItem {
    * Get prefixInteger
    * @return prefixInteger
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(example = "-2", value = "")
   public Integer getPrefixInteger() {
     return prefixInteger;
@@ -406,6 +420,7 @@ public class XmlItem {
    * Get prefixBoolean
    * @return prefixBoolean
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(example = "true", value = "")
   public Boolean getPrefixBoolean() {
     return prefixBoolean;
@@ -432,6 +447,7 @@ public class XmlItem {
    * Get prefixArray
    * @return prefixArray
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public List<Integer> getPrefixArray() {
     return prefixArray;
@@ -458,6 +474,7 @@ public class XmlItem {
    * Get prefixWrappedArray
    * @return prefixWrappedArray
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public List<Integer> getPrefixWrappedArray() {
     return prefixWrappedArray;
@@ -476,6 +493,7 @@ public class XmlItem {
    * Get namespaceString
    * @return namespaceString
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(example = "string", value = "")
   public String getNamespaceString() {
     return namespaceString;
@@ -494,6 +512,7 @@ public class XmlItem {
    * Get namespaceNumber
    * @return namespaceNumber
   **/
+  @javax.annotation.Nullable 
   @Valid
   @ApiModelProperty(example = "1.234", value = "")
   public BigDecimal getNamespaceNumber() {
@@ -513,6 +532,7 @@ public class XmlItem {
    * Get namespaceInteger
    * @return namespaceInteger
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(example = "-2", value = "")
   public Integer getNamespaceInteger() {
     return namespaceInteger;
@@ -531,6 +551,7 @@ public class XmlItem {
    * Get namespaceBoolean
    * @return namespaceBoolean
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(example = "true", value = "")
   public Boolean getNamespaceBoolean() {
     return namespaceBoolean;
@@ -557,6 +578,7 @@ public class XmlItem {
    * Get namespaceArray
    * @return namespaceArray
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public List<Integer> getNamespaceArray() {
     return namespaceArray;
@@ -583,6 +605,7 @@ public class XmlItem {
    * Get namespaceWrappedArray
    * @return namespaceWrappedArray
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public List<Integer> getNamespaceWrappedArray() {
     return namespaceWrappedArray;
@@ -601,6 +624,7 @@ public class XmlItem {
    * Get prefixNsString
    * @return prefixNsString
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(example = "string", value = "")
   public String getPrefixNsString() {
     return prefixNsString;
@@ -619,6 +643,7 @@ public class XmlItem {
    * Get prefixNsNumber
    * @return prefixNsNumber
   **/
+  @javax.annotation.Nullable 
   @Valid
   @ApiModelProperty(example = "1.234", value = "")
   public BigDecimal getPrefixNsNumber() {
@@ -638,6 +663,7 @@ public class XmlItem {
    * Get prefixNsInteger
    * @return prefixNsInteger
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(example = "-2", value = "")
   public Integer getPrefixNsInteger() {
     return prefixNsInteger;
@@ -656,6 +682,7 @@ public class XmlItem {
    * Get prefixNsBoolean
    * @return prefixNsBoolean
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(example = "true", value = "")
   public Boolean getPrefixNsBoolean() {
     return prefixNsBoolean;
@@ -682,6 +709,7 @@ public class XmlItem {
    * Get prefixNsArray
    * @return prefixNsArray
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public List<Integer> getPrefixNsArray() {
     return prefixNsArray;
@@ -708,6 +736,7 @@ public class XmlItem {
    * Get prefixNsWrappedArray
    * @return prefixNsWrappedArray
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public List<Integer> getPrefixNsWrappedArray() {
     return prefixNsWrappedArray;
diff --git a/samples/client/petstore/java/retrofit2-play26/build.gradle b/samples/client/petstore/java/retrofit2-play26/build.gradle
index 9807ba7527..f8182e0932 100644
--- a/samples/client/petstore/java/retrofit2-play26/build.gradle
+++ b/samples/client/petstore/java/retrofit2-play26/build.gradle
@@ -111,6 +111,7 @@ dependencies {
     compile "com.squareup.retrofit2:converter-scalars:$retrofit_version"
     compile "com.squareup.retrofit2:converter-gson:$retrofit_version"
     compile "io.swagger:swagger-annotations:$swagger_annotations_version"
+    compile "com.google.code.findbugs:jsr305:3.0.2"
     compile ("org.apache.oltu.oauth2:org.apache.oltu.oauth2.client:$oltu_version"){
         exclude group:'org.apache.oltu.oauth2' , module: 'org.apache.oltu.oauth2.common'
     }
diff --git a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/AdditionalPropertiesAnyType.java b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/AdditionalPropertiesAnyType.java
index fdb2463eba..3c28034de7 100644
--- a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/AdditionalPropertiesAnyType.java
+++ b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/AdditionalPropertiesAnyType.java
@@ -42,6 +42,7 @@ public class AdditionalPropertiesAnyType extends HashMap<String, Object> {
    * Get name
    * @return name
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getName() {
     return name;
diff --git a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/AdditionalPropertiesArray.java b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/AdditionalPropertiesArray.java
index 2bbaf5fcb9..a1b662902c 100644
--- a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/AdditionalPropertiesArray.java
+++ b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/AdditionalPropertiesArray.java
@@ -43,6 +43,7 @@ public class AdditionalPropertiesArray extends HashMap<String, List> {
    * Get name
    * @return name
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getName() {
     return name;
diff --git a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/AdditionalPropertiesBoolean.java b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/AdditionalPropertiesBoolean.java
index 787e59f566..0f73cf6b2b 100644
--- a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/AdditionalPropertiesBoolean.java
+++ b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/AdditionalPropertiesBoolean.java
@@ -42,6 +42,7 @@ public class AdditionalPropertiesBoolean extends HashMap<String, Boolean> {
    * Get name
    * @return name
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getName() {
     return name;
diff --git a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java
index 82e8921b20..b39b92f916 100644
--- a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java
+++ b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java
@@ -82,6 +82,7 @@ public class AdditionalPropertiesClass {
    * Get mapString
    * @return mapString
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Map<String, String> getMapString() {
     return mapString;
@@ -108,6 +109,7 @@ public class AdditionalPropertiesClass {
    * Get mapNumber
    * @return mapNumber
   **/
+  @javax.annotation.Nullable 
   @Valid
   @ApiModelProperty(value = "")
   public Map<String, BigDecimal> getMapNumber() {
@@ -135,6 +137,7 @@ public class AdditionalPropertiesClass {
    * Get mapInteger
    * @return mapInteger
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Map<String, Integer> getMapInteger() {
     return mapInteger;
@@ -161,6 +164,7 @@ public class AdditionalPropertiesClass {
    * Get mapBoolean
    * @return mapBoolean
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Map<String, Boolean> getMapBoolean() {
     return mapBoolean;
@@ -187,6 +191,7 @@ public class AdditionalPropertiesClass {
    * Get mapArrayInteger
    * @return mapArrayInteger
   **/
+  @javax.annotation.Nullable 
   @Valid
   @ApiModelProperty(value = "")
   public Map<String, List<Integer>> getMapArrayInteger() {
@@ -214,6 +219,7 @@ public class AdditionalPropertiesClass {
    * Get mapArrayAnytype
    * @return mapArrayAnytype
   **/
+  @javax.annotation.Nullable 
   @Valid
   @ApiModelProperty(value = "")
   public Map<String, List<Object>> getMapArrayAnytype() {
@@ -241,6 +247,7 @@ public class AdditionalPropertiesClass {
    * Get mapMapString
    * @return mapMapString
   **/
+  @javax.annotation.Nullable 
   @Valid
   @ApiModelProperty(value = "")
   public Map<String, Map<String, String>> getMapMapString() {
@@ -268,6 +275,7 @@ public class AdditionalPropertiesClass {
    * Get mapMapAnytype
    * @return mapMapAnytype
   **/
+  @javax.annotation.Nullable 
   @Valid
   @ApiModelProperty(value = "")
   public Map<String, Map<String, Object>> getMapMapAnytype() {
@@ -287,6 +295,7 @@ public class AdditionalPropertiesClass {
    * Get anytype1
    * @return anytype1
   **/
+  @javax.annotation.Nullable 
   @Valid
   @ApiModelProperty(value = "")
   public Object getAnytype1() {
@@ -306,6 +315,7 @@ public class AdditionalPropertiesClass {
    * Get anytype2
    * @return anytype2
   **/
+  @javax.annotation.Nullable 
   @Valid
   @ApiModelProperty(value = "")
   public Object getAnytype2() {
@@ -325,6 +335,7 @@ public class AdditionalPropertiesClass {
    * Get anytype3
    * @return anytype3
   **/
+  @javax.annotation.Nullable 
   @Valid
   @ApiModelProperty(value = "")
   public Object getAnytype3() {
diff --git a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/AdditionalPropertiesInteger.java b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/AdditionalPropertiesInteger.java
index 8ee999f00b..eafdd58e5d 100644
--- a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/AdditionalPropertiesInteger.java
+++ b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/AdditionalPropertiesInteger.java
@@ -42,6 +42,7 @@ public class AdditionalPropertiesInteger extends HashMap<String, Integer> {
    * Get name
    * @return name
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getName() {
     return name;
diff --git a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/AdditionalPropertiesNumber.java b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/AdditionalPropertiesNumber.java
index 84e4652c1b..c166cbef6d 100644
--- a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/AdditionalPropertiesNumber.java
+++ b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/AdditionalPropertiesNumber.java
@@ -43,6 +43,7 @@ public class AdditionalPropertiesNumber extends HashMap<String, BigDecimal> {
    * Get name
    * @return name
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getName() {
     return name;
diff --git a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/AdditionalPropertiesObject.java b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/AdditionalPropertiesObject.java
index 37e6d6ad96..6f7169d2eb 100644
--- a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/AdditionalPropertiesObject.java
+++ b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/AdditionalPropertiesObject.java
@@ -42,6 +42,7 @@ public class AdditionalPropertiesObject extends HashMap<String, Map> {
    * Get name
    * @return name
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getName() {
     return name;
diff --git a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/AdditionalPropertiesString.java b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/AdditionalPropertiesString.java
index 0c5e1f514a..1404d12db6 100644
--- a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/AdditionalPropertiesString.java
+++ b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/AdditionalPropertiesString.java
@@ -42,6 +42,7 @@ public class AdditionalPropertiesString extends HashMap<String, String> {
    * Get name
    * @return name
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getName() {
     return name;
diff --git a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/Animal.java b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/Animal.java
index 78b949b628..72b233aa45 100644
--- a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/Animal.java
+++ b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/Animal.java
@@ -51,6 +51,7 @@ public class Animal {
    * Get className
    * @return className
   **/
+
   @NotNull
   @ApiModelProperty(required = true, value = "")
   public String getClassName() {
@@ -70,6 +71,7 @@ public class Animal {
    * Get color
    * @return color
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getColor() {
     return color;
diff --git a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java
index 4d02e387b1..dcf7fc9f48 100644
--- a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java
+++ b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java
@@ -51,6 +51,7 @@ public class ArrayOfArrayOfNumberOnly {
    * Get arrayArrayNumber
    * @return arrayArrayNumber
   **/
+  @javax.annotation.Nullable 
   @Valid
   @ApiModelProperty(value = "")
   public List<List<BigDecimal>> getArrayArrayNumber() {
diff --git a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java
index 6e6b3fe2f8..520a394d26 100644
--- a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java
+++ b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java
@@ -51,6 +51,7 @@ public class ArrayOfNumberOnly {
    * Get arrayNumber
    * @return arrayNumber
   **/
+  @javax.annotation.Nullable 
   @Valid
   @ApiModelProperty(value = "")
   public List<BigDecimal> getArrayNumber() {
diff --git a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/ArrayTest.java b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/ArrayTest.java
index 83ad2d8e95..7ac5804445 100644
--- a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/ArrayTest.java
+++ b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/ArrayTest.java
@@ -57,6 +57,7 @@ public class ArrayTest {
    * Get arrayOfString
    * @return arrayOfString
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public List<String> getArrayOfString() {
     return arrayOfString;
@@ -83,6 +84,7 @@ public class ArrayTest {
    * Get arrayArrayOfInteger
    * @return arrayArrayOfInteger
   **/
+  @javax.annotation.Nullable 
   @Valid
   @ApiModelProperty(value = "")
   public List<List<Long>> getArrayArrayOfInteger() {
@@ -110,6 +112,7 @@ public class ArrayTest {
    * Get arrayArrayOfModel
    * @return arrayArrayOfModel
   **/
+  @javax.annotation.Nullable 
   @Valid
   @ApiModelProperty(value = "")
   public List<List<ReadOnlyFirst>> getArrayArrayOfModel() {
diff --git a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/Capitalization.java b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/Capitalization.java
index 49e8edc9fa..473052d303 100644
--- a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/Capitalization.java
+++ b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/Capitalization.java
@@ -55,6 +55,7 @@ public class Capitalization {
    * Get smallCamel
    * @return smallCamel
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getSmallCamel() {
     return smallCamel;
@@ -73,6 +74,7 @@ public class Capitalization {
    * Get capitalCamel
    * @return capitalCamel
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getCapitalCamel() {
     return capitalCamel;
@@ -91,6 +93,7 @@ public class Capitalization {
    * Get smallSnake
    * @return smallSnake
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getSmallSnake() {
     return smallSnake;
@@ -109,6 +112,7 @@ public class Capitalization {
    * Get capitalSnake
    * @return capitalSnake
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getCapitalSnake() {
     return capitalSnake;
@@ -127,6 +131,7 @@ public class Capitalization {
    * Get scAETHFlowPoints
    * @return scAETHFlowPoints
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getScAETHFlowPoints() {
     return scAETHFlowPoints;
@@ -145,6 +150,7 @@ public class Capitalization {
    * Name of the pet 
    * @return ATT_NAME
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "Name of the pet ")
   public String getATTNAME() {
     return ATT_NAME;
diff --git a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/Cat.java b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/Cat.java
index e534f3adff..a0b8ca3385 100644
--- a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/Cat.java
+++ b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/Cat.java
@@ -42,6 +42,7 @@ public class Cat extends Animal {
    * Get declawed
    * @return declawed
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Boolean getDeclawed() {
     return declawed;
diff --git a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/CatAllOf.java b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/CatAllOf.java
index 785656993b..997a3ef2f4 100644
--- a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/CatAllOf.java
+++ b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/CatAllOf.java
@@ -40,6 +40,7 @@ public class CatAllOf {
    * Get declawed
    * @return declawed
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Boolean getDeclawed() {
     return declawed;
diff --git a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/Category.java b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/Category.java
index 078bc70818..6db06530c3 100644
--- a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/Category.java
+++ b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/Category.java
@@ -43,6 +43,7 @@ public class Category {
    * Get id
    * @return id
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Long getId() {
     return id;
@@ -61,6 +62,7 @@ public class Category {
    * Get name
    * @return name
   **/
+
   @NotNull
   @ApiModelProperty(required = true, value = "")
   public String getName() {
diff --git a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/ClassModel.java b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/ClassModel.java
index 964f0fab15..41049c9bee 100644
--- a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/ClassModel.java
+++ b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/ClassModel.java
@@ -41,6 +41,7 @@ public class ClassModel {
    * Get propertyClass
    * @return propertyClass
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getPropertyClass() {
     return propertyClass;
diff --git a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/Client.java b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/Client.java
index 078f3e1de9..83962ddde1 100644
--- a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/Client.java
+++ b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/Client.java
@@ -40,6 +40,7 @@ public class Client {
    * Get client
    * @return client
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getClient() {
     return client;
diff --git a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/Dog.java b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/Dog.java
index 4c1bca6839..845c7aa339 100644
--- a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/Dog.java
+++ b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/Dog.java
@@ -42,6 +42,7 @@ public class Dog extends Animal {
    * Get breed
    * @return breed
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getBreed() {
     return breed;
diff --git a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/DogAllOf.java b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/DogAllOf.java
index caa98e0f41..1aa1423a91 100644
--- a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/DogAllOf.java
+++ b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/DogAllOf.java
@@ -40,6 +40,7 @@ public class DogAllOf {
    * Get breed
    * @return breed
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getBreed() {
     return breed;
diff --git a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/EnumArrays.java b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/EnumArrays.java
index 077db2b668..398db61223 100644
--- a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/EnumArrays.java
+++ b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/EnumArrays.java
@@ -115,6 +115,7 @@ public class EnumArrays {
    * Get justSymbol
    * @return justSymbol
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public JustSymbolEnum getJustSymbol() {
     return justSymbol;
@@ -141,6 +142,7 @@ public class EnumArrays {
    * Get arrayEnum
    * @return arrayEnum
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public List<ArrayEnumEnum> getArrayEnum() {
     return arrayEnum;
diff --git a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/EnumTest.java b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/EnumTest.java
index fb9f931387..88f0ab2b6e 100644
--- a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/EnumTest.java
+++ b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/EnumTest.java
@@ -197,6 +197,7 @@ public class EnumTest {
    * Get enumString
    * @return enumString
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public EnumStringEnum getEnumString() {
     return enumString;
@@ -215,6 +216,7 @@ public class EnumTest {
    * Get enumStringRequired
    * @return enumStringRequired
   **/
+
   @NotNull
   @ApiModelProperty(required = true, value = "")
   public EnumStringRequiredEnum getEnumStringRequired() {
@@ -234,6 +236,7 @@ public class EnumTest {
    * Get enumInteger
    * @return enumInteger
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public EnumIntegerEnum getEnumInteger() {
     return enumInteger;
@@ -252,6 +255,7 @@ public class EnumTest {
    * Get enumNumber
    * @return enumNumber
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public EnumNumberEnum getEnumNumber() {
     return enumNumber;
@@ -270,6 +274,7 @@ public class EnumTest {
    * Get outerEnum
    * @return outerEnum
   **/
+  @javax.annotation.Nullable 
   @Valid
   @ApiModelProperty(value = "")
   public OuterEnum getOuterEnum() {
diff --git a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java
index fef73da58c..78595f7854 100644
--- a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java
+++ b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java
@@ -45,6 +45,7 @@ public class FileSchemaTestClass {
    * Get file
    * @return file
   **/
+  @javax.annotation.Nullable 
   @Valid
   @ApiModelProperty(value = "")
   public java.io.File getFile() {
@@ -72,6 +73,7 @@ public class FileSchemaTestClass {
    * Get files
    * @return files
   **/
+  @javax.annotation.Nullable 
   @Valid
   @ApiModelProperty(value = "")
   public List<java.io.File> getFiles() {
diff --git a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/FormatTest.java b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/FormatTest.java
index 98bc4181f1..7ec52a2c7f 100644
--- a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/FormatTest.java
+++ b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/FormatTest.java
@@ -83,6 +83,7 @@ public class FormatTest {
    * maximum: 100
    * @return integer
   **/
+  @javax.annotation.Nullable 
  @Min(10) @Max(100)  @ApiModelProperty(value = "")
   public Integer getInteger() {
     return integer;
@@ -103,6 +104,7 @@ public class FormatTest {
    * maximum: 200
    * @return int32
   **/
+  @javax.annotation.Nullable 
  @Min(20) @Max(200)  @ApiModelProperty(value = "")
   public Integer getInt32() {
     return int32;
@@ -121,6 +123,7 @@ public class FormatTest {
    * Get int64
    * @return int64
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Long getInt64() {
     return int64;
@@ -141,6 +144,7 @@ public class FormatTest {
    * maximum: 543.2
    * @return number
   **/
+
   @NotNull
   @Valid
  @DecimalMin("32.1") @DecimalMax("543.2")  @ApiModelProperty(required = true, value = "")
@@ -163,6 +167,7 @@ public class FormatTest {
    * maximum: 987.6
    * @return _float
   **/
+  @javax.annotation.Nullable 
  @DecimalMin("54.3") @DecimalMax("987.6")  @ApiModelProperty(value = "")
   public Float getFloat() {
     return _float;
@@ -183,6 +188,7 @@ public class FormatTest {
    * maximum: 123.4
    * @return _double
   **/
+  @javax.annotation.Nullable 
  @DecimalMin("67.8") @DecimalMax("123.4")  @ApiModelProperty(value = "")
   public Double getDouble() {
     return _double;
@@ -201,6 +207,7 @@ public class FormatTest {
    * Get string
    * @return string
   **/
+  @javax.annotation.Nullable 
  @Pattern(regexp="/[a-z]/i")  @ApiModelProperty(value = "")
   public String getString() {
     return string;
@@ -219,6 +226,7 @@ public class FormatTest {
    * Get _byte
    * @return _byte
   **/
+
   @NotNull
  @Pattern(regexp="^(?:[A-Za-z0-9+/]{4})*(?:[A-Za-z0-9+/]{2}==|[A-Za-z0-9+/]{3}=)?$")  @ApiModelProperty(required = true, value = "")
   public byte[] getByte() {
@@ -238,6 +246,7 @@ public class FormatTest {
    * Get binary
    * @return binary
   **/
+  @javax.annotation.Nullable 
   @Valid
   @ApiModelProperty(value = "")
   public File getBinary() {
@@ -257,6 +266,7 @@ public class FormatTest {
    * Get date
    * @return date
   **/
+
   @NotNull
   @Valid
   @ApiModelProperty(required = true, value = "")
@@ -277,6 +287,7 @@ public class FormatTest {
    * Get dateTime
    * @return dateTime
   **/
+  @javax.annotation.Nullable 
   @Valid
   @ApiModelProperty(value = "")
   public OffsetDateTime getDateTime() {
@@ -296,6 +307,7 @@ public class FormatTest {
    * Get uuid
    * @return uuid
   **/
+  @javax.annotation.Nullable 
   @Valid
   @ApiModelProperty(example = "72f98069-206d-4f12-9f12-3d1e525a8e84", value = "")
   public UUID getUuid() {
@@ -315,6 +327,7 @@ public class FormatTest {
    * Get password
    * @return password
   **/
+
   @NotNull
  @Size(min=10,max=64)  @ApiModelProperty(required = true, value = "")
   public String getPassword() {
diff --git a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java
index ba573ce435..17fb98f8e7 100644
--- a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java
+++ b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java
@@ -38,6 +38,7 @@ public class HasOnlyReadOnly {
    * Get bar
    * @return bar
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getBar() {
     return bar;
@@ -47,6 +48,7 @@ public class HasOnlyReadOnly {
    * Get foo
    * @return foo
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getFoo() {
     return foo;
diff --git a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/MapTest.java b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/MapTest.java
index cfebb3cb53..920717d212 100644
--- a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/MapTest.java
+++ b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/MapTest.java
@@ -95,6 +95,7 @@ public class MapTest {
    * Get mapMapOfString
    * @return mapMapOfString
   **/
+  @javax.annotation.Nullable 
   @Valid
   @ApiModelProperty(value = "")
   public Map<String, Map<String, String>> getMapMapOfString() {
@@ -122,6 +123,7 @@ public class MapTest {
    * Get mapOfEnumString
    * @return mapOfEnumString
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Map<String, InnerEnum> getMapOfEnumString() {
     return mapOfEnumString;
@@ -148,6 +150,7 @@ public class MapTest {
    * Get directMap
    * @return directMap
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Map<String, Boolean> getDirectMap() {
     return directMap;
@@ -174,6 +177,7 @@ public class MapTest {
    * Get indirectMap
    * @return indirectMap
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Map<String, Boolean> getIndirectMap() {
     return indirectMap;
diff --git a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java
index 176fcd84fd..870ceb97f9 100644
--- a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java
+++ b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java
@@ -52,6 +52,7 @@ public class MixedPropertiesAndAdditionalPropertiesClass {
    * Get uuid
    * @return uuid
   **/
+  @javax.annotation.Nullable 
   @Valid
   @ApiModelProperty(value = "")
   public UUID getUuid() {
@@ -71,6 +72,7 @@ public class MixedPropertiesAndAdditionalPropertiesClass {
    * Get dateTime
    * @return dateTime
   **/
+  @javax.annotation.Nullable 
   @Valid
   @ApiModelProperty(value = "")
   public OffsetDateTime getDateTime() {
@@ -98,6 +100,7 @@ public class MixedPropertiesAndAdditionalPropertiesClass {
    * Get map
    * @return map
   **/
+  @javax.annotation.Nullable 
   @Valid
   @ApiModelProperty(value = "")
   public Map<String, Animal> getMap() {
diff --git a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/Model200Response.java b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/Model200Response.java
index ea38c104e5..ea07d5c6a8 100644
--- a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/Model200Response.java
+++ b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/Model200Response.java
@@ -44,6 +44,7 @@ public class Model200Response {
    * Get name
    * @return name
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Integer getName() {
     return name;
@@ -62,6 +63,7 @@ public class Model200Response {
    * Get propertyClass
    * @return propertyClass
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getPropertyClass() {
     return propertyClass;
diff --git a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/ModelApiResponse.java b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/ModelApiResponse.java
index ea6b333fc7..b30186ae73 100644
--- a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/ModelApiResponse.java
+++ b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/ModelApiResponse.java
@@ -46,6 +46,7 @@ public class ModelApiResponse {
    * Get code
    * @return code
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Integer getCode() {
     return code;
@@ -64,6 +65,7 @@ public class ModelApiResponse {
    * Get type
    * @return type
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getType() {
     return type;
@@ -82,6 +84,7 @@ public class ModelApiResponse {
    * Get message
    * @return message
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getMessage() {
     return message;
diff --git a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/ModelReturn.java b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/ModelReturn.java
index a79004799a..a8010bb637 100644
--- a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/ModelReturn.java
+++ b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/ModelReturn.java
@@ -41,6 +41,7 @@ public class ModelReturn {
    * Get _return
    * @return _return
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Integer getReturn() {
     return _return;
diff --git a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/Name.java b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/Name.java
index e512a48414..8f2864ef8f 100644
--- a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/Name.java
+++ b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/Name.java
@@ -50,6 +50,7 @@ public class Name {
    * Get name
    * @return name
   **/
+
   @NotNull
   @ApiModelProperty(required = true, value = "")
   public Integer getName() {
@@ -64,6 +65,7 @@ public class Name {
    * Get snakeCase
    * @return snakeCase
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Integer getSnakeCase() {
     return snakeCase;
@@ -78,6 +80,7 @@ public class Name {
    * Get property
    * @return property
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getProperty() {
     return property;
@@ -91,6 +94,7 @@ public class Name {
    * Get _123number
    * @return _123number
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Integer get123number() {
     return _123number;
diff --git a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/NumberOnly.java b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/NumberOnly.java
index 2669d07504..6ebb9d5231 100644
--- a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/NumberOnly.java
+++ b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/NumberOnly.java
@@ -41,6 +41,7 @@ public class NumberOnly {
    * Get justNumber
    * @return justNumber
   **/
+  @javax.annotation.Nullable 
   @Valid
   @ApiModelProperty(value = "")
   public BigDecimal getJustNumber() {
diff --git a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/Order.java b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/Order.java
index 8c33e20d07..1f009a45cf 100644
--- a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/Order.java
+++ b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/Order.java
@@ -93,6 +93,7 @@ public class Order {
    * Get id
    * @return id
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Long getId() {
     return id;
@@ -111,6 +112,7 @@ public class Order {
    * Get petId
    * @return petId
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Long getPetId() {
     return petId;
@@ -129,6 +131,7 @@ public class Order {
    * Get quantity
    * @return quantity
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Integer getQuantity() {
     return quantity;
@@ -147,6 +150,7 @@ public class Order {
    * Get shipDate
    * @return shipDate
   **/
+  @javax.annotation.Nullable 
   @Valid
   @ApiModelProperty(value = "")
   public OffsetDateTime getShipDate() {
@@ -166,6 +170,7 @@ public class Order {
    * Order Status
    * @return status
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "Order Status")
   public StatusEnum getStatus() {
     return status;
@@ -184,6 +189,7 @@ public class Order {
    * Get complete
    * @return complete
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Boolean getComplete() {
     return complete;
diff --git a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/OuterComposite.java b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/OuterComposite.java
index 5f0bfb4e59..709bad5916 100644
--- a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/OuterComposite.java
+++ b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/OuterComposite.java
@@ -47,6 +47,7 @@ public class OuterComposite {
    * Get myNumber
    * @return myNumber
   **/
+  @javax.annotation.Nullable 
   @Valid
   @ApiModelProperty(value = "")
   public BigDecimal getMyNumber() {
@@ -66,6 +67,7 @@ public class OuterComposite {
    * Get myString
    * @return myString
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getMyString() {
     return myString;
@@ -84,6 +86,7 @@ public class OuterComposite {
    * Get myBoolean
    * @return myBoolean
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Boolean getMyBoolean() {
     return myBoolean;
diff --git a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/Pet.java b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/Pet.java
index d507247710..a77cad038b 100644
--- a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/Pet.java
+++ b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/Pet.java
@@ -96,6 +96,7 @@ public class Pet {
    * Get id
    * @return id
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Long getId() {
     return id;
@@ -114,6 +115,7 @@ public class Pet {
    * Get category
    * @return category
   **/
+  @javax.annotation.Nullable 
   @Valid
   @ApiModelProperty(value = "")
   public Category getCategory() {
@@ -133,6 +135,7 @@ public class Pet {
    * Get name
    * @return name
   **/
+
   @NotNull
   @ApiModelProperty(example = "doggie", required = true, value = "")
   public String getName() {
@@ -157,6 +160,7 @@ public class Pet {
    * Get photoUrls
    * @return photoUrls
   **/
+
   @NotNull
   @ApiModelProperty(required = true, value = "")
   public List<String> getPhotoUrls() {
@@ -184,6 +188,7 @@ public class Pet {
    * Get tags
    * @return tags
   **/
+  @javax.annotation.Nullable 
   @Valid
   @ApiModelProperty(value = "")
   public List<Tag> getTags() {
@@ -203,6 +208,7 @@ public class Pet {
    * pet status in the store
    * @return status
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "pet status in the store")
   public StatusEnum getStatus() {
     return status;
diff --git a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/ReadOnlyFirst.java b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/ReadOnlyFirst.java
index 4f57c24084..b8ec9b5b58 100644
--- a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/ReadOnlyFirst.java
+++ b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/ReadOnlyFirst.java
@@ -38,6 +38,7 @@ public class ReadOnlyFirst {
    * Get bar
    * @return bar
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getBar() {
     return bar;
@@ -52,6 +53,7 @@ public class ReadOnlyFirst {
    * Get baz
    * @return baz
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getBaz() {
     return baz;
diff --git a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/SpecialModelName.java b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/SpecialModelName.java
index f6b18fb17e..37405452a3 100644
--- a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/SpecialModelName.java
+++ b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/SpecialModelName.java
@@ -40,6 +40,7 @@ public class SpecialModelName {
    * Get $specialPropertyName
    * @return $specialPropertyName
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Long get$SpecialPropertyName() {
     return $specialPropertyName;
diff --git a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/Tag.java b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/Tag.java
index 3f96effbe1..78c198db1f 100644
--- a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/Tag.java
+++ b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/Tag.java
@@ -43,6 +43,7 @@ public class Tag {
    * Get id
    * @return id
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Long getId() {
     return id;
@@ -61,6 +62,7 @@ public class Tag {
    * Get name
    * @return name
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getName() {
     return name;
diff --git a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/TypeHolderDefault.java b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/TypeHolderDefault.java
index 6f1c423706..499efa34b5 100644
--- a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/TypeHolderDefault.java
+++ b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/TypeHolderDefault.java
@@ -55,6 +55,7 @@ public class TypeHolderDefault {
    * Get stringItem
    * @return stringItem
   **/
+
   @NotNull
   @ApiModelProperty(required = true, value = "")
   public String getStringItem() {
@@ -74,6 +75,7 @@ public class TypeHolderDefault {
    * Get numberItem
    * @return numberItem
   **/
+
   @NotNull
   @Valid
   @ApiModelProperty(required = true, value = "")
@@ -94,6 +96,7 @@ public class TypeHolderDefault {
    * Get integerItem
    * @return integerItem
   **/
+
   @NotNull
   @ApiModelProperty(required = true, value = "")
   public Integer getIntegerItem() {
@@ -113,6 +116,7 @@ public class TypeHolderDefault {
    * Get boolItem
    * @return boolItem
   **/
+
   @NotNull
   @ApiModelProperty(required = true, value = "")
   public Boolean getBoolItem() {
@@ -137,6 +141,7 @@ public class TypeHolderDefault {
    * Get arrayItem
    * @return arrayItem
   **/
+
   @NotNull
   @ApiModelProperty(required = true, value = "")
   public List<Integer> getArrayItem() {
diff --git a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/TypeHolderExample.java b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/TypeHolderExample.java
index f1e1e7792a..70c0b65d80 100644
--- a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/TypeHolderExample.java
+++ b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/TypeHolderExample.java
@@ -55,6 +55,7 @@ public class TypeHolderExample {
    * Get stringItem
    * @return stringItem
   **/
+
   @NotNull
   @ApiModelProperty(example = "what", required = true, value = "")
   public String getStringItem() {
@@ -74,6 +75,7 @@ public class TypeHolderExample {
    * Get numberItem
    * @return numberItem
   **/
+
   @NotNull
   @Valid
   @ApiModelProperty(example = "1.234", required = true, value = "")
@@ -94,6 +96,7 @@ public class TypeHolderExample {
    * Get integerItem
    * @return integerItem
   **/
+
   @NotNull
   @ApiModelProperty(example = "-2", required = true, value = "")
   public Integer getIntegerItem() {
@@ -113,6 +116,7 @@ public class TypeHolderExample {
    * Get boolItem
    * @return boolItem
   **/
+
   @NotNull
   @ApiModelProperty(example = "true", required = true, value = "")
   public Boolean getBoolItem() {
@@ -137,6 +141,7 @@ public class TypeHolderExample {
    * Get arrayItem
    * @return arrayItem
   **/
+
   @NotNull
   @ApiModelProperty(example = "[0, 1, 2, 3]", required = true, value = "")
   public List<Integer> getArrayItem() {
diff --git a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/User.java b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/User.java
index 53897d1843..6baf32249c 100644
--- a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/User.java
+++ b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/User.java
@@ -61,6 +61,7 @@ public class User {
    * Get id
    * @return id
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Long getId() {
     return id;
@@ -79,6 +80,7 @@ public class User {
    * Get username
    * @return username
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getUsername() {
     return username;
@@ -97,6 +99,7 @@ public class User {
    * Get firstName
    * @return firstName
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getFirstName() {
     return firstName;
@@ -115,6 +118,7 @@ public class User {
    * Get lastName
    * @return lastName
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getLastName() {
     return lastName;
@@ -133,6 +137,7 @@ public class User {
    * Get email
    * @return email
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getEmail() {
     return email;
@@ -151,6 +156,7 @@ public class User {
    * Get password
    * @return password
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getPassword() {
     return password;
@@ -169,6 +175,7 @@ public class User {
    * Get phone
    * @return phone
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getPhone() {
     return phone;
@@ -187,6 +194,7 @@ public class User {
    * User Status
    * @return userStatus
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "User Status")
   public Integer getUserStatus() {
     return userStatus;
diff --git a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/XmlItem.java b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/XmlItem.java
index 6bd0aac094..71f0e18c5a 100644
--- a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/XmlItem.java
+++ b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/XmlItem.java
@@ -127,6 +127,7 @@ public class XmlItem {
    * Get attributeString
    * @return attributeString
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(example = "string", value = "")
   public String getAttributeString() {
     return attributeString;
@@ -145,6 +146,7 @@ public class XmlItem {
    * Get attributeNumber
    * @return attributeNumber
   **/
+  @javax.annotation.Nullable 
   @Valid
   @ApiModelProperty(example = "1.234", value = "")
   public BigDecimal getAttributeNumber() {
@@ -164,6 +166,7 @@ public class XmlItem {
    * Get attributeInteger
    * @return attributeInteger
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(example = "-2", value = "")
   public Integer getAttributeInteger() {
     return attributeInteger;
@@ -182,6 +185,7 @@ public class XmlItem {
    * Get attributeBoolean
    * @return attributeBoolean
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(example = "true", value = "")
   public Boolean getAttributeBoolean() {
     return attributeBoolean;
@@ -208,6 +212,7 @@ public class XmlItem {
    * Get wrappedArray
    * @return wrappedArray
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public List<Integer> getWrappedArray() {
     return wrappedArray;
@@ -226,6 +231,7 @@ public class XmlItem {
    * Get nameString
    * @return nameString
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(example = "string", value = "")
   public String getNameString() {
     return nameString;
@@ -244,6 +250,7 @@ public class XmlItem {
    * Get nameNumber
    * @return nameNumber
   **/
+  @javax.annotation.Nullable 
   @Valid
   @ApiModelProperty(example = "1.234", value = "")
   public BigDecimal getNameNumber() {
@@ -263,6 +270,7 @@ public class XmlItem {
    * Get nameInteger
    * @return nameInteger
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(example = "-2", value = "")
   public Integer getNameInteger() {
     return nameInteger;
@@ -281,6 +289,7 @@ public class XmlItem {
    * Get nameBoolean
    * @return nameBoolean
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(example = "true", value = "")
   public Boolean getNameBoolean() {
     return nameBoolean;
@@ -307,6 +316,7 @@ public class XmlItem {
    * Get nameArray
    * @return nameArray
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public List<Integer> getNameArray() {
     return nameArray;
@@ -333,6 +343,7 @@ public class XmlItem {
    * Get nameWrappedArray
    * @return nameWrappedArray
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public List<Integer> getNameWrappedArray() {
     return nameWrappedArray;
@@ -351,6 +362,7 @@ public class XmlItem {
    * Get prefixString
    * @return prefixString
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(example = "string", value = "")
   public String getPrefixString() {
     return prefixString;
@@ -369,6 +381,7 @@ public class XmlItem {
    * Get prefixNumber
    * @return prefixNumber
   **/
+  @javax.annotation.Nullable 
   @Valid
   @ApiModelProperty(example = "1.234", value = "")
   public BigDecimal getPrefixNumber() {
@@ -388,6 +401,7 @@ public class XmlItem {
    * Get prefixInteger
    * @return prefixInteger
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(example = "-2", value = "")
   public Integer getPrefixInteger() {
     return prefixInteger;
@@ -406,6 +420,7 @@ public class XmlItem {
    * Get prefixBoolean
    * @return prefixBoolean
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(example = "true", value = "")
   public Boolean getPrefixBoolean() {
     return prefixBoolean;
@@ -432,6 +447,7 @@ public class XmlItem {
    * Get prefixArray
    * @return prefixArray
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public List<Integer> getPrefixArray() {
     return prefixArray;
@@ -458,6 +474,7 @@ public class XmlItem {
    * Get prefixWrappedArray
    * @return prefixWrappedArray
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public List<Integer> getPrefixWrappedArray() {
     return prefixWrappedArray;
@@ -476,6 +493,7 @@ public class XmlItem {
    * Get namespaceString
    * @return namespaceString
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(example = "string", value = "")
   public String getNamespaceString() {
     return namespaceString;
@@ -494,6 +512,7 @@ public class XmlItem {
    * Get namespaceNumber
    * @return namespaceNumber
   **/
+  @javax.annotation.Nullable 
   @Valid
   @ApiModelProperty(example = "1.234", value = "")
   public BigDecimal getNamespaceNumber() {
@@ -513,6 +532,7 @@ public class XmlItem {
    * Get namespaceInteger
    * @return namespaceInteger
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(example = "-2", value = "")
   public Integer getNamespaceInteger() {
     return namespaceInteger;
@@ -531,6 +551,7 @@ public class XmlItem {
    * Get namespaceBoolean
    * @return namespaceBoolean
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(example = "true", value = "")
   public Boolean getNamespaceBoolean() {
     return namespaceBoolean;
@@ -557,6 +578,7 @@ public class XmlItem {
    * Get namespaceArray
    * @return namespaceArray
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public List<Integer> getNamespaceArray() {
     return namespaceArray;
@@ -583,6 +605,7 @@ public class XmlItem {
    * Get namespaceWrappedArray
    * @return namespaceWrappedArray
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public List<Integer> getNamespaceWrappedArray() {
     return namespaceWrappedArray;
@@ -601,6 +624,7 @@ public class XmlItem {
    * Get prefixNsString
    * @return prefixNsString
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(example = "string", value = "")
   public String getPrefixNsString() {
     return prefixNsString;
@@ -619,6 +643,7 @@ public class XmlItem {
    * Get prefixNsNumber
    * @return prefixNsNumber
   **/
+  @javax.annotation.Nullable 
   @Valid
   @ApiModelProperty(example = "1.234", value = "")
   public BigDecimal getPrefixNsNumber() {
@@ -638,6 +663,7 @@ public class XmlItem {
    * Get prefixNsInteger
    * @return prefixNsInteger
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(example = "-2", value = "")
   public Integer getPrefixNsInteger() {
     return prefixNsInteger;
@@ -656,6 +682,7 @@ public class XmlItem {
    * Get prefixNsBoolean
    * @return prefixNsBoolean
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(example = "true", value = "")
   public Boolean getPrefixNsBoolean() {
     return prefixNsBoolean;
@@ -682,6 +709,7 @@ public class XmlItem {
    * Get prefixNsArray
    * @return prefixNsArray
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public List<Integer> getPrefixNsArray() {
     return prefixNsArray;
@@ -708,6 +736,7 @@ public class XmlItem {
    * Get prefixNsWrappedArray
    * @return prefixNsWrappedArray
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public List<Integer> getPrefixNsWrappedArray() {
     return prefixNsWrappedArray;
diff --git a/samples/client/petstore/java/retrofit2/build.gradle b/samples/client/petstore/java/retrofit2/build.gradle
index 65eb8fc672..fe7dc2edaf 100644
--- a/samples/client/petstore/java/retrofit2/build.gradle
+++ b/samples/client/petstore/java/retrofit2/build.gradle
@@ -108,6 +108,7 @@ dependencies {
     compile "com.squareup.retrofit2:converter-scalars:$retrofit_version"
     compile "com.squareup.retrofit2:converter-gson:$retrofit_version"
     compile "io.swagger:swagger-annotations:$swagger_annotations_version"
+    compile "com.google.code.findbugs:jsr305:3.0.2"
     compile ("org.apache.oltu.oauth2:org.apache.oltu.oauth2.client:$oltu_version"){
         exclude group:'org.apache.oltu.oauth2' , module: 'org.apache.oltu.oauth2.common'
     }
diff --git a/samples/client/petstore/java/retrofit2/pom.xml b/samples/client/petstore/java/retrofit2/pom.xml
index 5307e5f124..c0d0659103 100644
--- a/samples/client/petstore/java/retrofit2/pom.xml
+++ b/samples/client/petstore/java/retrofit2/pom.xml
@@ -191,6 +191,12 @@
             <artifactId>swagger-annotations</artifactId>
             <version>${swagger-annotations-version}</version>
         </dependency>
+        <!-- @Nullable annotation -->
+        <dependency>
+            <groupId>com.google.code.findbugs</groupId>
+            <artifactId>jsr305</artifactId>
+            <version>3.0.2</version>
+        </dependency>
         <dependency>
             <groupId>com.squareup.retrofit2</groupId>
             <artifactId>converter-gson</artifactId>
diff --git a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/AdditionalPropertiesAnyType.java b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/AdditionalPropertiesAnyType.java
index 9c47737ced..e98f74f8ae 100644
--- a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/AdditionalPropertiesAnyType.java
+++ b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/AdditionalPropertiesAnyType.java
@@ -44,6 +44,7 @@ public class AdditionalPropertiesAnyType extends HashMap<String, Object> {
    * Get name
    * @return name
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getName() {
     return name;
diff --git a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/AdditionalPropertiesArray.java b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/AdditionalPropertiesArray.java
index c5eed6cdac..1d86faad3e 100644
--- a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/AdditionalPropertiesArray.java
+++ b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/AdditionalPropertiesArray.java
@@ -45,6 +45,7 @@ public class AdditionalPropertiesArray extends HashMap<String, List> {
    * Get name
    * @return name
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getName() {
     return name;
diff --git a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/AdditionalPropertiesBoolean.java b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/AdditionalPropertiesBoolean.java
index 390777ff37..a3b37161da 100644
--- a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/AdditionalPropertiesBoolean.java
+++ b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/AdditionalPropertiesBoolean.java
@@ -44,6 +44,7 @@ public class AdditionalPropertiesBoolean extends HashMap<String, Boolean> {
    * Get name
    * @return name
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getName() {
     return name;
diff --git a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java
index 3c1a02c33c..8819f4a024 100644
--- a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java
+++ b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java
@@ -94,6 +94,7 @@ public class AdditionalPropertiesClass {
    * Get mapString
    * @return mapString
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Map<String, String> getMapString() {
     return mapString;
@@ -120,6 +121,7 @@ public class AdditionalPropertiesClass {
    * Get mapNumber
    * @return mapNumber
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Map<String, BigDecimal> getMapNumber() {
     return mapNumber;
@@ -146,6 +148,7 @@ public class AdditionalPropertiesClass {
    * Get mapInteger
    * @return mapInteger
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Map<String, Integer> getMapInteger() {
     return mapInteger;
@@ -172,6 +175,7 @@ public class AdditionalPropertiesClass {
    * Get mapBoolean
    * @return mapBoolean
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Map<String, Boolean> getMapBoolean() {
     return mapBoolean;
@@ -198,6 +202,7 @@ public class AdditionalPropertiesClass {
    * Get mapArrayInteger
    * @return mapArrayInteger
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Map<String, List<Integer>> getMapArrayInteger() {
     return mapArrayInteger;
@@ -224,6 +229,7 @@ public class AdditionalPropertiesClass {
    * Get mapArrayAnytype
    * @return mapArrayAnytype
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Map<String, List<Object>> getMapArrayAnytype() {
     return mapArrayAnytype;
@@ -250,6 +256,7 @@ public class AdditionalPropertiesClass {
    * Get mapMapString
    * @return mapMapString
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Map<String, Map<String, String>> getMapMapString() {
     return mapMapString;
@@ -276,6 +283,7 @@ public class AdditionalPropertiesClass {
    * Get mapMapAnytype
    * @return mapMapAnytype
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Map<String, Map<String, Object>> getMapMapAnytype() {
     return mapMapAnytype;
@@ -294,6 +302,7 @@ public class AdditionalPropertiesClass {
    * Get anytype1
    * @return anytype1
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Object getAnytype1() {
     return anytype1;
@@ -312,6 +321,7 @@ public class AdditionalPropertiesClass {
    * Get anytype2
    * @return anytype2
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Object getAnytype2() {
     return anytype2;
@@ -330,6 +340,7 @@ public class AdditionalPropertiesClass {
    * Get anytype3
    * @return anytype3
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Object getAnytype3() {
     return anytype3;
diff --git a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/AdditionalPropertiesInteger.java b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/AdditionalPropertiesInteger.java
index df6e865593..b8f956cbed 100644
--- a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/AdditionalPropertiesInteger.java
+++ b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/AdditionalPropertiesInteger.java
@@ -44,6 +44,7 @@ public class AdditionalPropertiesInteger extends HashMap<String, Integer> {
    * Get name
    * @return name
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getName() {
     return name;
diff --git a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/AdditionalPropertiesNumber.java b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/AdditionalPropertiesNumber.java
index 8a9118cf85..03d923ab1d 100644
--- a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/AdditionalPropertiesNumber.java
+++ b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/AdditionalPropertiesNumber.java
@@ -45,6 +45,7 @@ public class AdditionalPropertiesNumber extends HashMap<String, BigDecimal> {
    * Get name
    * @return name
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getName() {
     return name;
diff --git a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/AdditionalPropertiesObject.java b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/AdditionalPropertiesObject.java
index b67f12d840..c0e696dbd5 100644
--- a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/AdditionalPropertiesObject.java
+++ b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/AdditionalPropertiesObject.java
@@ -44,6 +44,7 @@ public class AdditionalPropertiesObject extends HashMap<String, Map> {
    * Get name
    * @return name
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getName() {
     return name;
diff --git a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/AdditionalPropertiesString.java b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/AdditionalPropertiesString.java
index 6e54b260fd..67e597e3cf 100644
--- a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/AdditionalPropertiesString.java
+++ b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/AdditionalPropertiesString.java
@@ -44,6 +44,7 @@ public class AdditionalPropertiesString extends HashMap<String, String> {
    * Get name
    * @return name
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getName() {
     return name;
diff --git a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/Animal.java b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/Animal.java
index 06342bce06..1738bdaf47 100644
--- a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/Animal.java
+++ b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/Animal.java
@@ -50,6 +50,7 @@ public class Animal {
    * Get className
    * @return className
   **/
+
   @ApiModelProperty(required = true, value = "")
   public String getClassName() {
     return className;
@@ -68,6 +69,7 @@ public class Animal {
    * Get color
    * @return color
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getColor() {
     return color;
diff --git a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java
index 87429212a6..69c0cacb05 100644
--- a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java
+++ b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java
@@ -53,6 +53,7 @@ public class ArrayOfArrayOfNumberOnly {
    * Get arrayArrayNumber
    * @return arrayArrayNumber
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public List<List<BigDecimal>> getArrayArrayNumber() {
     return arrayArrayNumber;
diff --git a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java
index c21e45d438..a85aa96af7 100644
--- a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java
+++ b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java
@@ -53,6 +53,7 @@ public class ArrayOfNumberOnly {
    * Get arrayNumber
    * @return arrayNumber
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public List<BigDecimal> getArrayNumber() {
     return arrayNumber;
diff --git a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/ArrayTest.java b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/ArrayTest.java
index 8ae596291a..986ac5aa17 100644
--- a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/ArrayTest.java
+++ b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/ArrayTest.java
@@ -61,6 +61,7 @@ public class ArrayTest {
    * Get arrayOfString
    * @return arrayOfString
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public List<String> getArrayOfString() {
     return arrayOfString;
@@ -87,6 +88,7 @@ public class ArrayTest {
    * Get arrayArrayOfInteger
    * @return arrayArrayOfInteger
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public List<List<Long>> getArrayArrayOfInteger() {
     return arrayArrayOfInteger;
@@ -113,6 +115,7 @@ public class ArrayTest {
    * Get arrayArrayOfModel
    * @return arrayArrayOfModel
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public List<List<ReadOnlyFirst>> getArrayArrayOfModel() {
     return arrayArrayOfModel;
diff --git a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/Capitalization.java b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/Capitalization.java
index 3f05d95d60..36f8853e1c 100644
--- a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/Capitalization.java
+++ b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/Capitalization.java
@@ -62,6 +62,7 @@ public class Capitalization {
    * Get smallCamel
    * @return smallCamel
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getSmallCamel() {
     return smallCamel;
@@ -80,6 +81,7 @@ public class Capitalization {
    * Get capitalCamel
    * @return capitalCamel
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getCapitalCamel() {
     return capitalCamel;
@@ -98,6 +100,7 @@ public class Capitalization {
    * Get smallSnake
    * @return smallSnake
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getSmallSnake() {
     return smallSnake;
@@ -116,6 +119,7 @@ public class Capitalization {
    * Get capitalSnake
    * @return capitalSnake
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getCapitalSnake() {
     return capitalSnake;
@@ -134,6 +138,7 @@ public class Capitalization {
    * Get scAETHFlowPoints
    * @return scAETHFlowPoints
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getScAETHFlowPoints() {
     return scAETHFlowPoints;
@@ -152,6 +157,7 @@ public class Capitalization {
    * Name of the pet 
    * @return ATT_NAME
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "Name of the pet ")
   public String getATTNAME() {
     return ATT_NAME;
diff --git a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/Cat.java b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/Cat.java
index 4a12050bc8..965461a8be 100644
--- a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/Cat.java
+++ b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/Cat.java
@@ -44,6 +44,7 @@ public class Cat extends Animal {
    * Get declawed
    * @return declawed
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Boolean getDeclawed() {
     return declawed;
diff --git a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/CatAllOf.java b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/CatAllOf.java
index 1424f55ddb..124db9b8ba 100644
--- a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/CatAllOf.java
+++ b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/CatAllOf.java
@@ -42,6 +42,7 @@ public class CatAllOf {
    * Get declawed
    * @return declawed
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Boolean getDeclawed() {
     return declawed;
diff --git a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/Category.java b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/Category.java
index eb41569576..d4e121847a 100644
--- a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/Category.java
+++ b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/Category.java
@@ -46,6 +46,7 @@ public class Category {
    * Get id
    * @return id
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Long getId() {
     return id;
@@ -64,6 +65,7 @@ public class Category {
    * Get name
    * @return name
   **/
+
   @ApiModelProperty(required = true, value = "")
   public String getName() {
     return name;
diff --git a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/ClassModel.java b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/ClassModel.java
index 91632a4f68..cbdd8f317b 100644
--- a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/ClassModel.java
+++ b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/ClassModel.java
@@ -43,6 +43,7 @@ public class ClassModel {
    * Get propertyClass
    * @return propertyClass
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getPropertyClass() {
     return propertyClass;
diff --git a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/Client.java b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/Client.java
index 3067e8d184..5d9c5c4a71 100644
--- a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/Client.java
+++ b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/Client.java
@@ -42,6 +42,7 @@ public class Client {
    * Get client
    * @return client
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getClient() {
     return client;
diff --git a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/Dog.java b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/Dog.java
index 63ff1ffbec..4da9ba4364 100644
--- a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/Dog.java
+++ b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/Dog.java
@@ -44,6 +44,7 @@ public class Dog extends Animal {
    * Get breed
    * @return breed
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getBreed() {
     return breed;
diff --git a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/DogAllOf.java b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/DogAllOf.java
index 7214ddd07e..e505d1dbc3 100644
--- a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/DogAllOf.java
+++ b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/DogAllOf.java
@@ -42,6 +42,7 @@ public class DogAllOf {
    * Get breed
    * @return breed
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getBreed() {
     return breed;
diff --git a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/EnumArrays.java b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/EnumArrays.java
index bd8d680339..8748c9fa37 100644
--- a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/EnumArrays.java
+++ b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/EnumArrays.java
@@ -142,6 +142,7 @@ public class EnumArrays {
    * Get justSymbol
    * @return justSymbol
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public JustSymbolEnum getJustSymbol() {
     return justSymbol;
@@ -168,6 +169,7 @@ public class EnumArrays {
    * Get arrayEnum
    * @return arrayEnum
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public List<ArrayEnumEnum> getArrayEnum() {
     return arrayEnum;
diff --git a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/EnumTest.java b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/EnumTest.java
index 6c05a8f967..1960c24ac2 100644
--- a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/EnumTest.java
+++ b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/EnumTest.java
@@ -251,6 +251,7 @@ public class EnumTest {
    * Get enumString
    * @return enumString
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public EnumStringEnum getEnumString() {
     return enumString;
@@ -269,6 +270,7 @@ public class EnumTest {
    * Get enumStringRequired
    * @return enumStringRequired
   **/
+
   @ApiModelProperty(required = true, value = "")
   public EnumStringRequiredEnum getEnumStringRequired() {
     return enumStringRequired;
@@ -287,6 +289,7 @@ public class EnumTest {
    * Get enumInteger
    * @return enumInteger
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public EnumIntegerEnum getEnumInteger() {
     return enumInteger;
@@ -305,6 +308,7 @@ public class EnumTest {
    * Get enumNumber
    * @return enumNumber
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public EnumNumberEnum getEnumNumber() {
     return enumNumber;
@@ -323,6 +327,7 @@ public class EnumTest {
    * Get outerEnum
    * @return outerEnum
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public OuterEnum getOuterEnum() {
     return outerEnum;
diff --git a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java
index 8ebc84c044..3c7fcaabdf 100644
--- a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java
+++ b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java
@@ -48,6 +48,7 @@ public class FileSchemaTestClass {
    * Get file
    * @return file
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public java.io.File getFile() {
     return file;
@@ -74,6 +75,7 @@ public class FileSchemaTestClass {
    * Get files
    * @return files
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public List<java.io.File> getFiles() {
     return files;
diff --git a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/FormatTest.java b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/FormatTest.java
index 29058abb17..e7b28a4737 100644
--- a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/FormatTest.java
+++ b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/FormatTest.java
@@ -97,6 +97,7 @@ public class FormatTest {
    * maximum: 100
    * @return integer
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Integer getInteger() {
     return integer;
@@ -117,6 +118,7 @@ public class FormatTest {
    * maximum: 200
    * @return int32
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Integer getInt32() {
     return int32;
@@ -135,6 +137,7 @@ public class FormatTest {
    * Get int64
    * @return int64
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Long getInt64() {
     return int64;
@@ -155,6 +158,7 @@ public class FormatTest {
    * maximum: 543.2
    * @return number
   **/
+
   @ApiModelProperty(required = true, value = "")
   public BigDecimal getNumber() {
     return number;
@@ -175,6 +179,7 @@ public class FormatTest {
    * maximum: 987.6
    * @return _float
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Float getFloat() {
     return _float;
@@ -195,6 +200,7 @@ public class FormatTest {
    * maximum: 123.4
    * @return _double
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Double getDouble() {
     return _double;
@@ -213,6 +219,7 @@ public class FormatTest {
    * Get string
    * @return string
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getString() {
     return string;
@@ -231,6 +238,7 @@ public class FormatTest {
    * Get _byte
    * @return _byte
   **/
+
   @ApiModelProperty(required = true, value = "")
   public byte[] getByte() {
     return _byte;
@@ -249,6 +257,7 @@ public class FormatTest {
    * Get binary
    * @return binary
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public File getBinary() {
     return binary;
@@ -267,6 +276,7 @@ public class FormatTest {
    * Get date
    * @return date
   **/
+
   @ApiModelProperty(required = true, value = "")
   public LocalDate getDate() {
     return date;
@@ -285,6 +295,7 @@ public class FormatTest {
    * Get dateTime
    * @return dateTime
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public OffsetDateTime getDateTime() {
     return dateTime;
@@ -303,6 +314,7 @@ public class FormatTest {
    * Get uuid
    * @return uuid
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(example = "72f98069-206d-4f12-9f12-3d1e525a8e84", value = "")
   public UUID getUuid() {
     return uuid;
@@ -321,6 +333,7 @@ public class FormatTest {
    * Get password
    * @return password
   **/
+
   @ApiModelProperty(required = true, value = "")
   public String getPassword() {
     return password;
diff --git a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java
index bb1394ea1f..72fcaa8993 100644
--- a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java
+++ b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java
@@ -41,6 +41,7 @@ public class HasOnlyReadOnly {
    * Get bar
    * @return bar
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getBar() {
     return bar;
@@ -50,6 +51,7 @@ public class HasOnlyReadOnly {
    * Get foo
    * @return foo
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getFoo() {
     return foo;
diff --git a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/MapTest.java b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/MapTest.java
index cb95334e61..43f0d2e998 100644
--- a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/MapTest.java
+++ b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/MapTest.java
@@ -112,6 +112,7 @@ public class MapTest {
    * Get mapMapOfString
    * @return mapMapOfString
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Map<String, Map<String, String>> getMapMapOfString() {
     return mapMapOfString;
@@ -138,6 +139,7 @@ public class MapTest {
    * Get mapOfEnumString
    * @return mapOfEnumString
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Map<String, InnerEnum> getMapOfEnumString() {
     return mapOfEnumString;
@@ -164,6 +166,7 @@ public class MapTest {
    * Get directMap
    * @return directMap
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Map<String, Boolean> getDirectMap() {
     return directMap;
@@ -190,6 +193,7 @@ public class MapTest {
    * Get indirectMap
    * @return indirectMap
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Map<String, Boolean> getIndirectMap() {
     return indirectMap;
diff --git a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java
index 7417b41271..78d80bd7f0 100644
--- a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java
+++ b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java
@@ -56,6 +56,7 @@ public class MixedPropertiesAndAdditionalPropertiesClass {
    * Get uuid
    * @return uuid
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public UUID getUuid() {
     return uuid;
@@ -74,6 +75,7 @@ public class MixedPropertiesAndAdditionalPropertiesClass {
    * Get dateTime
    * @return dateTime
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public OffsetDateTime getDateTime() {
     return dateTime;
@@ -100,6 +102,7 @@ public class MixedPropertiesAndAdditionalPropertiesClass {
    * Get map
    * @return map
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Map<String, Animal> getMap() {
     return map;
diff --git a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/Model200Response.java b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/Model200Response.java
index 3981e9696a..0c0fc9710d 100644
--- a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/Model200Response.java
+++ b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/Model200Response.java
@@ -47,6 +47,7 @@ public class Model200Response {
    * Get name
    * @return name
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Integer getName() {
     return name;
@@ -65,6 +66,7 @@ public class Model200Response {
    * Get propertyClass
    * @return propertyClass
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getPropertyClass() {
     return propertyClass;
diff --git a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/ModelApiResponse.java b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/ModelApiResponse.java
index 8a0b10b4e2..777b1a8a7c 100644
--- a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/ModelApiResponse.java
+++ b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/ModelApiResponse.java
@@ -50,6 +50,7 @@ public class ModelApiResponse {
    * Get code
    * @return code
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Integer getCode() {
     return code;
@@ -68,6 +69,7 @@ public class ModelApiResponse {
    * Get type
    * @return type
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getType() {
     return type;
@@ -86,6 +88,7 @@ public class ModelApiResponse {
    * Get message
    * @return message
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getMessage() {
     return message;
diff --git a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/ModelReturn.java b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/ModelReturn.java
index f045378132..225df7f4e8 100644
--- a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/ModelReturn.java
+++ b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/ModelReturn.java
@@ -43,6 +43,7 @@ public class ModelReturn {
    * Get _return
    * @return _return
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Integer getReturn() {
     return _return;
diff --git a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/Name.java b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/Name.java
index dab0c2d48f..c5a5691688 100644
--- a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/Name.java
+++ b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/Name.java
@@ -55,6 +55,7 @@ public class Name {
    * Get name
    * @return name
   **/
+
   @ApiModelProperty(required = true, value = "")
   public Integer getName() {
     return name;
@@ -68,6 +69,7 @@ public class Name {
    * Get snakeCase
    * @return snakeCase
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Integer getSnakeCase() {
     return snakeCase;
@@ -82,6 +84,7 @@ public class Name {
    * Get property
    * @return property
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getProperty() {
     return property;
@@ -95,6 +98,7 @@ public class Name {
    * Get _123number
    * @return _123number
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Integer get123number() {
     return _123number;
diff --git a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/NumberOnly.java b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/NumberOnly.java
index 17cb112586..00ffd2f67e 100644
--- a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/NumberOnly.java
+++ b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/NumberOnly.java
@@ -43,6 +43,7 @@ public class NumberOnly {
    * Get justNumber
    * @return justNumber
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public BigDecimal getJustNumber() {
     return justNumber;
diff --git a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/Order.java b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/Order.java
index 66e43825e2..cfb3d04776 100644
--- a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/Order.java
+++ b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/Order.java
@@ -112,6 +112,7 @@ public class Order {
    * Get id
    * @return id
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Long getId() {
     return id;
@@ -130,6 +131,7 @@ public class Order {
    * Get petId
    * @return petId
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Long getPetId() {
     return petId;
@@ -148,6 +150,7 @@ public class Order {
    * Get quantity
    * @return quantity
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Integer getQuantity() {
     return quantity;
@@ -166,6 +169,7 @@ public class Order {
    * Get shipDate
    * @return shipDate
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public OffsetDateTime getShipDate() {
     return shipDate;
@@ -184,6 +188,7 @@ public class Order {
    * Order Status
    * @return status
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "Order Status")
   public StatusEnum getStatus() {
     return status;
@@ -202,6 +207,7 @@ public class Order {
    * Get complete
    * @return complete
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Boolean getComplete() {
     return complete;
diff --git a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/OuterComposite.java b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/OuterComposite.java
index 65f05e3fa4..9e2a78d57f 100644
--- a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/OuterComposite.java
+++ b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/OuterComposite.java
@@ -51,6 +51,7 @@ public class OuterComposite {
    * Get myNumber
    * @return myNumber
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public BigDecimal getMyNumber() {
     return myNumber;
@@ -69,6 +70,7 @@ public class OuterComposite {
    * Get myString
    * @return myString
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getMyString() {
     return myString;
@@ -87,6 +89,7 @@ public class OuterComposite {
    * Get myBoolean
    * @return myBoolean
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Boolean getMyBoolean() {
     return myBoolean;
diff --git a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/Pet.java b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/Pet.java
index a95a0c9dd0..5ac8165f7f 100644
--- a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/Pet.java
+++ b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/Pet.java
@@ -115,6 +115,7 @@ public class Pet {
    * Get id
    * @return id
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Long getId() {
     return id;
@@ -133,6 +134,7 @@ public class Pet {
    * Get category
    * @return category
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Category getCategory() {
     return category;
@@ -151,6 +153,7 @@ public class Pet {
    * Get name
    * @return name
   **/
+
   @ApiModelProperty(example = "doggie", required = true, value = "")
   public String getName() {
     return name;
@@ -174,6 +177,7 @@ public class Pet {
    * Get photoUrls
    * @return photoUrls
   **/
+
   @ApiModelProperty(required = true, value = "")
   public List<String> getPhotoUrls() {
     return photoUrls;
@@ -200,6 +204,7 @@ public class Pet {
    * Get tags
    * @return tags
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public List<Tag> getTags() {
     return tags;
@@ -218,6 +223,7 @@ public class Pet {
    * pet status in the store
    * @return status
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "pet status in the store")
   public StatusEnum getStatus() {
     return status;
diff --git a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/ReadOnlyFirst.java b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/ReadOnlyFirst.java
index 2872f78893..23ec5576c0 100644
--- a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/ReadOnlyFirst.java
+++ b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/ReadOnlyFirst.java
@@ -41,6 +41,7 @@ public class ReadOnlyFirst {
    * Get bar
    * @return bar
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getBar() {
     return bar;
@@ -55,6 +56,7 @@ public class ReadOnlyFirst {
    * Get baz
    * @return baz
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getBaz() {
     return baz;
diff --git a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/SpecialModelName.java b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/SpecialModelName.java
index 8fab5e0b27..f4a7d343a7 100644
--- a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/SpecialModelName.java
+++ b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/SpecialModelName.java
@@ -42,6 +42,7 @@ public class SpecialModelName {
    * Get $specialPropertyName
    * @return $specialPropertyName
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Long get$SpecialPropertyName() {
     return $specialPropertyName;
diff --git a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/Tag.java b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/Tag.java
index ab153ca672..bce1fc934d 100644
--- a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/Tag.java
+++ b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/Tag.java
@@ -46,6 +46,7 @@ public class Tag {
    * Get id
    * @return id
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Long getId() {
     return id;
@@ -64,6 +65,7 @@ public class Tag {
    * Get name
    * @return name
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getName() {
     return name;
diff --git a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/TypeHolderDefault.java b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/TypeHolderDefault.java
index 8fc321bc0a..8c7e1fa55d 100644
--- a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/TypeHolderDefault.java
+++ b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/TypeHolderDefault.java
@@ -61,6 +61,7 @@ public class TypeHolderDefault {
    * Get stringItem
    * @return stringItem
   **/
+
   @ApiModelProperty(required = true, value = "")
   public String getStringItem() {
     return stringItem;
@@ -79,6 +80,7 @@ public class TypeHolderDefault {
    * Get numberItem
    * @return numberItem
   **/
+
   @ApiModelProperty(required = true, value = "")
   public BigDecimal getNumberItem() {
     return numberItem;
@@ -97,6 +99,7 @@ public class TypeHolderDefault {
    * Get integerItem
    * @return integerItem
   **/
+
   @ApiModelProperty(required = true, value = "")
   public Integer getIntegerItem() {
     return integerItem;
@@ -115,6 +118,7 @@ public class TypeHolderDefault {
    * Get boolItem
    * @return boolItem
   **/
+
   @ApiModelProperty(required = true, value = "")
   public Boolean getBoolItem() {
     return boolItem;
@@ -138,6 +142,7 @@ public class TypeHolderDefault {
    * Get arrayItem
    * @return arrayItem
   **/
+
   @ApiModelProperty(required = true, value = "")
   public List<Integer> getArrayItem() {
     return arrayItem;
diff --git a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/TypeHolderExample.java b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/TypeHolderExample.java
index d9496cbd79..8315f422ea 100644
--- a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/TypeHolderExample.java
+++ b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/TypeHolderExample.java
@@ -61,6 +61,7 @@ public class TypeHolderExample {
    * Get stringItem
    * @return stringItem
   **/
+
   @ApiModelProperty(example = "what", required = true, value = "")
   public String getStringItem() {
     return stringItem;
@@ -79,6 +80,7 @@ public class TypeHolderExample {
    * Get numberItem
    * @return numberItem
   **/
+
   @ApiModelProperty(example = "1.234", required = true, value = "")
   public BigDecimal getNumberItem() {
     return numberItem;
@@ -97,6 +99,7 @@ public class TypeHolderExample {
    * Get integerItem
    * @return integerItem
   **/
+
   @ApiModelProperty(example = "-2", required = true, value = "")
   public Integer getIntegerItem() {
     return integerItem;
@@ -115,6 +118,7 @@ public class TypeHolderExample {
    * Get boolItem
    * @return boolItem
   **/
+
   @ApiModelProperty(example = "true", required = true, value = "")
   public Boolean getBoolItem() {
     return boolItem;
@@ -138,6 +142,7 @@ public class TypeHolderExample {
    * Get arrayItem
    * @return arrayItem
   **/
+
   @ApiModelProperty(example = "[0, 1, 2, 3]", required = true, value = "")
   public List<Integer> getArrayItem() {
     return arrayItem;
diff --git a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/User.java b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/User.java
index 74b9a66a24..3f9eb4bb8a 100644
--- a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/User.java
+++ b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/User.java
@@ -70,6 +70,7 @@ public class User {
    * Get id
    * @return id
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Long getId() {
     return id;
@@ -88,6 +89,7 @@ public class User {
    * Get username
    * @return username
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getUsername() {
     return username;
@@ -106,6 +108,7 @@ public class User {
    * Get firstName
    * @return firstName
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getFirstName() {
     return firstName;
@@ -124,6 +127,7 @@ public class User {
    * Get lastName
    * @return lastName
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getLastName() {
     return lastName;
@@ -142,6 +146,7 @@ public class User {
    * Get email
    * @return email
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getEmail() {
     return email;
@@ -160,6 +165,7 @@ public class User {
    * Get password
    * @return password
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getPassword() {
     return password;
@@ -178,6 +184,7 @@ public class User {
    * Get phone
    * @return phone
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getPhone() {
     return phone;
@@ -196,6 +203,7 @@ public class User {
    * User Status
    * @return userStatus
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "User Status")
   public Integer getUserStatus() {
     return userStatus;
diff --git a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/XmlItem.java b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/XmlItem.java
index ac66ad77de..67910352a7 100644
--- a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/XmlItem.java
+++ b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/XmlItem.java
@@ -157,6 +157,7 @@ public class XmlItem {
    * Get attributeString
    * @return attributeString
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(example = "string", value = "")
   public String getAttributeString() {
     return attributeString;
@@ -175,6 +176,7 @@ public class XmlItem {
    * Get attributeNumber
    * @return attributeNumber
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(example = "1.234", value = "")
   public BigDecimal getAttributeNumber() {
     return attributeNumber;
@@ -193,6 +195,7 @@ public class XmlItem {
    * Get attributeInteger
    * @return attributeInteger
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(example = "-2", value = "")
   public Integer getAttributeInteger() {
     return attributeInteger;
@@ -211,6 +214,7 @@ public class XmlItem {
    * Get attributeBoolean
    * @return attributeBoolean
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(example = "true", value = "")
   public Boolean getAttributeBoolean() {
     return attributeBoolean;
@@ -237,6 +241,7 @@ public class XmlItem {
    * Get wrappedArray
    * @return wrappedArray
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public List<Integer> getWrappedArray() {
     return wrappedArray;
@@ -255,6 +260,7 @@ public class XmlItem {
    * Get nameString
    * @return nameString
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(example = "string", value = "")
   public String getNameString() {
     return nameString;
@@ -273,6 +279,7 @@ public class XmlItem {
    * Get nameNumber
    * @return nameNumber
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(example = "1.234", value = "")
   public BigDecimal getNameNumber() {
     return nameNumber;
@@ -291,6 +298,7 @@ public class XmlItem {
    * Get nameInteger
    * @return nameInteger
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(example = "-2", value = "")
   public Integer getNameInteger() {
     return nameInteger;
@@ -309,6 +317,7 @@ public class XmlItem {
    * Get nameBoolean
    * @return nameBoolean
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(example = "true", value = "")
   public Boolean getNameBoolean() {
     return nameBoolean;
@@ -335,6 +344,7 @@ public class XmlItem {
    * Get nameArray
    * @return nameArray
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public List<Integer> getNameArray() {
     return nameArray;
@@ -361,6 +371,7 @@ public class XmlItem {
    * Get nameWrappedArray
    * @return nameWrappedArray
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public List<Integer> getNameWrappedArray() {
     return nameWrappedArray;
@@ -379,6 +390,7 @@ public class XmlItem {
    * Get prefixString
    * @return prefixString
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(example = "string", value = "")
   public String getPrefixString() {
     return prefixString;
@@ -397,6 +409,7 @@ public class XmlItem {
    * Get prefixNumber
    * @return prefixNumber
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(example = "1.234", value = "")
   public BigDecimal getPrefixNumber() {
     return prefixNumber;
@@ -415,6 +428,7 @@ public class XmlItem {
    * Get prefixInteger
    * @return prefixInteger
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(example = "-2", value = "")
   public Integer getPrefixInteger() {
     return prefixInteger;
@@ -433,6 +447,7 @@ public class XmlItem {
    * Get prefixBoolean
    * @return prefixBoolean
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(example = "true", value = "")
   public Boolean getPrefixBoolean() {
     return prefixBoolean;
@@ -459,6 +474,7 @@ public class XmlItem {
    * Get prefixArray
    * @return prefixArray
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public List<Integer> getPrefixArray() {
     return prefixArray;
@@ -485,6 +501,7 @@ public class XmlItem {
    * Get prefixWrappedArray
    * @return prefixWrappedArray
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public List<Integer> getPrefixWrappedArray() {
     return prefixWrappedArray;
@@ -503,6 +520,7 @@ public class XmlItem {
    * Get namespaceString
    * @return namespaceString
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(example = "string", value = "")
   public String getNamespaceString() {
     return namespaceString;
@@ -521,6 +539,7 @@ public class XmlItem {
    * Get namespaceNumber
    * @return namespaceNumber
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(example = "1.234", value = "")
   public BigDecimal getNamespaceNumber() {
     return namespaceNumber;
@@ -539,6 +558,7 @@ public class XmlItem {
    * Get namespaceInteger
    * @return namespaceInteger
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(example = "-2", value = "")
   public Integer getNamespaceInteger() {
     return namespaceInteger;
@@ -557,6 +577,7 @@ public class XmlItem {
    * Get namespaceBoolean
    * @return namespaceBoolean
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(example = "true", value = "")
   public Boolean getNamespaceBoolean() {
     return namespaceBoolean;
@@ -583,6 +604,7 @@ public class XmlItem {
    * Get namespaceArray
    * @return namespaceArray
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public List<Integer> getNamespaceArray() {
     return namespaceArray;
@@ -609,6 +631,7 @@ public class XmlItem {
    * Get namespaceWrappedArray
    * @return namespaceWrappedArray
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public List<Integer> getNamespaceWrappedArray() {
     return namespaceWrappedArray;
@@ -627,6 +650,7 @@ public class XmlItem {
    * Get prefixNsString
    * @return prefixNsString
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(example = "string", value = "")
   public String getPrefixNsString() {
     return prefixNsString;
@@ -645,6 +669,7 @@ public class XmlItem {
    * Get prefixNsNumber
    * @return prefixNsNumber
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(example = "1.234", value = "")
   public BigDecimal getPrefixNsNumber() {
     return prefixNsNumber;
@@ -663,6 +688,7 @@ public class XmlItem {
    * Get prefixNsInteger
    * @return prefixNsInteger
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(example = "-2", value = "")
   public Integer getPrefixNsInteger() {
     return prefixNsInteger;
@@ -681,6 +707,7 @@ public class XmlItem {
    * Get prefixNsBoolean
    * @return prefixNsBoolean
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(example = "true", value = "")
   public Boolean getPrefixNsBoolean() {
     return prefixNsBoolean;
@@ -707,6 +734,7 @@ public class XmlItem {
    * Get prefixNsArray
    * @return prefixNsArray
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public List<Integer> getPrefixNsArray() {
     return prefixNsArray;
@@ -733,6 +761,7 @@ public class XmlItem {
    * Get prefixNsWrappedArray
    * @return prefixNsWrappedArray
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public List<Integer> getPrefixNsWrappedArray() {
     return prefixNsWrappedArray;
diff --git a/samples/client/petstore/java/retrofit2rx/build.gradle b/samples/client/petstore/java/retrofit2rx/build.gradle
index 2be7dc0d84..d7b5bd24e6 100644
--- a/samples/client/petstore/java/retrofit2rx/build.gradle
+++ b/samples/client/petstore/java/retrofit2rx/build.gradle
@@ -111,6 +111,7 @@ dependencies {
     compile "com.squareup.retrofit2:adapter-rxjava:$retrofit_version"
     compile "io.reactivex:rxjava:$rx_java_version"
     compile "io.swagger:swagger-annotations:$swagger_annotations_version"
+    compile "com.google.code.findbugs:jsr305:3.0.2"
     compile ("org.apache.oltu.oauth2:org.apache.oltu.oauth2.client:$oltu_version"){
         exclude group:'org.apache.oltu.oauth2' , module: 'org.apache.oltu.oauth2.common'
     }
diff --git a/samples/client/petstore/java/retrofit2rx/pom.xml b/samples/client/petstore/java/retrofit2rx/pom.xml
index 7cb53b5916..88fe728d38 100644
--- a/samples/client/petstore/java/retrofit2rx/pom.xml
+++ b/samples/client/petstore/java/retrofit2rx/pom.xml
@@ -191,6 +191,12 @@
             <artifactId>swagger-annotations</artifactId>
             <version>${swagger-annotations-version}</version>
         </dependency>
+        <!-- @Nullable annotation -->
+        <dependency>
+            <groupId>com.google.code.findbugs</groupId>
+            <artifactId>jsr305</artifactId>
+            <version>3.0.2</version>
+        </dependency>
         <dependency>
             <groupId>com.squareup.retrofit2</groupId>
             <artifactId>converter-gson</artifactId>
diff --git a/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/model/AdditionalPropertiesAnyType.java b/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/model/AdditionalPropertiesAnyType.java
index 9c47737ced..e98f74f8ae 100644
--- a/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/model/AdditionalPropertiesAnyType.java
+++ b/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/model/AdditionalPropertiesAnyType.java
@@ -44,6 +44,7 @@ public class AdditionalPropertiesAnyType extends HashMap<String, Object> {
    * Get name
    * @return name
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getName() {
     return name;
diff --git a/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/model/AdditionalPropertiesArray.java b/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/model/AdditionalPropertiesArray.java
index c5eed6cdac..1d86faad3e 100644
--- a/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/model/AdditionalPropertiesArray.java
+++ b/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/model/AdditionalPropertiesArray.java
@@ -45,6 +45,7 @@ public class AdditionalPropertiesArray extends HashMap<String, List> {
    * Get name
    * @return name
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getName() {
     return name;
diff --git a/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/model/AdditionalPropertiesBoolean.java b/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/model/AdditionalPropertiesBoolean.java
index 390777ff37..a3b37161da 100644
--- a/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/model/AdditionalPropertiesBoolean.java
+++ b/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/model/AdditionalPropertiesBoolean.java
@@ -44,6 +44,7 @@ public class AdditionalPropertiesBoolean extends HashMap<String, Boolean> {
    * Get name
    * @return name
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getName() {
     return name;
diff --git a/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java b/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java
index 3c1a02c33c..8819f4a024 100644
--- a/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java
+++ b/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java
@@ -94,6 +94,7 @@ public class AdditionalPropertiesClass {
    * Get mapString
    * @return mapString
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Map<String, String> getMapString() {
     return mapString;
@@ -120,6 +121,7 @@ public class AdditionalPropertiesClass {
    * Get mapNumber
    * @return mapNumber
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Map<String, BigDecimal> getMapNumber() {
     return mapNumber;
@@ -146,6 +148,7 @@ public class AdditionalPropertiesClass {
    * Get mapInteger
    * @return mapInteger
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Map<String, Integer> getMapInteger() {
     return mapInteger;
@@ -172,6 +175,7 @@ public class AdditionalPropertiesClass {
    * Get mapBoolean
    * @return mapBoolean
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Map<String, Boolean> getMapBoolean() {
     return mapBoolean;
@@ -198,6 +202,7 @@ public class AdditionalPropertiesClass {
    * Get mapArrayInteger
    * @return mapArrayInteger
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Map<String, List<Integer>> getMapArrayInteger() {
     return mapArrayInteger;
@@ -224,6 +229,7 @@ public class AdditionalPropertiesClass {
    * Get mapArrayAnytype
    * @return mapArrayAnytype
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Map<String, List<Object>> getMapArrayAnytype() {
     return mapArrayAnytype;
@@ -250,6 +256,7 @@ public class AdditionalPropertiesClass {
    * Get mapMapString
    * @return mapMapString
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Map<String, Map<String, String>> getMapMapString() {
     return mapMapString;
@@ -276,6 +283,7 @@ public class AdditionalPropertiesClass {
    * Get mapMapAnytype
    * @return mapMapAnytype
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Map<String, Map<String, Object>> getMapMapAnytype() {
     return mapMapAnytype;
@@ -294,6 +302,7 @@ public class AdditionalPropertiesClass {
    * Get anytype1
    * @return anytype1
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Object getAnytype1() {
     return anytype1;
@@ -312,6 +321,7 @@ public class AdditionalPropertiesClass {
    * Get anytype2
    * @return anytype2
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Object getAnytype2() {
     return anytype2;
@@ -330,6 +340,7 @@ public class AdditionalPropertiesClass {
    * Get anytype3
    * @return anytype3
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Object getAnytype3() {
     return anytype3;
diff --git a/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/model/AdditionalPropertiesInteger.java b/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/model/AdditionalPropertiesInteger.java
index df6e865593..b8f956cbed 100644
--- a/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/model/AdditionalPropertiesInteger.java
+++ b/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/model/AdditionalPropertiesInteger.java
@@ -44,6 +44,7 @@ public class AdditionalPropertiesInteger extends HashMap<String, Integer> {
    * Get name
    * @return name
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getName() {
     return name;
diff --git a/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/model/AdditionalPropertiesNumber.java b/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/model/AdditionalPropertiesNumber.java
index 8a9118cf85..03d923ab1d 100644
--- a/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/model/AdditionalPropertiesNumber.java
+++ b/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/model/AdditionalPropertiesNumber.java
@@ -45,6 +45,7 @@ public class AdditionalPropertiesNumber extends HashMap<String, BigDecimal> {
    * Get name
    * @return name
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getName() {
     return name;
diff --git a/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/model/AdditionalPropertiesObject.java b/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/model/AdditionalPropertiesObject.java
index b67f12d840..c0e696dbd5 100644
--- a/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/model/AdditionalPropertiesObject.java
+++ b/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/model/AdditionalPropertiesObject.java
@@ -44,6 +44,7 @@ public class AdditionalPropertiesObject extends HashMap<String, Map> {
    * Get name
    * @return name
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getName() {
     return name;
diff --git a/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/model/AdditionalPropertiesString.java b/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/model/AdditionalPropertiesString.java
index 6e54b260fd..67e597e3cf 100644
--- a/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/model/AdditionalPropertiesString.java
+++ b/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/model/AdditionalPropertiesString.java
@@ -44,6 +44,7 @@ public class AdditionalPropertiesString extends HashMap<String, String> {
    * Get name
    * @return name
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getName() {
     return name;
diff --git a/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/model/Animal.java b/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/model/Animal.java
index 06342bce06..1738bdaf47 100644
--- a/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/model/Animal.java
+++ b/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/model/Animal.java
@@ -50,6 +50,7 @@ public class Animal {
    * Get className
    * @return className
   **/
+
   @ApiModelProperty(required = true, value = "")
   public String getClassName() {
     return className;
@@ -68,6 +69,7 @@ public class Animal {
    * Get color
    * @return color
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getColor() {
     return color;
diff --git a/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java b/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java
index 87429212a6..69c0cacb05 100644
--- a/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java
+++ b/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java
@@ -53,6 +53,7 @@ public class ArrayOfArrayOfNumberOnly {
    * Get arrayArrayNumber
    * @return arrayArrayNumber
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public List<List<BigDecimal>> getArrayArrayNumber() {
     return arrayArrayNumber;
diff --git a/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java b/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java
index c21e45d438..a85aa96af7 100644
--- a/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java
+++ b/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java
@@ -53,6 +53,7 @@ public class ArrayOfNumberOnly {
    * Get arrayNumber
    * @return arrayNumber
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public List<BigDecimal> getArrayNumber() {
     return arrayNumber;
diff --git a/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/model/ArrayTest.java b/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/model/ArrayTest.java
index 8ae596291a..986ac5aa17 100644
--- a/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/model/ArrayTest.java
+++ b/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/model/ArrayTest.java
@@ -61,6 +61,7 @@ public class ArrayTest {
    * Get arrayOfString
    * @return arrayOfString
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public List<String> getArrayOfString() {
     return arrayOfString;
@@ -87,6 +88,7 @@ public class ArrayTest {
    * Get arrayArrayOfInteger
    * @return arrayArrayOfInteger
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public List<List<Long>> getArrayArrayOfInteger() {
     return arrayArrayOfInteger;
@@ -113,6 +115,7 @@ public class ArrayTest {
    * Get arrayArrayOfModel
    * @return arrayArrayOfModel
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public List<List<ReadOnlyFirst>> getArrayArrayOfModel() {
     return arrayArrayOfModel;
diff --git a/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/model/Capitalization.java b/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/model/Capitalization.java
index 3f05d95d60..36f8853e1c 100644
--- a/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/model/Capitalization.java
+++ b/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/model/Capitalization.java
@@ -62,6 +62,7 @@ public class Capitalization {
    * Get smallCamel
    * @return smallCamel
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getSmallCamel() {
     return smallCamel;
@@ -80,6 +81,7 @@ public class Capitalization {
    * Get capitalCamel
    * @return capitalCamel
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getCapitalCamel() {
     return capitalCamel;
@@ -98,6 +100,7 @@ public class Capitalization {
    * Get smallSnake
    * @return smallSnake
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getSmallSnake() {
     return smallSnake;
@@ -116,6 +119,7 @@ public class Capitalization {
    * Get capitalSnake
    * @return capitalSnake
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getCapitalSnake() {
     return capitalSnake;
@@ -134,6 +138,7 @@ public class Capitalization {
    * Get scAETHFlowPoints
    * @return scAETHFlowPoints
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getScAETHFlowPoints() {
     return scAETHFlowPoints;
@@ -152,6 +157,7 @@ public class Capitalization {
    * Name of the pet 
    * @return ATT_NAME
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "Name of the pet ")
   public String getATTNAME() {
     return ATT_NAME;
diff --git a/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/model/Cat.java b/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/model/Cat.java
index 4a12050bc8..965461a8be 100644
--- a/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/model/Cat.java
+++ b/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/model/Cat.java
@@ -44,6 +44,7 @@ public class Cat extends Animal {
    * Get declawed
    * @return declawed
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Boolean getDeclawed() {
     return declawed;
diff --git a/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/model/CatAllOf.java b/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/model/CatAllOf.java
index 1424f55ddb..124db9b8ba 100644
--- a/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/model/CatAllOf.java
+++ b/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/model/CatAllOf.java
@@ -42,6 +42,7 @@ public class CatAllOf {
    * Get declawed
    * @return declawed
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Boolean getDeclawed() {
     return declawed;
diff --git a/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/model/Category.java b/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/model/Category.java
index eb41569576..d4e121847a 100644
--- a/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/model/Category.java
+++ b/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/model/Category.java
@@ -46,6 +46,7 @@ public class Category {
    * Get id
    * @return id
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Long getId() {
     return id;
@@ -64,6 +65,7 @@ public class Category {
    * Get name
    * @return name
   **/
+
   @ApiModelProperty(required = true, value = "")
   public String getName() {
     return name;
diff --git a/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/model/ClassModel.java b/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/model/ClassModel.java
index 91632a4f68..cbdd8f317b 100644
--- a/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/model/ClassModel.java
+++ b/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/model/ClassModel.java
@@ -43,6 +43,7 @@ public class ClassModel {
    * Get propertyClass
    * @return propertyClass
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getPropertyClass() {
     return propertyClass;
diff --git a/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/model/Client.java b/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/model/Client.java
index 3067e8d184..5d9c5c4a71 100644
--- a/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/model/Client.java
+++ b/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/model/Client.java
@@ -42,6 +42,7 @@ public class Client {
    * Get client
    * @return client
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getClient() {
     return client;
diff --git a/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/model/Dog.java b/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/model/Dog.java
index 63ff1ffbec..4da9ba4364 100644
--- a/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/model/Dog.java
+++ b/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/model/Dog.java
@@ -44,6 +44,7 @@ public class Dog extends Animal {
    * Get breed
    * @return breed
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getBreed() {
     return breed;
diff --git a/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/model/DogAllOf.java b/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/model/DogAllOf.java
index 7214ddd07e..e505d1dbc3 100644
--- a/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/model/DogAllOf.java
+++ b/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/model/DogAllOf.java
@@ -42,6 +42,7 @@ public class DogAllOf {
    * Get breed
    * @return breed
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getBreed() {
     return breed;
diff --git a/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/model/EnumArrays.java b/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/model/EnumArrays.java
index bd8d680339..8748c9fa37 100644
--- a/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/model/EnumArrays.java
+++ b/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/model/EnumArrays.java
@@ -142,6 +142,7 @@ public class EnumArrays {
    * Get justSymbol
    * @return justSymbol
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public JustSymbolEnum getJustSymbol() {
     return justSymbol;
@@ -168,6 +169,7 @@ public class EnumArrays {
    * Get arrayEnum
    * @return arrayEnum
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public List<ArrayEnumEnum> getArrayEnum() {
     return arrayEnum;
diff --git a/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/model/EnumTest.java b/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/model/EnumTest.java
index 6c05a8f967..1960c24ac2 100644
--- a/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/model/EnumTest.java
+++ b/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/model/EnumTest.java
@@ -251,6 +251,7 @@ public class EnumTest {
    * Get enumString
    * @return enumString
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public EnumStringEnum getEnumString() {
     return enumString;
@@ -269,6 +270,7 @@ public class EnumTest {
    * Get enumStringRequired
    * @return enumStringRequired
   **/
+
   @ApiModelProperty(required = true, value = "")
   public EnumStringRequiredEnum getEnumStringRequired() {
     return enumStringRequired;
@@ -287,6 +289,7 @@ public class EnumTest {
    * Get enumInteger
    * @return enumInteger
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public EnumIntegerEnum getEnumInteger() {
     return enumInteger;
@@ -305,6 +308,7 @@ public class EnumTest {
    * Get enumNumber
    * @return enumNumber
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public EnumNumberEnum getEnumNumber() {
     return enumNumber;
@@ -323,6 +327,7 @@ public class EnumTest {
    * Get outerEnum
    * @return outerEnum
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public OuterEnum getOuterEnum() {
     return outerEnum;
diff --git a/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java b/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java
index 8ebc84c044..3c7fcaabdf 100644
--- a/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java
+++ b/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java
@@ -48,6 +48,7 @@ public class FileSchemaTestClass {
    * Get file
    * @return file
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public java.io.File getFile() {
     return file;
@@ -74,6 +75,7 @@ public class FileSchemaTestClass {
    * Get files
    * @return files
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public List<java.io.File> getFiles() {
     return files;
diff --git a/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/model/FormatTest.java b/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/model/FormatTest.java
index 29058abb17..e7b28a4737 100644
--- a/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/model/FormatTest.java
+++ b/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/model/FormatTest.java
@@ -97,6 +97,7 @@ public class FormatTest {
    * maximum: 100
    * @return integer
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Integer getInteger() {
     return integer;
@@ -117,6 +118,7 @@ public class FormatTest {
    * maximum: 200
    * @return int32
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Integer getInt32() {
     return int32;
@@ -135,6 +137,7 @@ public class FormatTest {
    * Get int64
    * @return int64
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Long getInt64() {
     return int64;
@@ -155,6 +158,7 @@ public class FormatTest {
    * maximum: 543.2
    * @return number
   **/
+
   @ApiModelProperty(required = true, value = "")
   public BigDecimal getNumber() {
     return number;
@@ -175,6 +179,7 @@ public class FormatTest {
    * maximum: 987.6
    * @return _float
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Float getFloat() {
     return _float;
@@ -195,6 +200,7 @@ public class FormatTest {
    * maximum: 123.4
    * @return _double
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Double getDouble() {
     return _double;
@@ -213,6 +219,7 @@ public class FormatTest {
    * Get string
    * @return string
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getString() {
     return string;
@@ -231,6 +238,7 @@ public class FormatTest {
    * Get _byte
    * @return _byte
   **/
+
   @ApiModelProperty(required = true, value = "")
   public byte[] getByte() {
     return _byte;
@@ -249,6 +257,7 @@ public class FormatTest {
    * Get binary
    * @return binary
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public File getBinary() {
     return binary;
@@ -267,6 +276,7 @@ public class FormatTest {
    * Get date
    * @return date
   **/
+
   @ApiModelProperty(required = true, value = "")
   public LocalDate getDate() {
     return date;
@@ -285,6 +295,7 @@ public class FormatTest {
    * Get dateTime
    * @return dateTime
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public OffsetDateTime getDateTime() {
     return dateTime;
@@ -303,6 +314,7 @@ public class FormatTest {
    * Get uuid
    * @return uuid
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(example = "72f98069-206d-4f12-9f12-3d1e525a8e84", value = "")
   public UUID getUuid() {
     return uuid;
@@ -321,6 +333,7 @@ public class FormatTest {
    * Get password
    * @return password
   **/
+
   @ApiModelProperty(required = true, value = "")
   public String getPassword() {
     return password;
diff --git a/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java b/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java
index bb1394ea1f..72fcaa8993 100644
--- a/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java
+++ b/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java
@@ -41,6 +41,7 @@ public class HasOnlyReadOnly {
    * Get bar
    * @return bar
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getBar() {
     return bar;
@@ -50,6 +51,7 @@ public class HasOnlyReadOnly {
    * Get foo
    * @return foo
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getFoo() {
     return foo;
diff --git a/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/model/MapTest.java b/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/model/MapTest.java
index cb95334e61..43f0d2e998 100644
--- a/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/model/MapTest.java
+++ b/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/model/MapTest.java
@@ -112,6 +112,7 @@ public class MapTest {
    * Get mapMapOfString
    * @return mapMapOfString
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Map<String, Map<String, String>> getMapMapOfString() {
     return mapMapOfString;
@@ -138,6 +139,7 @@ public class MapTest {
    * Get mapOfEnumString
    * @return mapOfEnumString
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Map<String, InnerEnum> getMapOfEnumString() {
     return mapOfEnumString;
@@ -164,6 +166,7 @@ public class MapTest {
    * Get directMap
    * @return directMap
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Map<String, Boolean> getDirectMap() {
     return directMap;
@@ -190,6 +193,7 @@ public class MapTest {
    * Get indirectMap
    * @return indirectMap
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Map<String, Boolean> getIndirectMap() {
     return indirectMap;
diff --git a/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java
index 7417b41271..78d80bd7f0 100644
--- a/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java
+++ b/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java
@@ -56,6 +56,7 @@ public class MixedPropertiesAndAdditionalPropertiesClass {
    * Get uuid
    * @return uuid
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public UUID getUuid() {
     return uuid;
@@ -74,6 +75,7 @@ public class MixedPropertiesAndAdditionalPropertiesClass {
    * Get dateTime
    * @return dateTime
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public OffsetDateTime getDateTime() {
     return dateTime;
@@ -100,6 +102,7 @@ public class MixedPropertiesAndAdditionalPropertiesClass {
    * Get map
    * @return map
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Map<String, Animal> getMap() {
     return map;
diff --git a/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/model/Model200Response.java b/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/model/Model200Response.java
index 3981e9696a..0c0fc9710d 100644
--- a/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/model/Model200Response.java
+++ b/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/model/Model200Response.java
@@ -47,6 +47,7 @@ public class Model200Response {
    * Get name
    * @return name
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Integer getName() {
     return name;
@@ -65,6 +66,7 @@ public class Model200Response {
    * Get propertyClass
    * @return propertyClass
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getPropertyClass() {
     return propertyClass;
diff --git a/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/model/ModelApiResponse.java b/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/model/ModelApiResponse.java
index 8a0b10b4e2..777b1a8a7c 100644
--- a/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/model/ModelApiResponse.java
+++ b/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/model/ModelApiResponse.java
@@ -50,6 +50,7 @@ public class ModelApiResponse {
    * Get code
    * @return code
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Integer getCode() {
     return code;
@@ -68,6 +69,7 @@ public class ModelApiResponse {
    * Get type
    * @return type
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getType() {
     return type;
@@ -86,6 +88,7 @@ public class ModelApiResponse {
    * Get message
    * @return message
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getMessage() {
     return message;
diff --git a/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/model/ModelReturn.java b/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/model/ModelReturn.java
index f045378132..225df7f4e8 100644
--- a/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/model/ModelReturn.java
+++ b/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/model/ModelReturn.java
@@ -43,6 +43,7 @@ public class ModelReturn {
    * Get _return
    * @return _return
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Integer getReturn() {
     return _return;
diff --git a/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/model/Name.java b/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/model/Name.java
index dab0c2d48f..c5a5691688 100644
--- a/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/model/Name.java
+++ b/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/model/Name.java
@@ -55,6 +55,7 @@ public class Name {
    * Get name
    * @return name
   **/
+
   @ApiModelProperty(required = true, value = "")
   public Integer getName() {
     return name;
@@ -68,6 +69,7 @@ public class Name {
    * Get snakeCase
    * @return snakeCase
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Integer getSnakeCase() {
     return snakeCase;
@@ -82,6 +84,7 @@ public class Name {
    * Get property
    * @return property
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getProperty() {
     return property;
@@ -95,6 +98,7 @@ public class Name {
    * Get _123number
    * @return _123number
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Integer get123number() {
     return _123number;
diff --git a/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/model/NumberOnly.java b/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/model/NumberOnly.java
index 17cb112586..00ffd2f67e 100644
--- a/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/model/NumberOnly.java
+++ b/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/model/NumberOnly.java
@@ -43,6 +43,7 @@ public class NumberOnly {
    * Get justNumber
    * @return justNumber
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public BigDecimal getJustNumber() {
     return justNumber;
diff --git a/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/model/Order.java b/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/model/Order.java
index 66e43825e2..cfb3d04776 100644
--- a/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/model/Order.java
+++ b/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/model/Order.java
@@ -112,6 +112,7 @@ public class Order {
    * Get id
    * @return id
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Long getId() {
     return id;
@@ -130,6 +131,7 @@ public class Order {
    * Get petId
    * @return petId
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Long getPetId() {
     return petId;
@@ -148,6 +150,7 @@ public class Order {
    * Get quantity
    * @return quantity
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Integer getQuantity() {
     return quantity;
@@ -166,6 +169,7 @@ public class Order {
    * Get shipDate
    * @return shipDate
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public OffsetDateTime getShipDate() {
     return shipDate;
@@ -184,6 +188,7 @@ public class Order {
    * Order Status
    * @return status
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "Order Status")
   public StatusEnum getStatus() {
     return status;
@@ -202,6 +207,7 @@ public class Order {
    * Get complete
    * @return complete
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Boolean getComplete() {
     return complete;
diff --git a/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/model/OuterComposite.java b/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/model/OuterComposite.java
index 65f05e3fa4..9e2a78d57f 100644
--- a/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/model/OuterComposite.java
+++ b/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/model/OuterComposite.java
@@ -51,6 +51,7 @@ public class OuterComposite {
    * Get myNumber
    * @return myNumber
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public BigDecimal getMyNumber() {
     return myNumber;
@@ -69,6 +70,7 @@ public class OuterComposite {
    * Get myString
    * @return myString
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getMyString() {
     return myString;
@@ -87,6 +89,7 @@ public class OuterComposite {
    * Get myBoolean
    * @return myBoolean
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Boolean getMyBoolean() {
     return myBoolean;
diff --git a/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/model/Pet.java b/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/model/Pet.java
index a95a0c9dd0..5ac8165f7f 100644
--- a/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/model/Pet.java
+++ b/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/model/Pet.java
@@ -115,6 +115,7 @@ public class Pet {
    * Get id
    * @return id
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Long getId() {
     return id;
@@ -133,6 +134,7 @@ public class Pet {
    * Get category
    * @return category
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Category getCategory() {
     return category;
@@ -151,6 +153,7 @@ public class Pet {
    * Get name
    * @return name
   **/
+
   @ApiModelProperty(example = "doggie", required = true, value = "")
   public String getName() {
     return name;
@@ -174,6 +177,7 @@ public class Pet {
    * Get photoUrls
    * @return photoUrls
   **/
+
   @ApiModelProperty(required = true, value = "")
   public List<String> getPhotoUrls() {
     return photoUrls;
@@ -200,6 +204,7 @@ public class Pet {
    * Get tags
    * @return tags
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public List<Tag> getTags() {
     return tags;
@@ -218,6 +223,7 @@ public class Pet {
    * pet status in the store
    * @return status
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "pet status in the store")
   public StatusEnum getStatus() {
     return status;
diff --git a/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/model/ReadOnlyFirst.java b/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/model/ReadOnlyFirst.java
index 2872f78893..23ec5576c0 100644
--- a/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/model/ReadOnlyFirst.java
+++ b/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/model/ReadOnlyFirst.java
@@ -41,6 +41,7 @@ public class ReadOnlyFirst {
    * Get bar
    * @return bar
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getBar() {
     return bar;
@@ -55,6 +56,7 @@ public class ReadOnlyFirst {
    * Get baz
    * @return baz
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getBaz() {
     return baz;
diff --git a/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/model/SpecialModelName.java b/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/model/SpecialModelName.java
index 8fab5e0b27..f4a7d343a7 100644
--- a/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/model/SpecialModelName.java
+++ b/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/model/SpecialModelName.java
@@ -42,6 +42,7 @@ public class SpecialModelName {
    * Get $specialPropertyName
    * @return $specialPropertyName
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Long get$SpecialPropertyName() {
     return $specialPropertyName;
diff --git a/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/model/Tag.java b/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/model/Tag.java
index ab153ca672..bce1fc934d 100644
--- a/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/model/Tag.java
+++ b/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/model/Tag.java
@@ -46,6 +46,7 @@ public class Tag {
    * Get id
    * @return id
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Long getId() {
     return id;
@@ -64,6 +65,7 @@ public class Tag {
    * Get name
    * @return name
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getName() {
     return name;
diff --git a/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/model/TypeHolderDefault.java b/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/model/TypeHolderDefault.java
index 8fc321bc0a..8c7e1fa55d 100644
--- a/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/model/TypeHolderDefault.java
+++ b/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/model/TypeHolderDefault.java
@@ -61,6 +61,7 @@ public class TypeHolderDefault {
    * Get stringItem
    * @return stringItem
   **/
+
   @ApiModelProperty(required = true, value = "")
   public String getStringItem() {
     return stringItem;
@@ -79,6 +80,7 @@ public class TypeHolderDefault {
    * Get numberItem
    * @return numberItem
   **/
+
   @ApiModelProperty(required = true, value = "")
   public BigDecimal getNumberItem() {
     return numberItem;
@@ -97,6 +99,7 @@ public class TypeHolderDefault {
    * Get integerItem
    * @return integerItem
   **/
+
   @ApiModelProperty(required = true, value = "")
   public Integer getIntegerItem() {
     return integerItem;
@@ -115,6 +118,7 @@ public class TypeHolderDefault {
    * Get boolItem
    * @return boolItem
   **/
+
   @ApiModelProperty(required = true, value = "")
   public Boolean getBoolItem() {
     return boolItem;
@@ -138,6 +142,7 @@ public class TypeHolderDefault {
    * Get arrayItem
    * @return arrayItem
   **/
+
   @ApiModelProperty(required = true, value = "")
   public List<Integer> getArrayItem() {
     return arrayItem;
diff --git a/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/model/TypeHolderExample.java b/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/model/TypeHolderExample.java
index d9496cbd79..8315f422ea 100644
--- a/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/model/TypeHolderExample.java
+++ b/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/model/TypeHolderExample.java
@@ -61,6 +61,7 @@ public class TypeHolderExample {
    * Get stringItem
    * @return stringItem
   **/
+
   @ApiModelProperty(example = "what", required = true, value = "")
   public String getStringItem() {
     return stringItem;
@@ -79,6 +80,7 @@ public class TypeHolderExample {
    * Get numberItem
    * @return numberItem
   **/
+
   @ApiModelProperty(example = "1.234", required = true, value = "")
   public BigDecimal getNumberItem() {
     return numberItem;
@@ -97,6 +99,7 @@ public class TypeHolderExample {
    * Get integerItem
    * @return integerItem
   **/
+
   @ApiModelProperty(example = "-2", required = true, value = "")
   public Integer getIntegerItem() {
     return integerItem;
@@ -115,6 +118,7 @@ public class TypeHolderExample {
    * Get boolItem
    * @return boolItem
   **/
+
   @ApiModelProperty(example = "true", required = true, value = "")
   public Boolean getBoolItem() {
     return boolItem;
@@ -138,6 +142,7 @@ public class TypeHolderExample {
    * Get arrayItem
    * @return arrayItem
   **/
+
   @ApiModelProperty(example = "[0, 1, 2, 3]", required = true, value = "")
   public List<Integer> getArrayItem() {
     return arrayItem;
diff --git a/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/model/User.java b/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/model/User.java
index 74b9a66a24..3f9eb4bb8a 100644
--- a/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/model/User.java
+++ b/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/model/User.java
@@ -70,6 +70,7 @@ public class User {
    * Get id
    * @return id
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Long getId() {
     return id;
@@ -88,6 +89,7 @@ public class User {
    * Get username
    * @return username
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getUsername() {
     return username;
@@ -106,6 +108,7 @@ public class User {
    * Get firstName
    * @return firstName
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getFirstName() {
     return firstName;
@@ -124,6 +127,7 @@ public class User {
    * Get lastName
    * @return lastName
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getLastName() {
     return lastName;
@@ -142,6 +146,7 @@ public class User {
    * Get email
    * @return email
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getEmail() {
     return email;
@@ -160,6 +165,7 @@ public class User {
    * Get password
    * @return password
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getPassword() {
     return password;
@@ -178,6 +184,7 @@ public class User {
    * Get phone
    * @return phone
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getPhone() {
     return phone;
@@ -196,6 +203,7 @@ public class User {
    * User Status
    * @return userStatus
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "User Status")
   public Integer getUserStatus() {
     return userStatus;
diff --git a/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/model/XmlItem.java b/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/model/XmlItem.java
index ac66ad77de..67910352a7 100644
--- a/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/model/XmlItem.java
+++ b/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/model/XmlItem.java
@@ -157,6 +157,7 @@ public class XmlItem {
    * Get attributeString
    * @return attributeString
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(example = "string", value = "")
   public String getAttributeString() {
     return attributeString;
@@ -175,6 +176,7 @@ public class XmlItem {
    * Get attributeNumber
    * @return attributeNumber
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(example = "1.234", value = "")
   public BigDecimal getAttributeNumber() {
     return attributeNumber;
@@ -193,6 +195,7 @@ public class XmlItem {
    * Get attributeInteger
    * @return attributeInteger
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(example = "-2", value = "")
   public Integer getAttributeInteger() {
     return attributeInteger;
@@ -211,6 +214,7 @@ public class XmlItem {
    * Get attributeBoolean
    * @return attributeBoolean
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(example = "true", value = "")
   public Boolean getAttributeBoolean() {
     return attributeBoolean;
@@ -237,6 +241,7 @@ public class XmlItem {
    * Get wrappedArray
    * @return wrappedArray
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public List<Integer> getWrappedArray() {
     return wrappedArray;
@@ -255,6 +260,7 @@ public class XmlItem {
    * Get nameString
    * @return nameString
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(example = "string", value = "")
   public String getNameString() {
     return nameString;
@@ -273,6 +279,7 @@ public class XmlItem {
    * Get nameNumber
    * @return nameNumber
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(example = "1.234", value = "")
   public BigDecimal getNameNumber() {
     return nameNumber;
@@ -291,6 +298,7 @@ public class XmlItem {
    * Get nameInteger
    * @return nameInteger
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(example = "-2", value = "")
   public Integer getNameInteger() {
     return nameInteger;
@@ -309,6 +317,7 @@ public class XmlItem {
    * Get nameBoolean
    * @return nameBoolean
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(example = "true", value = "")
   public Boolean getNameBoolean() {
     return nameBoolean;
@@ -335,6 +344,7 @@ public class XmlItem {
    * Get nameArray
    * @return nameArray
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public List<Integer> getNameArray() {
     return nameArray;
@@ -361,6 +371,7 @@ public class XmlItem {
    * Get nameWrappedArray
    * @return nameWrappedArray
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public List<Integer> getNameWrappedArray() {
     return nameWrappedArray;
@@ -379,6 +390,7 @@ public class XmlItem {
    * Get prefixString
    * @return prefixString
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(example = "string", value = "")
   public String getPrefixString() {
     return prefixString;
@@ -397,6 +409,7 @@ public class XmlItem {
    * Get prefixNumber
    * @return prefixNumber
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(example = "1.234", value = "")
   public BigDecimal getPrefixNumber() {
     return prefixNumber;
@@ -415,6 +428,7 @@ public class XmlItem {
    * Get prefixInteger
    * @return prefixInteger
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(example = "-2", value = "")
   public Integer getPrefixInteger() {
     return prefixInteger;
@@ -433,6 +447,7 @@ public class XmlItem {
    * Get prefixBoolean
    * @return prefixBoolean
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(example = "true", value = "")
   public Boolean getPrefixBoolean() {
     return prefixBoolean;
@@ -459,6 +474,7 @@ public class XmlItem {
    * Get prefixArray
    * @return prefixArray
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public List<Integer> getPrefixArray() {
     return prefixArray;
@@ -485,6 +501,7 @@ public class XmlItem {
    * Get prefixWrappedArray
    * @return prefixWrappedArray
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public List<Integer> getPrefixWrappedArray() {
     return prefixWrappedArray;
@@ -503,6 +520,7 @@ public class XmlItem {
    * Get namespaceString
    * @return namespaceString
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(example = "string", value = "")
   public String getNamespaceString() {
     return namespaceString;
@@ -521,6 +539,7 @@ public class XmlItem {
    * Get namespaceNumber
    * @return namespaceNumber
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(example = "1.234", value = "")
   public BigDecimal getNamespaceNumber() {
     return namespaceNumber;
@@ -539,6 +558,7 @@ public class XmlItem {
    * Get namespaceInteger
    * @return namespaceInteger
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(example = "-2", value = "")
   public Integer getNamespaceInteger() {
     return namespaceInteger;
@@ -557,6 +577,7 @@ public class XmlItem {
    * Get namespaceBoolean
    * @return namespaceBoolean
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(example = "true", value = "")
   public Boolean getNamespaceBoolean() {
     return namespaceBoolean;
@@ -583,6 +604,7 @@ public class XmlItem {
    * Get namespaceArray
    * @return namespaceArray
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public List<Integer> getNamespaceArray() {
     return namespaceArray;
@@ -609,6 +631,7 @@ public class XmlItem {
    * Get namespaceWrappedArray
    * @return namespaceWrappedArray
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public List<Integer> getNamespaceWrappedArray() {
     return namespaceWrappedArray;
@@ -627,6 +650,7 @@ public class XmlItem {
    * Get prefixNsString
    * @return prefixNsString
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(example = "string", value = "")
   public String getPrefixNsString() {
     return prefixNsString;
@@ -645,6 +669,7 @@ public class XmlItem {
    * Get prefixNsNumber
    * @return prefixNsNumber
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(example = "1.234", value = "")
   public BigDecimal getPrefixNsNumber() {
     return prefixNsNumber;
@@ -663,6 +688,7 @@ public class XmlItem {
    * Get prefixNsInteger
    * @return prefixNsInteger
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(example = "-2", value = "")
   public Integer getPrefixNsInteger() {
     return prefixNsInteger;
@@ -681,6 +707,7 @@ public class XmlItem {
    * Get prefixNsBoolean
    * @return prefixNsBoolean
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(example = "true", value = "")
   public Boolean getPrefixNsBoolean() {
     return prefixNsBoolean;
@@ -707,6 +734,7 @@ public class XmlItem {
    * Get prefixNsArray
    * @return prefixNsArray
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public List<Integer> getPrefixNsArray() {
     return prefixNsArray;
@@ -733,6 +761,7 @@ public class XmlItem {
    * Get prefixNsWrappedArray
    * @return prefixNsWrappedArray
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public List<Integer> getPrefixNsWrappedArray() {
     return prefixNsWrappedArray;
diff --git a/samples/client/petstore/java/retrofit2rx2/build.gradle b/samples/client/petstore/java/retrofit2rx2/build.gradle
index 304e3c78ee..435c9f843e 100644
--- a/samples/client/petstore/java/retrofit2rx2/build.gradle
+++ b/samples/client/petstore/java/retrofit2rx2/build.gradle
@@ -111,6 +111,7 @@ dependencies {
     compile 'com.squareup.retrofit2:adapter-rxjava2:2.3.0'
     compile "io.reactivex.rxjava2:rxjava:$rx_java_version"
     compile "io.swagger:swagger-annotations:$swagger_annotations_version"
+    compile "com.google.code.findbugs:jsr305:3.0.2"
     compile ("org.apache.oltu.oauth2:org.apache.oltu.oauth2.client:$oltu_version"){
         exclude group:'org.apache.oltu.oauth2' , module: 'org.apache.oltu.oauth2.common'
     }
diff --git a/samples/client/petstore/java/retrofit2rx2/pom.xml b/samples/client/petstore/java/retrofit2rx2/pom.xml
index d4e60aced9..b4a58f9d58 100644
--- a/samples/client/petstore/java/retrofit2rx2/pom.xml
+++ b/samples/client/petstore/java/retrofit2rx2/pom.xml
@@ -191,6 +191,12 @@
             <artifactId>swagger-annotations</artifactId>
             <version>${swagger-annotations-version}</version>
         </dependency>
+        <!-- @Nullable annotation -->
+        <dependency>
+            <groupId>com.google.code.findbugs</groupId>
+            <artifactId>jsr305</artifactId>
+            <version>3.0.2</version>
+        </dependency>
         <dependency>
             <groupId>com.squareup.retrofit2</groupId>
             <artifactId>converter-gson</artifactId>
diff --git a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/AdditionalPropertiesAnyType.java b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/AdditionalPropertiesAnyType.java
index 9c47737ced..e98f74f8ae 100644
--- a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/AdditionalPropertiesAnyType.java
+++ b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/AdditionalPropertiesAnyType.java
@@ -44,6 +44,7 @@ public class AdditionalPropertiesAnyType extends HashMap<String, Object> {
    * Get name
    * @return name
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getName() {
     return name;
diff --git a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/AdditionalPropertiesArray.java b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/AdditionalPropertiesArray.java
index c5eed6cdac..1d86faad3e 100644
--- a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/AdditionalPropertiesArray.java
+++ b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/AdditionalPropertiesArray.java
@@ -45,6 +45,7 @@ public class AdditionalPropertiesArray extends HashMap<String, List> {
    * Get name
    * @return name
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getName() {
     return name;
diff --git a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/AdditionalPropertiesBoolean.java b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/AdditionalPropertiesBoolean.java
index 390777ff37..a3b37161da 100644
--- a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/AdditionalPropertiesBoolean.java
+++ b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/AdditionalPropertiesBoolean.java
@@ -44,6 +44,7 @@ public class AdditionalPropertiesBoolean extends HashMap<String, Boolean> {
    * Get name
    * @return name
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getName() {
     return name;
diff --git a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java
index 3c1a02c33c..8819f4a024 100644
--- a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java
+++ b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java
@@ -94,6 +94,7 @@ public class AdditionalPropertiesClass {
    * Get mapString
    * @return mapString
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Map<String, String> getMapString() {
     return mapString;
@@ -120,6 +121,7 @@ public class AdditionalPropertiesClass {
    * Get mapNumber
    * @return mapNumber
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Map<String, BigDecimal> getMapNumber() {
     return mapNumber;
@@ -146,6 +148,7 @@ public class AdditionalPropertiesClass {
    * Get mapInteger
    * @return mapInteger
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Map<String, Integer> getMapInteger() {
     return mapInteger;
@@ -172,6 +175,7 @@ public class AdditionalPropertiesClass {
    * Get mapBoolean
    * @return mapBoolean
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Map<String, Boolean> getMapBoolean() {
     return mapBoolean;
@@ -198,6 +202,7 @@ public class AdditionalPropertiesClass {
    * Get mapArrayInteger
    * @return mapArrayInteger
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Map<String, List<Integer>> getMapArrayInteger() {
     return mapArrayInteger;
@@ -224,6 +229,7 @@ public class AdditionalPropertiesClass {
    * Get mapArrayAnytype
    * @return mapArrayAnytype
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Map<String, List<Object>> getMapArrayAnytype() {
     return mapArrayAnytype;
@@ -250,6 +256,7 @@ public class AdditionalPropertiesClass {
    * Get mapMapString
    * @return mapMapString
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Map<String, Map<String, String>> getMapMapString() {
     return mapMapString;
@@ -276,6 +283,7 @@ public class AdditionalPropertiesClass {
    * Get mapMapAnytype
    * @return mapMapAnytype
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Map<String, Map<String, Object>> getMapMapAnytype() {
     return mapMapAnytype;
@@ -294,6 +302,7 @@ public class AdditionalPropertiesClass {
    * Get anytype1
    * @return anytype1
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Object getAnytype1() {
     return anytype1;
@@ -312,6 +321,7 @@ public class AdditionalPropertiesClass {
    * Get anytype2
    * @return anytype2
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Object getAnytype2() {
     return anytype2;
@@ -330,6 +340,7 @@ public class AdditionalPropertiesClass {
    * Get anytype3
    * @return anytype3
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Object getAnytype3() {
     return anytype3;
diff --git a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/AdditionalPropertiesInteger.java b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/AdditionalPropertiesInteger.java
index df6e865593..b8f956cbed 100644
--- a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/AdditionalPropertiesInteger.java
+++ b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/AdditionalPropertiesInteger.java
@@ -44,6 +44,7 @@ public class AdditionalPropertiesInteger extends HashMap<String, Integer> {
    * Get name
    * @return name
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getName() {
     return name;
diff --git a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/AdditionalPropertiesNumber.java b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/AdditionalPropertiesNumber.java
index 8a9118cf85..03d923ab1d 100644
--- a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/AdditionalPropertiesNumber.java
+++ b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/AdditionalPropertiesNumber.java
@@ -45,6 +45,7 @@ public class AdditionalPropertiesNumber extends HashMap<String, BigDecimal> {
    * Get name
    * @return name
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getName() {
     return name;
diff --git a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/AdditionalPropertiesObject.java b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/AdditionalPropertiesObject.java
index b67f12d840..c0e696dbd5 100644
--- a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/AdditionalPropertiesObject.java
+++ b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/AdditionalPropertiesObject.java
@@ -44,6 +44,7 @@ public class AdditionalPropertiesObject extends HashMap<String, Map> {
    * Get name
    * @return name
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getName() {
     return name;
diff --git a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/AdditionalPropertiesString.java b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/AdditionalPropertiesString.java
index 6e54b260fd..67e597e3cf 100644
--- a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/AdditionalPropertiesString.java
+++ b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/AdditionalPropertiesString.java
@@ -44,6 +44,7 @@ public class AdditionalPropertiesString extends HashMap<String, String> {
    * Get name
    * @return name
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getName() {
     return name;
diff --git a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/Animal.java b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/Animal.java
index 06342bce06..1738bdaf47 100644
--- a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/Animal.java
+++ b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/Animal.java
@@ -50,6 +50,7 @@ public class Animal {
    * Get className
    * @return className
   **/
+
   @ApiModelProperty(required = true, value = "")
   public String getClassName() {
     return className;
@@ -68,6 +69,7 @@ public class Animal {
    * Get color
    * @return color
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getColor() {
     return color;
diff --git a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java
index 87429212a6..69c0cacb05 100644
--- a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java
+++ b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java
@@ -53,6 +53,7 @@ public class ArrayOfArrayOfNumberOnly {
    * Get arrayArrayNumber
    * @return arrayArrayNumber
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public List<List<BigDecimal>> getArrayArrayNumber() {
     return arrayArrayNumber;
diff --git a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java
index c21e45d438..a85aa96af7 100644
--- a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java
+++ b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java
@@ -53,6 +53,7 @@ public class ArrayOfNumberOnly {
    * Get arrayNumber
    * @return arrayNumber
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public List<BigDecimal> getArrayNumber() {
     return arrayNumber;
diff --git a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/ArrayTest.java b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/ArrayTest.java
index 8ae596291a..986ac5aa17 100644
--- a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/ArrayTest.java
+++ b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/ArrayTest.java
@@ -61,6 +61,7 @@ public class ArrayTest {
    * Get arrayOfString
    * @return arrayOfString
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public List<String> getArrayOfString() {
     return arrayOfString;
@@ -87,6 +88,7 @@ public class ArrayTest {
    * Get arrayArrayOfInteger
    * @return arrayArrayOfInteger
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public List<List<Long>> getArrayArrayOfInteger() {
     return arrayArrayOfInteger;
@@ -113,6 +115,7 @@ public class ArrayTest {
    * Get arrayArrayOfModel
    * @return arrayArrayOfModel
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public List<List<ReadOnlyFirst>> getArrayArrayOfModel() {
     return arrayArrayOfModel;
diff --git a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/Capitalization.java b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/Capitalization.java
index 3f05d95d60..36f8853e1c 100644
--- a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/Capitalization.java
+++ b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/Capitalization.java
@@ -62,6 +62,7 @@ public class Capitalization {
    * Get smallCamel
    * @return smallCamel
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getSmallCamel() {
     return smallCamel;
@@ -80,6 +81,7 @@ public class Capitalization {
    * Get capitalCamel
    * @return capitalCamel
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getCapitalCamel() {
     return capitalCamel;
@@ -98,6 +100,7 @@ public class Capitalization {
    * Get smallSnake
    * @return smallSnake
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getSmallSnake() {
     return smallSnake;
@@ -116,6 +119,7 @@ public class Capitalization {
    * Get capitalSnake
    * @return capitalSnake
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getCapitalSnake() {
     return capitalSnake;
@@ -134,6 +138,7 @@ public class Capitalization {
    * Get scAETHFlowPoints
    * @return scAETHFlowPoints
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getScAETHFlowPoints() {
     return scAETHFlowPoints;
@@ -152,6 +157,7 @@ public class Capitalization {
    * Name of the pet 
    * @return ATT_NAME
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "Name of the pet ")
   public String getATTNAME() {
     return ATT_NAME;
diff --git a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/Cat.java b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/Cat.java
index 4a12050bc8..965461a8be 100644
--- a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/Cat.java
+++ b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/Cat.java
@@ -44,6 +44,7 @@ public class Cat extends Animal {
    * Get declawed
    * @return declawed
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Boolean getDeclawed() {
     return declawed;
diff --git a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/CatAllOf.java b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/CatAllOf.java
index 1424f55ddb..124db9b8ba 100644
--- a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/CatAllOf.java
+++ b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/CatAllOf.java
@@ -42,6 +42,7 @@ public class CatAllOf {
    * Get declawed
    * @return declawed
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Boolean getDeclawed() {
     return declawed;
diff --git a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/Category.java b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/Category.java
index eb41569576..d4e121847a 100644
--- a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/Category.java
+++ b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/Category.java
@@ -46,6 +46,7 @@ public class Category {
    * Get id
    * @return id
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Long getId() {
     return id;
@@ -64,6 +65,7 @@ public class Category {
    * Get name
    * @return name
   **/
+
   @ApiModelProperty(required = true, value = "")
   public String getName() {
     return name;
diff --git a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/ClassModel.java b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/ClassModel.java
index 91632a4f68..cbdd8f317b 100644
--- a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/ClassModel.java
+++ b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/ClassModel.java
@@ -43,6 +43,7 @@ public class ClassModel {
    * Get propertyClass
    * @return propertyClass
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getPropertyClass() {
     return propertyClass;
diff --git a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/Client.java b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/Client.java
index 3067e8d184..5d9c5c4a71 100644
--- a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/Client.java
+++ b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/Client.java
@@ -42,6 +42,7 @@ public class Client {
    * Get client
    * @return client
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getClient() {
     return client;
diff --git a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/Dog.java b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/Dog.java
index 63ff1ffbec..4da9ba4364 100644
--- a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/Dog.java
+++ b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/Dog.java
@@ -44,6 +44,7 @@ public class Dog extends Animal {
    * Get breed
    * @return breed
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getBreed() {
     return breed;
diff --git a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/DogAllOf.java b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/DogAllOf.java
index 7214ddd07e..e505d1dbc3 100644
--- a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/DogAllOf.java
+++ b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/DogAllOf.java
@@ -42,6 +42,7 @@ public class DogAllOf {
    * Get breed
    * @return breed
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getBreed() {
     return breed;
diff --git a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/EnumArrays.java b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/EnumArrays.java
index bd8d680339..8748c9fa37 100644
--- a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/EnumArrays.java
+++ b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/EnumArrays.java
@@ -142,6 +142,7 @@ public class EnumArrays {
    * Get justSymbol
    * @return justSymbol
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public JustSymbolEnum getJustSymbol() {
     return justSymbol;
@@ -168,6 +169,7 @@ public class EnumArrays {
    * Get arrayEnum
    * @return arrayEnum
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public List<ArrayEnumEnum> getArrayEnum() {
     return arrayEnum;
diff --git a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/EnumTest.java b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/EnumTest.java
index 6c05a8f967..1960c24ac2 100644
--- a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/EnumTest.java
+++ b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/EnumTest.java
@@ -251,6 +251,7 @@ public class EnumTest {
    * Get enumString
    * @return enumString
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public EnumStringEnum getEnumString() {
     return enumString;
@@ -269,6 +270,7 @@ public class EnumTest {
    * Get enumStringRequired
    * @return enumStringRequired
   **/
+
   @ApiModelProperty(required = true, value = "")
   public EnumStringRequiredEnum getEnumStringRequired() {
     return enumStringRequired;
@@ -287,6 +289,7 @@ public class EnumTest {
    * Get enumInteger
    * @return enumInteger
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public EnumIntegerEnum getEnumInteger() {
     return enumInteger;
@@ -305,6 +308,7 @@ public class EnumTest {
    * Get enumNumber
    * @return enumNumber
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public EnumNumberEnum getEnumNumber() {
     return enumNumber;
@@ -323,6 +327,7 @@ public class EnumTest {
    * Get outerEnum
    * @return outerEnum
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public OuterEnum getOuterEnum() {
     return outerEnum;
diff --git a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java
index 8ebc84c044..3c7fcaabdf 100644
--- a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java
+++ b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java
@@ -48,6 +48,7 @@ public class FileSchemaTestClass {
    * Get file
    * @return file
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public java.io.File getFile() {
     return file;
@@ -74,6 +75,7 @@ public class FileSchemaTestClass {
    * Get files
    * @return files
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public List<java.io.File> getFiles() {
     return files;
diff --git a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/FormatTest.java b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/FormatTest.java
index 29058abb17..e7b28a4737 100644
--- a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/FormatTest.java
+++ b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/FormatTest.java
@@ -97,6 +97,7 @@ public class FormatTest {
    * maximum: 100
    * @return integer
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Integer getInteger() {
     return integer;
@@ -117,6 +118,7 @@ public class FormatTest {
    * maximum: 200
    * @return int32
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Integer getInt32() {
     return int32;
@@ -135,6 +137,7 @@ public class FormatTest {
    * Get int64
    * @return int64
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Long getInt64() {
     return int64;
@@ -155,6 +158,7 @@ public class FormatTest {
    * maximum: 543.2
    * @return number
   **/
+
   @ApiModelProperty(required = true, value = "")
   public BigDecimal getNumber() {
     return number;
@@ -175,6 +179,7 @@ public class FormatTest {
    * maximum: 987.6
    * @return _float
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Float getFloat() {
     return _float;
@@ -195,6 +200,7 @@ public class FormatTest {
    * maximum: 123.4
    * @return _double
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Double getDouble() {
     return _double;
@@ -213,6 +219,7 @@ public class FormatTest {
    * Get string
    * @return string
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getString() {
     return string;
@@ -231,6 +238,7 @@ public class FormatTest {
    * Get _byte
    * @return _byte
   **/
+
   @ApiModelProperty(required = true, value = "")
   public byte[] getByte() {
     return _byte;
@@ -249,6 +257,7 @@ public class FormatTest {
    * Get binary
    * @return binary
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public File getBinary() {
     return binary;
@@ -267,6 +276,7 @@ public class FormatTest {
    * Get date
    * @return date
   **/
+
   @ApiModelProperty(required = true, value = "")
   public LocalDate getDate() {
     return date;
@@ -285,6 +295,7 @@ public class FormatTest {
    * Get dateTime
    * @return dateTime
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public OffsetDateTime getDateTime() {
     return dateTime;
@@ -303,6 +314,7 @@ public class FormatTest {
    * Get uuid
    * @return uuid
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(example = "72f98069-206d-4f12-9f12-3d1e525a8e84", value = "")
   public UUID getUuid() {
     return uuid;
@@ -321,6 +333,7 @@ public class FormatTest {
    * Get password
    * @return password
   **/
+
   @ApiModelProperty(required = true, value = "")
   public String getPassword() {
     return password;
diff --git a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java
index bb1394ea1f..72fcaa8993 100644
--- a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java
+++ b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java
@@ -41,6 +41,7 @@ public class HasOnlyReadOnly {
    * Get bar
    * @return bar
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getBar() {
     return bar;
@@ -50,6 +51,7 @@ public class HasOnlyReadOnly {
    * Get foo
    * @return foo
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getFoo() {
     return foo;
diff --git a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/MapTest.java b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/MapTest.java
index cb95334e61..43f0d2e998 100644
--- a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/MapTest.java
+++ b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/MapTest.java
@@ -112,6 +112,7 @@ public class MapTest {
    * Get mapMapOfString
    * @return mapMapOfString
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Map<String, Map<String, String>> getMapMapOfString() {
     return mapMapOfString;
@@ -138,6 +139,7 @@ public class MapTest {
    * Get mapOfEnumString
    * @return mapOfEnumString
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Map<String, InnerEnum> getMapOfEnumString() {
     return mapOfEnumString;
@@ -164,6 +166,7 @@ public class MapTest {
    * Get directMap
    * @return directMap
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Map<String, Boolean> getDirectMap() {
     return directMap;
@@ -190,6 +193,7 @@ public class MapTest {
    * Get indirectMap
    * @return indirectMap
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Map<String, Boolean> getIndirectMap() {
     return indirectMap;
diff --git a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java
index 7417b41271..78d80bd7f0 100644
--- a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java
+++ b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java
@@ -56,6 +56,7 @@ public class MixedPropertiesAndAdditionalPropertiesClass {
    * Get uuid
    * @return uuid
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public UUID getUuid() {
     return uuid;
@@ -74,6 +75,7 @@ public class MixedPropertiesAndAdditionalPropertiesClass {
    * Get dateTime
    * @return dateTime
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public OffsetDateTime getDateTime() {
     return dateTime;
@@ -100,6 +102,7 @@ public class MixedPropertiesAndAdditionalPropertiesClass {
    * Get map
    * @return map
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Map<String, Animal> getMap() {
     return map;
diff --git a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/Model200Response.java b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/Model200Response.java
index 3981e9696a..0c0fc9710d 100644
--- a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/Model200Response.java
+++ b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/Model200Response.java
@@ -47,6 +47,7 @@ public class Model200Response {
    * Get name
    * @return name
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Integer getName() {
     return name;
@@ -65,6 +66,7 @@ public class Model200Response {
    * Get propertyClass
    * @return propertyClass
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getPropertyClass() {
     return propertyClass;
diff --git a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/ModelApiResponse.java b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/ModelApiResponse.java
index 8a0b10b4e2..777b1a8a7c 100644
--- a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/ModelApiResponse.java
+++ b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/ModelApiResponse.java
@@ -50,6 +50,7 @@ public class ModelApiResponse {
    * Get code
    * @return code
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Integer getCode() {
     return code;
@@ -68,6 +69,7 @@ public class ModelApiResponse {
    * Get type
    * @return type
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getType() {
     return type;
@@ -86,6 +88,7 @@ public class ModelApiResponse {
    * Get message
    * @return message
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getMessage() {
     return message;
diff --git a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/ModelReturn.java b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/ModelReturn.java
index f045378132..225df7f4e8 100644
--- a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/ModelReturn.java
+++ b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/ModelReturn.java
@@ -43,6 +43,7 @@ public class ModelReturn {
    * Get _return
    * @return _return
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Integer getReturn() {
     return _return;
diff --git a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/Name.java b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/Name.java
index dab0c2d48f..c5a5691688 100644
--- a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/Name.java
+++ b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/Name.java
@@ -55,6 +55,7 @@ public class Name {
    * Get name
    * @return name
   **/
+
   @ApiModelProperty(required = true, value = "")
   public Integer getName() {
     return name;
@@ -68,6 +69,7 @@ public class Name {
    * Get snakeCase
    * @return snakeCase
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Integer getSnakeCase() {
     return snakeCase;
@@ -82,6 +84,7 @@ public class Name {
    * Get property
    * @return property
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getProperty() {
     return property;
@@ -95,6 +98,7 @@ public class Name {
    * Get _123number
    * @return _123number
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Integer get123number() {
     return _123number;
diff --git a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/NumberOnly.java b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/NumberOnly.java
index 17cb112586..00ffd2f67e 100644
--- a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/NumberOnly.java
+++ b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/NumberOnly.java
@@ -43,6 +43,7 @@ public class NumberOnly {
    * Get justNumber
    * @return justNumber
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public BigDecimal getJustNumber() {
     return justNumber;
diff --git a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/Order.java b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/Order.java
index 66e43825e2..cfb3d04776 100644
--- a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/Order.java
+++ b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/Order.java
@@ -112,6 +112,7 @@ public class Order {
    * Get id
    * @return id
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Long getId() {
     return id;
@@ -130,6 +131,7 @@ public class Order {
    * Get petId
    * @return petId
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Long getPetId() {
     return petId;
@@ -148,6 +150,7 @@ public class Order {
    * Get quantity
    * @return quantity
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Integer getQuantity() {
     return quantity;
@@ -166,6 +169,7 @@ public class Order {
    * Get shipDate
    * @return shipDate
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public OffsetDateTime getShipDate() {
     return shipDate;
@@ -184,6 +188,7 @@ public class Order {
    * Order Status
    * @return status
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "Order Status")
   public StatusEnum getStatus() {
     return status;
@@ -202,6 +207,7 @@ public class Order {
    * Get complete
    * @return complete
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Boolean getComplete() {
     return complete;
diff --git a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/OuterComposite.java b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/OuterComposite.java
index 65f05e3fa4..9e2a78d57f 100644
--- a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/OuterComposite.java
+++ b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/OuterComposite.java
@@ -51,6 +51,7 @@ public class OuterComposite {
    * Get myNumber
    * @return myNumber
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public BigDecimal getMyNumber() {
     return myNumber;
@@ -69,6 +70,7 @@ public class OuterComposite {
    * Get myString
    * @return myString
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getMyString() {
     return myString;
@@ -87,6 +89,7 @@ public class OuterComposite {
    * Get myBoolean
    * @return myBoolean
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Boolean getMyBoolean() {
     return myBoolean;
diff --git a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/Pet.java b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/Pet.java
index a95a0c9dd0..5ac8165f7f 100644
--- a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/Pet.java
+++ b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/Pet.java
@@ -115,6 +115,7 @@ public class Pet {
    * Get id
    * @return id
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Long getId() {
     return id;
@@ -133,6 +134,7 @@ public class Pet {
    * Get category
    * @return category
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Category getCategory() {
     return category;
@@ -151,6 +153,7 @@ public class Pet {
    * Get name
    * @return name
   **/
+
   @ApiModelProperty(example = "doggie", required = true, value = "")
   public String getName() {
     return name;
@@ -174,6 +177,7 @@ public class Pet {
    * Get photoUrls
    * @return photoUrls
   **/
+
   @ApiModelProperty(required = true, value = "")
   public List<String> getPhotoUrls() {
     return photoUrls;
@@ -200,6 +204,7 @@ public class Pet {
    * Get tags
    * @return tags
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public List<Tag> getTags() {
     return tags;
@@ -218,6 +223,7 @@ public class Pet {
    * pet status in the store
    * @return status
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "pet status in the store")
   public StatusEnum getStatus() {
     return status;
diff --git a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/ReadOnlyFirst.java b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/ReadOnlyFirst.java
index 2872f78893..23ec5576c0 100644
--- a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/ReadOnlyFirst.java
+++ b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/ReadOnlyFirst.java
@@ -41,6 +41,7 @@ public class ReadOnlyFirst {
    * Get bar
    * @return bar
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getBar() {
     return bar;
@@ -55,6 +56,7 @@ public class ReadOnlyFirst {
    * Get baz
    * @return baz
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getBaz() {
     return baz;
diff --git a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/SpecialModelName.java b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/SpecialModelName.java
index 8fab5e0b27..f4a7d343a7 100644
--- a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/SpecialModelName.java
+++ b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/SpecialModelName.java
@@ -42,6 +42,7 @@ public class SpecialModelName {
    * Get $specialPropertyName
    * @return $specialPropertyName
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Long get$SpecialPropertyName() {
     return $specialPropertyName;
diff --git a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/Tag.java b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/Tag.java
index ab153ca672..bce1fc934d 100644
--- a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/Tag.java
+++ b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/Tag.java
@@ -46,6 +46,7 @@ public class Tag {
    * Get id
    * @return id
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Long getId() {
     return id;
@@ -64,6 +65,7 @@ public class Tag {
    * Get name
    * @return name
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getName() {
     return name;
diff --git a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/TypeHolderDefault.java b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/TypeHolderDefault.java
index 8fc321bc0a..8c7e1fa55d 100644
--- a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/TypeHolderDefault.java
+++ b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/TypeHolderDefault.java
@@ -61,6 +61,7 @@ public class TypeHolderDefault {
    * Get stringItem
    * @return stringItem
   **/
+
   @ApiModelProperty(required = true, value = "")
   public String getStringItem() {
     return stringItem;
@@ -79,6 +80,7 @@ public class TypeHolderDefault {
    * Get numberItem
    * @return numberItem
   **/
+
   @ApiModelProperty(required = true, value = "")
   public BigDecimal getNumberItem() {
     return numberItem;
@@ -97,6 +99,7 @@ public class TypeHolderDefault {
    * Get integerItem
    * @return integerItem
   **/
+
   @ApiModelProperty(required = true, value = "")
   public Integer getIntegerItem() {
     return integerItem;
@@ -115,6 +118,7 @@ public class TypeHolderDefault {
    * Get boolItem
    * @return boolItem
   **/
+
   @ApiModelProperty(required = true, value = "")
   public Boolean getBoolItem() {
     return boolItem;
@@ -138,6 +142,7 @@ public class TypeHolderDefault {
    * Get arrayItem
    * @return arrayItem
   **/
+
   @ApiModelProperty(required = true, value = "")
   public List<Integer> getArrayItem() {
     return arrayItem;
diff --git a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/TypeHolderExample.java b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/TypeHolderExample.java
index d9496cbd79..8315f422ea 100644
--- a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/TypeHolderExample.java
+++ b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/TypeHolderExample.java
@@ -61,6 +61,7 @@ public class TypeHolderExample {
    * Get stringItem
    * @return stringItem
   **/
+
   @ApiModelProperty(example = "what", required = true, value = "")
   public String getStringItem() {
     return stringItem;
@@ -79,6 +80,7 @@ public class TypeHolderExample {
    * Get numberItem
    * @return numberItem
   **/
+
   @ApiModelProperty(example = "1.234", required = true, value = "")
   public BigDecimal getNumberItem() {
     return numberItem;
@@ -97,6 +99,7 @@ public class TypeHolderExample {
    * Get integerItem
    * @return integerItem
   **/
+
   @ApiModelProperty(example = "-2", required = true, value = "")
   public Integer getIntegerItem() {
     return integerItem;
@@ -115,6 +118,7 @@ public class TypeHolderExample {
    * Get boolItem
    * @return boolItem
   **/
+
   @ApiModelProperty(example = "true", required = true, value = "")
   public Boolean getBoolItem() {
     return boolItem;
@@ -138,6 +142,7 @@ public class TypeHolderExample {
    * Get arrayItem
    * @return arrayItem
   **/
+
   @ApiModelProperty(example = "[0, 1, 2, 3]", required = true, value = "")
   public List<Integer> getArrayItem() {
     return arrayItem;
diff --git a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/User.java b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/User.java
index 74b9a66a24..3f9eb4bb8a 100644
--- a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/User.java
+++ b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/User.java
@@ -70,6 +70,7 @@ public class User {
    * Get id
    * @return id
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Long getId() {
     return id;
@@ -88,6 +89,7 @@ public class User {
    * Get username
    * @return username
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getUsername() {
     return username;
@@ -106,6 +108,7 @@ public class User {
    * Get firstName
    * @return firstName
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getFirstName() {
     return firstName;
@@ -124,6 +127,7 @@ public class User {
    * Get lastName
    * @return lastName
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getLastName() {
     return lastName;
@@ -142,6 +146,7 @@ public class User {
    * Get email
    * @return email
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getEmail() {
     return email;
@@ -160,6 +165,7 @@ public class User {
    * Get password
    * @return password
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getPassword() {
     return password;
@@ -178,6 +184,7 @@ public class User {
    * Get phone
    * @return phone
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getPhone() {
     return phone;
@@ -196,6 +203,7 @@ public class User {
    * User Status
    * @return userStatus
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "User Status")
   public Integer getUserStatus() {
     return userStatus;
diff --git a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/XmlItem.java b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/XmlItem.java
index ac66ad77de..67910352a7 100644
--- a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/XmlItem.java
+++ b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/XmlItem.java
@@ -157,6 +157,7 @@ public class XmlItem {
    * Get attributeString
    * @return attributeString
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(example = "string", value = "")
   public String getAttributeString() {
     return attributeString;
@@ -175,6 +176,7 @@ public class XmlItem {
    * Get attributeNumber
    * @return attributeNumber
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(example = "1.234", value = "")
   public BigDecimal getAttributeNumber() {
     return attributeNumber;
@@ -193,6 +195,7 @@ public class XmlItem {
    * Get attributeInteger
    * @return attributeInteger
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(example = "-2", value = "")
   public Integer getAttributeInteger() {
     return attributeInteger;
@@ -211,6 +214,7 @@ public class XmlItem {
    * Get attributeBoolean
    * @return attributeBoolean
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(example = "true", value = "")
   public Boolean getAttributeBoolean() {
     return attributeBoolean;
@@ -237,6 +241,7 @@ public class XmlItem {
    * Get wrappedArray
    * @return wrappedArray
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public List<Integer> getWrappedArray() {
     return wrappedArray;
@@ -255,6 +260,7 @@ public class XmlItem {
    * Get nameString
    * @return nameString
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(example = "string", value = "")
   public String getNameString() {
     return nameString;
@@ -273,6 +279,7 @@ public class XmlItem {
    * Get nameNumber
    * @return nameNumber
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(example = "1.234", value = "")
   public BigDecimal getNameNumber() {
     return nameNumber;
@@ -291,6 +298,7 @@ public class XmlItem {
    * Get nameInteger
    * @return nameInteger
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(example = "-2", value = "")
   public Integer getNameInteger() {
     return nameInteger;
@@ -309,6 +317,7 @@ public class XmlItem {
    * Get nameBoolean
    * @return nameBoolean
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(example = "true", value = "")
   public Boolean getNameBoolean() {
     return nameBoolean;
@@ -335,6 +344,7 @@ public class XmlItem {
    * Get nameArray
    * @return nameArray
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public List<Integer> getNameArray() {
     return nameArray;
@@ -361,6 +371,7 @@ public class XmlItem {
    * Get nameWrappedArray
    * @return nameWrappedArray
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public List<Integer> getNameWrappedArray() {
     return nameWrappedArray;
@@ -379,6 +390,7 @@ public class XmlItem {
    * Get prefixString
    * @return prefixString
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(example = "string", value = "")
   public String getPrefixString() {
     return prefixString;
@@ -397,6 +409,7 @@ public class XmlItem {
    * Get prefixNumber
    * @return prefixNumber
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(example = "1.234", value = "")
   public BigDecimal getPrefixNumber() {
     return prefixNumber;
@@ -415,6 +428,7 @@ public class XmlItem {
    * Get prefixInteger
    * @return prefixInteger
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(example = "-2", value = "")
   public Integer getPrefixInteger() {
     return prefixInteger;
@@ -433,6 +447,7 @@ public class XmlItem {
    * Get prefixBoolean
    * @return prefixBoolean
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(example = "true", value = "")
   public Boolean getPrefixBoolean() {
     return prefixBoolean;
@@ -459,6 +474,7 @@ public class XmlItem {
    * Get prefixArray
    * @return prefixArray
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public List<Integer> getPrefixArray() {
     return prefixArray;
@@ -485,6 +501,7 @@ public class XmlItem {
    * Get prefixWrappedArray
    * @return prefixWrappedArray
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public List<Integer> getPrefixWrappedArray() {
     return prefixWrappedArray;
@@ -503,6 +520,7 @@ public class XmlItem {
    * Get namespaceString
    * @return namespaceString
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(example = "string", value = "")
   public String getNamespaceString() {
     return namespaceString;
@@ -521,6 +539,7 @@ public class XmlItem {
    * Get namespaceNumber
    * @return namespaceNumber
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(example = "1.234", value = "")
   public BigDecimal getNamespaceNumber() {
     return namespaceNumber;
@@ -539,6 +558,7 @@ public class XmlItem {
    * Get namespaceInteger
    * @return namespaceInteger
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(example = "-2", value = "")
   public Integer getNamespaceInteger() {
     return namespaceInteger;
@@ -557,6 +577,7 @@ public class XmlItem {
    * Get namespaceBoolean
    * @return namespaceBoolean
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(example = "true", value = "")
   public Boolean getNamespaceBoolean() {
     return namespaceBoolean;
@@ -583,6 +604,7 @@ public class XmlItem {
    * Get namespaceArray
    * @return namespaceArray
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public List<Integer> getNamespaceArray() {
     return namespaceArray;
@@ -609,6 +631,7 @@ public class XmlItem {
    * Get namespaceWrappedArray
    * @return namespaceWrappedArray
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public List<Integer> getNamespaceWrappedArray() {
     return namespaceWrappedArray;
@@ -627,6 +650,7 @@ public class XmlItem {
    * Get prefixNsString
    * @return prefixNsString
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(example = "string", value = "")
   public String getPrefixNsString() {
     return prefixNsString;
@@ -645,6 +669,7 @@ public class XmlItem {
    * Get prefixNsNumber
    * @return prefixNsNumber
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(example = "1.234", value = "")
   public BigDecimal getPrefixNsNumber() {
     return prefixNsNumber;
@@ -663,6 +688,7 @@ public class XmlItem {
    * Get prefixNsInteger
    * @return prefixNsInteger
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(example = "-2", value = "")
   public Integer getPrefixNsInteger() {
     return prefixNsInteger;
@@ -681,6 +707,7 @@ public class XmlItem {
    * Get prefixNsBoolean
    * @return prefixNsBoolean
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(example = "true", value = "")
   public Boolean getPrefixNsBoolean() {
     return prefixNsBoolean;
@@ -707,6 +734,7 @@ public class XmlItem {
    * Get prefixNsArray
    * @return prefixNsArray
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public List<Integer> getPrefixNsArray() {
     return prefixNsArray;
@@ -733,6 +761,7 @@ public class XmlItem {
    * Get prefixNsWrappedArray
    * @return prefixNsWrappedArray
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public List<Integer> getPrefixNsWrappedArray() {
     return prefixNsWrappedArray;
diff --git a/samples/client/petstore/java/vertx/build.gradle b/samples/client/petstore/java/vertx/build.gradle
index 2145131264..78e71edb30 100644
--- a/samples/client/petstore/java/vertx/build.gradle
+++ b/samples/client/petstore/java/vertx/build.gradle
@@ -36,6 +36,7 @@ ext {
 
 dependencies {
     compile "io.swagger:swagger-annotations:$swagger_annotations_version"
+    compile "com.google.code.findbugs:jsr305:3.0.2"
     compile "io.vertx:vertx-web-client:$vertx_version"
     compile "io.vertx:vertx-rx-java:$vertx_version"
     compile "com.fasterxml.jackson.core:jackson-core:$jackson_version"
diff --git a/samples/client/petstore/java/vertx/pom.xml b/samples/client/petstore/java/vertx/pom.xml
index 1b536fe832..aa79e5fe40 100644
--- a/samples/client/petstore/java/vertx/pom.xml
+++ b/samples/client/petstore/java/vertx/pom.xml
@@ -201,6 +201,13 @@
             <version>${swagger-annotations-version}</version>
         </dependency>
 
+        <!-- @Nullable annotation -->
+        <dependency>
+            <groupId>com.google.code.findbugs</groupId>
+            <artifactId>jsr305</artifactId>
+            <version>3.0.2</version>
+        </dependency>
+        
         <!-- Vertx -->
         <dependency>
             <groupId>io.vertx</groupId>
diff --git a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/AdditionalPropertiesAnyType.java b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/AdditionalPropertiesAnyType.java
index d223a661f8..1abb2d8a64 100644
--- a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/AdditionalPropertiesAnyType.java
+++ b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/AdditionalPropertiesAnyType.java
@@ -40,6 +40,7 @@ public class AdditionalPropertiesAnyType extends HashMap<String, Object> {
    * Get name
    * @return name
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getName() {
     return name;
diff --git a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/AdditionalPropertiesArray.java b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/AdditionalPropertiesArray.java
index db738129d0..1821c243e1 100644
--- a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/AdditionalPropertiesArray.java
+++ b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/AdditionalPropertiesArray.java
@@ -41,6 +41,7 @@ public class AdditionalPropertiesArray extends HashMap<String, List> {
    * Get name
    * @return name
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getName() {
     return name;
diff --git a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/AdditionalPropertiesBoolean.java b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/AdditionalPropertiesBoolean.java
index 754ff32555..78f7ac79b2 100644
--- a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/AdditionalPropertiesBoolean.java
+++ b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/AdditionalPropertiesBoolean.java
@@ -40,6 +40,7 @@ public class AdditionalPropertiesBoolean extends HashMap<String, Boolean> {
    * Get name
    * @return name
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getName() {
     return name;
diff --git a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java
index abba0b86e7..fc52759bc8 100644
--- a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java
+++ b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java
@@ -80,6 +80,7 @@ public class AdditionalPropertiesClass {
    * Get mapString
    * @return mapString
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Map<String, String> getMapString() {
     return mapString;
@@ -106,6 +107,7 @@ public class AdditionalPropertiesClass {
    * Get mapNumber
    * @return mapNumber
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Map<String, BigDecimal> getMapNumber() {
     return mapNumber;
@@ -132,6 +134,7 @@ public class AdditionalPropertiesClass {
    * Get mapInteger
    * @return mapInteger
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Map<String, Integer> getMapInteger() {
     return mapInteger;
@@ -158,6 +161,7 @@ public class AdditionalPropertiesClass {
    * Get mapBoolean
    * @return mapBoolean
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Map<String, Boolean> getMapBoolean() {
     return mapBoolean;
@@ -184,6 +188,7 @@ public class AdditionalPropertiesClass {
    * Get mapArrayInteger
    * @return mapArrayInteger
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Map<String, List<Integer>> getMapArrayInteger() {
     return mapArrayInteger;
@@ -210,6 +215,7 @@ public class AdditionalPropertiesClass {
    * Get mapArrayAnytype
    * @return mapArrayAnytype
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Map<String, List<Object>> getMapArrayAnytype() {
     return mapArrayAnytype;
@@ -236,6 +242,7 @@ public class AdditionalPropertiesClass {
    * Get mapMapString
    * @return mapMapString
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Map<String, Map<String, String>> getMapMapString() {
     return mapMapString;
@@ -262,6 +269,7 @@ public class AdditionalPropertiesClass {
    * Get mapMapAnytype
    * @return mapMapAnytype
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Map<String, Map<String, Object>> getMapMapAnytype() {
     return mapMapAnytype;
@@ -280,6 +288,7 @@ public class AdditionalPropertiesClass {
    * Get anytype1
    * @return anytype1
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Object getAnytype1() {
     return anytype1;
@@ -298,6 +307,7 @@ public class AdditionalPropertiesClass {
    * Get anytype2
    * @return anytype2
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Object getAnytype2() {
     return anytype2;
@@ -316,6 +326,7 @@ public class AdditionalPropertiesClass {
    * Get anytype3
    * @return anytype3
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Object getAnytype3() {
     return anytype3;
diff --git a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/AdditionalPropertiesInteger.java b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/AdditionalPropertiesInteger.java
index 1f61976466..6e5159d404 100644
--- a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/AdditionalPropertiesInteger.java
+++ b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/AdditionalPropertiesInteger.java
@@ -40,6 +40,7 @@ public class AdditionalPropertiesInteger extends HashMap<String, Integer> {
    * Get name
    * @return name
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getName() {
     return name;
diff --git a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/AdditionalPropertiesNumber.java b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/AdditionalPropertiesNumber.java
index 474d7b8f04..ddc8146dea 100644
--- a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/AdditionalPropertiesNumber.java
+++ b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/AdditionalPropertiesNumber.java
@@ -41,6 +41,7 @@ public class AdditionalPropertiesNumber extends HashMap<String, BigDecimal> {
    * Get name
    * @return name
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getName() {
     return name;
diff --git a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/AdditionalPropertiesObject.java b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/AdditionalPropertiesObject.java
index 40ff424fe4..cc29400029 100644
--- a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/AdditionalPropertiesObject.java
+++ b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/AdditionalPropertiesObject.java
@@ -40,6 +40,7 @@ public class AdditionalPropertiesObject extends HashMap<String, Map> {
    * Get name
    * @return name
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getName() {
     return name;
diff --git a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/AdditionalPropertiesString.java b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/AdditionalPropertiesString.java
index eeaedf3bda..fb3368dfed 100644
--- a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/AdditionalPropertiesString.java
+++ b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/AdditionalPropertiesString.java
@@ -40,6 +40,7 @@ public class AdditionalPropertiesString extends HashMap<String, String> {
    * Get name
    * @return name
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getName() {
     return name;
diff --git a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/Animal.java b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/Animal.java
index f210737e12..53a0eec339 100644
--- a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/Animal.java
+++ b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/Animal.java
@@ -49,6 +49,7 @@ public class Animal {
    * Get className
    * @return className
   **/
+
   @ApiModelProperty(required = true, value = "")
   public String getClassName() {
     return className;
@@ -67,6 +68,7 @@ public class Animal {
    * Get color
    * @return color
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getColor() {
     return color;
diff --git a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java
index 4f767a55cb..49b5c55250 100644
--- a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java
+++ b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java
@@ -49,6 +49,7 @@ public class ArrayOfArrayOfNumberOnly {
    * Get arrayArrayNumber
    * @return arrayArrayNumber
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public List<List<BigDecimal>> getArrayArrayNumber() {
     return arrayArrayNumber;
diff --git a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java
index 727da04e54..ef2555974d 100644
--- a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java
+++ b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java
@@ -49,6 +49,7 @@ public class ArrayOfNumberOnly {
    * Get arrayNumber
    * @return arrayNumber
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public List<BigDecimal> getArrayNumber() {
     return arrayNumber;
diff --git a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/ArrayTest.java b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/ArrayTest.java
index 1c4f1195f7..b6b98aa275 100644
--- a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/ArrayTest.java
+++ b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/ArrayTest.java
@@ -55,6 +55,7 @@ public class ArrayTest {
    * Get arrayOfString
    * @return arrayOfString
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public List<String> getArrayOfString() {
     return arrayOfString;
@@ -81,6 +82,7 @@ public class ArrayTest {
    * Get arrayArrayOfInteger
    * @return arrayArrayOfInteger
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public List<List<Long>> getArrayArrayOfInteger() {
     return arrayArrayOfInteger;
@@ -107,6 +109,7 @@ public class ArrayTest {
    * Get arrayArrayOfModel
    * @return arrayArrayOfModel
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public List<List<ReadOnlyFirst>> getArrayArrayOfModel() {
     return arrayArrayOfModel;
diff --git a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/Capitalization.java b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/Capitalization.java
index cedbd8c9db..bb83be97fe 100644
--- a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/Capitalization.java
+++ b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/Capitalization.java
@@ -53,6 +53,7 @@ public class Capitalization {
    * Get smallCamel
    * @return smallCamel
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getSmallCamel() {
     return smallCamel;
@@ -71,6 +72,7 @@ public class Capitalization {
    * Get capitalCamel
    * @return capitalCamel
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getCapitalCamel() {
     return capitalCamel;
@@ -89,6 +91,7 @@ public class Capitalization {
    * Get smallSnake
    * @return smallSnake
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getSmallSnake() {
     return smallSnake;
@@ -107,6 +110,7 @@ public class Capitalization {
    * Get capitalSnake
    * @return capitalSnake
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getCapitalSnake() {
     return capitalSnake;
@@ -125,6 +129,7 @@ public class Capitalization {
    * Get scAETHFlowPoints
    * @return scAETHFlowPoints
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getScAETHFlowPoints() {
     return scAETHFlowPoints;
@@ -143,6 +148,7 @@ public class Capitalization {
    * Name of the pet 
    * @return ATT_NAME
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "Name of the pet ")
   public String getATTNAME() {
     return ATT_NAME;
diff --git a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/Cat.java b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/Cat.java
index 40f40f869e..ce456c8647 100644
--- a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/Cat.java
+++ b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/Cat.java
@@ -40,6 +40,7 @@ public class Cat extends Animal {
    * Get declawed
    * @return declawed
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Boolean getDeclawed() {
     return declawed;
diff --git a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/CatAllOf.java b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/CatAllOf.java
index 0e8a7f8fa9..224c08671c 100644
--- a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/CatAllOf.java
+++ b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/CatAllOf.java
@@ -38,6 +38,7 @@ public class CatAllOf {
    * Get declawed
    * @return declawed
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Boolean getDeclawed() {
     return declawed;
diff --git a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/Category.java b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/Category.java
index baf44c948a..03efdd4be8 100644
--- a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/Category.java
+++ b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/Category.java
@@ -41,6 +41,7 @@ public class Category {
    * Get id
    * @return id
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Long getId() {
     return id;
@@ -59,6 +60,7 @@ public class Category {
    * Get name
    * @return name
   **/
+
   @ApiModelProperty(required = true, value = "")
   public String getName() {
     return name;
diff --git a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/ClassModel.java b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/ClassModel.java
index 0904f531de..def421a670 100644
--- a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/ClassModel.java
+++ b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/ClassModel.java
@@ -39,6 +39,7 @@ public class ClassModel {
    * Get propertyClass
    * @return propertyClass
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getPropertyClass() {
     return propertyClass;
diff --git a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/Client.java b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/Client.java
index 9ebcc7294e..c0bd0743e5 100644
--- a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/Client.java
+++ b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/Client.java
@@ -38,6 +38,7 @@ public class Client {
    * Get client
    * @return client
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getClient() {
     return client;
diff --git a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/Dog.java b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/Dog.java
index 3b1c570cb4..6b79c59606 100644
--- a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/Dog.java
+++ b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/Dog.java
@@ -40,6 +40,7 @@ public class Dog extends Animal {
    * Get breed
    * @return breed
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getBreed() {
     return breed;
diff --git a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/DogAllOf.java b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/DogAllOf.java
index cb95a6a372..1a4496d8f0 100644
--- a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/DogAllOf.java
+++ b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/DogAllOf.java
@@ -38,6 +38,7 @@ public class DogAllOf {
    * Get breed
    * @return breed
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getBreed() {
     return breed;
diff --git a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/EnumArrays.java b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/EnumArrays.java
index 38f41757f0..fff7f65c72 100644
--- a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/EnumArrays.java
+++ b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/EnumArrays.java
@@ -113,6 +113,7 @@ public class EnumArrays {
    * Get justSymbol
    * @return justSymbol
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public JustSymbolEnum getJustSymbol() {
     return justSymbol;
@@ -139,6 +140,7 @@ public class EnumArrays {
    * Get arrayEnum
    * @return arrayEnum
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public List<ArrayEnumEnum> getArrayEnum() {
     return arrayEnum;
diff --git a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/EnumTest.java b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/EnumTest.java
index bdf61d52c9..d4b36798ee 100644
--- a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/EnumTest.java
+++ b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/EnumTest.java
@@ -195,6 +195,7 @@ public class EnumTest {
    * Get enumString
    * @return enumString
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public EnumStringEnum getEnumString() {
     return enumString;
@@ -213,6 +214,7 @@ public class EnumTest {
    * Get enumStringRequired
    * @return enumStringRequired
   **/
+
   @ApiModelProperty(required = true, value = "")
   public EnumStringRequiredEnum getEnumStringRequired() {
     return enumStringRequired;
@@ -231,6 +233,7 @@ public class EnumTest {
    * Get enumInteger
    * @return enumInteger
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public EnumIntegerEnum getEnumInteger() {
     return enumInteger;
@@ -249,6 +252,7 @@ public class EnumTest {
    * Get enumNumber
    * @return enumNumber
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public EnumNumberEnum getEnumNumber() {
     return enumNumber;
@@ -267,6 +271,7 @@ public class EnumTest {
    * Get outerEnum
    * @return outerEnum
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public OuterEnum getOuterEnum() {
     return outerEnum;
diff --git a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java
index c8e26deafa..ebbb0fb9f3 100644
--- a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java
+++ b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java
@@ -43,6 +43,7 @@ public class FileSchemaTestClass {
    * Get file
    * @return file
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public java.io.File getFile() {
     return file;
@@ -69,6 +70,7 @@ public class FileSchemaTestClass {
    * Get files
    * @return files
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public List<java.io.File> getFiles() {
     return files;
diff --git a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/FormatTest.java b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/FormatTest.java
index f03ced8961..4c976d9981 100644
--- a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/FormatTest.java
+++ b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/FormatTest.java
@@ -81,6 +81,7 @@ public class FormatTest {
    * maximum: 100
    * @return integer
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Integer getInteger() {
     return integer;
@@ -101,6 +102,7 @@ public class FormatTest {
    * maximum: 200
    * @return int32
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Integer getInt32() {
     return int32;
@@ -119,6 +121,7 @@ public class FormatTest {
    * Get int64
    * @return int64
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Long getInt64() {
     return int64;
@@ -139,6 +142,7 @@ public class FormatTest {
    * maximum: 543.2
    * @return number
   **/
+
   @ApiModelProperty(required = true, value = "")
   public BigDecimal getNumber() {
     return number;
@@ -159,6 +163,7 @@ public class FormatTest {
    * maximum: 987.6
    * @return _float
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Float getFloat() {
     return _float;
@@ -179,6 +184,7 @@ public class FormatTest {
    * maximum: 123.4
    * @return _double
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Double getDouble() {
     return _double;
@@ -197,6 +203,7 @@ public class FormatTest {
    * Get string
    * @return string
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getString() {
     return string;
@@ -215,6 +222,7 @@ public class FormatTest {
    * Get _byte
    * @return _byte
   **/
+
   @ApiModelProperty(required = true, value = "")
   public byte[] getByte() {
     return _byte;
@@ -233,6 +241,7 @@ public class FormatTest {
    * Get binary
    * @return binary
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public AsyncFile getBinary() {
     return binary;
@@ -251,6 +260,7 @@ public class FormatTest {
    * Get date
    * @return date
   **/
+
   @ApiModelProperty(required = true, value = "")
   public LocalDate getDate() {
     return date;
@@ -269,6 +279,7 @@ public class FormatTest {
    * Get dateTime
    * @return dateTime
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public OffsetDateTime getDateTime() {
     return dateTime;
@@ -287,6 +298,7 @@ public class FormatTest {
    * Get uuid
    * @return uuid
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(example = "72f98069-206d-4f12-9f12-3d1e525a8e84", value = "")
   public UUID getUuid() {
     return uuid;
@@ -305,6 +317,7 @@ public class FormatTest {
    * Get password
    * @return password
   **/
+
   @ApiModelProperty(required = true, value = "")
   public String getPassword() {
     return password;
diff --git a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java
index 4dbede6b7d..44159e08e8 100644
--- a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java
+++ b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java
@@ -36,6 +36,7 @@ public class HasOnlyReadOnly {
    * Get bar
    * @return bar
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getBar() {
     return bar;
@@ -45,6 +46,7 @@ public class HasOnlyReadOnly {
    * Get foo
    * @return foo
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getFoo() {
     return foo;
diff --git a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/MapTest.java b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/MapTest.java
index e4c090189f..2caabbea07 100644
--- a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/MapTest.java
+++ b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/MapTest.java
@@ -93,6 +93,7 @@ public class MapTest {
    * Get mapMapOfString
    * @return mapMapOfString
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Map<String, Map<String, String>> getMapMapOfString() {
     return mapMapOfString;
@@ -119,6 +120,7 @@ public class MapTest {
    * Get mapOfEnumString
    * @return mapOfEnumString
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Map<String, InnerEnum> getMapOfEnumString() {
     return mapOfEnumString;
@@ -145,6 +147,7 @@ public class MapTest {
    * Get directMap
    * @return directMap
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Map<String, Boolean> getDirectMap() {
     return directMap;
@@ -171,6 +174,7 @@ public class MapTest {
    * Get indirectMap
    * @return indirectMap
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Map<String, Boolean> getIndirectMap() {
     return indirectMap;
diff --git a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java
index 3e4d20688e..8d97329c31 100644
--- a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java
+++ b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java
@@ -50,6 +50,7 @@ public class MixedPropertiesAndAdditionalPropertiesClass {
    * Get uuid
    * @return uuid
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public UUID getUuid() {
     return uuid;
@@ -68,6 +69,7 @@ public class MixedPropertiesAndAdditionalPropertiesClass {
    * Get dateTime
    * @return dateTime
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public OffsetDateTime getDateTime() {
     return dateTime;
@@ -94,6 +96,7 @@ public class MixedPropertiesAndAdditionalPropertiesClass {
    * Get map
    * @return map
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Map<String, Animal> getMap() {
     return map;
diff --git a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/Model200Response.java b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/Model200Response.java
index 3be60ea3ae..bd3244dd57 100644
--- a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/Model200Response.java
+++ b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/Model200Response.java
@@ -42,6 +42,7 @@ public class Model200Response {
    * Get name
    * @return name
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Integer getName() {
     return name;
@@ -60,6 +61,7 @@ public class Model200Response {
    * Get propertyClass
    * @return propertyClass
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getPropertyClass() {
     return propertyClass;
diff --git a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/ModelApiResponse.java b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/ModelApiResponse.java
index 6e458e38dc..ed335cdca1 100644
--- a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/ModelApiResponse.java
+++ b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/ModelApiResponse.java
@@ -44,6 +44,7 @@ public class ModelApiResponse {
    * Get code
    * @return code
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Integer getCode() {
     return code;
@@ -62,6 +63,7 @@ public class ModelApiResponse {
    * Get type
    * @return type
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getType() {
     return type;
@@ -80,6 +82,7 @@ public class ModelApiResponse {
    * Get message
    * @return message
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getMessage() {
     return message;
diff --git a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/ModelReturn.java b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/ModelReturn.java
index 62e5295212..04c0bcd33f 100644
--- a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/ModelReturn.java
+++ b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/ModelReturn.java
@@ -39,6 +39,7 @@ public class ModelReturn {
    * Get _return
    * @return _return
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Integer getReturn() {
     return _return;
diff --git a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/Name.java b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/Name.java
index 852a999035..af27c6e45f 100644
--- a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/Name.java
+++ b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/Name.java
@@ -48,6 +48,7 @@ public class Name {
    * Get name
    * @return name
   **/
+
   @ApiModelProperty(required = true, value = "")
   public Integer getName() {
     return name;
@@ -61,6 +62,7 @@ public class Name {
    * Get snakeCase
    * @return snakeCase
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Integer getSnakeCase() {
     return snakeCase;
@@ -75,6 +77,7 @@ public class Name {
    * Get property
    * @return property
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getProperty() {
     return property;
@@ -88,6 +91,7 @@ public class Name {
    * Get _123number
    * @return _123number
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Integer get123number() {
     return _123number;
diff --git a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/NumberOnly.java b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/NumberOnly.java
index 530a4d5818..4e29c814cc 100644
--- a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/NumberOnly.java
+++ b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/NumberOnly.java
@@ -39,6 +39,7 @@ public class NumberOnly {
    * Get justNumber
    * @return justNumber
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public BigDecimal getJustNumber() {
     return justNumber;
diff --git a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/Order.java b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/Order.java
index 67680cd7e6..1735b41d31 100644
--- a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/Order.java
+++ b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/Order.java
@@ -91,6 +91,7 @@ public class Order {
    * Get id
    * @return id
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Long getId() {
     return id;
@@ -109,6 +110,7 @@ public class Order {
    * Get petId
    * @return petId
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Long getPetId() {
     return petId;
@@ -127,6 +129,7 @@ public class Order {
    * Get quantity
    * @return quantity
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Integer getQuantity() {
     return quantity;
@@ -145,6 +148,7 @@ public class Order {
    * Get shipDate
    * @return shipDate
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public OffsetDateTime getShipDate() {
     return shipDate;
@@ -163,6 +167,7 @@ public class Order {
    * Order Status
    * @return status
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "Order Status")
   public StatusEnum getStatus() {
     return status;
@@ -181,6 +186,7 @@ public class Order {
    * Get complete
    * @return complete
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Boolean getComplete() {
     return complete;
diff --git a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/OuterComposite.java b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/OuterComposite.java
index 6e71242384..f6515126a8 100644
--- a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/OuterComposite.java
+++ b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/OuterComposite.java
@@ -45,6 +45,7 @@ public class OuterComposite {
    * Get myNumber
    * @return myNumber
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public BigDecimal getMyNumber() {
     return myNumber;
@@ -63,6 +64,7 @@ public class OuterComposite {
    * Get myString
    * @return myString
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getMyString() {
     return myString;
@@ -81,6 +83,7 @@ public class OuterComposite {
    * Get myBoolean
    * @return myBoolean
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Boolean getMyBoolean() {
     return myBoolean;
diff --git a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/Pet.java b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/Pet.java
index a2305bf1d9..ace85c42aa 100644
--- a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/Pet.java
+++ b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/Pet.java
@@ -94,6 +94,7 @@ public class Pet {
    * Get id
    * @return id
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Long getId() {
     return id;
@@ -112,6 +113,7 @@ public class Pet {
    * Get category
    * @return category
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Category getCategory() {
     return category;
@@ -130,6 +132,7 @@ public class Pet {
    * Get name
    * @return name
   **/
+
   @ApiModelProperty(example = "doggie", required = true, value = "")
   public String getName() {
     return name;
@@ -153,6 +156,7 @@ public class Pet {
    * Get photoUrls
    * @return photoUrls
   **/
+
   @ApiModelProperty(required = true, value = "")
   public List<String> getPhotoUrls() {
     return photoUrls;
@@ -179,6 +183,7 @@ public class Pet {
    * Get tags
    * @return tags
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public List<Tag> getTags() {
     return tags;
@@ -197,6 +202,7 @@ public class Pet {
    * pet status in the store
    * @return status
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "pet status in the store")
   public StatusEnum getStatus() {
     return status;
diff --git a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/ReadOnlyFirst.java b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/ReadOnlyFirst.java
index 83f25c7923..a2c9e99699 100644
--- a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/ReadOnlyFirst.java
+++ b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/ReadOnlyFirst.java
@@ -36,6 +36,7 @@ public class ReadOnlyFirst {
    * Get bar
    * @return bar
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getBar() {
     return bar;
@@ -50,6 +51,7 @@ public class ReadOnlyFirst {
    * Get baz
    * @return baz
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getBaz() {
     return baz;
diff --git a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/SpecialModelName.java b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/SpecialModelName.java
index 5abfc132ad..a5ddb0b638 100644
--- a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/SpecialModelName.java
+++ b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/SpecialModelName.java
@@ -38,6 +38,7 @@ public class SpecialModelName {
    * Get $specialPropertyName
    * @return $specialPropertyName
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Long get$SpecialPropertyName() {
     return $specialPropertyName;
diff --git a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/Tag.java b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/Tag.java
index e2e947b84a..8255ad8298 100644
--- a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/Tag.java
+++ b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/Tag.java
@@ -41,6 +41,7 @@ public class Tag {
    * Get id
    * @return id
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Long getId() {
     return id;
@@ -59,6 +60,7 @@ public class Tag {
    * Get name
    * @return name
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getName() {
     return name;
diff --git a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/TypeHolderDefault.java b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/TypeHolderDefault.java
index 3c6488d270..786a681fb3 100644
--- a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/TypeHolderDefault.java
+++ b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/TypeHolderDefault.java
@@ -53,6 +53,7 @@ public class TypeHolderDefault {
    * Get stringItem
    * @return stringItem
   **/
+
   @ApiModelProperty(required = true, value = "")
   public String getStringItem() {
     return stringItem;
@@ -71,6 +72,7 @@ public class TypeHolderDefault {
    * Get numberItem
    * @return numberItem
   **/
+
   @ApiModelProperty(required = true, value = "")
   public BigDecimal getNumberItem() {
     return numberItem;
@@ -89,6 +91,7 @@ public class TypeHolderDefault {
    * Get integerItem
    * @return integerItem
   **/
+
   @ApiModelProperty(required = true, value = "")
   public Integer getIntegerItem() {
     return integerItem;
@@ -107,6 +110,7 @@ public class TypeHolderDefault {
    * Get boolItem
    * @return boolItem
   **/
+
   @ApiModelProperty(required = true, value = "")
   public Boolean getBoolItem() {
     return boolItem;
@@ -130,6 +134,7 @@ public class TypeHolderDefault {
    * Get arrayItem
    * @return arrayItem
   **/
+
   @ApiModelProperty(required = true, value = "")
   public List<Integer> getArrayItem() {
     return arrayItem;
diff --git a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/TypeHolderExample.java b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/TypeHolderExample.java
index 812b5839aa..701e4db843 100644
--- a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/TypeHolderExample.java
+++ b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/TypeHolderExample.java
@@ -53,6 +53,7 @@ public class TypeHolderExample {
    * Get stringItem
    * @return stringItem
   **/
+
   @ApiModelProperty(example = "what", required = true, value = "")
   public String getStringItem() {
     return stringItem;
@@ -71,6 +72,7 @@ public class TypeHolderExample {
    * Get numberItem
    * @return numberItem
   **/
+
   @ApiModelProperty(example = "1.234", required = true, value = "")
   public BigDecimal getNumberItem() {
     return numberItem;
@@ -89,6 +91,7 @@ public class TypeHolderExample {
    * Get integerItem
    * @return integerItem
   **/
+
   @ApiModelProperty(example = "-2", required = true, value = "")
   public Integer getIntegerItem() {
     return integerItem;
@@ -107,6 +110,7 @@ public class TypeHolderExample {
    * Get boolItem
    * @return boolItem
   **/
+
   @ApiModelProperty(example = "true", required = true, value = "")
   public Boolean getBoolItem() {
     return boolItem;
@@ -130,6 +134,7 @@ public class TypeHolderExample {
    * Get arrayItem
    * @return arrayItem
   **/
+
   @ApiModelProperty(example = "[0, 1, 2, 3]", required = true, value = "")
   public List<Integer> getArrayItem() {
     return arrayItem;
diff --git a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/User.java b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/User.java
index ee3f656a1a..6e6c4ac102 100644
--- a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/User.java
+++ b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/User.java
@@ -59,6 +59,7 @@ public class User {
    * Get id
    * @return id
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Long getId() {
     return id;
@@ -77,6 +78,7 @@ public class User {
    * Get username
    * @return username
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getUsername() {
     return username;
@@ -95,6 +97,7 @@ public class User {
    * Get firstName
    * @return firstName
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getFirstName() {
     return firstName;
@@ -113,6 +116,7 @@ public class User {
    * Get lastName
    * @return lastName
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getLastName() {
     return lastName;
@@ -131,6 +135,7 @@ public class User {
    * Get email
    * @return email
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getEmail() {
     return email;
@@ -149,6 +154,7 @@ public class User {
    * Get password
    * @return password
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getPassword() {
     return password;
@@ -167,6 +173,7 @@ public class User {
    * Get phone
    * @return phone
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getPhone() {
     return phone;
@@ -185,6 +192,7 @@ public class User {
    * User Status
    * @return userStatus
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "User Status")
   public Integer getUserStatus() {
     return userStatus;
diff --git a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/XmlItem.java b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/XmlItem.java
index 7cb8000561..2af459e5ae 100644
--- a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/XmlItem.java
+++ b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/XmlItem.java
@@ -125,6 +125,7 @@ public class XmlItem {
    * Get attributeString
    * @return attributeString
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(example = "string", value = "")
   public String getAttributeString() {
     return attributeString;
@@ -143,6 +144,7 @@ public class XmlItem {
    * Get attributeNumber
    * @return attributeNumber
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(example = "1.234", value = "")
   public BigDecimal getAttributeNumber() {
     return attributeNumber;
@@ -161,6 +163,7 @@ public class XmlItem {
    * Get attributeInteger
    * @return attributeInteger
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(example = "-2", value = "")
   public Integer getAttributeInteger() {
     return attributeInteger;
@@ -179,6 +182,7 @@ public class XmlItem {
    * Get attributeBoolean
    * @return attributeBoolean
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(example = "true", value = "")
   public Boolean getAttributeBoolean() {
     return attributeBoolean;
@@ -205,6 +209,7 @@ public class XmlItem {
    * Get wrappedArray
    * @return wrappedArray
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public List<Integer> getWrappedArray() {
     return wrappedArray;
@@ -223,6 +228,7 @@ public class XmlItem {
    * Get nameString
    * @return nameString
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(example = "string", value = "")
   public String getNameString() {
     return nameString;
@@ -241,6 +247,7 @@ public class XmlItem {
    * Get nameNumber
    * @return nameNumber
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(example = "1.234", value = "")
   public BigDecimal getNameNumber() {
     return nameNumber;
@@ -259,6 +266,7 @@ public class XmlItem {
    * Get nameInteger
    * @return nameInteger
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(example = "-2", value = "")
   public Integer getNameInteger() {
     return nameInteger;
@@ -277,6 +285,7 @@ public class XmlItem {
    * Get nameBoolean
    * @return nameBoolean
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(example = "true", value = "")
   public Boolean getNameBoolean() {
     return nameBoolean;
@@ -303,6 +312,7 @@ public class XmlItem {
    * Get nameArray
    * @return nameArray
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public List<Integer> getNameArray() {
     return nameArray;
@@ -329,6 +339,7 @@ public class XmlItem {
    * Get nameWrappedArray
    * @return nameWrappedArray
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public List<Integer> getNameWrappedArray() {
     return nameWrappedArray;
@@ -347,6 +358,7 @@ public class XmlItem {
    * Get prefixString
    * @return prefixString
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(example = "string", value = "")
   public String getPrefixString() {
     return prefixString;
@@ -365,6 +377,7 @@ public class XmlItem {
    * Get prefixNumber
    * @return prefixNumber
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(example = "1.234", value = "")
   public BigDecimal getPrefixNumber() {
     return prefixNumber;
@@ -383,6 +396,7 @@ public class XmlItem {
    * Get prefixInteger
    * @return prefixInteger
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(example = "-2", value = "")
   public Integer getPrefixInteger() {
     return prefixInteger;
@@ -401,6 +415,7 @@ public class XmlItem {
    * Get prefixBoolean
    * @return prefixBoolean
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(example = "true", value = "")
   public Boolean getPrefixBoolean() {
     return prefixBoolean;
@@ -427,6 +442,7 @@ public class XmlItem {
    * Get prefixArray
    * @return prefixArray
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public List<Integer> getPrefixArray() {
     return prefixArray;
@@ -453,6 +469,7 @@ public class XmlItem {
    * Get prefixWrappedArray
    * @return prefixWrappedArray
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public List<Integer> getPrefixWrappedArray() {
     return prefixWrappedArray;
@@ -471,6 +488,7 @@ public class XmlItem {
    * Get namespaceString
    * @return namespaceString
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(example = "string", value = "")
   public String getNamespaceString() {
     return namespaceString;
@@ -489,6 +507,7 @@ public class XmlItem {
    * Get namespaceNumber
    * @return namespaceNumber
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(example = "1.234", value = "")
   public BigDecimal getNamespaceNumber() {
     return namespaceNumber;
@@ -507,6 +526,7 @@ public class XmlItem {
    * Get namespaceInteger
    * @return namespaceInteger
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(example = "-2", value = "")
   public Integer getNamespaceInteger() {
     return namespaceInteger;
@@ -525,6 +545,7 @@ public class XmlItem {
    * Get namespaceBoolean
    * @return namespaceBoolean
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(example = "true", value = "")
   public Boolean getNamespaceBoolean() {
     return namespaceBoolean;
@@ -551,6 +572,7 @@ public class XmlItem {
    * Get namespaceArray
    * @return namespaceArray
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public List<Integer> getNamespaceArray() {
     return namespaceArray;
@@ -577,6 +599,7 @@ public class XmlItem {
    * Get namespaceWrappedArray
    * @return namespaceWrappedArray
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public List<Integer> getNamespaceWrappedArray() {
     return namespaceWrappedArray;
@@ -595,6 +618,7 @@ public class XmlItem {
    * Get prefixNsString
    * @return prefixNsString
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(example = "string", value = "")
   public String getPrefixNsString() {
     return prefixNsString;
@@ -613,6 +637,7 @@ public class XmlItem {
    * Get prefixNsNumber
    * @return prefixNsNumber
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(example = "1.234", value = "")
   public BigDecimal getPrefixNsNumber() {
     return prefixNsNumber;
@@ -631,6 +656,7 @@ public class XmlItem {
    * Get prefixNsInteger
    * @return prefixNsInteger
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(example = "-2", value = "")
   public Integer getPrefixNsInteger() {
     return prefixNsInteger;
@@ -649,6 +675,7 @@ public class XmlItem {
    * Get prefixNsBoolean
    * @return prefixNsBoolean
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(example = "true", value = "")
   public Boolean getPrefixNsBoolean() {
     return prefixNsBoolean;
@@ -675,6 +702,7 @@ public class XmlItem {
    * Get prefixNsArray
    * @return prefixNsArray
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public List<Integer> getPrefixNsArray() {
     return prefixNsArray;
@@ -701,6 +729,7 @@ public class XmlItem {
    * Get prefixNsWrappedArray
    * @return prefixNsWrappedArray
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public List<Integer> getPrefixNsWrappedArray() {
     return prefixNsWrappedArray;
diff --git a/samples/client/petstore/java/webclient/build.gradle b/samples/client/petstore/java/webclient/build.gradle
index b2be386265..70ecf2cc3a 100644
--- a/samples/client/petstore/java/webclient/build.gradle
+++ b/samples/client/petstore/java/webclient/build.gradle
@@ -121,6 +121,7 @@ ext {
 
 dependencies {
     compile "io.swagger:swagger-annotations:$swagger_annotations_version"
+    compile "com.google.code.findbugs:jsr305:3.0.2"
     compile "com.sun.jersey:jersey-client:$jersey_version"
     compile "com.sun.jersey.contribs:jersey-multipart:$jersey_version"
     compile "com.fasterxml.jackson.core:jackson-core:$jackson_version"
diff --git a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/AdditionalPropertiesAnyType.java b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/AdditionalPropertiesAnyType.java
index d223a661f8..1abb2d8a64 100644
--- a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/AdditionalPropertiesAnyType.java
+++ b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/AdditionalPropertiesAnyType.java
@@ -40,6 +40,7 @@ public class AdditionalPropertiesAnyType extends HashMap<String, Object> {
    * Get name
    * @return name
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getName() {
     return name;
diff --git a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/AdditionalPropertiesArray.java b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/AdditionalPropertiesArray.java
index db738129d0..1821c243e1 100644
--- a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/AdditionalPropertiesArray.java
+++ b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/AdditionalPropertiesArray.java
@@ -41,6 +41,7 @@ public class AdditionalPropertiesArray extends HashMap<String, List> {
    * Get name
    * @return name
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getName() {
     return name;
diff --git a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/AdditionalPropertiesBoolean.java b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/AdditionalPropertiesBoolean.java
index 754ff32555..78f7ac79b2 100644
--- a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/AdditionalPropertiesBoolean.java
+++ b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/AdditionalPropertiesBoolean.java
@@ -40,6 +40,7 @@ public class AdditionalPropertiesBoolean extends HashMap<String, Boolean> {
    * Get name
    * @return name
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getName() {
     return name;
diff --git a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java
index abba0b86e7..fc52759bc8 100644
--- a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java
+++ b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java
@@ -80,6 +80,7 @@ public class AdditionalPropertiesClass {
    * Get mapString
    * @return mapString
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Map<String, String> getMapString() {
     return mapString;
@@ -106,6 +107,7 @@ public class AdditionalPropertiesClass {
    * Get mapNumber
    * @return mapNumber
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Map<String, BigDecimal> getMapNumber() {
     return mapNumber;
@@ -132,6 +134,7 @@ public class AdditionalPropertiesClass {
    * Get mapInteger
    * @return mapInteger
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Map<String, Integer> getMapInteger() {
     return mapInteger;
@@ -158,6 +161,7 @@ public class AdditionalPropertiesClass {
    * Get mapBoolean
    * @return mapBoolean
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Map<String, Boolean> getMapBoolean() {
     return mapBoolean;
@@ -184,6 +188,7 @@ public class AdditionalPropertiesClass {
    * Get mapArrayInteger
    * @return mapArrayInteger
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Map<String, List<Integer>> getMapArrayInteger() {
     return mapArrayInteger;
@@ -210,6 +215,7 @@ public class AdditionalPropertiesClass {
    * Get mapArrayAnytype
    * @return mapArrayAnytype
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Map<String, List<Object>> getMapArrayAnytype() {
     return mapArrayAnytype;
@@ -236,6 +242,7 @@ public class AdditionalPropertiesClass {
    * Get mapMapString
    * @return mapMapString
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Map<String, Map<String, String>> getMapMapString() {
     return mapMapString;
@@ -262,6 +269,7 @@ public class AdditionalPropertiesClass {
    * Get mapMapAnytype
    * @return mapMapAnytype
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Map<String, Map<String, Object>> getMapMapAnytype() {
     return mapMapAnytype;
@@ -280,6 +288,7 @@ public class AdditionalPropertiesClass {
    * Get anytype1
    * @return anytype1
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Object getAnytype1() {
     return anytype1;
@@ -298,6 +307,7 @@ public class AdditionalPropertiesClass {
    * Get anytype2
    * @return anytype2
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Object getAnytype2() {
     return anytype2;
@@ -316,6 +326,7 @@ public class AdditionalPropertiesClass {
    * Get anytype3
    * @return anytype3
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Object getAnytype3() {
     return anytype3;
diff --git a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/AdditionalPropertiesInteger.java b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/AdditionalPropertiesInteger.java
index 1f61976466..6e5159d404 100644
--- a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/AdditionalPropertiesInteger.java
+++ b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/AdditionalPropertiesInteger.java
@@ -40,6 +40,7 @@ public class AdditionalPropertiesInteger extends HashMap<String, Integer> {
    * Get name
    * @return name
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getName() {
     return name;
diff --git a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/AdditionalPropertiesNumber.java b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/AdditionalPropertiesNumber.java
index 474d7b8f04..ddc8146dea 100644
--- a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/AdditionalPropertiesNumber.java
+++ b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/AdditionalPropertiesNumber.java
@@ -41,6 +41,7 @@ public class AdditionalPropertiesNumber extends HashMap<String, BigDecimal> {
    * Get name
    * @return name
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getName() {
     return name;
diff --git a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/AdditionalPropertiesObject.java b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/AdditionalPropertiesObject.java
index 40ff424fe4..cc29400029 100644
--- a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/AdditionalPropertiesObject.java
+++ b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/AdditionalPropertiesObject.java
@@ -40,6 +40,7 @@ public class AdditionalPropertiesObject extends HashMap<String, Map> {
    * Get name
    * @return name
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getName() {
     return name;
diff --git a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/AdditionalPropertiesString.java b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/AdditionalPropertiesString.java
index eeaedf3bda..fb3368dfed 100644
--- a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/AdditionalPropertiesString.java
+++ b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/AdditionalPropertiesString.java
@@ -40,6 +40,7 @@ public class AdditionalPropertiesString extends HashMap<String, String> {
    * Get name
    * @return name
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getName() {
     return name;
diff --git a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/Animal.java b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/Animal.java
index f210737e12..53a0eec339 100644
--- a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/Animal.java
+++ b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/Animal.java
@@ -49,6 +49,7 @@ public class Animal {
    * Get className
    * @return className
   **/
+
   @ApiModelProperty(required = true, value = "")
   public String getClassName() {
     return className;
@@ -67,6 +68,7 @@ public class Animal {
    * Get color
    * @return color
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getColor() {
     return color;
diff --git a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java
index 4f767a55cb..49b5c55250 100644
--- a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java
+++ b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java
@@ -49,6 +49,7 @@ public class ArrayOfArrayOfNumberOnly {
    * Get arrayArrayNumber
    * @return arrayArrayNumber
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public List<List<BigDecimal>> getArrayArrayNumber() {
     return arrayArrayNumber;
diff --git a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java
index 727da04e54..ef2555974d 100644
--- a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java
+++ b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java
@@ -49,6 +49,7 @@ public class ArrayOfNumberOnly {
    * Get arrayNumber
    * @return arrayNumber
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public List<BigDecimal> getArrayNumber() {
     return arrayNumber;
diff --git a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/ArrayTest.java b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/ArrayTest.java
index 1c4f1195f7..b6b98aa275 100644
--- a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/ArrayTest.java
+++ b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/ArrayTest.java
@@ -55,6 +55,7 @@ public class ArrayTest {
    * Get arrayOfString
    * @return arrayOfString
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public List<String> getArrayOfString() {
     return arrayOfString;
@@ -81,6 +82,7 @@ public class ArrayTest {
    * Get arrayArrayOfInteger
    * @return arrayArrayOfInteger
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public List<List<Long>> getArrayArrayOfInteger() {
     return arrayArrayOfInteger;
@@ -107,6 +109,7 @@ public class ArrayTest {
    * Get arrayArrayOfModel
    * @return arrayArrayOfModel
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public List<List<ReadOnlyFirst>> getArrayArrayOfModel() {
     return arrayArrayOfModel;
diff --git a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/Capitalization.java b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/Capitalization.java
index cedbd8c9db..bb83be97fe 100644
--- a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/Capitalization.java
+++ b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/Capitalization.java
@@ -53,6 +53,7 @@ public class Capitalization {
    * Get smallCamel
    * @return smallCamel
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getSmallCamel() {
     return smallCamel;
@@ -71,6 +72,7 @@ public class Capitalization {
    * Get capitalCamel
    * @return capitalCamel
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getCapitalCamel() {
     return capitalCamel;
@@ -89,6 +91,7 @@ public class Capitalization {
    * Get smallSnake
    * @return smallSnake
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getSmallSnake() {
     return smallSnake;
@@ -107,6 +110,7 @@ public class Capitalization {
    * Get capitalSnake
    * @return capitalSnake
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getCapitalSnake() {
     return capitalSnake;
@@ -125,6 +129,7 @@ public class Capitalization {
    * Get scAETHFlowPoints
    * @return scAETHFlowPoints
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getScAETHFlowPoints() {
     return scAETHFlowPoints;
@@ -143,6 +148,7 @@ public class Capitalization {
    * Name of the pet 
    * @return ATT_NAME
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "Name of the pet ")
   public String getATTNAME() {
     return ATT_NAME;
diff --git a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/Cat.java b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/Cat.java
index 40f40f869e..ce456c8647 100644
--- a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/Cat.java
+++ b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/Cat.java
@@ -40,6 +40,7 @@ public class Cat extends Animal {
    * Get declawed
    * @return declawed
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Boolean getDeclawed() {
     return declawed;
diff --git a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/CatAllOf.java b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/CatAllOf.java
index 0e8a7f8fa9..224c08671c 100644
--- a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/CatAllOf.java
+++ b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/CatAllOf.java
@@ -38,6 +38,7 @@ public class CatAllOf {
    * Get declawed
    * @return declawed
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Boolean getDeclawed() {
     return declawed;
diff --git a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/Category.java b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/Category.java
index baf44c948a..03efdd4be8 100644
--- a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/Category.java
+++ b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/Category.java
@@ -41,6 +41,7 @@ public class Category {
    * Get id
    * @return id
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Long getId() {
     return id;
@@ -59,6 +60,7 @@ public class Category {
    * Get name
    * @return name
   **/
+
   @ApiModelProperty(required = true, value = "")
   public String getName() {
     return name;
diff --git a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/ClassModel.java b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/ClassModel.java
index 0904f531de..def421a670 100644
--- a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/ClassModel.java
+++ b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/ClassModel.java
@@ -39,6 +39,7 @@ public class ClassModel {
    * Get propertyClass
    * @return propertyClass
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getPropertyClass() {
     return propertyClass;
diff --git a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/Client.java b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/Client.java
index 9ebcc7294e..c0bd0743e5 100644
--- a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/Client.java
+++ b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/Client.java
@@ -38,6 +38,7 @@ public class Client {
    * Get client
    * @return client
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getClient() {
     return client;
diff --git a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/Dog.java b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/Dog.java
index 3b1c570cb4..6b79c59606 100644
--- a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/Dog.java
+++ b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/Dog.java
@@ -40,6 +40,7 @@ public class Dog extends Animal {
    * Get breed
    * @return breed
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getBreed() {
     return breed;
diff --git a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/DogAllOf.java b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/DogAllOf.java
index cb95a6a372..1a4496d8f0 100644
--- a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/DogAllOf.java
+++ b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/DogAllOf.java
@@ -38,6 +38,7 @@ public class DogAllOf {
    * Get breed
    * @return breed
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getBreed() {
     return breed;
diff --git a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/EnumArrays.java b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/EnumArrays.java
index 38f41757f0..fff7f65c72 100644
--- a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/EnumArrays.java
+++ b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/EnumArrays.java
@@ -113,6 +113,7 @@ public class EnumArrays {
    * Get justSymbol
    * @return justSymbol
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public JustSymbolEnum getJustSymbol() {
     return justSymbol;
@@ -139,6 +140,7 @@ public class EnumArrays {
    * Get arrayEnum
    * @return arrayEnum
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public List<ArrayEnumEnum> getArrayEnum() {
     return arrayEnum;
diff --git a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/EnumTest.java b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/EnumTest.java
index bdf61d52c9..d4b36798ee 100644
--- a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/EnumTest.java
+++ b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/EnumTest.java
@@ -195,6 +195,7 @@ public class EnumTest {
    * Get enumString
    * @return enumString
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public EnumStringEnum getEnumString() {
     return enumString;
@@ -213,6 +214,7 @@ public class EnumTest {
    * Get enumStringRequired
    * @return enumStringRequired
   **/
+
   @ApiModelProperty(required = true, value = "")
   public EnumStringRequiredEnum getEnumStringRequired() {
     return enumStringRequired;
@@ -231,6 +233,7 @@ public class EnumTest {
    * Get enumInteger
    * @return enumInteger
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public EnumIntegerEnum getEnumInteger() {
     return enumInteger;
@@ -249,6 +252,7 @@ public class EnumTest {
    * Get enumNumber
    * @return enumNumber
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public EnumNumberEnum getEnumNumber() {
     return enumNumber;
@@ -267,6 +271,7 @@ public class EnumTest {
    * Get outerEnum
    * @return outerEnum
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public OuterEnum getOuterEnum() {
     return outerEnum;
diff --git a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java
index c8e26deafa..ebbb0fb9f3 100644
--- a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java
+++ b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java
@@ -43,6 +43,7 @@ public class FileSchemaTestClass {
    * Get file
    * @return file
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public java.io.File getFile() {
     return file;
@@ -69,6 +70,7 @@ public class FileSchemaTestClass {
    * Get files
    * @return files
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public List<java.io.File> getFiles() {
     return files;
diff --git a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/FormatTest.java b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/FormatTest.java
index a7ff05e63e..518432caff 100644
--- a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/FormatTest.java
+++ b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/FormatTest.java
@@ -81,6 +81,7 @@ public class FormatTest {
    * maximum: 100
    * @return integer
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Integer getInteger() {
     return integer;
@@ -101,6 +102,7 @@ public class FormatTest {
    * maximum: 200
    * @return int32
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Integer getInt32() {
     return int32;
@@ -119,6 +121,7 @@ public class FormatTest {
    * Get int64
    * @return int64
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Long getInt64() {
     return int64;
@@ -139,6 +142,7 @@ public class FormatTest {
    * maximum: 543.2
    * @return number
   **/
+
   @ApiModelProperty(required = true, value = "")
   public BigDecimal getNumber() {
     return number;
@@ -159,6 +163,7 @@ public class FormatTest {
    * maximum: 987.6
    * @return _float
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Float getFloat() {
     return _float;
@@ -179,6 +184,7 @@ public class FormatTest {
    * maximum: 123.4
    * @return _double
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Double getDouble() {
     return _double;
@@ -197,6 +203,7 @@ public class FormatTest {
    * Get string
    * @return string
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getString() {
     return string;
@@ -215,6 +222,7 @@ public class FormatTest {
    * Get _byte
    * @return _byte
   **/
+
   @ApiModelProperty(required = true, value = "")
   public byte[] getByte() {
     return _byte;
@@ -233,6 +241,7 @@ public class FormatTest {
    * Get binary
    * @return binary
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public File getBinary() {
     return binary;
@@ -251,6 +260,7 @@ public class FormatTest {
    * Get date
    * @return date
   **/
+
   @ApiModelProperty(required = true, value = "")
   public LocalDate getDate() {
     return date;
@@ -269,6 +279,7 @@ public class FormatTest {
    * Get dateTime
    * @return dateTime
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public OffsetDateTime getDateTime() {
     return dateTime;
@@ -287,6 +298,7 @@ public class FormatTest {
    * Get uuid
    * @return uuid
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(example = "72f98069-206d-4f12-9f12-3d1e525a8e84", value = "")
   public UUID getUuid() {
     return uuid;
@@ -305,6 +317,7 @@ public class FormatTest {
    * Get password
    * @return password
   **/
+
   @ApiModelProperty(required = true, value = "")
   public String getPassword() {
     return password;
diff --git a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java
index 4dbede6b7d..44159e08e8 100644
--- a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java
+++ b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java
@@ -36,6 +36,7 @@ public class HasOnlyReadOnly {
    * Get bar
    * @return bar
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getBar() {
     return bar;
@@ -45,6 +46,7 @@ public class HasOnlyReadOnly {
    * Get foo
    * @return foo
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getFoo() {
     return foo;
diff --git a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/MapTest.java b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/MapTest.java
index e4c090189f..2caabbea07 100644
--- a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/MapTest.java
+++ b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/MapTest.java
@@ -93,6 +93,7 @@ public class MapTest {
    * Get mapMapOfString
    * @return mapMapOfString
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Map<String, Map<String, String>> getMapMapOfString() {
     return mapMapOfString;
@@ -119,6 +120,7 @@ public class MapTest {
    * Get mapOfEnumString
    * @return mapOfEnumString
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Map<String, InnerEnum> getMapOfEnumString() {
     return mapOfEnumString;
@@ -145,6 +147,7 @@ public class MapTest {
    * Get directMap
    * @return directMap
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Map<String, Boolean> getDirectMap() {
     return directMap;
@@ -171,6 +174,7 @@ public class MapTest {
    * Get indirectMap
    * @return indirectMap
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Map<String, Boolean> getIndirectMap() {
     return indirectMap;
diff --git a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java
index 3e4d20688e..8d97329c31 100644
--- a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java
+++ b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java
@@ -50,6 +50,7 @@ public class MixedPropertiesAndAdditionalPropertiesClass {
    * Get uuid
    * @return uuid
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public UUID getUuid() {
     return uuid;
@@ -68,6 +69,7 @@ public class MixedPropertiesAndAdditionalPropertiesClass {
    * Get dateTime
    * @return dateTime
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public OffsetDateTime getDateTime() {
     return dateTime;
@@ -94,6 +96,7 @@ public class MixedPropertiesAndAdditionalPropertiesClass {
    * Get map
    * @return map
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Map<String, Animal> getMap() {
     return map;
diff --git a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/Model200Response.java b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/Model200Response.java
index 3be60ea3ae..bd3244dd57 100644
--- a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/Model200Response.java
+++ b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/Model200Response.java
@@ -42,6 +42,7 @@ public class Model200Response {
    * Get name
    * @return name
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Integer getName() {
     return name;
@@ -60,6 +61,7 @@ public class Model200Response {
    * Get propertyClass
    * @return propertyClass
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getPropertyClass() {
     return propertyClass;
diff --git a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/ModelApiResponse.java b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/ModelApiResponse.java
index 6e458e38dc..ed335cdca1 100644
--- a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/ModelApiResponse.java
+++ b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/ModelApiResponse.java
@@ -44,6 +44,7 @@ public class ModelApiResponse {
    * Get code
    * @return code
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Integer getCode() {
     return code;
@@ -62,6 +63,7 @@ public class ModelApiResponse {
    * Get type
    * @return type
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getType() {
     return type;
@@ -80,6 +82,7 @@ public class ModelApiResponse {
    * Get message
    * @return message
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getMessage() {
     return message;
diff --git a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/ModelReturn.java b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/ModelReturn.java
index 62e5295212..04c0bcd33f 100644
--- a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/ModelReturn.java
+++ b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/ModelReturn.java
@@ -39,6 +39,7 @@ public class ModelReturn {
    * Get _return
    * @return _return
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Integer getReturn() {
     return _return;
diff --git a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/Name.java b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/Name.java
index 852a999035..af27c6e45f 100644
--- a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/Name.java
+++ b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/Name.java
@@ -48,6 +48,7 @@ public class Name {
    * Get name
    * @return name
   **/
+
   @ApiModelProperty(required = true, value = "")
   public Integer getName() {
     return name;
@@ -61,6 +62,7 @@ public class Name {
    * Get snakeCase
    * @return snakeCase
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Integer getSnakeCase() {
     return snakeCase;
@@ -75,6 +77,7 @@ public class Name {
    * Get property
    * @return property
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getProperty() {
     return property;
@@ -88,6 +91,7 @@ public class Name {
    * Get _123number
    * @return _123number
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Integer get123number() {
     return _123number;
diff --git a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/NumberOnly.java b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/NumberOnly.java
index 530a4d5818..4e29c814cc 100644
--- a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/NumberOnly.java
+++ b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/NumberOnly.java
@@ -39,6 +39,7 @@ public class NumberOnly {
    * Get justNumber
    * @return justNumber
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public BigDecimal getJustNumber() {
     return justNumber;
diff --git a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/Order.java b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/Order.java
index 67680cd7e6..1735b41d31 100644
--- a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/Order.java
+++ b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/Order.java
@@ -91,6 +91,7 @@ public class Order {
    * Get id
    * @return id
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Long getId() {
     return id;
@@ -109,6 +110,7 @@ public class Order {
    * Get petId
    * @return petId
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Long getPetId() {
     return petId;
@@ -127,6 +129,7 @@ public class Order {
    * Get quantity
    * @return quantity
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Integer getQuantity() {
     return quantity;
@@ -145,6 +148,7 @@ public class Order {
    * Get shipDate
    * @return shipDate
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public OffsetDateTime getShipDate() {
     return shipDate;
@@ -163,6 +167,7 @@ public class Order {
    * Order Status
    * @return status
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "Order Status")
   public StatusEnum getStatus() {
     return status;
@@ -181,6 +186,7 @@ public class Order {
    * Get complete
    * @return complete
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Boolean getComplete() {
     return complete;
diff --git a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/OuterComposite.java b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/OuterComposite.java
index 6e71242384..f6515126a8 100644
--- a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/OuterComposite.java
+++ b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/OuterComposite.java
@@ -45,6 +45,7 @@ public class OuterComposite {
    * Get myNumber
    * @return myNumber
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public BigDecimal getMyNumber() {
     return myNumber;
@@ -63,6 +64,7 @@ public class OuterComposite {
    * Get myString
    * @return myString
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getMyString() {
     return myString;
@@ -81,6 +83,7 @@ public class OuterComposite {
    * Get myBoolean
    * @return myBoolean
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Boolean getMyBoolean() {
     return myBoolean;
diff --git a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/Pet.java b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/Pet.java
index a2305bf1d9..ace85c42aa 100644
--- a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/Pet.java
+++ b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/Pet.java
@@ -94,6 +94,7 @@ public class Pet {
    * Get id
    * @return id
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Long getId() {
     return id;
@@ -112,6 +113,7 @@ public class Pet {
    * Get category
    * @return category
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Category getCategory() {
     return category;
@@ -130,6 +132,7 @@ public class Pet {
    * Get name
    * @return name
   **/
+
   @ApiModelProperty(example = "doggie", required = true, value = "")
   public String getName() {
     return name;
@@ -153,6 +156,7 @@ public class Pet {
    * Get photoUrls
    * @return photoUrls
   **/
+
   @ApiModelProperty(required = true, value = "")
   public List<String> getPhotoUrls() {
     return photoUrls;
@@ -179,6 +183,7 @@ public class Pet {
    * Get tags
    * @return tags
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public List<Tag> getTags() {
     return tags;
@@ -197,6 +202,7 @@ public class Pet {
    * pet status in the store
    * @return status
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "pet status in the store")
   public StatusEnum getStatus() {
     return status;
diff --git a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/ReadOnlyFirst.java b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/ReadOnlyFirst.java
index 83f25c7923..a2c9e99699 100644
--- a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/ReadOnlyFirst.java
+++ b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/ReadOnlyFirst.java
@@ -36,6 +36,7 @@ public class ReadOnlyFirst {
    * Get bar
    * @return bar
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getBar() {
     return bar;
@@ -50,6 +51,7 @@ public class ReadOnlyFirst {
    * Get baz
    * @return baz
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getBaz() {
     return baz;
diff --git a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/SpecialModelName.java b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/SpecialModelName.java
index 5abfc132ad..a5ddb0b638 100644
--- a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/SpecialModelName.java
+++ b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/SpecialModelName.java
@@ -38,6 +38,7 @@ public class SpecialModelName {
    * Get $specialPropertyName
    * @return $specialPropertyName
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Long get$SpecialPropertyName() {
     return $specialPropertyName;
diff --git a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/Tag.java b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/Tag.java
index e2e947b84a..8255ad8298 100644
--- a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/Tag.java
+++ b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/Tag.java
@@ -41,6 +41,7 @@ public class Tag {
    * Get id
    * @return id
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Long getId() {
     return id;
@@ -59,6 +60,7 @@ public class Tag {
    * Get name
    * @return name
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getName() {
     return name;
diff --git a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/TypeHolderDefault.java b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/TypeHolderDefault.java
index 3c6488d270..786a681fb3 100644
--- a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/TypeHolderDefault.java
+++ b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/TypeHolderDefault.java
@@ -53,6 +53,7 @@ public class TypeHolderDefault {
    * Get stringItem
    * @return stringItem
   **/
+
   @ApiModelProperty(required = true, value = "")
   public String getStringItem() {
     return stringItem;
@@ -71,6 +72,7 @@ public class TypeHolderDefault {
    * Get numberItem
    * @return numberItem
   **/
+
   @ApiModelProperty(required = true, value = "")
   public BigDecimal getNumberItem() {
     return numberItem;
@@ -89,6 +91,7 @@ public class TypeHolderDefault {
    * Get integerItem
    * @return integerItem
   **/
+
   @ApiModelProperty(required = true, value = "")
   public Integer getIntegerItem() {
     return integerItem;
@@ -107,6 +110,7 @@ public class TypeHolderDefault {
    * Get boolItem
    * @return boolItem
   **/
+
   @ApiModelProperty(required = true, value = "")
   public Boolean getBoolItem() {
     return boolItem;
@@ -130,6 +134,7 @@ public class TypeHolderDefault {
    * Get arrayItem
    * @return arrayItem
   **/
+
   @ApiModelProperty(required = true, value = "")
   public List<Integer> getArrayItem() {
     return arrayItem;
diff --git a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/TypeHolderExample.java b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/TypeHolderExample.java
index 812b5839aa..701e4db843 100644
--- a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/TypeHolderExample.java
+++ b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/TypeHolderExample.java
@@ -53,6 +53,7 @@ public class TypeHolderExample {
    * Get stringItem
    * @return stringItem
   **/
+
   @ApiModelProperty(example = "what", required = true, value = "")
   public String getStringItem() {
     return stringItem;
@@ -71,6 +72,7 @@ public class TypeHolderExample {
    * Get numberItem
    * @return numberItem
   **/
+
   @ApiModelProperty(example = "1.234", required = true, value = "")
   public BigDecimal getNumberItem() {
     return numberItem;
@@ -89,6 +91,7 @@ public class TypeHolderExample {
    * Get integerItem
    * @return integerItem
   **/
+
   @ApiModelProperty(example = "-2", required = true, value = "")
   public Integer getIntegerItem() {
     return integerItem;
@@ -107,6 +110,7 @@ public class TypeHolderExample {
    * Get boolItem
    * @return boolItem
   **/
+
   @ApiModelProperty(example = "true", required = true, value = "")
   public Boolean getBoolItem() {
     return boolItem;
@@ -130,6 +134,7 @@ public class TypeHolderExample {
    * Get arrayItem
    * @return arrayItem
   **/
+
   @ApiModelProperty(example = "[0, 1, 2, 3]", required = true, value = "")
   public List<Integer> getArrayItem() {
     return arrayItem;
diff --git a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/User.java b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/User.java
index ee3f656a1a..6e6c4ac102 100644
--- a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/User.java
+++ b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/User.java
@@ -59,6 +59,7 @@ public class User {
    * Get id
    * @return id
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public Long getId() {
     return id;
@@ -77,6 +78,7 @@ public class User {
    * Get username
    * @return username
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getUsername() {
     return username;
@@ -95,6 +97,7 @@ public class User {
    * Get firstName
    * @return firstName
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getFirstName() {
     return firstName;
@@ -113,6 +116,7 @@ public class User {
    * Get lastName
    * @return lastName
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getLastName() {
     return lastName;
@@ -131,6 +135,7 @@ public class User {
    * Get email
    * @return email
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getEmail() {
     return email;
@@ -149,6 +154,7 @@ public class User {
    * Get password
    * @return password
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getPassword() {
     return password;
@@ -167,6 +173,7 @@ public class User {
    * Get phone
    * @return phone
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public String getPhone() {
     return phone;
@@ -185,6 +192,7 @@ public class User {
    * User Status
    * @return userStatus
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "User Status")
   public Integer getUserStatus() {
     return userStatus;
diff --git a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/XmlItem.java b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/XmlItem.java
index 7cb8000561..2af459e5ae 100644
--- a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/XmlItem.java
+++ b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/XmlItem.java
@@ -125,6 +125,7 @@ public class XmlItem {
    * Get attributeString
    * @return attributeString
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(example = "string", value = "")
   public String getAttributeString() {
     return attributeString;
@@ -143,6 +144,7 @@ public class XmlItem {
    * Get attributeNumber
    * @return attributeNumber
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(example = "1.234", value = "")
   public BigDecimal getAttributeNumber() {
     return attributeNumber;
@@ -161,6 +163,7 @@ public class XmlItem {
    * Get attributeInteger
    * @return attributeInteger
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(example = "-2", value = "")
   public Integer getAttributeInteger() {
     return attributeInteger;
@@ -179,6 +182,7 @@ public class XmlItem {
    * Get attributeBoolean
    * @return attributeBoolean
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(example = "true", value = "")
   public Boolean getAttributeBoolean() {
     return attributeBoolean;
@@ -205,6 +209,7 @@ public class XmlItem {
    * Get wrappedArray
    * @return wrappedArray
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public List<Integer> getWrappedArray() {
     return wrappedArray;
@@ -223,6 +228,7 @@ public class XmlItem {
    * Get nameString
    * @return nameString
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(example = "string", value = "")
   public String getNameString() {
     return nameString;
@@ -241,6 +247,7 @@ public class XmlItem {
    * Get nameNumber
    * @return nameNumber
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(example = "1.234", value = "")
   public BigDecimal getNameNumber() {
     return nameNumber;
@@ -259,6 +266,7 @@ public class XmlItem {
    * Get nameInteger
    * @return nameInteger
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(example = "-2", value = "")
   public Integer getNameInteger() {
     return nameInteger;
@@ -277,6 +285,7 @@ public class XmlItem {
    * Get nameBoolean
    * @return nameBoolean
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(example = "true", value = "")
   public Boolean getNameBoolean() {
     return nameBoolean;
@@ -303,6 +312,7 @@ public class XmlItem {
    * Get nameArray
    * @return nameArray
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public List<Integer> getNameArray() {
     return nameArray;
@@ -329,6 +339,7 @@ public class XmlItem {
    * Get nameWrappedArray
    * @return nameWrappedArray
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public List<Integer> getNameWrappedArray() {
     return nameWrappedArray;
@@ -347,6 +358,7 @@ public class XmlItem {
    * Get prefixString
    * @return prefixString
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(example = "string", value = "")
   public String getPrefixString() {
     return prefixString;
@@ -365,6 +377,7 @@ public class XmlItem {
    * Get prefixNumber
    * @return prefixNumber
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(example = "1.234", value = "")
   public BigDecimal getPrefixNumber() {
     return prefixNumber;
@@ -383,6 +396,7 @@ public class XmlItem {
    * Get prefixInteger
    * @return prefixInteger
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(example = "-2", value = "")
   public Integer getPrefixInteger() {
     return prefixInteger;
@@ -401,6 +415,7 @@ public class XmlItem {
    * Get prefixBoolean
    * @return prefixBoolean
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(example = "true", value = "")
   public Boolean getPrefixBoolean() {
     return prefixBoolean;
@@ -427,6 +442,7 @@ public class XmlItem {
    * Get prefixArray
    * @return prefixArray
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public List<Integer> getPrefixArray() {
     return prefixArray;
@@ -453,6 +469,7 @@ public class XmlItem {
    * Get prefixWrappedArray
    * @return prefixWrappedArray
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public List<Integer> getPrefixWrappedArray() {
     return prefixWrappedArray;
@@ -471,6 +488,7 @@ public class XmlItem {
    * Get namespaceString
    * @return namespaceString
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(example = "string", value = "")
   public String getNamespaceString() {
     return namespaceString;
@@ -489,6 +507,7 @@ public class XmlItem {
    * Get namespaceNumber
    * @return namespaceNumber
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(example = "1.234", value = "")
   public BigDecimal getNamespaceNumber() {
     return namespaceNumber;
@@ -507,6 +526,7 @@ public class XmlItem {
    * Get namespaceInteger
    * @return namespaceInteger
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(example = "-2", value = "")
   public Integer getNamespaceInteger() {
     return namespaceInteger;
@@ -525,6 +545,7 @@ public class XmlItem {
    * Get namespaceBoolean
    * @return namespaceBoolean
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(example = "true", value = "")
   public Boolean getNamespaceBoolean() {
     return namespaceBoolean;
@@ -551,6 +572,7 @@ public class XmlItem {
    * Get namespaceArray
    * @return namespaceArray
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public List<Integer> getNamespaceArray() {
     return namespaceArray;
@@ -577,6 +599,7 @@ public class XmlItem {
    * Get namespaceWrappedArray
    * @return namespaceWrappedArray
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public List<Integer> getNamespaceWrappedArray() {
     return namespaceWrappedArray;
@@ -595,6 +618,7 @@ public class XmlItem {
    * Get prefixNsString
    * @return prefixNsString
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(example = "string", value = "")
   public String getPrefixNsString() {
     return prefixNsString;
@@ -613,6 +637,7 @@ public class XmlItem {
    * Get prefixNsNumber
    * @return prefixNsNumber
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(example = "1.234", value = "")
   public BigDecimal getPrefixNsNumber() {
     return prefixNsNumber;
@@ -631,6 +656,7 @@ public class XmlItem {
    * Get prefixNsInteger
    * @return prefixNsInteger
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(example = "-2", value = "")
   public Integer getPrefixNsInteger() {
     return prefixNsInteger;
@@ -649,6 +675,7 @@ public class XmlItem {
    * Get prefixNsBoolean
    * @return prefixNsBoolean
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(example = "true", value = "")
   public Boolean getPrefixNsBoolean() {
     return prefixNsBoolean;
@@ -675,6 +702,7 @@ public class XmlItem {
    * Get prefixNsArray
    * @return prefixNsArray
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public List<Integer> getPrefixNsArray() {
     return prefixNsArray;
@@ -701,6 +729,7 @@ public class XmlItem {
    * Get prefixNsWrappedArray
    * @return prefixNsWrappedArray
   **/
+  @javax.annotation.Nullable 
   @ApiModelProperty(value = "")
   public List<Integer> getPrefixNsWrappedArray() {
     return prefixNsWrappedArray;
diff --git a/samples/client/petstore/spring-cloud/pom.xml b/samples/client/petstore/spring-cloud/pom.xml
index 1ee79c2f74..b14446583f 100644
--- a/samples/client/petstore/spring-cloud/pom.xml
+++ b/samples/client/petstore/spring-cloud/pom.xml
@@ -38,6 +38,12 @@
             <artifactId>swagger-annotations</artifactId>
             <version>${swagger-core-version}</version>
         </dependency>
+        <!-- @Nullable annotation -->
+        <dependency>
+            <groupId>com.google.code.findbugs</groupId>
+            <artifactId>jsr305</artifactId>
+            <version>3.0.2</version>
+        </dependency>
         <dependency>
             <groupId>org.springframework.cloud</groupId>
             <artifactId>spring-cloud-starter-openfeign</artifactId>
diff --git a/samples/server/petstore/springboot-reactive/pom.xml b/samples/server/petstore/springboot-reactive/pom.xml
index 880a1dba10..4e18946be4 100644
--- a/samples/server/petstore/springboot-reactive/pom.xml
+++ b/samples/server/petstore/springboot-reactive/pom.xml
@@ -46,6 +46,12 @@
             <artifactId>swagger-annotations</artifactId>
             <version>1.5.14</version>
         </dependency>
+        <!-- @Nullable annotation -->
+        <dependency>
+            <groupId>com.google.code.findbugs</groupId>
+            <artifactId>jsr305</artifactId>
+            <version>3.0.2</version>
+        </dependency>
         <dependency>
             <groupId>com.fasterxml.jackson.dataformat</groupId>
             <artifactId>jackson-dataformat-yaml</artifactId>

From 2f479f493f47789e8cdcfb83bdf2858271148a38 Mon Sep 17 00:00:00 2001
From: Fjolnir-Dvorak <rtiersch@techfak.uni-bielefeld.de>
Date: Thu, 25 Jul 2019 07:38:49 +0200
Subject: [PATCH 49/62] [Java] Fix numeric field names (#3436)

* Fix for OpenAPITools/openapi-generator#3293. Number fields in java generators are escaped now.

* Added a few tests for number to varName to persist and ensure this behaviour for future breaking changes OpenAPITools/openapi-generator#3293.

* I also added a few test for convertModelName to prevent similar breaking changes in the future. OpenAPITools/openapi-generator#3293.
---
 .../languages/AbstractJavaCodegen.java        |  5 ++++
 .../codegen/java/AbstractJavaCodegenTest.java | 29 +++++++++++++++----
 2 files changed, 28 insertions(+), 6 deletions(-)

diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractJavaCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractJavaCodegen.java
index 8a51194cc7..d47c22925c 100644
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractJavaCodegen.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractJavaCodegen.java
@@ -586,6 +586,11 @@ public abstract class AbstractJavaCodegen extends DefaultCodegen implements Code
             name = "_u";
         }
 
+        // numbers are not allowed at the beginning
+        if (name.matches("^\\d.*")) {
+            name = "_" + name;
+        }
+
         // if it's all uppper case, do nothing
         if (name.matches("^[A-Z0-9_]*$")) {
             return name;
diff --git a/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/AbstractJavaCodegenTest.java b/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/AbstractJavaCodegenTest.java
index 3db02060a1..f2569fb670 100644
--- a/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/AbstractJavaCodegenTest.java
+++ b/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/AbstractJavaCodegenTest.java
@@ -89,15 +89,31 @@ public class AbstractJavaCodegenTest {
         Assert.assertEquals(fakeJavaCodegen.toVarName("USERname"), "usERname");
         Assert.assertEquals(fakeJavaCodegen.toVarName("USERNAME"), "USERNAME");
         Assert.assertEquals(fakeJavaCodegen.toVarName("USER123NAME"), "USER123NAME");
-   }
+        Assert.assertEquals(fakeJavaCodegen.toVarName("1"), "_1");
+        Assert.assertEquals(fakeJavaCodegen.toVarName("1a"), "_1a");
+        Assert.assertEquals(fakeJavaCodegen.toVarName("1A"), "_1A");
+        Assert.assertEquals(fakeJavaCodegen.toVarName("1AAAA"), "_1AAAA");
+        Assert.assertEquals(fakeJavaCodegen.toVarName("1AAaa"), "_1aAaa");
+    }
 
-   @Test
-   public void convertModelName() throws Exception {
+    @Test
+    public void convertModelName() throws Exception {
         Assert.assertEquals(fakeJavaCodegen.toModelName("name"), "Name");
         Assert.assertEquals(fakeJavaCodegen.toModelName("$name"), "Name");
         Assert.assertEquals(fakeJavaCodegen.toModelName("nam#e"), "Name");
         Assert.assertEquals(fakeJavaCodegen.toModelName("$another-fake?"), "AnotherFake");
-   }
+        Assert.assertEquals(fakeJavaCodegen.toModelName("1a"), "Model1a");
+        Assert.assertEquals(fakeJavaCodegen.toModelName("1A"), "Model1A");
+        Assert.assertEquals(fakeJavaCodegen.toModelName("AAAb"), "AAAb");
+        Assert.assertEquals(fakeJavaCodegen.toModelName("aBB"), "ABB");
+        Assert.assertEquals(fakeJavaCodegen.toModelName("AaBBa"), "AaBBa");
+        Assert.assertEquals(fakeJavaCodegen.toModelName("A_B"), "AB");
+        Assert.assertEquals(fakeJavaCodegen.toModelName("A-B"), "AB");
+        Assert.assertEquals(fakeJavaCodegen.toModelName("Aa_Bb"), "AaBb");
+        Assert.assertEquals(fakeJavaCodegen.toModelName("Aa-Bb"), "AaBb");
+        Assert.assertEquals(fakeJavaCodegen.toModelName("Aa_bb"), "AaBb");
+        Assert.assertEquals(fakeJavaCodegen.toModelName("Aa-bb"), "AaBb");
+    }
 
     @Test
     public void testInitialConfigValues() throws Exception {
@@ -163,7 +179,7 @@ public class AbstractJavaCodegenTest {
     }
 
     @Test
-    public void toEnumValue(){
+    public void toEnumValue() {
         final AbstractJavaCodegen codegen = new P_AbstractJavaCodegen();
         Assert.assertEquals(codegen.toEnumValue("1", "Integer"), "1");
         Assert.assertEquals(codegen.toEnumValue("42", "Double"), "42");
@@ -213,7 +229,7 @@ public class AbstractJavaCodegenTest {
         codegen.setOutputDir("/User/open.api.tools");
         Assert.assertEquals(codegen.apiDocFileFolder(), "/User/open.api.tools/docs/".replace('/', File.separatorChar));
     }
-  
+
     @Test(description = "tests if API version specification is used if no version is provided in additional properties")
     public void openApiversionTest() {
         final P_AbstractJavaCodegen codegen = new P_AbstractJavaCodegen();
@@ -310,6 +326,7 @@ public class AbstractJavaCodegenTest {
         /**
          * Gets artifact version.
          * Only for testing purposes.
+         *
          * @return version
          */
         public String getArtifactVersion() {

From 3f3ecb68791608f6436888e89da56c7ba0d4ea2e Mon Sep 17 00:00:00 2001
From: Martin Delille <martin@delille.org>
Date: Thu, 25 Jul 2019 09:23:51 +0200
Subject: [PATCH 50/62] add modelNamePrefix option for qt5 (#3431)

* qt5: Remove duplicate cppNamespace additional property

* qt5: Add modelNamePrefix additional property
---
 docs/generators/cpp-qt5-client.md                         | 2 +-
 docs/generators/cpp-qt5-qhttpengine-server.md             | 2 +-
 .../java/org/openapitools/codegen/CodegenConstants.java   | 4 ++--
 .../codegen/languages/CppQt5AbstractCodegen.java          | 8 +++++---
 4 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/docs/generators/cpp-qt5-client.md b/docs/generators/cpp-qt5-client.md
index 8c72f0bedd..fb3cd18844 100644
--- a/docs/generators/cpp-qt5-client.md
+++ b/docs/generators/cpp-qt5-client.md
@@ -12,5 +12,5 @@ sidebar_label: cpp-qt5-client
 |allowUnicodeIdentifiers|boolean, toggles whether unicode identifiers are allowed in names or not, default is false| |false|
 |prependFormOrBodyParameters|Add form or body parameters to the beginning of the parameter list.| |false|
 |cppNamespace|C++ namespace (convention: name::space::for::api).| |OpenAPI|
-|cppNamespace|C++ namespace (convention: name::space::for::api).| |OpenAPI|
+|modelNamePrefix|Prefix that will be prepended to all model names.| |OAI|
 |optionalProjectFile|Generate client.pri.| |true|
diff --git a/docs/generators/cpp-qt5-qhttpengine-server.md b/docs/generators/cpp-qt5-qhttpengine-server.md
index 364066a0d8..171c325638 100644
--- a/docs/generators/cpp-qt5-qhttpengine-server.md
+++ b/docs/generators/cpp-qt5-qhttpengine-server.md
@@ -12,4 +12,4 @@ sidebar_label: cpp-qt5-qhttpengine-server
 |allowUnicodeIdentifiers|boolean, toggles whether unicode identifiers are allowed in names or not, default is false| |false|
 |prependFormOrBodyParameters|Add form or body parameters to the beginning of the parameter list.| |false|
 |cppNamespace|C++ namespace (convention: name::space::for::api).| |OpenAPI|
-|cppNamespace|C++ namespace (convention: name::space::for::api).| |OpenAPI|
+|modelNamePrefix|Prefix that will be prepended to all model names.| |OAI|
diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/CodegenConstants.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/CodegenConstants.java
index 02ec63ec5b..50f35eff4b 100644
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/CodegenConstants.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/CodegenConstants.java
@@ -203,10 +203,10 @@ public class CodegenConstants {
     public static final String ENUM_PROPERTY_NAMING_DESC = "Naming convention for enum properties: 'camelCase', 'PascalCase', 'snake_case', 'UPPERCASE', and 'original'";
 
     public static final String MODEL_NAME_PREFIX = "modelNamePrefix";
-    public static final String MODEL_NAME_PREFIX_DESC = "Prefix that will be prepended to all model names. Default is the empty string.";
+    public static final String MODEL_NAME_PREFIX_DESC = "Prefix that will be prepended to all model names.";
 
     public static final String MODEL_NAME_SUFFIX = "modelNameSuffix";
-    public static final String MODEL_NAME_SUFFIX_DESC = "Suffix that will be appended to all model names. Default is the empty string.";
+    public static final String MODEL_NAME_SUFFIX_DESC = "Suffix that will be appended to all model names.";
 
     public static final String GIT_USER_ID = "gitUserId";
     public static final String GIT_USER_ID_DESC = "Git user ID, e.g. openapitools.";
diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CppQt5AbstractCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CppQt5AbstractCodegen.java
index 7dcd055d9a..cfaac199a1 100644
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CppQt5AbstractCodegen.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CppQt5AbstractCodegen.java
@@ -5,6 +5,7 @@ import io.swagger.v3.oas.models.media.Schema;
 import io.swagger.v3.parser.util.SchemaTypeUtil;
 import org.apache.commons.lang3.StringUtils;
 import org.openapitools.codegen.CodegenConfig;
+import org.openapitools.codegen.CodegenConstants;
 import org.openapitools.codegen.CodegenModel;
 import org.openapitools.codegen.CodegenOperation;
 import org.openapitools.codegen.CodegenParameter;
@@ -34,6 +35,7 @@ public class CppQt5AbstractCodegen extends AbstractCppCodegen implements Codegen
         }
         // CLI options
         addOption(CPP_NAMESPACE, CPP_NAMESPACE_DESC, this.cppNamespace);
+        addOption(CodegenConstants.MODEL_NAME_PREFIX, CodegenConstants.MODEL_NAME_PREFIX_DESC, this.modelNamePrefix);
 
         /*
          * Additional Properties.  These values can be passed to the templates and
@@ -45,9 +47,7 @@ public class CppQt5AbstractCodegen extends AbstractCppCodegen implements Codegen
         // Write defaults namespace in properties so that it can be accessible in templates.
         // At this point command line has not been parsed so if value is given
         // in command line it will supersede this content
-        additionalProperties.put("cppNamespace", cppNamespace);   
-        // CLI options
-        addOption(CPP_NAMESPACE, CPP_NAMESPACE_DESC, this.cppNamespace);
+        additionalProperties.put("cppNamespace", cppNamespace);
         /*
          * Language Specific Primitives.  These types will not trigger imports by
          * the client generator
@@ -112,7 +112,9 @@ public class CppQt5AbstractCodegen extends AbstractCppCodegen implements Codegen
         }
 
         additionalProperties.put("cppNamespaceDeclarations", cppNamespace.split("\\::"));
+
         if (additionalProperties.containsKey("modelNamePrefix")) {
+            modelNamePrefix = (String) additionalProperties.get("modelNamePrefix");
             typeMapping.put("object", modelNamePrefix + "Object");
             additionalProperties().put("prefix", modelNamePrefix);
         }

From 64c20692565f049aae4af16ade4107c3de81ec04 Mon Sep 17 00:00:00 2001
From: William Cheng <wing328hk@gmail.com>
Date: Thu, 25 Jul 2019 15:30:13 +0800
Subject: [PATCH 51/62] update java samples

---
 samples/client/petstore/java/jersey2-java6/pom.xml        | 7 +++++++
 samples/client/petstore/java/jersey2-java8/pom.xml        | 7 +++++++
 samples/client/petstore/java/resteasy/pom.xml             | 6 ++++++
 samples/client/petstore/java/resttemplate-withXml/pom.xml | 7 +++++++
 samples/client/petstore/java/resttemplate/pom.xml         | 7 +++++++
 samples/client/petstore/java/retrofit/pom.xml             | 6 ++++++
 samples/client/petstore/java/retrofit2-play24/pom.xml     | 6 ++++++
 samples/client/petstore/java/retrofit2-play25/pom.xml     | 6 ++++++
 samples/client/petstore/java/retrofit2-play26/pom.xml     | 6 ++++++
 samples/client/petstore/java/webclient/pom.xml            | 7 +++++++
 10 files changed, 65 insertions(+)

diff --git a/samples/client/petstore/java/jersey2-java6/pom.xml b/samples/client/petstore/java/jersey2-java6/pom.xml
index 8a80c6c158..7f29de9bf6 100644
--- a/samples/client/petstore/java/jersey2-java6/pom.xml
+++ b/samples/client/petstore/java/jersey2-java6/pom.xml
@@ -210,6 +210,13 @@
             <version>${swagger-annotations-version}</version>
         </dependency>
 
+        <!-- @Nullable annotation -->
+        <dependency>
+            <groupId>com.google.code.findbugs</groupId>
+            <artifactId>jsr305</artifactId>
+            <version>3.0.2</version>
+        </dependency>
+        
         <!-- HTTP client: jersey-client -->
         <dependency>
             <groupId>org.glassfish.jersey.core</groupId>
diff --git a/samples/client/petstore/java/jersey2-java8/pom.xml b/samples/client/petstore/java/jersey2-java8/pom.xml
index 75381cb9de..5d62f179fe 100644
--- a/samples/client/petstore/java/jersey2-java8/pom.xml
+++ b/samples/client/petstore/java/jersey2-java8/pom.xml
@@ -210,6 +210,13 @@
             <version>${swagger-annotations-version}</version>
         </dependency>
 
+        <!-- @Nullable annotation -->
+        <dependency>
+            <groupId>com.google.code.findbugs</groupId>
+            <artifactId>jsr305</artifactId>
+            <version>3.0.2</version>
+        </dependency>
+        
         <!-- HTTP client: jersey-client -->
         <dependency>
             <groupId>org.glassfish.jersey.core</groupId>
diff --git a/samples/client/petstore/java/resteasy/pom.xml b/samples/client/petstore/java/resteasy/pom.xml
index ed8cee8d12..1b327454a6 100644
--- a/samples/client/petstore/java/resteasy/pom.xml
+++ b/samples/client/petstore/java/resteasy/pom.xml
@@ -160,6 +160,12 @@
             <artifactId>swagger-annotations</artifactId>
             <version>${swagger-annotations-version}</version>
         </dependency>
+        <!-- @Nullable annotation -->
+        <dependency>
+            <groupId>com.google.code.findbugs</groupId>
+            <artifactId>jsr305</artifactId>
+            <version>3.0.2</version>
+        </dependency>
         <!-- HTTP client: jersey-client -->
         <dependency>
             <groupId>org.jboss.resteasy</groupId>
diff --git a/samples/client/petstore/java/resttemplate-withXml/pom.xml b/samples/client/petstore/java/resttemplate-withXml/pom.xml
index fe4ba6cf40..03f37e2fc0 100644
--- a/samples/client/petstore/java/resttemplate-withXml/pom.xml
+++ b/samples/client/petstore/java/resttemplate-withXml/pom.xml
@@ -200,6 +200,13 @@
             <artifactId>swagger-annotations</artifactId>
             <version>${swagger-annotations-version}</version>
         </dependency>
+        
+        <!-- @Nullable annotation -->
+        <dependency>
+            <groupId>com.google.code.findbugs</groupId>
+            <artifactId>jsr305</artifactId>
+            <version>3.0.2</version>
+        </dependency>
 
         <!-- HTTP client: Spring RestTemplate -->
         <dependency>
diff --git a/samples/client/petstore/java/resttemplate/pom.xml b/samples/client/petstore/java/resttemplate/pom.xml
index ff4d882ede..3f6172a676 100644
--- a/samples/client/petstore/java/resttemplate/pom.xml
+++ b/samples/client/petstore/java/resttemplate/pom.xml
@@ -200,6 +200,13 @@
             <artifactId>swagger-annotations</artifactId>
             <version>${swagger-annotations-version}</version>
         </dependency>
+        
+        <!-- @Nullable annotation -->
+        <dependency>
+            <groupId>com.google.code.findbugs</groupId>
+            <artifactId>jsr305</artifactId>
+            <version>3.0.2</version>
+        </dependency>
 
         <!-- HTTP client: Spring RestTemplate -->
         <dependency>
diff --git a/samples/client/petstore/java/retrofit/pom.xml b/samples/client/petstore/java/retrofit/pom.xml
index 855a657653..fff98c3ba3 100644
--- a/samples/client/petstore/java/retrofit/pom.xml
+++ b/samples/client/petstore/java/retrofit/pom.xml
@@ -200,6 +200,12 @@
             <artifactId>swagger-annotations</artifactId>
             <version>${swagger-annotations-version}</version>
         </dependency>
+        <!-- @Nullable annotation -->
+        <dependency>
+            <groupId>com.google.code.findbugs</groupId>
+            <artifactId>jsr305</artifactId>
+            <version>3.0.2</version>
+        </dependency>
         <dependency>
             <groupId>com.squareup.retrofit</groupId>
             <artifactId>retrofit</artifactId>
diff --git a/samples/client/petstore/java/retrofit2-play24/pom.xml b/samples/client/petstore/java/retrofit2-play24/pom.xml
index 1a8e875825..6a8a48bd5a 100644
--- a/samples/client/petstore/java/retrofit2-play24/pom.xml
+++ b/samples/client/petstore/java/retrofit2-play24/pom.xml
@@ -191,6 +191,12 @@
             <artifactId>swagger-annotations</artifactId>
             <version>${swagger-annotations-version}</version>
         </dependency>
+        <!-- @Nullable annotation -->
+        <dependency>
+            <groupId>com.google.code.findbugs</groupId>
+            <artifactId>jsr305</artifactId>
+            <version>3.0.2</version>
+        </dependency>
         <dependency>
             <groupId>com.squareup.retrofit2</groupId>
             <artifactId>converter-gson</artifactId>
diff --git a/samples/client/petstore/java/retrofit2-play25/pom.xml b/samples/client/petstore/java/retrofit2-play25/pom.xml
index ced3973a7c..e82fe6f2b1 100644
--- a/samples/client/petstore/java/retrofit2-play25/pom.xml
+++ b/samples/client/petstore/java/retrofit2-play25/pom.xml
@@ -191,6 +191,12 @@
             <artifactId>swagger-annotations</artifactId>
             <version>${swagger-annotations-version}</version>
         </dependency>
+        <!-- @Nullable annotation -->
+        <dependency>
+            <groupId>com.google.code.findbugs</groupId>
+            <artifactId>jsr305</artifactId>
+            <version>3.0.2</version>
+        </dependency>
         <dependency>
             <groupId>com.squareup.retrofit2</groupId>
             <artifactId>converter-gson</artifactId>
diff --git a/samples/client/petstore/java/retrofit2-play26/pom.xml b/samples/client/petstore/java/retrofit2-play26/pom.xml
index 4a764c94f8..d03f83d54f 100644
--- a/samples/client/petstore/java/retrofit2-play26/pom.xml
+++ b/samples/client/petstore/java/retrofit2-play26/pom.xml
@@ -191,6 +191,12 @@
             <artifactId>swagger-annotations</artifactId>
             <version>${swagger-annotations-version}</version>
         </dependency>
+        <!-- @Nullable annotation -->
+        <dependency>
+            <groupId>com.google.code.findbugs</groupId>
+            <artifactId>jsr305</artifactId>
+            <version>3.0.2</version>
+        </dependency>
         <dependency>
             <groupId>com.squareup.retrofit2</groupId>
             <artifactId>converter-gson</artifactId>
diff --git a/samples/client/petstore/java/webclient/pom.xml b/samples/client/petstore/java/webclient/pom.xml
index 262a5b0b5c..ee6480dc26 100644
--- a/samples/client/petstore/java/webclient/pom.xml
+++ b/samples/client/petstore/java/webclient/pom.xml
@@ -65,6 +65,13 @@
             <artifactId>swagger-annotations</artifactId>
             <version>${swagger-annotations-version}</version>
         </dependency>
+        
+        <!-- @Nullable annotation -->
+        <dependency>
+            <groupId>com.google.code.findbugs</groupId>
+            <artifactId>jsr305</artifactId>
+            <version>3.0.2</version>
+        </dependency>
 
         <dependency>
             <groupId>io.projectreactor</groupId>

From da62116c9d3945b3431d07cbf1ec1b06659f2c8f Mon Sep 17 00:00:00 2001
From: William Cheng <wing328hk@gmail.com>
Date: Thu, 25 Jul 2019 15:35:55 +0800
Subject: [PATCH 52/62] Add  bkabrda to Go technical committee (#3454)

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 7402e2c152..8638a77f80 100644
--- a/README.md
+++ b/README.md
@@ -791,7 +791,7 @@ If you want to join the committee, please kindly apply by sending an email to te
 | Elm       | @eriktim (2018/09) |
 | Erlang    | @tsloughter (2017/11) @jfacorro (2018/10) @robertoaloi (2018/10) |
 | F#        | @nmfisher (2019/05) |
-| Go        | @antihax (2017/11) @bvwells (2017/12) @grokify (2018/07) @kemokemo (2018/09) |
+| Go        | @antihax (2017/11) @bvwells (2017/12) @grokify (2018/07) @kemokemo (2018/09) @bkabrda (2019/07) |
 | GraphQL   | @renepardon (2018/12) |
 | Groovy    |  |
 | Haskell   |  |

From d0b728794d38a860046ea4715e061a96feeafb94 Mon Sep 17 00:00:00 2001
From: William Cheng <wing328hk@gmail.com>
Date: Thu, 25 Jul 2019 18:56:59 +0800
Subject: [PATCH 53/62] update kotlin server samples

---
 samples/server/petstore/kotlin-springboot-reactive/pom.xml | 6 ++++++
 samples/server/petstore/kotlin-springboot/pom.xml          | 6 ++++++
 2 files changed, 12 insertions(+)

diff --git a/samples/server/petstore/kotlin-springboot-reactive/pom.xml b/samples/server/petstore/kotlin-springboot-reactive/pom.xml
index c8683e54bc..b0a954d470 100644
--- a/samples/server/petstore/kotlin-springboot-reactive/pom.xml
+++ b/samples/server/petstore/kotlin-springboot-reactive/pom.xml
@@ -96,6 +96,12 @@
             <artifactId>swagger-annotations</artifactId>
             <version>1.5.21</version>
         </dependency>
+        <!-- @Nullable annotation -->
+        <dependency>
+            <groupId>com.google.code.findbugs</groupId>
+            <artifactId>jsr305</artifactId>
+            <version>3.0.2</version>
+        </dependency>
         <dependency>
             <groupId>com.fasterxml.jackson.dataformat</groupId>
             <artifactId>jackson-dataformat-yaml</artifactId>
diff --git a/samples/server/petstore/kotlin-springboot/pom.xml b/samples/server/petstore/kotlin-springboot/pom.xml
index 10720393bf..38491e8939 100644
--- a/samples/server/petstore/kotlin-springboot/pom.xml
+++ b/samples/server/petstore/kotlin-springboot/pom.xml
@@ -86,6 +86,12 @@
             <artifactId>swagger-annotations</artifactId>
             <version>1.5.21</version>
         </dependency>
+        <!-- @Nullable annotation -->
+        <dependency>
+            <groupId>com.google.code.findbugs</groupId>
+            <artifactId>jsr305</artifactId>
+            <version>3.0.2</version>
+        </dependency>
         <dependency>
             <groupId>com.fasterxml.jackson.dataformat</groupId>
             <artifactId>jackson-dataformat-yaml</artifactId>

From a3cf964ce929504e3906bad8a8f246bd77009f44 Mon Sep 17 00:00:00 2001
From: Freeman <freemanxchen@gmail.com>
Date: Thu, 25 Jul 2019 05:31:27 -0700
Subject: [PATCH 54/62] Upgrade babel packages for Javascript ES6 generator
 (#3424)

* Upgrade babel packages for Javascript ES6 generator

* Fix @babel/register in test script
---
 .../Javascript/es6/.babelrc.mustache          | 32 ++++++++++++++++++-
 .../resources/Javascript/es6/package.mustache | 26 ++++++++++++---
 .../client/petstore/javascript-es6/.babelrc   | 32 ++++++++++++++++++-
 .../petstore/javascript-es6/package.json      | 26 ++++++++++++---
 .../petstore/javascript-promise-es6/.babelrc  | 32 ++++++++++++++++++-
 .../javascript-promise-es6/package.json       | 26 ++++++++++++---
 6 files changed, 156 insertions(+), 18 deletions(-)

diff --git a/modules/openapi-generator/src/main/resources/Javascript/es6/.babelrc.mustache b/modules/openapi-generator/src/main/resources/Javascript/es6/.babelrc.mustache
index 67b369ed37..c73df9d50b 100644
--- a/modules/openapi-generator/src/main/resources/Javascript/es6/.babelrc.mustache
+++ b/modules/openapi-generator/src/main/resources/Javascript/es6/.babelrc.mustache
@@ -1,3 +1,33 @@
 {
-  "presets": ["env", "stage-0"]
+  "presets": [
+    "@babel/preset-env"
+  ],
+  "plugins": [
+    "@babel/plugin-syntax-dynamic-import",
+    "@babel/plugin-syntax-import-meta",
+    "@babel/plugin-proposal-class-properties",
+    "@babel/plugin-proposal-json-strings",
+    [
+      "@babel/plugin-proposal-decorators",
+      {
+        "legacy": true
+      }
+    ],
+    "@babel/plugin-proposal-function-sent",
+    "@babel/plugin-proposal-export-namespace-from",
+    "@babel/plugin-proposal-numeric-separator",
+    "@babel/plugin-proposal-throw-expressions",
+    "@babel/plugin-proposal-export-default-from",
+    "@babel/plugin-proposal-logical-assignment-operators",
+    "@babel/plugin-proposal-optional-chaining",
+    [
+      "@babel/plugin-proposal-pipeline-operator",
+      {
+        "proposal": "minimal"
+      }
+    ],
+    "@babel/plugin-proposal-nullish-coalescing-operator",
+    "@babel/plugin-proposal-do-expressions",
+    "@babel/plugin-proposal-function-bind"
+  ]
 }
diff --git a/modules/openapi-generator/src/main/resources/Javascript/es6/package.mustache b/modules/openapi-generator/src/main/resources/Javascript/es6/package.mustache
index a50b249f59..bfe24d5570 100644
--- a/modules/openapi-generator/src/main/resources/Javascript/es6/package.mustache
+++ b/modules/openapi-generator/src/main/resources/Javascript/es6/package.mustache
@@ -7,19 +7,35 @@
   "scripts": {
     "build": "babel src -d dist",
     "prepack": "npm run build",
-    "test": "mocha --compilers js:babel-core/register --recursive"
+    "test": "mocha --compilers js:@babel/register --recursive"
   },
   "browser": {
     "fs": false
   },
   "dependencies": {
-    "babel-cli": "^6.26.0",
+    "@babel/cli": "^7.0.0",
     "superagent": "3.7.0"
   },
   "devDependencies": {
-    "babel-core": "6.26.0",
-    "babel-preset-env": "^1.6.1",
-    "babel-preset-stage-0": "^6.24.1",
+    "@babel/core": "^7.0.0",
+    "@babel/plugin-proposal-class-properties": "^7.0.0",
+    "@babel/plugin-proposal-decorators": "^7.0.0",
+    "@babel/plugin-proposal-do-expressions": "^7.0.0",
+    "@babel/plugin-proposal-export-default-from": "^7.0.0",
+    "@babel/plugin-proposal-export-namespace-from": "^7.0.0",
+    "@babel/plugin-proposal-function-bind": "^7.0.0",
+    "@babel/plugin-proposal-function-sent": "^7.0.0",
+    "@babel/plugin-proposal-json-strings": "^7.0.0",
+    "@babel/plugin-proposal-logical-assignment-operators": "^7.0.0",
+    "@babel/plugin-proposal-nullish-coalescing-operator": "^7.0.0",
+    "@babel/plugin-proposal-numeric-separator": "^7.0.0",
+    "@babel/plugin-proposal-optional-chaining": "^7.0.0",
+    "@babel/plugin-proposal-pipeline-operator": "^7.0.0",
+    "@babel/plugin-proposal-throw-expressions": "^7.0.0",
+    "@babel/plugin-syntax-dynamic-import": "^7.0.0",
+    "@babel/plugin-syntax-import-meta": "^7.0.0",
+    "@babel/preset-env": "^7.0.0",
+    "@babel/register": "^7.0.0",
     "expect.js": "^0.3.1",
     "mocha": "^5.2.0",
     "sinon": "^7.2.0"
diff --git a/samples/client/petstore/javascript-es6/.babelrc b/samples/client/petstore/javascript-es6/.babelrc
index 67b369ed37..c73df9d50b 100644
--- a/samples/client/petstore/javascript-es6/.babelrc
+++ b/samples/client/petstore/javascript-es6/.babelrc
@@ -1,3 +1,33 @@
 {
-  "presets": ["env", "stage-0"]
+  "presets": [
+    "@babel/preset-env"
+  ],
+  "plugins": [
+    "@babel/plugin-syntax-dynamic-import",
+    "@babel/plugin-syntax-import-meta",
+    "@babel/plugin-proposal-class-properties",
+    "@babel/plugin-proposal-json-strings",
+    [
+      "@babel/plugin-proposal-decorators",
+      {
+        "legacy": true
+      }
+    ],
+    "@babel/plugin-proposal-function-sent",
+    "@babel/plugin-proposal-export-namespace-from",
+    "@babel/plugin-proposal-numeric-separator",
+    "@babel/plugin-proposal-throw-expressions",
+    "@babel/plugin-proposal-export-default-from",
+    "@babel/plugin-proposal-logical-assignment-operators",
+    "@babel/plugin-proposal-optional-chaining",
+    [
+      "@babel/plugin-proposal-pipeline-operator",
+      {
+        "proposal": "minimal"
+      }
+    ],
+    "@babel/plugin-proposal-nullish-coalescing-operator",
+    "@babel/plugin-proposal-do-expressions",
+    "@babel/plugin-proposal-function-bind"
+  ]
 }
diff --git a/samples/client/petstore/javascript-es6/package.json b/samples/client/petstore/javascript-es6/package.json
index 94455e4a69..6a738bcf33 100644
--- a/samples/client/petstore/javascript-es6/package.json
+++ b/samples/client/petstore/javascript-es6/package.json
@@ -7,19 +7,35 @@
   "scripts": {
     "build": "babel src -d dist",
     "prepack": "npm run build",
-    "test": "mocha --compilers js:babel-core/register --recursive"
+    "test": "mocha --compilers js:@babel/register --recursive"
   },
   "browser": {
     "fs": false
   },
   "dependencies": {
-    "babel-cli": "^6.26.0",
+    "@babel/cli": "^7.0.0",
     "superagent": "3.7.0"
   },
   "devDependencies": {
-    "babel-core": "6.26.0",
-    "babel-preset-env": "^1.6.1",
-    "babel-preset-stage-0": "^6.24.1",
+    "@babel/core": "^7.0.0",
+    "@babel/plugin-proposal-class-properties": "^7.0.0",
+    "@babel/plugin-proposal-decorators": "^7.0.0",
+    "@babel/plugin-proposal-do-expressions": "^7.0.0",
+    "@babel/plugin-proposal-export-default-from": "^7.0.0",
+    "@babel/plugin-proposal-export-namespace-from": "^7.0.0",
+    "@babel/plugin-proposal-function-bind": "^7.0.0",
+    "@babel/plugin-proposal-function-sent": "^7.0.0",
+    "@babel/plugin-proposal-json-strings": "^7.0.0",
+    "@babel/plugin-proposal-logical-assignment-operators": "^7.0.0",
+    "@babel/plugin-proposal-nullish-coalescing-operator": "^7.0.0",
+    "@babel/plugin-proposal-numeric-separator": "^7.0.0",
+    "@babel/plugin-proposal-optional-chaining": "^7.0.0",
+    "@babel/plugin-proposal-pipeline-operator": "^7.0.0",
+    "@babel/plugin-proposal-throw-expressions": "^7.0.0",
+    "@babel/plugin-syntax-dynamic-import": "^7.0.0",
+    "@babel/plugin-syntax-import-meta": "^7.0.0",
+    "@babel/preset-env": "^7.0.0",
+    "@babel/register": "^7.0.0",
     "expect.js": "^0.3.1",
     "mocha": "^5.2.0",
     "sinon": "^7.2.0"
diff --git a/samples/client/petstore/javascript-promise-es6/.babelrc b/samples/client/petstore/javascript-promise-es6/.babelrc
index 67b369ed37..c73df9d50b 100644
--- a/samples/client/petstore/javascript-promise-es6/.babelrc
+++ b/samples/client/petstore/javascript-promise-es6/.babelrc
@@ -1,3 +1,33 @@
 {
-  "presets": ["env", "stage-0"]
+  "presets": [
+    "@babel/preset-env"
+  ],
+  "plugins": [
+    "@babel/plugin-syntax-dynamic-import",
+    "@babel/plugin-syntax-import-meta",
+    "@babel/plugin-proposal-class-properties",
+    "@babel/plugin-proposal-json-strings",
+    [
+      "@babel/plugin-proposal-decorators",
+      {
+        "legacy": true
+      }
+    ],
+    "@babel/plugin-proposal-function-sent",
+    "@babel/plugin-proposal-export-namespace-from",
+    "@babel/plugin-proposal-numeric-separator",
+    "@babel/plugin-proposal-throw-expressions",
+    "@babel/plugin-proposal-export-default-from",
+    "@babel/plugin-proposal-logical-assignment-operators",
+    "@babel/plugin-proposal-optional-chaining",
+    [
+      "@babel/plugin-proposal-pipeline-operator",
+      {
+        "proposal": "minimal"
+      }
+    ],
+    "@babel/plugin-proposal-nullish-coalescing-operator",
+    "@babel/plugin-proposal-do-expressions",
+    "@babel/plugin-proposal-function-bind"
+  ]
 }
diff --git a/samples/client/petstore/javascript-promise-es6/package.json b/samples/client/petstore/javascript-promise-es6/package.json
index 94455e4a69..6a738bcf33 100644
--- a/samples/client/petstore/javascript-promise-es6/package.json
+++ b/samples/client/petstore/javascript-promise-es6/package.json
@@ -7,19 +7,35 @@
   "scripts": {
     "build": "babel src -d dist",
     "prepack": "npm run build",
-    "test": "mocha --compilers js:babel-core/register --recursive"
+    "test": "mocha --compilers js:@babel/register --recursive"
   },
   "browser": {
     "fs": false
   },
   "dependencies": {
-    "babel-cli": "^6.26.0",
+    "@babel/cli": "^7.0.0",
     "superagent": "3.7.0"
   },
   "devDependencies": {
-    "babel-core": "6.26.0",
-    "babel-preset-env": "^1.6.1",
-    "babel-preset-stage-0": "^6.24.1",
+    "@babel/core": "^7.0.0",
+    "@babel/plugin-proposal-class-properties": "^7.0.0",
+    "@babel/plugin-proposal-decorators": "^7.0.0",
+    "@babel/plugin-proposal-do-expressions": "^7.0.0",
+    "@babel/plugin-proposal-export-default-from": "^7.0.0",
+    "@babel/plugin-proposal-export-namespace-from": "^7.0.0",
+    "@babel/plugin-proposal-function-bind": "^7.0.0",
+    "@babel/plugin-proposal-function-sent": "^7.0.0",
+    "@babel/plugin-proposal-json-strings": "^7.0.0",
+    "@babel/plugin-proposal-logical-assignment-operators": "^7.0.0",
+    "@babel/plugin-proposal-nullish-coalescing-operator": "^7.0.0",
+    "@babel/plugin-proposal-numeric-separator": "^7.0.0",
+    "@babel/plugin-proposal-optional-chaining": "^7.0.0",
+    "@babel/plugin-proposal-pipeline-operator": "^7.0.0",
+    "@babel/plugin-proposal-throw-expressions": "^7.0.0",
+    "@babel/plugin-syntax-dynamic-import": "^7.0.0",
+    "@babel/plugin-syntax-import-meta": "^7.0.0",
+    "@babel/preset-env": "^7.0.0",
+    "@babel/register": "^7.0.0",
     "expect.js": "^0.3.1",
     "mocha": "^5.2.0",
     "sinon": "^7.2.0"

From 8231cbfe81fef8082c5733376a6ede6d3d91ca41 Mon Sep 17 00:00:00 2001
From: Bernd Hacker <hacker.bernd@gmail.com>
Date: Thu, 25 Jul 2019 15:16:54 +0200
Subject: [PATCH 55/62] [typescript-rxjs]: support reponseType blob (#3437)

* feat(typescript-rxjs): add optional responseType to RequestOpts

* refactor(typescript-rxjs): remove redundant importMapping.clear() in codegen constructor

* feat(typescript-rxjs): update this.reservedWords

* fix(typescript-rxjs): add missing fields copied to ExtendedCodegenOperation

* feat(typescript-rxjs): add support for responseType blob

* feat(typescript-rxjs): regenerate samples
---
 .../TypeScriptRxjsClientCodegen.java          | 54 ++++++++++++++++---
 .../resources/typescript-rxjs/apis.mustache   |  3 ++
 .../typescript-rxjs/runtime.mustache          |  2 +
 .../typescript-rxjs/builds/default/runtime.ts |  2 +
 .../builds/es6-target/runtime.ts              |  2 +
 .../builds/with-interfaces/runtime.ts         |  2 +
 .../builds/with-npm-version/runtime.ts        |  2 +
 7 files changed, 61 insertions(+), 6 deletions(-)

diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/TypeScriptRxjsClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/TypeScriptRxjsClientCodegen.java
index 267711f961..93a25c21f4 100644
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/TypeScriptRxjsClientCodegen.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/TypeScriptRxjsClientCodegen.java
@@ -42,10 +42,6 @@ public class TypeScriptRxjsClientCodegen extends AbstractTypeScriptClientCodegen
     public TypeScriptRxjsClientCodegen() {
         super();
 
-        // clear import mapping (from default generator) as TS does not use it
-        // at the moment
-        importMapping.clear();
-
         outputFolder = "generated-code/typescript-rxjs";
         embeddedTemplateDir = templateDir = "typescript-rxjs";
 
@@ -55,6 +51,9 @@ public class TypeScriptRxjsClientCodegen extends AbstractTypeScriptClientCodegen
         this.modelTemplateFiles.put("models.mustache", ".ts");
         this.addExtraReservedWords();
 
+        languageSpecificPrimitives.add("Blob");
+        typeMapping.put("file", "Blob");
+
         this.cliOptions.add(new CliOption(NPM_REPOSITORY, "Use this property to set an url your private npmRepo in the package.json"));
         this.cliOptions.add(new CliOption(WITH_INTERFACES, "Setting this property to true will generate interfaces next to the default class implementations.", SchemaTypeUtil.BOOLEAN_TYPE).defaultValue(Boolean.FALSE.toString()));
     }
@@ -93,6 +92,11 @@ public class TypeScriptRxjsClientCodegen extends AbstractTypeScriptClientCodegen
         }
     }
 
+    @Override
+    public boolean isDataTypeFile(final String dataType) {
+        return dataType != null && dataType.equals("Blob");
+    }
+
     @Override
     public String getTypeDeclaration(Schema p) {
         Schema inner;
@@ -162,6 +166,33 @@ public class TypeScriptRxjsClientCodegen extends AbstractTypeScriptClientCodegen
         return result;
     }
 
+    @Override
+    public void postProcessParameter(CodegenParameter parameter) {
+        super.postProcessParameter(parameter);
+        parameter.dataType = applyLocalTypeMapping(parameter.dataType);
+    }
+
+    @Override
+    public String getSchemaType(Schema p) {
+        String openAPIType = super.getSchemaType(p);
+        if (isLanguagePrimitive(openAPIType)) {
+            return openAPIType;
+        }
+        applyLocalTypeMapping(openAPIType);
+        return openAPIType;
+    }
+
+    private String applyLocalTypeMapping(String type) {
+        if (typeMapping.containsKey(type)) {
+            type = typeMapping.get(type);
+        }
+        return type;
+    }
+
+    private boolean isLanguagePrimitive(String type) {
+        return languageSpecificPrimitives.contains(type);
+    }
+
     private void addNpmPackageGeneration() {
         if (additionalProperties.containsKey(NPM_REPOSITORY)) {
             this.setNpmRepository(additionalProperties.get(NPM_REPOSITORY).toString());
@@ -290,10 +321,10 @@ public class TypeScriptRxjsClientCodegen extends AbstractTypeScriptClientCodegen
         this.reservedWords.add("ModelPropertyNaming");
         this.reservedWords.add("RequestArgs");
         this.reservedWords.add("RequestOpts");
+        this.reservedWords.add("ResponseArgs");
         this.reservedWords.add("exists");
-        this.reservedWords.add("RequestContext");
-        this.reservedWords.add("ResponseContext");
         this.reservedWords.add("Middleware");
+        this.reservedWords.add("AjaxRequest");
         this.reservedWords.add("AjaxResponse");
     }
 
@@ -310,6 +341,7 @@ public class TypeScriptRxjsClientCodegen extends AbstractTypeScriptClientCodegen
             this.hasProduces = o.hasProduces;
             this.hasParams = o.hasParams;
             this.hasOptionalParams = o.hasOptionalParams;
+            this.hasRequiredParams = o.hasRequiredParams;
             this.returnTypeIsPrimitive = o.returnTypeIsPrimitive;
             this.returnSimpleType = o.returnSimpleType;
             this.subresourceOperation = o.subresourceOperation;
@@ -318,6 +350,7 @@ public class TypeScriptRxjsClientCodegen extends AbstractTypeScriptClientCodegen
             this.isMultipart = o.isMultipart;
             this.hasMore = o.hasMore;
             this.isResponseBinary = o.isResponseBinary;
+            this.isResponseFile = o.isResponseFile;
             this.hasReference = o.hasReference;
             this.isRestfulIndex = o.isRestfulIndex;
             this.isRestfulShow = o.isRestfulShow;
@@ -325,6 +358,8 @@ public class TypeScriptRxjsClientCodegen extends AbstractTypeScriptClientCodegen
             this.isRestfulUpdate = o.isRestfulUpdate;
             this.isRestfulDestroy = o.isRestfulDestroy;
             this.isRestful = o.isRestful;
+            this.isDeprecated = o.isDeprecated;
+            this.isCallbackRequest = o.isCallbackRequest;
             this.path = o.path;
             this.operationId = o.operationId;
             this.returnType = o.returnType;
@@ -339,6 +374,8 @@ public class TypeScriptRxjsClientCodegen extends AbstractTypeScriptClientCodegen
             this.discriminator = o.discriminator;
             this.consumes = o.consumes;
             this.produces = o.produces;
+            this.prioritizedContentTypes = o.prioritizedContentTypes;
+            this.servers = o.servers;
             this.bodyParam = o.bodyParam;
             this.allParams = o.allParams;
             this.bodyParams = o.bodyParams;
@@ -346,18 +383,23 @@ public class TypeScriptRxjsClientCodegen extends AbstractTypeScriptClientCodegen
             this.queryParams = o.queryParams;
             this.headerParams = o.headerParams;
             this.formParams = o.formParams;
+            this.cookieParams = o.cookieParams;
             this.requiredParams = o.requiredParams;
             this.optionalParams = o.optionalParams;
             this.authMethods = o.authMethods;
             this.tags = o.tags;
             this.responses = o.responses;
+            this.callbacks = o.callbacks;
             this.imports = o.imports;
             this.examples = o.examples;
+            this.requestBodyExamples = o.requestBodyExamples;
             this.externalDocs = o.externalDocs;
             this.vendorExtensions = o.vendorExtensions;
             this.nickname = o.nickname;
+            this.operationIdOriginal = o.operationIdOriginal;
             this.operationIdLowerCase = o.operationIdLowerCase;
             this.operationIdCamelCase = o.operationIdCamelCase;
+            this.operationIdSnakeCase = o.operationIdSnakeCase;
 
             // new fields
             this.hasHttpHeaders = o.getHasHeaderParams() || o.getHasBodyParam() || o.hasAuthMethods;
diff --git a/modules/openapi-generator/src/main/resources/typescript-rxjs/apis.mustache b/modules/openapi-generator/src/main/resources/typescript-rxjs/apis.mustache
index 70b0ea8872..70614d7f79 100644
--- a/modules/openapi-generator/src/main/resources/typescript-rxjs/apis.mustache
+++ b/modules/openapi-generator/src/main/resources/typescript-rxjs/apis.mustache
@@ -171,6 +171,9 @@ export class {{classname}} extends BaseAPI {
             {{#hasFormParams}}
             body: formData,
             {{/hasFormParams}}
+{{#isResponseFile}}
+            responseType: 'blob'
+{{/isResponseFile}}
         });
     }
 
diff --git a/modules/openapi-generator/src/main/resources/typescript-rxjs/runtime.mustache b/modules/openapi-generator/src/main/resources/typescript-rxjs/runtime.mustache
index 9592c345d1..429584b64c 100644
--- a/modules/openapi-generator/src/main/resources/typescript-rxjs/runtime.mustache
+++ b/modules/openapi-generator/src/main/resources/typescript-rxjs/runtime.mustache
@@ -97,6 +97,7 @@ export class BaseAPI {
             method: requestOpts.method,
             headers: requestOpts.headers,
             body: requestOpts.body instanceof FormData ? requestOpts.body : JSON.stringify(requestOpts.body),
+            responseType: requestOpts.responseType || 'json'
         };
     }
 
@@ -149,6 +150,7 @@ export interface RequestOpts {
     headers?: HttpHeaders;
     query?: HttpQuery;
     body?: HttpBody;
+    responseType?: 'json' | 'blob' | 'arraybuffer' | 'text';
 }
 
 export const encodeURI = (value: any) => encodeURIComponent(String(value))
diff --git a/samples/client/petstore/typescript-rxjs/builds/default/runtime.ts b/samples/client/petstore/typescript-rxjs/builds/default/runtime.ts
index 9b29b9be67..ef017aff8f 100644
--- a/samples/client/petstore/typescript-rxjs/builds/default/runtime.ts
+++ b/samples/client/petstore/typescript-rxjs/builds/default/runtime.ts
@@ -108,6 +108,7 @@ export class BaseAPI {
             method: requestOpts.method,
             headers: requestOpts.headers,
             body: requestOpts.body instanceof FormData ? requestOpts.body : JSON.stringify(requestOpts.body),
+            responseType: requestOpts.responseType || 'json'
         };
     }
 
@@ -160,6 +161,7 @@ export interface RequestOpts {
     headers?: HttpHeaders;
     query?: HttpQuery;
     body?: HttpBody;
+    responseType?: 'json' | 'blob' | 'arraybuffer' | 'text';
 }
 
 export const encodeURI = (value: any) => encodeURIComponent(String(value))
diff --git a/samples/client/petstore/typescript-rxjs/builds/es6-target/runtime.ts b/samples/client/petstore/typescript-rxjs/builds/es6-target/runtime.ts
index 9b29b9be67..ef017aff8f 100644
--- a/samples/client/petstore/typescript-rxjs/builds/es6-target/runtime.ts
+++ b/samples/client/petstore/typescript-rxjs/builds/es6-target/runtime.ts
@@ -108,6 +108,7 @@ export class BaseAPI {
             method: requestOpts.method,
             headers: requestOpts.headers,
             body: requestOpts.body instanceof FormData ? requestOpts.body : JSON.stringify(requestOpts.body),
+            responseType: requestOpts.responseType || 'json'
         };
     }
 
@@ -160,6 +161,7 @@ export interface RequestOpts {
     headers?: HttpHeaders;
     query?: HttpQuery;
     body?: HttpBody;
+    responseType?: 'json' | 'blob' | 'arraybuffer' | 'text';
 }
 
 export const encodeURI = (value: any) => encodeURIComponent(String(value))
diff --git a/samples/client/petstore/typescript-rxjs/builds/with-interfaces/runtime.ts b/samples/client/petstore/typescript-rxjs/builds/with-interfaces/runtime.ts
index 9b29b9be67..ef017aff8f 100644
--- a/samples/client/petstore/typescript-rxjs/builds/with-interfaces/runtime.ts
+++ b/samples/client/petstore/typescript-rxjs/builds/with-interfaces/runtime.ts
@@ -108,6 +108,7 @@ export class BaseAPI {
             method: requestOpts.method,
             headers: requestOpts.headers,
             body: requestOpts.body instanceof FormData ? requestOpts.body : JSON.stringify(requestOpts.body),
+            responseType: requestOpts.responseType || 'json'
         };
     }
 
@@ -160,6 +161,7 @@ export interface RequestOpts {
     headers?: HttpHeaders;
     query?: HttpQuery;
     body?: HttpBody;
+    responseType?: 'json' | 'blob' | 'arraybuffer' | 'text';
 }
 
 export const encodeURI = (value: any) => encodeURIComponent(String(value))
diff --git a/samples/client/petstore/typescript-rxjs/builds/with-npm-version/runtime.ts b/samples/client/petstore/typescript-rxjs/builds/with-npm-version/runtime.ts
index 9b29b9be67..ef017aff8f 100644
--- a/samples/client/petstore/typescript-rxjs/builds/with-npm-version/runtime.ts
+++ b/samples/client/petstore/typescript-rxjs/builds/with-npm-version/runtime.ts
@@ -108,6 +108,7 @@ export class BaseAPI {
             method: requestOpts.method,
             headers: requestOpts.headers,
             body: requestOpts.body instanceof FormData ? requestOpts.body : JSON.stringify(requestOpts.body),
+            responseType: requestOpts.responseType || 'json'
         };
     }
 
@@ -160,6 +161,7 @@ export interface RequestOpts {
     headers?: HttpHeaders;
     query?: HttpQuery;
     body?: HttpBody;
+    responseType?: 'json' | 'blob' | 'arraybuffer' | 'text';
 }
 
 export const encodeURI = (value: any) => encodeURIComponent(String(value))

From fabe021fb03751a44378ce6c2590e727ae77a732 Mon Sep 17 00:00:00 2001
From: Martin Delille <martin@delille.org>
Date: Thu, 25 Jul 2019 18:25:17 +0200
Subject: [PATCH 56/62] Revert "qt5 client: use openapi 3 spec (#3400)" (#3458)

This reverts commit 40f1f920dfa03c2c172d196e6ad4dd5950f17405.
---
 bin/cpp-qt5-petstore.sh                       |   2 +-
 .../cpp-qt5/client/OAIInline_object.cpp       | 127 ------------------
 .../cpp-qt5/client/OAIInline_object.h         |  73 ----------
 .../cpp-qt5/client/OAIInline_object_1.cpp     | 127 ------------------
 .../cpp-qt5/client/OAIInline_object_1.h       |  74 ----------
 .../petstore/cpp-qt5/client/OAIPetApi.cpp     |  18 +--
 .../petstore/cpp-qt5/client/OAIPetApi.h       |   6 +-
 .../petstore/cpp-qt5/client/OAIStoreApi.cpp   |   4 +-
 .../petstore/cpp-qt5/client/OAIStoreApi.h     |   2 +-
 .../petstore/cpp-qt5/client/OAIUserApi.cpp    |  16 +--
 .../petstore/cpp-qt5/client/OAIUserApi.h      |   8 +-
 .../client/petstore/cpp-qt5/client/client.pri |   4 -
 12 files changed, 24 insertions(+), 437 deletions(-)
 delete mode 100644 samples/client/petstore/cpp-qt5/client/OAIInline_object.cpp
 delete mode 100644 samples/client/petstore/cpp-qt5/client/OAIInline_object.h
 delete mode 100644 samples/client/petstore/cpp-qt5/client/OAIInline_object_1.cpp
 delete mode 100644 samples/client/petstore/cpp-qt5/client/OAIInline_object_1.h

diff --git a/bin/cpp-qt5-petstore.sh b/bin/cpp-qt5-petstore.sh
index 56db53e7fa..ee4f311199 100755
--- a/bin/cpp-qt5-petstore.sh
+++ b/bin/cpp-qt5-petstore.sh
@@ -27,6 +27,6 @@ fi
 
 # if you've executed sbt assembly previously it will use that instead.
 export JAVA_OPTS="${JAVA_OPTS} -Xmx1024M -DloggerPath=conf/log4j.properties"
-ags="generate -t modules/openapi-generator/src/main/resources/cpp-qt5-client -i modules/openapi-generator/src/test/resources/3_0/petstore.yaml -g cpp-qt5-client -o samples/client/petstore/cpp-qt5 $@"
+ags="generate -t modules/openapi-generator/src/main/resources/cpp-qt5-client -i modules/openapi-generator/src/test/resources/2_0/petstore.yaml -g cpp-qt5-client -o samples/client/petstore/cpp-qt5 $@"
 
 java $JAVA_OPTS -jar $executable $ags
diff --git a/samples/client/petstore/cpp-qt5/client/OAIInline_object.cpp b/samples/client/petstore/cpp-qt5/client/OAIInline_object.cpp
deleted file mode 100644
index 5d5218fb10..0000000000
--- a/samples/client/petstore/cpp-qt5/client/OAIInline_object.cpp
+++ /dev/null
@@ -1,127 +0,0 @@
-/**
- * OpenAPI Petstore
- * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters.
- *
- * The version of the OpenAPI document: 1.0.0
- * 
- *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-
-#include "OAIInline_object.h"
-
-#include "OAIHelpers.h"
-
-#include <QJsonDocument>
-#include <QJsonArray>
-#include <QObject>
-#include <QDebug>
-
-namespace OpenAPI {
-
-OAIInline_object::OAIInline_object(QString json) {
-    this->init();
-    this->fromJson(json);
-}
-
-OAIInline_object::OAIInline_object() {
-    this->init();
-}
-
-OAIInline_object::~OAIInline_object() {
-
-}
-
-void
-OAIInline_object::init() {
-    
-    m_name_isSet = false;
-    m_name_isValid = false;
-    
-    m_status_isSet = false;
-    m_status_isValid = false;
-    }
-
-void
-OAIInline_object::fromJson(QString jsonString) {
-    QByteArray array (jsonString.toStdString().c_str());
-    QJsonDocument doc = QJsonDocument::fromJson(array);
-    QJsonObject jsonObject = doc.object();
-    this->fromJsonObject(jsonObject);
-}
-
-void
-OAIInline_object::fromJsonObject(QJsonObject json) {
-    
-    m_name_isValid = ::OpenAPI::fromJsonValue(name, json[QString("name")]);
-    
-    
-    m_status_isValid = ::OpenAPI::fromJsonValue(status, json[QString("status")]);
-    
-    
-}
-
-QString
-OAIInline_object::asJson () const {
-    QJsonObject obj = this->asJsonObject();
-    QJsonDocument doc(obj);
-    QByteArray bytes = doc.toJson();
-    return QString(bytes);
-}
-
-QJsonObject
-OAIInline_object::asJsonObject() const {
-    QJsonObject obj;
-	if(m_name_isSet){
-        obj.insert(QString("name"), ::OpenAPI::toJsonValue(name));
-    }
-	if(m_status_isSet){
-        obj.insert(QString("status"), ::OpenAPI::toJsonValue(status));
-    }
-    return obj;
-}
-
-
-QString
-OAIInline_object::getName() const {
-    return name;
-}
-void
-OAIInline_object::setName(const QString &name) {
-    this->name = name;
-    this->m_name_isSet = true;
-}
-
-
-QString
-OAIInline_object::getStatus() const {
-    return status;
-}
-void
-OAIInline_object::setStatus(const QString &status) {
-    this->status = status;
-    this->m_status_isSet = true;
-}
-
-bool
-OAIInline_object::isSet() const {
-    bool isObjectUpdated = false;
-    do{ 
-        if(m_name_isSet){ isObjectUpdated = true; break;}
-    
-        if(m_status_isSet){ isObjectUpdated = true; break;}
-    }while(false);
-    return isObjectUpdated;
-}
-
-bool
-OAIInline_object::isValid() const {
-    // only required properties are required for the object to be considered valid
-    return true;
-}
-
-}
-
diff --git a/samples/client/petstore/cpp-qt5/client/OAIInline_object.h b/samples/client/petstore/cpp-qt5/client/OAIInline_object.h
deleted file mode 100644
index cde555a97c..0000000000
--- a/samples/client/petstore/cpp-qt5/client/OAIInline_object.h
+++ /dev/null
@@ -1,73 +0,0 @@
-/**
- * OpenAPI Petstore
- * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters.
- *
- * The version of the OpenAPI document: 1.0.0
- * 
- *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-/*
- * OAIInline_object.h
- *
- * 
- */
-
-#ifndef OAIInline_object_H
-#define OAIInline_object_H
-
-#include <QJsonObject>
-
-
-#include <QString>
-
-#include "OAIObject.h"
-#include "OAIEnum.h"
-
-namespace OpenAPI {
-
-class OAIInline_object: public OAIObject {
-public:
-    OAIInline_object();
-    OAIInline_object(QString json);
-    ~OAIInline_object() override;
-
-    QString asJson () const override;
-    QJsonObject asJsonObject() const override;
-    void fromJsonObject(QJsonObject json) override;
-    void fromJson(QString jsonString) override;
-
-    
-    QString getName() const;
-    void setName(const QString &name);
-
-    
-    QString getStatus() const;
-    void setStatus(const QString &status);
-
-    
-
-    virtual bool isSet() const override;
-    virtual bool isValid() const override;
-
-private:
-    void init();
-    
-    QString name;
-    bool m_name_isSet;
-    bool m_name_isValid;
-    
-    QString status;
-    bool m_status_isSet;
-    bool m_status_isValid;
-    
-    };
-
-}
-
-Q_DECLARE_METATYPE(OpenAPI::OAIInline_object)
-
-#endif // OAIInline_object_H
diff --git a/samples/client/petstore/cpp-qt5/client/OAIInline_object_1.cpp b/samples/client/petstore/cpp-qt5/client/OAIInline_object_1.cpp
deleted file mode 100644
index 3624546e32..0000000000
--- a/samples/client/petstore/cpp-qt5/client/OAIInline_object_1.cpp
+++ /dev/null
@@ -1,127 +0,0 @@
-/**
- * OpenAPI Petstore
- * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters.
- *
- * The version of the OpenAPI document: 1.0.0
- * 
- *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-
-#include "OAIInline_object_1.h"
-
-#include "OAIHelpers.h"
-
-#include <QJsonDocument>
-#include <QJsonArray>
-#include <QObject>
-#include <QDebug>
-
-namespace OpenAPI {
-
-OAIInline_object_1::OAIInline_object_1(QString json) {
-    this->init();
-    this->fromJson(json);
-}
-
-OAIInline_object_1::OAIInline_object_1() {
-    this->init();
-}
-
-OAIInline_object_1::~OAIInline_object_1() {
-
-}
-
-void
-OAIInline_object_1::init() {
-    
-    m_additional_metadata_isSet = false;
-    m_additional_metadata_isValid = false;
-    
-    m_file_isSet = false;
-    m_file_isValid = false;
-    }
-
-void
-OAIInline_object_1::fromJson(QString jsonString) {
-    QByteArray array (jsonString.toStdString().c_str());
-    QJsonDocument doc = QJsonDocument::fromJson(array);
-    QJsonObject jsonObject = doc.object();
-    this->fromJsonObject(jsonObject);
-}
-
-void
-OAIInline_object_1::fromJsonObject(QJsonObject json) {
-    
-    m_additional_metadata_isValid = ::OpenAPI::fromJsonValue(additional_metadata, json[QString("additionalMetadata")]);
-    
-    
-    m_file_isValid = ::OpenAPI::fromJsonValue(file, json[QString("file")]);
-    
-    
-}
-
-QString
-OAIInline_object_1::asJson () const {
-    QJsonObject obj = this->asJsonObject();
-    QJsonDocument doc(obj);
-    QByteArray bytes = doc.toJson();
-    return QString(bytes);
-}
-
-QJsonObject
-OAIInline_object_1::asJsonObject() const {
-    QJsonObject obj;
-	if(m_additional_metadata_isSet){
-        obj.insert(QString("additionalMetadata"), ::OpenAPI::toJsonValue(additional_metadata));
-    }
-	if(file.isSet()){
-        obj.insert(QString("file"), ::OpenAPI::toJsonValue(file));
-    }
-    return obj;
-}
-
-
-QString
-OAIInline_object_1::getAdditionalMetadata() const {
-    return additional_metadata;
-}
-void
-OAIInline_object_1::setAdditionalMetadata(const QString &additional_metadata) {
-    this->additional_metadata = additional_metadata;
-    this->m_additional_metadata_isSet = true;
-}
-
-
-OAIHttpRequestInputFileElement*
-OAIInline_object_1::getFile() const {
-    return file;
-}
-void
-OAIInline_object_1::setFile(const OAIHttpRequestInputFileElement* &file) {
-    this->file = file;
-    this->m_file_isSet = true;
-}
-
-bool
-OAIInline_object_1::isSet() const {
-    bool isObjectUpdated = false;
-    do{ 
-        if(m_additional_metadata_isSet){ isObjectUpdated = true; break;}
-    
-        if(file.isSet()){ isObjectUpdated = true; break;}
-    }while(false);
-    return isObjectUpdated;
-}
-
-bool
-OAIInline_object_1::isValid() const {
-    // only required properties are required for the object to be considered valid
-    return true;
-}
-
-}
-
diff --git a/samples/client/petstore/cpp-qt5/client/OAIInline_object_1.h b/samples/client/petstore/cpp-qt5/client/OAIInline_object_1.h
deleted file mode 100644
index 3f2ff572ee..0000000000
--- a/samples/client/petstore/cpp-qt5/client/OAIInline_object_1.h
+++ /dev/null
@@ -1,74 +0,0 @@
-/**
- * OpenAPI Petstore
- * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters.
- *
- * The version of the OpenAPI document: 1.0.0
- * 
- *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- */
-
-/*
- * OAIInline_object_1.h
- *
- * 
- */
-
-#ifndef OAIInline_object_1_H
-#define OAIInline_object_1_H
-
-#include <QJsonObject>
-
-
-#include "OAIHttpRequest.h"
-#include <QString>
-
-#include "OAIObject.h"
-#include "OAIEnum.h"
-
-namespace OpenAPI {
-
-class OAIInline_object_1: public OAIObject {
-public:
-    OAIInline_object_1();
-    OAIInline_object_1(QString json);
-    ~OAIInline_object_1() override;
-
-    QString asJson () const override;
-    QJsonObject asJsonObject() const override;
-    void fromJsonObject(QJsonObject json) override;
-    void fromJson(QString jsonString) override;
-
-    
-    QString getAdditionalMetadata() const;
-    void setAdditionalMetadata(const QString &additional_metadata);
-
-    
-    OAIHttpRequestInputFileElement* getFile() const;
-    void setFile(const OAIHttpRequestInputFileElement* &file);
-
-    
-
-    virtual bool isSet() const override;
-    virtual bool isValid() const override;
-
-private:
-    void init();
-    
-    QString additional_metadata;
-    bool m_additional_metadata_isSet;
-    bool m_additional_metadata_isValid;
-    
-    OAIHttpRequestInputFileElement* file;
-    bool m_file_isSet;
-    bool m_file_isValid;
-    
-    };
-
-}
-
-Q_DECLARE_METATYPE(OpenAPI::OAIInline_object_1)
-
-#endif // OAIInline_object_1_H
diff --git a/samples/client/petstore/cpp-qt5/client/OAIPetApi.cpp b/samples/client/petstore/cpp-qt5/client/OAIPetApi.cpp
index 808206ac29..1341a73c3b 100644
--- a/samples/client/petstore/cpp-qt5/client/OAIPetApi.cpp
+++ b/samples/client/petstore/cpp-qt5/client/OAIPetApi.cpp
@@ -52,7 +52,7 @@ void OAIPetApi::addHeaders(const QString& key, const QString& value){
 
 
 void
-OAIPetApi::addPet(const OAIPet& oai_pet) {
+OAIPetApi::addPet(const OAIPet& body) {
     QString fullPath;
     fullPath.append(this->host).append(this->basePath).append("/pet");
     
@@ -61,7 +61,7 @@ OAIPetApi::addPet(const OAIPet& oai_pet) {
     OAIHttpRequestInput input(fullPath, "POST");
 
     
-    QString output = oai_pet.asJson();
+    QString output = body.asJson();
     input.request_body.append(output);
     
 
@@ -247,7 +247,7 @@ OAIPetApi::findPetsByStatusCallback(OAIHttpRequestWorker * worker) {
 }
 
 void
-OAIPetApi::findPetsByTags(const QList<QString>& tags, const qint32& max_count) {
+OAIPetApi::findPetsByTags(const QList<QString>& tags) {
     QString fullPath;
     fullPath.append(this->host).append(this->basePath).append("/pet/findByTags");
     
@@ -291,14 +291,6 @@ OAIPetApi::findPetsByTags(const QList<QString>& tags, const qint32& max_count) {
       }
     }
     
-    if (fullPath.indexOf("?") > 0)
-      fullPath.append("&");
-    else
-      fullPath.append("?");
-    fullPath.append(QUrl::toPercentEncoding("maxCount"))
-        .append("=")
-        .append(QUrl::toPercentEncoding(::OpenAPI::toStringValue(max_count)));
-    
     OAIHttpRequestWorker *worker = new OAIHttpRequestWorker();
     worker->setTimeOut(timeout);
     OAIHttpRequestInput input(fullPath, "GET");
@@ -399,7 +391,7 @@ OAIPetApi::getPetByIdCallback(OAIHttpRequestWorker * worker) {
 }
 
 void
-OAIPetApi::updatePet(const OAIPet& oai_pet) {
+OAIPetApi::updatePet(const OAIPet& body) {
     QString fullPath;
     fullPath.append(this->host).append(this->basePath).append("/pet");
     
@@ -408,7 +400,7 @@ OAIPetApi::updatePet(const OAIPet& oai_pet) {
     OAIHttpRequestInput input(fullPath, "PUT");
 
     
-    QString output = oai_pet.asJson();
+    QString output = body.asJson();
     input.request_body.append(output);
     
 
diff --git a/samples/client/petstore/cpp-qt5/client/OAIPetApi.h b/samples/client/petstore/cpp-qt5/client/OAIPetApi.h
index 2e89093994..449de95853 100644
--- a/samples/client/petstore/cpp-qt5/client/OAIPetApi.h
+++ b/samples/client/petstore/cpp-qt5/client/OAIPetApi.h
@@ -37,12 +37,12 @@ public:
     void setApiTimeOutMs(const int tout);
     void addHeaders(const QString& key, const QString& value);
 
-    void addPet(const OAIPet& oai_pet);
+    void addPet(const OAIPet& body);
     void deletePet(const qint64& pet_id, const QString& api_key);
     void findPetsByStatus(const QList<QString>& status);
-    void findPetsByTags(const QList<QString>& tags, const qint32& max_count);
+    void findPetsByTags(const QList<QString>& tags);
     void getPetById(const qint64& pet_id);
-    void updatePet(const OAIPet& oai_pet);
+    void updatePet(const OAIPet& body);
     void updatePetWithForm(const qint64& pet_id, const QString& name, const QString& status);
     void uploadFile(const qint64& pet_id, const QString& additional_metadata, const OAIHttpRequestInputFileElement*& file);
     
diff --git a/samples/client/petstore/cpp-qt5/client/OAIStoreApi.cpp b/samples/client/petstore/cpp-qt5/client/OAIStoreApi.cpp
index 681dc87f76..7b2e37f635 100644
--- a/samples/client/petstore/cpp-qt5/client/OAIStoreApi.cpp
+++ b/samples/client/petstore/cpp-qt5/client/OAIStoreApi.cpp
@@ -204,7 +204,7 @@ OAIStoreApi::getOrderByIdCallback(OAIHttpRequestWorker * worker) {
 }
 
 void
-OAIStoreApi::placeOrder(const OAIOrder& oai_order) {
+OAIStoreApi::placeOrder(const OAIOrder& body) {
     QString fullPath;
     fullPath.append(this->host).append(this->basePath).append("/store/order");
     
@@ -213,7 +213,7 @@ OAIStoreApi::placeOrder(const OAIOrder& oai_order) {
     OAIHttpRequestInput input(fullPath, "POST");
 
     
-    QString output = oai_order.asJson();
+    QString output = body.asJson();
     input.request_body.append(output);
     
 
diff --git a/samples/client/petstore/cpp-qt5/client/OAIStoreApi.h b/samples/client/petstore/cpp-qt5/client/OAIStoreApi.h
index ebda579b9b..2f9d41b998 100644
--- a/samples/client/petstore/cpp-qt5/client/OAIStoreApi.h
+++ b/samples/client/petstore/cpp-qt5/client/OAIStoreApi.h
@@ -39,7 +39,7 @@ public:
     void deleteOrder(const QString& order_id);
     void getInventory();
     void getOrderById(const qint64& order_id);
-    void placeOrder(const OAIOrder& oai_order);
+    void placeOrder(const OAIOrder& body);
     
 private:
     QString basePath;
diff --git a/samples/client/petstore/cpp-qt5/client/OAIUserApi.cpp b/samples/client/petstore/cpp-qt5/client/OAIUserApi.cpp
index f14ab4d08d..57556eab78 100644
--- a/samples/client/petstore/cpp-qt5/client/OAIUserApi.cpp
+++ b/samples/client/petstore/cpp-qt5/client/OAIUserApi.cpp
@@ -52,7 +52,7 @@ void OAIUserApi::addHeaders(const QString& key, const QString& value){
 
 
 void
-OAIUserApi::createUser(const OAIUser& oai_user) {
+OAIUserApi::createUser(const OAIUser& body) {
     QString fullPath;
     fullPath.append(this->host).append(this->basePath).append("/user");
     
@@ -61,7 +61,7 @@ OAIUserApi::createUser(const OAIUser& oai_user) {
     OAIHttpRequestInput input(fullPath, "POST");
 
     
-    QString output = oai_user.asJson();
+    QString output = body.asJson();
     input.request_body.append(output);
     
 
@@ -101,7 +101,7 @@ OAIUserApi::createUserCallback(OAIHttpRequestWorker * worker) {
 }
 
 void
-OAIUserApi::createUsersWithArrayInput(const QList<OAIUser>& oai_user) {
+OAIUserApi::createUsersWithArrayInput(const QList<OAIUser>& body) {
     QString fullPath;
     fullPath.append(this->host).append(this->basePath).append("/user/createWithArray");
     
@@ -110,7 +110,7 @@ OAIUserApi::createUsersWithArrayInput(const QList<OAIUser>& oai_user) {
     OAIHttpRequestInput input(fullPath, "POST");
 
     
-    QJsonDocument doc(::OpenAPI::toJsonValue(oai_user).toArray());
+    QJsonDocument doc(::OpenAPI::toJsonValue(body).toArray());
     QByteArray bytes = doc.toJson();
     input.request_body.append(bytes);
     
@@ -151,7 +151,7 @@ OAIUserApi::createUsersWithArrayInputCallback(OAIHttpRequestWorker * worker) {
 }
 
 void
-OAIUserApi::createUsersWithListInput(const QList<OAIUser>& oai_user) {
+OAIUserApi::createUsersWithListInput(const QList<OAIUser>& body) {
     QString fullPath;
     fullPath.append(this->host).append(this->basePath).append("/user/createWithList");
     
@@ -160,7 +160,7 @@ OAIUserApi::createUsersWithListInput(const QList<OAIUser>& oai_user) {
     OAIHttpRequestInput input(fullPath, "POST");
 
     
-    QJsonDocument doc(::OpenAPI::toJsonValue(oai_user).toArray());
+    QJsonDocument doc(::OpenAPI::toJsonValue(body).toArray());
     QByteArray bytes = doc.toJson();
     input.request_body.append(bytes);
     
@@ -406,7 +406,7 @@ OAIUserApi::logoutUserCallback(OAIHttpRequestWorker * worker) {
 }
 
 void
-OAIUserApi::updateUser(const QString& username, const OAIUser& oai_user) {
+OAIUserApi::updateUser(const QString& username, const OAIUser& body) {
     QString fullPath;
     fullPath.append(this->host).append(this->basePath).append("/user/{username}");
     QString usernamePathParam("{");
@@ -418,7 +418,7 @@ OAIUserApi::updateUser(const QString& username, const OAIUser& oai_user) {
     OAIHttpRequestInput input(fullPath, "PUT");
 
     
-    QString output = oai_user.asJson();
+    QString output = body.asJson();
     input.request_body.append(output);
     
 
diff --git a/samples/client/petstore/cpp-qt5/client/OAIUserApi.h b/samples/client/petstore/cpp-qt5/client/OAIUserApi.h
index b72cc28e42..454210caa6 100644
--- a/samples/client/petstore/cpp-qt5/client/OAIUserApi.h
+++ b/samples/client/petstore/cpp-qt5/client/OAIUserApi.h
@@ -36,14 +36,14 @@ public:
     void setApiTimeOutMs(const int tout);
     void addHeaders(const QString& key, const QString& value);
 
-    void createUser(const OAIUser& oai_user);
-    void createUsersWithArrayInput(const QList<OAIUser>& oai_user);
-    void createUsersWithListInput(const QList<OAIUser>& oai_user);
+    void createUser(const OAIUser& body);
+    void createUsersWithArrayInput(const QList<OAIUser>& body);
+    void createUsersWithListInput(const QList<OAIUser>& body);
     void deleteUser(const QString& username);
     void getUserByName(const QString& username);
     void loginUser(const QString& username, const QString& password);
     void logoutUser();
-    void updateUser(const QString& username, const OAIUser& oai_user);
+    void updateUser(const QString& username, const OAIUser& body);
     
 private:
     QString basePath;
diff --git a/samples/client/petstore/cpp-qt5/client/client.pri b/samples/client/petstore/cpp-qt5/client/client.pri
index e51b4c3108..ca6c9b5524 100644
--- a/samples/client/petstore/cpp-qt5/client/client.pri
+++ b/samples/client/petstore/cpp-qt5/client/client.pri
@@ -4,8 +4,6 @@ HEADERS += \
 # Models
     $${PWD}/OAIApiResponse.h \
     $${PWD}/OAICategory.h \
-    $${PWD}/OAIInline_object.h \
-    $${PWD}/OAIInline_object_1.h \
     $${PWD}/OAIOrder.h \
     $${PWD}/OAIPet.h \
     $${PWD}/OAITag.h \
@@ -24,8 +22,6 @@ SOURCES += \
 # Models
     $${PWD}/OAIApiResponse.cpp \
     $${PWD}/OAICategory.cpp \
-    $${PWD}/OAIInline_object.cpp \
-    $${PWD}/OAIInline_object_1.cpp \
     $${PWD}/OAIOrder.cpp \
     $${PWD}/OAIPet.cpp \
     $${PWD}/OAITag.cpp \

From 8253c28d6e0cae67b9710f998d3adf7a5d7b91a1 Mon Sep 17 00:00:00 2001
From: William Cheng <wing328hk@gmail.com>
Date: Fri, 26 Jul 2019 09:49:44 +0800
Subject: [PATCH 57/62] [Java] Replace "useNullForUnknownEnumValue" option with
 the nullable attribute  (#3455)

* add nullable support to enum

* update test spec with nullable enum

* update samples

* update samples
---
 bin/java-petstore-jersey1.sh                  |   2 +-
 bin/java-petstore-jersey2.json                |   5 +-
 .../openapitools/codegen/CodegenModel.java    | 153 +++++++++---------
 .../openapitools/codegen/DefaultCodegen.java  |  21 +--
 .../languages/AbstractJavaCodegen.java        |  10 --
 .../main/resources/Java/modelEnum.mustache    |   2 +-
 .../resources/Java/modelInnerEnum.mustache    |   2 +-
 .../JavaInflector/enumClass.mustache          |   2 +-
 .../JavaInflector/enumOuterClass.mustache     |   2 +-
 .../JavaJaxRS/cxf-cdi/enumClass.mustache      |   2 +-
 .../JavaJaxRS/cxf-ext/enumClass.mustache      |   2 +-
 .../JavaJaxRS/cxf-ext/enumOuterClass.mustache |   2 +-
 .../JavaJaxRS/cxf/enumClass.mustache          |   2 +-
 .../JavaJaxRS/cxf/enumOuterClass.mustache     |   2 +-
 .../resources/JavaJaxRS/enumClass.mustache    |   2 +-
 .../JavaJaxRS/enumOuterClass.mustache         |   2 +-
 .../resources/JavaJaxRS/modelEnum.mustache    |   2 +-
 .../JavaJaxRS/spec/enumClass.mustache         |   2 +-
 .../JavaJaxRS/spec/enumOuterClass.mustache    |   2 +-
 .../JavaPlayFramework/enumClass.mustache      |   2 +-
 .../JavaPlayFramework/enumOuterClass.mustache |   2 +-
 .../resources/JavaSpring/enumClass.mustache   |   2 +-
 .../JavaSpring/enumOuterClass.mustache        |   2 +-
 .../JavaVertXServer/enumOuterClass.mustache   |   2 +-
 .../java-msf4j-server/enumClass.mustache      |   2 +-
 .../java-msf4j-server/enumOuterClass.mustache |   2 +-
 .../resources/java-pkmst/enumClass.mustache   |   2 +-
 .../java-pkmst/enumOuterClass.mustache        |   2 +-
 .../enumOuterClass.mustache                   |   2 +-
 .../codegen/java/AbstractJavaCodegenTest.java |   5 -
 .../JavaJAXRSCXFExtServerCodegenTest.java     |   8 -
 ...ith-fake-endpoints-models-for-testing.yaml |   1 +
 .../openapitools/client/model/EnumArrays.java |   4 +-
 .../openapitools/client/model/EnumClass.java  |   2 +-
 .../openapitools/client/model/EnumTest.java   |   8 +-
 .../openapitools/client/model/MapTest.java    |   2 +-
 .../org/openapitools/client/model/Order.java  |   2 +-
 .../openapitools/client/model/OuterEnum.java  |   2 +-
 .../org/openapitools/client/model/Pet.java    |   2 +-
 .../python/petstore_api/models/enum_test.py   |   3 +-
 .../org/openapitools/model/OuterEnum.java     |   2 +-
 41 files changed, 128 insertions(+), 152 deletions(-)

diff --git a/bin/java-petstore-jersey1.sh b/bin/java-petstore-jersey1.sh
index cb6e0ea3a6..75a399b476 100755
--- a/bin/java-petstore-jersey1.sh
+++ b/bin/java-petstore-jersey1.sh
@@ -27,7 +27,7 @@ fi
 
 # if you've executed sbt assembly previously it will use that instead.
 export JAVA_OPTS="${JAVA_OPTS} -Xmx1024M -DloggerPath=conf/log4j.properties"
-ags="generate --artifact-id petstore-java-client-jersey1 -t modules/openapi-generator/src/main/resources/Java -i modules/openapi-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml -g java -o samples/client/petstore/java/jersey1 --additional-properties hideGenerationTimestamp=true --library=jersey1 --additional-properties useNullForUnknownEnumValue=true $@"
+ags="generate --artifact-id petstore-java-client-jersey1 -t modules/openapi-generator/src/main/resources/Java -i modules/openapi-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml -g java -o samples/client/petstore/java/jersey1 --additional-properties hideGenerationTimestamp=true --library=jersey1 $@"
 
 echo "Removing files and folders under samples/client/petstore/java/jersey1/src/main"
 rm -rf samples/client/petstore/java/jersey1/src/main
diff --git a/bin/java-petstore-jersey2.json b/bin/java-petstore-jersey2.json
index e5d741be32..79ed4cbc2e 100644
--- a/bin/java-petstore-jersey2.json
+++ b/bin/java-petstore-jersey2.json
@@ -1,7 +1,4 @@
 {
     "library": "jersey2",
-    "artifactId": "petstore-jersey2",
-        "additionalProperties" : {
-            "useNullForUnknownEnumValue" : true
-        }
+    "artifactId": "petstore-jersey2"
 }
diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/CodegenModel.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/CodegenModel.java
index b9e93fbf26..8f5c6d2b16 100644
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/CodegenModel.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/CodegenModel.java
@@ -61,7 +61,7 @@ public class CodegenModel {
     public Set<String> allMandatory = new TreeSet<String>(); // with parent's required properties
 
     public Set<String> imports = new TreeSet<String>();
-    public boolean hasVars, emptyVars, hasMoreModels, hasEnums, isEnum, hasRequired, hasOptional, isArrayModel, hasChildren, isMapModel;
+    public boolean hasVars, emptyVars, hasMoreModels, hasEnums, isEnum, isNullable, hasRequired, hasOptional, isArrayModel, hasChildren, isMapModel;
     public boolean hasOnlyReadOnly = true; // true if all properties are read-only
     public ExternalDocumentation externalDocumentation;
 
@@ -118,6 +118,7 @@ public class CodegenModel {
                 .append("hasMoreModels", hasMoreModels)
                 .append("hasEnums", hasEnums)
                 .append("isEnum", isEnum)
+                .append("isNullable", isEnum)
                 .append("hasRequired", hasRequired)
                 .append("hasOptional", hasOptional)
                 .append("isArrayModel", isArrayModel)
@@ -138,86 +139,86 @@ public class CodegenModel {
         CodegenModel that = (CodegenModel) o;
 
         return Objects.equals(parent, that.parent) &&
-            Objects.equals(parentSchema, that.parentSchema) &&
-            Objects.equals(interfaces, that.interfaces) &&
-            Objects.equals(allParents, that.allParents) &&
-            Objects.equals(parentModel, that.parentModel) &&
-            Objects.equals(interfaceModels, that.interfaceModels) &&
-            Objects.equals(name, that.name) &&
-            Objects.equals(classname, that.classname) &&
-            Objects.equals(title, that.title) &&
-            Objects.equals(description, that.description) &&
-            Objects.equals(classVarName, that.classVarName) &&
-            Objects.equals(modelJson, that.modelJson) &&
-            Objects.equals(dataType, that.dataType) &&
-            Objects.equals(xmlPrefix, that.xmlPrefix) &&
-            Objects.equals(xmlNamespace, that.xmlNamespace) &&
-            Objects.equals(xmlName, that.xmlName) &&
-            Objects.equals(classFilename, that.classFilename) &&
-            Objects.equals(unescapedDescription, that.unescapedDescription) &&
-            Objects.equals(discriminator, that.discriminator) &&
-            Objects.equals(defaultValue, that.defaultValue) &&
-            Objects.equals(vars, that.vars) &&
-            Objects.equals(requiredVars, that.requiredVars) &&
-            Objects.equals(optionalVars, that.optionalVars) &&
-            Objects.equals(allVars, that.allVars) &&
-            Objects.equals(allowableValues, that.allowableValues) &&
-            Objects.equals(mandatory, that.mandatory) &&
-            Objects.equals(allMandatory, that.allMandatory) &&
-            Objects.equals(imports, that.imports) &&
-            Objects.equals(hasVars, that.hasVars) &&
-            Objects.equals(emptyVars, that.emptyVars) &&
-            Objects.equals(hasMoreModels, that.hasMoreModels) &&
-            Objects.equals(hasEnums, that.hasEnums) &&
-            Objects.equals(isEnum, that.isEnum) &&
-            Objects.equals(externalDocumentation, that.externalDocumentation) &&
-            Objects.equals(hasOnlyReadOnly, that.hasOnlyReadOnly) &&
-            Objects.equals(hasChildren, that.hasChildren) &&
-            Objects.equals(parentVars, that.parentVars) &&
-            Objects.equals(vendorExtensions, that.vendorExtensions);
+                Objects.equals(parentSchema, that.parentSchema) &&
+                Objects.equals(interfaces, that.interfaces) &&
+                Objects.equals(allParents, that.allParents) &&
+                Objects.equals(parentModel, that.parentModel) &&
+                Objects.equals(interfaceModels, that.interfaceModels) &&
+                Objects.equals(name, that.name) &&
+                Objects.equals(classname, that.classname) &&
+                Objects.equals(title, that.title) &&
+                Objects.equals(description, that.description) &&
+                Objects.equals(classVarName, that.classVarName) &&
+                Objects.equals(modelJson, that.modelJson) &&
+                Objects.equals(dataType, that.dataType) &&
+                Objects.equals(xmlPrefix, that.xmlPrefix) &&
+                Objects.equals(xmlNamespace, that.xmlNamespace) &&
+                Objects.equals(xmlName, that.xmlName) &&
+                Objects.equals(classFilename, that.classFilename) &&
+                Objects.equals(unescapedDescription, that.unescapedDescription) &&
+                Objects.equals(discriminator, that.discriminator) &&
+                Objects.equals(defaultValue, that.defaultValue) &&
+                Objects.equals(vars, that.vars) &&
+                Objects.equals(requiredVars, that.requiredVars) &&
+                Objects.equals(optionalVars, that.optionalVars) &&
+                Objects.equals(allVars, that.allVars) &&
+                Objects.equals(allowableValues, that.allowableValues) &&
+                Objects.equals(mandatory, that.mandatory) &&
+                Objects.equals(allMandatory, that.allMandatory) &&
+                Objects.equals(imports, that.imports) &&
+                Objects.equals(hasVars, that.hasVars) &&
+                Objects.equals(emptyVars, that.emptyVars) &&
+                Objects.equals(hasMoreModels, that.hasMoreModels) &&
+                Objects.equals(hasEnums, that.hasEnums) &&
+                Objects.equals(isEnum, that.isEnum) &&
+                Objects.equals(externalDocumentation, that.externalDocumentation) &&
+                Objects.equals(hasOnlyReadOnly, that.hasOnlyReadOnly) &&
+                Objects.equals(hasChildren, that.hasChildren) &&
+                Objects.equals(parentVars, that.parentVars) &&
+                Objects.equals(vendorExtensions, that.vendorExtensions);
     }
 
     @Override
     public int hashCode() {
         return Objects.hash(
-            parent,
-            parentSchema,
-            interfaces,
-            allParents,
-            parentModel,
-            interfaceModels,
-            name,
-            classname,
-            title,
-            description,
-            classVarName,
-            modelJson,
-            dataType,
-            xmlPrefix,
-            xmlNamespace,
-            xmlName,
-            classFilename,
-            unescapedDescription,
-            discriminator,
-            defaultValue,
-            vars,
-            requiredVars,
-            optionalVars,
-            allVars,
-            allowableValues,
-            mandatory,
-            allMandatory,
-            imports,
-            hasVars,
-            emptyVars,
-            hasMoreModels,
-            hasEnums,
-            isEnum,
-            externalDocumentation,
-            vendorExtensions,
-            hasOnlyReadOnly,
-            hasChildren,
-            parentVars);
+                parent,
+                parentSchema,
+                interfaces,
+                allParents,
+                parentModel,
+                interfaceModels,
+                name,
+                classname,
+                title,
+                description,
+                classVarName,
+                modelJson,
+                dataType,
+                xmlPrefix,
+                xmlNamespace,
+                xmlName,
+                classFilename,
+                unescapedDescription,
+                discriminator,
+                defaultValue,
+                vars,
+                requiredVars,
+                optionalVars,
+                allVars,
+                allowableValues,
+                mandatory,
+                allMandatory,
+                imports,
+                hasVars,
+                emptyVars,
+                hasMoreModels,
+                hasEnums,
+                isEnum,
+                externalDocumentation,
+                vendorExtensions,
+                hasOnlyReadOnly,
+                hasChildren,
+                parentVars);
     }
 
     public String getParent() {
diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/DefaultCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/DefaultCodegen.java
index ba5c09b2fa..39415e2698 100644
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/DefaultCodegen.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/DefaultCodegen.java
@@ -1572,7 +1572,7 @@ public class DefaultCodegen implements CodegenConfig {
         } else if (ModelUtils.isURISchema(schema)) {
             return "URI";
         } else if (ModelUtils.isStringSchema(schema)) {
-            if(typeMapping.containsKey(schema.getFormat())) {
+            if (typeMapping.containsKey(schema.getFormat())) {
                 // If the format matches a typeMapping (supplied with the --typeMappings flag)
                 // then treat the format as a primitive type.
                 // This allows the typeMapping flag to add a new custom type which can then
@@ -1884,19 +1884,16 @@ public class DefaultCodegen implements CodegenConfig {
             if (ModelUtils.isMapSchema(schema)) {
                 addAdditionPropertiesToCodeGenModel(m, schema);
                 m.isMapModel = true;
-            }
-            else if (ModelUtils.isIntegerSchema(schema)) { // integer type
+            } else if (ModelUtils.isIntegerSchema(schema)) { // integer type
                 m.isNumeric = Boolean.TRUE;
                 if (ModelUtils.isLongSchema(schema)) { // int64/long format
                     m.isLong = Boolean.TRUE;
                 } else { // int32 format
                     m.isInteger = Boolean.TRUE;
                 }
-            }
-            else if (ModelUtils.isStringSchema(schema)) {
+            } else if (ModelUtils.isStringSchema(schema)) {
                 m.isString = Boolean.TRUE;
-            }
-            else if (ModelUtils.isNumberSchema(schema)) {
+            } else if (ModelUtils.isNumberSchema(schema)) {
                 m.isNumeric = Boolean.TRUE;
                 if (ModelUtils.isFloatSchema(schema)) { // float
                     m.isFloat = Boolean.TRUE;
@@ -1907,6 +1904,10 @@ public class DefaultCodegen implements CodegenConfig {
                 }
             }
 
+            if (Boolean.TRUE.equals(schema.getNullable())) {
+                m.isNullable = Boolean.TRUE;
+            }
+
             // passing null to allProperties and allRequired as there's no parent
             addVars(m, unaliasPropertySchema(schema.getProperties()), schema.getRequired(), null, null);
         }
@@ -2650,7 +2651,7 @@ public class DefaultCodegen implements CodegenConfig {
         if (requestBody != null) {
             if (getContentType(requestBody) != null &&
                     (getContentType(requestBody).toLowerCase(Locale.ROOT).startsWith("application/x-www-form-urlencoded") ||
-                    getContentType(requestBody).toLowerCase(Locale.ROOT).startsWith("multipart/form-data"))) {
+                            getContentType(requestBody).toLowerCase(Locale.ROOT).startsWith("multipart/form-data"))) {
                 // process form parameters
                 formParams = fromRequestBodyToFormParameters(requestBody, imports);
                 for (CodegenParameter cp : formParams) {
@@ -3018,7 +3019,7 @@ public class DefaultCodegen implements CodegenConfig {
         }
 
         Schema s;
-        if(parameter.getSchema() != null) {
+        if (parameter.getSchema() != null) {
             s = parameter.getSchema();
         } else if (parameter.getContent() != null) {
             Content content = parameter.getContent();
@@ -4942,7 +4943,7 @@ public class DefaultCodegen implements CodegenConfig {
     }
 
     protected void removeOption(String key) {
-        for(int i = 0; i < cliOptions.size(); i++) {
+        for (int i = 0; i < cliOptions.size(); i++) {
             if (key.equals(cliOptions.get(i).getOpt())) {
                 cliOptions.remove(i);
                 break;
diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractJavaCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractJavaCodegen.java
index d47c22925c..2d7f3d2ce6 100644
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractJavaCodegen.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractJavaCodegen.java
@@ -52,7 +52,6 @@ public abstract class AbstractJavaCodegen extends DefaultCodegen implements Code
     public static final String SUPPORT_JAVA6 = "supportJava6";
     public static final String DISABLE_HTML_ESCAPING = "disableHtmlEscaping";
     public static final String BOOLEAN_GETTER_PREFIX = "booleanGetterPrefix";
-    public static final String USE_NULL_FOR_UNKNOWN_ENUM_VALUE = "useNullForUnknownEnumValue";
 
     protected String dateLibrary = "threetenbp";
     protected boolean supportAsync = false;
@@ -86,7 +85,6 @@ public abstract class AbstractJavaCodegen extends DefaultCodegen implements Code
     protected boolean supportJava6 = false;
     protected boolean disableHtmlEscaping = false;
     protected String booleanGetterPrefix = "get";
-    protected boolean useNullForUnknownEnumValue = false;
     protected String parentGroupId = "";
     protected String parentArtifactId = "";
     protected String parentVersion = "";
@@ -220,10 +218,6 @@ public abstract class AbstractJavaCodegen extends DefaultCodegen implements Code
             this.setBooleanGetterPrefix(additionalProperties.get(BOOLEAN_GETTER_PREFIX).toString());
         }
         additionalProperties.put(BOOLEAN_GETTER_PREFIX, booleanGetterPrefix);
-        if (additionalProperties.containsKey(USE_NULL_FOR_UNKNOWN_ENUM_VALUE)) {
-            this.setUseNullForUnknownEnumValue(Boolean.valueOf(additionalProperties.get(USE_NULL_FOR_UNKNOWN_ENUM_VALUE).toString()));
-        }
-        additionalProperties.put(USE_NULL_FOR_UNKNOWN_ENUM_VALUE, useNullForUnknownEnumValue);
 
         if (additionalProperties.containsKey(CodegenConstants.INVOKER_PACKAGE)) {
             this.setInvokerPackage((String) additionalProperties.get(CodegenConstants.INVOKER_PACKAGE));
@@ -1405,10 +1399,6 @@ public abstract class AbstractJavaCodegen extends DefaultCodegen implements Code
         this.booleanGetterPrefix = booleanGetterPrefix;
     }
 
-    public void setUseNullForUnknownEnumValue(boolean useNullForUnknownEnumValue) {
-        this.useNullForUnknownEnumValue = useNullForUnknownEnumValue;
-    }
-
     @Override
     public String escapeQuotationMark(String input) {
         // remove " to avoid code injection
diff --git a/modules/openapi-generator/src/main/resources/Java/modelEnum.mustache b/modules/openapi-generator/src/main/resources/Java/modelEnum.mustache
index f9136b1a20..9428bc70f9 100644
--- a/modules/openapi-generator/src/main/resources/Java/modelEnum.mustache
+++ b/modules/openapi-generator/src/main/resources/Java/modelEnum.mustache
@@ -53,7 +53,7 @@ public enum {{#datatypeWithEnum}}{{{.}}}{{/datatypeWithEnum}}{{^datatypeWithEnum
         return b;
       }
     }
-    {{#useNullForUnknownEnumValue}}return null;{{/useNullForUnknownEnumValue}}{{^useNullForUnknownEnumValue}}throw new IllegalArgumentException("Unexpected value '" + value + "'");{{/useNullForUnknownEnumValue}}
+    {{#isNullable}}return null;{{/isNullable}}{{^isNullable}}throw new IllegalArgumentException("Unexpected value '" + value + "'");{{/isNullable}}
   }
 {{#gson}}
 
diff --git a/modules/openapi-generator/src/main/resources/Java/modelInnerEnum.mustache b/modules/openapi-generator/src/main/resources/Java/modelInnerEnum.mustache
index ea0656c2dd..614e260c97 100644
--- a/modules/openapi-generator/src/main/resources/Java/modelInnerEnum.mustache
+++ b/modules/openapi-generator/src/main/resources/Java/modelInnerEnum.mustache
@@ -44,7 +44,7 @@
           return b;
         }
       }
-      {{#useNullForUnknownEnumValue}}return null;{{/useNullForUnknownEnumValue}}{{^useNullForUnknownEnumValue}}throw new IllegalArgumentException("Unexpected value '" + value + "'");{{/useNullForUnknownEnumValue}}
+      {{#isNullable}}return null;{{/isNullable}}{{^isNullable}}throw new IllegalArgumentException("Unexpected value '" + value + "'");{{/isNullable}}
     }
 {{#gson}}
 
diff --git a/modules/openapi-generator/src/main/resources/JavaInflector/enumClass.mustache b/modules/openapi-generator/src/main/resources/JavaInflector/enumClass.mustache
index 2f36ba0b6c..0fe7d8c27b 100644
--- a/modules/openapi-generator/src/main/resources/JavaInflector/enumClass.mustache
+++ b/modules/openapi-generator/src/main/resources/JavaInflector/enumClass.mustache
@@ -39,6 +39,6 @@
           return b;
         }
       }
-      {{#useNullForUnknownEnumValue}}return null;{{/useNullForUnknownEnumValue}}{{^useNullForUnknownEnumValue}}throw new IllegalArgumentException("Unexpected value '" + text + "'");{{/useNullForUnknownEnumValue}}
+      {{#isNullable}}return null;{{/isNullable}}{{^isNullable}}throw new IllegalArgumentException("Unexpected value '" + text + "'");{{/isNullable}}
     }
   }
diff --git a/modules/openapi-generator/src/main/resources/JavaInflector/enumOuterClass.mustache b/modules/openapi-generator/src/main/resources/JavaInflector/enumOuterClass.mustache
index 0808ffda73..9e032184be 100644
--- a/modules/openapi-generator/src/main/resources/JavaInflector/enumOuterClass.mustache
+++ b/modules/openapi-generator/src/main/resources/JavaInflector/enumOuterClass.mustache
@@ -37,6 +37,6 @@ public enum {{#datatypeWithEnum}}{{{.}}}{{/datatypeWithEnum}}{{^datatypeWithEnum
         return b;
       }
     }
-    {{#useNullForUnknownEnumValue}}return null;{{/useNullForUnknownEnumValue}}{{^useNullForUnknownEnumValue}}throw new IllegalArgumentException("Unexpected value '" + text + "'");{{/useNullForUnknownEnumValue}}
+    {{#isNullable}}return null;{{/isNullable}}{{^isNullable}}throw new IllegalArgumentException("Unexpected value '" + text + "'");{{/isNullable}}
   }
 }
diff --git a/modules/openapi-generator/src/main/resources/JavaJaxRS/cxf-cdi/enumClass.mustache b/modules/openapi-generator/src/main/resources/JavaJaxRS/cxf-cdi/enumClass.mustache
index dc7b2db827..2d7d5388cf 100644
--- a/modules/openapi-generator/src/main/resources/JavaJaxRS/cxf-cdi/enumClass.mustache
+++ b/modules/openapi-generator/src/main/resources/JavaJaxRS/cxf-cdi/enumClass.mustache
@@ -28,6 +28,6 @@ public enum {{#datatypeWithEnum}}{{{.}}}{{/datatypeWithEnum}}{{^datatypeWithEnum
                 return b;
             }
         }
-        {{#useNullForUnknownEnumValue}}return null;{{/useNullForUnknownEnumValue}}{{^useNullForUnknownEnumValue}}throw new IllegalArgumentException("Unexpected value '" + value + "'");{{/useNullForUnknownEnumValue}}
+        {{#isNullable}}return null;{{/isNullable}}{{^isNullable}}throw new IllegalArgumentException("Unexpected value '" + value + "'");{{/isNullable}}
     }
 }
diff --git a/modules/openapi-generator/src/main/resources/JavaJaxRS/cxf-ext/enumClass.mustache b/modules/openapi-generator/src/main/resources/JavaJaxRS/cxf-ext/enumClass.mustache
index 549a7b100c..34b72f9a05 100644
--- a/modules/openapi-generator/src/main/resources/JavaJaxRS/cxf-ext/enumClass.mustache
+++ b/modules/openapi-generator/src/main/resources/JavaJaxRS/cxf-ext/enumClass.mustache
@@ -28,6 +28,6 @@ public enum {{datatypeWithEnum}} {
                 return b;
             }
         }
-        {{#useNullForUnknownEnumValue}}return null;{{/useNullForUnknownEnumValue}}{{^useNullForUnknownEnumValue}}throw new IllegalArgumentException("Unexpected value '" + value + "'");{{/useNullForUnknownEnumValue}}
+        {{#isNullable}}return null;{{/isNullable}}{{^isNullable}}throw new IllegalArgumentException("Unexpected value '" + value + "'");{{/isNullable}}
     }
 }
diff --git a/modules/openapi-generator/src/main/resources/JavaJaxRS/cxf-ext/enumOuterClass.mustache b/modules/openapi-generator/src/main/resources/JavaJaxRS/cxf-ext/enumOuterClass.mustache
index d807cfb17a..86916472d2 100644
--- a/modules/openapi-generator/src/main/resources/JavaJaxRS/cxf-ext/enumOuterClass.mustache
+++ b/modules/openapi-generator/src/main/resources/JavaJaxRS/cxf-ext/enumOuterClass.mustache
@@ -42,7 +42,7 @@ public enum {{#datatypeWithEnum}}{{{.}}}{{/datatypeWithEnum}}{{^datatypeWithEnum
         return b;
       }
     }
-    {{#useNullForUnknownEnumValue}}return null;{{/useNullForUnknownEnumValue}}{{^useNullForUnknownEnumValue}}throw new IllegalArgumentException("Unexpected value '" + value + "'");{{/useNullForUnknownEnumValue}}
+    {{#isNullable}}return null;{{/isNullable}}{{^isNullable}}throw new IllegalArgumentException("Unexpected value '" + value + "'");{{/isNullable}}
   }
   
 }
diff --git a/modules/openapi-generator/src/main/resources/JavaJaxRS/cxf/enumClass.mustache b/modules/openapi-generator/src/main/resources/JavaJaxRS/cxf/enumClass.mustache
index 10170a28a1..3e19ca9809 100644
--- a/modules/openapi-generator/src/main/resources/JavaJaxRS/cxf/enumClass.mustache
+++ b/modules/openapi-generator/src/main/resources/JavaJaxRS/cxf/enumClass.mustache
@@ -28,6 +28,6 @@ public enum {{datatypeWithEnum}} {
                 return b;
             }
         }
-        {{#useNullForUnknownEnumValue}}return null;{{/useNullForUnknownEnumValue}}{{^useNullForUnknownEnumValue}}throw new IllegalArgumentException("Unexpected value '" + value + "'");{{/useNullForUnknownEnumValue}}
+        {{#isNullable}}return null;{{/isNullable}}{{^isNullable}}throw new IllegalArgumentException("Unexpected value '" + value + "'");{{/isNullable}}
     }
 }
diff --git a/modules/openapi-generator/src/main/resources/JavaJaxRS/cxf/enumOuterClass.mustache b/modules/openapi-generator/src/main/resources/JavaJaxRS/cxf/enumOuterClass.mustache
index d807cfb17a..86916472d2 100644
--- a/modules/openapi-generator/src/main/resources/JavaJaxRS/cxf/enumOuterClass.mustache
+++ b/modules/openapi-generator/src/main/resources/JavaJaxRS/cxf/enumOuterClass.mustache
@@ -42,7 +42,7 @@ public enum {{#datatypeWithEnum}}{{{.}}}{{/datatypeWithEnum}}{{^datatypeWithEnum
         return b;
       }
     }
-    {{#useNullForUnknownEnumValue}}return null;{{/useNullForUnknownEnumValue}}{{^useNullForUnknownEnumValue}}throw new IllegalArgumentException("Unexpected value '" + value + "'");{{/useNullForUnknownEnumValue}}
+    {{#isNullable}}return null;{{/isNullable}}{{^isNullable}}throw new IllegalArgumentException("Unexpected value '" + value + "'");{{/isNullable}}
   }
   
 }
diff --git a/modules/openapi-generator/src/main/resources/JavaJaxRS/enumClass.mustache b/modules/openapi-generator/src/main/resources/JavaJaxRS/enumClass.mustache
index 383b36a572..67c7fcc520 100644
--- a/modules/openapi-generator/src/main/resources/JavaJaxRS/enumClass.mustache
+++ b/modules/openapi-generator/src/main/resources/JavaJaxRS/enumClass.mustache
@@ -49,6 +49,6 @@
           return b;
         }
       }
-      {{#useNullForUnknownEnumValue}}return null;{{/useNullForUnknownEnumValue}}{{^useNullForUnknownEnumValue}}throw new IllegalArgumentException("Unexpected value '" + value + "'");{{/useNullForUnknownEnumValue}}
+      {{#isNullable}}return null;{{/isNullable}}{{^isNullable}}throw new IllegalArgumentException("Unexpected value '" + value + "'");{{/isNullable}}
     }
   }
diff --git a/modules/openapi-generator/src/main/resources/JavaJaxRS/enumOuterClass.mustache b/modules/openapi-generator/src/main/resources/JavaJaxRS/enumOuterClass.mustache
index 48b9beb1a7..eb063d56c6 100644
--- a/modules/openapi-generator/src/main/resources/JavaJaxRS/enumOuterClass.mustache
+++ b/modules/openapi-generator/src/main/resources/JavaJaxRS/enumOuterClass.mustache
@@ -47,6 +47,6 @@ public enum {{#datatypeWithEnum}}{{{.}}}{{/datatypeWithEnum}}{{^datatypeWithEnum
         return b;
       }
     }
-    {{#useNullForUnknownEnumValue}}return null;{{/useNullForUnknownEnumValue}}{{^useNullForUnknownEnumValue}}throw new IllegalArgumentException("Unexpected value '" + value + "'");{{/useNullForUnknownEnumValue}}
+    {{#isNullable}}return null;{{/isNullable}}{{^isNullable}}throw new IllegalArgumentException("Unexpected value '" + value + "'");{{/isNullable}}
   }
 }
diff --git a/modules/openapi-generator/src/main/resources/JavaJaxRS/modelEnum.mustache b/modules/openapi-generator/src/main/resources/JavaJaxRS/modelEnum.mustache
index 33dc27b702..906ebdb28f 100644
--- a/modules/openapi-generator/src/main/resources/JavaJaxRS/modelEnum.mustache
+++ b/modules/openapi-generator/src/main/resources/JavaJaxRS/modelEnum.mustache
@@ -45,7 +45,7 @@ public enum {{#datatypeWithEnum}}{{{.}}}{{/datatypeWithEnum}}{{^datatypeWithEnum
         return b;
       }
     }
-    {{#useNullForUnknownEnumValue}}return null;{{/useNullForUnknownEnumValue}}{{^useNullForUnknownEnumValue}}throw new IllegalArgumentException("Unexpected value '" + value + "'");{{/useNullForUnknownEnumValue}}
+    {{#isNullable}}return null;{{/isNullable}}{{^isNullable}}throw new IllegalArgumentException("Unexpected value '" + value + "'");{{/isNullable}}
   }
 {{/jackson}}
 }
diff --git a/modules/openapi-generator/src/main/resources/JavaJaxRS/spec/enumClass.mustache b/modules/openapi-generator/src/main/resources/JavaJaxRS/spec/enumClass.mustache
index ab47115aae..81284b7dd3 100644
--- a/modules/openapi-generator/src/main/resources/JavaJaxRS/spec/enumClass.mustache
+++ b/modules/openapi-generator/src/main/resources/JavaJaxRS/spec/enumClass.mustache
@@ -28,6 +28,6 @@ public enum {{datatypeWithEnum}} {
                 return b;
             }
         }
-        {{#useNullForUnknownEnumValue}}return null;{{/useNullForUnknownEnumValue}}{{^useNullForUnknownEnumValue}}throw new IllegalArgumentException("Unexpected value '" + value + "'");{{/useNullForUnknownEnumValue}}
+        {{#isNullable}}return null;{{/isNullable}}{{^isNullable}}throw new IllegalArgumentException("Unexpected value '" + value + "'");{{/isNullable}}
     }
 }
diff --git a/modules/openapi-generator/src/main/resources/JavaJaxRS/spec/enumOuterClass.mustache b/modules/openapi-generator/src/main/resources/JavaJaxRS/spec/enumOuterClass.mustache
index e6c303b1e7..2865cf70cf 100644
--- a/modules/openapi-generator/src/main/resources/JavaJaxRS/spec/enumOuterClass.mustache
+++ b/modules/openapi-generator/src/main/resources/JavaJaxRS/spec/enumOuterClass.mustache
@@ -38,6 +38,6 @@ public enum {{#datatypeWithEnum}}{{{.}}}{{/datatypeWithEnum}}{{^datatypeWithEnum
         return b;
       }
     }
-    {{#useNullForUnknownEnumValue}}return null;{{/useNullForUnknownEnumValue}}{{^useNullForUnknownEnumValue}}throw new IllegalArgumentException("Unexpected value '" + value + "'");{{/useNullForUnknownEnumValue}}
+    {{#isNullable}}return null;{{/isNullable}}{{^isNullable}}throw new IllegalArgumentException("Unexpected value '" + value + "'");{{/isNullable}}
   }
 }
diff --git a/modules/openapi-generator/src/main/resources/JavaPlayFramework/enumClass.mustache b/modules/openapi-generator/src/main/resources/JavaPlayFramework/enumClass.mustache
index 64fd1abbc8..211fddf21f 100644
--- a/modules/openapi-generator/src/main/resources/JavaPlayFramework/enumClass.mustache
+++ b/modules/openapi-generator/src/main/resources/JavaPlayFramework/enumClass.mustache
@@ -39,6 +39,6 @@
           return b;
         }
       }
-      {{#useNullForUnknownEnumValue}}return null;{{/useNullForUnknownEnumValue}}{{^useNullForUnknownEnumValue}}throw new IllegalArgumentException("Unexpected value '" + value + "'");{{/useNullForUnknownEnumValue}}
+      {{#isNullable}}return null;{{/isNullable}}{{^isNullable}}throw new IllegalArgumentException("Unexpected value '" + value + "'");{{/isNullable}}
     }
   }
diff --git a/modules/openapi-generator/src/main/resources/JavaPlayFramework/enumOuterClass.mustache b/modules/openapi-generator/src/main/resources/JavaPlayFramework/enumOuterClass.mustache
index fa51217a5c..91d3edab7b 100644
--- a/modules/openapi-generator/src/main/resources/JavaPlayFramework/enumOuterClass.mustache
+++ b/modules/openapi-generator/src/main/resources/JavaPlayFramework/enumOuterClass.mustache
@@ -37,6 +37,6 @@ public enum {{#datatypeWithEnum}}{{{.}}}{{/datatypeWithEnum}}{{^datatypeWithEnum
         return b;
       }
     }
-    {{#useNullForUnknownEnumValue}}return null;{{/useNullForUnknownEnumValue}}{{^useNullForUnknownEnumValue}}throw new IllegalArgumentException("Unexpected value '" + value + "'");{{/useNullForUnknownEnumValue}}
+    {{#isNullable}}return null;{{/isNullable}}{{^isNullable}}throw new IllegalArgumentException("Unexpected value '" + value + "'");{{/isNullable}}
   }
 }
diff --git a/modules/openapi-generator/src/main/resources/JavaSpring/enumClass.mustache b/modules/openapi-generator/src/main/resources/JavaSpring/enumClass.mustache
index c1ca5e39b7..2e90275477 100644
--- a/modules/openapi-generator/src/main/resources/JavaSpring/enumClass.mustache
+++ b/modules/openapi-generator/src/main/resources/JavaSpring/enumClass.mustache
@@ -39,6 +39,6 @@
           return b;
         }
       }
-      {{#useNullForUnknownEnumValue}}return null;{{/useNullForUnknownEnumValue}}{{^useNullForUnknownEnumValue}}throw new IllegalArgumentException("Unexpected value '" + value + "'");{{/useNullForUnknownEnumValue}}
+      {{#isNullable}}return null;{{/isNullable}}{{^isNullable}}throw new IllegalArgumentException("Unexpected value '" + value + "'");{{/isNullable}}
     }
   }
diff --git a/modules/openapi-generator/src/main/resources/JavaSpring/enumOuterClass.mustache b/modules/openapi-generator/src/main/resources/JavaSpring/enumOuterClass.mustache
index b83507092e..60d13571cb 100644
--- a/modules/openapi-generator/src/main/resources/JavaSpring/enumOuterClass.mustache
+++ b/modules/openapi-generator/src/main/resources/JavaSpring/enumOuterClass.mustache
@@ -37,6 +37,6 @@ public enum {{#datatypeWithEnum}}{{{.}}}{{/datatypeWithEnum}}{{^datatypeWithEnum
         return b;
       }
     }
-    {{#useNullForUnknownEnumValue}}return null;{{/useNullForUnknownEnumValue}}{{^useNullForUnknownEnumValue}}throw new IllegalArgumentException("Unexpected value '" + value + "'");{{/useNullForUnknownEnumValue}}
+    {{#isNullable}}return null;{{/isNullable}}{{^isNullable}}throw new IllegalArgumentException("Unexpected value '" + value + "'");{{/isNullable}}
   }
 }
diff --git a/modules/openapi-generator/src/main/resources/JavaVertXServer/enumOuterClass.mustache b/modules/openapi-generator/src/main/resources/JavaVertXServer/enumOuterClass.mustache
index 97d8170d5f..e89caa5a3f 100644
--- a/modules/openapi-generator/src/main/resources/JavaVertXServer/enumOuterClass.mustache
+++ b/modules/openapi-generator/src/main/resources/JavaVertXServer/enumOuterClass.mustache
@@ -31,6 +31,6 @@ public enum {{#datatypeWithEnum}}{{{.}}}{{/datatypeWithEnum}}{{^datatypeWithEnum
         return b;
       }
     }
-    {{#useNullForUnknownEnumValue}}return null;{{/useNullForUnknownEnumValue}}{{^useNullForUnknownEnumValue}}throw new IllegalArgumentException("Unexpected value '" + value + "'");{{/useNullForUnknownEnumValue}}
+    {{#isNullable}}return null;{{/isNullable}}{{^isNullable}}throw new IllegalArgumentException("Unexpected value '" + value + "'");{{/isNullable}}
   }
 }
\ No newline at end of file
diff --git a/modules/openapi-generator/src/main/resources/java-msf4j-server/enumClass.mustache b/modules/openapi-generator/src/main/resources/java-msf4j-server/enumClass.mustache
index 2f36ba0b6c..0fe7d8c27b 100644
--- a/modules/openapi-generator/src/main/resources/java-msf4j-server/enumClass.mustache
+++ b/modules/openapi-generator/src/main/resources/java-msf4j-server/enumClass.mustache
@@ -39,6 +39,6 @@
           return b;
         }
       }
-      {{#useNullForUnknownEnumValue}}return null;{{/useNullForUnknownEnumValue}}{{^useNullForUnknownEnumValue}}throw new IllegalArgumentException("Unexpected value '" + text + "'");{{/useNullForUnknownEnumValue}}
+      {{#isNullable}}return null;{{/isNullable}}{{^isNullable}}throw new IllegalArgumentException("Unexpected value '" + text + "'");{{/isNullable}}
     }
   }
diff --git a/modules/openapi-generator/src/main/resources/java-msf4j-server/enumOuterClass.mustache b/modules/openapi-generator/src/main/resources/java-msf4j-server/enumOuterClass.mustache
index 0808ffda73..9e032184be 100644
--- a/modules/openapi-generator/src/main/resources/java-msf4j-server/enumOuterClass.mustache
+++ b/modules/openapi-generator/src/main/resources/java-msf4j-server/enumOuterClass.mustache
@@ -37,6 +37,6 @@ public enum {{#datatypeWithEnum}}{{{.}}}{{/datatypeWithEnum}}{{^datatypeWithEnum
         return b;
       }
     }
-    {{#useNullForUnknownEnumValue}}return null;{{/useNullForUnknownEnumValue}}{{^useNullForUnknownEnumValue}}throw new IllegalArgumentException("Unexpected value '" + text + "'");{{/useNullForUnknownEnumValue}}
+    {{#isNullable}}return null;{{/isNullable}}{{^isNullable}}throw new IllegalArgumentException("Unexpected value '" + text + "'");{{/isNullable}}
   }
 }
diff --git a/modules/openapi-generator/src/main/resources/java-pkmst/enumClass.mustache b/modules/openapi-generator/src/main/resources/java-pkmst/enumClass.mustache
index 2f36ba0b6c..0fe7d8c27b 100644
--- a/modules/openapi-generator/src/main/resources/java-pkmst/enumClass.mustache
+++ b/modules/openapi-generator/src/main/resources/java-pkmst/enumClass.mustache
@@ -39,6 +39,6 @@
           return b;
         }
       }
-      {{#useNullForUnknownEnumValue}}return null;{{/useNullForUnknownEnumValue}}{{^useNullForUnknownEnumValue}}throw new IllegalArgumentException("Unexpected value '" + text + "'");{{/useNullForUnknownEnumValue}}
+      {{#isNullable}}return null;{{/isNullable}}{{^isNullable}}throw new IllegalArgumentException("Unexpected value '" + text + "'");{{/isNullable}}
     }
   }
diff --git a/modules/openapi-generator/src/main/resources/java-pkmst/enumOuterClass.mustache b/modules/openapi-generator/src/main/resources/java-pkmst/enumOuterClass.mustache
index 0808ffda73..9e032184be 100644
--- a/modules/openapi-generator/src/main/resources/java-pkmst/enumOuterClass.mustache
+++ b/modules/openapi-generator/src/main/resources/java-pkmst/enumOuterClass.mustache
@@ -37,6 +37,6 @@ public enum {{#datatypeWithEnum}}{{{.}}}{{/datatypeWithEnum}}{{^datatypeWithEnum
         return b;
       }
     }
-    {{#useNullForUnknownEnumValue}}return null;{{/useNullForUnknownEnumValue}}{{^useNullForUnknownEnumValue}}throw new IllegalArgumentException("Unexpected value '" + text + "'");{{/useNullForUnknownEnumValue}}
+    {{#isNullable}}return null;{{/isNullable}}{{^isNullable}}throw new IllegalArgumentException("Unexpected value '" + text + "'");{{/isNullable}}
   }
 }
diff --git a/modules/openapi-generator/src/main/resources/java-undertow-server/enumOuterClass.mustache b/modules/openapi-generator/src/main/resources/java-undertow-server/enumOuterClass.mustache
index 3b43067c97..5333fff8c0 100644
--- a/modules/openapi-generator/src/main/resources/java-undertow-server/enumOuterClass.mustache
+++ b/modules/openapi-generator/src/main/resources/java-undertow-server/enumOuterClass.mustache
@@ -37,6 +37,6 @@ if (String.valueOf(b.value).equals(text)) {
 return b;
 }
 }
-{{#useNullForUnknownEnumValue}}return null;{{/useNullForUnknownEnumValue}}{{^useNullForUnknownEnumValue}}throw new IllegalArgumentException("Unexpected value '" + text + "'");{{/useNullForUnknownEnumValue}}
+{{#isNullable}}return null;{{/isNullable}}{{^isNullable}}throw new IllegalArgumentException("Unexpected value '" + text + "'");{{/isNullable}}
 }
 }
diff --git a/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/AbstractJavaCodegenTest.java b/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/AbstractJavaCodegenTest.java
index f2569fb670..cd1cdbf6f8 100644
--- a/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/AbstractJavaCodegenTest.java
+++ b/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/AbstractJavaCodegenTest.java
@@ -129,7 +129,6 @@ public class AbstractJavaCodegenTest {
         Assert.assertEquals(codegen.getInvokerPackage(), "org.openapitools");
         Assert.assertEquals(codegen.additionalProperties().get(CodegenConstants.INVOKER_PACKAGE), "org.openapitools");
         Assert.assertEquals(codegen.additionalProperties().get(AbstractJavaCodegen.BOOLEAN_GETTER_PREFIX), "get");
-        Assert.assertEquals(codegen.additionalProperties().get(AbstractJavaCodegen.USE_NULL_FOR_UNKNOWN_ENUM_VALUE), Boolean.FALSE);
     }
 
     @Test
@@ -140,7 +139,6 @@ public class AbstractJavaCodegenTest {
         codegen.setApiPackage("xyz.yyyyy.zzzzzzz.api");
         codegen.setInvokerPackage("xyz.yyyyy.zzzzzzz.invoker");
         codegen.setBooleanGetterPrefix("is");
-        codegen.setUseNullForUnknownEnumValue(true);
         codegen.processOpts();
 
         Assert.assertEquals(codegen.additionalProperties().get(CodegenConstants.HIDE_GENERATION_TIMESTAMP), Boolean.TRUE);
@@ -152,7 +150,6 @@ public class AbstractJavaCodegenTest {
         Assert.assertEquals(codegen.getInvokerPackage(), "xyz.yyyyy.zzzzzzz.invoker");
         Assert.assertEquals(codegen.additionalProperties().get(CodegenConstants.INVOKER_PACKAGE), "xyz.yyyyy.zzzzzzz.invoker");
         Assert.assertEquals(codegen.additionalProperties().get(AbstractJavaCodegen.BOOLEAN_GETTER_PREFIX), "is");
-        Assert.assertEquals(codegen.additionalProperties().get(AbstractJavaCodegen.USE_NULL_FOR_UNKNOWN_ENUM_VALUE), Boolean.TRUE);
     }
 
     @Test
@@ -163,7 +160,6 @@ public class AbstractJavaCodegenTest {
         codegen.additionalProperties().put(CodegenConstants.API_PACKAGE, "xyz.yyyyy.api.oooooo");
         codegen.additionalProperties().put(CodegenConstants.INVOKER_PACKAGE, "xyz.yyyyy.invoker.oooooo");
         codegen.additionalProperties().put(AbstractJavaCodegen.BOOLEAN_GETTER_PREFIX, "getBoolean");
-        codegen.additionalProperties().put(AbstractJavaCodegen.USE_NULL_FOR_UNKNOWN_ENUM_VALUE, "true");
         codegen.processOpts();
 
         Assert.assertEquals(codegen.additionalProperties().get(CodegenConstants.HIDE_GENERATION_TIMESTAMP), Boolean.FALSE);
@@ -175,7 +171,6 @@ public class AbstractJavaCodegenTest {
         Assert.assertEquals(codegen.getInvokerPackage(), "xyz.yyyyy.invoker.oooooo");
         Assert.assertEquals(codegen.additionalProperties().get(CodegenConstants.INVOKER_PACKAGE), "xyz.yyyyy.invoker.oooooo");
         Assert.assertEquals(codegen.additionalProperties().get(AbstractJavaCodegen.BOOLEAN_GETTER_PREFIX), "getBoolean");
-        Assert.assertEquals(codegen.additionalProperties().get(AbstractJavaCodegen.USE_NULL_FOR_UNKNOWN_ENUM_VALUE), Boolean.TRUE);
     }
 
     @Test
diff --git a/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/jaxrs/JavaJAXRSCXFExtServerCodegenTest.java b/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/jaxrs/JavaJAXRSCXFExtServerCodegenTest.java
index d826048703..61081616fd 100644
--- a/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/jaxrs/JavaJAXRSCXFExtServerCodegenTest.java
+++ b/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/jaxrs/JavaJAXRSCXFExtServerCodegenTest.java
@@ -133,11 +133,6 @@ public class JavaJAXRSCXFExtServerCodegenTest extends JavaJaxrsBaseTest {
             return useMultipartFeature;
         }
 
-        // AbstractJavaCodegen.USE_NULL_FOR_UNKNOWN_ENUM_VALUE
-        public boolean isUseNullForUnknownEnumValue() {
-            return useNullForUnknownEnumValue;
-        }
-
         // SpringFeatures.USE_SPRING_ANNOTATION_CONFIG
         public boolean isUseSpringAnnotationConfig() {
             return useSpringAnnotationConfig;
@@ -253,7 +248,6 @@ public class JavaJAXRSCXFExtServerCodegenTest extends JavaJaxrsBaseTest {
         additionalProperties.put(AbstractJavaCodegen.JAVA8_MODE, "true");
         additionalProperties.put(AbstractJavaCodegen.SUPPORT_ASYNC, "true");
         additionalProperties.put(AbstractJavaCodegen.SUPPORT_JAVA6, "false");
-        additionalProperties.put(AbstractJavaCodegen.USE_NULL_FOR_UNKNOWN_ENUM_VALUE, "true");
         additionalProperties.put(AbstractJavaCodegen.WITH_XML, "true");
         // Options processed by AbstractJavaJAXRSServerCodegen
         additionalProperties.put(CodegenConstants.IMPL_FOLDER, "myimpl");
@@ -328,7 +322,6 @@ public class JavaJAXRSCXFExtServerCodegenTest extends JavaJaxrsBaseTest {
         assertEquals(testerCodegen.isFullJavaUtil(), true);
         assertEquals(testerCodegen.isJava8Mode(), true);
         assertEquals(testerCodegen.isSupportAsync(), true);
-        assertEquals(testerCodegen.isUseNullForUnknownEnumValue(), true);
         assertEquals(testerCodegen.isWithXml(), true);
         // Options processed by AbstractJavaJAXRSServerCodegen
         assertEquals(testerCodegen.getImplFolder(), "myimpl");
@@ -581,7 +574,6 @@ public class JavaJAXRSCXFExtServerCodegenTest extends JavaJaxrsBaseTest {
         assertNull(additionalProperties.get(AbstractJavaCodegen.JAVA8_MODE));
         assertNull(additionalProperties.get(AbstractJavaCodegen.SUPPORT_ASYNC));
         assertEquals(additionalProperties.get(AbstractJavaCodegen.SUPPORT_JAVA6), Boolean.FALSE);
-        assertEquals(additionalProperties.get(AbstractJavaCodegen.USE_NULL_FOR_UNKNOWN_ENUM_VALUE), false);
         assertEquals(additionalProperties.get(AbstractJavaCodegen.WITH_XML), false);
         // Options processed by AbstractJavaJAXRSServerCodegen
         assertNull(additionalProperties.get(CodegenConstants.IMPL_FOLDER));
diff --git a/modules/openapi-generator/src/test/resources/3_0/petstore-with-fake-endpoints-models-for-testing.yaml b/modules/openapi-generator/src/test/resources/3_0/petstore-with-fake-endpoints-models-for-testing.yaml
index a8a0687c73..42c3d46a8b 100644
--- a/modules/openapi-generator/src/test/resources/3_0/petstore-with-fake-endpoints-models-for-testing.yaml
+++ b/modules/openapi-generator/src/test/resources/3_0/petstore-with-fake-endpoints-models-for-testing.yaml
@@ -1580,6 +1580,7 @@ components:
               - fish
               - crab
     OuterEnum:
+      nullable: true
       type: string
       enum:
         - placed
diff --git a/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/EnumArrays.java b/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/EnumArrays.java
index e0b5a0b760..40e31bf3ca 100644
--- a/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/EnumArrays.java
+++ b/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/EnumArrays.java
@@ -59,7 +59,7 @@ public class EnumArrays {
           return b;
         }
       }
-      return null;
+      throw new IllegalArgumentException("Unexpected value '" + value + "'");
     }
   }
 
@@ -97,7 +97,7 @@ public class EnumArrays {
           return b;
         }
       }
-      return null;
+      throw new IllegalArgumentException("Unexpected value '" + value + "'");
     }
   }
 
diff --git a/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/EnumClass.java b/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/EnumClass.java
index 5633f02805..a4cc808868 100644
--- a/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/EnumClass.java
+++ b/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/EnumClass.java
@@ -53,7 +53,7 @@ public enum EnumClass {
         return b;
       }
     }
-    return null;
+    throw new IllegalArgumentException("Unexpected value '" + value + "'");
   }
 }
 
diff --git a/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/EnumTest.java b/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/EnumTest.java
index 3d5976cb9e..d4b36798ee 100644
--- a/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/EnumTest.java
+++ b/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/EnumTest.java
@@ -60,7 +60,7 @@ public class EnumTest {
           return b;
         }
       }
-      return null;
+      throw new IllegalArgumentException("Unexpected value '" + value + "'");
     }
   }
 
@@ -100,7 +100,7 @@ public class EnumTest {
           return b;
         }
       }
-      return null;
+      throw new IllegalArgumentException("Unexpected value '" + value + "'");
     }
   }
 
@@ -138,7 +138,7 @@ public class EnumTest {
           return b;
         }
       }
-      return null;
+      throw new IllegalArgumentException("Unexpected value '" + value + "'");
     }
   }
 
@@ -176,7 +176,7 @@ public class EnumTest {
           return b;
         }
       }
-      return null;
+      throw new IllegalArgumentException("Unexpected value '" + value + "'");
     }
   }
 
diff --git a/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/MapTest.java b/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/MapTest.java
index 65ab3afca0..a7a141bb9b 100644
--- a/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/MapTest.java
+++ b/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/MapTest.java
@@ -63,7 +63,7 @@ public class MapTest {
           return b;
         }
       }
-      return null;
+      throw new IllegalArgumentException("Unexpected value '" + value + "'");
     }
   }
 
diff --git a/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/Order.java b/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/Order.java
index 18197114a2..9e935d606e 100644
--- a/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/Order.java
+++ b/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/Order.java
@@ -72,7 +72,7 @@ public class Order {
           return b;
         }
       }
-      return null;
+      throw new IllegalArgumentException("Unexpected value '" + value + "'");
     }
   }
 
diff --git a/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/OuterEnum.java b/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/OuterEnum.java
index f83b0c9587..dacbbdfb2c 100644
--- a/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/OuterEnum.java
+++ b/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/OuterEnum.java
@@ -53,7 +53,7 @@ public enum OuterEnum {
         return b;
       }
     }
-    return null;
+    throw new IllegalArgumentException("Unexpected value '" + value + "'");
   }
 }
 
diff --git a/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/Pet.java b/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/Pet.java
index 0e52f36237..63e9b4ff5d 100644
--- a/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/Pet.java
+++ b/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/Pet.java
@@ -78,7 +78,7 @@ public class Pet {
           return b;
         }
       }
-      return null;
+      throw new IllegalArgumentException("Unexpected value '" + value + "'");
     }
   }
 
diff --git a/samples/openapi3/client/petstore/python/petstore_api/models/enum_test.py b/samples/openapi3/client/petstore/python/petstore_api/models/enum_test.py
index ec484c4519..07b17fe5da 100644
--- a/samples/openapi3/client/petstore/python/petstore_api/models/enum_test.py
+++ b/samples/openapi3/client/petstore/python/petstore_api/models/enum_test.py
@@ -72,8 +72,7 @@ class EnumTest(object):
             self.enum_integer = enum_integer
         if enum_number is not None:
             self.enum_number = enum_number
-        if outer_enum is not None:
-            self.outer_enum = outer_enum
+        self.outer_enum = outer_enum
         if outer_enum_integer is not None:
             self.outer_enum_integer = outer_enum_integer
         if outer_enum_default_value is not None:
diff --git a/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/OuterEnum.java b/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/OuterEnum.java
index 06362e3365..1c1eb9c84c 100644
--- a/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/OuterEnum.java
+++ b/samples/server/petstore/jaxrs-jersey/src/gen/java/org/openapitools/model/OuterEnum.java
@@ -55,7 +55,7 @@ public enum OuterEnum {
         return b;
       }
     }
-    throw new IllegalArgumentException("Unexpected value '" + value + "'");
+    return null;
   }
 }
 

From 43590582c5153d58e076afa89701d5a15e963dca Mon Sep 17 00:00:00 2001
From: Benjamin Douglas <bdouglas@yelp.com>
Date: Thu, 25 Jul 2019 18:59:21 -0700
Subject: [PATCH 58/62] Java 11 native HTTP client library (#3434)

* Initial commit of Java 11 native HTTP client port

* Rebase to master and add JSR305 for @Nullable

* Update samples with @Nullable annotations
---
 bin/java-petstore-all.sh                      |   1 +
 bin/java-petstore-native.json                 |   4 +
 bin/java-petstore-native.sh                   |  35 +
 bin/windows/java-petstore-all.bat             |   1 +
 bin/windows/java-petstore-native.bat          |  10 +
 docs/generators/java.md                       |   2 +-
 .../codegen/languages/JavaClientCodegen.java  |  18 +-
 .../Java/libraries/native/ApiClient.mustache  | 306 ++++++
 .../Java/libraries/native/README.mustache     | 161 +++
 .../Java/libraries/native/api.mustache        | 157 +++
 .../libraries/native/apiException.mustache    |  79 ++
 .../libraries/native/build.gradle.mustache    |  66 ++
 .../Java/libraries/native/gradle-wrapper.jar  | Bin 0 -> 55616 bytes
 .../native/gradle-wrapper.properties.mustache |   5 +
 .../native/gradle.properties.mustache         |   0
 .../libraries/native/gradlew.bat.mustache     | 100 ++
 .../Java/libraries/native/gradlew.mustache    | 188 ++++
 .../Java/libraries/native/pom.mustache        | 215 ++++
 .../Java/libraries/native/travis.mustache     |  16 +
 .../client/petstore/java/native/.gitignore    |  21 +
 .../java/native/.openapi-generator-ignore     |  23 +
 .../java/native/.openapi-generator/VERSION    |   1 +
 .../client/petstore/java/native/.travis.yml   |  16 +
 samples/client/petstore/java/native/README.md | 235 +++++
 .../client/petstore/java/native/build.gradle  |  66 ++
 samples/client/petstore/java/native/build.sbt |   0
 .../docs/AdditionalPropertiesAnyType.md       |  12 +
 .../native/docs/AdditionalPropertiesArray.md  |  12 +
 .../docs/AdditionalPropertiesBoolean.md       |  12 +
 .../native/docs/AdditionalPropertiesClass.md  |  22 +
 .../docs/AdditionalPropertiesInteger.md       |  12 +
 .../native/docs/AdditionalPropertiesNumber.md |  12 +
 .../native/docs/AdditionalPropertiesObject.md |  12 +
 .../native/docs/AdditionalPropertiesString.md |  12 +
 .../petstore/java/native/docs/Animal.md       |  13 +
 .../java/native/docs/AnotherFakeApi.md        |  74 ++
 .../native/docs/ArrayOfArrayOfNumberOnly.md   |  12 +
 .../java/native/docs/ArrayOfNumberOnly.md     |  12 +
 .../petstore/java/native/docs/ArrayTest.md    |  14 +
 .../java/native/docs/Capitalization.md        |  17 +
 .../client/petstore/java/native/docs/Cat.md   |  12 +
 .../petstore/java/native/docs/CatAllOf.md     |  12 +
 .../petstore/java/native/docs/Category.md     |  13 +
 .../petstore/java/native/docs/ClassModel.md   |  12 +
 .../petstore/java/native/docs/Client.md       |  12 +
 .../client/petstore/java/native/docs/Dog.md   |  12 +
 .../petstore/java/native/docs/DogAllOf.md     |  12 +
 .../petstore/java/native/docs/EnumArrays.md   |  31 +
 .../petstore/java/native/docs/EnumClass.md    |  15 +
 .../petstore/java/native/docs/EnumTest.md     |  54 ++
 .../petstore/java/native/docs/FakeApi.md      | 914 ++++++++++++++++++
 .../native/docs/FakeClassnameTags123Api.md    |  81 ++
 .../java/native/docs/FileSchemaTestClass.md   |  13 +
 .../petstore/java/native/docs/FormatTest.md   |  24 +
 .../java/native/docs/HasOnlyReadOnly.md       |  13 +
 .../petstore/java/native/docs/MapTest.md      |  24 +
 ...dPropertiesAndAdditionalPropertiesClass.md |  14 +
 .../java/native/docs/Model200Response.md      |  13 +
 .../java/native/docs/ModelApiResponse.md      |  14 +
 .../petstore/java/native/docs/ModelReturn.md  |  12 +
 .../client/petstore/java/native/docs/Name.md  |  15 +
 .../petstore/java/native/docs/NumberOnly.md   |  12 +
 .../client/petstore/java/native/docs/Order.md |  27 +
 .../java/native/docs/OuterComposite.md        |  14 +
 .../petstore/java/native/docs/OuterEnum.md    |  15 +
 .../client/petstore/java/native/docs/Pet.md   |  27 +
 .../petstore/java/native/docs/PetApi.md       | 656 +++++++++++++
 .../java/native/docs/ReadOnlyFirst.md         |  13 +
 .../java/native/docs/SpecialModelName.md      |  12 +
 .../petstore/java/native/docs/StoreApi.md     | 276 ++++++
 .../client/petstore/java/native/docs/Tag.md   |  13 +
 .../java/native/docs/TypeHolderDefault.md     |  16 +
 .../java/native/docs/TypeHolderExample.md     |  16 +
 .../client/petstore/java/native/docs/User.md  |  19 +
 .../petstore/java/native/docs/UserApi.md      | 525 ++++++++++
 .../petstore/java/native/docs/XmlItem.md      |  40 +
 .../client/petstore/java/native/git_push.sh   |  52 +
 .../petstore/java/native/gradle.properties    |   0
 .../native/gradle/wrapper/gradle-wrapper.jar  | Bin 0 -> 55616 bytes
 .../gradle/wrapper/gradle-wrapper.properties  |   5 +
 samples/client/petstore/java/native/gradlew   | 188 ++++
 .../client/petstore/java/native/gradlew.bat   | 100 ++
 samples/client/petstore/java/native/pom.xml   | 208 ++++
 .../petstore/java/native/settings.gradle      |   1 +
 .../java/native/src/main/AndroidManifest.xml  |   3 +
 .../org/openapitools/client/ApiClient.java    | 317 ++++++
 .../org/openapitools/client/ApiException.java |  90 ++
 .../openapitools/client/Configuration.java    |  39 +
 .../java/org/openapitools/client/Pair.java    |  61 ++
 .../client/api/AnotherFakeApi.java            | 105 ++
 .../org/openapitools/client/api/FakeApi.java  | 733 ++++++++++++++
 .../client/api/FakeClassnameTags123Api.java   | 105 ++
 .../org/openapitools/client/api/PetApi.java   | 500 ++++++++++
 .../org/openapitools/client/api/StoreApi.java | 235 +++++
 .../org/openapitools/client/api/UserApi.java  | 432 +++++++++
 .../model/AdditionalPropertiesAnyType.java    |  95 ++
 .../model/AdditionalPropertiesArray.java      |  96 ++
 .../model/AdditionalPropertiesBoolean.java    |  95 ++
 .../model/AdditionalPropertiesClass.java      | 399 ++++++++
 .../model/AdditionalPropertiesInteger.java    |  95 ++
 .../model/AdditionalPropertiesNumber.java     |  96 ++
 .../model/AdditionalPropertiesObject.java     |  95 ++
 .../model/AdditionalPropertiesString.java     |  95 ++
 .../org/openapitools/client/model/Animal.java | 123 +++
 .../model/ArrayOfArrayOfNumberOnly.java       | 102 ++
 .../client/model/ArrayOfNumberOnly.java       | 102 ++
 .../openapitools/client/model/ArrayTest.java  | 166 ++++
 .../client/model/Capitalization.java          | 211 ++++
 .../org/openapitools/client/model/Cat.java    |  95 ++
 .../openapitools/client/model/CatAllOf.java   |  91 ++
 .../openapitools/client/model/Category.java   | 115 +++
 .../openapitools/client/model/ClassModel.java |  92 ++
 .../org/openapitools/client/model/Client.java |  91 ++
 .../org/openapitools/client/model/Dog.java    |  95 ++
 .../openapitools/client/model/DogAllOf.java   |  91 ++
 .../openapitools/client/model/EnumArrays.java | 195 ++++
 .../openapitools/client/model/EnumClass.java  |  59 ++
 .../openapitools/client/model/EnumTest.java   | 332 +++++++
 .../client/model/FileSchemaTestClass.java     | 125 +++
 .../openapitools/client/model/FormatTest.java | 394 ++++++++
 .../client/model/HasOnlyReadOnly.java         |  97 ++
 .../openapitools/client/model/MapTest.java    | 233 +++++
 ...ropertiesAndAdditionalPropertiesClass.java | 153 +++
 .../client/model/Model200Response.java        | 116 +++
 .../client/model/ModelApiResponse.java        | 139 +++
 .../client/model/ModelReturn.java             |  92 ++
 .../org/openapitools/client/model/Name.java   | 146 +++
 .../openapitools/client/model/NumberOnly.java |  92 ++
 .../org/openapitools/client/model/Order.java  | 249 +++++
 .../client/model/OuterComposite.java          | 140 +++
 .../openapitools/client/model/OuterEnum.java  |  59 ++
 .../org/openapitools/client/model/Pet.java    | 265 +++++
 .../client/model/ReadOnlyFirst.java           | 106 ++
 .../client/model/SpecialModelName.java        |  91 ++
 .../org/openapitools/client/model/Tag.java    | 115 +++
 .../client/model/TypeHolderDefault.java       | 195 ++++
 .../client/model/TypeHolderExample.java       | 195 ++++
 .../org/openapitools/client/model/User.java   | 259 +++++
 .../openapitools/client/model/XmlItem.java    | 838 ++++++++++++++++
 .../openapitools/client/ApiClientTest.java    |  85 ++
 .../client/api/AnotherFakeApiTest.java        |  51 +
 .../openapitools/client/api/FakeApiTest.java  | 278 ++++++
 .../api/FakeClassnameTags123ApiTest.java      |  51 +
 .../openapitools/client/api/PetApiTest.java   | 188 ++++
 .../openapitools/client/api/StoreApiTest.java |  98 ++
 .../openapitools/client/api/UserApiTest.java  | 164 ++++
 .../AdditionalPropertiesAnyTypeTest.java      |  50 +
 .../model/AdditionalPropertiesArrayTest.java  |  51 +
 .../AdditionalPropertiesBooleanTest.java      |  50 +
 .../model/AdditionalPropertiesClassTest.java  | 132 +++
 .../AdditionalPropertiesIntegerTest.java      |  50 +
 .../model/AdditionalPropertiesNumberTest.java |  51 +
 .../model/AdditionalPropertiesObjectTest.java |  50 +
 .../model/AdditionalPropertiesStringTest.java |  50 +
 .../openapitools/client/model/AnimalTest.java |  58 ++
 .../model/ArrayOfArrayOfNumberOnlyTest.java   |  51 +
 .../client/model/ArrayOfNumberOnlyTest.java   |  51 +
 .../client/model/ArrayTestTest.java           |  67 ++
 .../client/model/CapitalizationTest.java      |  88 ++
 .../client/model/CatAllOfTest.java            |  48 +
 .../openapitools/client/model/CatTest.java    |  58 ++
 .../client/model/CategoryTest.java            |  56 ++
 .../client/model/ClassModelTest.java          |  48 +
 .../openapitools/client/model/ClientTest.java |  48 +
 .../client/model/DogAllOfTest.java            |  48 +
 .../openapitools/client/model/DogTest.java    |  58 ++
 .../client/model/EnumArraysTest.java          |  58 ++
 .../client/model/EnumClassTest.java           |  33 +
 .../client/model/EnumTestTest.java            |  81 ++
 .../client/model/FileSchemaTestClassTest.java |  58 ++
 .../client/model/FormatTestTest.java          | 149 +++
 .../client/model/HasOnlyReadOnlyTest.java     |  56 ++
 .../client/model/MapTestTest.java             |  75 ++
 ...rtiesAndAdditionalPropertiesClassTest.java |  70 ++
 .../client/model/Model200ResponseTest.java    |  56 ++
 .../client/model/ModelApiResponseTest.java    |  64 ++
 .../client/model/ModelReturnTest.java         |  48 +
 .../openapitools/client/model/NameTest.java   |  72 ++
 .../client/model/NumberOnlyTest.java          |  49 +
 .../openapitools/client/model/OrderTest.java  |  89 ++
 .../client/model/OuterCompositeTest.java      |  65 ++
 .../client/model/OuterEnumTest.java           |  33 +
 .../openapitools/client/model/PetTest.java    |  92 ++
 .../client/model/ReadOnlyFirstTest.java       |  56 ++
 .../client/model/SpecialModelNameTest.java    |  48 +
 .../openapitools/client/model/TagTest.java    |  56 ++
 .../client/model/TypeHolderDefaultTest.java   |  83 ++
 .../client/model/TypeHolderExampleTest.java   |  83 ++
 .../openapitools/client/model/UserTest.java   | 104 ++
 .../client/model/XmlItemTest.java             | 275 ++++++
 190 files changed, 19200 insertions(+), 7 deletions(-)
 create mode 100644 bin/java-petstore-native.json
 create mode 100755 bin/java-petstore-native.sh
 create mode 100644 bin/windows/java-petstore-native.bat
 create mode 100644 modules/openapi-generator/src/main/resources/Java/libraries/native/ApiClient.mustache
 create mode 100644 modules/openapi-generator/src/main/resources/Java/libraries/native/README.mustache
 create mode 100644 modules/openapi-generator/src/main/resources/Java/libraries/native/api.mustache
 create mode 100644 modules/openapi-generator/src/main/resources/Java/libraries/native/apiException.mustache
 create mode 100644 modules/openapi-generator/src/main/resources/Java/libraries/native/build.gradle.mustache
 create mode 100644 modules/openapi-generator/src/main/resources/Java/libraries/native/gradle-wrapper.jar
 create mode 100644 modules/openapi-generator/src/main/resources/Java/libraries/native/gradle-wrapper.properties.mustache
 create mode 100644 modules/openapi-generator/src/main/resources/Java/libraries/native/gradle.properties.mustache
 create mode 100644 modules/openapi-generator/src/main/resources/Java/libraries/native/gradlew.bat.mustache
 create mode 100755 modules/openapi-generator/src/main/resources/Java/libraries/native/gradlew.mustache
 create mode 100644 modules/openapi-generator/src/main/resources/Java/libraries/native/pom.mustache
 create mode 100644 modules/openapi-generator/src/main/resources/Java/libraries/native/travis.mustache
 create mode 100644 samples/client/petstore/java/native/.gitignore
 create mode 100644 samples/client/petstore/java/native/.openapi-generator-ignore
 create mode 100644 samples/client/petstore/java/native/.openapi-generator/VERSION
 create mode 100644 samples/client/petstore/java/native/.travis.yml
 create mode 100644 samples/client/petstore/java/native/README.md
 create mode 100644 samples/client/petstore/java/native/build.gradle
 create mode 100644 samples/client/petstore/java/native/build.sbt
 create mode 100644 samples/client/petstore/java/native/docs/AdditionalPropertiesAnyType.md
 create mode 100644 samples/client/petstore/java/native/docs/AdditionalPropertiesArray.md
 create mode 100644 samples/client/petstore/java/native/docs/AdditionalPropertiesBoolean.md
 create mode 100644 samples/client/petstore/java/native/docs/AdditionalPropertiesClass.md
 create mode 100644 samples/client/petstore/java/native/docs/AdditionalPropertiesInteger.md
 create mode 100644 samples/client/petstore/java/native/docs/AdditionalPropertiesNumber.md
 create mode 100644 samples/client/petstore/java/native/docs/AdditionalPropertiesObject.md
 create mode 100644 samples/client/petstore/java/native/docs/AdditionalPropertiesString.md
 create mode 100644 samples/client/petstore/java/native/docs/Animal.md
 create mode 100644 samples/client/petstore/java/native/docs/AnotherFakeApi.md
 create mode 100644 samples/client/petstore/java/native/docs/ArrayOfArrayOfNumberOnly.md
 create mode 100644 samples/client/petstore/java/native/docs/ArrayOfNumberOnly.md
 create mode 100644 samples/client/petstore/java/native/docs/ArrayTest.md
 create mode 100644 samples/client/petstore/java/native/docs/Capitalization.md
 create mode 100644 samples/client/petstore/java/native/docs/Cat.md
 create mode 100644 samples/client/petstore/java/native/docs/CatAllOf.md
 create mode 100644 samples/client/petstore/java/native/docs/Category.md
 create mode 100644 samples/client/petstore/java/native/docs/ClassModel.md
 create mode 100644 samples/client/petstore/java/native/docs/Client.md
 create mode 100644 samples/client/petstore/java/native/docs/Dog.md
 create mode 100644 samples/client/petstore/java/native/docs/DogAllOf.md
 create mode 100644 samples/client/petstore/java/native/docs/EnumArrays.md
 create mode 100644 samples/client/petstore/java/native/docs/EnumClass.md
 create mode 100644 samples/client/petstore/java/native/docs/EnumTest.md
 create mode 100644 samples/client/petstore/java/native/docs/FakeApi.md
 create mode 100644 samples/client/petstore/java/native/docs/FakeClassnameTags123Api.md
 create mode 100644 samples/client/petstore/java/native/docs/FileSchemaTestClass.md
 create mode 100644 samples/client/petstore/java/native/docs/FormatTest.md
 create mode 100644 samples/client/petstore/java/native/docs/HasOnlyReadOnly.md
 create mode 100644 samples/client/petstore/java/native/docs/MapTest.md
 create mode 100644 samples/client/petstore/java/native/docs/MixedPropertiesAndAdditionalPropertiesClass.md
 create mode 100644 samples/client/petstore/java/native/docs/Model200Response.md
 create mode 100644 samples/client/petstore/java/native/docs/ModelApiResponse.md
 create mode 100644 samples/client/petstore/java/native/docs/ModelReturn.md
 create mode 100644 samples/client/petstore/java/native/docs/Name.md
 create mode 100644 samples/client/petstore/java/native/docs/NumberOnly.md
 create mode 100644 samples/client/petstore/java/native/docs/Order.md
 create mode 100644 samples/client/petstore/java/native/docs/OuterComposite.md
 create mode 100644 samples/client/petstore/java/native/docs/OuterEnum.md
 create mode 100644 samples/client/petstore/java/native/docs/Pet.md
 create mode 100644 samples/client/petstore/java/native/docs/PetApi.md
 create mode 100644 samples/client/petstore/java/native/docs/ReadOnlyFirst.md
 create mode 100644 samples/client/petstore/java/native/docs/SpecialModelName.md
 create mode 100644 samples/client/petstore/java/native/docs/StoreApi.md
 create mode 100644 samples/client/petstore/java/native/docs/Tag.md
 create mode 100644 samples/client/petstore/java/native/docs/TypeHolderDefault.md
 create mode 100644 samples/client/petstore/java/native/docs/TypeHolderExample.md
 create mode 100644 samples/client/petstore/java/native/docs/User.md
 create mode 100644 samples/client/petstore/java/native/docs/UserApi.md
 create mode 100644 samples/client/petstore/java/native/docs/XmlItem.md
 create mode 100644 samples/client/petstore/java/native/git_push.sh
 create mode 100644 samples/client/petstore/java/native/gradle.properties
 create mode 100644 samples/client/petstore/java/native/gradle/wrapper/gradle-wrapper.jar
 create mode 100644 samples/client/petstore/java/native/gradle/wrapper/gradle-wrapper.properties
 create mode 100644 samples/client/petstore/java/native/gradlew
 create mode 100644 samples/client/petstore/java/native/gradlew.bat
 create mode 100644 samples/client/petstore/java/native/pom.xml
 create mode 100644 samples/client/petstore/java/native/settings.gradle
 create mode 100644 samples/client/petstore/java/native/src/main/AndroidManifest.xml
 create mode 100644 samples/client/petstore/java/native/src/main/java/org/openapitools/client/ApiClient.java
 create mode 100644 samples/client/petstore/java/native/src/main/java/org/openapitools/client/ApiException.java
 create mode 100644 samples/client/petstore/java/native/src/main/java/org/openapitools/client/Configuration.java
 create mode 100644 samples/client/petstore/java/native/src/main/java/org/openapitools/client/Pair.java
 create mode 100644 samples/client/petstore/java/native/src/main/java/org/openapitools/client/api/AnotherFakeApi.java
 create mode 100644 samples/client/petstore/java/native/src/main/java/org/openapitools/client/api/FakeApi.java
 create mode 100644 samples/client/petstore/java/native/src/main/java/org/openapitools/client/api/FakeClassnameTags123Api.java
 create mode 100644 samples/client/petstore/java/native/src/main/java/org/openapitools/client/api/PetApi.java
 create mode 100644 samples/client/petstore/java/native/src/main/java/org/openapitools/client/api/StoreApi.java
 create mode 100644 samples/client/petstore/java/native/src/main/java/org/openapitools/client/api/UserApi.java
 create mode 100644 samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/AdditionalPropertiesAnyType.java
 create mode 100644 samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/AdditionalPropertiesArray.java
 create mode 100644 samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/AdditionalPropertiesBoolean.java
 create mode 100644 samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java
 create mode 100644 samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/AdditionalPropertiesInteger.java
 create mode 100644 samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/AdditionalPropertiesNumber.java
 create mode 100644 samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/AdditionalPropertiesObject.java
 create mode 100644 samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/AdditionalPropertiesString.java
 create mode 100644 samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/Animal.java
 create mode 100644 samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java
 create mode 100644 samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java
 create mode 100644 samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/ArrayTest.java
 create mode 100644 samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/Capitalization.java
 create mode 100644 samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/Cat.java
 create mode 100644 samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/CatAllOf.java
 create mode 100644 samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/Category.java
 create mode 100644 samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/ClassModel.java
 create mode 100644 samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/Client.java
 create mode 100644 samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/Dog.java
 create mode 100644 samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/DogAllOf.java
 create mode 100644 samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/EnumArrays.java
 create mode 100644 samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/EnumClass.java
 create mode 100644 samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/EnumTest.java
 create mode 100644 samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java
 create mode 100644 samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/FormatTest.java
 create mode 100644 samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java
 create mode 100644 samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/MapTest.java
 create mode 100644 samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java
 create mode 100644 samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/Model200Response.java
 create mode 100644 samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/ModelApiResponse.java
 create mode 100644 samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/ModelReturn.java
 create mode 100644 samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/Name.java
 create mode 100644 samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/NumberOnly.java
 create mode 100644 samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/Order.java
 create mode 100644 samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/OuterComposite.java
 create mode 100644 samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/OuterEnum.java
 create mode 100644 samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/Pet.java
 create mode 100644 samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/ReadOnlyFirst.java
 create mode 100644 samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/SpecialModelName.java
 create mode 100644 samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/Tag.java
 create mode 100644 samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/TypeHolderDefault.java
 create mode 100644 samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/TypeHolderExample.java
 create mode 100644 samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/User.java
 create mode 100644 samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/XmlItem.java
 create mode 100644 samples/client/petstore/java/native/src/test/java/org/openapitools/client/ApiClientTest.java
 create mode 100644 samples/client/petstore/java/native/src/test/java/org/openapitools/client/api/AnotherFakeApiTest.java
 create mode 100644 samples/client/petstore/java/native/src/test/java/org/openapitools/client/api/FakeApiTest.java
 create mode 100644 samples/client/petstore/java/native/src/test/java/org/openapitools/client/api/FakeClassnameTags123ApiTest.java
 create mode 100644 samples/client/petstore/java/native/src/test/java/org/openapitools/client/api/PetApiTest.java
 create mode 100644 samples/client/petstore/java/native/src/test/java/org/openapitools/client/api/StoreApiTest.java
 create mode 100644 samples/client/petstore/java/native/src/test/java/org/openapitools/client/api/UserApiTest.java
 create mode 100644 samples/client/petstore/java/native/src/test/java/org/openapitools/client/model/AdditionalPropertiesAnyTypeTest.java
 create mode 100644 samples/client/petstore/java/native/src/test/java/org/openapitools/client/model/AdditionalPropertiesArrayTest.java
 create mode 100644 samples/client/petstore/java/native/src/test/java/org/openapitools/client/model/AdditionalPropertiesBooleanTest.java
 create mode 100644 samples/client/petstore/java/native/src/test/java/org/openapitools/client/model/AdditionalPropertiesClassTest.java
 create mode 100644 samples/client/petstore/java/native/src/test/java/org/openapitools/client/model/AdditionalPropertiesIntegerTest.java
 create mode 100644 samples/client/petstore/java/native/src/test/java/org/openapitools/client/model/AdditionalPropertiesNumberTest.java
 create mode 100644 samples/client/petstore/java/native/src/test/java/org/openapitools/client/model/AdditionalPropertiesObjectTest.java
 create mode 100644 samples/client/petstore/java/native/src/test/java/org/openapitools/client/model/AdditionalPropertiesStringTest.java
 create mode 100644 samples/client/petstore/java/native/src/test/java/org/openapitools/client/model/AnimalTest.java
 create mode 100644 samples/client/petstore/java/native/src/test/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnlyTest.java
 create mode 100644 samples/client/petstore/java/native/src/test/java/org/openapitools/client/model/ArrayOfNumberOnlyTest.java
 create mode 100644 samples/client/petstore/java/native/src/test/java/org/openapitools/client/model/ArrayTestTest.java
 create mode 100644 samples/client/petstore/java/native/src/test/java/org/openapitools/client/model/CapitalizationTest.java
 create mode 100644 samples/client/petstore/java/native/src/test/java/org/openapitools/client/model/CatAllOfTest.java
 create mode 100644 samples/client/petstore/java/native/src/test/java/org/openapitools/client/model/CatTest.java
 create mode 100644 samples/client/petstore/java/native/src/test/java/org/openapitools/client/model/CategoryTest.java
 create mode 100644 samples/client/petstore/java/native/src/test/java/org/openapitools/client/model/ClassModelTest.java
 create mode 100644 samples/client/petstore/java/native/src/test/java/org/openapitools/client/model/ClientTest.java
 create mode 100644 samples/client/petstore/java/native/src/test/java/org/openapitools/client/model/DogAllOfTest.java
 create mode 100644 samples/client/petstore/java/native/src/test/java/org/openapitools/client/model/DogTest.java
 create mode 100644 samples/client/petstore/java/native/src/test/java/org/openapitools/client/model/EnumArraysTest.java
 create mode 100644 samples/client/petstore/java/native/src/test/java/org/openapitools/client/model/EnumClassTest.java
 create mode 100644 samples/client/petstore/java/native/src/test/java/org/openapitools/client/model/EnumTestTest.java
 create mode 100644 samples/client/petstore/java/native/src/test/java/org/openapitools/client/model/FileSchemaTestClassTest.java
 create mode 100644 samples/client/petstore/java/native/src/test/java/org/openapitools/client/model/FormatTestTest.java
 create mode 100644 samples/client/petstore/java/native/src/test/java/org/openapitools/client/model/HasOnlyReadOnlyTest.java
 create mode 100644 samples/client/petstore/java/native/src/test/java/org/openapitools/client/model/MapTestTest.java
 create mode 100644 samples/client/petstore/java/native/src/test/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClassTest.java
 create mode 100644 samples/client/petstore/java/native/src/test/java/org/openapitools/client/model/Model200ResponseTest.java
 create mode 100644 samples/client/petstore/java/native/src/test/java/org/openapitools/client/model/ModelApiResponseTest.java
 create mode 100644 samples/client/petstore/java/native/src/test/java/org/openapitools/client/model/ModelReturnTest.java
 create mode 100644 samples/client/petstore/java/native/src/test/java/org/openapitools/client/model/NameTest.java
 create mode 100644 samples/client/petstore/java/native/src/test/java/org/openapitools/client/model/NumberOnlyTest.java
 create mode 100644 samples/client/petstore/java/native/src/test/java/org/openapitools/client/model/OrderTest.java
 create mode 100644 samples/client/petstore/java/native/src/test/java/org/openapitools/client/model/OuterCompositeTest.java
 create mode 100644 samples/client/petstore/java/native/src/test/java/org/openapitools/client/model/OuterEnumTest.java
 create mode 100644 samples/client/petstore/java/native/src/test/java/org/openapitools/client/model/PetTest.java
 create mode 100644 samples/client/petstore/java/native/src/test/java/org/openapitools/client/model/ReadOnlyFirstTest.java
 create mode 100644 samples/client/petstore/java/native/src/test/java/org/openapitools/client/model/SpecialModelNameTest.java
 create mode 100644 samples/client/petstore/java/native/src/test/java/org/openapitools/client/model/TagTest.java
 create mode 100644 samples/client/petstore/java/native/src/test/java/org/openapitools/client/model/TypeHolderDefaultTest.java
 create mode 100644 samples/client/petstore/java/native/src/test/java/org/openapitools/client/model/TypeHolderExampleTest.java
 create mode 100644 samples/client/petstore/java/native/src/test/java/org/openapitools/client/model/UserTest.java
 create mode 100644 samples/client/petstore/java/native/src/test/java/org/openapitools/client/model/XmlItemTest.java

diff --git a/bin/java-petstore-all.sh b/bin/java-petstore-all.sh
index b51ecebf17..d0beeb353c 100755
--- a/bin/java-petstore-all.sh
+++ b/bin/java-petstore-all.sh
@@ -7,6 +7,7 @@
 ./bin/java-petstore-feign-10x.sh
 ./bin/java-petstore-okhttp-gson.sh
 ./bin/java-petstore-okhttp-gson-parcelable.sh
+./bin/java-petstore-native.sh
 ./bin/java-petstore-retrofit.sh
 ./bin/java-petstore-retrofit2.sh
 ./bin/java-petstore-retrofit2rx.sh
diff --git a/bin/java-petstore-native.json b/bin/java-petstore-native.json
new file mode 100644
index 0000000000..b5642e5b53
--- /dev/null
+++ b/bin/java-petstore-native.json
@@ -0,0 +1,4 @@
+{
+    "library": "native",
+    "artifactId": "petstore-native"
+}
diff --git a/bin/java-petstore-native.sh b/bin/java-petstore-native.sh
new file mode 100755
index 0000000000..d155429a3a
--- /dev/null
+++ b/bin/java-petstore-native.sh
@@ -0,0 +1,35 @@
+#!/bin/sh
+
+SCRIPT="$0"
+echo "# START SCRIPT: $SCRIPT"
+
+while [ -h "$SCRIPT" ] ; do
+  ls=`ls -ld "$SCRIPT"`
+  link=`expr "$ls" : '.*-> \(.*\)$'`
+  if expr "$link" : '/.*' > /dev/null; then
+    SCRIPT="$link"
+  else
+    SCRIPT=`dirname "$SCRIPT"`/"$link"
+  fi
+done
+
+if [ ! -d "${APP_DIR}" ]; then
+  APP_DIR=`dirname "$SCRIPT"`/..
+  APP_DIR=`cd "${APP_DIR}"; pwd`
+fi
+
+executable="./modules/openapi-generator-cli/target/openapi-generator-cli.jar"
+
+if [ ! -f "$executable" ]
+then
+  mvn -B clean package
+fi
+
+# if you've executed sbt assembly previously it will use that instead.
+export JAVA_OPTS="${JAVA_OPTS} -Xmx1024M -DloggerPath=conf/log4j.properties"
+ags="generate -t modules/openapi-generator/src/main/resources/Java/libraries/native -i modules/openapi-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml -g java -c bin/java-petstore-native.json -o samples/client/petstore/java/native --additional-properties hideGenerationTimestamp=true $@"
+
+echo "Removing files and folders under samples/client/petstore/java/httpclient/src/main"
+rm -rf samples/client/petstore/java/native/src/main
+find samples/client/petstore/java/native -maxdepth 1 -type f ! -name "README.md" -exec rm {} +
+java $JAVA_OPTS -jar $executable $ags
diff --git a/bin/windows/java-petstore-all.bat b/bin/windows/java-petstore-all.bat
index 9c65d3375c..dd357cfd56 100644
--- a/bin/windows/java-petstore-all.bat
+++ b/bin/windows/java-petstore-all.bat
@@ -2,6 +2,7 @@ call .\bin\windows\java-petstore-jersey1.bat
 call .\bin\windows\java-petstore-jersey2.bat
 call .\bin\windows\java-petstore-feign.bat
 call .\bin\windows\java-petstore-feign-10x.bat
+call .\bin\windows\java-petstore-native.bat
 call .\bin\windows\java-petstore-okhttp-gson.bat
 call .\bin\windows\java-petstore-okhttp-gson-parcelable.bat
 call .\bin\windows\java-petstore-retrofit.bat
diff --git a/bin/windows/java-petstore-native.bat b/bin/windows/java-petstore-native.bat
new file mode 100644
index 0000000000..e7301e9067
--- /dev/null
+++ b/bin/windows/java-petstore-native.bat
@@ -0,0 +1,10 @@
+set executable=.\modules\openapi-generator-cli\target\openapi-generator-cli.jar
+
+If Not Exist %executable% (
+  mvn clean package
+)
+
+REM set JAVA_OPTS=%JAVA_OPTS% -Xmx1024M
+set ags=generate -t modules\openapi-generator\src\main\resources\Java\libraries\native -i modules\openapi-generator\src\test\resources\2_0\petstore-with-fake-endpoints-models-for-testing.yaml -g java -c bin\java-petstore-native.json -o samples\client\petstore\java\native --additional-properties hideGenerationTimestamp=true
+
+java %JAVA_OPTS% -jar %executable% %ags%
diff --git a/docs/generators/java.md b/docs/generators/java.md
index bb4b92d6ff..84b9056b7a 100644
--- a/docs/generators/java.md
+++ b/docs/generators/java.md
@@ -55,4 +55,4 @@ sidebar_label: java
 |feignVersion|Version of OpenFeign: '10.x', '9.x' (default)| |false|
 |useReflectionEqualsHashCode|Use org.apache.commons.lang3.builder for equals and hashCode in the models. WARNING: This will fail under a security manager, unless the appropriate permissions are set up correctly and also there's potential performance impact.| |false|
 |caseInsensitiveResponseHeaders|Make API response's headers case-insensitive. Available on okhttp-gson, jersey2 libraries| |false|
-|library|library template (sub-template) to use|<dl><dt>**jersey1**</dt><dd>HTTP client: Jersey client 1.19.x. JSON processing: Jackson 2.8.x. Enable Java6 support using '-DsupportJava6=true'. Enable gzip request encoding using '-DuseGzipFeature=true'. IMPORTANT NOTE: jersey 1.x is no longer actively maintained so please upgrade to 'jersey2' or other HTTP libaries instead.</dd><dt>**jersey2**</dt><dd>HTTP client: Jersey client 2.25.1. JSON processing: Jackson 2.8.x</dd><dt>**feign**</dt><dd>HTTP client: OpenFeign 9.x or 10.x. JSON processing: Jackson 2.8.x. To enable OpenFeign 10.x, set the 'feignVersion' option to '10.x'</dd><dt>**okhttp-gson**</dt><dd>[DEFAULT] HTTP client: OkHttp 3.x. JSON processing: Gson 2.8.x. Enable Parcelable models on Android using '-DparcelableModel=true'. Enable gzip request encoding using '-DuseGzipFeature=true'.</dd><dt>**retrofit**</dt><dd>HTTP client: OkHttp 2.x. JSON processing: Gson 2.x (Retrofit 1.9.0). IMPORTANT NOTE: retrofit1.x is no longer actively maintained so please upgrade to 'retrofit2' instead.</dd><dt>**retrofit2**</dt><dd>HTTP client: OkHttp 3.x. JSON processing: Gson 2.x (Retrofit 2.3.0). Enable the RxJava adapter using '-DuseRxJava[2]=true'. (RxJava 1.x or 2.x)</dd><dt>**resttemplate**</dt><dd>HTTP client: Spring RestTemplate 4.x. JSON processing: Jackson 2.8.x</dd><dt>**webclient**</dt><dd>HTTP client: Spring WebClient 5.x. JSON processing: Jackson 2.9.x</dd><dt>**resteasy**</dt><dd>HTTP client: Resteasy client 3.x. JSON processing: Jackson 2.8.x</dd><dt>**vertx**</dt><dd>HTTP client: VertX client 3.x. JSON processing: Jackson 2.8.x</dd><dt>**google-api-client**</dt><dd>HTTP client: Google API client 1.x. JSON processing: Jackson 2.8.x</dd><dt>**rest-assured**</dt><dd>HTTP client: rest-assured : 4.x. JSON processing: Gson 2.x. Only for Java8</dd><dl>|okhttp-gson|
+|library|library template (sub-template) to use|<dl><dt>**jersey1**</dt><dd>HTTP client: Jersey client 1.19.x. JSON processing: Jackson 2.8.x. Enable Java6 support using '-DsupportJava6=true'. Enable gzip request encoding using '-DuseGzipFeature=true'. IMPORTANT NOTE: jersey 1.x is no longer actively maintained so please upgrade to 'jersey2' or other HTTP libaries instead.</dd><dt>**jersey2**</dt><dd>HTTP client: Jersey client 2.25.1. JSON processing: Jackson 2.8.x</dd><dt>**feign**</dt><dd>HTTP client: OpenFeign 9.x or 10.x. JSON processing: Jackson 2.8.x. To enable OpenFeign 10.x, set the 'feignVersion' option to '10.x'</dd><dt>**okhttp-gson**</dt><dd>[DEFAULT] HTTP client: OkHttp 3.x. JSON processing: Gson 2.8.x. Enable Parcelable models on Android using '-DparcelableModel=true'. Enable gzip request encoding using '-DuseGzipFeature=true'.</dd><dt>**retrofit**</dt><dd>HTTP client: OkHttp 2.x. JSON processing: Gson 2.x (Retrofit 1.9.0). IMPORTANT NOTE: retrofit1.x is no longer actively maintained so please upgrade to 'retrofit2' instead.</dd><dt>**retrofit2**</dt><dd>HTTP client: OkHttp 3.x. JSON processing: Gson 2.x (Retrofit 2.3.0). Enable the RxJava adapter using '-DuseRxJava[2]=true'. (RxJava 1.x or 2.x)</dd><dt>**resttemplate**</dt><dd>HTTP client: Spring RestTemplate 4.x. JSON processing: Jackson 2.8.x</dd><dt>**webclient**</dt><dd>HTTP client: Spring WebClient 5.x. JSON processing: Jackson 2.9.x</dd><dt>**resteasy**</dt><dd>HTTP client: Resteasy client 3.x. JSON processing: Jackson 2.8.x</dd><dt>**vertx**</dt><dd>HTTP client: VertX client 3.x. JSON processing: Jackson 2.8.x</dd><dt>**google-api-client**</dt><dd>HTTP client: Google API client 1.x. JSON processing: Jackson 2.8.x</dd><dt>**rest-assured**</dt><dd>HTTP client: rest-assured : 4.x. JSON processing: Gson 2.x. Only for Java8</dd><dt>**native**</dt><dd>HTTP client: Java native HttpClient. JSON processing: Jackson 2.9.x. Only for Java11+</dd><dl>|okhttp-gson|
diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaClientCodegen.java
index 83938212fb..8f1a232f80 100644
--- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaClientCodegen.java
+++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/JavaClientCodegen.java
@@ -67,6 +67,7 @@ public class JavaClientCodegen extends AbstractJavaCodegen
     public static final String GOOGLE_API_CLIENT = "google-api-client";
     public static final String JERSEY1 = "jersey1";
     public static final String JERSEY2 = "jersey2";
+    public static final String NATIVE = "native";
     public static final String OKHTTP_GSON = "okhttp-gson";
     public static final String RESTEASY = "resteasy";
     public static final String RESTTEMPLATE = "resttemplate";
@@ -139,6 +140,7 @@ public class JavaClientCodegen extends AbstractJavaCodegen
         supportedLibraries.put(VERTX, "HTTP client: VertX client 3.x. JSON processing: Jackson 2.8.x");
         supportedLibraries.put(GOOGLE_API_CLIENT, "HTTP client: Google API client 1.x. JSON processing: Jackson 2.8.x");
         supportedLibraries.put(REST_ASSURED, "HTTP client: rest-assured : 4.x. JSON processing: Gson 2.x. Only for Java8");
+        supportedLibraries.put(NATIVE, "HTTP client: Java native HttpClient. JSON processing: Jackson 2.9.x. Only for Java11+");
 
         CliOption libraryOption = new CliOption(CodegenConstants.LIBRARY, "library template (sub-template) to use");
         libraryOption.setEnum(supportedLibraries);
@@ -166,7 +168,7 @@ public class JavaClientCodegen extends AbstractJavaCodegen
 
     @Override
     public void processOpts() {
-        if (WEBCLIENT.equals(getLibrary()) && "threetenbp".equals(dateLibrary)) {
+        if ((WEBCLIENT.equals(getLibrary()) && "threetenbp".equals(dateLibrary)) || NATIVE.equals(getLibrary())) {
             dateLibrary = "java8";
         }
 
@@ -254,12 +256,12 @@ public class JavaClientCodegen extends AbstractJavaCodegen
         writeOptional(outputFolder, new SupportingFile("manifest.mustache", projectFolder, "AndroidManifest.xml"));
         supportingFiles.add(new SupportingFile("travis.mustache", "", ".travis.yml"));
         supportingFiles.add(new SupportingFile("ApiClient.mustache", invokerFolder, "ApiClient.java"));
-        if (!(RESTTEMPLATE.equals(getLibrary()) || REST_ASSURED.equals(getLibrary()))) {
+        if (!(RESTTEMPLATE.equals(getLibrary()) || REST_ASSURED.equals(getLibrary()) || NATIVE.equals(getLibrary()))) {
             supportingFiles.add(new SupportingFile("StringUtil.mustache", invokerFolder, "StringUtil.java"));
         }
 
         // google-api-client doesn't use the OpenAPI auth, because it uses Google Credential directly (HttpRequestInitializer)
-        if (!(GOOGLE_API_CLIENT.equals(getLibrary()) || REST_ASSURED.equals(getLibrary()))) {
+        if (!(GOOGLE_API_CLIENT.equals(getLibrary()) || REST_ASSURED.equals(getLibrary()) || NATIVE.equals(getLibrary()))) {
             supportingFiles.add(new SupportingFile("auth/HttpBasicAuth.mustache", authFolder, "HttpBasicAuth.java"));
             supportingFiles.add(new SupportingFile("auth/HttpBearerAuth.mustache", authFolder, "HttpBearerAuth.java"));
             supportingFiles.add(new SupportingFile("auth/ApiKeyAuth.mustache", authFolder, "ApiKeyAuth.java"));
@@ -293,7 +295,7 @@ public class JavaClientCodegen extends AbstractJavaCodegen
             supportingFiles.add(new SupportingFile("Pair.mustache", invokerFolder, "Pair.java"));
         }
 
-        if (!(FEIGN.equals(getLibrary()) || RESTTEMPLATE.equals(getLibrary()) || usesAnyRetrofitLibrary() || GOOGLE_API_CLIENT.equals(getLibrary()) || REST_ASSURED.equals(getLibrary()))) {
+        if (!(FEIGN.equals(getLibrary()) || RESTTEMPLATE.equals(getLibrary()) || usesAnyRetrofitLibrary() || GOOGLE_API_CLIENT.equals(getLibrary()) || REST_ASSURED.equals(getLibrary()) || NATIVE.equals(getLibrary()))) {
             supportingFiles.add(new SupportingFile("auth/Authentication.mustache", authFolder, "Authentication.java"));
         }
 
@@ -325,6 +327,10 @@ public class JavaClientCodegen extends AbstractJavaCodegen
             supportingFiles.add(new SupportingFile("JSON.mustache", invokerFolder, "JSON.java"));
             supportingFiles.add(new SupportingFile("ApiResponse.mustache", invokerFolder, "ApiResponse.java"));
             additionalProperties.put("jackson", "true");
+        } else if (NATIVE.equals(getLibrary())) {
+            setJava8Mode(true);
+            additionalProperties.put("java8", "true");
+            additionalProperties.put("jackson", "true");
         } else if (RESTEASY.equals(getLibrary())) {
             supportingFiles.add(new SupportingFile("JSON.mustache", invokerFolder, "JSON.java"));
             additionalProperties.put("jackson", "true");
@@ -412,7 +418,7 @@ public class JavaClientCodegen extends AbstractJavaCodegen
             additionalProperties.remove("gson");
         }
 
-        if (additionalProperties.containsKey("jackson")) {
+        if (additionalProperties.containsKey("jackson") && !NATIVE.equals(getLibrary())) {
             supportingFiles.add(new SupportingFile("RFC3339DateFormat.mustache", invokerFolder, "RFC3339DateFormat.java"));
             if ("threetenbp".equals(dateLibrary) && !usePlayWS) {
                 supportingFiles.add(new SupportingFile("CustomInstantDeserializer.mustache", invokerFolder, "CustomInstantDeserializer.java"));
@@ -500,7 +506,7 @@ public class JavaClientCodegen extends AbstractJavaCodegen
         }
 
         // google-api-client doesn't use the OpenAPI auth, because it uses Google Credential directly (HttpRequestInitializer)
-        if ((!(GOOGLE_API_CLIENT.equals(getLibrary()) || REST_ASSURED.equals(getLibrary()) || usePlayWS)) && ProcessUtils.hasOAuthMethods(objs)) {
+        if ((!(GOOGLE_API_CLIENT.equals(getLibrary()) || REST_ASSURED.equals(getLibrary()) || usePlayWS || NATIVE.equals(getLibrary()))) && ProcessUtils.hasOAuthMethods(objs)) {
             supportingFiles.add(new SupportingFile("auth/OAuth.mustache", authFolder, "OAuth.java"));
             supportingFiles.add(new SupportingFile("auth/OAuthFlow.mustache", authFolder, "OAuthFlow.java"));
         }
diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/native/ApiClient.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/native/ApiClient.mustache
new file mode 100644
index 0000000000..eee8f2923d
--- /dev/null
+++ b/modules/openapi-generator/src/main/resources/Java/libraries/native/ApiClient.mustache
@@ -0,0 +1,306 @@
+{{>licenseInfo}}
+package {{invokerPackage}};
+
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.databind.DeserializationFeature;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.SerializationFeature;
+import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule;
+
+import java.net.URI;
+import java.net.URLEncoder;
+import java.net.http.HttpClient;
+import java.net.http.HttpRequest;
+import java.nio.charset.Charset;
+import java.time.Duration;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
+import java.util.StringJoiner;
+import java.util.function.Consumer;
+import java.util.stream.Collectors;
+
+/**
+ * Configuration and utility class for API clients.
+ *
+ * <p>This class can be constructed and modified, then used to instantiate the
+ * various API classes. The API classes use the settings in this class to
+ * configure themselves, but otherwise do not store a link to this class.</p>
+ *
+ * <p>This class is mutable and not synchronized, so it is not thread-safe.
+ * The API classes generated from this are immutable and thread-safe.</p>
+ *
+ * <p>The setter methods of this class return the current object to facilitate
+ * a fluent style of configuration.</p>
+ */
+{{>generatedAnnotation}}
+public class ApiClient {
+
+  private static final Charset UTF_8 = Charset.forName("UTF-8");
+
+  private HttpClient.Builder builder;
+  private ObjectMapper mapper;
+  private String scheme;
+  private String host;
+  private int port;
+  private String basePath;
+  private Consumer<HttpRequest.Builder> interceptor;
+  private Duration readTimeout;
+
+  private static String valueToString(Object value) {
+    if (value == null) {
+      return "";
+    }
+    return value.toString();
+  }
+
+  /**
+   * URL encode a string in the UTF-8 encoding.
+   *
+   * @param s String to encode.
+   * @return URL-encoded representation of the input string.
+   */
+  public static String urlEncode(String s) {
+    return URLEncoder.encode(s, UTF_8);
+  }
+
+  /**
+   * Convert a URL query name/value parameter to a list of encoded {@link Pair}
+   * objects.
+   *
+   * <p>The value can be null, in which case an empty list is returned.</p>
+   *
+   * @param name The query name parameter.
+   * @param value The query value, which may not be a collection but may be
+   *              null.
+   * @return A singleton list of the {@link Pair} objects representing the input
+   * parameters, which is encoded for use in a URL. If the value is null, an
+   * empty list is returned.
+   */
+  public static List<Pair> parameterToPairs(String name, Object value) {
+    if (name == null || name.isEmpty() || value == null) {
+      return Collections.emptyList();
+    }
+    return Collections.singletonList(new Pair(urlEncode(name), urlEncode(value.toString())));
+  }
+
+  /**
+   * Convert a URL query name/collection parameter to a list of encoded
+   * {@link Pair} objects.
+   *
+   * @param collectionFormat The swagger collectionFormat string (csv, tsv, etc).
+   * @param name The query name parameter.
+   * @param values A collection of values for the given query name, which may be
+   *               null.
+   * @return A list of {@link Pair} objects representing the input parameters,
+   * which is encoded for use in a URL. If the values collection is null, an
+   * empty list is returned.
+   */
+  public static List<Pair> parameterToPairs(
+      String collectionFormat, String name, Collection<?> values) {
+    if (name == null || name.isEmpty() || values == null || values.isEmpty()) {
+      return Collections.emptyList();
+    }
+
+    // get the collection format (default: csv)
+    String format = collectionFormat == null || collectionFormat.isEmpty() ? "csv" : collectionFormat;
+
+    // create the params based on the collection format
+    if ("multi".equals(format)) {
+      return values.stream()
+          .map(value -> new Pair(urlEncode(name), urlEncode(valueToString(value))))
+          .collect(Collectors.toList());
+    }
+
+    String delimiter;
+    switch(format) {
+      case "csv":
+        delimiter = urlEncode(",");
+        break;
+      case "ssv":
+        delimiter = urlEncode(" ");
+        break;
+      case "tsv":
+        delimiter = urlEncode("\t");
+        break;
+      case "pipes":
+        delimiter = urlEncode("|");
+        break;
+      default:
+        throw new IllegalArgumentException("Illegal collection format: " + collectionFormat);
+    }
+
+    StringJoiner joiner = new StringJoiner(delimiter);
+    for (Object value : values) {
+      joiner.add(urlEncode(valueToString(value)));
+    }
+
+    return Collections.singletonList(new Pair(urlEncode(name), joiner.toString()));
+  }
+
+  /**
+   * Ctor.
+   */
+  public ApiClient() {
+    builder = HttpClient.newBuilder();
+    mapper = new ObjectMapper();
+    mapper.setSerializationInclusion(JsonInclude.Include.NON_NULL);
+    mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
+    mapper.configure(DeserializationFeature.FAIL_ON_INVALID_SUBTYPE, false);
+    mapper.disable(SerializationFeature.WRITE_DATES_AS_TIMESTAMPS);
+    mapper.enable(SerializationFeature.WRITE_ENUMS_USING_TO_STRING);
+    mapper.enable(DeserializationFeature.READ_ENUMS_USING_TO_STRING);
+    mapper.registerModule(new JavaTimeModule());
+    URI baseURI = URI.create("{{{basePath}}}");
+    scheme = baseURI.getScheme();
+    host = baseURI.getHost();
+    port = baseURI.getPort();
+    basePath = baseURI.getRawPath();
+    interceptor = null;
+    readTimeout = null;
+  }
+
+  /**
+   * Set a custom {@link HttpClient.Builder} object to use when creating the
+   * {@link HttpClient} that is used by the API client.
+   *
+   * @param builder Custom client builder.
+   * @return This object.
+   */
+  public ApiClient setHttpClientBuilder(HttpClient.Builder builder) {
+    this.builder = builder;
+    return this;
+  }
+
+  /**
+   * Get an {@link HttpClient} based on the current {@link HttpClient.Builder}.
+   *
+   * <p>The returned object is immutable and thread-safe.</p>
+   *
+   * @return The HTTP client.
+   */
+  public HttpClient getHttpClient() {
+    return builder.build();
+  }
+
+  /**
+   * Set a custom {@link ObjectMapper} to serialize and deserialize the request
+   * and response bodies.
+   *
+   * @param mapper Custom object mapper.
+   * @return This object.
+   */
+  public ApiClient setObjectMapper(ObjectMapper mapper) {
+    this.mapper = mapper;
+    return this;
+  }
+
+  /**
+   * Get a copy of the current {@link ObjectMapper}.
+   *
+   * @return A copy of the current object mapper.
+   */
+  public ObjectMapper getObjectMapper() {
+    return mapper.copy();
+  }
+
+  /**
+   * Set a custom host name for the target service.
+   *
+   * @param host The host name of the target service.
+   * @return This object.
+   */
+  public ApiClient setHost(String host) {
+    this.host = host;
+    return this;
+  }
+
+  /**
+   * Set a custom port number for the target service.
+   *
+   * @param port The port of the target service. Set this to -1 to reset the
+   *             value to the default for the scheme.
+   * @return This object.
+   */
+  public ApiClient setPort(int port) {
+    this.port = port;
+    return this;
+  }
+
+  /**
+   * Set a custom base path for the target service, for example '/v2'.
+   *
+   * @param basePath The base path against which the rest of the path is
+   *                 resolved.
+   * @return This object.
+   */
+  public ApiClient setBasePath(String basePath) {
+    this.basePath = basePath;
+    return this;
+  }
+
+  /**
+   * Get the base URI to resolve the endpoint paths against.
+   *
+   * @return The complete base URI that the rest of the API parameters are
+   * resolved against.
+   */
+  public String getBaseUri() {
+    return scheme + "://" + host + (port == -1 ? "" : ":" + port) + basePath;
+  }
+
+  /**
+   * Set a custom request interceptor.
+   *
+   * <p>A request interceptor is a mechanism for altering each request before it
+   * is sent. After the request has been fully configured but not yet built, the
+   * request builder is passed into this function for further modification,
+   * after which it is sent out.</p>
+   *
+   * <p>This is useful for altering the requests in a custom manner, such as
+   * adding headers. It could also be used for logging and monitoring.</p>
+   *
+   * @param interceptor A function invoked before creating each request. A value
+   *                    of null resets the interceptor to a no-op.
+   * @return This object.
+   */
+  public ApiClient setRequestInterceptor(Consumer<HttpRequest.Builder> interceptor) {
+    this.interceptor = interceptor;
+    return this;
+  }
+
+  /**
+   * Get the custom interceptor.
+   *
+   * @return The custom interceptor that was set, or null if there isn't any.
+   */
+  public Consumer<HttpRequest.Builder> getRequestInterceptor() {
+    return interceptor;
+  }
+
+  /**
+   * Set the read timeout for the http client.
+   *
+   * <p>This is the value used by default for each request, though it can be
+   * overridden on a per-request basis with a request interceptor.</p>
+   *
+   * @param readTimeout The read timeout used by default by the http client.
+   *                    Setting this value to null resets the timeout to an
+   *                    effectively infinite value.
+   * @return This object.
+   */
+  public ApiClient setReadTimeout(Duration readTimeout) {
+    this.readTimeout = readTimeout;
+    return this;
+  }
+
+  /**
+   * Get the read timeout that was set.
+   *
+   * @return The read timeout, or null if no timeout was set. Null represents
+   * an infinite wait time.
+   */
+  public Duration getReadTimeout() {
+    return readTimeout;
+  }
+}
diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/native/README.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/native/README.mustache
new file mode 100644
index 0000000000..44356cca82
--- /dev/null
+++ b/modules/openapi-generator/src/main/resources/Java/libraries/native/README.mustache
@@ -0,0 +1,161 @@
+# {{artifactId}}
+
+{{appName}}
+
+- API version: {{appVersion}}
+{{^hideGenerationTimestamp}}
+
+- Build date: {{generatedDate}}
+{{/hideGenerationTimestamp}}
+
+{{#appDescription}}{{{appDescription}}}{{/appDescription}}
+
+{{#infoUrl}}
+  For more information, please visit [{{{infoUrl}}}]({{{infoUrl}}})
+{{/infoUrl}}
+
+*Automatically generated by the [OpenAPI Generator](https://openapi-generator.tech)*
+
+## Requirements
+
+Building the API client library requires:
+
+1. Java 11+
+2. Maven/Gradle
+
+## Installation
+
+To install the API client library to your local Maven repository, simply execute:
+
+```shell
+mvn clean install
+```
+
+To deploy it to a remote Maven repository instead, configure the settings of the repository and execute:
+
+```shell
+mvn clean deploy
+```
+
+Refer to the [OSSRH Guide](http://central.sonatype.org/pages/ossrh-guide.html) for more information.
+
+### Maven users
+
+Add this dependency to your project's POM:
+
+```xml
+<dependency>
+  <groupId>{{{groupId}}}</groupId>
+  <artifactId>{{{artifactId}}}</artifactId>
+  <version>{{{artifactVersion}}}</version>
+  <scope>compile</scope>
+</dependency>
+```
+
+### Gradle users
+
+Add this dependency to your project's build file:
+
+```groovy
+compile "{{{groupId}}}:{{{artifactId}}}:{{{artifactVersion}}}"
+```
+
+### Others
+
+At first generate the JAR by executing:
+
+```shell
+mvn clean package
+```
+
+Then manually install the following JARs:
+
+- `target/{{{artifactId}}}-{{{artifactVersion}}}.jar`
+- `target/lib/*.jar`
+
+## Getting Started
+
+Please follow the [installation](#installation) instruction and execute the following Java code:
+
+```java
+{{#apiInfo}}{{#apis}}{{#-first}}{{#operations}}{{#operation}}{{#-first}}
+import {{{invokerPackage}}}.*;
+import {{{modelPackage}}}.*;
+import {{{package}}}.{{{classname}}};
+
+public class {{{classname}}}Example {
+
+    public static void main(String[] args) {
+        ApiClient defaultClient = Configuration.getDefaultApiClient();
+        // Configure clients using the `defaultClient` object, such as
+        // overriding the host and port, timeout, etc.
+        {{{classname}}} apiInstance = new {{{classname}}}(defaultClient);
+        {{#allParams}}
+        {{{dataType}}} {{{paramName}}} = {{{example}}}; // {{{dataType}}} | {{{description}}}
+        {{/allParams}}
+        try {
+            {{#returnType}}{{{returnType}}} result = {{/returnType}}apiInstance.{{{operationId}}}({{#allParams}}{{{paramName}}}{{#hasMore}}, {{/hasMore}}{{/allParams}});{{#returnType}}
+            System.out.println(result);{{/returnType}}
+        } catch (ApiException e) {
+            System.err.println("Exception when calling {{{classname}}}#{{{operationId}}}");
+            System.err.println("Status code: " + e.getCode());
+            System.err.println("Reason: " + e.getResponseBody());
+            System.err.println("Response headers: " + e.getResponseHeaders());
+            e.printStackTrace();
+        }
+    }
+}
+{{/-first}}{{/operation}}{{/operations}}{{/-first}}{{/apis}}{{/apiInfo}}
+```
+
+## Documentation for API Endpoints
+
+All URIs are relative to *{{basePath}}*
+
+Class | Method | HTTP request | Description
+------------ | ------------- | ------------- | -------------
+{{#apiInfo}}{{#apis}}{{#operations}}{{#operation}}*{{classname}}* | [**{{operationId}}**]({{apiDocPath}}{{classname}}.md#{{operationId}}) | **{{httpMethod}}** {{path}} | {{#summary}}{{summary}}{{/summary}}
+{{/operation}}{{/operations}}{{/apis}}{{/apiInfo}}
+
+## Documentation for Models
+
+{{#models}}{{#model}} - [{{classname}}]({{modelDocPath}}{{classname}}.md)
+{{/model}}{{/models}}
+
+## Documentation for Authorization
+
+{{^authMethods}}All endpoints do not require authorization.
+{{/authMethods}}Authentication schemes defined for the API:
+{{#authMethods}}### {{name}}
+
+{{#isApiKey}}
+
+- **Type**: API key
+- **API key parameter name**: {{keyParamName}}
+- **Location**: {{#isKeyInQuery}}URL query string{{/isKeyInQuery}}{{#isKeyInHeader}}HTTP header{{/isKeyInHeader}}
+{{/isApiKey}}
+{{#isBasic}}
+
+- **Type**: HTTP basic authentication
+{{/isBasic}}
+{{#isOAuth}}
+
+- **Type**: OAuth
+- **Flow**: {{flow}}
+- **Authorization URL**: {{authorizationUrl}}
+- **Scopes**: {{^scopes}}N/A{{/scopes}}
+{{#scopes}}  - {{scope}}: {{description}}
+{{/scopes}}
+{{/isOAuth}}
+
+{{/authMethods}}
+
+## Recommendation
+
+It's recommended to create an instance of `ApiClient` per thread in a multithreaded environment to avoid any potential issues.
+However, the instances of the api clients created from the `ApiClient` are thread-safe and can be re-used.
+
+## Author
+
+{{#apiInfo}}{{#apis}}{{^hasMore}}{{infoEmail}}
+{{/hasMore}}{{/apis}}{{/apiInfo}}
diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/native/api.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/native/api.mustache
new file mode 100644
index 0000000000..f045c81743
--- /dev/null
+++ b/modules/openapi-generator/src/main/resources/Java/libraries/native/api.mustache
@@ -0,0 +1,157 @@
+{{>licenseInfo}}
+package {{package}};
+
+import {{invokerPackage}}.ApiClient;
+import {{invokerPackage}}.ApiException;
+import {{invokerPackage}}.Pair;
+
+{{#imports}}
+import {{import}};
+{{/imports}}
+
+import com.fasterxml.jackson.core.type.TypeReference;
+import com.fasterxml.jackson.databind.ObjectMapper;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.net.URI;
+import java.net.http.HttpClient;
+import java.net.http.HttpRequest;
+import java.net.http.HttpResponse;
+import java.time.Duration;
+import java.util.function.Consumer;
+
+{{^fullJavaUtil}}
+import java.util.ArrayList;
+import java.util.StringJoiner;
+import java.util.List;
+import java.util.Map;
+{{/fullJavaUtil}}
+
+{{>generatedAnnotation}}
+{{#operations}}
+public class {{classname}} {
+  private final HttpClient memberVarHttpClient;
+  private final ObjectMapper memberVarObjectMapper;
+  private final String memberVarBaseUri;
+  private final Consumer<HttpRequest.Builder> memberVarInterceptor;
+  private final Duration memberVarReadTimeout;
+
+  public {{classname}}() {
+    this(new ApiClient());
+  }
+
+  public {{classname}}(ApiClient apiClient) {
+    memberVarHttpClient = apiClient.getHttpClient();
+    memberVarObjectMapper = apiClient.getObjectMapper();
+    memberVarBaseUri = apiClient.getBaseUri();
+    memberVarInterceptor = apiClient.getRequestInterceptor();
+    memberVarReadTimeout = apiClient.getReadTimeout();
+  }
+
+  {{#operation}}
+  /**
+   * {{summary}}
+   * {{notes}}
+   {{#allParams}}
+   * @param {{paramName}} {{description}}{{#required}} (required){{/required}}{{^required}} (optional{{^isContainer}}{{#defaultValue}}, default to {{.}}{{/defaultValue}}){{/isContainer}}{{/required}}
+   {{/allParams}}
+   {{#returnType}}
+   * @return {{returnType}}
+   {{/returnType}}
+   * @throws ApiException if fails to make API call
+   {{#isDeprecated}}
+   * @deprecated
+   {{/isDeprecated}}
+   {{#externalDocs}}
+   * {{description}}
+   * @see <a href="{{url}}">{{summary}} Documentation</a>
+   {{/externalDocs}}
+   */
+  {{#isDeprecated}}
+  @Deprecated
+  {{/isDeprecated}}
+  public {{#returnType}}{{{returnType}}} {{/returnType}}{{^returnType}}void {{/returnType}}{{operationId}}({{#allParams}}{{{dataType}}} {{paramName}}{{#hasMore}}, {{/hasMore}}{{/allParams}}) throws ApiException {
+    {{#allParams}}
+      {{#required}}
+    // verify the required parameter '{{paramName}}' is set
+    if ({{paramName}} == null) {
+      throw new ApiException(400, "Missing the required parameter '{{paramName}}' when calling {{operationId}}");
+    }
+      {{/required}}
+    {{/allParams}}
+
+    HttpRequest.Builder localVarRequestBuilder = HttpRequest.newBuilder();
+
+    {{! Switch delimiters for baseName so we can write constants like "{query}" }}
+    String localVarPath = "{{{path}}}"{{#pathParams}}
+        .replace({{=<% %>=}}"{<%baseName%>}"<%={{ }}=%>, ApiClient.urlEncode({{{paramName}}}.toString())){{/pathParams}};
+
+    {{#hasQueryParams}}
+    {{javaUtilPrefix}}List<Pair> localVarQueryParams = new {{javaUtilPrefix}}ArrayList<>();
+    {{#queryParams}}
+      {{#collectionFormat}}
+    localVarQueryParams.addAll(ApiClient.parameterToPairs("{{{collectionFormat}}}", "{{baseName}}", {{paramName}}));
+      {{/collectionFormat}}
+      {{^collectionFormat}}
+    localVarQueryParams.addAll(ApiClient.parameterToPairs("{{baseName}}", {{paramName}}));
+      {{/collectionFormat}}
+    {{/queryParams}}
+
+    if (!localVarQueryParams.isEmpty()) {
+      {{javaUtilPrefix}}StringJoiner queryJoiner = new StringJoiner("&");
+      localVarQueryParams.forEach(p -> queryJoiner.add(p.getName() + '=' + p.getValue()));
+      localVarRequestBuilder.uri(URI.create(memberVarBaseUri + localVarPath + '?' + queryJoiner.toString()));
+    } else {
+      localVarRequestBuilder.uri(URI.create(memberVarBaseUri + localVarPath));
+    }
+    {{/hasQueryParams}}
+    {{^hasQueryParams}}
+    localVarRequestBuilder.uri(URI.create(memberVarBaseUri + localVarPath));
+    {{/hasQueryParams}}
+
+    {{#headerParams}}
+    if ({{paramName}} != null) {
+      localVarRequestBuilder.header("{{baseName}}", {{paramName}}.toString());
+    }
+    {{/headerParams}}
+    {{#bodyParam}}
+    localVarRequestBuilder.header("Content-Type", "application/json");
+    {{/bodyParam}}
+    localVarRequestBuilder.header("Accept", "application/json");
+
+    try {
+      {{#bodyParam}}
+      byte[] localVarPostBody = memberVarObjectMapper.writeValueAsBytes({{paramName}});
+      localVarRequestBuilder.method("{{httpMethod}}", HttpRequest.BodyPublishers.ofByteArray(localVarPostBody));
+      {{/bodyParam}}
+      {{^bodyParam}}
+      localVarRequestBuilder.method("{{httpMethod}}", HttpRequest.BodyPublishers.noBody());
+      {{/bodyParam}}
+      if (memberVarReadTimeout != null) {
+        localVarRequestBuilder.timeout(memberVarReadTimeout);
+      }
+      if (memberVarInterceptor != null) {
+        memberVarInterceptor.accept(localVarRequestBuilder);
+      }
+
+      HttpResponse<InputStream> localVarResponse = memberVarHttpClient.send(
+          localVarRequestBuilder.build(),
+          HttpResponse.BodyHandlers.ofInputStream());
+      if (localVarResponse.statusCode()/ 100 != 2) {
+        throw new ApiException(localVarResponse.statusCode(),
+            "{{operationId}} call received non-success response",
+            localVarResponse.headers(),
+            localVarResponse.body() == null ? null : new String(localVarResponse.body().readAllBytes()));
+      }
+
+      {{#returnType}}
+      return memberVarObjectMapper.readValue(localVarResponse.body(), new TypeReference<{{{returnType}}}>() {});
+      {{/returnType}}
+    } catch (IOException | InterruptedException e) {
+      throw new ApiException(e);
+    }
+  }
+  {{/operation}}
+}
+{{/operations}}
diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/native/apiException.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/native/apiException.mustache
new file mode 100644
index 0000000000..3d0eee4bf9
--- /dev/null
+++ b/modules/openapi-generator/src/main/resources/Java/libraries/native/apiException.mustache
@@ -0,0 +1,79 @@
+{{>licenseInfo}}
+
+package {{invokerPackage}};
+
+import java.net.http.HttpHeaders;
+
+{{>generatedAnnotation}}
+public class ApiException extends{{#useRuntimeException}} RuntimeException {{/useRuntimeException}}{{^useRuntimeException}} Exception {{/useRuntimeException}}{
+    private int code = 0;
+    private HttpHeaders responseHeaders = null;
+    private String responseBody = null;
+
+    public ApiException() {}
+
+    public ApiException(Throwable throwable) {
+        super(throwable);
+    }
+
+    public ApiException(String message) {
+        super(message);
+    }
+
+    public ApiException(String message, Throwable throwable, int code, HttpHeaders responseHeaders, String responseBody) {
+        super(message, throwable);
+        this.code = code;
+        this.responseHeaders = responseHeaders;
+        this.responseBody = responseBody;
+    }
+
+    public ApiException(String message, int code, HttpHeaders responseHeaders, String responseBody) {
+        this(message, (Throwable) null, code, responseHeaders, responseBody);
+    }
+
+    public ApiException(String message, Throwable throwable, int code, HttpHeaders responseHeaders) {
+        this(message, throwable, code, responseHeaders, null);
+    }
+
+    public ApiException(int code, HttpHeaders responseHeaders, String responseBody) {
+        this((String) null, (Throwable) null, code, responseHeaders, responseBody);
+    }
+
+    public ApiException(int code, String message) {
+        super(message);
+        this.code = code;
+    }
+
+    public ApiException(int code, String message, HttpHeaders responseHeaders, String responseBody) {
+        this(code, message);
+        this.responseHeaders = responseHeaders;
+        this.responseBody = responseBody;
+    }
+
+    /**
+     * Get the HTTP status code.
+     *
+     * @return HTTP status code
+     */
+    public int getCode() {
+        return code;
+    }
+
+    /**
+     * Get the HTTP response headers.
+     *
+     * @return Headers as an HttpHeaders object
+     */
+    public HttpHeaders getResponseHeaders() {
+        return responseHeaders;
+    }
+
+    /**
+     * Get the HTTP response body.
+     *
+     * @return Response body in the form of string
+     */
+    public String getResponseBody() {
+        return responseBody;
+    }
+}
diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/native/build.gradle.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/native/build.gradle.mustache
new file mode 100644
index 0000000000..f81df201eb
--- /dev/null
+++ b/modules/openapi-generator/src/main/resources/Java/libraries/native/build.gradle.mustache
@@ -0,0 +1,66 @@
+apply plugin: 'idea'
+apply plugin: 'eclipse'
+
+group = '{{groupId}}'
+version = '{{artifactVersion}}'
+
+buildscript {
+    repositories {
+        mavenCentral()
+        jcenter()
+    }
+}
+
+repositories {
+    mavenCentral()
+    jcenter()
+}
+
+apply plugin: 'java'
+apply plugin: 'maven'
+
+sourceCompatibility = JavaVersion.VERSION_11
+targetCompatibility = JavaVersion.VERSION_11
+
+install {
+    repositories.mavenInstaller {
+        pom.artifactId = '{{artifactId}}'
+    }
+}
+
+task execute(type:JavaExec) {
+   main = System.getProperty('mainClass')
+   classpath = sourceSets.main.runtimeClasspath
+}
+
+task sourcesJar(type: Jar, dependsOn: classes) {
+    classifier = 'sources'
+    from sourceSets.main.allSource
+}
+
+task javadocJar(type: Jar, dependsOn: javadoc) {
+    classifier = 'javadoc'
+    from javadoc.destinationDir
+}
+
+artifacts {
+    archives sourcesJar
+    archives javadocJar
+}
+
+
+ext {
+    swagger_annotations_version = "1.5.22"
+    jackson_version = "2.9.9"
+    junit_version = "4.12"
+}
+
+dependencies {
+    compile "io.swagger:swagger-annotations:$swagger_annotations_version"
+    compile "com.google.code.findbugs:jsr305:3.0.2"
+    compile "com.fasterxml.jackson.core:jackson-core:$jackson_version"
+    compile "com.fasterxml.jackson.core:jackson-annotations:$jackson_version"
+    compile "com.fasterxml.jackson.core:jackson-databind:$jackson_version"
+    compile "com.fasterxml.jackson.datatype:jackson-datatype-jsr310:$jackson_version"
+    testCompile "junit:junit:$junit_version"
+}
diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/native/gradle-wrapper.jar b/modules/openapi-generator/src/main/resources/Java/libraries/native/gradle-wrapper.jar
new file mode 100644
index 0000000000000000000000000000000000000000..5c2d1cf016b3885f6930543d57b744ea8c220a1a
GIT binary patch
literal 55616
zcmafaW0WS*vSoFbZJS-TZP!<}ZQEV8ZQHihW!tvx>6!c9%-lQoy;&<GGk?TcCnML%
z6A^pwl#>DmfdT@8fB*sl68LLCKtKQ283+jS?^Q-bNq|NIAW8=eB==8_)^)r*{C^$z
z{u;{v?I<GvkPsD7RHBs;y_cC7mzJWTorRU6p`4nSZcw0KVA?sno1pn4F)1@iB|-fI
z>MYnO`JhmPq7|LA_@Iz75S<har4a4b;nv~Dzs&e|lK=f^Ab;;|9Zdh9r~1Erp#Q_i
z)Is0K%J{!^MgC`3R|kDNJ7b6cXGr;~$qFzi5YXA*H$(I9hX~r*IypN19WSGAZlma=
z@8D$YKx=5F@8}q%qN$3kit-hmW~7G$YRDfD9>9h~8`iX>QrjrmMeu{>hn4U;+$dor
zz+`T8Q0f}p^Ao)LsYq74!W*)&dTnv}E8;7H*Zetclpo2zf_f>9>HT8;`O^F8;M%l@
z57Z8dk34kG-~Wg7n48qF2xwPp;SOUpd1}9Moir5$VSyf4gF)Mp-?`wO3;2<dk#QvX
zNq=V~D5z;2`Tj6q@FqG^3)}|ERmz}^G<hA@O|{R{O*eSU&$w=qiapRDW(tABR4tgR
z4?&Uy9kWoPgMY3%QvY_<!aR-Z{;ggj-fVd4{3!nlW3P)gaYMPFKXzgTz@Y8);6FP5
zjN7Gk1bFke?m$h^F>x9gYj59oFwG>?Leva43@e(z{mjm0b*@OAYLC`O9q|s+FQLOE
z!+*Y;%_0(6Sr<(cxE0c=lS&-FGBFGWd_R<5$vwHRJG=tB&Mi<SMOLA+L+*D64Q)R3
zYZdQ`W2BH<$`00+5H|lp${TuxaaFziDWn_VKcFg|?K=O3Y5v5D{9KC@i*D)cX=CR9
z;EJgF+QH<ps+dqG*hkCz=f2)@MMXq3uDroOEhti_>8@hq_U7@IMyVyKkOo6wgR(<%
zQw1O!nnQl3T9QJ)Vh<v^oIPY2^T~PuIbh8#zrPn3(^WZ@e6&_+g}ma0pIU6^Pid*0
zys|y~GllV4TB2@#qWVaD`$boTmJ)Zb(3s|pbf{*j!Yv`M!O0eiu4cDTW5o+bj@;1C
zhlFD7U4JpuoISHx+bpy*_jxt6Ht*s+N3Xm+DK8PT&qC3FLQzGbmQbXz@3`=qTi8WU
zrVFh_hbW|Na)f~)i4F@i=5ZI61j=iNN$taQcxh-a3)Sgq^I+6aXt2dzwQ4B%wVm5B
zJ;|Y#7eL_?&%n-ir#8%c%ehdyK!zCXs0&RKtK>=(`cZM{nsEKChjbJhx@UQH+G>6p
z;beBQ1L!3Zl>^&*?cSZjy$B3<qlQ~cYR9s3h$b^reBT5Fk+mTyn3#~|L=C6bFDRG8
zifB8O&XM%~H-$K_ppFFVVG-Ru&|OZMwdLcX+rcIMCQv<G4Y_Q#^%ZLCI*D$x8DW_7
zZ10rzH>(1=Zyn~>@`!j%5v7IBRt6X`O)yDpVLS^9EqmHxBcisVG$TRwiip#ViN|4(
zYn!Av841_Z@Ys=T7w#>RT&iXvNgDq3*d?$N(SznG^wR`x{%w<6^q<JYu}g*z$;H14
zOx?_2FI3kqdhIocv+ei*Gv#kk7{dP93so3IG>j&|g})La;iD?`M=p>99p><39r9+e
z`dNhQ&tol5)P#;x8{tT47i*blMHaDKqJs8!Pi*F{#)9%USFxTVMfMOy{mp2ZrLR40
z2a9?TJgFyqgx~|j0eA6SegKVk@|Pd|_6P$HvwTrLTK)Re`~%kg8o9`EAE<nN9(M+8
zk%;gJBjgGoB!WHIbB)k(L!g<1QYeSaRV6o!erUY1`>1oAiY5Jgo=H<W#1ecfj!<Od
z7_qZ71<UX7qbKpF&(QQo#*_4bxRVS;(@)beO2O&VUni5WV$W6jzOc7xaV5xkObRhh
zCt^5wr*Qztc#D$=ywcqrL*cz$T|9}4lH+ggzC5i)z8wqPkmcOZ(<GIdd8snUc;=rx
zlC`pPUod@WPG*G#dDzGxYGyLF2uzo=ecW;#h#tYIk!%=TH*}}7EKi*KAHM&bLCoa8
zyz~F=qH}+Z_}}lQ!nUq9R<`;^Bn<!9L%kzqp!(?%g0{_AnkZf9{Gpe@y8QWe1hw4!
zSAtiN;^UP(+0gNNg~BNImN1WC;k%!8u1Ao2v4p^e=?O?oJss0F&^3^THP<n$MY^en
zv=PX-63ow`3!>}0*D?tSCn^=SIN~fvv453Ia(<1|s07aTVVtsRxY6+tT3589iQdi^
zC92D$ewm9O6FA*u*{Fe_=b`%q`pmFvAz@hfF@OC_${IPmD#QMpPNo0mE9U=Ch;k0L
zZteokPG-h7PUeRCPPYG%H<A>!WswC?cp7M|w42pbtwj!m_&4%hB6MdLQe&}@5-h~!
zkOt;w0BbDc0H!RBw;1UeVckHpJ@^|j%<DvdSZ0xDebb{Y$0;6Ho1^9HYrY>FBZlC}
zsm?nFOT$`F_i#1_gh4|n$rDe>0md6HvA=B%hlX*3Z%y@a&W>Rq`Fe(8smIgxTGb#8
zZ`->%h!?QCk>v*~{!qp=w?a*};Y**1uH<h7$9rxzHQR)$g(z1S8QAF#*U24*wrKd%
z4}~i|=2pAWAPI=wnkbg;1YHcq9W)g+{3H!7YoEauz7|);{u9J#qV{l~^!xz~Z;%(T
zn;Re10R#Q@r@w-9zNtyoD3uHR&yLktb9wmV%tJOW05uXG-CR0;m?Im53|oT@T4w%w
zJz0+Rs*Ri=SL!2!{fM!bB!X2%JN*h+@gOfs3?}HiLpt~(tWGg3El!5X$YU^c<Wa9-
zea;|7zkfnRLhy`spk5dAw;Ag2qr#U}=<X=O4xa*3iJ_6;xI;h%OA&jT_}l9xqmYew
z*kyg%%|j?FgKW)k&?{2y1c3nEZ@`Z#X5h#woZdG{Y-r54m}h@{dq@*r9w2V5B9<^}
z2k$$o@N}&!aHQ+b1H$1>`)OX`Gi+L%-d6{rV?@}MU#qfCU(!hLz;kWH=0A%W7E^pA
zD;A%Jg5SsRe!O*0TyYkAHe&O9z*Ij-YA$%-rR?sc`xz_v{>x%xY39!8g#!Z0#03H(
z{O=drKfb0cbx1F*5%q81xvTDy#rfUGw(fesh1!xiS2XT;7_wBi(Rh4i(!rR^9=C+-
z+**b9;icxfq@<7}Y!PW-0rTW+A^$o*#ZKenSkxLB$Qi$%gJSL>x!jc86`GmGGhai9
zOHq~hxh}KqQHJeN$2U{M>qd*t8_e&lyCs69{bm1?KGTYoj=c0`rTg>pS6G&J4&)xp
zLEGIHSTEjC0-s-@+e6o&w=h1sEWWvJUvezID1&exb$)ahF9`(6`?3KLyVL$|c)CjS
zx(bsy87~n8TQNOKle(BM^>1I!2-CZ^{x6zdA}qeDBIdrfd-(n@Vjl^9zO1(%2pP9@
zKBc~ozr$+4ZfjmzEIzoth(k?pbI87=<i9j8A6P_Q)BS3wyuZX)zAMtd6(`x0?t?A5
z%hGKrvTV`?8{R~u%jk>d5OfjVZ`Bn)J|urr8<b{Cut_K*Xd^KfafVtNq$wDRR}n3y
zDcFuN0?T3`L5(@6>yJq`ol^>_VAl^P)>2r)s+*3z5d<3rP+-fniCkjmk=2hTYRa@t
zCQcSxF&w%mHmA?!vaXnj7ZA$)te}ds+n8$2lH{NeD4mwk$>xZCBFhRy$8PE>q$<U}
z;Mkh?EI;0u$@?->wS`}8pI%45Y;Mg;HH+}Dp=PL)m77nKF68Fgg<ZXEG?Z+}ZLaBg
z7XQvOd(b+Tw;_tHmOQi+a30y&9SC`w7U=-smxEx5Lk%V%Bf}k5odepDt&yvF&|KGO
z+nyd8_nV#1CBhlluj)#0-cq^<M`VWLAq74gGcxV6l*+l1?=l0|N{Tjk!4p!DZVP#q
zT7GA7fnP<F8f^Iphz%fNQL}n87_Z0nE~nuX#5-@+1<ogAW7%)~@Fck+KPDBse2Kjr
zUSJn{a8F=(^Bqv2R2({pPxod!>Q-l3iXlVZuM2BDr<R7jd>R8AQbK;bn1%jzahl0;
zqz0(mNe;f~h8(fPzPKKf2qRsG8`+Ca)>|<&lw>KEqM&Lpnvig>69%YQpK6fx=8YFj
zHKrfzy>(7h2OhUVasdwKY`praH?>qU0326-kiSyOU_Qh>ytIs^htlBA62xU6xg?*l
z)&REdn*f9U3?u4$j-@ndD#D3l!viAUtw}i5*Vgd0Y6`^hHF5R=No7j8G-*$NWl%?t
z`7Nilf_Yre@Oe}QT3z+jOUVgYtT_Ym3PS5(D>kDLLas8~F+5kW%~ZYppSrf1C$gL*
zCVy}fWpZ3s%2rPL-E63^tA|8OdqKsZ4TH5fny47ENs1#^C`_NLg~H^uf3&bAj#fGV
zDe&#Ot%_Vhj$}yBrC3J1Xqj>Y%&k{B?lhxKrtYy;^E9DkyNHk5#6`4cuP&V7S8ce9
zTUF5PQIRO7TT4P2a*4;M&hk;Q7&{(83hJe5BSm=9qt~;U)NTf=4uKUcnxC`;iPJeI
zW#~w?HIOM+0j3ptB0{UU{^6_#B*Q2gs;1x^YFey(%DJHNWz@e_NEL?$fv?CDxG`jk
zH|52WFdVsZR;n!Up;K;4E$|w4h>ZIN+@Z}EwFXI{w_`?5x+SJFY_e4J@|f8U08%dd
z#Qsa9JLdO$jv)?4F@&z_^{Q($tG`?|9bzt8ZfH9P`epY`soPYqi1`oC3x&|@m{hc6
zs0R!t$g>sR@#SPfNV6Pf`a^E?q3QIaY30IO%yKjx#Njj@gro1YH2Q(0+7D7mM~c>C
zk&_?9Ye>B%*MA+77$Pa!?G~5tm`=p{NaZsUsOgm6Yzclr_P^2)r(7r%n(0?4B#$e7
z!fP;+l)$)0kPbMk#WOjm07+e?{E)(v)2|Ijo{o1+Z8#8ET#=kcT*OwM#K68fSNo%<
zvZFdHrOrr;>`zq!_welWh!X}=oN5+V01WJn7=;z5uo6l_$7wSNkXuh=8Y>`TjDbO<
z!yF}c42&QWYXl}X<PP0f5!bkF6n)!+V-TW|8d8&wa}v;NOj0i$B;8yY;E2`ess-bm
zt81;E;aA}~%#wiSi-}P~QdG%KfleL_dX=kLYF4o7Y!VtsB!$#313T^u;qS?vqDe~*
zacEQObaB)du}1R(i&qbFa0n;-gRmT*SR4Ks034#3x@_L2)}Nx=-U&ksNfhqU_IRh%
z=}eN0Vaa3W+04dtiI8~e?Ttl~aRjEL(gcT>aRr0u<kR4Tr%^{yVmAGL-&WkIO-5h#
zrzn-JO?bz!Oq}RcMB()Gl*Ab$B9>L?BNPXlGw=QpDUMo`v8pXzzG(=!G;t+mfCsg8
zJb9v&a)E!zg8|%9#U?SJqW!|oBHMsOu}U2Uwq8}RnWeUBJ>FtHKAhP~;&T4mn(9pB
zu9jPnnnH0`8ywm-4OWV91y1GY$!qiQCOB04DzfDDFlNy}S{$Vg9o^AY!XHMueN<{y
zYPo$cJZ6f7``tmlR5h8WUGm;G*i}ff!h`}L#ypFyV7iuca!J+C-4m@7*Pmj9>m+jh
zlpWbud)8j9zvQ`8-oQF#u=4!uK4kMFh>qS_pZciyq3NC(dQ{577lr-!+HD*QO_zB9
z_Rv<#qB{AAEF8Gbr7xQly%nMA%oR`a-i7nJw95F3<M4W+sj-oyyCOoGru)kHS~#ny
zMQ&|tNVB-2rt~YA3D-hRHy){N-EvKNYa&L94qm<7qj^X{`#wbacBnx%PeLH!(D+Yc
z4Pi*dnD$-bbkDwH(5%t`h=>iH&IX5hhy3CCV5y>mK4)&5a<yVc@%3Jn(B<7Pgl!5P
zP7%Z~NaOQ6(B}rjk;JJlDVqtypI8spsww$Ocjl6BX548C%VfhOoSdiRl?*F<>C*12
zI`{(g%MHq<(ocY5+@OK-Qn-$%!Nl%AGCgHl>e8ogTgepIKOf3)WoaOkuRJQt%MN8W
z=N-kW+FLw=1^}yN@*-_c>;0N{-B!aXy#O}`%_~Nk?{e|O=JmU8@+9<JgLq$v4ONrL
zG!e^iSM`TRwfn52lM%H&gS($XJuQ*=(~0)hZ6l!$Y9o;)J`U>2Q-Y6h)>@omP=9i~
zi`krLQK^!=@2BH?-R83DyFkejZ<R2S9kf;gA5Z*x{ru<+*r&fhflxyYX^LaXBNK3B
z(WCGM#k=rU;LE@Rzlt4od5K?O<DVH#R(L072|jLaH5XS%CTSXC(H~i3%!Z+wGxYXU
zI+MDFsfoMcZRh#UmCXh6JtdWbt|;`AGzJSe5U&p+-w5pt_o*qdGOF|H>khHJqV%^}
zUa&K22zwz7b*@CQV6BQ9X*RB177VCVa{Z!Lf?*c~PwS~V3<Xl6K($#dn5dkl=i5uO
z=f=b+@#Q(HJerbw!(-iXmD%LDLUw8=^4~bAi=>K{id1TB^WZh=aMqiws5)qWy<euQ
zCMUcAyMc=sb!n8LFR_@)B?w%W4HqA&FHEkdZa%|Zbwqq}J$A=k#QV!QxBBBR)Sul5
ztwr!nbjKu;zh93*S8N3S{#vaGhA(jOop)X^t*zvt51F~aNrqRv30JSYfCOh$TfDNg
zf_gWpOQ+SHw+Zylvs?M2XT6fr*Y5IN59T#y#kOcRaHY4HeOAuHqVKyhp|^i?RUUrK
z;Eda1gy0TE#TP7-r^(c64VMujq-kRRK3-v=qM}{*yii%bw0)+$NLA}xe#SGMS9XhB
z3S&K<dz(nc=~*rTxxp{)ovs2_Q(68>lK#^SG9!tqg3-)p_o(ABJsC!0;0v36;0tC=
z!zMQ_@se(*`KkTxJ~$nIx$7ez&_2EI+<xKgrR>{4=uI~dwKD$deb5?mwLJ~ema_0Z
z6A8Q$1~=tY&l5_EBZ?nAvn$3hIExWo_ZH2R)t<J+10zM3O)xUg9tNL}k576$!th(w
zKD=IbADTUYZkM_{68r`=vjDB+)_HELR~?a?z$Y_-a>YPjxTH5mAw#3n-*sOMV<F28
zEr!V+R<gUl?N=%-eEpJdq_1+~8|w$Vr@)vO2%le$FpG0%<a4d6kfqLm?5s+TWTcm5
zU5XUNQ$2+;;i4PTwNO!M<5cxcL|BPgg6^;9iqiJcC`*`1w%UPSCa`Rl8z10lOt&rm
z9zSFR{KE~SDB2;?^mFW!RtXv42uw(MHglO#7!++7uN^YzYM)u@FMQ0EjY1ydXBtWz
z#n0Bbin;xVe99Ub#}$T+)INZ|Blx$=?KR-*@@P9-eZ#p)uH{G9jvykORsZx{(LE8b
z_!Ru^00&}EYQXYmluX0Q`urW17hUjL202xLx9q^2gcn;vD~HoG&J+Cf-qwsaCXN{i
zit9~=z^@8NyqNlx)Iz*@r$r$rBdCfnN5uRsp205n%q`vCxKB`=)fjXPJx)m1-D76f
zZf!%CA?#9<NEMXG6=|~W>jpUrdnj1DBm4G!J+Ke}a|oQN9f?!p-TcYej+(6FNh_A?
zJ3C%AOjc<8%9SPJ)U(md`W5_pzYpLEMwK<_jgeg<cuRH0H;D>-VXSX1Nk1oX-{yHz
z-;CW!^2ds%PH{L{#12WonyeK5A=`O@s0Uc%s!@22etgSZW!K<%0(FHC+5(BxsXW@e
zAvMWiO~XSkmcz%-@s{|F76uFaBJ8L5H>nq6QM-8FsX08ug_=E)r#DC>d_!6Nr+rXe
zzUt30Du_d0oSfX~u>qOVR*BmrPBwL@WhF^5+dHjWRB;kB$`m8|46efLBXLkiF|*W=
zg|Hd(W}ZnlJLotYZCYKoL7Y<C=^be)R^4jGjwu})qX|lHh3=FeUh(ZcF~$!l`d4ZB
z(yQ__J|R=aI{Kxz&ffW&An~$jj73;?GR&6V?;Nj4M-Co7ae_()TlnocSS}%WGi%w3
zYr%L%>sQdLXZ!F`rLqLf8n$OZOyAzK`uKcbC-n0qoH!5-rh&k-`VADETKHxrhK<5C
zhF0BB4azs%j~_q_HA#fYPO0r;YTlaa-eb)Le+!IeP>4S{b8&STp|Y0if*`-A&DQ$^
z-%=i73HvEMf_V6zSEF?G>G-Eqn+|k`0=q?(^|ZcqWsuLlMF2!E*8dDAx%)}y=lyMa
z$Nn0_f8YN8g<4D<j2#`N%^jVLZT=IWcaG|V^5;hpxu%-8KouT;5}Dy&PZo)V5K(xS
zz%LFZW-|QJjNr|U31?n&K@aKR$XtHE1*z@t4LHt|O&u(!bs*iJk<?6^ltF_W3B0BL
zbD$mWU&WsDWVxNA3o#(4%(<tX&ZOV|SteG6G&u}XR;N{~(@dtH=R|}=v!5waWvpJ0
z_Knhik};mq$*#o|T`5K2G!u;@hz@w4v0U+c|MAc95^{J!G=l*F1;PLUG5z~^McfRn
zoE^<wj780@j0Fr0|As81Z=-MepAjdit~+9@Vt(VQ|LyLbz0Av1CS?E`lw5U5V3Ofh
zf;h{7L#fQ+Xw8&ZCz`Ak>>8IL3)GPf#dJYU@|NZqIX$;Lco?Qj=?W6J;D@pa`T=Yh
z-ybpFyFr*3^gRt!9NnbSJWs2R-S?Y4+s~J8vfrPd_&_*)HBQ{&rW(2X>P-_CZU8Y9
z-32><7|wL*K+3{ZXE5}nn~t@NNT#Bc0F6kKI4pVwLrpU@C#T-&f{Vm}0h1N3#89@d
zgcx3QyS;Pb?V*XAq;3(W&rjLBazm69XX;%^n6r}0!CR2zTU1!x#TypCr`yrII%wk8
z+g)fyQ!&xIX(*>?T}HYL^>wGC2E}euj{DD_RYKK@w=yF+44367X17)GP8DCmBK!xS
zE{WRfQ(WB-v>DAr!{F2-cQKHIjIUnLk^D}7XcTI#HyjSiEX)BO^GBI9NjxojYfQza
zWsX@GkLc7EqtP8(UM^cq5zP~{?j~*2T^Bb={@PV)DTkrP<9&hxDwN2@hEq~8(ZiF!
z3FuQH_iHyQ_s-#EmAC5~K$j_$cw{+!T>dm#8`t%CYA+->rWp09jvXY`AJQ-l%C{SJ
z1c~@<5*7$`1%b}n7ivSo(1(j8k+*Gek(m^rQ!+LPvb=xA@co<|(<v=1sPmq?J4vh1
zvUrv*IZ5t+5o!)uvdUU@5_8trTxXfrB*K7#KajDZ9(8DwPY$`heC&O2`esN9q}ZmW
z2BaSHOAjowcnJ-#v3N=Go4y*YwuJubHycZLmF_u{e;(|0vav*r_RePvhI4W(LcX8N
zA(Q+?y{@8WG3L||j!Ww34uD&=5#iNtDzs%v8s%d3k3c{ew35oRM`^Xi#uH^aROu4z
zT6({Vp5P_5%7s^j#Tg_7?qVm=tAwBIg??%71<vTW7GA86m}9yjs>XDK+(tb46xJ4)
zcw7w<0p3=Idb_FjQ@ttoyDmF?cT4JRGrX5xl&|ViA@Lg!vRR}p#$A?0=Qe+1)Mizl
zn;!zhm`B&9t0GA67GF09t_ceE(bGdJ0mbXYrUoV2iuc3c69e;!%)xNOGG*?x*@5k(
zh)snvm0s&gRq^{yyeE)>hk~w8)nTN`8HJRtY0~1f`f9ue%RV4~V(K*B;jFfJY4dBb
z*BGFK`9M-tpWzayiD>p_`U(29f$R|V-qEB;+_4T939BPb=XRw~8n2cGiRi`o$2qm~
zN&5N7JU{L*QGM@lO8VI)fUA0D7bPrhV(GjJ$+@=dcE5vAVyCy6r&R#4D=GyoEVOnu
z8``8q`PN-pEy>xiA_@+EN?EJpY<#}BhrsUJC0afQFx7<P!jj)HvM}dm%OQQX)#0#Q
z;`AO|DV6XVrffwqevvd$THno;(4*>-pBeLXR9Mr+#w@!wSNR7vxHy@r`!9MFecB4O
zh9jye3iSzL0@t3)OZ=OxFjjyK#KSF|zz@K}-+HaY6gW+O{T6%Zky@gD$6SW)Jq;V0
zt&LAG*YFO^+=ULohZZW*=3>7YgND-!$2}2)Mt~c>JO3j6QiPC-*ayH2xBF)2m7+}#
z`@m#q{J9r~Dr^eBgrF(l^#sOjlVNFgDs5NR*Xp;V*wr~HqBx7?qBUZ8w)%vIbhhe)
zt4(#1S~c$Cq7b_A%wpuah1Qn(X9#obljoY)VUoK%OiQZ#Fa|@ZvGD0_oxR=vz{>U*
znC(W7HaUDTc5F!T77GswL-jj7e0#83DH2+lS-T@_^SaWfROz9btt*5zDGck$<!b+H
z2aFAFQ&5ATq(uA#3T3W>{}*njAwf}3hLqKGLTeV&5(8FC+IP>s;p{L@a~RyCu)MIa
zs~vA?_JQ1^2Xc&^cjDq02tT_Z0gkElR0Aa$v@VHi+5*)1(@&}gEXxP5Xon?lxE@is
z9sxd|h#w2&P5uHJxWgmtVZJv5w>cl2ALzri;r57qg){6`urTu(2}EI?D?##g=!Sbh
z*L*>c9xN1a3CH$u7C~u_!g81`W|xp=54oZl9CM)&V9~ATCC-Q!yfKD@vp#2EKh0(S
zgt~aJ^oq-TM0IBol!w1S2j7tJ8H7;SR7yn4-H}iz&U^*zW95HrHiT!H&E|rSlnCYr
z7Y1|V7xebn=TFbkH;>WIH6H>8;0?HS#b6lCke9rSsH%3AM1#2U-^*NVhXEIDSFtE^
z=jOo1>j!c__Bub(R*dHyGa)@3h?!ls1&M)d2{?W5#1|M@6|ENYYa`X=2EA_oJUw=I
zjQ)K6;C!@>^i7vdf`pBOjH>Ts$97}B=lkb07<&;&?f#cy3I0p5{1=?O*#8m$C_5TE
zh}&8lOWWF7I@|pRC$G2;Sm#IJfhKW@^jk=jf<lp`AZZ)~U7Ldz$=Bm2(n{nn<Q5@Q
z2Mwqr9?8qsU5o%J75Ban>M1MdJP(v2fIrYTc{;e5;5gsp`}X<zNgn_TDjzA~MrNqh
z2eOBR1SOc7c&k;ZD?H;*0Vx3rHEeW3)RV|Sa~Bz?9{go&Xl&2cl%Oj^M_Us4VKXd#
zyxhzR14iSlhnLZA%}L6$@0qOl)=Te{k+Kc2wZ=Zp((>8-!{9{S1{h+)<@?+D13s^B
zq9(1Pu(Dfl#&z|~qJGuGSWDT&u{sq|huEsbJhiqMUae}K*g+R(vG7P$p6g}w*eYWn
zQ7luPl1@{vX?<U$9Wp*YEb6ss?rx=f4k}iAs?j7oOep|QAw>PMK%-IBt+N7TMn~GB
z!Ldy^(2Mp{fw_0<EeBCzww$51?l2CfM@fYHP<qUc(A&$JlN1h1szAzK&Eq5KRJa9j
zfISxT&%V&i+UAsnyQV7M0$~YlU&cI@S^PyP8HB6XD%{{1sm@2&^ic0##Jy`;Y%Xzc
z{I`J?+gSvEq2}N-G^VunT(%j_@abd3Y<IDTnYfmfV8+=9rmoo^r$X7A0pj$}bZE{2
zK}_3SiSP7VMy%O01EF)+79!F(*vbq}ie$WtG(WZ+4QUYj2ThAsWJ3XI@^CWQe%{dJ
z4B@*#7k$Lx7E!-{z$irPLByPA^ngtMHm`cbv2J_ZmZL)$ldrf@mEjE8fC$^;BFe9%
z0;7PG$0;=B7H$urh}Od?Pz@lJMk4cq1s~A-%Gc}<1xu^cO;06V++(x*LFyXpB16hi
zax%k7k(qxEPSlUpp<k7<XQuaj`Y%jqnjtG&$zM$gEE*6H<-afG{;`Ht{~=8IpW2fD
zpm5Z{-B3nQzreE^OBRXpkT1=64f%h`2U37Vm=Hor*b(smB(nQ`*eDL}+G1cE6VJ{A
zARQ`P3!6vg!c_p&qY`wncRimyYzZNajPiAq%qM}Kjz8zMWwF_QsUCM>;<<n9QUR%i
zfkI{H88Bs+2@W+J+*omJRPAt3Qj)a&oc>$dgHAv1gZgyJAx%}dA?jR=NPW1K`FkoY
zNDgag#YWI6-a2#&_E9NMIE~gQ+*)i<>0c)dSRUMHpg!+AL;a;^u|M1jp#0b<+#14z
z+#<q3-75TB%G9WTT#W!j;XUkMQue!rguCu(-<@wdxW(XXosWp{(Uz4Cz8`#iQu6+W
zFaM*bHUxpEa7!<W>LuQ1jCyV_GNj#lHWG3e9P@H34~n0VgP#(SBX=v|RSuOiY>L87
z#KA{JDDj2EOBX^{`a;xQxHtY1?q5^B5?up1akjEPhi1-KUsK|J9XEBAbt%^F`t0I-
zjRYYKI4OB7Zq3FqJFBZwbI=RuT~J|4tA8x)(v2yB^^+TYYJS>Et`_&yge##PuQ%0I
z^|X!Vtof}`UuIxPjoH8kofw4u1pT5h`Ip}d8;l>WcG^qTe>@x63s#zoJiGmDM@_h=
zo;8IZR`@AJRLnBNtatipUvL^(1P_a;q8P%&voqy#R!0(bNBTlV&*W9QU?kRV1B*~I
zWvI?SNo2cB<7bgVY{F_CF$7z!0<TVnewi8<kMd)PQKo}NbSs>2Qxfw-Ew#p!8PC#!
z1sRfOl`d-Y@&=)l(Sl4CS=>fVvor5lYm61C!!iF3NMocKQHUYr0%QM}a4v2>rzPfM
zUO}YRDb7-NEqW+p_;e0{Zi%0C$&B3CKx6|4BW`@`AwsxE?Vu}@Jm<3%T5O&05z+Yq
zkK!QF(vlN}Rm}m_J+*W4`8i~R&`P0&5!;^@S#>7qkfb9wxFv@(wN@$k%2*sEwen$a
zQnWymf+#Uyv)0lQVd?L1gpS}jMQZ(NHHCK<c!y-2vWm5=SjM{l!pf9&VcSAI@>Ryu
zjK|Zai0|N_)5iv)67(zDBCK4Ktm#ygP|0(m5tU`*AzR&{TSeSY8W=v5^<J9M=Ij&e
zDPL>=Ic`ahxM-LBWO+uoL~wxZmgcSJMUF9q%<%>jsvh9Dnp^_e>J_V=ySx4p?SF0Y
zg4ZpZt@!h>WR76~P3_YchYOak7oOz<f=}fJ88&9GWFr4oXrZhG3{x1EZ(thrLvVoZ
zmI{`ETVwzMV9xGWLiy4ZyuH)%(~*1PEdG!k?|9b*eM;^yX)dpa>R|`t+h!BbN}?zd
zq+vMTt0!duALNWDwWVIA$O=%{lWJEj;5(QD()huhFL5=6x_=1h|5ESMW&S|*oxgF#
z-0<B=5BA-|8Xw4-fVPa|SME#p-Q9NBHiY^r*tP#q%_ATjL=j0e@BcN1DxU`_@{%UY
z#xC%%;0Cym`E{w*|Az)iSII&!N#iA2(OpIfQby0QB3nA$rF1(t4l<Y?CF$5E^a~1?
ztx9g`7va+DjQzNDV7`^a$U`Dxxo&2;u6%6B<_G{oUK3eSqzOf}Ak;j)6!nM5g1G_b
zTqQFb?@oHEpJjMzS(v&3E0Y2UDuWoZBdLA%1iT<fjVF20#4B~!KI5HM!66r5Y0_<j
zyMfM~adcpXX9*uI2%Bs^k#d6igmZey9XRw#t1Kflgo3fOM5EHrsb72zxh#1g>GRIb
ziolwI13hJ-Rl(4Rj@*^=&Zz3vD$RX8bFWvBM{niz(%?z0gWNh_vUvpBDoa>-N=P4c
zbw-XEJ@txIbc<`wC883;&yE4ayVh>+N($SJ01m}fumz!#!aOg*;y4Hl{V{b;&ux3&
zBEmSq<t4aR2h_Qe%DoybQC94?0lUh~gOHB-K1F}kYPO{g>2jQ7#IbVm3TPBw?2vVN
z0wzj|Y6EBS(V%Pb+@OPkMvEKHW~%DZk#u|A18pZMmC<U^I9IX>rjWh%7J4Ph>vG61
zRBgJ6w^8dNRg2*=K$Wvh$t>$Q^SMaIX*UpBG)0bqcvY%*by=$EfZAy{ZOA#^tB(D(
zh}T(SZgdTj?bG9u+G{Avs5Yr1x=f3k7%K|eJp^>BHK#~dsG<&+=`mM@>kQ-cAJ2k)
zT+Ht5liXdc^(aMi9su~{pJUhe)!^U&qn%mV6PS%lye+<ix)CY|ChjLmnT_ZqqodK`
z3mn#R1y((F=bo8D2I%`VNL=zF1@rZZ?(R(Kq{6*!MFrhc^rx&kyn`}^&AQnLUj54{
z=Q7fS{euYqaMPR(9rUJX|7F!dX4&Epw=PJ0tCg4x!tWH28^TZs7ePIAQ$@KUch@bg
zeJ|Io&ft3<_j~i3`wTYc=&nNMTh*JEPJ0YRS`O-Wb`|zPgeS)ZEijy3<QL5_UK|p1
zwg}HsB~)`&F*!7K&Y#-=xWf)n`B^rYqE++<;~hSPha_E5V_o&!@{(!v84t$Pbb&|q
zHqrPJi90{}1qajIHf}ZA=Os|@C`@VFYK*=}6VlRH4TkVEqqL;H3mAWa>Iw5F@Xv8E
zdR4#?iz+R4--iiHDQmQWfNre=iofAbF~1oGTa1Ce?hId~W^kPuN(5vhNx++ZLkn?l
zUA7L~{0x|qA%%%P=8+-Ck{&2$UHn#OQncFS@uUVuE39c9o~#hl)v#!$X(X*4ban2c
z{buYr9!`H2;6n73n^W3Vg(!gdBV7<OCDaMS_-{|@ghRZHM}jEAr|pxd1s2VO1D3`6
zTYx;#8N4Ps1astmVGjg=boui!g1FC)1efC{S<ma!A5jj;N{Tr~P6w3T?qU7`dMvTp
zMBa(`<fFJ@Tm_k--`1r<;K?&y<_ps3P-scN@0}MIB$Md6D|?$(8_NwolH0y%(MXr0
zI}ghLVw{329HGh7+tgyaFv<6}BDoZ`i~*V<b>$e<T<|t3aM3lh)Efm(SqmL(xhA!o
z0W6r6lRM40@Ol<TDCh6VaQjacD6=>#v3<ku^qNS(8D1%MZ8ep3rXZTZ_9M!irH6!8
zsI3^I<%_J5PZ4kqunDHPth1W9FurL8>qubWALaUEAf@`ava{UTx%2~VVQbEE(*Q8_
zv#me9i+0=QnY)$IT+@3vP1l9Wrne+MlZNGO6|zUVG+v&lm7Xw3P*+gS6e#6mVx~(w
zyuaXogGTw4!!&P3oZ1|4oc_sGEa&m3Jsqy^lzUdJ^y8RlvUjDmbC^NZ0AmO-c*&m(
zSI<FJ<O#nNuE{IazaWpE8s%<1qt4W$l&UWIhX3c5<!uk+sQho4xBl0N{(ZS8@t?}K
zf0TJ5f1$~KdYItviPIw##7-!kM}xleYDyRofmzSZu@&;m()m{_JTD-8$qOYD0utT3
z<LP^6Um&&I>%4P9f|s!B#073b>Eet`T@J;3qY!NrABuUaED6M^=s-Q^2oZS`jVzuA
z>g&g$!Tc>`u-Q9PmKu0SLu-X(tZeZ<%7F+$j3qOOftaoXO5=4!+P!%Cx0rNU+@E~{
zxCclYb~G(Ci%o{}4PC(Bu>TyX9slm5A^2Y<Il_M(sg0wPzLnK~D*UokUwv_maecNf
z80IGfi~Yb-nh}a-CX<akXO@b=X(XuPWHjQ*^76<NHcw5`M<+PB)`8)<Z&Xm|AWD9T
zh)}FpDVG1vFAaqntNFt9;r)4bKXqZlnqh7AslR>i$$kCq-M#Jl)a2W9L-bq5%@Pw^
zh*iuuAz`x6N_rJ1LZ7J^MU9~}RYh+EVIVP+-62u+7IC%1p@;xmmQ`dGCx$QpnIUtK
z0`++;Ddz7{_R^~KDh%_yo8WM$IQhcNOALCIGC$3_PtUs?Y44@Osw;OZ()Lk=(H&Vc
zXjkHt+^1@M|J%Q&?4>;%T-i%#h|Tb1u;pO5rKst8(Cv2!3U{TRXdm&<su5?)szW0u
z%Z-U^HX5Ow@CSy^)@;VC#LR01vt&l~hMmW>>fWTJG)n*q&wQPjRz<lHwvL5SX^tdS
zq1td=OnO^>g%pS1RO9}U0*C6fhUi&f#qoV`1{U<&mWKS<$oVFW>{&*$6)r6Rx)F4W
zdUL8Mm_qNk6ycF<vVRTsX9c$VX$y3=jk<zOiFwABjo&-66eMkDplHLGI^C;WguH7s
zRG?=TwXL`NT4Pk--b3In-rO%EoV7Vd>VkI5F?V+cYFUch$92|8O^-Z1JC94GU+Nuk
zA#n3Z1q<mXmGCwb8B?l4_+w)b(9tR?hi~u~Txkq<hqZ&n&aPv2z_)1Y^z}i!$AQ)y
z9?9YRg<=AH77vT_Lid?oYwR{^g$TFJU`uVbMRSQs5ZWWRAZzG&Z%W+`H_@C)S<vwH
z8Dtv4JUmP+xyRn9pfQwg(tZ0N+B^aReaJsmm8<(=hWx?|MMVYGSgnq%HmTa3T3qY+
zVS(;A6`iyPo)o$|)lRE_WUtgJIx&gbscLZGY$`<VZkd`=m+&LOU~Cm8DBlzYU+;Nh
zx$L9CYSt<bu&#FEud_Vpg#>4<6zRiv%W5`NGk*Ym{#0E~IA6*)H-=RmfWIY%mEC0?
zSih7uchi`9-WkF2@z1ev6J_N~u;d$QfSNLMgPVpHZoh9oH-8D*;EhoCr~*kJ<|-VD
z_jklPveOxWZq40E!SV@0XXy+~Vfn!7nZ1GXsn~U$>#u0d*f?RL9!NMlz^qxYmz|xt
zz6A&MUAV#eD%^GcP#@5}QH5e7AV`}(N2#(3xpc!7dDmgu7C3TpgX5Z|$%Vu8=&SQI
zdxUk*XS-#C^-cM*O>k}WD5K81e2ayyRA)R&5>KT1QL!T!%@}fw{>BsF+-pzu>;7{g
z^CCSWfH;Y<I?vNb2hz$`traUdQ{)s+@=yAFJX2>tJGT@+An0Ded#zM9>UEFOdR_Xq
zS~!5R*{p1Whq62ynHo|n$4p7&d|bal{iGsxAY?opi3R${)Zt*8YyOU!$TWMYXF?|i
zPXYr}<vX_8>wJp#EH;keSG5WYJ*(~oiu#GDR>C4%-HpIWr7v`W`lzQN-lb?*vpoit
z8FqJ)`LC4w8fO8Fu}AYV`awF2NLMS4$f+?=KisU4P6@#+_t)5WDz@f*qE|NG0*hwO
z&gv^k^kC6Fg;5>Gr`Q46C{6>3F(p0QukG6NM07rxa&?)_C*eyU(jtli>9Zh#eUb(y
zt9NbC-bp0><wGEXH|LbpZ2{4R?q(L-5AJVDwPtZ@SFNAP8c14_b1FDiNpLP7+uO?B
z6nJL8n;*1fx~)1cq!LAFOVa{|A=?7sd|qvWdnZGio5#S>^m?i`?$aJUyBmF`N0zQ%
zvF_;vLVI{tq%Ji%u*8s2p4iBirv*uD(?t~PEz$CfxVa<j81d3XNHAljh|;;i4>=@R
z^HQu6-+I9w>a35kX!P)TfnJDD!)j8!%38(vWNe9vK0{k*`FS$ABZ`rdwfQe@IGDki
zssfXnsa6teKXCZUTd^qhhhUZ}>GG_>F0~LG7*<*x;8e39nb-0Bka(l)%+QZ_IVy3q
zcmm2uKO0p)9|HGxk*e_$mX2?->&-MXe`=Fz3FRTFfM!$_y}G?{F9jmNgD+L%R`jM1
zIP-kb=3Hlsb35Q&qo(%Ja(LwQj>~!GI|Hgq65J9^A!ibChYB3kxLn@&=#pr}BwO<a
zUuN)qH?&l@%%C>N0Q=e5;#sF8GGGuzx6O}z%u3l?jlKF&8Y#lUA)Cs6ZiW8DgOk|q
z=YBPAMsO7AoAhWgnSKae2I7%7*Xk>#AyLX-InyBO?OD_^2^nI4#;G|tBvg3C0ldO0
z*`$g(q^es4VqXH2t~0-u^m5cfK8eECh3Rb2h1kW%%^8A!+ya3OHLw$8kHorx4(vJO
zAlVu$nC>D{7i?<Y2$%?@CNJ%~MCUJbM0|n&`3opa%m%uF1#F<Q69M*s;Npwa<3@0W
zv5De+4Il;}=0~7#^0h#S7v{+EFQVoKFjQ@RzroExEhO{oX}bybWnCK-`42!1e+O+D
zLUC@B)pn3$B~NKQGm>7xDg3116Y2e+)Zb4FPAdZaX}qA!WW{$d?u+sK(iIKqOE-YM
zH7y^hkny24==(1;qEacfFU{W{xSXhffC&DJV&oqw`u~WAl@=HIel>KC-mLs2ggFld
zsSm-03=Jd^XNDA4i$vKqJ|e|TBc19bglw{)QL${Q(xlN?E;lPumO~;4w_McND6d+R
zsc2p*&uRWd`wTDszTcWKiii1mNBrF7n&LQp$2Z<}zkv=8k2s6-^+#siy_K1`5R+n(
z++5VOU^LDo(kt3ok?@$3drI`<%+SWcF*`CUWqAJxl3PAq!X|q{al;8%HfgxxM#2Vb
zeBS756iU|BzB>bN2NP=AX&!{uZXS;|F`LLd9F^97UTMnNks_t7EPnjZF`2ocD2*u+
z?oKP{xXrD*AKGYGkZtlnvCuazg6g16ZAF{Nu%w+LCZ+v_*`0R$NK)tOh_c#cze;o$
z)kY(<i{7Q3nX0G^70MJMh)G-P7tbRU8+qs0P=&TvvQwq~JflsbNmYi<U)-xk)h(bi
z`?6TW#$jHPS8O-RrX2l@>eZ5Viv<5zl1XfL(#GO|2FlXL#w3T?hpj3BZ&OAl^L!7@
zy;+iJWYQYP?$(`li_!|bfn!h~k#=v-#XXyjTLd+_txOqZZETqSEp>m+O0ji7MxZ*W
zSdq+yqEmafrsLErZG8&;kH2kbCwluSa<@1yU3^Q#5HmW(hYVR0E6!4ZvH;Cr<$`qf
zSvqRc`Pq_9b+xrtN3qLmds9;d7HdtlR!2NV$rZPCh6>(7f7M}>C^LeM_5^b$B~mn|
z#)?`E=ze<yoxTGYaaEN^qPc-K$(qI%*5ZdiS0{0KQ_K169j7A#mG+mo7(2%7hqNN2
zOl1`ya-8-ueO3h$O=waekDF%RfAQ3@*35tF6nfau&-yK#U#{li^+Byt2ilU%_Arfn
z0mu2rAC44|{vU=E^KGEIM9V2s4pz<3%S@{kL_S&OM%o0GY=c6R9!^!k0(Ja@C7{ce
zv%kH5abAjQ0wrf8+MCwN&_i5pc9&LTdN>o9(9?{O_ko>51~h|c?8{F=2=_-o(-eRc
z9p)o51krhCmff^U2oUi#$AG2p-*wSq8DZ(i!Jmu1wzD*)#%J&r)yZTq`3e|v4>EI-
z=c|^$Qhv}lEyG@!{G~@}Wbx~vxTxwKoe9zn%5_Z^H$F1?JG_Kadc(G8#|@yaf2-4<
zM1bdQF$b5R!W1f`j(S>Id;CHMzfpyjYEC_95VQ*$U3y5piVy=9Rdwg7g&<G?*LX}N
zq|zKbX)EKg7`U_tc5<c(ln=(roV-m&^Yd65KD=o@qE*vnVlK9_vas)E_JL3xpHwzD
z5f!?(u3BD`$)xZq>)%#6;U%b2W}_VVdh}qPnM<l3WQl|5WwDIi5jw>4FY9zFP(5eR
zWuCEFox6e;COjs$1RV}IbpE0EV;}5IP}Oq|zcb*77PEDIZU{;@_;8*22{~JRvG~1t
zc+ln^I+)Q*+Ha>(@=ra&L&a-kD;l$WEN;YL0q^GE8+})U_A_StHjX_gO{)N>tx4&F
zRK?99!6JqktfeS-IsD@74yuq*aFJoV{5&K(W`6Oa2Qy0O5J<mWe%}HCAi3Alt9)B9
z=t{T1(uWFb7{-^xrjWqQri%y();w4rPz#RO#b45e8OJVTTv31+Rx!Tsmn#yso;D1V
zML_%p6j&qKwz-#>G>O`zZ-p7vBGh!MxS;}}h6(96Wp`dci3DY?|B@1p8fVsDf$|0S
zfE{WL5g3<9&{~yygYyR?jK!>;eZ2<U88UkoW~^VB6pbwbRBbqAd>L#tpL2)H#89*b
zycE?VViXbH7M}m33{#tI69<mRO1MJ-jiD*3=rB}*g^@@A>PUPD=r)EVPTBku={Qh{
zKi*pht1jJ+yRhVE)1=Y()iS9j`FesMo$bjLSqPMF-i<42Hxl6%y7{#vw5YT(C}x0?
z$rJU7fFmoiR&%b|Y*pG?7O&+Jb#Z%S8&%o~fc?S9c`Dwdnc4BJC7njo7?3bp#Yonz
z<eWglECxZtVJ~>PC>y`DVK~nzN^n}jB5RhE4N>LzhCZD#WQseohYXvqp5^%Ns!q^B
z&8zQN(jgPS(2ty~g2t9!x9;Dao~lYVujG-QEq{vZp<1Nlp;oj#kFVsBnJssU^p-4%
zKF_A?5sRmA>d*~^og-I95z$>T*K*33<bqIt^{o8$L$~UV#jC1+d35BF@;la6?p4eS
zc<y#KD4ka`^it_nv>TGBPzs{OMoV2i+(P6K|9<l3@?n-)3>5UwSj$Zn<@Rt(g%|iY
z$SkSjYVJ)I<@S(kMQ6md{HxAa8S`^lXGV?ktLX!ngTVI~%WW+p#A#XTWaFWeBAl%U
z&rVhve#Yse*h4BC4nrq7A1n>Rlf^ErbOceJC`o#fyCu@<qNQ*r4a9*?7jhW;%3)Sk
z`m%DcLcZ^}^5k)z=3&nLXMPE|($>H;y)`E#a#)w)3eg^{Hw&E7);N5*6V+z%olvLj
zp^aJ4`h*4L4ij)K+uYvdpil(Z{EO@u{BcMI&}5{ephilI%zCkBhBMCvOQT#zp|!18
zuNl=id<LjH^8w2mGjP;ZR$ARg_NjG@Xzk3&o#4E7eF|vp97yjN(mujEl}H5}LV!a)
z5i!hu3aJha)Dn^a3=l($6!mknFfn1x5ljAU>d81|{FpGkt%ty=$fnZnWXxem!t4x{
zat@68CPmac(xYaOIeF}@O1j8O?2jbR!KkMSuix;L8x?m01}|bS2=&gsjg^t2O|+0{
zlzfu5r5_l4)py8uPb5~NHPG>!lYVynw;;T-gk1Pl6PQ39Mwgd2O+iHDB397H)2grN
zHwbd>8i%GY>Pfy7;y5X7AN>qGLZVH>N<PuPq=9f!_a8uc3WsT9bT>_ZuJZ-`z9UA>
zfyb$nbmPqxyF2F;UW}7`Cu>SS%0W6h^Wq5e{PWAjxlh=#Fq+6SiPa-L*551SZKX&w
zc9TkPv4eao?kqomkZ#X%tA{`UIvf|_=Y7p~mHZKqO>i_;q4PrwVtUDTk<LvwuB1p*
z&;{X&ug*R~yW3?So?iiDz6X5zl>?M7N<InO3a`^2tWZ;tq|uVs_gs`cR1h!F-z?_o
zgwCmB*Aj*A89Rn^dgoPGa=B5m@U5pp2CdIS(Y~suIS+J6d^;6NU$M4gH{2eTVqqB<
zh&iI}Y{!E!eG)jSM^X{v$UO)2>Cssa?Y4uxYrsXj!+k@`Cxl;&{NLs*6!R<6k9$Bq
z%grLhxJ#G_j~ytJpiND8neLfvD0+xu>wa$-%5v;4;RYYM66PUab)c9ruUm%d{^s{#
zTBBY??@^foRv9H}iEf{w_J%rV<%T1wv^`)Jm#snLTIifjgRkX``x2wV(D6(=VTLL4
zI-o}&5WuwBl~(XSLIn5~{cGWorl#z+=(vXuBXC#lp}SdW=_)~8Z(Vv!#3h2@pdA3d
z{cIPYK@Ojc9(ph=H3T7;aY>(S3~iuIn05Puh^32WObj%hVN(Y{Ty?n?Cm#!kGNZFa
zW6Ybz!tq|@erhtMo4xAus|H8V_c+XfE5mu|lYe|{$V3mKnb1~fqoFim;&_ZHN_=?t
zysQwC4qO}rTi}k8_f=R&i27RdBB)@bTeV9Wcd}Rysvod}7I%ujwYbTI*cN7Kbp_hO
z=eU521!#cx$0O@k9b$;pnCTRtLIzv){nVW6Ux1<0@te6`S5%Ew3{Z^9=lbL5$NF<g
z7h3&c(4kC9finw=$>vd4eUtK?%zgmB;_I&p`)YtpN<seswnZE<<!u}HF?<U_QWcy#
zN9rkMy7o@aL@){7z>`2Im(?jPN<(7Ua_ZWJRF(CChv`(gHfWodK%+joy>8Vaa;H1w
zIJ?!kA|<L)AyCgEPfRnxLH`_*u&*2>x7V;4U1BNr(UrhfvjPii7YENLIm`LtnL9Sx
z5E9TYaILoB2nSwDe|BVmrpLT4<pw=1#&qLiu9t~e6wCLJk%R981Ny41-7+WP1;-{n
zoP=61-Ynq|(ya2-mgS2K)&fo{8Ry)oJ~wl7e(^_~jV}O}*DOge<3dG>3*dJ8;T@1l
zJE)4LEzIE{IN}+Nvpo3=ZtV!U#D;rB@9OXYw^4QH+(52&pQEcZq&~u9bTg63ikW9!
z=!_RjN2xO=F+bk>fSPhsjQA;)%M1My#34T`I7tUf>Q_L>DRa=>Eo(sapm>}}LUsN%
zVw!C~a)xcca`G#g*Xqo>_uCJTz>LoWGSKOwp-tv`yvfqw{17t`9Z}U4o+q2JGP^&9
z(m}|d13XhYSnEm$_8vH-Lq$A^>oWUz1)bnv|AVn_0FwM$vYu&8+qUg$+qP}nwrykD
zwmIF?wr$()X@33oz1@B9zi+?Th^nZnsES)rb@O*K^JL~ZH|pRRk$i0+ohh?Il)y&~
zQaq{}9YxPt5~_2|+r#{k#~SUhO6yFq)uBGtYMMg4h1qddg!`TGHocYROyNFJtYjNe
z3oezNpq6%TP5V1g(?^5DMeKV|i6vdBq)aGJ)BRv;K(EL0_q7$h@s?BV$)w31*c(jd
z{@hDGl3QdXxS=#?0y3KmPd4JL(q(>0ikTk6nt98ptq$6_M|qrPi)N>HY>wKFbnCKY
z%0`~`9p)MDESQJ#A`_>@iL7qOCmCJ(p^>f+zqaMuDRk!z01Nd2A_W^D%~M73jTqC*
zKu8u$$r<LPe{#urvjwW;MEzt+?#y7U2cq!11e|z;OQF2c<mZ+2p+J%rS_H*coWLeZ
zIFHHp5%Ux+ekEN7C2V7=IiqdB97GjbH%4B5=VeDO@T}{F#pHjX*!a;zJ5b$mbJ*`l
z@gC&^3)q0;DB3^nV=56?Lm5>({vP~TE8rPk?8RSjlRvG*BLF}ye~Su%s~rivmjg2F
z24dhh6-1EQF(c>Z1E8DWY)Jw#9U#wR<@6J)3hjA&2qN$X%piJ4s={|>d-|Gzl~RNu
z##iR(m;9TN3|zh+>HgTI&82iR>$YVoOq$a(2%l*2mNP(AsV=lR^>=tIP-R9T<Nh&C
zWHDS^NyMa`7pMppwk!!pCgcUdflO*4kyBirpMXnQQ=1yGHQpY72&B-!x<4*2B_4s5
zd48O>w!BYnZROx`PN*JiNH>8bG}&@h0_v$yOTk#@1;Mh;-={ZU7e<cTpM-I})#mmS
zXiFWeyDTI}%iJRo$(xcJs0>@JE(~@@y0AuETvsqQV@7hbKe2wiWk@QvV=Kz`%@$rN
z_0Hadkl?7oEdp5eaaMqBm;#Xj^`fxNO^GQ9S3|Fb#%{lN;1b`~yxLGEcy8~!cz{!!
z=7tS!I)Qq%w(t9sTSMWNhoV#f=l5+a{a=}--?S!rA0w}QF!_Eq>V4NbmYKV&^OndM
z4WiLbqeC5+P@g_!_rs01AY6HwF7)$~%Ok^(NPD9I@fn5I?f$(rcOQjP+z?_|V0DiN
zb}l0fy*el9E<M05>3Q7fVRKw$EIlb&T0fG~fDJZL7Qn8*a5{)vUblM)*)NTLf1ll$
zpQ^(0pkSTol`|t~`Y4wzl;%NRn<sz(Q)N+Z$1UxSOJdp->>689mpQrW=SJ*rB;7}w
zVHB?&sVa2%-q@ANA~v)F<EKSn&@d}0o$DquIcW2efe#&PvpO$*G^#gg(s}M5)aEyH
zFmJ|FQ{)Vhn=R>Xb`?Nz8M1rHKiZB4xC9<{Q3T!XaS#fEk=sXI4IFMnlRqG+yaFw<
zF{}7tcMjV04!-_FFD8(FtuOZx+|CjF@-xl6-{qSFF!r7L3yD()=*Ss6fT?lDhy(h$
zt#%F5<EM^a9o4av$IN{>75$U(3-e2LsJd>ksuUZZ%=c}2dWvu8f!V%>z3gajZ!Dlk
zm=0|(wKY`c?r$|pX6XVo6padb9{EH}px)jIsdHoqG^(XH(7}r^bRa8BC(%M+wtcB?
z6G2%tui|Tx6C3*#RFgNZi9emm*v~txI}~xV4C`Ns)qEoczZ>j*r<WgOixd!mP8ONI
zlBz*Y(GH5^&|w=+$N@s^xC|x4cB7?c;Vy@cP4QTp9U&Q(CPPU-rcUSjaeYqEvEPI>
zqQCa5k90Gntl?EX!{iWh=1t$~jVoXjs&*jKu0Ay`^k)hC^v_y0xU~brMZ6PPcmt5$
z@_h`f#qnI$6B<RoU<yv^Lf%Xl`0pW!7mk>D(`#IR0PrITIV^~O{uo=)+Bi$oHA$G*
zH0a^PRoeYD3jU_k%!rTFh)v#@cq`P3_y=6D(<b6Koz6*-3){jUY2ZN*@>M~GBud;4
zCk$LuxPgJ5=8OEDlnU!R^4QDM4jGn<IGNNxhxXj<KLl(9GNJ=I$T1G*U~(lvT`|gA
z#uOl}zAb~N*b6cj<U+zFF=TIs+-~M65}Yu4z$I<|sDg`Y=LIQ(i%aGa5_ti?=Mka)
z1exav+2!GXxPwz%vCK_9abkH7{(y|O7SO-OeTPBC3+{a6dB@=tG^H@s1&&Yw>i}~C
zy;t2E%Qy;A^bz_5HSb5pq{x{g59U!ReE?6ULOw58DJ<O45}B^@!!UaE^%7Z8_pWUx
zVg|*lI+VksK0<Fq)FcK76D>cJy;H?g*ofr(X7+8wF;*3{rx>j&27Syl6A~{|w{pHb
zeFgu0E>OC<m~&I9^|59433v0MsO0%6G7z~hnNz|CkxwDLZ+OXFOnQ6bo69irRWr&T
z1RFk_`OFBOd@qhA2qpTs;udIIpSmYUb9rIvae`3^FHX)k*tb*lRX<~DNi(b8ZYrKO
zg+N7q`3zz}rl&d(qI3;-MxeK0w`2dwI7V>81~6a9(2F13r7NZDGdQxR8T68&t`-BK
zE>ZV0*0Ba9HkF_(AwfAds-r=|dA&p`G&B_zn5f9Zfrz9n#Rvso`x%u~SwE4SzYj!G
zVQ0@jrLwbYP=awX$21Aq!I%M{x?|C`narFWhp4n;=>Sj!0_J!k7|A0;N4!+z%Oqlk
z1>l=MHhw3bi1vT}1!}zR=6JOIYSm==qEN#7_fVsht?7SFCj=*2+Ro}B4}HR=D%%)F
z?eHy=I#Qx(vvx)@Fc3?MT_@D))w@oOCRR5zRw7614#?(-nC?RH`r(bb{Zzn+VV0bm
zJ93!(bfrDH;^p=IZkCH73f*GR8nDKoBo|!}($3^s*hV$c45Zu>6QCV(JhBW=3(Tpf
z=4PT6@|s1Uz+U=zJXil3K(N6;ePhAJhCIo`%XDJYW@x#7Za);~`ANTvi$N4(Fy!K-
z?CQ3KeEK64F0@ykv$-0oWCWhYI-5ZC1pDqui@B|+LVJmU`WJ=&C|{I_))TlREOc4*
zSd%N=pJ_5$G5d<CT0q4T$F7WOR#b3NxQX-OZtxL}pfTa<aS#C>^3XK+yj2UZasg2)
zXMLtMp<5XWWfh-o@ywb*nCnGdK{&S{YI54Wh2|h}yZ})+NCM;~i9H@1GMCgYf`d5n
zwOR(*EEkE4-V#R2<Z}&NY_JGKwN?`1fmXa>+Rc>@cAEho+GAS2L!tz<rnexGy*YgV
zTxr}n=n&IH-g-J}pvQ{WA+jso)rXdp&+4h8D*4<NJTP;{rtyl*i(-DGjDEaThKnco
z3~;|C?{ABND{${TZE#5=Gz3yl6okqI30w@@BlkoN)N2)m<iT*1eXj{`U4Zs$$TV4h
zH=!1<un=UZX;7q`T>isLl${4<R&k;-;<%^0)S>2Y=A7v}h;#@71_Gh2MV=hPr0_a%
z0!={Fcv5^GwuEU^<B-}N2I&G$o~=u-n7D}f1v1oK5~O^2p~@3^llXE{!UKgvQw$7U
zD0TH5<y&ml&G5nYX+(+KVH>5rD|sP;+y<%5o9;#m>ssbtVR2g<420(I-@fSqfBVMv
z?`>61-^q;M(b3r2z{=QxSjyH=-%99fpvb}8z}d;%_8$$J$qJg1Sp3KzlO_!nCn|g8
zzg8skdHNsfg<lpGz$4_qo2PdLw@63gq_kZ7j0&D>kf8<eUVvW;B&MVU7*xQ$(*Q@0
z*;ko;Z!hnAWPaXO;{{=8ByMVeO-VzYKW=*k0@rI6alWeFy#fVflfsqt&tfFE?}bjK
zOg&>A7PWs;YBz_S$S%!hWQ@G>guCgS--P!!Ui9#%GQ#Jh?s!U-4)7ozR?i>JXHU$|
zg0^vuti{!=N|kWorZN<Kk)Vl#qAN)fkn)nl$;6kyNvKy=3C5Pn*~gVr5Cde*DIfR=
z(=s$SCz6`~Ou_qTF311bNYa*VYj*Z^CAr+I$_NXrS&?hmX9F)0dxWOtgNOwJDFsU#
z()xzy$g>FX`dJgdphgic#(8sOBHQdBkY}Qzp3V%T{DFb{nGPgS;QwnH9B9;-Xhy{?
z(QVwtzkn9I)vHEmjY!T3ifk1l5B?%%TgP#;CqG-?16lTz;S_mHOzu#MY0w}XuF{lk
z*dt`2?&plYn(B>FFXo+fd&CS3q^hquSLVEn6TMAZ6e*WC{Q2e&U7l|)*W;^4l~|Q=
zt+yFlLVqPz!I4<rMg8hx(EK7-A^ktt!ru!e$tvcCSgI)8hLV`-xI-}pWKD)>0}NHv
zE2t1meCuGH%<`5iJ(~8ji#VD{?uhP%F(TnG#uRZW-V}1=N%ev&+Gd4v!0(f`2Ar-Y
z)GO6eYj7S{T_vxV?5^%l6TF{ygS_9e2DXT>9caP~xq*<Dh>~oE<5KkngGtsv)sdCC
zaQH#kSL%c*gLj6tV)zE6SGq|0iX*DPV|I`byc9kn_tNQkP<l#k(!rg)R0>U%y<`rj
zMC}lD<93=Oj+D6Y2GNMZb|m$^)RVdi`&0*}mxNy0BW#0iq!GGN2BGx5I0LS>I|4op
z(6^xWULBr=QRpbxIJDK~?h;K#>LwQI4N<8<HCF4PJqc@4B}Bw~!Xq6G6Xz7EBJUI(
zsZvb<id1({jwk7nkoj{<51Ag6HJWYnTrg^F@}Sm8pcVVaDGh~3V<7=VsYfPw=^1LJ
z*&GQC4_2FM)EJLNy&-09CgTF9`T*N$p=16z#%w6ajJ-ffNFbzO>V?%3>9I5l+e*yG
zFOZTIM0c3(q?y9f7qDHKX|%zsUF%2zN9jDa7%AK*qrI5@z~IruFP+IJy7!s~TE%V3
z_PSSxXlr!FU|Za>G_JL>DD3KVZ7u&}6VWbwWmSg?5;MabycEB)JT(eK8wg`^wvw!Q
zH5h24_E$2cuib&9>Ue&@%Cly}6YZN-oO_ei5#33VvqV%L*~ZehqMe;)m;$9)$HBsM
zfJ96Hk8GJyWwQ0$iiGjwhxGgQX$sN8ij%XJzW`pxqgwW=79hgMOMnC|0Q@ed%Y~=_
z?OnjUB|5rS+R$Q-p)vvM(eFS+Qr{_w$?#Y;0Iknw3u(+wA=2?gPyl~NyYa3me{-Su
zhH#8;01jEm%r#5g5oy-f&F>VA5TE_9=a0aO4!|gJpu470WIrfGo~v}HkF91m6qEG2
zK4j=7C?wWUMG$kYbIp^+@)<#ArZ$3k^EQxraLk0qav9TynuE7T79%MsBxl3|nRn?L
zD&8kt6*<fMNtlksr)YNx(}aF3@@Kji-#`VXPvDltGmcNq4%~A=fK2KFn03+Mgx0D<
zRF>RJB6*a7=5c57wp!pg)p6O?WHQarI{o9@3a32zQ3FH8cK@P!DZ?CPN_LtmC6U4F
zlv8T2?sa<zXQ^3fM29N~?bl=u<uThbfO&mDR~^p>u&+(i@EL6+tvP^&=|aq3@QgL4
zOu6S3wSWeYtgCnKqg*H4ifIQlR4hd^n{F+3>h3;u_q~qw-Sh;4dYtp^VYymX12$`?
z;V2_NiRt82RC=yC+aG<x#gQB#J9x5qrW3KyHEu8A*V2Y&bltEAF<s8yv%3*`H(B}C
zurNW%K4qzHSA|x+Zx@FT#&>?=t&a81!gso$hQUb)LM2D4Z{)S<y`8qwLmGQG%5hy>
zI1S9f020mSm(Dn$&Rlj<nD~}vRCsQQbC_97Yr;ps)=zvT%R1ZFgky*1qV0>0UX}H@
zv={G+fFC>Sad0~8yB%62V(NB4Z|b%6%Co8j!>D(VyAvjFBP%gB+`b*<ZU<^H>&KnJ
zU8s}&F+?iFKE(AT913mq;57|)q?ZrA&8YD3Hw*$yhkm;p5G6PNiO3VdFlnH-&U#JH
zEX+y>hB(4$R<6k|pt0?$?8l@zeWk&1Y5tlbgs3540F>A@@rfvY;KdnVncEh@N6Mfi
zY)8tFRY~Z?Qw!{@{sE~vQy)0&fKsJpj?yR`Yj+H5SDO1PBId3~d!yjh>FcI#Ug|^M
z7-%>aeyQhL8Zmj1!O0D7A2pZE-$>+-6m<#`QX8(n)Fg>}l404xFmPR~at%$(h$hYD
zoTzbxo`O{S{E}s8Mv6WviXMP}(YPZoL11xfd>bggPx;#&pFd;*#Yx%TtN1cp)MuHf
z+Z*5CG_AFPwk624V9@&aL0;=@Ql=2h6aJoqWx|hPQQzdF{e7|fe(m){0==hk_!$ou
zI|p_?kzdO9&d^GBS1u+$>JE-6Ov*o{mu@MF-?$r9V>i%;>>Fo~U`ac2hD*X}-gx*v
z1&;@ey`rA0qNcD9-5;3_K&jg|qvn@m^+t?8(GTF0l#|({Zwp^5Ywik@bW9mN+5`MU
zJ#<Cr+p?`LtG0iwU0Nf^$S*aBrZ<`A8==3er%H}<Y6_n9*GCpB>_Ju|jtsq{tv)xA
zY$5SnHgHj}c%qlQG72VS_(OSv;H~1GLUAegygT3T-J{<#h<!47Ec55&-{<|T`iU8c
z%N34d05TI?vMw>}))pk$FjfRQ+Kr%`2ZiI)@$96Nivh82#K@t>ze^H?R8wHii6Pxy
z0o#T(lh=V>ZD6EXf0U}sG~nQ1dFI`bx;vivBkYSVkxXn?yx1aGxbUiNBawMGad;6?
zm{zp?xqAoogt=I2H0g@826=7z^DmTTLB11by<dY{USGp6^#9(oD!PBoXj^|xY=055
zI++_gis{>YvAO;ir|O0xmNN3Ec0w%yHO({-%q(go%?_X{LP?=E1uXoQgrEGOfL1?~
zI%uPHC23dn-RC@UPs;mxq6cFr{UrgG@e3ONEL^SoxFm%kE^LBhe_D6+Ia+u0J=)BC
zf8FB!0J$dYg33jb2SxfmkB|8qeN&De!%r5|@H@GiqReK(YEpnXC;-v~*o<#JmYuze
zW}p-K=9?0=*fZyYTE7A}?QR6}m_vMPK!r~y*6%My)d;x4R?-=~MMLC_02KejX9q6=
z4sUB4AD0+H4ulSYz4;6mL8uaD07eXFvpy*i5X@dmx--+9`ur@rcJ5<<KIUYaAK82Z
z`8H0Aia9rzaoUTNjiGQ0T4Qn}ZK65^&9BmxkSw%l9WrAh(3cWwP7ImVRSOL`+f@zH
zg0-DzmBks>L#s%nq3MRi4Dpr;#28}dl36M{MkVs4+Fm3Pjo5qSV)h}i(2^$Ty|<7N
z>*LiBzFKH30D!$@n^3B@HYI_V1?yM(G$2Ml{oZ}?frfPU+{i|dHQOP^M0N2#NN_$+
zs*E=MXUOd=$Z2F4jSA^XIW=?KN=w6{_vJ4f(ZYhLxvFtPozPJv9k%7+z!Zj+_0|HC
zMU0(8`8c`Sa=%e$|Mu2+CT22Ifbac@7Vn*he`|6Bl81j`44IRcTu8aw_Y%;I$Hnyd
zdWz~I!tkWuGZx4Yjof(?jM;exFlUsrj5qO=@2F;56&^gM9D^ZUQ!6TMMUw19zslEu
zwB^^D&nG96Y+Q<ItdqMYe}%Z{n9>wbvgk?Zmkn<dsmE0jLW%Or48T~Gw}vN0(0EZ#
zzn(t@no?=rLQ_5q4U{}f4IH%=?Lv8#?NWJF?P7URO{=-PxC4!1QsiEeT{B4A^b3qO
zvqZXj(vcq?Hy^4|7c7$F`tU%juC$F35#d3J$NaA2Ui!!+N9Yn-9UWB_xm+Q3`681f
ze!!+j;Y29=jYfAockMGondVj~@WWr|UZqU09FoT7y~&Gix1Fe^`!i-5nPP8s;5i!6
zy~_A{sE|=a+<XP&opeTL4rjE2nwvj5nfbQ<W~Dj%JYna$t5In$-nv}+%tQfbxe1-l
zo24azX0Rp5KpEnO*!afuBlK9o7}rH@+Y99xK=S(z{8krcyDiTr!Vt}r+3ZMmST*1l
znnph+prGanxBrT^FtdJ<84Mv`3F_N@ZmJ>9%d{+V;DGKmBE(yBWX6H#wbaAm&O1U^
zS4YS7j2!1LDC6|>cfdQa`}_^satOz6vc$BfFIG07LoU^IhVMS_u+N=|QCJao0{F>p
z-^UkM)ODJW9#9*o;?LPCRV1y~k9B`&U)jbTdvuxG&2%!n_Z&udT=0mb@e;tZ<Q%Yx
zlXb6W{yHPGrR_E>$_l3bj6d0K2;Ya!&)q`A${SmdG_*4WfjubB)Mn+vaLV+)L5$yD
zYSTGxpVok&fJDG9iS8#oMN{vQneO|W{Y_xL2Hhb%YhQJgq7j~X7?bcA|B||C?R=Eo
z!z;=sSeKiw4mM$Qm>|aIP3nw36Tbh6Eml?hL#&PlR5xf9^vQGN6J8op1dpLfwFg}p
zlqYx$610Zf?=vCbB_^~~(e4IMic7C}X(L6~AjDp^;|=d$`=!gd%iwCi5E9<6Y~z0!
zX8p$qprEadiMgq>gZ_V~n$d~YUqqqsL#BE6t9ufXIUrs@DCTfGg^-Yh5Ms(wD1xAf
zTX8g52V!jr9TlWLl+whcUDv?Rc~JmYs3haeG*UnV;4bI=;__i?OSk)bF3=c9;qTdP
zeW1exJwD+;Q3yAw9j<gxM%iI5l7`Zr1h6S|^dB*JZZZW(Y}Tngau;E~hbfjn79SVE
z76BU%%$IA>_42Zj9nuvs%q<j8zm9qc0tH;leTKgR|A$Ei;EM`JMCp9;(`Y)*YNSf~
zW4dHl^nRU2xZ0o9?A7npj_b9*;5ug@pKPw~7Ga;TH6o3u*_^z<4m8#*HKb$l8m-PE
zhh$}}rdFfhBAZ`F%w4!-sKYXCR(oEG5=|wH|D2oa+F;UZUlJ^4F;Q}8d|0g?SdRWF
zKNL8zsIhQzQoW5L=Olb^(S8owYA7r?-CJ=y_IV;K7wQuhrarxhX|e5gI=&QDM&pt!
zVaNqvLXV=t4L+=V>GF=6I@($2Ue(a9QGRMZTd4ZAlxbT5W~7(alP1u<^YY!c3B7QV
z@jm$vn34XnA6Gh1I)NBgTmgmR=O1PKp#dT*mYDPRZ=}~X3B8}H*e_;;BHlr$FO}Eq
zJ9oWk0y#h;N1~ho724x~d)A4Z-{V%F6#e5?Z^(`GGC}sYp5%DKnnB+i-NW<?_u`;U
zBI!eT`Eu>xwL-CuF+^JWNl`t@VbXZ{K3#aIX+h9-{T*+t(b0BM&MymW9AA*{p^&-9
zWpWQ?*z(Yw!y%AoeoYS|E!(3IlLksr@?Z9Hqlig?Q4|cGe;0rg#FC}tXTmTNfpE};
z$sfUYEG@hLHUb$(K{A{R%~%6MQN|Bu949<a{qSuBBCZ~hm>`f#H6YC*E(p3lBBKcx
z-~Bsd6^QsKzB0)$FteBf*b3i7CN4hccSa-&lfQz4qHm>eC|_X!_E#?=`M(bZ{$cvU
zZpMbr|4omp`s9mrgz@>4=Fk3~8Y7q$G{T@?oE0<(I91_t+U}xYlT{c&6}zPAE8ikT
z3DP!l#>}i!A(eGT+@;fWdK#(~CTkwjs?*i4SJVBuNB2$6!bCRmcm6AnpHHvnN8G<|
zuh4YCYC%5}Zo;BO1>L0hQ8p>}tRVx~O89!${_NXhT!HUoGj0}bLvL2)qRNt|g*q~B
z7U&U7E+8Ixy1U`QT^&W@ZSRN|`_Ko$-Mk^^c%`YzhF(KY9l5))1jSyz$&>m<sp7%y
zAaVI7gvthAV^8HA?f@8huzHWw{GrA_+(BLUpelFK+#g7EyxD_lYG0-ReNc?W?mj<9
zWQSWz^*Fmm_iHG`_7DSgROkcMK~=9G;B}IwYr8qw*`_xbn3gxTSQ(k70SV~GvQ9A2
zu#(_UU(7BR7Z^00n?D<Ah&a16d*5ULnJrC~-eP0OP7u+?-*8?Nv~hzR3=Fom`Qhx{
zF&NzKwuV!z*F+Npe<7yeoXA8G|9Jh;PKm&s1j$BXn$Esa55rBTUsmAJ!@_tGzRO<L
zo!jsHdpPa`3R|Yn>WJHZzHt0Jje%BQFxEV}C00{|qo5_Hz7c!FlJ|T(JD^0*yjkDm
zL}4S%JU(mBV|3G2jVWU>DX413;d+h0C3{g3v|U8cUj`tZL37Sf@1d*jpwt4^B)`bK
zZdlwnPB6jfc7<ENQLS}Lak2wMN(r5v)7Ug0u0wOQS+Qbh1mjr~^njxA(qYp_0D-7o
z@kA`VbdvPbksH324BEkKEIYlG$@GMMV)hBkU7~UZC=gmbBuID$CdRMQrUeeh$&v5Y
zq(>rIKsldW81$C$a9BukX%=V}yPnaBz|i6(h>S)+Bn44@i8RtBZf0XetH&kAb?iAL
zD%Ge{>Jo3sy2hgrD?15PM}X_)(<r<W3NDU9v_RCBmX^2BhPGL1Fm+KsgXN^;z=OG2
zvcYNt(H_!lkxgCmh$t|L9$O4Tx&?_`f20)dgJ!f>6$LV`&t*D`IP)m}bzM)+x-xRJ
zavhA<Te-!c<b_FOWykSKCVuuMO=WofSc~%t{3MJ{X?PZoS}w1oj66mR{HKu^hAKr3
zd7bpwCG)Mj0nJJUu`nuUQ)^*9Axk|t#KdQZ%P^#EokW<*HRl?OYe(Jur4saRCh=-b
zd-@{{Zitc>)>hu2cD;LUTvN38FEtB94ee|~lIvk~3MBPzmTsN|7V}Kzi!h&za#NyY
zX^0BnB+lfBuW<?L3ryx5&PrUAn!Yn-?BABk*g`Fk(azif1(el$uf)U`6brC4H5Jd_
zb>!oR#8G&S#Er2bCVtA@5FI`<Af5f{-wzU@ldq>Q+a-e?G)LhzW_chWN-ZQmjtR<P
zcsMc!`SFY<^-O|v>eWu-UOPu^G}|k=o=;ffg>8|Z*qev7qS&oqA7%Z{4Ezb!t$f3&
z^NuT8CSNp`VHScyikB1YO{BgaBVJR&>dNIEEBwYkfOkWN;(I8CJ|vIfD}ST<COx>N
z{097)R9iC@6($s$#dsb*4B<T*?#5G662%}WD;iZ<L&540n4ll5nzygCxG3ZKrf@Wu
zIOfI1rk`Gt^;FTncEzuzq+W@*_}pb{yb<7G;+!;u8Q<t$SJYmecjTnd@a`Gh(!mja
zvE_35&Ve(ckyhiShblUz%XU~^;TFPnR~k{!m4ABcGoB2eRls`3Q8Gs57TLsC_(mfR
zxxrzuk8Llp*<nu(+bU_#Qn%K!Wl$K5W&uH(o-zFgG;Qh&o#!;NE&)d6#gN#tdk}ss
zOw6Qc=hKH?EiMflNX9dHGjkwGNS5D%13m;VW+YvkcRMppw30&Trs1&?T3tU`>XBx7
zb{6S2O}QUk>upEfij9C2tjqWy7%%V@Xfpe)vo6}PG+hmuY1Tc}peynUJLLm<!O8uq
z+_-hM!aCPA)}R|n-(sl|+GZG;?!h*3C+-605#A8%l3kjIGEM)(+znQ_ug>m)8pshG
zb}HWl^|sOPtYk)CD-<NU+!4YSe!2;r94JN*wQ+G7T42iH54J^UpTsuFI97EGNey52
zz*_}1wF+&4#;_V60G=p{Eo1sHe&IAD9=THiN%~%oL!jvOM8Hp`*swv3?>7{L+l(=F
zOp}fX8)|n{JDa&9uI!*@jh^^9qP&SbZ(xxDhR)y|bjnn|K3MeR3gl6xcvh9uqzb#K
zYkVjnK<xsXg)`I=#4ysad68X{Y;sYT&oIZX4{Qj=-bHYY+CY^q;RAsy*c9FwXWCzw
z$%fE!ar$#$LQUW^9qSm*7-WsScrDxkZovD;<&cb&0UGXrO?!7L{Npy)<p31&XONw~
z-=m~GcxbR>$;lUky~??mcqN-)d5~mk{wXhrf^<)!Jjq<QN=AXxXbo5NSBOMkVP->c
zG~hX0P_@KvOKwV=X9H&KR3GnP3U)DfqafBt$e10}iuVRFBXx@uBQ)sn0J%%c<;R+!
zQz;ETTVa+ma>+VF%U43w?_F6s0=x@N2(oisjA7LUOM<$|6iE|$WcO67W|KY8JUV_#
zg7P9K3Yo-c*;EmbsqT!M4(WT`%9uk+s9Em-yB0bE{B%F4X<8fT!%4??vezaJ(wJhj
zfOb%wKfkY3RU}7^FRq`UEbB-#A-%7)NJQwQd1As=!$u#~2vQ*CE~qp`u=_kL<`{OL
zk>753UqJVx1-4~+d@(pnX<b=;Xow3JybU*w{(IlAt;<cg+xOA2y`N(}y9ax0J1>-i
zV4&=eRWbJ)9YEGMV53poXpv$vd@^yd05z$$@i5J7%>gYKBx?mR2qGv&BPn!tE-_aW
zg*C!Z&<NNt#B81}E#Sx270if%qHicxMKJ8Ls38%Eg5+Veqhe&*g}^~d7x+yt1S>!B
zH>3J16dTJC(@M0*kIc}Jn}jf=f*agba|!HVm|^@+7A?V>Woo!$SJko*Jv1mu>;d}z
z^vF{3u5Mvo_94`4kq2&R2`32oyoWc2lJco3`Ls0Ew4E7*AdiMbn^LCV<BcH8b%oUi
z)AeZVvuQj4{O02=8A3!Itj8?%JKvT*qMLPgQir&4Z75G?_fH9TXaYWWK7sx<tC%;A
zg!)^(^@|t&KZF+kE{H?p`gbxBn*UIzvHL1!eGRn!C(1%aJ~|~KO-s=%O(!8WBEBF!
zIkHblIYBitF5Pqh^cNK8YuW!2=Arm{{+IRb^d0oAjlXnoXl%Y79slWD{;DbT&kMnQ
zz4)8L&)*lLGqf`QA96ek>%7%mU)hr4S3UVJjDLUoIKRQ)gm?^{1Z}OYzd$1?a~tEY
ztjXmIM*2_qC|OC{7V%430T?RsY?ZLN$w!bkDOQ0}wiq69){Kdu3SqW?NMC))S}zq^
zu)w!>E1!;OrXO!RmT?m&PA;YKUjJy5-Seu=@o;m4*Vp$0OipBl4~Ub)1xBdWkZ<Vj
zw<m&|Iu1LII}T`w+ropEx?z}!V+r(X{8k-?3Rbl#9-ODOW}{n&q*(cmW~b+9FxEL)
zE-7yZaEL)4n#>47=UkJd$`Z}O8ZbpGN$i_WtY^00`S8=EHG#Ff{&MU1L(^wYjTchB
zMTK%1LZ(eLLP($0UR2JVLaL|C2~IFbWirNjp|^=<eFBtVVK7u^V<k;~u4TggYDy0`
z^>Fl48~Sp9zNOCZ@t&;;^avfN(NpNfq}~VYA{q%yjHo4D>JB>XEv(~Z!`1~SoY=9v
zTq;hrjObE_h)cmHXLJ>LC_&XQ2<INN7eW0M+x6Vo^oo~eym<!wZ5F|o_A^HL{;qID
zSgG|s$&g+c(jWr%ns9wj2>BgGfV}e#v}ZF}iF97bG`Nog&O+SA`2zsn%bbB309}I$
zYi;vW$k@fC^muYBL?XB#CBuhC&^H)F4E&vw(5Q^PF{7~}(b&lF4^%DQzL0(BVk?lM
zTHXTo4?Ps|dRICEiux#y77_RF8?5!1D-*h5UY&gRY`WO|V`xxB{f{DHzBwvt1W==r
zdfAUy<qAGooMp&vXZIl#S3KMZ5i+~qaTRRrVj6dsv$71aKg}>d({^*>Y7lObr;_fO
zxDDw7X^dO`n!PLqHZ`by0h#BJ-@bAFPs{yJQ~Ylj^M5zWsxO_WFHG}8hH>OK{Q)9`
zSRP94d{AM(q-2x0yhK@aNMv!qGA5@~2tB;X?l{Pf?DM5Y*Q<tZzEf5E%lYRGe`<@j
z3@tpO`6#10`_Z}g<K_|PtIO@#maOmhYnCo~`lu&kuUtLwJFnIPz3;9l)VsK3y!#ce
zkh9NXJwwCydJtpWX#<dWDjnD1KzKYC0?j`H-F}BpJ=c;NW}o@e8VU}gLH8t?r*C2h
z@*-**#-W~f_DrWT&=|ILwwSZQHBJ!P3t(t2MObDSI<yZabz09Ex2D%+3*>K`{mGA?
zjx;gwnR~#Nep12dFk<^@-U{`&`P1Z}Z3T2~m8^J&7y}GaMElsTXg|GqfF3>E#HG=j
zMt;6hfbfjHSQ&pN9(AT8q$FLKXo`N(WNHDY!K6;JrHZCO&ISBdX`g8sX<CJOh(v20
zp(jBNAl0Szv+!b7-c(#QKEAP1Rr|MH31~EZI&WTbB}c(|`apkziiC*l402n7G{2rX
z<ZQKlYca~$;4c3NgO(~EWYb--7U+31|9XTUKLs=4Na7w-K;Gd#8}$OxzDR>vIf?|8
zX$-W^ut!FhBxY|+R49o44IgWHt}$1BuE|6|kvn1OR#zhyrw}4H*~cpmFk%K(CTGYc
zNkJ8L$eS;UYDa=ZHWZy`rO`!w0oIcgZnK&xC|93#nHvfb^n1xgxf{$LB`H1ao+OGb
zKG_}>N-RHSqL(RBdlc7J-Z$Gaay`wEGJ_u-lo88{`aQ*+T~+x(H5j?Q{uRA~>2R+}
zB+{wM2m?$->unwg8-GaFrG%ZmoHEceOj{W21)Mi2lAfT)EQuNVo+Do%nHPuq7Ttt7
z%^6J5Yo64dH671tOUrA7I2hL@HKZq;S#Ejxt;*m-l*pPj?=i`=E~FAXAb#QH+a}-%
z#3u^pFlg%p{hGiIp>05T$RiE*V7bPXtkz(G<+^E}Risi6F!R~Mbf(Qz*<@2&F#vDr
zaL#!8!&ughWxjA(o9xtK{BzzYwm_z2t*c>2jI)c0-xo8ahnEqZ&K;8uF*!Hg0?Gd*
z=eJK`FkAr>7$_i$;kq3Ks5NNJkNBnw|1f-&Ys56c9Y@tdM3VTT<c|gQHFOuurxWPM
zd5BPAQWbtJat(efGMPekuI2mlJUlU`D8w<kH=TZj%s%*F#bP;lzeR*k)c#B9yO3Ds
z%^|<S+x^z@J^n-+I&VwBC1euOJw3H9XTaz+4yw7m{|>uXOCbWqye9va6+ZSeF0eh}
zYb^ct&<h+o$tWJI5<F&n@AngX(3<(?k3Z}mK{9b5r(^pHajeC|NPzud*I~H3Altw=
zZbGd$uqB8&XoLIcIg5y6OQE~9L(G;@dHPM{uE`ym7o-y+N#`raN$1^lc=`B`e!r-d
z?zp%e!*0W8xYc%wZ}I^<+&j~n?{`ja2`Xry-@5Jc8F3<chx9;q$i8?p%KSN+Pb$=<
zcbe0VK0yC9Ch)GBbQk^VZ;|}+pZ~^p{?qZq?_la|{iR9tMJ8)(_upt^a{Pn@FavV1
z><gfvsafNTZ@>4lQTfNZ3M3(9?{;s><(zq%hza7zcxlZ+`F8J*>%4wq8s$cC6Z=F@
zhbvdv;n$%vEI$B~B)Q&LkTse!8Vt};7Szv2@YB!_Ztp@JA>rc(#R1`EZcIdE+JiI%
zC2!hgYt+~@%xU?;<P17sOqjA=(wxX(r(UE0B;E39C=?vgaVWw|?NPR311o$q%5ekI
z*@`1S?n12yT7Rqt;=H_~4+s8fo!yH}#x(LjMu(bx1AZpqqzkDk@JTO>ir+g92W`*j
z3`@S;I6@2rO28zqj&SWO^CvA5MeNEhBF+8-U0O0Q1Co=I^WvPl%#}<B0MxziiHako
za&<nLQ*EJSuu|g8GG#Y6%6Wpmax}}iz;yrNvYB&8ao?x+(P^$L7-xJGmEIK=P(sO4
zIUv2J{R;B0yV9_=`-1VcE2dw&^0!FpF9Fa$?aE&wnP_=w$v!@K@43an`I>UFDMBVl
z5iXV@d|`QTa$>iw;<I{^jjz7imo=_u;5YeQmS99FNNqKj!-=k^ko26b8ryGAY_8MJ
zb`o|8QZ%hBK|XX@^`Li(#X+A2ttNX(KS<7<xemf1Iw^&YxoD9-%#Df<VJE?Dh=UDC
zm$K|s$+*b%<7X7Y_0aq6w^t<HE`!riyQZxY9C*cxJ_ql!WJOl22Iq;BERH6tUE@}t
z+g&j66p*cTmBUCR^74SMvZt~7-^*`mT_ogF&VqPH=1+B#_C?M}?7TY+5NKOCZMzWL
zKWV^O*TUg6_5s!7CW_WTdHxIL&EV3FR?VgjDFbVER`b7o<n1jfaWvU~>m$^}6JeuW
zjr;{)S2TfK0Q%xgHvONSJb#NA|LOmg{U=k;R?&1tQbylMEY4<1*9mJh&(qo`G#9{X
zYRs)#*PtEHnO;PV0G~6G`ca%tpKgb6<@)xc^SQY58lTo*S$*sv5w7bG+8YLKYU`8{
zNBVl<SZLN=wqsXA_u7Zd;ghe=2k7syXVNHZHnKf0^zT`g!gwhf_TO!xPV&(=!?)pS
zg|8uLBl(l-u=z1DFfyWC`^@MzMj_3G#XP`Od$VdHf)RSl*+#;9kOg(tyGX$#MfgK#
z_*w3nZ4Mz3If|=Gmll*}7Nh60OkyR>vgaDu7icvyf;N&%42z2L4(rR<*Jd48X8Jnw
zN>!R$%MZ@~Xu9jH?$2Se&I|ZcW>!26BJP?H7og0hT(S`nXh6{sR36O^7%v=31T+eL
z)~BeC)15v>1m#(LN>OEwYFG?TE0_z)MrT%3SkMBBjvCd6!uD+03Jz#!s#Y~b1jf>S
z&Rz5&8rbLj5!Y;(Hx|UY(2aw~W(8!3q3D}LRE%XX(@h5TnP@PhDoLVQx;6|r^+Bvs
zaR55cR%Db9hZ<<|I%dDkone+8Sq7dqPOMnGoHk~-R*#a8w$c)`>4U`k+o?2|E>Sd4
zZ0ZVT{95pY$qKJ54K}3JB!(WcES>F+x56oJBRg))tMJ^#Qc(2rVcd5a<lQMbJ$!JZ
z8d)_k56<ry_OO(RMRO)9P|wG=;Hf!aoYTn5HBlc^>dd=Us6vpBNkIg9b#ulk%!XBU
zV^fH1uY(rGIAiFew|z#MM!qsVv%ZNb#why9%9In4Kj-hDYtMdirWLFzn~de!nnH(V
zv0>I3;X#N)bo1$dFzqo(tzmvqNUKraAz~?)OSv42MeM!OYu;2VKn2-s7#fucX`|l~
zplxtG1Pgk#(;V=`P_PZ`MV{Bt4$a7;aLvG@KQo%E=;7ZO&Ws-r@XL+AhnPn>PAKc7
zQ_iQ4mXa-a4)QS>cJzt_j;AjuVCp8g^|dIV=DI0>v-f_|w5YWAX61lNBjZEZax3aV
znher(j)f+a9_s8n#|u=kj0(unR1P-*L7`{F28xv054|#DMh}q=@rs@-fbyf(2+52L
zN>hn3v!I~%jfOV=j(@xLOsl$Jv-+yR5{3pX)$rIdDarl7(C3)})P`QoHN|y<<2n;`
zJ0UrF=Z<Hch0fA7*Jo?X%~>v}d=F(Uj}~Yv9(@1pqUSRa5_bB*AvQ|Z-6YZ*N%p(U
z<;Bpqr9iEBe^L<k9C5CYB)5Rye}>FF!t{1UnRtaH-9=@p35fMQJ~1^&)(2D|^&z?m
z855r&di<Hmzf*5|z8nGPgU0W+LJ`EQwMFCsa~}_?y!-+#xIZB-61V6Si_X5+{~}lt
z`pgWXdqc$p!ZzoGo!-(Pg*=*_1TP9q>VS6}jmt2)A7LZDiv;&Ys6@W5P{JHY!!n7W
zvj3(2{1R9Y=TJ|{^2DK&be*ZaMiRHw>WVI^701f<gKaFlP%PTd+(EB*(uJ3f47>C)
zAp<SsJf$2vWO-!|<*3x~5M5N?B#2XhEGbN6@dCul1?<FS^vGejiD<`-JF3|OU9g``
z4$Tl7iFObNb#lf#z{MfgFrw}34Msv?Jhs-HfuPXrzHMmvJWPAWCSpW1ELpK3IOKQD
zB7DVMPyRi9Ne9L`ejsg$#V|7-p{Q&eR?$lc{(CfTI$rtro0vA6jYA3g=9Vj31E$40
zn%<Gg?AYm!G;DYq?&~Pm20}e9{s0khED|v|3Sww734EPs5A8mI4B`r)7^lI!eg4o{
ze>1?8?oiU%Faj?Qhou6S^d11_7@tEK-XQ~%q!!7hha-Im^>NcRF7OH7s{IO7arZQ{
zE8n?2><7*!*lH}~usWPWZ}2&M+)VQo7C!AWJSQc>8g_r-P`N&uybK5)p$5_o;+58Q
z-Ux2l<3i|hxqqur*qAfHq=)?<Pj-*)@>GDchq}ShV#m6&w|mi~ar~`EO_<hu1Uigv
zJo}M-nkzq3DhtE+UQuVL9BBg5#oA<p^j{Z~hG}GuHSq!|u@VeZEorYMaz5()GQFPa
zoB55~Vv&EvQ{FBjYKp$R^TF5sFQux#co8{$hcDLQ|Kzp`j^h8DdZqBESyR)O9%_4-
zWuQ(TIe0_>S=fb~<}66U>5i7$H#m~wR;L~4yHL2R&;L*u7-SPdHxLS&Iy7<IREdCS
z7-x!}ALyF(N?5GZUc9A+n2VlFwoj&oTi20BAS4}+rV%zb&QsejN95fZh@f9FpI}j(
zWp@cGJVTN=RlufWKB6IbS4}L$zrW7z(se`A+xGR#TN>6q$2j#Pe)$WulRiCICG*t+
zeehM8`!{**KRL{Q{8WCEFLXu3+`-XF(b?c1Z~wg?c0lD!21y?NLq?O$STk3NzmrHM
zsCgQS5I+nxDH0iyU;KKjzS24GJmG?{D`08|N-v+Egy92lBku)fnAM<}tELA<a5Kg3
zXmaS~xRSndcQ>_U`)xKYb=pq|hejMCT1-rg0Edt6(*E9l9WCKI1a=@c99swp2t6Tx
zFHy`8Hb#iXS(8c>F~({`NV@F4w0lu5X;MH6I$&|h*qfx{<TT3)RoOADF_c-mK?I$Y
zV`JfSp>~DJ*h5e|61t1QP}tZEIcjC%!Fa)omJTfpX%aI+OD*Y(l|xc0$1Zip;4rx;
zV=qI!5tSuXG7h?jLR)pBE<lUAyl~;_)Nr31I|7i4ZH614F)D_B3gg|AAWhYxZyqwq
zFgU$G9YcYr5%f?G=%DP5M*>x!B15HCoVycD&Z2dlqN*MFQDb!|yi0j~JciNC!>){~
zQQgmZvc}0l$XB0VIWdg&ShDTbTkArryp3x)T8%ulR;Z?6APx{JZyUm=LC-ACkFm`6
z(x7zm5ULIU-xGi*V6x|eF~CN`PUM%`!4S;Uv_J>b#&OT9IT=jx5#nydC4=0htcDme
zDUH*Hk-`Jsa>&Z<7zJ{K4AZE1BVW%zk&MZ^lHyj8mWmk|Pq8WwHRO<q<ME!8yXa7z
z2^Zcbm(L!F$VZKg_a|01w?&DbIcPj7E<!<^SI+N)Whl+QD<7Da=V5Rdt0*_P*q|}B
zAD>z0Kwj-AFqvR)H2gDN*6dzVk>R<J|IX33&ED24t3Vh1`!l)y*<5Z$r29?81G`pE
z44Nsw^E&Jg*o*b7dBUX5YT(Q=nOlC{Gi)c`@i{-B3Pxa%RIZN{K~K?)KnH3>3@_CV
zw3Z@6s^73xW)XY->AFwUlk^4Q=hXE;ckW=|RcZFchyOM0vqBW{2l*QR#v^SZNnT6j
zZv|?ZO1-C_wLWVuYORQ<epX=8R;Uxyq2QS<8{r%wj~gS~sH-C|{2QdBg8XC%JvhB5
z_|<sltc2K21pX`P4s4<d{(TqFwSmy{kmM{nCJ|SeyT^ofCW`W$KLR2MY>ryj29JA;
zS4BsxfVl@X!W{!2GkG9fL4}58Srv{$-GYngg>JuHz!7ZPQbfIQr4@6ZC4T$`;Vr@t
zD#-uJ8A!kSM*gA&^6yWi|F}&59^*Rx{qn3z{(JYxrzg!X2b#uGd>&O0e=0k_2*N?3
zYXV{v={ONL{rW~z_FtFj7kSSJZ?s);LL@W&aND7blR8rlvkAb48RwJZlOHA~t~RfC
zOD%ZcOzhYEV&s9%qns0&ste5U!^MFWYn`Od()5RwIz6%@Ek+Pn`s79unJY-$7n-Uf
z&eUYvtd<vwymLT9=5a*XKD0yP>)f7h7zG_hDiFC!psCg#q&0c=GHKOik~$$>$Fw*k
z;G)HS$IR)Cu72HH|JjeeauX;U6IgZ_IfxFCE_bGPAU25$!j8Etsl0Rk@R`$jXuHo8
z3Hhj-rTR$Gq(x)4Tu6;6rHQhoCvL4Q+h0Y+@Zdt=KTb0~wj7-(Z9G<l!NM8FF&IFb
z8B{sC3jSltRks_?yI}M&s#m9IeRGo^@1$j@#?y;4WM~?|Gwo8mz^BdXl|%zQSl&WI
z^(ZL%Fu<2Nl~hh230-f|`cs${8iy7A(D1}^x9NH_99EUpZ8;%=p=8elwS|6)-n|mc
zD2;7$1u%}=&3t?p&8r+T(~QM^-UVsz1C7VQ{NihtW`_4+*=}ura(A$B8i=EN%jnv2
zA*kcW2zjqnd;(J>%J+aQu05@k6JHeCC|YRFWGdDCV}ja;-yl^9<`>f=AwOqML1a~*
z9@cQYb?!+Fmkf}9VQrL8$uyq8k(r8)#;##xG9lJ-B)Fg@15<q#EP5at8YAu;Y(&hu
zEAdj~p((Lah;|O_H>&To(@xgk9SP*bkHlxiy8I*wJQylh<mPu(3&*|7^Hi2mXUD?}
zEgFYK60=l;bz$9~Mnnf>(+9X~H-Is!g&C!q*eIYuhl&fS&|w)dAzXBdGJ&Mp$+8D|
zZaD<+RtjI90QT{R0YLk6_dm=GfCg><HB~Mg8ruH;g}7!yef!4s|4o(u;h6-CO>7;$
zlyLsNYf@MfLH<}ott5)<Z%qqoE`(+N?$xuNpqEJunxScLr$N?8`fEhM9>t2CXiQos
zFLt^`%ygB2Vy^I$W3J_Rt4olRn~Gh}AW(`F@LsUN{d$sR%bU&3;rsD=2KCL+4c`zv
zlI%D>9-)U&R3;>d1Vdd5b{DeR!HXDm44Vq*u?`wziLLsFUEp4El;*S0;I~D#TgG0s
zBXYZS{o|Hy0A?LVNS)V4c_CFwyYj-E#)4SQq9yaf`Y2Yhk7yHSdos~|f<ERWN(ffs
z=JgUnjC%!4YUZk5oXVLdM<0d0n(g9fyR#~d>ImZG5_3~~o<@jTOH@Mc7`*xn-aO5F
zyFT-|LBsm(NbWkL^oB-Nd31<Ot*~rDU3JWHA-^@=s&Lk113mQoM1GZq%TB!YymZVI
zI@m@VRwRq{Z4-OCZ>djBaYebhIGXhsJyn~`SQ6_4>{fqIjRp#Vb|~+Qi}Mdz!Zsw=
zz?5L%F{c{;Cv3Q8ab>dsHp)z`DEKHf%e9sT(aE6$az?A}<jz~3-pWMJE;7I_0~M|#
zbe+zoVO-=xagqFFSP=H*Zz-q?l&qex0R61P*0DH_l;Yh3Pe_()_8~M#iDjcOkCU=(
zo-U(dH<5Nzo6LtHlhko8$K{j&M|7mhE`2d<T)mZYCd+nnUC;cJDlWDq2Mp^2v2uyl
z(oDaZ@SDMYCP6b^b*O{Tb`wXh3O-?Vp?P##cU<#}IA9ppEqI?YH7&1(-DxNS*8N+<
zg;_X64lBdU=ay{Rbk}y=bT-;B{i>3P`Lm(~W$8Jr=;d8#?dm_cmv>2673NqAOenze
z=&<Oe<;qT(J6@d9tcp6n)@)Wy;}D<+J@sox_&vbjN?!$8l{W=W%;}bYSzvl(LnJ#&
zOk_yZ8?|3|`Zg+f7IDrVXd_%*v6A=UenMQ~^?s7r+_LE)6kSpZNMk?+3%Qr1<MGH}
z^jy<c+03rW79h&L0qJtZuls+JX}n(Ja?3_=v&8Z=`{8%^J&mwPc?J!U{|NyUSV*#j
zz}a^lJkWtmixzZ2l_iPQ<J?yb`G#C!yd+Nbct7L#S27X4`>QW`?TQAu5~LzFLJvaJ
zaBU3mQFtl5z?4XQDBWNPaH4y)McRpX#$(3o5Nx@hVoOYOL&-P+gqS1cQ~J;~1roGH
zVzi46?FaI@w-MJ0Y7BuAg*3;D%?<_OGsB3)c|^s3A{UoAOLP8scn`!5?MFa|^cTvq
z#%bYG3m3UO9(sH@LyK9-LSnlVcm#5^NRs9BXFtRN9kBY2mPO|@b7K#IH{B{=0W06)
zl|s#cIYcreZ5p3j>@Ly@35wr-q8z5f9=R42IsII=->1stLo@Q%VooDvg@*K(H@*5g
zUPS&cM~k4oqp`S+qp^*nxzm^0mg3h8ppEHQ@cXyQ=YKV-6)FB*$KCa{POe2^EHr{J
zOxcVd)s3Mzs8m`iV?MSp=qV59blW9$+$P+2;PZDRUD~sr*CQUr&EDiCSfH@wuHez+
z`d5p(r;I7D@8>nbZ&DVhT6qe+accH;<}q$8Nzz|d1twqW?UV%FMP4Y@NQ`3(+5*i8
zP9*yIMP7frrneG3M9<x`C|Uwyu3dsv4zoxbW~fjQ53vZ7q<NEkN(r5b*Wy)tY7p+>
zf>GsjA!O#Bifr5np-H~9lR(>#9vhE6W-r`EjjeQ_wdWp+rt{{L5t5t(Ho|4O24@}4
z_^=_CkbI`3;~sXTnnsv=^b3J}`;IYyvb1gM>#J9{$l#Zd*W!;meMn&yXO7x`Epx_Y
zm-1wlu~@Ii_7D}>%tzlXW;zQT=uQXSG@t$<#6-W*^vy7Vr<i&_SYE8%wl1b@4D`Po
zE*TZe#IR^FiNHp-8|lH+`f+9lQM6TtEoCqY_WE+{`?=zH9**BTFB}0LS+GGUReWVc
zX7>2TCpnix@7<HhKxgy@Ev<$wJY}=|7Hp5=>!_|aNXEnN<-m?Oq;<hv>DpN*x6f>w
za1Wa5entFEDtA0SD%iZv#3{wl-S`0{{i3a9cmgNW`!TH{J*~{@|5f%CKy@uk*8~af
zt_d34U4y&3y9IZ5cXxLQ?(XjH5?q3Z0KxK~y!-CUyWG6{<)5lkhbox0HnV&7^zNBn
zjc|?X!Y=63(Vg>#&Wx%=LUr5{i@~OdzT#?P8xu#P*I_?Jl7xM4dq)4vi}3Wj_c=XI
zSbc)@Q2Et4=(nBDU{aD(F&*%Ix!53_^0`+nOFk)}*34#b0Egffld|t_RV91}S0m)0
zap{cQDWzW$geKzYMcDZDAw480!1e1!1Onpv9fK9Ov~sfi!~OeXb(FW)wKx335nNY!
za6*~K{k~=pw`~3z!Uq%?MMzSl#s%rZM{gzB7nB*A83XIGyNbi|H8X>a5i?}Rs+z^;
z2iXrmK4|eDOu@{M<gyi`>dS+?@(!-Ar4P4?H_yjTEMqm7`rbV4P275(-#T<owm!@+
zdOcx#OGyMxf!2p7KH>W##v#Dt14Yn9UB-Sg3`WmL0+H~N;iC`Mg%pBl?1AAOfZ&e;
z*G=dR>=h_Mz@i;lrGpIOQwezI=S=R8#);d*;G8I(39ZZGIpWU)y?qew(t!j23B9fD
z?Uo?-Gx3}6r8u1fUy!u)7LthD2(}boE#uhO&mKBau8W8`XV7vO>zb^ZVWiH-DOjl2
zf~^o1CYVU8eBdmpAB=T%i(=y}!@3N%G-*{BT_|f=egqtucEtj<Y=-+d$UnDNO-T<Q
z_K|=)EJj7lT-bpTa89Ywn2(1LbOmaaJuFiaS22#P!%%S7o4vH52#0GKZ`vYgV&wj-
ze-1lY80g|S$HvKNTxpES?fH8Db~^rg#pkByaW3d&*ILU%sidx?h=5^q%z&Ounv=tR
zwp!EoZ>RJJhSf)tiBhpPDpgzOpG12UgvOFnab&16Zn^2ZHjs)pbd&W1jpx%%EXmE^
zdn#R73^BHp3w%&v!0~azw(Fg*TT*~5#dJw%-UdxX&^^(~V&C4hBpc+bPcLRZizWlc
zjR;$4X3Sw*Rp4-o+a4$cUmrz05RucTNoXRINYG*DPpzM&;d1GNHFiyl(_x#wspacQ
zL)wVFXz2Rh0k5i>?Ao5zEVzT)R(4Pjmjv5pzPrav{T(bgr|CM4jH1wDp6z*_jnN{V
ziN56m1T)PBp1%`OCFYcJJ+T09`=&=Y$Z#!0l0J2sIuGQtAr>dLfq5S;{XGJzNk@a^
zk^eHlC4Gch`t+ue<VfR^y>3RviiOlhz81CD9z~d|n5;A>AGtkZMUQ#f>5M14f2d}2
z8<*LNZvYVob!p9lbmb!0j<mNhyrh9%FD1`aBa9*{B@wAL@R%8L(4Z}Bhu)EZU<Wjp
zUW$Nx%L%v<-QFe3ay4F2Ykw-?sX;aYeUkZmX1>t)xn6O&JS)`}7v}j+csS3e;&Awj
zoNyjnqLzC(QQ;!jvEYUTy73t_%16p)qMb?ihbU{y$i?=a7@JJoXS!#CE#y}PGMK~3
zeeqqmo7G-W_S97s2eed^erB2qeh4P25)RO1>MH7ai5cZJTEevogLNii=oKG)0(&f`
z&hh8cO{of0;6KiNWZ6q$cO(1)9r{`}Q&%p*O0W7N--sw3Us;)EJgB)6iSOg(9p_mc
zRw{M^qf|?rs2wGPtjVKTOMAfQ+ZNNkb$Ok0;Pe=dNc7__TPCzw^H$5J0l4D<F6e~>
z%p(_0w(oLmn0)YDwrcFsc*8q)J@ORBRoZ54GkJpxSvnagp|8H5sxB|ZKirp%_mQt_
z81+*Y8{0Oy!r8Gmih48VuRPwoO$dDW@h53$C)duL4_(osryhwZSj%~KsZ?2n?b`Z*
z#C8aMdZxYmCWSM{mFNw1ov*W}Dl=%GQpp90qgZ{(T}GO<vFy*1j4~by*dTmbA*g%S
zQBgTLH75u%3+%7>S8#>sbiEU;zYvA?=wbD5g+ahb<ryFqY$b|{Y%Pd__A>d1#s`=|
zV6&f#ofJC261~Ua6>0M$w?V1j##jh-lBJ2vQ%&z`7pO%frhLP-1l)wMs=3Q&?oth1
zefkPr@3Z(&OL@~|<0X-)?!AdK)ShtFJ;84G2(izo3cCu<GpO8mFv>Kc{>`+aDoziL
z6gLTL(=RYeD7x^FYA%sPXswOKhVa4i(S4>h&mLvS##6-H?<?=7+Ij1Xxa|B$8*-A&
zSEa0h1kDx^+CUIDS3LZYugl+gbdxDaW(P7&W~=D{i&N{(zis^%XlECpG7^dK263K^
zbX#A!`ULU{)yl~<fKSAA=x&AmXjFh#dv#gDTntk>w8q!B<8Alk>nQEwUG<v>)SFXK
zETfcTwi=R3!ck|hSM`|-^N3NWLav&UTO{a9=&Tuz-Kq963;XaRFq#-1R18fi^Gb-;
zVO>Q{Oe<^b0WA!hkBi9iJp3`kGwacXX2CVQ0xQn@Y2OhrM%e4)Ea7Y*Df$dY2BpbL
zv$kX}*#`R1uNA(7lk_FAk~{~9Z*Si5xd(WKQdD&I?8Y^cK|9H&huMU1I(251D7(LL
z+){kRc=ALmD;#SH#YJ+|7EJL6e~w!D7_IrK5Q=1DCulUcN(3j`+D_a|GP}?KYx}V+
zx_vLTYCLb0C?h;e<{K0`)-|-qfM16y{mnfX(GGs2H-;-lRMXyb@kiY^D;i1haxoEk
zsQ7C_o2wv?;3KS_0w^G5#Q<Nd&I|bQ%{Z$Tw13Boy>g<yj@$x(KX?t;IsC0xO-WNb
zJAeoH#{vu3KmV`QH3JZ4nUw*EnmA#vFQ8(Q2S-T=EQ8d*#^4u2P6T1ROVy$6Rz_bK
zOFcug;>f*>u)3bT<3kGQL-z#YiN9QH7<(oDdNlSdeHD<WSbdt++35+A+#eeWYReuw
z^iGtV)Im)cie-K|JT}xOeka**DxGT5Rsg3FBT)P9N}O6#zQT2l0W-XaFS+J}-6E4_
zU~?)Vc7Ncm!z!iaic<A4W17aCSt2b+=P+S3aj5MgQle8<PV6aow7Pz<Vg~yjLq3eM
z+BmFy$2K-|MtTKX+M3qRjGU`8#+MDX__HCqQ3tANi0IK8M5X#Ej<AYM1+kW49?Rr>
zQJN-U*_wJM_cU}1YOH=m>DW~{%MAPxL;gLdU6S5xLb$gJt#4c2KYaEaL8ORWf=^(l
z-2`8^J;&YG@vb9em%s~QpU)gG@24BQD69;*y&-#0NBkxumqg#YYomd2tyo0NGCr8N
z5<5-E%utH?Ixt!(Y4x>zIz4R^9SABVMpLl(>oXnBNWs8w&xygh_e4*I$y_cVm?W-^
ze!9mPy^vTLRclXRGf$>g%Y{(#Bbm<X_MNEZg=Cz85;VpJho=eow^&@FAFzl_gNq@j
zhiOfvMZ%`M$R}?QhS5C<TKGTskMZuyUaj>2xxr_Mrsvd7ci|X|`qGe5=54Zt2Tb)N
zl<q;d278!&VQhhKSnr-*!GS%n={}fB^iMZN$)fMlc?QpI#UPb9=X>ykxE&re1ny<F
zr0pXUeMiQ3Wf&gx$xYW+6s!<uCnzV2!&agpXV@_kQv+5ORU2M5e&_S|)7b=$2Vc;K
z<DKv>+O7g#`6e_zyjVj<lO?>Ri5!DeTvSJ9^BJqQ*ovJ%?dkaQl!8<r$UYNRVhp;k
zU=+Hb#}A4<s59?S-e%l^|25L004mO13NZgZfcgKHclmF-cha>r{F`@KuDEJB3#ho5
zmT$A&L=?}gF+!YACb=%Y@}8{SnhaGCHRmmuAh{LxAn0sg#R6P_^cJ-9)+-{YU@<^-
zlYnH&^;mLVYE+tyjFj4gaAPCD4CnwP75BBXA`O*H(ULnYD!7K14C!kGL_&hak)udZ
zkQN8)EAh&9I|TY~F{Z6mBv7sz3?<^o(#(NXGL898S3yZPTaT|CzZpZ~pK~*9Zcf2F
zgwuG)jy^OTZD`|wf&bEdq4Vt$ir-+qM7BosXvu`>W1;iFN7yTvcpN_#at)Q4n+(Jh
zYX1A-24l9H5jgY?wdEbW{(6U1=Kc?Utren80bP`K?J0+v@{-RDA7Y8yJYafdI<7-I
z_XA!xeh#R4N7>rJ_?(VECa6iWhMJ$qdK0Ms27xG&$gLAy(|SO7_M|AH`fIY)1FGDp
zlsLwIDshDU;*n`dF@8vV;B4~jRFpiHrJhQ6TcEm%OjWTi<S2}tPfA(ag+#Rx<RV35
zsb{ioRg!w?x=}Ja-hpR(v5#628Jo$?zVwoO;ILOoxo<0sez#p_n#H8em@RxuIwY3+
zF;?X~UfU&T<%Q7b<EVjROG(RI$<`XJ#Nzn)_!Jc$*Fbwba_d*^vvV7>+KmE7+X{19
z>e!sg0--lE2(S0tK}zD&ov-{6bMUc%dNFIn{2^vjXWlt>+uxw#d)T6HNk6MjsfN~4
zDlq#Jjp_!wn}$wfs!f8NX3Rk#9)Q6-jD;D9D=1{$`3?o~caZjXU*U32^JkJ$ZzJ_%
zQWNfcImxb!AV1DRBq`-qTV@g1#BT>TlvktYOBviCY!13Bv?_hGYDK}MINVi;pg)V-
z($Bx1Tj`c?1I3pYg+i_cvFtcQ$SV9%%9QBPg&8R~Ig$eL+xKZY!C=;M1|r)$&9J2x
z;l^a*Ph+isNl*%y1T4SviuK1Nco_spQ25v5-}7u?T9zHB5~{-+W*y3p{yjn{1obqf
zYL`J^Uz8zZZN8c4Dxy~)k3Ws)E5eYi+V2C!+7Sm0uu{xq)S8o{9uszFTnE>lPhY=5
zdke-B8_*KwWOd%tQs_zf0x9+YixHp+Qi_V$aYVc$P-1mg?2|_{BUr$6WtLdIX2FaF
zGmPRT<p6)(TV864%~8JJvDGnsOLYaKl+j{&dQ>rdIz)DNE)j*_>b9E}sp*(1-16}u
za`dgT`KtA3;+e~9{KV48RT=CGPaVt;>-35}%nlFUMK0y7nOjoYds7&Ft~#>0$^ciZ
zM}!J5M<I9?@*1gE!M%&vJ!WEs(Pd8Os|?SAqIe_rhjAy#)|>z{&|&lyG^bnmh?YtR
z*Z5EfDxkrI{QS#Iq752aiA~V)DRl<yhO<WJ>C*2jlA|nCU!@CJwxO#<=j6ssn;muv
zhB<gvVmveDM~C#@54_F{$xcyg*In%8YnYrgxdofZLcY`(Kx;6)r~o9;Q!pE<-iC*s
zVm27x?^jQ!xDmX@*N36OAlWG$u-Snr_>T9~35VtwsoSLf*(7vl&{u7d_K_CSBMbzr
zzyjt&V5O#8VswCRK3AvVbS7U5(KvTPyUc0BhQ}wy0z3LjcdqH8`6F3!`)b3(mOSxL
z>i4f8xor(#V+&#ph~ycJMcj#qeehjxt=~Na>dx#Tcq6Xi4?BnDeu5WBBxt603*BY&
zZ#;o1kv?qpZjwK-E{8r4v1@g*lwb|8w@oR3BTDcbiGKs)a>Fpxf<rH?+U$sa>zh&b
ziQANuJ_tNHdx;a*JeCo^RkGC$<J2-iDHuH^Wf}S!^~ekA+iohMQICP@^DaRwQ*1~v
zcbS`q5P#R6lzj34p_=rzjrU|8f(TfnsFdtDJ*nIr>(TXS;jnxk=dx++D8|dmPP<0@
z$wh#ZYI%Rx$NKe-)BlJzB*bot0ras3I%`#HTMDthGtM_G6u-(tSroGp1Lz+W1Y`$@
zP`9NK^|IHbBrJ#AL3!X*g3{arc@)nuq<IGiFt(y^rqphJ!<|TfdOFxb_a>a<L#aaS
z85Hs!2U6s_R53N=L5BL;4%cl}=mF5SBBPQH@~dDx$W600YEHNjm_Zb3{=#~+DxQFt
zI8jk9_7z^2-gHGt<yqmrqMmVFz#zq7bWrKTHYsy%)=+U$ad8UVYrb2}ELqJ{%zR!I
z5vHJl%n|j6{=QcY5MQM4aTab#^0N4P6&TD|qgRlmj>{=*2y+DvSwE=f*{>z1HX(>V
zNE$>bbc}_yAu4OVn;8LG^<Td?xCjbV_j7U+DSnDdYpt8jIU24UvB<v~v->naq5HZY
zh{Hec==MD+kJhy6t=Nro&+V)RqORK&ssAxioc7-L#UQuPi#3V2pzfh6Ar400@iuV5
z@r>+{-yOZ%XQhsSfw%;|a4}XHaloW#uGluLKux0II9S1W4w=X9J=(k&8KU()m}b{H
zFtoD$u5JlGfpX^&<igWOV3zVVp*G3*<pGG?fm^|kfQMlNAo1e2wj2Mr`G3Sk|A;ar
zD14U!B&$E)xbBVE#H)b{$RdW-36IM5Wxd5RlL&_(A$|Q_y&}ohx!vpxE-z{u`HqGN
zID~}T`#j&qQ60fNjxTQFY;3~)%lO#Y)BTsHciwEAM}j;O8GUt;jG=r~1+;lPSd_4}
z?2IS@q|kIpJr-LWm0J~oZZME|3m7${tB-_@oM($=^{n<!E5Q8HQ^D(9MdP`jTQ336
zs*d%_bvYGd84BKcT?`dR4`aikjw64oyTXHD37_$H2fP+OE6jQ4(Flxi#gr;Y{$uD(
zr=HNkyrCR<Gd2h_C8}M;$!hb-dUD?OiKkML%haG4<bA0D`Bz7&$UJs=frC7i7wmh@
z$u#!lbzW5aH$lp6_(vv9lhL7m`_+NqFf@}2PEMYN%h-FfWeA4&`xv&yA^L|q4W|OK
z6`VZcTM3VBt<%-k9#l(^76;7~fwXIZw1j*x8t(_*qxtc1GSYg((9tBoQ0m0!?s}~i
zaa1Tf@PR~C8GK?Nz`$VB?oJLIgekDQG#YyB)m~q7Jh_WM8ZygugFmV`5PbMby044V
zZnr}fm;)C_)mB6?i48kgiL@>SXHlp$J~wk|DL^YVNh2w(oZ~1*W156YRmenU;g=mI
zw({B(QVo2JpJ?pJqu9vijk$Cn+%PSw&b4c@uU6vw)DjGm2WJKt!X}uZ43XYlDIz%&
z=~<J4kbF4G)Xi+8IPk-7zSVE0nBiiOKF};<Qh`r(>RlgZpU-tu_rD`5!t?289PTyQ
zZgAEp=zMK>RW9^~gyc*x%v<oIwL~g7tz*<jGXl(a(Xo>G;l+<a6wV1(rNGPS)OdW$
z9JrC2^lRoVI4lCa0w3|QEJp%^HR0k!4CI;uN|=oljx2=_35}4E)OfW<fQ9zlQLw(^
zYWPYq<Y<$8MgOZeY|Lv@6A!R`XMpYhe|W>c-V?}Bm;^{RpgbEnt_B!FqvnvSy)T=R
zGa!5GACDk{9801o@j>L8IbKp#!*Td5@vgFKI4w!5?R{>@^hd8ax{l=vQnd2RDHopo
zwA+qb2cu4Rx9^Bu1WNYT`a(g}=&&vT`&Sqn-irxzX_j1=tIE#li`Hn=<N%}%Uj=Bs
zuHQaYhv8>ht<P+TyrKNwyktkppz#H(XBoAFYKOHX5ZtjVdYKK*VzNA_<CK|VW4ii6
z@bDXq(7Xdx=XUVhDu_m<FOP-G*Zm#(DX@dgkZwe49?K^w7a*gPn%X5}*-W{?sS~?q
zLE8e!k=AKO;Hqa6D5drTVWkN~57b?IHv}OFIL@9TtT$J}@0S(0P$HD2`)oK*69zck
zf|Lj;os6LrVZ#uc4yp=j;?p~|bcUXwQ*$~kSu_y=`?H_D^k$(f1|P{bTyIaX6~rpt
zs5*5mR&DDflv`a~hP-{^eTXT|oX4t`<MahVmF8h7S*rLS`i?sgk+~3RcJh5>4KQXp
zzZj`JO+wojs0dRA#(bXBOFn**o+7rPY{bM9m<+UBF{orv$#yF8)AiOWfuas5Fo`CJ
zqa;jAZU^!bh8sjE7fsoPn%Tw11+vufr;NMm3*zC=;jB{R49e~BDeMR+H6MGzDlcA^
zKg>JEL~6_6iaR4i`tSfUhkgPaLXZ<@L7poRF?dw_DzodYG{Gp7#24<}=18PBT}aY`
z{)rrt`g}930jr3^RBQNA$j!vzTh#Mo1VL`QCA&US?;<2`P+xy8b9D_Hz>FGHC2r$m
zW>S9ywTSdQI5hh%7^e`#r#2906T?))i59O(V^Rpxw42rCAu-+I3y#Pg6cm#&AX%dy
ze=hv0cUMxxxh1NQEIYXR{IBM&Bk8FK3NZI3z+M>r@A$ocd*e%x-?W;M0pv50p+MVt
zug<ZdBC=p$&$nZSlORb-3>o<@_ij*6RZ;IPtT_sOf2Zv}-3R_1=sW37GgaF9Ti(>V
z1L4ju8RzM%&(B}JpnHSVSs2LH#_&@`4Kg1)>*)^i`9-^JiPE@=4l$+<g4SY(YxI1W
zj62)<X7H&LUhk7#;S6+O4-eYN>?NbAP?44hX&XAZy&?}1;=8c(e0#-3blt<NQAZjX
zedDseA*YO-bGCIIdPLiN4kCxI3NAr1slhZLNrb4l9^q~8kruGq87@UxJEHZA-jGR0
za*QMMZ9vn!#mpH{+k=U$LK;Fz3n0l!zf-o)8Z)IYI^DK00-S`!j}G!_LwIoA;1oY6
zizXYwW~-?ZUoxfKcUhPgws7|pEB+3js&ngS$7H|hdOycvL~Fq%iHLRu`tg$7{H#$O
zO-=A5$6Pn7s&UMmbEWeX2X<mjSAbQ;^VEN3d#i#`Jkr-VIoQOxv~%N_;C1atrxM(K
zjm{yex3wQ(5LNZ~*|Ya$1TF|Oj~%-xG0GAR2~fjF?_n{S$PjXK<XAXm%+waeVfUbK
zU$Ms3Bx+;cBc(321~4HYSL{ehxTB|~zgufnSPa$gsH9jGBg^xz$tOFPhR&*GD%2lG
zNs@D|Nph_L6tA>VWg6h=k!(mCx=6DqOJ-I!-(g;*f~DDe={{JGtH7=UY|0F<WySM5
zHl=83_759Y?TVvvfP;lxPO+jrwC^DhE(3x|MIro?;6baSXJ*Ku%K22QT8ZRs?CJR>
zNk(YyXsGi;g%hB8x)QLpp;;`~4rx>zr3?A|W$>xj>^D~%CyzRctVqtiIz7O3pc<L_
zqUWaqtC`gzYKN;+KKY48$Q9-_Vf8b;sy`8(4BifW|3G+@2<wyp0(=j$%DhG_o;WI`
zs^h+F6V{wd0i75#s%~UCOqP(ZslsfL7m8isHwo#VuZ|)@$rDFoFcIrW*Ld7qsF|O4
z^Y}_h=a9B`QoeZSoru9koun0Smk6$*xzv=}mm?;hi&**W{T5ck0=X61wL#ln`a2;h
zEj6<lCYLv$y&Ljz0>@r@JdGJiH@%XR_9vaYoV?J3K1cT%g1xOYqhXfSa`fg=bCLy%
zWG74UTdouXiH$?H()lyx6QXt}AS)cOa~3IdBxddcQp;(H-O}btpXR-iwZ5E)di9Jf
zfToEu%bOR11xf=Knw7JovRJJ#xZDgAvhBDF<8mDu+Q|!}Z?m_=Oy%Ur4<fwIO`fHT
zQkR`d%X~U0!l#`_Sp}L~f179_XmCHzj4q}_<S?TP!|VnMj9Vkq)VkMfE2)OMa?9lU
z5w<uozVEFE*y^D;CZ8`j-$&4>p<71cD@0OGZW+{-1QT?U%_PJJ8T!0d2*a9I2;%|A
z9LrfBU!r9qh4=3M<lMZ-S<}QF*~;$yWbC5~kW*0%-ksaNJ=!*+{n|DR_@SBo&Dr*e
zoW^8Zi}mb?k-=8nm0Db|&R`SzZ{P0&=cg|7?~dbN+_G1xfoQ)qEd8W<HDdGW4L7SQ
zpk#?izu<Qv-z=y1weQ(92r`%P>m3nR_~X-EyNc<;?m`?dKUNetCnS)}_-%QcWuOpw
zAdZF`4c_24z&m{H9-LIL`=Hrx%{IjrNZ~U<7k<b7g*<@qlAQ645w;-sH~i2#<T$+j
z&QZ+tLTVa1)%2`!n2Ml!p1(eg4b;-+(2#(D%mK+kB)>6p{_wRkR84g>`eUBOQd3x5
zT^kISYq)gGw?IB8(lu1=$#Vl?iZdrx$H0%NxW)?MO$MhRHn8$F^&mzfMCu>|`{)FL
z`ZgOt`z%W~^&kzMAuWy9=q~$ldBftH0}T#(K5e8;j~!x$JjyspJ1IISI?ON5OIPB$
z-5_|YUMb+QUsiv3R%Ys4tVYW+x$}dg;hw%EdoH%SXMp`)v?cxR4wic{X9pVB<xZ|w
z7myBd;EvNh?S3*yH;=REkD?rQM=U&uF+AUwr{CuMv@PGsG=GOGm>H>=`#`Kcj!}x4
zV<dEMh~f|f+!?-*FEeQG-jiV%PNMG+{|UJhr8>!`6tj|*q?jZdG(CSevn(}4Ogij5
z-kp;sZs}7oNu0x+NHs~(aWaKGV@l~TBkmW&mPj==N!f|1e1SndS6(rPxsn7dz$q_{
zL0jSri<I3YC|5!9d9eiT(s^nIMY|U2+Fcl?)binU_p(H+&h(OD4W{&>hO)1t?gh8N
zos<fl=%zI)!VF-eNH}{U$IhT5Wk#5l!*ZRJ@{UxC)rv~R)2g0q>MjR3n#YC()CVKv
zos2TbnL&)lHEIiYdz|%6N^vAUvTs6?s|~kwI4uXjc9fim`KCqW3D838Xu{48p$2?I
zOeEqQe1}JUZECrZSO_m=2<$^rB#B6?nrFXFpi8jw)NmoKV^*Utg6i8aEW|^QNJuW&
z4cbXpHSp4|7~TW(%JP%q9W2~@&@5Y5%cXL#fMhV59AGj<3$Hhtfa>24DLk{7GZUtr
z5ql**-e58|mbz%5Kk~|f!;g+Ze^b);F+5~^jdoq#m+s?Y*+=d5ruym%-Tnn8htCV;
zDyyUrWydgDNM&bI{yp<_wd-q&?Ig+BN-^JjWo6Zu3%Eov^Ja>%eKqrk&7kUqeM8PL
zs5D}lTe_Yx;e=K`TD<zAEU14ve_E|$wp3;b8B~h9suVy_Sbp*-7|+Iz0VnLl?C+RT
z9@z>ya!<G5KHy?wIL3&IOZR#4N`|wE%6ulI11v{`v|1!uU2eqgnlh{*Rm|&bZmC^A
z4O6`c0xaNTE>-u%y$)r*Cr4bSfN*eZk$XT(Lv2Y}qj&_UaiTevxs_=HXjnOuBpmT>
zBg|ty8?|1rD1~Ev^6=C$L9%+RkmBSQxlnj3j$XN?%QBstXdx+Vl!N$f2Ey`i3p@!f
zzqhI3jC(TZUx|sP%yValu^nzEV96o%*CljO><uZ-Z3!%2AEV{PIVkd{C7A-!`n?a2
z#9jxa4QldffL%a9nJrJCRH-mE%T#?>I_YKa8wMfc3$_L()k4P<Nj4?+18okdw1iX}
ze>B6kglP@IT#wBd*3RITYADL}g+hlzLYxFmCt=_XWS}=jg8`RgJefB57z(2n&&q>m
ze&F(YMmoRZW7sQ;cZgd(!A9>7mQ2d#!-?$%G8IQ0`p1|*L&P$GnU0i0^(S;Rua4v8
z_7Qhmv#@+kjS-M|($c*ZOo?V2PgT;GKJyP1REABlZhPyf!kR(0UA7Bww~R<7_u6#t
z{XNbiKT&tjne(&=UDZ+gNxf&@9EV|fblS^gxNhI-DH;|`1!Y<mYC8)L#IS}In*pT?
z3+y!tLj|&=I|Y{0%I#o3wFgyiFOTCx*-#C;oJ%n{?`8-|E0ODMEN?BB#GUZx#ipuP
znsc-`_ML3=0SBcfmCsZ?v5Zl}DU{XbD3DJn0asTWb9P@zPhkL?6%Q2hk<*%HYc+zi
zo={9Th6%EhQH?>NlMcC{d7I{u_E~cJOa<DEFkooswP>lFEzDY|I?S3kHtbrN&}R3k
zK(P<i1mplmQv?ZBU|p!`C$}bP8BUZFxY+JGx_rr%W<UGlz($Sn=*0*#hoUA9re#YJ
z6-NxDm|}cQTRKGIhYOex$X?o_nwe;SduZ~YHM;f-1#C^erSh^h`>h_Ty}*<BCj8d?
z!D#V4dVcC83J6@{u$=<9{+?2L{tkR)@?0w{+XM|s=emXY8nu3lrU1oo2Ic00(r}xs
z*BZme=7N-H5tz0Sa;}e`>L3Et6$c<rTa+pocGYd$@mWZP*GQEyY~$Qlqto_2@LP7D
z2Ck7eVqW1AlRvDz?ytdb9CcDvY3|AojX<ZLZ~zqdbgA&24N^se<$M=!b}loX5x7R|
z^e)1_ilJuR+yOXBl}%!6ISPZn<K3-6vK)FCm>UW`0}**BY@44KtwEy(jW@pAt`>g>
z&8>-TmJiDwc;H%Ae<rXQKc39iehOX|-f%EG_AA(LIU43eepd*$DVDg?Q5b@k+j{*v
zL%rnv1I_vwfLa1i+)ALP#0b@8To^`>%k6$ndZlfKruu1GocgZrLN=sYI52}_I%d)~
z6z40!%W4I6ch$CE2m>Dl3iwWIbcm27QNY#J!}3hqc&~(F8K{^gIT6E&L!APVaQhj^
zjTJEO&?**pivl^xqfD<D65wRJ3w6aPBZYdn`l+Tx2rxorrYj<K{P+9#sQRgJIjhkE
zRnjj@ZfaV}8A?0obxwO1cWwA@C<I9o&9&UW?N^K*_r$yP7tR&ieom~B<IjwKcQl8u
zA3}T^iyso`&OM1O*B7ES(;MP+>(rpLu;`Tm1MV+<A(X|yNr`)H@Wztcm}d<PRr|n&
z9;a&3{W>Wtd4u>X6u5V{Yp%)xH$k410o{pGoKdtY0t<buHQ?wQkO`fgM|V>@GgqFN
zO=!hTcYoa^dEPKvPX4ukgUTmR#q840gRMMi%{3kvh9gt(wK;Fniqu<C;TC)irAYU_
z*kJAxPx5gkvHM;M*(vwjS9H6MB3FBcQ;|7Ps6jh|x;2y}SyRTi$D<}R#rt8;yFG88
z>9A%BMsq?U&B5DFX<K#-tTq<#XXtCSxv8&(%;(0sE+RSlLme<8Gq)sPByp;1cAACT
zGs{agbXbky3~;c2M)n0PW2vokek=TO$MZG|t!ahopY#iIbV^pI-PhZ{WUP{UR=7Ie
z`zi$@v1k}(Wkcj)coC$!J|;Gma@VX&RApkyXg8YWRFzndpfeMmhQLus9C<&Q<kMk^
z;_3JZrZDOU%+NGy@{XEXRv(}(HMgZ;a-LS3I4uT7uN2X8eV$JOMm1&#l=|?Fp!PkX
z%V$+HZc8O}I4`goS}uF6Xjjvy2@&mw)_|);TZRoJXks2uhmv>C8t8FBN1&UIwS#=S
zF(6^Eyn8T}p)4)yRvs2rCXZ{L?N6{hgE_dkH_HA#L3a0$@UMoBw6RE9h|k_rx~%rB
zUq<fs$Lw)#c=y6c9xQX7n;oTM)>eEPL|!Pbp|up2Q=8Ac<mCiYr~53+@zw-Wyq%<{
z2-B2~!QG&iWl7?TCJ_tKUW8a&;qx-@kO|XHPV#c9D_05V`M&Q$&tY9=r*_ONb=DUf
za`tL8Z}fL1rAc`>Uxflck(fPNJYP1OM_4I(bc24a**Qnd-@;Bkb^2z8Xv?;3yZp*|
z<bKP78)%bZ$faky&98g{FBt@We_JXNCJoPN%koC~ve^TkEWRw@1l2-I^&78A`^C95
z<fW<v1?8(9a{^&+tkVI!ip|mLpr_k!gDjk=c~fgFCVJfc&i65kYw+#OC#JjC_}bP$
z1FynO4hM(!YoOS?Wh3@HNIyaMAYWYT*6B31RR{(6cJ?HzSs8Y%hE=!jReLv96{GJs
z=4HRxNkjeYKj2~erU;~+)s#hwz_3evJI;-+dIA07>oy9KhLo=;8n0rPdQ}yAoS8eb
zAtG5QYB|~z@Z(<d&^A|sgmIi{Xuo}_;O9&Bd=%`9dpY~KtiCxeQi89Ha_79BJcVCK
zrQCcdiAukc)q-?zj}7It4v?vG8w-nbwCxR5%u|Yu=d_j9ydg$WP*Yh5vlZ0X2!ooJ
zF8d1p*j~IA(c{fyO0C!}`JttBT0KrVzDPsq>Fxdu`LmoO>f&(<frD^<CX(vBvqk0!
z$MZHfWg&HJMMZ4~{A|#SIO5Sl%((fQlev*0ja225m0)ma(L34h8%_xwBnd&}<0?1`
z8}8Mw5PBdDJHXf3n96#DvpUH777Ta;Xq*wymy1iG+B*bo;v=_JuvvLvgVW@MIwQ_?
z!(=8&diEk@?0XXCNhJP;$c`fKa%Tdln}N|sC4+~x`u1d>JzsO|v0V?1HYsfMvF!3|
zka=}6U13(l@$9&=1!CLTCMS~L01CMs@Abl4^Q^YgVgizWaJa%{7t)2sVcZg0mh7>d
z(tN=$5$r?s={yA@IX~2ot9`ZG<TO?YRVF*aw{<_fxHnxcS{h}0bG)m1vNQCthAhPc
z=X4+{#RhqokkdDdmZfOq;f{=HykCFVzOmSIV0tHA)!SE}bTPVU>jUgVlul$IU4N}{
zIFBz<WMpn;d7!3n@w6@_`<TfiQqew6U{r4%WuwnAWMo#KJRHvWRyZG2`Pdg2+tC~2
zoT+k!=LSZU85{<GiV6aQ=wJ@gZ7Fm_Wjf}}YQf;72D9|lvWtBnBc^y3CA`wh-38~c
zHo;8rlo7!V)%uQ51F6gyKkl)K?m)Bl@P|#sYu(7~>Y3O0;g$BZ#X|V<f;1CrPLF;y
zJ}Q|#^1x49@Af6POU4bfdz)CJ4%&PUI%13quQMda-{nlPjeogY6o<Jc<&sxv!33wG
z{K|lQe?dtlm6^jeJBjHKD8I!vA#-hdICqgAc(4q$ehF5HD_i>juTPKyw*|IJ+&pQ`
z(NpzU`o=D86kZ3<rZLf(voqzQ`4bQtvr?gVGkn-#m?vf7dE%TaIhE5K(j!g~U_wO-
zyEi1W6C08Bt00IKt0bb-r1L2uATg?oX}z6{snLqSF<(TzS8&7Yiuc}xO~1EB3pnlF
z_1Vkq9v!@W{TN{UrjKncfP9Xknuc&QwjEq;OH9fc*yU9_{J}o?eM&flLvNWJGsUSp
zITqz9Nl8pzhSIKLmy!npER)tike(^d*i3?+YI)mK5EEK!{kLJ%fCHDz!IgcD`Y9rl
z<9>E5#!3Ry$#0AW!6wZe)_xZ8EPidvJ0f+MQJZ6|ZJ$CEV6;Yt<PPHpogryw#W9I%
ztKOI;XYuYE`ybWEVcN3T?RpNZ;}0xbVQPO5Ke%|6IXIZkHm1WCm=zYOjUcWa58Osn
zds#!-O;H0=DaPSR#&Mat7Pz=a+=gGdE$Ncs>{OJnL`dewc1k>AGbkK9Gf5BbB-fg?
zgC4#CPYX+9%LLHg@=c;_Vai_~#ksI~)5|9k(W()g6ylc(wP2uSeJ$QLATtq%e#zpT
zp^6Y)bV+e_pqIE7#-hURQhfQvIZpMUzD8&-t$esrKJ}4`ZhT|woYi>rP<r^z%~jrT
z5f;M*r(Vjjy+F4jL8nt!&BwV7`2G_ZEYrfBMc5$(8WKPJjsd~GtVG>~y~LRf`*2!6
z6prDzJ~1VOlYhYAuBHcu9m>k_F>;N3rpLg>pr;{EDkeQPHfPv~woj$?UTF=txmaZy
z?RrVthxVcqUM;X*(=UNg4(L|0d250Xk)6GF&DKD@r6{aZo;(}dnO5@CP7pMmdsI)-
zeYH*@#+|)L8x7)@G<DyfP%;&(upWhHToSbMJr?<@6T&|RQI4sJb=*>NBu0Npyyh6r
z^~!3$x&w8N)T;|LVgnwx1<q)=5kJ=5r2j7Fz8U6acfr+HE1$`#upwh(B5N5@G-Nm8
zx1=h&o1*x+{{8yrcxfL`a|`OWAyF=?Szb_h9qcfAFdC}iuL~z%-|3QD)ql<Ph~l4(
zk+drha_WzGDmGP`zk215MNYXS-pNj)SopqA|7fp7L~qhfi7DR9r87{F>jHmZn{b2V
zO|8s#F0NZhvux?<K%Q;e3e5-}x>0W9NH5;qZ?P_JtPW86)4J>AS{0F1S0d}=L2`{F
z_y<bO3C1N?R4zd#gP$6yBMFO*yrsCqOSHS(Pz0428HkF|?k>;o;17%{j4I)znptnB
z%No1W>o}H2%?~CFo~0j?pzWk?dV4ayb!s{#>Yj`ZJ!H)xn}*Z_gF<n*RcE047{B3c
zme&2Cd-v9n6U^>Hy~JDis)?9-P=z4<af;v@ge<g~Fru_>iOQg{26~n?dTms7)+F}?
zcXvnHHnnbNTzc!$t+V}=<2L<7l(84v1I3b;-)F*Q?cwLNlgg{zi#iS)*rQ5AFWe&~
zWHPPGy{8wEC9JSL?qNVY76=es`bA{vUr~L7f9G@mP}2MNF0Qhv6Sgs`r_k!qRbSXK
zv16Qqq`rFM9!4zCrCeiVS~P2e{Pw^A8I?p?NSVR{X<iI+V?4Et$#Ral=`srlWHd^w
zj;%^Z_ZG+I-9T1$dV2DKhcS`(LKB_v!PwgEgh$rx#sM|M{a`!KGiKMTM`~ZkWb!M-
zJDmmmkTCKx2;Yg^x6}=xdY}%GM$LH0O$t$QO_bCW<eAEse4vuFgeHCOK3@`0m)t3E
zY4wciw&iZmLo|A@`=YrE^_wBu_rUDbZa+8EYN6k<`1c?5PteTmgf$T*Y9j$@D_thg
zc3|<McPK?w?nvr>fwlQo*wj|Ctqz4X-j+dU7eGkC(2y`(P?FM?P4gK<kRuK^dFD$m
z)Ugr$QMx5M6@T~eaS`DJ{l|kD5V)?3eA5E(nZ(QyED-4Bv97olMOwL?{h8QIaY-ZF
z0Wz2E3(^?ut3+8^+lD-Hg*V*#ON=i0YCAUBpf!M(@nw+&AFS}vhJq;7qiv+i5|h%d
zlra?0>ki3Msw#fM6paBq#VNc>T2@``L{DlnnA-_*i10Kre&@-H!Z7gzn9pRF61?^^
z8dJ5kEeVKb%Bly}6NLV}<0(*eZM$QTLcH#+@iWS^>$Of_@Mu1Jw<nW1FD-nURbmpK
zYjCd4&Ms%4OK>M!>&3evymgY6>C_)sK+n|A5G6(3RJz0k>(z2uLdzXeTw)e4*g!h}
zn*UvIx-Ozx<3rCF#C`khSv`Y-b&R4gX>d5osr$6jlq^8vi!M$QGx05pJZoY#RGr*J
zsJmOhfodAzYQxv-MoU?m_|h^aEwgEHt5h_HMkHwtE+OA03(7{hm1V?AlYAS7G$u5n
zO+6?51qo@aQK5#l6pM`kD5OmI28g!J2Z{5kNlSuKl=Yj3QZ|bvVHU}FlM+{QV=<=)
z+b|%<!;*M`^!Zvredv4Dif+RL7u-{Ef1b~}Zr`uI^YqN8+o-Wuel!Ah$(~&t3J2u#
zhwEcb-&inRJOs>Q!R<gnuD?BM(o!)9Gdmo7P6fyLhP4p|f(5tb?F-JF8L67sK>)FE
z@ycDMSKV2?*XfcAc5@IOrSI&3&aR$|oAD8WNA6O;p~q-J@ll{x`jP<*eEpIY<uf^v
z{yfbaVdbYlq!#in`2*@If2Q=FI4sXd#SY7cWOOL^;p9N=Pf0lFTv&y)<+?BjjE_*t
ziW;-DQMFi}5u4U^$`ar=B5IR~ZS1Zt-PSHkM|UWnkI1k4YzuM4F%K|3K6DPD>OYnT
zer_t=dYw6a0avjQtKN&#n&(KJ5Kr$RXPOp1@Fq#0O<t)^@vF?ROt|PohN&&ZZB+>f
zTXQkq4qQxKWR>x#d{Hyh?6<ll*@9xVT0EEF^wpr9`cL&(((rr-l4hds2C{{Fxt})P
zVxOaMWwF?nM8qg_^)z^v_@j@dmm3RQm*dev0IRndk%CA=v$wP}y96xDa9uQI)rzrZ
zibWXKqNL9Z_CC^E90b_`$xeTkq3ue5Ki^5E($adfdp}jkq~6x{jBxD26V5xr?@bTK
zqwrxvWGyhZ31sup;?9cTJ)H=hJ@RoNMxlx@oh|ZL53?y03F5^n{%+Lt{Hg3ul_u#O
zek3c5@L=~=_$`6pC@^3gz7?7hA~RKnr15uLz_>Y)U07;Q$?BTl7mx2bSPY_juXub1
z%-$)NKXzE<%}q>RX25*oeMVjiz&r_z;BrQV-(u>!U>C*OisXNU*UftsrH6vAhTEm@
zoKA`?fZL1sdd!+G@*NNvZa>}37u^x8^T>VH0_6Bx{3@x5NAg&55{2jUE-w3zCJNJi
z^IlU=+DJz-9K&4c@7iKj(zlj@%V}27?vYmxo*;!jZVXJMeDg;5T!4Y1rxNV-e$WAu
zkk6^Xao8HC=w2hpLvM(!xwo|~$eG6jJj39zyQHf)E+NPJlfspUhzRv&_qr8+Z1`DA
zz`EV=A)d=;2&J;eypNx~q&Ir_7e_^xXg(L9>k=X4pxZ3y#-ch$^TN}i>X&uw<U9MO
zlF4a{y~lC8L?n4j`bZJyk;=pCn0&+F9QrKW^Z;X&5+4By@sW+?Rr$pxzk*;9U&}c`
zVeX!$eN(tsyiocg_0GHE%gc@Q!`6VM^z1Zy&XeAH`btF8w<FthN2Y1DIVai-JD9}j
zzD1iL%qOrMyi0MnK2I2#HgUJi=dXCFx^I*i<%~;W)C!T!vxO_(Vl*|hJX?LQx0PBU
z`e?j_P;1~4Daam$cTW)+88a-!P6T&7I+l=r*k60+45)21{!Sy4>F%75c(9cjO6`E5
z16vbMYb!lEIM?jxn)^+Ld8*hmEXR4a8TSfqwBg1(@^8$p&#@?iyGd}uhWTVS`Mlpa
zGc+kV)K7DJ<v}<!uFIrb&;o7Ixy)I)Ro{m8ZhG$`LxgIrtg$VJPC&L?NJ+e|Jcx1B
zckLN3CwY${zZTStoi>wd46aco@=?iASsx?sDjbHoDVU9=+^tk46|Fxxey1u)_}c1j
z^(`5~PU%og1LdSBE5x4N&5&%Nh$sy0oANXwUcGa>@CCMqP`4W$ZPSaykK|giiuMIw
zu#j)&VRKWP55I(5K1^cog|iXgaK1Z%wm%T;;M3X`-`TTWaI}NtIZj;CS)S%S(h}qq
zRFQ#{m4Qk$7;1i*0PC^|X1@a1pcMq1aiRSCHq+mnfj^FS{oxWs0McCN-lK4>SDp#`
z7=Duh)kXC;lr1g3dqogzBBDg6>et<<>m>KO^|bI5X{+eMd^-$2xfoP*&e$vdQc7J%
zmFO~OHf7aqlIvg%P`Gu|3n;lKj<JTcG+BhuR}TueDYI}dFm#ycnh~ifrJG8E*hanM
zyts*CbJn)GXuBg6912N&%-mX;x1nyhA$jA%za+{3^EjzULVzw^<(4%VAyt;KU+pj@
zKaE>tRd@;;x#$>_xU(HpZos7?ShZlQSU)bY?qyQM3cHh5twS6^bF8NBKDnJgXHa)?
zBYv=GjsZuYC2QFS+jc#uCsaEPEzLSJCL=}SIk9!*2Eo(V*SAUqKw#?um$mUIbqQQb
zF1Nn(y?7;gP#@ws$W76>TuGcG=U_f6q2uJq?j#mv7g;llvqu{Yk~Mo>id)jMD7;T>
zSB$1!g)QpIf*f}IgmV;!B+3u(ifW%xrD=`RKt*PDC?M5KI)DO`VXw(7X-OMLd3iVU
z0CihUN(eNrY;m?vwK{55MU`p1;JDF=6ITN$+!q8W#`iIsN8;W7H?`htf%RS9Lh+KQ
z_p_4?<ntF8U$D@Ka;CpypOeKWe3jI~hhLSB3Ooy^a0EV2G%eT~k)>qO4#<u#i=63F
zdyVQD*YUAOvvj`QLL<kERGbF`R-#4ZoSI#5DuVTN*j9~3#sE%s<<;^wcl<U!f!RZ_
zr{GC#mPd@zH*H^XJ%w3e4yvI+;_HVykR}|xQ-77&eyiZ~+*5>*`t+8l-N|kAKDcOt
zoHsqz_oO&n?@4^Mr*4YrkDX44BeS*0zaA1j@*c}{$;jUxRXx1rq7z^*NX6d`DcQ}L
z6*cN7e%`2#_J4z8=^GM6>%*i>>X^_0u9qn%0JTUo)c0zIz<Kt=2nM}C*<{hlL7=lO
zi?10sY)d=-_LpcSYU@1BZtA%u;hImg)z{uT0?30JadWH$%Px>|7a`%_UnB)-I1cc+
z0}jAK0}jBl|6-2VT759oxBnf%-;7vs>7Mr}0h3^$0`5FAy}2h{ps5%RJA|^~6uCqg
zxBMK5bQVD{Aduh1lu4)`Up<rVpp?=r3G7gw9i_8vUON_AozqkT-Bhc;N5gh8->*&(
zCJQ>nafDb#MuhSZ5>YmD@|TcrNv~Q%!tca;tyy8Iy2vu2CeA+AsV^q*Wohg%69XYq
zP0ppEDEYJ9>Se&X(v=U#ibxg()m=83pLc*|otb<fp}wtygv!@DV-xq;MZQ4)h!5po
zyM)GWR1cSN%LNWo4kw}xi5DgA)`;Vg7hXpqT}B2(;*bYvhZOI%^L$+hW+x>G;`CYZ
z*YgsakGO$E$E_$|3bns7`m9ARe%myU3$<Ba2&<yFae<}OjvJo0W=e}k=QU&o+tcj@
z7h%onm*E7iR=vrpKx=%)gM}$`ty?&emSPbfK5@$BmpR4{1twpMY=;Y7h*tC}FAUio
za+FRZYU^6<*yc5r2mh@0p%`##rr>DE;RoQ<6hR8e;%`pxO1{GXb$cCZl9lVnJ$(c`
z``G?|PhXaz`>)rb7jm2#v7=(W?@<CLmp)q5H!OUZ7hGfFLzd|aK#xX4m!pw6@=V2>
zjUhrNndRFMQ}%^^(-nmD&J>}9w@)>l;mhRr@$}|4ueOd?U9ZfO-oi%^n4{#V`i}#f
zqh<@f^%~(MnS?Z0xsQI|Fghrby<&{FA+e4a>c(yxFL!Pi#?DW!!YI{OmR{xEC7T7k
zS_g*9VWI}d0IvIXx*d5<7$5Vs=2^=ews4qZGmAVyC^9e;wxJ%BmB(<CaQ5`VLzKOc
zWRPnETePoBLrsIHiW@1JowbAxiy?ItsJId(?45#&^KfqH*Uoq&0WgJZAVJ`K;cT2f
znL%X~pPg4?78NF*HRS_u7}<DFKRB1yPglW~&)W5x+>F5*&!yyABCtLVGL@`qW>X9K
zpv=W~+EszGef=am3LG+#yIq5oLXMnZ_dxSLQ_&bwjC^0e8qN@v!p?7mg02H<9`uaJ
zy0GKA&YQV2CxynI3T&J*m!rf4@J*eo235*!cB1zEMQZ%h5>GBF;8r37K0h?@|E*0A
zIHUg0y7zm(rFKvJS48W7RJwl!i~<6X2Zw+Fbm9ekev0M;#MS=Y5P(kq^(#q11zsvq
zDIppe@xOMnsOIK+5BTFB=cWLalK#{3eE>&7fd11>l2=MpNKjsZT2kmG!jCQh`~Fu0
z9P0ab`$3!r`1yz8>_7DYsO|h$kIsMh__s*^KXv?Z1O8|~sEz?Y{+GDzze^GPjk$E$
zXbA-1gd77#=tn)YKU=;JE?}De0)WrT%H9s3`fn|%YibEdyZov3|MJ>QWS>290eCZj
z58<D<fbV=CGeC;ZFQ5egk_qNkx(0u$`Mm@j+&e451`MnOU{D$V0w@KDtNarnV3BZk
z;dQV#0jMmS>i<*>dC9=kz?s$sP_9kK1p>nV3qvbleExyq56|o+oQsb{ZVmuu1n~JG
z0sUvo_i4fSM>xRs8rvG$*+~GZof}&ISxn(2JU*K{L<3+b{bBw{68H&Uiup@;fWWl5
zgB?IWMab0LkXK(Hz#yq>scZbd2%=B?DO~^q9tarlzZysN+g}n0+v);JhbjUT8AYrt
z3?;0r%p9zLJv1r$%q&HKF@;3~0wVwO!U5m;J`Mm|`Nc^80sZd+Wj}21*SPoF82hCF
zoK?Vw;4ioafdAkZxT1er-LLVi-*0`@2Ur&*!b?0U>R;no+S%)xoBuBxRw$<Qq5?ct
z>?weN-u~tKE}8xb@7Gs%(aC;e1-L<sfEoPb+52b9_t6mhC7Ohl@&CNrR+gBE4S-3n
z^Y4VCpI{J@zXX#3R5anWvoo~N1C)y;lCaX(H5ULFtgWe@!%r3Smqz=t)ca2s6zTt)
z<=4aD|Dwq4PfSatUt+%WGyYQY_T?47EE)L|-BbOS=>IlSfXDK(faFW)mnHdrLc3`F
z6ZBsT^u0uVS&il=>YVX^*5`k!P4g1)2LQmz{?&dgf`7JrA4ZeE0sikL`k!Eb6r=g0
z{aCy_0I>fxSAXQYz3lw5G|ivg^L@(x-uch!AphH+d<p-u+{jOO7PG%y+n?~i^Dgp|
z=w+FJpG1dNe<S*@>;E4`175<v)Vu!)?`iW-@Gso$m#{Bo-haYw*!~mjf5$OiV!jmp
z{fSBB@=uum3YPpw0{A8BOMTs+sPL}8f%?DIc3%>`R0#b^)Zp>EM1Ks=zx6_261>!7
z{7F#a{Tl@Tpw9S`>7_i|PbScS-(dPJv9_0-FBP_aa@Gg^2IoKNZM~#=sW$SH3MJ|{
zsQy8F<R#NfVTYeg$g#h{^oKd{{!-@QCDqIH`JYr63BOGRc)t92eE&yL?<L90oaCP*
zq{+Wc^2dDrFU6LZEH9H^f3gs#{x-`W>43lX7hYx<{v^Q9`2QsMzeen3cGpiTgzVp-
z`aj3&Wv0(he1qKI!2jpGpO-i0Wpcz%vdn`2o9x&3;^nsZPt3c<zhVAsIR3s#{_;9s
zM%RC0f_44hnE$j!y^KlzL?-L~JM!;GC|~{uFXLoCd7k?I#`Dsf{Vy-!|5(Of#%_Mn
zObz_UvHM?<oR`=9qw}9$BJrO{fbV=Cg2BIl{dmOux?G`*I2ho4_Q%^S15htOYS9?b
I5eVr20d63LbpQYW

literal 0
HcmV?d00001

diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/native/gradle-wrapper.properties.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/native/gradle-wrapper.properties.mustache
new file mode 100644
index 0000000000..b0acbdcd73
--- /dev/null
+++ b/modules/openapi-generator/src/main/resources/Java/libraries/native/gradle-wrapper.properties.mustache
@@ -0,0 +1,5 @@
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.5-bin.zip
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/native/gradle.properties.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/native/gradle.properties.mustache
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/native/gradlew.bat.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/native/gradlew.bat.mustache
new file mode 100644
index 0000000000..9618d8d960
--- /dev/null
+++ b/modules/openapi-generator/src/main/resources/Java/libraries/native/gradlew.bat.mustache
@@ -0,0 +1,100 @@
+@rem
+@rem Copyright 2015 the original author or authors.
+@rem
+@rem Licensed under the Apache License, Version 2.0 (the "License");
+@rem you may not use this file except in compliance with the License.
+@rem You may obtain a copy of the License at
+@rem
+@rem      https://www.apache.org/licenses/LICENSE-2.0
+@rem
+@rem Unless required by applicable law or agreed to in writing, software
+@rem distributed under the License is distributed on an "AS IS" BASIS,
+@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+@rem See the License for the specific language governing permissions and
+@rem limitations under the License.
+@rem
+
+@if "%DEBUG%" == "" @echo off
+@rem ##########################################################################
+@rem
+@rem  Gradle startup script for Windows
+@rem
+@rem ##########################################################################
+
+@rem Set local scope for the variables with windows NT shell
+if "%OS%"=="Windows_NT" setlocal
+
+set DIRNAME=%~dp0
+if "%DIRNAME%" == "" set DIRNAME=.
+set APP_BASE_NAME=%~n0
+set APP_HOME=%DIRNAME%
+
+@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
+
+@rem Find java.exe
+if defined JAVA_HOME goto findJavaFromJavaHome
+
+set JAVA_EXE=java.exe
+%JAVA_EXE% -version >NUL 2>&1
+if "%ERRORLEVEL%" == "0" goto init
+
+echo.
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:findJavaFromJavaHome
+set JAVA_HOME=%JAVA_HOME:"=%
+set JAVA_EXE=%JAVA_HOME%/bin/java.exe
+
+if exist "%JAVA_EXE%" goto init
+
+echo.
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:init
+@rem Get command-line arguments, handling Windows variants
+
+if not "%OS%" == "Windows_NT" goto win9xME_args
+
+:win9xME_args
+@rem Slurp the command line arguments.
+set CMD_LINE_ARGS=
+set _SKIP=2
+
+:win9xME_args_slurp
+if "x%~1" == "x" goto execute
+
+set CMD_LINE_ARGS=%*
+
+:execute
+@rem Setup the command line
+
+set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
+
+@rem Execute Gradle
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
+
+:end
+@rem End local scope for the variables with windows NT shell
+if "%ERRORLEVEL%"=="0" goto mainEnd
+
+:fail
+rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
+rem the _cmd.exe /c_ return code!
+if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
+exit /b 1
+
+:mainEnd
+if "%OS%"=="Windows_NT" endlocal
+
+:omega
diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/native/gradlew.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/native/gradlew.mustache
new file mode 100755
index 0000000000..8e25e6c19d
--- /dev/null
+++ b/modules/openapi-generator/src/main/resources/Java/libraries/native/gradlew.mustache
@@ -0,0 +1,188 @@
+#!/usr/bin/env sh
+
+#
+# Copyright 2015 the original author or authors.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+##############################################################################
+##
+##  Gradle start up script for UN*X
+##
+##############################################################################
+
+# Attempt to set APP_HOME
+# Resolve links: $0 may be a link
+PRG="$0"
+# Need this for relative symlinks.
+while [ -h "$PRG" ] ; do
+    ls=`ls -ld "$PRG"`
+    link=`expr "$ls" : '.*-> \(.*\)$'`
+    if expr "$link" : '/.*' > /dev/null; then
+        PRG="$link"
+    else
+        PRG=`dirname "$PRG"`"/$link"
+    fi
+done
+SAVED="`pwd`"
+cd "`dirname \"$PRG\"`/" >/dev/null
+APP_HOME="`pwd -P`"
+cd "$SAVED" >/dev/null
+
+APP_NAME="Gradle"
+APP_BASE_NAME=`basename "$0"`
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+
+# Use the maximum available, or set MAX_FD != -1 to use that value.
+MAX_FD="maximum"
+
+warn () {
+    echo "$*"
+}
+
+die () {
+    echo
+    echo "$*"
+    echo
+    exit 1
+}
+
+# OS specific support (must be 'true' or 'false').
+cygwin=false
+msys=false
+darwin=false
+nonstop=false
+case "`uname`" in
+  CYGWIN* )
+    cygwin=true
+    ;;
+  Darwin* )
+    darwin=true
+    ;;
+  MINGW* )
+    msys=true
+    ;;
+  NONSTOP* )
+    nonstop=true
+    ;;
+esac
+
+CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
+
+# Determine the Java command to use to start the JVM.
+if [ -n "$JAVA_HOME" ] ; then
+    if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
+        # IBM's JDK on AIX uses strange locations for the executables
+        JAVACMD="$JAVA_HOME/jre/sh/java"
+    else
+        JAVACMD="$JAVA_HOME/bin/java"
+    fi
+    if [ ! -x "$JAVACMD" ] ; then
+        die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+    fi
+else
+    JAVACMD="java"
+    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+fi
+
+# Increase the maximum file descriptors if we can.
+if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
+    MAX_FD_LIMIT=`ulimit -H -n`
+    if [ $? -eq 0 ] ; then
+        if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
+            MAX_FD="$MAX_FD_LIMIT"
+        fi
+        ulimit -n $MAX_FD
+        if [ $? -ne 0 ] ; then
+            warn "Could not set maximum file descriptor limit: $MAX_FD"
+        fi
+    else
+        warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
+    fi
+fi
+
+# For Darwin, add options to specify how the application appears in the dock
+if $darwin; then
+    GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
+fi
+
+# For Cygwin, switch paths to Windows format before running java
+if $cygwin ; then
+    APP_HOME=`cygpath --path --mixed "$APP_HOME"`
+    CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
+    JAVACMD=`cygpath --unix "$JAVACMD"`
+
+    # We build the pattern for arguments to be converted via cygpath
+    ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
+    SEP=""
+    for dir in $ROOTDIRSRAW ; do
+        ROOTDIRS="$ROOTDIRS$SEP$dir"
+        SEP="|"
+    done
+    OURCYGPATTERN="(^($ROOTDIRS))"
+    # Add a user-defined pattern to the cygpath arguments
+    if [ "$GRADLE_CYGPATTERN" != "" ] ; then
+        OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
+    fi
+    # Now convert the arguments - kludge to limit ourselves to /bin/sh
+    i=0
+    for arg in "$@" ; do
+        CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
+        CHECK2=`echo "$arg"|egrep -c "^-"`                                 ### Determine if an option
+
+        if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then                    ### Added a condition
+            eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
+        else
+            eval `echo args$i`="\"$arg\""
+        fi
+        i=$((i+1))
+    done
+    case $i in
+        (0) set -- ;;
+        (1) set -- "$args0" ;;
+        (2) set -- "$args0" "$args1" ;;
+        (3) set -- "$args0" "$args1" "$args2" ;;
+        (4) set -- "$args0" "$args1" "$args2" "$args3" ;;
+        (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
+        (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
+        (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
+        (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
+        (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
+    esac
+fi
+
+# Escape application args
+save () {
+    for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
+    echo " "
+}
+APP_ARGS=$(save "$@")
+
+# Collect all arguments for the java command, following the shell quoting and substitution rules
+eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
+
+# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong
+if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then
+  cd "$(dirname "$0")"
+fi
+
+exec "$JAVACMD" "$@"
diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/native/pom.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/native/pom.mustache
new file mode 100644
index 0000000000..ad7c4234c1
--- /dev/null
+++ b/modules/openapi-generator/src/main/resources/Java/libraries/native/pom.mustache
@@ -0,0 +1,215 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <groupId>{{groupId}}</groupId>
+    <artifactId>{{artifactId}}</artifactId>
+    <packaging>jar</packaging>
+    <name>{{artifactId}}</name>
+    <version>{{artifactVersion}}</version>
+    <url>{{artifactUrl}}</url>
+    <description>{{artifactDescription}}</description>
+    <scm>
+        <connection>{{scmConnection}}</connection>
+        <developerConnection>{{scmDeveloperConnection}}</developerConnection>
+        <url>{{scmUrl}}</url>
+    </scm>
+{{#parentOverridden}}
+    <parent>
+        <groupId>{{{parentGroupId}}}</groupId>
+        <artifactId>{{{parentArtifactId}}}</artifactId>
+        <version>{{{parentVersion}}}</version>
+    </parent>
+{{/parentOverridden}}
+
+    <licenses>
+        <license>
+            <name>{{licenseName}}</name>
+            <url>{{licenseUrl}}</url>
+            <distribution>repo</distribution>
+        </license>
+    </licenses>
+
+    <developers>
+        <developer>
+            <name>{{developerName}}</name>
+            <email>{{developerEmail}}</email>
+            <organization>{{developerOrganization}}</organization>
+            <organizationUrl>{{developerOrganizationUrl}}</organizationUrl>
+        </developer>
+    </developers>
+
+    <build>
+        <plugins>
+            <plugin>
+                <artifactId>maven-enforcer-plugin</artifactId>
+                <version>3.0.0-M1</version>
+                <executions>
+                    <execution>
+                        <id>enforce-maven</id>
+                        <goals>
+                            <goal>enforce</goal>
+                        </goals>
+                        <configuration>
+                            <rules>
+                                <requireMavenVersion>
+                                    <version>3</version>
+                                </requireMavenVersion>
+                                <requireJavaVersion>
+                                    <version>11</version>
+                                </requireJavaVersion>
+                            </rules>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <version>3.0.0-M3</version>
+                <configuration>
+                    <systemPropertyVariables>
+                        <loggerPath>conf/log4j.properties</loggerPath>
+                    </systemPropertyVariables>
+                    <argLine>-Xms512m -Xmx1500m</argLine>
+                    <parallel>methods</parallel>
+                    <threadCount>10</threadCount>
+                </configuration>
+            </plugin>
+            <plugin>
+                <artifactId>maven-dependency-plugin</artifactId>
+                <version>3.1.1</version>
+                <executions>
+                    <execution>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>copy-dependencies</goal>
+                        </goals>
+                        <configuration>
+                            <outputDirectory>${project.build.directory}/lib</outputDirectory>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+
+            <!-- attach test jar -->
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-jar-plugin</artifactId>
+                <version>3.1.2</version>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>test-jar</goal>
+                        </goals>
+                    </execution>
+                </executions>
+                <configuration>
+                </configuration>
+            </plugin>
+            <plugin>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <version>3.8.1</version>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-javadoc-plugin</artifactId>
+                <version>3.1.0</version>
+                <executions>
+                    <execution>
+                        <id>attach-javadocs</id>
+                        <goals>
+                            <goal>jar</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <artifactId>maven-source-plugin</artifactId>
+                <version>3.1.0</version>
+                <executions>
+                    <execution>
+                        <id>attach-sources</id>
+                        <goals>
+                            <goal>jar-no-fork</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+
+    <profiles>
+        <profile>
+            <id>sign-artifacts</id>
+            <build>
+                <plugins>
+                    <plugin>
+                        <artifactId>maven-gpg-plugin</artifactId>
+                        <version>1.6</version>
+                        <executions>
+                            <execution>
+                                <id>sign-artifacts</id>
+                                <phase>verify</phase>
+                                <goals>
+                                    <goal>sign</goal>
+                                </goals>
+                            </execution>
+                        </executions>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+    </profiles>
+
+    <dependencies>
+        <dependency>
+            <groupId>io.swagger</groupId>
+            <artifactId>swagger-annotations</artifactId>
+            <version>${swagger-annotations-version}</version>
+        </dependency>
+
+        <!-- JSON processing: jackson -->
+        <dependency>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-core</artifactId>
+            <version>${jackson-version}</version>
+        </dependency>
+        <dependency>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-annotations</artifactId>
+            <version>${jackson-version}</version>
+        </dependency>
+        <dependency>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-databind</artifactId>
+            <version>${jackson-version}</version>
+        </dependency>
+        <dependency>
+            <groupId>com.fasterxml.jackson.datatype</groupId>
+            <artifactId>jackson-datatype-jsr310</artifactId>
+            <version>${jackson-version}</version>
+        </dependency>
+
+        <!-- @Nullable annotation -->
+        <dependency>
+            <groupId>com.google.code.findbugs</groupId>
+            <artifactId>jsr305</artifactId>
+            <version>3.0.2</version>
+        </dependency>
+
+        <!-- test dependencies -->
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <version>${junit-version}</version>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
+    <properties>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <swagger-annotations-version>1.5.22</swagger-annotations-version>
+        <maven.compiler.source>11</maven.compiler.source>
+        <maven.compiler.target>11</maven.compiler.target>
+        <jackson-version>2.9.9</jackson-version>
+        <junit-version>4.12</junit-version>
+    </properties>
+</project>
diff --git a/modules/openapi-generator/src/main/resources/Java/libraries/native/travis.mustache b/modules/openapi-generator/src/main/resources/Java/libraries/native/travis.mustache
new file mode 100644
index 0000000000..d489da682e
--- /dev/null
+++ b/modules/openapi-generator/src/main/resources/Java/libraries/native/travis.mustache
@@ -0,0 +1,16 @@
+#
+# Generated by: https://openapi-generator.tech
+#
+language: java
+jdk:
+  - oraclejdk11
+before_install:
+  # ensure gradlew has proper permission
+  - chmod a+x ./gradlew
+script:
+  # test using maven
+  - mvn test
+  # uncomment below to test using gradle
+  # - gradle test
+  # uncomment below to test using sbt 
+  # - sbt test
diff --git a/samples/client/petstore/java/native/.gitignore b/samples/client/petstore/java/native/.gitignore
new file mode 100644
index 0000000000..a530464afa
--- /dev/null
+++ b/samples/client/petstore/java/native/.gitignore
@@ -0,0 +1,21 @@
+*.class
+
+# Mobile Tools for Java (J2ME)
+.mtj.tmp/
+
+# Package Files #
+*.jar
+*.war
+*.ear
+
+# exclude jar for gradle wrapper
+!gradle/wrapper/*.jar
+
+# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
+hs_err_pid*
+
+# build files
+**/target
+target
+.gradle
+build
diff --git a/samples/client/petstore/java/native/.openapi-generator-ignore b/samples/client/petstore/java/native/.openapi-generator-ignore
new file mode 100644
index 0000000000..7484ee590a
--- /dev/null
+++ b/samples/client/petstore/java/native/.openapi-generator-ignore
@@ -0,0 +1,23 @@
+# OpenAPI Generator Ignore
+# Generated by openapi-generator https://github.com/openapitools/openapi-generator
+
+# Use this file to prevent files from being overwritten by the generator.
+# The patterns follow closely to .gitignore or .dockerignore.
+
+# As an example, the C# client generator defines ApiClient.cs.
+# You can make changes and tell OpenAPI Generator to ignore just this file by uncommenting the following line:
+#ApiClient.cs
+
+# You can match any string of characters against a directory, file or extension with a single asterisk (*):
+#foo/*/qux
+# The above matches foo/bar/qux and foo/baz/qux, but not foo/bar/baz/qux
+
+# You can recursively match patterns against a directory, file or extension with a double asterisk (**):
+#foo/**/qux
+# This matches foo/bar/qux, foo/baz/qux, and foo/bar/baz/qux
+
+# You can also negate patterns with an exclamation (!).
+# For example, you can ignore all files in a docs folder with the file extension .md:
+#docs/*.md
+# Then explicitly reverse the ignore rule for a single file:
+#!docs/README.md
diff --git a/samples/client/petstore/java/native/.openapi-generator/VERSION b/samples/client/petstore/java/native/.openapi-generator/VERSION
new file mode 100644
index 0000000000..83a328a922
--- /dev/null
+++ b/samples/client/petstore/java/native/.openapi-generator/VERSION
@@ -0,0 +1 @@
+4.1.0-SNAPSHOT
\ No newline at end of file
diff --git a/samples/client/petstore/java/native/.travis.yml b/samples/client/petstore/java/native/.travis.yml
new file mode 100644
index 0000000000..d489da682e
--- /dev/null
+++ b/samples/client/petstore/java/native/.travis.yml
@@ -0,0 +1,16 @@
+#
+# Generated by: https://openapi-generator.tech
+#
+language: java
+jdk:
+  - oraclejdk11
+before_install:
+  # ensure gradlew has proper permission
+  - chmod a+x ./gradlew
+script:
+  # test using maven
+  - mvn test
+  # uncomment below to test using gradle
+  # - gradle test
+  # uncomment below to test using sbt 
+  # - sbt test
diff --git a/samples/client/petstore/java/native/README.md b/samples/client/petstore/java/native/README.md
new file mode 100644
index 0000000000..6c5f47c0eb
--- /dev/null
+++ b/samples/client/petstore/java/native/README.md
@@ -0,0 +1,235 @@
+# petstore-native
+
+OpenAPI Petstore
+
+- API version: 1.0.0
+
+This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+
+
+*Automatically generated by the [OpenAPI Generator](https://openapi-generator.tech)*
+
+## Requirements
+
+Building the API client library requires:
+
+1. Java 11+
+2. Maven/Gradle
+
+## Installation
+
+To install the API client library to your local Maven repository, simply execute:
+
+```shell
+mvn clean install
+```
+
+To deploy it to a remote Maven repository instead, configure the settings of the repository and execute:
+
+```shell
+mvn clean deploy
+```
+
+Refer to the [OSSRH Guide](http://central.sonatype.org/pages/ossrh-guide.html) for more information.
+
+### Maven users
+
+Add this dependency to your project's POM:
+
+```xml
+<dependency>
+  <groupId>org.openapitools</groupId>
+  <artifactId>petstore-native</artifactId>
+  <version>1.0.0</version>
+  <scope>compile</scope>
+</dependency>
+```
+
+### Gradle users
+
+Add this dependency to your project's build file:
+
+```groovy
+compile "org.openapitools:petstore-native:1.0.0"
+```
+
+### Others
+
+At first generate the JAR by executing:
+
+```shell
+mvn clean package
+```
+
+Then manually install the following JARs:
+
+- `target/petstore-native-1.0.0.jar`
+- `target/lib/*.jar`
+
+## Getting Started
+
+Please follow the [installation](#installation) instruction and execute the following Java code:
+
+```java
+
+import org.openapitools.client.*;
+import org.openapitools.client.model.*;
+import org.openapitools.client.api.AnotherFakeApi;
+
+public class AnotherFakeApiExample {
+
+    public static void main(String[] args) {
+        ApiClient defaultClient = Configuration.getDefaultApiClient();
+        // Configure clients using the `defaultClient` object, such as
+        // overriding the host and port, timeout, etc.
+        AnotherFakeApi apiInstance = new AnotherFakeApi(defaultClient);
+        Client body = new Client(); // Client | client model
+        try {
+            Client result = apiInstance.call123testSpecialTags(body);
+            System.out.println(result);
+        } catch (ApiException e) {
+            System.err.println("Exception when calling AnotherFakeApi#call123testSpecialTags");
+            System.err.println("Status code: " + e.getCode());
+            System.err.println("Reason: " + e.getResponseBody());
+            System.err.println("Response headers: " + e.getResponseHeaders());
+            e.printStackTrace();
+        }
+    }
+}
+
+```
+
+## Documentation for API Endpoints
+
+All URIs are relative to *http://petstore.swagger.io:80/v2*
+
+Class | Method | HTTP request | Description
+------------ | ------------- | ------------- | -------------
+*AnotherFakeApi* | [**call123testSpecialTags**](docs/AnotherFakeApi.md#call123testSpecialTags) | **PATCH** /another-fake/dummy | To test special tags
+*FakeApi* | [**createXmlItem**](docs/FakeApi.md#createXmlItem) | **POST** /fake/create_xml_item | creates an XmlItem
+*FakeApi* | [**fakeOuterBooleanSerialize**](docs/FakeApi.md#fakeOuterBooleanSerialize) | **POST** /fake/outer/boolean | 
+*FakeApi* | [**fakeOuterCompositeSerialize**](docs/FakeApi.md#fakeOuterCompositeSerialize) | **POST** /fake/outer/composite | 
+*FakeApi* | [**fakeOuterNumberSerialize**](docs/FakeApi.md#fakeOuterNumberSerialize) | **POST** /fake/outer/number | 
+*FakeApi* | [**fakeOuterStringSerialize**](docs/FakeApi.md#fakeOuterStringSerialize) | **POST** /fake/outer/string | 
+*FakeApi* | [**testBodyWithFileSchema**](docs/FakeApi.md#testBodyWithFileSchema) | **PUT** /fake/body-with-file-schema | 
+*FakeApi* | [**testBodyWithQueryParams**](docs/FakeApi.md#testBodyWithQueryParams) | **PUT** /fake/body-with-query-params | 
+*FakeApi* | [**testClientModel**](docs/FakeApi.md#testClientModel) | **PATCH** /fake | To test \&quot;client\&quot; model
+*FakeApi* | [**testEndpointParameters**](docs/FakeApi.md#testEndpointParameters) | **POST** /fake | Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 
+*FakeApi* | [**testEnumParameters**](docs/FakeApi.md#testEnumParameters) | **GET** /fake | To test enum parameters
+*FakeApi* | [**testGroupParameters**](docs/FakeApi.md#testGroupParameters) | **DELETE** /fake | Fake endpoint to test group parameters (optional)
+*FakeApi* | [**testInlineAdditionalProperties**](docs/FakeApi.md#testInlineAdditionalProperties) | **POST** /fake/inline-additionalProperties | test inline additionalProperties
+*FakeApi* | [**testJsonFormData**](docs/FakeApi.md#testJsonFormData) | **GET** /fake/jsonFormData | test json serialization of form data
+*FakeClassnameTags123Api* | [**testClassname**](docs/FakeClassnameTags123Api.md#testClassname) | **PATCH** /fake_classname_test | To test class name in snake case
+*PetApi* | [**addPet**](docs/PetApi.md#addPet) | **POST** /pet | Add a new pet to the store
+*PetApi* | [**deletePet**](docs/PetApi.md#deletePet) | **DELETE** /pet/{petId} | Deletes a pet
+*PetApi* | [**findPetsByStatus**](docs/PetApi.md#findPetsByStatus) | **GET** /pet/findByStatus | Finds Pets by status
+*PetApi* | [**findPetsByTags**](docs/PetApi.md#findPetsByTags) | **GET** /pet/findByTags | Finds Pets by tags
+*PetApi* | [**getPetById**](docs/PetApi.md#getPetById) | **GET** /pet/{petId} | Find pet by ID
+*PetApi* | [**updatePet**](docs/PetApi.md#updatePet) | **PUT** /pet | Update an existing pet
+*PetApi* | [**updatePetWithForm**](docs/PetApi.md#updatePetWithForm) | **POST** /pet/{petId} | Updates a pet in the store with form data
+*PetApi* | [**uploadFile**](docs/PetApi.md#uploadFile) | **POST** /pet/{petId}/uploadImage | uploads an image
+*PetApi* | [**uploadFileWithRequiredFile**](docs/PetApi.md#uploadFileWithRequiredFile) | **POST** /fake/{petId}/uploadImageWithRequiredFile | uploads an image (required)
+*StoreApi* | [**deleteOrder**](docs/StoreApi.md#deleteOrder) | **DELETE** /store/order/{order_id} | Delete purchase order by ID
+*StoreApi* | [**getInventory**](docs/StoreApi.md#getInventory) | **GET** /store/inventory | Returns pet inventories by status
+*StoreApi* | [**getOrderById**](docs/StoreApi.md#getOrderById) | **GET** /store/order/{order_id} | Find purchase order by ID
+*StoreApi* | [**placeOrder**](docs/StoreApi.md#placeOrder) | **POST** /store/order | Place an order for a pet
+*UserApi* | [**createUser**](docs/UserApi.md#createUser) | **POST** /user | Create user
+*UserApi* | [**createUsersWithArrayInput**](docs/UserApi.md#createUsersWithArrayInput) | **POST** /user/createWithArray | Creates list of users with given input array
+*UserApi* | [**createUsersWithListInput**](docs/UserApi.md#createUsersWithListInput) | **POST** /user/createWithList | Creates list of users with given input array
+*UserApi* | [**deleteUser**](docs/UserApi.md#deleteUser) | **DELETE** /user/{username} | Delete user
+*UserApi* | [**getUserByName**](docs/UserApi.md#getUserByName) | **GET** /user/{username} | Get user by user name
+*UserApi* | [**loginUser**](docs/UserApi.md#loginUser) | **GET** /user/login | Logs user into the system
+*UserApi* | [**logoutUser**](docs/UserApi.md#logoutUser) | **GET** /user/logout | Logs out current logged in user session
+*UserApi* | [**updateUser**](docs/UserApi.md#updateUser) | **PUT** /user/{username} | Updated user
+
+
+## Documentation for Models
+
+ - [AdditionalPropertiesAnyType](docs/AdditionalPropertiesAnyType.md)
+ - [AdditionalPropertiesArray](docs/AdditionalPropertiesArray.md)
+ - [AdditionalPropertiesBoolean](docs/AdditionalPropertiesBoolean.md)
+ - [AdditionalPropertiesClass](docs/AdditionalPropertiesClass.md)
+ - [AdditionalPropertiesInteger](docs/AdditionalPropertiesInteger.md)
+ - [AdditionalPropertiesNumber](docs/AdditionalPropertiesNumber.md)
+ - [AdditionalPropertiesObject](docs/AdditionalPropertiesObject.md)
+ - [AdditionalPropertiesString](docs/AdditionalPropertiesString.md)
+ - [Animal](docs/Animal.md)
+ - [ArrayOfArrayOfNumberOnly](docs/ArrayOfArrayOfNumberOnly.md)
+ - [ArrayOfNumberOnly](docs/ArrayOfNumberOnly.md)
+ - [ArrayTest](docs/ArrayTest.md)
+ - [Capitalization](docs/Capitalization.md)
+ - [Cat](docs/Cat.md)
+ - [CatAllOf](docs/CatAllOf.md)
+ - [Category](docs/Category.md)
+ - [ClassModel](docs/ClassModel.md)
+ - [Client](docs/Client.md)
+ - [Dog](docs/Dog.md)
+ - [DogAllOf](docs/DogAllOf.md)
+ - [EnumArrays](docs/EnumArrays.md)
+ - [EnumClass](docs/EnumClass.md)
+ - [EnumTest](docs/EnumTest.md)
+ - [FileSchemaTestClass](docs/FileSchemaTestClass.md)
+ - [FormatTest](docs/FormatTest.md)
+ - [HasOnlyReadOnly](docs/HasOnlyReadOnly.md)
+ - [MapTest](docs/MapTest.md)
+ - [MixedPropertiesAndAdditionalPropertiesClass](docs/MixedPropertiesAndAdditionalPropertiesClass.md)
+ - [Model200Response](docs/Model200Response.md)
+ - [ModelApiResponse](docs/ModelApiResponse.md)
+ - [ModelReturn](docs/ModelReturn.md)
+ - [Name](docs/Name.md)
+ - [NumberOnly](docs/NumberOnly.md)
+ - [Order](docs/Order.md)
+ - [OuterComposite](docs/OuterComposite.md)
+ - [OuterEnum](docs/OuterEnum.md)
+ - [Pet](docs/Pet.md)
+ - [ReadOnlyFirst](docs/ReadOnlyFirst.md)
+ - [SpecialModelName](docs/SpecialModelName.md)
+ - [Tag](docs/Tag.md)
+ - [TypeHolderDefault](docs/TypeHolderDefault.md)
+ - [TypeHolderExample](docs/TypeHolderExample.md)
+ - [User](docs/User.md)
+ - [XmlItem](docs/XmlItem.md)
+
+
+## Documentation for Authorization
+
+Authentication schemes defined for the API:
+### api_key
+
+
+- **Type**: API key
+- **API key parameter name**: api_key
+- **Location**: HTTP header
+
+### api_key_query
+
+
+- **Type**: API key
+- **API key parameter name**: api_key_query
+- **Location**: URL query string
+
+### http_basic_test
+
+
+- **Type**: HTTP basic authentication
+
+### petstore_auth
+
+
+- **Type**: OAuth
+- **Flow**: implicit
+- **Authorization URL**: http://petstore.swagger.io/api/oauth/dialog
+- **Scopes**: 
+  - write:pets: modify pets in your account
+  - read:pets: read your pets
+
+
+## Recommendation
+
+It's recommended to create an instance of `ApiClient` per thread in a multithreaded environment to avoid any potential issues.
+However, the instances of the api clients created from the `ApiClient` are thread-safe and can be re-used.
+
+## Author
+
+
+
diff --git a/samples/client/petstore/java/native/build.gradle b/samples/client/petstore/java/native/build.gradle
new file mode 100644
index 0000000000..70f87373f8
--- /dev/null
+++ b/samples/client/petstore/java/native/build.gradle
@@ -0,0 +1,66 @@
+apply plugin: 'idea'
+apply plugin: 'eclipse'
+
+group = 'org.openapitools'
+version = '1.0.0'
+
+buildscript {
+    repositories {
+        mavenCentral()
+        jcenter()
+    }
+}
+
+repositories {
+    mavenCentral()
+    jcenter()
+}
+
+apply plugin: 'java'
+apply plugin: 'maven'
+
+sourceCompatibility = JavaVersion.VERSION_11
+targetCompatibility = JavaVersion.VERSION_11
+
+install {
+    repositories.mavenInstaller {
+        pom.artifactId = 'petstore-native'
+    }
+}
+
+task execute(type:JavaExec) {
+   main = System.getProperty('mainClass')
+   classpath = sourceSets.main.runtimeClasspath
+}
+
+task sourcesJar(type: Jar, dependsOn: classes) {
+    classifier = 'sources'
+    from sourceSets.main.allSource
+}
+
+task javadocJar(type: Jar, dependsOn: javadoc) {
+    classifier = 'javadoc'
+    from javadoc.destinationDir
+}
+
+artifacts {
+    archives sourcesJar
+    archives javadocJar
+}
+
+
+ext {
+    swagger_annotations_version = "1.5.22"
+    jackson_version = "2.9.9"
+    junit_version = "4.12"
+}
+
+dependencies {
+    compile "io.swagger:swagger-annotations:$swagger_annotations_version"
+    compile "com.google.code.findbugs:jsr305:3.0.2"
+    compile "com.fasterxml.jackson.core:jackson-core:$jackson_version"
+    compile "com.fasterxml.jackson.core:jackson-annotations:$jackson_version"
+    compile "com.fasterxml.jackson.core:jackson-databind:$jackson_version"
+    compile "com.fasterxml.jackson.datatype:jackson-datatype-jsr310:$jackson_version"
+    testCompile "junit:junit:$junit_version"
+}
diff --git a/samples/client/petstore/java/native/build.sbt b/samples/client/petstore/java/native/build.sbt
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/samples/client/petstore/java/native/docs/AdditionalPropertiesAnyType.md b/samples/client/petstore/java/native/docs/AdditionalPropertiesAnyType.md
new file mode 100644
index 0000000000..87b468bb7c
--- /dev/null
+++ b/samples/client/petstore/java/native/docs/AdditionalPropertiesAnyType.md
@@ -0,0 +1,12 @@
+
+
+# AdditionalPropertiesAnyType
+
+## Properties
+
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**name** | **String** |  |  [optional]
+
+
+
diff --git a/samples/client/petstore/java/native/docs/AdditionalPropertiesArray.md b/samples/client/petstore/java/native/docs/AdditionalPropertiesArray.md
new file mode 100644
index 0000000000..cb7fe9b390
--- /dev/null
+++ b/samples/client/petstore/java/native/docs/AdditionalPropertiesArray.md
@@ -0,0 +1,12 @@
+
+
+# AdditionalPropertiesArray
+
+## Properties
+
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**name** | **String** |  |  [optional]
+
+
+
diff --git a/samples/client/petstore/java/native/docs/AdditionalPropertiesBoolean.md b/samples/client/petstore/java/native/docs/AdditionalPropertiesBoolean.md
new file mode 100644
index 0000000000..6b53e7ba73
--- /dev/null
+++ b/samples/client/petstore/java/native/docs/AdditionalPropertiesBoolean.md
@@ -0,0 +1,12 @@
+
+
+# AdditionalPropertiesBoolean
+
+## Properties
+
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**name** | **String** |  |  [optional]
+
+
+
diff --git a/samples/client/petstore/java/native/docs/AdditionalPropertiesClass.md b/samples/client/petstore/java/native/docs/AdditionalPropertiesClass.md
new file mode 100644
index 0000000000..36e1816200
--- /dev/null
+++ b/samples/client/petstore/java/native/docs/AdditionalPropertiesClass.md
@@ -0,0 +1,22 @@
+
+
+# AdditionalPropertiesClass
+
+## Properties
+
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**mapString** | **Map&lt;String, String&gt;** |  |  [optional]
+**mapNumber** | [**Map&lt;String, BigDecimal&gt;**](BigDecimal.md) |  |  [optional]
+**mapInteger** | **Map&lt;String, Integer&gt;** |  |  [optional]
+**mapBoolean** | **Map&lt;String, Boolean&gt;** |  |  [optional]
+**mapArrayInteger** | [**Map&lt;String, List&lt;Integer&gt;&gt;**](List.md) |  |  [optional]
+**mapArrayAnytype** | [**Map&lt;String, List&lt;Object&gt;&gt;**](List.md) |  |  [optional]
+**mapMapString** | [**Map&lt;String, Map&lt;String, String&gt;&gt;**](Map.md) |  |  [optional]
+**mapMapAnytype** | [**Map&lt;String, Map&lt;String, Object&gt;&gt;**](Map.md) |  |  [optional]
+**anytype1** | [**Object**](.md) |  |  [optional]
+**anytype2** | [**Object**](.md) |  |  [optional]
+**anytype3** | [**Object**](.md) |  |  [optional]
+
+
+
diff --git a/samples/client/petstore/java/native/docs/AdditionalPropertiesInteger.md b/samples/client/petstore/java/native/docs/AdditionalPropertiesInteger.md
new file mode 100644
index 0000000000..d2ed7fb1a4
--- /dev/null
+++ b/samples/client/petstore/java/native/docs/AdditionalPropertiesInteger.md
@@ -0,0 +1,12 @@
+
+
+# AdditionalPropertiesInteger
+
+## Properties
+
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**name** | **String** |  |  [optional]
+
+
+
diff --git a/samples/client/petstore/java/native/docs/AdditionalPropertiesNumber.md b/samples/client/petstore/java/native/docs/AdditionalPropertiesNumber.md
new file mode 100644
index 0000000000..53f6e81e71
--- /dev/null
+++ b/samples/client/petstore/java/native/docs/AdditionalPropertiesNumber.md
@@ -0,0 +1,12 @@
+
+
+# AdditionalPropertiesNumber
+
+## Properties
+
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**name** | **String** |  |  [optional]
+
+
+
diff --git a/samples/client/petstore/java/native/docs/AdditionalPropertiesObject.md b/samples/client/petstore/java/native/docs/AdditionalPropertiesObject.md
new file mode 100644
index 0000000000..98ac8d2e5f
--- /dev/null
+++ b/samples/client/petstore/java/native/docs/AdditionalPropertiesObject.md
@@ -0,0 +1,12 @@
+
+
+# AdditionalPropertiesObject
+
+## Properties
+
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**name** | **String** |  |  [optional]
+
+
+
diff --git a/samples/client/petstore/java/native/docs/AdditionalPropertiesString.md b/samples/client/petstore/java/native/docs/AdditionalPropertiesString.md
new file mode 100644
index 0000000000..d7970cdfe1
--- /dev/null
+++ b/samples/client/petstore/java/native/docs/AdditionalPropertiesString.md
@@ -0,0 +1,12 @@
+
+
+# AdditionalPropertiesString
+
+## Properties
+
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**name** | **String** |  |  [optional]
+
+
+
diff --git a/samples/client/petstore/java/native/docs/Animal.md b/samples/client/petstore/java/native/docs/Animal.md
new file mode 100644
index 0000000000..c8e18ae55e
--- /dev/null
+++ b/samples/client/petstore/java/native/docs/Animal.md
@@ -0,0 +1,13 @@
+
+
+# Animal
+
+## Properties
+
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**className** | **String** |  | 
+**color** | **String** |  |  [optional]
+
+
+
diff --git a/samples/client/petstore/java/native/docs/AnotherFakeApi.md b/samples/client/petstore/java/native/docs/AnotherFakeApi.md
new file mode 100644
index 0000000000..059616ec6b
--- /dev/null
+++ b/samples/client/petstore/java/native/docs/AnotherFakeApi.md
@@ -0,0 +1,74 @@
+# AnotherFakeApi
+
+All URIs are relative to *http://petstore.swagger.io:80/v2*
+
+Method | HTTP request | Description
+------------- | ------------- | -------------
+[**call123testSpecialTags**](AnotherFakeApi.md#call123testSpecialTags) | **PATCH** /another-fake/dummy | To test special tags
+
+
+
+## call123testSpecialTags
+
+> Client call123testSpecialTags(body)
+
+To test special tags
+
+To test special tags and operation ID starting with number
+
+### Example
+
+```java
+// Import classes:
+import org.openapitools.client.ApiClient;
+import org.openapitools.client.ApiException;
+import org.openapitools.client.Configuration;
+import org.openapitools.client.models.*;
+import org.openapitools.client.api.AnotherFakeApi;
+
+public class Example {
+    public static void main(String[] args) {
+        ApiClient defaultClient = Configuration.getDefaultApiClient();
+        defaultClient.setBasePath("http://petstore.swagger.io:80/v2");
+
+        AnotherFakeApi apiInstance = new AnotherFakeApi(defaultClient);
+        Client body = new Client(); // Client | client model
+        try {
+            Client result = apiInstance.call123testSpecialTags(body);
+            System.out.println(result);
+        } catch (ApiException e) {
+            System.err.println("Exception when calling AnotherFakeApi#call123testSpecialTags");
+            System.err.println("Status code: " + e.getCode());
+            System.err.println("Reason: " + e.getResponseBody());
+            System.err.println("Response headers: " + e.getResponseHeaders());
+            e.printStackTrace();
+        }
+    }
+}
+```
+
+### Parameters
+
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **body** | [**Client**](Client.md)| client model |
+
+### Return type
+
+[**Client**](Client.md)
+
+### Authorization
+
+No authorization required
+
+### HTTP request headers
+
+- **Content-Type**: application/json
+- **Accept**: application/json
+
+### HTTP response details
+| Status code | Description | Response headers |
+|-------------|-------------|------------------|
+| **200** | successful operation |  -  |
+
diff --git a/samples/client/petstore/java/native/docs/ArrayOfArrayOfNumberOnly.md b/samples/client/petstore/java/native/docs/ArrayOfArrayOfNumberOnly.md
new file mode 100644
index 0000000000..a48aa23e78
--- /dev/null
+++ b/samples/client/petstore/java/native/docs/ArrayOfArrayOfNumberOnly.md
@@ -0,0 +1,12 @@
+
+
+# ArrayOfArrayOfNumberOnly
+
+## Properties
+
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**arrayArrayNumber** | [**List&lt;List&lt;BigDecimal&gt;&gt;**](List.md) |  |  [optional]
+
+
+
diff --git a/samples/client/petstore/java/native/docs/ArrayOfNumberOnly.md b/samples/client/petstore/java/native/docs/ArrayOfNumberOnly.md
new file mode 100644
index 0000000000..fa2909211a
--- /dev/null
+++ b/samples/client/petstore/java/native/docs/ArrayOfNumberOnly.md
@@ -0,0 +1,12 @@
+
+
+# ArrayOfNumberOnly
+
+## Properties
+
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**arrayNumber** | [**List&lt;BigDecimal&gt;**](BigDecimal.md) |  |  [optional]
+
+
+
diff --git a/samples/client/petstore/java/native/docs/ArrayTest.md b/samples/client/petstore/java/native/docs/ArrayTest.md
new file mode 100644
index 0000000000..9ad1c9814a
--- /dev/null
+++ b/samples/client/petstore/java/native/docs/ArrayTest.md
@@ -0,0 +1,14 @@
+
+
+# ArrayTest
+
+## Properties
+
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**arrayOfString** | **List&lt;String&gt;** |  |  [optional]
+**arrayArrayOfInteger** | [**List&lt;List&lt;Long&gt;&gt;**](List.md) |  |  [optional]
+**arrayArrayOfModel** | [**List&lt;List&lt;ReadOnlyFirst&gt;&gt;**](List.md) |  |  [optional]
+
+
+
diff --git a/samples/client/petstore/java/native/docs/Capitalization.md b/samples/client/petstore/java/native/docs/Capitalization.md
new file mode 100644
index 0000000000..7b73c40b55
--- /dev/null
+++ b/samples/client/petstore/java/native/docs/Capitalization.md
@@ -0,0 +1,17 @@
+
+
+# Capitalization
+
+## Properties
+
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**smallCamel** | **String** |  |  [optional]
+**capitalCamel** | **String** |  |  [optional]
+**smallSnake** | **String** |  |  [optional]
+**capitalSnake** | **String** |  |  [optional]
+**scAETHFlowPoints** | **String** |  |  [optional]
+**ATT_NAME** | **String** | Name of the pet  |  [optional]
+
+
+
diff --git a/samples/client/petstore/java/native/docs/Cat.md b/samples/client/petstore/java/native/docs/Cat.md
new file mode 100644
index 0000000000..39c2f864df
--- /dev/null
+++ b/samples/client/petstore/java/native/docs/Cat.md
@@ -0,0 +1,12 @@
+
+
+# Cat
+
+## Properties
+
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**declawed** | **Boolean** |  |  [optional]
+
+
+
diff --git a/samples/client/petstore/java/native/docs/CatAllOf.md b/samples/client/petstore/java/native/docs/CatAllOf.md
new file mode 100644
index 0000000000..1098fd900c
--- /dev/null
+++ b/samples/client/petstore/java/native/docs/CatAllOf.md
@@ -0,0 +1,12 @@
+
+
+# CatAllOf
+
+## Properties
+
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**declawed** | **Boolean** |  |  [optional]
+
+
+
diff --git a/samples/client/petstore/java/native/docs/Category.md b/samples/client/petstore/java/native/docs/Category.md
new file mode 100644
index 0000000000..613ea9f7ee
--- /dev/null
+++ b/samples/client/petstore/java/native/docs/Category.md
@@ -0,0 +1,13 @@
+
+
+# Category
+
+## Properties
+
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**id** | **Long** |  |  [optional]
+**name** | **String** |  | 
+
+
+
diff --git a/samples/client/petstore/java/native/docs/ClassModel.md b/samples/client/petstore/java/native/docs/ClassModel.md
new file mode 100644
index 0000000000..fa6c9b6e3e
--- /dev/null
+++ b/samples/client/petstore/java/native/docs/ClassModel.md
@@ -0,0 +1,12 @@
+
+
+# ClassModel
+
+## Properties
+
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**propertyClass** | **String** |  |  [optional]
+
+
+
diff --git a/samples/client/petstore/java/native/docs/Client.md b/samples/client/petstore/java/native/docs/Client.md
new file mode 100644
index 0000000000..228df49238
--- /dev/null
+++ b/samples/client/petstore/java/native/docs/Client.md
@@ -0,0 +1,12 @@
+
+
+# Client
+
+## Properties
+
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**client** | **String** |  |  [optional]
+
+
+
diff --git a/samples/client/petstore/java/native/docs/Dog.md b/samples/client/petstore/java/native/docs/Dog.md
new file mode 100644
index 0000000000..73cedf2bc9
--- /dev/null
+++ b/samples/client/petstore/java/native/docs/Dog.md
@@ -0,0 +1,12 @@
+
+
+# Dog
+
+## Properties
+
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**breed** | **String** |  |  [optional]
+
+
+
diff --git a/samples/client/petstore/java/native/docs/DogAllOf.md b/samples/client/petstore/java/native/docs/DogAllOf.md
new file mode 100644
index 0000000000..cbeb9e9a22
--- /dev/null
+++ b/samples/client/petstore/java/native/docs/DogAllOf.md
@@ -0,0 +1,12 @@
+
+
+# DogAllOf
+
+## Properties
+
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**breed** | **String** |  |  [optional]
+
+
+
diff --git a/samples/client/petstore/java/native/docs/EnumArrays.md b/samples/client/petstore/java/native/docs/EnumArrays.md
new file mode 100644
index 0000000000..869b7a6c06
--- /dev/null
+++ b/samples/client/petstore/java/native/docs/EnumArrays.md
@@ -0,0 +1,31 @@
+
+
+# EnumArrays
+
+## Properties
+
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**justSymbol** | [**JustSymbolEnum**](#JustSymbolEnum) |  |  [optional]
+**arrayEnum** | [**List&lt;ArrayEnumEnum&gt;**](#List&lt;ArrayEnumEnum&gt;) |  |  [optional]
+
+
+
+## Enum: JustSymbolEnum
+
+Name | Value
+---- | -----
+GREATER_THAN_OR_EQUAL_TO | &quot;&gt;&#x3D;&quot;
+DOLLAR | &quot;$&quot;
+
+
+
+## Enum: List&lt;ArrayEnumEnum&gt;
+
+Name | Value
+---- | -----
+FISH | &quot;fish&quot;
+CRAB | &quot;crab&quot;
+
+
+
diff --git a/samples/client/petstore/java/native/docs/EnumClass.md b/samples/client/petstore/java/native/docs/EnumClass.md
new file mode 100644
index 0000000000..b314590a75
--- /dev/null
+++ b/samples/client/petstore/java/native/docs/EnumClass.md
@@ -0,0 +1,15 @@
+
+
+# EnumClass
+
+## Enum
+
+
+* `_ABC` (value: `"_abc"`)
+
+* `_EFG` (value: `"-efg"`)
+
+* `_XYZ_` (value: `"(xyz)"`)
+
+
+
diff --git a/samples/client/petstore/java/native/docs/EnumTest.md b/samples/client/petstore/java/native/docs/EnumTest.md
new file mode 100644
index 0000000000..61eb95f22f
--- /dev/null
+++ b/samples/client/petstore/java/native/docs/EnumTest.md
@@ -0,0 +1,54 @@
+
+
+# EnumTest
+
+## Properties
+
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**enumString** | [**EnumStringEnum**](#EnumStringEnum) |  |  [optional]
+**enumStringRequired** | [**EnumStringRequiredEnum**](#EnumStringRequiredEnum) |  | 
+**enumInteger** | [**EnumIntegerEnum**](#EnumIntegerEnum) |  |  [optional]
+**enumNumber** | [**EnumNumberEnum**](#EnumNumberEnum) |  |  [optional]
+**outerEnum** | [**OuterEnum**](OuterEnum.md) |  |  [optional]
+
+
+
+## Enum: EnumStringEnum
+
+Name | Value
+---- | -----
+UPPER | &quot;UPPER&quot;
+LOWER | &quot;lower&quot;
+EMPTY | &quot;&quot;
+
+
+
+## Enum: EnumStringRequiredEnum
+
+Name | Value
+---- | -----
+UPPER | &quot;UPPER&quot;
+LOWER | &quot;lower&quot;
+EMPTY | &quot;&quot;
+
+
+
+## Enum: EnumIntegerEnum
+
+Name | Value
+---- | -----
+NUMBER_1 | 1
+NUMBER_MINUS_1 | -1
+
+
+
+## Enum: EnumNumberEnum
+
+Name | Value
+---- | -----
+NUMBER_1_DOT_1 | 1.1
+NUMBER_MINUS_1_DOT_2 | -1.2
+
+
+
diff --git a/samples/client/petstore/java/native/docs/FakeApi.md b/samples/client/petstore/java/native/docs/FakeApi.md
new file mode 100644
index 0000000000..9a2e477020
--- /dev/null
+++ b/samples/client/petstore/java/native/docs/FakeApi.md
@@ -0,0 +1,914 @@
+# FakeApi
+
+All URIs are relative to *http://petstore.swagger.io:80/v2*
+
+Method | HTTP request | Description
+------------- | ------------- | -------------
+[**createXmlItem**](FakeApi.md#createXmlItem) | **POST** /fake/create_xml_item | creates an XmlItem
+[**fakeOuterBooleanSerialize**](FakeApi.md#fakeOuterBooleanSerialize) | **POST** /fake/outer/boolean | 
+[**fakeOuterCompositeSerialize**](FakeApi.md#fakeOuterCompositeSerialize) | **POST** /fake/outer/composite | 
+[**fakeOuterNumberSerialize**](FakeApi.md#fakeOuterNumberSerialize) | **POST** /fake/outer/number | 
+[**fakeOuterStringSerialize**](FakeApi.md#fakeOuterStringSerialize) | **POST** /fake/outer/string | 
+[**testBodyWithFileSchema**](FakeApi.md#testBodyWithFileSchema) | **PUT** /fake/body-with-file-schema | 
+[**testBodyWithQueryParams**](FakeApi.md#testBodyWithQueryParams) | **PUT** /fake/body-with-query-params | 
+[**testClientModel**](FakeApi.md#testClientModel) | **PATCH** /fake | To test \&quot;client\&quot; model
+[**testEndpointParameters**](FakeApi.md#testEndpointParameters) | **POST** /fake | Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 
+[**testEnumParameters**](FakeApi.md#testEnumParameters) | **GET** /fake | To test enum parameters
+[**testGroupParameters**](FakeApi.md#testGroupParameters) | **DELETE** /fake | Fake endpoint to test group parameters (optional)
+[**testInlineAdditionalProperties**](FakeApi.md#testInlineAdditionalProperties) | **POST** /fake/inline-additionalProperties | test inline additionalProperties
+[**testJsonFormData**](FakeApi.md#testJsonFormData) | **GET** /fake/jsonFormData | test json serialization of form data
+
+
+
+## createXmlItem
+
+> createXmlItem(xmlItem)
+
+creates an XmlItem
+
+this route creates an XmlItem
+
+### Example
+
+```java
+// Import classes:
+import org.openapitools.client.ApiClient;
+import org.openapitools.client.ApiException;
+import org.openapitools.client.Configuration;
+import org.openapitools.client.models.*;
+import org.openapitools.client.api.FakeApi;
+
+public class Example {
+    public static void main(String[] args) {
+        ApiClient defaultClient = Configuration.getDefaultApiClient();
+        defaultClient.setBasePath("http://petstore.swagger.io:80/v2");
+
+        FakeApi apiInstance = new FakeApi(defaultClient);
+        XmlItem xmlItem = new XmlItem(); // XmlItem | XmlItem Body
+        try {
+            apiInstance.createXmlItem(xmlItem);
+        } catch (ApiException e) {
+            System.err.println("Exception when calling FakeApi#createXmlItem");
+            System.err.println("Status code: " + e.getCode());
+            System.err.println("Reason: " + e.getResponseBody());
+            System.err.println("Response headers: " + e.getResponseHeaders());
+            e.printStackTrace();
+        }
+    }
+}
+```
+
+### Parameters
+
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **xmlItem** | [**XmlItem**](XmlItem.md)| XmlItem Body |
+
+### Return type
+
+null (empty response body)
+
+### Authorization
+
+No authorization required
+
+### HTTP request headers
+
+- **Content-Type**: application/xml, application/xml; charset=utf-8, application/xml; charset=utf-16, text/xml, text/xml; charset=utf-8, text/xml; charset=utf-16
+- **Accept**: Not defined
+
+### HTTP response details
+| Status code | Description | Response headers |
+|-------------|-------------|------------------|
+| **200** | successful operation |  -  |
+
+
+## fakeOuterBooleanSerialize
+
+> Boolean fakeOuterBooleanSerialize(body)
+
+
+
+Test serialization of outer boolean types
+
+### Example
+
+```java
+// Import classes:
+import org.openapitools.client.ApiClient;
+import org.openapitools.client.ApiException;
+import org.openapitools.client.Configuration;
+import org.openapitools.client.models.*;
+import org.openapitools.client.api.FakeApi;
+
+public class Example {
+    public static void main(String[] args) {
+        ApiClient defaultClient = Configuration.getDefaultApiClient();
+        defaultClient.setBasePath("http://petstore.swagger.io:80/v2");
+
+        FakeApi apiInstance = new FakeApi(defaultClient);
+        Boolean body = true; // Boolean | Input boolean as post body
+        try {
+            Boolean result = apiInstance.fakeOuterBooleanSerialize(body);
+            System.out.println(result);
+        } catch (ApiException e) {
+            System.err.println("Exception when calling FakeApi#fakeOuterBooleanSerialize");
+            System.err.println("Status code: " + e.getCode());
+            System.err.println("Reason: " + e.getResponseBody());
+            System.err.println("Response headers: " + e.getResponseHeaders());
+            e.printStackTrace();
+        }
+    }
+}
+```
+
+### Parameters
+
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **body** | **Boolean**| Input boolean as post body | [optional]
+
+### Return type
+
+**Boolean**
+
+### Authorization
+
+No authorization required
+
+### HTTP request headers
+
+- **Content-Type**: Not defined
+- **Accept**: */*
+
+### HTTP response details
+| Status code | Description | Response headers |
+|-------------|-------------|------------------|
+| **200** | Output boolean |  -  |
+
+
+## fakeOuterCompositeSerialize
+
+> OuterComposite fakeOuterCompositeSerialize(body)
+
+
+
+Test serialization of object with outer number type
+
+### Example
+
+```java
+// Import classes:
+import org.openapitools.client.ApiClient;
+import org.openapitools.client.ApiException;
+import org.openapitools.client.Configuration;
+import org.openapitools.client.models.*;
+import org.openapitools.client.api.FakeApi;
+
+public class Example {
+    public static void main(String[] args) {
+        ApiClient defaultClient = Configuration.getDefaultApiClient();
+        defaultClient.setBasePath("http://petstore.swagger.io:80/v2");
+
+        FakeApi apiInstance = new FakeApi(defaultClient);
+        OuterComposite body = new OuterComposite(); // OuterComposite | Input composite as post body
+        try {
+            OuterComposite result = apiInstance.fakeOuterCompositeSerialize(body);
+            System.out.println(result);
+        } catch (ApiException e) {
+            System.err.println("Exception when calling FakeApi#fakeOuterCompositeSerialize");
+            System.err.println("Status code: " + e.getCode());
+            System.err.println("Reason: " + e.getResponseBody());
+            System.err.println("Response headers: " + e.getResponseHeaders());
+            e.printStackTrace();
+        }
+    }
+}
+```
+
+### Parameters
+
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **body** | [**OuterComposite**](OuterComposite.md)| Input composite as post body | [optional]
+
+### Return type
+
+[**OuterComposite**](OuterComposite.md)
+
+### Authorization
+
+No authorization required
+
+### HTTP request headers
+
+- **Content-Type**: Not defined
+- **Accept**: */*
+
+### HTTP response details
+| Status code | Description | Response headers |
+|-------------|-------------|------------------|
+| **200** | Output composite |  -  |
+
+
+## fakeOuterNumberSerialize
+
+> BigDecimal fakeOuterNumberSerialize(body)
+
+
+
+Test serialization of outer number types
+
+### Example
+
+```java
+// Import classes:
+import org.openapitools.client.ApiClient;
+import org.openapitools.client.ApiException;
+import org.openapitools.client.Configuration;
+import org.openapitools.client.models.*;
+import org.openapitools.client.api.FakeApi;
+
+public class Example {
+    public static void main(String[] args) {
+        ApiClient defaultClient = Configuration.getDefaultApiClient();
+        defaultClient.setBasePath("http://petstore.swagger.io:80/v2");
+
+        FakeApi apiInstance = new FakeApi(defaultClient);
+        BigDecimal body = new BigDecimal(); // BigDecimal | Input number as post body
+        try {
+            BigDecimal result = apiInstance.fakeOuterNumberSerialize(body);
+            System.out.println(result);
+        } catch (ApiException e) {
+            System.err.println("Exception when calling FakeApi#fakeOuterNumberSerialize");
+            System.err.println("Status code: " + e.getCode());
+            System.err.println("Reason: " + e.getResponseBody());
+            System.err.println("Response headers: " + e.getResponseHeaders());
+            e.printStackTrace();
+        }
+    }
+}
+```
+
+### Parameters
+
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **body** | **BigDecimal**| Input number as post body | [optional]
+
+### Return type
+
+[**BigDecimal**](BigDecimal.md)
+
+### Authorization
+
+No authorization required
+
+### HTTP request headers
+
+- **Content-Type**: Not defined
+- **Accept**: */*
+
+### HTTP response details
+| Status code | Description | Response headers |
+|-------------|-------------|------------------|
+| **200** | Output number |  -  |
+
+
+## fakeOuterStringSerialize
+
+> String fakeOuterStringSerialize(body)
+
+
+
+Test serialization of outer string types
+
+### Example
+
+```java
+// Import classes:
+import org.openapitools.client.ApiClient;
+import org.openapitools.client.ApiException;
+import org.openapitools.client.Configuration;
+import org.openapitools.client.models.*;
+import org.openapitools.client.api.FakeApi;
+
+public class Example {
+    public static void main(String[] args) {
+        ApiClient defaultClient = Configuration.getDefaultApiClient();
+        defaultClient.setBasePath("http://petstore.swagger.io:80/v2");
+
+        FakeApi apiInstance = new FakeApi(defaultClient);
+        String body = "body_example"; // String | Input string as post body
+        try {
+            String result = apiInstance.fakeOuterStringSerialize(body);
+            System.out.println(result);
+        } catch (ApiException e) {
+            System.err.println("Exception when calling FakeApi#fakeOuterStringSerialize");
+            System.err.println("Status code: " + e.getCode());
+            System.err.println("Reason: " + e.getResponseBody());
+            System.err.println("Response headers: " + e.getResponseHeaders());
+            e.printStackTrace();
+        }
+    }
+}
+```
+
+### Parameters
+
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **body** | **String**| Input string as post body | [optional]
+
+### Return type
+
+**String**
+
+### Authorization
+
+No authorization required
+
+### HTTP request headers
+
+- **Content-Type**: Not defined
+- **Accept**: */*
+
+### HTTP response details
+| Status code | Description | Response headers |
+|-------------|-------------|------------------|
+| **200** | Output string |  -  |
+
+
+## testBodyWithFileSchema
+
+> testBodyWithFileSchema(body)
+
+
+
+For this test, the body for this request much reference a schema named &#x60;File&#x60;.
+
+### Example
+
+```java
+// Import classes:
+import org.openapitools.client.ApiClient;
+import org.openapitools.client.ApiException;
+import org.openapitools.client.Configuration;
+import org.openapitools.client.models.*;
+import org.openapitools.client.api.FakeApi;
+
+public class Example {
+    public static void main(String[] args) {
+        ApiClient defaultClient = Configuration.getDefaultApiClient();
+        defaultClient.setBasePath("http://petstore.swagger.io:80/v2");
+
+        FakeApi apiInstance = new FakeApi(defaultClient);
+        FileSchemaTestClass body = new FileSchemaTestClass(); // FileSchemaTestClass | 
+        try {
+            apiInstance.testBodyWithFileSchema(body);
+        } catch (ApiException e) {
+            System.err.println("Exception when calling FakeApi#testBodyWithFileSchema");
+            System.err.println("Status code: " + e.getCode());
+            System.err.println("Reason: " + e.getResponseBody());
+            System.err.println("Response headers: " + e.getResponseHeaders());
+            e.printStackTrace();
+        }
+    }
+}
+```
+
+### Parameters
+
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **body** | [**FileSchemaTestClass**](FileSchemaTestClass.md)|  |
+
+### Return type
+
+null (empty response body)
+
+### Authorization
+
+No authorization required
+
+### HTTP request headers
+
+- **Content-Type**: application/json
+- **Accept**: Not defined
+
+### HTTP response details
+| Status code | Description | Response headers |
+|-------------|-------------|------------------|
+| **200** | Success |  -  |
+
+
+## testBodyWithQueryParams
+
+> testBodyWithQueryParams(query, body)
+
+
+
+### Example
+
+```java
+// Import classes:
+import org.openapitools.client.ApiClient;
+import org.openapitools.client.ApiException;
+import org.openapitools.client.Configuration;
+import org.openapitools.client.models.*;
+import org.openapitools.client.api.FakeApi;
+
+public class Example {
+    public static void main(String[] args) {
+        ApiClient defaultClient = Configuration.getDefaultApiClient();
+        defaultClient.setBasePath("http://petstore.swagger.io:80/v2");
+
+        FakeApi apiInstance = new FakeApi(defaultClient);
+        String query = "query_example"; // String | 
+        User body = new User(); // User | 
+        try {
+            apiInstance.testBodyWithQueryParams(query, body);
+        } catch (ApiException e) {
+            System.err.println("Exception when calling FakeApi#testBodyWithQueryParams");
+            System.err.println("Status code: " + e.getCode());
+            System.err.println("Reason: " + e.getResponseBody());
+            System.err.println("Response headers: " + e.getResponseHeaders());
+            e.printStackTrace();
+        }
+    }
+}
+```
+
+### Parameters
+
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **query** | **String**|  |
+ **body** | [**User**](User.md)|  |
+
+### Return type
+
+null (empty response body)
+
+### Authorization
+
+No authorization required
+
+### HTTP request headers
+
+- **Content-Type**: application/json
+- **Accept**: Not defined
+
+### HTTP response details
+| Status code | Description | Response headers |
+|-------------|-------------|------------------|
+| **200** | Success |  -  |
+
+
+## testClientModel
+
+> Client testClientModel(body)
+
+To test \&quot;client\&quot; model
+
+To test \&quot;client\&quot; model
+
+### Example
+
+```java
+// Import classes:
+import org.openapitools.client.ApiClient;
+import org.openapitools.client.ApiException;
+import org.openapitools.client.Configuration;
+import org.openapitools.client.models.*;
+import org.openapitools.client.api.FakeApi;
+
+public class Example {
+    public static void main(String[] args) {
+        ApiClient defaultClient = Configuration.getDefaultApiClient();
+        defaultClient.setBasePath("http://petstore.swagger.io:80/v2");
+
+        FakeApi apiInstance = new FakeApi(defaultClient);
+        Client body = new Client(); // Client | client model
+        try {
+            Client result = apiInstance.testClientModel(body);
+            System.out.println(result);
+        } catch (ApiException e) {
+            System.err.println("Exception when calling FakeApi#testClientModel");
+            System.err.println("Status code: " + e.getCode());
+            System.err.println("Reason: " + e.getResponseBody());
+            System.err.println("Response headers: " + e.getResponseHeaders());
+            e.printStackTrace();
+        }
+    }
+}
+```
+
+### Parameters
+
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **body** | [**Client**](Client.md)| client model |
+
+### Return type
+
+[**Client**](Client.md)
+
+### Authorization
+
+No authorization required
+
+### HTTP request headers
+
+- **Content-Type**: application/json
+- **Accept**: application/json
+
+### HTTP response details
+| Status code | Description | Response headers |
+|-------------|-------------|------------------|
+| **200** | successful operation |  -  |
+
+
+## testEndpointParameters
+
+> testEndpointParameters(number, _double, patternWithoutDelimiter, _byte, integer, int32, int64, _float, string, binary, date, dateTime, password, paramCallback)
+
+Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 
+
+Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 
+
+### Example
+
+```java
+// Import classes:
+import org.openapitools.client.ApiClient;
+import org.openapitools.client.ApiException;
+import org.openapitools.client.Configuration;
+import org.openapitools.client.auth.*;
+import org.openapitools.client.models.*;
+import org.openapitools.client.api.FakeApi;
+
+public class Example {
+    public static void main(String[] args) {
+        ApiClient defaultClient = Configuration.getDefaultApiClient();
+        defaultClient.setBasePath("http://petstore.swagger.io:80/v2");
+        
+        // Configure HTTP basic authorization: http_basic_test
+        HttpBasicAuth http_basic_test = (HttpBasicAuth) defaultClient.getAuthentication("http_basic_test");
+        http_basic_test.setUsername("YOUR USERNAME");
+        http_basic_test.setPassword("YOUR PASSWORD");
+
+        FakeApi apiInstance = new FakeApi(defaultClient);
+        BigDecimal number = new BigDecimal(); // BigDecimal | None
+        Double _double = 3.4D; // Double | None
+        String patternWithoutDelimiter = "patternWithoutDelimiter_example"; // String | None
+        byte[] _byte = null; // byte[] | None
+        Integer integer = 56; // Integer | None
+        Integer int32 = 56; // Integer | None
+        Long int64 = 56L; // Long | None
+        Float _float = 3.4F; // Float | None
+        String string = "string_example"; // String | None
+        File binary = new File("/path/to/file"); // File | None
+        LocalDate date = new LocalDate(); // LocalDate | None
+        OffsetDateTime dateTime = new OffsetDateTime(); // OffsetDateTime | None
+        String password = "password_example"; // String | None
+        String paramCallback = "paramCallback_example"; // String | None
+        try {
+            apiInstance.testEndpointParameters(number, _double, patternWithoutDelimiter, _byte, integer, int32, int64, _float, string, binary, date, dateTime, password, paramCallback);
+        } catch (ApiException e) {
+            System.err.println("Exception when calling FakeApi#testEndpointParameters");
+            System.err.println("Status code: " + e.getCode());
+            System.err.println("Reason: " + e.getResponseBody());
+            System.err.println("Response headers: " + e.getResponseHeaders());
+            e.printStackTrace();
+        }
+    }
+}
+```
+
+### Parameters
+
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **number** | **BigDecimal**| None |
+ **_double** | **Double**| None |
+ **patternWithoutDelimiter** | **String**| None |
+ **_byte** | **byte[]**| None |
+ **integer** | **Integer**| None | [optional]
+ **int32** | **Integer**| None | [optional]
+ **int64** | **Long**| None | [optional]
+ **_float** | **Float**| None | [optional]
+ **string** | **String**| None | [optional]
+ **binary** | **File**| None | [optional]
+ **date** | **LocalDate**| None | [optional]
+ **dateTime** | **OffsetDateTime**| None | [optional]
+ **password** | **String**| None | [optional]
+ **paramCallback** | **String**| None | [optional]
+
+### Return type
+
+null (empty response body)
+
+### Authorization
+
+[http_basic_test](../README.md#http_basic_test)
+
+### HTTP request headers
+
+- **Content-Type**: application/x-www-form-urlencoded
+- **Accept**: Not defined
+
+### HTTP response details
+| Status code | Description | Response headers |
+|-------------|-------------|------------------|
+| **400** | Invalid username supplied |  -  |
+| **404** | User not found |  -  |
+
+
+## testEnumParameters
+
+> testEnumParameters(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumFormStringArray, enumFormString)
+
+To test enum parameters
+
+To test enum parameters
+
+### Example
+
+```java
+// Import classes:
+import org.openapitools.client.ApiClient;
+import org.openapitools.client.ApiException;
+import org.openapitools.client.Configuration;
+import org.openapitools.client.models.*;
+import org.openapitools.client.api.FakeApi;
+
+public class Example {
+    public static void main(String[] args) {
+        ApiClient defaultClient = Configuration.getDefaultApiClient();
+        defaultClient.setBasePath("http://petstore.swagger.io:80/v2");
+
+        FakeApi apiInstance = new FakeApi(defaultClient);
+        List<String> enumHeaderStringArray = Arrays.asList("$"); // List<String> | Header parameter enum test (string array)
+        String enumHeaderString = "-efg"; // String | Header parameter enum test (string)
+        List<String> enumQueryStringArray = Arrays.asList("$"); // List<String> | Query parameter enum test (string array)
+        String enumQueryString = "-efg"; // String | Query parameter enum test (string)
+        Integer enumQueryInteger = 56; // Integer | Query parameter enum test (double)
+        Double enumQueryDouble = 3.4D; // Double | Query parameter enum test (double)
+        List<String> enumFormStringArray = "$"; // List<String> | Form parameter enum test (string array)
+        String enumFormString = "-efg"; // String | Form parameter enum test (string)
+        try {
+            apiInstance.testEnumParameters(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumFormStringArray, enumFormString);
+        } catch (ApiException e) {
+            System.err.println("Exception when calling FakeApi#testEnumParameters");
+            System.err.println("Status code: " + e.getCode());
+            System.err.println("Reason: " + e.getResponseBody());
+            System.err.println("Response headers: " + e.getResponseHeaders());
+            e.printStackTrace();
+        }
+    }
+}
+```
+
+### Parameters
+
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **enumHeaderStringArray** | [**List&lt;String&gt;**](String.md)| Header parameter enum test (string array) | [optional] [enum: >, $]
+ **enumHeaderString** | **String**| Header parameter enum test (string) | [optional] [default to -efg] [enum: _abc, -efg, (xyz)]
+ **enumQueryStringArray** | [**List&lt;String&gt;**](String.md)| Query parameter enum test (string array) | [optional] [enum: >, $]
+ **enumQueryString** | **String**| Query parameter enum test (string) | [optional] [default to -efg] [enum: _abc, -efg, (xyz)]
+ **enumQueryInteger** | **Integer**| Query parameter enum test (double) | [optional] [enum: 1, -2]
+ **enumQueryDouble** | **Double**| Query parameter enum test (double) | [optional] [enum: 1.1, -1.2]
+ **enumFormStringArray** | [**List&lt;String&gt;**](String.md)| Form parameter enum test (string array) | [optional] [enum: >, $]
+ **enumFormString** | **String**| Form parameter enum test (string) | [optional] [default to -efg] [enum: _abc, -efg, (xyz)]
+
+### Return type
+
+null (empty response body)
+
+### Authorization
+
+No authorization required
+
+### HTTP request headers
+
+- **Content-Type**: application/x-www-form-urlencoded
+- **Accept**: Not defined
+
+### HTTP response details
+| Status code | Description | Response headers |
+|-------------|-------------|------------------|
+| **400** | Invalid request |  -  |
+| **404** | Not found |  -  |
+
+
+## testGroupParameters
+
+> testGroupParameters(requiredStringGroup, requiredBooleanGroup, requiredInt64Group, stringGroup, booleanGroup, int64Group)
+
+Fake endpoint to test group parameters (optional)
+
+Fake endpoint to test group parameters (optional)
+
+### Example
+
+```java
+// Import classes:
+import org.openapitools.client.ApiClient;
+import org.openapitools.client.ApiException;
+import org.openapitools.client.Configuration;
+import org.openapitools.client.models.*;
+import org.openapitools.client.api.FakeApi;
+
+public class Example {
+    public static void main(String[] args) {
+        ApiClient defaultClient = Configuration.getDefaultApiClient();
+        defaultClient.setBasePath("http://petstore.swagger.io:80/v2");
+
+        FakeApi apiInstance = new FakeApi(defaultClient);
+        Integer requiredStringGroup = 56; // Integer | Required String in group parameters
+        Boolean requiredBooleanGroup = true; // Boolean | Required Boolean in group parameters
+        Long requiredInt64Group = 56L; // Long | Required Integer in group parameters
+        Integer stringGroup = 56; // Integer | String in group parameters
+        Boolean booleanGroup = true; // Boolean | Boolean in group parameters
+        Long int64Group = 56L; // Long | Integer in group parameters
+        try {
+            apiInstance.testGroupParameters(requiredStringGroup, requiredBooleanGroup, requiredInt64Group, stringGroup, booleanGroup, int64Group);
+        } catch (ApiException e) {
+            System.err.println("Exception when calling FakeApi#testGroupParameters");
+            System.err.println("Status code: " + e.getCode());
+            System.err.println("Reason: " + e.getResponseBody());
+            System.err.println("Response headers: " + e.getResponseHeaders());
+            e.printStackTrace();
+        }
+    }
+}
+```
+
+### Parameters
+
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **requiredStringGroup** | **Integer**| Required String in group parameters |
+ **requiredBooleanGroup** | **Boolean**| Required Boolean in group parameters |
+ **requiredInt64Group** | **Long**| Required Integer in group parameters |
+ **stringGroup** | **Integer**| String in group parameters | [optional]
+ **booleanGroup** | **Boolean**| Boolean in group parameters | [optional]
+ **int64Group** | **Long**| Integer in group parameters | [optional]
+
+### Return type
+
+null (empty response body)
+
+### Authorization
+
+No authorization required
+
+### HTTP request headers
+
+- **Content-Type**: Not defined
+- **Accept**: Not defined
+
+### HTTP response details
+| Status code | Description | Response headers |
+|-------------|-------------|------------------|
+| **400** | Someting wrong |  -  |
+
+
+## testInlineAdditionalProperties
+
+> testInlineAdditionalProperties(param)
+
+test inline additionalProperties
+
+### Example
+
+```java
+// Import classes:
+import org.openapitools.client.ApiClient;
+import org.openapitools.client.ApiException;
+import org.openapitools.client.Configuration;
+import org.openapitools.client.models.*;
+import org.openapitools.client.api.FakeApi;
+
+public class Example {
+    public static void main(String[] args) {
+        ApiClient defaultClient = Configuration.getDefaultApiClient();
+        defaultClient.setBasePath("http://petstore.swagger.io:80/v2");
+
+        FakeApi apiInstance = new FakeApi(defaultClient);
+        Map<String, String> param = new HashMap(); // Map<String, String> | request body
+        try {
+            apiInstance.testInlineAdditionalProperties(param);
+        } catch (ApiException e) {
+            System.err.println("Exception when calling FakeApi#testInlineAdditionalProperties");
+            System.err.println("Status code: " + e.getCode());
+            System.err.println("Reason: " + e.getResponseBody());
+            System.err.println("Response headers: " + e.getResponseHeaders());
+            e.printStackTrace();
+        }
+    }
+}
+```
+
+### Parameters
+
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **param** | [**Map&lt;String, String&gt;**](String.md)| request body |
+
+### Return type
+
+null (empty response body)
+
+### Authorization
+
+No authorization required
+
+### HTTP request headers
+
+- **Content-Type**: application/json
+- **Accept**: Not defined
+
+### HTTP response details
+| Status code | Description | Response headers |
+|-------------|-------------|------------------|
+| **200** | successful operation |  -  |
+
+
+## testJsonFormData
+
+> testJsonFormData(param, param2)
+
+test json serialization of form data
+
+### Example
+
+```java
+// Import classes:
+import org.openapitools.client.ApiClient;
+import org.openapitools.client.ApiException;
+import org.openapitools.client.Configuration;
+import org.openapitools.client.models.*;
+import org.openapitools.client.api.FakeApi;
+
+public class Example {
+    public static void main(String[] args) {
+        ApiClient defaultClient = Configuration.getDefaultApiClient();
+        defaultClient.setBasePath("http://petstore.swagger.io:80/v2");
+
+        FakeApi apiInstance = new FakeApi(defaultClient);
+        String param = "param_example"; // String | field1
+        String param2 = "param2_example"; // String | field2
+        try {
+            apiInstance.testJsonFormData(param, param2);
+        } catch (ApiException e) {
+            System.err.println("Exception when calling FakeApi#testJsonFormData");
+            System.err.println("Status code: " + e.getCode());
+            System.err.println("Reason: " + e.getResponseBody());
+            System.err.println("Response headers: " + e.getResponseHeaders());
+            e.printStackTrace();
+        }
+    }
+}
+```
+
+### Parameters
+
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **param** | **String**| field1 |
+ **param2** | **String**| field2 |
+
+### Return type
+
+null (empty response body)
+
+### Authorization
+
+No authorization required
+
+### HTTP request headers
+
+- **Content-Type**: application/x-www-form-urlencoded
+- **Accept**: Not defined
+
+### HTTP response details
+| Status code | Description | Response headers |
+|-------------|-------------|------------------|
+| **200** | successful operation |  -  |
+
diff --git a/samples/client/petstore/java/native/docs/FakeClassnameTags123Api.md b/samples/client/petstore/java/native/docs/FakeClassnameTags123Api.md
new file mode 100644
index 0000000000..14a74a37a4
--- /dev/null
+++ b/samples/client/petstore/java/native/docs/FakeClassnameTags123Api.md
@@ -0,0 +1,81 @@
+# FakeClassnameTags123Api
+
+All URIs are relative to *http://petstore.swagger.io:80/v2*
+
+Method | HTTP request | Description
+------------- | ------------- | -------------
+[**testClassname**](FakeClassnameTags123Api.md#testClassname) | **PATCH** /fake_classname_test | To test class name in snake case
+
+
+
+## testClassname
+
+> Client testClassname(body)
+
+To test class name in snake case
+
+To test class name in snake case
+
+### Example
+
+```java
+// Import classes:
+import org.openapitools.client.ApiClient;
+import org.openapitools.client.ApiException;
+import org.openapitools.client.Configuration;
+import org.openapitools.client.auth.*;
+import org.openapitools.client.models.*;
+import org.openapitools.client.api.FakeClassnameTags123Api;
+
+public class Example {
+    public static void main(String[] args) {
+        ApiClient defaultClient = Configuration.getDefaultApiClient();
+        defaultClient.setBasePath("http://petstore.swagger.io:80/v2");
+        
+        // Configure API key authorization: api_key_query
+        ApiKeyAuth api_key_query = (ApiKeyAuth) defaultClient.getAuthentication("api_key_query");
+        api_key_query.setApiKey("YOUR API KEY");
+        // Uncomment the following line to set a prefix for the API key, e.g. "Token" (defaults to null)
+        //api_key_query.setApiKeyPrefix("Token");
+
+        FakeClassnameTags123Api apiInstance = new FakeClassnameTags123Api(defaultClient);
+        Client body = new Client(); // Client | client model
+        try {
+            Client result = apiInstance.testClassname(body);
+            System.out.println(result);
+        } catch (ApiException e) {
+            System.err.println("Exception when calling FakeClassnameTags123Api#testClassname");
+            System.err.println("Status code: " + e.getCode());
+            System.err.println("Reason: " + e.getResponseBody());
+            System.err.println("Response headers: " + e.getResponseHeaders());
+            e.printStackTrace();
+        }
+    }
+}
+```
+
+### Parameters
+
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **body** | [**Client**](Client.md)| client model |
+
+### Return type
+
+[**Client**](Client.md)
+
+### Authorization
+
+[api_key_query](../README.md#api_key_query)
+
+### HTTP request headers
+
+- **Content-Type**: application/json
+- **Accept**: application/json
+
+### HTTP response details
+| Status code | Description | Response headers |
+|-------------|-------------|------------------|
+| **200** | successful operation |  -  |
+
diff --git a/samples/client/petstore/java/native/docs/FileSchemaTestClass.md b/samples/client/petstore/java/native/docs/FileSchemaTestClass.md
new file mode 100644
index 0000000000..3a95e27d7c
--- /dev/null
+++ b/samples/client/petstore/java/native/docs/FileSchemaTestClass.md
@@ -0,0 +1,13 @@
+
+
+# FileSchemaTestClass
+
+## Properties
+
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**file** | [**java.io.File**](java.io.File.md) |  |  [optional]
+**files** | [**List&lt;java.io.File&gt;**](java.io.File.md) |  |  [optional]
+
+
+
diff --git a/samples/client/petstore/java/native/docs/FormatTest.md b/samples/client/petstore/java/native/docs/FormatTest.md
new file mode 100644
index 0000000000..29f68d18ec
--- /dev/null
+++ b/samples/client/petstore/java/native/docs/FormatTest.md
@@ -0,0 +1,24 @@
+
+
+# FormatTest
+
+## Properties
+
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**integer** | **Integer** |  |  [optional]
+**int32** | **Integer** |  |  [optional]
+**int64** | **Long** |  |  [optional]
+**number** | [**BigDecimal**](BigDecimal.md) |  | 
+**_float** | **Float** |  |  [optional]
+**_double** | **Double** |  |  [optional]
+**string** | **String** |  |  [optional]
+**_byte** | **byte[]** |  | 
+**binary** | [**File**](File.md) |  |  [optional]
+**date** | [**LocalDate**](LocalDate.md) |  | 
+**dateTime** | [**OffsetDateTime**](OffsetDateTime.md) |  |  [optional]
+**uuid** | [**UUID**](UUID.md) |  |  [optional]
+**password** | **String** |  | 
+
+
+
diff --git a/samples/client/petstore/java/native/docs/HasOnlyReadOnly.md b/samples/client/petstore/java/native/docs/HasOnlyReadOnly.md
new file mode 100644
index 0000000000..3abb662c38
--- /dev/null
+++ b/samples/client/petstore/java/native/docs/HasOnlyReadOnly.md
@@ -0,0 +1,13 @@
+
+
+# HasOnlyReadOnly
+
+## Properties
+
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**bar** | **String** |  |  [optional]
+**foo** | **String** |  |  [optional]
+
+
+
diff --git a/samples/client/petstore/java/native/docs/MapTest.md b/samples/client/petstore/java/native/docs/MapTest.md
new file mode 100644
index 0000000000..c35c3cf2c0
--- /dev/null
+++ b/samples/client/petstore/java/native/docs/MapTest.md
@@ -0,0 +1,24 @@
+
+
+# MapTest
+
+## Properties
+
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**mapMapOfString** | [**Map&lt;String, Map&lt;String, String&gt;&gt;**](Map.md) |  |  [optional]
+**mapOfEnumString** | [**Map&lt;String, InnerEnum&gt;**](#Map&lt;String, InnerEnum&gt;) |  |  [optional]
+**directMap** | **Map&lt;String, Boolean&gt;** |  |  [optional]
+**indirectMap** | **Map&lt;String, Boolean&gt;** |  |  [optional]
+
+
+
+## Enum: Map&lt;String, InnerEnum&gt;
+
+Name | Value
+---- | -----
+UPPER | &quot;UPPER&quot;
+LOWER | &quot;lower&quot;
+
+
+
diff --git a/samples/client/petstore/java/native/docs/MixedPropertiesAndAdditionalPropertiesClass.md b/samples/client/petstore/java/native/docs/MixedPropertiesAndAdditionalPropertiesClass.md
new file mode 100644
index 0000000000..3dc283ae49
--- /dev/null
+++ b/samples/client/petstore/java/native/docs/MixedPropertiesAndAdditionalPropertiesClass.md
@@ -0,0 +1,14 @@
+
+
+# MixedPropertiesAndAdditionalPropertiesClass
+
+## Properties
+
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**uuid** | [**UUID**](UUID.md) |  |  [optional]
+**dateTime** | [**OffsetDateTime**](OffsetDateTime.md) |  |  [optional]
+**map** | [**Map&lt;String, Animal&gt;**](Animal.md) |  |  [optional]
+
+
+
diff --git a/samples/client/petstore/java/native/docs/Model200Response.md b/samples/client/petstore/java/native/docs/Model200Response.md
new file mode 100644
index 0000000000..e2b5738a69
--- /dev/null
+++ b/samples/client/petstore/java/native/docs/Model200Response.md
@@ -0,0 +1,13 @@
+
+
+# Model200Response
+
+## Properties
+
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**name** | **Integer** |  |  [optional]
+**propertyClass** | **String** |  |  [optional]
+
+
+
diff --git a/samples/client/petstore/java/native/docs/ModelApiResponse.md b/samples/client/petstore/java/native/docs/ModelApiResponse.md
new file mode 100644
index 0000000000..14fb7f1ed2
--- /dev/null
+++ b/samples/client/petstore/java/native/docs/ModelApiResponse.md
@@ -0,0 +1,14 @@
+
+
+# ModelApiResponse
+
+## Properties
+
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**code** | **Integer** |  |  [optional]
+**type** | **String** |  |  [optional]
+**message** | **String** |  |  [optional]
+
+
+
diff --git a/samples/client/petstore/java/native/docs/ModelReturn.md b/samples/client/petstore/java/native/docs/ModelReturn.md
new file mode 100644
index 0000000000..44dc3c0a35
--- /dev/null
+++ b/samples/client/petstore/java/native/docs/ModelReturn.md
@@ -0,0 +1,12 @@
+
+
+# ModelReturn
+
+## Properties
+
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**_return** | **Integer** |  |  [optional]
+
+
+
diff --git a/samples/client/petstore/java/native/docs/Name.md b/samples/client/petstore/java/native/docs/Name.md
new file mode 100644
index 0000000000..cde0ebd7f2
--- /dev/null
+++ b/samples/client/petstore/java/native/docs/Name.md
@@ -0,0 +1,15 @@
+
+
+# Name
+
+## Properties
+
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**name** | **Integer** |  | 
+**snakeCase** | **Integer** |  |  [optional]
+**property** | **String** |  |  [optional]
+**_123number** | **Integer** |  |  [optional]
+
+
+
diff --git a/samples/client/petstore/java/native/docs/NumberOnly.md b/samples/client/petstore/java/native/docs/NumberOnly.md
new file mode 100644
index 0000000000..1c12b6adf3
--- /dev/null
+++ b/samples/client/petstore/java/native/docs/NumberOnly.md
@@ -0,0 +1,12 @@
+
+
+# NumberOnly
+
+## Properties
+
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**justNumber** | [**BigDecimal**](BigDecimal.md) |  |  [optional]
+
+
+
diff --git a/samples/client/petstore/java/native/docs/Order.md b/samples/client/petstore/java/native/docs/Order.md
new file mode 100644
index 0000000000..409fc4cc96
--- /dev/null
+++ b/samples/client/petstore/java/native/docs/Order.md
@@ -0,0 +1,27 @@
+
+
+# Order
+
+## Properties
+
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**id** | **Long** |  |  [optional]
+**petId** | **Long** |  |  [optional]
+**quantity** | **Integer** |  |  [optional]
+**shipDate** | [**OffsetDateTime**](OffsetDateTime.md) |  |  [optional]
+**status** | [**StatusEnum**](#StatusEnum) | Order Status |  [optional]
+**complete** | **Boolean** |  |  [optional]
+
+
+
+## Enum: StatusEnum
+
+Name | Value
+---- | -----
+PLACED | &quot;placed&quot;
+APPROVED | &quot;approved&quot;
+DELIVERED | &quot;delivered&quot;
+
+
+
diff --git a/samples/client/petstore/java/native/docs/OuterComposite.md b/samples/client/petstore/java/native/docs/OuterComposite.md
new file mode 100644
index 0000000000..e062922188
--- /dev/null
+++ b/samples/client/petstore/java/native/docs/OuterComposite.md
@@ -0,0 +1,14 @@
+
+
+# OuterComposite
+
+## Properties
+
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**myNumber** | [**BigDecimal**](BigDecimal.md) |  |  [optional]
+**myString** | **String** |  |  [optional]
+**myBoolean** | **Boolean** |  |  [optional]
+
+
+
diff --git a/samples/client/petstore/java/native/docs/OuterEnum.md b/samples/client/petstore/java/native/docs/OuterEnum.md
new file mode 100644
index 0000000000..1f9b723eb8
--- /dev/null
+++ b/samples/client/petstore/java/native/docs/OuterEnum.md
@@ -0,0 +1,15 @@
+
+
+# OuterEnum
+
+## Enum
+
+
+* `PLACED` (value: `"placed"`)
+
+* `APPROVED` (value: `"approved"`)
+
+* `DELIVERED` (value: `"delivered"`)
+
+
+
diff --git a/samples/client/petstore/java/native/docs/Pet.md b/samples/client/petstore/java/native/docs/Pet.md
new file mode 100644
index 0000000000..37ac007b79
--- /dev/null
+++ b/samples/client/petstore/java/native/docs/Pet.md
@@ -0,0 +1,27 @@
+
+
+# Pet
+
+## Properties
+
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**id** | **Long** |  |  [optional]
+**category** | [**Category**](Category.md) |  |  [optional]
+**name** | **String** |  | 
+**photoUrls** | **List&lt;String&gt;** |  | 
+**tags** | [**List&lt;Tag&gt;**](Tag.md) |  |  [optional]
+**status** | [**StatusEnum**](#StatusEnum) | pet status in the store |  [optional]
+
+
+
+## Enum: StatusEnum
+
+Name | Value
+---- | -----
+AVAILABLE | &quot;available&quot;
+PENDING | &quot;pending&quot;
+SOLD | &quot;sold&quot;
+
+
+
diff --git a/samples/client/petstore/java/native/docs/PetApi.md b/samples/client/petstore/java/native/docs/PetApi.md
new file mode 100644
index 0000000000..875a8e6783
--- /dev/null
+++ b/samples/client/petstore/java/native/docs/PetApi.md
@@ -0,0 +1,656 @@
+# PetApi
+
+All URIs are relative to *http://petstore.swagger.io:80/v2*
+
+Method | HTTP request | Description
+------------- | ------------- | -------------
+[**addPet**](PetApi.md#addPet) | **POST** /pet | Add a new pet to the store
+[**deletePet**](PetApi.md#deletePet) | **DELETE** /pet/{petId} | Deletes a pet
+[**findPetsByStatus**](PetApi.md#findPetsByStatus) | **GET** /pet/findByStatus | Finds Pets by status
+[**findPetsByTags**](PetApi.md#findPetsByTags) | **GET** /pet/findByTags | Finds Pets by tags
+[**getPetById**](PetApi.md#getPetById) | **GET** /pet/{petId} | Find pet by ID
+[**updatePet**](PetApi.md#updatePet) | **PUT** /pet | Update an existing pet
+[**updatePetWithForm**](PetApi.md#updatePetWithForm) | **POST** /pet/{petId} | Updates a pet in the store with form data
+[**uploadFile**](PetApi.md#uploadFile) | **POST** /pet/{petId}/uploadImage | uploads an image
+[**uploadFileWithRequiredFile**](PetApi.md#uploadFileWithRequiredFile) | **POST** /fake/{petId}/uploadImageWithRequiredFile | uploads an image (required)
+
+
+
+## addPet
+
+> addPet(body)
+
+Add a new pet to the store
+
+### Example
+
+```java
+// Import classes:
+import org.openapitools.client.ApiClient;
+import org.openapitools.client.ApiException;
+import org.openapitools.client.Configuration;
+import org.openapitools.client.auth.*;
+import org.openapitools.client.models.*;
+import org.openapitools.client.api.PetApi;
+
+public class Example {
+    public static void main(String[] args) {
+        ApiClient defaultClient = Configuration.getDefaultApiClient();
+        defaultClient.setBasePath("http://petstore.swagger.io:80/v2");
+        
+        // Configure OAuth2 access token for authorization: petstore_auth
+        OAuth petstore_auth = (OAuth) defaultClient.getAuthentication("petstore_auth");
+        petstore_auth.setAccessToken("YOUR ACCESS TOKEN");
+
+        PetApi apiInstance = new PetApi(defaultClient);
+        Pet body = new Pet(); // Pet | Pet object that needs to be added to the store
+        try {
+            apiInstance.addPet(body);
+        } catch (ApiException e) {
+            System.err.println("Exception when calling PetApi#addPet");
+            System.err.println("Status code: " + e.getCode());
+            System.err.println("Reason: " + e.getResponseBody());
+            System.err.println("Response headers: " + e.getResponseHeaders());
+            e.printStackTrace();
+        }
+    }
+}
+```
+
+### Parameters
+
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **body** | [**Pet**](Pet.md)| Pet object that needs to be added to the store |
+
+### Return type
+
+null (empty response body)
+
+### Authorization
+
+[petstore_auth](../README.md#petstore_auth)
+
+### HTTP request headers
+
+- **Content-Type**: application/json, application/xml
+- **Accept**: Not defined
+
+### HTTP response details
+| Status code | Description | Response headers |
+|-------------|-------------|------------------|
+| **200** | successful operation |  -  |
+| **405** | Invalid input |  -  |
+
+
+## deletePet
+
+> deletePet(petId, apiKey)
+
+Deletes a pet
+
+### Example
+
+```java
+// Import classes:
+import org.openapitools.client.ApiClient;
+import org.openapitools.client.ApiException;
+import org.openapitools.client.Configuration;
+import org.openapitools.client.auth.*;
+import org.openapitools.client.models.*;
+import org.openapitools.client.api.PetApi;
+
+public class Example {
+    public static void main(String[] args) {
+        ApiClient defaultClient = Configuration.getDefaultApiClient();
+        defaultClient.setBasePath("http://petstore.swagger.io:80/v2");
+        
+        // Configure OAuth2 access token for authorization: petstore_auth
+        OAuth petstore_auth = (OAuth) defaultClient.getAuthentication("petstore_auth");
+        petstore_auth.setAccessToken("YOUR ACCESS TOKEN");
+
+        PetApi apiInstance = new PetApi(defaultClient);
+        Long petId = 56L; // Long | Pet id to delete
+        String apiKey = "apiKey_example"; // String | 
+        try {
+            apiInstance.deletePet(petId, apiKey);
+        } catch (ApiException e) {
+            System.err.println("Exception when calling PetApi#deletePet");
+            System.err.println("Status code: " + e.getCode());
+            System.err.println("Reason: " + e.getResponseBody());
+            System.err.println("Response headers: " + e.getResponseHeaders());
+            e.printStackTrace();
+        }
+    }
+}
+```
+
+### Parameters
+
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **petId** | **Long**| Pet id to delete |
+ **apiKey** | **String**|  | [optional]
+
+### Return type
+
+null (empty response body)
+
+### Authorization
+
+[petstore_auth](../README.md#petstore_auth)
+
+### HTTP request headers
+
+- **Content-Type**: Not defined
+- **Accept**: Not defined
+
+### HTTP response details
+| Status code | Description | Response headers |
+|-------------|-------------|------------------|
+| **200** | successful operation |  -  |
+| **400** | Invalid pet value |  -  |
+
+
+## findPetsByStatus
+
+> List&lt;Pet&gt; findPetsByStatus(status)
+
+Finds Pets by status
+
+Multiple status values can be provided with comma separated strings
+
+### Example
+
+```java
+// Import classes:
+import org.openapitools.client.ApiClient;
+import org.openapitools.client.ApiException;
+import org.openapitools.client.Configuration;
+import org.openapitools.client.auth.*;
+import org.openapitools.client.models.*;
+import org.openapitools.client.api.PetApi;
+
+public class Example {
+    public static void main(String[] args) {
+        ApiClient defaultClient = Configuration.getDefaultApiClient();
+        defaultClient.setBasePath("http://petstore.swagger.io:80/v2");
+        
+        // Configure OAuth2 access token for authorization: petstore_auth
+        OAuth petstore_auth = (OAuth) defaultClient.getAuthentication("petstore_auth");
+        petstore_auth.setAccessToken("YOUR ACCESS TOKEN");
+
+        PetApi apiInstance = new PetApi(defaultClient);
+        List<String> status = Arrays.asList("available"); // List<String> | Status values that need to be considered for filter
+        try {
+            List<Pet> result = apiInstance.findPetsByStatus(status);
+            System.out.println(result);
+        } catch (ApiException e) {
+            System.err.println("Exception when calling PetApi#findPetsByStatus");
+            System.err.println("Status code: " + e.getCode());
+            System.err.println("Reason: " + e.getResponseBody());
+            System.err.println("Response headers: " + e.getResponseHeaders());
+            e.printStackTrace();
+        }
+    }
+}
+```
+
+### Parameters
+
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **status** | [**List&lt;String&gt;**](String.md)| Status values that need to be considered for filter | [enum: available, pending, sold]
+
+### Return type
+
+[**List&lt;Pet&gt;**](Pet.md)
+
+### Authorization
+
+[petstore_auth](../README.md#petstore_auth)
+
+### HTTP request headers
+
+- **Content-Type**: Not defined
+- **Accept**: application/xml, application/json
+
+### HTTP response details
+| Status code | Description | Response headers |
+|-------------|-------------|------------------|
+| **200** | successful operation |  -  |
+| **400** | Invalid status value |  -  |
+
+
+## findPetsByTags
+
+> List&lt;Pet&gt; findPetsByTags(tags)
+
+Finds Pets by tags
+
+Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3 for testing.
+
+### Example
+
+```java
+// Import classes:
+import org.openapitools.client.ApiClient;
+import org.openapitools.client.ApiException;
+import org.openapitools.client.Configuration;
+import org.openapitools.client.auth.*;
+import org.openapitools.client.models.*;
+import org.openapitools.client.api.PetApi;
+
+public class Example {
+    public static void main(String[] args) {
+        ApiClient defaultClient = Configuration.getDefaultApiClient();
+        defaultClient.setBasePath("http://petstore.swagger.io:80/v2");
+        
+        // Configure OAuth2 access token for authorization: petstore_auth
+        OAuth petstore_auth = (OAuth) defaultClient.getAuthentication("petstore_auth");
+        petstore_auth.setAccessToken("YOUR ACCESS TOKEN");
+
+        PetApi apiInstance = new PetApi(defaultClient);
+        List<String> tags = Arrays.asList(); // List<String> | Tags to filter by
+        try {
+            List<Pet> result = apiInstance.findPetsByTags(tags);
+            System.out.println(result);
+        } catch (ApiException e) {
+            System.err.println("Exception when calling PetApi#findPetsByTags");
+            System.err.println("Status code: " + e.getCode());
+            System.err.println("Reason: " + e.getResponseBody());
+            System.err.println("Response headers: " + e.getResponseHeaders());
+            e.printStackTrace();
+        }
+    }
+}
+```
+
+### Parameters
+
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **tags** | [**List&lt;String&gt;**](String.md)| Tags to filter by |
+
+### Return type
+
+[**List&lt;Pet&gt;**](Pet.md)
+
+### Authorization
+
+[petstore_auth](../README.md#petstore_auth)
+
+### HTTP request headers
+
+- **Content-Type**: Not defined
+- **Accept**: application/xml, application/json
+
+### HTTP response details
+| Status code | Description | Response headers |
+|-------------|-------------|------------------|
+| **200** | successful operation |  -  |
+| **400** | Invalid tag value |  -  |
+
+
+## getPetById
+
+> Pet getPetById(petId)
+
+Find pet by ID
+
+Returns a single pet
+
+### Example
+
+```java
+// Import classes:
+import org.openapitools.client.ApiClient;
+import org.openapitools.client.ApiException;
+import org.openapitools.client.Configuration;
+import org.openapitools.client.auth.*;
+import org.openapitools.client.models.*;
+import org.openapitools.client.api.PetApi;
+
+public class Example {
+    public static void main(String[] args) {
+        ApiClient defaultClient = Configuration.getDefaultApiClient();
+        defaultClient.setBasePath("http://petstore.swagger.io:80/v2");
+        
+        // Configure API key authorization: api_key
+        ApiKeyAuth api_key = (ApiKeyAuth) defaultClient.getAuthentication("api_key");
+        api_key.setApiKey("YOUR API KEY");
+        // Uncomment the following line to set a prefix for the API key, e.g. "Token" (defaults to null)
+        //api_key.setApiKeyPrefix("Token");
+
+        PetApi apiInstance = new PetApi(defaultClient);
+        Long petId = 56L; // Long | ID of pet to return
+        try {
+            Pet result = apiInstance.getPetById(petId);
+            System.out.println(result);
+        } catch (ApiException e) {
+            System.err.println("Exception when calling PetApi#getPetById");
+            System.err.println("Status code: " + e.getCode());
+            System.err.println("Reason: " + e.getResponseBody());
+            System.err.println("Response headers: " + e.getResponseHeaders());
+            e.printStackTrace();
+        }
+    }
+}
+```
+
+### Parameters
+
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **petId** | **Long**| ID of pet to return |
+
+### Return type
+
+[**Pet**](Pet.md)
+
+### Authorization
+
+[api_key](../README.md#api_key)
+
+### HTTP request headers
+
+- **Content-Type**: Not defined
+- **Accept**: application/xml, application/json
+
+### HTTP response details
+| Status code | Description | Response headers |
+|-------------|-------------|------------------|
+| **200** | successful operation |  -  |
+| **400** | Invalid ID supplied |  -  |
+| **404** | Pet not found |  -  |
+
+
+## updatePet
+
+> updatePet(body)
+
+Update an existing pet
+
+### Example
+
+```java
+// Import classes:
+import org.openapitools.client.ApiClient;
+import org.openapitools.client.ApiException;
+import org.openapitools.client.Configuration;
+import org.openapitools.client.auth.*;
+import org.openapitools.client.models.*;
+import org.openapitools.client.api.PetApi;
+
+public class Example {
+    public static void main(String[] args) {
+        ApiClient defaultClient = Configuration.getDefaultApiClient();
+        defaultClient.setBasePath("http://petstore.swagger.io:80/v2");
+        
+        // Configure OAuth2 access token for authorization: petstore_auth
+        OAuth petstore_auth = (OAuth) defaultClient.getAuthentication("petstore_auth");
+        petstore_auth.setAccessToken("YOUR ACCESS TOKEN");
+
+        PetApi apiInstance = new PetApi(defaultClient);
+        Pet body = new Pet(); // Pet | Pet object that needs to be added to the store
+        try {
+            apiInstance.updatePet(body);
+        } catch (ApiException e) {
+            System.err.println("Exception when calling PetApi#updatePet");
+            System.err.println("Status code: " + e.getCode());
+            System.err.println("Reason: " + e.getResponseBody());
+            System.err.println("Response headers: " + e.getResponseHeaders());
+            e.printStackTrace();
+        }
+    }
+}
+```
+
+### Parameters
+
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **body** | [**Pet**](Pet.md)| Pet object that needs to be added to the store |
+
+### Return type
+
+null (empty response body)
+
+### Authorization
+
+[petstore_auth](../README.md#petstore_auth)
+
+### HTTP request headers
+
+- **Content-Type**: application/json, application/xml
+- **Accept**: Not defined
+
+### HTTP response details
+| Status code | Description | Response headers |
+|-------------|-------------|------------------|
+| **200** | successful operation |  -  |
+| **400** | Invalid ID supplied |  -  |
+| **404** | Pet not found |  -  |
+| **405** | Validation exception |  -  |
+
+
+## updatePetWithForm
+
+> updatePetWithForm(petId, name, status)
+
+Updates a pet in the store with form data
+
+### Example
+
+```java
+// Import classes:
+import org.openapitools.client.ApiClient;
+import org.openapitools.client.ApiException;
+import org.openapitools.client.Configuration;
+import org.openapitools.client.auth.*;
+import org.openapitools.client.models.*;
+import org.openapitools.client.api.PetApi;
+
+public class Example {
+    public static void main(String[] args) {
+        ApiClient defaultClient = Configuration.getDefaultApiClient();
+        defaultClient.setBasePath("http://petstore.swagger.io:80/v2");
+        
+        // Configure OAuth2 access token for authorization: petstore_auth
+        OAuth petstore_auth = (OAuth) defaultClient.getAuthentication("petstore_auth");
+        petstore_auth.setAccessToken("YOUR ACCESS TOKEN");
+
+        PetApi apiInstance = new PetApi(defaultClient);
+        Long petId = 56L; // Long | ID of pet that needs to be updated
+        String name = "name_example"; // String | Updated name of the pet
+        String status = "status_example"; // String | Updated status of the pet
+        try {
+            apiInstance.updatePetWithForm(petId, name, status);
+        } catch (ApiException e) {
+            System.err.println("Exception when calling PetApi#updatePetWithForm");
+            System.err.println("Status code: " + e.getCode());
+            System.err.println("Reason: " + e.getResponseBody());
+            System.err.println("Response headers: " + e.getResponseHeaders());
+            e.printStackTrace();
+        }
+    }
+}
+```
+
+### Parameters
+
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **petId** | **Long**| ID of pet that needs to be updated |
+ **name** | **String**| Updated name of the pet | [optional]
+ **status** | **String**| Updated status of the pet | [optional]
+
+### Return type
+
+null (empty response body)
+
+### Authorization
+
+[petstore_auth](../README.md#petstore_auth)
+
+### HTTP request headers
+
+- **Content-Type**: application/x-www-form-urlencoded
+- **Accept**: Not defined
+
+### HTTP response details
+| Status code | Description | Response headers |
+|-------------|-------------|------------------|
+| **405** | Invalid input |  -  |
+
+
+## uploadFile
+
+> ModelApiResponse uploadFile(petId, additionalMetadata, file)
+
+uploads an image
+
+### Example
+
+```java
+// Import classes:
+import org.openapitools.client.ApiClient;
+import org.openapitools.client.ApiException;
+import org.openapitools.client.Configuration;
+import org.openapitools.client.auth.*;
+import org.openapitools.client.models.*;
+import org.openapitools.client.api.PetApi;
+
+public class Example {
+    public static void main(String[] args) {
+        ApiClient defaultClient = Configuration.getDefaultApiClient();
+        defaultClient.setBasePath("http://petstore.swagger.io:80/v2");
+        
+        // Configure OAuth2 access token for authorization: petstore_auth
+        OAuth petstore_auth = (OAuth) defaultClient.getAuthentication("petstore_auth");
+        petstore_auth.setAccessToken("YOUR ACCESS TOKEN");
+
+        PetApi apiInstance = new PetApi(defaultClient);
+        Long petId = 56L; // Long | ID of pet to update
+        String additionalMetadata = "additionalMetadata_example"; // String | Additional data to pass to server
+        File file = new File("/path/to/file"); // File | file to upload
+        try {
+            ModelApiResponse result = apiInstance.uploadFile(petId, additionalMetadata, file);
+            System.out.println(result);
+        } catch (ApiException e) {
+            System.err.println("Exception when calling PetApi#uploadFile");
+            System.err.println("Status code: " + e.getCode());
+            System.err.println("Reason: " + e.getResponseBody());
+            System.err.println("Response headers: " + e.getResponseHeaders());
+            e.printStackTrace();
+        }
+    }
+}
+```
+
+### Parameters
+
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **petId** | **Long**| ID of pet to update |
+ **additionalMetadata** | **String**| Additional data to pass to server | [optional]
+ **file** | **File**| file to upload | [optional]
+
+### Return type
+
+[**ModelApiResponse**](ModelApiResponse.md)
+
+### Authorization
+
+[petstore_auth](../README.md#petstore_auth)
+
+### HTTP request headers
+
+- **Content-Type**: multipart/form-data
+- **Accept**: application/json
+
+### HTTP response details
+| Status code | Description | Response headers |
+|-------------|-------------|------------------|
+| **200** | successful operation |  -  |
+
+
+## uploadFileWithRequiredFile
+
+> ModelApiResponse uploadFileWithRequiredFile(petId, requiredFile, additionalMetadata)
+
+uploads an image (required)
+
+### Example
+
+```java
+// Import classes:
+import org.openapitools.client.ApiClient;
+import org.openapitools.client.ApiException;
+import org.openapitools.client.Configuration;
+import org.openapitools.client.auth.*;
+import org.openapitools.client.models.*;
+import org.openapitools.client.api.PetApi;
+
+public class Example {
+    public static void main(String[] args) {
+        ApiClient defaultClient = Configuration.getDefaultApiClient();
+        defaultClient.setBasePath("http://petstore.swagger.io:80/v2");
+        
+        // Configure OAuth2 access token for authorization: petstore_auth
+        OAuth petstore_auth = (OAuth) defaultClient.getAuthentication("petstore_auth");
+        petstore_auth.setAccessToken("YOUR ACCESS TOKEN");
+
+        PetApi apiInstance = new PetApi(defaultClient);
+        Long petId = 56L; // Long | ID of pet to update
+        File requiredFile = new File("/path/to/file"); // File | file to upload
+        String additionalMetadata = "additionalMetadata_example"; // String | Additional data to pass to server
+        try {
+            ModelApiResponse result = apiInstance.uploadFileWithRequiredFile(petId, requiredFile, additionalMetadata);
+            System.out.println(result);
+        } catch (ApiException e) {
+            System.err.println("Exception when calling PetApi#uploadFileWithRequiredFile");
+            System.err.println("Status code: " + e.getCode());
+            System.err.println("Reason: " + e.getResponseBody());
+            System.err.println("Response headers: " + e.getResponseHeaders());
+            e.printStackTrace();
+        }
+    }
+}
+```
+
+### Parameters
+
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **petId** | **Long**| ID of pet to update |
+ **requiredFile** | **File**| file to upload |
+ **additionalMetadata** | **String**| Additional data to pass to server | [optional]
+
+### Return type
+
+[**ModelApiResponse**](ModelApiResponse.md)
+
+### Authorization
+
+[petstore_auth](../README.md#petstore_auth)
+
+### HTTP request headers
+
+- **Content-Type**: multipart/form-data
+- **Accept**: application/json
+
+### HTTP response details
+| Status code | Description | Response headers |
+|-------------|-------------|------------------|
+| **200** | successful operation |  -  |
+
diff --git a/samples/client/petstore/java/native/docs/ReadOnlyFirst.md b/samples/client/petstore/java/native/docs/ReadOnlyFirst.md
new file mode 100644
index 0000000000..c38ed3bae4
--- /dev/null
+++ b/samples/client/petstore/java/native/docs/ReadOnlyFirst.md
@@ -0,0 +1,13 @@
+
+
+# ReadOnlyFirst
+
+## Properties
+
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**bar** | **String** |  |  [optional]
+**baz** | **String** |  |  [optional]
+
+
+
diff --git a/samples/client/petstore/java/native/docs/SpecialModelName.md b/samples/client/petstore/java/native/docs/SpecialModelName.md
new file mode 100644
index 0000000000..934b8f0f25
--- /dev/null
+++ b/samples/client/petstore/java/native/docs/SpecialModelName.md
@@ -0,0 +1,12 @@
+
+
+# SpecialModelName
+
+## Properties
+
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**$specialPropertyName** | **Long** |  |  [optional]
+
+
+
diff --git a/samples/client/petstore/java/native/docs/StoreApi.md b/samples/client/petstore/java/native/docs/StoreApi.md
new file mode 100644
index 0000000000..352399ea51
--- /dev/null
+++ b/samples/client/petstore/java/native/docs/StoreApi.md
@@ -0,0 +1,276 @@
+# StoreApi
+
+All URIs are relative to *http://petstore.swagger.io:80/v2*
+
+Method | HTTP request | Description
+------------- | ------------- | -------------
+[**deleteOrder**](StoreApi.md#deleteOrder) | **DELETE** /store/order/{order_id} | Delete purchase order by ID
+[**getInventory**](StoreApi.md#getInventory) | **GET** /store/inventory | Returns pet inventories by status
+[**getOrderById**](StoreApi.md#getOrderById) | **GET** /store/order/{order_id} | Find purchase order by ID
+[**placeOrder**](StoreApi.md#placeOrder) | **POST** /store/order | Place an order for a pet
+
+
+
+## deleteOrder
+
+> deleteOrder(orderId)
+
+Delete purchase order by ID
+
+For valid response try integer IDs with value &lt; 1000. Anything above 1000 or nonintegers will generate API errors
+
+### Example
+
+```java
+// Import classes:
+import org.openapitools.client.ApiClient;
+import org.openapitools.client.ApiException;
+import org.openapitools.client.Configuration;
+import org.openapitools.client.models.*;
+import org.openapitools.client.api.StoreApi;
+
+public class Example {
+    public static void main(String[] args) {
+        ApiClient defaultClient = Configuration.getDefaultApiClient();
+        defaultClient.setBasePath("http://petstore.swagger.io:80/v2");
+
+        StoreApi apiInstance = new StoreApi(defaultClient);
+        String orderId = "orderId_example"; // String | ID of the order that needs to be deleted
+        try {
+            apiInstance.deleteOrder(orderId);
+        } catch (ApiException e) {
+            System.err.println("Exception when calling StoreApi#deleteOrder");
+            System.err.println("Status code: " + e.getCode());
+            System.err.println("Reason: " + e.getResponseBody());
+            System.err.println("Response headers: " + e.getResponseHeaders());
+            e.printStackTrace();
+        }
+    }
+}
+```
+
+### Parameters
+
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **orderId** | **String**| ID of the order that needs to be deleted |
+
+### Return type
+
+null (empty response body)
+
+### Authorization
+
+No authorization required
+
+### HTTP request headers
+
+- **Content-Type**: Not defined
+- **Accept**: Not defined
+
+### HTTP response details
+| Status code | Description | Response headers |
+|-------------|-------------|------------------|
+| **400** | Invalid ID supplied |  -  |
+| **404** | Order not found |  -  |
+
+
+## getInventory
+
+> Map&lt;String, Integer&gt; getInventory()
+
+Returns pet inventories by status
+
+Returns a map of status codes to quantities
+
+### Example
+
+```java
+// Import classes:
+import org.openapitools.client.ApiClient;
+import org.openapitools.client.ApiException;
+import org.openapitools.client.Configuration;
+import org.openapitools.client.auth.*;
+import org.openapitools.client.models.*;
+import org.openapitools.client.api.StoreApi;
+
+public class Example {
+    public static void main(String[] args) {
+        ApiClient defaultClient = Configuration.getDefaultApiClient();
+        defaultClient.setBasePath("http://petstore.swagger.io:80/v2");
+        
+        // Configure API key authorization: api_key
+        ApiKeyAuth api_key = (ApiKeyAuth) defaultClient.getAuthentication("api_key");
+        api_key.setApiKey("YOUR API KEY");
+        // Uncomment the following line to set a prefix for the API key, e.g. "Token" (defaults to null)
+        //api_key.setApiKeyPrefix("Token");
+
+        StoreApi apiInstance = new StoreApi(defaultClient);
+        try {
+            Map<String, Integer> result = apiInstance.getInventory();
+            System.out.println(result);
+        } catch (ApiException e) {
+            System.err.println("Exception when calling StoreApi#getInventory");
+            System.err.println("Status code: " + e.getCode());
+            System.err.println("Reason: " + e.getResponseBody());
+            System.err.println("Response headers: " + e.getResponseHeaders());
+            e.printStackTrace();
+        }
+    }
+}
+```
+
+### Parameters
+
+This endpoint does not need any parameter.
+
+### Return type
+
+**Map&lt;String, Integer&gt;**
+
+### Authorization
+
+[api_key](../README.md#api_key)
+
+### HTTP request headers
+
+- **Content-Type**: Not defined
+- **Accept**: application/json
+
+### HTTP response details
+| Status code | Description | Response headers |
+|-------------|-------------|------------------|
+| **200** | successful operation |  -  |
+
+
+## getOrderById
+
+> Order getOrderById(orderId)
+
+Find purchase order by ID
+
+For valid response try integer IDs with value &lt;&#x3D; 5 or &gt; 10. Other values will generated exceptions
+
+### Example
+
+```java
+// Import classes:
+import org.openapitools.client.ApiClient;
+import org.openapitools.client.ApiException;
+import org.openapitools.client.Configuration;
+import org.openapitools.client.models.*;
+import org.openapitools.client.api.StoreApi;
+
+public class Example {
+    public static void main(String[] args) {
+        ApiClient defaultClient = Configuration.getDefaultApiClient();
+        defaultClient.setBasePath("http://petstore.swagger.io:80/v2");
+
+        StoreApi apiInstance = new StoreApi(defaultClient);
+        Long orderId = 56L; // Long | ID of pet that needs to be fetched
+        try {
+            Order result = apiInstance.getOrderById(orderId);
+            System.out.println(result);
+        } catch (ApiException e) {
+            System.err.println("Exception when calling StoreApi#getOrderById");
+            System.err.println("Status code: " + e.getCode());
+            System.err.println("Reason: " + e.getResponseBody());
+            System.err.println("Response headers: " + e.getResponseHeaders());
+            e.printStackTrace();
+        }
+    }
+}
+```
+
+### Parameters
+
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **orderId** | **Long**| ID of pet that needs to be fetched |
+
+### Return type
+
+[**Order**](Order.md)
+
+### Authorization
+
+No authorization required
+
+### HTTP request headers
+
+- **Content-Type**: Not defined
+- **Accept**: application/xml, application/json
+
+### HTTP response details
+| Status code | Description | Response headers |
+|-------------|-------------|------------------|
+| **200** | successful operation |  -  |
+| **400** | Invalid ID supplied |  -  |
+| **404** | Order not found |  -  |
+
+
+## placeOrder
+
+> Order placeOrder(body)
+
+Place an order for a pet
+
+### Example
+
+```java
+// Import classes:
+import org.openapitools.client.ApiClient;
+import org.openapitools.client.ApiException;
+import org.openapitools.client.Configuration;
+import org.openapitools.client.models.*;
+import org.openapitools.client.api.StoreApi;
+
+public class Example {
+    public static void main(String[] args) {
+        ApiClient defaultClient = Configuration.getDefaultApiClient();
+        defaultClient.setBasePath("http://petstore.swagger.io:80/v2");
+
+        StoreApi apiInstance = new StoreApi(defaultClient);
+        Order body = new Order(); // Order | order placed for purchasing the pet
+        try {
+            Order result = apiInstance.placeOrder(body);
+            System.out.println(result);
+        } catch (ApiException e) {
+            System.err.println("Exception when calling StoreApi#placeOrder");
+            System.err.println("Status code: " + e.getCode());
+            System.err.println("Reason: " + e.getResponseBody());
+            System.err.println("Response headers: " + e.getResponseHeaders());
+            e.printStackTrace();
+        }
+    }
+}
+```
+
+### Parameters
+
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **body** | [**Order**](Order.md)| order placed for purchasing the pet |
+
+### Return type
+
+[**Order**](Order.md)
+
+### Authorization
+
+No authorization required
+
+### HTTP request headers
+
+- **Content-Type**: Not defined
+- **Accept**: application/xml, application/json
+
+### HTTP response details
+| Status code | Description | Response headers |
+|-------------|-------------|------------------|
+| **200** | successful operation |  -  |
+| **400** | Invalid Order |  -  |
+
diff --git a/samples/client/petstore/java/native/docs/Tag.md b/samples/client/petstore/java/native/docs/Tag.md
new file mode 100644
index 0000000000..f24eba7d22
--- /dev/null
+++ b/samples/client/petstore/java/native/docs/Tag.md
@@ -0,0 +1,13 @@
+
+
+# Tag
+
+## Properties
+
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**id** | **Long** |  |  [optional]
+**name** | **String** |  |  [optional]
+
+
+
diff --git a/samples/client/petstore/java/native/docs/TypeHolderDefault.md b/samples/client/petstore/java/native/docs/TypeHolderDefault.md
new file mode 100644
index 0000000000..a338fc900c
--- /dev/null
+++ b/samples/client/petstore/java/native/docs/TypeHolderDefault.md
@@ -0,0 +1,16 @@
+
+
+# TypeHolderDefault
+
+## Properties
+
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**stringItem** | **String** |  | 
+**numberItem** | [**BigDecimal**](BigDecimal.md) |  | 
+**integerItem** | **Integer** |  | 
+**boolItem** | **Boolean** |  | 
+**arrayItem** | **List&lt;Integer&gt;** |  | 
+
+
+
diff --git a/samples/client/petstore/java/native/docs/TypeHolderExample.md b/samples/client/petstore/java/native/docs/TypeHolderExample.md
new file mode 100644
index 0000000000..16b91b0152
--- /dev/null
+++ b/samples/client/petstore/java/native/docs/TypeHolderExample.md
@@ -0,0 +1,16 @@
+
+
+# TypeHolderExample
+
+## Properties
+
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**stringItem** | **String** |  | 
+**numberItem** | [**BigDecimal**](BigDecimal.md) |  | 
+**integerItem** | **Integer** |  | 
+**boolItem** | **Boolean** |  | 
+**arrayItem** | **List&lt;Integer&gt;** |  | 
+
+
+
diff --git a/samples/client/petstore/java/native/docs/User.md b/samples/client/petstore/java/native/docs/User.md
new file mode 100644
index 0000000000..c4ea94b7fc
--- /dev/null
+++ b/samples/client/petstore/java/native/docs/User.md
@@ -0,0 +1,19 @@
+
+
+# User
+
+## Properties
+
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**id** | **Long** |  |  [optional]
+**username** | **String** |  |  [optional]
+**firstName** | **String** |  |  [optional]
+**lastName** | **String** |  |  [optional]
+**email** | **String** |  |  [optional]
+**password** | **String** |  |  [optional]
+**phone** | **String** |  |  [optional]
+**userStatus** | **Integer** | User Status |  [optional]
+
+
+
diff --git a/samples/client/petstore/java/native/docs/UserApi.md b/samples/client/petstore/java/native/docs/UserApi.md
new file mode 100644
index 0000000000..4154aba4f1
--- /dev/null
+++ b/samples/client/petstore/java/native/docs/UserApi.md
@@ -0,0 +1,525 @@
+# UserApi
+
+All URIs are relative to *http://petstore.swagger.io:80/v2*
+
+Method | HTTP request | Description
+------------- | ------------- | -------------
+[**createUser**](UserApi.md#createUser) | **POST** /user | Create user
+[**createUsersWithArrayInput**](UserApi.md#createUsersWithArrayInput) | **POST** /user/createWithArray | Creates list of users with given input array
+[**createUsersWithListInput**](UserApi.md#createUsersWithListInput) | **POST** /user/createWithList | Creates list of users with given input array
+[**deleteUser**](UserApi.md#deleteUser) | **DELETE** /user/{username} | Delete user
+[**getUserByName**](UserApi.md#getUserByName) | **GET** /user/{username} | Get user by user name
+[**loginUser**](UserApi.md#loginUser) | **GET** /user/login | Logs user into the system
+[**logoutUser**](UserApi.md#logoutUser) | **GET** /user/logout | Logs out current logged in user session
+[**updateUser**](UserApi.md#updateUser) | **PUT** /user/{username} | Updated user
+
+
+
+## createUser
+
+> createUser(body)
+
+Create user
+
+This can only be done by the logged in user.
+
+### Example
+
+```java
+// Import classes:
+import org.openapitools.client.ApiClient;
+import org.openapitools.client.ApiException;
+import org.openapitools.client.Configuration;
+import org.openapitools.client.models.*;
+import org.openapitools.client.api.UserApi;
+
+public class Example {
+    public static void main(String[] args) {
+        ApiClient defaultClient = Configuration.getDefaultApiClient();
+        defaultClient.setBasePath("http://petstore.swagger.io:80/v2");
+
+        UserApi apiInstance = new UserApi(defaultClient);
+        User body = new User(); // User | Created user object
+        try {
+            apiInstance.createUser(body);
+        } catch (ApiException e) {
+            System.err.println("Exception when calling UserApi#createUser");
+            System.err.println("Status code: " + e.getCode());
+            System.err.println("Reason: " + e.getResponseBody());
+            System.err.println("Response headers: " + e.getResponseHeaders());
+            e.printStackTrace();
+        }
+    }
+}
+```
+
+### Parameters
+
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **body** | [**User**](User.md)| Created user object |
+
+### Return type
+
+null (empty response body)
+
+### Authorization
+
+No authorization required
+
+### HTTP request headers
+
+- **Content-Type**: Not defined
+- **Accept**: Not defined
+
+### HTTP response details
+| Status code | Description | Response headers |
+|-------------|-------------|------------------|
+| **0** | successful operation |  -  |
+
+
+## createUsersWithArrayInput
+
+> createUsersWithArrayInput(body)
+
+Creates list of users with given input array
+
+### Example
+
+```java
+// Import classes:
+import org.openapitools.client.ApiClient;
+import org.openapitools.client.ApiException;
+import org.openapitools.client.Configuration;
+import org.openapitools.client.models.*;
+import org.openapitools.client.api.UserApi;
+
+public class Example {
+    public static void main(String[] args) {
+        ApiClient defaultClient = Configuration.getDefaultApiClient();
+        defaultClient.setBasePath("http://petstore.swagger.io:80/v2");
+
+        UserApi apiInstance = new UserApi(defaultClient);
+        List<User> body = Arrays.asList(null); // List<User> | List of user object
+        try {
+            apiInstance.createUsersWithArrayInput(body);
+        } catch (ApiException e) {
+            System.err.println("Exception when calling UserApi#createUsersWithArrayInput");
+            System.err.println("Status code: " + e.getCode());
+            System.err.println("Reason: " + e.getResponseBody());
+            System.err.println("Response headers: " + e.getResponseHeaders());
+            e.printStackTrace();
+        }
+    }
+}
+```
+
+### Parameters
+
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **body** | [**List&lt;User&gt;**](User.md)| List of user object |
+
+### Return type
+
+null (empty response body)
+
+### Authorization
+
+No authorization required
+
+### HTTP request headers
+
+- **Content-Type**: Not defined
+- **Accept**: Not defined
+
+### HTTP response details
+| Status code | Description | Response headers |
+|-------------|-------------|------------------|
+| **0** | successful operation |  -  |
+
+
+## createUsersWithListInput
+
+> createUsersWithListInput(body)
+
+Creates list of users with given input array
+
+### Example
+
+```java
+// Import classes:
+import org.openapitools.client.ApiClient;
+import org.openapitools.client.ApiException;
+import org.openapitools.client.Configuration;
+import org.openapitools.client.models.*;
+import org.openapitools.client.api.UserApi;
+
+public class Example {
+    public static void main(String[] args) {
+        ApiClient defaultClient = Configuration.getDefaultApiClient();
+        defaultClient.setBasePath("http://petstore.swagger.io:80/v2");
+
+        UserApi apiInstance = new UserApi(defaultClient);
+        List<User> body = Arrays.asList(null); // List<User> | List of user object
+        try {
+            apiInstance.createUsersWithListInput(body);
+        } catch (ApiException e) {
+            System.err.println("Exception when calling UserApi#createUsersWithListInput");
+            System.err.println("Status code: " + e.getCode());
+            System.err.println("Reason: " + e.getResponseBody());
+            System.err.println("Response headers: " + e.getResponseHeaders());
+            e.printStackTrace();
+        }
+    }
+}
+```
+
+### Parameters
+
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **body** | [**List&lt;User&gt;**](User.md)| List of user object |
+
+### Return type
+
+null (empty response body)
+
+### Authorization
+
+No authorization required
+
+### HTTP request headers
+
+- **Content-Type**: Not defined
+- **Accept**: Not defined
+
+### HTTP response details
+| Status code | Description | Response headers |
+|-------------|-------------|------------------|
+| **0** | successful operation |  -  |
+
+
+## deleteUser
+
+> deleteUser(username)
+
+Delete user
+
+This can only be done by the logged in user.
+
+### Example
+
+```java
+// Import classes:
+import org.openapitools.client.ApiClient;
+import org.openapitools.client.ApiException;
+import org.openapitools.client.Configuration;
+import org.openapitools.client.models.*;
+import org.openapitools.client.api.UserApi;
+
+public class Example {
+    public static void main(String[] args) {
+        ApiClient defaultClient = Configuration.getDefaultApiClient();
+        defaultClient.setBasePath("http://petstore.swagger.io:80/v2");
+
+        UserApi apiInstance = new UserApi(defaultClient);
+        String username = "username_example"; // String | The name that needs to be deleted
+        try {
+            apiInstance.deleteUser(username);
+        } catch (ApiException e) {
+            System.err.println("Exception when calling UserApi#deleteUser");
+            System.err.println("Status code: " + e.getCode());
+            System.err.println("Reason: " + e.getResponseBody());
+            System.err.println("Response headers: " + e.getResponseHeaders());
+            e.printStackTrace();
+        }
+    }
+}
+```
+
+### Parameters
+
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **username** | **String**| The name that needs to be deleted |
+
+### Return type
+
+null (empty response body)
+
+### Authorization
+
+No authorization required
+
+### HTTP request headers
+
+- **Content-Type**: Not defined
+- **Accept**: Not defined
+
+### HTTP response details
+| Status code | Description | Response headers |
+|-------------|-------------|------------------|
+| **400** | Invalid username supplied |  -  |
+| **404** | User not found |  -  |
+
+
+## getUserByName
+
+> User getUserByName(username)
+
+Get user by user name
+
+### Example
+
+```java
+// Import classes:
+import org.openapitools.client.ApiClient;
+import org.openapitools.client.ApiException;
+import org.openapitools.client.Configuration;
+import org.openapitools.client.models.*;
+import org.openapitools.client.api.UserApi;
+
+public class Example {
+    public static void main(String[] args) {
+        ApiClient defaultClient = Configuration.getDefaultApiClient();
+        defaultClient.setBasePath("http://petstore.swagger.io:80/v2");
+
+        UserApi apiInstance = new UserApi(defaultClient);
+        String username = "username_example"; // String | The name that needs to be fetched. Use user1 for testing.
+        try {
+            User result = apiInstance.getUserByName(username);
+            System.out.println(result);
+        } catch (ApiException e) {
+            System.err.println("Exception when calling UserApi#getUserByName");
+            System.err.println("Status code: " + e.getCode());
+            System.err.println("Reason: " + e.getResponseBody());
+            System.err.println("Response headers: " + e.getResponseHeaders());
+            e.printStackTrace();
+        }
+    }
+}
+```
+
+### Parameters
+
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **username** | **String**| The name that needs to be fetched. Use user1 for testing. |
+
+### Return type
+
+[**User**](User.md)
+
+### Authorization
+
+No authorization required
+
+### HTTP request headers
+
+- **Content-Type**: Not defined
+- **Accept**: application/xml, application/json
+
+### HTTP response details
+| Status code | Description | Response headers |
+|-------------|-------------|------------------|
+| **200** | successful operation |  -  |
+| **400** | Invalid username supplied |  -  |
+| **404** | User not found |  -  |
+
+
+## loginUser
+
+> String loginUser(username, password)
+
+Logs user into the system
+
+### Example
+
+```java
+// Import classes:
+import org.openapitools.client.ApiClient;
+import org.openapitools.client.ApiException;
+import org.openapitools.client.Configuration;
+import org.openapitools.client.models.*;
+import org.openapitools.client.api.UserApi;
+
+public class Example {
+    public static void main(String[] args) {
+        ApiClient defaultClient = Configuration.getDefaultApiClient();
+        defaultClient.setBasePath("http://petstore.swagger.io:80/v2");
+
+        UserApi apiInstance = new UserApi(defaultClient);
+        String username = "username_example"; // String | The user name for login
+        String password = "password_example"; // String | The password for login in clear text
+        try {
+            String result = apiInstance.loginUser(username, password);
+            System.out.println(result);
+        } catch (ApiException e) {
+            System.err.println("Exception when calling UserApi#loginUser");
+            System.err.println("Status code: " + e.getCode());
+            System.err.println("Reason: " + e.getResponseBody());
+            System.err.println("Response headers: " + e.getResponseHeaders());
+            e.printStackTrace();
+        }
+    }
+}
+```
+
+### Parameters
+
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **username** | **String**| The user name for login |
+ **password** | **String**| The password for login in clear text |
+
+### Return type
+
+**String**
+
+### Authorization
+
+No authorization required
+
+### HTTP request headers
+
+- **Content-Type**: Not defined
+- **Accept**: application/xml, application/json
+
+### HTTP response details
+| Status code | Description | Response headers |
+|-------------|-------------|------------------|
+| **200** | successful operation |  * X-Rate-Limit - calls per hour allowed by the user <br>  * X-Expires-After - date in UTC when token expires <br>  |
+| **400** | Invalid username/password supplied |  -  |
+
+
+## logoutUser
+
+> logoutUser()
+
+Logs out current logged in user session
+
+### Example
+
+```java
+// Import classes:
+import org.openapitools.client.ApiClient;
+import org.openapitools.client.ApiException;
+import org.openapitools.client.Configuration;
+import org.openapitools.client.models.*;
+import org.openapitools.client.api.UserApi;
+
+public class Example {
+    public static void main(String[] args) {
+        ApiClient defaultClient = Configuration.getDefaultApiClient();
+        defaultClient.setBasePath("http://petstore.swagger.io:80/v2");
+
+        UserApi apiInstance = new UserApi(defaultClient);
+        try {
+            apiInstance.logoutUser();
+        } catch (ApiException e) {
+            System.err.println("Exception when calling UserApi#logoutUser");
+            System.err.println("Status code: " + e.getCode());
+            System.err.println("Reason: " + e.getResponseBody());
+            System.err.println("Response headers: " + e.getResponseHeaders());
+            e.printStackTrace();
+        }
+    }
+}
+```
+
+### Parameters
+
+This endpoint does not need any parameter.
+
+### Return type
+
+null (empty response body)
+
+### Authorization
+
+No authorization required
+
+### HTTP request headers
+
+- **Content-Type**: Not defined
+- **Accept**: Not defined
+
+### HTTP response details
+| Status code | Description | Response headers |
+|-------------|-------------|------------------|
+| **0** | successful operation |  -  |
+
+
+## updateUser
+
+> updateUser(username, body)
+
+Updated user
+
+This can only be done by the logged in user.
+
+### Example
+
+```java
+// Import classes:
+import org.openapitools.client.ApiClient;
+import org.openapitools.client.ApiException;
+import org.openapitools.client.Configuration;
+import org.openapitools.client.models.*;
+import org.openapitools.client.api.UserApi;
+
+public class Example {
+    public static void main(String[] args) {
+        ApiClient defaultClient = Configuration.getDefaultApiClient();
+        defaultClient.setBasePath("http://petstore.swagger.io:80/v2");
+
+        UserApi apiInstance = new UserApi(defaultClient);
+        String username = "username_example"; // String | name that need to be deleted
+        User body = new User(); // User | Updated user object
+        try {
+            apiInstance.updateUser(username, body);
+        } catch (ApiException e) {
+            System.err.println("Exception when calling UserApi#updateUser");
+            System.err.println("Status code: " + e.getCode());
+            System.err.println("Reason: " + e.getResponseBody());
+            System.err.println("Response headers: " + e.getResponseHeaders());
+            e.printStackTrace();
+        }
+    }
+}
+```
+
+### Parameters
+
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **username** | **String**| name that need to be deleted |
+ **body** | [**User**](User.md)| Updated user object |
+
+### Return type
+
+null (empty response body)
+
+### Authorization
+
+No authorization required
+
+### HTTP request headers
+
+- **Content-Type**: Not defined
+- **Accept**: Not defined
+
+### HTTP response details
+| Status code | Description | Response headers |
+|-------------|-------------|------------------|
+| **400** | Invalid user supplied |  -  |
+| **404** | User not found |  -  |
+
diff --git a/samples/client/petstore/java/native/docs/XmlItem.md b/samples/client/petstore/java/native/docs/XmlItem.md
new file mode 100644
index 0000000000..6065fd1f4e
--- /dev/null
+++ b/samples/client/petstore/java/native/docs/XmlItem.md
@@ -0,0 +1,40 @@
+
+
+# XmlItem
+
+## Properties
+
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**attributeString** | **String** |  |  [optional]
+**attributeNumber** | [**BigDecimal**](BigDecimal.md) |  |  [optional]
+**attributeInteger** | **Integer** |  |  [optional]
+**attributeBoolean** | **Boolean** |  |  [optional]
+**wrappedArray** | **List&lt;Integer&gt;** |  |  [optional]
+**nameString** | **String** |  |  [optional]
+**nameNumber** | [**BigDecimal**](BigDecimal.md) |  |  [optional]
+**nameInteger** | **Integer** |  |  [optional]
+**nameBoolean** | **Boolean** |  |  [optional]
+**nameArray** | **List&lt;Integer&gt;** |  |  [optional]
+**nameWrappedArray** | **List&lt;Integer&gt;** |  |  [optional]
+**prefixString** | **String** |  |  [optional]
+**prefixNumber** | [**BigDecimal**](BigDecimal.md) |  |  [optional]
+**prefixInteger** | **Integer** |  |  [optional]
+**prefixBoolean** | **Boolean** |  |  [optional]
+**prefixArray** | **List&lt;Integer&gt;** |  |  [optional]
+**prefixWrappedArray** | **List&lt;Integer&gt;** |  |  [optional]
+**namespaceString** | **String** |  |  [optional]
+**namespaceNumber** | [**BigDecimal**](BigDecimal.md) |  |  [optional]
+**namespaceInteger** | **Integer** |  |  [optional]
+**namespaceBoolean** | **Boolean** |  |  [optional]
+**namespaceArray** | **List&lt;Integer&gt;** |  |  [optional]
+**namespaceWrappedArray** | **List&lt;Integer&gt;** |  |  [optional]
+**prefixNsString** | **String** |  |  [optional]
+**prefixNsNumber** | [**BigDecimal**](BigDecimal.md) |  |  [optional]
+**prefixNsInteger** | **Integer** |  |  [optional]
+**prefixNsBoolean** | **Boolean** |  |  [optional]
+**prefixNsArray** | **List&lt;Integer&gt;** |  |  [optional]
+**prefixNsWrappedArray** | **List&lt;Integer&gt;** |  |  [optional]
+
+
+
diff --git a/samples/client/petstore/java/native/git_push.sh b/samples/client/petstore/java/native/git_push.sh
new file mode 100644
index 0000000000..8442b80bb4
--- /dev/null
+++ b/samples/client/petstore/java/native/git_push.sh
@@ -0,0 +1,52 @@
+#!/bin/sh
+# ref: https://help.github.com/articles/adding-an-existing-project-to-github-using-the-command-line/
+#
+# Usage example: /bin/sh ./git_push.sh wing328 openapi-pestore-perl "minor update"
+
+git_user_id=$1
+git_repo_id=$2
+release_note=$3
+
+if [ "$git_user_id" = "" ]; then
+    git_user_id="GIT_USER_ID"
+    echo "[INFO] No command line input provided. Set \$git_user_id to $git_user_id"
+fi
+
+if [ "$git_repo_id" = "" ]; then
+    git_repo_id="GIT_REPO_ID"
+    echo "[INFO] No command line input provided. Set \$git_repo_id to $git_repo_id"
+fi
+
+if [ "$release_note" = "" ]; then
+    release_note="Minor update"
+    echo "[INFO] No command line input provided. Set \$release_note to $release_note"
+fi
+
+# Initialize the local directory as a Git repository
+git init
+
+# Adds the files in the local repository and stages them for commit.
+git add .
+
+# Commits the tracked changes and prepares them to be pushed to a remote repository. 
+git commit -m "$release_note"
+
+# Sets the new remote
+git_remote=`git remote`
+if [ "$git_remote" = "" ]; then # git remote not defined
+
+    if [ "$GIT_TOKEN" = "" ]; then
+        echo "[INFO] \$GIT_TOKEN (environment variable) is not set. Using the git credential in your environment."
+        git remote add origin https://github.com/${git_user_id}/${git_repo_id}.git
+    else
+        git remote add origin https://${git_user_id}:${GIT_TOKEN}@github.com/${git_user_id}/${git_repo_id}.git
+    fi
+
+fi
+
+git pull origin master
+
+# Pushes (Forces) the changes in the local repository up to the remote repository
+echo "Git pushing to https://github.com/${git_user_id}/${git_repo_id}.git"
+git push origin master 2>&1 | grep -v 'To https'
+
diff --git a/samples/client/petstore/java/native/gradle.properties b/samples/client/petstore/java/native/gradle.properties
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/samples/client/petstore/java/native/gradle/wrapper/gradle-wrapper.jar b/samples/client/petstore/java/native/gradle/wrapper/gradle-wrapper.jar
new file mode 100644
index 0000000000000000000000000000000000000000..5c2d1cf016b3885f6930543d57b744ea8c220a1a
GIT binary patch
literal 55616
zcmafaW0WS*vSoFbZJS-TZP!<}ZQEV8ZQHihW!tvx>6!c9%-lQoy;&<GGk?TcCnML%
z6A^pwl#>DmfdT@8fB*sl68LLCKtKQ283+jS?^Q-bNq|NIAW8=eB==8_)^)r*{C^$z
z{u;{v?I<GvkPsD7RHBs;y_cC7mzJWTorRU6p`4nSZcw0KVA?sno1pn4F)1@iB|-fI
z>MYnO`JhmPq7|LA_@Iz75S<har4a4b;nv~Dzs&e|lK=f^Ab;;|9Zdh9r~1Erp#Q_i
z)Is0K%J{!^MgC`3R|kDNJ7b6cXGr;~$qFzi5YXA*H$(I9hX~r*IypN19WSGAZlma=
z@8D$YKx=5F@8}q%qN$3kit-hmW~7G$YRDfD9>9h~8`iX>QrjrmMeu{>hn4U;+$dor
zz+`T8Q0f}p^Ao)LsYq74!W*)&dTnv}E8;7H*Zetclpo2zf_f>9>HT8;`O^F8;M%l@
z57Z8dk34kG-~Wg7n48qF2xwPp;SOUpd1}9Moir5$VSyf4gF)Mp-?`wO3;2<dk#QvX
zNq=V~D5z;2`Tj6q@FqG^3)}|ERmz}^G<hA@O|{R{O*eSU&$w=qiapRDW(tABR4tgR
z4?&Uy9kWoPgMY3%QvY_<!aR-Z{;ggj-fVd4{3!nlW3P)gaYMPFKXzgTz@Y8);6FP5
zjN7Gk1bFke?m$h^F>x9gYj59oFwG>?Leva43@e(z{mjm0b*@OAYLC`O9q|s+FQLOE
z!+*Y;%_0(6Sr<(cxE0c=lS&-FGBFGWd_R<5$vwHRJG=tB&Mi<SMOLA+L+*D64Q)R3
zYZdQ`W2BH<$`00+5H|lp${TuxaaFziDWn_VKcFg|?K=O3Y5v5D{9KC@i*D)cX=CR9
z;EJgF+QH<ps+dqG*hkCz=f2)@MMXq3uDroOEhti_>8@hq_U7@IMyVyKkOo6wgR(<%
zQw1O!nnQl3T9QJ)Vh<v^oIPY2^T~PuIbh8#zrPn3(^WZ@e6&_+g}ma0pIU6^Pid*0
zys|y~GllV4TB2@#qWVaD`$boTmJ)Zb(3s|pbf{*j!Yv`M!O0eiu4cDTW5o+bj@;1C
zhlFD7U4JpuoISHx+bpy*_jxt6Ht*s+N3Xm+DK8PT&qC3FLQzGbmQbXz@3`=qTi8WU
zrVFh_hbW|Na)f~)i4F@i=5ZI61j=iNN$taQcxh-a3)Sgq^I+6aXt2dzwQ4B%wVm5B
zJ;|Y#7eL_?&%n-ir#8%c%ehdyK!zCXs0&RKtK>=(`cZM{nsEKChjbJhx@UQH+G>6p
z;beBQ1L!3Zl>^&*?cSZjy$B3<qlQ~cYR9s3h$b^reBT5Fk+mTyn3#~|L=C6bFDRG8
zifB8O&XM%~H-$K_ppFFVVG-Ru&|OZMwdLcX+rcIMCQv<G4Y_Q#^%ZLCI*D$x8DW_7
zZ10rzH>(1=Zyn~>@`!j%5v7IBRt6X`O)yDpVLS^9EqmHxBcisVG$TRwiip#ViN|4(
zYn!Av841_Z@Ys=T7w#>RT&iXvNgDq3*d?$N(SznG^wR`x{%w<6^q<JYu}g*z$;H14
zOx?_2FI3kqdhIocv+ei*Gv#kk7{dP93so3IG>j&|g})La;iD?`M=p>99p><39r9+e
z`dNhQ&tol5)P#;x8{tT47i*blMHaDKqJs8!Pi*F{#)9%USFxTVMfMOy{mp2ZrLR40
z2a9?TJgFyqgx~|j0eA6SegKVk@|Pd|_6P$HvwTrLTK)Re`~%kg8o9`EAE<nN9(M+8
zk%;gJBjgGoB!WHIbB)k(L!g<1QYeSaRV6o!erUY1`>1oAiY5Jgo=H<W#1ecfj!<Od
z7_qZ71<UX7qbKpF&(QQo#*_4bxRVS;(@)beO2O&VUni5WV$W6jzOc7xaV5xkObRhh
zCt^5wr*Qztc#D$=ywcqrL*cz$T|9}4lH+ggzC5i)z8wqPkmcOZ(<GIdd8snUc;=rx
zlC`pPUod@WPG*G#dDzGxYGyLF2uzo=ecW;#h#tYIk!%=TH*}}7EKi*KAHM&bLCoa8
zyz~F=qH}+Z_}}lQ!nUq9R<`;^Bn<!9L%kzqp!(?%g0{_AnkZf9{Gpe@y8QWe1hw4!
zSAtiN;^UP(+0gNNg~BNImN1WC;k%!8u1Ao2v4p^e=?O?oJss0F&^3^THP<n$MY^en
zv=PX-63ow`3!>}0*D?tSCn^=SIN~fvv453Ia(<1|s07aTVVtsRxY6+tT3589iQdi^
zC92D$ewm9O6FA*u*{Fe_=b`%q`pmFvAz@hfF@OC_${IPmD#QMpPNo0mE9U=Ch;k0L
zZteokPG-h7PUeRCPPYG%H<A>!WswC?cp7M|w42pbtwj!m_&4%hB6MdLQe&}@5-h~!
zkOt;w0BbDc0H!RBw;1UeVckHpJ@^|j%<DvdSZ0xDebb{Y$0;6Ho1^9HYrY>FBZlC}
zsm?nFOT$`F_i#1_gh4|n$rDe>0md6HvA=B%hlX*3Z%y@a&W>Rq`Fe(8smIgxTGb#8
zZ`->%h!?QCk>v*~{!qp=w?a*};Y**1uH<h7$9rxzHQR)$g(z1S8QAF#*U24*wrKd%
z4}~i|=2pAWAPI=wnkbg;1YHcq9W)g+{3H!7YoEauz7|);{u9J#qV{l~^!xz~Z;%(T
zn;Re10R#Q@r@w-9zNtyoD3uHR&yLktb9wmV%tJOW05uXG-CR0;m?Im53|oT@T4w%w
zJz0+Rs*Ri=SL!2!{fM!bB!X2%JN*h+@gOfs3?}HiLpt~(tWGg3El!5X$YU^c<Wa9-
zea;|7zkfnRLhy`spk5dAw;Ag2qr#U}=<X=O4xa*3iJ_6;xI;h%OA&jT_}l9xqmYew
z*kyg%%|j?FgKW)k&?{2y1c3nEZ@`Z#X5h#woZdG{Y-r54m}h@{dq@*r9w2V5B9<^}
z2k$$o@N}&!aHQ+b1H$1>`)OX`Gi+L%-d6{rV?@}MU#qfCU(!hLz;kWH=0A%W7E^pA
zD;A%Jg5SsRe!O*0TyYkAHe&O9z*Ij-YA$%-rR?sc`xz_v{>x%xY39!8g#!Z0#03H(
z{O=drKfb0cbx1F*5%q81xvTDy#rfUGw(fesh1!xiS2XT;7_wBi(Rh4i(!rR^9=C+-
z+**b9;icxfq@<7}Y!PW-0rTW+A^$o*#ZKenSkxLB$Qi$%gJSL>x!jc86`GmGGhai9
zOHq~hxh}KqQHJeN$2U{M>qd*t8_e&lyCs69{bm1?KGTYoj=c0`rTg>pS6G&J4&)xp
zLEGIHSTEjC0-s-@+e6o&w=h1sEWWvJUvezID1&exb$)ahF9`(6`?3KLyVL$|c)CjS
zx(bsy87~n8TQNOKle(BM^>1I!2-CZ^{x6zdA}qeDBIdrfd-(n@Vjl^9zO1(%2pP9@
zKBc~ozr$+4ZfjmzEIzoth(k?pbI87=<i9j8A6P_Q)BS3wyuZX)zAMtd6(`x0?t?A5
z%hGKrvTV`?8{R~u%jk>d5OfjVZ`Bn)J|urr8<b{Cut_K*Xd^KfafVtNq$wDRR}n3y
zDcFuN0?T3`L5(@6>yJq`ol^>_VAl^P)>2r)s+*3z5d<3rP+-fniCkjmk=2hTYRa@t
zCQcSxF&w%mHmA?!vaXnj7ZA$)te}ds+n8$2lH{NeD4mwk$>xZCBFhRy$8PE>q$<U}
z;Mkh?EI;0u$@?->wS`}8pI%45Y;Mg;HH+}Dp=PL)m77nKF68Fgg<ZXEG?Z+}ZLaBg
z7XQvOd(b+Tw;_tHmOQi+a30y&9SC`w7U=-smxEx5Lk%V%Bf}k5odepDt&yvF&|KGO
z+nyd8_nV#1CBhlluj)#0-cq^<M`VWLAq74gGcxV6l*+l1?=l0|N{Tjk!4p!DZVP#q
zT7GA7fnP<F8f^Iphz%fNQL}n87_Z0nE~nuX#5-@+1<ogAW7%)~@Fck+KPDBse2Kjr
zUSJn{a8F=(^Bqv2R2({pPxod!>Q-l3iXlVZuM2BDr<R7jd>R8AQbK;bn1%jzahl0;
zqz0(mNe;f~h8(fPzPKKf2qRsG8`+Ca)>|<&lw>KEqM&Lpnvig>69%YQpK6fx=8YFj
zHKrfzy>(7h2OhUVasdwKY`praH?>qU0326-kiSyOU_Qh>ytIs^htlBA62xU6xg?*l
z)&REdn*f9U3?u4$j-@ndD#D3l!viAUtw}i5*Vgd0Y6`^hHF5R=No7j8G-*$NWl%?t
z`7Nilf_Yre@Oe}QT3z+jOUVgYtT_Ym3PS5(D>kDLLas8~F+5kW%~ZYppSrf1C$gL*
zCVy}fWpZ3s%2rPL-E63^tA|8OdqKsZ4TH5fny47ENs1#^C`_NLg~H^uf3&bAj#fGV
zDe&#Ot%_Vhj$}yBrC3J1Xqj>Y%&k{B?lhxKrtYy;^E9DkyNHk5#6`4cuP&V7S8ce9
zTUF5PQIRO7TT4P2a*4;M&hk;Q7&{(83hJe5BSm=9qt~;U)NTf=4uKUcnxC`;iPJeI
zW#~w?HIOM+0j3ptB0{UU{^6_#B*Q2gs;1x^YFey(%DJHNWz@e_NEL?$fv?CDxG`jk
zH|52WFdVsZR;n!Up;K;4E$|w4h>ZIN+@Z}EwFXI{w_`?5x+SJFY_e4J@|f8U08%dd
z#Qsa9JLdO$jv)?4F@&z_^{Q($tG`?|9bzt8ZfH9P`epY`soPYqi1`oC3x&|@m{hc6
zs0R!t$g>sR@#SPfNV6Pf`a^E?q3QIaY30IO%yKjx#Njj@gro1YH2Q(0+7D7mM~c>C
zk&_?9Ye>B%*MA+77$Pa!?G~5tm`=p{NaZsUsOgm6Yzclr_P^2)r(7r%n(0?4B#$e7
z!fP;+l)$)0kPbMk#WOjm07+e?{E)(v)2|Ijo{o1+Z8#8ET#=kcT*OwM#K68fSNo%<
zvZFdHrOrr;>`zq!_welWh!X}=oN5+V01WJn7=;z5uo6l_$7wSNkXuh=8Y>`TjDbO<
z!yF}c42&QWYXl}X<PP0f5!bkF6n)!+V-TW|8d8&wa}v;NOj0i$B;8yY;E2`ess-bm
zt81;E;aA}~%#wiSi-}P~QdG%KfleL_dX=kLYF4o7Y!VtsB!$#313T^u;qS?vqDe~*
zacEQObaB)du}1R(i&qbFa0n;-gRmT*SR4Ks034#3x@_L2)}Nx=-U&ksNfhqU_IRh%
z=}eN0Vaa3W+04dtiI8~e?Ttl~aRjEL(gcT>aRr0u<kR4Tr%^{yVmAGL-&WkIO-5h#
zrzn-JO?bz!Oq}RcMB()Gl*Ab$B9>L?BNPXlGw=QpDUMo`v8pXzzG(=!G;t+mfCsg8
zJb9v&a)E!zg8|%9#U?SJqW!|oBHMsOu}U2Uwq8}RnWeUBJ>FtHKAhP~;&T4mn(9pB
zu9jPnnnH0`8ywm-4OWV91y1GY$!qiQCOB04DzfDDFlNy}S{$Vg9o^AY!XHMueN<{y
zYPo$cJZ6f7``tmlR5h8WUGm;G*i}ff!h`}L#ypFyV7iuca!J+C-4m@7*Pmj9>m+jh
zlpWbud)8j9zvQ`8-oQF#u=4!uK4kMFh>qS_pZciyq3NC(dQ{577lr-!+HD*QO_zB9
z_Rv<#qB{AAEF8Gbr7xQly%nMA%oR`a-i7nJw95F3<M4W+sj-oyyCOoGru)kHS~#ny
zMQ&|tNVB-2rt~YA3D-hRHy){N-EvKNYa&L94qm<7qj^X{`#wbacBnx%PeLH!(D+Yc
z4Pi*dnD$-bbkDwH(5%t`h=>iH&IX5hhy3CCV5y>mK4)&5a<yVc@%3Jn(B<7Pgl!5P
zP7%Z~NaOQ6(B}rjk;JJlDVqtypI8spsww$Ocjl6BX548C%VfhOoSdiRl?*F<>C*12
zI`{(g%MHq<(ocY5+@OK-Qn-$%!Nl%AGCgHl>e8ogTgepIKOf3)WoaOkuRJQt%MN8W
z=N-kW+FLw=1^}yN@*-_c>;0N{-B!aXy#O}`%_~Nk?{e|O=JmU8@+9<JgLq$v4ONrL
zG!e^iSM`TRwfn52lM%H&gS($XJuQ*=(~0)hZ6l!$Y9o;)J`U>2Q-Y6h)>@omP=9i~
zi`krLQK^!=@2BH?-R83DyFkejZ<R2S9kf;gA5Z*x{ru<+*r&fhflxyYX^LaXBNK3B
z(WCGM#k=rU;LE@Rzlt4od5K?O<DVH#R(L072|jLaH5XS%CTSXC(H~i3%!Z+wGxYXU
zI+MDFsfoMcZRh#UmCXh6JtdWbt|;`AGzJSe5U&p+-w5pt_o*qdGOF|H>khHJqV%^}
zUa&K22zwz7b*@CQV6BQ9X*RB177VCVa{Z!Lf?*c~PwS~V3<Xl6K($#dn5dkl=i5uO
z=f=b+@#Q(HJerbw!(-iXmD%LDLUw8=^4~bAi=>K{id1TB^WZh=aMqiws5)qWy<euQ
zCMUcAyMc=sb!n8LFR_@)B?w%W4HqA&FHEkdZa%|Zbwqq}J$A=k#QV!QxBBBR)Sul5
ztwr!nbjKu;zh93*S8N3S{#vaGhA(jOop)X^t*zvt51F~aNrqRv30JSYfCOh$TfDNg
zf_gWpOQ+SHw+Zylvs?M2XT6fr*Y5IN59T#y#kOcRaHY4HeOAuHqVKyhp|^i?RUUrK
z;Eda1gy0TE#TP7-r^(c64VMujq-kRRK3-v=qM}{*yii%bw0)+$NLA}xe#SGMS9XhB
z3S&K<dz(nc=~*rTxxp{)ovs2_Q(68>lK#^SG9!tqg3-)p_o(ABJsC!0;0v36;0tC=
z!zMQ_@se(*`KkTxJ~$nIx$7ez&_2EI+<xKgrR>{4=uI~dwKD$deb5?mwLJ~ema_0Z
z6A8Q$1~=tY&l5_EBZ?nAvn$3hIExWo_ZH2R)t<J+10zM3O)xUg9tNL}k576$!th(w
zKD=IbADTUYZkM_{68r`=vjDB+)_HELR~?a?z$Y_-a>YPjxTH5mAw#3n-*sOMV<F28
zEr!V+R<gUl?N=%-eEpJdq_1+~8|w$Vr@)vO2%le$FpG0%<a4d6kfqLm?5s+TWTcm5
zU5XUNQ$2+;;i4PTwNO!M<5cxcL|BPgg6^;9iqiJcC`*`1w%UPSCa`Rl8z10lOt&rm
z9zSFR{KE~SDB2;?^mFW!RtXv42uw(MHglO#7!++7uN^YzYM)u@FMQ0EjY1ydXBtWz
z#n0Bbin;xVe99Ub#}$T+)INZ|Blx$=?KR-*@@P9-eZ#p)uH{G9jvykORsZx{(LE8b
z_!Ru^00&}EYQXYmluX0Q`urW17hUjL202xLx9q^2gcn;vD~HoG&J+Cf-qwsaCXN{i
zit9~=z^@8NyqNlx)Iz*@r$r$rBdCfnN5uRsp205n%q`vCxKB`=)fjXPJx)m1-D76f
zZf!%CA?#9<NEMXG6=|~W>jpUrdnj1DBm4G!J+Ke}a|oQN9f?!p-TcYej+(6FNh_A?
zJ3C%AOjc<8%9SPJ)U(md`W5_pzYpLEMwK<_jgeg<cuRH0H;D>-VXSX1Nk1oX-{yHz
z-;CW!^2ds%PH{L{#12WonyeK5A=`O@s0Uc%s!@22etgSZW!K<%0(FHC+5(BxsXW@e
zAvMWiO~XSkmcz%-@s{|F76uFaBJ8L5H>nq6QM-8FsX08ug_=E)r#DC>d_!6Nr+rXe
zzUt30Du_d0oSfX~u>qOVR*BmrPBwL@WhF^5+dHjWRB;kB$`m8|46efLBXLkiF|*W=
zg|Hd(W}ZnlJLotYZCYKoL7Y<C=^be)R^4jGjwu})qX|lHh3=FeUh(ZcF~$!l`d4ZB
z(yQ__J|R=aI{Kxz&ffW&An~$jj73;?GR&6V?;Nj4M-Co7ae_()TlnocSS}%WGi%w3
zYr%L%>sQdLXZ!F`rLqLf8n$OZOyAzK`uKcbC-n0qoH!5-rh&k-`VADETKHxrhK<5C
zhF0BB4azs%j~_q_HA#fYPO0r;YTlaa-eb)Le+!IeP>4S{b8&STp|Y0if*`-A&DQ$^
z-%=i73HvEMf_V6zSEF?G>G-Eqn+|k`0=q?(^|ZcqWsuLlMF2!E*8dDAx%)}y=lyMa
z$Nn0_f8YN8g<4D<j2#`N%^jVLZT=IWcaG|V^5;hpxu%-8KouT;5}Dy&PZo)V5K(xS
zz%LFZW-|QJjNr|U31?n&K@aKR$XtHE1*z@t4LHt|O&u(!bs*iJk<?6^ltF_W3B0BL
zbD$mWU&WsDWVxNA3o#(4%(<tX&ZOV|SteG6G&u}XR;N{~(@dtH=R|}=v!5waWvpJ0
z_Knhik};mq$*#o|T`5K2G!u;@hz@w4v0U+c|MAc95^{J!G=l*F1;PLUG5z~^McfRn
zoE^<wj780@j0Fr0|As81Z=-MepAjdit~+9@Vt(VQ|LyLbz0Av1CS?E`lw5U5V3Ofh
zf;h{7L#fQ+Xw8&ZCz`Ak>>8IL3)GPf#dJYU@|NZqIX$;Lco?Qj=?W6J;D@pa`T=Yh
z-ybpFyFr*3^gRt!9NnbSJWs2R-S?Y4+s~J8vfrPd_&_*)HBQ{&rW(2X>P-_CZU8Y9
z-32><7|wL*K+3{ZXE5}nn~t@NNT#Bc0F6kKI4pVwLrpU@C#T-&f{Vm}0h1N3#89@d
zgcx3QyS;Pb?V*XAq;3(W&rjLBazm69XX;%^n6r}0!CR2zTU1!x#TypCr`yrII%wk8
z+g)fyQ!&xIX(*>?T}HYL^>wGC2E}euj{DD_RYKK@w=yF+44367X17)GP8DCmBK!xS
zE{WRfQ(WB-v>DAr!{F2-cQKHIjIUnLk^D}7XcTI#HyjSiEX)BO^GBI9NjxojYfQza
zWsX@GkLc7EqtP8(UM^cq5zP~{?j~*2T^Bb={@PV)DTkrP<9&hxDwN2@hEq~8(ZiF!
z3FuQH_iHyQ_s-#EmAC5~K$j_$cw{+!T>dm#8`t%CYA+->rWp09jvXY`AJQ-l%C{SJ
z1c~@<5*7$`1%b}n7ivSo(1(j8k+*Gek(m^rQ!+LPvb=xA@co<|(<v=1sPmq?J4vh1
zvUrv*IZ5t+5o!)uvdUU@5_8trTxXfrB*K7#KajDZ9(8DwPY$`heC&O2`esN9q}ZmW
z2BaSHOAjowcnJ-#v3N=Go4y*YwuJubHycZLmF_u{e;(|0vav*r_RePvhI4W(LcX8N
zA(Q+?y{@8WG3L||j!Ww34uD&=5#iNtDzs%v8s%d3k3c{ew35oRM`^Xi#uH^aROu4z
zT6({Vp5P_5%7s^j#Tg_7?qVm=tAwBIg??%71<vTW7GA86m}9yjs>XDK+(tb46xJ4)
zcw7w<0p3=Idb_FjQ@ttoyDmF?cT4JRGrX5xl&|ViA@Lg!vRR}p#$A?0=Qe+1)Mizl
zn;!zhm`B&9t0GA67GF09t_ceE(bGdJ0mbXYrUoV2iuc3c69e;!%)xNOGG*?x*@5k(
zh)snvm0s&gRq^{yyeE)>hk~w8)nTN`8HJRtY0~1f`f9ue%RV4~V(K*B;jFfJY4dBb
z*BGFK`9M-tpWzayiD>p_`U(29f$R|V-qEB;+_4T939BPb=XRw~8n2cGiRi`o$2qm~
zN&5N7JU{L*QGM@lO8VI)fUA0D7bPrhV(GjJ$+@=dcE5vAVyCy6r&R#4D=GyoEVOnu
z8``8q`PN-pEy>xiA_@+EN?EJpY<#}BhrsUJC0afQFx7<P!jj)HvM}dm%OQQX)#0#Q
z;`AO|DV6XVrffwqevvd$THno;(4*>-pBeLXR9Mr+#w@!wSNR7vxHy@r`!9MFecB4O
zh9jye3iSzL0@t3)OZ=OxFjjyK#KSF|zz@K}-+HaY6gW+O{T6%Zky@gD$6SW)Jq;V0
zt&LAG*YFO^+=ULohZZW*=3>7YgND-!$2}2)Mt~c>JO3j6QiPC-*ayH2xBF)2m7+}#
z`@m#q{J9r~Dr^eBgrF(l^#sOjlVNFgDs5NR*Xp;V*wr~HqBx7?qBUZ8w)%vIbhhe)
zt4(#1S~c$Cq7b_A%wpuah1Qn(X9#obljoY)VUoK%OiQZ#Fa|@ZvGD0_oxR=vz{>U*
znC(W7HaUDTc5F!T77GswL-jj7e0#83DH2+lS-T@_^SaWfROz9btt*5zDGck$<!b+H
z2aFAFQ&5ATq(uA#3T3W>{}*njAwf}3hLqKGLTeV&5(8FC+IP>s;p{L@a~RyCu)MIa
zs~vA?_JQ1^2Xc&^cjDq02tT_Z0gkElR0Aa$v@VHi+5*)1(@&}gEXxP5Xon?lxE@is
z9sxd|h#w2&P5uHJxWgmtVZJv5w>cl2ALzri;r57qg){6`urTu(2}EI?D?##g=!Sbh
z*L*>c9xN1a3CH$u7C~u_!g81`W|xp=54oZl9CM)&V9~ATCC-Q!yfKD@vp#2EKh0(S
zgt~aJ^oq-TM0IBol!w1S2j7tJ8H7;SR7yn4-H}iz&U^*zW95HrHiT!H&E|rSlnCYr
z7Y1|V7xebn=TFbkH;>WIH6H>8;0?HS#b6lCke9rSsH%3AM1#2U-^*NVhXEIDSFtE^
z=jOo1>j!c__Bub(R*dHyGa)@3h?!ls1&M)d2{?W5#1|M@6|ENYYa`X=2EA_oJUw=I
zjQ)K6;C!@>^i7vdf`pBOjH>Ts$97}B=lkb07<&;&?f#cy3I0p5{1=?O*#8m$C_5TE
zh}&8lOWWF7I@|pRC$G2;Sm#IJfhKW@^jk=jf<lp`AZZ)~U7Ldz$=Bm2(n{nn<Q5@Q
z2Mwqr9?8qsU5o%J75Ban>M1MdJP(v2fIrYTc{;e5;5gsp`}X<zNgn_TDjzA~MrNqh
z2eOBR1SOc7c&k;ZD?H;*0Vx3rHEeW3)RV|Sa~Bz?9{go&Xl&2cl%Oj^M_Us4VKXd#
zyxhzR14iSlhnLZA%}L6$@0qOl)=Te{k+Kc2wZ=Zp((>8-!{9{S1{h+)<@?+D13s^B
zq9(1Pu(Dfl#&z|~qJGuGSWDT&u{sq|huEsbJhiqMUae}K*g+R(vG7P$p6g}w*eYWn
zQ7luPl1@{vX?<U$9Wp*YEb6ss?rx=f4k}iAs?j7oOep|QAw>PMK%-IBt+N7TMn~GB
z!Ldy^(2Mp{fw_0<EeBCzww$51?l2CfM@fYHP<qUc(A&$JlN1h1szAzK&Eq5KRJa9j
zfISxT&%V&i+UAsnyQV7M0$~YlU&cI@S^PyP8HB6XD%{{1sm@2&^ic0##Jy`;Y%Xzc
z{I`J?+gSvEq2}N-G^VunT(%j_@abd3Y<IDTnYfmfV8+=9rmoo^r$X7A0pj$}bZE{2
zK}_3SiSP7VMy%O01EF)+79!F(*vbq}ie$WtG(WZ+4QUYj2ThAsWJ3XI@^CWQe%{dJ
z4B@*#7k$Lx7E!-{z$irPLByPA^ngtMHm`cbv2J_ZmZL)$ldrf@mEjE8fC$^;BFe9%
z0;7PG$0;=B7H$urh}Od?Pz@lJMk4cq1s~A-%Gc}<1xu^cO;06V++(x*LFyXpB16hi
zax%k7k(qxEPSlUpp<k7<XQuaj`Y%jqnjtG&$zM$gEE*6H<-afG{;`Ht{~=8IpW2fD
zpm5Z{-B3nQzreE^OBRXpkT1=64f%h`2U37Vm=Hor*b(smB(nQ`*eDL}+G1cE6VJ{A
zARQ`P3!6vg!c_p&qY`wncRimyYzZNajPiAq%qM}Kjz8zMWwF_QsUCM>;<<n9QUR%i
zfkI{H88Bs+2@W+J+*omJRPAt3Qj)a&oc>$dgHAv1gZgyJAx%}dA?jR=NPW1K`FkoY
zNDgag#YWI6-a2#&_E9NMIE~gQ+*)i<>0c)dSRUMHpg!+AL;a;^u|M1jp#0b<+#14z
z+#<q3-75TB%G9WTT#W!j;XUkMQue!rguCu(-<@wdxW(XXosWp{(Uz4Cz8`#iQu6+W
zFaM*bHUxpEa7!<W>LuQ1jCyV_GNj#lHWG3e9P@H34~n0VgP#(SBX=v|RSuOiY>L87
z#KA{JDDj2EOBX^{`a;xQxHtY1?q5^B5?up1akjEPhi1-KUsK|J9XEBAbt%^F`t0I-
zjRYYKI4OB7Zq3FqJFBZwbI=RuT~J|4tA8x)(v2yB^^+TYYJS>Et`_&yge##PuQ%0I
z^|X!Vtof}`UuIxPjoH8kofw4u1pT5h`Ip}d8;l>WcG^qTe>@x63s#zoJiGmDM@_h=
zo;8IZR`@AJRLnBNtatipUvL^(1P_a;q8P%&voqy#R!0(bNBTlV&*W9QU?kRV1B*~I
zWvI?SNo2cB<7bgVY{F_CF$7z!0<TVnewi8<kMd)PQKo}NbSs>2Qxfw-Ew#p!8PC#!
z1sRfOl`d-Y@&=)l(Sl4CS=>fVvor5lYm61C!!iF3NMocKQHUYr0%QM}a4v2>rzPfM
zUO}YRDb7-NEqW+p_;e0{Zi%0C$&B3CKx6|4BW`@`AwsxE?Vu}@Jm<3%T5O&05z+Yq
zkK!QF(vlN}Rm}m_J+*W4`8i~R&`P0&5!;^@S#>7qkfb9wxFv@(wN@$k%2*sEwen$a
zQnWymf+#Uyv)0lQVd?L1gpS}jMQZ(NHHCK<c!y-2vWm5=SjM{l!pf9&VcSAI@>Ryu
zjK|Zai0|N_)5iv)67(zDBCK4Ktm#ygP|0(m5tU`*AzR&{TSeSY8W=v5^<J9M=Ij&e
zDPL>=Ic`ahxM-LBWO+uoL~wxZmgcSJMUF9q%<%>jsvh9Dnp^_e>J_V=ySx4p?SF0Y
zg4ZpZt@!h>WR76~P3_YchYOak7oOz<f=}fJ88&9GWFr4oXrZhG3{x1EZ(thrLvVoZ
zmI{`ETVwzMV9xGWLiy4ZyuH)%(~*1PEdG!k?|9b*eM;^yX)dpa>R|`t+h!BbN}?zd
zq+vMTt0!duALNWDwWVIA$O=%{lWJEj;5(QD()huhFL5=6x_=1h|5ESMW&S|*oxgF#
z-0<B=5BA-|8Xw4-fVPa|SME#p-Q9NBHiY^r*tP#q%_ATjL=j0e@BcN1DxU`_@{%UY
z#xC%%;0Cym`E{w*|Az)iSII&!N#iA2(OpIfQby0QB3nA$rF1(t4l<Y?CF$5E^a~1?
ztx9g`7va+DjQzNDV7`^a$U`Dxxo&2;u6%6B<_G{oUK3eSqzOf}Ak;j)6!nM5g1G_b
zTqQFb?@oHEpJjMzS(v&3E0Y2UDuWoZBdLA%1iT<fjVF20#4B~!KI5HM!66r5Y0_<j
zyMfM~adcpXX9*uI2%Bs^k#d6igmZey9XRw#t1Kflgo3fOM5EHrsb72zxh#1g>GRIb
ziolwI13hJ-Rl(4Rj@*^=&Zz3vD$RX8bFWvBM{niz(%?z0gWNh_vUvpBDoa>-N=P4c
zbw-XEJ@txIbc<`wC883;&yE4ayVh>+N($SJ01m}fumz!#!aOg*;y4Hl{V{b;&ux3&
zBEmSq<t4aR2h_Qe%DoybQC94?0lUh~gOHB-K1F}kYPO{g>2jQ7#IbVm3TPBw?2vVN
z0wzj|Y6EBS(V%Pb+@OPkMvEKHW~%DZk#u|A18pZMmC<U^I9IX>rjWh%7J4Ph>vG61
zRBgJ6w^8dNRg2*=K$Wvh$t>$Q^SMaIX*UpBG)0bqcvY%*by=$EfZAy{ZOA#^tB(D(
zh}T(SZgdTj?bG9u+G{Avs5Yr1x=f3k7%K|eJp^>BHK#~dsG<&+=`mM@>kQ-cAJ2k)
zT+Ht5liXdc^(aMi9su~{pJUhe)!^U&qn%mV6PS%lye+<ix)CY|ChjLmnT_ZqqodK`
z3mn#R1y((F=bo8D2I%`VNL=zF1@rZZ?(R(Kq{6*!MFrhc^rx&kyn`}^&AQnLUj54{
z=Q7fS{euYqaMPR(9rUJX|7F!dX4&Epw=PJ0tCg4x!tWH28^TZs7ePIAQ$@KUch@bg
zeJ|Io&ft3<_j~i3`wTYc=&nNMTh*JEPJ0YRS`O-Wb`|zPgeS)ZEijy3<QL5_UK|p1
zwg}HsB~)`&F*!7K&Y#-=xWf)n`B^rYqE++<;~hSPha_E5V_o&!@{(!v84t$Pbb&|q
zHqrPJi90{}1qajIHf}ZA=Os|@C`@VFYK*=}6VlRH4TkVEqqL;H3mAWa>Iw5F@Xv8E
zdR4#?iz+R4--iiHDQmQWfNre=iofAbF~1oGTa1Ce?hId~W^kPuN(5vhNx++ZLkn?l
zUA7L~{0x|qA%%%P=8+-Ck{&2$UHn#OQncFS@uUVuE39c9o~#hl)v#!$X(X*4ban2c
z{buYr9!`H2;6n73n^W3Vg(!gdBV7<OCDaMS_-{|@ghRZHM}jEAr|pxd1s2VO1D3`6
zTYx;#8N4Ps1astmVGjg=boui!g1FC)1efC{S<ma!A5jj;N{Tr~P6w3T?qU7`dMvTp
zMBa(`<fFJ@Tm_k--`1r<;K?&y<_ps3P-scN@0}MIB$Md6D|?$(8_NwolH0y%(MXr0
zI}ghLVw{329HGh7+tgyaFv<6}BDoZ`i~*V<b>$e<T<|t3aM3lh)Efm(SqmL(xhA!o
z0W6r6lRM40@Ol<TDCh6VaQjacD6=>#v3<ku^qNS(8D1%MZ8ep3rXZTZ_9M!irH6!8
zsI3^I<%_J5PZ4kqunDHPth1W9FurL8>qubWALaUEAf@`ava{UTx%2~VVQbEE(*Q8_
zv#me9i+0=QnY)$IT+@3vP1l9Wrne+MlZNGO6|zUVG+v&lm7Xw3P*+gS6e#6mVx~(w
zyuaXogGTw4!!&P3oZ1|4oc_sGEa&m3Jsqy^lzUdJ^y8RlvUjDmbC^NZ0AmO-c*&m(
zSI<FJ<O#nNuE{IazaWpE8s%<1qt4W$l&UWIhX3c5<!uk+sQho4xBl0N{(ZS8@t?}K
zf0TJ5f1$~KdYItviPIw##7-!kM}xleYDyRofmzSZu@&;m()m{_JTD-8$qOYD0utT3
z<LP^6Um&&I>%4P9f|s!B#073b>Eet`T@J;3qY!NrABuUaED6M^=s-Q^2oZS`jVzuA
z>g&g$!Tc>`u-Q9PmKu0SLu-X(tZeZ<%7F+$j3qOOftaoXO5=4!+P!%Cx0rNU+@E~{
zxCclYb~G(Ci%o{}4PC(Bu>TyX9slm5A^2Y<Il_M(sg0wPzLnK~D*UokUwv_maecNf
z80IGfi~Yb-nh}a-CX<akXO@b=X(XuPWHjQ*^76<NHcw5`M<+PB)`8)<Z&Xm|AWD9T
zh)}FpDVG1vFAaqntNFt9;r)4bKXqZlnqh7AslR>i$$kCq-M#Jl)a2W9L-bq5%@Pw^
zh*iuuAz`x6N_rJ1LZ7J^MU9~}RYh+EVIVP+-62u+7IC%1p@;xmmQ`dGCx$QpnIUtK
z0`++;Ddz7{_R^~KDh%_yo8WM$IQhcNOALCIGC$3_PtUs?Y44@Osw;OZ()Lk=(H&Vc
zXjkHt+^1@M|J%Q&?4>;%T-i%#h|Tb1u;pO5rKst8(Cv2!3U{TRXdm&<su5?)szW0u
z%Z-U^HX5Ow@CSy^)@;VC#LR01vt&l~hMmW>>fWTJG)n*q&wQPjRz<lHwvL5SX^tdS
zq1td=OnO^>g%pS1RO9}U0*C6fhUi&f#qoV`1{U<&mWKS<$oVFW>{&*$6)r6Rx)F4W
zdUL8Mm_qNk6ycF<vVRTsX9c$VX$y3=jk<zOiFwABjo&-66eMkDplHLGI^C;WguH7s
zRG?=TwXL`NT4Pk--b3In-rO%EoV7Vd>VkI5F?V+cYFUch$92|8O^-Z1JC94GU+Nuk
zA#n3Z1q<mXmGCwb8B?l4_+w)b(9tR?hi~u~Txkq<hqZ&n&aPv2z_)1Y^z}i!$AQ)y
z9?9YRg<=AH77vT_Lid?oYwR{^g$TFJU`uVbMRSQs5ZWWRAZzG&Z%W+`H_@C)S<vwH
z8Dtv4JUmP+xyRn9pfQwg(tZ0N+B^aReaJsmm8<(=hWx?|MMVYGSgnq%HmTa3T3qY+
zVS(;A6`iyPo)o$|)lRE_WUtgJIx&gbscLZGY$`<VZkd`=m+&LOU~Cm8DBlzYU+;Nh
zx$L9CYSt<bu&#FEud_Vpg#>4<6zRiv%W5`NGk*Ym{#0E~IA6*)H-=RmfWIY%mEC0?
zSih7uchi`9-WkF2@z1ev6J_N~u;d$QfSNLMgPVpHZoh9oH-8D*;EhoCr~*kJ<|-VD
z_jklPveOxWZq40E!SV@0XXy+~Vfn!7nZ1GXsn~U$>#u0d*f?RL9!NMlz^qxYmz|xt
zz6A&MUAV#eD%^GcP#@5}QH5e7AV`}(N2#(3xpc!7dDmgu7C3TpgX5Z|$%Vu8=&SQI
zdxUk*XS-#C^-cM*O>k}WD5K81e2ayyRA)R&5>KT1QL!T!%@}fw{>BsF+-pzu>;7{g
z^CCSWfH;Y<I?vNb2hz$`traUdQ{)s+@=yAFJX2>tJGT@+An0Ded#zM9>UEFOdR_Xq
zS~!5R*{p1Whq62ynHo|n$4p7&d|bal{iGsxAY?opi3R${)Zt*8YyOU!$TWMYXF?|i
zPXYr}<vX_8>wJp#EH;keSG5WYJ*(~oiu#GDR>C4%-HpIWr7v`W`lzQN-lb?*vpoit
z8FqJ)`LC4w8fO8Fu}AYV`awF2NLMS4$f+?=KisU4P6@#+_t)5WDz@f*qE|NG0*hwO
z&gv^k^kC6Fg;5>Gr`Q46C{6>3F(p0QukG6NM07rxa&?)_C*eyU(jtli>9Zh#eUb(y
zt9NbC-bp0><wGEXH|LbpZ2{4R?q(L-5AJVDwPtZ@SFNAP8c14_b1FDiNpLP7+uO?B
z6nJL8n;*1fx~)1cq!LAFOVa{|A=?7sd|qvWdnZGio5#S>^m?i`?$aJUyBmF`N0zQ%
zvF_;vLVI{tq%Ji%u*8s2p4iBirv*uD(?t~PEz$CfxVa<j81d3XNHAljh|;;i4>=@R
z^HQu6-+I9w>a35kX!P)TfnJDD!)j8!%38(vWNe9vK0{k*`FS$ABZ`rdwfQe@IGDki
zssfXnsa6teKXCZUTd^qhhhUZ}>GG_>F0~LG7*<*x;8e39nb-0Bka(l)%+QZ_IVy3q
zcmm2uKO0p)9|HGxk*e_$mX2?->&-MXe`=Fz3FRTFfM!$_y}G?{F9jmNgD+L%R`jM1
zIP-kb=3Hlsb35Q&qo(%Ja(LwQj>~!GI|Hgq65J9^A!ibChYB3kxLn@&=#pr}BwO<a
zUuN)qH?&l@%%C>N0Q=e5;#sF8GGGuzx6O}z%u3l?jlKF&8Y#lUA)Cs6ZiW8DgOk|q
z=YBPAMsO7AoAhWgnSKae2I7%7*Xk>#AyLX-InyBO?OD_^2^nI4#;G|tBvg3C0ldO0
z*`$g(q^es4VqXH2t~0-u^m5cfK8eECh3Rb2h1kW%%^8A!+ya3OHLw$8kHorx4(vJO
zAlVu$nC>D{7i?<Y2$%?@CNJ%~MCUJbM0|n&`3opa%m%uF1#F<Q69M*s;Npwa<3@0W
zv5De+4Il;}=0~7#^0h#S7v{+EFQVoKFjQ@RzroExEhO{oX}bybWnCK-`42!1e+O+D
zLUC@B)pn3$B~NKQGm>7xDg3116Y2e+)Zb4FPAdZaX}qA!WW{$d?u+sK(iIKqOE-YM
zH7y^hkny24==(1;qEacfFU{W{xSXhffC&DJV&oqw`u~WAl@=HIel>KC-mLs2ggFld
zsSm-03=Jd^XNDA4i$vKqJ|e|TBc19bglw{)QL${Q(xlN?E;lPumO~;4w_McND6d+R
zsc2p*&uRWd`wTDszTcWKiii1mNBrF7n&LQp$2Z<}zkv=8k2s6-^+#siy_K1`5R+n(
z++5VOU^LDo(kt3ok?@$3drI`<%+SWcF*`CUWqAJxl3PAq!X|q{al;8%HfgxxM#2Vb
zeBS756iU|BzB>bN2NP=AX&!{uZXS;|F`LLd9F^97UTMnNks_t7EPnjZF`2ocD2*u+
z?oKP{xXrD*AKGYGkZtlnvCuazg6g16ZAF{Nu%w+LCZ+v_*`0R$NK)tOh_c#cze;o$
z)kY(<i{7Q3nX0G^70MJMh)G-P7tbRU8+qs0P=&TvvQwq~JflsbNmYi<U)-xk)h(bi
z`?6TW#$jHPS8O-RrX2l@>eZ5Viv<5zl1XfL(#GO|2FlXL#w3T?hpj3BZ&OAl^L!7@
zy;+iJWYQYP?$(`li_!|bfn!h~k#=v-#XXyjTLd+_txOqZZETqSEp>m+O0ji7MxZ*W
zSdq+yqEmafrsLErZG8&;kH2kbCwluSa<@1yU3^Q#5HmW(hYVR0E6!4ZvH;Cr<$`qf
zSvqRc`Pq_9b+xrtN3qLmds9;d7HdtlR!2NV$rZPCh6>(7f7M}>C^LeM_5^b$B~mn|
z#)?`E=ze<yoxTGYaaEN^qPc-K$(qI%*5ZdiS0{0KQ_K169j7A#mG+mo7(2%7hqNN2
zOl1`ya-8-ueO3h$O=waekDF%RfAQ3@*35tF6nfau&-yK#U#{li^+Byt2ilU%_Arfn
z0mu2rAC44|{vU=E^KGEIM9V2s4pz<3%S@{kL_S&OM%o0GY=c6R9!^!k0(Ja@C7{ce
zv%kH5abAjQ0wrf8+MCwN&_i5pc9&LTdN>o9(9?{O_ko>51~h|c?8{F=2=_-o(-eRc
z9p)o51krhCmff^U2oUi#$AG2p-*wSq8DZ(i!Jmu1wzD*)#%J&r)yZTq`3e|v4>EI-
z=c|^$Qhv}lEyG@!{G~@}Wbx~vxTxwKoe9zn%5_Z^H$F1?JG_Kadc(G8#|@yaf2-4<
zM1bdQF$b5R!W1f`j(S>Id;CHMzfpyjYEC_95VQ*$U3y5piVy=9Rdwg7g&<G?*LX}N
zq|zKbX)EKg7`U_tc5<c(ln=(roV-m&^Yd65KD=o@qE*vnVlK9_vas)E_JL3xpHwzD
z5f!?(u3BD`$)xZq>)%#6;U%b2W}_VVdh}qPnM<l3WQl|5WwDIi5jw>4FY9zFP(5eR
zWuCEFox6e;COjs$1RV}IbpE0EV;}5IP}Oq|zcb*77PEDIZU{;@_;8*22{~JRvG~1t
zc+ln^I+)Q*+Ha>(@=ra&L&a-kD;l$WEN;YL0q^GE8+})U_A_StHjX_gO{)N>tx4&F
zRK?99!6JqktfeS-IsD@74yuq*aFJoV{5&K(W`6Oa2Qy0O5J<mWe%}HCAi3Alt9)B9
z=t{T1(uWFb7{-^xrjWqQri%y();w4rPz#RO#b45e8OJVTTv31+Rx!Tsmn#yso;D1V
zML_%p6j&qKwz-#>G>O`zZ-p7vBGh!MxS;}}h6(96Wp`dci3DY?|B@1p8fVsDf$|0S
zfE{WL5g3<9&{~yygYyR?jK!>;eZ2<U88UkoW~^VB6pbwbRBbqAd>L#tpL2)H#89*b
zycE?VViXbH7M}m33{#tI69<mRO1MJ-jiD*3=rB}*g^@@A>PUPD=r)EVPTBku={Qh{
zKi*pht1jJ+yRhVE)1=Y()iS9j`FesMo$bjLSqPMF-i<42Hxl6%y7{#vw5YT(C}x0?
z$rJU7fFmoiR&%b|Y*pG?7O&+Jb#Z%S8&%o~fc?S9c`Dwdnc4BJC7njo7?3bp#Yonz
z<eWglECxZtVJ~>PC>y`DVK~nzN^n}jB5RhE4N>LzhCZD#WQseohYXvqp5^%Ns!q^B
z&8zQN(jgPS(2ty~g2t9!x9;Dao~lYVujG-QEq{vZp<1Nlp;oj#kFVsBnJssU^p-4%
zKF_A?5sRmA>d*~^og-I95z$>T*K*33<bqIt^{o8$L$~UV#jC1+d35BF@;la6?p4eS
zc<y#KD4ka`^it_nv>TGBPzs{OMoV2i+(P6K|9<l3@?n-)3>5UwSj$Zn<@Rt(g%|iY
z$SkSjYVJ)I<@S(kMQ6md{HxAa8S`^lXGV?ktLX!ngTVI~%WW+p#A#XTWaFWeBAl%U
z&rVhve#Yse*h4BC4nrq7A1n>Rlf^ErbOceJC`o#fyCu@<qNQ*r4a9*?7jhW;%3)Sk
z`m%DcLcZ^}^5k)z=3&nLXMPE|($>H;y)`E#a#)w)3eg^{Hw&E7);N5*6V+z%olvLj
zp^aJ4`h*4L4ij)K+uYvdpil(Z{EO@u{BcMI&}5{ephilI%zCkBhBMCvOQT#zp|!18
zuNl=id<LjH^8w2mGjP;ZR$ARg_NjG@Xzk3&o#4E7eF|vp97yjN(mujEl}H5}LV!a)
z5i!hu3aJha)Dn^a3=l($6!mknFfn1x5ljAU>d81|{FpGkt%ty=$fnZnWXxem!t4x{
zat@68CPmac(xYaOIeF}@O1j8O?2jbR!KkMSuix;L8x?m01}|bS2=&gsjg^t2O|+0{
zlzfu5r5_l4)py8uPb5~NHPG>!lYVynw;;T-gk1Pl6PQ39Mwgd2O+iHDB397H)2grN
zHwbd>8i%GY>Pfy7;y5X7AN>qGLZVH>N<PuPq=9f!_a8uc3WsT9bT>_ZuJZ-`z9UA>
zfyb$nbmPqxyF2F;UW}7`Cu>SS%0W6h^Wq5e{PWAjxlh=#Fq+6SiPa-L*551SZKX&w
zc9TkPv4eao?kqomkZ#X%tA{`UIvf|_=Y7p~mHZKqO>i_;q4PrwVtUDTk<LvwuB1p*
z&;{X&ug*R~yW3?So?iiDz6X5zl>?M7N<InO3a`^2tWZ;tq|uVs_gs`cR1h!F-z?_o
zgwCmB*Aj*A89Rn^dgoPGa=B5m@U5pp2CdIS(Y~suIS+J6d^;6NU$M4gH{2eTVqqB<
zh&iI}Y{!E!eG)jSM^X{v$UO)2>Cssa?Y4uxYrsXj!+k@`Cxl;&{NLs*6!R<6k9$Bq
z%grLhxJ#G_j~ytJpiND8neLfvD0+xu>wa$-%5v;4;RYYM66PUab)c9ruUm%d{^s{#
zTBBY??@^foRv9H}iEf{w_J%rV<%T1wv^`)Jm#snLTIifjgRkX``x2wV(D6(=VTLL4
zI-o}&5WuwBl~(XSLIn5~{cGWorl#z+=(vXuBXC#lp}SdW=_)~8Z(Vv!#3h2@pdA3d
z{cIPYK@Ojc9(ph=H3T7;aY>(S3~iuIn05Puh^32WObj%hVN(Y{Ty?n?Cm#!kGNZFa
zW6Ybz!tq|@erhtMo4xAus|H8V_c+XfE5mu|lYe|{$V3mKnb1~fqoFim;&_ZHN_=?t
zysQwC4qO}rTi}k8_f=R&i27RdBB)@bTeV9Wcd}Rysvod}7I%ujwYbTI*cN7Kbp_hO
z=eU521!#cx$0O@k9b$;pnCTRtLIzv){nVW6Ux1<0@te6`S5%Ew3{Z^9=lbL5$NF<g
z7h3&c(4kC9finw=$>vd4eUtK?%zgmB;_I&p`)YtpN<seswnZE<<!u}HF?<U_QWcy#
zN9rkMy7o@aL@){7z>`2Im(?jPN<(7Ua_ZWJRF(CChv`(gHfWodK%+joy>8Vaa;H1w
zIJ?!kA|<L)AyCgEPfRnxLH`_*u&*2>x7V;4U1BNr(UrhfvjPii7YENLIm`LtnL9Sx
z5E9TYaILoB2nSwDe|BVmrpLT4<pw=1#&qLiu9t~e6wCLJk%R981Ny41-7+WP1;-{n
zoP=61-Ynq|(ya2-mgS2K)&fo{8Ry)oJ~wl7e(^_~jV}O}*DOge<3dG>3*dJ8;T@1l
zJE)4LEzIE{IN}+Nvpo3=ZtV!U#D;rB@9OXYw^4QH+(52&pQEcZq&~u9bTg63ikW9!
z=!_RjN2xO=F+bk>fSPhsjQA;)%M1My#34T`I7tUf>Q_L>DRa=>Eo(sapm>}}LUsN%
zVw!C~a)xcca`G#g*Xqo>_uCJTz>LoWGSKOwp-tv`yvfqw{17t`9Z}U4o+q2JGP^&9
z(m}|d13XhYSnEm$_8vH-Lq$A^>oWUz1)bnv|AVn_0FwM$vYu&8+qUg$+qP}nwrykD
zwmIF?wr$()X@33oz1@B9zi+?Th^nZnsES)rb@O*K^JL~ZH|pRRk$i0+ohh?Il)y&~
zQaq{}9YxPt5~_2|+r#{k#~SUhO6yFq)uBGtYMMg4h1qddg!`TGHocYROyNFJtYjNe
z3oezNpq6%TP5V1g(?^5DMeKV|i6vdBq)aGJ)BRv;K(EL0_q7$h@s?BV$)w31*c(jd
z{@hDGl3QdXxS=#?0y3KmPd4JL(q(>0ikTk6nt98ptq$6_M|qrPi)N>HY>wKFbnCKY
z%0`~`9p)MDESQJ#A`_>@iL7qOCmCJ(p^>f+zqaMuDRk!z01Nd2A_W^D%~M73jTqC*
zKu8u$$r<LPe{#urvjwW;MEzt+?#y7U2cq!11e|z;OQF2c<mZ+2p+J%rS_H*coWLeZ
zIFHHp5%Ux+ekEN7C2V7=IiqdB97GjbH%4B5=VeDO@T}{F#pHjX*!a;zJ5b$mbJ*`l
z@gC&^3)q0;DB3^nV=56?Lm5>({vP~TE8rPk?8RSjlRvG*BLF}ye~Su%s~rivmjg2F
z24dhh6-1EQF(c>Z1E8DWY)Jw#9U#wR<@6J)3hjA&2qN$X%piJ4s={|>d-|Gzl~RNu
z##iR(m;9TN3|zh+>HgTI&82iR>$YVoOq$a(2%l*2mNP(AsV=lR^>=tIP-R9T<Nh&C
zWHDS^NyMa`7pMppwk!!pCgcUdflO*4kyBirpMXnQQ=1yGHQpY72&B-!x<4*2B_4s5
zd48O>w!BYnZROx`PN*JiNH>8bG}&@h0_v$yOTk#@1;Mh;-={ZU7e<cTpM-I})#mmS
zXiFWeyDTI}%iJRo$(xcJs0>@JE(~@@y0AuETvsqQV@7hbKe2wiWk@QvV=Kz`%@$rN
z_0Hadkl?7oEdp5eaaMqBm;#Xj^`fxNO^GQ9S3|Fb#%{lN;1b`~yxLGEcy8~!cz{!!
z=7tS!I)Qq%w(t9sTSMWNhoV#f=l5+a{a=}--?S!rA0w}QF!_Eq>V4NbmYKV&^OndM
z4WiLbqeC5+P@g_!_rs01AY6HwF7)$~%Ok^(NPD9I@fn5I?f$(rcOQjP+z?_|V0DiN
zb}l0fy*el9E<M05>3Q7fVRKw$EIlb&T0fG~fDJZL7Qn8*a5{)vUblM)*)NTLf1ll$
zpQ^(0pkSTol`|t~`Y4wzl;%NRn<sz(Q)N+Z$1UxSOJdp->>689mpQrW=SJ*rB;7}w
zVHB?&sVa2%-q@ANA~v)F<EKSn&@d}0o$DquIcW2efe#&PvpO$*G^#gg(s}M5)aEyH
zFmJ|FQ{)Vhn=R>Xb`?Nz8M1rHKiZB4xC9<{Q3T!XaS#fEk=sXI4IFMnlRqG+yaFw<
zF{}7tcMjV04!-_FFD8(FtuOZx+|CjF@-xl6-{qSFF!r7L3yD()=*Ss6fT?lDhy(h$
zt#%F5<EM^a9o4av$IN{>75$U(3-e2LsJd>ksuUZZ%=c}2dWvu8f!V%>z3gajZ!Dlk
zm=0|(wKY`c?r$|pX6XVo6padb9{EH}px)jIsdHoqG^(XH(7}r^bRa8BC(%M+wtcB?
z6G2%tui|Tx6C3*#RFgNZi9emm*v~txI}~xV4C`Ns)qEoczZ>j*r<WgOixd!mP8ONI
zlBz*Y(GH5^&|w=+$N@s^xC|x4cB7?c;Vy@cP4QTp9U&Q(CPPU-rcUSjaeYqEvEPI>
zqQCa5k90Gntl?EX!{iWh=1t$~jVoXjs&*jKu0Ay`^k)hC^v_y0xU~brMZ6PPcmt5$
z@_h`f#qnI$6B<RoU<yv^Lf%Xl`0pW!7mk>D(`#IR0PrITIV^~O{uo=)+Bi$oHA$G*
zH0a^PRoeYD3jU_k%!rTFh)v#@cq`P3_y=6D(<b6Koz6*-3){jUY2ZN*@>M~GBud;4
zCk$LuxPgJ5=8OEDlnU!R^4QDM4jGn<IGNNxhxXj<KLl(9GNJ=I$T1G*U~(lvT`|gA
z#uOl}zAb~N*b6cj<U+zFF=TIs+-~M65}Yu4z$I<|sDg`Y=LIQ(i%aGa5_ti?=Mka)
z1exav+2!GXxPwz%vCK_9abkH7{(y|O7SO-OeTPBC3+{a6dB@=tG^H@s1&&Yw>i}~C
zy;t2E%Qy;A^bz_5HSb5pq{x{g59U!ReE?6ULOw58DJ<O45}B^@!!UaE^%7Z8_pWUx
zVg|*lI+VksK0<Fq)FcK76D>cJy;H?g*ofr(X7+8wF;*3{rx>j&27Syl6A~{|w{pHb
zeFgu0E>OC<m~&I9^|59433v0MsO0%6G7z~hnNz|CkxwDLZ+OXFOnQ6bo69irRWr&T
z1RFk_`OFBOd@qhA2qpTs;udIIpSmYUb9rIvae`3^FHX)k*tb*lRX<~DNi(b8ZYrKO
zg+N7q`3zz}rl&d(qI3;-MxeK0w`2dwI7V>81~6a9(2F13r7NZDGdQxR8T68&t`-BK
zE>ZV0*0Ba9HkF_(AwfAds-r=|dA&p`G&B_zn5f9Zfrz9n#Rvso`x%u~SwE4SzYj!G
zVQ0@jrLwbYP=awX$21Aq!I%M{x?|C`narFWhp4n;=>Sj!0_J!k7|A0;N4!+z%Oqlk
z1>l=MHhw3bi1vT}1!}zR=6JOIYSm==qEN#7_fVsht?7SFCj=*2+Ro}B4}HR=D%%)F
z?eHy=I#Qx(vvx)@Fc3?MT_@D))w@oOCRR5zRw7614#?(-nC?RH`r(bb{Zzn+VV0bm
zJ93!(bfrDH;^p=IZkCH73f*GR8nDKoBo|!}($3^s*hV$c45Zu>6QCV(JhBW=3(Tpf
z=4PT6@|s1Uz+U=zJXil3K(N6;ePhAJhCIo`%XDJYW@x#7Za);~`ANTvi$N4(Fy!K-
z?CQ3KeEK64F0@ykv$-0oWCWhYI-5ZC1pDqui@B|+LVJmU`WJ=&C|{I_))TlREOc4*
zSd%N=pJ_5$G5d<CT0q4T$F7WOR#b3NxQX-OZtxL}pfTa<aS#C>^3XK+yj2UZasg2)
zXMLtMp<5XWWfh-o@ywb*nCnGdK{&S{YI54Wh2|h}yZ})+NCM;~i9H@1GMCgYf`d5n
zwOR(*EEkE4-V#R2<Z}&NY_JGKwN?`1fmXa>+Rc>@cAEho+GAS2L!tz<rnexGy*YgV
zTxr}n=n&IH-g-J}pvQ{WA+jso)rXdp&+4h8D*4<NJTP;{rtyl*i(-DGjDEaThKnco
z3~;|C?{ABND{${TZE#5=Gz3yl6okqI30w@@BlkoN)N2)m<iT*1eXj{`U4Zs$$TV4h
zH=!1<un=UZX;7q`T>isLl${4<R&k;-;<%^0)S>2Y=A7v}h;#@71_Gh2MV=hPr0_a%
z0!={Fcv5^GwuEU^<B-}N2I&G$o~=u-n7D}f1v1oK5~O^2p~@3^llXE{!UKgvQw$7U
zD0TH5<y&ml&G5nYX+(+KVH>5rD|sP;+y<%5o9;#m>ssbtVR2g<420(I-@fSqfBVMv
z?`>61-^q;M(b3r2z{=QxSjyH=-%99fpvb}8z}d;%_8$$J$qJg1Sp3KzlO_!nCn|g8
zzg8skdHNsfg<lpGz$4_qo2PdLw@63gq_kZ7j0&D>kf8<eUVvW;B&MVU7*xQ$(*Q@0
z*;ko;Z!hnAWPaXO;{{=8ByMVeO-VzYKW=*k0@rI6alWeFy#fVflfsqt&tfFE?}bjK
zOg&>A7PWs;YBz_S$S%!hWQ@G>guCgS--P!!Ui9#%GQ#Jh?s!U-4)7ozR?i>JXHU$|
zg0^vuti{!=N|kWorZN<Kk)Vl#qAN)fkn)nl$;6kyNvKy=3C5Pn*~gVr5Cde*DIfR=
z(=s$SCz6`~Ou_qTF311bNYa*VYj*Z^CAr+I$_NXrS&?hmX9F)0dxWOtgNOwJDFsU#
z()xzy$g>FX`dJgdphgic#(8sOBHQdBkY}Qzp3V%T{DFb{nGPgS;QwnH9B9;-Xhy{?
z(QVwtzkn9I)vHEmjY!T3ifk1l5B?%%TgP#;CqG-?16lTz;S_mHOzu#MY0w}XuF{lk
z*dt`2?&plYn(B>FFXo+fd&CS3q^hquSLVEn6TMAZ6e*WC{Q2e&U7l|)*W;^4l~|Q=
zt+yFlLVqPz!I4<rMg8hx(EK7-A^ktt!ru!e$tvcCSgI)8hLV`-xI-}pWKD)>0}NHv
zE2t1meCuGH%<`5iJ(~8ji#VD{?uhP%F(TnG#uRZW-V}1=N%ev&+Gd4v!0(f`2Ar-Y
z)GO6eYj7S{T_vxV?5^%l6TF{ygS_9e2DXT>9caP~xq*<Dh>~oE<5KkngGtsv)sdCC
zaQH#kSL%c*gLj6tV)zE6SGq|0iX*DPV|I`byc9kn_tNQkP<l#k(!rg)R0>U%y<`rj
zMC}lD<93=Oj+D6Y2GNMZb|m$^)RVdi`&0*}mxNy0BW#0iq!GGN2BGx5I0LS>I|4op
z(6^xWULBr=QRpbxIJDK~?h;K#>LwQI4N<8<HCF4PJqc@4B}Bw~!Xq6G6Xz7EBJUI(
zsZvb<id1({jwk7nkoj{<51Ag6HJWYnTrg^F@}Sm8pcVVaDGh~3V<7=VsYfPw=^1LJ
z*&GQC4_2FM)EJLNy&-09CgTF9`T*N$p=16z#%w6ajJ-ffNFbzO>V?%3>9I5l+e*yG
zFOZTIM0c3(q?y9f7qDHKX|%zsUF%2zN9jDa7%AK*qrI5@z~IruFP+IJy7!s~TE%V3
z_PSSxXlr!FU|Za>G_JL>DD3KVZ7u&}6VWbwWmSg?5;MabycEB)JT(eK8wg`^wvw!Q
zH5h24_E$2cuib&9>Ue&@%Cly}6YZN-oO_ei5#33VvqV%L*~ZehqMe;)m;$9)$HBsM
zfJ96Hk8GJyWwQ0$iiGjwhxGgQX$sN8ij%XJzW`pxqgwW=79hgMOMnC|0Q@ed%Y~=_
z?OnjUB|5rS+R$Q-p)vvM(eFS+Qr{_w$?#Y;0Iknw3u(+wA=2?gPyl~NyYa3me{-Su
zhH#8;01jEm%r#5g5oy-f&F>VA5TE_9=a0aO4!|gJpu470WIrfGo~v}HkF91m6qEG2
zK4j=7C?wWUMG$kYbIp^+@)<#ArZ$3k^EQxraLk0qav9TynuE7T79%MsBxl3|nRn?L
zD&8kt6*<fMNtlksr)YNx(}aF3@@Kji-#`VXPvDltGmcNq4%~A=fK2KFn03+Mgx0D<
zRF>RJB6*a7=5c57wp!pg)p6O?WHQarI{o9@3a32zQ3FH8cK@P!DZ?CPN_LtmC6U4F
zlv8T2?sa<zXQ^3fM29N~?bl=u<uThbfO&mDR~^p>u&+(i@EL6+tvP^&=|aq3@QgL4
zOu6S3wSWeYtgCnKqg*H4ifIQlR4hd^n{F+3>h3;u_q~qw-Sh;4dYtp^VYymX12$`?
z;V2_NiRt82RC=yC+aG<x#gQB#J9x5qrW3KyHEu8A*V2Y&bltEAF<s8yv%3*`H(B}C
zurNW%K4qzHSA|x+Zx@FT#&>?=t&a81!gso$hQUb)LM2D4Z{)S<y`8qwLmGQG%5hy>
zI1S9f020mSm(Dn$&Rlj<nD~}vRCsQQbC_97Yr;ps)=zvT%R1ZFgky*1qV0>0UX}H@
zv={G+fFC>Sad0~8yB%62V(NB4Z|b%6%Co8j!>D(VyAvjFBP%gB+`b*<ZU<^H>&KnJ
zU8s}&F+?iFKE(AT913mq;57|)q?ZrA&8YD3Hw*$yhkm;p5G6PNiO3VdFlnH-&U#JH
zEX+y>hB(4$R<6k|pt0?$?8l@zeWk&1Y5tlbgs3540F>A@@rfvY;KdnVncEh@N6Mfi
zY)8tFRY~Z?Qw!{@{sE~vQy)0&fKsJpj?yR`Yj+H5SDO1PBId3~d!yjh>FcI#Ug|^M
z7-%>aeyQhL8Zmj1!O0D7A2pZE-$>+-6m<#`QX8(n)Fg>}l404xFmPR~at%$(h$hYD
zoTzbxo`O{S{E}s8Mv6WviXMP}(YPZoL11xfd>bggPx;#&pFd;*#Yx%TtN1cp)MuHf
z+Z*5CG_AFPwk624V9@&aL0;=@Ql=2h6aJoqWx|hPQQzdF{e7|fe(m){0==hk_!$ou
zI|p_?kzdO9&d^GBS1u+$>JE-6Ov*o{mu@MF-?$r9V>i%;>>Fo~U`ac2hD*X}-gx*v
z1&;@ey`rA0qNcD9-5;3_K&jg|qvn@m^+t?8(GTF0l#|({Zwp^5Ywik@bW9mN+5`MU
zJ#<Cr+p?`LtG0iwU0Nf^$S*aBrZ<`A8==3er%H}<Y6_n9*GCpB>_Ju|jtsq{tv)xA
zY$5SnHgHj}c%qlQG72VS_(OSv;H~1GLUAegygT3T-J{<#h<!47Ec55&-{<|T`iU8c
z%N34d05TI?vMw>}))pk$FjfRQ+Kr%`2ZiI)@$96Nivh82#K@t>ze^H?R8wHii6Pxy
z0o#T(lh=V>ZD6EXf0U}sG~nQ1dFI`bx;vivBkYSVkxXn?yx1aGxbUiNBawMGad;6?
zm{zp?xqAoogt=I2H0g@826=7z^DmTTLB11by<dY{USGp6^#9(oD!PBoXj^|xY=055
zI++_gis{>YvAO;ir|O0xmNN3Ec0w%yHO({-%q(go%?_X{LP?=E1uXoQgrEGOfL1?~
zI%uPHC23dn-RC@UPs;mxq6cFr{UrgG@e3ONEL^SoxFm%kE^LBhe_D6+Ia+u0J=)BC
zf8FB!0J$dYg33jb2SxfmkB|8qeN&De!%r5|@H@GiqReK(YEpnXC;-v~*o<#JmYuze
zW}p-K=9?0=*fZyYTE7A}?QR6}m_vMPK!r~y*6%My)d;x4R?-=~MMLC_02KejX9q6=
z4sUB4AD0+H4ulSYz4;6mL8uaD07eXFvpy*i5X@dmx--+9`ur@rcJ5<<KIUYaAK82Z
z`8H0Aia9rzaoUTNjiGQ0T4Qn}ZK65^&9BmxkSw%l9WrAh(3cWwP7ImVRSOL`+f@zH
zg0-DzmBks>L#s%nq3MRi4Dpr;#28}dl36M{MkVs4+Fm3Pjo5qSV)h}i(2^$Ty|<7N
z>*LiBzFKH30D!$@n^3B@HYI_V1?yM(G$2Ml{oZ}?frfPU+{i|dHQOP^M0N2#NN_$+
zs*E=MXUOd=$Z2F4jSA^XIW=?KN=w6{_vJ4f(ZYhLxvFtPozPJv9k%7+z!Zj+_0|HC
zMU0(8`8c`Sa=%e$|Mu2+CT22Ifbac@7Vn*he`|6Bl81j`44IRcTu8aw_Y%;I$Hnyd
zdWz~I!tkWuGZx4Yjof(?jM;exFlUsrj5qO=@2F;56&^gM9D^ZUQ!6TMMUw19zslEu
zwB^^D&nG96Y+Q<ItdqMYe}%Z{n9>wbvgk?Zmkn<dsmE0jLW%Or48T~Gw}vN0(0EZ#
zzn(t@no?=rLQ_5q4U{}f4IH%=?Lv8#?NWJF?P7URO{=-PxC4!1QsiEeT{B4A^b3qO
zvqZXj(vcq?Hy^4|7c7$F`tU%juC$F35#d3J$NaA2Ui!!+N9Yn-9UWB_xm+Q3`681f
ze!!+j;Y29=jYfAockMGondVj~@WWr|UZqU09FoT7y~&Gix1Fe^`!i-5nPP8s;5i!6
zy~_A{sE|=a+<XP&opeTL4rjE2nwvj5nfbQ<W~Dj%JYna$t5In$-nv}+%tQfbxe1-l
zo24azX0Rp5KpEnO*!afuBlK9o7}rH@+Y99xK=S(z{8krcyDiTr!Vt}r+3ZMmST*1l
znnph+prGanxBrT^FtdJ<84Mv`3F_N@ZmJ>9%d{+V;DGKmBE(yBWX6H#wbaAm&O1U^
zS4YS7j2!1LDC6|>cfdQa`}_^satOz6vc$BfFIG07LoU^IhVMS_u+N=|QCJao0{F>p
z-^UkM)ODJW9#9*o;?LPCRV1y~k9B`&U)jbTdvuxG&2%!n_Z&udT=0mb@e;tZ<Q%Yx
zlXb6W{yHPGrR_E>$_l3bj6d0K2;Ya!&)q`A${SmdG_*4WfjubB)Mn+vaLV+)L5$yD
zYSTGxpVok&fJDG9iS8#oMN{vQneO|W{Y_xL2Hhb%YhQJgq7j~X7?bcA|B||C?R=Eo
z!z;=sSeKiw4mM$Qm>|aIP3nw36Tbh6Eml?hL#&PlR5xf9^vQGN6J8op1dpLfwFg}p
zlqYx$610Zf?=vCbB_^~~(e4IMic7C}X(L6~AjDp^;|=d$`=!gd%iwCi5E9<6Y~z0!
zX8p$qprEadiMgq>gZ_V~n$d~YUqqqsL#BE6t9ufXIUrs@DCTfGg^-Yh5Ms(wD1xAf
zTX8g52V!jr9TlWLl+whcUDv?Rc~JmYs3haeG*UnV;4bI=;__i?OSk)bF3=c9;qTdP
zeW1exJwD+;Q3yAw9j<gxM%iI5l7`Zr1h6S|^dB*JZZZW(Y}Tngau;E~hbfjn79SVE
z76BU%%$IA>_42Zj9nuvs%q<j8zm9qc0tH;leTKgR|A$Ei;EM`JMCp9;(`Y)*YNSf~
zW4dHl^nRU2xZ0o9?A7npj_b9*;5ug@pKPw~7Ga;TH6o3u*_^z<4m8#*HKb$l8m-PE
zhh$}}rdFfhBAZ`F%w4!-sKYXCR(oEG5=|wH|D2oa+F;UZUlJ^4F;Q}8d|0g?SdRWF
zKNL8zsIhQzQoW5L=Olb^(S8owYA7r?-CJ=y_IV;K7wQuhrarxhX|e5gI=&QDM&pt!
zVaNqvLXV=t4L+=V>GF=6I@($2Ue(a9QGRMZTd4ZAlxbT5W~7(alP1u<^YY!c3B7QV
z@jm$vn34XnA6Gh1I)NBgTmgmR=O1PKp#dT*mYDPRZ=}~X3B8}H*e_;;BHlr$FO}Eq
zJ9oWk0y#h;N1~ho724x~d)A4Z-{V%F6#e5?Z^(`GGC}sYp5%DKnnB+i-NW<?_u`;U
zBI!eT`Eu>xwL-CuF+^JWNl`t@VbXZ{K3#aIX+h9-{T*+t(b0BM&MymW9AA*{p^&-9
zWpWQ?*z(Yw!y%AoeoYS|E!(3IlLksr@?Z9Hqlig?Q4|cGe;0rg#FC}tXTmTNfpE};
z$sfUYEG@hLHUb$(K{A{R%~%6MQN|Bu949<a{qSuBBCZ~hm>`f#H6YC*E(p3lBBKcx
z-~Bsd6^QsKzB0)$FteBf*b3i7CN4hccSa-&lfQz4qHm>eC|_X!_E#?=`M(bZ{$cvU
zZpMbr|4omp`s9mrgz@>4=Fk3~8Y7q$G{T@?oE0<(I91_t+U}xYlT{c&6}zPAE8ikT
z3DP!l#>}i!A(eGT+@;fWdK#(~CTkwjs?*i4SJVBuNB2$6!bCRmcm6AnpHHvnN8G<|
zuh4YCYC%5}Zo;BO1>L0hQ8p>}tRVx~O89!${_NXhT!HUoGj0}bLvL2)qRNt|g*q~B
z7U&U7E+8Ixy1U`QT^&W@ZSRN|`_Ko$-Mk^^c%`YzhF(KY9l5))1jSyz$&>m<sp7%y
zAaVI7gvthAV^8HA?f@8huzHWw{GrA_+(BLUpelFK+#g7EyxD_lYG0-ReNc?W?mj<9
zWQSWz^*Fmm_iHG`_7DSgROkcMK~=9G;B}IwYr8qw*`_xbn3gxTSQ(k70SV~GvQ9A2
zu#(_UU(7BR7Z^00n?D<Ah&a16d*5ULnJrC~-eP0OP7u+?-*8?Nv~hzR3=Fom`Qhx{
zF&NzKwuV!z*F+Npe<7yeoXA8G|9Jh;PKm&s1j$BXn$Esa55rBTUsmAJ!@_tGzRO<L
zo!jsHdpPa`3R|Yn>WJHZzHt0Jje%BQFxEV}C00{|qo5_Hz7c!FlJ|T(JD^0*yjkDm
zL}4S%JU(mBV|3G2jVWU>DX413;d+h0C3{g3v|U8cUj`tZL37Sf@1d*jpwt4^B)`bK
zZdlwnPB6jfc7<ENQLS}Lak2wMN(r5v)7Ug0u0wOQS+Qbh1mjr~^njxA(qYp_0D-7o
z@kA`VbdvPbksH324BEkKEIYlG$@GMMV)hBkU7~UZC=gmbBuID$CdRMQrUeeh$&v5Y
zq(>rIKsldW81$C$a9BukX%=V}yPnaBz|i6(h>S)+Bn44@i8RtBZf0XetH&kAb?iAL
zD%Ge{>Jo3sy2hgrD?15PM}X_)(<r<W3NDU9v_RCBmX^2BhPGL1Fm+KsgXN^;z=OG2
zvcYNt(H_!lkxgCmh$t|L9$O4Tx&?_`f20)dgJ!f>6$LV`&t*D`IP)m}bzM)+x-xRJ
zavhA<Te-!c<b_FOWykSKCVuuMO=WofSc~%t{3MJ{X?PZoS}w1oj66mR{HKu^hAKr3
zd7bpwCG)Mj0nJJUu`nuUQ)^*9Axk|t#KdQZ%P^#EokW<*HRl?OYe(Jur4saRCh=-b
zd-@{{Zitc>)>hu2cD;LUTvN38FEtB94ee|~lIvk~3MBPzmTsN|7V}Kzi!h&za#NyY
zX^0BnB+lfBuW<?L3ryx5&PrUAn!Yn-?BABk*g`Fk(azif1(el$uf)U`6brC4H5Jd_
zb>!oR#8G&S#Er2bCVtA@5FI`<Af5f{-wzU@ldq>Q+a-e?G)LhzW_chWN-ZQmjtR<P
zcsMc!`SFY<^-O|v>eWu-UOPu^G}|k=o=;ffg>8|Z*qev7qS&oqA7%Z{4Ezb!t$f3&
z^NuT8CSNp`VHScyikB1YO{BgaBVJR&>dNIEEBwYkfOkWN;(I8CJ|vIfD}ST<COx>N
z{097)R9iC@6($s$#dsb*4B<T*?#5G662%}WD;iZ<L&540n4ll5nzygCxG3ZKrf@Wu
zIOfI1rk`Gt^;FTncEzuzq+W@*_}pb{yb<7G;+!;u8Q<t$SJYmecjTnd@a`Gh(!mja
zvE_35&Ve(ckyhiShblUz%XU~^;TFPnR~k{!m4ABcGoB2eRls`3Q8Gs57TLsC_(mfR
zxxrzuk8Llp*<nu(+bU_#Qn%K!Wl$K5W&uH(o-zFgG;Qh&o#!;NE&)d6#gN#tdk}ss
zOw6Qc=hKH?EiMflNX9dHGjkwGNS5D%13m;VW+YvkcRMppw30&Trs1&?T3tU`>XBx7
zb{6S2O}QUk>upEfij9C2tjqWy7%%V@Xfpe)vo6}PG+hmuY1Tc}peynUJLLm<!O8uq
z+_-hM!aCPA)}R|n-(sl|+GZG;?!h*3C+-605#A8%l3kjIGEM)(+znQ_ug>m)8pshG
zb}HWl^|sOPtYk)CD-<NU+!4YSe!2;r94JN*wQ+G7T42iH54J^UpTsuFI97EGNey52
zz*_}1wF+&4#;_V60G=p{Eo1sHe&IAD9=THiN%~%oL!jvOM8Hp`*swv3?>7{L+l(=F
zOp}fX8)|n{JDa&9uI!*@jh^^9qP&SbZ(xxDhR)y|bjnn|K3MeR3gl6xcvh9uqzb#K
zYkVjnK<xsXg)`I=#4ysad68X{Y;sYT&oIZX4{Qj=-bHYY+CY^q;RAsy*c9FwXWCzw
z$%fE!ar$#$LQUW^9qSm*7-WsScrDxkZovD;<&cb&0UGXrO?!7L{Npy)<p31&XONw~
z-=m~GcxbR>$;lUky~??mcqN-)d5~mk{wXhrf^<)!Jjq<QN=AXxXbo5NSBOMkVP->c
zG~hX0P_@KvOKwV=X9H&KR3GnP3U)DfqafBt$e10}iuVRFBXx@uBQ)sn0J%%c<;R+!
zQz;ETTVa+ma>+VF%U43w?_F6s0=x@N2(oisjA7LUOM<$|6iE|$WcO67W|KY8JUV_#
zg7P9K3Yo-c*;EmbsqT!M4(WT`%9uk+s9Em-yB0bE{B%F4X<8fT!%4??vezaJ(wJhj
zfOb%wKfkY3RU}7^FRq`UEbB-#A-%7)NJQwQd1As=!$u#~2vQ*CE~qp`u=_kL<`{OL
zk>753UqJVx1-4~+d@(pnX<b=;Xow3JybU*w{(IlAt;<cg+xOA2y`N(}y9ax0J1>-i
zV4&=eRWbJ)9YEGMV53poXpv$vd@^yd05z$$@i5J7%>gYKBx?mR2qGv&BPn!tE-_aW
zg*C!Z&<NNt#B81}E#Sx270if%qHicxMKJ8Ls38%Eg5+Veqhe&*g}^~d7x+yt1S>!B
zH>3J16dTJC(@M0*kIc}Jn}jf=f*agba|!HVm|^@+7A?V>Woo!$SJko*Jv1mu>;d}z
z^vF{3u5Mvo_94`4kq2&R2`32oyoWc2lJco3`Ls0Ew4E7*AdiMbn^LCV<BcH8b%oUi
z)AeZVvuQj4{O02=8A3!Itj8?%JKvT*qMLPgQir&4Z75G?_fH9TXaYWWK7sx<tC%;A
zg!)^(^@|t&KZF+kE{H?p`gbxBn*UIzvHL1!eGRn!C(1%aJ~|~KO-s=%O(!8WBEBF!
zIkHblIYBitF5Pqh^cNK8YuW!2=Arm{{+IRb^d0oAjlXnoXl%Y79slWD{;DbT&kMnQ
zz4)8L&)*lLGqf`QA96ek>%7%mU)hr4S3UVJjDLUoIKRQ)gm?^{1Z}OYzd$1?a~tEY
ztjXmIM*2_qC|OC{7V%430T?RsY?ZLN$w!bkDOQ0}wiq69){Kdu3SqW?NMC))S}zq^
zu)w!>E1!;OrXO!RmT?m&PA;YKUjJy5-Seu=@o;m4*Vp$0OipBl4~Ub)1xBdWkZ<Vj
zw<m&|Iu1LII}T`w+ropEx?z}!V+r(X{8k-?3Rbl#9-ODOW}{n&q*(cmW~b+9FxEL)
zE-7yZaEL)4n#>47=UkJd$`Z}O8ZbpGN$i_WtY^00`S8=EHG#Ff{&MU1L(^wYjTchB
zMTK%1LZ(eLLP($0UR2JVLaL|C2~IFbWirNjp|^=<eFBtVVK7u^V<k;~u4TggYDy0`
z^>Fl48~Sp9zNOCZ@t&;;^avfN(NpNfq}~VYA{q%yjHo4D>JB>XEv(~Z!`1~SoY=9v
zTq;hrjObE_h)cmHXLJ>LC_&XQ2<INN7eW0M+x6Vo^oo~eym<!wZ5F|o_A^HL{;qID
zSgG|s$&g+c(jWr%ns9wj2>BgGfV}e#v}ZF}iF97bG`Nog&O+SA`2zsn%bbB309}I$
zYi;vW$k@fC^muYBL?XB#CBuhC&^H)F4E&vw(5Q^PF{7~}(b&lF4^%DQzL0(BVk?lM
zTHXTo4?Ps|dRICEiux#y77_RF8?5!1D-*h5UY&gRY`WO|V`xxB{f{DHzBwvt1W==r
zdfAUy<qAGooMp&vXZIl#S3KMZ5i+~qaTRRrVj6dsv$71aKg}>d({^*>Y7lObr;_fO
zxDDw7X^dO`n!PLqHZ`by0h#BJ-@bAFPs{yJQ~Ylj^M5zWsxO_WFHG}8hH>OK{Q)9`
zSRP94d{AM(q-2x0yhK@aNMv!qGA5@~2tB;X?l{Pf?DM5Y*Q<tZzEf5E%lYRGe`<@j
z3@tpO`6#10`_Z}g<K_|PtIO@#maOmhYnCo~`lu&kuUtLwJFnIPz3;9l)VsK3y!#ce
zkh9NXJwwCydJtpWX#<dWDjnD1KzKYC0?j`H-F}BpJ=c;NW}o@e8VU}gLH8t?r*C2h
z@*-**#-W~f_DrWT&=|ILwwSZQHBJ!P3t(t2MObDSI<yZabz09Ex2D%+3*>K`{mGA?
zjx;gwnR~#Nep12dFk<^@-U{`&`P1Z}Z3T2~m8^J&7y}GaMElsTXg|GqfF3>E#HG=j
zMt;6hfbfjHSQ&pN9(AT8q$FLKXo`N(WNHDY!K6;JrHZCO&ISBdX`g8sX<CJOh(v20
zp(jBNAl0Szv+!b7-c(#QKEAP1Rr|MH31~EZI&WTbB}c(|`apkziiC*l402n7G{2rX
z<ZQKlYca~$;4c3NgO(~EWYb--7U+31|9XTUKLs=4Na7w-K;Gd#8}$OxzDR>vIf?|8
zX$-W^ut!FhBxY|+R49o44IgWHt}$1BuE|6|kvn1OR#zhyrw}4H*~cpmFk%K(CTGYc
zNkJ8L$eS;UYDa=ZHWZy`rO`!w0oIcgZnK&xC|93#nHvfb^n1xgxf{$LB`H1ao+OGb
zKG_}>N-RHSqL(RBdlc7J-Z$Gaay`wEGJ_u-lo88{`aQ*+T~+x(H5j?Q{uRA~>2R+}
zB+{wM2m?$->unwg8-GaFrG%ZmoHEceOj{W21)Mi2lAfT)EQuNVo+Do%nHPuq7Ttt7
z%^6J5Yo64dH671tOUrA7I2hL@HKZq;S#Ejxt;*m-l*pPj?=i`=E~FAXAb#QH+a}-%
z#3u^pFlg%p{hGiIp>05T$RiE*V7bPXtkz(G<+^E}Risi6F!R~Mbf(Qz*<@2&F#vDr
zaL#!8!&ughWxjA(o9xtK{BzzYwm_z2t*c>2jI)c0-xo8ahnEqZ&K;8uF*!Hg0?Gd*
z=eJK`FkAr>7$_i$;kq3Ks5NNJkNBnw|1f-&Ys56c9Y@tdM3VTT<c|gQHFOuurxWPM
zd5BPAQWbtJat(efGMPekuI2mlJUlU`D8w<kH=TZj%s%*F#bP;lzeR*k)c#B9yO3Ds
z%^|<S+x^z@J^n-+I&VwBC1euOJw3H9XTaz+4yw7m{|>uXOCbWqye9va6+ZSeF0eh}
zYb^ct&<h+o$tWJI5<F&n@AngX(3<(?k3Z}mK{9b5r(^pHajeC|NPzud*I~H3Altw=
zZbGd$uqB8&XoLIcIg5y6OQE~9L(G;@dHPM{uE`ym7o-y+N#`raN$1^lc=`B`e!r-d
z?zp%e!*0W8xYc%wZ}I^<+&j~n?{`ja2`Xry-@5Jc8F3<chx9;q$i8?p%KSN+Pb$=<
zcbe0VK0yC9Ch)GBbQk^VZ;|}+pZ~^p{?qZq?_la|{iR9tMJ8)(_upt^a{Pn@FavV1
z><gfvsafNTZ@>4lQTfNZ3M3(9?{;s><(zq%hza7zcxlZ+`F8J*>%4wq8s$cC6Z=F@
zhbvdv;n$%vEI$B~B)Q&LkTse!8Vt};7Szv2@YB!_Ztp@JA>rc(#R1`EZcIdE+JiI%
zC2!hgYt+~@%xU?;<P17sOqjA=(wxX(r(UE0B;E39C=?vgaVWw|?NPR311o$q%5ekI
z*@`1S?n12yT7Rqt;=H_~4+s8fo!yH}#x(LjMu(bx1AZpqqzkDk@JTO>ir+g92W`*j
z3`@S;I6@2rO28zqj&SWO^CvA5MeNEhBF+8-U0O0Q1Co=I^WvPl%#}<B0MxziiHako
za&<nLQ*EJSuu|g8GG#Y6%6Wpmax}}iz;yrNvYB&8ao?x+(P^$L7-xJGmEIK=P(sO4
zIUv2J{R;B0yV9_=`-1VcE2dw&^0!FpF9Fa$?aE&wnP_=w$v!@K@43an`I>UFDMBVl
z5iXV@d|`QTa$>iw;<I{^jjz7imo=_u;5YeQmS99FNNqKj!-=k^ko26b8ryGAY_8MJ
zb`o|8QZ%hBK|XX@^`Li(#X+A2ttNX(KS<7<xemf1Iw^&YxoD9-%#Df<VJE?Dh=UDC
zm$K|s$+*b%<7X7Y_0aq6w^t<HE`!riyQZxY9C*cxJ_ql!WJOl22Iq;BERH6tUE@}t
z+g&j66p*cTmBUCR^74SMvZt~7-^*`mT_ogF&VqPH=1+B#_C?M}?7TY+5NKOCZMzWL
zKWV^O*TUg6_5s!7CW_WTdHxIL&EV3FR?VgjDFbVER`b7o<n1jfaWvU~>m$^}6JeuW
zjr;{)S2TfK0Q%xgHvONSJb#NA|LOmg{U=k;R?&1tQbylMEY4<1*9mJh&(qo`G#9{X
zYRs)#*PtEHnO;PV0G~6G`ca%tpKgb6<@)xc^SQY58lTo*S$*sv5w7bG+8YLKYU`8{
zNBVl<SZLN=wqsXA_u7Zd;ghe=2k7syXVNHZHnKf0^zT`g!gwhf_TO!xPV&(=!?)pS
zg|8uLBl(l-u=z1DFfyWC`^@MzMj_3G#XP`Od$VdHf)RSl*+#;9kOg(tyGX$#MfgK#
z_*w3nZ4Mz3If|=Gmll*}7Nh60OkyR>vgaDu7icvyf;N&%42z2L4(rR<*Jd48X8Jnw
zN>!R$%MZ@~Xu9jH?$2Se&I|ZcW>!26BJP?H7og0hT(S`nXh6{sR36O^7%v=31T+eL
z)~BeC)15v>1m#(LN>OEwYFG?TE0_z)MrT%3SkMBBjvCd6!uD+03Jz#!s#Y~b1jf>S
z&Rz5&8rbLj5!Y;(Hx|UY(2aw~W(8!3q3D}LRE%XX(@h5TnP@PhDoLVQx;6|r^+Bvs
zaR55cR%Db9hZ<<|I%dDkone+8Sq7dqPOMnGoHk~-R*#a8w$c)`>4U`k+o?2|E>Sd4
zZ0ZVT{95pY$qKJ54K}3JB!(WcES>F+x56oJBRg))tMJ^#Qc(2rVcd5a<lQMbJ$!JZ
z8d)_k56<ry_OO(RMRO)9P|wG=;Hf!aoYTn5HBlc^>dd=Us6vpBNkIg9b#ulk%!XBU
zV^fH1uY(rGIAiFew|z#MM!qsVv%ZNb#why9%9In4Kj-hDYtMdirWLFzn~de!nnH(V
zv0>I3;X#N)bo1$dFzqo(tzmvqNUKraAz~?)OSv42MeM!OYu;2VKn2-s7#fucX`|l~
zplxtG1Pgk#(;V=`P_PZ`MV{Bt4$a7;aLvG@KQo%E=;7ZO&Ws-r@XL+AhnPn>PAKc7
zQ_iQ4mXa-a4)QS>cJzt_j;AjuVCp8g^|dIV=DI0>v-f_|w5YWAX61lNBjZEZax3aV
znher(j)f+a9_s8n#|u=kj0(unR1P-*L7`{F28xv054|#DMh}q=@rs@-fbyf(2+52L
zN>hn3v!I~%jfOV=j(@xLOsl$Jv-+yR5{3pX)$rIdDarl7(C3)})P`QoHN|y<<2n;`
zJ0UrF=Z<Hch0fA7*Jo?X%~>v}d=F(Uj}~Yv9(@1pqUSRa5_bB*AvQ|Z-6YZ*N%p(U
z<;Bpqr9iEBe^L<k9C5CYB)5Rye}>FF!t{1UnRtaH-9=@p35fMQJ~1^&)(2D|^&z?m
z855r&di<Hmzf*5|z8nGPgU0W+LJ`EQwMFCsa~}_?y!-+#xIZB-61V6Si_X5+{~}lt
z`pgWXdqc$p!ZzoGo!-(Pg*=*_1TP9q>VS6}jmt2)A7LZDiv;&Ys6@W5P{JHY!!n7W
zvj3(2{1R9Y=TJ|{^2DK&be*ZaMiRHw>WVI^701f<gKaFlP%PTd+(EB*(uJ3f47>C)
zAp<SsJf$2vWO-!|<*3x~5M5N?B#2XhEGbN6@dCul1?<FS^vGejiD<`-JF3|OU9g``
z4$Tl7iFObNb#lf#z{MfgFrw}34Msv?Jhs-HfuPXrzHMmvJWPAWCSpW1ELpK3IOKQD
zB7DVMPyRi9Ne9L`ejsg$#V|7-p{Q&eR?$lc{(CfTI$rtro0vA6jYA3g=9Vj31E$40
zn%<Gg?AYm!G;DYq?&~Pm20}e9{s0khED|v|3Sww734EPs5A8mI4B`r)7^lI!eg4o{
ze>1?8?oiU%Faj?Qhou6S^d11_7@tEK-XQ~%q!!7hha-Im^>NcRF7OH7s{IO7arZQ{
zE8n?2><7*!*lH}~usWPWZ}2&M+)VQo7C!AWJSQc>8g_r-P`N&uybK5)p$5_o;+58Q
z-Ux2l<3i|hxqqur*qAfHq=)?<Pj-*)@>GDchq}ShV#m6&w|mi~ar~`EO_<hu1Uigv
zJo}M-nkzq3DhtE+UQuVL9BBg5#oA<p^j{Z~hG}GuHSq!|u@VeZEorYMaz5()GQFPa
zoB55~Vv&EvQ{FBjYKp$R^TF5sFQux#co8{$hcDLQ|Kzp`j^h8DdZqBESyR)O9%_4-
zWuQ(TIe0_>S=fb~<}66U>5i7$H#m~wR;L~4yHL2R&;L*u7-SPdHxLS&Iy7<IREdCS
z7-x!}ALyF(N?5GZUc9A+n2VlFwoj&oTi20BAS4}+rV%zb&QsejN95fZh@f9FpI}j(
zWp@cGJVTN=RlufWKB6IbS4}L$zrW7z(se`A+xGR#TN>6q$2j#Pe)$WulRiCICG*t+
zeehM8`!{**KRL{Q{8WCEFLXu3+`-XF(b?c1Z~wg?c0lD!21y?NLq?O$STk3NzmrHM
zsCgQS5I+nxDH0iyU;KKjzS24GJmG?{D`08|N-v+Egy92lBku)fnAM<}tELA<a5Kg3
zXmaS~xRSndcQ>_U`)xKYb=pq|hejMCT1-rg0Edt6(*E9l9WCKI1a=@c99swp2t6Tx
zFHy`8Hb#iXS(8c>F~({`NV@F4w0lu5X;MH6I$&|h*qfx{<TT3)RoOADF_c-mK?I$Y
zV`JfSp>~DJ*h5e|61t1QP}tZEIcjC%!Fa)omJTfpX%aI+OD*Y(l|xc0$1Zip;4rx;
zV=qI!5tSuXG7h?jLR)pBE<lUAyl~;_)Nr31I|7i4ZH614F)D_B3gg|AAWhYxZyqwq
zFgU$G9YcYr5%f?G=%DP5M*>x!B15HCoVycD&Z2dlqN*MFQDb!|yi0j~JciNC!>){~
zQQgmZvc}0l$XB0VIWdg&ShDTbTkArryp3x)T8%ulR;Z?6APx{JZyUm=LC-ACkFm`6
z(x7zm5ULIU-xGi*V6x|eF~CN`PUM%`!4S;Uv_J>b#&OT9IT=jx5#nydC4=0htcDme
zDUH*Hk-`Jsa>&Z<7zJ{K4AZE1BVW%zk&MZ^lHyj8mWmk|Pq8WwHRO<q<ME!8yXa7z
z2^Zcbm(L!F$VZKg_a|01w?&DbIcPj7E<!<^SI+N)Whl+QD<7Da=V5Rdt0*_P*q|}B
zAD>z0Kwj-AFqvR)H2gDN*6dzVk>R<J|IX33&ED24t3Vh1`!l)y*<5Z$r29?81G`pE
z44Nsw^E&Jg*o*b7dBUX5YT(Q=nOlC{Gi)c`@i{-B3Pxa%RIZN{K~K?)KnH3>3@_CV
zw3Z@6s^73xW)XY->AFwUlk^4Q=hXE;ckW=|RcZFchyOM0vqBW{2l*QR#v^SZNnT6j
zZv|?ZO1-C_wLWVuYORQ<epX=8R;Uxyq2QS<8{r%wj~gS~sH-C|{2QdBg8XC%JvhB5
z_|<sltc2K21pX`P4s4<d{(TqFwSmy{kmM{nCJ|SeyT^ofCW`W$KLR2MY>ryj29JA;
zS4BsxfVl@X!W{!2GkG9fL4}58Srv{$-GYngg>JuHz!7ZPQbfIQr4@6ZC4T$`;Vr@t
zD#-uJ8A!kSM*gA&^6yWi|F}&59^*Rx{qn3z{(JYxrzg!X2b#uGd>&O0e=0k_2*N?3
zYXV{v={ONL{rW~z_FtFj7kSSJZ?s);LL@W&aND7blR8rlvkAb48RwJZlOHA~t~RfC
zOD%ZcOzhYEV&s9%qns0&ste5U!^MFWYn`Od()5RwIz6%@Ek+Pn`s79unJY-$7n-Uf
z&eUYvtd<vwymLT9=5a*XKD0yP>)f7h7zG_hDiFC!psCg#q&0c=GHKOik~$$>$Fw*k
z;G)HS$IR)Cu72HH|JjeeauX;U6IgZ_IfxFCE_bGPAU25$!j8Etsl0Rk@R`$jXuHo8
z3Hhj-rTR$Gq(x)4Tu6;6rHQhoCvL4Q+h0Y+@Zdt=KTb0~wj7-(Z9G<l!NM8FF&IFb
z8B{sC3jSltRks_?yI}M&s#m9IeRGo^@1$j@#?y;4WM~?|Gwo8mz^BdXl|%zQSl&WI
z^(ZL%Fu<2Nl~hh230-f|`cs${8iy7A(D1}^x9NH_99EUpZ8;%=p=8elwS|6)-n|mc
zD2;7$1u%}=&3t?p&8r+T(~QM^-UVsz1C7VQ{NihtW`_4+*=}ura(A$B8i=EN%jnv2
zA*kcW2zjqnd;(J>%J+aQu05@k6JHeCC|YRFWGdDCV}ja;-yl^9<`>f=AwOqML1a~*
z9@cQYb?!+Fmkf}9VQrL8$uyq8k(r8)#;##xG9lJ-B)Fg@15<q#EP5at8YAu;Y(&hu
zEAdj~p((Lah;|O_H>&To(@xgk9SP*bkHlxiy8I*wJQylh<mPu(3&*|7^Hi2mXUD?}
zEgFYK60=l;bz$9~Mnnf>(+9X~H-Is!g&C!q*eIYuhl&fS&|w)dAzXBdGJ&Mp$+8D|
zZaD<+RtjI90QT{R0YLk6_dm=GfCg><HB~Mg8ruH;g}7!yef!4s|4o(u;h6-CO>7;$
zlyLsNYf@MfLH<}ott5)<Z%qqoE`(+N?$xuNpqEJunxScLr$N?8`fEhM9>t2CXiQos
zFLt^`%ygB2Vy^I$W3J_Rt4olRn~Gh}AW(`F@LsUN{d$sR%bU&3;rsD=2KCL+4c`zv
zlI%D>9-)U&R3;>d1Vdd5b{DeR!HXDm44Vq*u?`wziLLsFUEp4El;*S0;I~D#TgG0s
zBXYZS{o|Hy0A?LVNS)V4c_CFwyYj-E#)4SQq9yaf`Y2Yhk7yHSdos~|f<ERWN(ffs
z=JgUnjC%!4YUZk5oXVLdM<0d0n(g9fyR#~d>ImZG5_3~~o<@jTOH@Mc7`*xn-aO5F
zyFT-|LBsm(NbWkL^oB-Nd31<Ot*~rDU3JWHA-^@=s&Lk113mQoM1GZq%TB!YymZVI
zI@m@VRwRq{Z4-OCZ>djBaYebhIGXhsJyn~`SQ6_4>{fqIjRp#Vb|~+Qi}Mdz!Zsw=
zz?5L%F{c{;Cv3Q8ab>dsHp)z`DEKHf%e9sT(aE6$az?A}<jz~3-pWMJE;7I_0~M|#
zbe+zoVO-=xagqFFSP=H*Zz-q?l&qex0R61P*0DH_l;Yh3Pe_()_8~M#iDjcOkCU=(
zo-U(dH<5Nzo6LtHlhko8$K{j&M|7mhE`2d<T)mZYCd+nnUC;cJDlWDq2Mp^2v2uyl
z(oDaZ@SDMYCP6b^b*O{Tb`wXh3O-?Vp?P##cU<#}IA9ppEqI?YH7&1(-DxNS*8N+<
zg;_X64lBdU=ay{Rbk}y=bT-;B{i>3P`Lm(~W$8Jr=;d8#?dm_cmv>2673NqAOenze
z=&<Oe<;qT(J6@d9tcp6n)@)Wy;}D<+J@sox_&vbjN?!$8l{W=W%;}bYSzvl(LnJ#&
zOk_yZ8?|3|`Zg+f7IDrVXd_%*v6A=UenMQ~^?s7r+_LE)6kSpZNMk?+3%Qr1<MGH}
z^jy<c+03rW79h&L0qJtZuls+JX}n(Ja?3_=v&8Z=`{8%^J&mwPc?J!U{|NyUSV*#j
zz}a^lJkWtmixzZ2l_iPQ<J?yb`G#C!yd+Nbct7L#S27X4`>QW`?TQAu5~LzFLJvaJ
zaBU3mQFtl5z?4XQDBWNPaH4y)McRpX#$(3o5Nx@hVoOYOL&-P+gqS1cQ~J;~1roGH
zVzi46?FaI@w-MJ0Y7BuAg*3;D%?<_OGsB3)c|^s3A{UoAOLP8scn`!5?MFa|^cTvq
z#%bYG3m3UO9(sH@LyK9-LSnlVcm#5^NRs9BXFtRN9kBY2mPO|@b7K#IH{B{=0W06)
zl|s#cIYcreZ5p3j>@Ly@35wr-q8z5f9=R42IsII=->1stLo@Q%VooDvg@*K(H@*5g
zUPS&cM~k4oqp`S+qp^*nxzm^0mg3h8ppEHQ@cXyQ=YKV-6)FB*$KCa{POe2^EHr{J
zOxcVd)s3Mzs8m`iV?MSp=qV59blW9$+$P+2;PZDRUD~sr*CQUr&EDiCSfH@wuHez+
z`d5p(r;I7D@8>nbZ&DVhT6qe+accH;<}q$8Nzz|d1twqW?UV%FMP4Y@NQ`3(+5*i8
zP9*yIMP7frrneG3M9<x`C|Uwyu3dsv4zoxbW~fjQ53vZ7q<NEkN(r5b*Wy)tY7p+>
zf>GsjA!O#Bifr5np-H~9lR(>#9vhE6W-r`EjjeQ_wdWp+rt{{L5t5t(Ho|4O24@}4
z_^=_CkbI`3;~sXTnnsv=^b3J}`;IYyvb1gM>#J9{$l#Zd*W!;meMn&yXO7x`Epx_Y
zm-1wlu~@Ii_7D}>%tzlXW;zQT=uQXSG@t$<#6-W*^vy7Vr<i&_SYE8%wl1b@4D`Po
zE*TZe#IR^FiNHp-8|lH+`f+9lQM6TtEoCqY_WE+{`?=zH9**BTFB}0LS+GGUReWVc
zX7>2TCpnix@7<HhKxgy@Ev<$wJY}=|7Hp5=>!_|aNXEnN<-m?Oq;<hv>DpN*x6f>w
za1Wa5entFEDtA0SD%iZv#3{wl-S`0{{i3a9cmgNW`!TH{J*~{@|5f%CKy@uk*8~af
zt_d34U4y&3y9IZ5cXxLQ?(XjH5?q3Z0KxK~y!-CUyWG6{<)5lkhbox0HnV&7^zNBn
zjc|?X!Y=63(Vg>#&Wx%=LUr5{i@~OdzT#?P8xu#P*I_?Jl7xM4dq)4vi}3Wj_c=XI
zSbc)@Q2Et4=(nBDU{aD(F&*%Ix!53_^0`+nOFk)}*34#b0Egffld|t_RV91}S0m)0
zap{cQDWzW$geKzYMcDZDAw480!1e1!1Onpv9fK9Ov~sfi!~OeXb(FW)wKx335nNY!
za6*~K{k~=pw`~3z!Uq%?MMzSl#s%rZM{gzB7nB*A83XIGyNbi|H8X>a5i?}Rs+z^;
z2iXrmK4|eDOu@{M<gyi`>dS+?@(!-Ar4P4?H_yjTEMqm7`rbV4P275(-#T<owm!@+
zdOcx#OGyMxf!2p7KH>W##v#Dt14Yn9UB-Sg3`WmL0+H~N;iC`Mg%pBl?1AAOfZ&e;
z*G=dR>=h_Mz@i;lrGpIOQwezI=S=R8#);d*;G8I(39ZZGIpWU)y?qew(t!j23B9fD
z?Uo?-Gx3}6r8u1fUy!u)7LthD2(}boE#uhO&mKBau8W8`XV7vO>zb^ZVWiH-DOjl2
zf~^o1CYVU8eBdmpAB=T%i(=y}!@3N%G-*{BT_|f=egqtucEtj<Y=-+d$UnDNO-T<Q
z_K|=)EJj7lT-bpTa89Ywn2(1LbOmaaJuFiaS22#P!%%S7o4vH52#0GKZ`vYgV&wj-
ze-1lY80g|S$HvKNTxpES?fH8Db~^rg#pkByaW3d&*ILU%sidx?h=5^q%z&Ounv=tR
zwp!EoZ>RJJhSf)tiBhpPDpgzOpG12UgvOFnab&16Zn^2ZHjs)pbd&W1jpx%%EXmE^
zdn#R73^BHp3w%&v!0~azw(Fg*TT*~5#dJw%-UdxX&^^(~V&C4hBpc+bPcLRZizWlc
zjR;$4X3Sw*Rp4-o+a4$cUmrz05RucTNoXRINYG*DPpzM&;d1GNHFiyl(_x#wspacQ
zL)wVFXz2Rh0k5i>?Ao5zEVzT)R(4Pjmjv5pzPrav{T(bgr|CM4jH1wDp6z*_jnN{V
ziN56m1T)PBp1%`OCFYcJJ+T09`=&=Y$Z#!0l0J2sIuGQtAr>dLfq5S;{XGJzNk@a^
zk^eHlC4Gch`t+ue<VfR^y>3RviiOlhz81CD9z~d|n5;A>AGtkZMUQ#f>5M14f2d}2
z8<*LNZvYVob!p9lbmb!0j<mNhyrh9%FD1`aBa9*{B@wAL@R%8L(4Z}Bhu)EZU<Wjp
zUW$Nx%L%v<-QFe3ay4F2Ykw-?sX;aYeUkZmX1>t)xn6O&JS)`}7v}j+csS3e;&Awj
zoNyjnqLzC(QQ;!jvEYUTy73t_%16p)qMb?ihbU{y$i?=a7@JJoXS!#CE#y}PGMK~3
zeeqqmo7G-W_S97s2eed^erB2qeh4P25)RO1>MH7ai5cZJTEevogLNii=oKG)0(&f`
z&hh8cO{of0;6KiNWZ6q$cO(1)9r{`}Q&%p*O0W7N--sw3Us;)EJgB)6iSOg(9p_mc
zRw{M^qf|?rs2wGPtjVKTOMAfQ+ZNNkb$Ok0;Pe=dNc7__TPCzw^H$5J0l4D<F6e~>
z%p(_0w(oLmn0)YDwrcFsc*8q)J@ORBRoZ54GkJpxSvnagp|8H5sxB|ZKirp%_mQt_
z81+*Y8{0Oy!r8Gmih48VuRPwoO$dDW@h53$C)duL4_(osryhwZSj%~KsZ?2n?b`Z*
z#C8aMdZxYmCWSM{mFNw1ov*W}Dl=%GQpp90qgZ{(T}GO<vFy*1j4~by*dTmbA*g%S
zQBgTLH75u%3+%7>S8#>sbiEU;zYvA?=wbD5g+ahb<ryFqY$b|{Y%Pd__A>d1#s`=|
zV6&f#ofJC261~Ua6>0M$w?V1j##jh-lBJ2vQ%&z`7pO%frhLP-1l)wMs=3Q&?oth1
zefkPr@3Z(&OL@~|<0X-)?!AdK)ShtFJ;84G2(izo3cCu<GpO8mFv>Kc{>`+aDoziL
z6gLTL(=RYeD7x^FYA%sPXswOKhVa4i(S4>h&mLvS##6-H?<?=7+Ij1Xxa|B$8*-A&
zSEa0h1kDx^+CUIDS3LZYugl+gbdxDaW(P7&W~=D{i&N{(zis^%XlECpG7^dK263K^
zbX#A!`ULU{)yl~<fKSAA=x&AmXjFh#dv#gDTntk>w8q!B<8Alk>nQEwUG<v>)SFXK
zETfcTwi=R3!ck|hSM`|-^N3NWLav&UTO{a9=&Tuz-Kq963;XaRFq#-1R18fi^Gb-;
zVO>Q{Oe<^b0WA!hkBi9iJp3`kGwacXX2CVQ0xQn@Y2OhrM%e4)Ea7Y*Df$dY2BpbL
zv$kX}*#`R1uNA(7lk_FAk~{~9Z*Si5xd(WKQdD&I?8Y^cK|9H&huMU1I(251D7(LL
z+){kRc=ALmD;#SH#YJ+|7EJL6e~w!D7_IrK5Q=1DCulUcN(3j`+D_a|GP}?KYx}V+
zx_vLTYCLb0C?h;e<{K0`)-|-qfM16y{mnfX(GGs2H-;-lRMXyb@kiY^D;i1haxoEk
zsQ7C_o2wv?;3KS_0w^G5#Q<Nd&I|bQ%{Z$Tw13Boy>g<yj@$x(KX?t;IsC0xO-WNb
zJAeoH#{vu3KmV`QH3JZ4nUw*EnmA#vFQ8(Q2S-T=EQ8d*#^4u2P6T1ROVy$6Rz_bK
zOFcug;>f*>u)3bT<3kGQL-z#YiN9QH7<(oDdNlSdeHD<WSbdt++35+A+#eeWYReuw
z^iGtV)Im)cie-K|JT}xOeka**DxGT5Rsg3FBT)P9N}O6#zQT2l0W-XaFS+J}-6E4_
zU~?)Vc7Ncm!z!iaic<A4W17aCSt2b+=P+S3aj5MgQle8<PV6aow7Pz<Vg~yjLq3eM
z+BmFy$2K-|MtTKX+M3qRjGU`8#+MDX__HCqQ3tANi0IK8M5X#Ej<AYM1+kW49?Rr>
zQJN-U*_wJM_cU}1YOH=m>DW~{%MAPxL;gLdU6S5xLb$gJt#4c2KYaEaL8ORWf=^(l
z-2`8^J;&YG@vb9em%s~QpU)gG@24BQD69;*y&-#0NBkxumqg#YYomd2tyo0NGCr8N
z5<5-E%utH?Ixt!(Y4x>zIz4R^9SABVMpLl(>oXnBNWs8w&xygh_e4*I$y_cVm?W-^
ze!9mPy^vTLRclXRGf$>g%Y{(#Bbm<X_MNEZg=Cz85;VpJho=eow^&@FAFzl_gNq@j
zhiOfvMZ%`M$R}?QhS5C<TKGTskMZuyUaj>2xxr_Mrsvd7ci|X|`qGe5=54Zt2Tb)N
zl<q;d278!&VQhhKSnr-*!GS%n={}fB^iMZN$)fMlc?QpI#UPb9=X>ykxE&re1ny<F
zr0pXUeMiQ3Wf&gx$xYW+6s!<uCnzV2!&agpXV@_kQv+5ORU2M5e&_S|)7b=$2Vc;K
z<DKv>+O7g#`6e_zyjVj<lO?>Ri5!DeTvSJ9^BJqQ*ovJ%?dkaQl!8<r$UYNRVhp;k
zU=+Hb#}A4<s59?S-e%l^|25L004mO13NZgZfcgKHclmF-cha>r{F`@KuDEJB3#ho5
zmT$A&L=?}gF+!YACb=%Y@}8{SnhaGCHRmmuAh{LxAn0sg#R6P_^cJ-9)+-{YU@<^-
zlYnH&^;mLVYE+tyjFj4gaAPCD4CnwP75BBXA`O*H(ULnYD!7K14C!kGL_&hak)udZ
zkQN8)EAh&9I|TY~F{Z6mBv7sz3?<^o(#(NXGL898S3yZPTaT|CzZpZ~pK~*9Zcf2F
zgwuG)jy^OTZD`|wf&bEdq4Vt$ir-+qM7BosXvu`>W1;iFN7yTvcpN_#at)Q4n+(Jh
zYX1A-24l9H5jgY?wdEbW{(6U1=Kc?Utren80bP`K?J0+v@{-RDA7Y8yJYafdI<7-I
z_XA!xeh#R4N7>rJ_?(VECa6iWhMJ$qdK0Ms27xG&$gLAy(|SO7_M|AH`fIY)1FGDp
zlsLwIDshDU;*n`dF@8vV;B4~jRFpiHrJhQ6TcEm%OjWTi<S2}tPfA(ag+#Rx<RV35
zsb{ioRg!w?x=}Ja-hpR(v5#628Jo$?zVwoO;ILOoxo<0sez#p_n#H8em@RxuIwY3+
zF;?X~UfU&T<%Q7b<EVjROG(RI$<`XJ#Nzn)_!Jc$*Fbwba_d*^vvV7>+KmE7+X{19
z>e!sg0--lE2(S0tK}zD&ov-{6bMUc%dNFIn{2^vjXWlt>+uxw#d)T6HNk6MjsfN~4
zDlq#Jjp_!wn}$wfs!f8NX3Rk#9)Q6-jD;D9D=1{$`3?o~caZjXU*U32^JkJ$ZzJ_%
zQWNfcImxb!AV1DRBq`-qTV@g1#BT>TlvktYOBviCY!13Bv?_hGYDK}MINVi;pg)V-
z($Bx1Tj`c?1I3pYg+i_cvFtcQ$SV9%%9QBPg&8R~Ig$eL+xKZY!C=;M1|r)$&9J2x
z;l^a*Ph+isNl*%y1T4SviuK1Nco_spQ25v5-}7u?T9zHB5~{-+W*y3p{yjn{1obqf
zYL`J^Uz8zZZN8c4Dxy~)k3Ws)E5eYi+V2C!+7Sm0uu{xq)S8o{9uszFTnE>lPhY=5
zdke-B8_*KwWOd%tQs_zf0x9+YixHp+Qi_V$aYVc$P-1mg?2|_{BUr$6WtLdIX2FaF
zGmPRT<p6)(TV864%~8JJvDGnsOLYaKl+j{&dQ>rdIz)DNE)j*_>b9E}sp*(1-16}u
za`dgT`KtA3;+e~9{KV48RT=CGPaVt;>-35}%nlFUMK0y7nOjoYds7&Ft~#>0$^ciZ
zM}!J5M<I9?@*1gE!M%&vJ!WEs(Pd8Os|?SAqIe_rhjAy#)|>z{&|&lyG^bnmh?YtR
z*Z5EfDxkrI{QS#Iq752aiA~V)DRl<yhO<WJ>C*2jlA|nCU!@CJwxO#<=j6ssn;muv
zhB<gvVmveDM~C#@54_F{$xcyg*In%8YnYrgxdofZLcY`(Kx;6)r~o9;Q!pE<-iC*s
zVm27x?^jQ!xDmX@*N36OAlWG$u-Snr_>T9~35VtwsoSLf*(7vl&{u7d_K_CSBMbzr
zzyjt&V5O#8VswCRK3AvVbS7U5(KvTPyUc0BhQ}wy0z3LjcdqH8`6F3!`)b3(mOSxL
z>i4f8xor(#V+&#ph~ycJMcj#qeehjxt=~Na>dx#Tcq6Xi4?BnDeu5WBBxt603*BY&
zZ#;o1kv?qpZjwK-E{8r4v1@g*lwb|8w@oR3BTDcbiGKs)a>Fpxf<rH?+U$sa>zh&b
ziQANuJ_tNHdx;a*JeCo^RkGC$<J2-iDHuH^Wf}S!^~ekA+iohMQICP@^DaRwQ*1~v
zcbS`q5P#R6lzj34p_=rzjrU|8f(TfnsFdtDJ*nIr>(TXS;jnxk=dx++D8|dmPP<0@
z$wh#ZYI%Rx$NKe-)BlJzB*bot0ras3I%`#HTMDthGtM_G6u-(tSroGp1Lz+W1Y`$@
zP`9NK^|IHbBrJ#AL3!X*g3{arc@)nuq<IGiFt(y^rqphJ!<|TfdOFxb_a>a<L#aaS
z85Hs!2U6s_R53N=L5BL;4%cl}=mF5SBBPQH@~dDx$W600YEHNjm_Zb3{=#~+DxQFt
zI8jk9_7z^2-gHGt<yqmrqMmVFz#zq7bWrKTHYsy%)=+U$ad8UVYrb2}ELqJ{%zR!I
z5vHJl%n|j6{=QcY5MQM4aTab#^0N4P6&TD|qgRlmj>{=*2y+DvSwE=f*{>z1HX(>V
zNE$>bbc}_yAu4OVn;8LG^<Td?xCjbV_j7U+DSnDdYpt8jIU24UvB<v~v->naq5HZY
zh{Hec==MD+kJhy6t=Nro&+V)RqORK&ssAxioc7-L#UQuPi#3V2pzfh6Ar400@iuV5
z@r>+{-yOZ%XQhsSfw%;|a4}XHaloW#uGluLKux0II9S1W4w=X9J=(k&8KU()m}b{H
zFtoD$u5JlGfpX^&<igWOV3zVVp*G3*<pGG?fm^|kfQMlNAo1e2wj2Mr`G3Sk|A;ar
zD14U!B&$E)xbBVE#H)b{$RdW-36IM5Wxd5RlL&_(A$|Q_y&}ohx!vpxE-z{u`HqGN
zID~}T`#j&qQ60fNjxTQFY;3~)%lO#Y)BTsHciwEAM}j;O8GUt;jG=r~1+;lPSd_4}
z?2IS@q|kIpJr-LWm0J~oZZME|3m7${tB-_@oM($=^{n<!E5Q8HQ^D(9MdP`jTQ336
zs*d%_bvYGd84BKcT?`dR4`aikjw64oyTXHD37_$H2fP+OE6jQ4(Flxi#gr;Y{$uD(
zr=HNkyrCR<Gd2h_C8}M;$!hb-dUD?OiKkML%haG4<bA0D`Bz7&$UJs=frC7i7wmh@
z$u#!lbzW5aH$lp6_(vv9lhL7m`_+NqFf@}2PEMYN%h-FfWeA4&`xv&yA^L|q4W|OK
z6`VZcTM3VBt<%-k9#l(^76;7~fwXIZw1j*x8t(_*qxtc1GSYg((9tBoQ0m0!?s}~i
zaa1Tf@PR~C8GK?Nz`$VB?oJLIgekDQG#YyB)m~q7Jh_WM8ZygugFmV`5PbMby044V
zZnr}fm;)C_)mB6?i48kgiL@>SXHlp$J~wk|DL^YVNh2w(oZ~1*W156YRmenU;g=mI
zw({B(QVo2JpJ?pJqu9vijk$Cn+%PSw&b4c@uU6vw)DjGm2WJKt!X}uZ43XYlDIz%&
z=~<J4kbF4G)Xi+8IPk-7zSVE0nBiiOKF};<Qh`r(>RlgZpU-tu_rD`5!t?289PTyQ
zZgAEp=zMK>RW9^~gyc*x%v<oIwL~g7tz*<jGXl(a(Xo>G;l+<a6wV1(rNGPS)OdW$
z9JrC2^lRoVI4lCa0w3|QEJp%^HR0k!4CI;uN|=oljx2=_35}4E)OfW<fQ9zlQLw(^
zYWPYq<Y<$8MgOZeY|Lv@6A!R`XMpYhe|W>c-V?}Bm;^{RpgbEnt_B!FqvnvSy)T=R
zGa!5GACDk{9801o@j>L8IbKp#!*Td5@vgFKI4w!5?R{>@^hd8ax{l=vQnd2RDHopo
zwA+qb2cu4Rx9^Bu1WNYT`a(g}=&&vT`&Sqn-irxzX_j1=tIE#li`Hn=<N%}%Uj=Bs
zuHQaYhv8>ht<P+TyrKNwyktkppz#H(XBoAFYKOHX5ZtjVdYKK*VzNA_<CK|VW4ii6
z@bDXq(7Xdx=XUVhDu_m<FOP-G*Zm#(DX@dgkZwe49?K^w7a*gPn%X5}*-W{?sS~?q
zLE8e!k=AKO;Hqa6D5drTVWkN~57b?IHv}OFIL@9TtT$J}@0S(0P$HD2`)oK*69zck
zf|Lj;os6LrVZ#uc4yp=j;?p~|bcUXwQ*$~kSu_y=`?H_D^k$(f1|P{bTyIaX6~rpt
zs5*5mR&DDflv`a~hP-{^eTXT|oX4t`<MahVmF8h7S*rLS`i?sgk+~3RcJh5>4KQXp
zzZj`JO+wojs0dRA#(bXBOFn**o+7rPY{bM9m<+UBF{orv$#yF8)AiOWfuas5Fo`CJ
zqa;jAZU^!bh8sjE7fsoPn%Tw11+vufr;NMm3*zC=;jB{R49e~BDeMR+H6MGzDlcA^
zKg>JEL~6_6iaR4i`tSfUhkgPaLXZ<@L7poRF?dw_DzodYG{Gp7#24<}=18PBT}aY`
z{)rrt`g}930jr3^RBQNA$j!vzTh#Mo1VL`QCA&US?;<2`P+xy8b9D_Hz>FGHC2r$m
zW>S9ywTSdQI5hh%7^e`#r#2906T?))i59O(V^Rpxw42rCAu-+I3y#Pg6cm#&AX%dy
ze=hv0cUMxxxh1NQEIYXR{IBM&Bk8FK3NZI3z+M>r@A$ocd*e%x-?W;M0pv50p+MVt
zug<ZdBC=p$&$nZSlORb-3>o<@_ij*6RZ;IPtT_sOf2Zv}-3R_1=sW37GgaF9Ti(>V
z1L4ju8RzM%&(B}JpnHSVSs2LH#_&@`4Kg1)>*)^i`9-^JiPE@=4l$+<g4SY(YxI1W
zj62)<X7H&LUhk7#;S6+O4-eYN>?NbAP?44hX&XAZy&?}1;=8c(e0#-3blt<NQAZjX
zedDseA*YO-bGCIIdPLiN4kCxI3NAr1slhZLNrb4l9^q~8kruGq87@UxJEHZA-jGR0
za*QMMZ9vn!#mpH{+k=U$LK;Fz3n0l!zf-o)8Z)IYI^DK00-S`!j}G!_LwIoA;1oY6
zizXYwW~-?ZUoxfKcUhPgws7|pEB+3js&ngS$7H|hdOycvL~Fq%iHLRu`tg$7{H#$O
zO-=A5$6Pn7s&UMmbEWeX2X<mjSAbQ;^VEN3d#i#`Jkr-VIoQOxv~%N_;C1atrxM(K
zjm{yex3wQ(5LNZ~*|Ya$1TF|Oj~%-xG0GAR2~fjF?_n{S$PjXK<XAXm%+waeVfUbK
zU$Ms3Bx+;cBc(321~4HYSL{ehxTB|~zgufnSPa$gsH9jGBg^xz$tOFPhR&*GD%2lG
zNs@D|Nph_L6tA>VWg6h=k!(mCx=6DqOJ-I!-(g;*f~DDe={{JGtH7=UY|0F<WySM5
zHl=83_759Y?TVvvfP;lxPO+jrwC^DhE(3x|MIro?;6baSXJ*Ku%K22QT8ZRs?CJR>
zNk(YyXsGi;g%hB8x)QLpp;;`~4rx>zr3?A|W$>xj>^D~%CyzRctVqtiIz7O3pc<L_
zqUWaqtC`gzYKN;+KKY48$Q9-_Vf8b;sy`8(4BifW|3G+@2<wyp0(=j$%DhG_o;WI`
zs^h+F6V{wd0i75#s%~UCOqP(ZslsfL7m8isHwo#VuZ|)@$rDFoFcIrW*Ld7qsF|O4
z^Y}_h=a9B`QoeZSoru9koun0Smk6$*xzv=}mm?;hi&**W{T5ck0=X61wL#ln`a2;h
zEj6<lCYLv$y&Ljz0>@r@JdGJiH@%XR_9vaYoV?J3K1cT%g1xOYqhXfSa`fg=bCLy%
zWG74UTdouXiH$?H()lyx6QXt}AS)cOa~3IdBxddcQp;(H-O}btpXR-iwZ5E)di9Jf
zfToEu%bOR11xf=Knw7JovRJJ#xZDgAvhBDF<8mDu+Q|!}Z?m_=Oy%Ur4<fwIO`fHT
zQkR`d%X~U0!l#`_Sp}L~f179_XmCHzj4q}_<S?TP!|VnMj9Vkq)VkMfE2)OMa?9lU
z5w<uozVEFE*y^D;CZ8`j-$&4>p<71cD@0OGZW+{-1QT?U%_PJJ8T!0d2*a9I2;%|A
z9LrfBU!r9qh4=3M<lMZ-S<}QF*~;$yWbC5~kW*0%-ksaNJ=!*+{n|DR_@SBo&Dr*e
zoW^8Zi}mb?k-=8nm0Db|&R`SzZ{P0&=cg|7?~dbN+_G1xfoQ)qEd8W<HDdGW4L7SQ
zpk#?izu<Qv-z=y1weQ(92r`%P>m3nR_~X-EyNc<;?m`?dKUNetCnS)}_-%QcWuOpw
zAdZF`4c_24z&m{H9-LIL`=Hrx%{IjrNZ~U<7k<b7g*<@qlAQ645w;-sH~i2#<T$+j
z&QZ+tLTVa1)%2`!n2Ml!p1(eg4b;-+(2#(D%mK+kB)>6p{_wRkR84g>`eUBOQd3x5
zT^kISYq)gGw?IB8(lu1=$#Vl?iZdrx$H0%NxW)?MO$MhRHn8$F^&mzfMCu>|`{)FL
z`ZgOt`z%W~^&kzMAuWy9=q~$ldBftH0}T#(K5e8;j~!x$JjyspJ1IISI?ON5OIPB$
z-5_|YUMb+QUsiv3R%Ys4tVYW+x$}dg;hw%EdoH%SXMp`)v?cxR4wic{X9pVB<xZ|w
z7myBd;EvNh?S3*yH;=REkD?rQM=U&uF+AUwr{CuMv@PGsG=GOGm>H>=`#`Kcj!}x4
zV<dEMh~f|f+!?-*FEeQG-jiV%PNMG+{|UJhr8>!`6tj|*q?jZdG(CSevn(}4Ogij5
z-kp;sZs}7oNu0x+NHs~(aWaKGV@l~TBkmW&mPj==N!f|1e1SndS6(rPxsn7dz$q_{
zL0jSri<I3YC|5!9d9eiT(s^nIMY|U2+Fcl?)binU_p(H+&h(OD4W{&>hO)1t?gh8N
zos<fl=%zI)!VF-eNH}{U$IhT5Wk#5l!*ZRJ@{UxC)rv~R)2g0q>MjR3n#YC()CVKv
zos2TbnL&)lHEIiYdz|%6N^vAUvTs6?s|~kwI4uXjc9fim`KCqW3D838Xu{48p$2?I
zOeEqQe1}JUZECrZSO_m=2<$^rB#B6?nrFXFpi8jw)NmoKV^*Utg6i8aEW|^QNJuW&
z4cbXpHSp4|7~TW(%JP%q9W2~@&@5Y5%cXL#fMhV59AGj<3$Hhtfa>24DLk{7GZUtr
z5ql**-e58|mbz%5Kk~|f!;g+Ze^b);F+5~^jdoq#m+s?Y*+=d5ruym%-Tnn8htCV;
zDyyUrWydgDNM&bI{yp<_wd-q&?Ig+BN-^JjWo6Zu3%Eov^Ja>%eKqrk&7kUqeM8PL
zs5D}lTe_Yx;e=K`TD<zAEU14ve_E|$wp3;b8B~h9suVy_Sbp*-7|+Iz0VnLl?C+RT
z9@z>ya!<G5KHy?wIL3&IOZR#4N`|wE%6ulI11v{`v|1!uU2eqgnlh{*Rm|&bZmC^A
z4O6`c0xaNTE>-u%y$)r*Cr4bSfN*eZk$XT(Lv2Y}qj&_UaiTevxs_=HXjnOuBpmT>
zBg|ty8?|1rD1~Ev^6=C$L9%+RkmBSQxlnj3j$XN?%QBstXdx+Vl!N$f2Ey`i3p@!f
zzqhI3jC(TZUx|sP%yValu^nzEV96o%*CljO><uZ-Z3!%2AEV{PIVkd{C7A-!`n?a2
z#9jxa4QldffL%a9nJrJCRH-mE%T#?>I_YKa8wMfc3$_L()k4P<Nj4?+18okdw1iX}
ze>B6kglP@IT#wBd*3RITYADL}g+hlzLYxFmCt=_XWS}=jg8`RgJefB57z(2n&&q>m
ze&F(YMmoRZW7sQ;cZgd(!A9>7mQ2d#!-?$%G8IQ0`p1|*L&P$GnU0i0^(S;Rua4v8
z_7Qhmv#@+kjS-M|($c*ZOo?V2PgT;GKJyP1REABlZhPyf!kR(0UA7Bww~R<7_u6#t
z{XNbiKT&tjne(&=UDZ+gNxf&@9EV|fblS^gxNhI-DH;|`1!Y<mYC8)L#IS}In*pT?
z3+y!tLj|&=I|Y{0%I#o3wFgyiFOTCx*-#C;oJ%n{?`8-|E0ODMEN?BB#GUZx#ipuP
znsc-`_ML3=0SBcfmCsZ?v5Zl}DU{XbD3DJn0asTWb9P@zPhkL?6%Q2hk<*%HYc+zi
zo={9Th6%EhQH?>NlMcC{d7I{u_E~cJOa<DEFkooswP>lFEzDY|I?S3kHtbrN&}R3k
zK(P<i1mplmQv?ZBU|p!`C$}bP8BUZFxY+JGx_rr%W<UGlz($Sn=*0*#hoUA9re#YJ
z6-NxDm|}cQTRKGIhYOex$X?o_nwe;SduZ~YHM;f-1#C^erSh^h`>h_Ty}*<BCj8d?
z!D#V4dVcC83J6@{u$=<9{+?2L{tkR)@?0w{+XM|s=emXY8nu3lrU1oo2Ic00(r}xs
z*BZme=7N-H5tz0Sa;}e`>L3Et6$c<rTa+pocGYd$@mWZP*GQEyY~$Qlqto_2@LP7D
z2Ck7eVqW1AlRvDz?ytdb9CcDvY3|AojX<ZLZ~zqdbgA&24N^se<$M=!b}loX5x7R|
z^e)1_ilJuR+yOXBl}%!6ISPZn<K3-6vK)FCm>UW`0}**BY@44KtwEy(jW@pAt`>g>
z&8>-TmJiDwc;H%Ae<rXQKc39iehOX|-f%EG_AA(LIU43eepd*$DVDg?Q5b@k+j{*v
zL%rnv1I_vwfLa1i+)ALP#0b@8To^`>%k6$ndZlfKruu1GocgZrLN=sYI52}_I%d)~
z6z40!%W4I6ch$CE2m>Dl3iwWIbcm27QNY#J!}3hqc&~(F8K{^gIT6E&L!APVaQhj^
zjTJEO&?**pivl^xqfD<D65wRJ3w6aPBZYdn`l+Tx2rxorrYj<K{P+9#sQRgJIjhkE
zRnjj@ZfaV}8A?0obxwO1cWwA@C<I9o&9&UW?N^K*_r$yP7tR&ieom~B<IjwKcQl8u
zA3}T^iyso`&OM1O*B7ES(;MP+>(rpLu;`Tm1MV+<A(X|yNr`)H@Wztcm}d<PRr|n&
z9;a&3{W>Wtd4u>X6u5V{Yp%)xH$k410o{pGoKdtY0t<buHQ?wQkO`fgM|V>@GgqFN
zO=!hTcYoa^dEPKvPX4ukgUTmR#q840gRMMi%{3kvh9gt(wK;Fniqu<C;TC)irAYU_
z*kJAxPx5gkvHM;M*(vwjS9H6MB3FBcQ;|7Ps6jh|x;2y}SyRTi$D<}R#rt8;yFG88
z>9A%BMsq?U&B5DFX<K#-tTq<#XXtCSxv8&(%;(0sE+RSlLme<8Gq)sPByp;1cAACT
zGs{agbXbky3~;c2M)n0PW2vokek=TO$MZG|t!ahopY#iIbV^pI-PhZ{WUP{UR=7Ie
z`zi$@v1k}(Wkcj)coC$!J|;Gma@VX&RApkyXg8YWRFzndpfeMmhQLus9C<&Q<kMk^
z;_3JZrZDOU%+NGy@{XEXRv(}(HMgZ;a-LS3I4uT7uN2X8eV$JOMm1&#l=|?Fp!PkX
z%V$+HZc8O}I4`goS}uF6Xjjvy2@&mw)_|);TZRoJXks2uhmv>C8t8FBN1&UIwS#=S
zF(6^Eyn8T}p)4)yRvs2rCXZ{L?N6{hgE_dkH_HA#L3a0$@UMoBw6RE9h|k_rx~%rB
zUq<fs$Lw)#c=y6c9xQX7n;oTM)>eEPL|!Pbp|up2Q=8Ac<mCiYr~53+@zw-Wyq%<{
z2-B2~!QG&iWl7?TCJ_tKUW8a&;qx-@kO|XHPV#c9D_05V`M&Q$&tY9=r*_ONb=DUf
za`tL8Z}fL1rAc`>Uxflck(fPNJYP1OM_4I(bc24a**Qnd-@;Bkb^2z8Xv?;3yZp*|
z<bKP78)%bZ$faky&98g{FBt@We_JXNCJoPN%koC~ve^TkEWRw@1l2-I^&78A`^C95
z<fW<v1?8(9a{^&+tkVI!ip|mLpr_k!gDjk=c~fgFCVJfc&i65kYw+#OC#JjC_}bP$
z1FynO4hM(!YoOS?Wh3@HNIyaMAYWYT*6B31RR{(6cJ?HzSs8Y%hE=!jReLv96{GJs
z=4HRxNkjeYKj2~erU;~+)s#hwz_3evJI;-+dIA07>oy9KhLo=;8n0rPdQ}yAoS8eb
zAtG5QYB|~z@Z(<d&^A|sgmIi{Xuo}_;O9&Bd=%`9dpY~KtiCxeQi89Ha_79BJcVCK
zrQCcdiAukc)q-?zj}7It4v?vG8w-nbwCxR5%u|Yu=d_j9ydg$WP*Yh5vlZ0X2!ooJ
zF8d1p*j~IA(c{fyO0C!}`JttBT0KrVzDPsq>Fxdu`LmoO>f&(<frD^<CX(vBvqk0!
z$MZHfWg&HJMMZ4~{A|#SIO5Sl%((fQlev*0ja225m0)ma(L34h8%_xwBnd&}<0?1`
z8}8Mw5PBdDJHXf3n96#DvpUH777Ta;Xq*wymy1iG+B*bo;v=_JuvvLvgVW@MIwQ_?
z!(=8&diEk@?0XXCNhJP;$c`fKa%Tdln}N|sC4+~x`u1d>JzsO|v0V?1HYsfMvF!3|
zka=}6U13(l@$9&=1!CLTCMS~L01CMs@Abl4^Q^YgVgizWaJa%{7t)2sVcZg0mh7>d
z(tN=$5$r?s={yA@IX~2ot9`ZG<TO?YRVF*aw{<_fxHnxcS{h}0bG)m1vNQCthAhPc
z=X4+{#RhqokkdDdmZfOq;f{=HykCFVzOmSIV0tHA)!SE}bTPVU>jUgVlul$IU4N}{
zIFBz<WMpn;d7!3n@w6@_`<TfiQqew6U{r4%WuwnAWMo#KJRHvWRyZG2`Pdg2+tC~2
zoT+k!=LSZU85{<GiV6aQ=wJ@gZ7Fm_Wjf}}YQf;72D9|lvWtBnBc^y3CA`wh-38~c
zHo;8rlo7!V)%uQ51F6gyKkl)K?m)Bl@P|#sYu(7~>Y3O0;g$BZ#X|V<f;1CrPLF;y
zJ}Q|#^1x49@Af6POU4bfdz)CJ4%&PUI%13quQMda-{nlPjeogY6o<Jc<&sxv!33wG
z{K|lQe?dtlm6^jeJBjHKD8I!vA#-hdICqgAc(4q$ehF5HD_i>juTPKyw*|IJ+&pQ`
z(NpzU`o=D86kZ3<rZLf(voqzQ`4bQtvr?gVGkn-#m?vf7dE%TaIhE5K(j!g~U_wO-
zyEi1W6C08Bt00IKt0bb-r1L2uATg?oX}z6{snLqSF<(TzS8&7Yiuc}xO~1EB3pnlF
z_1Vkq9v!@W{TN{UrjKncfP9Xknuc&QwjEq;OH9fc*yU9_{J}o?eM&flLvNWJGsUSp
zITqz9Nl8pzhSIKLmy!npER)tike(^d*i3?+YI)mK5EEK!{kLJ%fCHDz!IgcD`Y9rl
z<9>E5#!3Ry$#0AW!6wZe)_xZ8EPidvJ0f+MQJZ6|ZJ$CEV6;Yt<PPHpogryw#W9I%
ztKOI;XYuYE`ybWEVcN3T?RpNZ;}0xbVQPO5Ke%|6IXIZkHm1WCm=zYOjUcWa58Osn
zds#!-O;H0=DaPSR#&Mat7Pz=a+=gGdE$Ncs>{OJnL`dewc1k>AGbkK9Gf5BbB-fg?
zgC4#CPYX+9%LLHg@=c;_Vai_~#ksI~)5|9k(W()g6ylc(wP2uSeJ$QLATtq%e#zpT
zp^6Y)bV+e_pqIE7#-hURQhfQvIZpMUzD8&-t$esrKJ}4`ZhT|woYi>rP<r^z%~jrT
z5f;M*r(Vjjy+F4jL8nt!&BwV7`2G_ZEYrfBMc5$(8WKPJjsd~GtVG>~y~LRf`*2!6
z6prDzJ~1VOlYhYAuBHcu9m>k_F>;N3rpLg>pr;{EDkeQPHfPv~woj$?UTF=txmaZy
z?RrVthxVcqUM;X*(=UNg4(L|0d250Xk)6GF&DKD@r6{aZo;(}dnO5@CP7pMmdsI)-
zeYH*@#+|)L8x7)@G<DyfP%;&(upWhHToSbMJr?<@6T&|RQI4sJb=*>NBu0Npyyh6r
z^~!3$x&w8N)T;|LVgnwx1<q)=5kJ=5r2j7Fz8U6acfr+HE1$`#upwh(B5N5@G-Nm8
zx1=h&o1*x+{{8yrcxfL`a|`OWAyF=?Szb_h9qcfAFdC}iuL~z%-|3QD)ql<Ph~l4(
zk+drha_WzGDmGP`zk215MNYXS-pNj)SopqA|7fp7L~qhfi7DR9r87{F>jHmZn{b2V
zO|8s#F0NZhvux?<K%Q;e3e5-}x>0W9NH5;qZ?P_JtPW86)4J>AS{0F1S0d}=L2`{F
z_y<bO3C1N?R4zd#gP$6yBMFO*yrsCqOSHS(Pz0428HkF|?k>;o;17%{j4I)znptnB
z%No1W>o}H2%?~CFo~0j?pzWk?dV4ayb!s{#>Yj`ZJ!H)xn}*Z_gF<n*RcE047{B3c
zme&2Cd-v9n6U^>Hy~JDis)?9-P=z4<af;v@ge<g~Fru_>iOQg{26~n?dTms7)+F}?
zcXvnHHnnbNTzc!$t+V}=<2L<7l(84v1I3b;-)F*Q?cwLNlgg{zi#iS)*rQ5AFWe&~
zWHPPGy{8wEC9JSL?qNVY76=es`bA{vUr~L7f9G@mP}2MNF0Qhv6Sgs`r_k!qRbSXK
zv16Qqq`rFM9!4zCrCeiVS~P2e{Pw^A8I?p?NSVR{X<iI+V?4Et$#Ral=`srlWHd^w
zj;%^Z_ZG+I-9T1$dV2DKhcS`(LKB_v!PwgEgh$rx#sM|M{a`!KGiKMTM`~ZkWb!M-
zJDmmmkTCKx2;Yg^x6}=xdY}%GM$LH0O$t$QO_bCW<eAEse4vuFgeHCOK3@`0m)t3E
zY4wciw&iZmLo|A@`=YrE^_wBu_rUDbZa+8EYN6k<`1c?5PteTmgf$T*Y9j$@D_thg
zc3|<McPK?w?nvr>fwlQo*wj|Ctqz4X-j+dU7eGkC(2y`(P?FM?P4gK<kRuK^dFD$m
z)Ugr$QMx5M6@T~eaS`DJ{l|kD5V)?3eA5E(nZ(QyED-4Bv97olMOwL?{h8QIaY-ZF
z0Wz2E3(^?ut3+8^+lD-Hg*V*#ON=i0YCAUBpf!M(@nw+&AFS}vhJq;7qiv+i5|h%d
zlra?0>ki3Msw#fM6paBq#VNc>T2@``L{DlnnA-_*i10Kre&@-H!Z7gzn9pRF61?^^
z8dJ5kEeVKb%Bly}6NLV}<0(*eZM$QTLcH#+@iWS^>$Of_@Mu1Jw<nW1FD-nURbmpK
zYjCd4&Ms%4OK>M!>&3evymgY6>C_)sK+n|A5G6(3RJz0k>(z2uLdzXeTw)e4*g!h}
zn*UvIx-Ozx<3rCF#C`khSv`Y-b&R4gX>d5osr$6jlq^8vi!M$QGx05pJZoY#RGr*J
zsJmOhfodAzYQxv-MoU?m_|h^aEwgEHt5h_HMkHwtE+OA03(7{hm1V?AlYAS7G$u5n
zO+6?51qo@aQK5#l6pM`kD5OmI28g!J2Z{5kNlSuKl=Yj3QZ|bvVHU}FlM+{QV=<=)
z+b|%<!;*M`^!Zvredv4Dif+RL7u-{Ef1b~}Zr`uI^YqN8+o-Wuel!Ah$(~&t3J2u#
zhwEcb-&inRJOs>Q!R<gnuD?BM(o!)9Gdmo7P6fyLhP4p|f(5tb?F-JF8L67sK>)FE
z@ycDMSKV2?*XfcAc5@IOrSI&3&aR$|oAD8WNA6O;p~q-J@ll{x`jP<*eEpIY<uf^v
z{yfbaVdbYlq!#in`2*@If2Q=FI4sXd#SY7cWOOL^;p9N=Pf0lFTv&y)<+?BjjE_*t
ziW;-DQMFi}5u4U^$`ar=B5IR~ZS1Zt-PSHkM|UWnkI1k4YzuM4F%K|3K6DPD>OYnT
zer_t=dYw6a0avjQtKN&#n&(KJ5Kr$RXPOp1@Fq#0O<t)^@vF?ROt|PohN&&ZZB+>f
zTXQkq4qQxKWR>x#d{Hyh?6<ll*@9xVT0EEF^wpr9`cL&(((rr-l4hds2C{{Fxt})P
zVxOaMWwF?nM8qg_^)z^v_@j@dmm3RQm*dev0IRndk%CA=v$wP}y96xDa9uQI)rzrZ
zibWXKqNL9Z_CC^E90b_`$xeTkq3ue5Ki^5E($adfdp}jkq~6x{jBxD26V5xr?@bTK
zqwrxvWGyhZ31sup;?9cTJ)H=hJ@RoNMxlx@oh|ZL53?y03F5^n{%+Lt{Hg3ul_u#O
zek3c5@L=~=_$`6pC@^3gz7?7hA~RKnr15uLz_>Y)U07;Q$?BTl7mx2bSPY_juXub1
z%-$)NKXzE<%}q>RX25*oeMVjiz&r_z;BrQV-(u>!U>C*OisXNU*UftsrH6vAhTEm@
zoKA`?fZL1sdd!+G@*NNvZa>}37u^x8^T>VH0_6Bx{3@x5NAg&55{2jUE-w3zCJNJi
z^IlU=+DJz-9K&4c@7iKj(zlj@%V}27?vYmxo*;!jZVXJMeDg;5T!4Y1rxNV-e$WAu
zkk6^Xao8HC=w2hpLvM(!xwo|~$eG6jJj39zyQHf)E+NPJlfspUhzRv&_qr8+Z1`DA
zz`EV=A)d=;2&J;eypNx~q&Ir_7e_^xXg(L9>k=X4pxZ3y#-ch$^TN}i>X&uw<U9MO
zlF4a{y~lC8L?n4j`bZJyk;=pCn0&+F9QrKW^Z;X&5+4By@sW+?Rr$pxzk*;9U&}c`
zVeX!$eN(tsyiocg_0GHE%gc@Q!`6VM^z1Zy&XeAH`btF8w<FthN2Y1DIVai-JD9}j
zzD1iL%qOrMyi0MnK2I2#HgUJi=dXCFx^I*i<%~;W)C!T!vxO_(Vl*|hJX?LQx0PBU
z`e?j_P;1~4Daam$cTW)+88a-!P6T&7I+l=r*k60+45)21{!Sy4>F%75c(9cjO6`E5
z16vbMYb!lEIM?jxn)^+Ld8*hmEXR4a8TSfqwBg1(@^8$p&#@?iyGd}uhWTVS`Mlpa
zGc+kV)K7DJ<v}<!uFIrb&;o7Ixy)I)Ro{m8ZhG$`LxgIrtg$VJPC&L?NJ+e|Jcx1B
zckLN3CwY${zZTStoi>wd46aco@=?iASsx?sDjbHoDVU9=+^tk46|Fxxey1u)_}c1j
z^(`5~PU%og1LdSBE5x4N&5&%Nh$sy0oANXwUcGa>@CCMqP`4W$ZPSaykK|giiuMIw
zu#j)&VRKWP55I(5K1^cog|iXgaK1Z%wm%T;;M3X`-`TTWaI}NtIZj;CS)S%S(h}qq
zRFQ#{m4Qk$7;1i*0PC^|X1@a1pcMq1aiRSCHq+mnfj^FS{oxWs0McCN-lK4>SDp#`
z7=Duh)kXC;lr1g3dqogzBBDg6>et<<>m>KO^|bI5X{+eMd^-$2xfoP*&e$vdQc7J%
zmFO~OHf7aqlIvg%P`Gu|3n;lKj<JTcG+BhuR}TueDYI}dFm#ycnh~ifrJG8E*hanM
zyts*CbJn)GXuBg6912N&%-mX;x1nyhA$jA%za+{3^EjzULVzw^<(4%VAyt;KU+pj@
zKaE>tRd@;;x#$>_xU(HpZos7?ShZlQSU)bY?qyQM3cHh5twS6^bF8NBKDnJgXHa)?
zBYv=GjsZuYC2QFS+jc#uCsaEPEzLSJCL=}SIk9!*2Eo(V*SAUqKw#?um$mUIbqQQb
zF1Nn(y?7;gP#@ws$W76>TuGcG=U_f6q2uJq?j#mv7g;llvqu{Yk~Mo>id)jMD7;T>
zSB$1!g)QpIf*f}IgmV;!B+3u(ifW%xrD=`RKt*PDC?M5KI)DO`VXw(7X-OMLd3iVU
z0CihUN(eNrY;m?vwK{55MU`p1;JDF=6ITN$+!q8W#`iIsN8;W7H?`htf%RS9Lh+KQ
z_p_4?<ntF8U$D@Ka;CpypOeKWe3jI~hhLSB3Ooy^a0EV2G%eT~k)>qO4#<u#i=63F
zdyVQD*YUAOvvj`QLL<kERGbF`R-#4ZoSI#5DuVTN*j9~3#sE%s<<;^wcl<U!f!RZ_
zr{GC#mPd@zH*H^XJ%w3e4yvI+;_HVykR}|xQ-77&eyiZ~+*5>*`t+8l-N|kAKDcOt
zoHsqz_oO&n?@4^Mr*4YrkDX44BeS*0zaA1j@*c}{$;jUxRXx1rq7z^*NX6d`DcQ}L
z6*cN7e%`2#_J4z8=^GM6>%*i>>X^_0u9qn%0JTUo)c0zIz<Kt=2nM}C*<{hlL7=lO
zi?10sY)d=-_LpcSYU@1BZtA%u;hImg)z{uT0?30JadWH$%Px>|7a`%_UnB)-I1cc+
z0}jAK0}jBl|6-2VT759oxBnf%-;7vs>7Mr}0h3^$0`5FAy}2h{ps5%RJA|^~6uCqg
zxBMK5bQVD{Aduh1lu4)`Up<rVpp?=r3G7gw9i_8vUON_AozqkT-Bhc;N5gh8->*&(
zCJQ>nafDb#MuhSZ5>YmD@|TcrNv~Q%!tca;tyy8Iy2vu2CeA+AsV^q*Wohg%69XYq
zP0ppEDEYJ9>Se&X(v=U#ibxg()m=83pLc*|otb<fp}wtygv!@DV-xq;MZQ4)h!5po
zyM)GWR1cSN%LNWo4kw}xi5DgA)`;Vg7hXpqT}B2(;*bYvhZOI%^L$+hW+x>G;`CYZ
z*YgsakGO$E$E_$|3bns7`m9ARe%myU3$<Ba2&<yFae<}OjvJo0W=e}k=QU&o+tcj@
z7h%onm*E7iR=vrpKx=%)gM}$`ty?&emSPbfK5@$BmpR4{1twpMY=;Y7h*tC}FAUio
za+FRZYU^6<*yc5r2mh@0p%`##rr>DE;RoQ<6hR8e;%`pxO1{GXb$cCZl9lVnJ$(c`
z``G?|PhXaz`>)rb7jm2#v7=(W?@<CLmp)q5H!OUZ7hGfFLzd|aK#xX4m!pw6@=V2>
zjUhrNndRFMQ}%^^(-nmD&J>}9w@)>l;mhRr@$}|4ueOd?U9ZfO-oi%^n4{#V`i}#f
zqh<@f^%~(MnS?Z0xsQI|Fghrby<&{FA+e4a>c(yxFL!Pi#?DW!!YI{OmR{xEC7T7k
zS_g*9VWI}d0IvIXx*d5<7$5Vs=2^=ews4qZGmAVyC^9e;wxJ%BmB(<CaQ5`VLzKOc
zWRPnETePoBLrsIHiW@1JowbAxiy?ItsJId(?45#&^KfqH*Uoq&0WgJZAVJ`K;cT2f
znL%X~pPg4?78NF*HRS_u7}<DFKRB1yPglW~&)W5x+>F5*&!yyABCtLVGL@`qW>X9K
zpv=W~+EszGef=am3LG+#yIq5oLXMnZ_dxSLQ_&bwjC^0e8qN@v!p?7mg02H<9`uaJ
zy0GKA&YQV2CxynI3T&J*m!rf4@J*eo235*!cB1zEMQZ%h5>GBF;8r37K0h?@|E*0A
zIHUg0y7zm(rFKvJS48W7RJwl!i~<6X2Zw+Fbm9ekev0M;#MS=Y5P(kq^(#q11zsvq
zDIppe@xOMnsOIK+5BTFB=cWLalK#{3eE>&7fd11>l2=MpNKjsZT2kmG!jCQh`~Fu0
z9P0ab`$3!r`1yz8>_7DYsO|h$kIsMh__s*^KXv?Z1O8|~sEz?Y{+GDzze^GPjk$E$
zXbA-1gd77#=tn)YKU=;JE?}De0)WrT%H9s3`fn|%YibEdyZov3|MJ>QWS>290eCZj
z58<D<fbV=CGeC;ZFQ5egk_qNkx(0u$`Mm@j+&e451`MnOU{D$V0w@KDtNarnV3BZk
z;dQV#0jMmS>i<*>dC9=kz?s$sP_9kK1p>nV3qvbleExyq56|o+oQsb{ZVmuu1n~JG
z0sUvo_i4fSM>xRs8rvG$*+~GZof}&ISxn(2JU*K{L<3+b{bBw{68H&Uiup@;fWWl5
zgB?IWMab0LkXK(Hz#yq>scZbd2%=B?DO~^q9tarlzZysN+g}n0+v);JhbjUT8AYrt
z3?;0r%p9zLJv1r$%q&HKF@;3~0wVwO!U5m;J`Mm|`Nc^80sZd+Wj}21*SPoF82hCF
zoK?Vw;4ioafdAkZxT1er-LLVi-*0`@2Ur&*!b?0U>R;no+S%)xoBuBxRw$<Qq5?ct
z>?weN-u~tKE}8xb@7Gs%(aC;e1-L<sfEoPb+52b9_t6mhC7Ohl@&CNrR+gBE4S-3n
z^Y4VCpI{J@zXX#3R5anWvoo~N1C)y;lCaX(H5ULFtgWe@!%r3Smqz=t)ca2s6zTt)
z<=4aD|Dwq4PfSatUt+%WGyYQY_T?47EE)L|-BbOS=>IlSfXDK(faFW)mnHdrLc3`F
z6ZBsT^u0uVS&il=>YVX^*5`k!P4g1)2LQmz{?&dgf`7JrA4ZeE0sikL`k!Eb6r=g0
z{aCy_0I>fxSAXQYz3lw5G|ivg^L@(x-uch!AphH+d<p-u+{jOO7PG%y+n?~i^Dgp|
z=w+FJpG1dNe<S*@>;E4`175<v)Vu!)?`iW-@Gso$m#{Bo-haYw*!~mjf5$OiV!jmp
z{fSBB@=uum3YPpw0{A8BOMTs+sPL}8f%?DIc3%>`R0#b^)Zp>EM1Ks=zx6_261>!7
z{7F#a{Tl@Tpw9S`>7_i|PbScS-(dPJv9_0-FBP_aa@Gg^2IoKNZM~#=sW$SH3MJ|{
zsQy8F<R#NfVTYeg$g#h{^oKd{{!-@QCDqIH`JYr63BOGRc)t92eE&yL?<L90oaCP*
zq{+Wc^2dDrFU6LZEH9H^f3gs#{x-`W>43lX7hYx<{v^Q9`2QsMzeen3cGpiTgzVp-
z`aj3&Wv0(he1qKI!2jpGpO-i0Wpcz%vdn`2o9x&3;^nsZPt3c<zhVAsIR3s#{_;9s
zM%RC0f_44hnE$j!y^KlzL?-L~JM!;GC|~{uFXLoCd7k?I#`Dsf{Vy-!|5(Of#%_Mn
zObz_UvHM?<oR`=9qw}9$BJrO{fbV=Cg2BIl{dmOux?G`*I2ho4_Q%^S15htOYS9?b
I5eVr20d63LbpQYW

literal 0
HcmV?d00001

diff --git a/samples/client/petstore/java/native/gradle/wrapper/gradle-wrapper.properties b/samples/client/petstore/java/native/gradle/wrapper/gradle-wrapper.properties
new file mode 100644
index 0000000000..b0acbdcd73
--- /dev/null
+++ b/samples/client/petstore/java/native/gradle/wrapper/gradle-wrapper.properties
@@ -0,0 +1,5 @@
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.5-bin.zip
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
diff --git a/samples/client/petstore/java/native/gradlew b/samples/client/petstore/java/native/gradlew
new file mode 100644
index 0000000000..8e25e6c19d
--- /dev/null
+++ b/samples/client/petstore/java/native/gradlew
@@ -0,0 +1,188 @@
+#!/usr/bin/env sh
+
+#
+# Copyright 2015 the original author or authors.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+##############################################################################
+##
+##  Gradle start up script for UN*X
+##
+##############################################################################
+
+# Attempt to set APP_HOME
+# Resolve links: $0 may be a link
+PRG="$0"
+# Need this for relative symlinks.
+while [ -h "$PRG" ] ; do
+    ls=`ls -ld "$PRG"`
+    link=`expr "$ls" : '.*-> \(.*\)$'`
+    if expr "$link" : '/.*' > /dev/null; then
+        PRG="$link"
+    else
+        PRG=`dirname "$PRG"`"/$link"
+    fi
+done
+SAVED="`pwd`"
+cd "`dirname \"$PRG\"`/" >/dev/null
+APP_HOME="`pwd -P`"
+cd "$SAVED" >/dev/null
+
+APP_NAME="Gradle"
+APP_BASE_NAME=`basename "$0"`
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+
+# Use the maximum available, or set MAX_FD != -1 to use that value.
+MAX_FD="maximum"
+
+warn () {
+    echo "$*"
+}
+
+die () {
+    echo
+    echo "$*"
+    echo
+    exit 1
+}
+
+# OS specific support (must be 'true' or 'false').
+cygwin=false
+msys=false
+darwin=false
+nonstop=false
+case "`uname`" in
+  CYGWIN* )
+    cygwin=true
+    ;;
+  Darwin* )
+    darwin=true
+    ;;
+  MINGW* )
+    msys=true
+    ;;
+  NONSTOP* )
+    nonstop=true
+    ;;
+esac
+
+CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
+
+# Determine the Java command to use to start the JVM.
+if [ -n "$JAVA_HOME" ] ; then
+    if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
+        # IBM's JDK on AIX uses strange locations for the executables
+        JAVACMD="$JAVA_HOME/jre/sh/java"
+    else
+        JAVACMD="$JAVA_HOME/bin/java"
+    fi
+    if [ ! -x "$JAVACMD" ] ; then
+        die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+    fi
+else
+    JAVACMD="java"
+    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+fi
+
+# Increase the maximum file descriptors if we can.
+if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
+    MAX_FD_LIMIT=`ulimit -H -n`
+    if [ $? -eq 0 ] ; then
+        if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
+            MAX_FD="$MAX_FD_LIMIT"
+        fi
+        ulimit -n $MAX_FD
+        if [ $? -ne 0 ] ; then
+            warn "Could not set maximum file descriptor limit: $MAX_FD"
+        fi
+    else
+        warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
+    fi
+fi
+
+# For Darwin, add options to specify how the application appears in the dock
+if $darwin; then
+    GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
+fi
+
+# For Cygwin, switch paths to Windows format before running java
+if $cygwin ; then
+    APP_HOME=`cygpath --path --mixed "$APP_HOME"`
+    CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
+    JAVACMD=`cygpath --unix "$JAVACMD"`
+
+    # We build the pattern for arguments to be converted via cygpath
+    ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
+    SEP=""
+    for dir in $ROOTDIRSRAW ; do
+        ROOTDIRS="$ROOTDIRS$SEP$dir"
+        SEP="|"
+    done
+    OURCYGPATTERN="(^($ROOTDIRS))"
+    # Add a user-defined pattern to the cygpath arguments
+    if [ "$GRADLE_CYGPATTERN" != "" ] ; then
+        OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
+    fi
+    # Now convert the arguments - kludge to limit ourselves to /bin/sh
+    i=0
+    for arg in "$@" ; do
+        CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
+        CHECK2=`echo "$arg"|egrep -c "^-"`                                 ### Determine if an option
+
+        if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then                    ### Added a condition
+            eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
+        else
+            eval `echo args$i`="\"$arg\""
+        fi
+        i=$((i+1))
+    done
+    case $i in
+        (0) set -- ;;
+        (1) set -- "$args0" ;;
+        (2) set -- "$args0" "$args1" ;;
+        (3) set -- "$args0" "$args1" "$args2" ;;
+        (4) set -- "$args0" "$args1" "$args2" "$args3" ;;
+        (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
+        (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
+        (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
+        (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
+        (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
+    esac
+fi
+
+# Escape application args
+save () {
+    for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
+    echo " "
+}
+APP_ARGS=$(save "$@")
+
+# Collect all arguments for the java command, following the shell quoting and substitution rules
+eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
+
+# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong
+if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then
+  cd "$(dirname "$0")"
+fi
+
+exec "$JAVACMD" "$@"
diff --git a/samples/client/petstore/java/native/gradlew.bat b/samples/client/petstore/java/native/gradlew.bat
new file mode 100644
index 0000000000..9618d8d960
--- /dev/null
+++ b/samples/client/petstore/java/native/gradlew.bat
@@ -0,0 +1,100 @@
+@rem
+@rem Copyright 2015 the original author or authors.
+@rem
+@rem Licensed under the Apache License, Version 2.0 (the "License");
+@rem you may not use this file except in compliance with the License.
+@rem You may obtain a copy of the License at
+@rem
+@rem      https://www.apache.org/licenses/LICENSE-2.0
+@rem
+@rem Unless required by applicable law or agreed to in writing, software
+@rem distributed under the License is distributed on an "AS IS" BASIS,
+@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+@rem See the License for the specific language governing permissions and
+@rem limitations under the License.
+@rem
+
+@if "%DEBUG%" == "" @echo off
+@rem ##########################################################################
+@rem
+@rem  Gradle startup script for Windows
+@rem
+@rem ##########################################################################
+
+@rem Set local scope for the variables with windows NT shell
+if "%OS%"=="Windows_NT" setlocal
+
+set DIRNAME=%~dp0
+if "%DIRNAME%" == "" set DIRNAME=.
+set APP_BASE_NAME=%~n0
+set APP_HOME=%DIRNAME%
+
+@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
+
+@rem Find java.exe
+if defined JAVA_HOME goto findJavaFromJavaHome
+
+set JAVA_EXE=java.exe
+%JAVA_EXE% -version >NUL 2>&1
+if "%ERRORLEVEL%" == "0" goto init
+
+echo.
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:findJavaFromJavaHome
+set JAVA_HOME=%JAVA_HOME:"=%
+set JAVA_EXE=%JAVA_HOME%/bin/java.exe
+
+if exist "%JAVA_EXE%" goto init
+
+echo.
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:init
+@rem Get command-line arguments, handling Windows variants
+
+if not "%OS%" == "Windows_NT" goto win9xME_args
+
+:win9xME_args
+@rem Slurp the command line arguments.
+set CMD_LINE_ARGS=
+set _SKIP=2
+
+:win9xME_args_slurp
+if "x%~1" == "x" goto execute
+
+set CMD_LINE_ARGS=%*
+
+:execute
+@rem Setup the command line
+
+set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
+
+@rem Execute Gradle
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
+
+:end
+@rem End local scope for the variables with windows NT shell
+if "%ERRORLEVEL%"=="0" goto mainEnd
+
+:fail
+rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
+rem the _cmd.exe /c_ return code!
+if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
+exit /b 1
+
+:mainEnd
+if "%OS%"=="Windows_NT" endlocal
+
+:omega
diff --git a/samples/client/petstore/java/native/pom.xml b/samples/client/petstore/java/native/pom.xml
new file mode 100644
index 0000000000..522945ca75
--- /dev/null
+++ b/samples/client/petstore/java/native/pom.xml
@@ -0,0 +1,208 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <groupId>org.openapitools</groupId>
+    <artifactId>petstore-native</artifactId>
+    <packaging>jar</packaging>
+    <name>petstore-native</name>
+    <version>1.0.0</version>
+    <url>https://github.com/openapitools/openapi-generator</url>
+    <description>OpenAPI Java</description>
+    <scm>
+        <connection>scm:git:git@github.com:openapitools/openapi-generator.git</connection>
+        <developerConnection>scm:git:git@github.com:openapitools/openapi-generator.git</developerConnection>
+        <url>https://github.com/openapitools/openapi-generator</url>
+    </scm>
+
+    <licenses>
+        <license>
+            <name>Unlicense</name>
+            <url>http://www.apache.org/licenses/LICENSE-2.0.html</url>
+            <distribution>repo</distribution>
+        </license>
+    </licenses>
+
+    <developers>
+        <developer>
+            <name>OpenAPI-Generator Contributors</name>
+            <email>team@openapitools.org</email>
+            <organization>OpenAPITools.org</organization>
+            <organizationUrl>http://openapitools.org</organizationUrl>
+        </developer>
+    </developers>
+
+    <build>
+        <plugins>
+            <plugin>
+                <artifactId>maven-enforcer-plugin</artifactId>
+                <version>3.0.0-M1</version>
+                <executions>
+                    <execution>
+                        <id>enforce-maven</id>
+                        <goals>
+                            <goal>enforce</goal>
+                        </goals>
+                        <configuration>
+                            <rules>
+                                <requireMavenVersion>
+                                    <version>3</version>
+                                </requireMavenVersion>
+                                <requireJavaVersion>
+                                    <version>11</version>
+                                </requireJavaVersion>
+                            </rules>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <version>3.0.0-M3</version>
+                <configuration>
+                    <systemPropertyVariables>
+                        <loggerPath>conf/log4j.properties</loggerPath>
+                    </systemPropertyVariables>
+                    <argLine>-Xms512m -Xmx1500m</argLine>
+                    <parallel>methods</parallel>
+                    <threadCount>10</threadCount>
+                </configuration>
+            </plugin>
+            <plugin>
+                <artifactId>maven-dependency-plugin</artifactId>
+                <version>3.1.1</version>
+                <executions>
+                    <execution>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>copy-dependencies</goal>
+                        </goals>
+                        <configuration>
+                            <outputDirectory>${project.build.directory}/lib</outputDirectory>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+
+            <!-- attach test jar -->
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-jar-plugin</artifactId>
+                <version>3.1.2</version>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>test-jar</goal>
+                        </goals>
+                    </execution>
+                </executions>
+                <configuration>
+                </configuration>
+            </plugin>
+            <plugin>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <version>3.8.1</version>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-javadoc-plugin</artifactId>
+                <version>3.1.0</version>
+                <executions>
+                    <execution>
+                        <id>attach-javadocs</id>
+                        <goals>
+                            <goal>jar</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <artifactId>maven-source-plugin</artifactId>
+                <version>3.1.0</version>
+                <executions>
+                    <execution>
+                        <id>attach-sources</id>
+                        <goals>
+                            <goal>jar-no-fork</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+
+    <profiles>
+        <profile>
+            <id>sign-artifacts</id>
+            <build>
+                <plugins>
+                    <plugin>
+                        <artifactId>maven-gpg-plugin</artifactId>
+                        <version>1.6</version>
+                        <executions>
+                            <execution>
+                                <id>sign-artifacts</id>
+                                <phase>verify</phase>
+                                <goals>
+                                    <goal>sign</goal>
+                                </goals>
+                            </execution>
+                        </executions>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+    </profiles>
+
+    <dependencies>
+        <dependency>
+            <groupId>io.swagger</groupId>
+            <artifactId>swagger-annotations</artifactId>
+            <version>${swagger-annotations-version}</version>
+        </dependency>
+
+        <!-- JSON processing: jackson -->
+        <dependency>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-core</artifactId>
+            <version>${jackson-version}</version>
+        </dependency>
+        <dependency>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-annotations</artifactId>
+            <version>${jackson-version}</version>
+        </dependency>
+        <dependency>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-databind</artifactId>
+            <version>${jackson-version}</version>
+        </dependency>
+        <dependency>
+            <groupId>com.fasterxml.jackson.datatype</groupId>
+            <artifactId>jackson-datatype-jsr310</artifactId>
+            <version>${jackson-version}</version>
+        </dependency>
+
+        <!-- @Nullable annotation -->
+        <dependency>
+            <groupId>com.google.code.findbugs</groupId>
+            <artifactId>jsr305</artifactId>
+            <version>3.0.2</version>
+        </dependency>
+
+        <!-- test dependencies -->
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <version>${junit-version}</version>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
+    <properties>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <swagger-annotations-version>1.5.22</swagger-annotations-version>
+        <maven.compiler.source>11</maven.compiler.source>
+        <maven.compiler.target>11</maven.compiler.target>
+        <jackson-version>2.9.9</jackson-version>
+        <junit-version>4.12</junit-version>
+    </properties>
+</project>
diff --git a/samples/client/petstore/java/native/settings.gradle b/samples/client/petstore/java/native/settings.gradle
new file mode 100644
index 0000000000..b8b464b291
--- /dev/null
+++ b/samples/client/petstore/java/native/settings.gradle
@@ -0,0 +1 @@
+rootProject.name = "petstore-native"
\ No newline at end of file
diff --git a/samples/client/petstore/java/native/src/main/AndroidManifest.xml b/samples/client/petstore/java/native/src/main/AndroidManifest.xml
new file mode 100644
index 0000000000..54fbcb3da1
--- /dev/null
+++ b/samples/client/petstore/java/native/src/main/AndroidManifest.xml
@@ -0,0 +1,3 @@
+<manifest package="org.openapitools.client" xmlns:android="http://schemas.android.com/apk/res/android">
+    <application />
+</manifest>
diff --git a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/ApiClient.java b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/ApiClient.java
new file mode 100644
index 0000000000..d09776ee9f
--- /dev/null
+++ b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/ApiClient.java
@@ -0,0 +1,317 @@
+/*
+ * OpenAPI Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+package org.openapitools.client;
+
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.fasterxml.jackson.databind.DeserializationFeature;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.SerializationFeature;
+import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule;
+
+import java.net.URI;
+import java.net.URLEncoder;
+import java.net.http.HttpClient;
+import java.net.http.HttpRequest;
+import java.nio.charset.Charset;
+import java.time.Duration;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
+import java.util.StringJoiner;
+import java.util.function.Consumer;
+import java.util.stream.Collectors;
+
+/**
+ * Configuration and utility class for API clients.
+ *
+ * <p>This class can be constructed and modified, then used to instantiate the
+ * various API classes. The API classes use the settings in this class to
+ * configure themselves, but otherwise do not store a link to this class.</p>
+ *
+ * <p>This class is mutable and not synchronized, so it is not thread-safe.
+ * The API classes generated from this are immutable and thread-safe.</p>
+ *
+ * <p>The setter methods of this class return the current object to facilitate
+ * a fluent style of configuration.</p>
+ */
+
+public class ApiClient {
+
+  private static final Charset UTF_8 = Charset.forName("UTF-8");
+
+  private HttpClient.Builder builder;
+  private ObjectMapper mapper;
+  private String scheme;
+  private String host;
+  private int port;
+  private String basePath;
+  private Consumer<HttpRequest.Builder> interceptor;
+  private Duration readTimeout;
+
+  private static String valueToString(Object value) {
+    if (value == null) {
+      return "";
+    }
+    return value.toString();
+  }
+
+  /**
+   * URL encode a string in the UTF-8 encoding.
+   *
+   * @param s String to encode.
+   * @return URL-encoded representation of the input string.
+   */
+  public static String urlEncode(String s) {
+    return URLEncoder.encode(s, UTF_8);
+  }
+
+  /**
+   * Convert a URL query name/value parameter to a list of encoded {@link Pair}
+   * objects.
+   *
+   * <p>The value can be null, in which case an empty list is returned.</p>
+   *
+   * @param name The query name parameter.
+   * @param value The query value, which may not be a collection but may be
+   *              null.
+   * @return A singleton list of the {@link Pair} objects representing the input
+   * parameters, which is encoded for use in a URL. If the value is null, an
+   * empty list is returned.
+   */
+  public static List<Pair> parameterToPairs(String name, Object value) {
+    if (name == null || name.isEmpty() || value == null) {
+      return Collections.emptyList();
+    }
+    return Collections.singletonList(new Pair(urlEncode(name), urlEncode(value.toString())));
+  }
+
+  /**
+   * Convert a URL query name/collection parameter to a list of encoded
+   * {@link Pair} objects.
+   *
+   * @param collectionFormat The swagger collectionFormat string (csv, tsv, etc).
+   * @param name The query name parameter.
+   * @param values A collection of values for the given query name, which may be
+   *               null.
+   * @return A list of {@link Pair} objects representing the input parameters,
+   * which is encoded for use in a URL. If the values collection is null, an
+   * empty list is returned.
+   */
+  public static List<Pair> parameterToPairs(
+      String collectionFormat, String name, Collection<?> values) {
+    if (name == null || name.isEmpty() || values == null || values.isEmpty()) {
+      return Collections.emptyList();
+    }
+
+    // get the collection format (default: csv)
+    String format = collectionFormat == null || collectionFormat.isEmpty() ? "csv" : collectionFormat;
+
+    // create the params based on the collection format
+    if ("multi".equals(format)) {
+      return values.stream()
+          .map(value -> new Pair(urlEncode(name), urlEncode(valueToString(value))))
+          .collect(Collectors.toList());
+    }
+
+    String delimiter;
+    switch(format) {
+      case "csv":
+        delimiter = urlEncode(",");
+        break;
+      case "ssv":
+        delimiter = urlEncode(" ");
+        break;
+      case "tsv":
+        delimiter = urlEncode("\t");
+        break;
+      case "pipes":
+        delimiter = urlEncode("|");
+        break;
+      default:
+        throw new IllegalArgumentException("Illegal collection format: " + collectionFormat);
+    }
+
+    StringJoiner joiner = new StringJoiner(delimiter);
+    for (Object value : values) {
+      joiner.add(urlEncode(valueToString(value)));
+    }
+
+    return Collections.singletonList(new Pair(urlEncode(name), joiner.toString()));
+  }
+
+  /**
+   * Ctor.
+   */
+  public ApiClient() {
+    builder = HttpClient.newBuilder();
+    mapper = new ObjectMapper();
+    mapper.setSerializationInclusion(JsonInclude.Include.NON_NULL);
+    mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
+    mapper.configure(DeserializationFeature.FAIL_ON_INVALID_SUBTYPE, false);
+    mapper.disable(SerializationFeature.WRITE_DATES_AS_TIMESTAMPS);
+    mapper.enable(SerializationFeature.WRITE_ENUMS_USING_TO_STRING);
+    mapper.enable(DeserializationFeature.READ_ENUMS_USING_TO_STRING);
+    mapper.registerModule(new JavaTimeModule());
+    URI baseURI = URI.create("http://petstore.swagger.io:80/v2");
+    scheme = baseURI.getScheme();
+    host = baseURI.getHost();
+    port = baseURI.getPort();
+    basePath = baseURI.getRawPath();
+    interceptor = null;
+    readTimeout = null;
+  }
+
+  /**
+   * Set a custom {@link HttpClient.Builder} object to use when creating the
+   * {@link HttpClient} that is used by the API client.
+   *
+   * @param builder Custom client builder.
+   * @return This object.
+   */
+  public ApiClient setHttpClientBuilder(HttpClient.Builder builder) {
+    this.builder = builder;
+    return this;
+  }
+
+  /**
+   * Get an {@link HttpClient} based on the current {@link HttpClient.Builder}.
+   *
+   * <p>The returned object is immutable and thread-safe.</p>
+   *
+   * @return The HTTP client.
+   */
+  public HttpClient getHttpClient() {
+    return builder.build();
+  }
+
+  /**
+   * Set a custom {@link ObjectMapper} to serialize and deserialize the request
+   * and response bodies.
+   *
+   * @param mapper Custom object mapper.
+   * @return This object.
+   */
+  public ApiClient setObjectMapper(ObjectMapper mapper) {
+    this.mapper = mapper;
+    return this;
+  }
+
+  /**
+   * Get a copy of the current {@link ObjectMapper}.
+   *
+   * @return A copy of the current object mapper.
+   */
+  public ObjectMapper getObjectMapper() {
+    return mapper.copy();
+  }
+
+  /**
+   * Set a custom host name for the target service.
+   *
+   * @param host The host name of the target service.
+   * @return This object.
+   */
+  public ApiClient setHost(String host) {
+    this.host = host;
+    return this;
+  }
+
+  /**
+   * Set a custom port number for the target service.
+   *
+   * @param port The port of the target service. Set this to -1 to reset the
+   *             value to the default for the scheme.
+   * @return This object.
+   */
+  public ApiClient setPort(int port) {
+    this.port = port;
+    return this;
+  }
+
+  /**
+   * Set a custom base path for the target service, for example '/v2'.
+   *
+   * @param basePath The base path against which the rest of the path is
+   *                 resolved.
+   * @return This object.
+   */
+  public ApiClient setBasePath(String basePath) {
+    this.basePath = basePath;
+    return this;
+  }
+
+  /**
+   * Get the base URI to resolve the endpoint paths against.
+   *
+   * @return The complete base URI that the rest of the API parameters are
+   * resolved against.
+   */
+  public String getBaseUri() {
+    return scheme + "://" + host + (port == -1 ? "" : ":" + port) + basePath;
+  }
+
+  /**
+   * Set a custom request interceptor.
+   *
+   * <p>A request interceptor is a mechanism for altering each request before it
+   * is sent. After the request has been fully configured but not yet built, the
+   * request builder is passed into this function for further modification,
+   * after which it is sent out.</p>
+   *
+   * <p>This is useful for altering the requests in a custom manner, such as
+   * adding headers. It could also be used for logging and monitoring.</p>
+   *
+   * @param interceptor A function invoked before creating each request. A value
+   *                    of null resets the interceptor to a no-op.
+   * @return This object.
+   */
+  public ApiClient setRequestInterceptor(Consumer<HttpRequest.Builder> interceptor) {
+    this.interceptor = interceptor;
+    return this;
+  }
+
+  /**
+   * Get the custom interceptor.
+   *
+   * @return The custom interceptor that was set, or null if there isn't any.
+   */
+  public Consumer<HttpRequest.Builder> getRequestInterceptor() {
+    return interceptor;
+  }
+
+  /**
+   * Set the read timeout for the http client.
+   *
+   * <p>This is the value used by default for each request, though it can be
+   * overridden on a per-request basis with a request interceptor.</p>
+   *
+   * @param readTimeout The read timeout used by default by the http client.
+   *                    Setting this value to null resets the timeout to an
+   *                    effectively infinite value.
+   * @return This object.
+   */
+  public ApiClient setReadTimeout(Duration readTimeout) {
+    this.readTimeout = readTimeout;
+    return this;
+  }
+
+  /**
+   * Get the read timeout that was set.
+   *
+   * @return The read timeout, or null if no timeout was set. Null represents
+   * an infinite wait time.
+   */
+  public Duration getReadTimeout() {
+    return readTimeout;
+  }
+}
diff --git a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/ApiException.java b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/ApiException.java
new file mode 100644
index 0000000000..f5427482e3
--- /dev/null
+++ b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/ApiException.java
@@ -0,0 +1,90 @@
+/*
+ * OpenAPI Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+
+package org.openapitools.client;
+
+import java.net.http.HttpHeaders;
+
+
+public class ApiException extends Exception {
+    private int code = 0;
+    private HttpHeaders responseHeaders = null;
+    private String responseBody = null;
+
+    public ApiException() {}
+
+    public ApiException(Throwable throwable) {
+        super(throwable);
+    }
+
+    public ApiException(String message) {
+        super(message);
+    }
+
+    public ApiException(String message, Throwable throwable, int code, HttpHeaders responseHeaders, String responseBody) {
+        super(message, throwable);
+        this.code = code;
+        this.responseHeaders = responseHeaders;
+        this.responseBody = responseBody;
+    }
+
+    public ApiException(String message, int code, HttpHeaders responseHeaders, String responseBody) {
+        this(message, (Throwable) null, code, responseHeaders, responseBody);
+    }
+
+    public ApiException(String message, Throwable throwable, int code, HttpHeaders responseHeaders) {
+        this(message, throwable, code, responseHeaders, null);
+    }
+
+    public ApiException(int code, HttpHeaders responseHeaders, String responseBody) {
+        this((String) null, (Throwable) null, code, responseHeaders, responseBody);
+    }
+
+    public ApiException(int code, String message) {
+        super(message);
+        this.code = code;
+    }
+
+    public ApiException(int code, String message, HttpHeaders responseHeaders, String responseBody) {
+        this(code, message);
+        this.responseHeaders = responseHeaders;
+        this.responseBody = responseBody;
+    }
+
+    /**
+     * Get the HTTP status code.
+     *
+     * @return HTTP status code
+     */
+    public int getCode() {
+        return code;
+    }
+
+    /**
+     * Get the HTTP response headers.
+     *
+     * @return Headers as an HttpHeaders object
+     */
+    public HttpHeaders getResponseHeaders() {
+        return responseHeaders;
+    }
+
+    /**
+     * Get the HTTP response body.
+     *
+     * @return Response body in the form of string
+     */
+    public String getResponseBody() {
+        return responseBody;
+    }
+}
diff --git a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/Configuration.java b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/Configuration.java
new file mode 100644
index 0000000000..acbecda489
--- /dev/null
+++ b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/Configuration.java
@@ -0,0 +1,39 @@
+/*
+ * OpenAPI Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+
+package org.openapitools.client;
+
+
+public class Configuration {
+    private static ApiClient defaultApiClient = new ApiClient();
+
+    /**
+     * Get the default API client, which would be used when creating API
+     * instances without providing an API client.
+     *
+     * @return Default API client
+     */
+    public static ApiClient getDefaultApiClient() {
+        return defaultApiClient;
+    }
+
+    /**
+     * Set the default API client, which would be used when creating API
+     * instances without providing an API client.
+     *
+     * @param apiClient API client
+     */
+    public static void setDefaultApiClient(ApiClient apiClient) {
+        defaultApiClient = apiClient;
+    }
+}
diff --git a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/Pair.java b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/Pair.java
new file mode 100644
index 0000000000..ae89aa6145
--- /dev/null
+++ b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/Pair.java
@@ -0,0 +1,61 @@
+/*
+ * OpenAPI Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+
+package org.openapitools.client;
+
+
+public class Pair {
+    private String name = "";
+    private String value = "";
+
+    public Pair (String name, String value) {
+        setName(name);
+        setValue(value);
+    }
+
+    private void setName(String name) {
+        if (!isValidString(name)) {
+            return;
+        }
+
+        this.name = name;
+    }
+
+    private void setValue(String value) {
+        if (!isValidString(value)) {
+            return;
+        }
+
+        this.value = value;
+    }
+
+    public String getName() {
+        return this.name;
+    }
+
+    public String getValue() {
+        return this.value;
+    }
+
+    private boolean isValidString(String arg) {
+        if (arg == null) {
+            return false;
+        }
+
+        if (arg.trim().isEmpty()) {
+            return false;
+        }
+
+        return true;
+    }
+}
diff --git a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/api/AnotherFakeApi.java b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/api/AnotherFakeApi.java
new file mode 100644
index 0000000000..baa5f332f9
--- /dev/null
+++ b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/api/AnotherFakeApi.java
@@ -0,0 +1,105 @@
+/*
+ * OpenAPI Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+package org.openapitools.client.api;
+
+import org.openapitools.client.ApiClient;
+import org.openapitools.client.ApiException;
+import org.openapitools.client.Pair;
+
+import org.openapitools.client.model.Client;
+
+import com.fasterxml.jackson.core.type.TypeReference;
+import com.fasterxml.jackson.databind.ObjectMapper;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.net.URI;
+import java.net.http.HttpClient;
+import java.net.http.HttpRequest;
+import java.net.http.HttpResponse;
+import java.time.Duration;
+import java.util.function.Consumer;
+
+import java.util.ArrayList;
+import java.util.StringJoiner;
+import java.util.List;
+import java.util.Map;
+
+
+public class AnotherFakeApi {
+  private final HttpClient memberVarHttpClient;
+  private final ObjectMapper memberVarObjectMapper;
+  private final String memberVarBaseUri;
+  private final Consumer<HttpRequest.Builder> memberVarInterceptor;
+  private final Duration memberVarReadTimeout;
+
+  public AnotherFakeApi() {
+    this(new ApiClient());
+  }
+
+  public AnotherFakeApi(ApiClient apiClient) {
+    memberVarHttpClient = apiClient.getHttpClient();
+    memberVarObjectMapper = apiClient.getObjectMapper();
+    memberVarBaseUri = apiClient.getBaseUri();
+    memberVarInterceptor = apiClient.getRequestInterceptor();
+    memberVarReadTimeout = apiClient.getReadTimeout();
+  }
+
+  /**
+   * To test special tags
+   * To test special tags and operation ID starting with number
+   * @param body client model (required)
+   * @return Client
+   * @throws ApiException if fails to make API call
+   */
+  public Client call123testSpecialTags(Client body) throws ApiException {
+    // verify the required parameter 'body' is set
+    if (body == null) {
+      throw new ApiException(400, "Missing the required parameter 'body' when calling call123testSpecialTags");
+    }
+
+    HttpRequest.Builder localVarRequestBuilder = HttpRequest.newBuilder();
+
+    String localVarPath = "/another-fake/dummy";
+
+    localVarRequestBuilder.uri(URI.create(memberVarBaseUri + localVarPath));
+
+    localVarRequestBuilder.header("Content-Type", "application/json");
+    localVarRequestBuilder.header("Accept", "application/json");
+
+    try {
+      byte[] localVarPostBody = memberVarObjectMapper.writeValueAsBytes(body);
+      localVarRequestBuilder.method("PATCH", HttpRequest.BodyPublishers.ofByteArray(localVarPostBody));
+      if (memberVarReadTimeout != null) {
+        localVarRequestBuilder.timeout(memberVarReadTimeout);
+      }
+      if (memberVarInterceptor != null) {
+        memberVarInterceptor.accept(localVarRequestBuilder);
+      }
+
+      HttpResponse<InputStream> localVarResponse = memberVarHttpClient.send(
+          localVarRequestBuilder.build(),
+          HttpResponse.BodyHandlers.ofInputStream());
+      if (localVarResponse.statusCode()/ 100 != 2) {
+        throw new ApiException(localVarResponse.statusCode(),
+            "call123testSpecialTags call received non-success response",
+            localVarResponse.headers(),
+            localVarResponse.body() == null ? null : new String(localVarResponse.body().readAllBytes()));
+      }
+
+      return memberVarObjectMapper.readValue(localVarResponse.body(), new TypeReference<Client>() {});
+    } catch (IOException | InterruptedException e) {
+      throw new ApiException(e);
+    }
+  }
+}
diff --git a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/api/FakeApi.java b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/api/FakeApi.java
new file mode 100644
index 0000000000..740a9719ca
--- /dev/null
+++ b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/api/FakeApi.java
@@ -0,0 +1,733 @@
+/*
+ * OpenAPI Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+package org.openapitools.client.api;
+
+import org.openapitools.client.ApiClient;
+import org.openapitools.client.ApiException;
+import org.openapitools.client.Pair;
+
+import java.math.BigDecimal;
+import org.openapitools.client.model.Client;
+import java.io.File;
+import org.openapitools.client.model.FileSchemaTestClass;
+import java.time.LocalDate;
+import java.time.OffsetDateTime;
+import org.openapitools.client.model.OuterComposite;
+import org.openapitools.client.model.User;
+import org.openapitools.client.model.XmlItem;
+
+import com.fasterxml.jackson.core.type.TypeReference;
+import com.fasterxml.jackson.databind.ObjectMapper;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.net.URI;
+import java.net.http.HttpClient;
+import java.net.http.HttpRequest;
+import java.net.http.HttpResponse;
+import java.time.Duration;
+import java.util.function.Consumer;
+
+import java.util.ArrayList;
+import java.util.StringJoiner;
+import java.util.List;
+import java.util.Map;
+
+
+public class FakeApi {
+  private final HttpClient memberVarHttpClient;
+  private final ObjectMapper memberVarObjectMapper;
+  private final String memberVarBaseUri;
+  private final Consumer<HttpRequest.Builder> memberVarInterceptor;
+  private final Duration memberVarReadTimeout;
+
+  public FakeApi() {
+    this(new ApiClient());
+  }
+
+  public FakeApi(ApiClient apiClient) {
+    memberVarHttpClient = apiClient.getHttpClient();
+    memberVarObjectMapper = apiClient.getObjectMapper();
+    memberVarBaseUri = apiClient.getBaseUri();
+    memberVarInterceptor = apiClient.getRequestInterceptor();
+    memberVarReadTimeout = apiClient.getReadTimeout();
+  }
+
+  /**
+   * creates an XmlItem
+   * this route creates an XmlItem
+   * @param xmlItem XmlItem Body (required)
+   * @throws ApiException if fails to make API call
+   */
+  public void createXmlItem(XmlItem xmlItem) throws ApiException {
+    // verify the required parameter 'xmlItem' is set
+    if (xmlItem == null) {
+      throw new ApiException(400, "Missing the required parameter 'xmlItem' when calling createXmlItem");
+    }
+
+    HttpRequest.Builder localVarRequestBuilder = HttpRequest.newBuilder();
+
+    String localVarPath = "/fake/create_xml_item";
+
+    localVarRequestBuilder.uri(URI.create(memberVarBaseUri + localVarPath));
+
+    localVarRequestBuilder.header("Content-Type", "application/json");
+    localVarRequestBuilder.header("Accept", "application/json");
+
+    try {
+      byte[] localVarPostBody = memberVarObjectMapper.writeValueAsBytes(xmlItem);
+      localVarRequestBuilder.method("POST", HttpRequest.BodyPublishers.ofByteArray(localVarPostBody));
+      if (memberVarReadTimeout != null) {
+        localVarRequestBuilder.timeout(memberVarReadTimeout);
+      }
+      if (memberVarInterceptor != null) {
+        memberVarInterceptor.accept(localVarRequestBuilder);
+      }
+
+      HttpResponse<InputStream> localVarResponse = memberVarHttpClient.send(
+          localVarRequestBuilder.build(),
+          HttpResponse.BodyHandlers.ofInputStream());
+      if (localVarResponse.statusCode()/ 100 != 2) {
+        throw new ApiException(localVarResponse.statusCode(),
+            "createXmlItem call received non-success response",
+            localVarResponse.headers(),
+            localVarResponse.body() == null ? null : new String(localVarResponse.body().readAllBytes()));
+      }
+
+    } catch (IOException | InterruptedException e) {
+      throw new ApiException(e);
+    }
+  }
+  /**
+   * 
+   * Test serialization of outer boolean types
+   * @param body Input boolean as post body (optional)
+   * @return Boolean
+   * @throws ApiException if fails to make API call
+   */
+  public Boolean fakeOuterBooleanSerialize(Boolean body) throws ApiException {
+
+    HttpRequest.Builder localVarRequestBuilder = HttpRequest.newBuilder();
+
+    String localVarPath = "/fake/outer/boolean";
+
+    localVarRequestBuilder.uri(URI.create(memberVarBaseUri + localVarPath));
+
+    localVarRequestBuilder.header("Content-Type", "application/json");
+    localVarRequestBuilder.header("Accept", "application/json");
+
+    try {
+      byte[] localVarPostBody = memberVarObjectMapper.writeValueAsBytes(body);
+      localVarRequestBuilder.method("POST", HttpRequest.BodyPublishers.ofByteArray(localVarPostBody));
+      if (memberVarReadTimeout != null) {
+        localVarRequestBuilder.timeout(memberVarReadTimeout);
+      }
+      if (memberVarInterceptor != null) {
+        memberVarInterceptor.accept(localVarRequestBuilder);
+      }
+
+      HttpResponse<InputStream> localVarResponse = memberVarHttpClient.send(
+          localVarRequestBuilder.build(),
+          HttpResponse.BodyHandlers.ofInputStream());
+      if (localVarResponse.statusCode()/ 100 != 2) {
+        throw new ApiException(localVarResponse.statusCode(),
+            "fakeOuterBooleanSerialize call received non-success response",
+            localVarResponse.headers(),
+            localVarResponse.body() == null ? null : new String(localVarResponse.body().readAllBytes()));
+      }
+
+      return memberVarObjectMapper.readValue(localVarResponse.body(), new TypeReference<Boolean>() {});
+    } catch (IOException | InterruptedException e) {
+      throw new ApiException(e);
+    }
+  }
+  /**
+   * 
+   * Test serialization of object with outer number type
+   * @param body Input composite as post body (optional)
+   * @return OuterComposite
+   * @throws ApiException if fails to make API call
+   */
+  public OuterComposite fakeOuterCompositeSerialize(OuterComposite body) throws ApiException {
+
+    HttpRequest.Builder localVarRequestBuilder = HttpRequest.newBuilder();
+
+    String localVarPath = "/fake/outer/composite";
+
+    localVarRequestBuilder.uri(URI.create(memberVarBaseUri + localVarPath));
+
+    localVarRequestBuilder.header("Content-Type", "application/json");
+    localVarRequestBuilder.header("Accept", "application/json");
+
+    try {
+      byte[] localVarPostBody = memberVarObjectMapper.writeValueAsBytes(body);
+      localVarRequestBuilder.method("POST", HttpRequest.BodyPublishers.ofByteArray(localVarPostBody));
+      if (memberVarReadTimeout != null) {
+        localVarRequestBuilder.timeout(memberVarReadTimeout);
+      }
+      if (memberVarInterceptor != null) {
+        memberVarInterceptor.accept(localVarRequestBuilder);
+      }
+
+      HttpResponse<InputStream> localVarResponse = memberVarHttpClient.send(
+          localVarRequestBuilder.build(),
+          HttpResponse.BodyHandlers.ofInputStream());
+      if (localVarResponse.statusCode()/ 100 != 2) {
+        throw new ApiException(localVarResponse.statusCode(),
+            "fakeOuterCompositeSerialize call received non-success response",
+            localVarResponse.headers(),
+            localVarResponse.body() == null ? null : new String(localVarResponse.body().readAllBytes()));
+      }
+
+      return memberVarObjectMapper.readValue(localVarResponse.body(), new TypeReference<OuterComposite>() {});
+    } catch (IOException | InterruptedException e) {
+      throw new ApiException(e);
+    }
+  }
+  /**
+   * 
+   * Test serialization of outer number types
+   * @param body Input number as post body (optional)
+   * @return BigDecimal
+   * @throws ApiException if fails to make API call
+   */
+  public BigDecimal fakeOuterNumberSerialize(BigDecimal body) throws ApiException {
+
+    HttpRequest.Builder localVarRequestBuilder = HttpRequest.newBuilder();
+
+    String localVarPath = "/fake/outer/number";
+
+    localVarRequestBuilder.uri(URI.create(memberVarBaseUri + localVarPath));
+
+    localVarRequestBuilder.header("Content-Type", "application/json");
+    localVarRequestBuilder.header("Accept", "application/json");
+
+    try {
+      byte[] localVarPostBody = memberVarObjectMapper.writeValueAsBytes(body);
+      localVarRequestBuilder.method("POST", HttpRequest.BodyPublishers.ofByteArray(localVarPostBody));
+      if (memberVarReadTimeout != null) {
+        localVarRequestBuilder.timeout(memberVarReadTimeout);
+      }
+      if (memberVarInterceptor != null) {
+        memberVarInterceptor.accept(localVarRequestBuilder);
+      }
+
+      HttpResponse<InputStream> localVarResponse = memberVarHttpClient.send(
+          localVarRequestBuilder.build(),
+          HttpResponse.BodyHandlers.ofInputStream());
+      if (localVarResponse.statusCode()/ 100 != 2) {
+        throw new ApiException(localVarResponse.statusCode(),
+            "fakeOuterNumberSerialize call received non-success response",
+            localVarResponse.headers(),
+            localVarResponse.body() == null ? null : new String(localVarResponse.body().readAllBytes()));
+      }
+
+      return memberVarObjectMapper.readValue(localVarResponse.body(), new TypeReference<BigDecimal>() {});
+    } catch (IOException | InterruptedException e) {
+      throw new ApiException(e);
+    }
+  }
+  /**
+   * 
+   * Test serialization of outer string types
+   * @param body Input string as post body (optional)
+   * @return String
+   * @throws ApiException if fails to make API call
+   */
+  public String fakeOuterStringSerialize(String body) throws ApiException {
+
+    HttpRequest.Builder localVarRequestBuilder = HttpRequest.newBuilder();
+
+    String localVarPath = "/fake/outer/string";
+
+    localVarRequestBuilder.uri(URI.create(memberVarBaseUri + localVarPath));
+
+    localVarRequestBuilder.header("Content-Type", "application/json");
+    localVarRequestBuilder.header("Accept", "application/json");
+
+    try {
+      byte[] localVarPostBody = memberVarObjectMapper.writeValueAsBytes(body);
+      localVarRequestBuilder.method("POST", HttpRequest.BodyPublishers.ofByteArray(localVarPostBody));
+      if (memberVarReadTimeout != null) {
+        localVarRequestBuilder.timeout(memberVarReadTimeout);
+      }
+      if (memberVarInterceptor != null) {
+        memberVarInterceptor.accept(localVarRequestBuilder);
+      }
+
+      HttpResponse<InputStream> localVarResponse = memberVarHttpClient.send(
+          localVarRequestBuilder.build(),
+          HttpResponse.BodyHandlers.ofInputStream());
+      if (localVarResponse.statusCode()/ 100 != 2) {
+        throw new ApiException(localVarResponse.statusCode(),
+            "fakeOuterStringSerialize call received non-success response",
+            localVarResponse.headers(),
+            localVarResponse.body() == null ? null : new String(localVarResponse.body().readAllBytes()));
+      }
+
+      return memberVarObjectMapper.readValue(localVarResponse.body(), new TypeReference<String>() {});
+    } catch (IOException | InterruptedException e) {
+      throw new ApiException(e);
+    }
+  }
+  /**
+   * 
+   * For this test, the body for this request much reference a schema named &#x60;File&#x60;.
+   * @param body  (required)
+   * @throws ApiException if fails to make API call
+   */
+  public void testBodyWithFileSchema(FileSchemaTestClass body) throws ApiException {
+    // verify the required parameter 'body' is set
+    if (body == null) {
+      throw new ApiException(400, "Missing the required parameter 'body' when calling testBodyWithFileSchema");
+    }
+
+    HttpRequest.Builder localVarRequestBuilder = HttpRequest.newBuilder();
+
+    String localVarPath = "/fake/body-with-file-schema";
+
+    localVarRequestBuilder.uri(URI.create(memberVarBaseUri + localVarPath));
+
+    localVarRequestBuilder.header("Content-Type", "application/json");
+    localVarRequestBuilder.header("Accept", "application/json");
+
+    try {
+      byte[] localVarPostBody = memberVarObjectMapper.writeValueAsBytes(body);
+      localVarRequestBuilder.method("PUT", HttpRequest.BodyPublishers.ofByteArray(localVarPostBody));
+      if (memberVarReadTimeout != null) {
+        localVarRequestBuilder.timeout(memberVarReadTimeout);
+      }
+      if (memberVarInterceptor != null) {
+        memberVarInterceptor.accept(localVarRequestBuilder);
+      }
+
+      HttpResponse<InputStream> localVarResponse = memberVarHttpClient.send(
+          localVarRequestBuilder.build(),
+          HttpResponse.BodyHandlers.ofInputStream());
+      if (localVarResponse.statusCode()/ 100 != 2) {
+        throw new ApiException(localVarResponse.statusCode(),
+            "testBodyWithFileSchema call received non-success response",
+            localVarResponse.headers(),
+            localVarResponse.body() == null ? null : new String(localVarResponse.body().readAllBytes()));
+      }
+
+    } catch (IOException | InterruptedException e) {
+      throw new ApiException(e);
+    }
+  }
+  /**
+   * 
+   * 
+   * @param query  (required)
+   * @param body  (required)
+   * @throws ApiException if fails to make API call
+   */
+  public void testBodyWithQueryParams(String query, User body) throws ApiException {
+    // verify the required parameter 'query' is set
+    if (query == null) {
+      throw new ApiException(400, "Missing the required parameter 'query' when calling testBodyWithQueryParams");
+    }
+    // verify the required parameter 'body' is set
+    if (body == null) {
+      throw new ApiException(400, "Missing the required parameter 'body' when calling testBodyWithQueryParams");
+    }
+
+    HttpRequest.Builder localVarRequestBuilder = HttpRequest.newBuilder();
+
+    String localVarPath = "/fake/body-with-query-params";
+
+    List<Pair> localVarQueryParams = new ArrayList<>();
+    localVarQueryParams.addAll(ApiClient.parameterToPairs("query", query));
+
+    if (!localVarQueryParams.isEmpty()) {
+      StringJoiner queryJoiner = new StringJoiner("&");
+      localVarQueryParams.forEach(p -> queryJoiner.add(p.getName() + '=' + p.getValue()));
+      localVarRequestBuilder.uri(URI.create(memberVarBaseUri + localVarPath + '?' + queryJoiner.toString()));
+    } else {
+      localVarRequestBuilder.uri(URI.create(memberVarBaseUri + localVarPath));
+    }
+
+    localVarRequestBuilder.header("Content-Type", "application/json");
+    localVarRequestBuilder.header("Accept", "application/json");
+
+    try {
+      byte[] localVarPostBody = memberVarObjectMapper.writeValueAsBytes(body);
+      localVarRequestBuilder.method("PUT", HttpRequest.BodyPublishers.ofByteArray(localVarPostBody));
+      if (memberVarReadTimeout != null) {
+        localVarRequestBuilder.timeout(memberVarReadTimeout);
+      }
+      if (memberVarInterceptor != null) {
+        memberVarInterceptor.accept(localVarRequestBuilder);
+      }
+
+      HttpResponse<InputStream> localVarResponse = memberVarHttpClient.send(
+          localVarRequestBuilder.build(),
+          HttpResponse.BodyHandlers.ofInputStream());
+      if (localVarResponse.statusCode()/ 100 != 2) {
+        throw new ApiException(localVarResponse.statusCode(),
+            "testBodyWithQueryParams call received non-success response",
+            localVarResponse.headers(),
+            localVarResponse.body() == null ? null : new String(localVarResponse.body().readAllBytes()));
+      }
+
+    } catch (IOException | InterruptedException e) {
+      throw new ApiException(e);
+    }
+  }
+  /**
+   * To test \&quot;client\&quot; model
+   * To test \&quot;client\&quot; model
+   * @param body client model (required)
+   * @return Client
+   * @throws ApiException if fails to make API call
+   */
+  public Client testClientModel(Client body) throws ApiException {
+    // verify the required parameter 'body' is set
+    if (body == null) {
+      throw new ApiException(400, "Missing the required parameter 'body' when calling testClientModel");
+    }
+
+    HttpRequest.Builder localVarRequestBuilder = HttpRequest.newBuilder();
+
+    String localVarPath = "/fake";
+
+    localVarRequestBuilder.uri(URI.create(memberVarBaseUri + localVarPath));
+
+    localVarRequestBuilder.header("Content-Type", "application/json");
+    localVarRequestBuilder.header("Accept", "application/json");
+
+    try {
+      byte[] localVarPostBody = memberVarObjectMapper.writeValueAsBytes(body);
+      localVarRequestBuilder.method("PATCH", HttpRequest.BodyPublishers.ofByteArray(localVarPostBody));
+      if (memberVarReadTimeout != null) {
+        localVarRequestBuilder.timeout(memberVarReadTimeout);
+      }
+      if (memberVarInterceptor != null) {
+        memberVarInterceptor.accept(localVarRequestBuilder);
+      }
+
+      HttpResponse<InputStream> localVarResponse = memberVarHttpClient.send(
+          localVarRequestBuilder.build(),
+          HttpResponse.BodyHandlers.ofInputStream());
+      if (localVarResponse.statusCode()/ 100 != 2) {
+        throw new ApiException(localVarResponse.statusCode(),
+            "testClientModel call received non-success response",
+            localVarResponse.headers(),
+            localVarResponse.body() == null ? null : new String(localVarResponse.body().readAllBytes()));
+      }
+
+      return memberVarObjectMapper.readValue(localVarResponse.body(), new TypeReference<Client>() {});
+    } catch (IOException | InterruptedException e) {
+      throw new ApiException(e);
+    }
+  }
+  /**
+   * Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 
+   * Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 
+   * @param number None (required)
+   * @param _double None (required)
+   * @param patternWithoutDelimiter None (required)
+   * @param _byte None (required)
+   * @param integer None (optional)
+   * @param int32 None (optional)
+   * @param int64 None (optional)
+   * @param _float None (optional)
+   * @param string None (optional)
+   * @param binary None (optional)
+   * @param date None (optional)
+   * @param dateTime None (optional)
+   * @param password None (optional)
+   * @param paramCallback None (optional)
+   * @throws ApiException if fails to make API call
+   */
+  public void testEndpointParameters(BigDecimal number, Double _double, String patternWithoutDelimiter, byte[] _byte, Integer integer, Integer int32, Long int64, Float _float, String string, File binary, LocalDate date, OffsetDateTime dateTime, String password, String paramCallback) throws ApiException {
+    // verify the required parameter 'number' is set
+    if (number == null) {
+      throw new ApiException(400, "Missing the required parameter 'number' when calling testEndpointParameters");
+    }
+    // verify the required parameter '_double' is set
+    if (_double == null) {
+      throw new ApiException(400, "Missing the required parameter '_double' when calling testEndpointParameters");
+    }
+    // verify the required parameter 'patternWithoutDelimiter' is set
+    if (patternWithoutDelimiter == null) {
+      throw new ApiException(400, "Missing the required parameter 'patternWithoutDelimiter' when calling testEndpointParameters");
+    }
+    // verify the required parameter '_byte' is set
+    if (_byte == null) {
+      throw new ApiException(400, "Missing the required parameter '_byte' when calling testEndpointParameters");
+    }
+
+    HttpRequest.Builder localVarRequestBuilder = HttpRequest.newBuilder();
+
+    String localVarPath = "/fake";
+
+    localVarRequestBuilder.uri(URI.create(memberVarBaseUri + localVarPath));
+
+    localVarRequestBuilder.header("Accept", "application/json");
+
+    try {
+      localVarRequestBuilder.method("POST", HttpRequest.BodyPublishers.noBody());
+      if (memberVarReadTimeout != null) {
+        localVarRequestBuilder.timeout(memberVarReadTimeout);
+      }
+      if (memberVarInterceptor != null) {
+        memberVarInterceptor.accept(localVarRequestBuilder);
+      }
+
+      HttpResponse<InputStream> localVarResponse = memberVarHttpClient.send(
+          localVarRequestBuilder.build(),
+          HttpResponse.BodyHandlers.ofInputStream());
+      if (localVarResponse.statusCode()/ 100 != 2) {
+        throw new ApiException(localVarResponse.statusCode(),
+            "testEndpointParameters call received non-success response",
+            localVarResponse.headers(),
+            localVarResponse.body() == null ? null : new String(localVarResponse.body().readAllBytes()));
+      }
+
+    } catch (IOException | InterruptedException e) {
+      throw new ApiException(e);
+    }
+  }
+  /**
+   * To test enum parameters
+   * To test enum parameters
+   * @param enumHeaderStringArray Header parameter enum test (string array) (optional
+   * @param enumHeaderString Header parameter enum test (string) (optional, default to -efg)
+   * @param enumQueryStringArray Query parameter enum test (string array) (optional
+   * @param enumQueryString Query parameter enum test (string) (optional, default to -efg)
+   * @param enumQueryInteger Query parameter enum test (double) (optional)
+   * @param enumQueryDouble Query parameter enum test (double) (optional)
+   * @param enumFormStringArray Form parameter enum test (string array) (optional
+   * @param enumFormString Form parameter enum test (string) (optional, default to -efg)
+   * @throws ApiException if fails to make API call
+   */
+  public void testEnumParameters(List<String> enumHeaderStringArray, String enumHeaderString, List<String> enumQueryStringArray, String enumQueryString, Integer enumQueryInteger, Double enumQueryDouble, List<String> enumFormStringArray, String enumFormString) throws ApiException {
+
+    HttpRequest.Builder localVarRequestBuilder = HttpRequest.newBuilder();
+
+    String localVarPath = "/fake";
+
+    List<Pair> localVarQueryParams = new ArrayList<>();
+    localVarQueryParams.addAll(ApiClient.parameterToPairs("csv", "enum_query_string_array", enumQueryStringArray));
+    localVarQueryParams.addAll(ApiClient.parameterToPairs("enum_query_string", enumQueryString));
+    localVarQueryParams.addAll(ApiClient.parameterToPairs("enum_query_integer", enumQueryInteger));
+    localVarQueryParams.addAll(ApiClient.parameterToPairs("enum_query_double", enumQueryDouble));
+
+    if (!localVarQueryParams.isEmpty()) {
+      StringJoiner queryJoiner = new StringJoiner("&");
+      localVarQueryParams.forEach(p -> queryJoiner.add(p.getName() + '=' + p.getValue()));
+      localVarRequestBuilder.uri(URI.create(memberVarBaseUri + localVarPath + '?' + queryJoiner.toString()));
+    } else {
+      localVarRequestBuilder.uri(URI.create(memberVarBaseUri + localVarPath));
+    }
+
+    if (enumHeaderStringArray != null) {
+      localVarRequestBuilder.header("enum_header_string_array", enumHeaderStringArray.toString());
+    }
+    if (enumHeaderString != null) {
+      localVarRequestBuilder.header("enum_header_string", enumHeaderString.toString());
+    }
+    localVarRequestBuilder.header("Accept", "application/json");
+
+    try {
+      localVarRequestBuilder.method("GET", HttpRequest.BodyPublishers.noBody());
+      if (memberVarReadTimeout != null) {
+        localVarRequestBuilder.timeout(memberVarReadTimeout);
+      }
+      if (memberVarInterceptor != null) {
+        memberVarInterceptor.accept(localVarRequestBuilder);
+      }
+
+      HttpResponse<InputStream> localVarResponse = memberVarHttpClient.send(
+          localVarRequestBuilder.build(),
+          HttpResponse.BodyHandlers.ofInputStream());
+      if (localVarResponse.statusCode()/ 100 != 2) {
+        throw new ApiException(localVarResponse.statusCode(),
+            "testEnumParameters call received non-success response",
+            localVarResponse.headers(),
+            localVarResponse.body() == null ? null : new String(localVarResponse.body().readAllBytes()));
+      }
+
+    } catch (IOException | InterruptedException e) {
+      throw new ApiException(e);
+    }
+  }
+  /**
+   * Fake endpoint to test group parameters (optional)
+   * Fake endpoint to test group parameters (optional)
+   * @param requiredStringGroup Required String in group parameters (required)
+   * @param requiredBooleanGroup Required Boolean in group parameters (required)
+   * @param requiredInt64Group Required Integer in group parameters (required)
+   * @param stringGroup String in group parameters (optional)
+   * @param booleanGroup Boolean in group parameters (optional)
+   * @param int64Group Integer in group parameters (optional)
+   * @throws ApiException if fails to make API call
+   */
+  public void testGroupParameters(Integer requiredStringGroup, Boolean requiredBooleanGroup, Long requiredInt64Group, Integer stringGroup, Boolean booleanGroup, Long int64Group) throws ApiException {
+    // verify the required parameter 'requiredStringGroup' is set
+    if (requiredStringGroup == null) {
+      throw new ApiException(400, "Missing the required parameter 'requiredStringGroup' when calling testGroupParameters");
+    }
+    // verify the required parameter 'requiredBooleanGroup' is set
+    if (requiredBooleanGroup == null) {
+      throw new ApiException(400, "Missing the required parameter 'requiredBooleanGroup' when calling testGroupParameters");
+    }
+    // verify the required parameter 'requiredInt64Group' is set
+    if (requiredInt64Group == null) {
+      throw new ApiException(400, "Missing the required parameter 'requiredInt64Group' when calling testGroupParameters");
+    }
+
+    HttpRequest.Builder localVarRequestBuilder = HttpRequest.newBuilder();
+
+    String localVarPath = "/fake";
+
+    List<Pair> localVarQueryParams = new ArrayList<>();
+    localVarQueryParams.addAll(ApiClient.parameterToPairs("required_string_group", requiredStringGroup));
+    localVarQueryParams.addAll(ApiClient.parameterToPairs("required_int64_group", requiredInt64Group));
+    localVarQueryParams.addAll(ApiClient.parameterToPairs("string_group", stringGroup));
+    localVarQueryParams.addAll(ApiClient.parameterToPairs("int64_group", int64Group));
+
+    if (!localVarQueryParams.isEmpty()) {
+      StringJoiner queryJoiner = new StringJoiner("&");
+      localVarQueryParams.forEach(p -> queryJoiner.add(p.getName() + '=' + p.getValue()));
+      localVarRequestBuilder.uri(URI.create(memberVarBaseUri + localVarPath + '?' + queryJoiner.toString()));
+    } else {
+      localVarRequestBuilder.uri(URI.create(memberVarBaseUri + localVarPath));
+    }
+
+    if (requiredBooleanGroup != null) {
+      localVarRequestBuilder.header("required_boolean_group", requiredBooleanGroup.toString());
+    }
+    if (booleanGroup != null) {
+      localVarRequestBuilder.header("boolean_group", booleanGroup.toString());
+    }
+    localVarRequestBuilder.header("Accept", "application/json");
+
+    try {
+      localVarRequestBuilder.method("DELETE", HttpRequest.BodyPublishers.noBody());
+      if (memberVarReadTimeout != null) {
+        localVarRequestBuilder.timeout(memberVarReadTimeout);
+      }
+      if (memberVarInterceptor != null) {
+        memberVarInterceptor.accept(localVarRequestBuilder);
+      }
+
+      HttpResponse<InputStream> localVarResponse = memberVarHttpClient.send(
+          localVarRequestBuilder.build(),
+          HttpResponse.BodyHandlers.ofInputStream());
+      if (localVarResponse.statusCode()/ 100 != 2) {
+        throw new ApiException(localVarResponse.statusCode(),
+            "testGroupParameters call received non-success response",
+            localVarResponse.headers(),
+            localVarResponse.body() == null ? null : new String(localVarResponse.body().readAllBytes()));
+      }
+
+    } catch (IOException | InterruptedException e) {
+      throw new ApiException(e);
+    }
+  }
+  /**
+   * test inline additionalProperties
+   * 
+   * @param param request body (required)
+   * @throws ApiException if fails to make API call
+   */
+  public void testInlineAdditionalProperties(Map<String, String> param) throws ApiException {
+    // verify the required parameter 'param' is set
+    if (param == null) {
+      throw new ApiException(400, "Missing the required parameter 'param' when calling testInlineAdditionalProperties");
+    }
+
+    HttpRequest.Builder localVarRequestBuilder = HttpRequest.newBuilder();
+
+    String localVarPath = "/fake/inline-additionalProperties";
+
+    localVarRequestBuilder.uri(URI.create(memberVarBaseUri + localVarPath));
+
+    localVarRequestBuilder.header("Content-Type", "application/json");
+    localVarRequestBuilder.header("Accept", "application/json");
+
+    try {
+      byte[] localVarPostBody = memberVarObjectMapper.writeValueAsBytes(param);
+      localVarRequestBuilder.method("POST", HttpRequest.BodyPublishers.ofByteArray(localVarPostBody));
+      if (memberVarReadTimeout != null) {
+        localVarRequestBuilder.timeout(memberVarReadTimeout);
+      }
+      if (memberVarInterceptor != null) {
+        memberVarInterceptor.accept(localVarRequestBuilder);
+      }
+
+      HttpResponse<InputStream> localVarResponse = memberVarHttpClient.send(
+          localVarRequestBuilder.build(),
+          HttpResponse.BodyHandlers.ofInputStream());
+      if (localVarResponse.statusCode()/ 100 != 2) {
+        throw new ApiException(localVarResponse.statusCode(),
+            "testInlineAdditionalProperties call received non-success response",
+            localVarResponse.headers(),
+            localVarResponse.body() == null ? null : new String(localVarResponse.body().readAllBytes()));
+      }
+
+    } catch (IOException | InterruptedException e) {
+      throw new ApiException(e);
+    }
+  }
+  /**
+   * test json serialization of form data
+   * 
+   * @param param field1 (required)
+   * @param param2 field2 (required)
+   * @throws ApiException if fails to make API call
+   */
+  public void testJsonFormData(String param, String param2) throws ApiException {
+    // verify the required parameter 'param' is set
+    if (param == null) {
+      throw new ApiException(400, "Missing the required parameter 'param' when calling testJsonFormData");
+    }
+    // verify the required parameter 'param2' is set
+    if (param2 == null) {
+      throw new ApiException(400, "Missing the required parameter 'param2' when calling testJsonFormData");
+    }
+
+    HttpRequest.Builder localVarRequestBuilder = HttpRequest.newBuilder();
+
+    String localVarPath = "/fake/jsonFormData";
+
+    localVarRequestBuilder.uri(URI.create(memberVarBaseUri + localVarPath));
+
+    localVarRequestBuilder.header("Accept", "application/json");
+
+    try {
+      localVarRequestBuilder.method("GET", HttpRequest.BodyPublishers.noBody());
+      if (memberVarReadTimeout != null) {
+        localVarRequestBuilder.timeout(memberVarReadTimeout);
+      }
+      if (memberVarInterceptor != null) {
+        memberVarInterceptor.accept(localVarRequestBuilder);
+      }
+
+      HttpResponse<InputStream> localVarResponse = memberVarHttpClient.send(
+          localVarRequestBuilder.build(),
+          HttpResponse.BodyHandlers.ofInputStream());
+      if (localVarResponse.statusCode()/ 100 != 2) {
+        throw new ApiException(localVarResponse.statusCode(),
+            "testJsonFormData call received non-success response",
+            localVarResponse.headers(),
+            localVarResponse.body() == null ? null : new String(localVarResponse.body().readAllBytes()));
+      }
+
+    } catch (IOException | InterruptedException e) {
+      throw new ApiException(e);
+    }
+  }
+}
diff --git a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/api/FakeClassnameTags123Api.java b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/api/FakeClassnameTags123Api.java
new file mode 100644
index 0000000000..d347fc4777
--- /dev/null
+++ b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/api/FakeClassnameTags123Api.java
@@ -0,0 +1,105 @@
+/*
+ * OpenAPI Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+package org.openapitools.client.api;
+
+import org.openapitools.client.ApiClient;
+import org.openapitools.client.ApiException;
+import org.openapitools.client.Pair;
+
+import org.openapitools.client.model.Client;
+
+import com.fasterxml.jackson.core.type.TypeReference;
+import com.fasterxml.jackson.databind.ObjectMapper;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.net.URI;
+import java.net.http.HttpClient;
+import java.net.http.HttpRequest;
+import java.net.http.HttpResponse;
+import java.time.Duration;
+import java.util.function.Consumer;
+
+import java.util.ArrayList;
+import java.util.StringJoiner;
+import java.util.List;
+import java.util.Map;
+
+
+public class FakeClassnameTags123Api {
+  private final HttpClient memberVarHttpClient;
+  private final ObjectMapper memberVarObjectMapper;
+  private final String memberVarBaseUri;
+  private final Consumer<HttpRequest.Builder> memberVarInterceptor;
+  private final Duration memberVarReadTimeout;
+
+  public FakeClassnameTags123Api() {
+    this(new ApiClient());
+  }
+
+  public FakeClassnameTags123Api(ApiClient apiClient) {
+    memberVarHttpClient = apiClient.getHttpClient();
+    memberVarObjectMapper = apiClient.getObjectMapper();
+    memberVarBaseUri = apiClient.getBaseUri();
+    memberVarInterceptor = apiClient.getRequestInterceptor();
+    memberVarReadTimeout = apiClient.getReadTimeout();
+  }
+
+  /**
+   * To test class name in snake case
+   * To test class name in snake case
+   * @param body client model (required)
+   * @return Client
+   * @throws ApiException if fails to make API call
+   */
+  public Client testClassname(Client body) throws ApiException {
+    // verify the required parameter 'body' is set
+    if (body == null) {
+      throw new ApiException(400, "Missing the required parameter 'body' when calling testClassname");
+    }
+
+    HttpRequest.Builder localVarRequestBuilder = HttpRequest.newBuilder();
+
+    String localVarPath = "/fake_classname_test";
+
+    localVarRequestBuilder.uri(URI.create(memberVarBaseUri + localVarPath));
+
+    localVarRequestBuilder.header("Content-Type", "application/json");
+    localVarRequestBuilder.header("Accept", "application/json");
+
+    try {
+      byte[] localVarPostBody = memberVarObjectMapper.writeValueAsBytes(body);
+      localVarRequestBuilder.method("PATCH", HttpRequest.BodyPublishers.ofByteArray(localVarPostBody));
+      if (memberVarReadTimeout != null) {
+        localVarRequestBuilder.timeout(memberVarReadTimeout);
+      }
+      if (memberVarInterceptor != null) {
+        memberVarInterceptor.accept(localVarRequestBuilder);
+      }
+
+      HttpResponse<InputStream> localVarResponse = memberVarHttpClient.send(
+          localVarRequestBuilder.build(),
+          HttpResponse.BodyHandlers.ofInputStream());
+      if (localVarResponse.statusCode()/ 100 != 2) {
+        throw new ApiException(localVarResponse.statusCode(),
+            "testClassname call received non-success response",
+            localVarResponse.headers(),
+            localVarResponse.body() == null ? null : new String(localVarResponse.body().readAllBytes()));
+      }
+
+      return memberVarObjectMapper.readValue(localVarResponse.body(), new TypeReference<Client>() {});
+    } catch (IOException | InterruptedException e) {
+      throw new ApiException(e);
+    }
+  }
+}
diff --git a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/api/PetApi.java b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/api/PetApi.java
new file mode 100644
index 0000000000..7eacabd955
--- /dev/null
+++ b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/api/PetApi.java
@@ -0,0 +1,500 @@
+/*
+ * OpenAPI Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+package org.openapitools.client.api;
+
+import org.openapitools.client.ApiClient;
+import org.openapitools.client.ApiException;
+import org.openapitools.client.Pair;
+
+import java.io.File;
+import org.openapitools.client.model.ModelApiResponse;
+import org.openapitools.client.model.Pet;
+
+import com.fasterxml.jackson.core.type.TypeReference;
+import com.fasterxml.jackson.databind.ObjectMapper;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.net.URI;
+import java.net.http.HttpClient;
+import java.net.http.HttpRequest;
+import java.net.http.HttpResponse;
+import java.time.Duration;
+import java.util.function.Consumer;
+
+import java.util.ArrayList;
+import java.util.StringJoiner;
+import java.util.List;
+import java.util.Map;
+
+
+public class PetApi {
+  private final HttpClient memberVarHttpClient;
+  private final ObjectMapper memberVarObjectMapper;
+  private final String memberVarBaseUri;
+  private final Consumer<HttpRequest.Builder> memberVarInterceptor;
+  private final Duration memberVarReadTimeout;
+
+  public PetApi() {
+    this(new ApiClient());
+  }
+
+  public PetApi(ApiClient apiClient) {
+    memberVarHttpClient = apiClient.getHttpClient();
+    memberVarObjectMapper = apiClient.getObjectMapper();
+    memberVarBaseUri = apiClient.getBaseUri();
+    memberVarInterceptor = apiClient.getRequestInterceptor();
+    memberVarReadTimeout = apiClient.getReadTimeout();
+  }
+
+  /**
+   * Add a new pet to the store
+   * 
+   * @param body Pet object that needs to be added to the store (required)
+   * @throws ApiException if fails to make API call
+   */
+  public void addPet(Pet body) throws ApiException {
+    // verify the required parameter 'body' is set
+    if (body == null) {
+      throw new ApiException(400, "Missing the required parameter 'body' when calling addPet");
+    }
+
+    HttpRequest.Builder localVarRequestBuilder = HttpRequest.newBuilder();
+
+    String localVarPath = "/pet";
+
+    localVarRequestBuilder.uri(URI.create(memberVarBaseUri + localVarPath));
+
+    localVarRequestBuilder.header("Content-Type", "application/json");
+    localVarRequestBuilder.header("Accept", "application/json");
+
+    try {
+      byte[] localVarPostBody = memberVarObjectMapper.writeValueAsBytes(body);
+      localVarRequestBuilder.method("POST", HttpRequest.BodyPublishers.ofByteArray(localVarPostBody));
+      if (memberVarReadTimeout != null) {
+        localVarRequestBuilder.timeout(memberVarReadTimeout);
+      }
+      if (memberVarInterceptor != null) {
+        memberVarInterceptor.accept(localVarRequestBuilder);
+      }
+
+      HttpResponse<InputStream> localVarResponse = memberVarHttpClient.send(
+          localVarRequestBuilder.build(),
+          HttpResponse.BodyHandlers.ofInputStream());
+      if (localVarResponse.statusCode()/ 100 != 2) {
+        throw new ApiException(localVarResponse.statusCode(),
+            "addPet call received non-success response",
+            localVarResponse.headers(),
+            localVarResponse.body() == null ? null : new String(localVarResponse.body().readAllBytes()));
+      }
+
+    } catch (IOException | InterruptedException e) {
+      throw new ApiException(e);
+    }
+  }
+  /**
+   * Deletes a pet
+   * 
+   * @param petId Pet id to delete (required)
+   * @param apiKey  (optional)
+   * @throws ApiException if fails to make API call
+   */
+  public void deletePet(Long petId, String apiKey) throws ApiException {
+    // verify the required parameter 'petId' is set
+    if (petId == null) {
+      throw new ApiException(400, "Missing the required parameter 'petId' when calling deletePet");
+    }
+
+    HttpRequest.Builder localVarRequestBuilder = HttpRequest.newBuilder();
+
+    String localVarPath = "/pet/{petId}"
+        .replace("{petId}", ApiClient.urlEncode(petId.toString()));
+
+    localVarRequestBuilder.uri(URI.create(memberVarBaseUri + localVarPath));
+
+    if (apiKey != null) {
+      localVarRequestBuilder.header("api_key", apiKey.toString());
+    }
+    localVarRequestBuilder.header("Accept", "application/json");
+
+    try {
+      localVarRequestBuilder.method("DELETE", HttpRequest.BodyPublishers.noBody());
+      if (memberVarReadTimeout != null) {
+        localVarRequestBuilder.timeout(memberVarReadTimeout);
+      }
+      if (memberVarInterceptor != null) {
+        memberVarInterceptor.accept(localVarRequestBuilder);
+      }
+
+      HttpResponse<InputStream> localVarResponse = memberVarHttpClient.send(
+          localVarRequestBuilder.build(),
+          HttpResponse.BodyHandlers.ofInputStream());
+      if (localVarResponse.statusCode()/ 100 != 2) {
+        throw new ApiException(localVarResponse.statusCode(),
+            "deletePet call received non-success response",
+            localVarResponse.headers(),
+            localVarResponse.body() == null ? null : new String(localVarResponse.body().readAllBytes()));
+      }
+
+    } catch (IOException | InterruptedException e) {
+      throw new ApiException(e);
+    }
+  }
+  /**
+   * Finds Pets by status
+   * Multiple status values can be provided with comma separated strings
+   * @param status Status values that need to be considered for filter (required)
+   * @return List&lt;Pet&gt;
+   * @throws ApiException if fails to make API call
+   */
+  public List<Pet> findPetsByStatus(List<String> status) throws ApiException {
+    // verify the required parameter 'status' is set
+    if (status == null) {
+      throw new ApiException(400, "Missing the required parameter 'status' when calling findPetsByStatus");
+    }
+
+    HttpRequest.Builder localVarRequestBuilder = HttpRequest.newBuilder();
+
+    String localVarPath = "/pet/findByStatus";
+
+    List<Pair> localVarQueryParams = new ArrayList<>();
+    localVarQueryParams.addAll(ApiClient.parameterToPairs("csv", "status", status));
+
+    if (!localVarQueryParams.isEmpty()) {
+      StringJoiner queryJoiner = new StringJoiner("&");
+      localVarQueryParams.forEach(p -> queryJoiner.add(p.getName() + '=' + p.getValue()));
+      localVarRequestBuilder.uri(URI.create(memberVarBaseUri + localVarPath + '?' + queryJoiner.toString()));
+    } else {
+      localVarRequestBuilder.uri(URI.create(memberVarBaseUri + localVarPath));
+    }
+
+    localVarRequestBuilder.header("Accept", "application/json");
+
+    try {
+      localVarRequestBuilder.method("GET", HttpRequest.BodyPublishers.noBody());
+      if (memberVarReadTimeout != null) {
+        localVarRequestBuilder.timeout(memberVarReadTimeout);
+      }
+      if (memberVarInterceptor != null) {
+        memberVarInterceptor.accept(localVarRequestBuilder);
+      }
+
+      HttpResponse<InputStream> localVarResponse = memberVarHttpClient.send(
+          localVarRequestBuilder.build(),
+          HttpResponse.BodyHandlers.ofInputStream());
+      if (localVarResponse.statusCode()/ 100 != 2) {
+        throw new ApiException(localVarResponse.statusCode(),
+            "findPetsByStatus call received non-success response",
+            localVarResponse.headers(),
+            localVarResponse.body() == null ? null : new String(localVarResponse.body().readAllBytes()));
+      }
+
+      return memberVarObjectMapper.readValue(localVarResponse.body(), new TypeReference<List<Pet>>() {});
+    } catch (IOException | InterruptedException e) {
+      throw new ApiException(e);
+    }
+  }
+  /**
+   * Finds Pets by tags
+   * Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3 for testing.
+   * @param tags Tags to filter by (required)
+   * @return List&lt;Pet&gt;
+   * @throws ApiException if fails to make API call
+   * @deprecated
+   */
+  @Deprecated
+  public List<Pet> findPetsByTags(List<String> tags) throws ApiException {
+    // verify the required parameter 'tags' is set
+    if (tags == null) {
+      throw new ApiException(400, "Missing the required parameter 'tags' when calling findPetsByTags");
+    }
+
+    HttpRequest.Builder localVarRequestBuilder = HttpRequest.newBuilder();
+
+    String localVarPath = "/pet/findByTags";
+
+    List<Pair> localVarQueryParams = new ArrayList<>();
+    localVarQueryParams.addAll(ApiClient.parameterToPairs("csv", "tags", tags));
+
+    if (!localVarQueryParams.isEmpty()) {
+      StringJoiner queryJoiner = new StringJoiner("&");
+      localVarQueryParams.forEach(p -> queryJoiner.add(p.getName() + '=' + p.getValue()));
+      localVarRequestBuilder.uri(URI.create(memberVarBaseUri + localVarPath + '?' + queryJoiner.toString()));
+    } else {
+      localVarRequestBuilder.uri(URI.create(memberVarBaseUri + localVarPath));
+    }
+
+    localVarRequestBuilder.header("Accept", "application/json");
+
+    try {
+      localVarRequestBuilder.method("GET", HttpRequest.BodyPublishers.noBody());
+      if (memberVarReadTimeout != null) {
+        localVarRequestBuilder.timeout(memberVarReadTimeout);
+      }
+      if (memberVarInterceptor != null) {
+        memberVarInterceptor.accept(localVarRequestBuilder);
+      }
+
+      HttpResponse<InputStream> localVarResponse = memberVarHttpClient.send(
+          localVarRequestBuilder.build(),
+          HttpResponse.BodyHandlers.ofInputStream());
+      if (localVarResponse.statusCode()/ 100 != 2) {
+        throw new ApiException(localVarResponse.statusCode(),
+            "findPetsByTags call received non-success response",
+            localVarResponse.headers(),
+            localVarResponse.body() == null ? null : new String(localVarResponse.body().readAllBytes()));
+      }
+
+      return memberVarObjectMapper.readValue(localVarResponse.body(), new TypeReference<List<Pet>>() {});
+    } catch (IOException | InterruptedException e) {
+      throw new ApiException(e);
+    }
+  }
+  /**
+   * Find pet by ID
+   * Returns a single pet
+   * @param petId ID of pet to return (required)
+   * @return Pet
+   * @throws ApiException if fails to make API call
+   */
+  public Pet getPetById(Long petId) throws ApiException {
+    // verify the required parameter 'petId' is set
+    if (petId == null) {
+      throw new ApiException(400, "Missing the required parameter 'petId' when calling getPetById");
+    }
+
+    HttpRequest.Builder localVarRequestBuilder = HttpRequest.newBuilder();
+
+    String localVarPath = "/pet/{petId}"
+        .replace("{petId}", ApiClient.urlEncode(petId.toString()));
+
+    localVarRequestBuilder.uri(URI.create(memberVarBaseUri + localVarPath));
+
+    localVarRequestBuilder.header("Accept", "application/json");
+
+    try {
+      localVarRequestBuilder.method("GET", HttpRequest.BodyPublishers.noBody());
+      if (memberVarReadTimeout != null) {
+        localVarRequestBuilder.timeout(memberVarReadTimeout);
+      }
+      if (memberVarInterceptor != null) {
+        memberVarInterceptor.accept(localVarRequestBuilder);
+      }
+
+      HttpResponse<InputStream> localVarResponse = memberVarHttpClient.send(
+          localVarRequestBuilder.build(),
+          HttpResponse.BodyHandlers.ofInputStream());
+      if (localVarResponse.statusCode()/ 100 != 2) {
+        throw new ApiException(localVarResponse.statusCode(),
+            "getPetById call received non-success response",
+            localVarResponse.headers(),
+            localVarResponse.body() == null ? null : new String(localVarResponse.body().readAllBytes()));
+      }
+
+      return memberVarObjectMapper.readValue(localVarResponse.body(), new TypeReference<Pet>() {});
+    } catch (IOException | InterruptedException e) {
+      throw new ApiException(e);
+    }
+  }
+  /**
+   * Update an existing pet
+   * 
+   * @param body Pet object that needs to be added to the store (required)
+   * @throws ApiException if fails to make API call
+   */
+  public void updatePet(Pet body) throws ApiException {
+    // verify the required parameter 'body' is set
+    if (body == null) {
+      throw new ApiException(400, "Missing the required parameter 'body' when calling updatePet");
+    }
+
+    HttpRequest.Builder localVarRequestBuilder = HttpRequest.newBuilder();
+
+    String localVarPath = "/pet";
+
+    localVarRequestBuilder.uri(URI.create(memberVarBaseUri + localVarPath));
+
+    localVarRequestBuilder.header("Content-Type", "application/json");
+    localVarRequestBuilder.header("Accept", "application/json");
+
+    try {
+      byte[] localVarPostBody = memberVarObjectMapper.writeValueAsBytes(body);
+      localVarRequestBuilder.method("PUT", HttpRequest.BodyPublishers.ofByteArray(localVarPostBody));
+      if (memberVarReadTimeout != null) {
+        localVarRequestBuilder.timeout(memberVarReadTimeout);
+      }
+      if (memberVarInterceptor != null) {
+        memberVarInterceptor.accept(localVarRequestBuilder);
+      }
+
+      HttpResponse<InputStream> localVarResponse = memberVarHttpClient.send(
+          localVarRequestBuilder.build(),
+          HttpResponse.BodyHandlers.ofInputStream());
+      if (localVarResponse.statusCode()/ 100 != 2) {
+        throw new ApiException(localVarResponse.statusCode(),
+            "updatePet call received non-success response",
+            localVarResponse.headers(),
+            localVarResponse.body() == null ? null : new String(localVarResponse.body().readAllBytes()));
+      }
+
+    } catch (IOException | InterruptedException e) {
+      throw new ApiException(e);
+    }
+  }
+  /**
+   * Updates a pet in the store with form data
+   * 
+   * @param petId ID of pet that needs to be updated (required)
+   * @param name Updated name of the pet (optional)
+   * @param status Updated status of the pet (optional)
+   * @throws ApiException if fails to make API call
+   */
+  public void updatePetWithForm(Long petId, String name, String status) throws ApiException {
+    // verify the required parameter 'petId' is set
+    if (petId == null) {
+      throw new ApiException(400, "Missing the required parameter 'petId' when calling updatePetWithForm");
+    }
+
+    HttpRequest.Builder localVarRequestBuilder = HttpRequest.newBuilder();
+
+    String localVarPath = "/pet/{petId}"
+        .replace("{petId}", ApiClient.urlEncode(petId.toString()));
+
+    localVarRequestBuilder.uri(URI.create(memberVarBaseUri + localVarPath));
+
+    localVarRequestBuilder.header("Accept", "application/json");
+
+    try {
+      localVarRequestBuilder.method("POST", HttpRequest.BodyPublishers.noBody());
+      if (memberVarReadTimeout != null) {
+        localVarRequestBuilder.timeout(memberVarReadTimeout);
+      }
+      if (memberVarInterceptor != null) {
+        memberVarInterceptor.accept(localVarRequestBuilder);
+      }
+
+      HttpResponse<InputStream> localVarResponse = memberVarHttpClient.send(
+          localVarRequestBuilder.build(),
+          HttpResponse.BodyHandlers.ofInputStream());
+      if (localVarResponse.statusCode()/ 100 != 2) {
+        throw new ApiException(localVarResponse.statusCode(),
+            "updatePetWithForm call received non-success response",
+            localVarResponse.headers(),
+            localVarResponse.body() == null ? null : new String(localVarResponse.body().readAllBytes()));
+      }
+
+    } catch (IOException | InterruptedException e) {
+      throw new ApiException(e);
+    }
+  }
+  /**
+   * uploads an image
+   * 
+   * @param petId ID of pet to update (required)
+   * @param additionalMetadata Additional data to pass to server (optional)
+   * @param file file to upload (optional)
+   * @return ModelApiResponse
+   * @throws ApiException if fails to make API call
+   */
+  public ModelApiResponse uploadFile(Long petId, String additionalMetadata, File file) throws ApiException {
+    // verify the required parameter 'petId' is set
+    if (petId == null) {
+      throw new ApiException(400, "Missing the required parameter 'petId' when calling uploadFile");
+    }
+
+    HttpRequest.Builder localVarRequestBuilder = HttpRequest.newBuilder();
+
+    String localVarPath = "/pet/{petId}/uploadImage"
+        .replace("{petId}", ApiClient.urlEncode(petId.toString()));
+
+    localVarRequestBuilder.uri(URI.create(memberVarBaseUri + localVarPath));
+
+    localVarRequestBuilder.header("Accept", "application/json");
+
+    try {
+      localVarRequestBuilder.method("POST", HttpRequest.BodyPublishers.noBody());
+      if (memberVarReadTimeout != null) {
+        localVarRequestBuilder.timeout(memberVarReadTimeout);
+      }
+      if (memberVarInterceptor != null) {
+        memberVarInterceptor.accept(localVarRequestBuilder);
+      }
+
+      HttpResponse<InputStream> localVarResponse = memberVarHttpClient.send(
+          localVarRequestBuilder.build(),
+          HttpResponse.BodyHandlers.ofInputStream());
+      if (localVarResponse.statusCode()/ 100 != 2) {
+        throw new ApiException(localVarResponse.statusCode(),
+            "uploadFile call received non-success response",
+            localVarResponse.headers(),
+            localVarResponse.body() == null ? null : new String(localVarResponse.body().readAllBytes()));
+      }
+
+      return memberVarObjectMapper.readValue(localVarResponse.body(), new TypeReference<ModelApiResponse>() {});
+    } catch (IOException | InterruptedException e) {
+      throw new ApiException(e);
+    }
+  }
+  /**
+   * uploads an image (required)
+   * 
+   * @param petId ID of pet to update (required)
+   * @param requiredFile file to upload (required)
+   * @param additionalMetadata Additional data to pass to server (optional)
+   * @return ModelApiResponse
+   * @throws ApiException if fails to make API call
+   */
+  public ModelApiResponse uploadFileWithRequiredFile(Long petId, File requiredFile, String additionalMetadata) throws ApiException {
+    // verify the required parameter 'petId' is set
+    if (petId == null) {
+      throw new ApiException(400, "Missing the required parameter 'petId' when calling uploadFileWithRequiredFile");
+    }
+    // verify the required parameter 'requiredFile' is set
+    if (requiredFile == null) {
+      throw new ApiException(400, "Missing the required parameter 'requiredFile' when calling uploadFileWithRequiredFile");
+    }
+
+    HttpRequest.Builder localVarRequestBuilder = HttpRequest.newBuilder();
+
+    String localVarPath = "/fake/{petId}/uploadImageWithRequiredFile"
+        .replace("{petId}", ApiClient.urlEncode(petId.toString()));
+
+    localVarRequestBuilder.uri(URI.create(memberVarBaseUri + localVarPath));
+
+    localVarRequestBuilder.header("Accept", "application/json");
+
+    try {
+      localVarRequestBuilder.method("POST", HttpRequest.BodyPublishers.noBody());
+      if (memberVarReadTimeout != null) {
+        localVarRequestBuilder.timeout(memberVarReadTimeout);
+      }
+      if (memberVarInterceptor != null) {
+        memberVarInterceptor.accept(localVarRequestBuilder);
+      }
+
+      HttpResponse<InputStream> localVarResponse = memberVarHttpClient.send(
+          localVarRequestBuilder.build(),
+          HttpResponse.BodyHandlers.ofInputStream());
+      if (localVarResponse.statusCode()/ 100 != 2) {
+        throw new ApiException(localVarResponse.statusCode(),
+            "uploadFileWithRequiredFile call received non-success response",
+            localVarResponse.headers(),
+            localVarResponse.body() == null ? null : new String(localVarResponse.body().readAllBytes()));
+      }
+
+      return memberVarObjectMapper.readValue(localVarResponse.body(), new TypeReference<ModelApiResponse>() {});
+    } catch (IOException | InterruptedException e) {
+      throw new ApiException(e);
+    }
+  }
+}
diff --git a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/api/StoreApi.java b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/api/StoreApi.java
new file mode 100644
index 0000000000..414389f3f6
--- /dev/null
+++ b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/api/StoreApi.java
@@ -0,0 +1,235 @@
+/*
+ * OpenAPI Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+package org.openapitools.client.api;
+
+import org.openapitools.client.ApiClient;
+import org.openapitools.client.ApiException;
+import org.openapitools.client.Pair;
+
+import org.openapitools.client.model.Order;
+
+import com.fasterxml.jackson.core.type.TypeReference;
+import com.fasterxml.jackson.databind.ObjectMapper;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.net.URI;
+import java.net.http.HttpClient;
+import java.net.http.HttpRequest;
+import java.net.http.HttpResponse;
+import java.time.Duration;
+import java.util.function.Consumer;
+
+import java.util.ArrayList;
+import java.util.StringJoiner;
+import java.util.List;
+import java.util.Map;
+
+
+public class StoreApi {
+  private final HttpClient memberVarHttpClient;
+  private final ObjectMapper memberVarObjectMapper;
+  private final String memberVarBaseUri;
+  private final Consumer<HttpRequest.Builder> memberVarInterceptor;
+  private final Duration memberVarReadTimeout;
+
+  public StoreApi() {
+    this(new ApiClient());
+  }
+
+  public StoreApi(ApiClient apiClient) {
+    memberVarHttpClient = apiClient.getHttpClient();
+    memberVarObjectMapper = apiClient.getObjectMapper();
+    memberVarBaseUri = apiClient.getBaseUri();
+    memberVarInterceptor = apiClient.getRequestInterceptor();
+    memberVarReadTimeout = apiClient.getReadTimeout();
+  }
+
+  /**
+   * Delete purchase order by ID
+   * For valid response try integer IDs with value &lt; 1000. Anything above 1000 or nonintegers will generate API errors
+   * @param orderId ID of the order that needs to be deleted (required)
+   * @throws ApiException if fails to make API call
+   */
+  public void deleteOrder(String orderId) throws ApiException {
+    // verify the required parameter 'orderId' is set
+    if (orderId == null) {
+      throw new ApiException(400, "Missing the required parameter 'orderId' when calling deleteOrder");
+    }
+
+    HttpRequest.Builder localVarRequestBuilder = HttpRequest.newBuilder();
+
+    String localVarPath = "/store/order/{order_id}"
+        .replace("{order_id}", ApiClient.urlEncode(orderId.toString()));
+
+    localVarRequestBuilder.uri(URI.create(memberVarBaseUri + localVarPath));
+
+    localVarRequestBuilder.header("Accept", "application/json");
+
+    try {
+      localVarRequestBuilder.method("DELETE", HttpRequest.BodyPublishers.noBody());
+      if (memberVarReadTimeout != null) {
+        localVarRequestBuilder.timeout(memberVarReadTimeout);
+      }
+      if (memberVarInterceptor != null) {
+        memberVarInterceptor.accept(localVarRequestBuilder);
+      }
+
+      HttpResponse<InputStream> localVarResponse = memberVarHttpClient.send(
+          localVarRequestBuilder.build(),
+          HttpResponse.BodyHandlers.ofInputStream());
+      if (localVarResponse.statusCode()/ 100 != 2) {
+        throw new ApiException(localVarResponse.statusCode(),
+            "deleteOrder call received non-success response",
+            localVarResponse.headers(),
+            localVarResponse.body() == null ? null : new String(localVarResponse.body().readAllBytes()));
+      }
+
+    } catch (IOException | InterruptedException e) {
+      throw new ApiException(e);
+    }
+  }
+  /**
+   * Returns pet inventories by status
+   * Returns a map of status codes to quantities
+   * @return Map&lt;String, Integer&gt;
+   * @throws ApiException if fails to make API call
+   */
+  public Map<String, Integer> getInventory() throws ApiException {
+
+    HttpRequest.Builder localVarRequestBuilder = HttpRequest.newBuilder();
+
+    String localVarPath = "/store/inventory";
+
+    localVarRequestBuilder.uri(URI.create(memberVarBaseUri + localVarPath));
+
+    localVarRequestBuilder.header("Accept", "application/json");
+
+    try {
+      localVarRequestBuilder.method("GET", HttpRequest.BodyPublishers.noBody());
+      if (memberVarReadTimeout != null) {
+        localVarRequestBuilder.timeout(memberVarReadTimeout);
+      }
+      if (memberVarInterceptor != null) {
+        memberVarInterceptor.accept(localVarRequestBuilder);
+      }
+
+      HttpResponse<InputStream> localVarResponse = memberVarHttpClient.send(
+          localVarRequestBuilder.build(),
+          HttpResponse.BodyHandlers.ofInputStream());
+      if (localVarResponse.statusCode()/ 100 != 2) {
+        throw new ApiException(localVarResponse.statusCode(),
+            "getInventory call received non-success response",
+            localVarResponse.headers(),
+            localVarResponse.body() == null ? null : new String(localVarResponse.body().readAllBytes()));
+      }
+
+      return memberVarObjectMapper.readValue(localVarResponse.body(), new TypeReference<Map<String, Integer>>() {});
+    } catch (IOException | InterruptedException e) {
+      throw new ApiException(e);
+    }
+  }
+  /**
+   * Find purchase order by ID
+   * For valid response try integer IDs with value &lt;&#x3D; 5 or &gt; 10. Other values will generated exceptions
+   * @param orderId ID of pet that needs to be fetched (required)
+   * @return Order
+   * @throws ApiException if fails to make API call
+   */
+  public Order getOrderById(Long orderId) throws ApiException {
+    // verify the required parameter 'orderId' is set
+    if (orderId == null) {
+      throw new ApiException(400, "Missing the required parameter 'orderId' when calling getOrderById");
+    }
+
+    HttpRequest.Builder localVarRequestBuilder = HttpRequest.newBuilder();
+
+    String localVarPath = "/store/order/{order_id}"
+        .replace("{order_id}", ApiClient.urlEncode(orderId.toString()));
+
+    localVarRequestBuilder.uri(URI.create(memberVarBaseUri + localVarPath));
+
+    localVarRequestBuilder.header("Accept", "application/json");
+
+    try {
+      localVarRequestBuilder.method("GET", HttpRequest.BodyPublishers.noBody());
+      if (memberVarReadTimeout != null) {
+        localVarRequestBuilder.timeout(memberVarReadTimeout);
+      }
+      if (memberVarInterceptor != null) {
+        memberVarInterceptor.accept(localVarRequestBuilder);
+      }
+
+      HttpResponse<InputStream> localVarResponse = memberVarHttpClient.send(
+          localVarRequestBuilder.build(),
+          HttpResponse.BodyHandlers.ofInputStream());
+      if (localVarResponse.statusCode()/ 100 != 2) {
+        throw new ApiException(localVarResponse.statusCode(),
+            "getOrderById call received non-success response",
+            localVarResponse.headers(),
+            localVarResponse.body() == null ? null : new String(localVarResponse.body().readAllBytes()));
+      }
+
+      return memberVarObjectMapper.readValue(localVarResponse.body(), new TypeReference<Order>() {});
+    } catch (IOException | InterruptedException e) {
+      throw new ApiException(e);
+    }
+  }
+  /**
+   * Place an order for a pet
+   * 
+   * @param body order placed for purchasing the pet (required)
+   * @return Order
+   * @throws ApiException if fails to make API call
+   */
+  public Order placeOrder(Order body) throws ApiException {
+    // verify the required parameter 'body' is set
+    if (body == null) {
+      throw new ApiException(400, "Missing the required parameter 'body' when calling placeOrder");
+    }
+
+    HttpRequest.Builder localVarRequestBuilder = HttpRequest.newBuilder();
+
+    String localVarPath = "/store/order";
+
+    localVarRequestBuilder.uri(URI.create(memberVarBaseUri + localVarPath));
+
+    localVarRequestBuilder.header("Content-Type", "application/json");
+    localVarRequestBuilder.header("Accept", "application/json");
+
+    try {
+      byte[] localVarPostBody = memberVarObjectMapper.writeValueAsBytes(body);
+      localVarRequestBuilder.method("POST", HttpRequest.BodyPublishers.ofByteArray(localVarPostBody));
+      if (memberVarReadTimeout != null) {
+        localVarRequestBuilder.timeout(memberVarReadTimeout);
+      }
+      if (memberVarInterceptor != null) {
+        memberVarInterceptor.accept(localVarRequestBuilder);
+      }
+
+      HttpResponse<InputStream> localVarResponse = memberVarHttpClient.send(
+          localVarRequestBuilder.build(),
+          HttpResponse.BodyHandlers.ofInputStream());
+      if (localVarResponse.statusCode()/ 100 != 2) {
+        throw new ApiException(localVarResponse.statusCode(),
+            "placeOrder call received non-success response",
+            localVarResponse.headers(),
+            localVarResponse.body() == null ? null : new String(localVarResponse.body().readAllBytes()));
+      }
+
+      return memberVarObjectMapper.readValue(localVarResponse.body(), new TypeReference<Order>() {});
+    } catch (IOException | InterruptedException e) {
+      throw new ApiException(e);
+    }
+  }
+}
diff --git a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/api/UserApi.java b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/api/UserApi.java
new file mode 100644
index 0000000000..6dd1913469
--- /dev/null
+++ b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/api/UserApi.java
@@ -0,0 +1,432 @@
+/*
+ * OpenAPI Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+package org.openapitools.client.api;
+
+import org.openapitools.client.ApiClient;
+import org.openapitools.client.ApiException;
+import org.openapitools.client.Pair;
+
+import org.openapitools.client.model.User;
+
+import com.fasterxml.jackson.core.type.TypeReference;
+import com.fasterxml.jackson.databind.ObjectMapper;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.net.URI;
+import java.net.http.HttpClient;
+import java.net.http.HttpRequest;
+import java.net.http.HttpResponse;
+import java.time.Duration;
+import java.util.function.Consumer;
+
+import java.util.ArrayList;
+import java.util.StringJoiner;
+import java.util.List;
+import java.util.Map;
+
+
+public class UserApi {
+  private final HttpClient memberVarHttpClient;
+  private final ObjectMapper memberVarObjectMapper;
+  private final String memberVarBaseUri;
+  private final Consumer<HttpRequest.Builder> memberVarInterceptor;
+  private final Duration memberVarReadTimeout;
+
+  public UserApi() {
+    this(new ApiClient());
+  }
+
+  public UserApi(ApiClient apiClient) {
+    memberVarHttpClient = apiClient.getHttpClient();
+    memberVarObjectMapper = apiClient.getObjectMapper();
+    memberVarBaseUri = apiClient.getBaseUri();
+    memberVarInterceptor = apiClient.getRequestInterceptor();
+    memberVarReadTimeout = apiClient.getReadTimeout();
+  }
+
+  /**
+   * Create user
+   * This can only be done by the logged in user.
+   * @param body Created user object (required)
+   * @throws ApiException if fails to make API call
+   */
+  public void createUser(User body) throws ApiException {
+    // verify the required parameter 'body' is set
+    if (body == null) {
+      throw new ApiException(400, "Missing the required parameter 'body' when calling createUser");
+    }
+
+    HttpRequest.Builder localVarRequestBuilder = HttpRequest.newBuilder();
+
+    String localVarPath = "/user";
+
+    localVarRequestBuilder.uri(URI.create(memberVarBaseUri + localVarPath));
+
+    localVarRequestBuilder.header("Content-Type", "application/json");
+    localVarRequestBuilder.header("Accept", "application/json");
+
+    try {
+      byte[] localVarPostBody = memberVarObjectMapper.writeValueAsBytes(body);
+      localVarRequestBuilder.method("POST", HttpRequest.BodyPublishers.ofByteArray(localVarPostBody));
+      if (memberVarReadTimeout != null) {
+        localVarRequestBuilder.timeout(memberVarReadTimeout);
+      }
+      if (memberVarInterceptor != null) {
+        memberVarInterceptor.accept(localVarRequestBuilder);
+      }
+
+      HttpResponse<InputStream> localVarResponse = memberVarHttpClient.send(
+          localVarRequestBuilder.build(),
+          HttpResponse.BodyHandlers.ofInputStream());
+      if (localVarResponse.statusCode()/ 100 != 2) {
+        throw new ApiException(localVarResponse.statusCode(),
+            "createUser call received non-success response",
+            localVarResponse.headers(),
+            localVarResponse.body() == null ? null : new String(localVarResponse.body().readAllBytes()));
+      }
+
+    } catch (IOException | InterruptedException e) {
+      throw new ApiException(e);
+    }
+  }
+  /**
+   * Creates list of users with given input array
+   * 
+   * @param body List of user object (required)
+   * @throws ApiException if fails to make API call
+   */
+  public void createUsersWithArrayInput(List<User> body) throws ApiException {
+    // verify the required parameter 'body' is set
+    if (body == null) {
+      throw new ApiException(400, "Missing the required parameter 'body' when calling createUsersWithArrayInput");
+    }
+
+    HttpRequest.Builder localVarRequestBuilder = HttpRequest.newBuilder();
+
+    String localVarPath = "/user/createWithArray";
+
+    localVarRequestBuilder.uri(URI.create(memberVarBaseUri + localVarPath));
+
+    localVarRequestBuilder.header("Content-Type", "application/json");
+    localVarRequestBuilder.header("Accept", "application/json");
+
+    try {
+      byte[] localVarPostBody = memberVarObjectMapper.writeValueAsBytes(body);
+      localVarRequestBuilder.method("POST", HttpRequest.BodyPublishers.ofByteArray(localVarPostBody));
+      if (memberVarReadTimeout != null) {
+        localVarRequestBuilder.timeout(memberVarReadTimeout);
+      }
+      if (memberVarInterceptor != null) {
+        memberVarInterceptor.accept(localVarRequestBuilder);
+      }
+
+      HttpResponse<InputStream> localVarResponse = memberVarHttpClient.send(
+          localVarRequestBuilder.build(),
+          HttpResponse.BodyHandlers.ofInputStream());
+      if (localVarResponse.statusCode()/ 100 != 2) {
+        throw new ApiException(localVarResponse.statusCode(),
+            "createUsersWithArrayInput call received non-success response",
+            localVarResponse.headers(),
+            localVarResponse.body() == null ? null : new String(localVarResponse.body().readAllBytes()));
+      }
+
+    } catch (IOException | InterruptedException e) {
+      throw new ApiException(e);
+    }
+  }
+  /**
+   * Creates list of users with given input array
+   * 
+   * @param body List of user object (required)
+   * @throws ApiException if fails to make API call
+   */
+  public void createUsersWithListInput(List<User> body) throws ApiException {
+    // verify the required parameter 'body' is set
+    if (body == null) {
+      throw new ApiException(400, "Missing the required parameter 'body' when calling createUsersWithListInput");
+    }
+
+    HttpRequest.Builder localVarRequestBuilder = HttpRequest.newBuilder();
+
+    String localVarPath = "/user/createWithList";
+
+    localVarRequestBuilder.uri(URI.create(memberVarBaseUri + localVarPath));
+
+    localVarRequestBuilder.header("Content-Type", "application/json");
+    localVarRequestBuilder.header("Accept", "application/json");
+
+    try {
+      byte[] localVarPostBody = memberVarObjectMapper.writeValueAsBytes(body);
+      localVarRequestBuilder.method("POST", HttpRequest.BodyPublishers.ofByteArray(localVarPostBody));
+      if (memberVarReadTimeout != null) {
+        localVarRequestBuilder.timeout(memberVarReadTimeout);
+      }
+      if (memberVarInterceptor != null) {
+        memberVarInterceptor.accept(localVarRequestBuilder);
+      }
+
+      HttpResponse<InputStream> localVarResponse = memberVarHttpClient.send(
+          localVarRequestBuilder.build(),
+          HttpResponse.BodyHandlers.ofInputStream());
+      if (localVarResponse.statusCode()/ 100 != 2) {
+        throw new ApiException(localVarResponse.statusCode(),
+            "createUsersWithListInput call received non-success response",
+            localVarResponse.headers(),
+            localVarResponse.body() == null ? null : new String(localVarResponse.body().readAllBytes()));
+      }
+
+    } catch (IOException | InterruptedException e) {
+      throw new ApiException(e);
+    }
+  }
+  /**
+   * Delete user
+   * This can only be done by the logged in user.
+   * @param username The name that needs to be deleted (required)
+   * @throws ApiException if fails to make API call
+   */
+  public void deleteUser(String username) throws ApiException {
+    // verify the required parameter 'username' is set
+    if (username == null) {
+      throw new ApiException(400, "Missing the required parameter 'username' when calling deleteUser");
+    }
+
+    HttpRequest.Builder localVarRequestBuilder = HttpRequest.newBuilder();
+
+    String localVarPath = "/user/{username}"
+        .replace("{username}", ApiClient.urlEncode(username.toString()));
+
+    localVarRequestBuilder.uri(URI.create(memberVarBaseUri + localVarPath));
+
+    localVarRequestBuilder.header("Accept", "application/json");
+
+    try {
+      localVarRequestBuilder.method("DELETE", HttpRequest.BodyPublishers.noBody());
+      if (memberVarReadTimeout != null) {
+        localVarRequestBuilder.timeout(memberVarReadTimeout);
+      }
+      if (memberVarInterceptor != null) {
+        memberVarInterceptor.accept(localVarRequestBuilder);
+      }
+
+      HttpResponse<InputStream> localVarResponse = memberVarHttpClient.send(
+          localVarRequestBuilder.build(),
+          HttpResponse.BodyHandlers.ofInputStream());
+      if (localVarResponse.statusCode()/ 100 != 2) {
+        throw new ApiException(localVarResponse.statusCode(),
+            "deleteUser call received non-success response",
+            localVarResponse.headers(),
+            localVarResponse.body() == null ? null : new String(localVarResponse.body().readAllBytes()));
+      }
+
+    } catch (IOException | InterruptedException e) {
+      throw new ApiException(e);
+    }
+  }
+  /**
+   * Get user by user name
+   * 
+   * @param username The name that needs to be fetched. Use user1 for testing. (required)
+   * @return User
+   * @throws ApiException if fails to make API call
+   */
+  public User getUserByName(String username) throws ApiException {
+    // verify the required parameter 'username' is set
+    if (username == null) {
+      throw new ApiException(400, "Missing the required parameter 'username' when calling getUserByName");
+    }
+
+    HttpRequest.Builder localVarRequestBuilder = HttpRequest.newBuilder();
+
+    String localVarPath = "/user/{username}"
+        .replace("{username}", ApiClient.urlEncode(username.toString()));
+
+    localVarRequestBuilder.uri(URI.create(memberVarBaseUri + localVarPath));
+
+    localVarRequestBuilder.header("Accept", "application/json");
+
+    try {
+      localVarRequestBuilder.method("GET", HttpRequest.BodyPublishers.noBody());
+      if (memberVarReadTimeout != null) {
+        localVarRequestBuilder.timeout(memberVarReadTimeout);
+      }
+      if (memberVarInterceptor != null) {
+        memberVarInterceptor.accept(localVarRequestBuilder);
+      }
+
+      HttpResponse<InputStream> localVarResponse = memberVarHttpClient.send(
+          localVarRequestBuilder.build(),
+          HttpResponse.BodyHandlers.ofInputStream());
+      if (localVarResponse.statusCode()/ 100 != 2) {
+        throw new ApiException(localVarResponse.statusCode(),
+            "getUserByName call received non-success response",
+            localVarResponse.headers(),
+            localVarResponse.body() == null ? null : new String(localVarResponse.body().readAllBytes()));
+      }
+
+      return memberVarObjectMapper.readValue(localVarResponse.body(), new TypeReference<User>() {});
+    } catch (IOException | InterruptedException e) {
+      throw new ApiException(e);
+    }
+  }
+  /**
+   * Logs user into the system
+   * 
+   * @param username The user name for login (required)
+   * @param password The password for login in clear text (required)
+   * @return String
+   * @throws ApiException if fails to make API call
+   */
+  public String loginUser(String username, String password) throws ApiException {
+    // verify the required parameter 'username' is set
+    if (username == null) {
+      throw new ApiException(400, "Missing the required parameter 'username' when calling loginUser");
+    }
+    // verify the required parameter 'password' is set
+    if (password == null) {
+      throw new ApiException(400, "Missing the required parameter 'password' when calling loginUser");
+    }
+
+    HttpRequest.Builder localVarRequestBuilder = HttpRequest.newBuilder();
+
+    String localVarPath = "/user/login";
+
+    List<Pair> localVarQueryParams = new ArrayList<>();
+    localVarQueryParams.addAll(ApiClient.parameterToPairs("username", username));
+    localVarQueryParams.addAll(ApiClient.parameterToPairs("password", password));
+
+    if (!localVarQueryParams.isEmpty()) {
+      StringJoiner queryJoiner = new StringJoiner("&");
+      localVarQueryParams.forEach(p -> queryJoiner.add(p.getName() + '=' + p.getValue()));
+      localVarRequestBuilder.uri(URI.create(memberVarBaseUri + localVarPath + '?' + queryJoiner.toString()));
+    } else {
+      localVarRequestBuilder.uri(URI.create(memberVarBaseUri + localVarPath));
+    }
+
+    localVarRequestBuilder.header("Accept", "application/json");
+
+    try {
+      localVarRequestBuilder.method("GET", HttpRequest.BodyPublishers.noBody());
+      if (memberVarReadTimeout != null) {
+        localVarRequestBuilder.timeout(memberVarReadTimeout);
+      }
+      if (memberVarInterceptor != null) {
+        memberVarInterceptor.accept(localVarRequestBuilder);
+      }
+
+      HttpResponse<InputStream> localVarResponse = memberVarHttpClient.send(
+          localVarRequestBuilder.build(),
+          HttpResponse.BodyHandlers.ofInputStream());
+      if (localVarResponse.statusCode()/ 100 != 2) {
+        throw new ApiException(localVarResponse.statusCode(),
+            "loginUser call received non-success response",
+            localVarResponse.headers(),
+            localVarResponse.body() == null ? null : new String(localVarResponse.body().readAllBytes()));
+      }
+
+      return memberVarObjectMapper.readValue(localVarResponse.body(), new TypeReference<String>() {});
+    } catch (IOException | InterruptedException e) {
+      throw new ApiException(e);
+    }
+  }
+  /**
+   * Logs out current logged in user session
+   * 
+   * @throws ApiException if fails to make API call
+   */
+  public void logoutUser() throws ApiException {
+
+    HttpRequest.Builder localVarRequestBuilder = HttpRequest.newBuilder();
+
+    String localVarPath = "/user/logout";
+
+    localVarRequestBuilder.uri(URI.create(memberVarBaseUri + localVarPath));
+
+    localVarRequestBuilder.header("Accept", "application/json");
+
+    try {
+      localVarRequestBuilder.method("GET", HttpRequest.BodyPublishers.noBody());
+      if (memberVarReadTimeout != null) {
+        localVarRequestBuilder.timeout(memberVarReadTimeout);
+      }
+      if (memberVarInterceptor != null) {
+        memberVarInterceptor.accept(localVarRequestBuilder);
+      }
+
+      HttpResponse<InputStream> localVarResponse = memberVarHttpClient.send(
+          localVarRequestBuilder.build(),
+          HttpResponse.BodyHandlers.ofInputStream());
+      if (localVarResponse.statusCode()/ 100 != 2) {
+        throw new ApiException(localVarResponse.statusCode(),
+            "logoutUser call received non-success response",
+            localVarResponse.headers(),
+            localVarResponse.body() == null ? null : new String(localVarResponse.body().readAllBytes()));
+      }
+
+    } catch (IOException | InterruptedException e) {
+      throw new ApiException(e);
+    }
+  }
+  /**
+   * Updated user
+   * This can only be done by the logged in user.
+   * @param username name that need to be deleted (required)
+   * @param body Updated user object (required)
+   * @throws ApiException if fails to make API call
+   */
+  public void updateUser(String username, User body) throws ApiException {
+    // verify the required parameter 'username' is set
+    if (username == null) {
+      throw new ApiException(400, "Missing the required parameter 'username' when calling updateUser");
+    }
+    // verify the required parameter 'body' is set
+    if (body == null) {
+      throw new ApiException(400, "Missing the required parameter 'body' when calling updateUser");
+    }
+
+    HttpRequest.Builder localVarRequestBuilder = HttpRequest.newBuilder();
+
+    String localVarPath = "/user/{username}"
+        .replace("{username}", ApiClient.urlEncode(username.toString()));
+
+    localVarRequestBuilder.uri(URI.create(memberVarBaseUri + localVarPath));
+
+    localVarRequestBuilder.header("Content-Type", "application/json");
+    localVarRequestBuilder.header("Accept", "application/json");
+
+    try {
+      byte[] localVarPostBody = memberVarObjectMapper.writeValueAsBytes(body);
+      localVarRequestBuilder.method("PUT", HttpRequest.BodyPublishers.ofByteArray(localVarPostBody));
+      if (memberVarReadTimeout != null) {
+        localVarRequestBuilder.timeout(memberVarReadTimeout);
+      }
+      if (memberVarInterceptor != null) {
+        memberVarInterceptor.accept(localVarRequestBuilder);
+      }
+
+      HttpResponse<InputStream> localVarResponse = memberVarHttpClient.send(
+          localVarRequestBuilder.build(),
+          HttpResponse.BodyHandlers.ofInputStream());
+      if (localVarResponse.statusCode()/ 100 != 2) {
+        throw new ApiException(localVarResponse.statusCode(),
+            "updateUser call received non-success response",
+            localVarResponse.headers(),
+            localVarResponse.body() == null ? null : new String(localVarResponse.body().readAllBytes()));
+      }
+
+    } catch (IOException | InterruptedException e) {
+      throw new ApiException(e);
+    }
+  }
+}
diff --git a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/AdditionalPropertiesAnyType.java b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/AdditionalPropertiesAnyType.java
new file mode 100644
index 0000000000..1abb2d8a64
--- /dev/null
+++ b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/AdditionalPropertiesAnyType.java
@@ -0,0 +1,95 @@
+/*
+ * OpenAPI Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+
+package org.openapitools.client.model;
+
+import java.util.Objects;
+import java.util.Arrays;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonValue;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * AdditionalPropertiesAnyType
+ */
+
+public class AdditionalPropertiesAnyType extends HashMap<String, Object> {
+  @JsonProperty("name")
+  private String name;
+
+  public AdditionalPropertiesAnyType name(String name) {
+    this.name = name;
+    return this;
+  }
+
+   /**
+   * Get name
+   * @return name
+  **/
+  @javax.annotation.Nullable 
+  @ApiModelProperty(value = "")
+  public String getName() {
+    return name;
+  }
+
+  public void setName(String name) {
+    this.name = name;
+  }
+
+
+  @Override
+  public boolean equals(java.lang.Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    AdditionalPropertiesAnyType additionalPropertiesAnyType = (AdditionalPropertiesAnyType) o;
+    return Objects.equals(this.name, additionalPropertiesAnyType.name) &&
+        super.equals(o);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(name, super.hashCode());
+  }
+
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class AdditionalPropertiesAnyType {\n");
+    sb.append("    ").append(toIndentedString(super.toString())).append("\n");
+    sb.append("    name: ").append(toIndentedString(name)).append("\n");
+    sb.append("}");
+    return sb.toString();
+  }
+
+  /**
+   * Convert the given object to string with each line indented by 4 spaces
+   * (except the first line).
+   */
+  private String toIndentedString(java.lang.Object o) {
+    if (o == null) {
+      return "null";
+    }
+    return o.toString().replace("\n", "\n    ");
+  }
+
+}
+
diff --git a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/AdditionalPropertiesArray.java b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/AdditionalPropertiesArray.java
new file mode 100644
index 0000000000..1821c243e1
--- /dev/null
+++ b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/AdditionalPropertiesArray.java
@@ -0,0 +1,96 @@
+/*
+ * OpenAPI Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+
+package org.openapitools.client.model;
+
+import java.util.Objects;
+import java.util.Arrays;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonValue;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * AdditionalPropertiesArray
+ */
+
+public class AdditionalPropertiesArray extends HashMap<String, List> {
+  @JsonProperty("name")
+  private String name;
+
+  public AdditionalPropertiesArray name(String name) {
+    this.name = name;
+    return this;
+  }
+
+   /**
+   * Get name
+   * @return name
+  **/
+  @javax.annotation.Nullable 
+  @ApiModelProperty(value = "")
+  public String getName() {
+    return name;
+  }
+
+  public void setName(String name) {
+    this.name = name;
+  }
+
+
+  @Override
+  public boolean equals(java.lang.Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    AdditionalPropertiesArray additionalPropertiesArray = (AdditionalPropertiesArray) o;
+    return Objects.equals(this.name, additionalPropertiesArray.name) &&
+        super.equals(o);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(name, super.hashCode());
+  }
+
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class AdditionalPropertiesArray {\n");
+    sb.append("    ").append(toIndentedString(super.toString())).append("\n");
+    sb.append("    name: ").append(toIndentedString(name)).append("\n");
+    sb.append("}");
+    return sb.toString();
+  }
+
+  /**
+   * Convert the given object to string with each line indented by 4 spaces
+   * (except the first line).
+   */
+  private String toIndentedString(java.lang.Object o) {
+    if (o == null) {
+      return "null";
+    }
+    return o.toString().replace("\n", "\n    ");
+  }
+
+}
+
diff --git a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/AdditionalPropertiesBoolean.java b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/AdditionalPropertiesBoolean.java
new file mode 100644
index 0000000000..78f7ac79b2
--- /dev/null
+++ b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/AdditionalPropertiesBoolean.java
@@ -0,0 +1,95 @@
+/*
+ * OpenAPI Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+
+package org.openapitools.client.model;
+
+import java.util.Objects;
+import java.util.Arrays;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonValue;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * AdditionalPropertiesBoolean
+ */
+
+public class AdditionalPropertiesBoolean extends HashMap<String, Boolean> {
+  @JsonProperty("name")
+  private String name;
+
+  public AdditionalPropertiesBoolean name(String name) {
+    this.name = name;
+    return this;
+  }
+
+   /**
+   * Get name
+   * @return name
+  **/
+  @javax.annotation.Nullable 
+  @ApiModelProperty(value = "")
+  public String getName() {
+    return name;
+  }
+
+  public void setName(String name) {
+    this.name = name;
+  }
+
+
+  @Override
+  public boolean equals(java.lang.Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    AdditionalPropertiesBoolean additionalPropertiesBoolean = (AdditionalPropertiesBoolean) o;
+    return Objects.equals(this.name, additionalPropertiesBoolean.name) &&
+        super.equals(o);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(name, super.hashCode());
+  }
+
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class AdditionalPropertiesBoolean {\n");
+    sb.append("    ").append(toIndentedString(super.toString())).append("\n");
+    sb.append("    name: ").append(toIndentedString(name)).append("\n");
+    sb.append("}");
+    return sb.toString();
+  }
+
+  /**
+   * Convert the given object to string with each line indented by 4 spaces
+   * (except the first line).
+   */
+  private String toIndentedString(java.lang.Object o) {
+    if (o == null) {
+      return "null";
+    }
+    return o.toString().replace("\n", "\n    ");
+  }
+
+}
+
diff --git a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java
new file mode 100644
index 0000000000..fc52759bc8
--- /dev/null
+++ b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java
@@ -0,0 +1,399 @@
+/*
+ * OpenAPI Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+
+package org.openapitools.client.model;
+
+import java.util.Objects;
+import java.util.Arrays;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonValue;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import java.math.BigDecimal;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * AdditionalPropertiesClass
+ */
+
+public class AdditionalPropertiesClass {
+  @JsonProperty("map_string")
+  private Map<String, String> mapString = new HashMap<>();
+
+  @JsonProperty("map_number")
+  private Map<String, BigDecimal> mapNumber = new HashMap<>();
+
+  @JsonProperty("map_integer")
+  private Map<String, Integer> mapInteger = new HashMap<>();
+
+  @JsonProperty("map_boolean")
+  private Map<String, Boolean> mapBoolean = new HashMap<>();
+
+  @JsonProperty("map_array_integer")
+  private Map<String, List<Integer>> mapArrayInteger = new HashMap<>();
+
+  @JsonProperty("map_array_anytype")
+  private Map<String, List<Object>> mapArrayAnytype = new HashMap<>();
+
+  @JsonProperty("map_map_string")
+  private Map<String, Map<String, String>> mapMapString = new HashMap<>();
+
+  @JsonProperty("map_map_anytype")
+  private Map<String, Map<String, Object>> mapMapAnytype = new HashMap<>();
+
+  @JsonProperty("anytype_1")
+  private Object anytype1 = null;
+
+  @JsonProperty("anytype_2")
+  private Object anytype2 = null;
+
+  @JsonProperty("anytype_3")
+  private Object anytype3 = null;
+
+  public AdditionalPropertiesClass mapString(Map<String, String> mapString) {
+    this.mapString = mapString;
+    return this;
+  }
+
+  public AdditionalPropertiesClass putMapStringItem(String key, String mapStringItem) {
+    if (this.mapString == null) {
+      this.mapString = new HashMap<>();
+    }
+    this.mapString.put(key, mapStringItem);
+    return this;
+  }
+
+   /**
+   * Get mapString
+   * @return mapString
+  **/
+  @javax.annotation.Nullable 
+  @ApiModelProperty(value = "")
+  public Map<String, String> getMapString() {
+    return mapString;
+  }
+
+  public void setMapString(Map<String, String> mapString) {
+    this.mapString = mapString;
+  }
+
+  public AdditionalPropertiesClass mapNumber(Map<String, BigDecimal> mapNumber) {
+    this.mapNumber = mapNumber;
+    return this;
+  }
+
+  public AdditionalPropertiesClass putMapNumberItem(String key, BigDecimal mapNumberItem) {
+    if (this.mapNumber == null) {
+      this.mapNumber = new HashMap<>();
+    }
+    this.mapNumber.put(key, mapNumberItem);
+    return this;
+  }
+
+   /**
+   * Get mapNumber
+   * @return mapNumber
+  **/
+  @javax.annotation.Nullable 
+  @ApiModelProperty(value = "")
+  public Map<String, BigDecimal> getMapNumber() {
+    return mapNumber;
+  }
+
+  public void setMapNumber(Map<String, BigDecimal> mapNumber) {
+    this.mapNumber = mapNumber;
+  }
+
+  public AdditionalPropertiesClass mapInteger(Map<String, Integer> mapInteger) {
+    this.mapInteger = mapInteger;
+    return this;
+  }
+
+  public AdditionalPropertiesClass putMapIntegerItem(String key, Integer mapIntegerItem) {
+    if (this.mapInteger == null) {
+      this.mapInteger = new HashMap<>();
+    }
+    this.mapInteger.put(key, mapIntegerItem);
+    return this;
+  }
+
+   /**
+   * Get mapInteger
+   * @return mapInteger
+  **/
+  @javax.annotation.Nullable 
+  @ApiModelProperty(value = "")
+  public Map<String, Integer> getMapInteger() {
+    return mapInteger;
+  }
+
+  public void setMapInteger(Map<String, Integer> mapInteger) {
+    this.mapInteger = mapInteger;
+  }
+
+  public AdditionalPropertiesClass mapBoolean(Map<String, Boolean> mapBoolean) {
+    this.mapBoolean = mapBoolean;
+    return this;
+  }
+
+  public AdditionalPropertiesClass putMapBooleanItem(String key, Boolean mapBooleanItem) {
+    if (this.mapBoolean == null) {
+      this.mapBoolean = new HashMap<>();
+    }
+    this.mapBoolean.put(key, mapBooleanItem);
+    return this;
+  }
+
+   /**
+   * Get mapBoolean
+   * @return mapBoolean
+  **/
+  @javax.annotation.Nullable 
+  @ApiModelProperty(value = "")
+  public Map<String, Boolean> getMapBoolean() {
+    return mapBoolean;
+  }
+
+  public void setMapBoolean(Map<String, Boolean> mapBoolean) {
+    this.mapBoolean = mapBoolean;
+  }
+
+  public AdditionalPropertiesClass mapArrayInteger(Map<String, List<Integer>> mapArrayInteger) {
+    this.mapArrayInteger = mapArrayInteger;
+    return this;
+  }
+
+  public AdditionalPropertiesClass putMapArrayIntegerItem(String key, List<Integer> mapArrayIntegerItem) {
+    if (this.mapArrayInteger == null) {
+      this.mapArrayInteger = new HashMap<>();
+    }
+    this.mapArrayInteger.put(key, mapArrayIntegerItem);
+    return this;
+  }
+
+   /**
+   * Get mapArrayInteger
+   * @return mapArrayInteger
+  **/
+  @javax.annotation.Nullable 
+  @ApiModelProperty(value = "")
+  public Map<String, List<Integer>> getMapArrayInteger() {
+    return mapArrayInteger;
+  }
+
+  public void setMapArrayInteger(Map<String, List<Integer>> mapArrayInteger) {
+    this.mapArrayInteger = mapArrayInteger;
+  }
+
+  public AdditionalPropertiesClass mapArrayAnytype(Map<String, List<Object>> mapArrayAnytype) {
+    this.mapArrayAnytype = mapArrayAnytype;
+    return this;
+  }
+
+  public AdditionalPropertiesClass putMapArrayAnytypeItem(String key, List<Object> mapArrayAnytypeItem) {
+    if (this.mapArrayAnytype == null) {
+      this.mapArrayAnytype = new HashMap<>();
+    }
+    this.mapArrayAnytype.put(key, mapArrayAnytypeItem);
+    return this;
+  }
+
+   /**
+   * Get mapArrayAnytype
+   * @return mapArrayAnytype
+  **/
+  @javax.annotation.Nullable 
+  @ApiModelProperty(value = "")
+  public Map<String, List<Object>> getMapArrayAnytype() {
+    return mapArrayAnytype;
+  }
+
+  public void setMapArrayAnytype(Map<String, List<Object>> mapArrayAnytype) {
+    this.mapArrayAnytype = mapArrayAnytype;
+  }
+
+  public AdditionalPropertiesClass mapMapString(Map<String, Map<String, String>> mapMapString) {
+    this.mapMapString = mapMapString;
+    return this;
+  }
+
+  public AdditionalPropertiesClass putMapMapStringItem(String key, Map<String, String> mapMapStringItem) {
+    if (this.mapMapString == null) {
+      this.mapMapString = new HashMap<>();
+    }
+    this.mapMapString.put(key, mapMapStringItem);
+    return this;
+  }
+
+   /**
+   * Get mapMapString
+   * @return mapMapString
+  **/
+  @javax.annotation.Nullable 
+  @ApiModelProperty(value = "")
+  public Map<String, Map<String, String>> getMapMapString() {
+    return mapMapString;
+  }
+
+  public void setMapMapString(Map<String, Map<String, String>> mapMapString) {
+    this.mapMapString = mapMapString;
+  }
+
+  public AdditionalPropertiesClass mapMapAnytype(Map<String, Map<String, Object>> mapMapAnytype) {
+    this.mapMapAnytype = mapMapAnytype;
+    return this;
+  }
+
+  public AdditionalPropertiesClass putMapMapAnytypeItem(String key, Map<String, Object> mapMapAnytypeItem) {
+    if (this.mapMapAnytype == null) {
+      this.mapMapAnytype = new HashMap<>();
+    }
+    this.mapMapAnytype.put(key, mapMapAnytypeItem);
+    return this;
+  }
+
+   /**
+   * Get mapMapAnytype
+   * @return mapMapAnytype
+  **/
+  @javax.annotation.Nullable 
+  @ApiModelProperty(value = "")
+  public Map<String, Map<String, Object>> getMapMapAnytype() {
+    return mapMapAnytype;
+  }
+
+  public void setMapMapAnytype(Map<String, Map<String, Object>> mapMapAnytype) {
+    this.mapMapAnytype = mapMapAnytype;
+  }
+
+  public AdditionalPropertiesClass anytype1(Object anytype1) {
+    this.anytype1 = anytype1;
+    return this;
+  }
+
+   /**
+   * Get anytype1
+   * @return anytype1
+  **/
+  @javax.annotation.Nullable 
+  @ApiModelProperty(value = "")
+  public Object getAnytype1() {
+    return anytype1;
+  }
+
+  public void setAnytype1(Object anytype1) {
+    this.anytype1 = anytype1;
+  }
+
+  public AdditionalPropertiesClass anytype2(Object anytype2) {
+    this.anytype2 = anytype2;
+    return this;
+  }
+
+   /**
+   * Get anytype2
+   * @return anytype2
+  **/
+  @javax.annotation.Nullable 
+  @ApiModelProperty(value = "")
+  public Object getAnytype2() {
+    return anytype2;
+  }
+
+  public void setAnytype2(Object anytype2) {
+    this.anytype2 = anytype2;
+  }
+
+  public AdditionalPropertiesClass anytype3(Object anytype3) {
+    this.anytype3 = anytype3;
+    return this;
+  }
+
+   /**
+   * Get anytype3
+   * @return anytype3
+  **/
+  @javax.annotation.Nullable 
+  @ApiModelProperty(value = "")
+  public Object getAnytype3() {
+    return anytype3;
+  }
+
+  public void setAnytype3(Object anytype3) {
+    this.anytype3 = anytype3;
+  }
+
+
+  @Override
+  public boolean equals(java.lang.Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    AdditionalPropertiesClass additionalPropertiesClass = (AdditionalPropertiesClass) o;
+    return Objects.equals(this.mapString, additionalPropertiesClass.mapString) &&
+        Objects.equals(this.mapNumber, additionalPropertiesClass.mapNumber) &&
+        Objects.equals(this.mapInteger, additionalPropertiesClass.mapInteger) &&
+        Objects.equals(this.mapBoolean, additionalPropertiesClass.mapBoolean) &&
+        Objects.equals(this.mapArrayInteger, additionalPropertiesClass.mapArrayInteger) &&
+        Objects.equals(this.mapArrayAnytype, additionalPropertiesClass.mapArrayAnytype) &&
+        Objects.equals(this.mapMapString, additionalPropertiesClass.mapMapString) &&
+        Objects.equals(this.mapMapAnytype, additionalPropertiesClass.mapMapAnytype) &&
+        Objects.equals(this.anytype1, additionalPropertiesClass.anytype1) &&
+        Objects.equals(this.anytype2, additionalPropertiesClass.anytype2) &&
+        Objects.equals(this.anytype3, additionalPropertiesClass.anytype3);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(mapString, mapNumber, mapInteger, mapBoolean, mapArrayInteger, mapArrayAnytype, mapMapString, mapMapAnytype, anytype1, anytype2, anytype3);
+  }
+
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class AdditionalPropertiesClass {\n");
+    sb.append("    mapString: ").append(toIndentedString(mapString)).append("\n");
+    sb.append("    mapNumber: ").append(toIndentedString(mapNumber)).append("\n");
+    sb.append("    mapInteger: ").append(toIndentedString(mapInteger)).append("\n");
+    sb.append("    mapBoolean: ").append(toIndentedString(mapBoolean)).append("\n");
+    sb.append("    mapArrayInteger: ").append(toIndentedString(mapArrayInteger)).append("\n");
+    sb.append("    mapArrayAnytype: ").append(toIndentedString(mapArrayAnytype)).append("\n");
+    sb.append("    mapMapString: ").append(toIndentedString(mapMapString)).append("\n");
+    sb.append("    mapMapAnytype: ").append(toIndentedString(mapMapAnytype)).append("\n");
+    sb.append("    anytype1: ").append(toIndentedString(anytype1)).append("\n");
+    sb.append("    anytype2: ").append(toIndentedString(anytype2)).append("\n");
+    sb.append("    anytype3: ").append(toIndentedString(anytype3)).append("\n");
+    sb.append("}");
+    return sb.toString();
+  }
+
+  /**
+   * Convert the given object to string with each line indented by 4 spaces
+   * (except the first line).
+   */
+  private String toIndentedString(java.lang.Object o) {
+    if (o == null) {
+      return "null";
+    }
+    return o.toString().replace("\n", "\n    ");
+  }
+
+}
+
diff --git a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/AdditionalPropertiesInteger.java b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/AdditionalPropertiesInteger.java
new file mode 100644
index 0000000000..6e5159d404
--- /dev/null
+++ b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/AdditionalPropertiesInteger.java
@@ -0,0 +1,95 @@
+/*
+ * OpenAPI Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+
+package org.openapitools.client.model;
+
+import java.util.Objects;
+import java.util.Arrays;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonValue;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * AdditionalPropertiesInteger
+ */
+
+public class AdditionalPropertiesInteger extends HashMap<String, Integer> {
+  @JsonProperty("name")
+  private String name;
+
+  public AdditionalPropertiesInteger name(String name) {
+    this.name = name;
+    return this;
+  }
+
+   /**
+   * Get name
+   * @return name
+  **/
+  @javax.annotation.Nullable 
+  @ApiModelProperty(value = "")
+  public String getName() {
+    return name;
+  }
+
+  public void setName(String name) {
+    this.name = name;
+  }
+
+
+  @Override
+  public boolean equals(java.lang.Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    AdditionalPropertiesInteger additionalPropertiesInteger = (AdditionalPropertiesInteger) o;
+    return Objects.equals(this.name, additionalPropertiesInteger.name) &&
+        super.equals(o);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(name, super.hashCode());
+  }
+
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class AdditionalPropertiesInteger {\n");
+    sb.append("    ").append(toIndentedString(super.toString())).append("\n");
+    sb.append("    name: ").append(toIndentedString(name)).append("\n");
+    sb.append("}");
+    return sb.toString();
+  }
+
+  /**
+   * Convert the given object to string with each line indented by 4 spaces
+   * (except the first line).
+   */
+  private String toIndentedString(java.lang.Object o) {
+    if (o == null) {
+      return "null";
+    }
+    return o.toString().replace("\n", "\n    ");
+  }
+
+}
+
diff --git a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/AdditionalPropertiesNumber.java b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/AdditionalPropertiesNumber.java
new file mode 100644
index 0000000000..ddc8146dea
--- /dev/null
+++ b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/AdditionalPropertiesNumber.java
@@ -0,0 +1,96 @@
+/*
+ * OpenAPI Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+
+package org.openapitools.client.model;
+
+import java.util.Objects;
+import java.util.Arrays;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonValue;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import java.math.BigDecimal;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * AdditionalPropertiesNumber
+ */
+
+public class AdditionalPropertiesNumber extends HashMap<String, BigDecimal> {
+  @JsonProperty("name")
+  private String name;
+
+  public AdditionalPropertiesNumber name(String name) {
+    this.name = name;
+    return this;
+  }
+
+   /**
+   * Get name
+   * @return name
+  **/
+  @javax.annotation.Nullable 
+  @ApiModelProperty(value = "")
+  public String getName() {
+    return name;
+  }
+
+  public void setName(String name) {
+    this.name = name;
+  }
+
+
+  @Override
+  public boolean equals(java.lang.Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    AdditionalPropertiesNumber additionalPropertiesNumber = (AdditionalPropertiesNumber) o;
+    return Objects.equals(this.name, additionalPropertiesNumber.name) &&
+        super.equals(o);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(name, super.hashCode());
+  }
+
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class AdditionalPropertiesNumber {\n");
+    sb.append("    ").append(toIndentedString(super.toString())).append("\n");
+    sb.append("    name: ").append(toIndentedString(name)).append("\n");
+    sb.append("}");
+    return sb.toString();
+  }
+
+  /**
+   * Convert the given object to string with each line indented by 4 spaces
+   * (except the first line).
+   */
+  private String toIndentedString(java.lang.Object o) {
+    if (o == null) {
+      return "null";
+    }
+    return o.toString().replace("\n", "\n    ");
+  }
+
+}
+
diff --git a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/AdditionalPropertiesObject.java b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/AdditionalPropertiesObject.java
new file mode 100644
index 0000000000..cc29400029
--- /dev/null
+++ b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/AdditionalPropertiesObject.java
@@ -0,0 +1,95 @@
+/*
+ * OpenAPI Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+
+package org.openapitools.client.model;
+
+import java.util.Objects;
+import java.util.Arrays;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonValue;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * AdditionalPropertiesObject
+ */
+
+public class AdditionalPropertiesObject extends HashMap<String, Map> {
+  @JsonProperty("name")
+  private String name;
+
+  public AdditionalPropertiesObject name(String name) {
+    this.name = name;
+    return this;
+  }
+
+   /**
+   * Get name
+   * @return name
+  **/
+  @javax.annotation.Nullable 
+  @ApiModelProperty(value = "")
+  public String getName() {
+    return name;
+  }
+
+  public void setName(String name) {
+    this.name = name;
+  }
+
+
+  @Override
+  public boolean equals(java.lang.Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    AdditionalPropertiesObject additionalPropertiesObject = (AdditionalPropertiesObject) o;
+    return Objects.equals(this.name, additionalPropertiesObject.name) &&
+        super.equals(o);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(name, super.hashCode());
+  }
+
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class AdditionalPropertiesObject {\n");
+    sb.append("    ").append(toIndentedString(super.toString())).append("\n");
+    sb.append("    name: ").append(toIndentedString(name)).append("\n");
+    sb.append("}");
+    return sb.toString();
+  }
+
+  /**
+   * Convert the given object to string with each line indented by 4 spaces
+   * (except the first line).
+   */
+  private String toIndentedString(java.lang.Object o) {
+    if (o == null) {
+      return "null";
+    }
+    return o.toString().replace("\n", "\n    ");
+  }
+
+}
+
diff --git a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/AdditionalPropertiesString.java b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/AdditionalPropertiesString.java
new file mode 100644
index 0000000000..fb3368dfed
--- /dev/null
+++ b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/AdditionalPropertiesString.java
@@ -0,0 +1,95 @@
+/*
+ * OpenAPI Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+
+package org.openapitools.client.model;
+
+import java.util.Objects;
+import java.util.Arrays;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonValue;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * AdditionalPropertiesString
+ */
+
+public class AdditionalPropertiesString extends HashMap<String, String> {
+  @JsonProperty("name")
+  private String name;
+
+  public AdditionalPropertiesString name(String name) {
+    this.name = name;
+    return this;
+  }
+
+   /**
+   * Get name
+   * @return name
+  **/
+  @javax.annotation.Nullable 
+  @ApiModelProperty(value = "")
+  public String getName() {
+    return name;
+  }
+
+  public void setName(String name) {
+    this.name = name;
+  }
+
+
+  @Override
+  public boolean equals(java.lang.Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    AdditionalPropertiesString additionalPropertiesString = (AdditionalPropertiesString) o;
+    return Objects.equals(this.name, additionalPropertiesString.name) &&
+        super.equals(o);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(name, super.hashCode());
+  }
+
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class AdditionalPropertiesString {\n");
+    sb.append("    ").append(toIndentedString(super.toString())).append("\n");
+    sb.append("    name: ").append(toIndentedString(name)).append("\n");
+    sb.append("}");
+    return sb.toString();
+  }
+
+  /**
+   * Convert the given object to string with each line indented by 4 spaces
+   * (except the first line).
+   */
+  private String toIndentedString(java.lang.Object o) {
+    if (o == null) {
+      return "null";
+    }
+    return o.toString().replace("\n", "\n    ");
+  }
+
+}
+
diff --git a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/Animal.java b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/Animal.java
new file mode 100644
index 0000000000..53a0eec339
--- /dev/null
+++ b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/Animal.java
@@ -0,0 +1,123 @@
+/*
+ * OpenAPI Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+
+package org.openapitools.client.model;
+
+import java.util.Objects;
+import java.util.Arrays;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonSubTypes;
+import com.fasterxml.jackson.annotation.JsonTypeInfo;
+import com.fasterxml.jackson.annotation.JsonValue;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+/**
+ * Animal
+ */
+
+@JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = JsonTypeInfo.As.PROPERTY, property = "className", visible = true)
+@JsonSubTypes({
+  @JsonSubTypes.Type(value = Dog.class, name = "Dog"),
+  @JsonSubTypes.Type(value = Cat.class, name = "Cat"),
+})
+
+public class Animal {
+  @JsonProperty("className")
+  private String className;
+
+  @JsonProperty("color")
+  private String color = "red";
+
+  public Animal className(String className) {
+    this.className = className;
+    return this;
+  }
+
+   /**
+   * Get className
+   * @return className
+  **/
+
+  @ApiModelProperty(required = true, value = "")
+  public String getClassName() {
+    return className;
+  }
+
+  public void setClassName(String className) {
+    this.className = className;
+  }
+
+  public Animal color(String color) {
+    this.color = color;
+    return this;
+  }
+
+   /**
+   * Get color
+   * @return color
+  **/
+  @javax.annotation.Nullable 
+  @ApiModelProperty(value = "")
+  public String getColor() {
+    return color;
+  }
+
+  public void setColor(String color) {
+    this.color = color;
+  }
+
+
+  @Override
+  public boolean equals(java.lang.Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    Animal animal = (Animal) o;
+    return Objects.equals(this.className, animal.className) &&
+        Objects.equals(this.color, animal.color);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(className, color);
+  }
+
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class Animal {\n");
+    sb.append("    className: ").append(toIndentedString(className)).append("\n");
+    sb.append("    color: ").append(toIndentedString(color)).append("\n");
+    sb.append("}");
+    return sb.toString();
+  }
+
+  /**
+   * Convert the given object to string with each line indented by 4 spaces
+   * (except the first line).
+   */
+  private String toIndentedString(java.lang.Object o) {
+    if (o == null) {
+      return "null";
+    }
+    return o.toString().replace("\n", "\n    ");
+  }
+
+}
+
diff --git a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java
new file mode 100644
index 0000000000..49b5c55250
--- /dev/null
+++ b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java
@@ -0,0 +1,102 @@
+/*
+ * OpenAPI Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+
+package org.openapitools.client.model;
+
+import java.util.Objects;
+import java.util.Arrays;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonValue;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import java.math.BigDecimal;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * ArrayOfArrayOfNumberOnly
+ */
+
+public class ArrayOfArrayOfNumberOnly {
+  @JsonProperty("ArrayArrayNumber")
+  private List<List<BigDecimal>> arrayArrayNumber = new ArrayList<>();
+
+  public ArrayOfArrayOfNumberOnly arrayArrayNumber(List<List<BigDecimal>> arrayArrayNumber) {
+    this.arrayArrayNumber = arrayArrayNumber;
+    return this;
+  }
+
+  public ArrayOfArrayOfNumberOnly addArrayArrayNumberItem(List<BigDecimal> arrayArrayNumberItem) {
+    if (this.arrayArrayNumber == null) {
+      this.arrayArrayNumber = new ArrayList<>();
+    }
+    this.arrayArrayNumber.add(arrayArrayNumberItem);
+    return this;
+  }
+
+   /**
+   * Get arrayArrayNumber
+   * @return arrayArrayNumber
+  **/
+  @javax.annotation.Nullable 
+  @ApiModelProperty(value = "")
+  public List<List<BigDecimal>> getArrayArrayNumber() {
+    return arrayArrayNumber;
+  }
+
+  public void setArrayArrayNumber(List<List<BigDecimal>> arrayArrayNumber) {
+    this.arrayArrayNumber = arrayArrayNumber;
+  }
+
+
+  @Override
+  public boolean equals(java.lang.Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    ArrayOfArrayOfNumberOnly arrayOfArrayOfNumberOnly = (ArrayOfArrayOfNumberOnly) o;
+    return Objects.equals(this.arrayArrayNumber, arrayOfArrayOfNumberOnly.arrayArrayNumber);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(arrayArrayNumber);
+  }
+
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class ArrayOfArrayOfNumberOnly {\n");
+    sb.append("    arrayArrayNumber: ").append(toIndentedString(arrayArrayNumber)).append("\n");
+    sb.append("}");
+    return sb.toString();
+  }
+
+  /**
+   * Convert the given object to string with each line indented by 4 spaces
+   * (except the first line).
+   */
+  private String toIndentedString(java.lang.Object o) {
+    if (o == null) {
+      return "null";
+    }
+    return o.toString().replace("\n", "\n    ");
+  }
+
+}
+
diff --git a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java
new file mode 100644
index 0000000000..ef2555974d
--- /dev/null
+++ b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java
@@ -0,0 +1,102 @@
+/*
+ * OpenAPI Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+
+package org.openapitools.client.model;
+
+import java.util.Objects;
+import java.util.Arrays;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonValue;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import java.math.BigDecimal;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * ArrayOfNumberOnly
+ */
+
+public class ArrayOfNumberOnly {
+  @JsonProperty("ArrayNumber")
+  private List<BigDecimal> arrayNumber = new ArrayList<>();
+
+  public ArrayOfNumberOnly arrayNumber(List<BigDecimal> arrayNumber) {
+    this.arrayNumber = arrayNumber;
+    return this;
+  }
+
+  public ArrayOfNumberOnly addArrayNumberItem(BigDecimal arrayNumberItem) {
+    if (this.arrayNumber == null) {
+      this.arrayNumber = new ArrayList<>();
+    }
+    this.arrayNumber.add(arrayNumberItem);
+    return this;
+  }
+
+   /**
+   * Get arrayNumber
+   * @return arrayNumber
+  **/
+  @javax.annotation.Nullable 
+  @ApiModelProperty(value = "")
+  public List<BigDecimal> getArrayNumber() {
+    return arrayNumber;
+  }
+
+  public void setArrayNumber(List<BigDecimal> arrayNumber) {
+    this.arrayNumber = arrayNumber;
+  }
+
+
+  @Override
+  public boolean equals(java.lang.Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    ArrayOfNumberOnly arrayOfNumberOnly = (ArrayOfNumberOnly) o;
+    return Objects.equals(this.arrayNumber, arrayOfNumberOnly.arrayNumber);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(arrayNumber);
+  }
+
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class ArrayOfNumberOnly {\n");
+    sb.append("    arrayNumber: ").append(toIndentedString(arrayNumber)).append("\n");
+    sb.append("}");
+    return sb.toString();
+  }
+
+  /**
+   * Convert the given object to string with each line indented by 4 spaces
+   * (except the first line).
+   */
+  private String toIndentedString(java.lang.Object o) {
+    if (o == null) {
+      return "null";
+    }
+    return o.toString().replace("\n", "\n    ");
+  }
+
+}
+
diff --git a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/ArrayTest.java b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/ArrayTest.java
new file mode 100644
index 0000000000..b6b98aa275
--- /dev/null
+++ b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/ArrayTest.java
@@ -0,0 +1,166 @@
+/*
+ * OpenAPI Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+
+package org.openapitools.client.model;
+
+import java.util.Objects;
+import java.util.Arrays;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonValue;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import java.util.ArrayList;
+import java.util.List;
+import org.openapitools.client.model.ReadOnlyFirst;
+
+/**
+ * ArrayTest
+ */
+
+public class ArrayTest {
+  @JsonProperty("array_of_string")
+  private List<String> arrayOfString = new ArrayList<>();
+
+  @JsonProperty("array_array_of_integer")
+  private List<List<Long>> arrayArrayOfInteger = new ArrayList<>();
+
+  @JsonProperty("array_array_of_model")
+  private List<List<ReadOnlyFirst>> arrayArrayOfModel = new ArrayList<>();
+
+  public ArrayTest arrayOfString(List<String> arrayOfString) {
+    this.arrayOfString = arrayOfString;
+    return this;
+  }
+
+  public ArrayTest addArrayOfStringItem(String arrayOfStringItem) {
+    if (this.arrayOfString == null) {
+      this.arrayOfString = new ArrayList<>();
+    }
+    this.arrayOfString.add(arrayOfStringItem);
+    return this;
+  }
+
+   /**
+   * Get arrayOfString
+   * @return arrayOfString
+  **/
+  @javax.annotation.Nullable 
+  @ApiModelProperty(value = "")
+  public List<String> getArrayOfString() {
+    return arrayOfString;
+  }
+
+  public void setArrayOfString(List<String> arrayOfString) {
+    this.arrayOfString = arrayOfString;
+  }
+
+  public ArrayTest arrayArrayOfInteger(List<List<Long>> arrayArrayOfInteger) {
+    this.arrayArrayOfInteger = arrayArrayOfInteger;
+    return this;
+  }
+
+  public ArrayTest addArrayArrayOfIntegerItem(List<Long> arrayArrayOfIntegerItem) {
+    if (this.arrayArrayOfInteger == null) {
+      this.arrayArrayOfInteger = new ArrayList<>();
+    }
+    this.arrayArrayOfInteger.add(arrayArrayOfIntegerItem);
+    return this;
+  }
+
+   /**
+   * Get arrayArrayOfInteger
+   * @return arrayArrayOfInteger
+  **/
+  @javax.annotation.Nullable 
+  @ApiModelProperty(value = "")
+  public List<List<Long>> getArrayArrayOfInteger() {
+    return arrayArrayOfInteger;
+  }
+
+  public void setArrayArrayOfInteger(List<List<Long>> arrayArrayOfInteger) {
+    this.arrayArrayOfInteger = arrayArrayOfInteger;
+  }
+
+  public ArrayTest arrayArrayOfModel(List<List<ReadOnlyFirst>> arrayArrayOfModel) {
+    this.arrayArrayOfModel = arrayArrayOfModel;
+    return this;
+  }
+
+  public ArrayTest addArrayArrayOfModelItem(List<ReadOnlyFirst> arrayArrayOfModelItem) {
+    if (this.arrayArrayOfModel == null) {
+      this.arrayArrayOfModel = new ArrayList<>();
+    }
+    this.arrayArrayOfModel.add(arrayArrayOfModelItem);
+    return this;
+  }
+
+   /**
+   * Get arrayArrayOfModel
+   * @return arrayArrayOfModel
+  **/
+  @javax.annotation.Nullable 
+  @ApiModelProperty(value = "")
+  public List<List<ReadOnlyFirst>> getArrayArrayOfModel() {
+    return arrayArrayOfModel;
+  }
+
+  public void setArrayArrayOfModel(List<List<ReadOnlyFirst>> arrayArrayOfModel) {
+    this.arrayArrayOfModel = arrayArrayOfModel;
+  }
+
+
+  @Override
+  public boolean equals(java.lang.Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    ArrayTest arrayTest = (ArrayTest) o;
+    return Objects.equals(this.arrayOfString, arrayTest.arrayOfString) &&
+        Objects.equals(this.arrayArrayOfInteger, arrayTest.arrayArrayOfInteger) &&
+        Objects.equals(this.arrayArrayOfModel, arrayTest.arrayArrayOfModel);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(arrayOfString, arrayArrayOfInteger, arrayArrayOfModel);
+  }
+
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class ArrayTest {\n");
+    sb.append("    arrayOfString: ").append(toIndentedString(arrayOfString)).append("\n");
+    sb.append("    arrayArrayOfInteger: ").append(toIndentedString(arrayArrayOfInteger)).append("\n");
+    sb.append("    arrayArrayOfModel: ").append(toIndentedString(arrayArrayOfModel)).append("\n");
+    sb.append("}");
+    return sb.toString();
+  }
+
+  /**
+   * Convert the given object to string with each line indented by 4 spaces
+   * (except the first line).
+   */
+  private String toIndentedString(java.lang.Object o) {
+    if (o == null) {
+      return "null";
+    }
+    return o.toString().replace("\n", "\n    ");
+  }
+
+}
+
diff --git a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/Capitalization.java b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/Capitalization.java
new file mode 100644
index 0000000000..bb83be97fe
--- /dev/null
+++ b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/Capitalization.java
@@ -0,0 +1,211 @@
+/*
+ * OpenAPI Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+
+package org.openapitools.client.model;
+
+import java.util.Objects;
+import java.util.Arrays;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonValue;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+/**
+ * Capitalization
+ */
+
+public class Capitalization {
+  @JsonProperty("smallCamel")
+  private String smallCamel;
+
+  @JsonProperty("CapitalCamel")
+  private String capitalCamel;
+
+  @JsonProperty("small_Snake")
+  private String smallSnake;
+
+  @JsonProperty("Capital_Snake")
+  private String capitalSnake;
+
+  @JsonProperty("SCA_ETH_Flow_Points")
+  private String scAETHFlowPoints;
+
+  @JsonProperty("ATT_NAME")
+  private String ATT_NAME;
+
+  public Capitalization smallCamel(String smallCamel) {
+    this.smallCamel = smallCamel;
+    return this;
+  }
+
+   /**
+   * Get smallCamel
+   * @return smallCamel
+  **/
+  @javax.annotation.Nullable 
+  @ApiModelProperty(value = "")
+  public String getSmallCamel() {
+    return smallCamel;
+  }
+
+  public void setSmallCamel(String smallCamel) {
+    this.smallCamel = smallCamel;
+  }
+
+  public Capitalization capitalCamel(String capitalCamel) {
+    this.capitalCamel = capitalCamel;
+    return this;
+  }
+
+   /**
+   * Get capitalCamel
+   * @return capitalCamel
+  **/
+  @javax.annotation.Nullable 
+  @ApiModelProperty(value = "")
+  public String getCapitalCamel() {
+    return capitalCamel;
+  }
+
+  public void setCapitalCamel(String capitalCamel) {
+    this.capitalCamel = capitalCamel;
+  }
+
+  public Capitalization smallSnake(String smallSnake) {
+    this.smallSnake = smallSnake;
+    return this;
+  }
+
+   /**
+   * Get smallSnake
+   * @return smallSnake
+  **/
+  @javax.annotation.Nullable 
+  @ApiModelProperty(value = "")
+  public String getSmallSnake() {
+    return smallSnake;
+  }
+
+  public void setSmallSnake(String smallSnake) {
+    this.smallSnake = smallSnake;
+  }
+
+  public Capitalization capitalSnake(String capitalSnake) {
+    this.capitalSnake = capitalSnake;
+    return this;
+  }
+
+   /**
+   * Get capitalSnake
+   * @return capitalSnake
+  **/
+  @javax.annotation.Nullable 
+  @ApiModelProperty(value = "")
+  public String getCapitalSnake() {
+    return capitalSnake;
+  }
+
+  public void setCapitalSnake(String capitalSnake) {
+    this.capitalSnake = capitalSnake;
+  }
+
+  public Capitalization scAETHFlowPoints(String scAETHFlowPoints) {
+    this.scAETHFlowPoints = scAETHFlowPoints;
+    return this;
+  }
+
+   /**
+   * Get scAETHFlowPoints
+   * @return scAETHFlowPoints
+  **/
+  @javax.annotation.Nullable 
+  @ApiModelProperty(value = "")
+  public String getScAETHFlowPoints() {
+    return scAETHFlowPoints;
+  }
+
+  public void setScAETHFlowPoints(String scAETHFlowPoints) {
+    this.scAETHFlowPoints = scAETHFlowPoints;
+  }
+
+  public Capitalization ATT_NAME(String ATT_NAME) {
+    this.ATT_NAME = ATT_NAME;
+    return this;
+  }
+
+   /**
+   * Name of the pet 
+   * @return ATT_NAME
+  **/
+  @javax.annotation.Nullable 
+  @ApiModelProperty(value = "Name of the pet ")
+  public String getATTNAME() {
+    return ATT_NAME;
+  }
+
+  public void setATTNAME(String ATT_NAME) {
+    this.ATT_NAME = ATT_NAME;
+  }
+
+
+  @Override
+  public boolean equals(java.lang.Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    Capitalization capitalization = (Capitalization) o;
+    return Objects.equals(this.smallCamel, capitalization.smallCamel) &&
+        Objects.equals(this.capitalCamel, capitalization.capitalCamel) &&
+        Objects.equals(this.smallSnake, capitalization.smallSnake) &&
+        Objects.equals(this.capitalSnake, capitalization.capitalSnake) &&
+        Objects.equals(this.scAETHFlowPoints, capitalization.scAETHFlowPoints) &&
+        Objects.equals(this.ATT_NAME, capitalization.ATT_NAME);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(smallCamel, capitalCamel, smallSnake, capitalSnake, scAETHFlowPoints, ATT_NAME);
+  }
+
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class Capitalization {\n");
+    sb.append("    smallCamel: ").append(toIndentedString(smallCamel)).append("\n");
+    sb.append("    capitalCamel: ").append(toIndentedString(capitalCamel)).append("\n");
+    sb.append("    smallSnake: ").append(toIndentedString(smallSnake)).append("\n");
+    sb.append("    capitalSnake: ").append(toIndentedString(capitalSnake)).append("\n");
+    sb.append("    scAETHFlowPoints: ").append(toIndentedString(scAETHFlowPoints)).append("\n");
+    sb.append("    ATT_NAME: ").append(toIndentedString(ATT_NAME)).append("\n");
+    sb.append("}");
+    return sb.toString();
+  }
+
+  /**
+   * Convert the given object to string with each line indented by 4 spaces
+   * (except the first line).
+   */
+  private String toIndentedString(java.lang.Object o) {
+    if (o == null) {
+      return "null";
+    }
+    return o.toString().replace("\n", "\n    ");
+  }
+
+}
+
diff --git a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/Cat.java b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/Cat.java
new file mode 100644
index 0000000000..ce456c8647
--- /dev/null
+++ b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/Cat.java
@@ -0,0 +1,95 @@
+/*
+ * OpenAPI Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+
+package org.openapitools.client.model;
+
+import java.util.Objects;
+import java.util.Arrays;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonValue;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import org.openapitools.client.model.Animal;
+import org.openapitools.client.model.CatAllOf;
+
+/**
+ * Cat
+ */
+
+public class Cat extends Animal {
+  @JsonProperty("declawed")
+  private Boolean declawed;
+
+  public Cat declawed(Boolean declawed) {
+    this.declawed = declawed;
+    return this;
+  }
+
+   /**
+   * Get declawed
+   * @return declawed
+  **/
+  @javax.annotation.Nullable 
+  @ApiModelProperty(value = "")
+  public Boolean getDeclawed() {
+    return declawed;
+  }
+
+  public void setDeclawed(Boolean declawed) {
+    this.declawed = declawed;
+  }
+
+
+  @Override
+  public boolean equals(java.lang.Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    Cat cat = (Cat) o;
+    return Objects.equals(this.declawed, cat.declawed) &&
+        super.equals(o);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(declawed, super.hashCode());
+  }
+
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class Cat {\n");
+    sb.append("    ").append(toIndentedString(super.toString())).append("\n");
+    sb.append("    declawed: ").append(toIndentedString(declawed)).append("\n");
+    sb.append("}");
+    return sb.toString();
+  }
+
+  /**
+   * Convert the given object to string with each line indented by 4 spaces
+   * (except the first line).
+   */
+  private String toIndentedString(java.lang.Object o) {
+    if (o == null) {
+      return "null";
+    }
+    return o.toString().replace("\n", "\n    ");
+  }
+
+}
+
diff --git a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/CatAllOf.java b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/CatAllOf.java
new file mode 100644
index 0000000000..224c08671c
--- /dev/null
+++ b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/CatAllOf.java
@@ -0,0 +1,91 @@
+/*
+ * OpenAPI Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+
+package org.openapitools.client.model;
+
+import java.util.Objects;
+import java.util.Arrays;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonValue;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+/**
+ * CatAllOf
+ */
+
+public class CatAllOf {
+  @JsonProperty("declawed")
+  private Boolean declawed;
+
+  public CatAllOf declawed(Boolean declawed) {
+    this.declawed = declawed;
+    return this;
+  }
+
+   /**
+   * Get declawed
+   * @return declawed
+  **/
+  @javax.annotation.Nullable 
+  @ApiModelProperty(value = "")
+  public Boolean getDeclawed() {
+    return declawed;
+  }
+
+  public void setDeclawed(Boolean declawed) {
+    this.declawed = declawed;
+  }
+
+
+  @Override
+  public boolean equals(java.lang.Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    CatAllOf catAllOf = (CatAllOf) o;
+    return Objects.equals(this.declawed, catAllOf.declawed);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(declawed);
+  }
+
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class CatAllOf {\n");
+    sb.append("    declawed: ").append(toIndentedString(declawed)).append("\n");
+    sb.append("}");
+    return sb.toString();
+  }
+
+  /**
+   * Convert the given object to string with each line indented by 4 spaces
+   * (except the first line).
+   */
+  private String toIndentedString(java.lang.Object o) {
+    if (o == null) {
+      return "null";
+    }
+    return o.toString().replace("\n", "\n    ");
+  }
+
+}
+
diff --git a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/Category.java b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/Category.java
new file mode 100644
index 0000000000..03efdd4be8
--- /dev/null
+++ b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/Category.java
@@ -0,0 +1,115 @@
+/*
+ * OpenAPI Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+
+package org.openapitools.client.model;
+
+import java.util.Objects;
+import java.util.Arrays;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonValue;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+/**
+ * Category
+ */
+
+public class Category {
+  @JsonProperty("id")
+  private Long id;
+
+  @JsonProperty("name")
+  private String name = "default-name";
+
+  public Category id(Long id) {
+    this.id = id;
+    return this;
+  }
+
+   /**
+   * Get id
+   * @return id
+  **/
+  @javax.annotation.Nullable 
+  @ApiModelProperty(value = "")
+  public Long getId() {
+    return id;
+  }
+
+  public void setId(Long id) {
+    this.id = id;
+  }
+
+  public Category name(String name) {
+    this.name = name;
+    return this;
+  }
+
+   /**
+   * Get name
+   * @return name
+  **/
+
+  @ApiModelProperty(required = true, value = "")
+  public String getName() {
+    return name;
+  }
+
+  public void setName(String name) {
+    this.name = name;
+  }
+
+
+  @Override
+  public boolean equals(java.lang.Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    Category category = (Category) o;
+    return Objects.equals(this.id, category.id) &&
+        Objects.equals(this.name, category.name);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(id, name);
+  }
+
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class Category {\n");
+    sb.append("    id: ").append(toIndentedString(id)).append("\n");
+    sb.append("    name: ").append(toIndentedString(name)).append("\n");
+    sb.append("}");
+    return sb.toString();
+  }
+
+  /**
+   * Convert the given object to string with each line indented by 4 spaces
+   * (except the first line).
+   */
+  private String toIndentedString(java.lang.Object o) {
+    if (o == null) {
+      return "null";
+    }
+    return o.toString().replace("\n", "\n    ");
+  }
+
+}
+
diff --git a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/ClassModel.java b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/ClassModel.java
new file mode 100644
index 0000000000..def421a670
--- /dev/null
+++ b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/ClassModel.java
@@ -0,0 +1,92 @@
+/*
+ * OpenAPI Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+
+package org.openapitools.client.model;
+
+import java.util.Objects;
+import java.util.Arrays;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonValue;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+/**
+ * Model for testing model with \&quot;_class\&quot; property
+ */
+@ApiModel(description = "Model for testing model with \"_class\" property")
+
+public class ClassModel {
+  @JsonProperty("_class")
+  private String propertyClass;
+
+  public ClassModel propertyClass(String propertyClass) {
+    this.propertyClass = propertyClass;
+    return this;
+  }
+
+   /**
+   * Get propertyClass
+   * @return propertyClass
+  **/
+  @javax.annotation.Nullable 
+  @ApiModelProperty(value = "")
+  public String getPropertyClass() {
+    return propertyClass;
+  }
+
+  public void setPropertyClass(String propertyClass) {
+    this.propertyClass = propertyClass;
+  }
+
+
+  @Override
+  public boolean equals(java.lang.Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    ClassModel classModel = (ClassModel) o;
+    return Objects.equals(this.propertyClass, classModel.propertyClass);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(propertyClass);
+  }
+
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class ClassModel {\n");
+    sb.append("    propertyClass: ").append(toIndentedString(propertyClass)).append("\n");
+    sb.append("}");
+    return sb.toString();
+  }
+
+  /**
+   * Convert the given object to string with each line indented by 4 spaces
+   * (except the first line).
+   */
+  private String toIndentedString(java.lang.Object o) {
+    if (o == null) {
+      return "null";
+    }
+    return o.toString().replace("\n", "\n    ");
+  }
+
+}
+
diff --git a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/Client.java b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/Client.java
new file mode 100644
index 0000000000..c0bd0743e5
--- /dev/null
+++ b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/Client.java
@@ -0,0 +1,91 @@
+/*
+ * OpenAPI Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+
+package org.openapitools.client.model;
+
+import java.util.Objects;
+import java.util.Arrays;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonValue;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+/**
+ * Client
+ */
+
+public class Client {
+  @JsonProperty("client")
+  private String client;
+
+  public Client client(String client) {
+    this.client = client;
+    return this;
+  }
+
+   /**
+   * Get client
+   * @return client
+  **/
+  @javax.annotation.Nullable 
+  @ApiModelProperty(value = "")
+  public String getClient() {
+    return client;
+  }
+
+  public void setClient(String client) {
+    this.client = client;
+  }
+
+
+  @Override
+  public boolean equals(java.lang.Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    Client client = (Client) o;
+    return Objects.equals(this.client, client.client);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(client);
+  }
+
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class Client {\n");
+    sb.append("    client: ").append(toIndentedString(client)).append("\n");
+    sb.append("}");
+    return sb.toString();
+  }
+
+  /**
+   * Convert the given object to string with each line indented by 4 spaces
+   * (except the first line).
+   */
+  private String toIndentedString(java.lang.Object o) {
+    if (o == null) {
+      return "null";
+    }
+    return o.toString().replace("\n", "\n    ");
+  }
+
+}
+
diff --git a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/Dog.java b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/Dog.java
new file mode 100644
index 0000000000..6b79c59606
--- /dev/null
+++ b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/Dog.java
@@ -0,0 +1,95 @@
+/*
+ * OpenAPI Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+
+package org.openapitools.client.model;
+
+import java.util.Objects;
+import java.util.Arrays;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonValue;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import org.openapitools.client.model.Animal;
+import org.openapitools.client.model.DogAllOf;
+
+/**
+ * Dog
+ */
+
+public class Dog extends Animal {
+  @JsonProperty("breed")
+  private String breed;
+
+  public Dog breed(String breed) {
+    this.breed = breed;
+    return this;
+  }
+
+   /**
+   * Get breed
+   * @return breed
+  **/
+  @javax.annotation.Nullable 
+  @ApiModelProperty(value = "")
+  public String getBreed() {
+    return breed;
+  }
+
+  public void setBreed(String breed) {
+    this.breed = breed;
+  }
+
+
+  @Override
+  public boolean equals(java.lang.Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    Dog dog = (Dog) o;
+    return Objects.equals(this.breed, dog.breed) &&
+        super.equals(o);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(breed, super.hashCode());
+  }
+
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class Dog {\n");
+    sb.append("    ").append(toIndentedString(super.toString())).append("\n");
+    sb.append("    breed: ").append(toIndentedString(breed)).append("\n");
+    sb.append("}");
+    return sb.toString();
+  }
+
+  /**
+   * Convert the given object to string with each line indented by 4 spaces
+   * (except the first line).
+   */
+  private String toIndentedString(java.lang.Object o) {
+    if (o == null) {
+      return "null";
+    }
+    return o.toString().replace("\n", "\n    ");
+  }
+
+}
+
diff --git a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/DogAllOf.java b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/DogAllOf.java
new file mode 100644
index 0000000000..1a4496d8f0
--- /dev/null
+++ b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/DogAllOf.java
@@ -0,0 +1,91 @@
+/*
+ * OpenAPI Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+
+package org.openapitools.client.model;
+
+import java.util.Objects;
+import java.util.Arrays;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonValue;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+/**
+ * DogAllOf
+ */
+
+public class DogAllOf {
+  @JsonProperty("breed")
+  private String breed;
+
+  public DogAllOf breed(String breed) {
+    this.breed = breed;
+    return this;
+  }
+
+   /**
+   * Get breed
+   * @return breed
+  **/
+  @javax.annotation.Nullable 
+  @ApiModelProperty(value = "")
+  public String getBreed() {
+    return breed;
+  }
+
+  public void setBreed(String breed) {
+    this.breed = breed;
+  }
+
+
+  @Override
+  public boolean equals(java.lang.Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    DogAllOf dogAllOf = (DogAllOf) o;
+    return Objects.equals(this.breed, dogAllOf.breed);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(breed);
+  }
+
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class DogAllOf {\n");
+    sb.append("    breed: ").append(toIndentedString(breed)).append("\n");
+    sb.append("}");
+    return sb.toString();
+  }
+
+  /**
+   * Convert the given object to string with each line indented by 4 spaces
+   * (except the first line).
+   */
+  private String toIndentedString(java.lang.Object o) {
+    if (o == null) {
+      return "null";
+    }
+    return o.toString().replace("\n", "\n    ");
+  }
+
+}
+
diff --git a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/EnumArrays.java b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/EnumArrays.java
new file mode 100644
index 0000000000..fff7f65c72
--- /dev/null
+++ b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/EnumArrays.java
@@ -0,0 +1,195 @@
+/*
+ * OpenAPI Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+
+package org.openapitools.client.model;
+
+import java.util.Objects;
+import java.util.Arrays;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonValue;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * EnumArrays
+ */
+
+public class EnumArrays {
+  /**
+   * Gets or Sets justSymbol
+   */
+  public enum JustSymbolEnum {
+    GREATER_THAN_OR_EQUAL_TO(">="),
+    
+    DOLLAR("$");
+
+    private String value;
+
+    JustSymbolEnum(String value) {
+      this.value = value;
+    }
+
+    @JsonValue
+    public String getValue() {
+      return value;
+    }
+
+    @Override
+    public String toString() {
+      return String.valueOf(value);
+    }
+
+    @JsonCreator
+    public static JustSymbolEnum fromValue(String value) {
+      for (JustSymbolEnum b : JustSymbolEnum.values()) {
+        if (b.value.equals(value)) {
+          return b;
+        }
+      }
+      throw new IllegalArgumentException("Unexpected value '" + value + "'");
+    }
+  }
+
+  @JsonProperty("just_symbol")
+  private JustSymbolEnum justSymbol;
+
+  /**
+   * Gets or Sets arrayEnum
+   */
+  public enum ArrayEnumEnum {
+    FISH("fish"),
+    
+    CRAB("crab");
+
+    private String value;
+
+    ArrayEnumEnum(String value) {
+      this.value = value;
+    }
+
+    @JsonValue
+    public String getValue() {
+      return value;
+    }
+
+    @Override
+    public String toString() {
+      return String.valueOf(value);
+    }
+
+    @JsonCreator
+    public static ArrayEnumEnum fromValue(String value) {
+      for (ArrayEnumEnum b : ArrayEnumEnum.values()) {
+        if (b.value.equals(value)) {
+          return b;
+        }
+      }
+      throw new IllegalArgumentException("Unexpected value '" + value + "'");
+    }
+  }
+
+  @JsonProperty("array_enum")
+  private List<ArrayEnumEnum> arrayEnum = new ArrayList<>();
+
+  public EnumArrays justSymbol(JustSymbolEnum justSymbol) {
+    this.justSymbol = justSymbol;
+    return this;
+  }
+
+   /**
+   * Get justSymbol
+   * @return justSymbol
+  **/
+  @javax.annotation.Nullable 
+  @ApiModelProperty(value = "")
+  public JustSymbolEnum getJustSymbol() {
+    return justSymbol;
+  }
+
+  public void setJustSymbol(JustSymbolEnum justSymbol) {
+    this.justSymbol = justSymbol;
+  }
+
+  public EnumArrays arrayEnum(List<ArrayEnumEnum> arrayEnum) {
+    this.arrayEnum = arrayEnum;
+    return this;
+  }
+
+  public EnumArrays addArrayEnumItem(ArrayEnumEnum arrayEnumItem) {
+    if (this.arrayEnum == null) {
+      this.arrayEnum = new ArrayList<>();
+    }
+    this.arrayEnum.add(arrayEnumItem);
+    return this;
+  }
+
+   /**
+   * Get arrayEnum
+   * @return arrayEnum
+  **/
+  @javax.annotation.Nullable 
+  @ApiModelProperty(value = "")
+  public List<ArrayEnumEnum> getArrayEnum() {
+    return arrayEnum;
+  }
+
+  public void setArrayEnum(List<ArrayEnumEnum> arrayEnum) {
+    this.arrayEnum = arrayEnum;
+  }
+
+
+  @Override
+  public boolean equals(java.lang.Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    EnumArrays enumArrays = (EnumArrays) o;
+    return Objects.equals(this.justSymbol, enumArrays.justSymbol) &&
+        Objects.equals(this.arrayEnum, enumArrays.arrayEnum);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(justSymbol, arrayEnum);
+  }
+
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class EnumArrays {\n");
+    sb.append("    justSymbol: ").append(toIndentedString(justSymbol)).append("\n");
+    sb.append("    arrayEnum: ").append(toIndentedString(arrayEnum)).append("\n");
+    sb.append("}");
+    return sb.toString();
+  }
+
+  /**
+   * Convert the given object to string with each line indented by 4 spaces
+   * (except the first line).
+   */
+  private String toIndentedString(java.lang.Object o) {
+    if (o == null) {
+      return "null";
+    }
+    return o.toString().replace("\n", "\n    ");
+  }
+
+}
+
diff --git a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/EnumClass.java b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/EnumClass.java
new file mode 100644
index 0000000000..a4cc808868
--- /dev/null
+++ b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/EnumClass.java
@@ -0,0 +1,59 @@
+/*
+ * OpenAPI Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+
+package org.openapitools.client.model;
+
+import java.util.Objects;
+import java.util.Arrays;
+
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonValue;
+
+/**
+ * Gets or Sets EnumClass
+ */
+public enum EnumClass {
+  
+  _ABC("_abc"),
+  
+  _EFG("-efg"),
+  
+  _XYZ_("(xyz)");
+
+  private String value;
+
+  EnumClass(String value) {
+    this.value = value;
+  }
+
+  @JsonValue
+  public String getValue() {
+    return value;
+  }
+
+  @Override
+  public String toString() {
+    return String.valueOf(value);
+  }
+
+  @JsonCreator
+  public static EnumClass fromValue(String value) {
+    for (EnumClass b : EnumClass.values()) {
+      if (b.value.equals(value)) {
+        return b;
+      }
+    }
+    throw new IllegalArgumentException("Unexpected value '" + value + "'");
+  }
+}
+
diff --git a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/EnumTest.java b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/EnumTest.java
new file mode 100644
index 0000000000..d4b36798ee
--- /dev/null
+++ b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/EnumTest.java
@@ -0,0 +1,332 @@
+/*
+ * OpenAPI Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+
+package org.openapitools.client.model;
+
+import java.util.Objects;
+import java.util.Arrays;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonValue;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import org.openapitools.client.model.OuterEnum;
+
+/**
+ * EnumTest
+ */
+
+public class EnumTest {
+  /**
+   * Gets or Sets enumString
+   */
+  public enum EnumStringEnum {
+    UPPER("UPPER"),
+    
+    LOWER("lower"),
+    
+    EMPTY("");
+
+    private String value;
+
+    EnumStringEnum(String value) {
+      this.value = value;
+    }
+
+    @JsonValue
+    public String getValue() {
+      return value;
+    }
+
+    @Override
+    public String toString() {
+      return String.valueOf(value);
+    }
+
+    @JsonCreator
+    public static EnumStringEnum fromValue(String value) {
+      for (EnumStringEnum b : EnumStringEnum.values()) {
+        if (b.value.equals(value)) {
+          return b;
+        }
+      }
+      throw new IllegalArgumentException("Unexpected value '" + value + "'");
+    }
+  }
+
+  @JsonProperty("enum_string")
+  private EnumStringEnum enumString;
+
+  /**
+   * Gets or Sets enumStringRequired
+   */
+  public enum EnumStringRequiredEnum {
+    UPPER("UPPER"),
+    
+    LOWER("lower"),
+    
+    EMPTY("");
+
+    private String value;
+
+    EnumStringRequiredEnum(String value) {
+      this.value = value;
+    }
+
+    @JsonValue
+    public String getValue() {
+      return value;
+    }
+
+    @Override
+    public String toString() {
+      return String.valueOf(value);
+    }
+
+    @JsonCreator
+    public static EnumStringRequiredEnum fromValue(String value) {
+      for (EnumStringRequiredEnum b : EnumStringRequiredEnum.values()) {
+        if (b.value.equals(value)) {
+          return b;
+        }
+      }
+      throw new IllegalArgumentException("Unexpected value '" + value + "'");
+    }
+  }
+
+  @JsonProperty("enum_string_required")
+  private EnumStringRequiredEnum enumStringRequired;
+
+  /**
+   * Gets or Sets enumInteger
+   */
+  public enum EnumIntegerEnum {
+    NUMBER_1(1),
+    
+    NUMBER_MINUS_1(-1);
+
+    private Integer value;
+
+    EnumIntegerEnum(Integer value) {
+      this.value = value;
+    }
+
+    @JsonValue
+    public Integer getValue() {
+      return value;
+    }
+
+    @Override
+    public String toString() {
+      return String.valueOf(value);
+    }
+
+    @JsonCreator
+    public static EnumIntegerEnum fromValue(Integer value) {
+      for (EnumIntegerEnum b : EnumIntegerEnum.values()) {
+        if (b.value.equals(value)) {
+          return b;
+        }
+      }
+      throw new IllegalArgumentException("Unexpected value '" + value + "'");
+    }
+  }
+
+  @JsonProperty("enum_integer")
+  private EnumIntegerEnum enumInteger;
+
+  /**
+   * Gets or Sets enumNumber
+   */
+  public enum EnumNumberEnum {
+    NUMBER_1_DOT_1(1.1),
+    
+    NUMBER_MINUS_1_DOT_2(-1.2);
+
+    private Double value;
+
+    EnumNumberEnum(Double value) {
+      this.value = value;
+    }
+
+    @JsonValue
+    public Double getValue() {
+      return value;
+    }
+
+    @Override
+    public String toString() {
+      return String.valueOf(value);
+    }
+
+    @JsonCreator
+    public static EnumNumberEnum fromValue(Double value) {
+      for (EnumNumberEnum b : EnumNumberEnum.values()) {
+        if (b.value.equals(value)) {
+          return b;
+        }
+      }
+      throw new IllegalArgumentException("Unexpected value '" + value + "'");
+    }
+  }
+
+  @JsonProperty("enum_number")
+  private EnumNumberEnum enumNumber;
+
+  @JsonProperty("outerEnum")
+  private OuterEnum outerEnum;
+
+  public EnumTest enumString(EnumStringEnum enumString) {
+    this.enumString = enumString;
+    return this;
+  }
+
+   /**
+   * Get enumString
+   * @return enumString
+  **/
+  @javax.annotation.Nullable 
+  @ApiModelProperty(value = "")
+  public EnumStringEnum getEnumString() {
+    return enumString;
+  }
+
+  public void setEnumString(EnumStringEnum enumString) {
+    this.enumString = enumString;
+  }
+
+  public EnumTest enumStringRequired(EnumStringRequiredEnum enumStringRequired) {
+    this.enumStringRequired = enumStringRequired;
+    return this;
+  }
+
+   /**
+   * Get enumStringRequired
+   * @return enumStringRequired
+  **/
+
+  @ApiModelProperty(required = true, value = "")
+  public EnumStringRequiredEnum getEnumStringRequired() {
+    return enumStringRequired;
+  }
+
+  public void setEnumStringRequired(EnumStringRequiredEnum enumStringRequired) {
+    this.enumStringRequired = enumStringRequired;
+  }
+
+  public EnumTest enumInteger(EnumIntegerEnum enumInteger) {
+    this.enumInteger = enumInteger;
+    return this;
+  }
+
+   /**
+   * Get enumInteger
+   * @return enumInteger
+  **/
+  @javax.annotation.Nullable 
+  @ApiModelProperty(value = "")
+  public EnumIntegerEnum getEnumInteger() {
+    return enumInteger;
+  }
+
+  public void setEnumInteger(EnumIntegerEnum enumInteger) {
+    this.enumInteger = enumInteger;
+  }
+
+  public EnumTest enumNumber(EnumNumberEnum enumNumber) {
+    this.enumNumber = enumNumber;
+    return this;
+  }
+
+   /**
+   * Get enumNumber
+   * @return enumNumber
+  **/
+  @javax.annotation.Nullable 
+  @ApiModelProperty(value = "")
+  public EnumNumberEnum getEnumNumber() {
+    return enumNumber;
+  }
+
+  public void setEnumNumber(EnumNumberEnum enumNumber) {
+    this.enumNumber = enumNumber;
+  }
+
+  public EnumTest outerEnum(OuterEnum outerEnum) {
+    this.outerEnum = outerEnum;
+    return this;
+  }
+
+   /**
+   * Get outerEnum
+   * @return outerEnum
+  **/
+  @javax.annotation.Nullable 
+  @ApiModelProperty(value = "")
+  public OuterEnum getOuterEnum() {
+    return outerEnum;
+  }
+
+  public void setOuterEnum(OuterEnum outerEnum) {
+    this.outerEnum = outerEnum;
+  }
+
+
+  @Override
+  public boolean equals(java.lang.Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    EnumTest enumTest = (EnumTest) o;
+    return Objects.equals(this.enumString, enumTest.enumString) &&
+        Objects.equals(this.enumStringRequired, enumTest.enumStringRequired) &&
+        Objects.equals(this.enumInteger, enumTest.enumInteger) &&
+        Objects.equals(this.enumNumber, enumTest.enumNumber) &&
+        Objects.equals(this.outerEnum, enumTest.outerEnum);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(enumString, enumStringRequired, enumInteger, enumNumber, outerEnum);
+  }
+
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class EnumTest {\n");
+    sb.append("    enumString: ").append(toIndentedString(enumString)).append("\n");
+    sb.append("    enumStringRequired: ").append(toIndentedString(enumStringRequired)).append("\n");
+    sb.append("    enumInteger: ").append(toIndentedString(enumInteger)).append("\n");
+    sb.append("    enumNumber: ").append(toIndentedString(enumNumber)).append("\n");
+    sb.append("    outerEnum: ").append(toIndentedString(outerEnum)).append("\n");
+    sb.append("}");
+    return sb.toString();
+  }
+
+  /**
+   * Convert the given object to string with each line indented by 4 spaces
+   * (except the first line).
+   */
+  private String toIndentedString(java.lang.Object o) {
+    if (o == null) {
+      return "null";
+    }
+    return o.toString().replace("\n", "\n    ");
+  }
+
+}
+
diff --git a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java
new file mode 100644
index 0000000000..ebbb0fb9f3
--- /dev/null
+++ b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java
@@ -0,0 +1,125 @@
+/*
+ * OpenAPI Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+
+package org.openapitools.client.model;
+
+import java.util.Objects;
+import java.util.Arrays;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonValue;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * FileSchemaTestClass
+ */
+
+public class FileSchemaTestClass {
+  @JsonProperty("file")
+  private java.io.File file = null;
+
+  @JsonProperty("files")
+  private List<java.io.File> files = new ArrayList<>();
+
+  public FileSchemaTestClass file(java.io.File file) {
+    this.file = file;
+    return this;
+  }
+
+   /**
+   * Get file
+   * @return file
+  **/
+  @javax.annotation.Nullable 
+  @ApiModelProperty(value = "")
+  public java.io.File getFile() {
+    return file;
+  }
+
+  public void setFile(java.io.File file) {
+    this.file = file;
+  }
+
+  public FileSchemaTestClass files(List<java.io.File> files) {
+    this.files = files;
+    return this;
+  }
+
+  public FileSchemaTestClass addFilesItem(java.io.File filesItem) {
+    if (this.files == null) {
+      this.files = new ArrayList<>();
+    }
+    this.files.add(filesItem);
+    return this;
+  }
+
+   /**
+   * Get files
+   * @return files
+  **/
+  @javax.annotation.Nullable 
+  @ApiModelProperty(value = "")
+  public List<java.io.File> getFiles() {
+    return files;
+  }
+
+  public void setFiles(List<java.io.File> files) {
+    this.files = files;
+  }
+
+
+  @Override
+  public boolean equals(java.lang.Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    FileSchemaTestClass fileSchemaTestClass = (FileSchemaTestClass) o;
+    return Objects.equals(this.file, fileSchemaTestClass.file) &&
+        Objects.equals(this.files, fileSchemaTestClass.files);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(file, files);
+  }
+
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class FileSchemaTestClass {\n");
+    sb.append("    file: ").append(toIndentedString(file)).append("\n");
+    sb.append("    files: ").append(toIndentedString(files)).append("\n");
+    sb.append("}");
+    return sb.toString();
+  }
+
+  /**
+   * Convert the given object to string with each line indented by 4 spaces
+   * (except the first line).
+   */
+  private String toIndentedString(java.lang.Object o) {
+    if (o == null) {
+      return "null";
+    }
+    return o.toString().replace("\n", "\n    ");
+  }
+
+}
+
diff --git a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/FormatTest.java b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/FormatTest.java
new file mode 100644
index 0000000000..518432caff
--- /dev/null
+++ b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/FormatTest.java
@@ -0,0 +1,394 @@
+/*
+ * OpenAPI Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+
+package org.openapitools.client.model;
+
+import java.util.Objects;
+import java.util.Arrays;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonValue;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import java.io.File;
+import java.math.BigDecimal;
+import java.time.LocalDate;
+import java.time.OffsetDateTime;
+import java.util.UUID;
+
+/**
+ * FormatTest
+ */
+
+public class FormatTest {
+  @JsonProperty("integer")
+  private Integer integer;
+
+  @JsonProperty("int32")
+  private Integer int32;
+
+  @JsonProperty("int64")
+  private Long int64;
+
+  @JsonProperty("number")
+  private BigDecimal number;
+
+  @JsonProperty("float")
+  private Float _float;
+
+  @JsonProperty("double")
+  private Double _double;
+
+  @JsonProperty("string")
+  private String string;
+
+  @JsonProperty("byte")
+  private byte[] _byte;
+
+  @JsonProperty("binary")
+  private File binary;
+
+  @JsonProperty("date")
+  private LocalDate date;
+
+  @JsonProperty("dateTime")
+  private OffsetDateTime dateTime;
+
+  @JsonProperty("uuid")
+  private UUID uuid;
+
+  @JsonProperty("password")
+  private String password;
+
+  public FormatTest integer(Integer integer) {
+    this.integer = integer;
+    return this;
+  }
+
+   /**
+   * Get integer
+   * minimum: 10
+   * maximum: 100
+   * @return integer
+  **/
+  @javax.annotation.Nullable 
+  @ApiModelProperty(value = "")
+  public Integer getInteger() {
+    return integer;
+  }
+
+  public void setInteger(Integer integer) {
+    this.integer = integer;
+  }
+
+  public FormatTest int32(Integer int32) {
+    this.int32 = int32;
+    return this;
+  }
+
+   /**
+   * Get int32
+   * minimum: 20
+   * maximum: 200
+   * @return int32
+  **/
+  @javax.annotation.Nullable 
+  @ApiModelProperty(value = "")
+  public Integer getInt32() {
+    return int32;
+  }
+
+  public void setInt32(Integer int32) {
+    this.int32 = int32;
+  }
+
+  public FormatTest int64(Long int64) {
+    this.int64 = int64;
+    return this;
+  }
+
+   /**
+   * Get int64
+   * @return int64
+  **/
+  @javax.annotation.Nullable 
+  @ApiModelProperty(value = "")
+  public Long getInt64() {
+    return int64;
+  }
+
+  public void setInt64(Long int64) {
+    this.int64 = int64;
+  }
+
+  public FormatTest number(BigDecimal number) {
+    this.number = number;
+    return this;
+  }
+
+   /**
+   * Get number
+   * minimum: 32.1
+   * maximum: 543.2
+   * @return number
+  **/
+
+  @ApiModelProperty(required = true, value = "")
+  public BigDecimal getNumber() {
+    return number;
+  }
+
+  public void setNumber(BigDecimal number) {
+    this.number = number;
+  }
+
+  public FormatTest _float(Float _float) {
+    this._float = _float;
+    return this;
+  }
+
+   /**
+   * Get _float
+   * minimum: 54.3
+   * maximum: 987.6
+   * @return _float
+  **/
+  @javax.annotation.Nullable 
+  @ApiModelProperty(value = "")
+  public Float getFloat() {
+    return _float;
+  }
+
+  public void setFloat(Float _float) {
+    this._float = _float;
+  }
+
+  public FormatTest _double(Double _double) {
+    this._double = _double;
+    return this;
+  }
+
+   /**
+   * Get _double
+   * minimum: 67.8
+   * maximum: 123.4
+   * @return _double
+  **/
+  @javax.annotation.Nullable 
+  @ApiModelProperty(value = "")
+  public Double getDouble() {
+    return _double;
+  }
+
+  public void setDouble(Double _double) {
+    this._double = _double;
+  }
+
+  public FormatTest string(String string) {
+    this.string = string;
+    return this;
+  }
+
+   /**
+   * Get string
+   * @return string
+  **/
+  @javax.annotation.Nullable 
+  @ApiModelProperty(value = "")
+  public String getString() {
+    return string;
+  }
+
+  public void setString(String string) {
+    this.string = string;
+  }
+
+  public FormatTest _byte(byte[] _byte) {
+    this._byte = _byte;
+    return this;
+  }
+
+   /**
+   * Get _byte
+   * @return _byte
+  **/
+
+  @ApiModelProperty(required = true, value = "")
+  public byte[] getByte() {
+    return _byte;
+  }
+
+  public void setByte(byte[] _byte) {
+    this._byte = _byte;
+  }
+
+  public FormatTest binary(File binary) {
+    this.binary = binary;
+    return this;
+  }
+
+   /**
+   * Get binary
+   * @return binary
+  **/
+  @javax.annotation.Nullable 
+  @ApiModelProperty(value = "")
+  public File getBinary() {
+    return binary;
+  }
+
+  public void setBinary(File binary) {
+    this.binary = binary;
+  }
+
+  public FormatTest date(LocalDate date) {
+    this.date = date;
+    return this;
+  }
+
+   /**
+   * Get date
+   * @return date
+  **/
+
+  @ApiModelProperty(required = true, value = "")
+  public LocalDate getDate() {
+    return date;
+  }
+
+  public void setDate(LocalDate date) {
+    this.date = date;
+  }
+
+  public FormatTest dateTime(OffsetDateTime dateTime) {
+    this.dateTime = dateTime;
+    return this;
+  }
+
+   /**
+   * Get dateTime
+   * @return dateTime
+  **/
+  @javax.annotation.Nullable 
+  @ApiModelProperty(value = "")
+  public OffsetDateTime getDateTime() {
+    return dateTime;
+  }
+
+  public void setDateTime(OffsetDateTime dateTime) {
+    this.dateTime = dateTime;
+  }
+
+  public FormatTest uuid(UUID uuid) {
+    this.uuid = uuid;
+    return this;
+  }
+
+   /**
+   * Get uuid
+   * @return uuid
+  **/
+  @javax.annotation.Nullable 
+  @ApiModelProperty(example = "72f98069-206d-4f12-9f12-3d1e525a8e84", value = "")
+  public UUID getUuid() {
+    return uuid;
+  }
+
+  public void setUuid(UUID uuid) {
+    this.uuid = uuid;
+  }
+
+  public FormatTest password(String password) {
+    this.password = password;
+    return this;
+  }
+
+   /**
+   * Get password
+   * @return password
+  **/
+
+  @ApiModelProperty(required = true, value = "")
+  public String getPassword() {
+    return password;
+  }
+
+  public void setPassword(String password) {
+    this.password = password;
+  }
+
+
+  @Override
+  public boolean equals(java.lang.Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    FormatTest formatTest = (FormatTest) o;
+    return Objects.equals(this.integer, formatTest.integer) &&
+        Objects.equals(this.int32, formatTest.int32) &&
+        Objects.equals(this.int64, formatTest.int64) &&
+        Objects.equals(this.number, formatTest.number) &&
+        Objects.equals(this._float, formatTest._float) &&
+        Objects.equals(this._double, formatTest._double) &&
+        Objects.equals(this.string, formatTest.string) &&
+        Arrays.equals(this._byte, formatTest._byte) &&
+        Objects.equals(this.binary, formatTest.binary) &&
+        Objects.equals(this.date, formatTest.date) &&
+        Objects.equals(this.dateTime, formatTest.dateTime) &&
+        Objects.equals(this.uuid, formatTest.uuid) &&
+        Objects.equals(this.password, formatTest.password);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(integer, int32, int64, number, _float, _double, string, Arrays.hashCode(_byte), binary, date, dateTime, uuid, password);
+  }
+
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class FormatTest {\n");
+    sb.append("    integer: ").append(toIndentedString(integer)).append("\n");
+    sb.append("    int32: ").append(toIndentedString(int32)).append("\n");
+    sb.append("    int64: ").append(toIndentedString(int64)).append("\n");
+    sb.append("    number: ").append(toIndentedString(number)).append("\n");
+    sb.append("    _float: ").append(toIndentedString(_float)).append("\n");
+    sb.append("    _double: ").append(toIndentedString(_double)).append("\n");
+    sb.append("    string: ").append(toIndentedString(string)).append("\n");
+    sb.append("    _byte: ").append(toIndentedString(_byte)).append("\n");
+    sb.append("    binary: ").append(toIndentedString(binary)).append("\n");
+    sb.append("    date: ").append(toIndentedString(date)).append("\n");
+    sb.append("    dateTime: ").append(toIndentedString(dateTime)).append("\n");
+    sb.append("    uuid: ").append(toIndentedString(uuid)).append("\n");
+    sb.append("    password: ").append(toIndentedString(password)).append("\n");
+    sb.append("}");
+    return sb.toString();
+  }
+
+  /**
+   * Convert the given object to string with each line indented by 4 spaces
+   * (except the first line).
+   */
+  private String toIndentedString(java.lang.Object o) {
+    if (o == null) {
+      return "null";
+    }
+    return o.toString().replace("\n", "\n    ");
+  }
+
+}
+
diff --git a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java
new file mode 100644
index 0000000000..44159e08e8
--- /dev/null
+++ b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java
@@ -0,0 +1,97 @@
+/*
+ * OpenAPI Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+
+package org.openapitools.client.model;
+
+import java.util.Objects;
+import java.util.Arrays;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonValue;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+/**
+ * HasOnlyReadOnly
+ */
+
+public class HasOnlyReadOnly {
+  @JsonProperty("bar")
+  private String bar;
+
+  @JsonProperty("foo")
+  private String foo;
+
+   /**
+   * Get bar
+   * @return bar
+  **/
+  @javax.annotation.Nullable 
+  @ApiModelProperty(value = "")
+  public String getBar() {
+    return bar;
+  }
+
+   /**
+   * Get foo
+   * @return foo
+  **/
+  @javax.annotation.Nullable 
+  @ApiModelProperty(value = "")
+  public String getFoo() {
+    return foo;
+  }
+
+
+  @Override
+  public boolean equals(java.lang.Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    HasOnlyReadOnly hasOnlyReadOnly = (HasOnlyReadOnly) o;
+    return Objects.equals(this.bar, hasOnlyReadOnly.bar) &&
+        Objects.equals(this.foo, hasOnlyReadOnly.foo);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(bar, foo);
+  }
+
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class HasOnlyReadOnly {\n");
+    sb.append("    bar: ").append(toIndentedString(bar)).append("\n");
+    sb.append("    foo: ").append(toIndentedString(foo)).append("\n");
+    sb.append("}");
+    return sb.toString();
+  }
+
+  /**
+   * Convert the given object to string with each line indented by 4 spaces
+   * (except the first line).
+   */
+  private String toIndentedString(java.lang.Object o) {
+    if (o == null) {
+      return "null";
+    }
+    return o.toString().replace("\n", "\n    ");
+  }
+
+}
+
diff --git a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/MapTest.java b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/MapTest.java
new file mode 100644
index 0000000000..2caabbea07
--- /dev/null
+++ b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/MapTest.java
@@ -0,0 +1,233 @@
+/*
+ * OpenAPI Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+
+package org.openapitools.client.model;
+
+import java.util.Objects;
+import java.util.Arrays;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonValue;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * MapTest
+ */
+
+public class MapTest {
+  @JsonProperty("map_map_of_string")
+  private Map<String, Map<String, String>> mapMapOfString = new HashMap<>();
+
+  /**
+   * Gets or Sets inner
+   */
+  public enum InnerEnum {
+    UPPER("UPPER"),
+    
+    LOWER("lower");
+
+    private String value;
+
+    InnerEnum(String value) {
+      this.value = value;
+    }
+
+    @JsonValue
+    public String getValue() {
+      return value;
+    }
+
+    @Override
+    public String toString() {
+      return String.valueOf(value);
+    }
+
+    @JsonCreator
+    public static InnerEnum fromValue(String value) {
+      for (InnerEnum b : InnerEnum.values()) {
+        if (b.value.equals(value)) {
+          return b;
+        }
+      }
+      throw new IllegalArgumentException("Unexpected value '" + value + "'");
+    }
+  }
+
+  @JsonProperty("map_of_enum_string")
+  private Map<String, InnerEnum> mapOfEnumString = new HashMap<>();
+
+  @JsonProperty("direct_map")
+  private Map<String, Boolean> directMap = new HashMap<>();
+
+  @JsonProperty("indirect_map")
+  private Map<String, Boolean> indirectMap = new HashMap<>();
+
+  public MapTest mapMapOfString(Map<String, Map<String, String>> mapMapOfString) {
+    this.mapMapOfString = mapMapOfString;
+    return this;
+  }
+
+  public MapTest putMapMapOfStringItem(String key, Map<String, String> mapMapOfStringItem) {
+    if (this.mapMapOfString == null) {
+      this.mapMapOfString = new HashMap<>();
+    }
+    this.mapMapOfString.put(key, mapMapOfStringItem);
+    return this;
+  }
+
+   /**
+   * Get mapMapOfString
+   * @return mapMapOfString
+  **/
+  @javax.annotation.Nullable 
+  @ApiModelProperty(value = "")
+  public Map<String, Map<String, String>> getMapMapOfString() {
+    return mapMapOfString;
+  }
+
+  public void setMapMapOfString(Map<String, Map<String, String>> mapMapOfString) {
+    this.mapMapOfString = mapMapOfString;
+  }
+
+  public MapTest mapOfEnumString(Map<String, InnerEnum> mapOfEnumString) {
+    this.mapOfEnumString = mapOfEnumString;
+    return this;
+  }
+
+  public MapTest putMapOfEnumStringItem(String key, InnerEnum mapOfEnumStringItem) {
+    if (this.mapOfEnumString == null) {
+      this.mapOfEnumString = new HashMap<>();
+    }
+    this.mapOfEnumString.put(key, mapOfEnumStringItem);
+    return this;
+  }
+
+   /**
+   * Get mapOfEnumString
+   * @return mapOfEnumString
+  **/
+  @javax.annotation.Nullable 
+  @ApiModelProperty(value = "")
+  public Map<String, InnerEnum> getMapOfEnumString() {
+    return mapOfEnumString;
+  }
+
+  public void setMapOfEnumString(Map<String, InnerEnum> mapOfEnumString) {
+    this.mapOfEnumString = mapOfEnumString;
+  }
+
+  public MapTest directMap(Map<String, Boolean> directMap) {
+    this.directMap = directMap;
+    return this;
+  }
+
+  public MapTest putDirectMapItem(String key, Boolean directMapItem) {
+    if (this.directMap == null) {
+      this.directMap = new HashMap<>();
+    }
+    this.directMap.put(key, directMapItem);
+    return this;
+  }
+
+   /**
+   * Get directMap
+   * @return directMap
+  **/
+  @javax.annotation.Nullable 
+  @ApiModelProperty(value = "")
+  public Map<String, Boolean> getDirectMap() {
+    return directMap;
+  }
+
+  public void setDirectMap(Map<String, Boolean> directMap) {
+    this.directMap = directMap;
+  }
+
+  public MapTest indirectMap(Map<String, Boolean> indirectMap) {
+    this.indirectMap = indirectMap;
+    return this;
+  }
+
+  public MapTest putIndirectMapItem(String key, Boolean indirectMapItem) {
+    if (this.indirectMap == null) {
+      this.indirectMap = new HashMap<>();
+    }
+    this.indirectMap.put(key, indirectMapItem);
+    return this;
+  }
+
+   /**
+   * Get indirectMap
+   * @return indirectMap
+  **/
+  @javax.annotation.Nullable 
+  @ApiModelProperty(value = "")
+  public Map<String, Boolean> getIndirectMap() {
+    return indirectMap;
+  }
+
+  public void setIndirectMap(Map<String, Boolean> indirectMap) {
+    this.indirectMap = indirectMap;
+  }
+
+
+  @Override
+  public boolean equals(java.lang.Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    MapTest mapTest = (MapTest) o;
+    return Objects.equals(this.mapMapOfString, mapTest.mapMapOfString) &&
+        Objects.equals(this.mapOfEnumString, mapTest.mapOfEnumString) &&
+        Objects.equals(this.directMap, mapTest.directMap) &&
+        Objects.equals(this.indirectMap, mapTest.indirectMap);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(mapMapOfString, mapOfEnumString, directMap, indirectMap);
+  }
+
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class MapTest {\n");
+    sb.append("    mapMapOfString: ").append(toIndentedString(mapMapOfString)).append("\n");
+    sb.append("    mapOfEnumString: ").append(toIndentedString(mapOfEnumString)).append("\n");
+    sb.append("    directMap: ").append(toIndentedString(directMap)).append("\n");
+    sb.append("    indirectMap: ").append(toIndentedString(indirectMap)).append("\n");
+    sb.append("}");
+    return sb.toString();
+  }
+
+  /**
+   * Convert the given object to string with each line indented by 4 spaces
+   * (except the first line).
+   */
+  private String toIndentedString(java.lang.Object o) {
+    if (o == null) {
+      return "null";
+    }
+    return o.toString().replace("\n", "\n    ");
+  }
+
+}
+
diff --git a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java
new file mode 100644
index 0000000000..8d97329c31
--- /dev/null
+++ b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java
@@ -0,0 +1,153 @@
+/*
+ * OpenAPI Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+
+package org.openapitools.client.model;
+
+import java.util.Objects;
+import java.util.Arrays;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonValue;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import java.time.OffsetDateTime;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.UUID;
+import org.openapitools.client.model.Animal;
+
+/**
+ * MixedPropertiesAndAdditionalPropertiesClass
+ */
+
+public class MixedPropertiesAndAdditionalPropertiesClass {
+  @JsonProperty("uuid")
+  private UUID uuid;
+
+  @JsonProperty("dateTime")
+  private OffsetDateTime dateTime;
+
+  @JsonProperty("map")
+  private Map<String, Animal> map = new HashMap<>();
+
+  public MixedPropertiesAndAdditionalPropertiesClass uuid(UUID uuid) {
+    this.uuid = uuid;
+    return this;
+  }
+
+   /**
+   * Get uuid
+   * @return uuid
+  **/
+  @javax.annotation.Nullable 
+  @ApiModelProperty(value = "")
+  public UUID getUuid() {
+    return uuid;
+  }
+
+  public void setUuid(UUID uuid) {
+    this.uuid = uuid;
+  }
+
+  public MixedPropertiesAndAdditionalPropertiesClass dateTime(OffsetDateTime dateTime) {
+    this.dateTime = dateTime;
+    return this;
+  }
+
+   /**
+   * Get dateTime
+   * @return dateTime
+  **/
+  @javax.annotation.Nullable 
+  @ApiModelProperty(value = "")
+  public OffsetDateTime getDateTime() {
+    return dateTime;
+  }
+
+  public void setDateTime(OffsetDateTime dateTime) {
+    this.dateTime = dateTime;
+  }
+
+  public MixedPropertiesAndAdditionalPropertiesClass map(Map<String, Animal> map) {
+    this.map = map;
+    return this;
+  }
+
+  public MixedPropertiesAndAdditionalPropertiesClass putMapItem(String key, Animal mapItem) {
+    if (this.map == null) {
+      this.map = new HashMap<>();
+    }
+    this.map.put(key, mapItem);
+    return this;
+  }
+
+   /**
+   * Get map
+   * @return map
+  **/
+  @javax.annotation.Nullable 
+  @ApiModelProperty(value = "")
+  public Map<String, Animal> getMap() {
+    return map;
+  }
+
+  public void setMap(Map<String, Animal> map) {
+    this.map = map;
+  }
+
+
+  @Override
+  public boolean equals(java.lang.Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    MixedPropertiesAndAdditionalPropertiesClass mixedPropertiesAndAdditionalPropertiesClass = (MixedPropertiesAndAdditionalPropertiesClass) o;
+    return Objects.equals(this.uuid, mixedPropertiesAndAdditionalPropertiesClass.uuid) &&
+        Objects.equals(this.dateTime, mixedPropertiesAndAdditionalPropertiesClass.dateTime) &&
+        Objects.equals(this.map, mixedPropertiesAndAdditionalPropertiesClass.map);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(uuid, dateTime, map);
+  }
+
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class MixedPropertiesAndAdditionalPropertiesClass {\n");
+    sb.append("    uuid: ").append(toIndentedString(uuid)).append("\n");
+    sb.append("    dateTime: ").append(toIndentedString(dateTime)).append("\n");
+    sb.append("    map: ").append(toIndentedString(map)).append("\n");
+    sb.append("}");
+    return sb.toString();
+  }
+
+  /**
+   * Convert the given object to string with each line indented by 4 spaces
+   * (except the first line).
+   */
+  private String toIndentedString(java.lang.Object o) {
+    if (o == null) {
+      return "null";
+    }
+    return o.toString().replace("\n", "\n    ");
+  }
+
+}
+
diff --git a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/Model200Response.java b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/Model200Response.java
new file mode 100644
index 0000000000..bd3244dd57
--- /dev/null
+++ b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/Model200Response.java
@@ -0,0 +1,116 @@
+/*
+ * OpenAPI Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+
+package org.openapitools.client.model;
+
+import java.util.Objects;
+import java.util.Arrays;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonValue;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+/**
+ * Model for testing model name starting with number
+ */
+@ApiModel(description = "Model for testing model name starting with number")
+
+public class Model200Response {
+  @JsonProperty("name")
+  private Integer name;
+
+  @JsonProperty("class")
+  private String propertyClass;
+
+  public Model200Response name(Integer name) {
+    this.name = name;
+    return this;
+  }
+
+   /**
+   * Get name
+   * @return name
+  **/
+  @javax.annotation.Nullable 
+  @ApiModelProperty(value = "")
+  public Integer getName() {
+    return name;
+  }
+
+  public void setName(Integer name) {
+    this.name = name;
+  }
+
+  public Model200Response propertyClass(String propertyClass) {
+    this.propertyClass = propertyClass;
+    return this;
+  }
+
+   /**
+   * Get propertyClass
+   * @return propertyClass
+  **/
+  @javax.annotation.Nullable 
+  @ApiModelProperty(value = "")
+  public String getPropertyClass() {
+    return propertyClass;
+  }
+
+  public void setPropertyClass(String propertyClass) {
+    this.propertyClass = propertyClass;
+  }
+
+
+  @Override
+  public boolean equals(java.lang.Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    Model200Response _200response = (Model200Response) o;
+    return Objects.equals(this.name, _200response.name) &&
+        Objects.equals(this.propertyClass, _200response.propertyClass);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(name, propertyClass);
+  }
+
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class Model200Response {\n");
+    sb.append("    name: ").append(toIndentedString(name)).append("\n");
+    sb.append("    propertyClass: ").append(toIndentedString(propertyClass)).append("\n");
+    sb.append("}");
+    return sb.toString();
+  }
+
+  /**
+   * Convert the given object to string with each line indented by 4 spaces
+   * (except the first line).
+   */
+  private String toIndentedString(java.lang.Object o) {
+    if (o == null) {
+      return "null";
+    }
+    return o.toString().replace("\n", "\n    ");
+  }
+
+}
+
diff --git a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/ModelApiResponse.java b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/ModelApiResponse.java
new file mode 100644
index 0000000000..ed335cdca1
--- /dev/null
+++ b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/ModelApiResponse.java
@@ -0,0 +1,139 @@
+/*
+ * OpenAPI Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+
+package org.openapitools.client.model;
+
+import java.util.Objects;
+import java.util.Arrays;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonValue;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+/**
+ * ModelApiResponse
+ */
+
+public class ModelApiResponse {
+  @JsonProperty("code")
+  private Integer code;
+
+  @JsonProperty("type")
+  private String type;
+
+  @JsonProperty("message")
+  private String message;
+
+  public ModelApiResponse code(Integer code) {
+    this.code = code;
+    return this;
+  }
+
+   /**
+   * Get code
+   * @return code
+  **/
+  @javax.annotation.Nullable 
+  @ApiModelProperty(value = "")
+  public Integer getCode() {
+    return code;
+  }
+
+  public void setCode(Integer code) {
+    this.code = code;
+  }
+
+  public ModelApiResponse type(String type) {
+    this.type = type;
+    return this;
+  }
+
+   /**
+   * Get type
+   * @return type
+  **/
+  @javax.annotation.Nullable 
+  @ApiModelProperty(value = "")
+  public String getType() {
+    return type;
+  }
+
+  public void setType(String type) {
+    this.type = type;
+  }
+
+  public ModelApiResponse message(String message) {
+    this.message = message;
+    return this;
+  }
+
+   /**
+   * Get message
+   * @return message
+  **/
+  @javax.annotation.Nullable 
+  @ApiModelProperty(value = "")
+  public String getMessage() {
+    return message;
+  }
+
+  public void setMessage(String message) {
+    this.message = message;
+  }
+
+
+  @Override
+  public boolean equals(java.lang.Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    ModelApiResponse _apiResponse = (ModelApiResponse) o;
+    return Objects.equals(this.code, _apiResponse.code) &&
+        Objects.equals(this.type, _apiResponse.type) &&
+        Objects.equals(this.message, _apiResponse.message);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(code, type, message);
+  }
+
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class ModelApiResponse {\n");
+    sb.append("    code: ").append(toIndentedString(code)).append("\n");
+    sb.append("    type: ").append(toIndentedString(type)).append("\n");
+    sb.append("    message: ").append(toIndentedString(message)).append("\n");
+    sb.append("}");
+    return sb.toString();
+  }
+
+  /**
+   * Convert the given object to string with each line indented by 4 spaces
+   * (except the first line).
+   */
+  private String toIndentedString(java.lang.Object o) {
+    if (o == null) {
+      return "null";
+    }
+    return o.toString().replace("\n", "\n    ");
+  }
+
+}
+
diff --git a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/ModelReturn.java b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/ModelReturn.java
new file mode 100644
index 0000000000..04c0bcd33f
--- /dev/null
+++ b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/ModelReturn.java
@@ -0,0 +1,92 @@
+/*
+ * OpenAPI Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+
+package org.openapitools.client.model;
+
+import java.util.Objects;
+import java.util.Arrays;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonValue;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+/**
+ * Model for testing reserved words
+ */
+@ApiModel(description = "Model for testing reserved words")
+
+public class ModelReturn {
+  @JsonProperty("return")
+  private Integer _return;
+
+  public ModelReturn _return(Integer _return) {
+    this._return = _return;
+    return this;
+  }
+
+   /**
+   * Get _return
+   * @return _return
+  **/
+  @javax.annotation.Nullable 
+  @ApiModelProperty(value = "")
+  public Integer getReturn() {
+    return _return;
+  }
+
+  public void setReturn(Integer _return) {
+    this._return = _return;
+  }
+
+
+  @Override
+  public boolean equals(java.lang.Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    ModelReturn _return = (ModelReturn) o;
+    return Objects.equals(this._return, _return._return);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(_return);
+  }
+
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class ModelReturn {\n");
+    sb.append("    _return: ").append(toIndentedString(_return)).append("\n");
+    sb.append("}");
+    return sb.toString();
+  }
+
+  /**
+   * Convert the given object to string with each line indented by 4 spaces
+   * (except the first line).
+   */
+  private String toIndentedString(java.lang.Object o) {
+    if (o == null) {
+      return "null";
+    }
+    return o.toString().replace("\n", "\n    ");
+  }
+
+}
+
diff --git a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/Name.java b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/Name.java
new file mode 100644
index 0000000000..af27c6e45f
--- /dev/null
+++ b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/Name.java
@@ -0,0 +1,146 @@
+/*
+ * OpenAPI Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+
+package org.openapitools.client.model;
+
+import java.util.Objects;
+import java.util.Arrays;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonValue;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+/**
+ * Model for testing model name same as property name
+ */
+@ApiModel(description = "Model for testing model name same as property name")
+
+public class Name {
+  @JsonProperty("name")
+  private Integer name;
+
+  @JsonProperty("snake_case")
+  private Integer snakeCase;
+
+  @JsonProperty("property")
+  private String property;
+
+  @JsonProperty("123Number")
+  private Integer _123number;
+
+  public Name name(Integer name) {
+    this.name = name;
+    return this;
+  }
+
+   /**
+   * Get name
+   * @return name
+  **/
+
+  @ApiModelProperty(required = true, value = "")
+  public Integer getName() {
+    return name;
+  }
+
+  public void setName(Integer name) {
+    this.name = name;
+  }
+
+   /**
+   * Get snakeCase
+   * @return snakeCase
+  **/
+  @javax.annotation.Nullable 
+  @ApiModelProperty(value = "")
+  public Integer getSnakeCase() {
+    return snakeCase;
+  }
+
+  public Name property(String property) {
+    this.property = property;
+    return this;
+  }
+
+   /**
+   * Get property
+   * @return property
+  **/
+  @javax.annotation.Nullable 
+  @ApiModelProperty(value = "")
+  public String getProperty() {
+    return property;
+  }
+
+  public void setProperty(String property) {
+    this.property = property;
+  }
+
+   /**
+   * Get _123number
+   * @return _123number
+  **/
+  @javax.annotation.Nullable 
+  @ApiModelProperty(value = "")
+  public Integer get123number() {
+    return _123number;
+  }
+
+
+  @Override
+  public boolean equals(java.lang.Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    Name name = (Name) o;
+    return Objects.equals(this.name, name.name) &&
+        Objects.equals(this.snakeCase, name.snakeCase) &&
+        Objects.equals(this.property, name.property) &&
+        Objects.equals(this._123number, name._123number);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(name, snakeCase, property, _123number);
+  }
+
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class Name {\n");
+    sb.append("    name: ").append(toIndentedString(name)).append("\n");
+    sb.append("    snakeCase: ").append(toIndentedString(snakeCase)).append("\n");
+    sb.append("    property: ").append(toIndentedString(property)).append("\n");
+    sb.append("    _123number: ").append(toIndentedString(_123number)).append("\n");
+    sb.append("}");
+    return sb.toString();
+  }
+
+  /**
+   * Convert the given object to string with each line indented by 4 spaces
+   * (except the first line).
+   */
+  private String toIndentedString(java.lang.Object o) {
+    if (o == null) {
+      return "null";
+    }
+    return o.toString().replace("\n", "\n    ");
+  }
+
+}
+
diff --git a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/NumberOnly.java b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/NumberOnly.java
new file mode 100644
index 0000000000..4e29c814cc
--- /dev/null
+++ b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/NumberOnly.java
@@ -0,0 +1,92 @@
+/*
+ * OpenAPI Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+
+package org.openapitools.client.model;
+
+import java.util.Objects;
+import java.util.Arrays;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonValue;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import java.math.BigDecimal;
+
+/**
+ * NumberOnly
+ */
+
+public class NumberOnly {
+  @JsonProperty("JustNumber")
+  private BigDecimal justNumber;
+
+  public NumberOnly justNumber(BigDecimal justNumber) {
+    this.justNumber = justNumber;
+    return this;
+  }
+
+   /**
+   * Get justNumber
+   * @return justNumber
+  **/
+  @javax.annotation.Nullable 
+  @ApiModelProperty(value = "")
+  public BigDecimal getJustNumber() {
+    return justNumber;
+  }
+
+  public void setJustNumber(BigDecimal justNumber) {
+    this.justNumber = justNumber;
+  }
+
+
+  @Override
+  public boolean equals(java.lang.Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    NumberOnly numberOnly = (NumberOnly) o;
+    return Objects.equals(this.justNumber, numberOnly.justNumber);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(justNumber);
+  }
+
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class NumberOnly {\n");
+    sb.append("    justNumber: ").append(toIndentedString(justNumber)).append("\n");
+    sb.append("}");
+    return sb.toString();
+  }
+
+  /**
+   * Convert the given object to string with each line indented by 4 spaces
+   * (except the first line).
+   */
+  private String toIndentedString(java.lang.Object o) {
+    if (o == null) {
+      return "null";
+    }
+    return o.toString().replace("\n", "\n    ");
+  }
+
+}
+
diff --git a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/Order.java b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/Order.java
new file mode 100644
index 0000000000..1735b41d31
--- /dev/null
+++ b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/Order.java
@@ -0,0 +1,249 @@
+/*
+ * OpenAPI Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+
+package org.openapitools.client.model;
+
+import java.util.Objects;
+import java.util.Arrays;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonValue;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import java.time.OffsetDateTime;
+
+/**
+ * Order
+ */
+
+public class Order {
+  @JsonProperty("id")
+  private Long id;
+
+  @JsonProperty("petId")
+  private Long petId;
+
+  @JsonProperty("quantity")
+  private Integer quantity;
+
+  @JsonProperty("shipDate")
+  private OffsetDateTime shipDate;
+
+  /**
+   * Order Status
+   */
+  public enum StatusEnum {
+    PLACED("placed"),
+    
+    APPROVED("approved"),
+    
+    DELIVERED("delivered");
+
+    private String value;
+
+    StatusEnum(String value) {
+      this.value = value;
+    }
+
+    @JsonValue
+    public String getValue() {
+      return value;
+    }
+
+    @Override
+    public String toString() {
+      return String.valueOf(value);
+    }
+
+    @JsonCreator
+    public static StatusEnum fromValue(String value) {
+      for (StatusEnum b : StatusEnum.values()) {
+        if (b.value.equals(value)) {
+          return b;
+        }
+      }
+      throw new IllegalArgumentException("Unexpected value '" + value + "'");
+    }
+  }
+
+  @JsonProperty("status")
+  private StatusEnum status;
+
+  @JsonProperty("complete")
+  private Boolean complete = false;
+
+  public Order id(Long id) {
+    this.id = id;
+    return this;
+  }
+
+   /**
+   * Get id
+   * @return id
+  **/
+  @javax.annotation.Nullable 
+  @ApiModelProperty(value = "")
+  public Long getId() {
+    return id;
+  }
+
+  public void setId(Long id) {
+    this.id = id;
+  }
+
+  public Order petId(Long petId) {
+    this.petId = petId;
+    return this;
+  }
+
+   /**
+   * Get petId
+   * @return petId
+  **/
+  @javax.annotation.Nullable 
+  @ApiModelProperty(value = "")
+  public Long getPetId() {
+    return petId;
+  }
+
+  public void setPetId(Long petId) {
+    this.petId = petId;
+  }
+
+  public Order quantity(Integer quantity) {
+    this.quantity = quantity;
+    return this;
+  }
+
+   /**
+   * Get quantity
+   * @return quantity
+  **/
+  @javax.annotation.Nullable 
+  @ApiModelProperty(value = "")
+  public Integer getQuantity() {
+    return quantity;
+  }
+
+  public void setQuantity(Integer quantity) {
+    this.quantity = quantity;
+  }
+
+  public Order shipDate(OffsetDateTime shipDate) {
+    this.shipDate = shipDate;
+    return this;
+  }
+
+   /**
+   * Get shipDate
+   * @return shipDate
+  **/
+  @javax.annotation.Nullable 
+  @ApiModelProperty(value = "")
+  public OffsetDateTime getShipDate() {
+    return shipDate;
+  }
+
+  public void setShipDate(OffsetDateTime shipDate) {
+    this.shipDate = shipDate;
+  }
+
+  public Order status(StatusEnum status) {
+    this.status = status;
+    return this;
+  }
+
+   /**
+   * Order Status
+   * @return status
+  **/
+  @javax.annotation.Nullable 
+  @ApiModelProperty(value = "Order Status")
+  public StatusEnum getStatus() {
+    return status;
+  }
+
+  public void setStatus(StatusEnum status) {
+    this.status = status;
+  }
+
+  public Order complete(Boolean complete) {
+    this.complete = complete;
+    return this;
+  }
+
+   /**
+   * Get complete
+   * @return complete
+  **/
+  @javax.annotation.Nullable 
+  @ApiModelProperty(value = "")
+  public Boolean getComplete() {
+    return complete;
+  }
+
+  public void setComplete(Boolean complete) {
+    this.complete = complete;
+  }
+
+
+  @Override
+  public boolean equals(java.lang.Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    Order order = (Order) o;
+    return Objects.equals(this.id, order.id) &&
+        Objects.equals(this.petId, order.petId) &&
+        Objects.equals(this.quantity, order.quantity) &&
+        Objects.equals(this.shipDate, order.shipDate) &&
+        Objects.equals(this.status, order.status) &&
+        Objects.equals(this.complete, order.complete);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(id, petId, quantity, shipDate, status, complete);
+  }
+
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class Order {\n");
+    sb.append("    id: ").append(toIndentedString(id)).append("\n");
+    sb.append("    petId: ").append(toIndentedString(petId)).append("\n");
+    sb.append("    quantity: ").append(toIndentedString(quantity)).append("\n");
+    sb.append("    shipDate: ").append(toIndentedString(shipDate)).append("\n");
+    sb.append("    status: ").append(toIndentedString(status)).append("\n");
+    sb.append("    complete: ").append(toIndentedString(complete)).append("\n");
+    sb.append("}");
+    return sb.toString();
+  }
+
+  /**
+   * Convert the given object to string with each line indented by 4 spaces
+   * (except the first line).
+   */
+  private String toIndentedString(java.lang.Object o) {
+    if (o == null) {
+      return "null";
+    }
+    return o.toString().replace("\n", "\n    ");
+  }
+
+}
+
diff --git a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/OuterComposite.java b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/OuterComposite.java
new file mode 100644
index 0000000000..f6515126a8
--- /dev/null
+++ b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/OuterComposite.java
@@ -0,0 +1,140 @@
+/*
+ * OpenAPI Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+
+package org.openapitools.client.model;
+
+import java.util.Objects;
+import java.util.Arrays;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonValue;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import java.math.BigDecimal;
+
+/**
+ * OuterComposite
+ */
+
+public class OuterComposite {
+  @JsonProperty("my_number")
+  private BigDecimal myNumber;
+
+  @JsonProperty("my_string")
+  private String myString;
+
+  @JsonProperty("my_boolean")
+  private Boolean myBoolean;
+
+  public OuterComposite myNumber(BigDecimal myNumber) {
+    this.myNumber = myNumber;
+    return this;
+  }
+
+   /**
+   * Get myNumber
+   * @return myNumber
+  **/
+  @javax.annotation.Nullable 
+  @ApiModelProperty(value = "")
+  public BigDecimal getMyNumber() {
+    return myNumber;
+  }
+
+  public void setMyNumber(BigDecimal myNumber) {
+    this.myNumber = myNumber;
+  }
+
+  public OuterComposite myString(String myString) {
+    this.myString = myString;
+    return this;
+  }
+
+   /**
+   * Get myString
+   * @return myString
+  **/
+  @javax.annotation.Nullable 
+  @ApiModelProperty(value = "")
+  public String getMyString() {
+    return myString;
+  }
+
+  public void setMyString(String myString) {
+    this.myString = myString;
+  }
+
+  public OuterComposite myBoolean(Boolean myBoolean) {
+    this.myBoolean = myBoolean;
+    return this;
+  }
+
+   /**
+   * Get myBoolean
+   * @return myBoolean
+  **/
+  @javax.annotation.Nullable 
+  @ApiModelProperty(value = "")
+  public Boolean getMyBoolean() {
+    return myBoolean;
+  }
+
+  public void setMyBoolean(Boolean myBoolean) {
+    this.myBoolean = myBoolean;
+  }
+
+
+  @Override
+  public boolean equals(java.lang.Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    OuterComposite outerComposite = (OuterComposite) o;
+    return Objects.equals(this.myNumber, outerComposite.myNumber) &&
+        Objects.equals(this.myString, outerComposite.myString) &&
+        Objects.equals(this.myBoolean, outerComposite.myBoolean);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(myNumber, myString, myBoolean);
+  }
+
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class OuterComposite {\n");
+    sb.append("    myNumber: ").append(toIndentedString(myNumber)).append("\n");
+    sb.append("    myString: ").append(toIndentedString(myString)).append("\n");
+    sb.append("    myBoolean: ").append(toIndentedString(myBoolean)).append("\n");
+    sb.append("}");
+    return sb.toString();
+  }
+
+  /**
+   * Convert the given object to string with each line indented by 4 spaces
+   * (except the first line).
+   */
+  private String toIndentedString(java.lang.Object o) {
+    if (o == null) {
+      return "null";
+    }
+    return o.toString().replace("\n", "\n    ");
+  }
+
+}
+
diff --git a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/OuterEnum.java b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/OuterEnum.java
new file mode 100644
index 0000000000..dacbbdfb2c
--- /dev/null
+++ b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/OuterEnum.java
@@ -0,0 +1,59 @@
+/*
+ * OpenAPI Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+
+package org.openapitools.client.model;
+
+import java.util.Objects;
+import java.util.Arrays;
+
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonValue;
+
+/**
+ * Gets or Sets OuterEnum
+ */
+public enum OuterEnum {
+  
+  PLACED("placed"),
+  
+  APPROVED("approved"),
+  
+  DELIVERED("delivered");
+
+  private String value;
+
+  OuterEnum(String value) {
+    this.value = value;
+  }
+
+  @JsonValue
+  public String getValue() {
+    return value;
+  }
+
+  @Override
+  public String toString() {
+    return String.valueOf(value);
+  }
+
+  @JsonCreator
+  public static OuterEnum fromValue(String value) {
+    for (OuterEnum b : OuterEnum.values()) {
+      if (b.value.equals(value)) {
+        return b;
+      }
+    }
+    throw new IllegalArgumentException("Unexpected value '" + value + "'");
+  }
+}
+
diff --git a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/Pet.java b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/Pet.java
new file mode 100644
index 0000000000..ace85c42aa
--- /dev/null
+++ b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/Pet.java
@@ -0,0 +1,265 @@
+/*
+ * OpenAPI Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+
+package org.openapitools.client.model;
+
+import java.util.Objects;
+import java.util.Arrays;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonValue;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import java.util.ArrayList;
+import java.util.List;
+import org.openapitools.client.model.Category;
+import org.openapitools.client.model.Tag;
+
+/**
+ * Pet
+ */
+
+public class Pet {
+  @JsonProperty("id")
+  private Long id;
+
+  @JsonProperty("category")
+  private Category category = null;
+
+  @JsonProperty("name")
+  private String name;
+
+  @JsonProperty("photoUrls")
+  private List<String> photoUrls = new ArrayList<>();
+
+  @JsonProperty("tags")
+  private List<Tag> tags = new ArrayList<>();
+
+  /**
+   * pet status in the store
+   */
+  public enum StatusEnum {
+    AVAILABLE("available"),
+    
+    PENDING("pending"),
+    
+    SOLD("sold");
+
+    private String value;
+
+    StatusEnum(String value) {
+      this.value = value;
+    }
+
+    @JsonValue
+    public String getValue() {
+      return value;
+    }
+
+    @Override
+    public String toString() {
+      return String.valueOf(value);
+    }
+
+    @JsonCreator
+    public static StatusEnum fromValue(String value) {
+      for (StatusEnum b : StatusEnum.values()) {
+        if (b.value.equals(value)) {
+          return b;
+        }
+      }
+      throw new IllegalArgumentException("Unexpected value '" + value + "'");
+    }
+  }
+
+  @JsonProperty("status")
+  private StatusEnum status;
+
+  public Pet id(Long id) {
+    this.id = id;
+    return this;
+  }
+
+   /**
+   * Get id
+   * @return id
+  **/
+  @javax.annotation.Nullable 
+  @ApiModelProperty(value = "")
+  public Long getId() {
+    return id;
+  }
+
+  public void setId(Long id) {
+    this.id = id;
+  }
+
+  public Pet category(Category category) {
+    this.category = category;
+    return this;
+  }
+
+   /**
+   * Get category
+   * @return category
+  **/
+  @javax.annotation.Nullable 
+  @ApiModelProperty(value = "")
+  public Category getCategory() {
+    return category;
+  }
+
+  public void setCategory(Category category) {
+    this.category = category;
+  }
+
+  public Pet name(String name) {
+    this.name = name;
+    return this;
+  }
+
+   /**
+   * Get name
+   * @return name
+  **/
+
+  @ApiModelProperty(example = "doggie", required = true, value = "")
+  public String getName() {
+    return name;
+  }
+
+  public void setName(String name) {
+    this.name = name;
+  }
+
+  public Pet photoUrls(List<String> photoUrls) {
+    this.photoUrls = photoUrls;
+    return this;
+  }
+
+  public Pet addPhotoUrlsItem(String photoUrlsItem) {
+    this.photoUrls.add(photoUrlsItem);
+    return this;
+  }
+
+   /**
+   * Get photoUrls
+   * @return photoUrls
+  **/
+
+  @ApiModelProperty(required = true, value = "")
+  public List<String> getPhotoUrls() {
+    return photoUrls;
+  }
+
+  public void setPhotoUrls(List<String> photoUrls) {
+    this.photoUrls = photoUrls;
+  }
+
+  public Pet tags(List<Tag> tags) {
+    this.tags = tags;
+    return this;
+  }
+
+  public Pet addTagsItem(Tag tagsItem) {
+    if (this.tags == null) {
+      this.tags = new ArrayList<>();
+    }
+    this.tags.add(tagsItem);
+    return this;
+  }
+
+   /**
+   * Get tags
+   * @return tags
+  **/
+  @javax.annotation.Nullable 
+  @ApiModelProperty(value = "")
+  public List<Tag> getTags() {
+    return tags;
+  }
+
+  public void setTags(List<Tag> tags) {
+    this.tags = tags;
+  }
+
+  public Pet status(StatusEnum status) {
+    this.status = status;
+    return this;
+  }
+
+   /**
+   * pet status in the store
+   * @return status
+  **/
+  @javax.annotation.Nullable 
+  @ApiModelProperty(value = "pet status in the store")
+  public StatusEnum getStatus() {
+    return status;
+  }
+
+  public void setStatus(StatusEnum status) {
+    this.status = status;
+  }
+
+
+  @Override
+  public boolean equals(java.lang.Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    Pet pet = (Pet) o;
+    return Objects.equals(this.id, pet.id) &&
+        Objects.equals(this.category, pet.category) &&
+        Objects.equals(this.name, pet.name) &&
+        Objects.equals(this.photoUrls, pet.photoUrls) &&
+        Objects.equals(this.tags, pet.tags) &&
+        Objects.equals(this.status, pet.status);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(id, category, name, photoUrls, tags, status);
+  }
+
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class Pet {\n");
+    sb.append("    id: ").append(toIndentedString(id)).append("\n");
+    sb.append("    category: ").append(toIndentedString(category)).append("\n");
+    sb.append("    name: ").append(toIndentedString(name)).append("\n");
+    sb.append("    photoUrls: ").append(toIndentedString(photoUrls)).append("\n");
+    sb.append("    tags: ").append(toIndentedString(tags)).append("\n");
+    sb.append("    status: ").append(toIndentedString(status)).append("\n");
+    sb.append("}");
+    return sb.toString();
+  }
+
+  /**
+   * Convert the given object to string with each line indented by 4 spaces
+   * (except the first line).
+   */
+  private String toIndentedString(java.lang.Object o) {
+    if (o == null) {
+      return "null";
+    }
+    return o.toString().replace("\n", "\n    ");
+  }
+
+}
+
diff --git a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/ReadOnlyFirst.java b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/ReadOnlyFirst.java
new file mode 100644
index 0000000000..a2c9e99699
--- /dev/null
+++ b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/ReadOnlyFirst.java
@@ -0,0 +1,106 @@
+/*
+ * OpenAPI Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+
+package org.openapitools.client.model;
+
+import java.util.Objects;
+import java.util.Arrays;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonValue;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+/**
+ * ReadOnlyFirst
+ */
+
+public class ReadOnlyFirst {
+  @JsonProperty("bar")
+  private String bar;
+
+  @JsonProperty("baz")
+  private String baz;
+
+   /**
+   * Get bar
+   * @return bar
+  **/
+  @javax.annotation.Nullable 
+  @ApiModelProperty(value = "")
+  public String getBar() {
+    return bar;
+  }
+
+  public ReadOnlyFirst baz(String baz) {
+    this.baz = baz;
+    return this;
+  }
+
+   /**
+   * Get baz
+   * @return baz
+  **/
+  @javax.annotation.Nullable 
+  @ApiModelProperty(value = "")
+  public String getBaz() {
+    return baz;
+  }
+
+  public void setBaz(String baz) {
+    this.baz = baz;
+  }
+
+
+  @Override
+  public boolean equals(java.lang.Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    ReadOnlyFirst readOnlyFirst = (ReadOnlyFirst) o;
+    return Objects.equals(this.bar, readOnlyFirst.bar) &&
+        Objects.equals(this.baz, readOnlyFirst.baz);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(bar, baz);
+  }
+
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class ReadOnlyFirst {\n");
+    sb.append("    bar: ").append(toIndentedString(bar)).append("\n");
+    sb.append("    baz: ").append(toIndentedString(baz)).append("\n");
+    sb.append("}");
+    return sb.toString();
+  }
+
+  /**
+   * Convert the given object to string with each line indented by 4 spaces
+   * (except the first line).
+   */
+  private String toIndentedString(java.lang.Object o) {
+    if (o == null) {
+      return "null";
+    }
+    return o.toString().replace("\n", "\n    ");
+  }
+
+}
+
diff --git a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/SpecialModelName.java b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/SpecialModelName.java
new file mode 100644
index 0000000000..a5ddb0b638
--- /dev/null
+++ b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/SpecialModelName.java
@@ -0,0 +1,91 @@
+/*
+ * OpenAPI Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+
+package org.openapitools.client.model;
+
+import java.util.Objects;
+import java.util.Arrays;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonValue;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+/**
+ * SpecialModelName
+ */
+
+public class SpecialModelName {
+  @JsonProperty("$special[property.name]")
+  private Long $specialPropertyName;
+
+  public SpecialModelName $specialPropertyName(Long $specialPropertyName) {
+    this.$specialPropertyName = $specialPropertyName;
+    return this;
+  }
+
+   /**
+   * Get $specialPropertyName
+   * @return $specialPropertyName
+  **/
+  @javax.annotation.Nullable 
+  @ApiModelProperty(value = "")
+  public Long get$SpecialPropertyName() {
+    return $specialPropertyName;
+  }
+
+  public void set$SpecialPropertyName(Long $specialPropertyName) {
+    this.$specialPropertyName = $specialPropertyName;
+  }
+
+
+  @Override
+  public boolean equals(java.lang.Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    SpecialModelName $specialModelName = (SpecialModelName) o;
+    return Objects.equals(this.$specialPropertyName, $specialModelName.$specialPropertyName);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash($specialPropertyName);
+  }
+
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class SpecialModelName {\n");
+    sb.append("    $specialPropertyName: ").append(toIndentedString($specialPropertyName)).append("\n");
+    sb.append("}");
+    return sb.toString();
+  }
+
+  /**
+   * Convert the given object to string with each line indented by 4 spaces
+   * (except the first line).
+   */
+  private String toIndentedString(java.lang.Object o) {
+    if (o == null) {
+      return "null";
+    }
+    return o.toString().replace("\n", "\n    ");
+  }
+
+}
+
diff --git a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/Tag.java b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/Tag.java
new file mode 100644
index 0000000000..8255ad8298
--- /dev/null
+++ b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/Tag.java
@@ -0,0 +1,115 @@
+/*
+ * OpenAPI Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+
+package org.openapitools.client.model;
+
+import java.util.Objects;
+import java.util.Arrays;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonValue;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+/**
+ * Tag
+ */
+
+public class Tag {
+  @JsonProperty("id")
+  private Long id;
+
+  @JsonProperty("name")
+  private String name;
+
+  public Tag id(Long id) {
+    this.id = id;
+    return this;
+  }
+
+   /**
+   * Get id
+   * @return id
+  **/
+  @javax.annotation.Nullable 
+  @ApiModelProperty(value = "")
+  public Long getId() {
+    return id;
+  }
+
+  public void setId(Long id) {
+    this.id = id;
+  }
+
+  public Tag name(String name) {
+    this.name = name;
+    return this;
+  }
+
+   /**
+   * Get name
+   * @return name
+  **/
+  @javax.annotation.Nullable 
+  @ApiModelProperty(value = "")
+  public String getName() {
+    return name;
+  }
+
+  public void setName(String name) {
+    this.name = name;
+  }
+
+
+  @Override
+  public boolean equals(java.lang.Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    Tag tag = (Tag) o;
+    return Objects.equals(this.id, tag.id) &&
+        Objects.equals(this.name, tag.name);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(id, name);
+  }
+
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class Tag {\n");
+    sb.append("    id: ").append(toIndentedString(id)).append("\n");
+    sb.append("    name: ").append(toIndentedString(name)).append("\n");
+    sb.append("}");
+    return sb.toString();
+  }
+
+  /**
+   * Convert the given object to string with each line indented by 4 spaces
+   * (except the first line).
+   */
+  private String toIndentedString(java.lang.Object o) {
+    if (o == null) {
+      return "null";
+    }
+    return o.toString().replace("\n", "\n    ");
+  }
+
+}
+
diff --git a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/TypeHolderDefault.java b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/TypeHolderDefault.java
new file mode 100644
index 0000000000..786a681fb3
--- /dev/null
+++ b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/TypeHolderDefault.java
@@ -0,0 +1,195 @@
+/*
+ * OpenAPI Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+
+package org.openapitools.client.model;
+
+import java.util.Objects;
+import java.util.Arrays;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonValue;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import java.math.BigDecimal;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * TypeHolderDefault
+ */
+
+public class TypeHolderDefault {
+  @JsonProperty("string_item")
+  private String stringItem = "what";
+
+  @JsonProperty("number_item")
+  private BigDecimal numberItem;
+
+  @JsonProperty("integer_item")
+  private Integer integerItem;
+
+  @JsonProperty("bool_item")
+  private Boolean boolItem = true;
+
+  @JsonProperty("array_item")
+  private List<Integer> arrayItem = new ArrayList<>();
+
+  public TypeHolderDefault stringItem(String stringItem) {
+    this.stringItem = stringItem;
+    return this;
+  }
+
+   /**
+   * Get stringItem
+   * @return stringItem
+  **/
+
+  @ApiModelProperty(required = true, value = "")
+  public String getStringItem() {
+    return stringItem;
+  }
+
+  public void setStringItem(String stringItem) {
+    this.stringItem = stringItem;
+  }
+
+  public TypeHolderDefault numberItem(BigDecimal numberItem) {
+    this.numberItem = numberItem;
+    return this;
+  }
+
+   /**
+   * Get numberItem
+   * @return numberItem
+  **/
+
+  @ApiModelProperty(required = true, value = "")
+  public BigDecimal getNumberItem() {
+    return numberItem;
+  }
+
+  public void setNumberItem(BigDecimal numberItem) {
+    this.numberItem = numberItem;
+  }
+
+  public TypeHolderDefault integerItem(Integer integerItem) {
+    this.integerItem = integerItem;
+    return this;
+  }
+
+   /**
+   * Get integerItem
+   * @return integerItem
+  **/
+
+  @ApiModelProperty(required = true, value = "")
+  public Integer getIntegerItem() {
+    return integerItem;
+  }
+
+  public void setIntegerItem(Integer integerItem) {
+    this.integerItem = integerItem;
+  }
+
+  public TypeHolderDefault boolItem(Boolean boolItem) {
+    this.boolItem = boolItem;
+    return this;
+  }
+
+   /**
+   * Get boolItem
+   * @return boolItem
+  **/
+
+  @ApiModelProperty(required = true, value = "")
+  public Boolean getBoolItem() {
+    return boolItem;
+  }
+
+  public void setBoolItem(Boolean boolItem) {
+    this.boolItem = boolItem;
+  }
+
+  public TypeHolderDefault arrayItem(List<Integer> arrayItem) {
+    this.arrayItem = arrayItem;
+    return this;
+  }
+
+  public TypeHolderDefault addArrayItemItem(Integer arrayItemItem) {
+    this.arrayItem.add(arrayItemItem);
+    return this;
+  }
+
+   /**
+   * Get arrayItem
+   * @return arrayItem
+  **/
+
+  @ApiModelProperty(required = true, value = "")
+  public List<Integer> getArrayItem() {
+    return arrayItem;
+  }
+
+  public void setArrayItem(List<Integer> arrayItem) {
+    this.arrayItem = arrayItem;
+  }
+
+
+  @Override
+  public boolean equals(java.lang.Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    TypeHolderDefault typeHolderDefault = (TypeHolderDefault) o;
+    return Objects.equals(this.stringItem, typeHolderDefault.stringItem) &&
+        Objects.equals(this.numberItem, typeHolderDefault.numberItem) &&
+        Objects.equals(this.integerItem, typeHolderDefault.integerItem) &&
+        Objects.equals(this.boolItem, typeHolderDefault.boolItem) &&
+        Objects.equals(this.arrayItem, typeHolderDefault.arrayItem);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(stringItem, numberItem, integerItem, boolItem, arrayItem);
+  }
+
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class TypeHolderDefault {\n");
+    sb.append("    stringItem: ").append(toIndentedString(stringItem)).append("\n");
+    sb.append("    numberItem: ").append(toIndentedString(numberItem)).append("\n");
+    sb.append("    integerItem: ").append(toIndentedString(integerItem)).append("\n");
+    sb.append("    boolItem: ").append(toIndentedString(boolItem)).append("\n");
+    sb.append("    arrayItem: ").append(toIndentedString(arrayItem)).append("\n");
+    sb.append("}");
+    return sb.toString();
+  }
+
+  /**
+   * Convert the given object to string with each line indented by 4 spaces
+   * (except the first line).
+   */
+  private String toIndentedString(java.lang.Object o) {
+    if (o == null) {
+      return "null";
+    }
+    return o.toString().replace("\n", "\n    ");
+  }
+
+}
+
diff --git a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/TypeHolderExample.java b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/TypeHolderExample.java
new file mode 100644
index 0000000000..701e4db843
--- /dev/null
+++ b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/TypeHolderExample.java
@@ -0,0 +1,195 @@
+/*
+ * OpenAPI Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+
+package org.openapitools.client.model;
+
+import java.util.Objects;
+import java.util.Arrays;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonValue;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import java.math.BigDecimal;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * TypeHolderExample
+ */
+
+public class TypeHolderExample {
+  @JsonProperty("string_item")
+  private String stringItem;
+
+  @JsonProperty("number_item")
+  private BigDecimal numberItem;
+
+  @JsonProperty("integer_item")
+  private Integer integerItem;
+
+  @JsonProperty("bool_item")
+  private Boolean boolItem;
+
+  @JsonProperty("array_item")
+  private List<Integer> arrayItem = new ArrayList<>();
+
+  public TypeHolderExample stringItem(String stringItem) {
+    this.stringItem = stringItem;
+    return this;
+  }
+
+   /**
+   * Get stringItem
+   * @return stringItem
+  **/
+
+  @ApiModelProperty(example = "what", required = true, value = "")
+  public String getStringItem() {
+    return stringItem;
+  }
+
+  public void setStringItem(String stringItem) {
+    this.stringItem = stringItem;
+  }
+
+  public TypeHolderExample numberItem(BigDecimal numberItem) {
+    this.numberItem = numberItem;
+    return this;
+  }
+
+   /**
+   * Get numberItem
+   * @return numberItem
+  **/
+
+  @ApiModelProperty(example = "1.234", required = true, value = "")
+  public BigDecimal getNumberItem() {
+    return numberItem;
+  }
+
+  public void setNumberItem(BigDecimal numberItem) {
+    this.numberItem = numberItem;
+  }
+
+  public TypeHolderExample integerItem(Integer integerItem) {
+    this.integerItem = integerItem;
+    return this;
+  }
+
+   /**
+   * Get integerItem
+   * @return integerItem
+  **/
+
+  @ApiModelProperty(example = "-2", required = true, value = "")
+  public Integer getIntegerItem() {
+    return integerItem;
+  }
+
+  public void setIntegerItem(Integer integerItem) {
+    this.integerItem = integerItem;
+  }
+
+  public TypeHolderExample boolItem(Boolean boolItem) {
+    this.boolItem = boolItem;
+    return this;
+  }
+
+   /**
+   * Get boolItem
+   * @return boolItem
+  **/
+
+  @ApiModelProperty(example = "true", required = true, value = "")
+  public Boolean getBoolItem() {
+    return boolItem;
+  }
+
+  public void setBoolItem(Boolean boolItem) {
+    this.boolItem = boolItem;
+  }
+
+  public TypeHolderExample arrayItem(List<Integer> arrayItem) {
+    this.arrayItem = arrayItem;
+    return this;
+  }
+
+  public TypeHolderExample addArrayItemItem(Integer arrayItemItem) {
+    this.arrayItem.add(arrayItemItem);
+    return this;
+  }
+
+   /**
+   * Get arrayItem
+   * @return arrayItem
+  **/
+
+  @ApiModelProperty(example = "[0, 1, 2, 3]", required = true, value = "")
+  public List<Integer> getArrayItem() {
+    return arrayItem;
+  }
+
+  public void setArrayItem(List<Integer> arrayItem) {
+    this.arrayItem = arrayItem;
+  }
+
+
+  @Override
+  public boolean equals(java.lang.Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    TypeHolderExample typeHolderExample = (TypeHolderExample) o;
+    return Objects.equals(this.stringItem, typeHolderExample.stringItem) &&
+        Objects.equals(this.numberItem, typeHolderExample.numberItem) &&
+        Objects.equals(this.integerItem, typeHolderExample.integerItem) &&
+        Objects.equals(this.boolItem, typeHolderExample.boolItem) &&
+        Objects.equals(this.arrayItem, typeHolderExample.arrayItem);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(stringItem, numberItem, integerItem, boolItem, arrayItem);
+  }
+
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class TypeHolderExample {\n");
+    sb.append("    stringItem: ").append(toIndentedString(stringItem)).append("\n");
+    sb.append("    numberItem: ").append(toIndentedString(numberItem)).append("\n");
+    sb.append("    integerItem: ").append(toIndentedString(integerItem)).append("\n");
+    sb.append("    boolItem: ").append(toIndentedString(boolItem)).append("\n");
+    sb.append("    arrayItem: ").append(toIndentedString(arrayItem)).append("\n");
+    sb.append("}");
+    return sb.toString();
+  }
+
+  /**
+   * Convert the given object to string with each line indented by 4 spaces
+   * (except the first line).
+   */
+  private String toIndentedString(java.lang.Object o) {
+    if (o == null) {
+      return "null";
+    }
+    return o.toString().replace("\n", "\n    ");
+  }
+
+}
+
diff --git a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/User.java b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/User.java
new file mode 100644
index 0000000000..6e6c4ac102
--- /dev/null
+++ b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/User.java
@@ -0,0 +1,259 @@
+/*
+ * OpenAPI Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+
+package org.openapitools.client.model;
+
+import java.util.Objects;
+import java.util.Arrays;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonValue;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+/**
+ * User
+ */
+
+public class User {
+  @JsonProperty("id")
+  private Long id;
+
+  @JsonProperty("username")
+  private String username;
+
+  @JsonProperty("firstName")
+  private String firstName;
+
+  @JsonProperty("lastName")
+  private String lastName;
+
+  @JsonProperty("email")
+  private String email;
+
+  @JsonProperty("password")
+  private String password;
+
+  @JsonProperty("phone")
+  private String phone;
+
+  @JsonProperty("userStatus")
+  private Integer userStatus;
+
+  public User id(Long id) {
+    this.id = id;
+    return this;
+  }
+
+   /**
+   * Get id
+   * @return id
+  **/
+  @javax.annotation.Nullable 
+  @ApiModelProperty(value = "")
+  public Long getId() {
+    return id;
+  }
+
+  public void setId(Long id) {
+    this.id = id;
+  }
+
+  public User username(String username) {
+    this.username = username;
+    return this;
+  }
+
+   /**
+   * Get username
+   * @return username
+  **/
+  @javax.annotation.Nullable 
+  @ApiModelProperty(value = "")
+  public String getUsername() {
+    return username;
+  }
+
+  public void setUsername(String username) {
+    this.username = username;
+  }
+
+  public User firstName(String firstName) {
+    this.firstName = firstName;
+    return this;
+  }
+
+   /**
+   * Get firstName
+   * @return firstName
+  **/
+  @javax.annotation.Nullable 
+  @ApiModelProperty(value = "")
+  public String getFirstName() {
+    return firstName;
+  }
+
+  public void setFirstName(String firstName) {
+    this.firstName = firstName;
+  }
+
+  public User lastName(String lastName) {
+    this.lastName = lastName;
+    return this;
+  }
+
+   /**
+   * Get lastName
+   * @return lastName
+  **/
+  @javax.annotation.Nullable 
+  @ApiModelProperty(value = "")
+  public String getLastName() {
+    return lastName;
+  }
+
+  public void setLastName(String lastName) {
+    this.lastName = lastName;
+  }
+
+  public User email(String email) {
+    this.email = email;
+    return this;
+  }
+
+   /**
+   * Get email
+   * @return email
+  **/
+  @javax.annotation.Nullable 
+  @ApiModelProperty(value = "")
+  public String getEmail() {
+    return email;
+  }
+
+  public void setEmail(String email) {
+    this.email = email;
+  }
+
+  public User password(String password) {
+    this.password = password;
+    return this;
+  }
+
+   /**
+   * Get password
+   * @return password
+  **/
+  @javax.annotation.Nullable 
+  @ApiModelProperty(value = "")
+  public String getPassword() {
+    return password;
+  }
+
+  public void setPassword(String password) {
+    this.password = password;
+  }
+
+  public User phone(String phone) {
+    this.phone = phone;
+    return this;
+  }
+
+   /**
+   * Get phone
+   * @return phone
+  **/
+  @javax.annotation.Nullable 
+  @ApiModelProperty(value = "")
+  public String getPhone() {
+    return phone;
+  }
+
+  public void setPhone(String phone) {
+    this.phone = phone;
+  }
+
+  public User userStatus(Integer userStatus) {
+    this.userStatus = userStatus;
+    return this;
+  }
+
+   /**
+   * User Status
+   * @return userStatus
+  **/
+  @javax.annotation.Nullable 
+  @ApiModelProperty(value = "User Status")
+  public Integer getUserStatus() {
+    return userStatus;
+  }
+
+  public void setUserStatus(Integer userStatus) {
+    this.userStatus = userStatus;
+  }
+
+
+  @Override
+  public boolean equals(java.lang.Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    User user = (User) o;
+    return Objects.equals(this.id, user.id) &&
+        Objects.equals(this.username, user.username) &&
+        Objects.equals(this.firstName, user.firstName) &&
+        Objects.equals(this.lastName, user.lastName) &&
+        Objects.equals(this.email, user.email) &&
+        Objects.equals(this.password, user.password) &&
+        Objects.equals(this.phone, user.phone) &&
+        Objects.equals(this.userStatus, user.userStatus);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(id, username, firstName, lastName, email, password, phone, userStatus);
+  }
+
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class User {\n");
+    sb.append("    id: ").append(toIndentedString(id)).append("\n");
+    sb.append("    username: ").append(toIndentedString(username)).append("\n");
+    sb.append("    firstName: ").append(toIndentedString(firstName)).append("\n");
+    sb.append("    lastName: ").append(toIndentedString(lastName)).append("\n");
+    sb.append("    email: ").append(toIndentedString(email)).append("\n");
+    sb.append("    password: ").append(toIndentedString(password)).append("\n");
+    sb.append("    phone: ").append(toIndentedString(phone)).append("\n");
+    sb.append("    userStatus: ").append(toIndentedString(userStatus)).append("\n");
+    sb.append("}");
+    return sb.toString();
+  }
+
+  /**
+   * Convert the given object to string with each line indented by 4 spaces
+   * (except the first line).
+   */
+  private String toIndentedString(java.lang.Object o) {
+    if (o == null) {
+      return "null";
+    }
+    return o.toString().replace("\n", "\n    ");
+  }
+
+}
+
diff --git a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/XmlItem.java b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/XmlItem.java
new file mode 100644
index 0000000000..2af459e5ae
--- /dev/null
+++ b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/XmlItem.java
@@ -0,0 +1,838 @@
+/*
+ * OpenAPI Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+
+package org.openapitools.client.model;
+
+import java.util.Objects;
+import java.util.Arrays;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonValue;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import java.math.BigDecimal;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * XmlItem
+ */
+
+public class XmlItem {
+  @JsonProperty("attribute_string")
+  private String attributeString;
+
+  @JsonProperty("attribute_number")
+  private BigDecimal attributeNumber;
+
+  @JsonProperty("attribute_integer")
+  private Integer attributeInteger;
+
+  @JsonProperty("attribute_boolean")
+  private Boolean attributeBoolean;
+
+  @JsonProperty("wrapped_array")
+  private List<Integer> wrappedArray = new ArrayList<>();
+
+  @JsonProperty("name_string")
+  private String nameString;
+
+  @JsonProperty("name_number")
+  private BigDecimal nameNumber;
+
+  @JsonProperty("name_integer")
+  private Integer nameInteger;
+
+  @JsonProperty("name_boolean")
+  private Boolean nameBoolean;
+
+  @JsonProperty("name_array")
+  private List<Integer> nameArray = new ArrayList<>();
+
+  @JsonProperty("name_wrapped_array")
+  private List<Integer> nameWrappedArray = new ArrayList<>();
+
+  @JsonProperty("prefix_string")
+  private String prefixString;
+
+  @JsonProperty("prefix_number")
+  private BigDecimal prefixNumber;
+
+  @JsonProperty("prefix_integer")
+  private Integer prefixInteger;
+
+  @JsonProperty("prefix_boolean")
+  private Boolean prefixBoolean;
+
+  @JsonProperty("prefix_array")
+  private List<Integer> prefixArray = new ArrayList<>();
+
+  @JsonProperty("prefix_wrapped_array")
+  private List<Integer> prefixWrappedArray = new ArrayList<>();
+
+  @JsonProperty("namespace_string")
+  private String namespaceString;
+
+  @JsonProperty("namespace_number")
+  private BigDecimal namespaceNumber;
+
+  @JsonProperty("namespace_integer")
+  private Integer namespaceInteger;
+
+  @JsonProperty("namespace_boolean")
+  private Boolean namespaceBoolean;
+
+  @JsonProperty("namespace_array")
+  private List<Integer> namespaceArray = new ArrayList<>();
+
+  @JsonProperty("namespace_wrapped_array")
+  private List<Integer> namespaceWrappedArray = new ArrayList<>();
+
+  @JsonProperty("prefix_ns_string")
+  private String prefixNsString;
+
+  @JsonProperty("prefix_ns_number")
+  private BigDecimal prefixNsNumber;
+
+  @JsonProperty("prefix_ns_integer")
+  private Integer prefixNsInteger;
+
+  @JsonProperty("prefix_ns_boolean")
+  private Boolean prefixNsBoolean;
+
+  @JsonProperty("prefix_ns_array")
+  private List<Integer> prefixNsArray = new ArrayList<>();
+
+  @JsonProperty("prefix_ns_wrapped_array")
+  private List<Integer> prefixNsWrappedArray = new ArrayList<>();
+
+  public XmlItem attributeString(String attributeString) {
+    this.attributeString = attributeString;
+    return this;
+  }
+
+   /**
+   * Get attributeString
+   * @return attributeString
+  **/
+  @javax.annotation.Nullable 
+  @ApiModelProperty(example = "string", value = "")
+  public String getAttributeString() {
+    return attributeString;
+  }
+
+  public void setAttributeString(String attributeString) {
+    this.attributeString = attributeString;
+  }
+
+  public XmlItem attributeNumber(BigDecimal attributeNumber) {
+    this.attributeNumber = attributeNumber;
+    return this;
+  }
+
+   /**
+   * Get attributeNumber
+   * @return attributeNumber
+  **/
+  @javax.annotation.Nullable 
+  @ApiModelProperty(example = "1.234", value = "")
+  public BigDecimal getAttributeNumber() {
+    return attributeNumber;
+  }
+
+  public void setAttributeNumber(BigDecimal attributeNumber) {
+    this.attributeNumber = attributeNumber;
+  }
+
+  public XmlItem attributeInteger(Integer attributeInteger) {
+    this.attributeInteger = attributeInteger;
+    return this;
+  }
+
+   /**
+   * Get attributeInteger
+   * @return attributeInteger
+  **/
+  @javax.annotation.Nullable 
+  @ApiModelProperty(example = "-2", value = "")
+  public Integer getAttributeInteger() {
+    return attributeInteger;
+  }
+
+  public void setAttributeInteger(Integer attributeInteger) {
+    this.attributeInteger = attributeInteger;
+  }
+
+  public XmlItem attributeBoolean(Boolean attributeBoolean) {
+    this.attributeBoolean = attributeBoolean;
+    return this;
+  }
+
+   /**
+   * Get attributeBoolean
+   * @return attributeBoolean
+  **/
+  @javax.annotation.Nullable 
+  @ApiModelProperty(example = "true", value = "")
+  public Boolean getAttributeBoolean() {
+    return attributeBoolean;
+  }
+
+  public void setAttributeBoolean(Boolean attributeBoolean) {
+    this.attributeBoolean = attributeBoolean;
+  }
+
+  public XmlItem wrappedArray(List<Integer> wrappedArray) {
+    this.wrappedArray = wrappedArray;
+    return this;
+  }
+
+  public XmlItem addWrappedArrayItem(Integer wrappedArrayItem) {
+    if (this.wrappedArray == null) {
+      this.wrappedArray = new ArrayList<>();
+    }
+    this.wrappedArray.add(wrappedArrayItem);
+    return this;
+  }
+
+   /**
+   * Get wrappedArray
+   * @return wrappedArray
+  **/
+  @javax.annotation.Nullable 
+  @ApiModelProperty(value = "")
+  public List<Integer> getWrappedArray() {
+    return wrappedArray;
+  }
+
+  public void setWrappedArray(List<Integer> wrappedArray) {
+    this.wrappedArray = wrappedArray;
+  }
+
+  public XmlItem nameString(String nameString) {
+    this.nameString = nameString;
+    return this;
+  }
+
+   /**
+   * Get nameString
+   * @return nameString
+  **/
+  @javax.annotation.Nullable 
+  @ApiModelProperty(example = "string", value = "")
+  public String getNameString() {
+    return nameString;
+  }
+
+  public void setNameString(String nameString) {
+    this.nameString = nameString;
+  }
+
+  public XmlItem nameNumber(BigDecimal nameNumber) {
+    this.nameNumber = nameNumber;
+    return this;
+  }
+
+   /**
+   * Get nameNumber
+   * @return nameNumber
+  **/
+  @javax.annotation.Nullable 
+  @ApiModelProperty(example = "1.234", value = "")
+  public BigDecimal getNameNumber() {
+    return nameNumber;
+  }
+
+  public void setNameNumber(BigDecimal nameNumber) {
+    this.nameNumber = nameNumber;
+  }
+
+  public XmlItem nameInteger(Integer nameInteger) {
+    this.nameInteger = nameInteger;
+    return this;
+  }
+
+   /**
+   * Get nameInteger
+   * @return nameInteger
+  **/
+  @javax.annotation.Nullable 
+  @ApiModelProperty(example = "-2", value = "")
+  public Integer getNameInteger() {
+    return nameInteger;
+  }
+
+  public void setNameInteger(Integer nameInteger) {
+    this.nameInteger = nameInteger;
+  }
+
+  public XmlItem nameBoolean(Boolean nameBoolean) {
+    this.nameBoolean = nameBoolean;
+    return this;
+  }
+
+   /**
+   * Get nameBoolean
+   * @return nameBoolean
+  **/
+  @javax.annotation.Nullable 
+  @ApiModelProperty(example = "true", value = "")
+  public Boolean getNameBoolean() {
+    return nameBoolean;
+  }
+
+  public void setNameBoolean(Boolean nameBoolean) {
+    this.nameBoolean = nameBoolean;
+  }
+
+  public XmlItem nameArray(List<Integer> nameArray) {
+    this.nameArray = nameArray;
+    return this;
+  }
+
+  public XmlItem addNameArrayItem(Integer nameArrayItem) {
+    if (this.nameArray == null) {
+      this.nameArray = new ArrayList<>();
+    }
+    this.nameArray.add(nameArrayItem);
+    return this;
+  }
+
+   /**
+   * Get nameArray
+   * @return nameArray
+  **/
+  @javax.annotation.Nullable 
+  @ApiModelProperty(value = "")
+  public List<Integer> getNameArray() {
+    return nameArray;
+  }
+
+  public void setNameArray(List<Integer> nameArray) {
+    this.nameArray = nameArray;
+  }
+
+  public XmlItem nameWrappedArray(List<Integer> nameWrappedArray) {
+    this.nameWrappedArray = nameWrappedArray;
+    return this;
+  }
+
+  public XmlItem addNameWrappedArrayItem(Integer nameWrappedArrayItem) {
+    if (this.nameWrappedArray == null) {
+      this.nameWrappedArray = new ArrayList<>();
+    }
+    this.nameWrappedArray.add(nameWrappedArrayItem);
+    return this;
+  }
+
+   /**
+   * Get nameWrappedArray
+   * @return nameWrappedArray
+  **/
+  @javax.annotation.Nullable 
+  @ApiModelProperty(value = "")
+  public List<Integer> getNameWrappedArray() {
+    return nameWrappedArray;
+  }
+
+  public void setNameWrappedArray(List<Integer> nameWrappedArray) {
+    this.nameWrappedArray = nameWrappedArray;
+  }
+
+  public XmlItem prefixString(String prefixString) {
+    this.prefixString = prefixString;
+    return this;
+  }
+
+   /**
+   * Get prefixString
+   * @return prefixString
+  **/
+  @javax.annotation.Nullable 
+  @ApiModelProperty(example = "string", value = "")
+  public String getPrefixString() {
+    return prefixString;
+  }
+
+  public void setPrefixString(String prefixString) {
+    this.prefixString = prefixString;
+  }
+
+  public XmlItem prefixNumber(BigDecimal prefixNumber) {
+    this.prefixNumber = prefixNumber;
+    return this;
+  }
+
+   /**
+   * Get prefixNumber
+   * @return prefixNumber
+  **/
+  @javax.annotation.Nullable 
+  @ApiModelProperty(example = "1.234", value = "")
+  public BigDecimal getPrefixNumber() {
+    return prefixNumber;
+  }
+
+  public void setPrefixNumber(BigDecimal prefixNumber) {
+    this.prefixNumber = prefixNumber;
+  }
+
+  public XmlItem prefixInteger(Integer prefixInteger) {
+    this.prefixInteger = prefixInteger;
+    return this;
+  }
+
+   /**
+   * Get prefixInteger
+   * @return prefixInteger
+  **/
+  @javax.annotation.Nullable 
+  @ApiModelProperty(example = "-2", value = "")
+  public Integer getPrefixInteger() {
+    return prefixInteger;
+  }
+
+  public void setPrefixInteger(Integer prefixInteger) {
+    this.prefixInteger = prefixInteger;
+  }
+
+  public XmlItem prefixBoolean(Boolean prefixBoolean) {
+    this.prefixBoolean = prefixBoolean;
+    return this;
+  }
+
+   /**
+   * Get prefixBoolean
+   * @return prefixBoolean
+  **/
+  @javax.annotation.Nullable 
+  @ApiModelProperty(example = "true", value = "")
+  public Boolean getPrefixBoolean() {
+    return prefixBoolean;
+  }
+
+  public void setPrefixBoolean(Boolean prefixBoolean) {
+    this.prefixBoolean = prefixBoolean;
+  }
+
+  public XmlItem prefixArray(List<Integer> prefixArray) {
+    this.prefixArray = prefixArray;
+    return this;
+  }
+
+  public XmlItem addPrefixArrayItem(Integer prefixArrayItem) {
+    if (this.prefixArray == null) {
+      this.prefixArray = new ArrayList<>();
+    }
+    this.prefixArray.add(prefixArrayItem);
+    return this;
+  }
+
+   /**
+   * Get prefixArray
+   * @return prefixArray
+  **/
+  @javax.annotation.Nullable 
+  @ApiModelProperty(value = "")
+  public List<Integer> getPrefixArray() {
+    return prefixArray;
+  }
+
+  public void setPrefixArray(List<Integer> prefixArray) {
+    this.prefixArray = prefixArray;
+  }
+
+  public XmlItem prefixWrappedArray(List<Integer> prefixWrappedArray) {
+    this.prefixWrappedArray = prefixWrappedArray;
+    return this;
+  }
+
+  public XmlItem addPrefixWrappedArrayItem(Integer prefixWrappedArrayItem) {
+    if (this.prefixWrappedArray == null) {
+      this.prefixWrappedArray = new ArrayList<>();
+    }
+    this.prefixWrappedArray.add(prefixWrappedArrayItem);
+    return this;
+  }
+
+   /**
+   * Get prefixWrappedArray
+   * @return prefixWrappedArray
+  **/
+  @javax.annotation.Nullable 
+  @ApiModelProperty(value = "")
+  public List<Integer> getPrefixWrappedArray() {
+    return prefixWrappedArray;
+  }
+
+  public void setPrefixWrappedArray(List<Integer> prefixWrappedArray) {
+    this.prefixWrappedArray = prefixWrappedArray;
+  }
+
+  public XmlItem namespaceString(String namespaceString) {
+    this.namespaceString = namespaceString;
+    return this;
+  }
+
+   /**
+   * Get namespaceString
+   * @return namespaceString
+  **/
+  @javax.annotation.Nullable 
+  @ApiModelProperty(example = "string", value = "")
+  public String getNamespaceString() {
+    return namespaceString;
+  }
+
+  public void setNamespaceString(String namespaceString) {
+    this.namespaceString = namespaceString;
+  }
+
+  public XmlItem namespaceNumber(BigDecimal namespaceNumber) {
+    this.namespaceNumber = namespaceNumber;
+    return this;
+  }
+
+   /**
+   * Get namespaceNumber
+   * @return namespaceNumber
+  **/
+  @javax.annotation.Nullable 
+  @ApiModelProperty(example = "1.234", value = "")
+  public BigDecimal getNamespaceNumber() {
+    return namespaceNumber;
+  }
+
+  public void setNamespaceNumber(BigDecimal namespaceNumber) {
+    this.namespaceNumber = namespaceNumber;
+  }
+
+  public XmlItem namespaceInteger(Integer namespaceInteger) {
+    this.namespaceInteger = namespaceInteger;
+    return this;
+  }
+
+   /**
+   * Get namespaceInteger
+   * @return namespaceInteger
+  **/
+  @javax.annotation.Nullable 
+  @ApiModelProperty(example = "-2", value = "")
+  public Integer getNamespaceInteger() {
+    return namespaceInteger;
+  }
+
+  public void setNamespaceInteger(Integer namespaceInteger) {
+    this.namespaceInteger = namespaceInteger;
+  }
+
+  public XmlItem namespaceBoolean(Boolean namespaceBoolean) {
+    this.namespaceBoolean = namespaceBoolean;
+    return this;
+  }
+
+   /**
+   * Get namespaceBoolean
+   * @return namespaceBoolean
+  **/
+  @javax.annotation.Nullable 
+  @ApiModelProperty(example = "true", value = "")
+  public Boolean getNamespaceBoolean() {
+    return namespaceBoolean;
+  }
+
+  public void setNamespaceBoolean(Boolean namespaceBoolean) {
+    this.namespaceBoolean = namespaceBoolean;
+  }
+
+  public XmlItem namespaceArray(List<Integer> namespaceArray) {
+    this.namespaceArray = namespaceArray;
+    return this;
+  }
+
+  public XmlItem addNamespaceArrayItem(Integer namespaceArrayItem) {
+    if (this.namespaceArray == null) {
+      this.namespaceArray = new ArrayList<>();
+    }
+    this.namespaceArray.add(namespaceArrayItem);
+    return this;
+  }
+
+   /**
+   * Get namespaceArray
+   * @return namespaceArray
+  **/
+  @javax.annotation.Nullable 
+  @ApiModelProperty(value = "")
+  public List<Integer> getNamespaceArray() {
+    return namespaceArray;
+  }
+
+  public void setNamespaceArray(List<Integer> namespaceArray) {
+    this.namespaceArray = namespaceArray;
+  }
+
+  public XmlItem namespaceWrappedArray(List<Integer> namespaceWrappedArray) {
+    this.namespaceWrappedArray = namespaceWrappedArray;
+    return this;
+  }
+
+  public XmlItem addNamespaceWrappedArrayItem(Integer namespaceWrappedArrayItem) {
+    if (this.namespaceWrappedArray == null) {
+      this.namespaceWrappedArray = new ArrayList<>();
+    }
+    this.namespaceWrappedArray.add(namespaceWrappedArrayItem);
+    return this;
+  }
+
+   /**
+   * Get namespaceWrappedArray
+   * @return namespaceWrappedArray
+  **/
+  @javax.annotation.Nullable 
+  @ApiModelProperty(value = "")
+  public List<Integer> getNamespaceWrappedArray() {
+    return namespaceWrappedArray;
+  }
+
+  public void setNamespaceWrappedArray(List<Integer> namespaceWrappedArray) {
+    this.namespaceWrappedArray = namespaceWrappedArray;
+  }
+
+  public XmlItem prefixNsString(String prefixNsString) {
+    this.prefixNsString = prefixNsString;
+    return this;
+  }
+
+   /**
+   * Get prefixNsString
+   * @return prefixNsString
+  **/
+  @javax.annotation.Nullable 
+  @ApiModelProperty(example = "string", value = "")
+  public String getPrefixNsString() {
+    return prefixNsString;
+  }
+
+  public void setPrefixNsString(String prefixNsString) {
+    this.prefixNsString = prefixNsString;
+  }
+
+  public XmlItem prefixNsNumber(BigDecimal prefixNsNumber) {
+    this.prefixNsNumber = prefixNsNumber;
+    return this;
+  }
+
+   /**
+   * Get prefixNsNumber
+   * @return prefixNsNumber
+  **/
+  @javax.annotation.Nullable 
+  @ApiModelProperty(example = "1.234", value = "")
+  public BigDecimal getPrefixNsNumber() {
+    return prefixNsNumber;
+  }
+
+  public void setPrefixNsNumber(BigDecimal prefixNsNumber) {
+    this.prefixNsNumber = prefixNsNumber;
+  }
+
+  public XmlItem prefixNsInteger(Integer prefixNsInteger) {
+    this.prefixNsInteger = prefixNsInteger;
+    return this;
+  }
+
+   /**
+   * Get prefixNsInteger
+   * @return prefixNsInteger
+  **/
+  @javax.annotation.Nullable 
+  @ApiModelProperty(example = "-2", value = "")
+  public Integer getPrefixNsInteger() {
+    return prefixNsInteger;
+  }
+
+  public void setPrefixNsInteger(Integer prefixNsInteger) {
+    this.prefixNsInteger = prefixNsInteger;
+  }
+
+  public XmlItem prefixNsBoolean(Boolean prefixNsBoolean) {
+    this.prefixNsBoolean = prefixNsBoolean;
+    return this;
+  }
+
+   /**
+   * Get prefixNsBoolean
+   * @return prefixNsBoolean
+  **/
+  @javax.annotation.Nullable 
+  @ApiModelProperty(example = "true", value = "")
+  public Boolean getPrefixNsBoolean() {
+    return prefixNsBoolean;
+  }
+
+  public void setPrefixNsBoolean(Boolean prefixNsBoolean) {
+    this.prefixNsBoolean = prefixNsBoolean;
+  }
+
+  public XmlItem prefixNsArray(List<Integer> prefixNsArray) {
+    this.prefixNsArray = prefixNsArray;
+    return this;
+  }
+
+  public XmlItem addPrefixNsArrayItem(Integer prefixNsArrayItem) {
+    if (this.prefixNsArray == null) {
+      this.prefixNsArray = new ArrayList<>();
+    }
+    this.prefixNsArray.add(prefixNsArrayItem);
+    return this;
+  }
+
+   /**
+   * Get prefixNsArray
+   * @return prefixNsArray
+  **/
+  @javax.annotation.Nullable 
+  @ApiModelProperty(value = "")
+  public List<Integer> getPrefixNsArray() {
+    return prefixNsArray;
+  }
+
+  public void setPrefixNsArray(List<Integer> prefixNsArray) {
+    this.prefixNsArray = prefixNsArray;
+  }
+
+  public XmlItem prefixNsWrappedArray(List<Integer> prefixNsWrappedArray) {
+    this.prefixNsWrappedArray = prefixNsWrappedArray;
+    return this;
+  }
+
+  public XmlItem addPrefixNsWrappedArrayItem(Integer prefixNsWrappedArrayItem) {
+    if (this.prefixNsWrappedArray == null) {
+      this.prefixNsWrappedArray = new ArrayList<>();
+    }
+    this.prefixNsWrappedArray.add(prefixNsWrappedArrayItem);
+    return this;
+  }
+
+   /**
+   * Get prefixNsWrappedArray
+   * @return prefixNsWrappedArray
+  **/
+  @javax.annotation.Nullable 
+  @ApiModelProperty(value = "")
+  public List<Integer> getPrefixNsWrappedArray() {
+    return prefixNsWrappedArray;
+  }
+
+  public void setPrefixNsWrappedArray(List<Integer> prefixNsWrappedArray) {
+    this.prefixNsWrappedArray = prefixNsWrappedArray;
+  }
+
+
+  @Override
+  public boolean equals(java.lang.Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    XmlItem xmlItem = (XmlItem) o;
+    return Objects.equals(this.attributeString, xmlItem.attributeString) &&
+        Objects.equals(this.attributeNumber, xmlItem.attributeNumber) &&
+        Objects.equals(this.attributeInteger, xmlItem.attributeInteger) &&
+        Objects.equals(this.attributeBoolean, xmlItem.attributeBoolean) &&
+        Objects.equals(this.wrappedArray, xmlItem.wrappedArray) &&
+        Objects.equals(this.nameString, xmlItem.nameString) &&
+        Objects.equals(this.nameNumber, xmlItem.nameNumber) &&
+        Objects.equals(this.nameInteger, xmlItem.nameInteger) &&
+        Objects.equals(this.nameBoolean, xmlItem.nameBoolean) &&
+        Objects.equals(this.nameArray, xmlItem.nameArray) &&
+        Objects.equals(this.nameWrappedArray, xmlItem.nameWrappedArray) &&
+        Objects.equals(this.prefixString, xmlItem.prefixString) &&
+        Objects.equals(this.prefixNumber, xmlItem.prefixNumber) &&
+        Objects.equals(this.prefixInteger, xmlItem.prefixInteger) &&
+        Objects.equals(this.prefixBoolean, xmlItem.prefixBoolean) &&
+        Objects.equals(this.prefixArray, xmlItem.prefixArray) &&
+        Objects.equals(this.prefixWrappedArray, xmlItem.prefixWrappedArray) &&
+        Objects.equals(this.namespaceString, xmlItem.namespaceString) &&
+        Objects.equals(this.namespaceNumber, xmlItem.namespaceNumber) &&
+        Objects.equals(this.namespaceInteger, xmlItem.namespaceInteger) &&
+        Objects.equals(this.namespaceBoolean, xmlItem.namespaceBoolean) &&
+        Objects.equals(this.namespaceArray, xmlItem.namespaceArray) &&
+        Objects.equals(this.namespaceWrappedArray, xmlItem.namespaceWrappedArray) &&
+        Objects.equals(this.prefixNsString, xmlItem.prefixNsString) &&
+        Objects.equals(this.prefixNsNumber, xmlItem.prefixNsNumber) &&
+        Objects.equals(this.prefixNsInteger, xmlItem.prefixNsInteger) &&
+        Objects.equals(this.prefixNsBoolean, xmlItem.prefixNsBoolean) &&
+        Objects.equals(this.prefixNsArray, xmlItem.prefixNsArray) &&
+        Objects.equals(this.prefixNsWrappedArray, xmlItem.prefixNsWrappedArray);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(attributeString, attributeNumber, attributeInteger, attributeBoolean, wrappedArray, nameString, nameNumber, nameInteger, nameBoolean, nameArray, nameWrappedArray, prefixString, prefixNumber, prefixInteger, prefixBoolean, prefixArray, prefixWrappedArray, namespaceString, namespaceNumber, namespaceInteger, namespaceBoolean, namespaceArray, namespaceWrappedArray, prefixNsString, prefixNsNumber, prefixNsInteger, prefixNsBoolean, prefixNsArray, prefixNsWrappedArray);
+  }
+
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class XmlItem {\n");
+    sb.append("    attributeString: ").append(toIndentedString(attributeString)).append("\n");
+    sb.append("    attributeNumber: ").append(toIndentedString(attributeNumber)).append("\n");
+    sb.append("    attributeInteger: ").append(toIndentedString(attributeInteger)).append("\n");
+    sb.append("    attributeBoolean: ").append(toIndentedString(attributeBoolean)).append("\n");
+    sb.append("    wrappedArray: ").append(toIndentedString(wrappedArray)).append("\n");
+    sb.append("    nameString: ").append(toIndentedString(nameString)).append("\n");
+    sb.append("    nameNumber: ").append(toIndentedString(nameNumber)).append("\n");
+    sb.append("    nameInteger: ").append(toIndentedString(nameInteger)).append("\n");
+    sb.append("    nameBoolean: ").append(toIndentedString(nameBoolean)).append("\n");
+    sb.append("    nameArray: ").append(toIndentedString(nameArray)).append("\n");
+    sb.append("    nameWrappedArray: ").append(toIndentedString(nameWrappedArray)).append("\n");
+    sb.append("    prefixString: ").append(toIndentedString(prefixString)).append("\n");
+    sb.append("    prefixNumber: ").append(toIndentedString(prefixNumber)).append("\n");
+    sb.append("    prefixInteger: ").append(toIndentedString(prefixInteger)).append("\n");
+    sb.append("    prefixBoolean: ").append(toIndentedString(prefixBoolean)).append("\n");
+    sb.append("    prefixArray: ").append(toIndentedString(prefixArray)).append("\n");
+    sb.append("    prefixWrappedArray: ").append(toIndentedString(prefixWrappedArray)).append("\n");
+    sb.append("    namespaceString: ").append(toIndentedString(namespaceString)).append("\n");
+    sb.append("    namespaceNumber: ").append(toIndentedString(namespaceNumber)).append("\n");
+    sb.append("    namespaceInteger: ").append(toIndentedString(namespaceInteger)).append("\n");
+    sb.append("    namespaceBoolean: ").append(toIndentedString(namespaceBoolean)).append("\n");
+    sb.append("    namespaceArray: ").append(toIndentedString(namespaceArray)).append("\n");
+    sb.append("    namespaceWrappedArray: ").append(toIndentedString(namespaceWrappedArray)).append("\n");
+    sb.append("    prefixNsString: ").append(toIndentedString(prefixNsString)).append("\n");
+    sb.append("    prefixNsNumber: ").append(toIndentedString(prefixNsNumber)).append("\n");
+    sb.append("    prefixNsInteger: ").append(toIndentedString(prefixNsInteger)).append("\n");
+    sb.append("    prefixNsBoolean: ").append(toIndentedString(prefixNsBoolean)).append("\n");
+    sb.append("    prefixNsArray: ").append(toIndentedString(prefixNsArray)).append("\n");
+    sb.append("    prefixNsWrappedArray: ").append(toIndentedString(prefixNsWrappedArray)).append("\n");
+    sb.append("}");
+    return sb.toString();
+  }
+
+  /**
+   * Convert the given object to string with each line indented by 4 spaces
+   * (except the first line).
+   */
+  private String toIndentedString(java.lang.Object o) {
+    if (o == null) {
+      return "null";
+    }
+    return o.toString().replace("\n", "\n    ");
+  }
+
+}
+
diff --git a/samples/client/petstore/java/native/src/test/java/org/openapitools/client/ApiClientTest.java b/samples/client/petstore/java/native/src/test/java/org/openapitools/client/ApiClientTest.java
new file mode 100644
index 0000000000..976ef6916a
--- /dev/null
+++ b/samples/client/petstore/java/native/src/test/java/org/openapitools/client/ApiClientTest.java
@@ -0,0 +1,85 @@
+package org.openapitools.client;
+
+import org.junit.Test;
+
+import java.net.http.HttpClient;
+import java.time.Duration;
+import java.util.List;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
+public class ApiClientTest {
+
+    @Test
+    public void urlEncodeTest() {
+        String encoded = ApiClient.urlEncode("/&= $");
+        assertEquals("%2F%26%3D+%24", encoded);
+    }
+
+    @Test
+    public void parameterToPairsTest() {
+        List<Pair> l = ApiClient.parameterToPairs("$name", "some value");
+        assertEquals(1, l.size());
+        Pair p = l.get(0);
+        assertEquals("%24name", p.getName());
+        assertEquals("some+value", p.getValue());
+
+        l = ApiClient.parameterToPairs("$name", null);
+        assertTrue(l.isEmpty());
+    }
+
+    @Test
+    public void parameterToPairsCollectionTest() {
+        List<Pair> l = ApiClient.parameterToPairs(
+                "csv",
+                "$name",
+                List.of("value 1", "value 2"));
+        assertEquals(1, l.size());
+        Pair p = l.get(0);
+        assertEquals("%24name", p.getName());
+        assertEquals("value+1%2Cvalue+2", p.getValue());
+
+        l = ApiClient.parameterToPairs(
+                "multi",
+                "$name",
+                List.of("value 1", "value 2"));
+        assertEquals(2, l.size());
+        p = l.get(0);
+        assertEquals("%24name", p.getName());
+        assertEquals("value+1", p.getValue());
+        p = l.get(1);
+        assertEquals("%24name", p.getName());
+        assertEquals("value+2", p.getValue());
+
+        l = ApiClient.parameterToPairs(
+                "multi",
+                "$name",
+                List.of());
+        assertTrue(l.isEmpty());
+    }
+
+    @Test
+    public void uriOverrideTest() {
+        ApiClient apiClient = new ApiClient();
+        apiClient.setHost("test.swagger.io");
+        apiClient.setPort(9999);
+        apiClient.setBasePath("/testing");
+        String baseUri = apiClient.getBaseUri();
+        assertTrue(baseUri.endsWith("://test.swagger.io:9999/testing"));
+    }
+
+    @Test
+    public void clientConnectTimeoutTest() {
+        ApiClient apiClient = new ApiClient();
+        HttpClient client = apiClient.getHttpClient();
+        assertTrue(client.connectTimeout().isEmpty());
+
+        HttpClient.Builder builder = HttpClient.newBuilder()
+                .connectTimeout(Duration.ofSeconds(10));
+        apiClient.setHttpClientBuilder(builder);
+        client = apiClient.getHttpClient();
+        assertTrue(client.connectTimeout().isPresent());
+        assertEquals(Duration.ofSeconds(10), client.connectTimeout().get());
+    }
+}
diff --git a/samples/client/petstore/java/native/src/test/java/org/openapitools/client/api/AnotherFakeApiTest.java b/samples/client/petstore/java/native/src/test/java/org/openapitools/client/api/AnotherFakeApiTest.java
new file mode 100644
index 0000000000..6fa396b485
--- /dev/null
+++ b/samples/client/petstore/java/native/src/test/java/org/openapitools/client/api/AnotherFakeApiTest.java
@@ -0,0 +1,51 @@
+/*
+ * OpenAPI Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+
+package org.openapitools.client.api;
+
+import org.openapitools.client.ApiException;
+import org.openapitools.client.model.Client;
+import org.junit.Test;
+import org.junit.Ignore;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * API tests for AnotherFakeApi
+ */
+@Ignore
+public class AnotherFakeApiTest {
+
+    private final AnotherFakeApi api = new AnotherFakeApi();
+
+    
+    /**
+     * To test special tags
+     *
+     * To test special tags and operation ID starting with number
+     *
+     * @throws ApiException
+     *          if the Api call fails
+     */
+    @Test
+    public void call123testSpecialTagsTest() throws ApiException {
+        Client body = null;
+        Client response = api.call123testSpecialTags(body);
+
+        // TODO: test validations
+    }
+    
+}
diff --git a/samples/client/petstore/java/native/src/test/java/org/openapitools/client/api/FakeApiTest.java b/samples/client/petstore/java/native/src/test/java/org/openapitools/client/api/FakeApiTest.java
new file mode 100644
index 0000000000..67847a40b6
--- /dev/null
+++ b/samples/client/petstore/java/native/src/test/java/org/openapitools/client/api/FakeApiTest.java
@@ -0,0 +1,278 @@
+/*
+ * OpenAPI Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+
+package org.openapitools.client.api;
+
+import org.openapitools.client.ApiException;
+import java.math.BigDecimal;
+import org.openapitools.client.model.Client;
+import java.io.File;
+import org.openapitools.client.model.FileSchemaTestClass;
+import java.time.LocalDate;
+import java.time.OffsetDateTime;
+import org.openapitools.client.model.OuterComposite;
+import org.openapitools.client.model.User;
+import org.openapitools.client.model.XmlItem;
+import org.junit.Test;
+import org.junit.Ignore;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * API tests for FakeApi
+ */
+@Ignore
+public class FakeApiTest {
+
+    private final FakeApi api = new FakeApi();
+
+    
+    /**
+     * creates an XmlItem
+     *
+     * this route creates an XmlItem
+     *
+     * @throws ApiException
+     *          if the Api call fails
+     */
+    @Test
+    public void createXmlItemTest() throws ApiException {
+        XmlItem xmlItem = null;
+        api.createXmlItem(xmlItem);
+
+        // TODO: test validations
+    }
+    
+    /**
+     * 
+     *
+     * Test serialization of outer boolean types
+     *
+     * @throws ApiException
+     *          if the Api call fails
+     */
+    @Test
+    public void fakeOuterBooleanSerializeTest() throws ApiException {
+        Boolean body = null;
+        Boolean response = api.fakeOuterBooleanSerialize(body);
+
+        // TODO: test validations
+    }
+    
+    /**
+     * 
+     *
+     * Test serialization of object with outer number type
+     *
+     * @throws ApiException
+     *          if the Api call fails
+     */
+    @Test
+    public void fakeOuterCompositeSerializeTest() throws ApiException {
+        OuterComposite body = null;
+        OuterComposite response = api.fakeOuterCompositeSerialize(body);
+
+        // TODO: test validations
+    }
+    
+    /**
+     * 
+     *
+     * Test serialization of outer number types
+     *
+     * @throws ApiException
+     *          if the Api call fails
+     */
+    @Test
+    public void fakeOuterNumberSerializeTest() throws ApiException {
+        BigDecimal body = null;
+        BigDecimal response = api.fakeOuterNumberSerialize(body);
+
+        // TODO: test validations
+    }
+    
+    /**
+     * 
+     *
+     * Test serialization of outer string types
+     *
+     * @throws ApiException
+     *          if the Api call fails
+     */
+    @Test
+    public void fakeOuterStringSerializeTest() throws ApiException {
+        String body = null;
+        String response = api.fakeOuterStringSerialize(body);
+
+        // TODO: test validations
+    }
+    
+    /**
+     * 
+     *
+     * For this test, the body for this request much reference a schema named &#x60;File&#x60;.
+     *
+     * @throws ApiException
+     *          if the Api call fails
+     */
+    @Test
+    public void testBodyWithFileSchemaTest() throws ApiException {
+        FileSchemaTestClass body = null;
+        api.testBodyWithFileSchema(body);
+
+        // TODO: test validations
+    }
+    
+    /**
+     * 
+     *
+     * 
+     *
+     * @throws ApiException
+     *          if the Api call fails
+     */
+    @Test
+    public void testBodyWithQueryParamsTest() throws ApiException {
+        String query = null;
+        User body = null;
+        api.testBodyWithQueryParams(query, body);
+
+        // TODO: test validations
+    }
+    
+    /**
+     * To test \&quot;client\&quot; model
+     *
+     * To test \&quot;client\&quot; model
+     *
+     * @throws ApiException
+     *          if the Api call fails
+     */
+    @Test
+    public void testClientModelTest() throws ApiException {
+        Client body = null;
+        Client response = api.testClientModel(body);
+
+        // TODO: test validations
+    }
+    
+    /**
+     * Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 
+     *
+     * Fake endpoint for testing various parameters 假端點 偽のエンドポイント 가짜 엔드 포인트 
+     *
+     * @throws ApiException
+     *          if the Api call fails
+     */
+    @Test
+    public void testEndpointParametersTest() throws ApiException {
+        BigDecimal number = null;
+        Double _double = null;
+        String patternWithoutDelimiter = null;
+        byte[] _byte = null;
+        Integer integer = null;
+        Integer int32 = null;
+        Long int64 = null;
+        Float _float = null;
+        String string = null;
+        File binary = null;
+        LocalDate date = null;
+        OffsetDateTime dateTime = null;
+        String password = null;
+        String paramCallback = null;
+        api.testEndpointParameters(number, _double, patternWithoutDelimiter, _byte, integer, int32, int64, _float, string, binary, date, dateTime, password, paramCallback);
+
+        // TODO: test validations
+    }
+    
+    /**
+     * To test enum parameters
+     *
+     * To test enum parameters
+     *
+     * @throws ApiException
+     *          if the Api call fails
+     */
+    @Test
+    public void testEnumParametersTest() throws ApiException {
+        List<String> enumHeaderStringArray = null;
+        String enumHeaderString = null;
+        List<String> enumQueryStringArray = null;
+        String enumQueryString = null;
+        Integer enumQueryInteger = null;
+        Double enumQueryDouble = null;
+        List<String> enumFormStringArray = null;
+        String enumFormString = null;
+        api.testEnumParameters(enumHeaderStringArray, enumHeaderString, enumQueryStringArray, enumQueryString, enumQueryInteger, enumQueryDouble, enumFormStringArray, enumFormString);
+
+        // TODO: test validations
+    }
+    
+    /**
+     * Fake endpoint to test group parameters (optional)
+     *
+     * Fake endpoint to test group parameters (optional)
+     *
+     * @throws ApiException
+     *          if the Api call fails
+     */
+    @Test
+    public void testGroupParametersTest() throws ApiException {
+        Integer requiredStringGroup = null;
+        Boolean requiredBooleanGroup = null;
+        Long requiredInt64Group = null;
+        Integer stringGroup = null;
+        Boolean booleanGroup = null;
+        Long int64Group = null;
+        api.testGroupParameters(requiredStringGroup, requiredBooleanGroup, requiredInt64Group, stringGroup, booleanGroup, int64Group);
+
+        // TODO: test validations
+    }
+    
+    /**
+     * test inline additionalProperties
+     *
+     * 
+     *
+     * @throws ApiException
+     *          if the Api call fails
+     */
+    @Test
+    public void testInlineAdditionalPropertiesTest() throws ApiException {
+        Map<String, String> param = null;
+        api.testInlineAdditionalProperties(param);
+
+        // TODO: test validations
+    }
+    
+    /**
+     * test json serialization of form data
+     *
+     * 
+     *
+     * @throws ApiException
+     *          if the Api call fails
+     */
+    @Test
+    public void testJsonFormDataTest() throws ApiException {
+        String param = null;
+        String param2 = null;
+        api.testJsonFormData(param, param2);
+
+        // TODO: test validations
+    }
+    
+}
diff --git a/samples/client/petstore/java/native/src/test/java/org/openapitools/client/api/FakeClassnameTags123ApiTest.java b/samples/client/petstore/java/native/src/test/java/org/openapitools/client/api/FakeClassnameTags123ApiTest.java
new file mode 100644
index 0000000000..96f3b24e18
--- /dev/null
+++ b/samples/client/petstore/java/native/src/test/java/org/openapitools/client/api/FakeClassnameTags123ApiTest.java
@@ -0,0 +1,51 @@
+/*
+ * OpenAPI Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+
+package org.openapitools.client.api;
+
+import org.openapitools.client.ApiException;
+import org.openapitools.client.model.Client;
+import org.junit.Test;
+import org.junit.Ignore;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * API tests for FakeClassnameTags123Api
+ */
+@Ignore
+public class FakeClassnameTags123ApiTest {
+
+    private final FakeClassnameTags123Api api = new FakeClassnameTags123Api();
+
+    
+    /**
+     * To test class name in snake case
+     *
+     * To test class name in snake case
+     *
+     * @throws ApiException
+     *          if the Api call fails
+     */
+    @Test
+    public void testClassnameTest() throws ApiException {
+        Client body = null;
+        Client response = api.testClassname(body);
+
+        // TODO: test validations
+    }
+    
+}
diff --git a/samples/client/petstore/java/native/src/test/java/org/openapitools/client/api/PetApiTest.java b/samples/client/petstore/java/native/src/test/java/org/openapitools/client/api/PetApiTest.java
new file mode 100644
index 0000000000..82fe8d503f
--- /dev/null
+++ b/samples/client/petstore/java/native/src/test/java/org/openapitools/client/api/PetApiTest.java
@@ -0,0 +1,188 @@
+/*
+ * OpenAPI Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+
+package org.openapitools.client.api;
+
+import org.openapitools.client.ApiException;
+import java.io.File;
+import org.openapitools.client.model.ModelApiResponse;
+import org.openapitools.client.model.Pet;
+import org.junit.Test;
+import org.junit.Ignore;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * API tests for PetApi
+ */
+@Ignore
+public class PetApiTest {
+
+    private final PetApi api = new PetApi();
+
+    
+    /**
+     * Add a new pet to the store
+     *
+     * 
+     *
+     * @throws ApiException
+     *          if the Api call fails
+     */
+    @Test
+    public void addPetTest() throws ApiException {
+        Pet body = null;
+        api.addPet(body);
+
+        // TODO: test validations
+    }
+    
+    /**
+     * Deletes a pet
+     *
+     * 
+     *
+     * @throws ApiException
+     *          if the Api call fails
+     */
+    @Test
+    public void deletePetTest() throws ApiException {
+        Long petId = null;
+        String apiKey = null;
+        api.deletePet(petId, apiKey);
+
+        // TODO: test validations
+    }
+    
+    /**
+     * Finds Pets by status
+     *
+     * Multiple status values can be provided with comma separated strings
+     *
+     * @throws ApiException
+     *          if the Api call fails
+     */
+    @Test
+    public void findPetsByStatusTest() throws ApiException {
+        List<String> status = null;
+        List<Pet> response = api.findPetsByStatus(status);
+
+        // TODO: test validations
+    }
+    
+    /**
+     * Finds Pets by tags
+     *
+     * Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3 for testing.
+     *
+     * @throws ApiException
+     *          if the Api call fails
+     */
+    @Test
+    public void findPetsByTagsTest() throws ApiException {
+        List<String> tags = null;
+        List<Pet> response = api.findPetsByTags(tags);
+
+        // TODO: test validations
+    }
+    
+    /**
+     * Find pet by ID
+     *
+     * Returns a single pet
+     *
+     * @throws ApiException
+     *          if the Api call fails
+     */
+    @Test
+    public void getPetByIdTest() throws ApiException {
+        Long petId = null;
+        Pet response = api.getPetById(petId);
+
+        // TODO: test validations
+    }
+    
+    /**
+     * Update an existing pet
+     *
+     * 
+     *
+     * @throws ApiException
+     *          if the Api call fails
+     */
+    @Test
+    public void updatePetTest() throws ApiException {
+        Pet body = null;
+        api.updatePet(body);
+
+        // TODO: test validations
+    }
+    
+    /**
+     * Updates a pet in the store with form data
+     *
+     * 
+     *
+     * @throws ApiException
+     *          if the Api call fails
+     */
+    @Test
+    public void updatePetWithFormTest() throws ApiException {
+        Long petId = null;
+        String name = null;
+        String status = null;
+        api.updatePetWithForm(petId, name, status);
+
+        // TODO: test validations
+    }
+    
+    /**
+     * uploads an image
+     *
+     * 
+     *
+     * @throws ApiException
+     *          if the Api call fails
+     */
+    @Test
+    public void uploadFileTest() throws ApiException {
+        Long petId = null;
+        String additionalMetadata = null;
+        File file = null;
+        ModelApiResponse response = api.uploadFile(petId, additionalMetadata, file);
+
+        // TODO: test validations
+    }
+    
+    /**
+     * uploads an image (required)
+     *
+     * 
+     *
+     * @throws ApiException
+     *          if the Api call fails
+     */
+    @Test
+    public void uploadFileWithRequiredFileTest() throws ApiException {
+        Long petId = null;
+        File requiredFile = null;
+        String additionalMetadata = null;
+        ModelApiResponse response = api.uploadFileWithRequiredFile(petId, requiredFile, additionalMetadata);
+
+        // TODO: test validations
+    }
+    
+}
diff --git a/samples/client/petstore/java/native/src/test/java/org/openapitools/client/api/StoreApiTest.java b/samples/client/petstore/java/native/src/test/java/org/openapitools/client/api/StoreApiTest.java
new file mode 100644
index 0000000000..4aa80d6f0a
--- /dev/null
+++ b/samples/client/petstore/java/native/src/test/java/org/openapitools/client/api/StoreApiTest.java
@@ -0,0 +1,98 @@
+/*
+ * OpenAPI Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+
+package org.openapitools.client.api;
+
+import org.openapitools.client.ApiException;
+import org.openapitools.client.model.Order;
+import org.junit.Test;
+import org.junit.Ignore;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * API tests for StoreApi
+ */
+@Ignore
+public class StoreApiTest {
+
+    private final StoreApi api = new StoreApi();
+
+    
+    /**
+     * Delete purchase order by ID
+     *
+     * For valid response try integer IDs with value &lt; 1000. Anything above 1000 or nonintegers will generate API errors
+     *
+     * @throws ApiException
+     *          if the Api call fails
+     */
+    @Test
+    public void deleteOrderTest() throws ApiException {
+        String orderId = null;
+        api.deleteOrder(orderId);
+
+        // TODO: test validations
+    }
+    
+    /**
+     * Returns pet inventories by status
+     *
+     * Returns a map of status codes to quantities
+     *
+     * @throws ApiException
+     *          if the Api call fails
+     */
+    @Test
+    public void getInventoryTest() throws ApiException {
+        Map<String, Integer> response = api.getInventory();
+
+        // TODO: test validations
+    }
+    
+    /**
+     * Find purchase order by ID
+     *
+     * For valid response try integer IDs with value &lt;&#x3D; 5 or &gt; 10. Other values will generated exceptions
+     *
+     * @throws ApiException
+     *          if the Api call fails
+     */
+    @Test
+    public void getOrderByIdTest() throws ApiException {
+        Long orderId = null;
+        Order response = api.getOrderById(orderId);
+
+        // TODO: test validations
+    }
+    
+    /**
+     * Place an order for a pet
+     *
+     * 
+     *
+     * @throws ApiException
+     *          if the Api call fails
+     */
+    @Test
+    public void placeOrderTest() throws ApiException {
+        Order body = null;
+        Order response = api.placeOrder(body);
+
+        // TODO: test validations
+    }
+    
+}
diff --git a/samples/client/petstore/java/native/src/test/java/org/openapitools/client/api/UserApiTest.java b/samples/client/petstore/java/native/src/test/java/org/openapitools/client/api/UserApiTest.java
new file mode 100644
index 0000000000..c2feab9aea
--- /dev/null
+++ b/samples/client/petstore/java/native/src/test/java/org/openapitools/client/api/UserApiTest.java
@@ -0,0 +1,164 @@
+/*
+ * OpenAPI Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+
+package org.openapitools.client.api;
+
+import org.openapitools.client.ApiException;
+import org.openapitools.client.model.User;
+import org.junit.Test;
+import org.junit.Ignore;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * API tests for UserApi
+ */
+@Ignore
+public class UserApiTest {
+
+    private final UserApi api = new UserApi();
+
+    
+    /**
+     * Create user
+     *
+     * This can only be done by the logged in user.
+     *
+     * @throws ApiException
+     *          if the Api call fails
+     */
+    @Test
+    public void createUserTest() throws ApiException {
+        User body = null;
+        api.createUser(body);
+
+        // TODO: test validations
+    }
+    
+    /**
+     * Creates list of users with given input array
+     *
+     * 
+     *
+     * @throws ApiException
+     *          if the Api call fails
+     */
+    @Test
+    public void createUsersWithArrayInputTest() throws ApiException {
+        List<User> body = null;
+        api.createUsersWithArrayInput(body);
+
+        // TODO: test validations
+    }
+    
+    /**
+     * Creates list of users with given input array
+     *
+     * 
+     *
+     * @throws ApiException
+     *          if the Api call fails
+     */
+    @Test
+    public void createUsersWithListInputTest() throws ApiException {
+        List<User> body = null;
+        api.createUsersWithListInput(body);
+
+        // TODO: test validations
+    }
+    
+    /**
+     * Delete user
+     *
+     * This can only be done by the logged in user.
+     *
+     * @throws ApiException
+     *          if the Api call fails
+     */
+    @Test
+    public void deleteUserTest() throws ApiException {
+        String username = null;
+        api.deleteUser(username);
+
+        // TODO: test validations
+    }
+    
+    /**
+     * Get user by user name
+     *
+     * 
+     *
+     * @throws ApiException
+     *          if the Api call fails
+     */
+    @Test
+    public void getUserByNameTest() throws ApiException {
+        String username = null;
+        User response = api.getUserByName(username);
+
+        // TODO: test validations
+    }
+    
+    /**
+     * Logs user into the system
+     *
+     * 
+     *
+     * @throws ApiException
+     *          if the Api call fails
+     */
+    @Test
+    public void loginUserTest() throws ApiException {
+        String username = null;
+        String password = null;
+        String response = api.loginUser(username, password);
+
+        // TODO: test validations
+    }
+    
+    /**
+     * Logs out current logged in user session
+     *
+     * 
+     *
+     * @throws ApiException
+     *          if the Api call fails
+     */
+    @Test
+    public void logoutUserTest() throws ApiException {
+        api.logoutUser();
+
+        // TODO: test validations
+    }
+    
+    /**
+     * Updated user
+     *
+     * This can only be done by the logged in user.
+     *
+     * @throws ApiException
+     *          if the Api call fails
+     */
+    @Test
+    public void updateUserTest() throws ApiException {
+        String username = null;
+        User body = null;
+        api.updateUser(username, body);
+
+        // TODO: test validations
+    }
+    
+}
diff --git a/samples/client/petstore/java/native/src/test/java/org/openapitools/client/model/AdditionalPropertiesAnyTypeTest.java b/samples/client/petstore/java/native/src/test/java/org/openapitools/client/model/AdditionalPropertiesAnyTypeTest.java
new file mode 100644
index 0000000000..7f17caef95
--- /dev/null
+++ b/samples/client/petstore/java/native/src/test/java/org/openapitools/client/model/AdditionalPropertiesAnyTypeTest.java
@@ -0,0 +1,50 @@
+/*
+ * OpenAPI Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+
+package org.openapitools.client.model;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonValue;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import java.util.HashMap;
+import java.util.Map;
+import org.junit.Assert;
+import org.junit.Ignore;
+import org.junit.Test;
+
+
+/**
+ * Model tests for AdditionalPropertiesAnyType
+ */
+public class AdditionalPropertiesAnyTypeTest {
+    private final AdditionalPropertiesAnyType model = new AdditionalPropertiesAnyType();
+
+    /**
+     * Model tests for AdditionalPropertiesAnyType
+     */
+    @Test
+    public void testAdditionalPropertiesAnyType() {
+        // TODO: test AdditionalPropertiesAnyType
+    }
+
+    /**
+     * Test the property 'name'
+     */
+    @Test
+    public void nameTest() {
+        // TODO: test name
+    }
+
+}
diff --git a/samples/client/petstore/java/native/src/test/java/org/openapitools/client/model/AdditionalPropertiesArrayTest.java b/samples/client/petstore/java/native/src/test/java/org/openapitools/client/model/AdditionalPropertiesArrayTest.java
new file mode 100644
index 0000000000..4f90e42398
--- /dev/null
+++ b/samples/client/petstore/java/native/src/test/java/org/openapitools/client/model/AdditionalPropertiesArrayTest.java
@@ -0,0 +1,51 @@
+/*
+ * OpenAPI Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+
+package org.openapitools.client.model;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonValue;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import org.junit.Assert;
+import org.junit.Ignore;
+import org.junit.Test;
+
+
+/**
+ * Model tests for AdditionalPropertiesArray
+ */
+public class AdditionalPropertiesArrayTest {
+    private final AdditionalPropertiesArray model = new AdditionalPropertiesArray();
+
+    /**
+     * Model tests for AdditionalPropertiesArray
+     */
+    @Test
+    public void testAdditionalPropertiesArray() {
+        // TODO: test AdditionalPropertiesArray
+    }
+
+    /**
+     * Test the property 'name'
+     */
+    @Test
+    public void nameTest() {
+        // TODO: test name
+    }
+
+}
diff --git a/samples/client/petstore/java/native/src/test/java/org/openapitools/client/model/AdditionalPropertiesBooleanTest.java b/samples/client/petstore/java/native/src/test/java/org/openapitools/client/model/AdditionalPropertiesBooleanTest.java
new file mode 100644
index 0000000000..2136768d35
--- /dev/null
+++ b/samples/client/petstore/java/native/src/test/java/org/openapitools/client/model/AdditionalPropertiesBooleanTest.java
@@ -0,0 +1,50 @@
+/*
+ * OpenAPI Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+
+package org.openapitools.client.model;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonValue;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import java.util.HashMap;
+import java.util.Map;
+import org.junit.Assert;
+import org.junit.Ignore;
+import org.junit.Test;
+
+
+/**
+ * Model tests for AdditionalPropertiesBoolean
+ */
+public class AdditionalPropertiesBooleanTest {
+    private final AdditionalPropertiesBoolean model = new AdditionalPropertiesBoolean();
+
+    /**
+     * Model tests for AdditionalPropertiesBoolean
+     */
+    @Test
+    public void testAdditionalPropertiesBoolean() {
+        // TODO: test AdditionalPropertiesBoolean
+    }
+
+    /**
+     * Test the property 'name'
+     */
+    @Test
+    public void nameTest() {
+        // TODO: test name
+    }
+
+}
diff --git a/samples/client/petstore/java/native/src/test/java/org/openapitools/client/model/AdditionalPropertiesClassTest.java b/samples/client/petstore/java/native/src/test/java/org/openapitools/client/model/AdditionalPropertiesClassTest.java
new file mode 100644
index 0000000000..c16a83b37c
--- /dev/null
+++ b/samples/client/petstore/java/native/src/test/java/org/openapitools/client/model/AdditionalPropertiesClassTest.java
@@ -0,0 +1,132 @@
+/*
+ * OpenAPI Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+
+package org.openapitools.client.model;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonValue;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import java.math.BigDecimal;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import org.junit.Assert;
+import org.junit.Ignore;
+import org.junit.Test;
+
+
+/**
+ * Model tests for AdditionalPropertiesClass
+ */
+public class AdditionalPropertiesClassTest {
+    private final AdditionalPropertiesClass model = new AdditionalPropertiesClass();
+
+    /**
+     * Model tests for AdditionalPropertiesClass
+     */
+    @Test
+    public void testAdditionalPropertiesClass() {
+        // TODO: test AdditionalPropertiesClass
+    }
+
+    /**
+     * Test the property 'mapString'
+     */
+    @Test
+    public void mapStringTest() {
+        // TODO: test mapString
+    }
+
+    /**
+     * Test the property 'mapNumber'
+     */
+    @Test
+    public void mapNumberTest() {
+        // TODO: test mapNumber
+    }
+
+    /**
+     * Test the property 'mapInteger'
+     */
+    @Test
+    public void mapIntegerTest() {
+        // TODO: test mapInteger
+    }
+
+    /**
+     * Test the property 'mapBoolean'
+     */
+    @Test
+    public void mapBooleanTest() {
+        // TODO: test mapBoolean
+    }
+
+    /**
+     * Test the property 'mapArrayInteger'
+     */
+    @Test
+    public void mapArrayIntegerTest() {
+        // TODO: test mapArrayInteger
+    }
+
+    /**
+     * Test the property 'mapArrayAnytype'
+     */
+    @Test
+    public void mapArrayAnytypeTest() {
+        // TODO: test mapArrayAnytype
+    }
+
+    /**
+     * Test the property 'mapMapString'
+     */
+    @Test
+    public void mapMapStringTest() {
+        // TODO: test mapMapString
+    }
+
+    /**
+     * Test the property 'mapMapAnytype'
+     */
+    @Test
+    public void mapMapAnytypeTest() {
+        // TODO: test mapMapAnytype
+    }
+
+    /**
+     * Test the property 'anytype1'
+     */
+    @Test
+    public void anytype1Test() {
+        // TODO: test anytype1
+    }
+
+    /**
+     * Test the property 'anytype2'
+     */
+    @Test
+    public void anytype2Test() {
+        // TODO: test anytype2
+    }
+
+    /**
+     * Test the property 'anytype3'
+     */
+    @Test
+    public void anytype3Test() {
+        // TODO: test anytype3
+    }
+
+}
diff --git a/samples/client/petstore/java/native/src/test/java/org/openapitools/client/model/AdditionalPropertiesIntegerTest.java b/samples/client/petstore/java/native/src/test/java/org/openapitools/client/model/AdditionalPropertiesIntegerTest.java
new file mode 100644
index 0000000000..ff1f5bf73d
--- /dev/null
+++ b/samples/client/petstore/java/native/src/test/java/org/openapitools/client/model/AdditionalPropertiesIntegerTest.java
@@ -0,0 +1,50 @@
+/*
+ * OpenAPI Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+
+package org.openapitools.client.model;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonValue;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import java.util.HashMap;
+import java.util.Map;
+import org.junit.Assert;
+import org.junit.Ignore;
+import org.junit.Test;
+
+
+/**
+ * Model tests for AdditionalPropertiesInteger
+ */
+public class AdditionalPropertiesIntegerTest {
+    private final AdditionalPropertiesInteger model = new AdditionalPropertiesInteger();
+
+    /**
+     * Model tests for AdditionalPropertiesInteger
+     */
+    @Test
+    public void testAdditionalPropertiesInteger() {
+        // TODO: test AdditionalPropertiesInteger
+    }
+
+    /**
+     * Test the property 'name'
+     */
+    @Test
+    public void nameTest() {
+        // TODO: test name
+    }
+
+}
diff --git a/samples/client/petstore/java/native/src/test/java/org/openapitools/client/model/AdditionalPropertiesNumberTest.java b/samples/client/petstore/java/native/src/test/java/org/openapitools/client/model/AdditionalPropertiesNumberTest.java
new file mode 100644
index 0000000000..64e1b79985
--- /dev/null
+++ b/samples/client/petstore/java/native/src/test/java/org/openapitools/client/model/AdditionalPropertiesNumberTest.java
@@ -0,0 +1,51 @@
+/*
+ * OpenAPI Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+
+package org.openapitools.client.model;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonValue;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import java.math.BigDecimal;
+import java.util.HashMap;
+import java.util.Map;
+import org.junit.Assert;
+import org.junit.Ignore;
+import org.junit.Test;
+
+
+/**
+ * Model tests for AdditionalPropertiesNumber
+ */
+public class AdditionalPropertiesNumberTest {
+    private final AdditionalPropertiesNumber model = new AdditionalPropertiesNumber();
+
+    /**
+     * Model tests for AdditionalPropertiesNumber
+     */
+    @Test
+    public void testAdditionalPropertiesNumber() {
+        // TODO: test AdditionalPropertiesNumber
+    }
+
+    /**
+     * Test the property 'name'
+     */
+    @Test
+    public void nameTest() {
+        // TODO: test name
+    }
+
+}
diff --git a/samples/client/petstore/java/native/src/test/java/org/openapitools/client/model/AdditionalPropertiesObjectTest.java b/samples/client/petstore/java/native/src/test/java/org/openapitools/client/model/AdditionalPropertiesObjectTest.java
new file mode 100644
index 0000000000..3a7be8304c
--- /dev/null
+++ b/samples/client/petstore/java/native/src/test/java/org/openapitools/client/model/AdditionalPropertiesObjectTest.java
@@ -0,0 +1,50 @@
+/*
+ * OpenAPI Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+
+package org.openapitools.client.model;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonValue;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import java.util.HashMap;
+import java.util.Map;
+import org.junit.Assert;
+import org.junit.Ignore;
+import org.junit.Test;
+
+
+/**
+ * Model tests for AdditionalPropertiesObject
+ */
+public class AdditionalPropertiesObjectTest {
+    private final AdditionalPropertiesObject model = new AdditionalPropertiesObject();
+
+    /**
+     * Model tests for AdditionalPropertiesObject
+     */
+    @Test
+    public void testAdditionalPropertiesObject() {
+        // TODO: test AdditionalPropertiesObject
+    }
+
+    /**
+     * Test the property 'name'
+     */
+    @Test
+    public void nameTest() {
+        // TODO: test name
+    }
+
+}
diff --git a/samples/client/petstore/java/native/src/test/java/org/openapitools/client/model/AdditionalPropertiesStringTest.java b/samples/client/petstore/java/native/src/test/java/org/openapitools/client/model/AdditionalPropertiesStringTest.java
new file mode 100644
index 0000000000..b434bc16ee
--- /dev/null
+++ b/samples/client/petstore/java/native/src/test/java/org/openapitools/client/model/AdditionalPropertiesStringTest.java
@@ -0,0 +1,50 @@
+/*
+ * OpenAPI Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+
+package org.openapitools.client.model;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonValue;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import java.util.HashMap;
+import java.util.Map;
+import org.junit.Assert;
+import org.junit.Ignore;
+import org.junit.Test;
+
+
+/**
+ * Model tests for AdditionalPropertiesString
+ */
+public class AdditionalPropertiesStringTest {
+    private final AdditionalPropertiesString model = new AdditionalPropertiesString();
+
+    /**
+     * Model tests for AdditionalPropertiesString
+     */
+    @Test
+    public void testAdditionalPropertiesString() {
+        // TODO: test AdditionalPropertiesString
+    }
+
+    /**
+     * Test the property 'name'
+     */
+    @Test
+    public void nameTest() {
+        // TODO: test name
+    }
+
+}
diff --git a/samples/client/petstore/java/native/src/test/java/org/openapitools/client/model/AnimalTest.java b/samples/client/petstore/java/native/src/test/java/org/openapitools/client/model/AnimalTest.java
new file mode 100644
index 0000000000..288f496c19
--- /dev/null
+++ b/samples/client/petstore/java/native/src/test/java/org/openapitools/client/model/AnimalTest.java
@@ -0,0 +1,58 @@
+/*
+ * OpenAPI Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+
+package org.openapitools.client.model;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonSubTypes;
+import com.fasterxml.jackson.annotation.JsonTypeInfo;
+import com.fasterxml.jackson.annotation.JsonValue;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import org.junit.Assert;
+import org.junit.Ignore;
+import org.junit.Test;
+
+
+/**
+ * Model tests for Animal
+ */
+public class AnimalTest {
+    private final Animal model = new Animal();
+
+    /**
+     * Model tests for Animal
+     */
+    @Test
+    public void testAnimal() {
+        // TODO: test Animal
+    }
+
+    /**
+     * Test the property 'className'
+     */
+    @Test
+    public void classNameTest() {
+        // TODO: test className
+    }
+
+    /**
+     * Test the property 'color'
+     */
+    @Test
+    public void colorTest() {
+        // TODO: test color
+    }
+
+}
diff --git a/samples/client/petstore/java/native/src/test/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnlyTest.java b/samples/client/petstore/java/native/src/test/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnlyTest.java
new file mode 100644
index 0000000000..70f2cb25d4
--- /dev/null
+++ b/samples/client/petstore/java/native/src/test/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnlyTest.java
@@ -0,0 +1,51 @@
+/*
+ * OpenAPI Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+
+package org.openapitools.client.model;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonValue;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import java.math.BigDecimal;
+import java.util.ArrayList;
+import java.util.List;
+import org.junit.Assert;
+import org.junit.Ignore;
+import org.junit.Test;
+
+
+/**
+ * Model tests for ArrayOfArrayOfNumberOnly
+ */
+public class ArrayOfArrayOfNumberOnlyTest {
+    private final ArrayOfArrayOfNumberOnly model = new ArrayOfArrayOfNumberOnly();
+
+    /**
+     * Model tests for ArrayOfArrayOfNumberOnly
+     */
+    @Test
+    public void testArrayOfArrayOfNumberOnly() {
+        // TODO: test ArrayOfArrayOfNumberOnly
+    }
+
+    /**
+     * Test the property 'arrayArrayNumber'
+     */
+    @Test
+    public void arrayArrayNumberTest() {
+        // TODO: test arrayArrayNumber
+    }
+
+}
diff --git a/samples/client/petstore/java/native/src/test/java/org/openapitools/client/model/ArrayOfNumberOnlyTest.java b/samples/client/petstore/java/native/src/test/java/org/openapitools/client/model/ArrayOfNumberOnlyTest.java
new file mode 100644
index 0000000000..8621c69bf3
--- /dev/null
+++ b/samples/client/petstore/java/native/src/test/java/org/openapitools/client/model/ArrayOfNumberOnlyTest.java
@@ -0,0 +1,51 @@
+/*
+ * OpenAPI Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+
+package org.openapitools.client.model;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonValue;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import java.math.BigDecimal;
+import java.util.ArrayList;
+import java.util.List;
+import org.junit.Assert;
+import org.junit.Ignore;
+import org.junit.Test;
+
+
+/**
+ * Model tests for ArrayOfNumberOnly
+ */
+public class ArrayOfNumberOnlyTest {
+    private final ArrayOfNumberOnly model = new ArrayOfNumberOnly();
+
+    /**
+     * Model tests for ArrayOfNumberOnly
+     */
+    @Test
+    public void testArrayOfNumberOnly() {
+        // TODO: test ArrayOfNumberOnly
+    }
+
+    /**
+     * Test the property 'arrayNumber'
+     */
+    @Test
+    public void arrayNumberTest() {
+        // TODO: test arrayNumber
+    }
+
+}
diff --git a/samples/client/petstore/java/native/src/test/java/org/openapitools/client/model/ArrayTestTest.java b/samples/client/petstore/java/native/src/test/java/org/openapitools/client/model/ArrayTestTest.java
new file mode 100644
index 0000000000..38f8f6a72b
--- /dev/null
+++ b/samples/client/petstore/java/native/src/test/java/org/openapitools/client/model/ArrayTestTest.java
@@ -0,0 +1,67 @@
+/*
+ * OpenAPI Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+
+package org.openapitools.client.model;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonValue;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import java.util.ArrayList;
+import java.util.List;
+import org.openapitools.client.model.ReadOnlyFirst;
+import org.junit.Assert;
+import org.junit.Ignore;
+import org.junit.Test;
+
+
+/**
+ * Model tests for ArrayTest
+ */
+public class ArrayTestTest {
+    private final ArrayTest model = new ArrayTest();
+
+    /**
+     * Model tests for ArrayTest
+     */
+    @Test
+    public void testArrayTest() {
+        // TODO: test ArrayTest
+    }
+
+    /**
+     * Test the property 'arrayOfString'
+     */
+    @Test
+    public void arrayOfStringTest() {
+        // TODO: test arrayOfString
+    }
+
+    /**
+     * Test the property 'arrayArrayOfInteger'
+     */
+    @Test
+    public void arrayArrayOfIntegerTest() {
+        // TODO: test arrayArrayOfInteger
+    }
+
+    /**
+     * Test the property 'arrayArrayOfModel'
+     */
+    @Test
+    public void arrayArrayOfModelTest() {
+        // TODO: test arrayArrayOfModel
+    }
+
+}
diff --git a/samples/client/petstore/java/native/src/test/java/org/openapitools/client/model/CapitalizationTest.java b/samples/client/petstore/java/native/src/test/java/org/openapitools/client/model/CapitalizationTest.java
new file mode 100644
index 0000000000..077001565e
--- /dev/null
+++ b/samples/client/petstore/java/native/src/test/java/org/openapitools/client/model/CapitalizationTest.java
@@ -0,0 +1,88 @@
+/*
+ * OpenAPI Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+
+package org.openapitools.client.model;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonValue;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import org.junit.Assert;
+import org.junit.Ignore;
+import org.junit.Test;
+
+
+/**
+ * Model tests for Capitalization
+ */
+public class CapitalizationTest {
+    private final Capitalization model = new Capitalization();
+
+    /**
+     * Model tests for Capitalization
+     */
+    @Test
+    public void testCapitalization() {
+        // TODO: test Capitalization
+    }
+
+    /**
+     * Test the property 'smallCamel'
+     */
+    @Test
+    public void smallCamelTest() {
+        // TODO: test smallCamel
+    }
+
+    /**
+     * Test the property 'capitalCamel'
+     */
+    @Test
+    public void capitalCamelTest() {
+        // TODO: test capitalCamel
+    }
+
+    /**
+     * Test the property 'smallSnake'
+     */
+    @Test
+    public void smallSnakeTest() {
+        // TODO: test smallSnake
+    }
+
+    /**
+     * Test the property 'capitalSnake'
+     */
+    @Test
+    public void capitalSnakeTest() {
+        // TODO: test capitalSnake
+    }
+
+    /**
+     * Test the property 'scAETHFlowPoints'
+     */
+    @Test
+    public void scAETHFlowPointsTest() {
+        // TODO: test scAETHFlowPoints
+    }
+
+    /**
+     * Test the property 'ATT_NAME'
+     */
+    @Test
+    public void ATT_NAMETest() {
+        // TODO: test ATT_NAME
+    }
+
+}
diff --git a/samples/client/petstore/java/native/src/test/java/org/openapitools/client/model/CatAllOfTest.java b/samples/client/petstore/java/native/src/test/java/org/openapitools/client/model/CatAllOfTest.java
new file mode 100644
index 0000000000..989e4c8d14
--- /dev/null
+++ b/samples/client/petstore/java/native/src/test/java/org/openapitools/client/model/CatAllOfTest.java
@@ -0,0 +1,48 @@
+/*
+ * OpenAPI Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+
+package org.openapitools.client.model;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonValue;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import org.junit.Assert;
+import org.junit.Ignore;
+import org.junit.Test;
+
+
+/**
+ * Model tests for CatAllOf
+ */
+public class CatAllOfTest {
+    private final CatAllOf model = new CatAllOf();
+
+    /**
+     * Model tests for CatAllOf
+     */
+    @Test
+    public void testCatAllOf() {
+        // TODO: test CatAllOf
+    }
+
+    /**
+     * Test the property 'declawed'
+     */
+    @Test
+    public void declawedTest() {
+        // TODO: test declawed
+    }
+
+}
diff --git a/samples/client/petstore/java/native/src/test/java/org/openapitools/client/model/CatTest.java b/samples/client/petstore/java/native/src/test/java/org/openapitools/client/model/CatTest.java
new file mode 100644
index 0000000000..91bf0ba87a
--- /dev/null
+++ b/samples/client/petstore/java/native/src/test/java/org/openapitools/client/model/CatTest.java
@@ -0,0 +1,58 @@
+/*
+ * OpenAPI Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+
+package org.openapitools.client.model;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonValue;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import org.openapitools.client.model.Animal;
+import org.openapitools.client.model.CatAllOf;
+import org.junit.Assert;
+import org.junit.Ignore;
+import org.junit.Test;
+
+
+/**
+ * Model tests for Cat
+ */
+public class CatTest {
+    private final Cat model = new Cat();
+
+    /**
+     * Model tests for Cat
+     */
+    @Test
+    public void testCat() {
+        // TODO: test Cat
+    }
+
+    /**
+     * Test the property 'className'
+     */
+    @Test
+    public void classNameTest() {
+        // TODO: test className
+    }
+
+    /**
+     * Test the property 'color'
+     */
+    @Test
+    public void colorTest() {
+        // TODO: test color
+    }
+
+}
diff --git a/samples/client/petstore/java/native/src/test/java/org/openapitools/client/model/CategoryTest.java b/samples/client/petstore/java/native/src/test/java/org/openapitools/client/model/CategoryTest.java
new file mode 100644
index 0000000000..e3b82ec76f
--- /dev/null
+++ b/samples/client/petstore/java/native/src/test/java/org/openapitools/client/model/CategoryTest.java
@@ -0,0 +1,56 @@
+/*
+ * OpenAPI Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+
+package org.openapitools.client.model;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonValue;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import org.junit.Assert;
+import org.junit.Ignore;
+import org.junit.Test;
+
+
+/**
+ * Model tests for Category
+ */
+public class CategoryTest {
+    private final Category model = new Category();
+
+    /**
+     * Model tests for Category
+     */
+    @Test
+    public void testCategory() {
+        // TODO: test Category
+    }
+
+    /**
+     * Test the property 'id'
+     */
+    @Test
+    public void idTest() {
+        // TODO: test id
+    }
+
+    /**
+     * Test the property 'name'
+     */
+    @Test
+    public void nameTest() {
+        // TODO: test name
+    }
+
+}
diff --git a/samples/client/petstore/java/native/src/test/java/org/openapitools/client/model/ClassModelTest.java b/samples/client/petstore/java/native/src/test/java/org/openapitools/client/model/ClassModelTest.java
new file mode 100644
index 0000000000..a6ab71b546
--- /dev/null
+++ b/samples/client/petstore/java/native/src/test/java/org/openapitools/client/model/ClassModelTest.java
@@ -0,0 +1,48 @@
+/*
+ * OpenAPI Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+
+package org.openapitools.client.model;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonValue;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import org.junit.Assert;
+import org.junit.Ignore;
+import org.junit.Test;
+
+
+/**
+ * Model tests for ClassModel
+ */
+public class ClassModelTest {
+    private final ClassModel model = new ClassModel();
+
+    /**
+     * Model tests for ClassModel
+     */
+    @Test
+    public void testClassModel() {
+        // TODO: test ClassModel
+    }
+
+    /**
+     * Test the property 'propertyClass'
+     */
+    @Test
+    public void propertyClassTest() {
+        // TODO: test propertyClass
+    }
+
+}
diff --git a/samples/client/petstore/java/native/src/test/java/org/openapitools/client/model/ClientTest.java b/samples/client/petstore/java/native/src/test/java/org/openapitools/client/model/ClientTest.java
new file mode 100644
index 0000000000..09b37202e1
--- /dev/null
+++ b/samples/client/petstore/java/native/src/test/java/org/openapitools/client/model/ClientTest.java
@@ -0,0 +1,48 @@
+/*
+ * OpenAPI Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+
+package org.openapitools.client.model;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonValue;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import org.junit.Assert;
+import org.junit.Ignore;
+import org.junit.Test;
+
+
+/**
+ * Model tests for Client
+ */
+public class ClientTest {
+    private final Client model = new Client();
+
+    /**
+     * Model tests for Client
+     */
+    @Test
+    public void testClient() {
+        // TODO: test Client
+    }
+
+    /**
+     * Test the property 'client'
+     */
+    @Test
+    public void clientTest() {
+        // TODO: test client
+    }
+
+}
diff --git a/samples/client/petstore/java/native/src/test/java/org/openapitools/client/model/DogAllOfTest.java b/samples/client/petstore/java/native/src/test/java/org/openapitools/client/model/DogAllOfTest.java
new file mode 100644
index 0000000000..4ddd0d5c8c
--- /dev/null
+++ b/samples/client/petstore/java/native/src/test/java/org/openapitools/client/model/DogAllOfTest.java
@@ -0,0 +1,48 @@
+/*
+ * OpenAPI Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+
+package org.openapitools.client.model;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonValue;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import org.junit.Assert;
+import org.junit.Ignore;
+import org.junit.Test;
+
+
+/**
+ * Model tests for DogAllOf
+ */
+public class DogAllOfTest {
+    private final DogAllOf model = new DogAllOf();
+
+    /**
+     * Model tests for DogAllOf
+     */
+    @Test
+    public void testDogAllOf() {
+        // TODO: test DogAllOf
+    }
+
+    /**
+     * Test the property 'breed'
+     */
+    @Test
+    public void breedTest() {
+        // TODO: test breed
+    }
+
+}
diff --git a/samples/client/petstore/java/native/src/test/java/org/openapitools/client/model/DogTest.java b/samples/client/petstore/java/native/src/test/java/org/openapitools/client/model/DogTest.java
new file mode 100644
index 0000000000..9c1bc2e3b3
--- /dev/null
+++ b/samples/client/petstore/java/native/src/test/java/org/openapitools/client/model/DogTest.java
@@ -0,0 +1,58 @@
+/*
+ * OpenAPI Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+
+package org.openapitools.client.model;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonValue;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import org.openapitools.client.model.Animal;
+import org.openapitools.client.model.DogAllOf;
+import org.junit.Assert;
+import org.junit.Ignore;
+import org.junit.Test;
+
+
+/**
+ * Model tests for Dog
+ */
+public class DogTest {
+    private final Dog model = new Dog();
+
+    /**
+     * Model tests for Dog
+     */
+    @Test
+    public void testDog() {
+        // TODO: test Dog
+    }
+
+    /**
+     * Test the property 'className'
+     */
+    @Test
+    public void classNameTest() {
+        // TODO: test className
+    }
+
+    /**
+     * Test the property 'color'
+     */
+    @Test
+    public void colorTest() {
+        // TODO: test color
+    }
+
+}
diff --git a/samples/client/petstore/java/native/src/test/java/org/openapitools/client/model/EnumArraysTest.java b/samples/client/petstore/java/native/src/test/java/org/openapitools/client/model/EnumArraysTest.java
new file mode 100644
index 0000000000..d6be9e0d84
--- /dev/null
+++ b/samples/client/petstore/java/native/src/test/java/org/openapitools/client/model/EnumArraysTest.java
@@ -0,0 +1,58 @@
+/*
+ * OpenAPI Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+
+package org.openapitools.client.model;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonValue;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import java.util.ArrayList;
+import java.util.List;
+import org.junit.Assert;
+import org.junit.Ignore;
+import org.junit.Test;
+
+
+/**
+ * Model tests for EnumArrays
+ */
+public class EnumArraysTest {
+    private final EnumArrays model = new EnumArrays();
+
+    /**
+     * Model tests for EnumArrays
+     */
+    @Test
+    public void testEnumArrays() {
+        // TODO: test EnumArrays
+    }
+
+    /**
+     * Test the property 'justSymbol'
+     */
+    @Test
+    public void justSymbolTest() {
+        // TODO: test justSymbol
+    }
+
+    /**
+     * Test the property 'arrayEnum'
+     */
+    @Test
+    public void arrayEnumTest() {
+        // TODO: test arrayEnum
+    }
+
+}
diff --git a/samples/client/petstore/java/native/src/test/java/org/openapitools/client/model/EnumClassTest.java b/samples/client/petstore/java/native/src/test/java/org/openapitools/client/model/EnumClassTest.java
new file mode 100644
index 0000000000..9e45543fac
--- /dev/null
+++ b/samples/client/petstore/java/native/src/test/java/org/openapitools/client/model/EnumClassTest.java
@@ -0,0 +1,33 @@
+/*
+ * OpenAPI Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+
+package org.openapitools.client.model;
+
+import org.junit.Assert;
+import org.junit.Ignore;
+import org.junit.Test;
+
+
+/**
+ * Model tests for EnumClass
+ */
+public class EnumClassTest {
+    /**
+     * Model tests for EnumClass
+     */
+    @Test
+    public void testEnumClass() {
+        // TODO: test EnumClass
+    }
+
+}
diff --git a/samples/client/petstore/java/native/src/test/java/org/openapitools/client/model/EnumTestTest.java b/samples/client/petstore/java/native/src/test/java/org/openapitools/client/model/EnumTestTest.java
new file mode 100644
index 0000000000..278f13d151
--- /dev/null
+++ b/samples/client/petstore/java/native/src/test/java/org/openapitools/client/model/EnumTestTest.java
@@ -0,0 +1,81 @@
+/*
+ * OpenAPI Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+
+package org.openapitools.client.model;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonValue;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import org.openapitools.client.model.OuterEnum;
+import org.junit.Assert;
+import org.junit.Ignore;
+import org.junit.Test;
+
+
+/**
+ * Model tests for EnumTest
+ */
+public class EnumTestTest {
+    private final EnumTest model = new EnumTest();
+
+    /**
+     * Model tests for EnumTest
+     */
+    @Test
+    public void testEnumTest() {
+        // TODO: test EnumTest
+    }
+
+    /**
+     * Test the property 'enumString'
+     */
+    @Test
+    public void enumStringTest() {
+        // TODO: test enumString
+    }
+
+    /**
+     * Test the property 'enumStringRequired'
+     */
+    @Test
+    public void enumStringRequiredTest() {
+        // TODO: test enumStringRequired
+    }
+
+    /**
+     * Test the property 'enumInteger'
+     */
+    @Test
+    public void enumIntegerTest() {
+        // TODO: test enumInteger
+    }
+
+    /**
+     * Test the property 'enumNumber'
+     */
+    @Test
+    public void enumNumberTest() {
+        // TODO: test enumNumber
+    }
+
+    /**
+     * Test the property 'outerEnum'
+     */
+    @Test
+    public void outerEnumTest() {
+        // TODO: test outerEnum
+    }
+
+}
diff --git a/samples/client/petstore/java/native/src/test/java/org/openapitools/client/model/FileSchemaTestClassTest.java b/samples/client/petstore/java/native/src/test/java/org/openapitools/client/model/FileSchemaTestClassTest.java
new file mode 100644
index 0000000000..b62c3d1c0d
--- /dev/null
+++ b/samples/client/petstore/java/native/src/test/java/org/openapitools/client/model/FileSchemaTestClassTest.java
@@ -0,0 +1,58 @@
+/*
+ * OpenAPI Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+
+package org.openapitools.client.model;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonValue;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import java.util.ArrayList;
+import java.util.List;
+import org.junit.Assert;
+import org.junit.Ignore;
+import org.junit.Test;
+
+
+/**
+ * Model tests for FileSchemaTestClass
+ */
+public class FileSchemaTestClassTest {
+    private final FileSchemaTestClass model = new FileSchemaTestClass();
+
+    /**
+     * Model tests for FileSchemaTestClass
+     */
+    @Test
+    public void testFileSchemaTestClass() {
+        // TODO: test FileSchemaTestClass
+    }
+
+    /**
+     * Test the property 'file'
+     */
+    @Test
+    public void fileTest() {
+        // TODO: test file
+    }
+
+    /**
+     * Test the property 'files'
+     */
+    @Test
+    public void filesTest() {
+        // TODO: test files
+    }
+
+}
diff --git a/samples/client/petstore/java/native/src/test/java/org/openapitools/client/model/FormatTestTest.java b/samples/client/petstore/java/native/src/test/java/org/openapitools/client/model/FormatTestTest.java
new file mode 100644
index 0000000000..a82c13f333
--- /dev/null
+++ b/samples/client/petstore/java/native/src/test/java/org/openapitools/client/model/FormatTestTest.java
@@ -0,0 +1,149 @@
+/*
+ * OpenAPI Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+
+package org.openapitools.client.model;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonValue;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import java.io.File;
+import java.math.BigDecimal;
+import java.time.LocalDate;
+import java.time.OffsetDateTime;
+import java.util.UUID;
+import org.junit.Assert;
+import org.junit.Ignore;
+import org.junit.Test;
+
+
+/**
+ * Model tests for FormatTest
+ */
+public class FormatTestTest {
+    private final FormatTest model = new FormatTest();
+
+    /**
+     * Model tests for FormatTest
+     */
+    @Test
+    public void testFormatTest() {
+        // TODO: test FormatTest
+    }
+
+    /**
+     * Test the property 'integer'
+     */
+    @Test
+    public void integerTest() {
+        // TODO: test integer
+    }
+
+    /**
+     * Test the property 'int32'
+     */
+    @Test
+    public void int32Test() {
+        // TODO: test int32
+    }
+
+    /**
+     * Test the property 'int64'
+     */
+    @Test
+    public void int64Test() {
+        // TODO: test int64
+    }
+
+    /**
+     * Test the property 'number'
+     */
+    @Test
+    public void numberTest() {
+        // TODO: test number
+    }
+
+    /**
+     * Test the property '_float'
+     */
+    @Test
+    public void _floatTest() {
+        // TODO: test _float
+    }
+
+    /**
+     * Test the property '_double'
+     */
+    @Test
+    public void _doubleTest() {
+        // TODO: test _double
+    }
+
+    /**
+     * Test the property 'string'
+     */
+    @Test
+    public void stringTest() {
+        // TODO: test string
+    }
+
+    /**
+     * Test the property '_byte'
+     */
+    @Test
+    public void _byteTest() {
+        // TODO: test _byte
+    }
+
+    /**
+     * Test the property 'binary'
+     */
+    @Test
+    public void binaryTest() {
+        // TODO: test binary
+    }
+
+    /**
+     * Test the property 'date'
+     */
+    @Test
+    public void dateTest() {
+        // TODO: test date
+    }
+
+    /**
+     * Test the property 'dateTime'
+     */
+    @Test
+    public void dateTimeTest() {
+        // TODO: test dateTime
+    }
+
+    /**
+     * Test the property 'uuid'
+     */
+    @Test
+    public void uuidTest() {
+        // TODO: test uuid
+    }
+
+    /**
+     * Test the property 'password'
+     */
+    @Test
+    public void passwordTest() {
+        // TODO: test password
+    }
+
+}
diff --git a/samples/client/petstore/java/native/src/test/java/org/openapitools/client/model/HasOnlyReadOnlyTest.java b/samples/client/petstore/java/native/src/test/java/org/openapitools/client/model/HasOnlyReadOnlyTest.java
new file mode 100644
index 0000000000..8adce96ff9
--- /dev/null
+++ b/samples/client/petstore/java/native/src/test/java/org/openapitools/client/model/HasOnlyReadOnlyTest.java
@@ -0,0 +1,56 @@
+/*
+ * OpenAPI Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+
+package org.openapitools.client.model;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonValue;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import org.junit.Assert;
+import org.junit.Ignore;
+import org.junit.Test;
+
+
+/**
+ * Model tests for HasOnlyReadOnly
+ */
+public class HasOnlyReadOnlyTest {
+    private final HasOnlyReadOnly model = new HasOnlyReadOnly();
+
+    /**
+     * Model tests for HasOnlyReadOnly
+     */
+    @Test
+    public void testHasOnlyReadOnly() {
+        // TODO: test HasOnlyReadOnly
+    }
+
+    /**
+     * Test the property 'bar'
+     */
+    @Test
+    public void barTest() {
+        // TODO: test bar
+    }
+
+    /**
+     * Test the property 'foo'
+     */
+    @Test
+    public void fooTest() {
+        // TODO: test foo
+    }
+
+}
diff --git a/samples/client/petstore/java/native/src/test/java/org/openapitools/client/model/MapTestTest.java b/samples/client/petstore/java/native/src/test/java/org/openapitools/client/model/MapTestTest.java
new file mode 100644
index 0000000000..25bcac7b98
--- /dev/null
+++ b/samples/client/petstore/java/native/src/test/java/org/openapitools/client/model/MapTestTest.java
@@ -0,0 +1,75 @@
+/*
+ * OpenAPI Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+
+package org.openapitools.client.model;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonValue;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import org.junit.Assert;
+import org.junit.Ignore;
+import org.junit.Test;
+
+
+/**
+ * Model tests for MapTest
+ */
+public class MapTestTest {
+    private final MapTest model = new MapTest();
+
+    /**
+     * Model tests for MapTest
+     */
+    @Test
+    public void testMapTest() {
+        // TODO: test MapTest
+    }
+
+    /**
+     * Test the property 'mapMapOfString'
+     */
+    @Test
+    public void mapMapOfStringTest() {
+        // TODO: test mapMapOfString
+    }
+
+    /**
+     * Test the property 'mapOfEnumString'
+     */
+    @Test
+    public void mapOfEnumStringTest() {
+        // TODO: test mapOfEnumString
+    }
+
+    /**
+     * Test the property 'directMap'
+     */
+    @Test
+    public void directMapTest() {
+        // TODO: test directMap
+    }
+
+    /**
+     * Test the property 'indirectMap'
+     */
+    @Test
+    public void indirectMapTest() {
+        // TODO: test indirectMap
+    }
+
+}
diff --git a/samples/client/petstore/java/native/src/test/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClassTest.java b/samples/client/petstore/java/native/src/test/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClassTest.java
new file mode 100644
index 0000000000..0f0d56b2a9
--- /dev/null
+++ b/samples/client/petstore/java/native/src/test/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClassTest.java
@@ -0,0 +1,70 @@
+/*
+ * OpenAPI Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+
+package org.openapitools.client.model;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonValue;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import java.time.OffsetDateTime;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.UUID;
+import org.openapitools.client.model.Animal;
+import org.junit.Assert;
+import org.junit.Ignore;
+import org.junit.Test;
+
+
+/**
+ * Model tests for MixedPropertiesAndAdditionalPropertiesClass
+ */
+public class MixedPropertiesAndAdditionalPropertiesClassTest {
+    private final MixedPropertiesAndAdditionalPropertiesClass model = new MixedPropertiesAndAdditionalPropertiesClass();
+
+    /**
+     * Model tests for MixedPropertiesAndAdditionalPropertiesClass
+     */
+    @Test
+    public void testMixedPropertiesAndAdditionalPropertiesClass() {
+        // TODO: test MixedPropertiesAndAdditionalPropertiesClass
+    }
+
+    /**
+     * Test the property 'uuid'
+     */
+    @Test
+    public void uuidTest() {
+        // TODO: test uuid
+    }
+
+    /**
+     * Test the property 'dateTime'
+     */
+    @Test
+    public void dateTimeTest() {
+        // TODO: test dateTime
+    }
+
+    /**
+     * Test the property 'map'
+     */
+    @Test
+    public void mapTest() {
+        // TODO: test map
+    }
+
+}
diff --git a/samples/client/petstore/java/native/src/test/java/org/openapitools/client/model/Model200ResponseTest.java b/samples/client/petstore/java/native/src/test/java/org/openapitools/client/model/Model200ResponseTest.java
new file mode 100644
index 0000000000..40cdb83d4f
--- /dev/null
+++ b/samples/client/petstore/java/native/src/test/java/org/openapitools/client/model/Model200ResponseTest.java
@@ -0,0 +1,56 @@
+/*
+ * OpenAPI Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+
+package org.openapitools.client.model;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonValue;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import org.junit.Assert;
+import org.junit.Ignore;
+import org.junit.Test;
+
+
+/**
+ * Model tests for Model200Response
+ */
+public class Model200ResponseTest {
+    private final Model200Response model = new Model200Response();
+
+    /**
+     * Model tests for Model200Response
+     */
+    @Test
+    public void testModel200Response() {
+        // TODO: test Model200Response
+    }
+
+    /**
+     * Test the property 'name'
+     */
+    @Test
+    public void nameTest() {
+        // TODO: test name
+    }
+
+    /**
+     * Test the property 'propertyClass'
+     */
+    @Test
+    public void propertyClassTest() {
+        // TODO: test propertyClass
+    }
+
+}
diff --git a/samples/client/petstore/java/native/src/test/java/org/openapitools/client/model/ModelApiResponseTest.java b/samples/client/petstore/java/native/src/test/java/org/openapitools/client/model/ModelApiResponseTest.java
new file mode 100644
index 0000000000..e24e3fe8b8
--- /dev/null
+++ b/samples/client/petstore/java/native/src/test/java/org/openapitools/client/model/ModelApiResponseTest.java
@@ -0,0 +1,64 @@
+/*
+ * OpenAPI Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+
+package org.openapitools.client.model;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonValue;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import org.junit.Assert;
+import org.junit.Ignore;
+import org.junit.Test;
+
+
+/**
+ * Model tests for ModelApiResponse
+ */
+public class ModelApiResponseTest {
+    private final ModelApiResponse model = new ModelApiResponse();
+
+    /**
+     * Model tests for ModelApiResponse
+     */
+    @Test
+    public void testModelApiResponse() {
+        // TODO: test ModelApiResponse
+    }
+
+    /**
+     * Test the property 'code'
+     */
+    @Test
+    public void codeTest() {
+        // TODO: test code
+    }
+
+    /**
+     * Test the property 'type'
+     */
+    @Test
+    public void typeTest() {
+        // TODO: test type
+    }
+
+    /**
+     * Test the property 'message'
+     */
+    @Test
+    public void messageTest() {
+        // TODO: test message
+    }
+
+}
diff --git a/samples/client/petstore/java/native/src/test/java/org/openapitools/client/model/ModelReturnTest.java b/samples/client/petstore/java/native/src/test/java/org/openapitools/client/model/ModelReturnTest.java
new file mode 100644
index 0000000000..64df63c9b4
--- /dev/null
+++ b/samples/client/petstore/java/native/src/test/java/org/openapitools/client/model/ModelReturnTest.java
@@ -0,0 +1,48 @@
+/*
+ * OpenAPI Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+
+package org.openapitools.client.model;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonValue;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import org.junit.Assert;
+import org.junit.Ignore;
+import org.junit.Test;
+
+
+/**
+ * Model tests for ModelReturn
+ */
+public class ModelReturnTest {
+    private final ModelReturn model = new ModelReturn();
+
+    /**
+     * Model tests for ModelReturn
+     */
+    @Test
+    public void testModelReturn() {
+        // TODO: test ModelReturn
+    }
+
+    /**
+     * Test the property '_return'
+     */
+    @Test
+    public void _returnTest() {
+        // TODO: test _return
+    }
+
+}
diff --git a/samples/client/petstore/java/native/src/test/java/org/openapitools/client/model/NameTest.java b/samples/client/petstore/java/native/src/test/java/org/openapitools/client/model/NameTest.java
new file mode 100644
index 0000000000..906587a014
--- /dev/null
+++ b/samples/client/petstore/java/native/src/test/java/org/openapitools/client/model/NameTest.java
@@ -0,0 +1,72 @@
+/*
+ * OpenAPI Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+
+package org.openapitools.client.model;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonValue;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import org.junit.Assert;
+import org.junit.Ignore;
+import org.junit.Test;
+
+
+/**
+ * Model tests for Name
+ */
+public class NameTest {
+    private final Name model = new Name();
+
+    /**
+     * Model tests for Name
+     */
+    @Test
+    public void testName() {
+        // TODO: test Name
+    }
+
+    /**
+     * Test the property 'name'
+     */
+    @Test
+    public void nameTest() {
+        // TODO: test name
+    }
+
+    /**
+     * Test the property 'snakeCase'
+     */
+    @Test
+    public void snakeCaseTest() {
+        // TODO: test snakeCase
+    }
+
+    /**
+     * Test the property 'property'
+     */
+    @Test
+    public void propertyTest() {
+        // TODO: test property
+    }
+
+    /**
+     * Test the property '_123number'
+     */
+    @Test
+    public void _123numberTest() {
+        // TODO: test _123number
+    }
+
+}
diff --git a/samples/client/petstore/java/native/src/test/java/org/openapitools/client/model/NumberOnlyTest.java b/samples/client/petstore/java/native/src/test/java/org/openapitools/client/model/NumberOnlyTest.java
new file mode 100644
index 0000000000..25a6f85213
--- /dev/null
+++ b/samples/client/petstore/java/native/src/test/java/org/openapitools/client/model/NumberOnlyTest.java
@@ -0,0 +1,49 @@
+/*
+ * OpenAPI Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+
+package org.openapitools.client.model;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonValue;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import java.math.BigDecimal;
+import org.junit.Assert;
+import org.junit.Ignore;
+import org.junit.Test;
+
+
+/**
+ * Model tests for NumberOnly
+ */
+public class NumberOnlyTest {
+    private final NumberOnly model = new NumberOnly();
+
+    /**
+     * Model tests for NumberOnly
+     */
+    @Test
+    public void testNumberOnly() {
+        // TODO: test NumberOnly
+    }
+
+    /**
+     * Test the property 'justNumber'
+     */
+    @Test
+    public void justNumberTest() {
+        // TODO: test justNumber
+    }
+
+}
diff --git a/samples/client/petstore/java/native/src/test/java/org/openapitools/client/model/OrderTest.java b/samples/client/petstore/java/native/src/test/java/org/openapitools/client/model/OrderTest.java
new file mode 100644
index 0000000000..229a851a4a
--- /dev/null
+++ b/samples/client/petstore/java/native/src/test/java/org/openapitools/client/model/OrderTest.java
@@ -0,0 +1,89 @@
+/*
+ * OpenAPI Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+
+package org.openapitools.client.model;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonValue;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import java.time.OffsetDateTime;
+import org.junit.Assert;
+import org.junit.Ignore;
+import org.junit.Test;
+
+
+/**
+ * Model tests for Order
+ */
+public class OrderTest {
+    private final Order model = new Order();
+
+    /**
+     * Model tests for Order
+     */
+    @Test
+    public void testOrder() {
+        // TODO: test Order
+    }
+
+    /**
+     * Test the property 'id'
+     */
+    @Test
+    public void idTest() {
+        // TODO: test id
+    }
+
+    /**
+     * Test the property 'petId'
+     */
+    @Test
+    public void petIdTest() {
+        // TODO: test petId
+    }
+
+    /**
+     * Test the property 'quantity'
+     */
+    @Test
+    public void quantityTest() {
+        // TODO: test quantity
+    }
+
+    /**
+     * Test the property 'shipDate'
+     */
+    @Test
+    public void shipDateTest() {
+        // TODO: test shipDate
+    }
+
+    /**
+     * Test the property 'status'
+     */
+    @Test
+    public void statusTest() {
+        // TODO: test status
+    }
+
+    /**
+     * Test the property 'complete'
+     */
+    @Test
+    public void completeTest() {
+        // TODO: test complete
+    }
+
+}
diff --git a/samples/client/petstore/java/native/src/test/java/org/openapitools/client/model/OuterCompositeTest.java b/samples/client/petstore/java/native/src/test/java/org/openapitools/client/model/OuterCompositeTest.java
new file mode 100644
index 0000000000..6e37732d5f
--- /dev/null
+++ b/samples/client/petstore/java/native/src/test/java/org/openapitools/client/model/OuterCompositeTest.java
@@ -0,0 +1,65 @@
+/*
+ * OpenAPI Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+
+package org.openapitools.client.model;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonValue;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import java.math.BigDecimal;
+import org.junit.Assert;
+import org.junit.Ignore;
+import org.junit.Test;
+
+
+/**
+ * Model tests for OuterComposite
+ */
+public class OuterCompositeTest {
+    private final OuterComposite model = new OuterComposite();
+
+    /**
+     * Model tests for OuterComposite
+     */
+    @Test
+    public void testOuterComposite() {
+        // TODO: test OuterComposite
+    }
+
+    /**
+     * Test the property 'myNumber'
+     */
+    @Test
+    public void myNumberTest() {
+        // TODO: test myNumber
+    }
+
+    /**
+     * Test the property 'myString'
+     */
+    @Test
+    public void myStringTest() {
+        // TODO: test myString
+    }
+
+    /**
+     * Test the property 'myBoolean'
+     */
+    @Test
+    public void myBooleanTest() {
+        // TODO: test myBoolean
+    }
+
+}
diff --git a/samples/client/petstore/java/native/src/test/java/org/openapitools/client/model/OuterEnumTest.java b/samples/client/petstore/java/native/src/test/java/org/openapitools/client/model/OuterEnumTest.java
new file mode 100644
index 0000000000..cf0ebae0fa
--- /dev/null
+++ b/samples/client/petstore/java/native/src/test/java/org/openapitools/client/model/OuterEnumTest.java
@@ -0,0 +1,33 @@
+/*
+ * OpenAPI Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+
+package org.openapitools.client.model;
+
+import org.junit.Assert;
+import org.junit.Ignore;
+import org.junit.Test;
+
+
+/**
+ * Model tests for OuterEnum
+ */
+public class OuterEnumTest {
+    /**
+     * Model tests for OuterEnum
+     */
+    @Test
+    public void testOuterEnum() {
+        // TODO: test OuterEnum
+    }
+
+}
diff --git a/samples/client/petstore/java/native/src/test/java/org/openapitools/client/model/PetTest.java b/samples/client/petstore/java/native/src/test/java/org/openapitools/client/model/PetTest.java
new file mode 100644
index 0000000000..82c72033b5
--- /dev/null
+++ b/samples/client/petstore/java/native/src/test/java/org/openapitools/client/model/PetTest.java
@@ -0,0 +1,92 @@
+/*
+ * OpenAPI Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+
+package org.openapitools.client.model;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonValue;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import java.util.ArrayList;
+import java.util.List;
+import org.openapitools.client.model.Category;
+import org.openapitools.client.model.Tag;
+import org.junit.Assert;
+import org.junit.Ignore;
+import org.junit.Test;
+
+
+/**
+ * Model tests for Pet
+ */
+public class PetTest {
+    private final Pet model = new Pet();
+
+    /**
+     * Model tests for Pet
+     */
+    @Test
+    public void testPet() {
+        // TODO: test Pet
+    }
+
+    /**
+     * Test the property 'id'
+     */
+    @Test
+    public void idTest() {
+        // TODO: test id
+    }
+
+    /**
+     * Test the property 'category'
+     */
+    @Test
+    public void categoryTest() {
+        // TODO: test category
+    }
+
+    /**
+     * Test the property 'name'
+     */
+    @Test
+    public void nameTest() {
+        // TODO: test name
+    }
+
+    /**
+     * Test the property 'photoUrls'
+     */
+    @Test
+    public void photoUrlsTest() {
+        // TODO: test photoUrls
+    }
+
+    /**
+     * Test the property 'tags'
+     */
+    @Test
+    public void tagsTest() {
+        // TODO: test tags
+    }
+
+    /**
+     * Test the property 'status'
+     */
+    @Test
+    public void statusTest() {
+        // TODO: test status
+    }
+
+}
diff --git a/samples/client/petstore/java/native/src/test/java/org/openapitools/client/model/ReadOnlyFirstTest.java b/samples/client/petstore/java/native/src/test/java/org/openapitools/client/model/ReadOnlyFirstTest.java
new file mode 100644
index 0000000000..8ba8d24151
--- /dev/null
+++ b/samples/client/petstore/java/native/src/test/java/org/openapitools/client/model/ReadOnlyFirstTest.java
@@ -0,0 +1,56 @@
+/*
+ * OpenAPI Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+
+package org.openapitools.client.model;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonValue;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import org.junit.Assert;
+import org.junit.Ignore;
+import org.junit.Test;
+
+
+/**
+ * Model tests for ReadOnlyFirst
+ */
+public class ReadOnlyFirstTest {
+    private final ReadOnlyFirst model = new ReadOnlyFirst();
+
+    /**
+     * Model tests for ReadOnlyFirst
+     */
+    @Test
+    public void testReadOnlyFirst() {
+        // TODO: test ReadOnlyFirst
+    }
+
+    /**
+     * Test the property 'bar'
+     */
+    @Test
+    public void barTest() {
+        // TODO: test bar
+    }
+
+    /**
+     * Test the property 'baz'
+     */
+    @Test
+    public void bazTest() {
+        // TODO: test baz
+    }
+
+}
diff --git a/samples/client/petstore/java/native/src/test/java/org/openapitools/client/model/SpecialModelNameTest.java b/samples/client/petstore/java/native/src/test/java/org/openapitools/client/model/SpecialModelNameTest.java
new file mode 100644
index 0000000000..4cd639541b
--- /dev/null
+++ b/samples/client/petstore/java/native/src/test/java/org/openapitools/client/model/SpecialModelNameTest.java
@@ -0,0 +1,48 @@
+/*
+ * OpenAPI Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+
+package org.openapitools.client.model;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonValue;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import org.junit.Assert;
+import org.junit.Ignore;
+import org.junit.Test;
+
+
+/**
+ * Model tests for SpecialModelName
+ */
+public class SpecialModelNameTest {
+    private final SpecialModelName model = new SpecialModelName();
+
+    /**
+     * Model tests for SpecialModelName
+     */
+    @Test
+    public void testSpecialModelName() {
+        // TODO: test SpecialModelName
+    }
+
+    /**
+     * Test the property '$specialPropertyName'
+     */
+    @Test
+    public void $specialPropertyNameTest() {
+        // TODO: test $specialPropertyName
+    }
+
+}
diff --git a/samples/client/petstore/java/native/src/test/java/org/openapitools/client/model/TagTest.java b/samples/client/petstore/java/native/src/test/java/org/openapitools/client/model/TagTest.java
new file mode 100644
index 0000000000..8732cce6b0
--- /dev/null
+++ b/samples/client/petstore/java/native/src/test/java/org/openapitools/client/model/TagTest.java
@@ -0,0 +1,56 @@
+/*
+ * OpenAPI Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+
+package org.openapitools.client.model;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonValue;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import org.junit.Assert;
+import org.junit.Ignore;
+import org.junit.Test;
+
+
+/**
+ * Model tests for Tag
+ */
+public class TagTest {
+    private final Tag model = new Tag();
+
+    /**
+     * Model tests for Tag
+     */
+    @Test
+    public void testTag() {
+        // TODO: test Tag
+    }
+
+    /**
+     * Test the property 'id'
+     */
+    @Test
+    public void idTest() {
+        // TODO: test id
+    }
+
+    /**
+     * Test the property 'name'
+     */
+    @Test
+    public void nameTest() {
+        // TODO: test name
+    }
+
+}
diff --git a/samples/client/petstore/java/native/src/test/java/org/openapitools/client/model/TypeHolderDefaultTest.java b/samples/client/petstore/java/native/src/test/java/org/openapitools/client/model/TypeHolderDefaultTest.java
new file mode 100644
index 0000000000..38672c891f
--- /dev/null
+++ b/samples/client/petstore/java/native/src/test/java/org/openapitools/client/model/TypeHolderDefaultTest.java
@@ -0,0 +1,83 @@
+/*
+ * OpenAPI Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+
+package org.openapitools.client.model;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonValue;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import java.math.BigDecimal;
+import java.util.ArrayList;
+import java.util.List;
+import org.junit.Assert;
+import org.junit.Ignore;
+import org.junit.Test;
+
+
+/**
+ * Model tests for TypeHolderDefault
+ */
+public class TypeHolderDefaultTest {
+    private final TypeHolderDefault model = new TypeHolderDefault();
+
+    /**
+     * Model tests for TypeHolderDefault
+     */
+    @Test
+    public void testTypeHolderDefault() {
+        // TODO: test TypeHolderDefault
+    }
+
+    /**
+     * Test the property 'stringItem'
+     */
+    @Test
+    public void stringItemTest() {
+        // TODO: test stringItem
+    }
+
+    /**
+     * Test the property 'numberItem'
+     */
+    @Test
+    public void numberItemTest() {
+        // TODO: test numberItem
+    }
+
+    /**
+     * Test the property 'integerItem'
+     */
+    @Test
+    public void integerItemTest() {
+        // TODO: test integerItem
+    }
+
+    /**
+     * Test the property 'boolItem'
+     */
+    @Test
+    public void boolItemTest() {
+        // TODO: test boolItem
+    }
+
+    /**
+     * Test the property 'arrayItem'
+     */
+    @Test
+    public void arrayItemTest() {
+        // TODO: test arrayItem
+    }
+
+}
diff --git a/samples/client/petstore/java/native/src/test/java/org/openapitools/client/model/TypeHolderExampleTest.java b/samples/client/petstore/java/native/src/test/java/org/openapitools/client/model/TypeHolderExampleTest.java
new file mode 100644
index 0000000000..d2527ff622
--- /dev/null
+++ b/samples/client/petstore/java/native/src/test/java/org/openapitools/client/model/TypeHolderExampleTest.java
@@ -0,0 +1,83 @@
+/*
+ * OpenAPI Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+
+package org.openapitools.client.model;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonValue;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import java.math.BigDecimal;
+import java.util.ArrayList;
+import java.util.List;
+import org.junit.Assert;
+import org.junit.Ignore;
+import org.junit.Test;
+
+
+/**
+ * Model tests for TypeHolderExample
+ */
+public class TypeHolderExampleTest {
+    private final TypeHolderExample model = new TypeHolderExample();
+
+    /**
+     * Model tests for TypeHolderExample
+     */
+    @Test
+    public void testTypeHolderExample() {
+        // TODO: test TypeHolderExample
+    }
+
+    /**
+     * Test the property 'stringItem'
+     */
+    @Test
+    public void stringItemTest() {
+        // TODO: test stringItem
+    }
+
+    /**
+     * Test the property 'numberItem'
+     */
+    @Test
+    public void numberItemTest() {
+        // TODO: test numberItem
+    }
+
+    /**
+     * Test the property 'integerItem'
+     */
+    @Test
+    public void integerItemTest() {
+        // TODO: test integerItem
+    }
+
+    /**
+     * Test the property 'boolItem'
+     */
+    @Test
+    public void boolItemTest() {
+        // TODO: test boolItem
+    }
+
+    /**
+     * Test the property 'arrayItem'
+     */
+    @Test
+    public void arrayItemTest() {
+        // TODO: test arrayItem
+    }
+
+}
diff --git a/samples/client/petstore/java/native/src/test/java/org/openapitools/client/model/UserTest.java b/samples/client/petstore/java/native/src/test/java/org/openapitools/client/model/UserTest.java
new file mode 100644
index 0000000000..6aa343941c
--- /dev/null
+++ b/samples/client/petstore/java/native/src/test/java/org/openapitools/client/model/UserTest.java
@@ -0,0 +1,104 @@
+/*
+ * OpenAPI Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+
+package org.openapitools.client.model;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonValue;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import org.junit.Assert;
+import org.junit.Ignore;
+import org.junit.Test;
+
+
+/**
+ * Model tests for User
+ */
+public class UserTest {
+    private final User model = new User();
+
+    /**
+     * Model tests for User
+     */
+    @Test
+    public void testUser() {
+        // TODO: test User
+    }
+
+    /**
+     * Test the property 'id'
+     */
+    @Test
+    public void idTest() {
+        // TODO: test id
+    }
+
+    /**
+     * Test the property 'username'
+     */
+    @Test
+    public void usernameTest() {
+        // TODO: test username
+    }
+
+    /**
+     * Test the property 'firstName'
+     */
+    @Test
+    public void firstNameTest() {
+        // TODO: test firstName
+    }
+
+    /**
+     * Test the property 'lastName'
+     */
+    @Test
+    public void lastNameTest() {
+        // TODO: test lastName
+    }
+
+    /**
+     * Test the property 'email'
+     */
+    @Test
+    public void emailTest() {
+        // TODO: test email
+    }
+
+    /**
+     * Test the property 'password'
+     */
+    @Test
+    public void passwordTest() {
+        // TODO: test password
+    }
+
+    /**
+     * Test the property 'phone'
+     */
+    @Test
+    public void phoneTest() {
+        // TODO: test phone
+    }
+
+    /**
+     * Test the property 'userStatus'
+     */
+    @Test
+    public void userStatusTest() {
+        // TODO: test userStatus
+    }
+
+}
diff --git a/samples/client/petstore/java/native/src/test/java/org/openapitools/client/model/XmlItemTest.java b/samples/client/petstore/java/native/src/test/java/org/openapitools/client/model/XmlItemTest.java
new file mode 100644
index 0000000000..dfe5d66d99
--- /dev/null
+++ b/samples/client/petstore/java/native/src/test/java/org/openapitools/client/model/XmlItemTest.java
@@ -0,0 +1,275 @@
+/*
+ * OpenAPI Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+
+package org.openapitools.client.model;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonValue;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import java.math.BigDecimal;
+import java.util.ArrayList;
+import java.util.List;
+import org.junit.Assert;
+import org.junit.Ignore;
+import org.junit.Test;
+
+
+/**
+ * Model tests for XmlItem
+ */
+public class XmlItemTest {
+    private final XmlItem model = new XmlItem();
+
+    /**
+     * Model tests for XmlItem
+     */
+    @Test
+    public void testXmlItem() {
+        // TODO: test XmlItem
+    }
+
+    /**
+     * Test the property 'attributeString'
+     */
+    @Test
+    public void attributeStringTest() {
+        // TODO: test attributeString
+    }
+
+    /**
+     * Test the property 'attributeNumber'
+     */
+    @Test
+    public void attributeNumberTest() {
+        // TODO: test attributeNumber
+    }
+
+    /**
+     * Test the property 'attributeInteger'
+     */
+    @Test
+    public void attributeIntegerTest() {
+        // TODO: test attributeInteger
+    }
+
+    /**
+     * Test the property 'attributeBoolean'
+     */
+    @Test
+    public void attributeBooleanTest() {
+        // TODO: test attributeBoolean
+    }
+
+    /**
+     * Test the property 'wrappedArray'
+     */
+    @Test
+    public void wrappedArrayTest() {
+        // TODO: test wrappedArray
+    }
+
+    /**
+     * Test the property 'nameString'
+     */
+    @Test
+    public void nameStringTest() {
+        // TODO: test nameString
+    }
+
+    /**
+     * Test the property 'nameNumber'
+     */
+    @Test
+    public void nameNumberTest() {
+        // TODO: test nameNumber
+    }
+
+    /**
+     * Test the property 'nameInteger'
+     */
+    @Test
+    public void nameIntegerTest() {
+        // TODO: test nameInteger
+    }
+
+    /**
+     * Test the property 'nameBoolean'
+     */
+    @Test
+    public void nameBooleanTest() {
+        // TODO: test nameBoolean
+    }
+
+    /**
+     * Test the property 'nameArray'
+     */
+    @Test
+    public void nameArrayTest() {
+        // TODO: test nameArray
+    }
+
+    /**
+     * Test the property 'nameWrappedArray'
+     */
+    @Test
+    public void nameWrappedArrayTest() {
+        // TODO: test nameWrappedArray
+    }
+
+    /**
+     * Test the property 'prefixString'
+     */
+    @Test
+    public void prefixStringTest() {
+        // TODO: test prefixString
+    }
+
+    /**
+     * Test the property 'prefixNumber'
+     */
+    @Test
+    public void prefixNumberTest() {
+        // TODO: test prefixNumber
+    }
+
+    /**
+     * Test the property 'prefixInteger'
+     */
+    @Test
+    public void prefixIntegerTest() {
+        // TODO: test prefixInteger
+    }
+
+    /**
+     * Test the property 'prefixBoolean'
+     */
+    @Test
+    public void prefixBooleanTest() {
+        // TODO: test prefixBoolean
+    }
+
+    /**
+     * Test the property 'prefixArray'
+     */
+    @Test
+    public void prefixArrayTest() {
+        // TODO: test prefixArray
+    }
+
+    /**
+     * Test the property 'prefixWrappedArray'
+     */
+    @Test
+    public void prefixWrappedArrayTest() {
+        // TODO: test prefixWrappedArray
+    }
+
+    /**
+     * Test the property 'namespaceString'
+     */
+    @Test
+    public void namespaceStringTest() {
+        // TODO: test namespaceString
+    }
+
+    /**
+     * Test the property 'namespaceNumber'
+     */
+    @Test
+    public void namespaceNumberTest() {
+        // TODO: test namespaceNumber
+    }
+
+    /**
+     * Test the property 'namespaceInteger'
+     */
+    @Test
+    public void namespaceIntegerTest() {
+        // TODO: test namespaceInteger
+    }
+
+    /**
+     * Test the property 'namespaceBoolean'
+     */
+    @Test
+    public void namespaceBooleanTest() {
+        // TODO: test namespaceBoolean
+    }
+
+    /**
+     * Test the property 'namespaceArray'
+     */
+    @Test
+    public void namespaceArrayTest() {
+        // TODO: test namespaceArray
+    }
+
+    /**
+     * Test the property 'namespaceWrappedArray'
+     */
+    @Test
+    public void namespaceWrappedArrayTest() {
+        // TODO: test namespaceWrappedArray
+    }
+
+    /**
+     * Test the property 'prefixNsString'
+     */
+    @Test
+    public void prefixNsStringTest() {
+        // TODO: test prefixNsString
+    }
+
+    /**
+     * Test the property 'prefixNsNumber'
+     */
+    @Test
+    public void prefixNsNumberTest() {
+        // TODO: test prefixNsNumber
+    }
+
+    /**
+     * Test the property 'prefixNsInteger'
+     */
+    @Test
+    public void prefixNsIntegerTest() {
+        // TODO: test prefixNsInteger
+    }
+
+    /**
+     * Test the property 'prefixNsBoolean'
+     */
+    @Test
+    public void prefixNsBooleanTest() {
+        // TODO: test prefixNsBoolean
+    }
+
+    /**
+     * Test the property 'prefixNsArray'
+     */
+    @Test
+    public void prefixNsArrayTest() {
+        // TODO: test prefixNsArray
+    }
+
+    /**
+     * Test the property 'prefixNsWrappedArray'
+     */
+    @Test
+    public void prefixNsWrappedArrayTest() {
+        // TODO: test prefixNsWrappedArray
+    }
+
+}

From 45fcf3792af0af4d18494324fa969d4edcd328d7 Mon Sep 17 00:00:00 2001
From: William Cheng <wing328hk@gmail.com>
Date: Fri, 26 Jul 2019 10:00:27 +0800
Subject: [PATCH 59/62] [Java] add nullable support to the clients (#3453)

* add nullable support, update samples

* update samples
---
 .../src/main/resources/Java/pojo.mustache     |  9 ++-
 .../model/AdditionalPropertiesAnyType.java    |  2 +-
 .../model/AdditionalPropertiesArray.java      |  2 +-
 .../model/AdditionalPropertiesBoolean.java    |  2 +-
 .../model/AdditionalPropertiesClass.java      | 22 +++----
 .../model/AdditionalPropertiesInteger.java    |  2 +-
 .../model/AdditionalPropertiesNumber.java     |  2 +-
 .../model/AdditionalPropertiesObject.java     |  2 +-
 .../model/AdditionalPropertiesString.java     |  2 +-
 .../org/openapitools/client/model/Animal.java |  3 +-
 .../model/ArrayOfArrayOfNumberOnly.java       |  2 +-
 .../client/model/ArrayOfNumberOnly.java       |  2 +-
 .../openapitools/client/model/ArrayTest.java  |  6 +-
 .../client/model/Capitalization.java          | 12 ++--
 .../org/openapitools/client/model/Cat.java    |  2 +-
 .../openapitools/client/model/CatAllOf.java   |  2 +-
 .../openapitools/client/model/Category.java   |  3 +-
 .../openapitools/client/model/ClassModel.java |  2 +-
 .../org/openapitools/client/model/Client.java |  2 +-
 .../org/openapitools/client/model/Dog.java    |  2 +-
 .../openapitools/client/model/DogAllOf.java   |  2 +-
 .../openapitools/client/model/EnumArrays.java |  4 +-
 .../openapitools/client/model/EnumTest.java   |  9 ++-
 .../client/model/FileSchemaTestClass.java     |  4 +-
 .../openapitools/client/model/FormatTest.java | 22 +++----
 .../client/model/HasOnlyReadOnly.java         |  4 +-
 .../openapitools/client/model/MapTest.java    |  8 +--
 ...ropertiesAndAdditionalPropertiesClass.java |  6 +-
 .../client/model/Model200Response.java        |  4 +-
 .../client/model/ModelApiResponse.java        |  6 +-
 .../client/model/ModelReturn.java             |  2 +-
 .../org/openapitools/client/model/Name.java   |  7 +--
 .../openapitools/client/model/NumberOnly.java |  2 +-
 .../org/openapitools/client/model/Order.java  | 12 ++--
 .../client/model/OuterComposite.java          |  6 +-
 .../org/openapitools/client/model/Pet.java    | 10 ++--
 .../client/model/ReadOnlyFirst.java           |  4 +-
 .../client/model/SpecialModelName.java        |  2 +-
 .../org/openapitools/client/model/Tag.java    |  4 +-
 .../client/model/TypeHolderDefault.java       |  5 --
 .../client/model/TypeHolderExample.java       |  5 --
 .../org/openapitools/client/model/User.java   | 16 ++---
 .../openapitools/client/model/XmlItem.java    | 58 +++++++++----------
 .../model/AdditionalPropertiesAnyType.java    |  2 +-
 .../model/AdditionalPropertiesArray.java      |  2 +-
 .../model/AdditionalPropertiesBoolean.java    |  2 +-
 .../model/AdditionalPropertiesClass.java      | 22 +++----
 .../model/AdditionalPropertiesInteger.java    |  2 +-
 .../model/AdditionalPropertiesNumber.java     |  2 +-
 .../model/AdditionalPropertiesObject.java     |  2 +-
 .../model/AdditionalPropertiesString.java     |  2 +-
 .../org/openapitools/client/model/Animal.java |  3 +-
 .../model/ArrayOfArrayOfNumberOnly.java       |  2 +-
 .../client/model/ArrayOfNumberOnly.java       |  2 +-
 .../openapitools/client/model/ArrayTest.java  |  6 +-
 .../client/model/Capitalization.java          | 12 ++--
 .../org/openapitools/client/model/Cat.java    |  2 +-
 .../openapitools/client/model/CatAllOf.java   |  2 +-
 .../openapitools/client/model/Category.java   |  3 +-
 .../openapitools/client/model/ClassModel.java |  2 +-
 .../org/openapitools/client/model/Client.java |  2 +-
 .../org/openapitools/client/model/Dog.java    |  2 +-
 .../openapitools/client/model/DogAllOf.java   |  2 +-
 .../openapitools/client/model/EnumArrays.java |  4 +-
 .../openapitools/client/model/EnumTest.java   |  9 ++-
 .../client/model/FileSchemaTestClass.java     |  4 +-
 .../openapitools/client/model/FormatTest.java | 22 +++----
 .../client/model/HasOnlyReadOnly.java         |  4 +-
 .../openapitools/client/model/MapTest.java    |  8 +--
 ...ropertiesAndAdditionalPropertiesClass.java |  6 +-
 .../client/model/Model200Response.java        |  4 +-
 .../client/model/ModelApiResponse.java        |  6 +-
 .../client/model/ModelReturn.java             |  2 +-
 .../org/openapitools/client/model/Name.java   |  7 +--
 .../openapitools/client/model/NumberOnly.java |  2 +-
 .../org/openapitools/client/model/Order.java  | 12 ++--
 .../client/model/OuterComposite.java          |  6 +-
 .../org/openapitools/client/model/Pet.java    | 10 ++--
 .../client/model/ReadOnlyFirst.java           |  4 +-
 .../client/model/SpecialModelName.java        |  2 +-
 .../org/openapitools/client/model/Tag.java    |  4 +-
 .../client/model/TypeHolderDefault.java       |  5 --
 .../client/model/TypeHolderExample.java       |  5 --
 .../org/openapitools/client/model/User.java   | 16 ++---
 .../openapitools/client/model/XmlItem.java    | 58 +++++++++----------
 .../model/AdditionalPropertiesAnyType.java    |  2 +-
 .../model/AdditionalPropertiesArray.java      |  2 +-
 .../model/AdditionalPropertiesBoolean.java    |  2 +-
 .../model/AdditionalPropertiesClass.java      | 22 +++----
 .../model/AdditionalPropertiesInteger.java    |  2 +-
 .../model/AdditionalPropertiesNumber.java     |  2 +-
 .../model/AdditionalPropertiesObject.java     |  2 +-
 .../model/AdditionalPropertiesString.java     |  2 +-
 .../org/openapitools/client/model/Animal.java |  3 +-
 .../model/ArrayOfArrayOfNumberOnly.java       |  2 +-
 .../client/model/ArrayOfNumberOnly.java       |  2 +-
 .../openapitools/client/model/ArrayTest.java  |  6 +-
 .../client/model/Capitalization.java          | 12 ++--
 .../org/openapitools/client/model/Cat.java    |  2 +-
 .../openapitools/client/model/CatAllOf.java   |  2 +-
 .../openapitools/client/model/Category.java   |  3 +-
 .../openapitools/client/model/ClassModel.java |  2 +-
 .../org/openapitools/client/model/Client.java |  2 +-
 .../org/openapitools/client/model/Dog.java    |  2 +-
 .../openapitools/client/model/DogAllOf.java   |  2 +-
 .../openapitools/client/model/EnumArrays.java |  4 +-
 .../openapitools/client/model/EnumTest.java   |  9 ++-
 .../client/model/FileSchemaTestClass.java     |  4 +-
 .../openapitools/client/model/FormatTest.java | 22 +++----
 .../client/model/HasOnlyReadOnly.java         |  4 +-
 .../openapitools/client/model/MapTest.java    |  8 +--
 ...ropertiesAndAdditionalPropertiesClass.java |  6 +-
 .../client/model/Model200Response.java        |  4 +-
 .../client/model/ModelApiResponse.java        |  6 +-
 .../client/model/ModelReturn.java             |  2 +-
 .../org/openapitools/client/model/Name.java   |  7 +--
 .../openapitools/client/model/NumberOnly.java |  2 +-
 .../org/openapitools/client/model/Order.java  | 12 ++--
 .../client/model/OuterComposite.java          |  6 +-
 .../org/openapitools/client/model/Pet.java    | 10 ++--
 .../client/model/ReadOnlyFirst.java           |  4 +-
 .../client/model/SpecialModelName.java        |  2 +-
 .../org/openapitools/client/model/Tag.java    |  4 +-
 .../client/model/TypeHolderDefault.java       |  5 --
 .../client/model/TypeHolderExample.java       |  5 --
 .../org/openapitools/client/model/User.java   | 16 ++---
 .../openapitools/client/model/XmlItem.java    | 58 +++++++++----------
 .../model/AdditionalPropertiesAnyType.java    |  2 +-
 .../model/AdditionalPropertiesArray.java      |  2 +-
 .../model/AdditionalPropertiesBoolean.java    |  2 +-
 .../model/AdditionalPropertiesClass.java      | 22 +++----
 .../model/AdditionalPropertiesInteger.java    |  2 +-
 .../model/AdditionalPropertiesNumber.java     |  2 +-
 .../model/AdditionalPropertiesObject.java     |  2 +-
 .../model/AdditionalPropertiesString.java     |  2 +-
 .../org/openapitools/client/model/Animal.java |  3 +-
 .../model/ArrayOfArrayOfNumberOnly.java       |  2 +-
 .../client/model/ArrayOfNumberOnly.java       |  2 +-
 .../openapitools/client/model/ArrayTest.java  |  6 +-
 .../client/model/Capitalization.java          | 12 ++--
 .../org/openapitools/client/model/Cat.java    |  2 +-
 .../openapitools/client/model/CatAllOf.java   |  2 +-
 .../openapitools/client/model/Category.java   |  3 +-
 .../openapitools/client/model/ClassModel.java |  2 +-
 .../org/openapitools/client/model/Client.java |  2 +-
 .../org/openapitools/client/model/Dog.java    |  2 +-
 .../openapitools/client/model/DogAllOf.java   |  2 +-
 .../openapitools/client/model/EnumArrays.java |  4 +-
 .../openapitools/client/model/EnumTest.java   |  9 ++-
 .../client/model/FileSchemaTestClass.java     |  4 +-
 .../openapitools/client/model/FormatTest.java | 22 +++----
 .../client/model/HasOnlyReadOnly.java         |  4 +-
 .../openapitools/client/model/MapTest.java    |  8 +--
 ...ropertiesAndAdditionalPropertiesClass.java |  6 +-
 .../client/model/Model200Response.java        |  4 +-
 .../client/model/ModelApiResponse.java        |  6 +-
 .../client/model/ModelReturn.java             |  2 +-
 .../org/openapitools/client/model/Name.java   |  7 +--
 .../openapitools/client/model/NumberOnly.java |  2 +-
 .../org/openapitools/client/model/Order.java  | 12 ++--
 .../client/model/OuterComposite.java          |  6 +-
 .../org/openapitools/client/model/Pet.java    | 10 ++--
 .../client/model/ReadOnlyFirst.java           |  4 +-
 .../client/model/SpecialModelName.java        |  2 +-
 .../org/openapitools/client/model/Tag.java    |  4 +-
 .../client/model/TypeHolderDefault.java       |  5 --
 .../client/model/TypeHolderExample.java       |  5 --
 .../org/openapitools/client/model/User.java   | 16 ++---
 .../openapitools/client/model/XmlItem.java    | 58 +++++++++----------
 .../model/AdditionalPropertiesAnyType.java    |  2 +-
 .../model/AdditionalPropertiesArray.java      |  2 +-
 .../model/AdditionalPropertiesBoolean.java    |  2 +-
 .../model/AdditionalPropertiesClass.java      | 22 +++----
 .../model/AdditionalPropertiesInteger.java    |  2 +-
 .../model/AdditionalPropertiesNumber.java     |  2 +-
 .../model/AdditionalPropertiesObject.java     |  2 +-
 .../model/AdditionalPropertiesString.java     |  2 +-
 .../org/openapitools/client/model/Animal.java |  3 +-
 .../model/ArrayOfArrayOfNumberOnly.java       |  2 +-
 .../client/model/ArrayOfNumberOnly.java       |  2 +-
 .../openapitools/client/model/ArrayTest.java  |  6 +-
 .../client/model/Capitalization.java          | 12 ++--
 .../org/openapitools/client/model/Cat.java    |  2 +-
 .../openapitools/client/model/CatAllOf.java   |  2 +-
 .../openapitools/client/model/Category.java   |  3 +-
 .../openapitools/client/model/ClassModel.java |  2 +-
 .../org/openapitools/client/model/Client.java |  2 +-
 .../org/openapitools/client/model/Dog.java    |  2 +-
 .../openapitools/client/model/DogAllOf.java   |  2 +-
 .../openapitools/client/model/EnumArrays.java |  4 +-
 .../openapitools/client/model/EnumTest.java   |  9 ++-
 .../client/model/FileSchemaTestClass.java     |  4 +-
 .../openapitools/client/model/FormatTest.java | 22 +++----
 .../client/model/HasOnlyReadOnly.java         |  4 +-
 .../openapitools/client/model/MapTest.java    |  8 +--
 ...ropertiesAndAdditionalPropertiesClass.java |  6 +-
 .../client/model/Model200Response.java        |  4 +-
 .../client/model/ModelApiResponse.java        |  6 +-
 .../client/model/ModelReturn.java             |  2 +-
 .../org/openapitools/client/model/Name.java   |  7 +--
 .../openapitools/client/model/NumberOnly.java |  2 +-
 .../org/openapitools/client/model/Order.java  | 12 ++--
 .../client/model/OuterComposite.java          |  6 +-
 .../org/openapitools/client/model/Pet.java    | 10 ++--
 .../client/model/ReadOnlyFirst.java           |  4 +-
 .../client/model/SpecialModelName.java        |  2 +-
 .../org/openapitools/client/model/Tag.java    |  4 +-
 .../client/model/TypeHolderDefault.java       |  5 --
 .../client/model/TypeHolderExample.java       |  5 --
 .../org/openapitools/client/model/User.java   | 16 ++---
 .../openapitools/client/model/XmlItem.java    | 58 +++++++++----------
 .../model/AdditionalPropertiesAnyType.java    |  2 +-
 .../model/AdditionalPropertiesArray.java      |  2 +-
 .../model/AdditionalPropertiesBoolean.java    |  2 +-
 .../model/AdditionalPropertiesClass.java      | 22 +++----
 .../model/AdditionalPropertiesInteger.java    |  2 +-
 .../model/AdditionalPropertiesNumber.java     |  2 +-
 .../model/AdditionalPropertiesObject.java     |  2 +-
 .../model/AdditionalPropertiesString.java     |  2 +-
 .../org/openapitools/client/model/Animal.java |  3 +-
 .../model/ArrayOfArrayOfNumberOnly.java       |  2 +-
 .../client/model/ArrayOfNumberOnly.java       |  2 +-
 .../openapitools/client/model/ArrayTest.java  |  6 +-
 .../client/model/Capitalization.java          | 12 ++--
 .../org/openapitools/client/model/Cat.java    |  2 +-
 .../openapitools/client/model/CatAllOf.java   |  2 +-
 .../openapitools/client/model/Category.java   |  3 +-
 .../openapitools/client/model/ClassModel.java |  2 +-
 .../org/openapitools/client/model/Client.java |  2 +-
 .../org/openapitools/client/model/Dog.java    |  2 +-
 .../openapitools/client/model/DogAllOf.java   |  2 +-
 .../openapitools/client/model/EnumArrays.java |  4 +-
 .../openapitools/client/model/EnumTest.java   |  9 ++-
 .../client/model/FileSchemaTestClass.java     |  4 +-
 .../openapitools/client/model/FormatTest.java | 22 +++----
 .../client/model/HasOnlyReadOnly.java         |  4 +-
 .../openapitools/client/model/MapTest.java    |  8 +--
 ...ropertiesAndAdditionalPropertiesClass.java |  6 +-
 .../client/model/Model200Response.java        |  4 +-
 .../client/model/ModelApiResponse.java        |  6 +-
 .../client/model/ModelReturn.java             |  2 +-
 .../org/openapitools/client/model/Name.java   |  7 +--
 .../openapitools/client/model/NumberOnly.java |  2 +-
 .../org/openapitools/client/model/Order.java  | 12 ++--
 .../client/model/OuterComposite.java          |  6 +-
 .../org/openapitools/client/model/Pet.java    | 10 ++--
 .../client/model/ReadOnlyFirst.java           |  4 +-
 .../client/model/SpecialModelName.java        |  2 +-
 .../org/openapitools/client/model/Tag.java    |  4 +-
 .../client/model/TypeHolderDefault.java       |  5 --
 .../client/model/TypeHolderExample.java       |  5 --
 .../org/openapitools/client/model/User.java   | 16 ++---
 .../openapitools/client/model/XmlItem.java    | 58 +++++++++----------
 .../model/AdditionalPropertiesAnyType.java    |  2 +-
 .../model/AdditionalPropertiesArray.java      |  2 +-
 .../model/AdditionalPropertiesBoolean.java    |  2 +-
 .../model/AdditionalPropertiesClass.java      | 22 +++----
 .../model/AdditionalPropertiesInteger.java    |  2 +-
 .../model/AdditionalPropertiesNumber.java     |  2 +-
 .../model/AdditionalPropertiesObject.java     |  2 +-
 .../model/AdditionalPropertiesString.java     |  2 +-
 .../org/openapitools/client/model/Animal.java |  3 +-
 .../model/ArrayOfArrayOfNumberOnly.java       |  2 +-
 .../client/model/ArrayOfNumberOnly.java       |  2 +-
 .../openapitools/client/model/ArrayTest.java  |  6 +-
 .../client/model/Capitalization.java          | 12 ++--
 .../org/openapitools/client/model/Cat.java    |  2 +-
 .../openapitools/client/model/CatAllOf.java   |  2 +-
 .../openapitools/client/model/Category.java   |  3 +-
 .../openapitools/client/model/ClassModel.java |  2 +-
 .../org/openapitools/client/model/Client.java |  2 +-
 .../org/openapitools/client/model/Dog.java    |  2 +-
 .../openapitools/client/model/DogAllOf.java   |  2 +-
 .../openapitools/client/model/EnumArrays.java |  4 +-
 .../openapitools/client/model/EnumTest.java   |  9 ++-
 .../client/model/FileSchemaTestClass.java     |  4 +-
 .../openapitools/client/model/FormatTest.java | 22 +++----
 .../client/model/HasOnlyReadOnly.java         |  4 +-
 .../openapitools/client/model/MapTest.java    |  8 +--
 ...ropertiesAndAdditionalPropertiesClass.java |  6 +-
 .../client/model/Model200Response.java        |  4 +-
 .../client/model/ModelApiResponse.java        |  6 +-
 .../client/model/ModelReturn.java             |  2 +-
 .../org/openapitools/client/model/Name.java   |  7 +--
 .../openapitools/client/model/NumberOnly.java |  2 +-
 .../org/openapitools/client/model/Order.java  | 12 ++--
 .../client/model/OuterComposite.java          |  6 +-
 .../org/openapitools/client/model/Pet.java    | 10 ++--
 .../client/model/ReadOnlyFirst.java           |  4 +-
 .../client/model/SpecialModelName.java        |  2 +-
 .../org/openapitools/client/model/Tag.java    |  4 +-
 .../client/model/TypeHolderDefault.java       |  5 --
 .../client/model/TypeHolderExample.java       |  5 --
 .../org/openapitools/client/model/User.java   | 16 ++---
 .../openapitools/client/model/XmlItem.java    | 58 +++++++++----------
 .../model/AdditionalPropertiesAnyType.java    |  2 +-
 .../model/AdditionalPropertiesArray.java      |  2 +-
 .../model/AdditionalPropertiesBoolean.java    |  2 +-
 .../model/AdditionalPropertiesClass.java      | 22 +++----
 .../model/AdditionalPropertiesInteger.java    |  2 +-
 .../model/AdditionalPropertiesNumber.java     |  2 +-
 .../model/AdditionalPropertiesObject.java     |  2 +-
 .../model/AdditionalPropertiesString.java     |  2 +-
 .../org/openapitools/client/model/Animal.java |  3 +-
 .../model/ArrayOfArrayOfNumberOnly.java       |  2 +-
 .../client/model/ArrayOfNumberOnly.java       |  2 +-
 .../openapitools/client/model/ArrayTest.java  |  6 +-
 .../client/model/Capitalization.java          | 12 ++--
 .../org/openapitools/client/model/Cat.java    |  2 +-
 .../openapitools/client/model/CatAllOf.java   |  2 +-
 .../openapitools/client/model/Category.java   |  3 +-
 .../openapitools/client/model/ClassModel.java |  2 +-
 .../org/openapitools/client/model/Client.java |  2 +-
 .../org/openapitools/client/model/Dog.java    |  2 +-
 .../openapitools/client/model/DogAllOf.java   |  2 +-
 .../openapitools/client/model/EnumArrays.java |  4 +-
 .../openapitools/client/model/EnumTest.java   |  9 ++-
 .../client/model/FileSchemaTestClass.java     |  4 +-
 .../openapitools/client/model/FormatTest.java | 22 +++----
 .../client/model/HasOnlyReadOnly.java         |  4 +-
 .../openapitools/client/model/MapTest.java    |  8 +--
 ...ropertiesAndAdditionalPropertiesClass.java |  6 +-
 .../client/model/Model200Response.java        |  4 +-
 .../client/model/ModelApiResponse.java        |  6 +-
 .../client/model/ModelReturn.java             |  2 +-
 .../org/openapitools/client/model/Name.java   |  7 +--
 .../openapitools/client/model/NumberOnly.java |  2 +-
 .../org/openapitools/client/model/Order.java  | 12 ++--
 .../client/model/OuterComposite.java          |  6 +-
 .../org/openapitools/client/model/Pet.java    | 10 ++--
 .../client/model/ReadOnlyFirst.java           |  4 +-
 .../client/model/SpecialModelName.java        |  2 +-
 .../org/openapitools/client/model/Tag.java    |  4 +-
 .../client/model/TypeHolderDefault.java       |  5 --
 .../client/model/TypeHolderExample.java       |  5 --
 .../org/openapitools/client/model/User.java   | 16 ++---
 .../openapitools/client/model/XmlItem.java    | 58 +++++++++----------
 .../model/AdditionalPropertiesAnyType.java    |  2 +-
 .../model/AdditionalPropertiesArray.java      |  2 +-
 .../model/AdditionalPropertiesBoolean.java    |  2 +-
 .../model/AdditionalPropertiesClass.java      | 22 +++----
 .../model/AdditionalPropertiesInteger.java    |  2 +-
 .../model/AdditionalPropertiesNumber.java     |  2 +-
 .../model/AdditionalPropertiesObject.java     |  2 +-
 .../model/AdditionalPropertiesString.java     |  2 +-
 .../org/openapitools/client/model/Animal.java |  3 +-
 .../model/ArrayOfArrayOfNumberOnly.java       |  2 +-
 .../client/model/ArrayOfNumberOnly.java       |  2 +-
 .../openapitools/client/model/ArrayTest.java  |  6 +-
 .../client/model/Capitalization.java          | 12 ++--
 .../org/openapitools/client/model/Cat.java    |  2 +-
 .../openapitools/client/model/CatAllOf.java   |  2 +-
 .../openapitools/client/model/Category.java   |  3 +-
 .../openapitools/client/model/ClassModel.java |  2 +-
 .../org/openapitools/client/model/Client.java |  2 +-
 .../org/openapitools/client/model/Dog.java    |  2 +-
 .../openapitools/client/model/DogAllOf.java   |  2 +-
 .../openapitools/client/model/EnumArrays.java |  4 +-
 .../openapitools/client/model/EnumTest.java   |  9 ++-
 .../client/model/FileSchemaTestClass.java     |  4 +-
 .../openapitools/client/model/FormatTest.java | 22 +++----
 .../client/model/HasOnlyReadOnly.java         |  4 +-
 .../openapitools/client/model/MapTest.java    |  8 +--
 ...ropertiesAndAdditionalPropertiesClass.java |  6 +-
 .../client/model/Model200Response.java        |  4 +-
 .../client/model/ModelApiResponse.java        |  6 +-
 .../client/model/ModelReturn.java             |  2 +-
 .../org/openapitools/client/model/Name.java   |  7 +--
 .../openapitools/client/model/NumberOnly.java |  2 +-
 .../org/openapitools/client/model/Order.java  | 12 ++--
 .../client/model/OuterComposite.java          |  6 +-
 .../org/openapitools/client/model/Pet.java    | 10 ++--
 .../client/model/ReadOnlyFirst.java           |  4 +-
 .../client/model/SpecialModelName.java        |  2 +-
 .../org/openapitools/client/model/Tag.java    |  4 +-
 .../client/model/TypeHolderDefault.java       |  5 --
 .../client/model/TypeHolderExample.java       |  5 --
 .../org/openapitools/client/model/User.java   | 16 ++---
 .../openapitools/client/model/XmlItem.java    | 58 +++++++++----------
 .../model/AdditionalPropertiesAnyType.java    |  2 +-
 .../model/AdditionalPropertiesArray.java      |  2 +-
 .../model/AdditionalPropertiesBoolean.java    |  2 +-
 .../model/AdditionalPropertiesClass.java      | 22 +++----
 .../model/AdditionalPropertiesInteger.java    |  2 +-
 .../model/AdditionalPropertiesNumber.java     |  2 +-
 .../model/AdditionalPropertiesObject.java     |  2 +-
 .../model/AdditionalPropertiesString.java     |  2 +-
 .../org/openapitools/client/model/Animal.java |  3 +-
 .../model/ArrayOfArrayOfNumberOnly.java       |  2 +-
 .../client/model/ArrayOfNumberOnly.java       |  2 +-
 .../openapitools/client/model/ArrayTest.java  |  6 +-
 .../client/model/Capitalization.java          | 12 ++--
 .../org/openapitools/client/model/Cat.java    |  2 +-
 .../openapitools/client/model/CatAllOf.java   |  2 +-
 .../openapitools/client/model/Category.java   |  3 +-
 .../openapitools/client/model/ClassModel.java |  2 +-
 .../org/openapitools/client/model/Client.java |  2 +-
 .../org/openapitools/client/model/Dog.java    |  2 +-
 .../openapitools/client/model/DogAllOf.java   |  2 +-
 .../openapitools/client/model/EnumArrays.java |  4 +-
 .../openapitools/client/model/EnumTest.java   |  9 ++-
 .../client/model/FileSchemaTestClass.java     |  4 +-
 .../openapitools/client/model/FormatTest.java | 22 +++----
 .../client/model/HasOnlyReadOnly.java         |  4 +-
 .../openapitools/client/model/MapTest.java    |  8 +--
 ...ropertiesAndAdditionalPropertiesClass.java |  6 +-
 .../client/model/Model200Response.java        |  4 +-
 .../client/model/ModelApiResponse.java        |  6 +-
 .../client/model/ModelReturn.java             |  2 +-
 .../org/openapitools/client/model/Name.java   |  7 +--
 .../openapitools/client/model/NumberOnly.java |  2 +-
 .../org/openapitools/client/model/Order.java  | 12 ++--
 .../client/model/OuterComposite.java          |  6 +-
 .../org/openapitools/client/model/Pet.java    | 10 ++--
 .../client/model/ReadOnlyFirst.java           |  4 +-
 .../client/model/SpecialModelName.java        |  2 +-
 .../org/openapitools/client/model/Tag.java    |  4 +-
 .../client/model/TypeHolderDefault.java       |  5 --
 .../client/model/TypeHolderExample.java       |  5 --
 .../org/openapitools/client/model/User.java   | 16 ++---
 .../openapitools/client/model/XmlItem.java    | 58 +++++++++----------
 .../model/AdditionalPropertiesAnyType.java    |  2 +-
 .../model/AdditionalPropertiesArray.java      |  2 +-
 .../model/AdditionalPropertiesBoolean.java    |  2 +-
 .../model/AdditionalPropertiesClass.java      | 22 +++----
 .../model/AdditionalPropertiesInteger.java    |  2 +-
 .../model/AdditionalPropertiesNumber.java     |  2 +-
 .../model/AdditionalPropertiesObject.java     |  2 +-
 .../model/AdditionalPropertiesString.java     |  2 +-
 .../org/openapitools/client/model/Animal.java |  3 +-
 .../model/ArrayOfArrayOfNumberOnly.java       |  2 +-
 .../client/model/ArrayOfNumberOnly.java       |  2 +-
 .../openapitools/client/model/ArrayTest.java  |  6 +-
 .../client/model/Capitalization.java          | 12 ++--
 .../org/openapitools/client/model/Cat.java    |  2 +-
 .../openapitools/client/model/CatAllOf.java   |  2 +-
 .../openapitools/client/model/Category.java   |  3 +-
 .../openapitools/client/model/ClassModel.java |  2 +-
 .../org/openapitools/client/model/Client.java |  2 +-
 .../org/openapitools/client/model/Dog.java    |  2 +-
 .../openapitools/client/model/DogAllOf.java   |  2 +-
 .../openapitools/client/model/EnumArrays.java |  4 +-
 .../openapitools/client/model/EnumTest.java   |  9 ++-
 .../client/model/FileSchemaTestClass.java     |  4 +-
 .../openapitools/client/model/FormatTest.java | 22 +++----
 .../client/model/HasOnlyReadOnly.java         |  4 +-
 .../openapitools/client/model/MapTest.java    |  8 +--
 ...ropertiesAndAdditionalPropertiesClass.java |  6 +-
 .../client/model/Model200Response.java        |  4 +-
 .../client/model/ModelApiResponse.java        |  6 +-
 .../client/model/ModelReturn.java             |  2 +-
 .../org/openapitools/client/model/Name.java   |  7 +--
 .../openapitools/client/model/NumberOnly.java |  2 +-
 .../org/openapitools/client/model/Order.java  | 12 ++--
 .../client/model/OuterComposite.java          |  6 +-
 .../org/openapitools/client/model/Pet.java    | 10 ++--
 .../client/model/ReadOnlyFirst.java           |  4 +-
 .../client/model/SpecialModelName.java        |  2 +-
 .../org/openapitools/client/model/Tag.java    |  4 +-
 .../client/model/TypeHolderDefault.java       |  5 --
 .../client/model/TypeHolderExample.java       |  5 --
 .../org/openapitools/client/model/User.java   | 16 ++---
 .../openapitools/client/model/XmlItem.java    | 58 +++++++++----------
 .../model/AdditionalPropertiesAnyType.java    |  2 +-
 .../model/AdditionalPropertiesArray.java      |  2 +-
 .../model/AdditionalPropertiesBoolean.java    |  2 +-
 .../model/AdditionalPropertiesClass.java      | 22 +++----
 .../model/AdditionalPropertiesInteger.java    |  2 +-
 .../model/AdditionalPropertiesNumber.java     |  2 +-
 .../model/AdditionalPropertiesObject.java     |  2 +-
 .../model/AdditionalPropertiesString.java     |  2 +-
 .../org/openapitools/client/model/Animal.java |  3 +-
 .../model/ArrayOfArrayOfNumberOnly.java       |  2 +-
 .../client/model/ArrayOfNumberOnly.java       |  2 +-
 .../openapitools/client/model/ArrayTest.java  |  6 +-
 .../client/model/Capitalization.java          | 12 ++--
 .../org/openapitools/client/model/Cat.java    |  2 +-
 .../openapitools/client/model/CatAllOf.java   |  2 +-
 .../openapitools/client/model/Category.java   |  3 +-
 .../openapitools/client/model/ClassModel.java |  2 +-
 .../org/openapitools/client/model/Client.java |  2 +-
 .../org/openapitools/client/model/Dog.java    |  2 +-
 .../openapitools/client/model/DogAllOf.java   |  2 +-
 .../openapitools/client/model/EnumArrays.java |  4 +-
 .../openapitools/client/model/EnumTest.java   |  9 ++-
 .../client/model/FileSchemaTestClass.java     |  4 +-
 .../openapitools/client/model/FormatTest.java | 22 +++----
 .../client/model/HasOnlyReadOnly.java         |  4 +-
 .../openapitools/client/model/MapTest.java    |  8 +--
 ...ropertiesAndAdditionalPropertiesClass.java |  6 +-
 .../client/model/Model200Response.java        |  4 +-
 .../client/model/ModelApiResponse.java        |  6 +-
 .../client/model/ModelReturn.java             |  2 +-
 .../org/openapitools/client/model/Name.java   |  7 +--
 .../openapitools/client/model/NumberOnly.java |  2 +-
 .../org/openapitools/client/model/Order.java  | 12 ++--
 .../client/model/OuterComposite.java          |  6 +-
 .../org/openapitools/client/model/Pet.java    | 10 ++--
 .../client/model/ReadOnlyFirst.java           |  4 +-
 .../client/model/SpecialModelName.java        |  2 +-
 .../org/openapitools/client/model/Tag.java    |  4 +-
 .../client/model/TypeHolderDefault.java       |  5 --
 .../client/model/TypeHolderExample.java       |  5 --
 .../org/openapitools/client/model/User.java   | 16 ++---
 .../openapitools/client/model/XmlItem.java    | 58 +++++++++----------
 .../model/AdditionalPropertiesAnyType.java    |  2 +-
 .../model/AdditionalPropertiesArray.java      |  2 +-
 .../model/AdditionalPropertiesBoolean.java    |  2 +-
 .../model/AdditionalPropertiesClass.java      | 22 +++----
 .../model/AdditionalPropertiesInteger.java    |  2 +-
 .../model/AdditionalPropertiesNumber.java     |  2 +-
 .../model/AdditionalPropertiesObject.java     |  2 +-
 .../model/AdditionalPropertiesString.java     |  2 +-
 .../org/openapitools/client/model/Animal.java |  3 +-
 .../model/ArrayOfArrayOfNumberOnly.java       |  2 +-
 .../client/model/ArrayOfNumberOnly.java       |  2 +-
 .../openapitools/client/model/ArrayTest.java  |  6 +-
 .../client/model/Capitalization.java          | 12 ++--
 .../org/openapitools/client/model/Cat.java    |  2 +-
 .../openapitools/client/model/CatAllOf.java   |  2 +-
 .../openapitools/client/model/Category.java   |  3 +-
 .../openapitools/client/model/ClassModel.java |  2 +-
 .../org/openapitools/client/model/Client.java |  2 +-
 .../org/openapitools/client/model/Dog.java    |  2 +-
 .../openapitools/client/model/DogAllOf.java   |  2 +-
 .../openapitools/client/model/EnumArrays.java |  4 +-
 .../openapitools/client/model/EnumTest.java   |  9 ++-
 .../client/model/FileSchemaTestClass.java     |  4 +-
 .../openapitools/client/model/FormatTest.java | 22 +++----
 .../client/model/HasOnlyReadOnly.java         |  4 +-
 .../openapitools/client/model/MapTest.java    |  8 +--
 ...ropertiesAndAdditionalPropertiesClass.java |  6 +-
 .../client/model/Model200Response.java        |  4 +-
 .../client/model/ModelApiResponse.java        |  6 +-
 .../client/model/ModelReturn.java             |  2 +-
 .../org/openapitools/client/model/Name.java   |  7 +--
 .../openapitools/client/model/NumberOnly.java |  2 +-
 .../org/openapitools/client/model/Order.java  | 12 ++--
 .../client/model/OuterComposite.java          |  6 +-
 .../org/openapitools/client/model/Pet.java    | 10 ++--
 .../client/model/ReadOnlyFirst.java           |  4 +-
 .../client/model/SpecialModelName.java        |  2 +-
 .../org/openapitools/client/model/Tag.java    |  4 +-
 .../client/model/TypeHolderDefault.java       |  5 --
 .../client/model/TypeHolderExample.java       |  5 --
 .../org/openapitools/client/model/User.java   | 16 ++---
 .../openapitools/client/model/XmlItem.java    | 58 +++++++++----------
 .../model/AdditionalPropertiesAnyType.java    |  2 +-
 .../model/AdditionalPropertiesArray.java      |  2 +-
 .../model/AdditionalPropertiesBoolean.java    |  2 +-
 .../model/AdditionalPropertiesClass.java      | 22 +++----
 .../model/AdditionalPropertiesInteger.java    |  2 +-
 .../model/AdditionalPropertiesNumber.java     |  2 +-
 .../model/AdditionalPropertiesObject.java     |  2 +-
 .../model/AdditionalPropertiesString.java     |  2 +-
 .../org/openapitools/client/model/Animal.java |  3 +-
 .../model/ArrayOfArrayOfNumberOnly.java       |  2 +-
 .../client/model/ArrayOfNumberOnly.java       |  2 +-
 .../openapitools/client/model/ArrayTest.java  |  6 +-
 .../client/model/Capitalization.java          | 12 ++--
 .../org/openapitools/client/model/Cat.java    |  2 +-
 .../openapitools/client/model/CatAllOf.java   |  2 +-
 .../openapitools/client/model/Category.java   |  3 +-
 .../openapitools/client/model/ClassModel.java |  2 +-
 .../org/openapitools/client/model/Client.java |  2 +-
 .../org/openapitools/client/model/Dog.java    |  2 +-
 .../openapitools/client/model/DogAllOf.java   |  2 +-
 .../openapitools/client/model/EnumArrays.java |  4 +-
 .../openapitools/client/model/EnumTest.java   |  9 ++-
 .../client/model/FileSchemaTestClass.java     |  4 +-
 .../openapitools/client/model/FormatTest.java | 22 +++----
 .../client/model/HasOnlyReadOnly.java         |  4 +-
 .../openapitools/client/model/MapTest.java    |  8 +--
 ...ropertiesAndAdditionalPropertiesClass.java |  6 +-
 .../client/model/Model200Response.java        |  4 +-
 .../client/model/ModelApiResponse.java        |  6 +-
 .../client/model/ModelReturn.java             |  2 +-
 .../org/openapitools/client/model/Name.java   |  7 +--
 .../openapitools/client/model/NumberOnly.java |  2 +-
 .../org/openapitools/client/model/Order.java  | 12 ++--
 .../client/model/OuterComposite.java          |  6 +-
 .../org/openapitools/client/model/Pet.java    | 10 ++--
 .../client/model/ReadOnlyFirst.java           |  4 +-
 .../client/model/SpecialModelName.java        |  2 +-
 .../org/openapitools/client/model/Tag.java    |  4 +-
 .../client/model/TypeHolderDefault.java       |  5 --
 .../client/model/TypeHolderExample.java       |  5 --
 .../org/openapitools/client/model/User.java   | 16 ++---
 .../openapitools/client/model/XmlItem.java    | 58 +++++++++----------
 .../model/AdditionalPropertiesAnyType.java    |  2 +-
 .../model/AdditionalPropertiesArray.java      |  2 +-
 .../model/AdditionalPropertiesBoolean.java    |  2 +-
 .../model/AdditionalPropertiesClass.java      | 22 +++----
 .../model/AdditionalPropertiesInteger.java    |  2 +-
 .../model/AdditionalPropertiesNumber.java     |  2 +-
 .../model/AdditionalPropertiesObject.java     |  2 +-
 .../model/AdditionalPropertiesString.java     |  2 +-
 .../org/openapitools/client/model/Animal.java |  3 +-
 .../model/ArrayOfArrayOfNumberOnly.java       |  2 +-
 .../client/model/ArrayOfNumberOnly.java       |  2 +-
 .../openapitools/client/model/ArrayTest.java  |  6 +-
 .../client/model/Capitalization.java          | 12 ++--
 .../org/openapitools/client/model/Cat.java    |  2 +-
 .../openapitools/client/model/CatAllOf.java   |  2 +-
 .../openapitools/client/model/Category.java   |  3 +-
 .../openapitools/client/model/ClassModel.java |  2 +-
 .../org/openapitools/client/model/Client.java |  2 +-
 .../org/openapitools/client/model/Dog.java    |  2 +-
 .../openapitools/client/model/DogAllOf.java   |  2 +-
 .../openapitools/client/model/EnumArrays.java |  4 +-
 .../openapitools/client/model/EnumTest.java   |  9 ++-
 .../client/model/FileSchemaTestClass.java     |  4 +-
 .../openapitools/client/model/FormatTest.java | 22 +++----
 .../client/model/HasOnlyReadOnly.java         |  4 +-
 .../openapitools/client/model/MapTest.java    |  8 +--
 ...ropertiesAndAdditionalPropertiesClass.java |  6 +-
 .../client/model/Model200Response.java        |  4 +-
 .../client/model/ModelApiResponse.java        |  6 +-
 .../client/model/ModelReturn.java             |  2 +-
 .../org/openapitools/client/model/Name.java   |  7 +--
 .../openapitools/client/model/NumberOnly.java |  2 +-
 .../org/openapitools/client/model/Order.java  | 12 ++--
 .../client/model/OuterComposite.java          |  6 +-
 .../org/openapitools/client/model/Pet.java    | 10 ++--
 .../client/model/ReadOnlyFirst.java           |  4 +-
 .../client/model/SpecialModelName.java        |  2 +-
 .../org/openapitools/client/model/Tag.java    |  4 +-
 .../client/model/TypeHolderDefault.java       |  5 --
 .../client/model/TypeHolderExample.java       |  5 --
 .../org/openapitools/client/model/User.java   | 16 ++---
 .../openapitools/client/model/XmlItem.java    | 58 +++++++++----------
 .../model/AdditionalPropertiesAnyType.java    |  2 +-
 .../model/AdditionalPropertiesArray.java      |  2 +-
 .../model/AdditionalPropertiesBoolean.java    |  2 +-
 .../model/AdditionalPropertiesClass.java      | 22 +++----
 .../model/AdditionalPropertiesInteger.java    |  2 +-
 .../model/AdditionalPropertiesNumber.java     |  2 +-
 .../model/AdditionalPropertiesObject.java     |  2 +-
 .../model/AdditionalPropertiesString.java     |  2 +-
 .../org/openapitools/client/model/Animal.java |  3 +-
 .../model/ArrayOfArrayOfNumberOnly.java       |  2 +-
 .../client/model/ArrayOfNumberOnly.java       |  2 +-
 .../openapitools/client/model/ArrayTest.java  |  6 +-
 .../client/model/Capitalization.java          | 12 ++--
 .../org/openapitools/client/model/Cat.java    |  2 +-
 .../openapitools/client/model/CatAllOf.java   |  2 +-
 .../openapitools/client/model/Category.java   |  3 +-
 .../openapitools/client/model/ClassModel.java |  2 +-
 .../org/openapitools/client/model/Client.java |  2 +-
 .../org/openapitools/client/model/Dog.java    |  2 +-
 .../openapitools/client/model/DogAllOf.java   |  2 +-
 .../openapitools/client/model/EnumArrays.java |  4 +-
 .../openapitools/client/model/EnumTest.java   |  9 ++-
 .../client/model/FileSchemaTestClass.java     |  4 +-
 .../openapitools/client/model/FormatTest.java | 22 +++----
 .../client/model/HasOnlyReadOnly.java         |  4 +-
 .../openapitools/client/model/MapTest.java    |  8 +--
 ...ropertiesAndAdditionalPropertiesClass.java |  6 +-
 .../client/model/Model200Response.java        |  4 +-
 .../client/model/ModelApiResponse.java        |  6 +-
 .../client/model/ModelReturn.java             |  2 +-
 .../org/openapitools/client/model/Name.java   |  7 +--
 .../openapitools/client/model/NumberOnly.java |  2 +-
 .../org/openapitools/client/model/Order.java  | 12 ++--
 .../client/model/OuterComposite.java          |  6 +-
 .../org/openapitools/client/model/Pet.java    | 10 ++--
 .../client/model/ReadOnlyFirst.java           |  4 +-
 .../client/model/SpecialModelName.java        |  2 +-
 .../org/openapitools/client/model/Tag.java    |  4 +-
 .../client/model/TypeHolderDefault.java       |  5 --
 .../client/model/TypeHolderExample.java       |  5 --
 .../org/openapitools/client/model/User.java   | 16 ++---
 .../openapitools/client/model/XmlItem.java    | 58 +++++++++----------
 .../model/AdditionalPropertiesAnyType.java    |  2 +-
 .../model/AdditionalPropertiesArray.java      |  2 +-
 .../model/AdditionalPropertiesBoolean.java    |  2 +-
 .../model/AdditionalPropertiesClass.java      | 22 +++----
 .../model/AdditionalPropertiesInteger.java    |  2 +-
 .../model/AdditionalPropertiesNumber.java     |  2 +-
 .../model/AdditionalPropertiesObject.java     |  2 +-
 .../model/AdditionalPropertiesString.java     |  2 +-
 .../org/openapitools/client/model/Animal.java |  3 +-
 .../model/ArrayOfArrayOfNumberOnly.java       |  2 +-
 .../client/model/ArrayOfNumberOnly.java       |  2 +-
 .../openapitools/client/model/ArrayTest.java  |  6 +-
 .../client/model/Capitalization.java          | 12 ++--
 .../org/openapitools/client/model/Cat.java    |  2 +-
 .../openapitools/client/model/CatAllOf.java   |  2 +-
 .../openapitools/client/model/Category.java   |  3 +-
 .../openapitools/client/model/ClassModel.java |  2 +-
 .../org/openapitools/client/model/Client.java |  2 +-
 .../org/openapitools/client/model/Dog.java    |  2 +-
 .../openapitools/client/model/DogAllOf.java   |  2 +-
 .../openapitools/client/model/EnumArrays.java |  4 +-
 .../openapitools/client/model/EnumTest.java   |  9 ++-
 .../client/model/FileSchemaTestClass.java     |  4 +-
 .../openapitools/client/model/FormatTest.java | 22 +++----
 .../client/model/HasOnlyReadOnly.java         |  4 +-
 .../openapitools/client/model/MapTest.java    |  8 +--
 ...ropertiesAndAdditionalPropertiesClass.java |  6 +-
 .../client/model/Model200Response.java        |  4 +-
 .../client/model/ModelApiResponse.java        |  6 +-
 .../client/model/ModelReturn.java             |  2 +-
 .../org/openapitools/client/model/Name.java   |  7 +--
 .../openapitools/client/model/NumberOnly.java |  2 +-
 .../org/openapitools/client/model/Order.java  | 12 ++--
 .../client/model/OuterComposite.java          |  6 +-
 .../org/openapitools/client/model/Pet.java    | 10 ++--
 .../client/model/ReadOnlyFirst.java           |  4 +-
 .../client/model/SpecialModelName.java        |  2 +-
 .../org/openapitools/client/model/Tag.java    |  4 +-
 .../client/model/TypeHolderDefault.java       |  5 --
 .../client/model/TypeHolderExample.java       |  5 --
 .../org/openapitools/client/model/User.java   | 16 ++---
 .../openapitools/client/model/XmlItem.java    | 58 +++++++++----------
 .../model/AdditionalPropertiesAnyType.java    |  2 +-
 .../model/AdditionalPropertiesArray.java      |  2 +-
 .../model/AdditionalPropertiesBoolean.java    |  2 +-
 .../model/AdditionalPropertiesClass.java      | 22 +++----
 .../model/AdditionalPropertiesInteger.java    |  2 +-
 .../model/AdditionalPropertiesNumber.java     |  2 +-
 .../model/AdditionalPropertiesObject.java     |  2 +-
 .../model/AdditionalPropertiesString.java     |  2 +-
 .../org/openapitools/client/model/Animal.java |  3 +-
 .../model/ArrayOfArrayOfNumberOnly.java       |  2 +-
 .../client/model/ArrayOfNumberOnly.java       |  2 +-
 .../openapitools/client/model/ArrayTest.java  |  6 +-
 .../client/model/Capitalization.java          | 12 ++--
 .../org/openapitools/client/model/Cat.java    |  2 +-
 .../openapitools/client/model/CatAllOf.java   |  2 +-
 .../openapitools/client/model/Category.java   |  3 +-
 .../openapitools/client/model/ClassModel.java |  2 +-
 .../org/openapitools/client/model/Client.java |  2 +-
 .../org/openapitools/client/model/Dog.java    |  2 +-
 .../openapitools/client/model/DogAllOf.java   |  2 +-
 .../openapitools/client/model/EnumArrays.java |  4 +-
 .../openapitools/client/model/EnumTest.java   |  9 ++-
 .../client/model/FileSchemaTestClass.java     |  4 +-
 .../openapitools/client/model/FormatTest.java | 22 +++----
 .../client/model/HasOnlyReadOnly.java         |  4 +-
 .../openapitools/client/model/MapTest.java    |  8 +--
 ...ropertiesAndAdditionalPropertiesClass.java |  6 +-
 .../client/model/Model200Response.java        |  4 +-
 .../client/model/ModelApiResponse.java        |  6 +-
 .../client/model/ModelReturn.java             |  2 +-
 .../org/openapitools/client/model/Name.java   |  7 +--
 .../openapitools/client/model/NumberOnly.java |  2 +-
 .../org/openapitools/client/model/Order.java  | 12 ++--
 .../client/model/OuterComposite.java          |  6 +-
 .../org/openapitools/client/model/Pet.java    | 10 ++--
 .../client/model/ReadOnlyFirst.java           |  4 +-
 .../client/model/SpecialModelName.java        |  2 +-
 .../org/openapitools/client/model/Tag.java    |  4 +-
 .../client/model/TypeHolderDefault.java       |  5 --
 .../client/model/TypeHolderExample.java       |  5 --
 .../org/openapitools/client/model/User.java   | 16 ++---
 .../openapitools/client/model/XmlItem.java    | 58 +++++++++----------
 .../model/AdditionalPropertiesAnyType.java    |  2 +-
 .../model/AdditionalPropertiesArray.java      |  2 +-
 .../model/AdditionalPropertiesBoolean.java    |  2 +-
 .../model/AdditionalPropertiesClass.java      | 22 +++----
 .../model/AdditionalPropertiesInteger.java    |  2 +-
 .../model/AdditionalPropertiesNumber.java     |  2 +-
 .../model/AdditionalPropertiesObject.java     |  2 +-
 .../model/AdditionalPropertiesString.java     |  2 +-
 .../org/openapitools/client/model/Animal.java |  3 +-
 .../model/ArrayOfArrayOfNumberOnly.java       |  2 +-
 .../client/model/ArrayOfNumberOnly.java       |  2 +-
 .../openapitools/client/model/ArrayTest.java  |  6 +-
 .../client/model/Capitalization.java          | 12 ++--
 .../org/openapitools/client/model/Cat.java    |  2 +-
 .../openapitools/client/model/CatAllOf.java   |  2 +-
 .../openapitools/client/model/Category.java   |  3 +-
 .../openapitools/client/model/ClassModel.java |  2 +-
 .../org/openapitools/client/model/Client.java |  2 +-
 .../org/openapitools/client/model/Dog.java    |  2 +-
 .../openapitools/client/model/DogAllOf.java   |  2 +-
 .../openapitools/client/model/EnumArrays.java |  4 +-
 .../openapitools/client/model/EnumTest.java   |  9 ++-
 .../client/model/FileSchemaTestClass.java     |  4 +-
 .../openapitools/client/model/FormatTest.java | 22 +++----
 .../client/model/HasOnlyReadOnly.java         |  4 +-
 .../openapitools/client/model/MapTest.java    |  8 +--
 ...ropertiesAndAdditionalPropertiesClass.java |  6 +-
 .../client/model/Model200Response.java        |  4 +-
 .../client/model/ModelApiResponse.java        |  6 +-
 .../client/model/ModelReturn.java             |  2 +-
 .../org/openapitools/client/model/Name.java   |  7 +--
 .../openapitools/client/model/NumberOnly.java |  2 +-
 .../org/openapitools/client/model/Order.java  | 12 ++--
 .../client/model/OuterComposite.java          |  6 +-
 .../org/openapitools/client/model/Pet.java    | 10 ++--
 .../client/model/ReadOnlyFirst.java           |  4 +-
 .../client/model/SpecialModelName.java        |  2 +-
 .../org/openapitools/client/model/Tag.java    |  4 +-
 .../client/model/TypeHolderDefault.java       |  5 --
 .../client/model/TypeHolderExample.java       |  5 --
 .../org/openapitools/client/model/User.java   | 16 ++---
 .../openapitools/client/model/XmlItem.java    | 58 +++++++++----------
 .../model/AdditionalPropertiesAnyType.java    |  2 +-
 .../model/AdditionalPropertiesArray.java      |  2 +-
 .../model/AdditionalPropertiesBoolean.java    |  2 +-
 .../model/AdditionalPropertiesClass.java      | 22 +++----
 .../model/AdditionalPropertiesInteger.java    |  2 +-
 .../model/AdditionalPropertiesNumber.java     |  2 +-
 .../model/AdditionalPropertiesObject.java     |  2 +-
 .../model/AdditionalPropertiesString.java     |  2 +-
 .../org/openapitools/client/model/Animal.java |  3 +-
 .../model/ArrayOfArrayOfNumberOnly.java       |  2 +-
 .../client/model/ArrayOfNumberOnly.java       |  2 +-
 .../openapitools/client/model/ArrayTest.java  |  6 +-
 .../client/model/Capitalization.java          | 12 ++--
 .../org/openapitools/client/model/Cat.java    |  2 +-
 .../openapitools/client/model/CatAllOf.java   |  2 +-
 .../openapitools/client/model/Category.java   |  3 +-
 .../openapitools/client/model/ClassModel.java |  2 +-
 .../org/openapitools/client/model/Client.java |  2 +-
 .../org/openapitools/client/model/Dog.java    |  2 +-
 .../openapitools/client/model/DogAllOf.java   |  2 +-
 .../openapitools/client/model/EnumArrays.java |  4 +-
 .../openapitools/client/model/EnumTest.java   |  9 ++-
 .../client/model/FileSchemaTestClass.java     |  4 +-
 .../openapitools/client/model/FormatTest.java | 22 +++----
 .../client/model/HasOnlyReadOnly.java         |  4 +-
 .../openapitools/client/model/MapTest.java    |  8 +--
 ...ropertiesAndAdditionalPropertiesClass.java |  6 +-
 .../client/model/Model200Response.java        |  4 +-
 .../client/model/ModelApiResponse.java        |  6 +-
 .../client/model/ModelReturn.java             |  2 +-
 .../org/openapitools/client/model/Name.java   |  7 +--
 .../openapitools/client/model/NumberOnly.java |  2 +-
 .../org/openapitools/client/model/Order.java  | 12 ++--
 .../client/model/OuterComposite.java          |  6 +-
 .../org/openapitools/client/model/Pet.java    | 10 ++--
 .../client/model/ReadOnlyFirst.java           |  4 +-
 .../client/model/SpecialModelName.java        |  2 +-
 .../org/openapitools/client/model/Tag.java    |  4 +-
 .../client/model/TypeHolderDefault.java       |  5 --
 .../client/model/TypeHolderExample.java       |  5 --
 .../org/openapitools/client/model/User.java   | 16 ++---
 .../openapitools/client/model/XmlItem.java    | 58 +++++++++----------
 .../model/AdditionalPropertiesAnyType.java    |  2 +-
 .../model/AdditionalPropertiesArray.java      |  2 +-
 .../model/AdditionalPropertiesBoolean.java    |  2 +-
 .../model/AdditionalPropertiesClass.java      | 22 +++----
 .../model/AdditionalPropertiesInteger.java    |  2 +-
 .../model/AdditionalPropertiesNumber.java     |  2 +-
 .../model/AdditionalPropertiesObject.java     |  2 +-
 .../model/AdditionalPropertiesString.java     |  2 +-
 .../org/openapitools/client/model/Animal.java |  3 +-
 .../model/ArrayOfArrayOfNumberOnly.java       |  2 +-
 .../client/model/ArrayOfNumberOnly.java       |  2 +-
 .../openapitools/client/model/ArrayTest.java  |  6 +-
 .../client/model/Capitalization.java          | 12 ++--
 .../org/openapitools/client/model/Cat.java    |  2 +-
 .../openapitools/client/model/CatAllOf.java   |  2 +-
 .../openapitools/client/model/Category.java   |  3 +-
 .../openapitools/client/model/ClassModel.java |  2 +-
 .../org/openapitools/client/model/Client.java |  2 +-
 .../org/openapitools/client/model/Dog.java    |  2 +-
 .../openapitools/client/model/DogAllOf.java   |  2 +-
 .../openapitools/client/model/EnumArrays.java |  4 +-
 .../openapitools/client/model/EnumTest.java   |  9 ++-
 .../client/model/FileSchemaTestClass.java     |  4 +-
 .../openapitools/client/model/FormatTest.java | 22 +++----
 .../client/model/HasOnlyReadOnly.java         |  4 +-
 .../openapitools/client/model/MapTest.java    |  8 +--
 ...ropertiesAndAdditionalPropertiesClass.java |  6 +-
 .../client/model/Model200Response.java        |  4 +-
 .../client/model/ModelApiResponse.java        |  6 +-
 .../client/model/ModelReturn.java             |  2 +-
 .../org/openapitools/client/model/Name.java   |  7 +--
 .../openapitools/client/model/NumberOnly.java |  2 +-
 .../org/openapitools/client/model/Order.java  | 12 ++--
 .../client/model/OuterComposite.java          |  6 +-
 .../org/openapitools/client/model/Pet.java    | 10 ++--
 .../client/model/ReadOnlyFirst.java           |  4 +-
 .../client/model/SpecialModelName.java        |  2 +-
 .../org/openapitools/client/model/Tag.java    |  4 +-
 .../client/model/TypeHolderDefault.java       |  5 --
 .../client/model/TypeHolderExample.java       |  5 --
 .../org/openapitools/client/model/User.java   | 16 ++---
 .../openapitools/client/model/XmlItem.java    | 58 +++++++++----------
 .../model/AdditionalPropertiesAnyType.java    |  2 +-
 .../model/AdditionalPropertiesArray.java      |  2 +-
 .../model/AdditionalPropertiesBoolean.java    |  2 +-
 .../model/AdditionalPropertiesClass.java      | 22 +++----
 .../model/AdditionalPropertiesInteger.java    |  2 +-
 .../model/AdditionalPropertiesNumber.java     |  2 +-
 .../model/AdditionalPropertiesObject.java     |  2 +-
 .../model/AdditionalPropertiesString.java     |  2 +-
 .../org/openapitools/client/model/Animal.java |  3 +-
 .../model/ArrayOfArrayOfNumberOnly.java       |  2 +-
 .../client/model/ArrayOfNumberOnly.java       |  2 +-
 .../openapitools/client/model/ArrayTest.java  |  6 +-
 .../client/model/Capitalization.java          | 12 ++--
 .../org/openapitools/client/model/Cat.java    |  2 +-
 .../openapitools/client/model/CatAllOf.java   |  2 +-
 .../openapitools/client/model/Category.java   |  3 +-
 .../openapitools/client/model/ClassModel.java |  2 +-
 .../org/openapitools/client/model/Client.java |  2 +-
 .../org/openapitools/client/model/Dog.java    |  2 +-
 .../openapitools/client/model/DogAllOf.java   |  2 +-
 .../openapitools/client/model/EnumArrays.java |  4 +-
 .../openapitools/client/model/EnumTest.java   |  9 ++-
 .../client/model/FileSchemaTestClass.java     |  4 +-
 .../openapitools/client/model/FormatTest.java | 22 +++----
 .../client/model/HasOnlyReadOnly.java         |  4 +-
 .../openapitools/client/model/MapTest.java    |  8 +--
 ...ropertiesAndAdditionalPropertiesClass.java |  6 +-
 .../client/model/Model200Response.java        |  4 +-
 .../client/model/ModelApiResponse.java        |  6 +-
 .../client/model/ModelReturn.java             |  2 +-
 .../org/openapitools/client/model/Name.java   |  7 +--
 .../openapitools/client/model/NumberOnly.java |  2 +-
 .../org/openapitools/client/model/Order.java  | 12 ++--
 .../client/model/OuterComposite.java          |  6 +-
 .../org/openapitools/client/model/Pet.java    | 10 ++--
 .../client/model/ReadOnlyFirst.java           |  4 +-
 .../client/model/SpecialModelName.java        |  2 +-
 .../org/openapitools/client/model/Tag.java    |  4 +-
 .../client/model/TypeHolderDefault.java       |  5 --
 .../client/model/TypeHolderExample.java       |  5 --
 .../org/openapitools/client/model/User.java   | 16 ++---
 .../openapitools/client/model/XmlItem.java    | 58 +++++++++----------
 925 files changed, 2824 insertions(+), 3257 deletions(-)

diff --git a/modules/openapi-generator/src/main/resources/Java/pojo.mustache b/modules/openapi-generator/src/main/resources/Java/pojo.mustache
index 276de9b66e..afd1ebf409 100644
--- a/modules/openapi-generator/src/main/resources/Java/pojo.mustache
+++ b/modules/openapi-generator/src/main/resources/Java/pojo.mustache
@@ -129,7 +129,14 @@ public class {{classname}} {{#parent}}extends {{{parent}}} {{/parent}}{{#parcela
   {{/maximum}}
    * @return {{name}}
   **/
-{{^required}}  @javax.annotation.Nullable {{/required}}
+{{#required}}
+{{#isNullable}}
+  @javax.annotation.Nullable
+{{/isNullable}}
+{{/required}}
+{{^required}}
+  @javax.annotation.Nullable
+{{/required}}
 {{#useBeanValidation}}{{>beanValidation}}{{/useBeanValidation}}  @ApiModelProperty({{#example}}example = "{{{example}}}", {{/example}}{{#required}}required = {{required}}, {{/required}}value = "{{{description}}}")
 {{#vendorExtensions.extraAnnotation}}
   {{{vendorExtensions.extraAnnotation}}}
diff --git a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/AdditionalPropertiesAnyType.java b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/AdditionalPropertiesAnyType.java
index 1abb2d8a64..69d6a81729 100644
--- a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/AdditionalPropertiesAnyType.java
+++ b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/AdditionalPropertiesAnyType.java
@@ -40,7 +40,7 @@ public class AdditionalPropertiesAnyType extends HashMap<String, Object> {
    * Get name
    * @return name
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getName() {
     return name;
diff --git a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/AdditionalPropertiesArray.java b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/AdditionalPropertiesArray.java
index 1821c243e1..0147a592b7 100644
--- a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/AdditionalPropertiesArray.java
+++ b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/AdditionalPropertiesArray.java
@@ -41,7 +41,7 @@ public class AdditionalPropertiesArray extends HashMap<String, List> {
    * Get name
    * @return name
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getName() {
     return name;
diff --git a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/AdditionalPropertiesBoolean.java b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/AdditionalPropertiesBoolean.java
index 78f7ac79b2..89aa511c2a 100644
--- a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/AdditionalPropertiesBoolean.java
+++ b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/AdditionalPropertiesBoolean.java
@@ -40,7 +40,7 @@ public class AdditionalPropertiesBoolean extends HashMap<String, Boolean> {
    * Get name
    * @return name
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getName() {
     return name;
diff --git a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java
index 406bccc278..cb955d1165 100644
--- a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java
+++ b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java
@@ -80,7 +80,7 @@ public class AdditionalPropertiesClass {
    * Get mapString
    * @return mapString
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Map<String, String> getMapString() {
     return mapString;
@@ -107,7 +107,7 @@ public class AdditionalPropertiesClass {
    * Get mapNumber
    * @return mapNumber
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Map<String, BigDecimal> getMapNumber() {
     return mapNumber;
@@ -134,7 +134,7 @@ public class AdditionalPropertiesClass {
    * Get mapInteger
    * @return mapInteger
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Map<String, Integer> getMapInteger() {
     return mapInteger;
@@ -161,7 +161,7 @@ public class AdditionalPropertiesClass {
    * Get mapBoolean
    * @return mapBoolean
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Map<String, Boolean> getMapBoolean() {
     return mapBoolean;
@@ -188,7 +188,7 @@ public class AdditionalPropertiesClass {
    * Get mapArrayInteger
    * @return mapArrayInteger
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Map<String, List<Integer>> getMapArrayInteger() {
     return mapArrayInteger;
@@ -215,7 +215,7 @@ public class AdditionalPropertiesClass {
    * Get mapArrayAnytype
    * @return mapArrayAnytype
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Map<String, List<Object>> getMapArrayAnytype() {
     return mapArrayAnytype;
@@ -242,7 +242,7 @@ public class AdditionalPropertiesClass {
    * Get mapMapString
    * @return mapMapString
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Map<String, Map<String, String>> getMapMapString() {
     return mapMapString;
@@ -269,7 +269,7 @@ public class AdditionalPropertiesClass {
    * Get mapMapAnytype
    * @return mapMapAnytype
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Map<String, Map<String, Object>> getMapMapAnytype() {
     return mapMapAnytype;
@@ -288,7 +288,7 @@ public class AdditionalPropertiesClass {
    * Get anytype1
    * @return anytype1
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Object getAnytype1() {
     return anytype1;
@@ -307,7 +307,7 @@ public class AdditionalPropertiesClass {
    * Get anytype2
    * @return anytype2
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Object getAnytype2() {
     return anytype2;
@@ -326,7 +326,7 @@ public class AdditionalPropertiesClass {
    * Get anytype3
    * @return anytype3
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Object getAnytype3() {
     return anytype3;
diff --git a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/AdditionalPropertiesInteger.java b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/AdditionalPropertiesInteger.java
index 6e5159d404..f27ff011de 100644
--- a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/AdditionalPropertiesInteger.java
+++ b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/AdditionalPropertiesInteger.java
@@ -40,7 +40,7 @@ public class AdditionalPropertiesInteger extends HashMap<String, Integer> {
    * Get name
    * @return name
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getName() {
     return name;
diff --git a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/AdditionalPropertiesNumber.java b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/AdditionalPropertiesNumber.java
index ddc8146dea..479696fdce 100644
--- a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/AdditionalPropertiesNumber.java
+++ b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/AdditionalPropertiesNumber.java
@@ -41,7 +41,7 @@ public class AdditionalPropertiesNumber extends HashMap<String, BigDecimal> {
    * Get name
    * @return name
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getName() {
     return name;
diff --git a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/AdditionalPropertiesObject.java b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/AdditionalPropertiesObject.java
index cc29400029..bd569b0da3 100644
--- a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/AdditionalPropertiesObject.java
+++ b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/AdditionalPropertiesObject.java
@@ -40,7 +40,7 @@ public class AdditionalPropertiesObject extends HashMap<String, Map> {
    * Get name
    * @return name
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getName() {
     return name;
diff --git a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/AdditionalPropertiesString.java b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/AdditionalPropertiesString.java
index fb3368dfed..27e03a2313 100644
--- a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/AdditionalPropertiesString.java
+++ b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/AdditionalPropertiesString.java
@@ -40,7 +40,7 @@ public class AdditionalPropertiesString extends HashMap<String, String> {
    * Get name
    * @return name
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getName() {
     return name;
diff --git a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/Animal.java b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/Animal.java
index 53a0eec339..dc16717ac3 100644
--- a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/Animal.java
+++ b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/Animal.java
@@ -49,7 +49,6 @@ public class Animal {
    * Get className
    * @return className
   **/
-
   @ApiModelProperty(required = true, value = "")
   public String getClassName() {
     return className;
@@ -68,7 +67,7 @@ public class Animal {
    * Get color
    * @return color
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getColor() {
     return color;
diff --git a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java
index de49df3fbd..b670ecb66e 100644
--- a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java
+++ b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java
@@ -49,7 +49,7 @@ public class ArrayOfArrayOfNumberOnly {
    * Get arrayArrayNumber
    * @return arrayArrayNumber
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public List<List<BigDecimal>> getArrayArrayNumber() {
     return arrayArrayNumber;
diff --git a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java
index f4399ff42d..9d6997f88f 100644
--- a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java
+++ b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java
@@ -49,7 +49,7 @@ public class ArrayOfNumberOnly {
    * Get arrayNumber
    * @return arrayNumber
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public List<BigDecimal> getArrayNumber() {
     return arrayNumber;
diff --git a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/ArrayTest.java b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/ArrayTest.java
index 7483fa96ce..7dc235f0a9 100644
--- a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/ArrayTest.java
+++ b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/ArrayTest.java
@@ -55,7 +55,7 @@ public class ArrayTest {
    * Get arrayOfString
    * @return arrayOfString
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public List<String> getArrayOfString() {
     return arrayOfString;
@@ -82,7 +82,7 @@ public class ArrayTest {
    * Get arrayArrayOfInteger
    * @return arrayArrayOfInteger
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public List<List<Long>> getArrayArrayOfInteger() {
     return arrayArrayOfInteger;
@@ -109,7 +109,7 @@ public class ArrayTest {
    * Get arrayArrayOfModel
    * @return arrayArrayOfModel
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public List<List<ReadOnlyFirst>> getArrayArrayOfModel() {
     return arrayArrayOfModel;
diff --git a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/Capitalization.java b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/Capitalization.java
index bb83be97fe..3f3df29d5d 100644
--- a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/Capitalization.java
+++ b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/Capitalization.java
@@ -53,7 +53,7 @@ public class Capitalization {
    * Get smallCamel
    * @return smallCamel
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getSmallCamel() {
     return smallCamel;
@@ -72,7 +72,7 @@ public class Capitalization {
    * Get capitalCamel
    * @return capitalCamel
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getCapitalCamel() {
     return capitalCamel;
@@ -91,7 +91,7 @@ public class Capitalization {
    * Get smallSnake
    * @return smallSnake
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getSmallSnake() {
     return smallSnake;
@@ -110,7 +110,7 @@ public class Capitalization {
    * Get capitalSnake
    * @return capitalSnake
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getCapitalSnake() {
     return capitalSnake;
@@ -129,7 +129,7 @@ public class Capitalization {
    * Get scAETHFlowPoints
    * @return scAETHFlowPoints
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getScAETHFlowPoints() {
     return scAETHFlowPoints;
@@ -148,7 +148,7 @@ public class Capitalization {
    * Name of the pet 
    * @return ATT_NAME
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "Name of the pet ")
   public String getATTNAME() {
     return ATT_NAME;
diff --git a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/Cat.java b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/Cat.java
index 6992ec21ca..3f770e0791 100644
--- a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/Cat.java
+++ b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/Cat.java
@@ -40,7 +40,7 @@ public class Cat extends Animal {
    * Get declawed
    * @return declawed
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Boolean isDeclawed() {
     return declawed;
diff --git a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/CatAllOf.java b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/CatAllOf.java
index 0a5eed53e7..9a258b81bf 100644
--- a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/CatAllOf.java
+++ b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/CatAllOf.java
@@ -38,7 +38,7 @@ public class CatAllOf {
    * Get declawed
    * @return declawed
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Boolean isDeclawed() {
     return declawed;
diff --git a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/Category.java b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/Category.java
index 03efdd4be8..3eccd2cd92 100644
--- a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/Category.java
+++ b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/Category.java
@@ -41,7 +41,7 @@ public class Category {
    * Get id
    * @return id
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Long getId() {
     return id;
@@ -60,7 +60,6 @@ public class Category {
    * Get name
    * @return name
   **/
-
   @ApiModelProperty(required = true, value = "")
   public String getName() {
     return name;
diff --git a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/ClassModel.java b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/ClassModel.java
index def421a670..2aaed27fff 100644
--- a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/ClassModel.java
+++ b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/ClassModel.java
@@ -39,7 +39,7 @@ public class ClassModel {
    * Get propertyClass
    * @return propertyClass
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getPropertyClass() {
     return propertyClass;
diff --git a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/Client.java b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/Client.java
index c0bd0743e5..458e812960 100644
--- a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/Client.java
+++ b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/Client.java
@@ -38,7 +38,7 @@ public class Client {
    * Get client
    * @return client
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getClient() {
     return client;
diff --git a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/Dog.java b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/Dog.java
index 6b79c59606..83f5cb0e27 100644
--- a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/Dog.java
+++ b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/Dog.java
@@ -40,7 +40,7 @@ public class Dog extends Animal {
    * Get breed
    * @return breed
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getBreed() {
     return breed;
diff --git a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/DogAllOf.java b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/DogAllOf.java
index 1a4496d8f0..d1e1402789 100644
--- a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/DogAllOf.java
+++ b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/DogAllOf.java
@@ -38,7 +38,7 @@ public class DogAllOf {
    * Get breed
    * @return breed
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getBreed() {
     return breed;
diff --git a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/EnumArrays.java b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/EnumArrays.java
index 40e31bf3ca..368b481f7e 100644
--- a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/EnumArrays.java
+++ b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/EnumArrays.java
@@ -113,7 +113,7 @@ public class EnumArrays {
    * Get justSymbol
    * @return justSymbol
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public JustSymbolEnum getJustSymbol() {
     return justSymbol;
@@ -140,7 +140,7 @@ public class EnumArrays {
    * Get arrayEnum
    * @return arrayEnum
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public List<ArrayEnumEnum> getArrayEnum() {
     return arrayEnum;
diff --git a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/EnumTest.java b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/EnumTest.java
index d4b36798ee..b365a8a56f 100644
--- a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/EnumTest.java
+++ b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/EnumTest.java
@@ -195,7 +195,7 @@ public class EnumTest {
    * Get enumString
    * @return enumString
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public EnumStringEnum getEnumString() {
     return enumString;
@@ -214,7 +214,6 @@ public class EnumTest {
    * Get enumStringRequired
    * @return enumStringRequired
   **/
-
   @ApiModelProperty(required = true, value = "")
   public EnumStringRequiredEnum getEnumStringRequired() {
     return enumStringRequired;
@@ -233,7 +232,7 @@ public class EnumTest {
    * Get enumInteger
    * @return enumInteger
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public EnumIntegerEnum getEnumInteger() {
     return enumInteger;
@@ -252,7 +251,7 @@ public class EnumTest {
    * Get enumNumber
    * @return enumNumber
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public EnumNumberEnum getEnumNumber() {
     return enumNumber;
@@ -271,7 +270,7 @@ public class EnumTest {
    * Get outerEnum
    * @return outerEnum
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public OuterEnum getOuterEnum() {
     return outerEnum;
diff --git a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java
index bee77a8cec..ca73764280 100644
--- a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java
+++ b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java
@@ -43,7 +43,7 @@ public class FileSchemaTestClass {
    * Get file
    * @return file
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public java.io.File getFile() {
     return file;
@@ -70,7 +70,7 @@ public class FileSchemaTestClass {
    * Get files
    * @return files
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public List<java.io.File> getFiles() {
     return files;
diff --git a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/FormatTest.java b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/FormatTest.java
index c017f57a80..00d132529e 100644
--- a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/FormatTest.java
+++ b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/FormatTest.java
@@ -81,7 +81,7 @@ public class FormatTest {
    * maximum: 100
    * @return integer
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Integer getInteger() {
     return integer;
@@ -102,7 +102,7 @@ public class FormatTest {
    * maximum: 200
    * @return int32
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Integer getInt32() {
     return int32;
@@ -121,7 +121,7 @@ public class FormatTest {
    * Get int64
    * @return int64
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Long getInt64() {
     return int64;
@@ -142,7 +142,6 @@ public class FormatTest {
    * maximum: 543.2
    * @return number
   **/
-
   @ApiModelProperty(required = true, value = "")
   public BigDecimal getNumber() {
     return number;
@@ -163,7 +162,7 @@ public class FormatTest {
    * maximum: 987.6
    * @return _float
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Float getFloat() {
     return _float;
@@ -184,7 +183,7 @@ public class FormatTest {
    * maximum: 123.4
    * @return _double
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Double getDouble() {
     return _double;
@@ -203,7 +202,7 @@ public class FormatTest {
    * Get string
    * @return string
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getString() {
     return string;
@@ -222,7 +221,6 @@ public class FormatTest {
    * Get _byte
    * @return _byte
   **/
-
   @ApiModelProperty(required = true, value = "")
   public byte[] getByte() {
     return _byte;
@@ -241,7 +239,7 @@ public class FormatTest {
    * Get binary
    * @return binary
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public File getBinary() {
     return binary;
@@ -260,7 +258,6 @@ public class FormatTest {
    * Get date
    * @return date
   **/
-
   @ApiModelProperty(required = true, value = "")
   public LocalDate getDate() {
     return date;
@@ -279,7 +276,7 @@ public class FormatTest {
    * Get dateTime
    * @return dateTime
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public OffsetDateTime getDateTime() {
     return dateTime;
@@ -298,7 +295,7 @@ public class FormatTest {
    * Get uuid
    * @return uuid
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(example = "72f98069-206d-4f12-9f12-3d1e525a8e84", value = "")
   public UUID getUuid() {
     return uuid;
@@ -317,7 +314,6 @@ public class FormatTest {
    * Get password
    * @return password
   **/
-
   @ApiModelProperty(required = true, value = "")
   public String getPassword() {
     return password;
diff --git a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java
index 44159e08e8..e9453bb6cc 100644
--- a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java
+++ b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java
@@ -36,7 +36,7 @@ public class HasOnlyReadOnly {
    * Get bar
    * @return bar
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getBar() {
     return bar;
@@ -46,7 +46,7 @@ public class HasOnlyReadOnly {
    * Get foo
    * @return foo
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getFoo() {
     return foo;
diff --git a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/MapTest.java b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/MapTest.java
index a7a141bb9b..44cd694057 100644
--- a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/MapTest.java
+++ b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/MapTest.java
@@ -93,7 +93,7 @@ public class MapTest {
    * Get mapMapOfString
    * @return mapMapOfString
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Map<String, Map<String, String>> getMapMapOfString() {
     return mapMapOfString;
@@ -120,7 +120,7 @@ public class MapTest {
    * Get mapOfEnumString
    * @return mapOfEnumString
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Map<String, InnerEnum> getMapOfEnumString() {
     return mapOfEnumString;
@@ -147,7 +147,7 @@ public class MapTest {
    * Get directMap
    * @return directMap
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Map<String, Boolean> getDirectMap() {
     return directMap;
@@ -174,7 +174,7 @@ public class MapTest {
    * Get indirectMap
    * @return indirectMap
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Map<String, Boolean> getIndirectMap() {
     return indirectMap;
diff --git a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java
index ea930e3e2e..19d808093c 100644
--- a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java
+++ b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java
@@ -50,7 +50,7 @@ public class MixedPropertiesAndAdditionalPropertiesClass {
    * Get uuid
    * @return uuid
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public UUID getUuid() {
     return uuid;
@@ -69,7 +69,7 @@ public class MixedPropertiesAndAdditionalPropertiesClass {
    * Get dateTime
    * @return dateTime
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public OffsetDateTime getDateTime() {
     return dateTime;
@@ -96,7 +96,7 @@ public class MixedPropertiesAndAdditionalPropertiesClass {
    * Get map
    * @return map
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Map<String, Animal> getMap() {
     return map;
diff --git a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/Model200Response.java b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/Model200Response.java
index bd3244dd57..39fabeeb6d 100644
--- a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/Model200Response.java
+++ b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/Model200Response.java
@@ -42,7 +42,7 @@ public class Model200Response {
    * Get name
    * @return name
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Integer getName() {
     return name;
@@ -61,7 +61,7 @@ public class Model200Response {
    * Get propertyClass
    * @return propertyClass
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getPropertyClass() {
     return propertyClass;
diff --git a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/ModelApiResponse.java b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/ModelApiResponse.java
index ed335cdca1..bb33412951 100644
--- a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/ModelApiResponse.java
+++ b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/ModelApiResponse.java
@@ -44,7 +44,7 @@ public class ModelApiResponse {
    * Get code
    * @return code
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Integer getCode() {
     return code;
@@ -63,7 +63,7 @@ public class ModelApiResponse {
    * Get type
    * @return type
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getType() {
     return type;
@@ -82,7 +82,7 @@ public class ModelApiResponse {
    * Get message
    * @return message
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getMessage() {
     return message;
diff --git a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/ModelReturn.java b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/ModelReturn.java
index 04c0bcd33f..9aafb13e04 100644
--- a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/ModelReturn.java
+++ b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/ModelReturn.java
@@ -39,7 +39,7 @@ public class ModelReturn {
    * Get _return
    * @return _return
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Integer getReturn() {
     return _return;
diff --git a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/Name.java b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/Name.java
index af27c6e45f..9518276dd6 100644
--- a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/Name.java
+++ b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/Name.java
@@ -48,7 +48,6 @@ public class Name {
    * Get name
    * @return name
   **/
-
   @ApiModelProperty(required = true, value = "")
   public Integer getName() {
     return name;
@@ -62,7 +61,7 @@ public class Name {
    * Get snakeCase
    * @return snakeCase
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Integer getSnakeCase() {
     return snakeCase;
@@ -77,7 +76,7 @@ public class Name {
    * Get property
    * @return property
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getProperty() {
     return property;
@@ -91,7 +90,7 @@ public class Name {
    * Get _123number
    * @return _123number
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Integer get123number() {
     return _123number;
diff --git a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/NumberOnly.java b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/NumberOnly.java
index 4e29c814cc..0245e8e210 100644
--- a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/NumberOnly.java
+++ b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/NumberOnly.java
@@ -39,7 +39,7 @@ public class NumberOnly {
    * Get justNumber
    * @return justNumber
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public BigDecimal getJustNumber() {
     return justNumber;
diff --git a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/Order.java b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/Order.java
index 7867042746..f72f97defc 100644
--- a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/Order.java
+++ b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/Order.java
@@ -91,7 +91,7 @@ public class Order {
    * Get id
    * @return id
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Long getId() {
     return id;
@@ -110,7 +110,7 @@ public class Order {
    * Get petId
    * @return petId
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Long getPetId() {
     return petId;
@@ -129,7 +129,7 @@ public class Order {
    * Get quantity
    * @return quantity
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Integer getQuantity() {
     return quantity;
@@ -148,7 +148,7 @@ public class Order {
    * Get shipDate
    * @return shipDate
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public OffsetDateTime getShipDate() {
     return shipDate;
@@ -167,7 +167,7 @@ public class Order {
    * Order Status
    * @return status
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "Order Status")
   public StatusEnum getStatus() {
     return status;
@@ -186,7 +186,7 @@ public class Order {
    * Get complete
    * @return complete
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Boolean isComplete() {
     return complete;
diff --git a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/OuterComposite.java b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/OuterComposite.java
index b075f7395a..8fcdb3b130 100644
--- a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/OuterComposite.java
+++ b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/OuterComposite.java
@@ -45,7 +45,7 @@ public class OuterComposite {
    * Get myNumber
    * @return myNumber
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public BigDecimal getMyNumber() {
     return myNumber;
@@ -64,7 +64,7 @@ public class OuterComposite {
    * Get myString
    * @return myString
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getMyString() {
     return myString;
@@ -83,7 +83,7 @@ public class OuterComposite {
    * Get myBoolean
    * @return myBoolean
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Boolean isMyBoolean() {
     return myBoolean;
diff --git a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/Pet.java b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/Pet.java
index 63e9b4ff5d..a7d92129d7 100644
--- a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/Pet.java
+++ b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/Pet.java
@@ -94,7 +94,7 @@ public class Pet {
    * Get id
    * @return id
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Long getId() {
     return id;
@@ -113,7 +113,7 @@ public class Pet {
    * Get category
    * @return category
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Category getCategory() {
     return category;
@@ -132,7 +132,6 @@ public class Pet {
    * Get name
    * @return name
   **/
-
   @ApiModelProperty(example = "doggie", required = true, value = "")
   public String getName() {
     return name;
@@ -156,7 +155,6 @@ public class Pet {
    * Get photoUrls
    * @return photoUrls
   **/
-
   @ApiModelProperty(required = true, value = "")
   public List<String> getPhotoUrls() {
     return photoUrls;
@@ -183,7 +181,7 @@ public class Pet {
    * Get tags
    * @return tags
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public List<Tag> getTags() {
     return tags;
@@ -202,7 +200,7 @@ public class Pet {
    * pet status in the store
    * @return status
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "pet status in the store")
   public StatusEnum getStatus() {
     return status;
diff --git a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/ReadOnlyFirst.java b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/ReadOnlyFirst.java
index a2c9e99699..1379ee09ea 100644
--- a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/ReadOnlyFirst.java
+++ b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/ReadOnlyFirst.java
@@ -36,7 +36,7 @@ public class ReadOnlyFirst {
    * Get bar
    * @return bar
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getBar() {
     return bar;
@@ -51,7 +51,7 @@ public class ReadOnlyFirst {
    * Get baz
    * @return baz
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getBaz() {
     return baz;
diff --git a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/SpecialModelName.java b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/SpecialModelName.java
index a5ddb0b638..869771afad 100644
--- a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/SpecialModelName.java
+++ b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/SpecialModelName.java
@@ -38,7 +38,7 @@ public class SpecialModelName {
    * Get $specialPropertyName
    * @return $specialPropertyName
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Long get$SpecialPropertyName() {
     return $specialPropertyName;
diff --git a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/Tag.java b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/Tag.java
index 8255ad8298..4bb498aff4 100644
--- a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/Tag.java
+++ b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/Tag.java
@@ -41,7 +41,7 @@ public class Tag {
    * Get id
    * @return id
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Long getId() {
     return id;
@@ -60,7 +60,7 @@ public class Tag {
    * Get name
    * @return name
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getName() {
     return name;
diff --git a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/TypeHolderDefault.java b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/TypeHolderDefault.java
index 04a11d85a5..c7988712cc 100644
--- a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/TypeHolderDefault.java
+++ b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/TypeHolderDefault.java
@@ -53,7 +53,6 @@ public class TypeHolderDefault {
    * Get stringItem
    * @return stringItem
   **/
-
   @ApiModelProperty(required = true, value = "")
   public String getStringItem() {
     return stringItem;
@@ -72,7 +71,6 @@ public class TypeHolderDefault {
    * Get numberItem
    * @return numberItem
   **/
-
   @ApiModelProperty(required = true, value = "")
   public BigDecimal getNumberItem() {
     return numberItem;
@@ -91,7 +89,6 @@ public class TypeHolderDefault {
    * Get integerItem
    * @return integerItem
   **/
-
   @ApiModelProperty(required = true, value = "")
   public Integer getIntegerItem() {
     return integerItem;
@@ -110,7 +107,6 @@ public class TypeHolderDefault {
    * Get boolItem
    * @return boolItem
   **/
-
   @ApiModelProperty(required = true, value = "")
   public Boolean isBoolItem() {
     return boolItem;
@@ -134,7 +130,6 @@ public class TypeHolderDefault {
    * Get arrayItem
    * @return arrayItem
   **/
-
   @ApiModelProperty(required = true, value = "")
   public List<Integer> getArrayItem() {
     return arrayItem;
diff --git a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/TypeHolderExample.java b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/TypeHolderExample.java
index a9bf8de899..cca1c01efd 100644
--- a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/TypeHolderExample.java
+++ b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/TypeHolderExample.java
@@ -53,7 +53,6 @@ public class TypeHolderExample {
    * Get stringItem
    * @return stringItem
   **/
-
   @ApiModelProperty(example = "what", required = true, value = "")
   public String getStringItem() {
     return stringItem;
@@ -72,7 +71,6 @@ public class TypeHolderExample {
    * Get numberItem
    * @return numberItem
   **/
-
   @ApiModelProperty(example = "1.234", required = true, value = "")
   public BigDecimal getNumberItem() {
     return numberItem;
@@ -91,7 +89,6 @@ public class TypeHolderExample {
    * Get integerItem
    * @return integerItem
   **/
-
   @ApiModelProperty(example = "-2", required = true, value = "")
   public Integer getIntegerItem() {
     return integerItem;
@@ -110,7 +107,6 @@ public class TypeHolderExample {
    * Get boolItem
    * @return boolItem
   **/
-
   @ApiModelProperty(example = "true", required = true, value = "")
   public Boolean isBoolItem() {
     return boolItem;
@@ -134,7 +130,6 @@ public class TypeHolderExample {
    * Get arrayItem
    * @return arrayItem
   **/
-
   @ApiModelProperty(example = "[0, 1, 2, 3]", required = true, value = "")
   public List<Integer> getArrayItem() {
     return arrayItem;
diff --git a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/User.java b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/User.java
index 6e6c4ac102..73164c3ee2 100644
--- a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/User.java
+++ b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/User.java
@@ -59,7 +59,7 @@ public class User {
    * Get id
    * @return id
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Long getId() {
     return id;
@@ -78,7 +78,7 @@ public class User {
    * Get username
    * @return username
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getUsername() {
     return username;
@@ -97,7 +97,7 @@ public class User {
    * Get firstName
    * @return firstName
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getFirstName() {
     return firstName;
@@ -116,7 +116,7 @@ public class User {
    * Get lastName
    * @return lastName
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getLastName() {
     return lastName;
@@ -135,7 +135,7 @@ public class User {
    * Get email
    * @return email
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getEmail() {
     return email;
@@ -154,7 +154,7 @@ public class User {
    * Get password
    * @return password
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getPassword() {
     return password;
@@ -173,7 +173,7 @@ public class User {
    * Get phone
    * @return phone
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getPhone() {
     return phone;
@@ -192,7 +192,7 @@ public class User {
    * User Status
    * @return userStatus
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "User Status")
   public Integer getUserStatus() {
     return userStatus;
diff --git a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/XmlItem.java b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/XmlItem.java
index 2665c57a91..9ee6eca908 100644
--- a/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/XmlItem.java
+++ b/samples/client/petstore/java/feign/src/main/java/org/openapitools/client/model/XmlItem.java
@@ -125,7 +125,7 @@ public class XmlItem {
    * Get attributeString
    * @return attributeString
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(example = "string", value = "")
   public String getAttributeString() {
     return attributeString;
@@ -144,7 +144,7 @@ public class XmlItem {
    * Get attributeNumber
    * @return attributeNumber
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(example = "1.234", value = "")
   public BigDecimal getAttributeNumber() {
     return attributeNumber;
@@ -163,7 +163,7 @@ public class XmlItem {
    * Get attributeInteger
    * @return attributeInteger
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(example = "-2", value = "")
   public Integer getAttributeInteger() {
     return attributeInteger;
@@ -182,7 +182,7 @@ public class XmlItem {
    * Get attributeBoolean
    * @return attributeBoolean
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(example = "true", value = "")
   public Boolean isAttributeBoolean() {
     return attributeBoolean;
@@ -209,7 +209,7 @@ public class XmlItem {
    * Get wrappedArray
    * @return wrappedArray
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public List<Integer> getWrappedArray() {
     return wrappedArray;
@@ -228,7 +228,7 @@ public class XmlItem {
    * Get nameString
    * @return nameString
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(example = "string", value = "")
   public String getNameString() {
     return nameString;
@@ -247,7 +247,7 @@ public class XmlItem {
    * Get nameNumber
    * @return nameNumber
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(example = "1.234", value = "")
   public BigDecimal getNameNumber() {
     return nameNumber;
@@ -266,7 +266,7 @@ public class XmlItem {
    * Get nameInteger
    * @return nameInteger
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(example = "-2", value = "")
   public Integer getNameInteger() {
     return nameInteger;
@@ -285,7 +285,7 @@ public class XmlItem {
    * Get nameBoolean
    * @return nameBoolean
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(example = "true", value = "")
   public Boolean isNameBoolean() {
     return nameBoolean;
@@ -312,7 +312,7 @@ public class XmlItem {
    * Get nameArray
    * @return nameArray
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public List<Integer> getNameArray() {
     return nameArray;
@@ -339,7 +339,7 @@ public class XmlItem {
    * Get nameWrappedArray
    * @return nameWrappedArray
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public List<Integer> getNameWrappedArray() {
     return nameWrappedArray;
@@ -358,7 +358,7 @@ public class XmlItem {
    * Get prefixString
    * @return prefixString
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(example = "string", value = "")
   public String getPrefixString() {
     return prefixString;
@@ -377,7 +377,7 @@ public class XmlItem {
    * Get prefixNumber
    * @return prefixNumber
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(example = "1.234", value = "")
   public BigDecimal getPrefixNumber() {
     return prefixNumber;
@@ -396,7 +396,7 @@ public class XmlItem {
    * Get prefixInteger
    * @return prefixInteger
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(example = "-2", value = "")
   public Integer getPrefixInteger() {
     return prefixInteger;
@@ -415,7 +415,7 @@ public class XmlItem {
    * Get prefixBoolean
    * @return prefixBoolean
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(example = "true", value = "")
   public Boolean isPrefixBoolean() {
     return prefixBoolean;
@@ -442,7 +442,7 @@ public class XmlItem {
    * Get prefixArray
    * @return prefixArray
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public List<Integer> getPrefixArray() {
     return prefixArray;
@@ -469,7 +469,7 @@ public class XmlItem {
    * Get prefixWrappedArray
    * @return prefixWrappedArray
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public List<Integer> getPrefixWrappedArray() {
     return prefixWrappedArray;
@@ -488,7 +488,7 @@ public class XmlItem {
    * Get namespaceString
    * @return namespaceString
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(example = "string", value = "")
   public String getNamespaceString() {
     return namespaceString;
@@ -507,7 +507,7 @@ public class XmlItem {
    * Get namespaceNumber
    * @return namespaceNumber
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(example = "1.234", value = "")
   public BigDecimal getNamespaceNumber() {
     return namespaceNumber;
@@ -526,7 +526,7 @@ public class XmlItem {
    * Get namespaceInteger
    * @return namespaceInteger
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(example = "-2", value = "")
   public Integer getNamespaceInteger() {
     return namespaceInteger;
@@ -545,7 +545,7 @@ public class XmlItem {
    * Get namespaceBoolean
    * @return namespaceBoolean
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(example = "true", value = "")
   public Boolean isNamespaceBoolean() {
     return namespaceBoolean;
@@ -572,7 +572,7 @@ public class XmlItem {
    * Get namespaceArray
    * @return namespaceArray
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public List<Integer> getNamespaceArray() {
     return namespaceArray;
@@ -599,7 +599,7 @@ public class XmlItem {
    * Get namespaceWrappedArray
    * @return namespaceWrappedArray
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public List<Integer> getNamespaceWrappedArray() {
     return namespaceWrappedArray;
@@ -618,7 +618,7 @@ public class XmlItem {
    * Get prefixNsString
    * @return prefixNsString
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(example = "string", value = "")
   public String getPrefixNsString() {
     return prefixNsString;
@@ -637,7 +637,7 @@ public class XmlItem {
    * Get prefixNsNumber
    * @return prefixNsNumber
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(example = "1.234", value = "")
   public BigDecimal getPrefixNsNumber() {
     return prefixNsNumber;
@@ -656,7 +656,7 @@ public class XmlItem {
    * Get prefixNsInteger
    * @return prefixNsInteger
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(example = "-2", value = "")
   public Integer getPrefixNsInteger() {
     return prefixNsInteger;
@@ -675,7 +675,7 @@ public class XmlItem {
    * Get prefixNsBoolean
    * @return prefixNsBoolean
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(example = "true", value = "")
   public Boolean isPrefixNsBoolean() {
     return prefixNsBoolean;
@@ -702,7 +702,7 @@ public class XmlItem {
    * Get prefixNsArray
    * @return prefixNsArray
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public List<Integer> getPrefixNsArray() {
     return prefixNsArray;
@@ -729,7 +729,7 @@ public class XmlItem {
    * Get prefixNsWrappedArray
    * @return prefixNsWrappedArray
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public List<Integer> getPrefixNsWrappedArray() {
     return prefixNsWrappedArray;
diff --git a/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/AdditionalPropertiesAnyType.java b/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/AdditionalPropertiesAnyType.java
index 1abb2d8a64..69d6a81729 100644
--- a/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/AdditionalPropertiesAnyType.java
+++ b/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/AdditionalPropertiesAnyType.java
@@ -40,7 +40,7 @@ public class AdditionalPropertiesAnyType extends HashMap<String, Object> {
    * Get name
    * @return name
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getName() {
     return name;
diff --git a/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/AdditionalPropertiesArray.java b/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/AdditionalPropertiesArray.java
index 1821c243e1..0147a592b7 100644
--- a/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/AdditionalPropertiesArray.java
+++ b/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/AdditionalPropertiesArray.java
@@ -41,7 +41,7 @@ public class AdditionalPropertiesArray extends HashMap<String, List> {
    * Get name
    * @return name
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getName() {
     return name;
diff --git a/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/AdditionalPropertiesBoolean.java b/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/AdditionalPropertiesBoolean.java
index 78f7ac79b2..89aa511c2a 100644
--- a/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/AdditionalPropertiesBoolean.java
+++ b/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/AdditionalPropertiesBoolean.java
@@ -40,7 +40,7 @@ public class AdditionalPropertiesBoolean extends HashMap<String, Boolean> {
    * Get name
    * @return name
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getName() {
     return name;
diff --git a/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java b/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java
index 406bccc278..cb955d1165 100644
--- a/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java
+++ b/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java
@@ -80,7 +80,7 @@ public class AdditionalPropertiesClass {
    * Get mapString
    * @return mapString
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Map<String, String> getMapString() {
     return mapString;
@@ -107,7 +107,7 @@ public class AdditionalPropertiesClass {
    * Get mapNumber
    * @return mapNumber
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Map<String, BigDecimal> getMapNumber() {
     return mapNumber;
@@ -134,7 +134,7 @@ public class AdditionalPropertiesClass {
    * Get mapInteger
    * @return mapInteger
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Map<String, Integer> getMapInteger() {
     return mapInteger;
@@ -161,7 +161,7 @@ public class AdditionalPropertiesClass {
    * Get mapBoolean
    * @return mapBoolean
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Map<String, Boolean> getMapBoolean() {
     return mapBoolean;
@@ -188,7 +188,7 @@ public class AdditionalPropertiesClass {
    * Get mapArrayInteger
    * @return mapArrayInteger
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Map<String, List<Integer>> getMapArrayInteger() {
     return mapArrayInteger;
@@ -215,7 +215,7 @@ public class AdditionalPropertiesClass {
    * Get mapArrayAnytype
    * @return mapArrayAnytype
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Map<String, List<Object>> getMapArrayAnytype() {
     return mapArrayAnytype;
@@ -242,7 +242,7 @@ public class AdditionalPropertiesClass {
    * Get mapMapString
    * @return mapMapString
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Map<String, Map<String, String>> getMapMapString() {
     return mapMapString;
@@ -269,7 +269,7 @@ public class AdditionalPropertiesClass {
    * Get mapMapAnytype
    * @return mapMapAnytype
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Map<String, Map<String, Object>> getMapMapAnytype() {
     return mapMapAnytype;
@@ -288,7 +288,7 @@ public class AdditionalPropertiesClass {
    * Get anytype1
    * @return anytype1
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Object getAnytype1() {
     return anytype1;
@@ -307,7 +307,7 @@ public class AdditionalPropertiesClass {
    * Get anytype2
    * @return anytype2
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Object getAnytype2() {
     return anytype2;
@@ -326,7 +326,7 @@ public class AdditionalPropertiesClass {
    * Get anytype3
    * @return anytype3
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Object getAnytype3() {
     return anytype3;
diff --git a/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/AdditionalPropertiesInteger.java b/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/AdditionalPropertiesInteger.java
index 6e5159d404..f27ff011de 100644
--- a/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/AdditionalPropertiesInteger.java
+++ b/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/AdditionalPropertiesInteger.java
@@ -40,7 +40,7 @@ public class AdditionalPropertiesInteger extends HashMap<String, Integer> {
    * Get name
    * @return name
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getName() {
     return name;
diff --git a/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/AdditionalPropertiesNumber.java b/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/AdditionalPropertiesNumber.java
index ddc8146dea..479696fdce 100644
--- a/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/AdditionalPropertiesNumber.java
+++ b/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/AdditionalPropertiesNumber.java
@@ -41,7 +41,7 @@ public class AdditionalPropertiesNumber extends HashMap<String, BigDecimal> {
    * Get name
    * @return name
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getName() {
     return name;
diff --git a/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/AdditionalPropertiesObject.java b/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/AdditionalPropertiesObject.java
index cc29400029..bd569b0da3 100644
--- a/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/AdditionalPropertiesObject.java
+++ b/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/AdditionalPropertiesObject.java
@@ -40,7 +40,7 @@ public class AdditionalPropertiesObject extends HashMap<String, Map> {
    * Get name
    * @return name
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getName() {
     return name;
diff --git a/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/AdditionalPropertiesString.java b/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/AdditionalPropertiesString.java
index fb3368dfed..27e03a2313 100644
--- a/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/AdditionalPropertiesString.java
+++ b/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/AdditionalPropertiesString.java
@@ -40,7 +40,7 @@ public class AdditionalPropertiesString extends HashMap<String, String> {
    * Get name
    * @return name
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getName() {
     return name;
diff --git a/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/Animal.java b/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/Animal.java
index 53a0eec339..dc16717ac3 100644
--- a/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/Animal.java
+++ b/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/Animal.java
@@ -49,7 +49,6 @@ public class Animal {
    * Get className
    * @return className
   **/
-
   @ApiModelProperty(required = true, value = "")
   public String getClassName() {
     return className;
@@ -68,7 +67,7 @@ public class Animal {
    * Get color
    * @return color
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getColor() {
     return color;
diff --git a/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java b/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java
index de49df3fbd..b670ecb66e 100644
--- a/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java
+++ b/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java
@@ -49,7 +49,7 @@ public class ArrayOfArrayOfNumberOnly {
    * Get arrayArrayNumber
    * @return arrayArrayNumber
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public List<List<BigDecimal>> getArrayArrayNumber() {
     return arrayArrayNumber;
diff --git a/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java b/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java
index f4399ff42d..9d6997f88f 100644
--- a/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java
+++ b/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java
@@ -49,7 +49,7 @@ public class ArrayOfNumberOnly {
    * Get arrayNumber
    * @return arrayNumber
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public List<BigDecimal> getArrayNumber() {
     return arrayNumber;
diff --git a/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/ArrayTest.java b/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/ArrayTest.java
index 7483fa96ce..7dc235f0a9 100644
--- a/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/ArrayTest.java
+++ b/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/ArrayTest.java
@@ -55,7 +55,7 @@ public class ArrayTest {
    * Get arrayOfString
    * @return arrayOfString
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public List<String> getArrayOfString() {
     return arrayOfString;
@@ -82,7 +82,7 @@ public class ArrayTest {
    * Get arrayArrayOfInteger
    * @return arrayArrayOfInteger
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public List<List<Long>> getArrayArrayOfInteger() {
     return arrayArrayOfInteger;
@@ -109,7 +109,7 @@ public class ArrayTest {
    * Get arrayArrayOfModel
    * @return arrayArrayOfModel
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public List<List<ReadOnlyFirst>> getArrayArrayOfModel() {
     return arrayArrayOfModel;
diff --git a/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/Capitalization.java b/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/Capitalization.java
index bb83be97fe..3f3df29d5d 100644
--- a/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/Capitalization.java
+++ b/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/Capitalization.java
@@ -53,7 +53,7 @@ public class Capitalization {
    * Get smallCamel
    * @return smallCamel
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getSmallCamel() {
     return smallCamel;
@@ -72,7 +72,7 @@ public class Capitalization {
    * Get capitalCamel
    * @return capitalCamel
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getCapitalCamel() {
     return capitalCamel;
@@ -91,7 +91,7 @@ public class Capitalization {
    * Get smallSnake
    * @return smallSnake
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getSmallSnake() {
     return smallSnake;
@@ -110,7 +110,7 @@ public class Capitalization {
    * Get capitalSnake
    * @return capitalSnake
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getCapitalSnake() {
     return capitalSnake;
@@ -129,7 +129,7 @@ public class Capitalization {
    * Get scAETHFlowPoints
    * @return scAETHFlowPoints
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getScAETHFlowPoints() {
     return scAETHFlowPoints;
@@ -148,7 +148,7 @@ public class Capitalization {
    * Name of the pet 
    * @return ATT_NAME
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "Name of the pet ")
   public String getATTNAME() {
     return ATT_NAME;
diff --git a/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/Cat.java b/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/Cat.java
index 6992ec21ca..3f770e0791 100644
--- a/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/Cat.java
+++ b/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/Cat.java
@@ -40,7 +40,7 @@ public class Cat extends Animal {
    * Get declawed
    * @return declawed
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Boolean isDeclawed() {
     return declawed;
diff --git a/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/CatAllOf.java b/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/CatAllOf.java
index 0a5eed53e7..9a258b81bf 100644
--- a/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/CatAllOf.java
+++ b/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/CatAllOf.java
@@ -38,7 +38,7 @@ public class CatAllOf {
    * Get declawed
    * @return declawed
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Boolean isDeclawed() {
     return declawed;
diff --git a/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/Category.java b/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/Category.java
index 03efdd4be8..3eccd2cd92 100644
--- a/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/Category.java
+++ b/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/Category.java
@@ -41,7 +41,7 @@ public class Category {
    * Get id
    * @return id
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Long getId() {
     return id;
@@ -60,7 +60,6 @@ public class Category {
    * Get name
    * @return name
   **/
-
   @ApiModelProperty(required = true, value = "")
   public String getName() {
     return name;
diff --git a/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/ClassModel.java b/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/ClassModel.java
index def421a670..2aaed27fff 100644
--- a/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/ClassModel.java
+++ b/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/ClassModel.java
@@ -39,7 +39,7 @@ public class ClassModel {
    * Get propertyClass
    * @return propertyClass
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getPropertyClass() {
     return propertyClass;
diff --git a/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/Client.java b/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/Client.java
index c0bd0743e5..458e812960 100644
--- a/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/Client.java
+++ b/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/Client.java
@@ -38,7 +38,7 @@ public class Client {
    * Get client
    * @return client
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getClient() {
     return client;
diff --git a/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/Dog.java b/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/Dog.java
index 6b79c59606..83f5cb0e27 100644
--- a/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/Dog.java
+++ b/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/Dog.java
@@ -40,7 +40,7 @@ public class Dog extends Animal {
    * Get breed
    * @return breed
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getBreed() {
     return breed;
diff --git a/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/DogAllOf.java b/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/DogAllOf.java
index 1a4496d8f0..d1e1402789 100644
--- a/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/DogAllOf.java
+++ b/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/DogAllOf.java
@@ -38,7 +38,7 @@ public class DogAllOf {
    * Get breed
    * @return breed
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getBreed() {
     return breed;
diff --git a/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/EnumArrays.java b/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/EnumArrays.java
index 40e31bf3ca..368b481f7e 100644
--- a/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/EnumArrays.java
+++ b/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/EnumArrays.java
@@ -113,7 +113,7 @@ public class EnumArrays {
    * Get justSymbol
    * @return justSymbol
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public JustSymbolEnum getJustSymbol() {
     return justSymbol;
@@ -140,7 +140,7 @@ public class EnumArrays {
    * Get arrayEnum
    * @return arrayEnum
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public List<ArrayEnumEnum> getArrayEnum() {
     return arrayEnum;
diff --git a/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/EnumTest.java b/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/EnumTest.java
index d4b36798ee..b365a8a56f 100644
--- a/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/EnumTest.java
+++ b/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/EnumTest.java
@@ -195,7 +195,7 @@ public class EnumTest {
    * Get enumString
    * @return enumString
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public EnumStringEnum getEnumString() {
     return enumString;
@@ -214,7 +214,6 @@ public class EnumTest {
    * Get enumStringRequired
    * @return enumStringRequired
   **/
-
   @ApiModelProperty(required = true, value = "")
   public EnumStringRequiredEnum getEnumStringRequired() {
     return enumStringRequired;
@@ -233,7 +232,7 @@ public class EnumTest {
    * Get enumInteger
    * @return enumInteger
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public EnumIntegerEnum getEnumInteger() {
     return enumInteger;
@@ -252,7 +251,7 @@ public class EnumTest {
    * Get enumNumber
    * @return enumNumber
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public EnumNumberEnum getEnumNumber() {
     return enumNumber;
@@ -271,7 +270,7 @@ public class EnumTest {
    * Get outerEnum
    * @return outerEnum
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public OuterEnum getOuterEnum() {
     return outerEnum;
diff --git a/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java b/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java
index bee77a8cec..ca73764280 100644
--- a/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java
+++ b/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java
@@ -43,7 +43,7 @@ public class FileSchemaTestClass {
    * Get file
    * @return file
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public java.io.File getFile() {
     return file;
@@ -70,7 +70,7 @@ public class FileSchemaTestClass {
    * Get files
    * @return files
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public List<java.io.File> getFiles() {
     return files;
diff --git a/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/FormatTest.java b/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/FormatTest.java
index c017f57a80..00d132529e 100644
--- a/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/FormatTest.java
+++ b/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/FormatTest.java
@@ -81,7 +81,7 @@ public class FormatTest {
    * maximum: 100
    * @return integer
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Integer getInteger() {
     return integer;
@@ -102,7 +102,7 @@ public class FormatTest {
    * maximum: 200
    * @return int32
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Integer getInt32() {
     return int32;
@@ -121,7 +121,7 @@ public class FormatTest {
    * Get int64
    * @return int64
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Long getInt64() {
     return int64;
@@ -142,7 +142,6 @@ public class FormatTest {
    * maximum: 543.2
    * @return number
   **/
-
   @ApiModelProperty(required = true, value = "")
   public BigDecimal getNumber() {
     return number;
@@ -163,7 +162,7 @@ public class FormatTest {
    * maximum: 987.6
    * @return _float
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Float getFloat() {
     return _float;
@@ -184,7 +183,7 @@ public class FormatTest {
    * maximum: 123.4
    * @return _double
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Double getDouble() {
     return _double;
@@ -203,7 +202,7 @@ public class FormatTest {
    * Get string
    * @return string
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getString() {
     return string;
@@ -222,7 +221,6 @@ public class FormatTest {
    * Get _byte
    * @return _byte
   **/
-
   @ApiModelProperty(required = true, value = "")
   public byte[] getByte() {
     return _byte;
@@ -241,7 +239,7 @@ public class FormatTest {
    * Get binary
    * @return binary
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public File getBinary() {
     return binary;
@@ -260,7 +258,6 @@ public class FormatTest {
    * Get date
    * @return date
   **/
-
   @ApiModelProperty(required = true, value = "")
   public LocalDate getDate() {
     return date;
@@ -279,7 +276,7 @@ public class FormatTest {
    * Get dateTime
    * @return dateTime
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public OffsetDateTime getDateTime() {
     return dateTime;
@@ -298,7 +295,7 @@ public class FormatTest {
    * Get uuid
    * @return uuid
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(example = "72f98069-206d-4f12-9f12-3d1e525a8e84", value = "")
   public UUID getUuid() {
     return uuid;
@@ -317,7 +314,6 @@ public class FormatTest {
    * Get password
    * @return password
   **/
-
   @ApiModelProperty(required = true, value = "")
   public String getPassword() {
     return password;
diff --git a/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java b/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java
index 44159e08e8..e9453bb6cc 100644
--- a/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java
+++ b/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java
@@ -36,7 +36,7 @@ public class HasOnlyReadOnly {
    * Get bar
    * @return bar
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getBar() {
     return bar;
@@ -46,7 +46,7 @@ public class HasOnlyReadOnly {
    * Get foo
    * @return foo
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getFoo() {
     return foo;
diff --git a/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/MapTest.java b/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/MapTest.java
index a7a141bb9b..44cd694057 100644
--- a/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/MapTest.java
+++ b/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/MapTest.java
@@ -93,7 +93,7 @@ public class MapTest {
    * Get mapMapOfString
    * @return mapMapOfString
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Map<String, Map<String, String>> getMapMapOfString() {
     return mapMapOfString;
@@ -120,7 +120,7 @@ public class MapTest {
    * Get mapOfEnumString
    * @return mapOfEnumString
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Map<String, InnerEnum> getMapOfEnumString() {
     return mapOfEnumString;
@@ -147,7 +147,7 @@ public class MapTest {
    * Get directMap
    * @return directMap
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Map<String, Boolean> getDirectMap() {
     return directMap;
@@ -174,7 +174,7 @@ public class MapTest {
    * Get indirectMap
    * @return indirectMap
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Map<String, Boolean> getIndirectMap() {
     return indirectMap;
diff --git a/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java
index ea930e3e2e..19d808093c 100644
--- a/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java
+++ b/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java
@@ -50,7 +50,7 @@ public class MixedPropertiesAndAdditionalPropertiesClass {
    * Get uuid
    * @return uuid
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public UUID getUuid() {
     return uuid;
@@ -69,7 +69,7 @@ public class MixedPropertiesAndAdditionalPropertiesClass {
    * Get dateTime
    * @return dateTime
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public OffsetDateTime getDateTime() {
     return dateTime;
@@ -96,7 +96,7 @@ public class MixedPropertiesAndAdditionalPropertiesClass {
    * Get map
    * @return map
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Map<String, Animal> getMap() {
     return map;
diff --git a/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/Model200Response.java b/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/Model200Response.java
index bd3244dd57..39fabeeb6d 100644
--- a/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/Model200Response.java
+++ b/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/Model200Response.java
@@ -42,7 +42,7 @@ public class Model200Response {
    * Get name
    * @return name
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Integer getName() {
     return name;
@@ -61,7 +61,7 @@ public class Model200Response {
    * Get propertyClass
    * @return propertyClass
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getPropertyClass() {
     return propertyClass;
diff --git a/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/ModelApiResponse.java b/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/ModelApiResponse.java
index ed335cdca1..bb33412951 100644
--- a/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/ModelApiResponse.java
+++ b/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/ModelApiResponse.java
@@ -44,7 +44,7 @@ public class ModelApiResponse {
    * Get code
    * @return code
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Integer getCode() {
     return code;
@@ -63,7 +63,7 @@ public class ModelApiResponse {
    * Get type
    * @return type
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getType() {
     return type;
@@ -82,7 +82,7 @@ public class ModelApiResponse {
    * Get message
    * @return message
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getMessage() {
     return message;
diff --git a/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/ModelReturn.java b/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/ModelReturn.java
index 04c0bcd33f..9aafb13e04 100644
--- a/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/ModelReturn.java
+++ b/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/ModelReturn.java
@@ -39,7 +39,7 @@ public class ModelReturn {
    * Get _return
    * @return _return
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Integer getReturn() {
     return _return;
diff --git a/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/Name.java b/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/Name.java
index af27c6e45f..9518276dd6 100644
--- a/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/Name.java
+++ b/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/Name.java
@@ -48,7 +48,6 @@ public class Name {
    * Get name
    * @return name
   **/
-
   @ApiModelProperty(required = true, value = "")
   public Integer getName() {
     return name;
@@ -62,7 +61,7 @@ public class Name {
    * Get snakeCase
    * @return snakeCase
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Integer getSnakeCase() {
     return snakeCase;
@@ -77,7 +76,7 @@ public class Name {
    * Get property
    * @return property
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getProperty() {
     return property;
@@ -91,7 +90,7 @@ public class Name {
    * Get _123number
    * @return _123number
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Integer get123number() {
     return _123number;
diff --git a/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/NumberOnly.java b/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/NumberOnly.java
index 4e29c814cc..0245e8e210 100644
--- a/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/NumberOnly.java
+++ b/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/NumberOnly.java
@@ -39,7 +39,7 @@ public class NumberOnly {
    * Get justNumber
    * @return justNumber
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public BigDecimal getJustNumber() {
     return justNumber;
diff --git a/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/Order.java b/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/Order.java
index 7867042746..f72f97defc 100644
--- a/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/Order.java
+++ b/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/Order.java
@@ -91,7 +91,7 @@ public class Order {
    * Get id
    * @return id
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Long getId() {
     return id;
@@ -110,7 +110,7 @@ public class Order {
    * Get petId
    * @return petId
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Long getPetId() {
     return petId;
@@ -129,7 +129,7 @@ public class Order {
    * Get quantity
    * @return quantity
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Integer getQuantity() {
     return quantity;
@@ -148,7 +148,7 @@ public class Order {
    * Get shipDate
    * @return shipDate
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public OffsetDateTime getShipDate() {
     return shipDate;
@@ -167,7 +167,7 @@ public class Order {
    * Order Status
    * @return status
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "Order Status")
   public StatusEnum getStatus() {
     return status;
@@ -186,7 +186,7 @@ public class Order {
    * Get complete
    * @return complete
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Boolean isComplete() {
     return complete;
diff --git a/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/OuterComposite.java b/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/OuterComposite.java
index b075f7395a..8fcdb3b130 100644
--- a/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/OuterComposite.java
+++ b/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/OuterComposite.java
@@ -45,7 +45,7 @@ public class OuterComposite {
    * Get myNumber
    * @return myNumber
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public BigDecimal getMyNumber() {
     return myNumber;
@@ -64,7 +64,7 @@ public class OuterComposite {
    * Get myString
    * @return myString
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getMyString() {
     return myString;
@@ -83,7 +83,7 @@ public class OuterComposite {
    * Get myBoolean
    * @return myBoolean
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Boolean isMyBoolean() {
     return myBoolean;
diff --git a/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/Pet.java b/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/Pet.java
index 63e9b4ff5d..a7d92129d7 100644
--- a/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/Pet.java
+++ b/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/Pet.java
@@ -94,7 +94,7 @@ public class Pet {
    * Get id
    * @return id
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Long getId() {
     return id;
@@ -113,7 +113,7 @@ public class Pet {
    * Get category
    * @return category
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Category getCategory() {
     return category;
@@ -132,7 +132,6 @@ public class Pet {
    * Get name
    * @return name
   **/
-
   @ApiModelProperty(example = "doggie", required = true, value = "")
   public String getName() {
     return name;
@@ -156,7 +155,6 @@ public class Pet {
    * Get photoUrls
    * @return photoUrls
   **/
-
   @ApiModelProperty(required = true, value = "")
   public List<String> getPhotoUrls() {
     return photoUrls;
@@ -183,7 +181,7 @@ public class Pet {
    * Get tags
    * @return tags
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public List<Tag> getTags() {
     return tags;
@@ -202,7 +200,7 @@ public class Pet {
    * pet status in the store
    * @return status
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "pet status in the store")
   public StatusEnum getStatus() {
     return status;
diff --git a/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/ReadOnlyFirst.java b/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/ReadOnlyFirst.java
index a2c9e99699..1379ee09ea 100644
--- a/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/ReadOnlyFirst.java
+++ b/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/ReadOnlyFirst.java
@@ -36,7 +36,7 @@ public class ReadOnlyFirst {
    * Get bar
    * @return bar
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getBar() {
     return bar;
@@ -51,7 +51,7 @@ public class ReadOnlyFirst {
    * Get baz
    * @return baz
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getBaz() {
     return baz;
diff --git a/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/SpecialModelName.java b/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/SpecialModelName.java
index a5ddb0b638..869771afad 100644
--- a/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/SpecialModelName.java
+++ b/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/SpecialModelName.java
@@ -38,7 +38,7 @@ public class SpecialModelName {
    * Get $specialPropertyName
    * @return $specialPropertyName
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Long get$SpecialPropertyName() {
     return $specialPropertyName;
diff --git a/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/Tag.java b/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/Tag.java
index 8255ad8298..4bb498aff4 100644
--- a/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/Tag.java
+++ b/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/Tag.java
@@ -41,7 +41,7 @@ public class Tag {
    * Get id
    * @return id
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Long getId() {
     return id;
@@ -60,7 +60,7 @@ public class Tag {
    * Get name
    * @return name
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getName() {
     return name;
diff --git a/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/TypeHolderDefault.java b/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/TypeHolderDefault.java
index 04a11d85a5..c7988712cc 100644
--- a/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/TypeHolderDefault.java
+++ b/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/TypeHolderDefault.java
@@ -53,7 +53,6 @@ public class TypeHolderDefault {
    * Get stringItem
    * @return stringItem
   **/
-
   @ApiModelProperty(required = true, value = "")
   public String getStringItem() {
     return stringItem;
@@ -72,7 +71,6 @@ public class TypeHolderDefault {
    * Get numberItem
    * @return numberItem
   **/
-
   @ApiModelProperty(required = true, value = "")
   public BigDecimal getNumberItem() {
     return numberItem;
@@ -91,7 +89,6 @@ public class TypeHolderDefault {
    * Get integerItem
    * @return integerItem
   **/
-
   @ApiModelProperty(required = true, value = "")
   public Integer getIntegerItem() {
     return integerItem;
@@ -110,7 +107,6 @@ public class TypeHolderDefault {
    * Get boolItem
    * @return boolItem
   **/
-
   @ApiModelProperty(required = true, value = "")
   public Boolean isBoolItem() {
     return boolItem;
@@ -134,7 +130,6 @@ public class TypeHolderDefault {
    * Get arrayItem
    * @return arrayItem
   **/
-
   @ApiModelProperty(required = true, value = "")
   public List<Integer> getArrayItem() {
     return arrayItem;
diff --git a/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/TypeHolderExample.java b/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/TypeHolderExample.java
index a9bf8de899..cca1c01efd 100644
--- a/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/TypeHolderExample.java
+++ b/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/TypeHolderExample.java
@@ -53,7 +53,6 @@ public class TypeHolderExample {
    * Get stringItem
    * @return stringItem
   **/
-
   @ApiModelProperty(example = "what", required = true, value = "")
   public String getStringItem() {
     return stringItem;
@@ -72,7 +71,6 @@ public class TypeHolderExample {
    * Get numberItem
    * @return numberItem
   **/
-
   @ApiModelProperty(example = "1.234", required = true, value = "")
   public BigDecimal getNumberItem() {
     return numberItem;
@@ -91,7 +89,6 @@ public class TypeHolderExample {
    * Get integerItem
    * @return integerItem
   **/
-
   @ApiModelProperty(example = "-2", required = true, value = "")
   public Integer getIntegerItem() {
     return integerItem;
@@ -110,7 +107,6 @@ public class TypeHolderExample {
    * Get boolItem
    * @return boolItem
   **/
-
   @ApiModelProperty(example = "true", required = true, value = "")
   public Boolean isBoolItem() {
     return boolItem;
@@ -134,7 +130,6 @@ public class TypeHolderExample {
    * Get arrayItem
    * @return arrayItem
   **/
-
   @ApiModelProperty(example = "[0, 1, 2, 3]", required = true, value = "")
   public List<Integer> getArrayItem() {
     return arrayItem;
diff --git a/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/User.java b/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/User.java
index 6e6c4ac102..73164c3ee2 100644
--- a/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/User.java
+++ b/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/User.java
@@ -59,7 +59,7 @@ public class User {
    * Get id
    * @return id
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Long getId() {
     return id;
@@ -78,7 +78,7 @@ public class User {
    * Get username
    * @return username
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getUsername() {
     return username;
@@ -97,7 +97,7 @@ public class User {
    * Get firstName
    * @return firstName
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getFirstName() {
     return firstName;
@@ -116,7 +116,7 @@ public class User {
    * Get lastName
    * @return lastName
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getLastName() {
     return lastName;
@@ -135,7 +135,7 @@ public class User {
    * Get email
    * @return email
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getEmail() {
     return email;
@@ -154,7 +154,7 @@ public class User {
    * Get password
    * @return password
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getPassword() {
     return password;
@@ -173,7 +173,7 @@ public class User {
    * Get phone
    * @return phone
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getPhone() {
     return phone;
@@ -192,7 +192,7 @@ public class User {
    * User Status
    * @return userStatus
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "User Status")
   public Integer getUserStatus() {
     return userStatus;
diff --git a/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/XmlItem.java b/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/XmlItem.java
index 2665c57a91..9ee6eca908 100644
--- a/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/XmlItem.java
+++ b/samples/client/petstore/java/feign10x/src/main/java/org/openapitools/client/model/XmlItem.java
@@ -125,7 +125,7 @@ public class XmlItem {
    * Get attributeString
    * @return attributeString
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(example = "string", value = "")
   public String getAttributeString() {
     return attributeString;
@@ -144,7 +144,7 @@ public class XmlItem {
    * Get attributeNumber
    * @return attributeNumber
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(example = "1.234", value = "")
   public BigDecimal getAttributeNumber() {
     return attributeNumber;
@@ -163,7 +163,7 @@ public class XmlItem {
    * Get attributeInteger
    * @return attributeInteger
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(example = "-2", value = "")
   public Integer getAttributeInteger() {
     return attributeInteger;
@@ -182,7 +182,7 @@ public class XmlItem {
    * Get attributeBoolean
    * @return attributeBoolean
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(example = "true", value = "")
   public Boolean isAttributeBoolean() {
     return attributeBoolean;
@@ -209,7 +209,7 @@ public class XmlItem {
    * Get wrappedArray
    * @return wrappedArray
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public List<Integer> getWrappedArray() {
     return wrappedArray;
@@ -228,7 +228,7 @@ public class XmlItem {
    * Get nameString
    * @return nameString
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(example = "string", value = "")
   public String getNameString() {
     return nameString;
@@ -247,7 +247,7 @@ public class XmlItem {
    * Get nameNumber
    * @return nameNumber
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(example = "1.234", value = "")
   public BigDecimal getNameNumber() {
     return nameNumber;
@@ -266,7 +266,7 @@ public class XmlItem {
    * Get nameInteger
    * @return nameInteger
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(example = "-2", value = "")
   public Integer getNameInteger() {
     return nameInteger;
@@ -285,7 +285,7 @@ public class XmlItem {
    * Get nameBoolean
    * @return nameBoolean
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(example = "true", value = "")
   public Boolean isNameBoolean() {
     return nameBoolean;
@@ -312,7 +312,7 @@ public class XmlItem {
    * Get nameArray
    * @return nameArray
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public List<Integer> getNameArray() {
     return nameArray;
@@ -339,7 +339,7 @@ public class XmlItem {
    * Get nameWrappedArray
    * @return nameWrappedArray
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public List<Integer> getNameWrappedArray() {
     return nameWrappedArray;
@@ -358,7 +358,7 @@ public class XmlItem {
    * Get prefixString
    * @return prefixString
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(example = "string", value = "")
   public String getPrefixString() {
     return prefixString;
@@ -377,7 +377,7 @@ public class XmlItem {
    * Get prefixNumber
    * @return prefixNumber
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(example = "1.234", value = "")
   public BigDecimal getPrefixNumber() {
     return prefixNumber;
@@ -396,7 +396,7 @@ public class XmlItem {
    * Get prefixInteger
    * @return prefixInteger
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(example = "-2", value = "")
   public Integer getPrefixInteger() {
     return prefixInteger;
@@ -415,7 +415,7 @@ public class XmlItem {
    * Get prefixBoolean
    * @return prefixBoolean
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(example = "true", value = "")
   public Boolean isPrefixBoolean() {
     return prefixBoolean;
@@ -442,7 +442,7 @@ public class XmlItem {
    * Get prefixArray
    * @return prefixArray
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public List<Integer> getPrefixArray() {
     return prefixArray;
@@ -469,7 +469,7 @@ public class XmlItem {
    * Get prefixWrappedArray
    * @return prefixWrappedArray
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public List<Integer> getPrefixWrappedArray() {
     return prefixWrappedArray;
@@ -488,7 +488,7 @@ public class XmlItem {
    * Get namespaceString
    * @return namespaceString
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(example = "string", value = "")
   public String getNamespaceString() {
     return namespaceString;
@@ -507,7 +507,7 @@ public class XmlItem {
    * Get namespaceNumber
    * @return namespaceNumber
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(example = "1.234", value = "")
   public BigDecimal getNamespaceNumber() {
     return namespaceNumber;
@@ -526,7 +526,7 @@ public class XmlItem {
    * Get namespaceInteger
    * @return namespaceInteger
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(example = "-2", value = "")
   public Integer getNamespaceInteger() {
     return namespaceInteger;
@@ -545,7 +545,7 @@ public class XmlItem {
    * Get namespaceBoolean
    * @return namespaceBoolean
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(example = "true", value = "")
   public Boolean isNamespaceBoolean() {
     return namespaceBoolean;
@@ -572,7 +572,7 @@ public class XmlItem {
    * Get namespaceArray
    * @return namespaceArray
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public List<Integer> getNamespaceArray() {
     return namespaceArray;
@@ -599,7 +599,7 @@ public class XmlItem {
    * Get namespaceWrappedArray
    * @return namespaceWrappedArray
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public List<Integer> getNamespaceWrappedArray() {
     return namespaceWrappedArray;
@@ -618,7 +618,7 @@ public class XmlItem {
    * Get prefixNsString
    * @return prefixNsString
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(example = "string", value = "")
   public String getPrefixNsString() {
     return prefixNsString;
@@ -637,7 +637,7 @@ public class XmlItem {
    * Get prefixNsNumber
    * @return prefixNsNumber
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(example = "1.234", value = "")
   public BigDecimal getPrefixNsNumber() {
     return prefixNsNumber;
@@ -656,7 +656,7 @@ public class XmlItem {
    * Get prefixNsInteger
    * @return prefixNsInteger
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(example = "-2", value = "")
   public Integer getPrefixNsInteger() {
     return prefixNsInteger;
@@ -675,7 +675,7 @@ public class XmlItem {
    * Get prefixNsBoolean
    * @return prefixNsBoolean
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(example = "true", value = "")
   public Boolean isPrefixNsBoolean() {
     return prefixNsBoolean;
@@ -702,7 +702,7 @@ public class XmlItem {
    * Get prefixNsArray
    * @return prefixNsArray
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public List<Integer> getPrefixNsArray() {
     return prefixNsArray;
@@ -729,7 +729,7 @@ public class XmlItem {
    * Get prefixNsWrappedArray
    * @return prefixNsWrappedArray
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public List<Integer> getPrefixNsWrappedArray() {
     return prefixNsWrappedArray;
diff --git a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/AdditionalPropertiesAnyType.java b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/AdditionalPropertiesAnyType.java
index 1abb2d8a64..69d6a81729 100644
--- a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/AdditionalPropertiesAnyType.java
+++ b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/AdditionalPropertiesAnyType.java
@@ -40,7 +40,7 @@ public class AdditionalPropertiesAnyType extends HashMap<String, Object> {
    * Get name
    * @return name
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getName() {
     return name;
diff --git a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/AdditionalPropertiesArray.java b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/AdditionalPropertiesArray.java
index 1821c243e1..0147a592b7 100644
--- a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/AdditionalPropertiesArray.java
+++ b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/AdditionalPropertiesArray.java
@@ -41,7 +41,7 @@ public class AdditionalPropertiesArray extends HashMap<String, List> {
    * Get name
    * @return name
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getName() {
     return name;
diff --git a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/AdditionalPropertiesBoolean.java b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/AdditionalPropertiesBoolean.java
index 78f7ac79b2..89aa511c2a 100644
--- a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/AdditionalPropertiesBoolean.java
+++ b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/AdditionalPropertiesBoolean.java
@@ -40,7 +40,7 @@ public class AdditionalPropertiesBoolean extends HashMap<String, Boolean> {
    * Get name
    * @return name
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getName() {
     return name;
diff --git a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java
index 406bccc278..cb955d1165 100644
--- a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java
+++ b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java
@@ -80,7 +80,7 @@ public class AdditionalPropertiesClass {
    * Get mapString
    * @return mapString
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Map<String, String> getMapString() {
     return mapString;
@@ -107,7 +107,7 @@ public class AdditionalPropertiesClass {
    * Get mapNumber
    * @return mapNumber
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Map<String, BigDecimal> getMapNumber() {
     return mapNumber;
@@ -134,7 +134,7 @@ public class AdditionalPropertiesClass {
    * Get mapInteger
    * @return mapInteger
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Map<String, Integer> getMapInteger() {
     return mapInteger;
@@ -161,7 +161,7 @@ public class AdditionalPropertiesClass {
    * Get mapBoolean
    * @return mapBoolean
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Map<String, Boolean> getMapBoolean() {
     return mapBoolean;
@@ -188,7 +188,7 @@ public class AdditionalPropertiesClass {
    * Get mapArrayInteger
    * @return mapArrayInteger
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Map<String, List<Integer>> getMapArrayInteger() {
     return mapArrayInteger;
@@ -215,7 +215,7 @@ public class AdditionalPropertiesClass {
    * Get mapArrayAnytype
    * @return mapArrayAnytype
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Map<String, List<Object>> getMapArrayAnytype() {
     return mapArrayAnytype;
@@ -242,7 +242,7 @@ public class AdditionalPropertiesClass {
    * Get mapMapString
    * @return mapMapString
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Map<String, Map<String, String>> getMapMapString() {
     return mapMapString;
@@ -269,7 +269,7 @@ public class AdditionalPropertiesClass {
    * Get mapMapAnytype
    * @return mapMapAnytype
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Map<String, Map<String, Object>> getMapMapAnytype() {
     return mapMapAnytype;
@@ -288,7 +288,7 @@ public class AdditionalPropertiesClass {
    * Get anytype1
    * @return anytype1
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Object getAnytype1() {
     return anytype1;
@@ -307,7 +307,7 @@ public class AdditionalPropertiesClass {
    * Get anytype2
    * @return anytype2
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Object getAnytype2() {
     return anytype2;
@@ -326,7 +326,7 @@ public class AdditionalPropertiesClass {
    * Get anytype3
    * @return anytype3
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Object getAnytype3() {
     return anytype3;
diff --git a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/AdditionalPropertiesInteger.java b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/AdditionalPropertiesInteger.java
index 6e5159d404..f27ff011de 100644
--- a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/AdditionalPropertiesInteger.java
+++ b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/AdditionalPropertiesInteger.java
@@ -40,7 +40,7 @@ public class AdditionalPropertiesInteger extends HashMap<String, Integer> {
    * Get name
    * @return name
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getName() {
     return name;
diff --git a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/AdditionalPropertiesNumber.java b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/AdditionalPropertiesNumber.java
index ddc8146dea..479696fdce 100644
--- a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/AdditionalPropertiesNumber.java
+++ b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/AdditionalPropertiesNumber.java
@@ -41,7 +41,7 @@ public class AdditionalPropertiesNumber extends HashMap<String, BigDecimal> {
    * Get name
    * @return name
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getName() {
     return name;
diff --git a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/AdditionalPropertiesObject.java b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/AdditionalPropertiesObject.java
index cc29400029..bd569b0da3 100644
--- a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/AdditionalPropertiesObject.java
+++ b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/AdditionalPropertiesObject.java
@@ -40,7 +40,7 @@ public class AdditionalPropertiesObject extends HashMap<String, Map> {
    * Get name
    * @return name
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getName() {
     return name;
diff --git a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/AdditionalPropertiesString.java b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/AdditionalPropertiesString.java
index fb3368dfed..27e03a2313 100644
--- a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/AdditionalPropertiesString.java
+++ b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/AdditionalPropertiesString.java
@@ -40,7 +40,7 @@ public class AdditionalPropertiesString extends HashMap<String, String> {
    * Get name
    * @return name
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getName() {
     return name;
diff --git a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/Animal.java b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/Animal.java
index 53a0eec339..dc16717ac3 100644
--- a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/Animal.java
+++ b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/Animal.java
@@ -49,7 +49,6 @@ public class Animal {
    * Get className
    * @return className
   **/
-
   @ApiModelProperty(required = true, value = "")
   public String getClassName() {
     return className;
@@ -68,7 +67,7 @@ public class Animal {
    * Get color
    * @return color
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getColor() {
     return color;
diff --git a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java
index de49df3fbd..b670ecb66e 100644
--- a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java
+++ b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java
@@ -49,7 +49,7 @@ public class ArrayOfArrayOfNumberOnly {
    * Get arrayArrayNumber
    * @return arrayArrayNumber
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public List<List<BigDecimal>> getArrayArrayNumber() {
     return arrayArrayNumber;
diff --git a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java
index f4399ff42d..9d6997f88f 100644
--- a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java
+++ b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java
@@ -49,7 +49,7 @@ public class ArrayOfNumberOnly {
    * Get arrayNumber
    * @return arrayNumber
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public List<BigDecimal> getArrayNumber() {
     return arrayNumber;
diff --git a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/ArrayTest.java b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/ArrayTest.java
index 7483fa96ce..7dc235f0a9 100644
--- a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/ArrayTest.java
+++ b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/ArrayTest.java
@@ -55,7 +55,7 @@ public class ArrayTest {
    * Get arrayOfString
    * @return arrayOfString
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public List<String> getArrayOfString() {
     return arrayOfString;
@@ -82,7 +82,7 @@ public class ArrayTest {
    * Get arrayArrayOfInteger
    * @return arrayArrayOfInteger
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public List<List<Long>> getArrayArrayOfInteger() {
     return arrayArrayOfInteger;
@@ -109,7 +109,7 @@ public class ArrayTest {
    * Get arrayArrayOfModel
    * @return arrayArrayOfModel
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public List<List<ReadOnlyFirst>> getArrayArrayOfModel() {
     return arrayArrayOfModel;
diff --git a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/Capitalization.java b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/Capitalization.java
index bb83be97fe..3f3df29d5d 100644
--- a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/Capitalization.java
+++ b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/Capitalization.java
@@ -53,7 +53,7 @@ public class Capitalization {
    * Get smallCamel
    * @return smallCamel
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getSmallCamel() {
     return smallCamel;
@@ -72,7 +72,7 @@ public class Capitalization {
    * Get capitalCamel
    * @return capitalCamel
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getCapitalCamel() {
     return capitalCamel;
@@ -91,7 +91,7 @@ public class Capitalization {
    * Get smallSnake
    * @return smallSnake
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getSmallSnake() {
     return smallSnake;
@@ -110,7 +110,7 @@ public class Capitalization {
    * Get capitalSnake
    * @return capitalSnake
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getCapitalSnake() {
     return capitalSnake;
@@ -129,7 +129,7 @@ public class Capitalization {
    * Get scAETHFlowPoints
    * @return scAETHFlowPoints
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getScAETHFlowPoints() {
     return scAETHFlowPoints;
@@ -148,7 +148,7 @@ public class Capitalization {
    * Name of the pet 
    * @return ATT_NAME
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "Name of the pet ")
   public String getATTNAME() {
     return ATT_NAME;
diff --git a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/Cat.java b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/Cat.java
index ce456c8647..a8108d6f15 100644
--- a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/Cat.java
+++ b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/Cat.java
@@ -40,7 +40,7 @@ public class Cat extends Animal {
    * Get declawed
    * @return declawed
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Boolean getDeclawed() {
     return declawed;
diff --git a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/CatAllOf.java b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/CatAllOf.java
index 224c08671c..42e9614610 100644
--- a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/CatAllOf.java
+++ b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/CatAllOf.java
@@ -38,7 +38,7 @@ public class CatAllOf {
    * Get declawed
    * @return declawed
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Boolean getDeclawed() {
     return declawed;
diff --git a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/Category.java b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/Category.java
index 03efdd4be8..3eccd2cd92 100644
--- a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/Category.java
+++ b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/Category.java
@@ -41,7 +41,7 @@ public class Category {
    * Get id
    * @return id
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Long getId() {
     return id;
@@ -60,7 +60,6 @@ public class Category {
    * Get name
    * @return name
   **/
-
   @ApiModelProperty(required = true, value = "")
   public String getName() {
     return name;
diff --git a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/ClassModel.java b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/ClassModel.java
index def421a670..2aaed27fff 100644
--- a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/ClassModel.java
+++ b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/ClassModel.java
@@ -39,7 +39,7 @@ public class ClassModel {
    * Get propertyClass
    * @return propertyClass
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getPropertyClass() {
     return propertyClass;
diff --git a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/Client.java b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/Client.java
index c0bd0743e5..458e812960 100644
--- a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/Client.java
+++ b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/Client.java
@@ -38,7 +38,7 @@ public class Client {
    * Get client
    * @return client
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getClient() {
     return client;
diff --git a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/Dog.java b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/Dog.java
index 6b79c59606..83f5cb0e27 100644
--- a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/Dog.java
+++ b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/Dog.java
@@ -40,7 +40,7 @@ public class Dog extends Animal {
    * Get breed
    * @return breed
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getBreed() {
     return breed;
diff --git a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/DogAllOf.java b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/DogAllOf.java
index 1a4496d8f0..d1e1402789 100644
--- a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/DogAllOf.java
+++ b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/DogAllOf.java
@@ -38,7 +38,7 @@ public class DogAllOf {
    * Get breed
    * @return breed
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getBreed() {
     return breed;
diff --git a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/EnumArrays.java b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/EnumArrays.java
index 40e31bf3ca..368b481f7e 100644
--- a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/EnumArrays.java
+++ b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/EnumArrays.java
@@ -113,7 +113,7 @@ public class EnumArrays {
    * Get justSymbol
    * @return justSymbol
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public JustSymbolEnum getJustSymbol() {
     return justSymbol;
@@ -140,7 +140,7 @@ public class EnumArrays {
    * Get arrayEnum
    * @return arrayEnum
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public List<ArrayEnumEnum> getArrayEnum() {
     return arrayEnum;
diff --git a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/EnumTest.java b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/EnumTest.java
index d4b36798ee..b365a8a56f 100644
--- a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/EnumTest.java
+++ b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/EnumTest.java
@@ -195,7 +195,7 @@ public class EnumTest {
    * Get enumString
    * @return enumString
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public EnumStringEnum getEnumString() {
     return enumString;
@@ -214,7 +214,6 @@ public class EnumTest {
    * Get enumStringRequired
    * @return enumStringRequired
   **/
-
   @ApiModelProperty(required = true, value = "")
   public EnumStringRequiredEnum getEnumStringRequired() {
     return enumStringRequired;
@@ -233,7 +232,7 @@ public class EnumTest {
    * Get enumInteger
    * @return enumInteger
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public EnumIntegerEnum getEnumInteger() {
     return enumInteger;
@@ -252,7 +251,7 @@ public class EnumTest {
    * Get enumNumber
    * @return enumNumber
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public EnumNumberEnum getEnumNumber() {
     return enumNumber;
@@ -271,7 +270,7 @@ public class EnumTest {
    * Get outerEnum
    * @return outerEnum
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public OuterEnum getOuterEnum() {
     return outerEnum;
diff --git a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java
index bee77a8cec..ca73764280 100644
--- a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java
+++ b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java
@@ -43,7 +43,7 @@ public class FileSchemaTestClass {
    * Get file
    * @return file
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public java.io.File getFile() {
     return file;
@@ -70,7 +70,7 @@ public class FileSchemaTestClass {
    * Get files
    * @return files
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public List<java.io.File> getFiles() {
     return files;
diff --git a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/FormatTest.java b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/FormatTest.java
index c017f57a80..00d132529e 100644
--- a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/FormatTest.java
+++ b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/FormatTest.java
@@ -81,7 +81,7 @@ public class FormatTest {
    * maximum: 100
    * @return integer
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Integer getInteger() {
     return integer;
@@ -102,7 +102,7 @@ public class FormatTest {
    * maximum: 200
    * @return int32
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Integer getInt32() {
     return int32;
@@ -121,7 +121,7 @@ public class FormatTest {
    * Get int64
    * @return int64
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Long getInt64() {
     return int64;
@@ -142,7 +142,6 @@ public class FormatTest {
    * maximum: 543.2
    * @return number
   **/
-
   @ApiModelProperty(required = true, value = "")
   public BigDecimal getNumber() {
     return number;
@@ -163,7 +162,7 @@ public class FormatTest {
    * maximum: 987.6
    * @return _float
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Float getFloat() {
     return _float;
@@ -184,7 +183,7 @@ public class FormatTest {
    * maximum: 123.4
    * @return _double
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Double getDouble() {
     return _double;
@@ -203,7 +202,7 @@ public class FormatTest {
    * Get string
    * @return string
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getString() {
     return string;
@@ -222,7 +221,6 @@ public class FormatTest {
    * Get _byte
    * @return _byte
   **/
-
   @ApiModelProperty(required = true, value = "")
   public byte[] getByte() {
     return _byte;
@@ -241,7 +239,7 @@ public class FormatTest {
    * Get binary
    * @return binary
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public File getBinary() {
     return binary;
@@ -260,7 +258,6 @@ public class FormatTest {
    * Get date
    * @return date
   **/
-
   @ApiModelProperty(required = true, value = "")
   public LocalDate getDate() {
     return date;
@@ -279,7 +276,7 @@ public class FormatTest {
    * Get dateTime
    * @return dateTime
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public OffsetDateTime getDateTime() {
     return dateTime;
@@ -298,7 +295,7 @@ public class FormatTest {
    * Get uuid
    * @return uuid
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(example = "72f98069-206d-4f12-9f12-3d1e525a8e84", value = "")
   public UUID getUuid() {
     return uuid;
@@ -317,7 +314,6 @@ public class FormatTest {
    * Get password
    * @return password
   **/
-
   @ApiModelProperty(required = true, value = "")
   public String getPassword() {
     return password;
diff --git a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java
index 44159e08e8..e9453bb6cc 100644
--- a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java
+++ b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java
@@ -36,7 +36,7 @@ public class HasOnlyReadOnly {
    * Get bar
    * @return bar
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getBar() {
     return bar;
@@ -46,7 +46,7 @@ public class HasOnlyReadOnly {
    * Get foo
    * @return foo
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getFoo() {
     return foo;
diff --git a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/MapTest.java b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/MapTest.java
index a7a141bb9b..44cd694057 100644
--- a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/MapTest.java
+++ b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/MapTest.java
@@ -93,7 +93,7 @@ public class MapTest {
    * Get mapMapOfString
    * @return mapMapOfString
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Map<String, Map<String, String>> getMapMapOfString() {
     return mapMapOfString;
@@ -120,7 +120,7 @@ public class MapTest {
    * Get mapOfEnumString
    * @return mapOfEnumString
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Map<String, InnerEnum> getMapOfEnumString() {
     return mapOfEnumString;
@@ -147,7 +147,7 @@ public class MapTest {
    * Get directMap
    * @return directMap
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Map<String, Boolean> getDirectMap() {
     return directMap;
@@ -174,7 +174,7 @@ public class MapTest {
    * Get indirectMap
    * @return indirectMap
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Map<String, Boolean> getIndirectMap() {
     return indirectMap;
diff --git a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java
index ea930e3e2e..19d808093c 100644
--- a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java
+++ b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java
@@ -50,7 +50,7 @@ public class MixedPropertiesAndAdditionalPropertiesClass {
    * Get uuid
    * @return uuid
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public UUID getUuid() {
     return uuid;
@@ -69,7 +69,7 @@ public class MixedPropertiesAndAdditionalPropertiesClass {
    * Get dateTime
    * @return dateTime
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public OffsetDateTime getDateTime() {
     return dateTime;
@@ -96,7 +96,7 @@ public class MixedPropertiesAndAdditionalPropertiesClass {
    * Get map
    * @return map
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Map<String, Animal> getMap() {
     return map;
diff --git a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/Model200Response.java b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/Model200Response.java
index bd3244dd57..39fabeeb6d 100644
--- a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/Model200Response.java
+++ b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/Model200Response.java
@@ -42,7 +42,7 @@ public class Model200Response {
    * Get name
    * @return name
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Integer getName() {
     return name;
@@ -61,7 +61,7 @@ public class Model200Response {
    * Get propertyClass
    * @return propertyClass
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getPropertyClass() {
     return propertyClass;
diff --git a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/ModelApiResponse.java b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/ModelApiResponse.java
index ed335cdca1..bb33412951 100644
--- a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/ModelApiResponse.java
+++ b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/ModelApiResponse.java
@@ -44,7 +44,7 @@ public class ModelApiResponse {
    * Get code
    * @return code
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Integer getCode() {
     return code;
@@ -63,7 +63,7 @@ public class ModelApiResponse {
    * Get type
    * @return type
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getType() {
     return type;
@@ -82,7 +82,7 @@ public class ModelApiResponse {
    * Get message
    * @return message
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getMessage() {
     return message;
diff --git a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/ModelReturn.java b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/ModelReturn.java
index 04c0bcd33f..9aafb13e04 100644
--- a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/ModelReturn.java
+++ b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/ModelReturn.java
@@ -39,7 +39,7 @@ public class ModelReturn {
    * Get _return
    * @return _return
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Integer getReturn() {
     return _return;
diff --git a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/Name.java b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/Name.java
index af27c6e45f..9518276dd6 100644
--- a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/Name.java
+++ b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/Name.java
@@ -48,7 +48,6 @@ public class Name {
    * Get name
    * @return name
   **/
-
   @ApiModelProperty(required = true, value = "")
   public Integer getName() {
     return name;
@@ -62,7 +61,7 @@ public class Name {
    * Get snakeCase
    * @return snakeCase
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Integer getSnakeCase() {
     return snakeCase;
@@ -77,7 +76,7 @@ public class Name {
    * Get property
    * @return property
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getProperty() {
     return property;
@@ -91,7 +90,7 @@ public class Name {
    * Get _123number
    * @return _123number
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Integer get123number() {
     return _123number;
diff --git a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/NumberOnly.java b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/NumberOnly.java
index 4e29c814cc..0245e8e210 100644
--- a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/NumberOnly.java
+++ b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/NumberOnly.java
@@ -39,7 +39,7 @@ public class NumberOnly {
    * Get justNumber
    * @return justNumber
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public BigDecimal getJustNumber() {
     return justNumber;
diff --git a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/Order.java b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/Order.java
index 9e935d606e..a9e2986a2f 100644
--- a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/Order.java
+++ b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/Order.java
@@ -91,7 +91,7 @@ public class Order {
    * Get id
    * @return id
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Long getId() {
     return id;
@@ -110,7 +110,7 @@ public class Order {
    * Get petId
    * @return petId
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Long getPetId() {
     return petId;
@@ -129,7 +129,7 @@ public class Order {
    * Get quantity
    * @return quantity
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Integer getQuantity() {
     return quantity;
@@ -148,7 +148,7 @@ public class Order {
    * Get shipDate
    * @return shipDate
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public OffsetDateTime getShipDate() {
     return shipDate;
@@ -167,7 +167,7 @@ public class Order {
    * Order Status
    * @return status
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "Order Status")
   public StatusEnum getStatus() {
     return status;
@@ -186,7 +186,7 @@ public class Order {
    * Get complete
    * @return complete
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Boolean getComplete() {
     return complete;
diff --git a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/OuterComposite.java b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/OuterComposite.java
index f6515126a8..c8bd99011c 100644
--- a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/OuterComposite.java
+++ b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/OuterComposite.java
@@ -45,7 +45,7 @@ public class OuterComposite {
    * Get myNumber
    * @return myNumber
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public BigDecimal getMyNumber() {
     return myNumber;
@@ -64,7 +64,7 @@ public class OuterComposite {
    * Get myString
    * @return myString
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getMyString() {
     return myString;
@@ -83,7 +83,7 @@ public class OuterComposite {
    * Get myBoolean
    * @return myBoolean
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Boolean getMyBoolean() {
     return myBoolean;
diff --git a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/Pet.java b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/Pet.java
index 63e9b4ff5d..a7d92129d7 100644
--- a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/Pet.java
+++ b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/Pet.java
@@ -94,7 +94,7 @@ public class Pet {
    * Get id
    * @return id
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Long getId() {
     return id;
@@ -113,7 +113,7 @@ public class Pet {
    * Get category
    * @return category
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Category getCategory() {
     return category;
@@ -132,7 +132,6 @@ public class Pet {
    * Get name
    * @return name
   **/
-
   @ApiModelProperty(example = "doggie", required = true, value = "")
   public String getName() {
     return name;
@@ -156,7 +155,6 @@ public class Pet {
    * Get photoUrls
    * @return photoUrls
   **/
-
   @ApiModelProperty(required = true, value = "")
   public List<String> getPhotoUrls() {
     return photoUrls;
@@ -183,7 +181,7 @@ public class Pet {
    * Get tags
    * @return tags
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public List<Tag> getTags() {
     return tags;
@@ -202,7 +200,7 @@ public class Pet {
    * pet status in the store
    * @return status
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "pet status in the store")
   public StatusEnum getStatus() {
     return status;
diff --git a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/ReadOnlyFirst.java b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/ReadOnlyFirst.java
index a2c9e99699..1379ee09ea 100644
--- a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/ReadOnlyFirst.java
+++ b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/ReadOnlyFirst.java
@@ -36,7 +36,7 @@ public class ReadOnlyFirst {
    * Get bar
    * @return bar
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getBar() {
     return bar;
@@ -51,7 +51,7 @@ public class ReadOnlyFirst {
    * Get baz
    * @return baz
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getBaz() {
     return baz;
diff --git a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/SpecialModelName.java b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/SpecialModelName.java
index a5ddb0b638..869771afad 100644
--- a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/SpecialModelName.java
+++ b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/SpecialModelName.java
@@ -38,7 +38,7 @@ public class SpecialModelName {
    * Get $specialPropertyName
    * @return $specialPropertyName
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Long get$SpecialPropertyName() {
     return $specialPropertyName;
diff --git a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/Tag.java b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/Tag.java
index 8255ad8298..4bb498aff4 100644
--- a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/Tag.java
+++ b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/Tag.java
@@ -41,7 +41,7 @@ public class Tag {
    * Get id
    * @return id
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Long getId() {
     return id;
@@ -60,7 +60,7 @@ public class Tag {
    * Get name
    * @return name
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getName() {
     return name;
diff --git a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/TypeHolderDefault.java b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/TypeHolderDefault.java
index d8c7b3efdd..9d0f5b2fbe 100644
--- a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/TypeHolderDefault.java
+++ b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/TypeHolderDefault.java
@@ -53,7 +53,6 @@ public class TypeHolderDefault {
    * Get stringItem
    * @return stringItem
   **/
-
   @ApiModelProperty(required = true, value = "")
   public String getStringItem() {
     return stringItem;
@@ -72,7 +71,6 @@ public class TypeHolderDefault {
    * Get numberItem
    * @return numberItem
   **/
-
   @ApiModelProperty(required = true, value = "")
   public BigDecimal getNumberItem() {
     return numberItem;
@@ -91,7 +89,6 @@ public class TypeHolderDefault {
    * Get integerItem
    * @return integerItem
   **/
-
   @ApiModelProperty(required = true, value = "")
   public Integer getIntegerItem() {
     return integerItem;
@@ -110,7 +107,6 @@ public class TypeHolderDefault {
    * Get boolItem
    * @return boolItem
   **/
-
   @ApiModelProperty(required = true, value = "")
   public Boolean getBoolItem() {
     return boolItem;
@@ -134,7 +130,6 @@ public class TypeHolderDefault {
    * Get arrayItem
    * @return arrayItem
   **/
-
   @ApiModelProperty(required = true, value = "")
   public List<Integer> getArrayItem() {
     return arrayItem;
diff --git a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/TypeHolderExample.java b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/TypeHolderExample.java
index c1d5ea30f8..94d3c57b6f 100644
--- a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/TypeHolderExample.java
+++ b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/TypeHolderExample.java
@@ -53,7 +53,6 @@ public class TypeHolderExample {
    * Get stringItem
    * @return stringItem
   **/
-
   @ApiModelProperty(example = "what", required = true, value = "")
   public String getStringItem() {
     return stringItem;
@@ -72,7 +71,6 @@ public class TypeHolderExample {
    * Get numberItem
    * @return numberItem
   **/
-
   @ApiModelProperty(example = "1.234", required = true, value = "")
   public BigDecimal getNumberItem() {
     return numberItem;
@@ -91,7 +89,6 @@ public class TypeHolderExample {
    * Get integerItem
    * @return integerItem
   **/
-
   @ApiModelProperty(example = "-2", required = true, value = "")
   public Integer getIntegerItem() {
     return integerItem;
@@ -110,7 +107,6 @@ public class TypeHolderExample {
    * Get boolItem
    * @return boolItem
   **/
-
   @ApiModelProperty(example = "true", required = true, value = "")
   public Boolean getBoolItem() {
     return boolItem;
@@ -134,7 +130,6 @@ public class TypeHolderExample {
    * Get arrayItem
    * @return arrayItem
   **/
-
   @ApiModelProperty(example = "[0, 1, 2, 3]", required = true, value = "")
   public List<Integer> getArrayItem() {
     return arrayItem;
diff --git a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/User.java b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/User.java
index 6e6c4ac102..73164c3ee2 100644
--- a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/User.java
+++ b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/User.java
@@ -59,7 +59,7 @@ public class User {
    * Get id
    * @return id
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Long getId() {
     return id;
@@ -78,7 +78,7 @@ public class User {
    * Get username
    * @return username
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getUsername() {
     return username;
@@ -97,7 +97,7 @@ public class User {
    * Get firstName
    * @return firstName
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getFirstName() {
     return firstName;
@@ -116,7 +116,7 @@ public class User {
    * Get lastName
    * @return lastName
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getLastName() {
     return lastName;
@@ -135,7 +135,7 @@ public class User {
    * Get email
    * @return email
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getEmail() {
     return email;
@@ -154,7 +154,7 @@ public class User {
    * Get password
    * @return password
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getPassword() {
     return password;
@@ -173,7 +173,7 @@ public class User {
    * Get phone
    * @return phone
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getPhone() {
     return phone;
@@ -192,7 +192,7 @@ public class User {
    * User Status
    * @return userStatus
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "User Status")
   public Integer getUserStatus() {
     return userStatus;
diff --git a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/XmlItem.java b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/XmlItem.java
index ce4af3e8b9..9032c23424 100644
--- a/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/XmlItem.java
+++ b/samples/client/petstore/java/google-api-client/src/main/java/org/openapitools/client/model/XmlItem.java
@@ -125,7 +125,7 @@ public class XmlItem {
    * Get attributeString
    * @return attributeString
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(example = "string", value = "")
   public String getAttributeString() {
     return attributeString;
@@ -144,7 +144,7 @@ public class XmlItem {
    * Get attributeNumber
    * @return attributeNumber
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(example = "1.234", value = "")
   public BigDecimal getAttributeNumber() {
     return attributeNumber;
@@ -163,7 +163,7 @@ public class XmlItem {
    * Get attributeInteger
    * @return attributeInteger
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(example = "-2", value = "")
   public Integer getAttributeInteger() {
     return attributeInteger;
@@ -182,7 +182,7 @@ public class XmlItem {
    * Get attributeBoolean
    * @return attributeBoolean
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(example = "true", value = "")
   public Boolean getAttributeBoolean() {
     return attributeBoolean;
@@ -209,7 +209,7 @@ public class XmlItem {
    * Get wrappedArray
    * @return wrappedArray
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public List<Integer> getWrappedArray() {
     return wrappedArray;
@@ -228,7 +228,7 @@ public class XmlItem {
    * Get nameString
    * @return nameString
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(example = "string", value = "")
   public String getNameString() {
     return nameString;
@@ -247,7 +247,7 @@ public class XmlItem {
    * Get nameNumber
    * @return nameNumber
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(example = "1.234", value = "")
   public BigDecimal getNameNumber() {
     return nameNumber;
@@ -266,7 +266,7 @@ public class XmlItem {
    * Get nameInteger
    * @return nameInteger
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(example = "-2", value = "")
   public Integer getNameInteger() {
     return nameInteger;
@@ -285,7 +285,7 @@ public class XmlItem {
    * Get nameBoolean
    * @return nameBoolean
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(example = "true", value = "")
   public Boolean getNameBoolean() {
     return nameBoolean;
@@ -312,7 +312,7 @@ public class XmlItem {
    * Get nameArray
    * @return nameArray
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public List<Integer> getNameArray() {
     return nameArray;
@@ -339,7 +339,7 @@ public class XmlItem {
    * Get nameWrappedArray
    * @return nameWrappedArray
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public List<Integer> getNameWrappedArray() {
     return nameWrappedArray;
@@ -358,7 +358,7 @@ public class XmlItem {
    * Get prefixString
    * @return prefixString
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(example = "string", value = "")
   public String getPrefixString() {
     return prefixString;
@@ -377,7 +377,7 @@ public class XmlItem {
    * Get prefixNumber
    * @return prefixNumber
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(example = "1.234", value = "")
   public BigDecimal getPrefixNumber() {
     return prefixNumber;
@@ -396,7 +396,7 @@ public class XmlItem {
    * Get prefixInteger
    * @return prefixInteger
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(example = "-2", value = "")
   public Integer getPrefixInteger() {
     return prefixInteger;
@@ -415,7 +415,7 @@ public class XmlItem {
    * Get prefixBoolean
    * @return prefixBoolean
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(example = "true", value = "")
   public Boolean getPrefixBoolean() {
     return prefixBoolean;
@@ -442,7 +442,7 @@ public class XmlItem {
    * Get prefixArray
    * @return prefixArray
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public List<Integer> getPrefixArray() {
     return prefixArray;
@@ -469,7 +469,7 @@ public class XmlItem {
    * Get prefixWrappedArray
    * @return prefixWrappedArray
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public List<Integer> getPrefixWrappedArray() {
     return prefixWrappedArray;
@@ -488,7 +488,7 @@ public class XmlItem {
    * Get namespaceString
    * @return namespaceString
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(example = "string", value = "")
   public String getNamespaceString() {
     return namespaceString;
@@ -507,7 +507,7 @@ public class XmlItem {
    * Get namespaceNumber
    * @return namespaceNumber
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(example = "1.234", value = "")
   public BigDecimal getNamespaceNumber() {
     return namespaceNumber;
@@ -526,7 +526,7 @@ public class XmlItem {
    * Get namespaceInteger
    * @return namespaceInteger
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(example = "-2", value = "")
   public Integer getNamespaceInteger() {
     return namespaceInteger;
@@ -545,7 +545,7 @@ public class XmlItem {
    * Get namespaceBoolean
    * @return namespaceBoolean
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(example = "true", value = "")
   public Boolean getNamespaceBoolean() {
     return namespaceBoolean;
@@ -572,7 +572,7 @@ public class XmlItem {
    * Get namespaceArray
    * @return namespaceArray
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public List<Integer> getNamespaceArray() {
     return namespaceArray;
@@ -599,7 +599,7 @@ public class XmlItem {
    * Get namespaceWrappedArray
    * @return namespaceWrappedArray
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public List<Integer> getNamespaceWrappedArray() {
     return namespaceWrappedArray;
@@ -618,7 +618,7 @@ public class XmlItem {
    * Get prefixNsString
    * @return prefixNsString
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(example = "string", value = "")
   public String getPrefixNsString() {
     return prefixNsString;
@@ -637,7 +637,7 @@ public class XmlItem {
    * Get prefixNsNumber
    * @return prefixNsNumber
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(example = "1.234", value = "")
   public BigDecimal getPrefixNsNumber() {
     return prefixNsNumber;
@@ -656,7 +656,7 @@ public class XmlItem {
    * Get prefixNsInteger
    * @return prefixNsInteger
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(example = "-2", value = "")
   public Integer getPrefixNsInteger() {
     return prefixNsInteger;
@@ -675,7 +675,7 @@ public class XmlItem {
    * Get prefixNsBoolean
    * @return prefixNsBoolean
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(example = "true", value = "")
   public Boolean getPrefixNsBoolean() {
     return prefixNsBoolean;
@@ -702,7 +702,7 @@ public class XmlItem {
    * Get prefixNsArray
    * @return prefixNsArray
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public List<Integer> getPrefixNsArray() {
     return prefixNsArray;
@@ -729,7 +729,7 @@ public class XmlItem {
    * Get prefixNsWrappedArray
    * @return prefixNsWrappedArray
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public List<Integer> getPrefixNsWrappedArray() {
     return prefixNsWrappedArray;
diff --git a/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/AdditionalPropertiesAnyType.java b/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/AdditionalPropertiesAnyType.java
index 1abb2d8a64..69d6a81729 100644
--- a/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/AdditionalPropertiesAnyType.java
+++ b/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/AdditionalPropertiesAnyType.java
@@ -40,7 +40,7 @@ public class AdditionalPropertiesAnyType extends HashMap<String, Object> {
    * Get name
    * @return name
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getName() {
     return name;
diff --git a/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/AdditionalPropertiesArray.java b/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/AdditionalPropertiesArray.java
index 1821c243e1..0147a592b7 100644
--- a/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/AdditionalPropertiesArray.java
+++ b/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/AdditionalPropertiesArray.java
@@ -41,7 +41,7 @@ public class AdditionalPropertiesArray extends HashMap<String, List> {
    * Get name
    * @return name
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getName() {
     return name;
diff --git a/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/AdditionalPropertiesBoolean.java b/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/AdditionalPropertiesBoolean.java
index 78f7ac79b2..89aa511c2a 100644
--- a/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/AdditionalPropertiesBoolean.java
+++ b/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/AdditionalPropertiesBoolean.java
@@ -40,7 +40,7 @@ public class AdditionalPropertiesBoolean extends HashMap<String, Boolean> {
    * Get name
    * @return name
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getName() {
     return name;
diff --git a/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java b/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java
index 406bccc278..cb955d1165 100644
--- a/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java
+++ b/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java
@@ -80,7 +80,7 @@ public class AdditionalPropertiesClass {
    * Get mapString
    * @return mapString
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Map<String, String> getMapString() {
     return mapString;
@@ -107,7 +107,7 @@ public class AdditionalPropertiesClass {
    * Get mapNumber
    * @return mapNumber
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Map<String, BigDecimal> getMapNumber() {
     return mapNumber;
@@ -134,7 +134,7 @@ public class AdditionalPropertiesClass {
    * Get mapInteger
    * @return mapInteger
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Map<String, Integer> getMapInteger() {
     return mapInteger;
@@ -161,7 +161,7 @@ public class AdditionalPropertiesClass {
    * Get mapBoolean
    * @return mapBoolean
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Map<String, Boolean> getMapBoolean() {
     return mapBoolean;
@@ -188,7 +188,7 @@ public class AdditionalPropertiesClass {
    * Get mapArrayInteger
    * @return mapArrayInteger
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Map<String, List<Integer>> getMapArrayInteger() {
     return mapArrayInteger;
@@ -215,7 +215,7 @@ public class AdditionalPropertiesClass {
    * Get mapArrayAnytype
    * @return mapArrayAnytype
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Map<String, List<Object>> getMapArrayAnytype() {
     return mapArrayAnytype;
@@ -242,7 +242,7 @@ public class AdditionalPropertiesClass {
    * Get mapMapString
    * @return mapMapString
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Map<String, Map<String, String>> getMapMapString() {
     return mapMapString;
@@ -269,7 +269,7 @@ public class AdditionalPropertiesClass {
    * Get mapMapAnytype
    * @return mapMapAnytype
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Map<String, Map<String, Object>> getMapMapAnytype() {
     return mapMapAnytype;
@@ -288,7 +288,7 @@ public class AdditionalPropertiesClass {
    * Get anytype1
    * @return anytype1
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Object getAnytype1() {
     return anytype1;
@@ -307,7 +307,7 @@ public class AdditionalPropertiesClass {
    * Get anytype2
    * @return anytype2
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Object getAnytype2() {
     return anytype2;
@@ -326,7 +326,7 @@ public class AdditionalPropertiesClass {
    * Get anytype3
    * @return anytype3
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Object getAnytype3() {
     return anytype3;
diff --git a/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/AdditionalPropertiesInteger.java b/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/AdditionalPropertiesInteger.java
index 6e5159d404..f27ff011de 100644
--- a/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/AdditionalPropertiesInteger.java
+++ b/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/AdditionalPropertiesInteger.java
@@ -40,7 +40,7 @@ public class AdditionalPropertiesInteger extends HashMap<String, Integer> {
    * Get name
    * @return name
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getName() {
     return name;
diff --git a/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/AdditionalPropertiesNumber.java b/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/AdditionalPropertiesNumber.java
index ddc8146dea..479696fdce 100644
--- a/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/AdditionalPropertiesNumber.java
+++ b/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/AdditionalPropertiesNumber.java
@@ -41,7 +41,7 @@ public class AdditionalPropertiesNumber extends HashMap<String, BigDecimal> {
    * Get name
    * @return name
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getName() {
     return name;
diff --git a/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/AdditionalPropertiesObject.java b/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/AdditionalPropertiesObject.java
index cc29400029..bd569b0da3 100644
--- a/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/AdditionalPropertiesObject.java
+++ b/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/AdditionalPropertiesObject.java
@@ -40,7 +40,7 @@ public class AdditionalPropertiesObject extends HashMap<String, Map> {
    * Get name
    * @return name
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getName() {
     return name;
diff --git a/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/AdditionalPropertiesString.java b/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/AdditionalPropertiesString.java
index fb3368dfed..27e03a2313 100644
--- a/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/AdditionalPropertiesString.java
+++ b/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/AdditionalPropertiesString.java
@@ -40,7 +40,7 @@ public class AdditionalPropertiesString extends HashMap<String, String> {
    * Get name
    * @return name
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getName() {
     return name;
diff --git a/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/Animal.java b/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/Animal.java
index 53a0eec339..dc16717ac3 100644
--- a/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/Animal.java
+++ b/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/Animal.java
@@ -49,7 +49,6 @@ public class Animal {
    * Get className
    * @return className
   **/
-
   @ApiModelProperty(required = true, value = "")
   public String getClassName() {
     return className;
@@ -68,7 +67,7 @@ public class Animal {
    * Get color
    * @return color
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getColor() {
     return color;
diff --git a/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java b/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java
index de49df3fbd..b670ecb66e 100644
--- a/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java
+++ b/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java
@@ -49,7 +49,7 @@ public class ArrayOfArrayOfNumberOnly {
    * Get arrayArrayNumber
    * @return arrayArrayNumber
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public List<List<BigDecimal>> getArrayArrayNumber() {
     return arrayArrayNumber;
diff --git a/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java b/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java
index f4399ff42d..9d6997f88f 100644
--- a/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java
+++ b/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java
@@ -49,7 +49,7 @@ public class ArrayOfNumberOnly {
    * Get arrayNumber
    * @return arrayNumber
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public List<BigDecimal> getArrayNumber() {
     return arrayNumber;
diff --git a/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/ArrayTest.java b/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/ArrayTest.java
index 7483fa96ce..7dc235f0a9 100644
--- a/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/ArrayTest.java
+++ b/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/ArrayTest.java
@@ -55,7 +55,7 @@ public class ArrayTest {
    * Get arrayOfString
    * @return arrayOfString
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public List<String> getArrayOfString() {
     return arrayOfString;
@@ -82,7 +82,7 @@ public class ArrayTest {
    * Get arrayArrayOfInteger
    * @return arrayArrayOfInteger
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public List<List<Long>> getArrayArrayOfInteger() {
     return arrayArrayOfInteger;
@@ -109,7 +109,7 @@ public class ArrayTest {
    * Get arrayArrayOfModel
    * @return arrayArrayOfModel
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public List<List<ReadOnlyFirst>> getArrayArrayOfModel() {
     return arrayArrayOfModel;
diff --git a/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/Capitalization.java b/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/Capitalization.java
index bb83be97fe..3f3df29d5d 100644
--- a/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/Capitalization.java
+++ b/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/Capitalization.java
@@ -53,7 +53,7 @@ public class Capitalization {
    * Get smallCamel
    * @return smallCamel
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getSmallCamel() {
     return smallCamel;
@@ -72,7 +72,7 @@ public class Capitalization {
    * Get capitalCamel
    * @return capitalCamel
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getCapitalCamel() {
     return capitalCamel;
@@ -91,7 +91,7 @@ public class Capitalization {
    * Get smallSnake
    * @return smallSnake
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getSmallSnake() {
     return smallSnake;
@@ -110,7 +110,7 @@ public class Capitalization {
    * Get capitalSnake
    * @return capitalSnake
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getCapitalSnake() {
     return capitalSnake;
@@ -129,7 +129,7 @@ public class Capitalization {
    * Get scAETHFlowPoints
    * @return scAETHFlowPoints
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getScAETHFlowPoints() {
     return scAETHFlowPoints;
@@ -148,7 +148,7 @@ public class Capitalization {
    * Name of the pet 
    * @return ATT_NAME
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "Name of the pet ")
   public String getATTNAME() {
     return ATT_NAME;
diff --git a/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/Cat.java b/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/Cat.java
index ce456c8647..a8108d6f15 100644
--- a/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/Cat.java
+++ b/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/Cat.java
@@ -40,7 +40,7 @@ public class Cat extends Animal {
    * Get declawed
    * @return declawed
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Boolean getDeclawed() {
     return declawed;
diff --git a/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/CatAllOf.java b/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/CatAllOf.java
index 224c08671c..42e9614610 100644
--- a/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/CatAllOf.java
+++ b/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/CatAllOf.java
@@ -38,7 +38,7 @@ public class CatAllOf {
    * Get declawed
    * @return declawed
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Boolean getDeclawed() {
     return declawed;
diff --git a/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/Category.java b/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/Category.java
index 03efdd4be8..3eccd2cd92 100644
--- a/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/Category.java
+++ b/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/Category.java
@@ -41,7 +41,7 @@ public class Category {
    * Get id
    * @return id
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Long getId() {
     return id;
@@ -60,7 +60,6 @@ public class Category {
    * Get name
    * @return name
   **/
-
   @ApiModelProperty(required = true, value = "")
   public String getName() {
     return name;
diff --git a/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/ClassModel.java b/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/ClassModel.java
index def421a670..2aaed27fff 100644
--- a/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/ClassModel.java
+++ b/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/ClassModel.java
@@ -39,7 +39,7 @@ public class ClassModel {
    * Get propertyClass
    * @return propertyClass
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getPropertyClass() {
     return propertyClass;
diff --git a/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/Client.java b/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/Client.java
index c0bd0743e5..458e812960 100644
--- a/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/Client.java
+++ b/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/Client.java
@@ -38,7 +38,7 @@ public class Client {
    * Get client
    * @return client
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getClient() {
     return client;
diff --git a/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/Dog.java b/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/Dog.java
index 6b79c59606..83f5cb0e27 100644
--- a/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/Dog.java
+++ b/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/Dog.java
@@ -40,7 +40,7 @@ public class Dog extends Animal {
    * Get breed
    * @return breed
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getBreed() {
     return breed;
diff --git a/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/DogAllOf.java b/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/DogAllOf.java
index 1a4496d8f0..d1e1402789 100644
--- a/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/DogAllOf.java
+++ b/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/DogAllOf.java
@@ -38,7 +38,7 @@ public class DogAllOf {
    * Get breed
    * @return breed
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getBreed() {
     return breed;
diff --git a/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/EnumArrays.java b/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/EnumArrays.java
index 40e31bf3ca..368b481f7e 100644
--- a/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/EnumArrays.java
+++ b/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/EnumArrays.java
@@ -113,7 +113,7 @@ public class EnumArrays {
    * Get justSymbol
    * @return justSymbol
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public JustSymbolEnum getJustSymbol() {
     return justSymbol;
@@ -140,7 +140,7 @@ public class EnumArrays {
    * Get arrayEnum
    * @return arrayEnum
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public List<ArrayEnumEnum> getArrayEnum() {
     return arrayEnum;
diff --git a/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/EnumTest.java b/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/EnumTest.java
index d4b36798ee..b365a8a56f 100644
--- a/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/EnumTest.java
+++ b/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/EnumTest.java
@@ -195,7 +195,7 @@ public class EnumTest {
    * Get enumString
    * @return enumString
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public EnumStringEnum getEnumString() {
     return enumString;
@@ -214,7 +214,6 @@ public class EnumTest {
    * Get enumStringRequired
    * @return enumStringRequired
   **/
-
   @ApiModelProperty(required = true, value = "")
   public EnumStringRequiredEnum getEnumStringRequired() {
     return enumStringRequired;
@@ -233,7 +232,7 @@ public class EnumTest {
    * Get enumInteger
    * @return enumInteger
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public EnumIntegerEnum getEnumInteger() {
     return enumInteger;
@@ -252,7 +251,7 @@ public class EnumTest {
    * Get enumNumber
    * @return enumNumber
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public EnumNumberEnum getEnumNumber() {
     return enumNumber;
@@ -271,7 +270,7 @@ public class EnumTest {
    * Get outerEnum
    * @return outerEnum
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public OuterEnum getOuterEnum() {
     return outerEnum;
diff --git a/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java b/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java
index bee77a8cec..ca73764280 100644
--- a/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java
+++ b/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java
@@ -43,7 +43,7 @@ public class FileSchemaTestClass {
    * Get file
    * @return file
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public java.io.File getFile() {
     return file;
@@ -70,7 +70,7 @@ public class FileSchemaTestClass {
    * Get files
    * @return files
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public List<java.io.File> getFiles() {
     return files;
diff --git a/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/FormatTest.java b/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/FormatTest.java
index c017f57a80..00d132529e 100644
--- a/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/FormatTest.java
+++ b/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/FormatTest.java
@@ -81,7 +81,7 @@ public class FormatTest {
    * maximum: 100
    * @return integer
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Integer getInteger() {
     return integer;
@@ -102,7 +102,7 @@ public class FormatTest {
    * maximum: 200
    * @return int32
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Integer getInt32() {
     return int32;
@@ -121,7 +121,7 @@ public class FormatTest {
    * Get int64
    * @return int64
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Long getInt64() {
     return int64;
@@ -142,7 +142,6 @@ public class FormatTest {
    * maximum: 543.2
    * @return number
   **/
-
   @ApiModelProperty(required = true, value = "")
   public BigDecimal getNumber() {
     return number;
@@ -163,7 +162,7 @@ public class FormatTest {
    * maximum: 987.6
    * @return _float
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Float getFloat() {
     return _float;
@@ -184,7 +183,7 @@ public class FormatTest {
    * maximum: 123.4
    * @return _double
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Double getDouble() {
     return _double;
@@ -203,7 +202,7 @@ public class FormatTest {
    * Get string
    * @return string
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getString() {
     return string;
@@ -222,7 +221,6 @@ public class FormatTest {
    * Get _byte
    * @return _byte
   **/
-
   @ApiModelProperty(required = true, value = "")
   public byte[] getByte() {
     return _byte;
@@ -241,7 +239,7 @@ public class FormatTest {
    * Get binary
    * @return binary
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public File getBinary() {
     return binary;
@@ -260,7 +258,6 @@ public class FormatTest {
    * Get date
    * @return date
   **/
-
   @ApiModelProperty(required = true, value = "")
   public LocalDate getDate() {
     return date;
@@ -279,7 +276,7 @@ public class FormatTest {
    * Get dateTime
    * @return dateTime
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public OffsetDateTime getDateTime() {
     return dateTime;
@@ -298,7 +295,7 @@ public class FormatTest {
    * Get uuid
    * @return uuid
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(example = "72f98069-206d-4f12-9f12-3d1e525a8e84", value = "")
   public UUID getUuid() {
     return uuid;
@@ -317,7 +314,6 @@ public class FormatTest {
    * Get password
    * @return password
   **/
-
   @ApiModelProperty(required = true, value = "")
   public String getPassword() {
     return password;
diff --git a/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java b/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java
index 44159e08e8..e9453bb6cc 100644
--- a/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java
+++ b/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java
@@ -36,7 +36,7 @@ public class HasOnlyReadOnly {
    * Get bar
    * @return bar
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getBar() {
     return bar;
@@ -46,7 +46,7 @@ public class HasOnlyReadOnly {
    * Get foo
    * @return foo
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getFoo() {
     return foo;
diff --git a/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/MapTest.java b/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/MapTest.java
index a7a141bb9b..44cd694057 100644
--- a/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/MapTest.java
+++ b/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/MapTest.java
@@ -93,7 +93,7 @@ public class MapTest {
    * Get mapMapOfString
    * @return mapMapOfString
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Map<String, Map<String, String>> getMapMapOfString() {
     return mapMapOfString;
@@ -120,7 +120,7 @@ public class MapTest {
    * Get mapOfEnumString
    * @return mapOfEnumString
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Map<String, InnerEnum> getMapOfEnumString() {
     return mapOfEnumString;
@@ -147,7 +147,7 @@ public class MapTest {
    * Get directMap
    * @return directMap
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Map<String, Boolean> getDirectMap() {
     return directMap;
@@ -174,7 +174,7 @@ public class MapTest {
    * Get indirectMap
    * @return indirectMap
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Map<String, Boolean> getIndirectMap() {
     return indirectMap;
diff --git a/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java
index ea930e3e2e..19d808093c 100644
--- a/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java
+++ b/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java
@@ -50,7 +50,7 @@ public class MixedPropertiesAndAdditionalPropertiesClass {
    * Get uuid
    * @return uuid
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public UUID getUuid() {
     return uuid;
@@ -69,7 +69,7 @@ public class MixedPropertiesAndAdditionalPropertiesClass {
    * Get dateTime
    * @return dateTime
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public OffsetDateTime getDateTime() {
     return dateTime;
@@ -96,7 +96,7 @@ public class MixedPropertiesAndAdditionalPropertiesClass {
    * Get map
    * @return map
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Map<String, Animal> getMap() {
     return map;
diff --git a/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/Model200Response.java b/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/Model200Response.java
index bd3244dd57..39fabeeb6d 100644
--- a/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/Model200Response.java
+++ b/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/Model200Response.java
@@ -42,7 +42,7 @@ public class Model200Response {
    * Get name
    * @return name
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Integer getName() {
     return name;
@@ -61,7 +61,7 @@ public class Model200Response {
    * Get propertyClass
    * @return propertyClass
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getPropertyClass() {
     return propertyClass;
diff --git a/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/ModelApiResponse.java b/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/ModelApiResponse.java
index ed335cdca1..bb33412951 100644
--- a/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/ModelApiResponse.java
+++ b/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/ModelApiResponse.java
@@ -44,7 +44,7 @@ public class ModelApiResponse {
    * Get code
    * @return code
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Integer getCode() {
     return code;
@@ -63,7 +63,7 @@ public class ModelApiResponse {
    * Get type
    * @return type
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getType() {
     return type;
@@ -82,7 +82,7 @@ public class ModelApiResponse {
    * Get message
    * @return message
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getMessage() {
     return message;
diff --git a/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/ModelReturn.java b/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/ModelReturn.java
index 04c0bcd33f..9aafb13e04 100644
--- a/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/ModelReturn.java
+++ b/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/ModelReturn.java
@@ -39,7 +39,7 @@ public class ModelReturn {
    * Get _return
    * @return _return
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Integer getReturn() {
     return _return;
diff --git a/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/Name.java b/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/Name.java
index af27c6e45f..9518276dd6 100644
--- a/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/Name.java
+++ b/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/Name.java
@@ -48,7 +48,6 @@ public class Name {
    * Get name
    * @return name
   **/
-
   @ApiModelProperty(required = true, value = "")
   public Integer getName() {
     return name;
@@ -62,7 +61,7 @@ public class Name {
    * Get snakeCase
    * @return snakeCase
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Integer getSnakeCase() {
     return snakeCase;
@@ -77,7 +76,7 @@ public class Name {
    * Get property
    * @return property
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getProperty() {
     return property;
@@ -91,7 +90,7 @@ public class Name {
    * Get _123number
    * @return _123number
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Integer get123number() {
     return _123number;
diff --git a/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/NumberOnly.java b/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/NumberOnly.java
index 4e29c814cc..0245e8e210 100644
--- a/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/NumberOnly.java
+++ b/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/NumberOnly.java
@@ -39,7 +39,7 @@ public class NumberOnly {
    * Get justNumber
    * @return justNumber
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public BigDecimal getJustNumber() {
     return justNumber;
diff --git a/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/Order.java b/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/Order.java
index 9e935d606e..a9e2986a2f 100644
--- a/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/Order.java
+++ b/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/Order.java
@@ -91,7 +91,7 @@ public class Order {
    * Get id
    * @return id
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Long getId() {
     return id;
@@ -110,7 +110,7 @@ public class Order {
    * Get petId
    * @return petId
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Long getPetId() {
     return petId;
@@ -129,7 +129,7 @@ public class Order {
    * Get quantity
    * @return quantity
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Integer getQuantity() {
     return quantity;
@@ -148,7 +148,7 @@ public class Order {
    * Get shipDate
    * @return shipDate
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public OffsetDateTime getShipDate() {
     return shipDate;
@@ -167,7 +167,7 @@ public class Order {
    * Order Status
    * @return status
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "Order Status")
   public StatusEnum getStatus() {
     return status;
@@ -186,7 +186,7 @@ public class Order {
    * Get complete
    * @return complete
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Boolean getComplete() {
     return complete;
diff --git a/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/OuterComposite.java b/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/OuterComposite.java
index f6515126a8..c8bd99011c 100644
--- a/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/OuterComposite.java
+++ b/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/OuterComposite.java
@@ -45,7 +45,7 @@ public class OuterComposite {
    * Get myNumber
    * @return myNumber
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public BigDecimal getMyNumber() {
     return myNumber;
@@ -64,7 +64,7 @@ public class OuterComposite {
    * Get myString
    * @return myString
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getMyString() {
     return myString;
@@ -83,7 +83,7 @@ public class OuterComposite {
    * Get myBoolean
    * @return myBoolean
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Boolean getMyBoolean() {
     return myBoolean;
diff --git a/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/Pet.java b/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/Pet.java
index 63e9b4ff5d..a7d92129d7 100644
--- a/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/Pet.java
+++ b/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/Pet.java
@@ -94,7 +94,7 @@ public class Pet {
    * Get id
    * @return id
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Long getId() {
     return id;
@@ -113,7 +113,7 @@ public class Pet {
    * Get category
    * @return category
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Category getCategory() {
     return category;
@@ -132,7 +132,6 @@ public class Pet {
    * Get name
    * @return name
   **/
-
   @ApiModelProperty(example = "doggie", required = true, value = "")
   public String getName() {
     return name;
@@ -156,7 +155,6 @@ public class Pet {
    * Get photoUrls
    * @return photoUrls
   **/
-
   @ApiModelProperty(required = true, value = "")
   public List<String> getPhotoUrls() {
     return photoUrls;
@@ -183,7 +181,7 @@ public class Pet {
    * Get tags
    * @return tags
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public List<Tag> getTags() {
     return tags;
@@ -202,7 +200,7 @@ public class Pet {
    * pet status in the store
    * @return status
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "pet status in the store")
   public StatusEnum getStatus() {
     return status;
diff --git a/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/ReadOnlyFirst.java b/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/ReadOnlyFirst.java
index a2c9e99699..1379ee09ea 100644
--- a/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/ReadOnlyFirst.java
+++ b/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/ReadOnlyFirst.java
@@ -36,7 +36,7 @@ public class ReadOnlyFirst {
    * Get bar
    * @return bar
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getBar() {
     return bar;
@@ -51,7 +51,7 @@ public class ReadOnlyFirst {
    * Get baz
    * @return baz
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getBaz() {
     return baz;
diff --git a/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/SpecialModelName.java b/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/SpecialModelName.java
index a5ddb0b638..869771afad 100644
--- a/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/SpecialModelName.java
+++ b/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/SpecialModelName.java
@@ -38,7 +38,7 @@ public class SpecialModelName {
    * Get $specialPropertyName
    * @return $specialPropertyName
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Long get$SpecialPropertyName() {
     return $specialPropertyName;
diff --git a/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/Tag.java b/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/Tag.java
index 8255ad8298..4bb498aff4 100644
--- a/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/Tag.java
+++ b/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/Tag.java
@@ -41,7 +41,7 @@ public class Tag {
    * Get id
    * @return id
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Long getId() {
     return id;
@@ -60,7 +60,7 @@ public class Tag {
    * Get name
    * @return name
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getName() {
     return name;
diff --git a/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/TypeHolderDefault.java b/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/TypeHolderDefault.java
index d8c7b3efdd..9d0f5b2fbe 100644
--- a/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/TypeHolderDefault.java
+++ b/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/TypeHolderDefault.java
@@ -53,7 +53,6 @@ public class TypeHolderDefault {
    * Get stringItem
    * @return stringItem
   **/
-
   @ApiModelProperty(required = true, value = "")
   public String getStringItem() {
     return stringItem;
@@ -72,7 +71,6 @@ public class TypeHolderDefault {
    * Get numberItem
    * @return numberItem
   **/
-
   @ApiModelProperty(required = true, value = "")
   public BigDecimal getNumberItem() {
     return numberItem;
@@ -91,7 +89,6 @@ public class TypeHolderDefault {
    * Get integerItem
    * @return integerItem
   **/
-
   @ApiModelProperty(required = true, value = "")
   public Integer getIntegerItem() {
     return integerItem;
@@ -110,7 +107,6 @@ public class TypeHolderDefault {
    * Get boolItem
    * @return boolItem
   **/
-
   @ApiModelProperty(required = true, value = "")
   public Boolean getBoolItem() {
     return boolItem;
@@ -134,7 +130,6 @@ public class TypeHolderDefault {
    * Get arrayItem
    * @return arrayItem
   **/
-
   @ApiModelProperty(required = true, value = "")
   public List<Integer> getArrayItem() {
     return arrayItem;
diff --git a/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/TypeHolderExample.java b/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/TypeHolderExample.java
index c1d5ea30f8..94d3c57b6f 100644
--- a/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/TypeHolderExample.java
+++ b/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/TypeHolderExample.java
@@ -53,7 +53,6 @@ public class TypeHolderExample {
    * Get stringItem
    * @return stringItem
   **/
-
   @ApiModelProperty(example = "what", required = true, value = "")
   public String getStringItem() {
     return stringItem;
@@ -72,7 +71,6 @@ public class TypeHolderExample {
    * Get numberItem
    * @return numberItem
   **/
-
   @ApiModelProperty(example = "1.234", required = true, value = "")
   public BigDecimal getNumberItem() {
     return numberItem;
@@ -91,7 +89,6 @@ public class TypeHolderExample {
    * Get integerItem
    * @return integerItem
   **/
-
   @ApiModelProperty(example = "-2", required = true, value = "")
   public Integer getIntegerItem() {
     return integerItem;
@@ -110,7 +107,6 @@ public class TypeHolderExample {
    * Get boolItem
    * @return boolItem
   **/
-
   @ApiModelProperty(example = "true", required = true, value = "")
   public Boolean getBoolItem() {
     return boolItem;
@@ -134,7 +130,6 @@ public class TypeHolderExample {
    * Get arrayItem
    * @return arrayItem
   **/
-
   @ApiModelProperty(example = "[0, 1, 2, 3]", required = true, value = "")
   public List<Integer> getArrayItem() {
     return arrayItem;
diff --git a/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/User.java b/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/User.java
index 6e6c4ac102..73164c3ee2 100644
--- a/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/User.java
+++ b/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/User.java
@@ -59,7 +59,7 @@ public class User {
    * Get id
    * @return id
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Long getId() {
     return id;
@@ -78,7 +78,7 @@ public class User {
    * Get username
    * @return username
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getUsername() {
     return username;
@@ -97,7 +97,7 @@ public class User {
    * Get firstName
    * @return firstName
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getFirstName() {
     return firstName;
@@ -116,7 +116,7 @@ public class User {
    * Get lastName
    * @return lastName
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getLastName() {
     return lastName;
@@ -135,7 +135,7 @@ public class User {
    * Get email
    * @return email
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getEmail() {
     return email;
@@ -154,7 +154,7 @@ public class User {
    * Get password
    * @return password
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getPassword() {
     return password;
@@ -173,7 +173,7 @@ public class User {
    * Get phone
    * @return phone
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getPhone() {
     return phone;
@@ -192,7 +192,7 @@ public class User {
    * User Status
    * @return userStatus
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "User Status")
   public Integer getUserStatus() {
     return userStatus;
diff --git a/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/XmlItem.java b/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/XmlItem.java
index ce4af3e8b9..9032c23424 100644
--- a/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/XmlItem.java
+++ b/samples/client/petstore/java/jersey1/src/main/java/org/openapitools/client/model/XmlItem.java
@@ -125,7 +125,7 @@ public class XmlItem {
    * Get attributeString
    * @return attributeString
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(example = "string", value = "")
   public String getAttributeString() {
     return attributeString;
@@ -144,7 +144,7 @@ public class XmlItem {
    * Get attributeNumber
    * @return attributeNumber
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(example = "1.234", value = "")
   public BigDecimal getAttributeNumber() {
     return attributeNumber;
@@ -163,7 +163,7 @@ public class XmlItem {
    * Get attributeInteger
    * @return attributeInteger
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(example = "-2", value = "")
   public Integer getAttributeInteger() {
     return attributeInteger;
@@ -182,7 +182,7 @@ public class XmlItem {
    * Get attributeBoolean
    * @return attributeBoolean
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(example = "true", value = "")
   public Boolean getAttributeBoolean() {
     return attributeBoolean;
@@ -209,7 +209,7 @@ public class XmlItem {
    * Get wrappedArray
    * @return wrappedArray
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public List<Integer> getWrappedArray() {
     return wrappedArray;
@@ -228,7 +228,7 @@ public class XmlItem {
    * Get nameString
    * @return nameString
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(example = "string", value = "")
   public String getNameString() {
     return nameString;
@@ -247,7 +247,7 @@ public class XmlItem {
    * Get nameNumber
    * @return nameNumber
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(example = "1.234", value = "")
   public BigDecimal getNameNumber() {
     return nameNumber;
@@ -266,7 +266,7 @@ public class XmlItem {
    * Get nameInteger
    * @return nameInteger
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(example = "-2", value = "")
   public Integer getNameInteger() {
     return nameInteger;
@@ -285,7 +285,7 @@ public class XmlItem {
    * Get nameBoolean
    * @return nameBoolean
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(example = "true", value = "")
   public Boolean getNameBoolean() {
     return nameBoolean;
@@ -312,7 +312,7 @@ public class XmlItem {
    * Get nameArray
    * @return nameArray
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public List<Integer> getNameArray() {
     return nameArray;
@@ -339,7 +339,7 @@ public class XmlItem {
    * Get nameWrappedArray
    * @return nameWrappedArray
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public List<Integer> getNameWrappedArray() {
     return nameWrappedArray;
@@ -358,7 +358,7 @@ public class XmlItem {
    * Get prefixString
    * @return prefixString
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(example = "string", value = "")
   public String getPrefixString() {
     return prefixString;
@@ -377,7 +377,7 @@ public class XmlItem {
    * Get prefixNumber
    * @return prefixNumber
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(example = "1.234", value = "")
   public BigDecimal getPrefixNumber() {
     return prefixNumber;
@@ -396,7 +396,7 @@ public class XmlItem {
    * Get prefixInteger
    * @return prefixInteger
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(example = "-2", value = "")
   public Integer getPrefixInteger() {
     return prefixInteger;
@@ -415,7 +415,7 @@ public class XmlItem {
    * Get prefixBoolean
    * @return prefixBoolean
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(example = "true", value = "")
   public Boolean getPrefixBoolean() {
     return prefixBoolean;
@@ -442,7 +442,7 @@ public class XmlItem {
    * Get prefixArray
    * @return prefixArray
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public List<Integer> getPrefixArray() {
     return prefixArray;
@@ -469,7 +469,7 @@ public class XmlItem {
    * Get prefixWrappedArray
    * @return prefixWrappedArray
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public List<Integer> getPrefixWrappedArray() {
     return prefixWrappedArray;
@@ -488,7 +488,7 @@ public class XmlItem {
    * Get namespaceString
    * @return namespaceString
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(example = "string", value = "")
   public String getNamespaceString() {
     return namespaceString;
@@ -507,7 +507,7 @@ public class XmlItem {
    * Get namespaceNumber
    * @return namespaceNumber
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(example = "1.234", value = "")
   public BigDecimal getNamespaceNumber() {
     return namespaceNumber;
@@ -526,7 +526,7 @@ public class XmlItem {
    * Get namespaceInteger
    * @return namespaceInteger
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(example = "-2", value = "")
   public Integer getNamespaceInteger() {
     return namespaceInteger;
@@ -545,7 +545,7 @@ public class XmlItem {
    * Get namespaceBoolean
    * @return namespaceBoolean
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(example = "true", value = "")
   public Boolean getNamespaceBoolean() {
     return namespaceBoolean;
@@ -572,7 +572,7 @@ public class XmlItem {
    * Get namespaceArray
    * @return namespaceArray
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public List<Integer> getNamespaceArray() {
     return namespaceArray;
@@ -599,7 +599,7 @@ public class XmlItem {
    * Get namespaceWrappedArray
    * @return namespaceWrappedArray
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public List<Integer> getNamespaceWrappedArray() {
     return namespaceWrappedArray;
@@ -618,7 +618,7 @@ public class XmlItem {
    * Get prefixNsString
    * @return prefixNsString
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(example = "string", value = "")
   public String getPrefixNsString() {
     return prefixNsString;
@@ -637,7 +637,7 @@ public class XmlItem {
    * Get prefixNsNumber
    * @return prefixNsNumber
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(example = "1.234", value = "")
   public BigDecimal getPrefixNsNumber() {
     return prefixNsNumber;
@@ -656,7 +656,7 @@ public class XmlItem {
    * Get prefixNsInteger
    * @return prefixNsInteger
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(example = "-2", value = "")
   public Integer getPrefixNsInteger() {
     return prefixNsInteger;
@@ -675,7 +675,7 @@ public class XmlItem {
    * Get prefixNsBoolean
    * @return prefixNsBoolean
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(example = "true", value = "")
   public Boolean getPrefixNsBoolean() {
     return prefixNsBoolean;
@@ -702,7 +702,7 @@ public class XmlItem {
    * Get prefixNsArray
    * @return prefixNsArray
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public List<Integer> getPrefixNsArray() {
     return prefixNsArray;
@@ -729,7 +729,7 @@ public class XmlItem {
    * Get prefixNsWrappedArray
    * @return prefixNsWrappedArray
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public List<Integer> getPrefixNsWrappedArray() {
     return prefixNsWrappedArray;
diff --git a/samples/client/petstore/java/jersey2-java6/src/main/java/org/openapitools/client/model/AdditionalPropertiesAnyType.java b/samples/client/petstore/java/jersey2-java6/src/main/java/org/openapitools/client/model/AdditionalPropertiesAnyType.java
index 6f77fd208c..81251713a1 100644
--- a/samples/client/petstore/java/jersey2-java6/src/main/java/org/openapitools/client/model/AdditionalPropertiesAnyType.java
+++ b/samples/client/petstore/java/jersey2-java6/src/main/java/org/openapitools/client/model/AdditionalPropertiesAnyType.java
@@ -39,7 +39,7 @@ public class AdditionalPropertiesAnyType extends HashMap<String, Object> {
    * Get name
    * @return name
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getName() {
     return name;
diff --git a/samples/client/petstore/java/jersey2-java6/src/main/java/org/openapitools/client/model/AdditionalPropertiesArray.java b/samples/client/petstore/java/jersey2-java6/src/main/java/org/openapitools/client/model/AdditionalPropertiesArray.java
index 154f47fc70..bdf5c625dd 100644
--- a/samples/client/petstore/java/jersey2-java6/src/main/java/org/openapitools/client/model/AdditionalPropertiesArray.java
+++ b/samples/client/petstore/java/jersey2-java6/src/main/java/org/openapitools/client/model/AdditionalPropertiesArray.java
@@ -40,7 +40,7 @@ public class AdditionalPropertiesArray extends HashMap<String, List> {
    * Get name
    * @return name
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getName() {
     return name;
diff --git a/samples/client/petstore/java/jersey2-java6/src/main/java/org/openapitools/client/model/AdditionalPropertiesBoolean.java b/samples/client/petstore/java/jersey2-java6/src/main/java/org/openapitools/client/model/AdditionalPropertiesBoolean.java
index a0bec91daa..eccc9e9d3c 100644
--- a/samples/client/petstore/java/jersey2-java6/src/main/java/org/openapitools/client/model/AdditionalPropertiesBoolean.java
+++ b/samples/client/petstore/java/jersey2-java6/src/main/java/org/openapitools/client/model/AdditionalPropertiesBoolean.java
@@ -39,7 +39,7 @@ public class AdditionalPropertiesBoolean extends HashMap<String, Boolean> {
    * Get name
    * @return name
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getName() {
     return name;
diff --git a/samples/client/petstore/java/jersey2-java6/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java b/samples/client/petstore/java/jersey2-java6/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java
index e179b284c1..9209ce67b6 100644
--- a/samples/client/petstore/java/jersey2-java6/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java
+++ b/samples/client/petstore/java/jersey2-java6/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java
@@ -79,7 +79,7 @@ public class AdditionalPropertiesClass {
    * Get mapString
    * @return mapString
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Map<String, String> getMapString() {
     return mapString;
@@ -106,7 +106,7 @@ public class AdditionalPropertiesClass {
    * Get mapNumber
    * @return mapNumber
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Map<String, BigDecimal> getMapNumber() {
     return mapNumber;
@@ -133,7 +133,7 @@ public class AdditionalPropertiesClass {
    * Get mapInteger
    * @return mapInteger
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Map<String, Integer> getMapInteger() {
     return mapInteger;
@@ -160,7 +160,7 @@ public class AdditionalPropertiesClass {
    * Get mapBoolean
    * @return mapBoolean
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Map<String, Boolean> getMapBoolean() {
     return mapBoolean;
@@ -187,7 +187,7 @@ public class AdditionalPropertiesClass {
    * Get mapArrayInteger
    * @return mapArrayInteger
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Map<String, List<Integer>> getMapArrayInteger() {
     return mapArrayInteger;
@@ -214,7 +214,7 @@ public class AdditionalPropertiesClass {
    * Get mapArrayAnytype
    * @return mapArrayAnytype
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Map<String, List<Object>> getMapArrayAnytype() {
     return mapArrayAnytype;
@@ -241,7 +241,7 @@ public class AdditionalPropertiesClass {
    * Get mapMapString
    * @return mapMapString
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Map<String, Map<String, String>> getMapMapString() {
     return mapMapString;
@@ -268,7 +268,7 @@ public class AdditionalPropertiesClass {
    * Get mapMapAnytype
    * @return mapMapAnytype
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Map<String, Map<String, Object>> getMapMapAnytype() {
     return mapMapAnytype;
@@ -287,7 +287,7 @@ public class AdditionalPropertiesClass {
    * Get anytype1
    * @return anytype1
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Object getAnytype1() {
     return anytype1;
@@ -306,7 +306,7 @@ public class AdditionalPropertiesClass {
    * Get anytype2
    * @return anytype2
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Object getAnytype2() {
     return anytype2;
@@ -325,7 +325,7 @@ public class AdditionalPropertiesClass {
    * Get anytype3
    * @return anytype3
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Object getAnytype3() {
     return anytype3;
diff --git a/samples/client/petstore/java/jersey2-java6/src/main/java/org/openapitools/client/model/AdditionalPropertiesInteger.java b/samples/client/petstore/java/jersey2-java6/src/main/java/org/openapitools/client/model/AdditionalPropertiesInteger.java
index bb45326e0f..da252b12fa 100644
--- a/samples/client/petstore/java/jersey2-java6/src/main/java/org/openapitools/client/model/AdditionalPropertiesInteger.java
+++ b/samples/client/petstore/java/jersey2-java6/src/main/java/org/openapitools/client/model/AdditionalPropertiesInteger.java
@@ -39,7 +39,7 @@ public class AdditionalPropertiesInteger extends HashMap<String, Integer> {
    * Get name
    * @return name
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getName() {
     return name;
diff --git a/samples/client/petstore/java/jersey2-java6/src/main/java/org/openapitools/client/model/AdditionalPropertiesNumber.java b/samples/client/petstore/java/jersey2-java6/src/main/java/org/openapitools/client/model/AdditionalPropertiesNumber.java
index 4dd2fe4248..25e752c588 100644
--- a/samples/client/petstore/java/jersey2-java6/src/main/java/org/openapitools/client/model/AdditionalPropertiesNumber.java
+++ b/samples/client/petstore/java/jersey2-java6/src/main/java/org/openapitools/client/model/AdditionalPropertiesNumber.java
@@ -40,7 +40,7 @@ public class AdditionalPropertiesNumber extends HashMap<String, BigDecimal> {
    * Get name
    * @return name
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getName() {
     return name;
diff --git a/samples/client/petstore/java/jersey2-java6/src/main/java/org/openapitools/client/model/AdditionalPropertiesObject.java b/samples/client/petstore/java/jersey2-java6/src/main/java/org/openapitools/client/model/AdditionalPropertiesObject.java
index 58987c7c19..b5a5fed844 100644
--- a/samples/client/petstore/java/jersey2-java6/src/main/java/org/openapitools/client/model/AdditionalPropertiesObject.java
+++ b/samples/client/petstore/java/jersey2-java6/src/main/java/org/openapitools/client/model/AdditionalPropertiesObject.java
@@ -39,7 +39,7 @@ public class AdditionalPropertiesObject extends HashMap<String, Map> {
    * Get name
    * @return name
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getName() {
     return name;
diff --git a/samples/client/petstore/java/jersey2-java6/src/main/java/org/openapitools/client/model/AdditionalPropertiesString.java b/samples/client/petstore/java/jersey2-java6/src/main/java/org/openapitools/client/model/AdditionalPropertiesString.java
index f923fd81ab..247d3242dd 100644
--- a/samples/client/petstore/java/jersey2-java6/src/main/java/org/openapitools/client/model/AdditionalPropertiesString.java
+++ b/samples/client/petstore/java/jersey2-java6/src/main/java/org/openapitools/client/model/AdditionalPropertiesString.java
@@ -39,7 +39,7 @@ public class AdditionalPropertiesString extends HashMap<String, String> {
    * Get name
    * @return name
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getName() {
     return name;
diff --git a/samples/client/petstore/java/jersey2-java6/src/main/java/org/openapitools/client/model/Animal.java b/samples/client/petstore/java/jersey2-java6/src/main/java/org/openapitools/client/model/Animal.java
index 463999716e..e7f76c2f91 100644
--- a/samples/client/petstore/java/jersey2-java6/src/main/java/org/openapitools/client/model/Animal.java
+++ b/samples/client/petstore/java/jersey2-java6/src/main/java/org/openapitools/client/model/Animal.java
@@ -48,7 +48,6 @@ public class Animal {
    * Get className
    * @return className
   **/
-
   @ApiModelProperty(required = true, value = "")
   public String getClassName() {
     return className;
@@ -67,7 +66,7 @@ public class Animal {
    * Get color
    * @return color
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getColor() {
     return color;
diff --git a/samples/client/petstore/java/jersey2-java6/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java b/samples/client/petstore/java/jersey2-java6/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java
index 620e0f0452..dbf11f2b6d 100644
--- a/samples/client/petstore/java/jersey2-java6/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java
+++ b/samples/client/petstore/java/jersey2-java6/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java
@@ -48,7 +48,7 @@ public class ArrayOfArrayOfNumberOnly {
    * Get arrayArrayNumber
    * @return arrayArrayNumber
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public List<List<BigDecimal>> getArrayArrayNumber() {
     return arrayArrayNumber;
diff --git a/samples/client/petstore/java/jersey2-java6/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java b/samples/client/petstore/java/jersey2-java6/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java
index 23ca3ec520..d35a9d2744 100644
--- a/samples/client/petstore/java/jersey2-java6/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java
+++ b/samples/client/petstore/java/jersey2-java6/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java
@@ -48,7 +48,7 @@ public class ArrayOfNumberOnly {
    * Get arrayNumber
    * @return arrayNumber
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public List<BigDecimal> getArrayNumber() {
     return arrayNumber;
diff --git a/samples/client/petstore/java/jersey2-java6/src/main/java/org/openapitools/client/model/ArrayTest.java b/samples/client/petstore/java/jersey2-java6/src/main/java/org/openapitools/client/model/ArrayTest.java
index a739327142..0a28291d77 100644
--- a/samples/client/petstore/java/jersey2-java6/src/main/java/org/openapitools/client/model/ArrayTest.java
+++ b/samples/client/petstore/java/jersey2-java6/src/main/java/org/openapitools/client/model/ArrayTest.java
@@ -54,7 +54,7 @@ public class ArrayTest {
    * Get arrayOfString
    * @return arrayOfString
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public List<String> getArrayOfString() {
     return arrayOfString;
@@ -81,7 +81,7 @@ public class ArrayTest {
    * Get arrayArrayOfInteger
    * @return arrayArrayOfInteger
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public List<List<Long>> getArrayArrayOfInteger() {
     return arrayArrayOfInteger;
@@ -108,7 +108,7 @@ public class ArrayTest {
    * Get arrayArrayOfModel
    * @return arrayArrayOfModel
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public List<List<ReadOnlyFirst>> getArrayArrayOfModel() {
     return arrayArrayOfModel;
diff --git a/samples/client/petstore/java/jersey2-java6/src/main/java/org/openapitools/client/model/Capitalization.java b/samples/client/petstore/java/jersey2-java6/src/main/java/org/openapitools/client/model/Capitalization.java
index 4cb3722a0d..b8a614a204 100644
--- a/samples/client/petstore/java/jersey2-java6/src/main/java/org/openapitools/client/model/Capitalization.java
+++ b/samples/client/petstore/java/jersey2-java6/src/main/java/org/openapitools/client/model/Capitalization.java
@@ -52,7 +52,7 @@ public class Capitalization {
    * Get smallCamel
    * @return smallCamel
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getSmallCamel() {
     return smallCamel;
@@ -71,7 +71,7 @@ public class Capitalization {
    * Get capitalCamel
    * @return capitalCamel
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getCapitalCamel() {
     return capitalCamel;
@@ -90,7 +90,7 @@ public class Capitalization {
    * Get smallSnake
    * @return smallSnake
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getSmallSnake() {
     return smallSnake;
@@ -109,7 +109,7 @@ public class Capitalization {
    * Get capitalSnake
    * @return capitalSnake
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getCapitalSnake() {
     return capitalSnake;
@@ -128,7 +128,7 @@ public class Capitalization {
    * Get scAETHFlowPoints
    * @return scAETHFlowPoints
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getScAETHFlowPoints() {
     return scAETHFlowPoints;
@@ -147,7 +147,7 @@ public class Capitalization {
    * Name of the pet 
    * @return ATT_NAME
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "Name of the pet ")
   public String getATTNAME() {
     return ATT_NAME;
diff --git a/samples/client/petstore/java/jersey2-java6/src/main/java/org/openapitools/client/model/Cat.java b/samples/client/petstore/java/jersey2-java6/src/main/java/org/openapitools/client/model/Cat.java
index b1bc3a3259..6cc1276b4e 100644
--- a/samples/client/petstore/java/jersey2-java6/src/main/java/org/openapitools/client/model/Cat.java
+++ b/samples/client/petstore/java/jersey2-java6/src/main/java/org/openapitools/client/model/Cat.java
@@ -39,7 +39,7 @@ public class Cat extends Animal {
    * Get declawed
    * @return declawed
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Boolean isDeclawed() {
     return declawed;
diff --git a/samples/client/petstore/java/jersey2-java6/src/main/java/org/openapitools/client/model/CatAllOf.java b/samples/client/petstore/java/jersey2-java6/src/main/java/org/openapitools/client/model/CatAllOf.java
index f0b7eba67d..a791dc55f9 100644
--- a/samples/client/petstore/java/jersey2-java6/src/main/java/org/openapitools/client/model/CatAllOf.java
+++ b/samples/client/petstore/java/jersey2-java6/src/main/java/org/openapitools/client/model/CatAllOf.java
@@ -37,7 +37,7 @@ public class CatAllOf {
    * Get declawed
    * @return declawed
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Boolean isDeclawed() {
     return declawed;
diff --git a/samples/client/petstore/java/jersey2-java6/src/main/java/org/openapitools/client/model/Category.java b/samples/client/petstore/java/jersey2-java6/src/main/java/org/openapitools/client/model/Category.java
index 71b7375870..6fefcefbe4 100644
--- a/samples/client/petstore/java/jersey2-java6/src/main/java/org/openapitools/client/model/Category.java
+++ b/samples/client/petstore/java/jersey2-java6/src/main/java/org/openapitools/client/model/Category.java
@@ -40,7 +40,7 @@ public class Category {
    * Get id
    * @return id
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Long getId() {
     return id;
@@ -59,7 +59,6 @@ public class Category {
    * Get name
    * @return name
   **/
-
   @ApiModelProperty(required = true, value = "")
   public String getName() {
     return name;
diff --git a/samples/client/petstore/java/jersey2-java6/src/main/java/org/openapitools/client/model/ClassModel.java b/samples/client/petstore/java/jersey2-java6/src/main/java/org/openapitools/client/model/ClassModel.java
index 8a670d59fb..a6bfab63ee 100644
--- a/samples/client/petstore/java/jersey2-java6/src/main/java/org/openapitools/client/model/ClassModel.java
+++ b/samples/client/petstore/java/jersey2-java6/src/main/java/org/openapitools/client/model/ClassModel.java
@@ -38,7 +38,7 @@ public class ClassModel {
    * Get propertyClass
    * @return propertyClass
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getPropertyClass() {
     return propertyClass;
diff --git a/samples/client/petstore/java/jersey2-java6/src/main/java/org/openapitools/client/model/Client.java b/samples/client/petstore/java/jersey2-java6/src/main/java/org/openapitools/client/model/Client.java
index a3a58de1fe..68d7f4fb55 100644
--- a/samples/client/petstore/java/jersey2-java6/src/main/java/org/openapitools/client/model/Client.java
+++ b/samples/client/petstore/java/jersey2-java6/src/main/java/org/openapitools/client/model/Client.java
@@ -37,7 +37,7 @@ public class Client {
    * Get client
    * @return client
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getClient() {
     return client;
diff --git a/samples/client/petstore/java/jersey2-java6/src/main/java/org/openapitools/client/model/Dog.java b/samples/client/petstore/java/jersey2-java6/src/main/java/org/openapitools/client/model/Dog.java
index 2d3e7d4fe9..1cbee958a0 100644
--- a/samples/client/petstore/java/jersey2-java6/src/main/java/org/openapitools/client/model/Dog.java
+++ b/samples/client/petstore/java/jersey2-java6/src/main/java/org/openapitools/client/model/Dog.java
@@ -39,7 +39,7 @@ public class Dog extends Animal {
    * Get breed
    * @return breed
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getBreed() {
     return breed;
diff --git a/samples/client/petstore/java/jersey2-java6/src/main/java/org/openapitools/client/model/DogAllOf.java b/samples/client/petstore/java/jersey2-java6/src/main/java/org/openapitools/client/model/DogAllOf.java
index 3a33a542db..ad09ae505a 100644
--- a/samples/client/petstore/java/jersey2-java6/src/main/java/org/openapitools/client/model/DogAllOf.java
+++ b/samples/client/petstore/java/jersey2-java6/src/main/java/org/openapitools/client/model/DogAllOf.java
@@ -37,7 +37,7 @@ public class DogAllOf {
    * Get breed
    * @return breed
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getBreed() {
     return breed;
diff --git a/samples/client/petstore/java/jersey2-java6/src/main/java/org/openapitools/client/model/EnumArrays.java b/samples/client/petstore/java/jersey2-java6/src/main/java/org/openapitools/client/model/EnumArrays.java
index a8b71af7f4..0b8fc89b05 100644
--- a/samples/client/petstore/java/jersey2-java6/src/main/java/org/openapitools/client/model/EnumArrays.java
+++ b/samples/client/petstore/java/jersey2-java6/src/main/java/org/openapitools/client/model/EnumArrays.java
@@ -112,7 +112,7 @@ public class EnumArrays {
    * Get justSymbol
    * @return justSymbol
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public JustSymbolEnum getJustSymbol() {
     return justSymbol;
@@ -139,7 +139,7 @@ public class EnumArrays {
    * Get arrayEnum
    * @return arrayEnum
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public List<ArrayEnumEnum> getArrayEnum() {
     return arrayEnum;
diff --git a/samples/client/petstore/java/jersey2-java6/src/main/java/org/openapitools/client/model/EnumTest.java b/samples/client/petstore/java/jersey2-java6/src/main/java/org/openapitools/client/model/EnumTest.java
index a6fa726f69..0004515092 100644
--- a/samples/client/petstore/java/jersey2-java6/src/main/java/org/openapitools/client/model/EnumTest.java
+++ b/samples/client/petstore/java/jersey2-java6/src/main/java/org/openapitools/client/model/EnumTest.java
@@ -194,7 +194,7 @@ public class EnumTest {
    * Get enumString
    * @return enumString
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public EnumStringEnum getEnumString() {
     return enumString;
@@ -213,7 +213,6 @@ public class EnumTest {
    * Get enumStringRequired
    * @return enumStringRequired
   **/
-
   @ApiModelProperty(required = true, value = "")
   public EnumStringRequiredEnum getEnumStringRequired() {
     return enumStringRequired;
@@ -232,7 +231,7 @@ public class EnumTest {
    * Get enumInteger
    * @return enumInteger
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public EnumIntegerEnum getEnumInteger() {
     return enumInteger;
@@ -251,7 +250,7 @@ public class EnumTest {
    * Get enumNumber
    * @return enumNumber
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public EnumNumberEnum getEnumNumber() {
     return enumNumber;
@@ -270,7 +269,7 @@ public class EnumTest {
    * Get outerEnum
    * @return outerEnum
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public OuterEnum getOuterEnum() {
     return outerEnum;
diff --git a/samples/client/petstore/java/jersey2-java6/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java b/samples/client/petstore/java/jersey2-java6/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java
index 62e4346f1c..5f2b12d45c 100644
--- a/samples/client/petstore/java/jersey2-java6/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java
+++ b/samples/client/petstore/java/jersey2-java6/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java
@@ -42,7 +42,7 @@ public class FileSchemaTestClass {
    * Get file
    * @return file
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public java.io.File getFile() {
     return file;
@@ -69,7 +69,7 @@ public class FileSchemaTestClass {
    * Get files
    * @return files
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public List<java.io.File> getFiles() {
     return files;
diff --git a/samples/client/petstore/java/jersey2-java6/src/main/java/org/openapitools/client/model/FormatTest.java b/samples/client/petstore/java/jersey2-java6/src/main/java/org/openapitools/client/model/FormatTest.java
index c9688e4e4a..fee5939f4f 100644
--- a/samples/client/petstore/java/jersey2-java6/src/main/java/org/openapitools/client/model/FormatTest.java
+++ b/samples/client/petstore/java/jersey2-java6/src/main/java/org/openapitools/client/model/FormatTest.java
@@ -80,7 +80,7 @@ public class FormatTest {
    * maximum: 100
    * @return integer
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Integer getInteger() {
     return integer;
@@ -101,7 +101,7 @@ public class FormatTest {
    * maximum: 200
    * @return int32
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Integer getInt32() {
     return int32;
@@ -120,7 +120,7 @@ public class FormatTest {
    * Get int64
    * @return int64
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Long getInt64() {
     return int64;
@@ -141,7 +141,6 @@ public class FormatTest {
    * maximum: 543.2
    * @return number
   **/
-
   @ApiModelProperty(required = true, value = "")
   public BigDecimal getNumber() {
     return number;
@@ -162,7 +161,7 @@ public class FormatTest {
    * maximum: 987.6
    * @return _float
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Float getFloat() {
     return _float;
@@ -183,7 +182,7 @@ public class FormatTest {
    * maximum: 123.4
    * @return _double
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Double getDouble() {
     return _double;
@@ -202,7 +201,7 @@ public class FormatTest {
    * Get string
    * @return string
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getString() {
     return string;
@@ -221,7 +220,6 @@ public class FormatTest {
    * Get _byte
    * @return _byte
   **/
-
   @ApiModelProperty(required = true, value = "")
   public byte[] getByte() {
     return _byte;
@@ -240,7 +238,7 @@ public class FormatTest {
    * Get binary
    * @return binary
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public File getBinary() {
     return binary;
@@ -259,7 +257,6 @@ public class FormatTest {
    * Get date
    * @return date
   **/
-
   @ApiModelProperty(required = true, value = "")
   public LocalDate getDate() {
     return date;
@@ -278,7 +275,7 @@ public class FormatTest {
    * Get dateTime
    * @return dateTime
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public OffsetDateTime getDateTime() {
     return dateTime;
@@ -297,7 +294,7 @@ public class FormatTest {
    * Get uuid
    * @return uuid
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(example = "72f98069-206d-4f12-9f12-3d1e525a8e84", value = "")
   public UUID getUuid() {
     return uuid;
@@ -316,7 +313,6 @@ public class FormatTest {
    * Get password
    * @return password
   **/
-
   @ApiModelProperty(required = true, value = "")
   public String getPassword() {
     return password;
diff --git a/samples/client/petstore/java/jersey2-java6/src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java b/samples/client/petstore/java/jersey2-java6/src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java
index 67943f4066..7581f7ba56 100644
--- a/samples/client/petstore/java/jersey2-java6/src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java
+++ b/samples/client/petstore/java/jersey2-java6/src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java
@@ -35,7 +35,7 @@ public class HasOnlyReadOnly {
    * Get bar
    * @return bar
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getBar() {
     return bar;
@@ -45,7 +45,7 @@ public class HasOnlyReadOnly {
    * Get foo
    * @return foo
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getFoo() {
     return foo;
diff --git a/samples/client/petstore/java/jersey2-java6/src/main/java/org/openapitools/client/model/MapTest.java b/samples/client/petstore/java/jersey2-java6/src/main/java/org/openapitools/client/model/MapTest.java
index b3e327d66b..da931e4794 100644
--- a/samples/client/petstore/java/jersey2-java6/src/main/java/org/openapitools/client/model/MapTest.java
+++ b/samples/client/petstore/java/jersey2-java6/src/main/java/org/openapitools/client/model/MapTest.java
@@ -92,7 +92,7 @@ public class MapTest {
    * Get mapMapOfString
    * @return mapMapOfString
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Map<String, Map<String, String>> getMapMapOfString() {
     return mapMapOfString;
@@ -119,7 +119,7 @@ public class MapTest {
    * Get mapOfEnumString
    * @return mapOfEnumString
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Map<String, InnerEnum> getMapOfEnumString() {
     return mapOfEnumString;
@@ -146,7 +146,7 @@ public class MapTest {
    * Get directMap
    * @return directMap
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Map<String, Boolean> getDirectMap() {
     return directMap;
@@ -173,7 +173,7 @@ public class MapTest {
    * Get indirectMap
    * @return indirectMap
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Map<String, Boolean> getIndirectMap() {
     return indirectMap;
diff --git a/samples/client/petstore/java/jersey2-java6/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/client/petstore/java/jersey2-java6/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java
index e6244b5ba0..bb7fce8383 100644
--- a/samples/client/petstore/java/jersey2-java6/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java
+++ b/samples/client/petstore/java/jersey2-java6/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java
@@ -49,7 +49,7 @@ public class MixedPropertiesAndAdditionalPropertiesClass {
    * Get uuid
    * @return uuid
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public UUID getUuid() {
     return uuid;
@@ -68,7 +68,7 @@ public class MixedPropertiesAndAdditionalPropertiesClass {
    * Get dateTime
    * @return dateTime
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public OffsetDateTime getDateTime() {
     return dateTime;
@@ -95,7 +95,7 @@ public class MixedPropertiesAndAdditionalPropertiesClass {
    * Get map
    * @return map
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Map<String, Animal> getMap() {
     return map;
diff --git a/samples/client/petstore/java/jersey2-java6/src/main/java/org/openapitools/client/model/Model200Response.java b/samples/client/petstore/java/jersey2-java6/src/main/java/org/openapitools/client/model/Model200Response.java
index b6e7dd4bb9..2d258ffec3 100644
--- a/samples/client/petstore/java/jersey2-java6/src/main/java/org/openapitools/client/model/Model200Response.java
+++ b/samples/client/petstore/java/jersey2-java6/src/main/java/org/openapitools/client/model/Model200Response.java
@@ -41,7 +41,7 @@ public class Model200Response {
    * Get name
    * @return name
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Integer getName() {
     return name;
@@ -60,7 +60,7 @@ public class Model200Response {
    * Get propertyClass
    * @return propertyClass
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getPropertyClass() {
     return propertyClass;
diff --git a/samples/client/petstore/java/jersey2-java6/src/main/java/org/openapitools/client/model/ModelApiResponse.java b/samples/client/petstore/java/jersey2-java6/src/main/java/org/openapitools/client/model/ModelApiResponse.java
index 828793964c..63ccaa32f2 100644
--- a/samples/client/petstore/java/jersey2-java6/src/main/java/org/openapitools/client/model/ModelApiResponse.java
+++ b/samples/client/petstore/java/jersey2-java6/src/main/java/org/openapitools/client/model/ModelApiResponse.java
@@ -43,7 +43,7 @@ public class ModelApiResponse {
    * Get code
    * @return code
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Integer getCode() {
     return code;
@@ -62,7 +62,7 @@ public class ModelApiResponse {
    * Get type
    * @return type
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getType() {
     return type;
@@ -81,7 +81,7 @@ public class ModelApiResponse {
    * Get message
    * @return message
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getMessage() {
     return message;
diff --git a/samples/client/petstore/java/jersey2-java6/src/main/java/org/openapitools/client/model/ModelReturn.java b/samples/client/petstore/java/jersey2-java6/src/main/java/org/openapitools/client/model/ModelReturn.java
index 75e7536150..ab17739908 100644
--- a/samples/client/petstore/java/jersey2-java6/src/main/java/org/openapitools/client/model/ModelReturn.java
+++ b/samples/client/petstore/java/jersey2-java6/src/main/java/org/openapitools/client/model/ModelReturn.java
@@ -38,7 +38,7 @@ public class ModelReturn {
    * Get _return
    * @return _return
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Integer getReturn() {
     return _return;
diff --git a/samples/client/petstore/java/jersey2-java6/src/main/java/org/openapitools/client/model/Name.java b/samples/client/petstore/java/jersey2-java6/src/main/java/org/openapitools/client/model/Name.java
index 9ae7b37e07..0774790c95 100644
--- a/samples/client/petstore/java/jersey2-java6/src/main/java/org/openapitools/client/model/Name.java
+++ b/samples/client/petstore/java/jersey2-java6/src/main/java/org/openapitools/client/model/Name.java
@@ -47,7 +47,6 @@ public class Name {
    * Get name
    * @return name
   **/
-
   @ApiModelProperty(required = true, value = "")
   public Integer getName() {
     return name;
@@ -61,7 +60,7 @@ public class Name {
    * Get snakeCase
    * @return snakeCase
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Integer getSnakeCase() {
     return snakeCase;
@@ -76,7 +75,7 @@ public class Name {
    * Get property
    * @return property
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getProperty() {
     return property;
@@ -90,7 +89,7 @@ public class Name {
    * Get _123number
    * @return _123number
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Integer get123number() {
     return _123number;
diff --git a/samples/client/petstore/java/jersey2-java6/src/main/java/org/openapitools/client/model/NumberOnly.java b/samples/client/petstore/java/jersey2-java6/src/main/java/org/openapitools/client/model/NumberOnly.java
index c58c1fd75b..85268b9b7c 100644
--- a/samples/client/petstore/java/jersey2-java6/src/main/java/org/openapitools/client/model/NumberOnly.java
+++ b/samples/client/petstore/java/jersey2-java6/src/main/java/org/openapitools/client/model/NumberOnly.java
@@ -38,7 +38,7 @@ public class NumberOnly {
    * Get justNumber
    * @return justNumber
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public BigDecimal getJustNumber() {
     return justNumber;
diff --git a/samples/client/petstore/java/jersey2-java6/src/main/java/org/openapitools/client/model/Order.java b/samples/client/petstore/java/jersey2-java6/src/main/java/org/openapitools/client/model/Order.java
index 55a9be17bf..8be8f68b6c 100644
--- a/samples/client/petstore/java/jersey2-java6/src/main/java/org/openapitools/client/model/Order.java
+++ b/samples/client/petstore/java/jersey2-java6/src/main/java/org/openapitools/client/model/Order.java
@@ -90,7 +90,7 @@ public class Order {
    * Get id
    * @return id
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Long getId() {
     return id;
@@ -109,7 +109,7 @@ public class Order {
    * Get petId
    * @return petId
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Long getPetId() {
     return petId;
@@ -128,7 +128,7 @@ public class Order {
    * Get quantity
    * @return quantity
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Integer getQuantity() {
     return quantity;
@@ -147,7 +147,7 @@ public class Order {
    * Get shipDate
    * @return shipDate
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public OffsetDateTime getShipDate() {
     return shipDate;
@@ -166,7 +166,7 @@ public class Order {
    * Order Status
    * @return status
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "Order Status")
   public StatusEnum getStatus() {
     return status;
@@ -185,7 +185,7 @@ public class Order {
    * Get complete
    * @return complete
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Boolean isComplete() {
     return complete;
diff --git a/samples/client/petstore/java/jersey2-java6/src/main/java/org/openapitools/client/model/OuterComposite.java b/samples/client/petstore/java/jersey2-java6/src/main/java/org/openapitools/client/model/OuterComposite.java
index d989f08146..a8dc2ee33d 100644
--- a/samples/client/petstore/java/jersey2-java6/src/main/java/org/openapitools/client/model/OuterComposite.java
+++ b/samples/client/petstore/java/jersey2-java6/src/main/java/org/openapitools/client/model/OuterComposite.java
@@ -44,7 +44,7 @@ public class OuterComposite {
    * Get myNumber
    * @return myNumber
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public BigDecimal getMyNumber() {
     return myNumber;
@@ -63,7 +63,7 @@ public class OuterComposite {
    * Get myString
    * @return myString
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getMyString() {
     return myString;
@@ -82,7 +82,7 @@ public class OuterComposite {
    * Get myBoolean
    * @return myBoolean
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Boolean isMyBoolean() {
     return myBoolean;
diff --git a/samples/client/petstore/java/jersey2-java6/src/main/java/org/openapitools/client/model/Pet.java b/samples/client/petstore/java/jersey2-java6/src/main/java/org/openapitools/client/model/Pet.java
index 5347514db0..914b9b1443 100644
--- a/samples/client/petstore/java/jersey2-java6/src/main/java/org/openapitools/client/model/Pet.java
+++ b/samples/client/petstore/java/jersey2-java6/src/main/java/org/openapitools/client/model/Pet.java
@@ -93,7 +93,7 @@ public class Pet {
    * Get id
    * @return id
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Long getId() {
     return id;
@@ -112,7 +112,7 @@ public class Pet {
    * Get category
    * @return category
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Category getCategory() {
     return category;
@@ -131,7 +131,6 @@ public class Pet {
    * Get name
    * @return name
   **/
-
   @ApiModelProperty(example = "doggie", required = true, value = "")
   public String getName() {
     return name;
@@ -155,7 +154,6 @@ public class Pet {
    * Get photoUrls
    * @return photoUrls
   **/
-
   @ApiModelProperty(required = true, value = "")
   public List<String> getPhotoUrls() {
     return photoUrls;
@@ -182,7 +180,7 @@ public class Pet {
    * Get tags
    * @return tags
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public List<Tag> getTags() {
     return tags;
@@ -201,7 +199,7 @@ public class Pet {
    * pet status in the store
    * @return status
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "pet status in the store")
   public StatusEnum getStatus() {
     return status;
diff --git a/samples/client/petstore/java/jersey2-java6/src/main/java/org/openapitools/client/model/ReadOnlyFirst.java b/samples/client/petstore/java/jersey2-java6/src/main/java/org/openapitools/client/model/ReadOnlyFirst.java
index 0b4f41ef51..81e19eda7c 100644
--- a/samples/client/petstore/java/jersey2-java6/src/main/java/org/openapitools/client/model/ReadOnlyFirst.java
+++ b/samples/client/petstore/java/jersey2-java6/src/main/java/org/openapitools/client/model/ReadOnlyFirst.java
@@ -35,7 +35,7 @@ public class ReadOnlyFirst {
    * Get bar
    * @return bar
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getBar() {
     return bar;
@@ -50,7 +50,7 @@ public class ReadOnlyFirst {
    * Get baz
    * @return baz
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getBaz() {
     return baz;
diff --git a/samples/client/petstore/java/jersey2-java6/src/main/java/org/openapitools/client/model/SpecialModelName.java b/samples/client/petstore/java/jersey2-java6/src/main/java/org/openapitools/client/model/SpecialModelName.java
index 015646fa51..e3b9f1a187 100644
--- a/samples/client/petstore/java/jersey2-java6/src/main/java/org/openapitools/client/model/SpecialModelName.java
+++ b/samples/client/petstore/java/jersey2-java6/src/main/java/org/openapitools/client/model/SpecialModelName.java
@@ -37,7 +37,7 @@ public class SpecialModelName {
    * Get $specialPropertyName
    * @return $specialPropertyName
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Long get$SpecialPropertyName() {
     return $specialPropertyName;
diff --git a/samples/client/petstore/java/jersey2-java6/src/main/java/org/openapitools/client/model/Tag.java b/samples/client/petstore/java/jersey2-java6/src/main/java/org/openapitools/client/model/Tag.java
index 9103978339..8eaa60d84e 100644
--- a/samples/client/petstore/java/jersey2-java6/src/main/java/org/openapitools/client/model/Tag.java
+++ b/samples/client/petstore/java/jersey2-java6/src/main/java/org/openapitools/client/model/Tag.java
@@ -40,7 +40,7 @@ public class Tag {
    * Get id
    * @return id
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Long getId() {
     return id;
@@ -59,7 +59,7 @@ public class Tag {
    * Get name
    * @return name
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getName() {
     return name;
diff --git a/samples/client/petstore/java/jersey2-java6/src/main/java/org/openapitools/client/model/TypeHolderDefault.java b/samples/client/petstore/java/jersey2-java6/src/main/java/org/openapitools/client/model/TypeHolderDefault.java
index 5d457b4179..113b0da0ae 100644
--- a/samples/client/petstore/java/jersey2-java6/src/main/java/org/openapitools/client/model/TypeHolderDefault.java
+++ b/samples/client/petstore/java/jersey2-java6/src/main/java/org/openapitools/client/model/TypeHolderDefault.java
@@ -52,7 +52,6 @@ public class TypeHolderDefault {
    * Get stringItem
    * @return stringItem
   **/
-
   @ApiModelProperty(required = true, value = "")
   public String getStringItem() {
     return stringItem;
@@ -71,7 +70,6 @@ public class TypeHolderDefault {
    * Get numberItem
    * @return numberItem
   **/
-
   @ApiModelProperty(required = true, value = "")
   public BigDecimal getNumberItem() {
     return numberItem;
@@ -90,7 +88,6 @@ public class TypeHolderDefault {
    * Get integerItem
    * @return integerItem
   **/
-
   @ApiModelProperty(required = true, value = "")
   public Integer getIntegerItem() {
     return integerItem;
@@ -109,7 +106,6 @@ public class TypeHolderDefault {
    * Get boolItem
    * @return boolItem
   **/
-
   @ApiModelProperty(required = true, value = "")
   public Boolean isBoolItem() {
     return boolItem;
@@ -133,7 +129,6 @@ public class TypeHolderDefault {
    * Get arrayItem
    * @return arrayItem
   **/
-
   @ApiModelProperty(required = true, value = "")
   public List<Integer> getArrayItem() {
     return arrayItem;
diff --git a/samples/client/petstore/java/jersey2-java6/src/main/java/org/openapitools/client/model/TypeHolderExample.java b/samples/client/petstore/java/jersey2-java6/src/main/java/org/openapitools/client/model/TypeHolderExample.java
index c59b6b8408..8c48c33c63 100644
--- a/samples/client/petstore/java/jersey2-java6/src/main/java/org/openapitools/client/model/TypeHolderExample.java
+++ b/samples/client/petstore/java/jersey2-java6/src/main/java/org/openapitools/client/model/TypeHolderExample.java
@@ -52,7 +52,6 @@ public class TypeHolderExample {
    * Get stringItem
    * @return stringItem
   **/
-
   @ApiModelProperty(example = "what", required = true, value = "")
   public String getStringItem() {
     return stringItem;
@@ -71,7 +70,6 @@ public class TypeHolderExample {
    * Get numberItem
    * @return numberItem
   **/
-
   @ApiModelProperty(example = "1.234", required = true, value = "")
   public BigDecimal getNumberItem() {
     return numberItem;
@@ -90,7 +88,6 @@ public class TypeHolderExample {
    * Get integerItem
    * @return integerItem
   **/
-
   @ApiModelProperty(example = "-2", required = true, value = "")
   public Integer getIntegerItem() {
     return integerItem;
@@ -109,7 +106,6 @@ public class TypeHolderExample {
    * Get boolItem
    * @return boolItem
   **/
-
   @ApiModelProperty(example = "true", required = true, value = "")
   public Boolean isBoolItem() {
     return boolItem;
@@ -133,7 +129,6 @@ public class TypeHolderExample {
    * Get arrayItem
    * @return arrayItem
   **/
-
   @ApiModelProperty(example = "[0, 1, 2, 3]", required = true, value = "")
   public List<Integer> getArrayItem() {
     return arrayItem;
diff --git a/samples/client/petstore/java/jersey2-java6/src/main/java/org/openapitools/client/model/User.java b/samples/client/petstore/java/jersey2-java6/src/main/java/org/openapitools/client/model/User.java
index 14fa403765..f4745a2b17 100644
--- a/samples/client/petstore/java/jersey2-java6/src/main/java/org/openapitools/client/model/User.java
+++ b/samples/client/petstore/java/jersey2-java6/src/main/java/org/openapitools/client/model/User.java
@@ -58,7 +58,7 @@ public class User {
    * Get id
    * @return id
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Long getId() {
     return id;
@@ -77,7 +77,7 @@ public class User {
    * Get username
    * @return username
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getUsername() {
     return username;
@@ -96,7 +96,7 @@ public class User {
    * Get firstName
    * @return firstName
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getFirstName() {
     return firstName;
@@ -115,7 +115,7 @@ public class User {
    * Get lastName
    * @return lastName
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getLastName() {
     return lastName;
@@ -134,7 +134,7 @@ public class User {
    * Get email
    * @return email
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getEmail() {
     return email;
@@ -153,7 +153,7 @@ public class User {
    * Get password
    * @return password
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getPassword() {
     return password;
@@ -172,7 +172,7 @@ public class User {
    * Get phone
    * @return phone
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getPhone() {
     return phone;
@@ -191,7 +191,7 @@ public class User {
    * User Status
    * @return userStatus
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "User Status")
   public Integer getUserStatus() {
     return userStatus;
diff --git a/samples/client/petstore/java/jersey2-java6/src/main/java/org/openapitools/client/model/XmlItem.java b/samples/client/petstore/java/jersey2-java6/src/main/java/org/openapitools/client/model/XmlItem.java
index db0a1c96d3..730742019f 100644
--- a/samples/client/petstore/java/jersey2-java6/src/main/java/org/openapitools/client/model/XmlItem.java
+++ b/samples/client/petstore/java/jersey2-java6/src/main/java/org/openapitools/client/model/XmlItem.java
@@ -124,7 +124,7 @@ public class XmlItem {
    * Get attributeString
    * @return attributeString
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(example = "string", value = "")
   public String getAttributeString() {
     return attributeString;
@@ -143,7 +143,7 @@ public class XmlItem {
    * Get attributeNumber
    * @return attributeNumber
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(example = "1.234", value = "")
   public BigDecimal getAttributeNumber() {
     return attributeNumber;
@@ -162,7 +162,7 @@ public class XmlItem {
    * Get attributeInteger
    * @return attributeInteger
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(example = "-2", value = "")
   public Integer getAttributeInteger() {
     return attributeInteger;
@@ -181,7 +181,7 @@ public class XmlItem {
    * Get attributeBoolean
    * @return attributeBoolean
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(example = "true", value = "")
   public Boolean isAttributeBoolean() {
     return attributeBoolean;
@@ -208,7 +208,7 @@ public class XmlItem {
    * Get wrappedArray
    * @return wrappedArray
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public List<Integer> getWrappedArray() {
     return wrappedArray;
@@ -227,7 +227,7 @@ public class XmlItem {
    * Get nameString
    * @return nameString
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(example = "string", value = "")
   public String getNameString() {
     return nameString;
@@ -246,7 +246,7 @@ public class XmlItem {
    * Get nameNumber
    * @return nameNumber
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(example = "1.234", value = "")
   public BigDecimal getNameNumber() {
     return nameNumber;
@@ -265,7 +265,7 @@ public class XmlItem {
    * Get nameInteger
    * @return nameInteger
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(example = "-2", value = "")
   public Integer getNameInteger() {
     return nameInteger;
@@ -284,7 +284,7 @@ public class XmlItem {
    * Get nameBoolean
    * @return nameBoolean
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(example = "true", value = "")
   public Boolean isNameBoolean() {
     return nameBoolean;
@@ -311,7 +311,7 @@ public class XmlItem {
    * Get nameArray
    * @return nameArray
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public List<Integer> getNameArray() {
     return nameArray;
@@ -338,7 +338,7 @@ public class XmlItem {
    * Get nameWrappedArray
    * @return nameWrappedArray
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public List<Integer> getNameWrappedArray() {
     return nameWrappedArray;
@@ -357,7 +357,7 @@ public class XmlItem {
    * Get prefixString
    * @return prefixString
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(example = "string", value = "")
   public String getPrefixString() {
     return prefixString;
@@ -376,7 +376,7 @@ public class XmlItem {
    * Get prefixNumber
    * @return prefixNumber
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(example = "1.234", value = "")
   public BigDecimal getPrefixNumber() {
     return prefixNumber;
@@ -395,7 +395,7 @@ public class XmlItem {
    * Get prefixInteger
    * @return prefixInteger
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(example = "-2", value = "")
   public Integer getPrefixInteger() {
     return prefixInteger;
@@ -414,7 +414,7 @@ public class XmlItem {
    * Get prefixBoolean
    * @return prefixBoolean
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(example = "true", value = "")
   public Boolean isPrefixBoolean() {
     return prefixBoolean;
@@ -441,7 +441,7 @@ public class XmlItem {
    * Get prefixArray
    * @return prefixArray
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public List<Integer> getPrefixArray() {
     return prefixArray;
@@ -468,7 +468,7 @@ public class XmlItem {
    * Get prefixWrappedArray
    * @return prefixWrappedArray
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public List<Integer> getPrefixWrappedArray() {
     return prefixWrappedArray;
@@ -487,7 +487,7 @@ public class XmlItem {
    * Get namespaceString
    * @return namespaceString
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(example = "string", value = "")
   public String getNamespaceString() {
     return namespaceString;
@@ -506,7 +506,7 @@ public class XmlItem {
    * Get namespaceNumber
    * @return namespaceNumber
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(example = "1.234", value = "")
   public BigDecimal getNamespaceNumber() {
     return namespaceNumber;
@@ -525,7 +525,7 @@ public class XmlItem {
    * Get namespaceInteger
    * @return namespaceInteger
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(example = "-2", value = "")
   public Integer getNamespaceInteger() {
     return namespaceInteger;
@@ -544,7 +544,7 @@ public class XmlItem {
    * Get namespaceBoolean
    * @return namespaceBoolean
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(example = "true", value = "")
   public Boolean isNamespaceBoolean() {
     return namespaceBoolean;
@@ -571,7 +571,7 @@ public class XmlItem {
    * Get namespaceArray
    * @return namespaceArray
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public List<Integer> getNamespaceArray() {
     return namespaceArray;
@@ -598,7 +598,7 @@ public class XmlItem {
    * Get namespaceWrappedArray
    * @return namespaceWrappedArray
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public List<Integer> getNamespaceWrappedArray() {
     return namespaceWrappedArray;
@@ -617,7 +617,7 @@ public class XmlItem {
    * Get prefixNsString
    * @return prefixNsString
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(example = "string", value = "")
   public String getPrefixNsString() {
     return prefixNsString;
@@ -636,7 +636,7 @@ public class XmlItem {
    * Get prefixNsNumber
    * @return prefixNsNumber
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(example = "1.234", value = "")
   public BigDecimal getPrefixNsNumber() {
     return prefixNsNumber;
@@ -655,7 +655,7 @@ public class XmlItem {
    * Get prefixNsInteger
    * @return prefixNsInteger
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(example = "-2", value = "")
   public Integer getPrefixNsInteger() {
     return prefixNsInteger;
@@ -674,7 +674,7 @@ public class XmlItem {
    * Get prefixNsBoolean
    * @return prefixNsBoolean
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(example = "true", value = "")
   public Boolean isPrefixNsBoolean() {
     return prefixNsBoolean;
@@ -701,7 +701,7 @@ public class XmlItem {
    * Get prefixNsArray
    * @return prefixNsArray
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public List<Integer> getPrefixNsArray() {
     return prefixNsArray;
@@ -728,7 +728,7 @@ public class XmlItem {
    * Get prefixNsWrappedArray
    * @return prefixNsWrappedArray
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public List<Integer> getPrefixNsWrappedArray() {
     return prefixNsWrappedArray;
diff --git a/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/AdditionalPropertiesAnyType.java b/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/AdditionalPropertiesAnyType.java
index 1abb2d8a64..69d6a81729 100644
--- a/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/AdditionalPropertiesAnyType.java
+++ b/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/AdditionalPropertiesAnyType.java
@@ -40,7 +40,7 @@ public class AdditionalPropertiesAnyType extends HashMap<String, Object> {
    * Get name
    * @return name
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getName() {
     return name;
diff --git a/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/AdditionalPropertiesArray.java b/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/AdditionalPropertiesArray.java
index 1821c243e1..0147a592b7 100644
--- a/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/AdditionalPropertiesArray.java
+++ b/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/AdditionalPropertiesArray.java
@@ -41,7 +41,7 @@ public class AdditionalPropertiesArray extends HashMap<String, List> {
    * Get name
    * @return name
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getName() {
     return name;
diff --git a/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/AdditionalPropertiesBoolean.java b/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/AdditionalPropertiesBoolean.java
index 78f7ac79b2..89aa511c2a 100644
--- a/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/AdditionalPropertiesBoolean.java
+++ b/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/AdditionalPropertiesBoolean.java
@@ -40,7 +40,7 @@ public class AdditionalPropertiesBoolean extends HashMap<String, Boolean> {
    * Get name
    * @return name
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getName() {
     return name;
diff --git a/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java b/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java
index fc52759bc8..ecb4e102ea 100644
--- a/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java
+++ b/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java
@@ -80,7 +80,7 @@ public class AdditionalPropertiesClass {
    * Get mapString
    * @return mapString
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Map<String, String> getMapString() {
     return mapString;
@@ -107,7 +107,7 @@ public class AdditionalPropertiesClass {
    * Get mapNumber
    * @return mapNumber
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Map<String, BigDecimal> getMapNumber() {
     return mapNumber;
@@ -134,7 +134,7 @@ public class AdditionalPropertiesClass {
    * Get mapInteger
    * @return mapInteger
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Map<String, Integer> getMapInteger() {
     return mapInteger;
@@ -161,7 +161,7 @@ public class AdditionalPropertiesClass {
    * Get mapBoolean
    * @return mapBoolean
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Map<String, Boolean> getMapBoolean() {
     return mapBoolean;
@@ -188,7 +188,7 @@ public class AdditionalPropertiesClass {
    * Get mapArrayInteger
    * @return mapArrayInteger
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Map<String, List<Integer>> getMapArrayInteger() {
     return mapArrayInteger;
@@ -215,7 +215,7 @@ public class AdditionalPropertiesClass {
    * Get mapArrayAnytype
    * @return mapArrayAnytype
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Map<String, List<Object>> getMapArrayAnytype() {
     return mapArrayAnytype;
@@ -242,7 +242,7 @@ public class AdditionalPropertiesClass {
    * Get mapMapString
    * @return mapMapString
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Map<String, Map<String, String>> getMapMapString() {
     return mapMapString;
@@ -269,7 +269,7 @@ public class AdditionalPropertiesClass {
    * Get mapMapAnytype
    * @return mapMapAnytype
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Map<String, Map<String, Object>> getMapMapAnytype() {
     return mapMapAnytype;
@@ -288,7 +288,7 @@ public class AdditionalPropertiesClass {
    * Get anytype1
    * @return anytype1
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Object getAnytype1() {
     return anytype1;
@@ -307,7 +307,7 @@ public class AdditionalPropertiesClass {
    * Get anytype2
    * @return anytype2
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Object getAnytype2() {
     return anytype2;
@@ -326,7 +326,7 @@ public class AdditionalPropertiesClass {
    * Get anytype3
    * @return anytype3
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Object getAnytype3() {
     return anytype3;
diff --git a/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/AdditionalPropertiesInteger.java b/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/AdditionalPropertiesInteger.java
index 6e5159d404..f27ff011de 100644
--- a/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/AdditionalPropertiesInteger.java
+++ b/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/AdditionalPropertiesInteger.java
@@ -40,7 +40,7 @@ public class AdditionalPropertiesInteger extends HashMap<String, Integer> {
    * Get name
    * @return name
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getName() {
     return name;
diff --git a/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/AdditionalPropertiesNumber.java b/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/AdditionalPropertiesNumber.java
index ddc8146dea..479696fdce 100644
--- a/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/AdditionalPropertiesNumber.java
+++ b/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/AdditionalPropertiesNumber.java
@@ -41,7 +41,7 @@ public class AdditionalPropertiesNumber extends HashMap<String, BigDecimal> {
    * Get name
    * @return name
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getName() {
     return name;
diff --git a/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/AdditionalPropertiesObject.java b/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/AdditionalPropertiesObject.java
index cc29400029..bd569b0da3 100644
--- a/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/AdditionalPropertiesObject.java
+++ b/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/AdditionalPropertiesObject.java
@@ -40,7 +40,7 @@ public class AdditionalPropertiesObject extends HashMap<String, Map> {
    * Get name
    * @return name
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getName() {
     return name;
diff --git a/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/AdditionalPropertiesString.java b/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/AdditionalPropertiesString.java
index fb3368dfed..27e03a2313 100644
--- a/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/AdditionalPropertiesString.java
+++ b/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/AdditionalPropertiesString.java
@@ -40,7 +40,7 @@ public class AdditionalPropertiesString extends HashMap<String, String> {
    * Get name
    * @return name
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getName() {
     return name;
diff --git a/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Animal.java b/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Animal.java
index 53a0eec339..dc16717ac3 100644
--- a/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Animal.java
+++ b/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Animal.java
@@ -49,7 +49,6 @@ public class Animal {
    * Get className
    * @return className
   **/
-
   @ApiModelProperty(required = true, value = "")
   public String getClassName() {
     return className;
@@ -68,7 +67,7 @@ public class Animal {
    * Get color
    * @return color
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getColor() {
     return color;
diff --git a/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java b/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java
index 49b5c55250..66e9fba5d7 100644
--- a/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java
+++ b/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java
@@ -49,7 +49,7 @@ public class ArrayOfArrayOfNumberOnly {
    * Get arrayArrayNumber
    * @return arrayArrayNumber
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public List<List<BigDecimal>> getArrayArrayNumber() {
     return arrayArrayNumber;
diff --git a/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java b/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java
index ef2555974d..9f5b467a31 100644
--- a/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java
+++ b/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java
@@ -49,7 +49,7 @@ public class ArrayOfNumberOnly {
    * Get arrayNumber
    * @return arrayNumber
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public List<BigDecimal> getArrayNumber() {
     return arrayNumber;
diff --git a/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/ArrayTest.java b/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/ArrayTest.java
index b6b98aa275..7ac6788089 100644
--- a/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/ArrayTest.java
+++ b/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/ArrayTest.java
@@ -55,7 +55,7 @@ public class ArrayTest {
    * Get arrayOfString
    * @return arrayOfString
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public List<String> getArrayOfString() {
     return arrayOfString;
@@ -82,7 +82,7 @@ public class ArrayTest {
    * Get arrayArrayOfInteger
    * @return arrayArrayOfInteger
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public List<List<Long>> getArrayArrayOfInteger() {
     return arrayArrayOfInteger;
@@ -109,7 +109,7 @@ public class ArrayTest {
    * Get arrayArrayOfModel
    * @return arrayArrayOfModel
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public List<List<ReadOnlyFirst>> getArrayArrayOfModel() {
     return arrayArrayOfModel;
diff --git a/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Capitalization.java b/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Capitalization.java
index bb83be97fe..3f3df29d5d 100644
--- a/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Capitalization.java
+++ b/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Capitalization.java
@@ -53,7 +53,7 @@ public class Capitalization {
    * Get smallCamel
    * @return smallCamel
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getSmallCamel() {
     return smallCamel;
@@ -72,7 +72,7 @@ public class Capitalization {
    * Get capitalCamel
    * @return capitalCamel
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getCapitalCamel() {
     return capitalCamel;
@@ -91,7 +91,7 @@ public class Capitalization {
    * Get smallSnake
    * @return smallSnake
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getSmallSnake() {
     return smallSnake;
@@ -110,7 +110,7 @@ public class Capitalization {
    * Get capitalSnake
    * @return capitalSnake
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getCapitalSnake() {
     return capitalSnake;
@@ -129,7 +129,7 @@ public class Capitalization {
    * Get scAETHFlowPoints
    * @return scAETHFlowPoints
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getScAETHFlowPoints() {
     return scAETHFlowPoints;
@@ -148,7 +148,7 @@ public class Capitalization {
    * Name of the pet 
    * @return ATT_NAME
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "Name of the pet ")
   public String getATTNAME() {
     return ATT_NAME;
diff --git a/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Cat.java b/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Cat.java
index ce456c8647..a8108d6f15 100644
--- a/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Cat.java
+++ b/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Cat.java
@@ -40,7 +40,7 @@ public class Cat extends Animal {
    * Get declawed
    * @return declawed
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Boolean getDeclawed() {
     return declawed;
diff --git a/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/CatAllOf.java b/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/CatAllOf.java
index 224c08671c..42e9614610 100644
--- a/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/CatAllOf.java
+++ b/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/CatAllOf.java
@@ -38,7 +38,7 @@ public class CatAllOf {
    * Get declawed
    * @return declawed
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Boolean getDeclawed() {
     return declawed;
diff --git a/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Category.java b/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Category.java
index 03efdd4be8..3eccd2cd92 100644
--- a/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Category.java
+++ b/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Category.java
@@ -41,7 +41,7 @@ public class Category {
    * Get id
    * @return id
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Long getId() {
     return id;
@@ -60,7 +60,6 @@ public class Category {
    * Get name
    * @return name
   **/
-
   @ApiModelProperty(required = true, value = "")
   public String getName() {
     return name;
diff --git a/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/ClassModel.java b/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/ClassModel.java
index def421a670..2aaed27fff 100644
--- a/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/ClassModel.java
+++ b/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/ClassModel.java
@@ -39,7 +39,7 @@ public class ClassModel {
    * Get propertyClass
    * @return propertyClass
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getPropertyClass() {
     return propertyClass;
diff --git a/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Client.java b/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Client.java
index c0bd0743e5..458e812960 100644
--- a/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Client.java
+++ b/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Client.java
@@ -38,7 +38,7 @@ public class Client {
    * Get client
    * @return client
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getClient() {
     return client;
diff --git a/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Dog.java b/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Dog.java
index 6b79c59606..83f5cb0e27 100644
--- a/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Dog.java
+++ b/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Dog.java
@@ -40,7 +40,7 @@ public class Dog extends Animal {
    * Get breed
    * @return breed
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getBreed() {
     return breed;
diff --git a/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/DogAllOf.java b/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/DogAllOf.java
index 1a4496d8f0..d1e1402789 100644
--- a/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/DogAllOf.java
+++ b/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/DogAllOf.java
@@ -38,7 +38,7 @@ public class DogAllOf {
    * Get breed
    * @return breed
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getBreed() {
     return breed;
diff --git a/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/EnumArrays.java b/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/EnumArrays.java
index fff7f65c72..a3bd1af472 100644
--- a/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/EnumArrays.java
+++ b/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/EnumArrays.java
@@ -113,7 +113,7 @@ public class EnumArrays {
    * Get justSymbol
    * @return justSymbol
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public JustSymbolEnum getJustSymbol() {
     return justSymbol;
@@ -140,7 +140,7 @@ public class EnumArrays {
    * Get arrayEnum
    * @return arrayEnum
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public List<ArrayEnumEnum> getArrayEnum() {
     return arrayEnum;
diff --git a/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/EnumTest.java b/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/EnumTest.java
index d4b36798ee..b365a8a56f 100644
--- a/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/EnumTest.java
+++ b/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/EnumTest.java
@@ -195,7 +195,7 @@ public class EnumTest {
    * Get enumString
    * @return enumString
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public EnumStringEnum getEnumString() {
     return enumString;
@@ -214,7 +214,6 @@ public class EnumTest {
    * Get enumStringRequired
    * @return enumStringRequired
   **/
-
   @ApiModelProperty(required = true, value = "")
   public EnumStringRequiredEnum getEnumStringRequired() {
     return enumStringRequired;
@@ -233,7 +232,7 @@ public class EnumTest {
    * Get enumInteger
    * @return enumInteger
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public EnumIntegerEnum getEnumInteger() {
     return enumInteger;
@@ -252,7 +251,7 @@ public class EnumTest {
    * Get enumNumber
    * @return enumNumber
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public EnumNumberEnum getEnumNumber() {
     return enumNumber;
@@ -271,7 +270,7 @@ public class EnumTest {
    * Get outerEnum
    * @return outerEnum
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public OuterEnum getOuterEnum() {
     return outerEnum;
diff --git a/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java b/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java
index ebbb0fb9f3..ad8cf751e1 100644
--- a/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java
+++ b/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java
@@ -43,7 +43,7 @@ public class FileSchemaTestClass {
    * Get file
    * @return file
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public java.io.File getFile() {
     return file;
@@ -70,7 +70,7 @@ public class FileSchemaTestClass {
    * Get files
    * @return files
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public List<java.io.File> getFiles() {
     return files;
diff --git a/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/FormatTest.java b/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/FormatTest.java
index 518432caff..8d075e26ba 100644
--- a/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/FormatTest.java
+++ b/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/FormatTest.java
@@ -81,7 +81,7 @@ public class FormatTest {
    * maximum: 100
    * @return integer
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Integer getInteger() {
     return integer;
@@ -102,7 +102,7 @@ public class FormatTest {
    * maximum: 200
    * @return int32
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Integer getInt32() {
     return int32;
@@ -121,7 +121,7 @@ public class FormatTest {
    * Get int64
    * @return int64
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Long getInt64() {
     return int64;
@@ -142,7 +142,6 @@ public class FormatTest {
    * maximum: 543.2
    * @return number
   **/
-
   @ApiModelProperty(required = true, value = "")
   public BigDecimal getNumber() {
     return number;
@@ -163,7 +162,7 @@ public class FormatTest {
    * maximum: 987.6
    * @return _float
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Float getFloat() {
     return _float;
@@ -184,7 +183,7 @@ public class FormatTest {
    * maximum: 123.4
    * @return _double
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Double getDouble() {
     return _double;
@@ -203,7 +202,7 @@ public class FormatTest {
    * Get string
    * @return string
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getString() {
     return string;
@@ -222,7 +221,6 @@ public class FormatTest {
    * Get _byte
    * @return _byte
   **/
-
   @ApiModelProperty(required = true, value = "")
   public byte[] getByte() {
     return _byte;
@@ -241,7 +239,7 @@ public class FormatTest {
    * Get binary
    * @return binary
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public File getBinary() {
     return binary;
@@ -260,7 +258,6 @@ public class FormatTest {
    * Get date
    * @return date
   **/
-
   @ApiModelProperty(required = true, value = "")
   public LocalDate getDate() {
     return date;
@@ -279,7 +276,7 @@ public class FormatTest {
    * Get dateTime
    * @return dateTime
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public OffsetDateTime getDateTime() {
     return dateTime;
@@ -298,7 +295,7 @@ public class FormatTest {
    * Get uuid
    * @return uuid
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(example = "72f98069-206d-4f12-9f12-3d1e525a8e84", value = "")
   public UUID getUuid() {
     return uuid;
@@ -317,7 +314,6 @@ public class FormatTest {
    * Get password
    * @return password
   **/
-
   @ApiModelProperty(required = true, value = "")
   public String getPassword() {
     return password;
diff --git a/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java b/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java
index 44159e08e8..e9453bb6cc 100644
--- a/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java
+++ b/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java
@@ -36,7 +36,7 @@ public class HasOnlyReadOnly {
    * Get bar
    * @return bar
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getBar() {
     return bar;
@@ -46,7 +46,7 @@ public class HasOnlyReadOnly {
    * Get foo
    * @return foo
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getFoo() {
     return foo;
diff --git a/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/MapTest.java b/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/MapTest.java
index 2caabbea07..b0d3e04bb6 100644
--- a/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/MapTest.java
+++ b/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/MapTest.java
@@ -93,7 +93,7 @@ public class MapTest {
    * Get mapMapOfString
    * @return mapMapOfString
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Map<String, Map<String, String>> getMapMapOfString() {
     return mapMapOfString;
@@ -120,7 +120,7 @@ public class MapTest {
    * Get mapOfEnumString
    * @return mapOfEnumString
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Map<String, InnerEnum> getMapOfEnumString() {
     return mapOfEnumString;
@@ -147,7 +147,7 @@ public class MapTest {
    * Get directMap
    * @return directMap
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Map<String, Boolean> getDirectMap() {
     return directMap;
@@ -174,7 +174,7 @@ public class MapTest {
    * Get indirectMap
    * @return indirectMap
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Map<String, Boolean> getIndirectMap() {
     return indirectMap;
diff --git a/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java
index 8d97329c31..fed78a2162 100644
--- a/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java
+++ b/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java
@@ -50,7 +50,7 @@ public class MixedPropertiesAndAdditionalPropertiesClass {
    * Get uuid
    * @return uuid
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public UUID getUuid() {
     return uuid;
@@ -69,7 +69,7 @@ public class MixedPropertiesAndAdditionalPropertiesClass {
    * Get dateTime
    * @return dateTime
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public OffsetDateTime getDateTime() {
     return dateTime;
@@ -96,7 +96,7 @@ public class MixedPropertiesAndAdditionalPropertiesClass {
    * Get map
    * @return map
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Map<String, Animal> getMap() {
     return map;
diff --git a/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Model200Response.java b/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Model200Response.java
index bd3244dd57..39fabeeb6d 100644
--- a/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Model200Response.java
+++ b/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Model200Response.java
@@ -42,7 +42,7 @@ public class Model200Response {
    * Get name
    * @return name
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Integer getName() {
     return name;
@@ -61,7 +61,7 @@ public class Model200Response {
    * Get propertyClass
    * @return propertyClass
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getPropertyClass() {
     return propertyClass;
diff --git a/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/ModelApiResponse.java b/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/ModelApiResponse.java
index ed335cdca1..bb33412951 100644
--- a/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/ModelApiResponse.java
+++ b/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/ModelApiResponse.java
@@ -44,7 +44,7 @@ public class ModelApiResponse {
    * Get code
    * @return code
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Integer getCode() {
     return code;
@@ -63,7 +63,7 @@ public class ModelApiResponse {
    * Get type
    * @return type
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getType() {
     return type;
@@ -82,7 +82,7 @@ public class ModelApiResponse {
    * Get message
    * @return message
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getMessage() {
     return message;
diff --git a/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/ModelReturn.java b/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/ModelReturn.java
index 04c0bcd33f..9aafb13e04 100644
--- a/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/ModelReturn.java
+++ b/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/ModelReturn.java
@@ -39,7 +39,7 @@ public class ModelReturn {
    * Get _return
    * @return _return
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Integer getReturn() {
     return _return;
diff --git a/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Name.java b/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Name.java
index af27c6e45f..9518276dd6 100644
--- a/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Name.java
+++ b/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Name.java
@@ -48,7 +48,6 @@ public class Name {
    * Get name
    * @return name
   **/
-
   @ApiModelProperty(required = true, value = "")
   public Integer getName() {
     return name;
@@ -62,7 +61,7 @@ public class Name {
    * Get snakeCase
    * @return snakeCase
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Integer getSnakeCase() {
     return snakeCase;
@@ -77,7 +76,7 @@ public class Name {
    * Get property
    * @return property
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getProperty() {
     return property;
@@ -91,7 +90,7 @@ public class Name {
    * Get _123number
    * @return _123number
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Integer get123number() {
     return _123number;
diff --git a/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/NumberOnly.java b/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/NumberOnly.java
index 4e29c814cc..0245e8e210 100644
--- a/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/NumberOnly.java
+++ b/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/NumberOnly.java
@@ -39,7 +39,7 @@ public class NumberOnly {
    * Get justNumber
    * @return justNumber
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public BigDecimal getJustNumber() {
     return justNumber;
diff --git a/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Order.java b/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Order.java
index 1735b41d31..594c76e484 100644
--- a/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Order.java
+++ b/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Order.java
@@ -91,7 +91,7 @@ public class Order {
    * Get id
    * @return id
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Long getId() {
     return id;
@@ -110,7 +110,7 @@ public class Order {
    * Get petId
    * @return petId
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Long getPetId() {
     return petId;
@@ -129,7 +129,7 @@ public class Order {
    * Get quantity
    * @return quantity
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Integer getQuantity() {
     return quantity;
@@ -148,7 +148,7 @@ public class Order {
    * Get shipDate
    * @return shipDate
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public OffsetDateTime getShipDate() {
     return shipDate;
@@ -167,7 +167,7 @@ public class Order {
    * Order Status
    * @return status
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "Order Status")
   public StatusEnum getStatus() {
     return status;
@@ -186,7 +186,7 @@ public class Order {
    * Get complete
    * @return complete
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Boolean getComplete() {
     return complete;
diff --git a/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/OuterComposite.java b/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/OuterComposite.java
index f6515126a8..c8bd99011c 100644
--- a/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/OuterComposite.java
+++ b/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/OuterComposite.java
@@ -45,7 +45,7 @@ public class OuterComposite {
    * Get myNumber
    * @return myNumber
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public BigDecimal getMyNumber() {
     return myNumber;
@@ -64,7 +64,7 @@ public class OuterComposite {
    * Get myString
    * @return myString
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getMyString() {
     return myString;
@@ -83,7 +83,7 @@ public class OuterComposite {
    * Get myBoolean
    * @return myBoolean
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Boolean getMyBoolean() {
     return myBoolean;
diff --git a/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Pet.java b/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Pet.java
index ace85c42aa..08f3773756 100644
--- a/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Pet.java
+++ b/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Pet.java
@@ -94,7 +94,7 @@ public class Pet {
    * Get id
    * @return id
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Long getId() {
     return id;
@@ -113,7 +113,7 @@ public class Pet {
    * Get category
    * @return category
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Category getCategory() {
     return category;
@@ -132,7 +132,6 @@ public class Pet {
    * Get name
    * @return name
   **/
-
   @ApiModelProperty(example = "doggie", required = true, value = "")
   public String getName() {
     return name;
@@ -156,7 +155,6 @@ public class Pet {
    * Get photoUrls
    * @return photoUrls
   **/
-
   @ApiModelProperty(required = true, value = "")
   public List<String> getPhotoUrls() {
     return photoUrls;
@@ -183,7 +181,7 @@ public class Pet {
    * Get tags
    * @return tags
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public List<Tag> getTags() {
     return tags;
@@ -202,7 +200,7 @@ public class Pet {
    * pet status in the store
    * @return status
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "pet status in the store")
   public StatusEnum getStatus() {
     return status;
diff --git a/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/ReadOnlyFirst.java b/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/ReadOnlyFirst.java
index a2c9e99699..1379ee09ea 100644
--- a/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/ReadOnlyFirst.java
+++ b/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/ReadOnlyFirst.java
@@ -36,7 +36,7 @@ public class ReadOnlyFirst {
    * Get bar
    * @return bar
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getBar() {
     return bar;
@@ -51,7 +51,7 @@ public class ReadOnlyFirst {
    * Get baz
    * @return baz
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getBaz() {
     return baz;
diff --git a/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/SpecialModelName.java b/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/SpecialModelName.java
index a5ddb0b638..869771afad 100644
--- a/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/SpecialModelName.java
+++ b/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/SpecialModelName.java
@@ -38,7 +38,7 @@ public class SpecialModelName {
    * Get $specialPropertyName
    * @return $specialPropertyName
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Long get$SpecialPropertyName() {
     return $specialPropertyName;
diff --git a/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Tag.java b/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Tag.java
index 8255ad8298..4bb498aff4 100644
--- a/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Tag.java
+++ b/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/Tag.java
@@ -41,7 +41,7 @@ public class Tag {
    * Get id
    * @return id
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Long getId() {
     return id;
@@ -60,7 +60,7 @@ public class Tag {
    * Get name
    * @return name
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getName() {
     return name;
diff --git a/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/TypeHolderDefault.java b/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/TypeHolderDefault.java
index 786a681fb3..3c6488d270 100644
--- a/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/TypeHolderDefault.java
+++ b/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/TypeHolderDefault.java
@@ -53,7 +53,6 @@ public class TypeHolderDefault {
    * Get stringItem
    * @return stringItem
   **/
-
   @ApiModelProperty(required = true, value = "")
   public String getStringItem() {
     return stringItem;
@@ -72,7 +71,6 @@ public class TypeHolderDefault {
    * Get numberItem
    * @return numberItem
   **/
-
   @ApiModelProperty(required = true, value = "")
   public BigDecimal getNumberItem() {
     return numberItem;
@@ -91,7 +89,6 @@ public class TypeHolderDefault {
    * Get integerItem
    * @return integerItem
   **/
-
   @ApiModelProperty(required = true, value = "")
   public Integer getIntegerItem() {
     return integerItem;
@@ -110,7 +107,6 @@ public class TypeHolderDefault {
    * Get boolItem
    * @return boolItem
   **/
-
   @ApiModelProperty(required = true, value = "")
   public Boolean getBoolItem() {
     return boolItem;
@@ -134,7 +130,6 @@ public class TypeHolderDefault {
    * Get arrayItem
    * @return arrayItem
   **/
-
   @ApiModelProperty(required = true, value = "")
   public List<Integer> getArrayItem() {
     return arrayItem;
diff --git a/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/TypeHolderExample.java b/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/TypeHolderExample.java
index 701e4db843..812b5839aa 100644
--- a/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/TypeHolderExample.java
+++ b/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/TypeHolderExample.java
@@ -53,7 +53,6 @@ public class TypeHolderExample {
    * Get stringItem
    * @return stringItem
   **/
-
   @ApiModelProperty(example = "what", required = true, value = "")
   public String getStringItem() {
     return stringItem;
@@ -72,7 +71,6 @@ public class TypeHolderExample {
    * Get numberItem
    * @return numberItem
   **/
-
   @ApiModelProperty(example = "1.234", required = true, value = "")
   public BigDecimal getNumberItem() {
     return numberItem;
@@ -91,7 +89,6 @@ public class TypeHolderExample {
    * Get integerItem
    * @return integerItem
   **/
-
   @ApiModelProperty(example = "-2", required = true, value = "")
   public Integer getIntegerItem() {
     return integerItem;
@@ -110,7 +107,6 @@ public class TypeHolderExample {
    * Get boolItem
    * @return boolItem
   **/
-
   @ApiModelProperty(example = "true", required = true, value = "")
   public Boolean getBoolItem() {
     return boolItem;
@@ -134,7 +130,6 @@ public class TypeHolderExample {
    * Get arrayItem
    * @return arrayItem
   **/
-
   @ApiModelProperty(example = "[0, 1, 2, 3]", required = true, value = "")
   public List<Integer> getArrayItem() {
     return arrayItem;
diff --git a/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/User.java b/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/User.java
index 6e6c4ac102..73164c3ee2 100644
--- a/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/User.java
+++ b/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/User.java
@@ -59,7 +59,7 @@ public class User {
    * Get id
    * @return id
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Long getId() {
     return id;
@@ -78,7 +78,7 @@ public class User {
    * Get username
    * @return username
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getUsername() {
     return username;
@@ -97,7 +97,7 @@ public class User {
    * Get firstName
    * @return firstName
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getFirstName() {
     return firstName;
@@ -116,7 +116,7 @@ public class User {
    * Get lastName
    * @return lastName
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getLastName() {
     return lastName;
@@ -135,7 +135,7 @@ public class User {
    * Get email
    * @return email
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getEmail() {
     return email;
@@ -154,7 +154,7 @@ public class User {
    * Get password
    * @return password
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getPassword() {
     return password;
@@ -173,7 +173,7 @@ public class User {
    * Get phone
    * @return phone
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getPhone() {
     return phone;
@@ -192,7 +192,7 @@ public class User {
    * User Status
    * @return userStatus
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "User Status")
   public Integer getUserStatus() {
     return userStatus;
diff --git a/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/XmlItem.java b/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/XmlItem.java
index 2af459e5ae..aa7ff22ccd 100644
--- a/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/XmlItem.java
+++ b/samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/model/XmlItem.java
@@ -125,7 +125,7 @@ public class XmlItem {
    * Get attributeString
    * @return attributeString
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(example = "string", value = "")
   public String getAttributeString() {
     return attributeString;
@@ -144,7 +144,7 @@ public class XmlItem {
    * Get attributeNumber
    * @return attributeNumber
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(example = "1.234", value = "")
   public BigDecimal getAttributeNumber() {
     return attributeNumber;
@@ -163,7 +163,7 @@ public class XmlItem {
    * Get attributeInteger
    * @return attributeInteger
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(example = "-2", value = "")
   public Integer getAttributeInteger() {
     return attributeInteger;
@@ -182,7 +182,7 @@ public class XmlItem {
    * Get attributeBoolean
    * @return attributeBoolean
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(example = "true", value = "")
   public Boolean getAttributeBoolean() {
     return attributeBoolean;
@@ -209,7 +209,7 @@ public class XmlItem {
    * Get wrappedArray
    * @return wrappedArray
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public List<Integer> getWrappedArray() {
     return wrappedArray;
@@ -228,7 +228,7 @@ public class XmlItem {
    * Get nameString
    * @return nameString
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(example = "string", value = "")
   public String getNameString() {
     return nameString;
@@ -247,7 +247,7 @@ public class XmlItem {
    * Get nameNumber
    * @return nameNumber
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(example = "1.234", value = "")
   public BigDecimal getNameNumber() {
     return nameNumber;
@@ -266,7 +266,7 @@ public class XmlItem {
    * Get nameInteger
    * @return nameInteger
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(example = "-2", value = "")
   public Integer getNameInteger() {
     return nameInteger;
@@ -285,7 +285,7 @@ public class XmlItem {
    * Get nameBoolean
    * @return nameBoolean
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(example = "true", value = "")
   public Boolean getNameBoolean() {
     return nameBoolean;
@@ -312,7 +312,7 @@ public class XmlItem {
    * Get nameArray
    * @return nameArray
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public List<Integer> getNameArray() {
     return nameArray;
@@ -339,7 +339,7 @@ public class XmlItem {
    * Get nameWrappedArray
    * @return nameWrappedArray
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public List<Integer> getNameWrappedArray() {
     return nameWrappedArray;
@@ -358,7 +358,7 @@ public class XmlItem {
    * Get prefixString
    * @return prefixString
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(example = "string", value = "")
   public String getPrefixString() {
     return prefixString;
@@ -377,7 +377,7 @@ public class XmlItem {
    * Get prefixNumber
    * @return prefixNumber
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(example = "1.234", value = "")
   public BigDecimal getPrefixNumber() {
     return prefixNumber;
@@ -396,7 +396,7 @@ public class XmlItem {
    * Get prefixInteger
    * @return prefixInteger
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(example = "-2", value = "")
   public Integer getPrefixInteger() {
     return prefixInteger;
@@ -415,7 +415,7 @@ public class XmlItem {
    * Get prefixBoolean
    * @return prefixBoolean
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(example = "true", value = "")
   public Boolean getPrefixBoolean() {
     return prefixBoolean;
@@ -442,7 +442,7 @@ public class XmlItem {
    * Get prefixArray
    * @return prefixArray
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public List<Integer> getPrefixArray() {
     return prefixArray;
@@ -469,7 +469,7 @@ public class XmlItem {
    * Get prefixWrappedArray
    * @return prefixWrappedArray
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public List<Integer> getPrefixWrappedArray() {
     return prefixWrappedArray;
@@ -488,7 +488,7 @@ public class XmlItem {
    * Get namespaceString
    * @return namespaceString
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(example = "string", value = "")
   public String getNamespaceString() {
     return namespaceString;
@@ -507,7 +507,7 @@ public class XmlItem {
    * Get namespaceNumber
    * @return namespaceNumber
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(example = "1.234", value = "")
   public BigDecimal getNamespaceNumber() {
     return namespaceNumber;
@@ -526,7 +526,7 @@ public class XmlItem {
    * Get namespaceInteger
    * @return namespaceInteger
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(example = "-2", value = "")
   public Integer getNamespaceInteger() {
     return namespaceInteger;
@@ -545,7 +545,7 @@ public class XmlItem {
    * Get namespaceBoolean
    * @return namespaceBoolean
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(example = "true", value = "")
   public Boolean getNamespaceBoolean() {
     return namespaceBoolean;
@@ -572,7 +572,7 @@ public class XmlItem {
    * Get namespaceArray
    * @return namespaceArray
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public List<Integer> getNamespaceArray() {
     return namespaceArray;
@@ -599,7 +599,7 @@ public class XmlItem {
    * Get namespaceWrappedArray
    * @return namespaceWrappedArray
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public List<Integer> getNamespaceWrappedArray() {
     return namespaceWrappedArray;
@@ -618,7 +618,7 @@ public class XmlItem {
    * Get prefixNsString
    * @return prefixNsString
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(example = "string", value = "")
   public String getPrefixNsString() {
     return prefixNsString;
@@ -637,7 +637,7 @@ public class XmlItem {
    * Get prefixNsNumber
    * @return prefixNsNumber
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(example = "1.234", value = "")
   public BigDecimal getPrefixNsNumber() {
     return prefixNsNumber;
@@ -656,7 +656,7 @@ public class XmlItem {
    * Get prefixNsInteger
    * @return prefixNsInteger
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(example = "-2", value = "")
   public Integer getPrefixNsInteger() {
     return prefixNsInteger;
@@ -675,7 +675,7 @@ public class XmlItem {
    * Get prefixNsBoolean
    * @return prefixNsBoolean
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(example = "true", value = "")
   public Boolean getPrefixNsBoolean() {
     return prefixNsBoolean;
@@ -702,7 +702,7 @@ public class XmlItem {
    * Get prefixNsArray
    * @return prefixNsArray
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public List<Integer> getPrefixNsArray() {
     return prefixNsArray;
@@ -729,7 +729,7 @@ public class XmlItem {
    * Get prefixNsWrappedArray
    * @return prefixNsWrappedArray
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public List<Integer> getPrefixNsWrappedArray() {
     return prefixNsWrappedArray;
diff --git a/samples/client/petstore/java/jersey2/src/main/java/org/openapitools/client/model/AdditionalPropertiesAnyType.java b/samples/client/petstore/java/jersey2/src/main/java/org/openapitools/client/model/AdditionalPropertiesAnyType.java
index 1abb2d8a64..69d6a81729 100644
--- a/samples/client/petstore/java/jersey2/src/main/java/org/openapitools/client/model/AdditionalPropertiesAnyType.java
+++ b/samples/client/petstore/java/jersey2/src/main/java/org/openapitools/client/model/AdditionalPropertiesAnyType.java
@@ -40,7 +40,7 @@ public class AdditionalPropertiesAnyType extends HashMap<String, Object> {
    * Get name
    * @return name
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getName() {
     return name;
diff --git a/samples/client/petstore/java/jersey2/src/main/java/org/openapitools/client/model/AdditionalPropertiesArray.java b/samples/client/petstore/java/jersey2/src/main/java/org/openapitools/client/model/AdditionalPropertiesArray.java
index 1821c243e1..0147a592b7 100644
--- a/samples/client/petstore/java/jersey2/src/main/java/org/openapitools/client/model/AdditionalPropertiesArray.java
+++ b/samples/client/petstore/java/jersey2/src/main/java/org/openapitools/client/model/AdditionalPropertiesArray.java
@@ -41,7 +41,7 @@ public class AdditionalPropertiesArray extends HashMap<String, List> {
    * Get name
    * @return name
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getName() {
     return name;
diff --git a/samples/client/petstore/java/jersey2/src/main/java/org/openapitools/client/model/AdditionalPropertiesBoolean.java b/samples/client/petstore/java/jersey2/src/main/java/org/openapitools/client/model/AdditionalPropertiesBoolean.java
index 78f7ac79b2..89aa511c2a 100644
--- a/samples/client/petstore/java/jersey2/src/main/java/org/openapitools/client/model/AdditionalPropertiesBoolean.java
+++ b/samples/client/petstore/java/jersey2/src/main/java/org/openapitools/client/model/AdditionalPropertiesBoolean.java
@@ -40,7 +40,7 @@ public class AdditionalPropertiesBoolean extends HashMap<String, Boolean> {
    * Get name
    * @return name
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getName() {
     return name;
diff --git a/samples/client/petstore/java/jersey2/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java b/samples/client/petstore/java/jersey2/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java
index 406bccc278..cb955d1165 100644
--- a/samples/client/petstore/java/jersey2/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java
+++ b/samples/client/petstore/java/jersey2/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java
@@ -80,7 +80,7 @@ public class AdditionalPropertiesClass {
    * Get mapString
    * @return mapString
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Map<String, String> getMapString() {
     return mapString;
@@ -107,7 +107,7 @@ public class AdditionalPropertiesClass {
    * Get mapNumber
    * @return mapNumber
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Map<String, BigDecimal> getMapNumber() {
     return mapNumber;
@@ -134,7 +134,7 @@ public class AdditionalPropertiesClass {
    * Get mapInteger
    * @return mapInteger
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Map<String, Integer> getMapInteger() {
     return mapInteger;
@@ -161,7 +161,7 @@ public class AdditionalPropertiesClass {
    * Get mapBoolean
    * @return mapBoolean
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Map<String, Boolean> getMapBoolean() {
     return mapBoolean;
@@ -188,7 +188,7 @@ public class AdditionalPropertiesClass {
    * Get mapArrayInteger
    * @return mapArrayInteger
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Map<String, List<Integer>> getMapArrayInteger() {
     return mapArrayInteger;
@@ -215,7 +215,7 @@ public class AdditionalPropertiesClass {
    * Get mapArrayAnytype
    * @return mapArrayAnytype
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Map<String, List<Object>> getMapArrayAnytype() {
     return mapArrayAnytype;
@@ -242,7 +242,7 @@ public class AdditionalPropertiesClass {
    * Get mapMapString
    * @return mapMapString
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Map<String, Map<String, String>> getMapMapString() {
     return mapMapString;
@@ -269,7 +269,7 @@ public class AdditionalPropertiesClass {
    * Get mapMapAnytype
    * @return mapMapAnytype
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Map<String, Map<String, Object>> getMapMapAnytype() {
     return mapMapAnytype;
@@ -288,7 +288,7 @@ public class AdditionalPropertiesClass {
    * Get anytype1
    * @return anytype1
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Object getAnytype1() {
     return anytype1;
@@ -307,7 +307,7 @@ public class AdditionalPropertiesClass {
    * Get anytype2
    * @return anytype2
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Object getAnytype2() {
     return anytype2;
@@ -326,7 +326,7 @@ public class AdditionalPropertiesClass {
    * Get anytype3
    * @return anytype3
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Object getAnytype3() {
     return anytype3;
diff --git a/samples/client/petstore/java/jersey2/src/main/java/org/openapitools/client/model/AdditionalPropertiesInteger.java b/samples/client/petstore/java/jersey2/src/main/java/org/openapitools/client/model/AdditionalPropertiesInteger.java
index 6e5159d404..f27ff011de 100644
--- a/samples/client/petstore/java/jersey2/src/main/java/org/openapitools/client/model/AdditionalPropertiesInteger.java
+++ b/samples/client/petstore/java/jersey2/src/main/java/org/openapitools/client/model/AdditionalPropertiesInteger.java
@@ -40,7 +40,7 @@ public class AdditionalPropertiesInteger extends HashMap<String, Integer> {
    * Get name
    * @return name
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getName() {
     return name;
diff --git a/samples/client/petstore/java/jersey2/src/main/java/org/openapitools/client/model/AdditionalPropertiesNumber.java b/samples/client/petstore/java/jersey2/src/main/java/org/openapitools/client/model/AdditionalPropertiesNumber.java
index ddc8146dea..479696fdce 100644
--- a/samples/client/petstore/java/jersey2/src/main/java/org/openapitools/client/model/AdditionalPropertiesNumber.java
+++ b/samples/client/petstore/java/jersey2/src/main/java/org/openapitools/client/model/AdditionalPropertiesNumber.java
@@ -41,7 +41,7 @@ public class AdditionalPropertiesNumber extends HashMap<String, BigDecimal> {
    * Get name
    * @return name
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getName() {
     return name;
diff --git a/samples/client/petstore/java/jersey2/src/main/java/org/openapitools/client/model/AdditionalPropertiesObject.java b/samples/client/petstore/java/jersey2/src/main/java/org/openapitools/client/model/AdditionalPropertiesObject.java
index cc29400029..bd569b0da3 100644
--- a/samples/client/petstore/java/jersey2/src/main/java/org/openapitools/client/model/AdditionalPropertiesObject.java
+++ b/samples/client/petstore/java/jersey2/src/main/java/org/openapitools/client/model/AdditionalPropertiesObject.java
@@ -40,7 +40,7 @@ public class AdditionalPropertiesObject extends HashMap<String, Map> {
    * Get name
    * @return name
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getName() {
     return name;
diff --git a/samples/client/petstore/java/jersey2/src/main/java/org/openapitools/client/model/AdditionalPropertiesString.java b/samples/client/petstore/java/jersey2/src/main/java/org/openapitools/client/model/AdditionalPropertiesString.java
index fb3368dfed..27e03a2313 100644
--- a/samples/client/petstore/java/jersey2/src/main/java/org/openapitools/client/model/AdditionalPropertiesString.java
+++ b/samples/client/petstore/java/jersey2/src/main/java/org/openapitools/client/model/AdditionalPropertiesString.java
@@ -40,7 +40,7 @@ public class AdditionalPropertiesString extends HashMap<String, String> {
    * Get name
    * @return name
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getName() {
     return name;
diff --git a/samples/client/petstore/java/jersey2/src/main/java/org/openapitools/client/model/Animal.java b/samples/client/petstore/java/jersey2/src/main/java/org/openapitools/client/model/Animal.java
index 53a0eec339..dc16717ac3 100644
--- a/samples/client/petstore/java/jersey2/src/main/java/org/openapitools/client/model/Animal.java
+++ b/samples/client/petstore/java/jersey2/src/main/java/org/openapitools/client/model/Animal.java
@@ -49,7 +49,6 @@ public class Animal {
    * Get className
    * @return className
   **/
-
   @ApiModelProperty(required = true, value = "")
   public String getClassName() {
     return className;
@@ -68,7 +67,7 @@ public class Animal {
    * Get color
    * @return color
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getColor() {
     return color;
diff --git a/samples/client/petstore/java/jersey2/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java b/samples/client/petstore/java/jersey2/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java
index de49df3fbd..b670ecb66e 100644
--- a/samples/client/petstore/java/jersey2/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java
+++ b/samples/client/petstore/java/jersey2/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java
@@ -49,7 +49,7 @@ public class ArrayOfArrayOfNumberOnly {
    * Get arrayArrayNumber
    * @return arrayArrayNumber
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public List<List<BigDecimal>> getArrayArrayNumber() {
     return arrayArrayNumber;
diff --git a/samples/client/petstore/java/jersey2/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java b/samples/client/petstore/java/jersey2/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java
index f4399ff42d..9d6997f88f 100644
--- a/samples/client/petstore/java/jersey2/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java
+++ b/samples/client/petstore/java/jersey2/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java
@@ -49,7 +49,7 @@ public class ArrayOfNumberOnly {
    * Get arrayNumber
    * @return arrayNumber
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public List<BigDecimal> getArrayNumber() {
     return arrayNumber;
diff --git a/samples/client/petstore/java/jersey2/src/main/java/org/openapitools/client/model/ArrayTest.java b/samples/client/petstore/java/jersey2/src/main/java/org/openapitools/client/model/ArrayTest.java
index 7483fa96ce..7dc235f0a9 100644
--- a/samples/client/petstore/java/jersey2/src/main/java/org/openapitools/client/model/ArrayTest.java
+++ b/samples/client/petstore/java/jersey2/src/main/java/org/openapitools/client/model/ArrayTest.java
@@ -55,7 +55,7 @@ public class ArrayTest {
    * Get arrayOfString
    * @return arrayOfString
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public List<String> getArrayOfString() {
     return arrayOfString;
@@ -82,7 +82,7 @@ public class ArrayTest {
    * Get arrayArrayOfInteger
    * @return arrayArrayOfInteger
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public List<List<Long>> getArrayArrayOfInteger() {
     return arrayArrayOfInteger;
@@ -109,7 +109,7 @@ public class ArrayTest {
    * Get arrayArrayOfModel
    * @return arrayArrayOfModel
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public List<List<ReadOnlyFirst>> getArrayArrayOfModel() {
     return arrayArrayOfModel;
diff --git a/samples/client/petstore/java/jersey2/src/main/java/org/openapitools/client/model/Capitalization.java b/samples/client/petstore/java/jersey2/src/main/java/org/openapitools/client/model/Capitalization.java
index bb83be97fe..3f3df29d5d 100644
--- a/samples/client/petstore/java/jersey2/src/main/java/org/openapitools/client/model/Capitalization.java
+++ b/samples/client/petstore/java/jersey2/src/main/java/org/openapitools/client/model/Capitalization.java
@@ -53,7 +53,7 @@ public class Capitalization {
    * Get smallCamel
    * @return smallCamel
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getSmallCamel() {
     return smallCamel;
@@ -72,7 +72,7 @@ public class Capitalization {
    * Get capitalCamel
    * @return capitalCamel
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getCapitalCamel() {
     return capitalCamel;
@@ -91,7 +91,7 @@ public class Capitalization {
    * Get smallSnake
    * @return smallSnake
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getSmallSnake() {
     return smallSnake;
@@ -110,7 +110,7 @@ public class Capitalization {
    * Get capitalSnake
    * @return capitalSnake
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getCapitalSnake() {
     return capitalSnake;
@@ -129,7 +129,7 @@ public class Capitalization {
    * Get scAETHFlowPoints
    * @return scAETHFlowPoints
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getScAETHFlowPoints() {
     return scAETHFlowPoints;
@@ -148,7 +148,7 @@ public class Capitalization {
    * Name of the pet 
    * @return ATT_NAME
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "Name of the pet ")
   public String getATTNAME() {
     return ATT_NAME;
diff --git a/samples/client/petstore/java/jersey2/src/main/java/org/openapitools/client/model/Cat.java b/samples/client/petstore/java/jersey2/src/main/java/org/openapitools/client/model/Cat.java
index ce456c8647..a8108d6f15 100644
--- a/samples/client/petstore/java/jersey2/src/main/java/org/openapitools/client/model/Cat.java
+++ b/samples/client/petstore/java/jersey2/src/main/java/org/openapitools/client/model/Cat.java
@@ -40,7 +40,7 @@ public class Cat extends Animal {
    * Get declawed
    * @return declawed
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Boolean getDeclawed() {
     return declawed;
diff --git a/samples/client/petstore/java/jersey2/src/main/java/org/openapitools/client/model/CatAllOf.java b/samples/client/petstore/java/jersey2/src/main/java/org/openapitools/client/model/CatAllOf.java
index 224c08671c..42e9614610 100644
--- a/samples/client/petstore/java/jersey2/src/main/java/org/openapitools/client/model/CatAllOf.java
+++ b/samples/client/petstore/java/jersey2/src/main/java/org/openapitools/client/model/CatAllOf.java
@@ -38,7 +38,7 @@ public class CatAllOf {
    * Get declawed
    * @return declawed
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Boolean getDeclawed() {
     return declawed;
diff --git a/samples/client/petstore/java/jersey2/src/main/java/org/openapitools/client/model/Category.java b/samples/client/petstore/java/jersey2/src/main/java/org/openapitools/client/model/Category.java
index 03efdd4be8..3eccd2cd92 100644
--- a/samples/client/petstore/java/jersey2/src/main/java/org/openapitools/client/model/Category.java
+++ b/samples/client/petstore/java/jersey2/src/main/java/org/openapitools/client/model/Category.java
@@ -41,7 +41,7 @@ public class Category {
    * Get id
    * @return id
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Long getId() {
     return id;
@@ -60,7 +60,6 @@ public class Category {
    * Get name
    * @return name
   **/
-
   @ApiModelProperty(required = true, value = "")
   public String getName() {
     return name;
diff --git a/samples/client/petstore/java/jersey2/src/main/java/org/openapitools/client/model/ClassModel.java b/samples/client/petstore/java/jersey2/src/main/java/org/openapitools/client/model/ClassModel.java
index def421a670..2aaed27fff 100644
--- a/samples/client/petstore/java/jersey2/src/main/java/org/openapitools/client/model/ClassModel.java
+++ b/samples/client/petstore/java/jersey2/src/main/java/org/openapitools/client/model/ClassModel.java
@@ -39,7 +39,7 @@ public class ClassModel {
    * Get propertyClass
    * @return propertyClass
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getPropertyClass() {
     return propertyClass;
diff --git a/samples/client/petstore/java/jersey2/src/main/java/org/openapitools/client/model/Client.java b/samples/client/petstore/java/jersey2/src/main/java/org/openapitools/client/model/Client.java
index c0bd0743e5..458e812960 100644
--- a/samples/client/petstore/java/jersey2/src/main/java/org/openapitools/client/model/Client.java
+++ b/samples/client/petstore/java/jersey2/src/main/java/org/openapitools/client/model/Client.java
@@ -38,7 +38,7 @@ public class Client {
    * Get client
    * @return client
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getClient() {
     return client;
diff --git a/samples/client/petstore/java/jersey2/src/main/java/org/openapitools/client/model/Dog.java b/samples/client/petstore/java/jersey2/src/main/java/org/openapitools/client/model/Dog.java
index 6b79c59606..83f5cb0e27 100644
--- a/samples/client/petstore/java/jersey2/src/main/java/org/openapitools/client/model/Dog.java
+++ b/samples/client/petstore/java/jersey2/src/main/java/org/openapitools/client/model/Dog.java
@@ -40,7 +40,7 @@ public class Dog extends Animal {
    * Get breed
    * @return breed
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getBreed() {
     return breed;
diff --git a/samples/client/petstore/java/jersey2/src/main/java/org/openapitools/client/model/DogAllOf.java b/samples/client/petstore/java/jersey2/src/main/java/org/openapitools/client/model/DogAllOf.java
index 1a4496d8f0..d1e1402789 100644
--- a/samples/client/petstore/java/jersey2/src/main/java/org/openapitools/client/model/DogAllOf.java
+++ b/samples/client/petstore/java/jersey2/src/main/java/org/openapitools/client/model/DogAllOf.java
@@ -38,7 +38,7 @@ public class DogAllOf {
    * Get breed
    * @return breed
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getBreed() {
     return breed;
diff --git a/samples/client/petstore/java/jersey2/src/main/java/org/openapitools/client/model/EnumArrays.java b/samples/client/petstore/java/jersey2/src/main/java/org/openapitools/client/model/EnumArrays.java
index 40e31bf3ca..368b481f7e 100644
--- a/samples/client/petstore/java/jersey2/src/main/java/org/openapitools/client/model/EnumArrays.java
+++ b/samples/client/petstore/java/jersey2/src/main/java/org/openapitools/client/model/EnumArrays.java
@@ -113,7 +113,7 @@ public class EnumArrays {
    * Get justSymbol
    * @return justSymbol
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public JustSymbolEnum getJustSymbol() {
     return justSymbol;
@@ -140,7 +140,7 @@ public class EnumArrays {
    * Get arrayEnum
    * @return arrayEnum
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public List<ArrayEnumEnum> getArrayEnum() {
     return arrayEnum;
diff --git a/samples/client/petstore/java/jersey2/src/main/java/org/openapitools/client/model/EnumTest.java b/samples/client/petstore/java/jersey2/src/main/java/org/openapitools/client/model/EnumTest.java
index d4b36798ee..b365a8a56f 100644
--- a/samples/client/petstore/java/jersey2/src/main/java/org/openapitools/client/model/EnumTest.java
+++ b/samples/client/petstore/java/jersey2/src/main/java/org/openapitools/client/model/EnumTest.java
@@ -195,7 +195,7 @@ public class EnumTest {
    * Get enumString
    * @return enumString
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public EnumStringEnum getEnumString() {
     return enumString;
@@ -214,7 +214,6 @@ public class EnumTest {
    * Get enumStringRequired
    * @return enumStringRequired
   **/
-
   @ApiModelProperty(required = true, value = "")
   public EnumStringRequiredEnum getEnumStringRequired() {
     return enumStringRequired;
@@ -233,7 +232,7 @@ public class EnumTest {
    * Get enumInteger
    * @return enumInteger
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public EnumIntegerEnum getEnumInteger() {
     return enumInteger;
@@ -252,7 +251,7 @@ public class EnumTest {
    * Get enumNumber
    * @return enumNumber
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public EnumNumberEnum getEnumNumber() {
     return enumNumber;
@@ -271,7 +270,7 @@ public class EnumTest {
    * Get outerEnum
    * @return outerEnum
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public OuterEnum getOuterEnum() {
     return outerEnum;
diff --git a/samples/client/petstore/java/jersey2/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java b/samples/client/petstore/java/jersey2/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java
index bee77a8cec..ca73764280 100644
--- a/samples/client/petstore/java/jersey2/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java
+++ b/samples/client/petstore/java/jersey2/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java
@@ -43,7 +43,7 @@ public class FileSchemaTestClass {
    * Get file
    * @return file
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public java.io.File getFile() {
     return file;
@@ -70,7 +70,7 @@ public class FileSchemaTestClass {
    * Get files
    * @return files
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public List<java.io.File> getFiles() {
     return files;
diff --git a/samples/client/petstore/java/jersey2/src/main/java/org/openapitools/client/model/FormatTest.java b/samples/client/petstore/java/jersey2/src/main/java/org/openapitools/client/model/FormatTest.java
index c017f57a80..00d132529e 100644
--- a/samples/client/petstore/java/jersey2/src/main/java/org/openapitools/client/model/FormatTest.java
+++ b/samples/client/petstore/java/jersey2/src/main/java/org/openapitools/client/model/FormatTest.java
@@ -81,7 +81,7 @@ public class FormatTest {
    * maximum: 100
    * @return integer
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Integer getInteger() {
     return integer;
@@ -102,7 +102,7 @@ public class FormatTest {
    * maximum: 200
    * @return int32
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Integer getInt32() {
     return int32;
@@ -121,7 +121,7 @@ public class FormatTest {
    * Get int64
    * @return int64
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Long getInt64() {
     return int64;
@@ -142,7 +142,6 @@ public class FormatTest {
    * maximum: 543.2
    * @return number
   **/
-
   @ApiModelProperty(required = true, value = "")
   public BigDecimal getNumber() {
     return number;
@@ -163,7 +162,7 @@ public class FormatTest {
    * maximum: 987.6
    * @return _float
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Float getFloat() {
     return _float;
@@ -184,7 +183,7 @@ public class FormatTest {
    * maximum: 123.4
    * @return _double
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Double getDouble() {
     return _double;
@@ -203,7 +202,7 @@ public class FormatTest {
    * Get string
    * @return string
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getString() {
     return string;
@@ -222,7 +221,6 @@ public class FormatTest {
    * Get _byte
    * @return _byte
   **/
-
   @ApiModelProperty(required = true, value = "")
   public byte[] getByte() {
     return _byte;
@@ -241,7 +239,7 @@ public class FormatTest {
    * Get binary
    * @return binary
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public File getBinary() {
     return binary;
@@ -260,7 +258,6 @@ public class FormatTest {
    * Get date
    * @return date
   **/
-
   @ApiModelProperty(required = true, value = "")
   public LocalDate getDate() {
     return date;
@@ -279,7 +276,7 @@ public class FormatTest {
    * Get dateTime
    * @return dateTime
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public OffsetDateTime getDateTime() {
     return dateTime;
@@ -298,7 +295,7 @@ public class FormatTest {
    * Get uuid
    * @return uuid
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(example = "72f98069-206d-4f12-9f12-3d1e525a8e84", value = "")
   public UUID getUuid() {
     return uuid;
@@ -317,7 +314,6 @@ public class FormatTest {
    * Get password
    * @return password
   **/
-
   @ApiModelProperty(required = true, value = "")
   public String getPassword() {
     return password;
diff --git a/samples/client/petstore/java/jersey2/src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java b/samples/client/petstore/java/jersey2/src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java
index 44159e08e8..e9453bb6cc 100644
--- a/samples/client/petstore/java/jersey2/src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java
+++ b/samples/client/petstore/java/jersey2/src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java
@@ -36,7 +36,7 @@ public class HasOnlyReadOnly {
    * Get bar
    * @return bar
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getBar() {
     return bar;
@@ -46,7 +46,7 @@ public class HasOnlyReadOnly {
    * Get foo
    * @return foo
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getFoo() {
     return foo;
diff --git a/samples/client/petstore/java/jersey2/src/main/java/org/openapitools/client/model/MapTest.java b/samples/client/petstore/java/jersey2/src/main/java/org/openapitools/client/model/MapTest.java
index a7a141bb9b..44cd694057 100644
--- a/samples/client/petstore/java/jersey2/src/main/java/org/openapitools/client/model/MapTest.java
+++ b/samples/client/petstore/java/jersey2/src/main/java/org/openapitools/client/model/MapTest.java
@@ -93,7 +93,7 @@ public class MapTest {
    * Get mapMapOfString
    * @return mapMapOfString
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Map<String, Map<String, String>> getMapMapOfString() {
     return mapMapOfString;
@@ -120,7 +120,7 @@ public class MapTest {
    * Get mapOfEnumString
    * @return mapOfEnumString
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Map<String, InnerEnum> getMapOfEnumString() {
     return mapOfEnumString;
@@ -147,7 +147,7 @@ public class MapTest {
    * Get directMap
    * @return directMap
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Map<String, Boolean> getDirectMap() {
     return directMap;
@@ -174,7 +174,7 @@ public class MapTest {
    * Get indirectMap
    * @return indirectMap
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Map<String, Boolean> getIndirectMap() {
     return indirectMap;
diff --git a/samples/client/petstore/java/jersey2/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/client/petstore/java/jersey2/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java
index ea930e3e2e..19d808093c 100644
--- a/samples/client/petstore/java/jersey2/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java
+++ b/samples/client/petstore/java/jersey2/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java
@@ -50,7 +50,7 @@ public class MixedPropertiesAndAdditionalPropertiesClass {
    * Get uuid
    * @return uuid
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public UUID getUuid() {
     return uuid;
@@ -69,7 +69,7 @@ public class MixedPropertiesAndAdditionalPropertiesClass {
    * Get dateTime
    * @return dateTime
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public OffsetDateTime getDateTime() {
     return dateTime;
@@ -96,7 +96,7 @@ public class MixedPropertiesAndAdditionalPropertiesClass {
    * Get map
    * @return map
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Map<String, Animal> getMap() {
     return map;
diff --git a/samples/client/petstore/java/jersey2/src/main/java/org/openapitools/client/model/Model200Response.java b/samples/client/petstore/java/jersey2/src/main/java/org/openapitools/client/model/Model200Response.java
index bd3244dd57..39fabeeb6d 100644
--- a/samples/client/petstore/java/jersey2/src/main/java/org/openapitools/client/model/Model200Response.java
+++ b/samples/client/petstore/java/jersey2/src/main/java/org/openapitools/client/model/Model200Response.java
@@ -42,7 +42,7 @@ public class Model200Response {
    * Get name
    * @return name
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Integer getName() {
     return name;
@@ -61,7 +61,7 @@ public class Model200Response {
    * Get propertyClass
    * @return propertyClass
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getPropertyClass() {
     return propertyClass;
diff --git a/samples/client/petstore/java/jersey2/src/main/java/org/openapitools/client/model/ModelApiResponse.java b/samples/client/petstore/java/jersey2/src/main/java/org/openapitools/client/model/ModelApiResponse.java
index ed335cdca1..bb33412951 100644
--- a/samples/client/petstore/java/jersey2/src/main/java/org/openapitools/client/model/ModelApiResponse.java
+++ b/samples/client/petstore/java/jersey2/src/main/java/org/openapitools/client/model/ModelApiResponse.java
@@ -44,7 +44,7 @@ public class ModelApiResponse {
    * Get code
    * @return code
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Integer getCode() {
     return code;
@@ -63,7 +63,7 @@ public class ModelApiResponse {
    * Get type
    * @return type
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getType() {
     return type;
@@ -82,7 +82,7 @@ public class ModelApiResponse {
    * Get message
    * @return message
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getMessage() {
     return message;
diff --git a/samples/client/petstore/java/jersey2/src/main/java/org/openapitools/client/model/ModelReturn.java b/samples/client/petstore/java/jersey2/src/main/java/org/openapitools/client/model/ModelReturn.java
index 04c0bcd33f..9aafb13e04 100644
--- a/samples/client/petstore/java/jersey2/src/main/java/org/openapitools/client/model/ModelReturn.java
+++ b/samples/client/petstore/java/jersey2/src/main/java/org/openapitools/client/model/ModelReturn.java
@@ -39,7 +39,7 @@ public class ModelReturn {
    * Get _return
    * @return _return
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Integer getReturn() {
     return _return;
diff --git a/samples/client/petstore/java/jersey2/src/main/java/org/openapitools/client/model/Name.java b/samples/client/petstore/java/jersey2/src/main/java/org/openapitools/client/model/Name.java
index af27c6e45f..9518276dd6 100644
--- a/samples/client/petstore/java/jersey2/src/main/java/org/openapitools/client/model/Name.java
+++ b/samples/client/petstore/java/jersey2/src/main/java/org/openapitools/client/model/Name.java
@@ -48,7 +48,6 @@ public class Name {
    * Get name
    * @return name
   **/
-
   @ApiModelProperty(required = true, value = "")
   public Integer getName() {
     return name;
@@ -62,7 +61,7 @@ public class Name {
    * Get snakeCase
    * @return snakeCase
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Integer getSnakeCase() {
     return snakeCase;
@@ -77,7 +76,7 @@ public class Name {
    * Get property
    * @return property
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getProperty() {
     return property;
@@ -91,7 +90,7 @@ public class Name {
    * Get _123number
    * @return _123number
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Integer get123number() {
     return _123number;
diff --git a/samples/client/petstore/java/jersey2/src/main/java/org/openapitools/client/model/NumberOnly.java b/samples/client/petstore/java/jersey2/src/main/java/org/openapitools/client/model/NumberOnly.java
index 4e29c814cc..0245e8e210 100644
--- a/samples/client/petstore/java/jersey2/src/main/java/org/openapitools/client/model/NumberOnly.java
+++ b/samples/client/petstore/java/jersey2/src/main/java/org/openapitools/client/model/NumberOnly.java
@@ -39,7 +39,7 @@ public class NumberOnly {
    * Get justNumber
    * @return justNumber
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public BigDecimal getJustNumber() {
     return justNumber;
diff --git a/samples/client/petstore/java/jersey2/src/main/java/org/openapitools/client/model/Order.java b/samples/client/petstore/java/jersey2/src/main/java/org/openapitools/client/model/Order.java
index 9e935d606e..a9e2986a2f 100644
--- a/samples/client/petstore/java/jersey2/src/main/java/org/openapitools/client/model/Order.java
+++ b/samples/client/petstore/java/jersey2/src/main/java/org/openapitools/client/model/Order.java
@@ -91,7 +91,7 @@ public class Order {
    * Get id
    * @return id
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Long getId() {
     return id;
@@ -110,7 +110,7 @@ public class Order {
    * Get petId
    * @return petId
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Long getPetId() {
     return petId;
@@ -129,7 +129,7 @@ public class Order {
    * Get quantity
    * @return quantity
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Integer getQuantity() {
     return quantity;
@@ -148,7 +148,7 @@ public class Order {
    * Get shipDate
    * @return shipDate
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public OffsetDateTime getShipDate() {
     return shipDate;
@@ -167,7 +167,7 @@ public class Order {
    * Order Status
    * @return status
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "Order Status")
   public StatusEnum getStatus() {
     return status;
@@ -186,7 +186,7 @@ public class Order {
    * Get complete
    * @return complete
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Boolean getComplete() {
     return complete;
diff --git a/samples/client/petstore/java/jersey2/src/main/java/org/openapitools/client/model/OuterComposite.java b/samples/client/petstore/java/jersey2/src/main/java/org/openapitools/client/model/OuterComposite.java
index f6515126a8..c8bd99011c 100644
--- a/samples/client/petstore/java/jersey2/src/main/java/org/openapitools/client/model/OuterComposite.java
+++ b/samples/client/petstore/java/jersey2/src/main/java/org/openapitools/client/model/OuterComposite.java
@@ -45,7 +45,7 @@ public class OuterComposite {
    * Get myNumber
    * @return myNumber
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public BigDecimal getMyNumber() {
     return myNumber;
@@ -64,7 +64,7 @@ public class OuterComposite {
    * Get myString
    * @return myString
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getMyString() {
     return myString;
@@ -83,7 +83,7 @@ public class OuterComposite {
    * Get myBoolean
    * @return myBoolean
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Boolean getMyBoolean() {
     return myBoolean;
diff --git a/samples/client/petstore/java/jersey2/src/main/java/org/openapitools/client/model/Pet.java b/samples/client/petstore/java/jersey2/src/main/java/org/openapitools/client/model/Pet.java
index 63e9b4ff5d..a7d92129d7 100644
--- a/samples/client/petstore/java/jersey2/src/main/java/org/openapitools/client/model/Pet.java
+++ b/samples/client/petstore/java/jersey2/src/main/java/org/openapitools/client/model/Pet.java
@@ -94,7 +94,7 @@ public class Pet {
    * Get id
    * @return id
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Long getId() {
     return id;
@@ -113,7 +113,7 @@ public class Pet {
    * Get category
    * @return category
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Category getCategory() {
     return category;
@@ -132,7 +132,6 @@ public class Pet {
    * Get name
    * @return name
   **/
-
   @ApiModelProperty(example = "doggie", required = true, value = "")
   public String getName() {
     return name;
@@ -156,7 +155,6 @@ public class Pet {
    * Get photoUrls
    * @return photoUrls
   **/
-
   @ApiModelProperty(required = true, value = "")
   public List<String> getPhotoUrls() {
     return photoUrls;
@@ -183,7 +181,7 @@ public class Pet {
    * Get tags
    * @return tags
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public List<Tag> getTags() {
     return tags;
@@ -202,7 +200,7 @@ public class Pet {
    * pet status in the store
    * @return status
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "pet status in the store")
   public StatusEnum getStatus() {
     return status;
diff --git a/samples/client/petstore/java/jersey2/src/main/java/org/openapitools/client/model/ReadOnlyFirst.java b/samples/client/petstore/java/jersey2/src/main/java/org/openapitools/client/model/ReadOnlyFirst.java
index a2c9e99699..1379ee09ea 100644
--- a/samples/client/petstore/java/jersey2/src/main/java/org/openapitools/client/model/ReadOnlyFirst.java
+++ b/samples/client/petstore/java/jersey2/src/main/java/org/openapitools/client/model/ReadOnlyFirst.java
@@ -36,7 +36,7 @@ public class ReadOnlyFirst {
    * Get bar
    * @return bar
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getBar() {
     return bar;
@@ -51,7 +51,7 @@ public class ReadOnlyFirst {
    * Get baz
    * @return baz
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getBaz() {
     return baz;
diff --git a/samples/client/petstore/java/jersey2/src/main/java/org/openapitools/client/model/SpecialModelName.java b/samples/client/petstore/java/jersey2/src/main/java/org/openapitools/client/model/SpecialModelName.java
index a5ddb0b638..869771afad 100644
--- a/samples/client/petstore/java/jersey2/src/main/java/org/openapitools/client/model/SpecialModelName.java
+++ b/samples/client/petstore/java/jersey2/src/main/java/org/openapitools/client/model/SpecialModelName.java
@@ -38,7 +38,7 @@ public class SpecialModelName {
    * Get $specialPropertyName
    * @return $specialPropertyName
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Long get$SpecialPropertyName() {
     return $specialPropertyName;
diff --git a/samples/client/petstore/java/jersey2/src/main/java/org/openapitools/client/model/Tag.java b/samples/client/petstore/java/jersey2/src/main/java/org/openapitools/client/model/Tag.java
index 8255ad8298..4bb498aff4 100644
--- a/samples/client/petstore/java/jersey2/src/main/java/org/openapitools/client/model/Tag.java
+++ b/samples/client/petstore/java/jersey2/src/main/java/org/openapitools/client/model/Tag.java
@@ -41,7 +41,7 @@ public class Tag {
    * Get id
    * @return id
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Long getId() {
     return id;
@@ -60,7 +60,7 @@ public class Tag {
    * Get name
    * @return name
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getName() {
     return name;
diff --git a/samples/client/petstore/java/jersey2/src/main/java/org/openapitools/client/model/TypeHolderDefault.java b/samples/client/petstore/java/jersey2/src/main/java/org/openapitools/client/model/TypeHolderDefault.java
index d8c7b3efdd..9d0f5b2fbe 100644
--- a/samples/client/petstore/java/jersey2/src/main/java/org/openapitools/client/model/TypeHolderDefault.java
+++ b/samples/client/petstore/java/jersey2/src/main/java/org/openapitools/client/model/TypeHolderDefault.java
@@ -53,7 +53,6 @@ public class TypeHolderDefault {
    * Get stringItem
    * @return stringItem
   **/
-
   @ApiModelProperty(required = true, value = "")
   public String getStringItem() {
     return stringItem;
@@ -72,7 +71,6 @@ public class TypeHolderDefault {
    * Get numberItem
    * @return numberItem
   **/
-
   @ApiModelProperty(required = true, value = "")
   public BigDecimal getNumberItem() {
     return numberItem;
@@ -91,7 +89,6 @@ public class TypeHolderDefault {
    * Get integerItem
    * @return integerItem
   **/
-
   @ApiModelProperty(required = true, value = "")
   public Integer getIntegerItem() {
     return integerItem;
@@ -110,7 +107,6 @@ public class TypeHolderDefault {
    * Get boolItem
    * @return boolItem
   **/
-
   @ApiModelProperty(required = true, value = "")
   public Boolean getBoolItem() {
     return boolItem;
@@ -134,7 +130,6 @@ public class TypeHolderDefault {
    * Get arrayItem
    * @return arrayItem
   **/
-
   @ApiModelProperty(required = true, value = "")
   public List<Integer> getArrayItem() {
     return arrayItem;
diff --git a/samples/client/petstore/java/jersey2/src/main/java/org/openapitools/client/model/TypeHolderExample.java b/samples/client/petstore/java/jersey2/src/main/java/org/openapitools/client/model/TypeHolderExample.java
index c1d5ea30f8..94d3c57b6f 100644
--- a/samples/client/petstore/java/jersey2/src/main/java/org/openapitools/client/model/TypeHolderExample.java
+++ b/samples/client/petstore/java/jersey2/src/main/java/org/openapitools/client/model/TypeHolderExample.java
@@ -53,7 +53,6 @@ public class TypeHolderExample {
    * Get stringItem
    * @return stringItem
   **/
-
   @ApiModelProperty(example = "what", required = true, value = "")
   public String getStringItem() {
     return stringItem;
@@ -72,7 +71,6 @@ public class TypeHolderExample {
    * Get numberItem
    * @return numberItem
   **/
-
   @ApiModelProperty(example = "1.234", required = true, value = "")
   public BigDecimal getNumberItem() {
     return numberItem;
@@ -91,7 +89,6 @@ public class TypeHolderExample {
    * Get integerItem
    * @return integerItem
   **/
-
   @ApiModelProperty(example = "-2", required = true, value = "")
   public Integer getIntegerItem() {
     return integerItem;
@@ -110,7 +107,6 @@ public class TypeHolderExample {
    * Get boolItem
    * @return boolItem
   **/
-
   @ApiModelProperty(example = "true", required = true, value = "")
   public Boolean getBoolItem() {
     return boolItem;
@@ -134,7 +130,6 @@ public class TypeHolderExample {
    * Get arrayItem
    * @return arrayItem
   **/
-
   @ApiModelProperty(example = "[0, 1, 2, 3]", required = true, value = "")
   public List<Integer> getArrayItem() {
     return arrayItem;
diff --git a/samples/client/petstore/java/jersey2/src/main/java/org/openapitools/client/model/User.java b/samples/client/petstore/java/jersey2/src/main/java/org/openapitools/client/model/User.java
index 6e6c4ac102..73164c3ee2 100644
--- a/samples/client/petstore/java/jersey2/src/main/java/org/openapitools/client/model/User.java
+++ b/samples/client/petstore/java/jersey2/src/main/java/org/openapitools/client/model/User.java
@@ -59,7 +59,7 @@ public class User {
    * Get id
    * @return id
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Long getId() {
     return id;
@@ -78,7 +78,7 @@ public class User {
    * Get username
    * @return username
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getUsername() {
     return username;
@@ -97,7 +97,7 @@ public class User {
    * Get firstName
    * @return firstName
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getFirstName() {
     return firstName;
@@ -116,7 +116,7 @@ public class User {
    * Get lastName
    * @return lastName
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getLastName() {
     return lastName;
@@ -135,7 +135,7 @@ public class User {
    * Get email
    * @return email
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getEmail() {
     return email;
@@ -154,7 +154,7 @@ public class User {
    * Get password
    * @return password
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getPassword() {
     return password;
@@ -173,7 +173,7 @@ public class User {
    * Get phone
    * @return phone
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getPhone() {
     return phone;
@@ -192,7 +192,7 @@ public class User {
    * User Status
    * @return userStatus
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "User Status")
   public Integer getUserStatus() {
     return userStatus;
diff --git a/samples/client/petstore/java/jersey2/src/main/java/org/openapitools/client/model/XmlItem.java b/samples/client/petstore/java/jersey2/src/main/java/org/openapitools/client/model/XmlItem.java
index ce4af3e8b9..9032c23424 100644
--- a/samples/client/petstore/java/jersey2/src/main/java/org/openapitools/client/model/XmlItem.java
+++ b/samples/client/petstore/java/jersey2/src/main/java/org/openapitools/client/model/XmlItem.java
@@ -125,7 +125,7 @@ public class XmlItem {
    * Get attributeString
    * @return attributeString
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(example = "string", value = "")
   public String getAttributeString() {
     return attributeString;
@@ -144,7 +144,7 @@ public class XmlItem {
    * Get attributeNumber
    * @return attributeNumber
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(example = "1.234", value = "")
   public BigDecimal getAttributeNumber() {
     return attributeNumber;
@@ -163,7 +163,7 @@ public class XmlItem {
    * Get attributeInteger
    * @return attributeInteger
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(example = "-2", value = "")
   public Integer getAttributeInteger() {
     return attributeInteger;
@@ -182,7 +182,7 @@ public class XmlItem {
    * Get attributeBoolean
    * @return attributeBoolean
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(example = "true", value = "")
   public Boolean getAttributeBoolean() {
     return attributeBoolean;
@@ -209,7 +209,7 @@ public class XmlItem {
    * Get wrappedArray
    * @return wrappedArray
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public List<Integer> getWrappedArray() {
     return wrappedArray;
@@ -228,7 +228,7 @@ public class XmlItem {
    * Get nameString
    * @return nameString
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(example = "string", value = "")
   public String getNameString() {
     return nameString;
@@ -247,7 +247,7 @@ public class XmlItem {
    * Get nameNumber
    * @return nameNumber
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(example = "1.234", value = "")
   public BigDecimal getNameNumber() {
     return nameNumber;
@@ -266,7 +266,7 @@ public class XmlItem {
    * Get nameInteger
    * @return nameInteger
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(example = "-2", value = "")
   public Integer getNameInteger() {
     return nameInteger;
@@ -285,7 +285,7 @@ public class XmlItem {
    * Get nameBoolean
    * @return nameBoolean
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(example = "true", value = "")
   public Boolean getNameBoolean() {
     return nameBoolean;
@@ -312,7 +312,7 @@ public class XmlItem {
    * Get nameArray
    * @return nameArray
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public List<Integer> getNameArray() {
     return nameArray;
@@ -339,7 +339,7 @@ public class XmlItem {
    * Get nameWrappedArray
    * @return nameWrappedArray
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public List<Integer> getNameWrappedArray() {
     return nameWrappedArray;
@@ -358,7 +358,7 @@ public class XmlItem {
    * Get prefixString
    * @return prefixString
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(example = "string", value = "")
   public String getPrefixString() {
     return prefixString;
@@ -377,7 +377,7 @@ public class XmlItem {
    * Get prefixNumber
    * @return prefixNumber
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(example = "1.234", value = "")
   public BigDecimal getPrefixNumber() {
     return prefixNumber;
@@ -396,7 +396,7 @@ public class XmlItem {
    * Get prefixInteger
    * @return prefixInteger
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(example = "-2", value = "")
   public Integer getPrefixInteger() {
     return prefixInteger;
@@ -415,7 +415,7 @@ public class XmlItem {
    * Get prefixBoolean
    * @return prefixBoolean
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(example = "true", value = "")
   public Boolean getPrefixBoolean() {
     return prefixBoolean;
@@ -442,7 +442,7 @@ public class XmlItem {
    * Get prefixArray
    * @return prefixArray
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public List<Integer> getPrefixArray() {
     return prefixArray;
@@ -469,7 +469,7 @@ public class XmlItem {
    * Get prefixWrappedArray
    * @return prefixWrappedArray
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public List<Integer> getPrefixWrappedArray() {
     return prefixWrappedArray;
@@ -488,7 +488,7 @@ public class XmlItem {
    * Get namespaceString
    * @return namespaceString
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(example = "string", value = "")
   public String getNamespaceString() {
     return namespaceString;
@@ -507,7 +507,7 @@ public class XmlItem {
    * Get namespaceNumber
    * @return namespaceNumber
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(example = "1.234", value = "")
   public BigDecimal getNamespaceNumber() {
     return namespaceNumber;
@@ -526,7 +526,7 @@ public class XmlItem {
    * Get namespaceInteger
    * @return namespaceInteger
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(example = "-2", value = "")
   public Integer getNamespaceInteger() {
     return namespaceInteger;
@@ -545,7 +545,7 @@ public class XmlItem {
    * Get namespaceBoolean
    * @return namespaceBoolean
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(example = "true", value = "")
   public Boolean getNamespaceBoolean() {
     return namespaceBoolean;
@@ -572,7 +572,7 @@ public class XmlItem {
    * Get namespaceArray
    * @return namespaceArray
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public List<Integer> getNamespaceArray() {
     return namespaceArray;
@@ -599,7 +599,7 @@ public class XmlItem {
    * Get namespaceWrappedArray
    * @return namespaceWrappedArray
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public List<Integer> getNamespaceWrappedArray() {
     return namespaceWrappedArray;
@@ -618,7 +618,7 @@ public class XmlItem {
    * Get prefixNsString
    * @return prefixNsString
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(example = "string", value = "")
   public String getPrefixNsString() {
     return prefixNsString;
@@ -637,7 +637,7 @@ public class XmlItem {
    * Get prefixNsNumber
    * @return prefixNsNumber
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(example = "1.234", value = "")
   public BigDecimal getPrefixNsNumber() {
     return prefixNsNumber;
@@ -656,7 +656,7 @@ public class XmlItem {
    * Get prefixNsInteger
    * @return prefixNsInteger
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(example = "-2", value = "")
   public Integer getPrefixNsInteger() {
     return prefixNsInteger;
@@ -675,7 +675,7 @@ public class XmlItem {
    * Get prefixNsBoolean
    * @return prefixNsBoolean
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(example = "true", value = "")
   public Boolean getPrefixNsBoolean() {
     return prefixNsBoolean;
@@ -702,7 +702,7 @@ public class XmlItem {
    * Get prefixNsArray
    * @return prefixNsArray
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public List<Integer> getPrefixNsArray() {
     return prefixNsArray;
@@ -729,7 +729,7 @@ public class XmlItem {
    * Get prefixNsWrappedArray
    * @return prefixNsWrappedArray
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public List<Integer> getPrefixNsWrappedArray() {
     return prefixNsWrappedArray;
diff --git a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/AdditionalPropertiesAnyType.java b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/AdditionalPropertiesAnyType.java
index 952e43c3b4..acb8a5e772 100644
--- a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/AdditionalPropertiesAnyType.java
+++ b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/AdditionalPropertiesAnyType.java
@@ -49,7 +49,7 @@ public class AdditionalPropertiesAnyType extends HashMap<String, Object> impleme
    * Get name
    * @return name
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getName() {
     return name;
diff --git a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/AdditionalPropertiesArray.java b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/AdditionalPropertiesArray.java
index fcb9a8b7b6..ebc9abb8dd 100644
--- a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/AdditionalPropertiesArray.java
+++ b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/AdditionalPropertiesArray.java
@@ -50,7 +50,7 @@ public class AdditionalPropertiesArray extends HashMap<String, List> implements
    * Get name
    * @return name
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getName() {
     return name;
diff --git a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/AdditionalPropertiesBoolean.java b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/AdditionalPropertiesBoolean.java
index 08bd0adcf1..4cc350ca10 100644
--- a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/AdditionalPropertiesBoolean.java
+++ b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/AdditionalPropertiesBoolean.java
@@ -49,7 +49,7 @@ public class AdditionalPropertiesBoolean extends HashMap<String, Boolean> implem
    * Get name
    * @return name
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getName() {
     return name;
diff --git a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java
index affc9e2c1a..23a7b49f01 100644
--- a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java
+++ b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java
@@ -98,7 +98,7 @@ public class AdditionalPropertiesClass implements Parcelable {
    * Get mapString
    * @return mapString
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Map<String, String> getMapString() {
     return mapString;
@@ -125,7 +125,7 @@ public class AdditionalPropertiesClass implements Parcelable {
    * Get mapNumber
    * @return mapNumber
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Map<String, BigDecimal> getMapNumber() {
     return mapNumber;
@@ -152,7 +152,7 @@ public class AdditionalPropertiesClass implements Parcelable {
    * Get mapInteger
    * @return mapInteger
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Map<String, Integer> getMapInteger() {
     return mapInteger;
@@ -179,7 +179,7 @@ public class AdditionalPropertiesClass implements Parcelable {
    * Get mapBoolean
    * @return mapBoolean
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Map<String, Boolean> getMapBoolean() {
     return mapBoolean;
@@ -206,7 +206,7 @@ public class AdditionalPropertiesClass implements Parcelable {
    * Get mapArrayInteger
    * @return mapArrayInteger
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Map<String, List<Integer>> getMapArrayInteger() {
     return mapArrayInteger;
@@ -233,7 +233,7 @@ public class AdditionalPropertiesClass implements Parcelable {
    * Get mapArrayAnytype
    * @return mapArrayAnytype
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Map<String, List<Object>> getMapArrayAnytype() {
     return mapArrayAnytype;
@@ -260,7 +260,7 @@ public class AdditionalPropertiesClass implements Parcelable {
    * Get mapMapString
    * @return mapMapString
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Map<String, Map<String, String>> getMapMapString() {
     return mapMapString;
@@ -287,7 +287,7 @@ public class AdditionalPropertiesClass implements Parcelable {
    * Get mapMapAnytype
    * @return mapMapAnytype
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Map<String, Map<String, Object>> getMapMapAnytype() {
     return mapMapAnytype;
@@ -306,7 +306,7 @@ public class AdditionalPropertiesClass implements Parcelable {
    * Get anytype1
    * @return anytype1
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Object getAnytype1() {
     return anytype1;
@@ -325,7 +325,7 @@ public class AdditionalPropertiesClass implements Parcelable {
    * Get anytype2
    * @return anytype2
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Object getAnytype2() {
     return anytype2;
@@ -344,7 +344,7 @@ public class AdditionalPropertiesClass implements Parcelable {
    * Get anytype3
    * @return anytype3
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Object getAnytype3() {
     return anytype3;
diff --git a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/AdditionalPropertiesInteger.java b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/AdditionalPropertiesInteger.java
index ba0e3c55c0..77d1242378 100644
--- a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/AdditionalPropertiesInteger.java
+++ b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/AdditionalPropertiesInteger.java
@@ -49,7 +49,7 @@ public class AdditionalPropertiesInteger extends HashMap<String, Integer> implem
    * Get name
    * @return name
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getName() {
     return name;
diff --git a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/AdditionalPropertiesNumber.java b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/AdditionalPropertiesNumber.java
index 6e0da4f662..7e0d226868 100644
--- a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/AdditionalPropertiesNumber.java
+++ b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/AdditionalPropertiesNumber.java
@@ -50,7 +50,7 @@ public class AdditionalPropertiesNumber extends HashMap<String, BigDecimal> impl
    * Get name
    * @return name
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getName() {
     return name;
diff --git a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/AdditionalPropertiesObject.java b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/AdditionalPropertiesObject.java
index 5321ee5f30..5d7aa7a622 100644
--- a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/AdditionalPropertiesObject.java
+++ b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/AdditionalPropertiesObject.java
@@ -49,7 +49,7 @@ public class AdditionalPropertiesObject extends HashMap<String, Map> implements
    * Get name
    * @return name
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getName() {
     return name;
diff --git a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/AdditionalPropertiesString.java b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/AdditionalPropertiesString.java
index f044148baf..7182f82197 100644
--- a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/AdditionalPropertiesString.java
+++ b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/AdditionalPropertiesString.java
@@ -49,7 +49,7 @@ public class AdditionalPropertiesString extends HashMap<String, String> implemen
    * Get name
    * @return name
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getName() {
     return name;
diff --git a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/Animal.java b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/Animal.java
index 90fabbb107..dce6c2969a 100644
--- a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/Animal.java
+++ b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/Animal.java
@@ -52,7 +52,6 @@ public class Animal implements Parcelable {
    * Get className
    * @return className
   **/
-
   @ApiModelProperty(required = true, value = "")
   public String getClassName() {
     return className;
@@ -71,7 +70,7 @@ public class Animal implements Parcelable {
    * Get color
    * @return color
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getColor() {
     return color;
diff --git a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java
index 026761eec6..cb59454209 100644
--- a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java
+++ b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java
@@ -57,7 +57,7 @@ public class ArrayOfArrayOfNumberOnly implements Parcelable {
    * Get arrayArrayNumber
    * @return arrayArrayNumber
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public List<List<BigDecimal>> getArrayArrayNumber() {
     return arrayArrayNumber;
diff --git a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java
index 3f9f9ea40c..4d55320e11 100644
--- a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java
+++ b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java
@@ -57,7 +57,7 @@ public class ArrayOfNumberOnly implements Parcelable {
    * Get arrayNumber
    * @return arrayNumber
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public List<BigDecimal> getArrayNumber() {
     return arrayNumber;
diff --git a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/ArrayTest.java b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/ArrayTest.java
index 91b99633fd..df2d89a618 100644
--- a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/ArrayTest.java
+++ b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/ArrayTest.java
@@ -65,7 +65,7 @@ public class ArrayTest implements Parcelable {
    * Get arrayOfString
    * @return arrayOfString
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public List<String> getArrayOfString() {
     return arrayOfString;
@@ -92,7 +92,7 @@ public class ArrayTest implements Parcelable {
    * Get arrayArrayOfInteger
    * @return arrayArrayOfInteger
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public List<List<Long>> getArrayArrayOfInteger() {
     return arrayArrayOfInteger;
@@ -119,7 +119,7 @@ public class ArrayTest implements Parcelable {
    * Get arrayArrayOfModel
    * @return arrayArrayOfModel
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public List<List<ReadOnlyFirst>> getArrayArrayOfModel() {
     return arrayArrayOfModel;
diff --git a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/Capitalization.java b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/Capitalization.java
index 7c85088f6c..21955e67b7 100644
--- a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/Capitalization.java
+++ b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/Capitalization.java
@@ -66,7 +66,7 @@ public class Capitalization implements Parcelable {
    * Get smallCamel
    * @return smallCamel
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getSmallCamel() {
     return smallCamel;
@@ -85,7 +85,7 @@ public class Capitalization implements Parcelable {
    * Get capitalCamel
    * @return capitalCamel
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getCapitalCamel() {
     return capitalCamel;
@@ -104,7 +104,7 @@ public class Capitalization implements Parcelable {
    * Get smallSnake
    * @return smallSnake
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getSmallSnake() {
     return smallSnake;
@@ -123,7 +123,7 @@ public class Capitalization implements Parcelable {
    * Get capitalSnake
    * @return capitalSnake
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getCapitalSnake() {
     return capitalSnake;
@@ -142,7 +142,7 @@ public class Capitalization implements Parcelable {
    * Get scAETHFlowPoints
    * @return scAETHFlowPoints
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getScAETHFlowPoints() {
     return scAETHFlowPoints;
@@ -161,7 +161,7 @@ public class Capitalization implements Parcelable {
    * Name of the pet 
    * @return ATT_NAME
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "Name of the pet ")
   public String getATTNAME() {
     return ATT_NAME;
diff --git a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/Cat.java b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/Cat.java
index dcb1df4846..5738b17e66 100644
--- a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/Cat.java
+++ b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/Cat.java
@@ -49,7 +49,7 @@ public class Cat extends Animal implements Parcelable {
    * Get declawed
    * @return declawed
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Boolean getDeclawed() {
     return declawed;
diff --git a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/CatAllOf.java b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/CatAllOf.java
index eb92c2ad1a..1d09feb3e7 100644
--- a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/CatAllOf.java
+++ b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/CatAllOf.java
@@ -46,7 +46,7 @@ public class CatAllOf implements Parcelable {
    * Get declawed
    * @return declawed
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Boolean getDeclawed() {
     return declawed;
diff --git a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/Category.java b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/Category.java
index 66b4c8b3f6..8dedfbedc1 100644
--- a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/Category.java
+++ b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/Category.java
@@ -50,7 +50,7 @@ public class Category implements Parcelable {
    * Get id
    * @return id
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Long getId() {
     return id;
@@ -69,7 +69,6 @@ public class Category implements Parcelable {
    * Get name
    * @return name
   **/
-
   @ApiModelProperty(required = true, value = "")
   public String getName() {
     return name;
diff --git a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/ClassModel.java b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/ClassModel.java
index 028d713c96..cbf4ea5ff1 100644
--- a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/ClassModel.java
+++ b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/ClassModel.java
@@ -47,7 +47,7 @@ public class ClassModel implements Parcelable {
    * Get propertyClass
    * @return propertyClass
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getPropertyClass() {
     return propertyClass;
diff --git a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/Client.java b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/Client.java
index ce5cf8deee..f2dfb2900d 100644
--- a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/Client.java
+++ b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/Client.java
@@ -46,7 +46,7 @@ public class Client implements Parcelable {
    * Get client
    * @return client
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getClient() {
     return client;
diff --git a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/Dog.java b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/Dog.java
index 934c359ee9..3f89f33448 100644
--- a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/Dog.java
+++ b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/Dog.java
@@ -49,7 +49,7 @@ public class Dog extends Animal implements Parcelable {
    * Get breed
    * @return breed
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getBreed() {
     return breed;
diff --git a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/DogAllOf.java b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/DogAllOf.java
index 714ecb307b..9f3e4e0856 100644
--- a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/DogAllOf.java
+++ b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/DogAllOf.java
@@ -46,7 +46,7 @@ public class DogAllOf implements Parcelable {
    * Get breed
    * @return breed
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getBreed() {
     return breed;
diff --git a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/EnumArrays.java b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/EnumArrays.java
index 6984f387df..11a6fed587 100644
--- a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/EnumArrays.java
+++ b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/EnumArrays.java
@@ -146,7 +146,7 @@ public class EnumArrays implements Parcelable {
    * Get justSymbol
    * @return justSymbol
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public JustSymbolEnum getJustSymbol() {
     return justSymbol;
@@ -173,7 +173,7 @@ public class EnumArrays implements Parcelable {
    * Get arrayEnum
    * @return arrayEnum
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public List<ArrayEnumEnum> getArrayEnum() {
     return arrayEnum;
diff --git a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/EnumTest.java b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/EnumTest.java
index 42d3a54b5b..7c67dd8229 100644
--- a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/EnumTest.java
+++ b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/EnumTest.java
@@ -255,7 +255,7 @@ public class EnumTest implements Parcelable {
    * Get enumString
    * @return enumString
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public EnumStringEnum getEnumString() {
     return enumString;
@@ -274,7 +274,6 @@ public class EnumTest implements Parcelable {
    * Get enumStringRequired
    * @return enumStringRequired
   **/
-
   @ApiModelProperty(required = true, value = "")
   public EnumStringRequiredEnum getEnumStringRequired() {
     return enumStringRequired;
@@ -293,7 +292,7 @@ public class EnumTest implements Parcelable {
    * Get enumInteger
    * @return enumInteger
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public EnumIntegerEnum getEnumInteger() {
     return enumInteger;
@@ -312,7 +311,7 @@ public class EnumTest implements Parcelable {
    * Get enumNumber
    * @return enumNumber
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public EnumNumberEnum getEnumNumber() {
     return enumNumber;
@@ -331,7 +330,7 @@ public class EnumTest implements Parcelable {
    * Get outerEnum
    * @return outerEnum
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public OuterEnum getOuterEnum() {
     return outerEnum;
diff --git a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java
index d3992e5424..b5f0ce559c 100644
--- a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java
+++ b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java
@@ -52,7 +52,7 @@ public class FileSchemaTestClass implements Parcelable {
    * Get file
    * @return file
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public java.io.File getFile() {
     return file;
@@ -79,7 +79,7 @@ public class FileSchemaTestClass implements Parcelable {
    * Get files
    * @return files
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public List<java.io.File> getFiles() {
     return files;
diff --git a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/FormatTest.java b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/FormatTest.java
index a16260f07c..1f8cd0e08d 100644
--- a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/FormatTest.java
+++ b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/FormatTest.java
@@ -101,7 +101,7 @@ public class FormatTest implements Parcelable {
    * maximum: 100
    * @return integer
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Integer getInteger() {
     return integer;
@@ -122,7 +122,7 @@ public class FormatTest implements Parcelable {
    * maximum: 200
    * @return int32
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Integer getInt32() {
     return int32;
@@ -141,7 +141,7 @@ public class FormatTest implements Parcelable {
    * Get int64
    * @return int64
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Long getInt64() {
     return int64;
@@ -162,7 +162,6 @@ public class FormatTest implements Parcelable {
    * maximum: 543.2
    * @return number
   **/
-
   @ApiModelProperty(required = true, value = "")
   public BigDecimal getNumber() {
     return number;
@@ -183,7 +182,7 @@ public class FormatTest implements Parcelable {
    * maximum: 987.6
    * @return _float
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Float getFloat() {
     return _float;
@@ -204,7 +203,7 @@ public class FormatTest implements Parcelable {
    * maximum: 123.4
    * @return _double
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Double getDouble() {
     return _double;
@@ -223,7 +222,7 @@ public class FormatTest implements Parcelable {
    * Get string
    * @return string
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getString() {
     return string;
@@ -242,7 +241,6 @@ public class FormatTest implements Parcelable {
    * Get _byte
    * @return _byte
   **/
-
   @ApiModelProperty(required = true, value = "")
   public byte[] getByte() {
     return _byte;
@@ -261,7 +259,7 @@ public class FormatTest implements Parcelable {
    * Get binary
    * @return binary
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public File getBinary() {
     return binary;
@@ -280,7 +278,6 @@ public class FormatTest implements Parcelable {
    * Get date
    * @return date
   **/
-
   @ApiModelProperty(required = true, value = "")
   public LocalDate getDate() {
     return date;
@@ -299,7 +296,7 @@ public class FormatTest implements Parcelable {
    * Get dateTime
    * @return dateTime
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public OffsetDateTime getDateTime() {
     return dateTime;
@@ -318,7 +315,7 @@ public class FormatTest implements Parcelable {
    * Get uuid
    * @return uuid
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(example = "72f98069-206d-4f12-9f12-3d1e525a8e84", value = "")
   public UUID getUuid() {
     return uuid;
@@ -337,7 +334,6 @@ public class FormatTest implements Parcelable {
    * Get password
    * @return password
   **/
-
   @ApiModelProperty(required = true, value = "")
   public String getPassword() {
     return password;
diff --git a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java
index 021055bb59..14c218af7e 100644
--- a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java
+++ b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java
@@ -45,7 +45,7 @@ public class HasOnlyReadOnly implements Parcelable {
    * Get bar
    * @return bar
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getBar() {
     return bar;
@@ -55,7 +55,7 @@ public class HasOnlyReadOnly implements Parcelable {
    * Get foo
    * @return foo
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getFoo() {
     return foo;
diff --git a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/MapTest.java b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/MapTest.java
index 9796dcbdb1..09f608dc19 100644
--- a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/MapTest.java
+++ b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/MapTest.java
@@ -116,7 +116,7 @@ public class MapTest implements Parcelable {
    * Get mapMapOfString
    * @return mapMapOfString
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Map<String, Map<String, String>> getMapMapOfString() {
     return mapMapOfString;
@@ -143,7 +143,7 @@ public class MapTest implements Parcelable {
    * Get mapOfEnumString
    * @return mapOfEnumString
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Map<String, InnerEnum> getMapOfEnumString() {
     return mapOfEnumString;
@@ -170,7 +170,7 @@ public class MapTest implements Parcelable {
    * Get directMap
    * @return directMap
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Map<String, Boolean> getDirectMap() {
     return directMap;
@@ -197,7 +197,7 @@ public class MapTest implements Parcelable {
    * Get indirectMap
    * @return indirectMap
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Map<String, Boolean> getIndirectMap() {
     return indirectMap;
diff --git a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java
index 4df2bf6539..abae7222e2 100644
--- a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java
+++ b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java
@@ -60,7 +60,7 @@ public class MixedPropertiesAndAdditionalPropertiesClass implements Parcelable {
    * Get uuid
    * @return uuid
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public UUID getUuid() {
     return uuid;
@@ -79,7 +79,7 @@ public class MixedPropertiesAndAdditionalPropertiesClass implements Parcelable {
    * Get dateTime
    * @return dateTime
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public OffsetDateTime getDateTime() {
     return dateTime;
@@ -106,7 +106,7 @@ public class MixedPropertiesAndAdditionalPropertiesClass implements Parcelable {
    * Get map
    * @return map
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Map<String, Animal> getMap() {
     return map;
diff --git a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/Model200Response.java b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/Model200Response.java
index 6aaf741507..c98ab531f0 100644
--- a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/Model200Response.java
+++ b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/Model200Response.java
@@ -51,7 +51,7 @@ public class Model200Response implements Parcelable {
    * Get name
    * @return name
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Integer getName() {
     return name;
@@ -70,7 +70,7 @@ public class Model200Response implements Parcelable {
    * Get propertyClass
    * @return propertyClass
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getPropertyClass() {
     return propertyClass;
diff --git a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/ModelApiResponse.java b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/ModelApiResponse.java
index 3bcfa5c703..166efa5ccd 100644
--- a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/ModelApiResponse.java
+++ b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/ModelApiResponse.java
@@ -54,7 +54,7 @@ public class ModelApiResponse implements Parcelable {
    * Get code
    * @return code
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Integer getCode() {
     return code;
@@ -73,7 +73,7 @@ public class ModelApiResponse implements Parcelable {
    * Get type
    * @return type
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getType() {
     return type;
@@ -92,7 +92,7 @@ public class ModelApiResponse implements Parcelable {
    * Get message
    * @return message
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getMessage() {
     return message;
diff --git a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/ModelReturn.java b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/ModelReturn.java
index b58da7220f..d475b48700 100644
--- a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/ModelReturn.java
+++ b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/ModelReturn.java
@@ -47,7 +47,7 @@ public class ModelReturn implements Parcelable {
    * Get _return
    * @return _return
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Integer getReturn() {
     return _return;
diff --git a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/Name.java b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/Name.java
index 6231fae2c4..adb0ada7b1 100644
--- a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/Name.java
+++ b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/Name.java
@@ -59,7 +59,6 @@ public class Name implements Parcelable {
    * Get name
    * @return name
   **/
-
   @ApiModelProperty(required = true, value = "")
   public Integer getName() {
     return name;
@@ -73,7 +72,7 @@ public class Name implements Parcelable {
    * Get snakeCase
    * @return snakeCase
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Integer getSnakeCase() {
     return snakeCase;
@@ -88,7 +87,7 @@ public class Name implements Parcelable {
    * Get property
    * @return property
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getProperty() {
     return property;
@@ -102,7 +101,7 @@ public class Name implements Parcelable {
    * Get _123number
    * @return _123number
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Integer get123number() {
     return _123number;
diff --git a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/NumberOnly.java b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/NumberOnly.java
index 2f89147e01..d9c9588870 100644
--- a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/NumberOnly.java
+++ b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/NumberOnly.java
@@ -47,7 +47,7 @@ public class NumberOnly implements Parcelable {
    * Get justNumber
    * @return justNumber
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public BigDecimal getJustNumber() {
     return justNumber;
diff --git a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/Order.java b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/Order.java
index 42a0bae7e7..27f8928228 100644
--- a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/Order.java
+++ b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/Order.java
@@ -116,7 +116,7 @@ public class Order implements Parcelable {
    * Get id
    * @return id
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Long getId() {
     return id;
@@ -135,7 +135,7 @@ public class Order implements Parcelable {
    * Get petId
    * @return petId
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Long getPetId() {
     return petId;
@@ -154,7 +154,7 @@ public class Order implements Parcelable {
    * Get quantity
    * @return quantity
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Integer getQuantity() {
     return quantity;
@@ -173,7 +173,7 @@ public class Order implements Parcelable {
    * Get shipDate
    * @return shipDate
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public OffsetDateTime getShipDate() {
     return shipDate;
@@ -192,7 +192,7 @@ public class Order implements Parcelable {
    * Order Status
    * @return status
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "Order Status")
   public StatusEnum getStatus() {
     return status;
@@ -211,7 +211,7 @@ public class Order implements Parcelable {
    * Get complete
    * @return complete
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Boolean getComplete() {
     return complete;
diff --git a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/OuterComposite.java b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/OuterComposite.java
index 6aff10110b..171ee7a93d 100644
--- a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/OuterComposite.java
+++ b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/OuterComposite.java
@@ -55,7 +55,7 @@ public class OuterComposite implements Parcelable {
    * Get myNumber
    * @return myNumber
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public BigDecimal getMyNumber() {
     return myNumber;
@@ -74,7 +74,7 @@ public class OuterComposite implements Parcelable {
    * Get myString
    * @return myString
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getMyString() {
     return myString;
@@ -93,7 +93,7 @@ public class OuterComposite implements Parcelable {
    * Get myBoolean
    * @return myBoolean
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Boolean getMyBoolean() {
     return myBoolean;
diff --git a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/Pet.java b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/Pet.java
index dd736e58d3..73ab81f800 100644
--- a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/Pet.java
+++ b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/Pet.java
@@ -119,7 +119,7 @@ public class Pet implements Parcelable {
    * Get id
    * @return id
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Long getId() {
     return id;
@@ -138,7 +138,7 @@ public class Pet implements Parcelable {
    * Get category
    * @return category
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Category getCategory() {
     return category;
@@ -157,7 +157,6 @@ public class Pet implements Parcelable {
    * Get name
    * @return name
   **/
-
   @ApiModelProperty(example = "doggie", required = true, value = "")
   public String getName() {
     return name;
@@ -181,7 +180,6 @@ public class Pet implements Parcelable {
    * Get photoUrls
    * @return photoUrls
   **/
-
   @ApiModelProperty(required = true, value = "")
   public List<String> getPhotoUrls() {
     return photoUrls;
@@ -208,7 +206,7 @@ public class Pet implements Parcelable {
    * Get tags
    * @return tags
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public List<Tag> getTags() {
     return tags;
@@ -227,7 +225,7 @@ public class Pet implements Parcelable {
    * pet status in the store
    * @return status
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "pet status in the store")
   public StatusEnum getStatus() {
     return status;
diff --git a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/ReadOnlyFirst.java b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/ReadOnlyFirst.java
index 3a590451f0..824c0c728c 100644
--- a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/ReadOnlyFirst.java
+++ b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/ReadOnlyFirst.java
@@ -45,7 +45,7 @@ public class ReadOnlyFirst implements Parcelable {
    * Get bar
    * @return bar
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getBar() {
     return bar;
@@ -60,7 +60,7 @@ public class ReadOnlyFirst implements Parcelable {
    * Get baz
    * @return baz
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getBaz() {
     return baz;
diff --git a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/SpecialModelName.java b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/SpecialModelName.java
index 569679be73..d2eadd0140 100644
--- a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/SpecialModelName.java
+++ b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/SpecialModelName.java
@@ -46,7 +46,7 @@ public class SpecialModelName implements Parcelable {
    * Get $specialPropertyName
    * @return $specialPropertyName
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Long get$SpecialPropertyName() {
     return $specialPropertyName;
diff --git a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/Tag.java b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/Tag.java
index 1d23f3ff18..1e75240cde 100644
--- a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/Tag.java
+++ b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/Tag.java
@@ -50,7 +50,7 @@ public class Tag implements Parcelable {
    * Get id
    * @return id
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Long getId() {
     return id;
@@ -69,7 +69,7 @@ public class Tag implements Parcelable {
    * Get name
    * @return name
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getName() {
     return name;
diff --git a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/TypeHolderDefault.java b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/TypeHolderDefault.java
index 1a42510215..8cb0ab9868 100644
--- a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/TypeHolderDefault.java
+++ b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/TypeHolderDefault.java
@@ -65,7 +65,6 @@ public class TypeHolderDefault implements Parcelable {
    * Get stringItem
    * @return stringItem
   **/
-
   @ApiModelProperty(required = true, value = "")
   public String getStringItem() {
     return stringItem;
@@ -84,7 +83,6 @@ public class TypeHolderDefault implements Parcelable {
    * Get numberItem
    * @return numberItem
   **/
-
   @ApiModelProperty(required = true, value = "")
   public BigDecimal getNumberItem() {
     return numberItem;
@@ -103,7 +101,6 @@ public class TypeHolderDefault implements Parcelable {
    * Get integerItem
    * @return integerItem
   **/
-
   @ApiModelProperty(required = true, value = "")
   public Integer getIntegerItem() {
     return integerItem;
@@ -122,7 +119,6 @@ public class TypeHolderDefault implements Parcelable {
    * Get boolItem
    * @return boolItem
   **/
-
   @ApiModelProperty(required = true, value = "")
   public Boolean getBoolItem() {
     return boolItem;
@@ -146,7 +142,6 @@ public class TypeHolderDefault implements Parcelable {
    * Get arrayItem
    * @return arrayItem
   **/
-
   @ApiModelProperty(required = true, value = "")
   public List<Integer> getArrayItem() {
     return arrayItem;
diff --git a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/TypeHolderExample.java b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/TypeHolderExample.java
index 8c9cbe0679..4945a5b35a 100644
--- a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/TypeHolderExample.java
+++ b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/TypeHolderExample.java
@@ -65,7 +65,6 @@ public class TypeHolderExample implements Parcelable {
    * Get stringItem
    * @return stringItem
   **/
-
   @ApiModelProperty(example = "what", required = true, value = "")
   public String getStringItem() {
     return stringItem;
@@ -84,7 +83,6 @@ public class TypeHolderExample implements Parcelable {
    * Get numberItem
    * @return numberItem
   **/
-
   @ApiModelProperty(example = "1.234", required = true, value = "")
   public BigDecimal getNumberItem() {
     return numberItem;
@@ -103,7 +101,6 @@ public class TypeHolderExample implements Parcelable {
    * Get integerItem
    * @return integerItem
   **/
-
   @ApiModelProperty(example = "-2", required = true, value = "")
   public Integer getIntegerItem() {
     return integerItem;
@@ -122,7 +119,6 @@ public class TypeHolderExample implements Parcelable {
    * Get boolItem
    * @return boolItem
   **/
-
   @ApiModelProperty(example = "true", required = true, value = "")
   public Boolean getBoolItem() {
     return boolItem;
@@ -146,7 +142,6 @@ public class TypeHolderExample implements Parcelable {
    * Get arrayItem
    * @return arrayItem
   **/
-
   @ApiModelProperty(example = "[0, 1, 2, 3]", required = true, value = "")
   public List<Integer> getArrayItem() {
     return arrayItem;
diff --git a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/User.java b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/User.java
index 00a1e51b84..3d0d5f8fc5 100644
--- a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/User.java
+++ b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/User.java
@@ -74,7 +74,7 @@ public class User implements Parcelable {
    * Get id
    * @return id
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Long getId() {
     return id;
@@ -93,7 +93,7 @@ public class User implements Parcelable {
    * Get username
    * @return username
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getUsername() {
     return username;
@@ -112,7 +112,7 @@ public class User implements Parcelable {
    * Get firstName
    * @return firstName
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getFirstName() {
     return firstName;
@@ -131,7 +131,7 @@ public class User implements Parcelable {
    * Get lastName
    * @return lastName
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getLastName() {
     return lastName;
@@ -150,7 +150,7 @@ public class User implements Parcelable {
    * Get email
    * @return email
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getEmail() {
     return email;
@@ -169,7 +169,7 @@ public class User implements Parcelable {
    * Get password
    * @return password
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getPassword() {
     return password;
@@ -188,7 +188,7 @@ public class User implements Parcelable {
    * Get phone
    * @return phone
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getPhone() {
     return phone;
@@ -207,7 +207,7 @@ public class User implements Parcelable {
    * User Status
    * @return userStatus
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "User Status")
   public Integer getUserStatus() {
     return userStatus;
diff --git a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/XmlItem.java b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/XmlItem.java
index c2e9c058b3..f5151fce0e 100644
--- a/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/XmlItem.java
+++ b/samples/client/petstore/java/okhttp-gson-parcelableModel/src/main/java/org/openapitools/client/model/XmlItem.java
@@ -161,7 +161,7 @@ public class XmlItem implements Parcelable {
    * Get attributeString
    * @return attributeString
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(example = "string", value = "")
   public String getAttributeString() {
     return attributeString;
@@ -180,7 +180,7 @@ public class XmlItem implements Parcelable {
    * Get attributeNumber
    * @return attributeNumber
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(example = "1.234", value = "")
   public BigDecimal getAttributeNumber() {
     return attributeNumber;
@@ -199,7 +199,7 @@ public class XmlItem implements Parcelable {
    * Get attributeInteger
    * @return attributeInteger
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(example = "-2", value = "")
   public Integer getAttributeInteger() {
     return attributeInteger;
@@ -218,7 +218,7 @@ public class XmlItem implements Parcelable {
    * Get attributeBoolean
    * @return attributeBoolean
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(example = "true", value = "")
   public Boolean getAttributeBoolean() {
     return attributeBoolean;
@@ -245,7 +245,7 @@ public class XmlItem implements Parcelable {
    * Get wrappedArray
    * @return wrappedArray
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public List<Integer> getWrappedArray() {
     return wrappedArray;
@@ -264,7 +264,7 @@ public class XmlItem implements Parcelable {
    * Get nameString
    * @return nameString
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(example = "string", value = "")
   public String getNameString() {
     return nameString;
@@ -283,7 +283,7 @@ public class XmlItem implements Parcelable {
    * Get nameNumber
    * @return nameNumber
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(example = "1.234", value = "")
   public BigDecimal getNameNumber() {
     return nameNumber;
@@ -302,7 +302,7 @@ public class XmlItem implements Parcelable {
    * Get nameInteger
    * @return nameInteger
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(example = "-2", value = "")
   public Integer getNameInteger() {
     return nameInteger;
@@ -321,7 +321,7 @@ public class XmlItem implements Parcelable {
    * Get nameBoolean
    * @return nameBoolean
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(example = "true", value = "")
   public Boolean getNameBoolean() {
     return nameBoolean;
@@ -348,7 +348,7 @@ public class XmlItem implements Parcelable {
    * Get nameArray
    * @return nameArray
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public List<Integer> getNameArray() {
     return nameArray;
@@ -375,7 +375,7 @@ public class XmlItem implements Parcelable {
    * Get nameWrappedArray
    * @return nameWrappedArray
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public List<Integer> getNameWrappedArray() {
     return nameWrappedArray;
@@ -394,7 +394,7 @@ public class XmlItem implements Parcelable {
    * Get prefixString
    * @return prefixString
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(example = "string", value = "")
   public String getPrefixString() {
     return prefixString;
@@ -413,7 +413,7 @@ public class XmlItem implements Parcelable {
    * Get prefixNumber
    * @return prefixNumber
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(example = "1.234", value = "")
   public BigDecimal getPrefixNumber() {
     return prefixNumber;
@@ -432,7 +432,7 @@ public class XmlItem implements Parcelable {
    * Get prefixInteger
    * @return prefixInteger
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(example = "-2", value = "")
   public Integer getPrefixInteger() {
     return prefixInteger;
@@ -451,7 +451,7 @@ public class XmlItem implements Parcelable {
    * Get prefixBoolean
    * @return prefixBoolean
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(example = "true", value = "")
   public Boolean getPrefixBoolean() {
     return prefixBoolean;
@@ -478,7 +478,7 @@ public class XmlItem implements Parcelable {
    * Get prefixArray
    * @return prefixArray
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public List<Integer> getPrefixArray() {
     return prefixArray;
@@ -505,7 +505,7 @@ public class XmlItem implements Parcelable {
    * Get prefixWrappedArray
    * @return prefixWrappedArray
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public List<Integer> getPrefixWrappedArray() {
     return prefixWrappedArray;
@@ -524,7 +524,7 @@ public class XmlItem implements Parcelable {
    * Get namespaceString
    * @return namespaceString
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(example = "string", value = "")
   public String getNamespaceString() {
     return namespaceString;
@@ -543,7 +543,7 @@ public class XmlItem implements Parcelable {
    * Get namespaceNumber
    * @return namespaceNumber
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(example = "1.234", value = "")
   public BigDecimal getNamespaceNumber() {
     return namespaceNumber;
@@ -562,7 +562,7 @@ public class XmlItem implements Parcelable {
    * Get namespaceInteger
    * @return namespaceInteger
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(example = "-2", value = "")
   public Integer getNamespaceInteger() {
     return namespaceInteger;
@@ -581,7 +581,7 @@ public class XmlItem implements Parcelable {
    * Get namespaceBoolean
    * @return namespaceBoolean
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(example = "true", value = "")
   public Boolean getNamespaceBoolean() {
     return namespaceBoolean;
@@ -608,7 +608,7 @@ public class XmlItem implements Parcelable {
    * Get namespaceArray
    * @return namespaceArray
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public List<Integer> getNamespaceArray() {
     return namespaceArray;
@@ -635,7 +635,7 @@ public class XmlItem implements Parcelable {
    * Get namespaceWrappedArray
    * @return namespaceWrappedArray
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public List<Integer> getNamespaceWrappedArray() {
     return namespaceWrappedArray;
@@ -654,7 +654,7 @@ public class XmlItem implements Parcelable {
    * Get prefixNsString
    * @return prefixNsString
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(example = "string", value = "")
   public String getPrefixNsString() {
     return prefixNsString;
@@ -673,7 +673,7 @@ public class XmlItem implements Parcelable {
    * Get prefixNsNumber
    * @return prefixNsNumber
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(example = "1.234", value = "")
   public BigDecimal getPrefixNsNumber() {
     return prefixNsNumber;
@@ -692,7 +692,7 @@ public class XmlItem implements Parcelable {
    * Get prefixNsInteger
    * @return prefixNsInteger
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(example = "-2", value = "")
   public Integer getPrefixNsInteger() {
     return prefixNsInteger;
@@ -711,7 +711,7 @@ public class XmlItem implements Parcelable {
    * Get prefixNsBoolean
    * @return prefixNsBoolean
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(example = "true", value = "")
   public Boolean getPrefixNsBoolean() {
     return prefixNsBoolean;
@@ -738,7 +738,7 @@ public class XmlItem implements Parcelable {
    * Get prefixNsArray
    * @return prefixNsArray
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public List<Integer> getPrefixNsArray() {
     return prefixNsArray;
@@ -765,7 +765,7 @@ public class XmlItem implements Parcelable {
    * Get prefixNsWrappedArray
    * @return prefixNsWrappedArray
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public List<Integer> getPrefixNsWrappedArray() {
     return prefixNsWrappedArray;
diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/AdditionalPropertiesAnyType.java b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/AdditionalPropertiesAnyType.java
index e98f74f8ae..6639252ccb 100644
--- a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/AdditionalPropertiesAnyType.java
+++ b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/AdditionalPropertiesAnyType.java
@@ -44,7 +44,7 @@ public class AdditionalPropertiesAnyType extends HashMap<String, Object> {
    * Get name
    * @return name
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getName() {
     return name;
diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/AdditionalPropertiesArray.java b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/AdditionalPropertiesArray.java
index 1d86faad3e..2c3f2ca0a4 100644
--- a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/AdditionalPropertiesArray.java
+++ b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/AdditionalPropertiesArray.java
@@ -45,7 +45,7 @@ public class AdditionalPropertiesArray extends HashMap<String, List> {
    * Get name
    * @return name
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getName() {
     return name;
diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/AdditionalPropertiesBoolean.java b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/AdditionalPropertiesBoolean.java
index a3b37161da..7c4a5248c0 100644
--- a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/AdditionalPropertiesBoolean.java
+++ b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/AdditionalPropertiesBoolean.java
@@ -44,7 +44,7 @@ public class AdditionalPropertiesBoolean extends HashMap<String, Boolean> {
    * Get name
    * @return name
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getName() {
     return name;
diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java
index 8819f4a024..b016f1f377 100644
--- a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java
+++ b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java
@@ -94,7 +94,7 @@ public class AdditionalPropertiesClass {
    * Get mapString
    * @return mapString
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Map<String, String> getMapString() {
     return mapString;
@@ -121,7 +121,7 @@ public class AdditionalPropertiesClass {
    * Get mapNumber
    * @return mapNumber
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Map<String, BigDecimal> getMapNumber() {
     return mapNumber;
@@ -148,7 +148,7 @@ public class AdditionalPropertiesClass {
    * Get mapInteger
    * @return mapInteger
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Map<String, Integer> getMapInteger() {
     return mapInteger;
@@ -175,7 +175,7 @@ public class AdditionalPropertiesClass {
    * Get mapBoolean
    * @return mapBoolean
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Map<String, Boolean> getMapBoolean() {
     return mapBoolean;
@@ -202,7 +202,7 @@ public class AdditionalPropertiesClass {
    * Get mapArrayInteger
    * @return mapArrayInteger
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Map<String, List<Integer>> getMapArrayInteger() {
     return mapArrayInteger;
@@ -229,7 +229,7 @@ public class AdditionalPropertiesClass {
    * Get mapArrayAnytype
    * @return mapArrayAnytype
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Map<String, List<Object>> getMapArrayAnytype() {
     return mapArrayAnytype;
@@ -256,7 +256,7 @@ public class AdditionalPropertiesClass {
    * Get mapMapString
    * @return mapMapString
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Map<String, Map<String, String>> getMapMapString() {
     return mapMapString;
@@ -283,7 +283,7 @@ public class AdditionalPropertiesClass {
    * Get mapMapAnytype
    * @return mapMapAnytype
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Map<String, Map<String, Object>> getMapMapAnytype() {
     return mapMapAnytype;
@@ -302,7 +302,7 @@ public class AdditionalPropertiesClass {
    * Get anytype1
    * @return anytype1
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Object getAnytype1() {
     return anytype1;
@@ -321,7 +321,7 @@ public class AdditionalPropertiesClass {
    * Get anytype2
    * @return anytype2
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Object getAnytype2() {
     return anytype2;
@@ -340,7 +340,7 @@ public class AdditionalPropertiesClass {
    * Get anytype3
    * @return anytype3
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Object getAnytype3() {
     return anytype3;
diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/AdditionalPropertiesInteger.java b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/AdditionalPropertiesInteger.java
index b8f956cbed..10df3df74c 100644
--- a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/AdditionalPropertiesInteger.java
+++ b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/AdditionalPropertiesInteger.java
@@ -44,7 +44,7 @@ public class AdditionalPropertiesInteger extends HashMap<String, Integer> {
    * Get name
    * @return name
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getName() {
     return name;
diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/AdditionalPropertiesNumber.java b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/AdditionalPropertiesNumber.java
index 03d923ab1d..33719cab26 100644
--- a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/AdditionalPropertiesNumber.java
+++ b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/AdditionalPropertiesNumber.java
@@ -45,7 +45,7 @@ public class AdditionalPropertiesNumber extends HashMap<String, BigDecimal> {
    * Get name
    * @return name
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getName() {
     return name;
diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/AdditionalPropertiesObject.java b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/AdditionalPropertiesObject.java
index c0e696dbd5..e37e04b01a 100644
--- a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/AdditionalPropertiesObject.java
+++ b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/AdditionalPropertiesObject.java
@@ -44,7 +44,7 @@ public class AdditionalPropertiesObject extends HashMap<String, Map> {
    * Get name
    * @return name
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getName() {
     return name;
diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/AdditionalPropertiesString.java b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/AdditionalPropertiesString.java
index 67e597e3cf..cfbf74f5b3 100644
--- a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/AdditionalPropertiesString.java
+++ b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/AdditionalPropertiesString.java
@@ -44,7 +44,7 @@ public class AdditionalPropertiesString extends HashMap<String, String> {
    * Get name
    * @return name
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getName() {
     return name;
diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/Animal.java b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/Animal.java
index 1738bdaf47..0a02419dbf 100644
--- a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/Animal.java
+++ b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/Animal.java
@@ -50,7 +50,6 @@ public class Animal {
    * Get className
    * @return className
   **/
-
   @ApiModelProperty(required = true, value = "")
   public String getClassName() {
     return className;
@@ -69,7 +68,7 @@ public class Animal {
    * Get color
    * @return color
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getColor() {
     return color;
diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java
index 69c0cacb05..4f016503d4 100644
--- a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java
+++ b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java
@@ -53,7 +53,7 @@ public class ArrayOfArrayOfNumberOnly {
    * Get arrayArrayNumber
    * @return arrayArrayNumber
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public List<List<BigDecimal>> getArrayArrayNumber() {
     return arrayArrayNumber;
diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java
index a85aa96af7..15d27a21f2 100644
--- a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java
+++ b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java
@@ -53,7 +53,7 @@ public class ArrayOfNumberOnly {
    * Get arrayNumber
    * @return arrayNumber
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public List<BigDecimal> getArrayNumber() {
     return arrayNumber;
diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/ArrayTest.java b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/ArrayTest.java
index 986ac5aa17..7f6d476044 100644
--- a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/ArrayTest.java
+++ b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/ArrayTest.java
@@ -61,7 +61,7 @@ public class ArrayTest {
    * Get arrayOfString
    * @return arrayOfString
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public List<String> getArrayOfString() {
     return arrayOfString;
@@ -88,7 +88,7 @@ public class ArrayTest {
    * Get arrayArrayOfInteger
    * @return arrayArrayOfInteger
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public List<List<Long>> getArrayArrayOfInteger() {
     return arrayArrayOfInteger;
@@ -115,7 +115,7 @@ public class ArrayTest {
    * Get arrayArrayOfModel
    * @return arrayArrayOfModel
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public List<List<ReadOnlyFirst>> getArrayArrayOfModel() {
     return arrayArrayOfModel;
diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/Capitalization.java b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/Capitalization.java
index 36f8853e1c..ef40fe949f 100644
--- a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/Capitalization.java
+++ b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/Capitalization.java
@@ -62,7 +62,7 @@ public class Capitalization {
    * Get smallCamel
    * @return smallCamel
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getSmallCamel() {
     return smallCamel;
@@ -81,7 +81,7 @@ public class Capitalization {
    * Get capitalCamel
    * @return capitalCamel
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getCapitalCamel() {
     return capitalCamel;
@@ -100,7 +100,7 @@ public class Capitalization {
    * Get smallSnake
    * @return smallSnake
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getSmallSnake() {
     return smallSnake;
@@ -119,7 +119,7 @@ public class Capitalization {
    * Get capitalSnake
    * @return capitalSnake
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getCapitalSnake() {
     return capitalSnake;
@@ -138,7 +138,7 @@ public class Capitalization {
    * Get scAETHFlowPoints
    * @return scAETHFlowPoints
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getScAETHFlowPoints() {
     return scAETHFlowPoints;
@@ -157,7 +157,7 @@ public class Capitalization {
    * Name of the pet 
    * @return ATT_NAME
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "Name of the pet ")
   public String getATTNAME() {
     return ATT_NAME;
diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/Cat.java b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/Cat.java
index 965461a8be..c600502f71 100644
--- a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/Cat.java
+++ b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/Cat.java
@@ -44,7 +44,7 @@ public class Cat extends Animal {
    * Get declawed
    * @return declawed
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Boolean getDeclawed() {
     return declawed;
diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/CatAllOf.java b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/CatAllOf.java
index 124db9b8ba..29b3658551 100644
--- a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/CatAllOf.java
+++ b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/CatAllOf.java
@@ -42,7 +42,7 @@ public class CatAllOf {
    * Get declawed
    * @return declawed
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Boolean getDeclawed() {
     return declawed;
diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/Category.java b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/Category.java
index d4e121847a..1968763722 100644
--- a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/Category.java
+++ b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/Category.java
@@ -46,7 +46,7 @@ public class Category {
    * Get id
    * @return id
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Long getId() {
     return id;
@@ -65,7 +65,6 @@ public class Category {
    * Get name
    * @return name
   **/
-
   @ApiModelProperty(required = true, value = "")
   public String getName() {
     return name;
diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/ClassModel.java b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/ClassModel.java
index cbdd8f317b..52245d7050 100644
--- a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/ClassModel.java
+++ b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/ClassModel.java
@@ -43,7 +43,7 @@ public class ClassModel {
    * Get propertyClass
    * @return propertyClass
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getPropertyClass() {
     return propertyClass;
diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/Client.java b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/Client.java
index 5d9c5c4a71..e5ece3536d 100644
--- a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/Client.java
+++ b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/Client.java
@@ -42,7 +42,7 @@ public class Client {
    * Get client
    * @return client
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getClient() {
     return client;
diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/Dog.java b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/Dog.java
index 4da9ba4364..d877eb2f37 100644
--- a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/Dog.java
+++ b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/Dog.java
@@ -44,7 +44,7 @@ public class Dog extends Animal {
    * Get breed
    * @return breed
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getBreed() {
     return breed;
diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/DogAllOf.java b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/DogAllOf.java
index e505d1dbc3..54483f2227 100644
--- a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/DogAllOf.java
+++ b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/DogAllOf.java
@@ -42,7 +42,7 @@ public class DogAllOf {
    * Get breed
    * @return breed
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getBreed() {
     return breed;
diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/EnumArrays.java b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/EnumArrays.java
index 8748c9fa37..a5aba01d53 100644
--- a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/EnumArrays.java
+++ b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/EnumArrays.java
@@ -142,7 +142,7 @@ public class EnumArrays {
    * Get justSymbol
    * @return justSymbol
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public JustSymbolEnum getJustSymbol() {
     return justSymbol;
@@ -169,7 +169,7 @@ public class EnumArrays {
    * Get arrayEnum
    * @return arrayEnum
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public List<ArrayEnumEnum> getArrayEnum() {
     return arrayEnum;
diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/EnumTest.java b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/EnumTest.java
index 1960c24ac2..679584204f 100644
--- a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/EnumTest.java
+++ b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/EnumTest.java
@@ -251,7 +251,7 @@ public class EnumTest {
    * Get enumString
    * @return enumString
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public EnumStringEnum getEnumString() {
     return enumString;
@@ -270,7 +270,6 @@ public class EnumTest {
    * Get enumStringRequired
    * @return enumStringRequired
   **/
-
   @ApiModelProperty(required = true, value = "")
   public EnumStringRequiredEnum getEnumStringRequired() {
     return enumStringRequired;
@@ -289,7 +288,7 @@ public class EnumTest {
    * Get enumInteger
    * @return enumInteger
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public EnumIntegerEnum getEnumInteger() {
     return enumInteger;
@@ -308,7 +307,7 @@ public class EnumTest {
    * Get enumNumber
    * @return enumNumber
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public EnumNumberEnum getEnumNumber() {
     return enumNumber;
@@ -327,7 +326,7 @@ public class EnumTest {
    * Get outerEnum
    * @return outerEnum
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public OuterEnum getOuterEnum() {
     return outerEnum;
diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java
index 3c7fcaabdf..181141b92d 100644
--- a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java
+++ b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java
@@ -48,7 +48,7 @@ public class FileSchemaTestClass {
    * Get file
    * @return file
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public java.io.File getFile() {
     return file;
@@ -75,7 +75,7 @@ public class FileSchemaTestClass {
    * Get files
    * @return files
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public List<java.io.File> getFiles() {
     return files;
diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/FormatTest.java b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/FormatTest.java
index e7b28a4737..583b12a0eb 100644
--- a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/FormatTest.java
+++ b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/FormatTest.java
@@ -97,7 +97,7 @@ public class FormatTest {
    * maximum: 100
    * @return integer
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Integer getInteger() {
     return integer;
@@ -118,7 +118,7 @@ public class FormatTest {
    * maximum: 200
    * @return int32
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Integer getInt32() {
     return int32;
@@ -137,7 +137,7 @@ public class FormatTest {
    * Get int64
    * @return int64
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Long getInt64() {
     return int64;
@@ -158,7 +158,6 @@ public class FormatTest {
    * maximum: 543.2
    * @return number
   **/
-
   @ApiModelProperty(required = true, value = "")
   public BigDecimal getNumber() {
     return number;
@@ -179,7 +178,7 @@ public class FormatTest {
    * maximum: 987.6
    * @return _float
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Float getFloat() {
     return _float;
@@ -200,7 +199,7 @@ public class FormatTest {
    * maximum: 123.4
    * @return _double
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Double getDouble() {
     return _double;
@@ -219,7 +218,7 @@ public class FormatTest {
    * Get string
    * @return string
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getString() {
     return string;
@@ -238,7 +237,6 @@ public class FormatTest {
    * Get _byte
    * @return _byte
   **/
-
   @ApiModelProperty(required = true, value = "")
   public byte[] getByte() {
     return _byte;
@@ -257,7 +255,7 @@ public class FormatTest {
    * Get binary
    * @return binary
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public File getBinary() {
     return binary;
@@ -276,7 +274,6 @@ public class FormatTest {
    * Get date
    * @return date
   **/
-
   @ApiModelProperty(required = true, value = "")
   public LocalDate getDate() {
     return date;
@@ -295,7 +292,7 @@ public class FormatTest {
    * Get dateTime
    * @return dateTime
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public OffsetDateTime getDateTime() {
     return dateTime;
@@ -314,7 +311,7 @@ public class FormatTest {
    * Get uuid
    * @return uuid
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(example = "72f98069-206d-4f12-9f12-3d1e525a8e84", value = "")
   public UUID getUuid() {
     return uuid;
@@ -333,7 +330,6 @@ public class FormatTest {
    * Get password
    * @return password
   **/
-
   @ApiModelProperty(required = true, value = "")
   public String getPassword() {
     return password;
diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java
index 72fcaa8993..02225d278c 100644
--- a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java
+++ b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java
@@ -41,7 +41,7 @@ public class HasOnlyReadOnly {
    * Get bar
    * @return bar
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getBar() {
     return bar;
@@ -51,7 +51,7 @@ public class HasOnlyReadOnly {
    * Get foo
    * @return foo
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getFoo() {
     return foo;
diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/MapTest.java b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/MapTest.java
index 43f0d2e998..329cb4c87b 100644
--- a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/MapTest.java
+++ b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/MapTest.java
@@ -112,7 +112,7 @@ public class MapTest {
    * Get mapMapOfString
    * @return mapMapOfString
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Map<String, Map<String, String>> getMapMapOfString() {
     return mapMapOfString;
@@ -139,7 +139,7 @@ public class MapTest {
    * Get mapOfEnumString
    * @return mapOfEnumString
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Map<String, InnerEnum> getMapOfEnumString() {
     return mapOfEnumString;
@@ -166,7 +166,7 @@ public class MapTest {
    * Get directMap
    * @return directMap
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Map<String, Boolean> getDirectMap() {
     return directMap;
@@ -193,7 +193,7 @@ public class MapTest {
    * Get indirectMap
    * @return indirectMap
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Map<String, Boolean> getIndirectMap() {
     return indirectMap;
diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java
index 78d80bd7f0..1826c8b064 100644
--- a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java
+++ b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java
@@ -56,7 +56,7 @@ public class MixedPropertiesAndAdditionalPropertiesClass {
    * Get uuid
    * @return uuid
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public UUID getUuid() {
     return uuid;
@@ -75,7 +75,7 @@ public class MixedPropertiesAndAdditionalPropertiesClass {
    * Get dateTime
    * @return dateTime
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public OffsetDateTime getDateTime() {
     return dateTime;
@@ -102,7 +102,7 @@ public class MixedPropertiesAndAdditionalPropertiesClass {
    * Get map
    * @return map
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Map<String, Animal> getMap() {
     return map;
diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/Model200Response.java b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/Model200Response.java
index 0c0fc9710d..3167560a9d 100644
--- a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/Model200Response.java
+++ b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/Model200Response.java
@@ -47,7 +47,7 @@ public class Model200Response {
    * Get name
    * @return name
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Integer getName() {
     return name;
@@ -66,7 +66,7 @@ public class Model200Response {
    * Get propertyClass
    * @return propertyClass
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getPropertyClass() {
     return propertyClass;
diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/ModelApiResponse.java b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/ModelApiResponse.java
index 777b1a8a7c..84d2fcc4d3 100644
--- a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/ModelApiResponse.java
+++ b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/ModelApiResponse.java
@@ -50,7 +50,7 @@ public class ModelApiResponse {
    * Get code
    * @return code
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Integer getCode() {
     return code;
@@ -69,7 +69,7 @@ public class ModelApiResponse {
    * Get type
    * @return type
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getType() {
     return type;
@@ -88,7 +88,7 @@ public class ModelApiResponse {
    * Get message
    * @return message
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getMessage() {
     return message;
diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/ModelReturn.java b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/ModelReturn.java
index 225df7f4e8..c13f1babe5 100644
--- a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/ModelReturn.java
+++ b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/ModelReturn.java
@@ -43,7 +43,7 @@ public class ModelReturn {
    * Get _return
    * @return _return
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Integer getReturn() {
     return _return;
diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/Name.java b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/Name.java
index c5a5691688..221821d4e1 100644
--- a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/Name.java
+++ b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/Name.java
@@ -55,7 +55,6 @@ public class Name {
    * Get name
    * @return name
   **/
-
   @ApiModelProperty(required = true, value = "")
   public Integer getName() {
     return name;
@@ -69,7 +68,7 @@ public class Name {
    * Get snakeCase
    * @return snakeCase
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Integer getSnakeCase() {
     return snakeCase;
@@ -84,7 +83,7 @@ public class Name {
    * Get property
    * @return property
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getProperty() {
     return property;
@@ -98,7 +97,7 @@ public class Name {
    * Get _123number
    * @return _123number
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Integer get123number() {
     return _123number;
diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/NumberOnly.java b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/NumberOnly.java
index 00ffd2f67e..9a068c2e1e 100644
--- a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/NumberOnly.java
+++ b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/NumberOnly.java
@@ -43,7 +43,7 @@ public class NumberOnly {
    * Get justNumber
    * @return justNumber
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public BigDecimal getJustNumber() {
     return justNumber;
diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/Order.java b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/Order.java
index cfb3d04776..9ee41b5b8a 100644
--- a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/Order.java
+++ b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/Order.java
@@ -112,7 +112,7 @@ public class Order {
    * Get id
    * @return id
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Long getId() {
     return id;
@@ -131,7 +131,7 @@ public class Order {
    * Get petId
    * @return petId
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Long getPetId() {
     return petId;
@@ -150,7 +150,7 @@ public class Order {
    * Get quantity
    * @return quantity
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Integer getQuantity() {
     return quantity;
@@ -169,7 +169,7 @@ public class Order {
    * Get shipDate
    * @return shipDate
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public OffsetDateTime getShipDate() {
     return shipDate;
@@ -188,7 +188,7 @@ public class Order {
    * Order Status
    * @return status
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "Order Status")
   public StatusEnum getStatus() {
     return status;
@@ -207,7 +207,7 @@ public class Order {
    * Get complete
    * @return complete
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Boolean getComplete() {
     return complete;
diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/OuterComposite.java b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/OuterComposite.java
index 9e2a78d57f..690b6bde4b 100644
--- a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/OuterComposite.java
+++ b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/OuterComposite.java
@@ -51,7 +51,7 @@ public class OuterComposite {
    * Get myNumber
    * @return myNumber
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public BigDecimal getMyNumber() {
     return myNumber;
@@ -70,7 +70,7 @@ public class OuterComposite {
    * Get myString
    * @return myString
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getMyString() {
     return myString;
@@ -89,7 +89,7 @@ public class OuterComposite {
    * Get myBoolean
    * @return myBoolean
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Boolean getMyBoolean() {
     return myBoolean;
diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/Pet.java b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/Pet.java
index 5ac8165f7f..59fe8406f4 100644
--- a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/Pet.java
+++ b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/Pet.java
@@ -115,7 +115,7 @@ public class Pet {
    * Get id
    * @return id
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Long getId() {
     return id;
@@ -134,7 +134,7 @@ public class Pet {
    * Get category
    * @return category
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Category getCategory() {
     return category;
@@ -153,7 +153,6 @@ public class Pet {
    * Get name
    * @return name
   **/
-
   @ApiModelProperty(example = "doggie", required = true, value = "")
   public String getName() {
     return name;
@@ -177,7 +176,6 @@ public class Pet {
    * Get photoUrls
    * @return photoUrls
   **/
-
   @ApiModelProperty(required = true, value = "")
   public List<String> getPhotoUrls() {
     return photoUrls;
@@ -204,7 +202,7 @@ public class Pet {
    * Get tags
    * @return tags
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public List<Tag> getTags() {
     return tags;
@@ -223,7 +221,7 @@ public class Pet {
    * pet status in the store
    * @return status
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "pet status in the store")
   public StatusEnum getStatus() {
     return status;
diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/ReadOnlyFirst.java b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/ReadOnlyFirst.java
index 23ec5576c0..84780d763a 100644
--- a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/ReadOnlyFirst.java
+++ b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/ReadOnlyFirst.java
@@ -41,7 +41,7 @@ public class ReadOnlyFirst {
    * Get bar
    * @return bar
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getBar() {
     return bar;
@@ -56,7 +56,7 @@ public class ReadOnlyFirst {
    * Get baz
    * @return baz
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getBaz() {
     return baz;
diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/SpecialModelName.java b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/SpecialModelName.java
index f4a7d343a7..c6ccd2c33f 100644
--- a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/SpecialModelName.java
+++ b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/SpecialModelName.java
@@ -42,7 +42,7 @@ public class SpecialModelName {
    * Get $specialPropertyName
    * @return $specialPropertyName
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Long get$SpecialPropertyName() {
     return $specialPropertyName;
diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/Tag.java b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/Tag.java
index bce1fc934d..504c51cc3e 100644
--- a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/Tag.java
+++ b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/Tag.java
@@ -46,7 +46,7 @@ public class Tag {
    * Get id
    * @return id
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Long getId() {
     return id;
@@ -65,7 +65,7 @@ public class Tag {
    * Get name
    * @return name
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getName() {
     return name;
diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/TypeHolderDefault.java b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/TypeHolderDefault.java
index 8c7e1fa55d..8fc321bc0a 100644
--- a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/TypeHolderDefault.java
+++ b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/TypeHolderDefault.java
@@ -61,7 +61,6 @@ public class TypeHolderDefault {
    * Get stringItem
    * @return stringItem
   **/
-
   @ApiModelProperty(required = true, value = "")
   public String getStringItem() {
     return stringItem;
@@ -80,7 +79,6 @@ public class TypeHolderDefault {
    * Get numberItem
    * @return numberItem
   **/
-
   @ApiModelProperty(required = true, value = "")
   public BigDecimal getNumberItem() {
     return numberItem;
@@ -99,7 +97,6 @@ public class TypeHolderDefault {
    * Get integerItem
    * @return integerItem
   **/
-
   @ApiModelProperty(required = true, value = "")
   public Integer getIntegerItem() {
     return integerItem;
@@ -118,7 +115,6 @@ public class TypeHolderDefault {
    * Get boolItem
    * @return boolItem
   **/
-
   @ApiModelProperty(required = true, value = "")
   public Boolean getBoolItem() {
     return boolItem;
@@ -142,7 +138,6 @@ public class TypeHolderDefault {
    * Get arrayItem
    * @return arrayItem
   **/
-
   @ApiModelProperty(required = true, value = "")
   public List<Integer> getArrayItem() {
     return arrayItem;
diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/TypeHolderExample.java b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/TypeHolderExample.java
index 8315f422ea..d9496cbd79 100644
--- a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/TypeHolderExample.java
+++ b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/TypeHolderExample.java
@@ -61,7 +61,6 @@ public class TypeHolderExample {
    * Get stringItem
    * @return stringItem
   **/
-
   @ApiModelProperty(example = "what", required = true, value = "")
   public String getStringItem() {
     return stringItem;
@@ -80,7 +79,6 @@ public class TypeHolderExample {
    * Get numberItem
    * @return numberItem
   **/
-
   @ApiModelProperty(example = "1.234", required = true, value = "")
   public BigDecimal getNumberItem() {
     return numberItem;
@@ -99,7 +97,6 @@ public class TypeHolderExample {
    * Get integerItem
    * @return integerItem
   **/
-
   @ApiModelProperty(example = "-2", required = true, value = "")
   public Integer getIntegerItem() {
     return integerItem;
@@ -118,7 +115,6 @@ public class TypeHolderExample {
    * Get boolItem
    * @return boolItem
   **/
-
   @ApiModelProperty(example = "true", required = true, value = "")
   public Boolean getBoolItem() {
     return boolItem;
@@ -142,7 +138,6 @@ public class TypeHolderExample {
    * Get arrayItem
    * @return arrayItem
   **/
-
   @ApiModelProperty(example = "[0, 1, 2, 3]", required = true, value = "")
   public List<Integer> getArrayItem() {
     return arrayItem;
diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/User.java b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/User.java
index 3f9eb4bb8a..1aedd044b5 100644
--- a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/User.java
+++ b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/User.java
@@ -70,7 +70,7 @@ public class User {
    * Get id
    * @return id
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Long getId() {
     return id;
@@ -89,7 +89,7 @@ public class User {
    * Get username
    * @return username
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getUsername() {
     return username;
@@ -108,7 +108,7 @@ public class User {
    * Get firstName
    * @return firstName
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getFirstName() {
     return firstName;
@@ -127,7 +127,7 @@ public class User {
    * Get lastName
    * @return lastName
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getLastName() {
     return lastName;
@@ -146,7 +146,7 @@ public class User {
    * Get email
    * @return email
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getEmail() {
     return email;
@@ -165,7 +165,7 @@ public class User {
    * Get password
    * @return password
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getPassword() {
     return password;
@@ -184,7 +184,7 @@ public class User {
    * Get phone
    * @return phone
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getPhone() {
     return phone;
@@ -203,7 +203,7 @@ public class User {
    * User Status
    * @return userStatus
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "User Status")
   public Integer getUserStatus() {
     return userStatus;
diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/XmlItem.java b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/XmlItem.java
index 67910352a7..ea15cdba33 100644
--- a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/XmlItem.java
+++ b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/XmlItem.java
@@ -157,7 +157,7 @@ public class XmlItem {
    * Get attributeString
    * @return attributeString
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(example = "string", value = "")
   public String getAttributeString() {
     return attributeString;
@@ -176,7 +176,7 @@ public class XmlItem {
    * Get attributeNumber
    * @return attributeNumber
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(example = "1.234", value = "")
   public BigDecimal getAttributeNumber() {
     return attributeNumber;
@@ -195,7 +195,7 @@ public class XmlItem {
    * Get attributeInteger
    * @return attributeInteger
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(example = "-2", value = "")
   public Integer getAttributeInteger() {
     return attributeInteger;
@@ -214,7 +214,7 @@ public class XmlItem {
    * Get attributeBoolean
    * @return attributeBoolean
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(example = "true", value = "")
   public Boolean getAttributeBoolean() {
     return attributeBoolean;
@@ -241,7 +241,7 @@ public class XmlItem {
    * Get wrappedArray
    * @return wrappedArray
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public List<Integer> getWrappedArray() {
     return wrappedArray;
@@ -260,7 +260,7 @@ public class XmlItem {
    * Get nameString
    * @return nameString
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(example = "string", value = "")
   public String getNameString() {
     return nameString;
@@ -279,7 +279,7 @@ public class XmlItem {
    * Get nameNumber
    * @return nameNumber
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(example = "1.234", value = "")
   public BigDecimal getNameNumber() {
     return nameNumber;
@@ -298,7 +298,7 @@ public class XmlItem {
    * Get nameInteger
    * @return nameInteger
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(example = "-2", value = "")
   public Integer getNameInteger() {
     return nameInteger;
@@ -317,7 +317,7 @@ public class XmlItem {
    * Get nameBoolean
    * @return nameBoolean
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(example = "true", value = "")
   public Boolean getNameBoolean() {
     return nameBoolean;
@@ -344,7 +344,7 @@ public class XmlItem {
    * Get nameArray
    * @return nameArray
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public List<Integer> getNameArray() {
     return nameArray;
@@ -371,7 +371,7 @@ public class XmlItem {
    * Get nameWrappedArray
    * @return nameWrappedArray
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public List<Integer> getNameWrappedArray() {
     return nameWrappedArray;
@@ -390,7 +390,7 @@ public class XmlItem {
    * Get prefixString
    * @return prefixString
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(example = "string", value = "")
   public String getPrefixString() {
     return prefixString;
@@ -409,7 +409,7 @@ public class XmlItem {
    * Get prefixNumber
    * @return prefixNumber
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(example = "1.234", value = "")
   public BigDecimal getPrefixNumber() {
     return prefixNumber;
@@ -428,7 +428,7 @@ public class XmlItem {
    * Get prefixInteger
    * @return prefixInteger
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(example = "-2", value = "")
   public Integer getPrefixInteger() {
     return prefixInteger;
@@ -447,7 +447,7 @@ public class XmlItem {
    * Get prefixBoolean
    * @return prefixBoolean
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(example = "true", value = "")
   public Boolean getPrefixBoolean() {
     return prefixBoolean;
@@ -474,7 +474,7 @@ public class XmlItem {
    * Get prefixArray
    * @return prefixArray
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public List<Integer> getPrefixArray() {
     return prefixArray;
@@ -501,7 +501,7 @@ public class XmlItem {
    * Get prefixWrappedArray
    * @return prefixWrappedArray
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public List<Integer> getPrefixWrappedArray() {
     return prefixWrappedArray;
@@ -520,7 +520,7 @@ public class XmlItem {
    * Get namespaceString
    * @return namespaceString
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(example = "string", value = "")
   public String getNamespaceString() {
     return namespaceString;
@@ -539,7 +539,7 @@ public class XmlItem {
    * Get namespaceNumber
    * @return namespaceNumber
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(example = "1.234", value = "")
   public BigDecimal getNamespaceNumber() {
     return namespaceNumber;
@@ -558,7 +558,7 @@ public class XmlItem {
    * Get namespaceInteger
    * @return namespaceInteger
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(example = "-2", value = "")
   public Integer getNamespaceInteger() {
     return namespaceInteger;
@@ -577,7 +577,7 @@ public class XmlItem {
    * Get namespaceBoolean
    * @return namespaceBoolean
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(example = "true", value = "")
   public Boolean getNamespaceBoolean() {
     return namespaceBoolean;
@@ -604,7 +604,7 @@ public class XmlItem {
    * Get namespaceArray
    * @return namespaceArray
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public List<Integer> getNamespaceArray() {
     return namespaceArray;
@@ -631,7 +631,7 @@ public class XmlItem {
    * Get namespaceWrappedArray
    * @return namespaceWrappedArray
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public List<Integer> getNamespaceWrappedArray() {
     return namespaceWrappedArray;
@@ -650,7 +650,7 @@ public class XmlItem {
    * Get prefixNsString
    * @return prefixNsString
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(example = "string", value = "")
   public String getPrefixNsString() {
     return prefixNsString;
@@ -669,7 +669,7 @@ public class XmlItem {
    * Get prefixNsNumber
    * @return prefixNsNumber
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(example = "1.234", value = "")
   public BigDecimal getPrefixNsNumber() {
     return prefixNsNumber;
@@ -688,7 +688,7 @@ public class XmlItem {
    * Get prefixNsInteger
    * @return prefixNsInteger
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(example = "-2", value = "")
   public Integer getPrefixNsInteger() {
     return prefixNsInteger;
@@ -707,7 +707,7 @@ public class XmlItem {
    * Get prefixNsBoolean
    * @return prefixNsBoolean
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(example = "true", value = "")
   public Boolean getPrefixNsBoolean() {
     return prefixNsBoolean;
@@ -734,7 +734,7 @@ public class XmlItem {
    * Get prefixNsArray
    * @return prefixNsArray
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public List<Integer> getPrefixNsArray() {
     return prefixNsArray;
@@ -761,7 +761,7 @@ public class XmlItem {
    * Get prefixNsWrappedArray
    * @return prefixNsWrappedArray
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public List<Integer> getPrefixNsWrappedArray() {
     return prefixNsWrappedArray;
diff --git a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/AdditionalPropertiesAnyType.java b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/AdditionalPropertiesAnyType.java
index e98f74f8ae..6639252ccb 100644
--- a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/AdditionalPropertiesAnyType.java
+++ b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/AdditionalPropertiesAnyType.java
@@ -44,7 +44,7 @@ public class AdditionalPropertiesAnyType extends HashMap<String, Object> {
    * Get name
    * @return name
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getName() {
     return name;
diff --git a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/AdditionalPropertiesArray.java b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/AdditionalPropertiesArray.java
index 1d86faad3e..2c3f2ca0a4 100644
--- a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/AdditionalPropertiesArray.java
+++ b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/AdditionalPropertiesArray.java
@@ -45,7 +45,7 @@ public class AdditionalPropertiesArray extends HashMap<String, List> {
    * Get name
    * @return name
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getName() {
     return name;
diff --git a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/AdditionalPropertiesBoolean.java b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/AdditionalPropertiesBoolean.java
index a3b37161da..7c4a5248c0 100644
--- a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/AdditionalPropertiesBoolean.java
+++ b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/AdditionalPropertiesBoolean.java
@@ -44,7 +44,7 @@ public class AdditionalPropertiesBoolean extends HashMap<String, Boolean> {
    * Get name
    * @return name
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getName() {
     return name;
diff --git a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java
index 8819f4a024..b016f1f377 100644
--- a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java
+++ b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java
@@ -94,7 +94,7 @@ public class AdditionalPropertiesClass {
    * Get mapString
    * @return mapString
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Map<String, String> getMapString() {
     return mapString;
@@ -121,7 +121,7 @@ public class AdditionalPropertiesClass {
    * Get mapNumber
    * @return mapNumber
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Map<String, BigDecimal> getMapNumber() {
     return mapNumber;
@@ -148,7 +148,7 @@ public class AdditionalPropertiesClass {
    * Get mapInteger
    * @return mapInteger
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Map<String, Integer> getMapInteger() {
     return mapInteger;
@@ -175,7 +175,7 @@ public class AdditionalPropertiesClass {
    * Get mapBoolean
    * @return mapBoolean
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Map<String, Boolean> getMapBoolean() {
     return mapBoolean;
@@ -202,7 +202,7 @@ public class AdditionalPropertiesClass {
    * Get mapArrayInteger
    * @return mapArrayInteger
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Map<String, List<Integer>> getMapArrayInteger() {
     return mapArrayInteger;
@@ -229,7 +229,7 @@ public class AdditionalPropertiesClass {
    * Get mapArrayAnytype
    * @return mapArrayAnytype
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Map<String, List<Object>> getMapArrayAnytype() {
     return mapArrayAnytype;
@@ -256,7 +256,7 @@ public class AdditionalPropertiesClass {
    * Get mapMapString
    * @return mapMapString
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Map<String, Map<String, String>> getMapMapString() {
     return mapMapString;
@@ -283,7 +283,7 @@ public class AdditionalPropertiesClass {
    * Get mapMapAnytype
    * @return mapMapAnytype
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Map<String, Map<String, Object>> getMapMapAnytype() {
     return mapMapAnytype;
@@ -302,7 +302,7 @@ public class AdditionalPropertiesClass {
    * Get anytype1
    * @return anytype1
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Object getAnytype1() {
     return anytype1;
@@ -321,7 +321,7 @@ public class AdditionalPropertiesClass {
    * Get anytype2
    * @return anytype2
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Object getAnytype2() {
     return anytype2;
@@ -340,7 +340,7 @@ public class AdditionalPropertiesClass {
    * Get anytype3
    * @return anytype3
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Object getAnytype3() {
     return anytype3;
diff --git a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/AdditionalPropertiesInteger.java b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/AdditionalPropertiesInteger.java
index b8f956cbed..10df3df74c 100644
--- a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/AdditionalPropertiesInteger.java
+++ b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/AdditionalPropertiesInteger.java
@@ -44,7 +44,7 @@ public class AdditionalPropertiesInteger extends HashMap<String, Integer> {
    * Get name
    * @return name
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getName() {
     return name;
diff --git a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/AdditionalPropertiesNumber.java b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/AdditionalPropertiesNumber.java
index 03d923ab1d..33719cab26 100644
--- a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/AdditionalPropertiesNumber.java
+++ b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/AdditionalPropertiesNumber.java
@@ -45,7 +45,7 @@ public class AdditionalPropertiesNumber extends HashMap<String, BigDecimal> {
    * Get name
    * @return name
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getName() {
     return name;
diff --git a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/AdditionalPropertiesObject.java b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/AdditionalPropertiesObject.java
index c0e696dbd5..e37e04b01a 100644
--- a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/AdditionalPropertiesObject.java
+++ b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/AdditionalPropertiesObject.java
@@ -44,7 +44,7 @@ public class AdditionalPropertiesObject extends HashMap<String, Map> {
    * Get name
    * @return name
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getName() {
     return name;
diff --git a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/AdditionalPropertiesString.java b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/AdditionalPropertiesString.java
index 67e597e3cf..cfbf74f5b3 100644
--- a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/AdditionalPropertiesString.java
+++ b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/AdditionalPropertiesString.java
@@ -44,7 +44,7 @@ public class AdditionalPropertiesString extends HashMap<String, String> {
    * Get name
    * @return name
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getName() {
     return name;
diff --git a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/Animal.java b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/Animal.java
index 1738bdaf47..0a02419dbf 100644
--- a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/Animal.java
+++ b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/Animal.java
@@ -50,7 +50,6 @@ public class Animal {
    * Get className
    * @return className
   **/
-
   @ApiModelProperty(required = true, value = "")
   public String getClassName() {
     return className;
@@ -69,7 +68,7 @@ public class Animal {
    * Get color
    * @return color
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getColor() {
     return color;
diff --git a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java
index 69c0cacb05..4f016503d4 100644
--- a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java
+++ b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java
@@ -53,7 +53,7 @@ public class ArrayOfArrayOfNumberOnly {
    * Get arrayArrayNumber
    * @return arrayArrayNumber
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public List<List<BigDecimal>> getArrayArrayNumber() {
     return arrayArrayNumber;
diff --git a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java
index a85aa96af7..15d27a21f2 100644
--- a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java
+++ b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java
@@ -53,7 +53,7 @@ public class ArrayOfNumberOnly {
    * Get arrayNumber
    * @return arrayNumber
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public List<BigDecimal> getArrayNumber() {
     return arrayNumber;
diff --git a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/ArrayTest.java b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/ArrayTest.java
index 986ac5aa17..7f6d476044 100644
--- a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/ArrayTest.java
+++ b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/ArrayTest.java
@@ -61,7 +61,7 @@ public class ArrayTest {
    * Get arrayOfString
    * @return arrayOfString
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public List<String> getArrayOfString() {
     return arrayOfString;
@@ -88,7 +88,7 @@ public class ArrayTest {
    * Get arrayArrayOfInteger
    * @return arrayArrayOfInteger
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public List<List<Long>> getArrayArrayOfInteger() {
     return arrayArrayOfInteger;
@@ -115,7 +115,7 @@ public class ArrayTest {
    * Get arrayArrayOfModel
    * @return arrayArrayOfModel
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public List<List<ReadOnlyFirst>> getArrayArrayOfModel() {
     return arrayArrayOfModel;
diff --git a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/Capitalization.java b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/Capitalization.java
index 36f8853e1c..ef40fe949f 100644
--- a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/Capitalization.java
+++ b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/Capitalization.java
@@ -62,7 +62,7 @@ public class Capitalization {
    * Get smallCamel
    * @return smallCamel
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getSmallCamel() {
     return smallCamel;
@@ -81,7 +81,7 @@ public class Capitalization {
    * Get capitalCamel
    * @return capitalCamel
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getCapitalCamel() {
     return capitalCamel;
@@ -100,7 +100,7 @@ public class Capitalization {
    * Get smallSnake
    * @return smallSnake
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getSmallSnake() {
     return smallSnake;
@@ -119,7 +119,7 @@ public class Capitalization {
    * Get capitalSnake
    * @return capitalSnake
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getCapitalSnake() {
     return capitalSnake;
@@ -138,7 +138,7 @@ public class Capitalization {
    * Get scAETHFlowPoints
    * @return scAETHFlowPoints
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getScAETHFlowPoints() {
     return scAETHFlowPoints;
@@ -157,7 +157,7 @@ public class Capitalization {
    * Name of the pet 
    * @return ATT_NAME
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "Name of the pet ")
   public String getATTNAME() {
     return ATT_NAME;
diff --git a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/Cat.java b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/Cat.java
index a8b8feb2ae..91196d53a8 100644
--- a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/Cat.java
+++ b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/Cat.java
@@ -44,7 +44,7 @@ public class Cat extends Animal {
    * Get declawed
    * @return declawed
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Boolean isDeclawed() {
     return declawed;
diff --git a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/CatAllOf.java b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/CatAllOf.java
index bcff151472..d7569c72fd 100644
--- a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/CatAllOf.java
+++ b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/CatAllOf.java
@@ -42,7 +42,7 @@ public class CatAllOf {
    * Get declawed
    * @return declawed
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Boolean isDeclawed() {
     return declawed;
diff --git a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/Category.java b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/Category.java
index d4e121847a..1968763722 100644
--- a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/Category.java
+++ b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/Category.java
@@ -46,7 +46,7 @@ public class Category {
    * Get id
    * @return id
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Long getId() {
     return id;
@@ -65,7 +65,6 @@ public class Category {
    * Get name
    * @return name
   **/
-
   @ApiModelProperty(required = true, value = "")
   public String getName() {
     return name;
diff --git a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/ClassModel.java b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/ClassModel.java
index cbdd8f317b..52245d7050 100644
--- a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/ClassModel.java
+++ b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/ClassModel.java
@@ -43,7 +43,7 @@ public class ClassModel {
    * Get propertyClass
    * @return propertyClass
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getPropertyClass() {
     return propertyClass;
diff --git a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/Client.java b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/Client.java
index 5d9c5c4a71..e5ece3536d 100644
--- a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/Client.java
+++ b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/Client.java
@@ -42,7 +42,7 @@ public class Client {
    * Get client
    * @return client
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getClient() {
     return client;
diff --git a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/Dog.java b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/Dog.java
index 4da9ba4364..d877eb2f37 100644
--- a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/Dog.java
+++ b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/Dog.java
@@ -44,7 +44,7 @@ public class Dog extends Animal {
    * Get breed
    * @return breed
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getBreed() {
     return breed;
diff --git a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/DogAllOf.java b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/DogAllOf.java
index e505d1dbc3..54483f2227 100644
--- a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/DogAllOf.java
+++ b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/DogAllOf.java
@@ -42,7 +42,7 @@ public class DogAllOf {
    * Get breed
    * @return breed
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getBreed() {
     return breed;
diff --git a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/EnumArrays.java b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/EnumArrays.java
index 8748c9fa37..a5aba01d53 100644
--- a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/EnumArrays.java
+++ b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/EnumArrays.java
@@ -142,7 +142,7 @@ public class EnumArrays {
    * Get justSymbol
    * @return justSymbol
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public JustSymbolEnum getJustSymbol() {
     return justSymbol;
@@ -169,7 +169,7 @@ public class EnumArrays {
    * Get arrayEnum
    * @return arrayEnum
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public List<ArrayEnumEnum> getArrayEnum() {
     return arrayEnum;
diff --git a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/EnumTest.java b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/EnumTest.java
index 1960c24ac2..679584204f 100644
--- a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/EnumTest.java
+++ b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/EnumTest.java
@@ -251,7 +251,7 @@ public class EnumTest {
    * Get enumString
    * @return enumString
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public EnumStringEnum getEnumString() {
     return enumString;
@@ -270,7 +270,6 @@ public class EnumTest {
    * Get enumStringRequired
    * @return enumStringRequired
   **/
-
   @ApiModelProperty(required = true, value = "")
   public EnumStringRequiredEnum getEnumStringRequired() {
     return enumStringRequired;
@@ -289,7 +288,7 @@ public class EnumTest {
    * Get enumInteger
    * @return enumInteger
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public EnumIntegerEnum getEnumInteger() {
     return enumInteger;
@@ -308,7 +307,7 @@ public class EnumTest {
    * Get enumNumber
    * @return enumNumber
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public EnumNumberEnum getEnumNumber() {
     return enumNumber;
@@ -327,7 +326,7 @@ public class EnumTest {
    * Get outerEnum
    * @return outerEnum
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public OuterEnum getOuterEnum() {
     return outerEnum;
diff --git a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java
index 3c7fcaabdf..181141b92d 100644
--- a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java
+++ b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java
@@ -48,7 +48,7 @@ public class FileSchemaTestClass {
    * Get file
    * @return file
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public java.io.File getFile() {
     return file;
@@ -75,7 +75,7 @@ public class FileSchemaTestClass {
    * Get files
    * @return files
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public List<java.io.File> getFiles() {
     return files;
diff --git a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/FormatTest.java b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/FormatTest.java
index e7b28a4737..583b12a0eb 100644
--- a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/FormatTest.java
+++ b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/FormatTest.java
@@ -97,7 +97,7 @@ public class FormatTest {
    * maximum: 100
    * @return integer
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Integer getInteger() {
     return integer;
@@ -118,7 +118,7 @@ public class FormatTest {
    * maximum: 200
    * @return int32
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Integer getInt32() {
     return int32;
@@ -137,7 +137,7 @@ public class FormatTest {
    * Get int64
    * @return int64
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Long getInt64() {
     return int64;
@@ -158,7 +158,6 @@ public class FormatTest {
    * maximum: 543.2
    * @return number
   **/
-
   @ApiModelProperty(required = true, value = "")
   public BigDecimal getNumber() {
     return number;
@@ -179,7 +178,7 @@ public class FormatTest {
    * maximum: 987.6
    * @return _float
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Float getFloat() {
     return _float;
@@ -200,7 +199,7 @@ public class FormatTest {
    * maximum: 123.4
    * @return _double
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Double getDouble() {
     return _double;
@@ -219,7 +218,7 @@ public class FormatTest {
    * Get string
    * @return string
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getString() {
     return string;
@@ -238,7 +237,6 @@ public class FormatTest {
    * Get _byte
    * @return _byte
   **/
-
   @ApiModelProperty(required = true, value = "")
   public byte[] getByte() {
     return _byte;
@@ -257,7 +255,7 @@ public class FormatTest {
    * Get binary
    * @return binary
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public File getBinary() {
     return binary;
@@ -276,7 +274,6 @@ public class FormatTest {
    * Get date
    * @return date
   **/
-
   @ApiModelProperty(required = true, value = "")
   public LocalDate getDate() {
     return date;
@@ -295,7 +292,7 @@ public class FormatTest {
    * Get dateTime
    * @return dateTime
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public OffsetDateTime getDateTime() {
     return dateTime;
@@ -314,7 +311,7 @@ public class FormatTest {
    * Get uuid
    * @return uuid
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(example = "72f98069-206d-4f12-9f12-3d1e525a8e84", value = "")
   public UUID getUuid() {
     return uuid;
@@ -333,7 +330,6 @@ public class FormatTest {
    * Get password
    * @return password
   **/
-
   @ApiModelProperty(required = true, value = "")
   public String getPassword() {
     return password;
diff --git a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java
index 72fcaa8993..02225d278c 100644
--- a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java
+++ b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java
@@ -41,7 +41,7 @@ public class HasOnlyReadOnly {
    * Get bar
    * @return bar
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getBar() {
     return bar;
@@ -51,7 +51,7 @@ public class HasOnlyReadOnly {
    * Get foo
    * @return foo
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getFoo() {
     return foo;
diff --git a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/MapTest.java b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/MapTest.java
index 43f0d2e998..329cb4c87b 100644
--- a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/MapTest.java
+++ b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/MapTest.java
@@ -112,7 +112,7 @@ public class MapTest {
    * Get mapMapOfString
    * @return mapMapOfString
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Map<String, Map<String, String>> getMapMapOfString() {
     return mapMapOfString;
@@ -139,7 +139,7 @@ public class MapTest {
    * Get mapOfEnumString
    * @return mapOfEnumString
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Map<String, InnerEnum> getMapOfEnumString() {
     return mapOfEnumString;
@@ -166,7 +166,7 @@ public class MapTest {
    * Get directMap
    * @return directMap
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Map<String, Boolean> getDirectMap() {
     return directMap;
@@ -193,7 +193,7 @@ public class MapTest {
    * Get indirectMap
    * @return indirectMap
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Map<String, Boolean> getIndirectMap() {
     return indirectMap;
diff --git a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java
index 78d80bd7f0..1826c8b064 100644
--- a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java
+++ b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java
@@ -56,7 +56,7 @@ public class MixedPropertiesAndAdditionalPropertiesClass {
    * Get uuid
    * @return uuid
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public UUID getUuid() {
     return uuid;
@@ -75,7 +75,7 @@ public class MixedPropertiesAndAdditionalPropertiesClass {
    * Get dateTime
    * @return dateTime
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public OffsetDateTime getDateTime() {
     return dateTime;
@@ -102,7 +102,7 @@ public class MixedPropertiesAndAdditionalPropertiesClass {
    * Get map
    * @return map
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Map<String, Animal> getMap() {
     return map;
diff --git a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/Model200Response.java b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/Model200Response.java
index 0c0fc9710d..3167560a9d 100644
--- a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/Model200Response.java
+++ b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/Model200Response.java
@@ -47,7 +47,7 @@ public class Model200Response {
    * Get name
    * @return name
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Integer getName() {
     return name;
@@ -66,7 +66,7 @@ public class Model200Response {
    * Get propertyClass
    * @return propertyClass
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getPropertyClass() {
     return propertyClass;
diff --git a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/ModelApiResponse.java b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/ModelApiResponse.java
index 777b1a8a7c..84d2fcc4d3 100644
--- a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/ModelApiResponse.java
+++ b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/ModelApiResponse.java
@@ -50,7 +50,7 @@ public class ModelApiResponse {
    * Get code
    * @return code
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Integer getCode() {
     return code;
@@ -69,7 +69,7 @@ public class ModelApiResponse {
    * Get type
    * @return type
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getType() {
     return type;
@@ -88,7 +88,7 @@ public class ModelApiResponse {
    * Get message
    * @return message
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getMessage() {
     return message;
diff --git a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/ModelReturn.java b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/ModelReturn.java
index 225df7f4e8..c13f1babe5 100644
--- a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/ModelReturn.java
+++ b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/ModelReturn.java
@@ -43,7 +43,7 @@ public class ModelReturn {
    * Get _return
    * @return _return
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Integer getReturn() {
     return _return;
diff --git a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/Name.java b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/Name.java
index c5a5691688..221821d4e1 100644
--- a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/Name.java
+++ b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/Name.java
@@ -55,7 +55,6 @@ public class Name {
    * Get name
    * @return name
   **/
-
   @ApiModelProperty(required = true, value = "")
   public Integer getName() {
     return name;
@@ -69,7 +68,7 @@ public class Name {
    * Get snakeCase
    * @return snakeCase
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Integer getSnakeCase() {
     return snakeCase;
@@ -84,7 +83,7 @@ public class Name {
    * Get property
    * @return property
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getProperty() {
     return property;
@@ -98,7 +97,7 @@ public class Name {
    * Get _123number
    * @return _123number
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Integer get123number() {
     return _123number;
diff --git a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/NumberOnly.java b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/NumberOnly.java
index 00ffd2f67e..9a068c2e1e 100644
--- a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/NumberOnly.java
+++ b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/NumberOnly.java
@@ -43,7 +43,7 @@ public class NumberOnly {
    * Get justNumber
    * @return justNumber
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public BigDecimal getJustNumber() {
     return justNumber;
diff --git a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/Order.java b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/Order.java
index 75a8568707..bfd740e83b 100644
--- a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/Order.java
+++ b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/Order.java
@@ -112,7 +112,7 @@ public class Order {
    * Get id
    * @return id
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Long getId() {
     return id;
@@ -131,7 +131,7 @@ public class Order {
    * Get petId
    * @return petId
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Long getPetId() {
     return petId;
@@ -150,7 +150,7 @@ public class Order {
    * Get quantity
    * @return quantity
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Integer getQuantity() {
     return quantity;
@@ -169,7 +169,7 @@ public class Order {
    * Get shipDate
    * @return shipDate
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public OffsetDateTime getShipDate() {
     return shipDate;
@@ -188,7 +188,7 @@ public class Order {
    * Order Status
    * @return status
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "Order Status")
   public StatusEnum getStatus() {
     return status;
@@ -207,7 +207,7 @@ public class Order {
    * Get complete
    * @return complete
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Boolean isComplete() {
     return complete;
diff --git a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/OuterComposite.java b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/OuterComposite.java
index 0c3317899b..5bc91ffa0a 100644
--- a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/OuterComposite.java
+++ b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/OuterComposite.java
@@ -51,7 +51,7 @@ public class OuterComposite {
    * Get myNumber
    * @return myNumber
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public BigDecimal getMyNumber() {
     return myNumber;
@@ -70,7 +70,7 @@ public class OuterComposite {
    * Get myString
    * @return myString
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getMyString() {
     return myString;
@@ -89,7 +89,7 @@ public class OuterComposite {
    * Get myBoolean
    * @return myBoolean
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Boolean isMyBoolean() {
     return myBoolean;
diff --git a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/Pet.java b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/Pet.java
index 5ac8165f7f..59fe8406f4 100644
--- a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/Pet.java
+++ b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/Pet.java
@@ -115,7 +115,7 @@ public class Pet {
    * Get id
    * @return id
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Long getId() {
     return id;
@@ -134,7 +134,7 @@ public class Pet {
    * Get category
    * @return category
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Category getCategory() {
     return category;
@@ -153,7 +153,6 @@ public class Pet {
    * Get name
    * @return name
   **/
-
   @ApiModelProperty(example = "doggie", required = true, value = "")
   public String getName() {
     return name;
@@ -177,7 +176,6 @@ public class Pet {
    * Get photoUrls
    * @return photoUrls
   **/
-
   @ApiModelProperty(required = true, value = "")
   public List<String> getPhotoUrls() {
     return photoUrls;
@@ -204,7 +202,7 @@ public class Pet {
    * Get tags
    * @return tags
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public List<Tag> getTags() {
     return tags;
@@ -223,7 +221,7 @@ public class Pet {
    * pet status in the store
    * @return status
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "pet status in the store")
   public StatusEnum getStatus() {
     return status;
diff --git a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/ReadOnlyFirst.java b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/ReadOnlyFirst.java
index 23ec5576c0..84780d763a 100644
--- a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/ReadOnlyFirst.java
+++ b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/ReadOnlyFirst.java
@@ -41,7 +41,7 @@ public class ReadOnlyFirst {
    * Get bar
    * @return bar
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getBar() {
     return bar;
@@ -56,7 +56,7 @@ public class ReadOnlyFirst {
    * Get baz
    * @return baz
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getBaz() {
     return baz;
diff --git a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/SpecialModelName.java b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/SpecialModelName.java
index f4a7d343a7..c6ccd2c33f 100644
--- a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/SpecialModelName.java
+++ b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/SpecialModelName.java
@@ -42,7 +42,7 @@ public class SpecialModelName {
    * Get $specialPropertyName
    * @return $specialPropertyName
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Long get$SpecialPropertyName() {
     return $specialPropertyName;
diff --git a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/Tag.java b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/Tag.java
index bce1fc934d..504c51cc3e 100644
--- a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/Tag.java
+++ b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/Tag.java
@@ -46,7 +46,7 @@ public class Tag {
    * Get id
    * @return id
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Long getId() {
     return id;
@@ -65,7 +65,7 @@ public class Tag {
    * Get name
    * @return name
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getName() {
     return name;
diff --git a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/TypeHolderDefault.java b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/TypeHolderDefault.java
index e302fc33c0..13d9a5ad67 100644
--- a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/TypeHolderDefault.java
+++ b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/TypeHolderDefault.java
@@ -61,7 +61,6 @@ public class TypeHolderDefault {
    * Get stringItem
    * @return stringItem
   **/
-
   @ApiModelProperty(required = true, value = "")
   public String getStringItem() {
     return stringItem;
@@ -80,7 +79,6 @@ public class TypeHolderDefault {
    * Get numberItem
    * @return numberItem
   **/
-
   @ApiModelProperty(required = true, value = "")
   public BigDecimal getNumberItem() {
     return numberItem;
@@ -99,7 +97,6 @@ public class TypeHolderDefault {
    * Get integerItem
    * @return integerItem
   **/
-
   @ApiModelProperty(required = true, value = "")
   public Integer getIntegerItem() {
     return integerItem;
@@ -118,7 +115,6 @@ public class TypeHolderDefault {
    * Get boolItem
    * @return boolItem
   **/
-
   @ApiModelProperty(required = true, value = "")
   public Boolean isBoolItem() {
     return boolItem;
@@ -142,7 +138,6 @@ public class TypeHolderDefault {
    * Get arrayItem
    * @return arrayItem
   **/
-
   @ApiModelProperty(required = true, value = "")
   public List<Integer> getArrayItem() {
     return arrayItem;
diff --git a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/TypeHolderExample.java b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/TypeHolderExample.java
index 26d4b5c120..adf66b7c65 100644
--- a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/TypeHolderExample.java
+++ b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/TypeHolderExample.java
@@ -61,7 +61,6 @@ public class TypeHolderExample {
    * Get stringItem
    * @return stringItem
   **/
-
   @ApiModelProperty(example = "what", required = true, value = "")
   public String getStringItem() {
     return stringItem;
@@ -80,7 +79,6 @@ public class TypeHolderExample {
    * Get numberItem
    * @return numberItem
   **/
-
   @ApiModelProperty(example = "1.234", required = true, value = "")
   public BigDecimal getNumberItem() {
     return numberItem;
@@ -99,7 +97,6 @@ public class TypeHolderExample {
    * Get integerItem
    * @return integerItem
   **/
-
   @ApiModelProperty(example = "-2", required = true, value = "")
   public Integer getIntegerItem() {
     return integerItem;
@@ -118,7 +115,6 @@ public class TypeHolderExample {
    * Get boolItem
    * @return boolItem
   **/
-
   @ApiModelProperty(example = "true", required = true, value = "")
   public Boolean isBoolItem() {
     return boolItem;
@@ -142,7 +138,6 @@ public class TypeHolderExample {
    * Get arrayItem
    * @return arrayItem
   **/
-
   @ApiModelProperty(example = "[0, 1, 2, 3]", required = true, value = "")
   public List<Integer> getArrayItem() {
     return arrayItem;
diff --git a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/User.java b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/User.java
index 3f9eb4bb8a..1aedd044b5 100644
--- a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/User.java
+++ b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/User.java
@@ -70,7 +70,7 @@ public class User {
    * Get id
    * @return id
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Long getId() {
     return id;
@@ -89,7 +89,7 @@ public class User {
    * Get username
    * @return username
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getUsername() {
     return username;
@@ -108,7 +108,7 @@ public class User {
    * Get firstName
    * @return firstName
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getFirstName() {
     return firstName;
@@ -127,7 +127,7 @@ public class User {
    * Get lastName
    * @return lastName
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getLastName() {
     return lastName;
@@ -146,7 +146,7 @@ public class User {
    * Get email
    * @return email
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getEmail() {
     return email;
@@ -165,7 +165,7 @@ public class User {
    * Get password
    * @return password
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getPassword() {
     return password;
@@ -184,7 +184,7 @@ public class User {
    * Get phone
    * @return phone
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getPhone() {
     return phone;
@@ -203,7 +203,7 @@ public class User {
    * User Status
    * @return userStatus
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "User Status")
   public Integer getUserStatus() {
     return userStatus;
diff --git a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/XmlItem.java b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/XmlItem.java
index bbd0fce821..42c4ad1631 100644
--- a/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/XmlItem.java
+++ b/samples/client/petstore/java/rest-assured/src/main/java/org/openapitools/client/model/XmlItem.java
@@ -157,7 +157,7 @@ public class XmlItem {
    * Get attributeString
    * @return attributeString
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(example = "string", value = "")
   public String getAttributeString() {
     return attributeString;
@@ -176,7 +176,7 @@ public class XmlItem {
    * Get attributeNumber
    * @return attributeNumber
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(example = "1.234", value = "")
   public BigDecimal getAttributeNumber() {
     return attributeNumber;
@@ -195,7 +195,7 @@ public class XmlItem {
    * Get attributeInteger
    * @return attributeInteger
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(example = "-2", value = "")
   public Integer getAttributeInteger() {
     return attributeInteger;
@@ -214,7 +214,7 @@ public class XmlItem {
    * Get attributeBoolean
    * @return attributeBoolean
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(example = "true", value = "")
   public Boolean isAttributeBoolean() {
     return attributeBoolean;
@@ -241,7 +241,7 @@ public class XmlItem {
    * Get wrappedArray
    * @return wrappedArray
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public List<Integer> getWrappedArray() {
     return wrappedArray;
@@ -260,7 +260,7 @@ public class XmlItem {
    * Get nameString
    * @return nameString
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(example = "string", value = "")
   public String getNameString() {
     return nameString;
@@ -279,7 +279,7 @@ public class XmlItem {
    * Get nameNumber
    * @return nameNumber
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(example = "1.234", value = "")
   public BigDecimal getNameNumber() {
     return nameNumber;
@@ -298,7 +298,7 @@ public class XmlItem {
    * Get nameInteger
    * @return nameInteger
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(example = "-2", value = "")
   public Integer getNameInteger() {
     return nameInteger;
@@ -317,7 +317,7 @@ public class XmlItem {
    * Get nameBoolean
    * @return nameBoolean
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(example = "true", value = "")
   public Boolean isNameBoolean() {
     return nameBoolean;
@@ -344,7 +344,7 @@ public class XmlItem {
    * Get nameArray
    * @return nameArray
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public List<Integer> getNameArray() {
     return nameArray;
@@ -371,7 +371,7 @@ public class XmlItem {
    * Get nameWrappedArray
    * @return nameWrappedArray
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public List<Integer> getNameWrappedArray() {
     return nameWrappedArray;
@@ -390,7 +390,7 @@ public class XmlItem {
    * Get prefixString
    * @return prefixString
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(example = "string", value = "")
   public String getPrefixString() {
     return prefixString;
@@ -409,7 +409,7 @@ public class XmlItem {
    * Get prefixNumber
    * @return prefixNumber
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(example = "1.234", value = "")
   public BigDecimal getPrefixNumber() {
     return prefixNumber;
@@ -428,7 +428,7 @@ public class XmlItem {
    * Get prefixInteger
    * @return prefixInteger
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(example = "-2", value = "")
   public Integer getPrefixInteger() {
     return prefixInteger;
@@ -447,7 +447,7 @@ public class XmlItem {
    * Get prefixBoolean
    * @return prefixBoolean
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(example = "true", value = "")
   public Boolean isPrefixBoolean() {
     return prefixBoolean;
@@ -474,7 +474,7 @@ public class XmlItem {
    * Get prefixArray
    * @return prefixArray
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public List<Integer> getPrefixArray() {
     return prefixArray;
@@ -501,7 +501,7 @@ public class XmlItem {
    * Get prefixWrappedArray
    * @return prefixWrappedArray
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public List<Integer> getPrefixWrappedArray() {
     return prefixWrappedArray;
@@ -520,7 +520,7 @@ public class XmlItem {
    * Get namespaceString
    * @return namespaceString
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(example = "string", value = "")
   public String getNamespaceString() {
     return namespaceString;
@@ -539,7 +539,7 @@ public class XmlItem {
    * Get namespaceNumber
    * @return namespaceNumber
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(example = "1.234", value = "")
   public BigDecimal getNamespaceNumber() {
     return namespaceNumber;
@@ -558,7 +558,7 @@ public class XmlItem {
    * Get namespaceInteger
    * @return namespaceInteger
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(example = "-2", value = "")
   public Integer getNamespaceInteger() {
     return namespaceInteger;
@@ -577,7 +577,7 @@ public class XmlItem {
    * Get namespaceBoolean
    * @return namespaceBoolean
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(example = "true", value = "")
   public Boolean isNamespaceBoolean() {
     return namespaceBoolean;
@@ -604,7 +604,7 @@ public class XmlItem {
    * Get namespaceArray
    * @return namespaceArray
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public List<Integer> getNamespaceArray() {
     return namespaceArray;
@@ -631,7 +631,7 @@ public class XmlItem {
    * Get namespaceWrappedArray
    * @return namespaceWrappedArray
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public List<Integer> getNamespaceWrappedArray() {
     return namespaceWrappedArray;
@@ -650,7 +650,7 @@ public class XmlItem {
    * Get prefixNsString
    * @return prefixNsString
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(example = "string", value = "")
   public String getPrefixNsString() {
     return prefixNsString;
@@ -669,7 +669,7 @@ public class XmlItem {
    * Get prefixNsNumber
    * @return prefixNsNumber
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(example = "1.234", value = "")
   public BigDecimal getPrefixNsNumber() {
     return prefixNsNumber;
@@ -688,7 +688,7 @@ public class XmlItem {
    * Get prefixNsInteger
    * @return prefixNsInteger
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(example = "-2", value = "")
   public Integer getPrefixNsInteger() {
     return prefixNsInteger;
@@ -707,7 +707,7 @@ public class XmlItem {
    * Get prefixNsBoolean
    * @return prefixNsBoolean
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(example = "true", value = "")
   public Boolean isPrefixNsBoolean() {
     return prefixNsBoolean;
@@ -734,7 +734,7 @@ public class XmlItem {
    * Get prefixNsArray
    * @return prefixNsArray
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public List<Integer> getPrefixNsArray() {
     return prefixNsArray;
@@ -761,7 +761,7 @@ public class XmlItem {
    * Get prefixNsWrappedArray
    * @return prefixNsWrappedArray
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public List<Integer> getPrefixNsWrappedArray() {
     return prefixNsWrappedArray;
diff --git a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/AdditionalPropertiesAnyType.java b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/AdditionalPropertiesAnyType.java
index 1abb2d8a64..69d6a81729 100644
--- a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/AdditionalPropertiesAnyType.java
+++ b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/AdditionalPropertiesAnyType.java
@@ -40,7 +40,7 @@ public class AdditionalPropertiesAnyType extends HashMap<String, Object> {
    * Get name
    * @return name
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getName() {
     return name;
diff --git a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/AdditionalPropertiesArray.java b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/AdditionalPropertiesArray.java
index 1821c243e1..0147a592b7 100644
--- a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/AdditionalPropertiesArray.java
+++ b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/AdditionalPropertiesArray.java
@@ -41,7 +41,7 @@ public class AdditionalPropertiesArray extends HashMap<String, List> {
    * Get name
    * @return name
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getName() {
     return name;
diff --git a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/AdditionalPropertiesBoolean.java b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/AdditionalPropertiesBoolean.java
index 78f7ac79b2..89aa511c2a 100644
--- a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/AdditionalPropertiesBoolean.java
+++ b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/AdditionalPropertiesBoolean.java
@@ -40,7 +40,7 @@ public class AdditionalPropertiesBoolean extends HashMap<String, Boolean> {
    * Get name
    * @return name
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getName() {
     return name;
diff --git a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java
index 406bccc278..cb955d1165 100644
--- a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java
+++ b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java
@@ -80,7 +80,7 @@ public class AdditionalPropertiesClass {
    * Get mapString
    * @return mapString
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Map<String, String> getMapString() {
     return mapString;
@@ -107,7 +107,7 @@ public class AdditionalPropertiesClass {
    * Get mapNumber
    * @return mapNumber
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Map<String, BigDecimal> getMapNumber() {
     return mapNumber;
@@ -134,7 +134,7 @@ public class AdditionalPropertiesClass {
    * Get mapInteger
    * @return mapInteger
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Map<String, Integer> getMapInteger() {
     return mapInteger;
@@ -161,7 +161,7 @@ public class AdditionalPropertiesClass {
    * Get mapBoolean
    * @return mapBoolean
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Map<String, Boolean> getMapBoolean() {
     return mapBoolean;
@@ -188,7 +188,7 @@ public class AdditionalPropertiesClass {
    * Get mapArrayInteger
    * @return mapArrayInteger
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Map<String, List<Integer>> getMapArrayInteger() {
     return mapArrayInteger;
@@ -215,7 +215,7 @@ public class AdditionalPropertiesClass {
    * Get mapArrayAnytype
    * @return mapArrayAnytype
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Map<String, List<Object>> getMapArrayAnytype() {
     return mapArrayAnytype;
@@ -242,7 +242,7 @@ public class AdditionalPropertiesClass {
    * Get mapMapString
    * @return mapMapString
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Map<String, Map<String, String>> getMapMapString() {
     return mapMapString;
@@ -269,7 +269,7 @@ public class AdditionalPropertiesClass {
    * Get mapMapAnytype
    * @return mapMapAnytype
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Map<String, Map<String, Object>> getMapMapAnytype() {
     return mapMapAnytype;
@@ -288,7 +288,7 @@ public class AdditionalPropertiesClass {
    * Get anytype1
    * @return anytype1
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Object getAnytype1() {
     return anytype1;
@@ -307,7 +307,7 @@ public class AdditionalPropertiesClass {
    * Get anytype2
    * @return anytype2
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Object getAnytype2() {
     return anytype2;
@@ -326,7 +326,7 @@ public class AdditionalPropertiesClass {
    * Get anytype3
    * @return anytype3
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Object getAnytype3() {
     return anytype3;
diff --git a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/AdditionalPropertiesInteger.java b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/AdditionalPropertiesInteger.java
index 6e5159d404..f27ff011de 100644
--- a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/AdditionalPropertiesInteger.java
+++ b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/AdditionalPropertiesInteger.java
@@ -40,7 +40,7 @@ public class AdditionalPropertiesInteger extends HashMap<String, Integer> {
    * Get name
    * @return name
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getName() {
     return name;
diff --git a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/AdditionalPropertiesNumber.java b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/AdditionalPropertiesNumber.java
index ddc8146dea..479696fdce 100644
--- a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/AdditionalPropertiesNumber.java
+++ b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/AdditionalPropertiesNumber.java
@@ -41,7 +41,7 @@ public class AdditionalPropertiesNumber extends HashMap<String, BigDecimal> {
    * Get name
    * @return name
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getName() {
     return name;
diff --git a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/AdditionalPropertiesObject.java b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/AdditionalPropertiesObject.java
index cc29400029..bd569b0da3 100644
--- a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/AdditionalPropertiesObject.java
+++ b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/AdditionalPropertiesObject.java
@@ -40,7 +40,7 @@ public class AdditionalPropertiesObject extends HashMap<String, Map> {
    * Get name
    * @return name
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getName() {
     return name;
diff --git a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/AdditionalPropertiesString.java b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/AdditionalPropertiesString.java
index fb3368dfed..27e03a2313 100644
--- a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/AdditionalPropertiesString.java
+++ b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/AdditionalPropertiesString.java
@@ -40,7 +40,7 @@ public class AdditionalPropertiesString extends HashMap<String, String> {
    * Get name
    * @return name
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getName() {
     return name;
diff --git a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/Animal.java b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/Animal.java
index 53a0eec339..dc16717ac3 100644
--- a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/Animal.java
+++ b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/Animal.java
@@ -49,7 +49,6 @@ public class Animal {
    * Get className
    * @return className
   **/
-
   @ApiModelProperty(required = true, value = "")
   public String getClassName() {
     return className;
@@ -68,7 +67,7 @@ public class Animal {
    * Get color
    * @return color
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getColor() {
     return color;
diff --git a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java
index de49df3fbd..b670ecb66e 100644
--- a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java
+++ b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java
@@ -49,7 +49,7 @@ public class ArrayOfArrayOfNumberOnly {
    * Get arrayArrayNumber
    * @return arrayArrayNumber
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public List<List<BigDecimal>> getArrayArrayNumber() {
     return arrayArrayNumber;
diff --git a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java
index f4399ff42d..9d6997f88f 100644
--- a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java
+++ b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java
@@ -49,7 +49,7 @@ public class ArrayOfNumberOnly {
    * Get arrayNumber
    * @return arrayNumber
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public List<BigDecimal> getArrayNumber() {
     return arrayNumber;
diff --git a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/ArrayTest.java b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/ArrayTest.java
index 7483fa96ce..7dc235f0a9 100644
--- a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/ArrayTest.java
+++ b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/ArrayTest.java
@@ -55,7 +55,7 @@ public class ArrayTest {
    * Get arrayOfString
    * @return arrayOfString
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public List<String> getArrayOfString() {
     return arrayOfString;
@@ -82,7 +82,7 @@ public class ArrayTest {
    * Get arrayArrayOfInteger
    * @return arrayArrayOfInteger
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public List<List<Long>> getArrayArrayOfInteger() {
     return arrayArrayOfInteger;
@@ -109,7 +109,7 @@ public class ArrayTest {
    * Get arrayArrayOfModel
    * @return arrayArrayOfModel
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public List<List<ReadOnlyFirst>> getArrayArrayOfModel() {
     return arrayArrayOfModel;
diff --git a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/Capitalization.java b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/Capitalization.java
index bb83be97fe..3f3df29d5d 100644
--- a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/Capitalization.java
+++ b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/Capitalization.java
@@ -53,7 +53,7 @@ public class Capitalization {
    * Get smallCamel
    * @return smallCamel
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getSmallCamel() {
     return smallCamel;
@@ -72,7 +72,7 @@ public class Capitalization {
    * Get capitalCamel
    * @return capitalCamel
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getCapitalCamel() {
     return capitalCamel;
@@ -91,7 +91,7 @@ public class Capitalization {
    * Get smallSnake
    * @return smallSnake
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getSmallSnake() {
     return smallSnake;
@@ -110,7 +110,7 @@ public class Capitalization {
    * Get capitalSnake
    * @return capitalSnake
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getCapitalSnake() {
     return capitalSnake;
@@ -129,7 +129,7 @@ public class Capitalization {
    * Get scAETHFlowPoints
    * @return scAETHFlowPoints
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getScAETHFlowPoints() {
     return scAETHFlowPoints;
@@ -148,7 +148,7 @@ public class Capitalization {
    * Name of the pet 
    * @return ATT_NAME
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "Name of the pet ")
   public String getATTNAME() {
     return ATT_NAME;
diff --git a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/Cat.java b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/Cat.java
index ce456c8647..a8108d6f15 100644
--- a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/Cat.java
+++ b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/Cat.java
@@ -40,7 +40,7 @@ public class Cat extends Animal {
    * Get declawed
    * @return declawed
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Boolean getDeclawed() {
     return declawed;
diff --git a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/CatAllOf.java b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/CatAllOf.java
index 224c08671c..42e9614610 100644
--- a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/CatAllOf.java
+++ b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/CatAllOf.java
@@ -38,7 +38,7 @@ public class CatAllOf {
    * Get declawed
    * @return declawed
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Boolean getDeclawed() {
     return declawed;
diff --git a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/Category.java b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/Category.java
index 03efdd4be8..3eccd2cd92 100644
--- a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/Category.java
+++ b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/Category.java
@@ -41,7 +41,7 @@ public class Category {
    * Get id
    * @return id
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Long getId() {
     return id;
@@ -60,7 +60,6 @@ public class Category {
    * Get name
    * @return name
   **/
-
   @ApiModelProperty(required = true, value = "")
   public String getName() {
     return name;
diff --git a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/ClassModel.java b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/ClassModel.java
index def421a670..2aaed27fff 100644
--- a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/ClassModel.java
+++ b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/ClassModel.java
@@ -39,7 +39,7 @@ public class ClassModel {
    * Get propertyClass
    * @return propertyClass
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getPropertyClass() {
     return propertyClass;
diff --git a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/Client.java b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/Client.java
index c0bd0743e5..458e812960 100644
--- a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/Client.java
+++ b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/Client.java
@@ -38,7 +38,7 @@ public class Client {
    * Get client
    * @return client
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getClient() {
     return client;
diff --git a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/Dog.java b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/Dog.java
index 6b79c59606..83f5cb0e27 100644
--- a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/Dog.java
+++ b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/Dog.java
@@ -40,7 +40,7 @@ public class Dog extends Animal {
    * Get breed
    * @return breed
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getBreed() {
     return breed;
diff --git a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/DogAllOf.java b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/DogAllOf.java
index 1a4496d8f0..d1e1402789 100644
--- a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/DogAllOf.java
+++ b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/DogAllOf.java
@@ -38,7 +38,7 @@ public class DogAllOf {
    * Get breed
    * @return breed
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getBreed() {
     return breed;
diff --git a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/EnumArrays.java b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/EnumArrays.java
index 40e31bf3ca..368b481f7e 100644
--- a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/EnumArrays.java
+++ b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/EnumArrays.java
@@ -113,7 +113,7 @@ public class EnumArrays {
    * Get justSymbol
    * @return justSymbol
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public JustSymbolEnum getJustSymbol() {
     return justSymbol;
@@ -140,7 +140,7 @@ public class EnumArrays {
    * Get arrayEnum
    * @return arrayEnum
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public List<ArrayEnumEnum> getArrayEnum() {
     return arrayEnum;
diff --git a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/EnumTest.java b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/EnumTest.java
index d4b36798ee..b365a8a56f 100644
--- a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/EnumTest.java
+++ b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/EnumTest.java
@@ -195,7 +195,7 @@ public class EnumTest {
    * Get enumString
    * @return enumString
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public EnumStringEnum getEnumString() {
     return enumString;
@@ -214,7 +214,6 @@ public class EnumTest {
    * Get enumStringRequired
    * @return enumStringRequired
   **/
-
   @ApiModelProperty(required = true, value = "")
   public EnumStringRequiredEnum getEnumStringRequired() {
     return enumStringRequired;
@@ -233,7 +232,7 @@ public class EnumTest {
    * Get enumInteger
    * @return enumInteger
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public EnumIntegerEnum getEnumInteger() {
     return enumInteger;
@@ -252,7 +251,7 @@ public class EnumTest {
    * Get enumNumber
    * @return enumNumber
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public EnumNumberEnum getEnumNumber() {
     return enumNumber;
@@ -271,7 +270,7 @@ public class EnumTest {
    * Get outerEnum
    * @return outerEnum
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public OuterEnum getOuterEnum() {
     return outerEnum;
diff --git a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java
index bee77a8cec..ca73764280 100644
--- a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java
+++ b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java
@@ -43,7 +43,7 @@ public class FileSchemaTestClass {
    * Get file
    * @return file
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public java.io.File getFile() {
     return file;
@@ -70,7 +70,7 @@ public class FileSchemaTestClass {
    * Get files
    * @return files
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public List<java.io.File> getFiles() {
     return files;
diff --git a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/FormatTest.java b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/FormatTest.java
index c017f57a80..00d132529e 100644
--- a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/FormatTest.java
+++ b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/FormatTest.java
@@ -81,7 +81,7 @@ public class FormatTest {
    * maximum: 100
    * @return integer
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Integer getInteger() {
     return integer;
@@ -102,7 +102,7 @@ public class FormatTest {
    * maximum: 200
    * @return int32
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Integer getInt32() {
     return int32;
@@ -121,7 +121,7 @@ public class FormatTest {
    * Get int64
    * @return int64
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Long getInt64() {
     return int64;
@@ -142,7 +142,6 @@ public class FormatTest {
    * maximum: 543.2
    * @return number
   **/
-
   @ApiModelProperty(required = true, value = "")
   public BigDecimal getNumber() {
     return number;
@@ -163,7 +162,7 @@ public class FormatTest {
    * maximum: 987.6
    * @return _float
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Float getFloat() {
     return _float;
@@ -184,7 +183,7 @@ public class FormatTest {
    * maximum: 123.4
    * @return _double
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Double getDouble() {
     return _double;
@@ -203,7 +202,7 @@ public class FormatTest {
    * Get string
    * @return string
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getString() {
     return string;
@@ -222,7 +221,6 @@ public class FormatTest {
    * Get _byte
    * @return _byte
   **/
-
   @ApiModelProperty(required = true, value = "")
   public byte[] getByte() {
     return _byte;
@@ -241,7 +239,7 @@ public class FormatTest {
    * Get binary
    * @return binary
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public File getBinary() {
     return binary;
@@ -260,7 +258,6 @@ public class FormatTest {
    * Get date
    * @return date
   **/
-
   @ApiModelProperty(required = true, value = "")
   public LocalDate getDate() {
     return date;
@@ -279,7 +276,7 @@ public class FormatTest {
    * Get dateTime
    * @return dateTime
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public OffsetDateTime getDateTime() {
     return dateTime;
@@ -298,7 +295,7 @@ public class FormatTest {
    * Get uuid
    * @return uuid
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(example = "72f98069-206d-4f12-9f12-3d1e525a8e84", value = "")
   public UUID getUuid() {
     return uuid;
@@ -317,7 +314,6 @@ public class FormatTest {
    * Get password
    * @return password
   **/
-
   @ApiModelProperty(required = true, value = "")
   public String getPassword() {
     return password;
diff --git a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java
index 44159e08e8..e9453bb6cc 100644
--- a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java
+++ b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java
@@ -36,7 +36,7 @@ public class HasOnlyReadOnly {
    * Get bar
    * @return bar
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getBar() {
     return bar;
@@ -46,7 +46,7 @@ public class HasOnlyReadOnly {
    * Get foo
    * @return foo
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getFoo() {
     return foo;
diff --git a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/MapTest.java b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/MapTest.java
index a7a141bb9b..44cd694057 100644
--- a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/MapTest.java
+++ b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/MapTest.java
@@ -93,7 +93,7 @@ public class MapTest {
    * Get mapMapOfString
    * @return mapMapOfString
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Map<String, Map<String, String>> getMapMapOfString() {
     return mapMapOfString;
@@ -120,7 +120,7 @@ public class MapTest {
    * Get mapOfEnumString
    * @return mapOfEnumString
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Map<String, InnerEnum> getMapOfEnumString() {
     return mapOfEnumString;
@@ -147,7 +147,7 @@ public class MapTest {
    * Get directMap
    * @return directMap
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Map<String, Boolean> getDirectMap() {
     return directMap;
@@ -174,7 +174,7 @@ public class MapTest {
    * Get indirectMap
    * @return indirectMap
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Map<String, Boolean> getIndirectMap() {
     return indirectMap;
diff --git a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java
index ea930e3e2e..19d808093c 100644
--- a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java
+++ b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java
@@ -50,7 +50,7 @@ public class MixedPropertiesAndAdditionalPropertiesClass {
    * Get uuid
    * @return uuid
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public UUID getUuid() {
     return uuid;
@@ -69,7 +69,7 @@ public class MixedPropertiesAndAdditionalPropertiesClass {
    * Get dateTime
    * @return dateTime
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public OffsetDateTime getDateTime() {
     return dateTime;
@@ -96,7 +96,7 @@ public class MixedPropertiesAndAdditionalPropertiesClass {
    * Get map
    * @return map
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Map<String, Animal> getMap() {
     return map;
diff --git a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/Model200Response.java b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/Model200Response.java
index bd3244dd57..39fabeeb6d 100644
--- a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/Model200Response.java
+++ b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/Model200Response.java
@@ -42,7 +42,7 @@ public class Model200Response {
    * Get name
    * @return name
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Integer getName() {
     return name;
@@ -61,7 +61,7 @@ public class Model200Response {
    * Get propertyClass
    * @return propertyClass
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getPropertyClass() {
     return propertyClass;
diff --git a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/ModelApiResponse.java b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/ModelApiResponse.java
index ed335cdca1..bb33412951 100644
--- a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/ModelApiResponse.java
+++ b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/ModelApiResponse.java
@@ -44,7 +44,7 @@ public class ModelApiResponse {
    * Get code
    * @return code
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Integer getCode() {
     return code;
@@ -63,7 +63,7 @@ public class ModelApiResponse {
    * Get type
    * @return type
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getType() {
     return type;
@@ -82,7 +82,7 @@ public class ModelApiResponse {
    * Get message
    * @return message
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getMessage() {
     return message;
diff --git a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/ModelReturn.java b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/ModelReturn.java
index 04c0bcd33f..9aafb13e04 100644
--- a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/ModelReturn.java
+++ b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/ModelReturn.java
@@ -39,7 +39,7 @@ public class ModelReturn {
    * Get _return
    * @return _return
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Integer getReturn() {
     return _return;
diff --git a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/Name.java b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/Name.java
index af27c6e45f..9518276dd6 100644
--- a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/Name.java
+++ b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/Name.java
@@ -48,7 +48,6 @@ public class Name {
    * Get name
    * @return name
   **/
-
   @ApiModelProperty(required = true, value = "")
   public Integer getName() {
     return name;
@@ -62,7 +61,7 @@ public class Name {
    * Get snakeCase
    * @return snakeCase
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Integer getSnakeCase() {
     return snakeCase;
@@ -77,7 +76,7 @@ public class Name {
    * Get property
    * @return property
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getProperty() {
     return property;
@@ -91,7 +90,7 @@ public class Name {
    * Get _123number
    * @return _123number
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Integer get123number() {
     return _123number;
diff --git a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/NumberOnly.java b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/NumberOnly.java
index 4e29c814cc..0245e8e210 100644
--- a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/NumberOnly.java
+++ b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/NumberOnly.java
@@ -39,7 +39,7 @@ public class NumberOnly {
    * Get justNumber
    * @return justNumber
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public BigDecimal getJustNumber() {
     return justNumber;
diff --git a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/Order.java b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/Order.java
index 9e935d606e..a9e2986a2f 100644
--- a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/Order.java
+++ b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/Order.java
@@ -91,7 +91,7 @@ public class Order {
    * Get id
    * @return id
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Long getId() {
     return id;
@@ -110,7 +110,7 @@ public class Order {
    * Get petId
    * @return petId
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Long getPetId() {
     return petId;
@@ -129,7 +129,7 @@ public class Order {
    * Get quantity
    * @return quantity
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Integer getQuantity() {
     return quantity;
@@ -148,7 +148,7 @@ public class Order {
    * Get shipDate
    * @return shipDate
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public OffsetDateTime getShipDate() {
     return shipDate;
@@ -167,7 +167,7 @@ public class Order {
    * Order Status
    * @return status
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "Order Status")
   public StatusEnum getStatus() {
     return status;
@@ -186,7 +186,7 @@ public class Order {
    * Get complete
    * @return complete
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Boolean getComplete() {
     return complete;
diff --git a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/OuterComposite.java b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/OuterComposite.java
index f6515126a8..c8bd99011c 100644
--- a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/OuterComposite.java
+++ b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/OuterComposite.java
@@ -45,7 +45,7 @@ public class OuterComposite {
    * Get myNumber
    * @return myNumber
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public BigDecimal getMyNumber() {
     return myNumber;
@@ -64,7 +64,7 @@ public class OuterComposite {
    * Get myString
    * @return myString
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getMyString() {
     return myString;
@@ -83,7 +83,7 @@ public class OuterComposite {
    * Get myBoolean
    * @return myBoolean
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Boolean getMyBoolean() {
     return myBoolean;
diff --git a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/Pet.java b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/Pet.java
index 63e9b4ff5d..a7d92129d7 100644
--- a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/Pet.java
+++ b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/Pet.java
@@ -94,7 +94,7 @@ public class Pet {
    * Get id
    * @return id
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Long getId() {
     return id;
@@ -113,7 +113,7 @@ public class Pet {
    * Get category
    * @return category
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Category getCategory() {
     return category;
@@ -132,7 +132,6 @@ public class Pet {
    * Get name
    * @return name
   **/
-
   @ApiModelProperty(example = "doggie", required = true, value = "")
   public String getName() {
     return name;
@@ -156,7 +155,6 @@ public class Pet {
    * Get photoUrls
    * @return photoUrls
   **/
-
   @ApiModelProperty(required = true, value = "")
   public List<String> getPhotoUrls() {
     return photoUrls;
@@ -183,7 +181,7 @@ public class Pet {
    * Get tags
    * @return tags
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public List<Tag> getTags() {
     return tags;
@@ -202,7 +200,7 @@ public class Pet {
    * pet status in the store
    * @return status
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "pet status in the store")
   public StatusEnum getStatus() {
     return status;
diff --git a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/ReadOnlyFirst.java b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/ReadOnlyFirst.java
index a2c9e99699..1379ee09ea 100644
--- a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/ReadOnlyFirst.java
+++ b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/ReadOnlyFirst.java
@@ -36,7 +36,7 @@ public class ReadOnlyFirst {
    * Get bar
    * @return bar
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getBar() {
     return bar;
@@ -51,7 +51,7 @@ public class ReadOnlyFirst {
    * Get baz
    * @return baz
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getBaz() {
     return baz;
diff --git a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/SpecialModelName.java b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/SpecialModelName.java
index a5ddb0b638..869771afad 100644
--- a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/SpecialModelName.java
+++ b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/SpecialModelName.java
@@ -38,7 +38,7 @@ public class SpecialModelName {
    * Get $specialPropertyName
    * @return $specialPropertyName
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Long get$SpecialPropertyName() {
     return $specialPropertyName;
diff --git a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/Tag.java b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/Tag.java
index 8255ad8298..4bb498aff4 100644
--- a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/Tag.java
+++ b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/Tag.java
@@ -41,7 +41,7 @@ public class Tag {
    * Get id
    * @return id
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Long getId() {
     return id;
@@ -60,7 +60,7 @@ public class Tag {
    * Get name
    * @return name
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getName() {
     return name;
diff --git a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/TypeHolderDefault.java b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/TypeHolderDefault.java
index d8c7b3efdd..9d0f5b2fbe 100644
--- a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/TypeHolderDefault.java
+++ b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/TypeHolderDefault.java
@@ -53,7 +53,6 @@ public class TypeHolderDefault {
    * Get stringItem
    * @return stringItem
   **/
-
   @ApiModelProperty(required = true, value = "")
   public String getStringItem() {
     return stringItem;
@@ -72,7 +71,6 @@ public class TypeHolderDefault {
    * Get numberItem
    * @return numberItem
   **/
-
   @ApiModelProperty(required = true, value = "")
   public BigDecimal getNumberItem() {
     return numberItem;
@@ -91,7 +89,6 @@ public class TypeHolderDefault {
    * Get integerItem
    * @return integerItem
   **/
-
   @ApiModelProperty(required = true, value = "")
   public Integer getIntegerItem() {
     return integerItem;
@@ -110,7 +107,6 @@ public class TypeHolderDefault {
    * Get boolItem
    * @return boolItem
   **/
-
   @ApiModelProperty(required = true, value = "")
   public Boolean getBoolItem() {
     return boolItem;
@@ -134,7 +130,6 @@ public class TypeHolderDefault {
    * Get arrayItem
    * @return arrayItem
   **/
-
   @ApiModelProperty(required = true, value = "")
   public List<Integer> getArrayItem() {
     return arrayItem;
diff --git a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/TypeHolderExample.java b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/TypeHolderExample.java
index c1d5ea30f8..94d3c57b6f 100644
--- a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/TypeHolderExample.java
+++ b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/TypeHolderExample.java
@@ -53,7 +53,6 @@ public class TypeHolderExample {
    * Get stringItem
    * @return stringItem
   **/
-
   @ApiModelProperty(example = "what", required = true, value = "")
   public String getStringItem() {
     return stringItem;
@@ -72,7 +71,6 @@ public class TypeHolderExample {
    * Get numberItem
    * @return numberItem
   **/
-
   @ApiModelProperty(example = "1.234", required = true, value = "")
   public BigDecimal getNumberItem() {
     return numberItem;
@@ -91,7 +89,6 @@ public class TypeHolderExample {
    * Get integerItem
    * @return integerItem
   **/
-
   @ApiModelProperty(example = "-2", required = true, value = "")
   public Integer getIntegerItem() {
     return integerItem;
@@ -110,7 +107,6 @@ public class TypeHolderExample {
    * Get boolItem
    * @return boolItem
   **/
-
   @ApiModelProperty(example = "true", required = true, value = "")
   public Boolean getBoolItem() {
     return boolItem;
@@ -134,7 +130,6 @@ public class TypeHolderExample {
    * Get arrayItem
    * @return arrayItem
   **/
-
   @ApiModelProperty(example = "[0, 1, 2, 3]", required = true, value = "")
   public List<Integer> getArrayItem() {
     return arrayItem;
diff --git a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/User.java b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/User.java
index 6e6c4ac102..73164c3ee2 100644
--- a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/User.java
+++ b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/User.java
@@ -59,7 +59,7 @@ public class User {
    * Get id
    * @return id
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Long getId() {
     return id;
@@ -78,7 +78,7 @@ public class User {
    * Get username
    * @return username
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getUsername() {
     return username;
@@ -97,7 +97,7 @@ public class User {
    * Get firstName
    * @return firstName
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getFirstName() {
     return firstName;
@@ -116,7 +116,7 @@ public class User {
    * Get lastName
    * @return lastName
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getLastName() {
     return lastName;
@@ -135,7 +135,7 @@ public class User {
    * Get email
    * @return email
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getEmail() {
     return email;
@@ -154,7 +154,7 @@ public class User {
    * Get password
    * @return password
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getPassword() {
     return password;
@@ -173,7 +173,7 @@ public class User {
    * Get phone
    * @return phone
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getPhone() {
     return phone;
@@ -192,7 +192,7 @@ public class User {
    * User Status
    * @return userStatus
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "User Status")
   public Integer getUserStatus() {
     return userStatus;
diff --git a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/XmlItem.java b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/XmlItem.java
index ce4af3e8b9..9032c23424 100644
--- a/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/XmlItem.java
+++ b/samples/client/petstore/java/resteasy/src/main/java/org/openapitools/client/model/XmlItem.java
@@ -125,7 +125,7 @@ public class XmlItem {
    * Get attributeString
    * @return attributeString
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(example = "string", value = "")
   public String getAttributeString() {
     return attributeString;
@@ -144,7 +144,7 @@ public class XmlItem {
    * Get attributeNumber
    * @return attributeNumber
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(example = "1.234", value = "")
   public BigDecimal getAttributeNumber() {
     return attributeNumber;
@@ -163,7 +163,7 @@ public class XmlItem {
    * Get attributeInteger
    * @return attributeInteger
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(example = "-2", value = "")
   public Integer getAttributeInteger() {
     return attributeInteger;
@@ -182,7 +182,7 @@ public class XmlItem {
    * Get attributeBoolean
    * @return attributeBoolean
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(example = "true", value = "")
   public Boolean getAttributeBoolean() {
     return attributeBoolean;
@@ -209,7 +209,7 @@ public class XmlItem {
    * Get wrappedArray
    * @return wrappedArray
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public List<Integer> getWrappedArray() {
     return wrappedArray;
@@ -228,7 +228,7 @@ public class XmlItem {
    * Get nameString
    * @return nameString
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(example = "string", value = "")
   public String getNameString() {
     return nameString;
@@ -247,7 +247,7 @@ public class XmlItem {
    * Get nameNumber
    * @return nameNumber
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(example = "1.234", value = "")
   public BigDecimal getNameNumber() {
     return nameNumber;
@@ -266,7 +266,7 @@ public class XmlItem {
    * Get nameInteger
    * @return nameInteger
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(example = "-2", value = "")
   public Integer getNameInteger() {
     return nameInteger;
@@ -285,7 +285,7 @@ public class XmlItem {
    * Get nameBoolean
    * @return nameBoolean
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(example = "true", value = "")
   public Boolean getNameBoolean() {
     return nameBoolean;
@@ -312,7 +312,7 @@ public class XmlItem {
    * Get nameArray
    * @return nameArray
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public List<Integer> getNameArray() {
     return nameArray;
@@ -339,7 +339,7 @@ public class XmlItem {
    * Get nameWrappedArray
    * @return nameWrappedArray
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public List<Integer> getNameWrappedArray() {
     return nameWrappedArray;
@@ -358,7 +358,7 @@ public class XmlItem {
    * Get prefixString
    * @return prefixString
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(example = "string", value = "")
   public String getPrefixString() {
     return prefixString;
@@ -377,7 +377,7 @@ public class XmlItem {
    * Get prefixNumber
    * @return prefixNumber
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(example = "1.234", value = "")
   public BigDecimal getPrefixNumber() {
     return prefixNumber;
@@ -396,7 +396,7 @@ public class XmlItem {
    * Get prefixInteger
    * @return prefixInteger
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(example = "-2", value = "")
   public Integer getPrefixInteger() {
     return prefixInteger;
@@ -415,7 +415,7 @@ public class XmlItem {
    * Get prefixBoolean
    * @return prefixBoolean
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(example = "true", value = "")
   public Boolean getPrefixBoolean() {
     return prefixBoolean;
@@ -442,7 +442,7 @@ public class XmlItem {
    * Get prefixArray
    * @return prefixArray
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public List<Integer> getPrefixArray() {
     return prefixArray;
@@ -469,7 +469,7 @@ public class XmlItem {
    * Get prefixWrappedArray
    * @return prefixWrappedArray
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public List<Integer> getPrefixWrappedArray() {
     return prefixWrappedArray;
@@ -488,7 +488,7 @@ public class XmlItem {
    * Get namespaceString
    * @return namespaceString
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(example = "string", value = "")
   public String getNamespaceString() {
     return namespaceString;
@@ -507,7 +507,7 @@ public class XmlItem {
    * Get namespaceNumber
    * @return namespaceNumber
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(example = "1.234", value = "")
   public BigDecimal getNamespaceNumber() {
     return namespaceNumber;
@@ -526,7 +526,7 @@ public class XmlItem {
    * Get namespaceInteger
    * @return namespaceInteger
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(example = "-2", value = "")
   public Integer getNamespaceInteger() {
     return namespaceInteger;
@@ -545,7 +545,7 @@ public class XmlItem {
    * Get namespaceBoolean
    * @return namespaceBoolean
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(example = "true", value = "")
   public Boolean getNamespaceBoolean() {
     return namespaceBoolean;
@@ -572,7 +572,7 @@ public class XmlItem {
    * Get namespaceArray
    * @return namespaceArray
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public List<Integer> getNamespaceArray() {
     return namespaceArray;
@@ -599,7 +599,7 @@ public class XmlItem {
    * Get namespaceWrappedArray
    * @return namespaceWrappedArray
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public List<Integer> getNamespaceWrappedArray() {
     return namespaceWrappedArray;
@@ -618,7 +618,7 @@ public class XmlItem {
    * Get prefixNsString
    * @return prefixNsString
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(example = "string", value = "")
   public String getPrefixNsString() {
     return prefixNsString;
@@ -637,7 +637,7 @@ public class XmlItem {
    * Get prefixNsNumber
    * @return prefixNsNumber
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(example = "1.234", value = "")
   public BigDecimal getPrefixNsNumber() {
     return prefixNsNumber;
@@ -656,7 +656,7 @@ public class XmlItem {
    * Get prefixNsInteger
    * @return prefixNsInteger
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(example = "-2", value = "")
   public Integer getPrefixNsInteger() {
     return prefixNsInteger;
@@ -675,7 +675,7 @@ public class XmlItem {
    * Get prefixNsBoolean
    * @return prefixNsBoolean
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(example = "true", value = "")
   public Boolean getPrefixNsBoolean() {
     return prefixNsBoolean;
@@ -702,7 +702,7 @@ public class XmlItem {
    * Get prefixNsArray
    * @return prefixNsArray
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public List<Integer> getPrefixNsArray() {
     return prefixNsArray;
@@ -729,7 +729,7 @@ public class XmlItem {
    * Get prefixNsWrappedArray
    * @return prefixNsWrappedArray
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public List<Integer> getPrefixNsWrappedArray() {
     return prefixNsWrappedArray;
diff --git a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/AdditionalPropertiesAnyType.java b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/AdditionalPropertiesAnyType.java
index 9cd410caea..35778f5f20 100644
--- a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/AdditionalPropertiesAnyType.java
+++ b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/AdditionalPropertiesAnyType.java
@@ -47,7 +47,7 @@ public class AdditionalPropertiesAnyType extends HashMap<String, Object> {
    * Get name
    * @return name
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getName() {
     return name;
diff --git a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/AdditionalPropertiesArray.java b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/AdditionalPropertiesArray.java
index 40ec8821a8..f12a0e3eea 100644
--- a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/AdditionalPropertiesArray.java
+++ b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/AdditionalPropertiesArray.java
@@ -48,7 +48,7 @@ public class AdditionalPropertiesArray extends HashMap<String, List> {
    * Get name
    * @return name
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getName() {
     return name;
diff --git a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/AdditionalPropertiesBoolean.java b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/AdditionalPropertiesBoolean.java
index 1572d5e26a..0724522b6c 100644
--- a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/AdditionalPropertiesBoolean.java
+++ b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/AdditionalPropertiesBoolean.java
@@ -47,7 +47,7 @@ public class AdditionalPropertiesBoolean extends HashMap<String, Boolean> {
    * Get name
    * @return name
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getName() {
     return name;
diff --git a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java
index 1fb68be349..0476d2af63 100644
--- a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java
+++ b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java
@@ -123,7 +123,7 @@ public class AdditionalPropertiesClass {
    * Get mapString
    * @return mapString
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Map<String, String> getMapString() {
     return mapString;
@@ -150,7 +150,7 @@ public class AdditionalPropertiesClass {
    * Get mapNumber
    * @return mapNumber
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Map<String, BigDecimal> getMapNumber() {
     return mapNumber;
@@ -177,7 +177,7 @@ public class AdditionalPropertiesClass {
    * Get mapInteger
    * @return mapInteger
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Map<String, Integer> getMapInteger() {
     return mapInteger;
@@ -204,7 +204,7 @@ public class AdditionalPropertiesClass {
    * Get mapBoolean
    * @return mapBoolean
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Map<String, Boolean> getMapBoolean() {
     return mapBoolean;
@@ -231,7 +231,7 @@ public class AdditionalPropertiesClass {
    * Get mapArrayInteger
    * @return mapArrayInteger
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Map<String, List<Integer>> getMapArrayInteger() {
     return mapArrayInteger;
@@ -258,7 +258,7 @@ public class AdditionalPropertiesClass {
    * Get mapArrayAnytype
    * @return mapArrayAnytype
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Map<String, List<Object>> getMapArrayAnytype() {
     return mapArrayAnytype;
@@ -285,7 +285,7 @@ public class AdditionalPropertiesClass {
    * Get mapMapString
    * @return mapMapString
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Map<String, Map<String, String>> getMapMapString() {
     return mapMapString;
@@ -312,7 +312,7 @@ public class AdditionalPropertiesClass {
    * Get mapMapAnytype
    * @return mapMapAnytype
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Map<String, Map<String, Object>> getMapMapAnytype() {
     return mapMapAnytype;
@@ -331,7 +331,7 @@ public class AdditionalPropertiesClass {
    * Get anytype1
    * @return anytype1
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Object getAnytype1() {
     return anytype1;
@@ -350,7 +350,7 @@ public class AdditionalPropertiesClass {
    * Get anytype2
    * @return anytype2
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Object getAnytype2() {
     return anytype2;
@@ -369,7 +369,7 @@ public class AdditionalPropertiesClass {
    * Get anytype3
    * @return anytype3
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Object getAnytype3() {
     return anytype3;
diff --git a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/AdditionalPropertiesInteger.java b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/AdditionalPropertiesInteger.java
index 6c5869d49a..f31a8c8b80 100644
--- a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/AdditionalPropertiesInteger.java
+++ b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/AdditionalPropertiesInteger.java
@@ -47,7 +47,7 @@ public class AdditionalPropertiesInteger extends HashMap<String, Integer> {
    * Get name
    * @return name
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getName() {
     return name;
diff --git a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/AdditionalPropertiesNumber.java b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/AdditionalPropertiesNumber.java
index 2ddabab3ad..54e58d5690 100644
--- a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/AdditionalPropertiesNumber.java
+++ b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/AdditionalPropertiesNumber.java
@@ -48,7 +48,7 @@ public class AdditionalPropertiesNumber extends HashMap<String, BigDecimal> {
    * Get name
    * @return name
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getName() {
     return name;
diff --git a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/AdditionalPropertiesObject.java b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/AdditionalPropertiesObject.java
index 57f36622cb..e89246c37c 100644
--- a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/AdditionalPropertiesObject.java
+++ b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/AdditionalPropertiesObject.java
@@ -47,7 +47,7 @@ public class AdditionalPropertiesObject extends HashMap<String, Map> {
    * Get name
    * @return name
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getName() {
     return name;
diff --git a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/AdditionalPropertiesString.java b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/AdditionalPropertiesString.java
index 5040129cca..a859ad4c7b 100644
--- a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/AdditionalPropertiesString.java
+++ b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/AdditionalPropertiesString.java
@@ -47,7 +47,7 @@ public class AdditionalPropertiesString extends HashMap<String, String> {
    * Get name
    * @return name
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getName() {
     return name;
diff --git a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/Animal.java b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/Animal.java
index 6cea07ff0a..ac608044d3 100644
--- a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/Animal.java
+++ b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/Animal.java
@@ -58,7 +58,6 @@ public class Animal {
    * Get className
    * @return className
   **/
-
   @ApiModelProperty(required = true, value = "")
   public String getClassName() {
     return className;
@@ -77,7 +76,7 @@ public class Animal {
    * Get color
    * @return color
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getColor() {
     return color;
diff --git a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java
index b72cc84541..c3a1a1343e 100644
--- a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java
+++ b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java
@@ -58,7 +58,7 @@ public class ArrayOfArrayOfNumberOnly {
    * Get arrayArrayNumber
    * @return arrayArrayNumber
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public List<List<BigDecimal>> getArrayArrayNumber() {
     return arrayArrayNumber;
diff --git a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java
index adef6e226e..56d8c18f8f 100644
--- a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java
+++ b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java
@@ -58,7 +58,7 @@ public class ArrayOfNumberOnly {
    * Get arrayNumber
    * @return arrayNumber
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public List<BigDecimal> getArrayNumber() {
     return arrayNumber;
diff --git a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/ArrayTest.java b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/ArrayTest.java
index 99fb1aae1e..c14f12e745 100644
--- a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/ArrayTest.java
+++ b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/ArrayTest.java
@@ -72,7 +72,7 @@ public class ArrayTest {
    * Get arrayOfString
    * @return arrayOfString
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public List<String> getArrayOfString() {
     return arrayOfString;
@@ -99,7 +99,7 @@ public class ArrayTest {
    * Get arrayArrayOfInteger
    * @return arrayArrayOfInteger
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public List<List<Long>> getArrayArrayOfInteger() {
     return arrayArrayOfInteger;
@@ -126,7 +126,7 @@ public class ArrayTest {
    * Get arrayArrayOfModel
    * @return arrayArrayOfModel
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public List<List<ReadOnlyFirst>> getArrayArrayOfModel() {
     return arrayArrayOfModel;
diff --git a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/Capitalization.java b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/Capitalization.java
index bad598c320..c8e25b928a 100644
--- a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/Capitalization.java
+++ b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/Capitalization.java
@@ -70,7 +70,7 @@ public class Capitalization {
    * Get smallCamel
    * @return smallCamel
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getSmallCamel() {
     return smallCamel;
@@ -89,7 +89,7 @@ public class Capitalization {
    * Get capitalCamel
    * @return capitalCamel
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getCapitalCamel() {
     return capitalCamel;
@@ -108,7 +108,7 @@ public class Capitalization {
    * Get smallSnake
    * @return smallSnake
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getSmallSnake() {
     return smallSnake;
@@ -127,7 +127,7 @@ public class Capitalization {
    * Get capitalSnake
    * @return capitalSnake
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getCapitalSnake() {
     return capitalSnake;
@@ -146,7 +146,7 @@ public class Capitalization {
    * Get scAETHFlowPoints
    * @return scAETHFlowPoints
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getScAETHFlowPoints() {
     return scAETHFlowPoints;
@@ -165,7 +165,7 @@ public class Capitalization {
    * Name of the pet 
    * @return ATT_NAME
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "Name of the pet ")
   public String getATTNAME() {
     return ATT_NAME;
diff --git a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/Cat.java b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/Cat.java
index d7015f214e..cf49fd3e04 100644
--- a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/Cat.java
+++ b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/Cat.java
@@ -47,7 +47,7 @@ public class Cat extends Animal {
    * Get declawed
    * @return declawed
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Boolean getDeclawed() {
     return declawed;
diff --git a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/CatAllOf.java b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/CatAllOf.java
index ac93255d17..7d37c97b42 100644
--- a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/CatAllOf.java
+++ b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/CatAllOf.java
@@ -45,7 +45,7 @@ public class CatAllOf {
    * Get declawed
    * @return declawed
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Boolean getDeclawed() {
     return declawed;
diff --git a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/Category.java b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/Category.java
index 665d1deefc..abb54619dc 100644
--- a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/Category.java
+++ b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/Category.java
@@ -50,7 +50,7 @@ public class Category {
    * Get id
    * @return id
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Long getId() {
     return id;
@@ -69,7 +69,6 @@ public class Category {
    * Get name
    * @return name
   **/
-
   @ApiModelProperty(required = true, value = "")
   public String getName() {
     return name;
diff --git a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/ClassModel.java b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/ClassModel.java
index 928c12ea45..e72245b091 100644
--- a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/ClassModel.java
+++ b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/ClassModel.java
@@ -46,7 +46,7 @@ public class ClassModel {
    * Get propertyClass
    * @return propertyClass
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getPropertyClass() {
     return propertyClass;
diff --git a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/Client.java b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/Client.java
index 017b2fca26..1f649f6855 100644
--- a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/Client.java
+++ b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/Client.java
@@ -45,7 +45,7 @@ public class Client {
    * Get client
    * @return client
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getClient() {
     return client;
diff --git a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/Dog.java b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/Dog.java
index 09c52412f4..81bc53f391 100644
--- a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/Dog.java
+++ b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/Dog.java
@@ -47,7 +47,7 @@ public class Dog extends Animal {
    * Get breed
    * @return breed
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getBreed() {
     return breed;
diff --git a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/DogAllOf.java b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/DogAllOf.java
index c62cc1655a..0d6418d5e9 100644
--- a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/DogAllOf.java
+++ b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/DogAllOf.java
@@ -45,7 +45,7 @@ public class DogAllOf {
    * Get breed
    * @return breed
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getBreed() {
     return breed;
diff --git a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/EnumArrays.java b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/EnumArrays.java
index af0d449c65..af06ee391b 100644
--- a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/EnumArrays.java
+++ b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/EnumArrays.java
@@ -124,7 +124,7 @@ public class EnumArrays {
    * Get justSymbol
    * @return justSymbol
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public JustSymbolEnum getJustSymbol() {
     return justSymbol;
@@ -151,7 +151,7 @@ public class EnumArrays {
    * Get arrayEnum
    * @return arrayEnum
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public List<ArrayEnumEnum> getArrayEnum() {
     return arrayEnum;
diff --git a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/EnumTest.java b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/EnumTest.java
index 4a3faa788b..d073d1c207 100644
--- a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/EnumTest.java
+++ b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/EnumTest.java
@@ -210,7 +210,7 @@ public class EnumTest {
    * Get enumString
    * @return enumString
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public EnumStringEnum getEnumString() {
     return enumString;
@@ -229,7 +229,6 @@ public class EnumTest {
    * Get enumStringRequired
    * @return enumStringRequired
   **/
-
   @ApiModelProperty(required = true, value = "")
   public EnumStringRequiredEnum getEnumStringRequired() {
     return enumStringRequired;
@@ -248,7 +247,7 @@ public class EnumTest {
    * Get enumInteger
    * @return enumInteger
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public EnumIntegerEnum getEnumInteger() {
     return enumInteger;
@@ -267,7 +266,7 @@ public class EnumTest {
    * Get enumNumber
    * @return enumNumber
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public EnumNumberEnum getEnumNumber() {
     return enumNumber;
@@ -286,7 +285,7 @@ public class EnumTest {
    * Get outerEnum
    * @return outerEnum
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public OuterEnum getOuterEnum() {
     return outerEnum;
diff --git a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java
index 06defab3d5..9ed3ee3649 100644
--- a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java
+++ b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java
@@ -54,7 +54,7 @@ public class FileSchemaTestClass {
    * Get file
    * @return file
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public java.io.File getFile() {
     return file;
@@ -81,7 +81,7 @@ public class FileSchemaTestClass {
    * Get files
    * @return files
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public List<java.io.File> getFiles() {
     return files;
diff --git a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/FormatTest.java b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/FormatTest.java
index c9ec8cfd5f..b65f3d8d14 100644
--- a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/FormatTest.java
+++ b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/FormatTest.java
@@ -112,7 +112,7 @@ public class FormatTest {
    * maximum: 100
    * @return integer
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Integer getInteger() {
     return integer;
@@ -133,7 +133,7 @@ public class FormatTest {
    * maximum: 200
    * @return int32
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Integer getInt32() {
     return int32;
@@ -152,7 +152,7 @@ public class FormatTest {
    * Get int64
    * @return int64
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Long getInt64() {
     return int64;
@@ -173,7 +173,6 @@ public class FormatTest {
    * maximum: 543.2
    * @return number
   **/
-
   @ApiModelProperty(required = true, value = "")
   public BigDecimal getNumber() {
     return number;
@@ -194,7 +193,7 @@ public class FormatTest {
    * maximum: 987.6
    * @return _float
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Float getFloat() {
     return _float;
@@ -215,7 +214,7 @@ public class FormatTest {
    * maximum: 123.4
    * @return _double
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Double getDouble() {
     return _double;
@@ -234,7 +233,7 @@ public class FormatTest {
    * Get string
    * @return string
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getString() {
     return string;
@@ -253,7 +252,6 @@ public class FormatTest {
    * Get _byte
    * @return _byte
   **/
-
   @ApiModelProperty(required = true, value = "")
   public byte[] getByte() {
     return _byte;
@@ -272,7 +270,7 @@ public class FormatTest {
    * Get binary
    * @return binary
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public File getBinary() {
     return binary;
@@ -291,7 +289,6 @@ public class FormatTest {
    * Get date
    * @return date
   **/
-
   @ApiModelProperty(required = true, value = "")
   public LocalDate getDate() {
     return date;
@@ -310,7 +307,7 @@ public class FormatTest {
    * Get dateTime
    * @return dateTime
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public OffsetDateTime getDateTime() {
     return dateTime;
@@ -329,7 +326,7 @@ public class FormatTest {
    * Get uuid
    * @return uuid
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(example = "72f98069-206d-4f12-9f12-3d1e525a8e84", value = "")
   public UUID getUuid() {
     return uuid;
@@ -348,7 +345,6 @@ public class FormatTest {
    * Get password
    * @return password
   **/
-
   @ApiModelProperty(required = true, value = "")
   public String getPassword() {
     return password;
diff --git a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java
index 907592d8e8..78ebe25cb2 100644
--- a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java
+++ b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java
@@ -45,7 +45,7 @@ public class HasOnlyReadOnly {
    * Get bar
    * @return bar
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getBar() {
     return bar;
@@ -55,7 +55,7 @@ public class HasOnlyReadOnly {
    * Get foo
    * @return foo
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getFoo() {
     return foo;
diff --git a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/MapTest.java b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/MapTest.java
index 812a680e75..1121f9769c 100644
--- a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/MapTest.java
+++ b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/MapTest.java
@@ -114,7 +114,7 @@ public class MapTest {
    * Get mapMapOfString
    * @return mapMapOfString
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Map<String, Map<String, String>> getMapMapOfString() {
     return mapMapOfString;
@@ -141,7 +141,7 @@ public class MapTest {
    * Get mapOfEnumString
    * @return mapOfEnumString
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Map<String, InnerEnum> getMapOfEnumString() {
     return mapOfEnumString;
@@ -168,7 +168,7 @@ public class MapTest {
    * Get directMap
    * @return directMap
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Map<String, Boolean> getDirectMap() {
     return directMap;
@@ -195,7 +195,7 @@ public class MapTest {
    * Get indirectMap
    * @return indirectMap
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Map<String, Boolean> getIndirectMap() {
     return indirectMap;
diff --git a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java
index 815679fe5f..cda964b8c4 100644
--- a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java
+++ b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java
@@ -63,7 +63,7 @@ public class MixedPropertiesAndAdditionalPropertiesClass {
    * Get uuid
    * @return uuid
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public UUID getUuid() {
     return uuid;
@@ -82,7 +82,7 @@ public class MixedPropertiesAndAdditionalPropertiesClass {
    * Get dateTime
    * @return dateTime
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public OffsetDateTime getDateTime() {
     return dateTime;
@@ -109,7 +109,7 @@ public class MixedPropertiesAndAdditionalPropertiesClass {
    * Get map
    * @return map
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Map<String, Animal> getMap() {
     return map;
diff --git a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/Model200Response.java b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/Model200Response.java
index 2a3c0b5965..09d309eb0d 100644
--- a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/Model200Response.java
+++ b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/Model200Response.java
@@ -51,7 +51,7 @@ public class Model200Response {
    * Get name
    * @return name
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Integer getName() {
     return name;
@@ -70,7 +70,7 @@ public class Model200Response {
    * Get propertyClass
    * @return propertyClass
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getPropertyClass() {
     return propertyClass;
diff --git a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/ModelApiResponse.java b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/ModelApiResponse.java
index 5ae9239007..352fc17d5f 100644
--- a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/ModelApiResponse.java
+++ b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/ModelApiResponse.java
@@ -55,7 +55,7 @@ public class ModelApiResponse {
    * Get code
    * @return code
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Integer getCode() {
     return code;
@@ -74,7 +74,7 @@ public class ModelApiResponse {
    * Get type
    * @return type
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getType() {
     return type;
@@ -93,7 +93,7 @@ public class ModelApiResponse {
    * Get message
    * @return message
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getMessage() {
     return message;
diff --git a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/ModelReturn.java b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/ModelReturn.java
index 7e3591fe6f..752ed97927 100644
--- a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/ModelReturn.java
+++ b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/ModelReturn.java
@@ -46,7 +46,7 @@ public class ModelReturn {
    * Get _return
    * @return _return
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Integer getReturn() {
     return _return;
diff --git a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/Name.java b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/Name.java
index 47dbe54104..28d4559809 100644
--- a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/Name.java
+++ b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/Name.java
@@ -61,7 +61,6 @@ public class Name {
    * Get name
    * @return name
   **/
-
   @ApiModelProperty(required = true, value = "")
   public Integer getName() {
     return name;
@@ -75,7 +74,7 @@ public class Name {
    * Get snakeCase
    * @return snakeCase
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Integer getSnakeCase() {
     return snakeCase;
@@ -90,7 +89,7 @@ public class Name {
    * Get property
    * @return property
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getProperty() {
     return property;
@@ -104,7 +103,7 @@ public class Name {
    * Get _123number
    * @return _123number
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Integer get123number() {
     return _123number;
diff --git a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/NumberOnly.java b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/NumberOnly.java
index c2dcc40b6d..63de10209d 100644
--- a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/NumberOnly.java
+++ b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/NumberOnly.java
@@ -46,7 +46,7 @@ public class NumberOnly {
    * Get justNumber
    * @return justNumber
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public BigDecimal getJustNumber() {
     return justNumber;
diff --git a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/Order.java b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/Order.java
index f41d6cb7f9..ca5db6e887 100644
--- a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/Order.java
+++ b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/Order.java
@@ -108,7 +108,7 @@ public class Order {
    * Get id
    * @return id
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Long getId() {
     return id;
@@ -127,7 +127,7 @@ public class Order {
    * Get petId
    * @return petId
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Long getPetId() {
     return petId;
@@ -146,7 +146,7 @@ public class Order {
    * Get quantity
    * @return quantity
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Integer getQuantity() {
     return quantity;
@@ -165,7 +165,7 @@ public class Order {
    * Get shipDate
    * @return shipDate
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public OffsetDateTime getShipDate() {
     return shipDate;
@@ -184,7 +184,7 @@ public class Order {
    * Order Status
    * @return status
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "Order Status")
   public StatusEnum getStatus() {
     return status;
@@ -203,7 +203,7 @@ public class Order {
    * Get complete
    * @return complete
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Boolean getComplete() {
     return complete;
diff --git a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/OuterComposite.java b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/OuterComposite.java
index 412283913c..a131baa5f8 100644
--- a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/OuterComposite.java
+++ b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/OuterComposite.java
@@ -56,7 +56,7 @@ public class OuterComposite {
    * Get myNumber
    * @return myNumber
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public BigDecimal getMyNumber() {
     return myNumber;
@@ -75,7 +75,7 @@ public class OuterComposite {
    * Get myString
    * @return myString
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getMyString() {
     return myString;
@@ -94,7 +94,7 @@ public class OuterComposite {
    * Get myBoolean
    * @return myBoolean
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Boolean getMyBoolean() {
     return myBoolean;
diff --git a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/Pet.java b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/Pet.java
index 0953836a6f..6bd167b2f1 100644
--- a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/Pet.java
+++ b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/Pet.java
@@ -121,7 +121,7 @@ public class Pet {
    * Get id
    * @return id
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Long getId() {
     return id;
@@ -140,7 +140,7 @@ public class Pet {
    * Get category
    * @return category
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Category getCategory() {
     return category;
@@ -159,7 +159,6 @@ public class Pet {
    * Get name
    * @return name
   **/
-
   @ApiModelProperty(example = "doggie", required = true, value = "")
   public String getName() {
     return name;
@@ -183,7 +182,6 @@ public class Pet {
    * Get photoUrls
    * @return photoUrls
   **/
-
   @ApiModelProperty(required = true, value = "")
   public List<String> getPhotoUrls() {
     return photoUrls;
@@ -210,7 +208,7 @@ public class Pet {
    * Get tags
    * @return tags
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public List<Tag> getTags() {
     return tags;
@@ -229,7 +227,7 @@ public class Pet {
    * pet status in the store
    * @return status
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "pet status in the store")
   public StatusEnum getStatus() {
     return status;
diff --git a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/ReadOnlyFirst.java b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/ReadOnlyFirst.java
index b01224ff98..ea1177f44c 100644
--- a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/ReadOnlyFirst.java
+++ b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/ReadOnlyFirst.java
@@ -45,7 +45,7 @@ public class ReadOnlyFirst {
    * Get bar
    * @return bar
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getBar() {
     return bar;
@@ -60,7 +60,7 @@ public class ReadOnlyFirst {
    * Get baz
    * @return baz
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getBaz() {
     return baz;
diff --git a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/SpecialModelName.java b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/SpecialModelName.java
index 0dce1b2135..598db84f6b 100644
--- a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/SpecialModelName.java
+++ b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/SpecialModelName.java
@@ -45,7 +45,7 @@ public class SpecialModelName {
    * Get $specialPropertyName
    * @return $specialPropertyName
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Long get$SpecialPropertyName() {
     return $specialPropertyName;
diff --git a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/Tag.java b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/Tag.java
index 0aeb3e8642..ce217a2c9a 100644
--- a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/Tag.java
+++ b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/Tag.java
@@ -50,7 +50,7 @@ public class Tag {
    * Get id
    * @return id
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Long getId() {
     return id;
@@ -69,7 +69,7 @@ public class Tag {
    * Get name
    * @return name
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getName() {
     return name;
diff --git a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/TypeHolderDefault.java b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/TypeHolderDefault.java
index 4c40efd2bd..6a1a1c4600 100644
--- a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/TypeHolderDefault.java
+++ b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/TypeHolderDefault.java
@@ -70,7 +70,6 @@ public class TypeHolderDefault {
    * Get stringItem
    * @return stringItem
   **/
-
   @ApiModelProperty(required = true, value = "")
   public String getStringItem() {
     return stringItem;
@@ -89,7 +88,6 @@ public class TypeHolderDefault {
    * Get numberItem
    * @return numberItem
   **/
-
   @ApiModelProperty(required = true, value = "")
   public BigDecimal getNumberItem() {
     return numberItem;
@@ -108,7 +106,6 @@ public class TypeHolderDefault {
    * Get integerItem
    * @return integerItem
   **/
-
   @ApiModelProperty(required = true, value = "")
   public Integer getIntegerItem() {
     return integerItem;
@@ -127,7 +124,6 @@ public class TypeHolderDefault {
    * Get boolItem
    * @return boolItem
   **/
-
   @ApiModelProperty(required = true, value = "")
   public Boolean getBoolItem() {
     return boolItem;
@@ -151,7 +147,6 @@ public class TypeHolderDefault {
    * Get arrayItem
    * @return arrayItem
   **/
-
   @ApiModelProperty(required = true, value = "")
   public List<Integer> getArrayItem() {
     return arrayItem;
diff --git a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/TypeHolderExample.java b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/TypeHolderExample.java
index e24eaa0e19..290f1d2d47 100644
--- a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/TypeHolderExample.java
+++ b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/TypeHolderExample.java
@@ -70,7 +70,6 @@ public class TypeHolderExample {
    * Get stringItem
    * @return stringItem
   **/
-
   @ApiModelProperty(example = "what", required = true, value = "")
   public String getStringItem() {
     return stringItem;
@@ -89,7 +88,6 @@ public class TypeHolderExample {
    * Get numberItem
    * @return numberItem
   **/
-
   @ApiModelProperty(example = "1.234", required = true, value = "")
   public BigDecimal getNumberItem() {
     return numberItem;
@@ -108,7 +106,6 @@ public class TypeHolderExample {
    * Get integerItem
    * @return integerItem
   **/
-
   @ApiModelProperty(example = "-2", required = true, value = "")
   public Integer getIntegerItem() {
     return integerItem;
@@ -127,7 +124,6 @@ public class TypeHolderExample {
    * Get boolItem
    * @return boolItem
   **/
-
   @ApiModelProperty(example = "true", required = true, value = "")
   public Boolean getBoolItem() {
     return boolItem;
@@ -151,7 +147,6 @@ public class TypeHolderExample {
    * Get arrayItem
    * @return arrayItem
   **/
-
   @ApiModelProperty(example = "[0, 1, 2, 3]", required = true, value = "")
   public List<Integer> getArrayItem() {
     return arrayItem;
diff --git a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/User.java b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/User.java
index 13acd447aa..fa805deb3e 100644
--- a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/User.java
+++ b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/User.java
@@ -80,7 +80,7 @@ public class User {
    * Get id
    * @return id
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Long getId() {
     return id;
@@ -99,7 +99,7 @@ public class User {
    * Get username
    * @return username
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getUsername() {
     return username;
@@ -118,7 +118,7 @@ public class User {
    * Get firstName
    * @return firstName
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getFirstName() {
     return firstName;
@@ -137,7 +137,7 @@ public class User {
    * Get lastName
    * @return lastName
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getLastName() {
     return lastName;
@@ -156,7 +156,7 @@ public class User {
    * Get email
    * @return email
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getEmail() {
     return email;
@@ -175,7 +175,7 @@ public class User {
    * Get password
    * @return password
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getPassword() {
     return password;
@@ -194,7 +194,7 @@ public class User {
    * Get phone
    * @return phone
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getPhone() {
     return phone;
@@ -213,7 +213,7 @@ public class User {
    * User Status
    * @return userStatus
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "User Status")
   public Integer getUserStatus() {
     return userStatus;
diff --git a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/XmlItem.java b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/XmlItem.java
index ce8aa206a8..3acfd5ce8f 100644
--- a/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/XmlItem.java
+++ b/samples/client/petstore/java/resttemplate-withXml/src/main/java/org/openapitools/client/model/XmlItem.java
@@ -221,7 +221,7 @@ public class XmlItem {
    * Get attributeString
    * @return attributeString
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(example = "string", value = "")
   public String getAttributeString() {
     return attributeString;
@@ -240,7 +240,7 @@ public class XmlItem {
    * Get attributeNumber
    * @return attributeNumber
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(example = "1.234", value = "")
   public BigDecimal getAttributeNumber() {
     return attributeNumber;
@@ -259,7 +259,7 @@ public class XmlItem {
    * Get attributeInteger
    * @return attributeInteger
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(example = "-2", value = "")
   public Integer getAttributeInteger() {
     return attributeInteger;
@@ -278,7 +278,7 @@ public class XmlItem {
    * Get attributeBoolean
    * @return attributeBoolean
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(example = "true", value = "")
   public Boolean getAttributeBoolean() {
     return attributeBoolean;
@@ -305,7 +305,7 @@ public class XmlItem {
    * Get wrappedArray
    * @return wrappedArray
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public List<Integer> getWrappedArray() {
     return wrappedArray;
@@ -324,7 +324,7 @@ public class XmlItem {
    * Get nameString
    * @return nameString
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(example = "string", value = "")
   public String getNameString() {
     return nameString;
@@ -343,7 +343,7 @@ public class XmlItem {
    * Get nameNumber
    * @return nameNumber
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(example = "1.234", value = "")
   public BigDecimal getNameNumber() {
     return nameNumber;
@@ -362,7 +362,7 @@ public class XmlItem {
    * Get nameInteger
    * @return nameInteger
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(example = "-2", value = "")
   public Integer getNameInteger() {
     return nameInteger;
@@ -381,7 +381,7 @@ public class XmlItem {
    * Get nameBoolean
    * @return nameBoolean
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(example = "true", value = "")
   public Boolean getNameBoolean() {
     return nameBoolean;
@@ -408,7 +408,7 @@ public class XmlItem {
    * Get nameArray
    * @return nameArray
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public List<Integer> getNameArray() {
     return nameArray;
@@ -435,7 +435,7 @@ public class XmlItem {
    * Get nameWrappedArray
    * @return nameWrappedArray
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public List<Integer> getNameWrappedArray() {
     return nameWrappedArray;
@@ -454,7 +454,7 @@ public class XmlItem {
    * Get prefixString
    * @return prefixString
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(example = "string", value = "")
   public String getPrefixString() {
     return prefixString;
@@ -473,7 +473,7 @@ public class XmlItem {
    * Get prefixNumber
    * @return prefixNumber
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(example = "1.234", value = "")
   public BigDecimal getPrefixNumber() {
     return prefixNumber;
@@ -492,7 +492,7 @@ public class XmlItem {
    * Get prefixInteger
    * @return prefixInteger
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(example = "-2", value = "")
   public Integer getPrefixInteger() {
     return prefixInteger;
@@ -511,7 +511,7 @@ public class XmlItem {
    * Get prefixBoolean
    * @return prefixBoolean
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(example = "true", value = "")
   public Boolean getPrefixBoolean() {
     return prefixBoolean;
@@ -538,7 +538,7 @@ public class XmlItem {
    * Get prefixArray
    * @return prefixArray
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public List<Integer> getPrefixArray() {
     return prefixArray;
@@ -565,7 +565,7 @@ public class XmlItem {
    * Get prefixWrappedArray
    * @return prefixWrappedArray
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public List<Integer> getPrefixWrappedArray() {
     return prefixWrappedArray;
@@ -584,7 +584,7 @@ public class XmlItem {
    * Get namespaceString
    * @return namespaceString
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(example = "string", value = "")
   public String getNamespaceString() {
     return namespaceString;
@@ -603,7 +603,7 @@ public class XmlItem {
    * Get namespaceNumber
    * @return namespaceNumber
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(example = "1.234", value = "")
   public BigDecimal getNamespaceNumber() {
     return namespaceNumber;
@@ -622,7 +622,7 @@ public class XmlItem {
    * Get namespaceInteger
    * @return namespaceInteger
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(example = "-2", value = "")
   public Integer getNamespaceInteger() {
     return namespaceInteger;
@@ -641,7 +641,7 @@ public class XmlItem {
    * Get namespaceBoolean
    * @return namespaceBoolean
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(example = "true", value = "")
   public Boolean getNamespaceBoolean() {
     return namespaceBoolean;
@@ -668,7 +668,7 @@ public class XmlItem {
    * Get namespaceArray
    * @return namespaceArray
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public List<Integer> getNamespaceArray() {
     return namespaceArray;
@@ -695,7 +695,7 @@ public class XmlItem {
    * Get namespaceWrappedArray
    * @return namespaceWrappedArray
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public List<Integer> getNamespaceWrappedArray() {
     return namespaceWrappedArray;
@@ -714,7 +714,7 @@ public class XmlItem {
    * Get prefixNsString
    * @return prefixNsString
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(example = "string", value = "")
   public String getPrefixNsString() {
     return prefixNsString;
@@ -733,7 +733,7 @@ public class XmlItem {
    * Get prefixNsNumber
    * @return prefixNsNumber
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(example = "1.234", value = "")
   public BigDecimal getPrefixNsNumber() {
     return prefixNsNumber;
@@ -752,7 +752,7 @@ public class XmlItem {
    * Get prefixNsInteger
    * @return prefixNsInteger
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(example = "-2", value = "")
   public Integer getPrefixNsInteger() {
     return prefixNsInteger;
@@ -771,7 +771,7 @@ public class XmlItem {
    * Get prefixNsBoolean
    * @return prefixNsBoolean
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(example = "true", value = "")
   public Boolean getPrefixNsBoolean() {
     return prefixNsBoolean;
@@ -798,7 +798,7 @@ public class XmlItem {
    * Get prefixNsArray
    * @return prefixNsArray
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public List<Integer> getPrefixNsArray() {
     return prefixNsArray;
@@ -825,7 +825,7 @@ public class XmlItem {
    * Get prefixNsWrappedArray
    * @return prefixNsWrappedArray
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public List<Integer> getPrefixNsWrappedArray() {
     return prefixNsWrappedArray;
diff --git a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/AdditionalPropertiesAnyType.java b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/AdditionalPropertiesAnyType.java
index 1abb2d8a64..69d6a81729 100644
--- a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/AdditionalPropertiesAnyType.java
+++ b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/AdditionalPropertiesAnyType.java
@@ -40,7 +40,7 @@ public class AdditionalPropertiesAnyType extends HashMap<String, Object> {
    * Get name
    * @return name
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getName() {
     return name;
diff --git a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/AdditionalPropertiesArray.java b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/AdditionalPropertiesArray.java
index 1821c243e1..0147a592b7 100644
--- a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/AdditionalPropertiesArray.java
+++ b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/AdditionalPropertiesArray.java
@@ -41,7 +41,7 @@ public class AdditionalPropertiesArray extends HashMap<String, List> {
    * Get name
    * @return name
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getName() {
     return name;
diff --git a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/AdditionalPropertiesBoolean.java b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/AdditionalPropertiesBoolean.java
index 78f7ac79b2..89aa511c2a 100644
--- a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/AdditionalPropertiesBoolean.java
+++ b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/AdditionalPropertiesBoolean.java
@@ -40,7 +40,7 @@ public class AdditionalPropertiesBoolean extends HashMap<String, Boolean> {
    * Get name
    * @return name
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getName() {
     return name;
diff --git a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java
index 406bccc278..cb955d1165 100644
--- a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java
+++ b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java
@@ -80,7 +80,7 @@ public class AdditionalPropertiesClass {
    * Get mapString
    * @return mapString
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Map<String, String> getMapString() {
     return mapString;
@@ -107,7 +107,7 @@ public class AdditionalPropertiesClass {
    * Get mapNumber
    * @return mapNumber
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Map<String, BigDecimal> getMapNumber() {
     return mapNumber;
@@ -134,7 +134,7 @@ public class AdditionalPropertiesClass {
    * Get mapInteger
    * @return mapInteger
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Map<String, Integer> getMapInteger() {
     return mapInteger;
@@ -161,7 +161,7 @@ public class AdditionalPropertiesClass {
    * Get mapBoolean
    * @return mapBoolean
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Map<String, Boolean> getMapBoolean() {
     return mapBoolean;
@@ -188,7 +188,7 @@ public class AdditionalPropertiesClass {
    * Get mapArrayInteger
    * @return mapArrayInteger
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Map<String, List<Integer>> getMapArrayInteger() {
     return mapArrayInteger;
@@ -215,7 +215,7 @@ public class AdditionalPropertiesClass {
    * Get mapArrayAnytype
    * @return mapArrayAnytype
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Map<String, List<Object>> getMapArrayAnytype() {
     return mapArrayAnytype;
@@ -242,7 +242,7 @@ public class AdditionalPropertiesClass {
    * Get mapMapString
    * @return mapMapString
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Map<String, Map<String, String>> getMapMapString() {
     return mapMapString;
@@ -269,7 +269,7 @@ public class AdditionalPropertiesClass {
    * Get mapMapAnytype
    * @return mapMapAnytype
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Map<String, Map<String, Object>> getMapMapAnytype() {
     return mapMapAnytype;
@@ -288,7 +288,7 @@ public class AdditionalPropertiesClass {
    * Get anytype1
    * @return anytype1
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Object getAnytype1() {
     return anytype1;
@@ -307,7 +307,7 @@ public class AdditionalPropertiesClass {
    * Get anytype2
    * @return anytype2
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Object getAnytype2() {
     return anytype2;
@@ -326,7 +326,7 @@ public class AdditionalPropertiesClass {
    * Get anytype3
    * @return anytype3
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Object getAnytype3() {
     return anytype3;
diff --git a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/AdditionalPropertiesInteger.java b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/AdditionalPropertiesInteger.java
index 6e5159d404..f27ff011de 100644
--- a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/AdditionalPropertiesInteger.java
+++ b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/AdditionalPropertiesInteger.java
@@ -40,7 +40,7 @@ public class AdditionalPropertiesInteger extends HashMap<String, Integer> {
    * Get name
    * @return name
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getName() {
     return name;
diff --git a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/AdditionalPropertiesNumber.java b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/AdditionalPropertiesNumber.java
index ddc8146dea..479696fdce 100644
--- a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/AdditionalPropertiesNumber.java
+++ b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/AdditionalPropertiesNumber.java
@@ -41,7 +41,7 @@ public class AdditionalPropertiesNumber extends HashMap<String, BigDecimal> {
    * Get name
    * @return name
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getName() {
     return name;
diff --git a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/AdditionalPropertiesObject.java b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/AdditionalPropertiesObject.java
index cc29400029..bd569b0da3 100644
--- a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/AdditionalPropertiesObject.java
+++ b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/AdditionalPropertiesObject.java
@@ -40,7 +40,7 @@ public class AdditionalPropertiesObject extends HashMap<String, Map> {
    * Get name
    * @return name
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getName() {
     return name;
diff --git a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/AdditionalPropertiesString.java b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/AdditionalPropertiesString.java
index fb3368dfed..27e03a2313 100644
--- a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/AdditionalPropertiesString.java
+++ b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/AdditionalPropertiesString.java
@@ -40,7 +40,7 @@ public class AdditionalPropertiesString extends HashMap<String, String> {
    * Get name
    * @return name
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getName() {
     return name;
diff --git a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/Animal.java b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/Animal.java
index 53a0eec339..dc16717ac3 100644
--- a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/Animal.java
+++ b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/Animal.java
@@ -49,7 +49,6 @@ public class Animal {
    * Get className
    * @return className
   **/
-
   @ApiModelProperty(required = true, value = "")
   public String getClassName() {
     return className;
@@ -68,7 +67,7 @@ public class Animal {
    * Get color
    * @return color
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getColor() {
     return color;
diff --git a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java
index de49df3fbd..b670ecb66e 100644
--- a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java
+++ b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java
@@ -49,7 +49,7 @@ public class ArrayOfArrayOfNumberOnly {
    * Get arrayArrayNumber
    * @return arrayArrayNumber
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public List<List<BigDecimal>> getArrayArrayNumber() {
     return arrayArrayNumber;
diff --git a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java
index f4399ff42d..9d6997f88f 100644
--- a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java
+++ b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java
@@ -49,7 +49,7 @@ public class ArrayOfNumberOnly {
    * Get arrayNumber
    * @return arrayNumber
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public List<BigDecimal> getArrayNumber() {
     return arrayNumber;
diff --git a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/ArrayTest.java b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/ArrayTest.java
index 7483fa96ce..7dc235f0a9 100644
--- a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/ArrayTest.java
+++ b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/ArrayTest.java
@@ -55,7 +55,7 @@ public class ArrayTest {
    * Get arrayOfString
    * @return arrayOfString
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public List<String> getArrayOfString() {
     return arrayOfString;
@@ -82,7 +82,7 @@ public class ArrayTest {
    * Get arrayArrayOfInteger
    * @return arrayArrayOfInteger
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public List<List<Long>> getArrayArrayOfInteger() {
     return arrayArrayOfInteger;
@@ -109,7 +109,7 @@ public class ArrayTest {
    * Get arrayArrayOfModel
    * @return arrayArrayOfModel
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public List<List<ReadOnlyFirst>> getArrayArrayOfModel() {
     return arrayArrayOfModel;
diff --git a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/Capitalization.java b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/Capitalization.java
index bb83be97fe..3f3df29d5d 100644
--- a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/Capitalization.java
+++ b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/Capitalization.java
@@ -53,7 +53,7 @@ public class Capitalization {
    * Get smallCamel
    * @return smallCamel
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getSmallCamel() {
     return smallCamel;
@@ -72,7 +72,7 @@ public class Capitalization {
    * Get capitalCamel
    * @return capitalCamel
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getCapitalCamel() {
     return capitalCamel;
@@ -91,7 +91,7 @@ public class Capitalization {
    * Get smallSnake
    * @return smallSnake
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getSmallSnake() {
     return smallSnake;
@@ -110,7 +110,7 @@ public class Capitalization {
    * Get capitalSnake
    * @return capitalSnake
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getCapitalSnake() {
     return capitalSnake;
@@ -129,7 +129,7 @@ public class Capitalization {
    * Get scAETHFlowPoints
    * @return scAETHFlowPoints
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getScAETHFlowPoints() {
     return scAETHFlowPoints;
@@ -148,7 +148,7 @@ public class Capitalization {
    * Name of the pet 
    * @return ATT_NAME
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "Name of the pet ")
   public String getATTNAME() {
     return ATT_NAME;
diff --git a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/Cat.java b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/Cat.java
index ce456c8647..a8108d6f15 100644
--- a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/Cat.java
+++ b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/Cat.java
@@ -40,7 +40,7 @@ public class Cat extends Animal {
    * Get declawed
    * @return declawed
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Boolean getDeclawed() {
     return declawed;
diff --git a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/CatAllOf.java b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/CatAllOf.java
index 224c08671c..42e9614610 100644
--- a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/CatAllOf.java
+++ b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/CatAllOf.java
@@ -38,7 +38,7 @@ public class CatAllOf {
    * Get declawed
    * @return declawed
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Boolean getDeclawed() {
     return declawed;
diff --git a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/Category.java b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/Category.java
index 03efdd4be8..3eccd2cd92 100644
--- a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/Category.java
+++ b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/Category.java
@@ -41,7 +41,7 @@ public class Category {
    * Get id
    * @return id
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Long getId() {
     return id;
@@ -60,7 +60,6 @@ public class Category {
    * Get name
    * @return name
   **/
-
   @ApiModelProperty(required = true, value = "")
   public String getName() {
     return name;
diff --git a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/ClassModel.java b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/ClassModel.java
index def421a670..2aaed27fff 100644
--- a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/ClassModel.java
+++ b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/ClassModel.java
@@ -39,7 +39,7 @@ public class ClassModel {
    * Get propertyClass
    * @return propertyClass
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getPropertyClass() {
     return propertyClass;
diff --git a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/Client.java b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/Client.java
index c0bd0743e5..458e812960 100644
--- a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/Client.java
+++ b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/Client.java
@@ -38,7 +38,7 @@ public class Client {
    * Get client
    * @return client
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getClient() {
     return client;
diff --git a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/Dog.java b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/Dog.java
index 6b79c59606..83f5cb0e27 100644
--- a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/Dog.java
+++ b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/Dog.java
@@ -40,7 +40,7 @@ public class Dog extends Animal {
    * Get breed
    * @return breed
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getBreed() {
     return breed;
diff --git a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/DogAllOf.java b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/DogAllOf.java
index 1a4496d8f0..d1e1402789 100644
--- a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/DogAllOf.java
+++ b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/DogAllOf.java
@@ -38,7 +38,7 @@ public class DogAllOf {
    * Get breed
    * @return breed
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getBreed() {
     return breed;
diff --git a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/EnumArrays.java b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/EnumArrays.java
index 40e31bf3ca..368b481f7e 100644
--- a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/EnumArrays.java
+++ b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/EnumArrays.java
@@ -113,7 +113,7 @@ public class EnumArrays {
    * Get justSymbol
    * @return justSymbol
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public JustSymbolEnum getJustSymbol() {
     return justSymbol;
@@ -140,7 +140,7 @@ public class EnumArrays {
    * Get arrayEnum
    * @return arrayEnum
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public List<ArrayEnumEnum> getArrayEnum() {
     return arrayEnum;
diff --git a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/EnumTest.java b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/EnumTest.java
index d4b36798ee..b365a8a56f 100644
--- a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/EnumTest.java
+++ b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/EnumTest.java
@@ -195,7 +195,7 @@ public class EnumTest {
    * Get enumString
    * @return enumString
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public EnumStringEnum getEnumString() {
     return enumString;
@@ -214,7 +214,6 @@ public class EnumTest {
    * Get enumStringRequired
    * @return enumStringRequired
   **/
-
   @ApiModelProperty(required = true, value = "")
   public EnumStringRequiredEnum getEnumStringRequired() {
     return enumStringRequired;
@@ -233,7 +232,7 @@ public class EnumTest {
    * Get enumInteger
    * @return enumInteger
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public EnumIntegerEnum getEnumInteger() {
     return enumInteger;
@@ -252,7 +251,7 @@ public class EnumTest {
    * Get enumNumber
    * @return enumNumber
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public EnumNumberEnum getEnumNumber() {
     return enumNumber;
@@ -271,7 +270,7 @@ public class EnumTest {
    * Get outerEnum
    * @return outerEnum
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public OuterEnum getOuterEnum() {
     return outerEnum;
diff --git a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java
index bee77a8cec..ca73764280 100644
--- a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java
+++ b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java
@@ -43,7 +43,7 @@ public class FileSchemaTestClass {
    * Get file
    * @return file
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public java.io.File getFile() {
     return file;
@@ -70,7 +70,7 @@ public class FileSchemaTestClass {
    * Get files
    * @return files
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public List<java.io.File> getFiles() {
     return files;
diff --git a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/FormatTest.java b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/FormatTest.java
index c017f57a80..00d132529e 100644
--- a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/FormatTest.java
+++ b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/FormatTest.java
@@ -81,7 +81,7 @@ public class FormatTest {
    * maximum: 100
    * @return integer
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Integer getInteger() {
     return integer;
@@ -102,7 +102,7 @@ public class FormatTest {
    * maximum: 200
    * @return int32
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Integer getInt32() {
     return int32;
@@ -121,7 +121,7 @@ public class FormatTest {
    * Get int64
    * @return int64
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Long getInt64() {
     return int64;
@@ -142,7 +142,6 @@ public class FormatTest {
    * maximum: 543.2
    * @return number
   **/
-
   @ApiModelProperty(required = true, value = "")
   public BigDecimal getNumber() {
     return number;
@@ -163,7 +162,7 @@ public class FormatTest {
    * maximum: 987.6
    * @return _float
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Float getFloat() {
     return _float;
@@ -184,7 +183,7 @@ public class FormatTest {
    * maximum: 123.4
    * @return _double
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Double getDouble() {
     return _double;
@@ -203,7 +202,7 @@ public class FormatTest {
    * Get string
    * @return string
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getString() {
     return string;
@@ -222,7 +221,6 @@ public class FormatTest {
    * Get _byte
    * @return _byte
   **/
-
   @ApiModelProperty(required = true, value = "")
   public byte[] getByte() {
     return _byte;
@@ -241,7 +239,7 @@ public class FormatTest {
    * Get binary
    * @return binary
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public File getBinary() {
     return binary;
@@ -260,7 +258,6 @@ public class FormatTest {
    * Get date
    * @return date
   **/
-
   @ApiModelProperty(required = true, value = "")
   public LocalDate getDate() {
     return date;
@@ -279,7 +276,7 @@ public class FormatTest {
    * Get dateTime
    * @return dateTime
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public OffsetDateTime getDateTime() {
     return dateTime;
@@ -298,7 +295,7 @@ public class FormatTest {
    * Get uuid
    * @return uuid
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(example = "72f98069-206d-4f12-9f12-3d1e525a8e84", value = "")
   public UUID getUuid() {
     return uuid;
@@ -317,7 +314,6 @@ public class FormatTest {
    * Get password
    * @return password
   **/
-
   @ApiModelProperty(required = true, value = "")
   public String getPassword() {
     return password;
diff --git a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java
index 44159e08e8..e9453bb6cc 100644
--- a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java
+++ b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java
@@ -36,7 +36,7 @@ public class HasOnlyReadOnly {
    * Get bar
    * @return bar
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getBar() {
     return bar;
@@ -46,7 +46,7 @@ public class HasOnlyReadOnly {
    * Get foo
    * @return foo
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getFoo() {
     return foo;
diff --git a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/MapTest.java b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/MapTest.java
index a7a141bb9b..44cd694057 100644
--- a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/MapTest.java
+++ b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/MapTest.java
@@ -93,7 +93,7 @@ public class MapTest {
    * Get mapMapOfString
    * @return mapMapOfString
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Map<String, Map<String, String>> getMapMapOfString() {
     return mapMapOfString;
@@ -120,7 +120,7 @@ public class MapTest {
    * Get mapOfEnumString
    * @return mapOfEnumString
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Map<String, InnerEnum> getMapOfEnumString() {
     return mapOfEnumString;
@@ -147,7 +147,7 @@ public class MapTest {
    * Get directMap
    * @return directMap
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Map<String, Boolean> getDirectMap() {
     return directMap;
@@ -174,7 +174,7 @@ public class MapTest {
    * Get indirectMap
    * @return indirectMap
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Map<String, Boolean> getIndirectMap() {
     return indirectMap;
diff --git a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java
index ea930e3e2e..19d808093c 100644
--- a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java
+++ b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java
@@ -50,7 +50,7 @@ public class MixedPropertiesAndAdditionalPropertiesClass {
    * Get uuid
    * @return uuid
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public UUID getUuid() {
     return uuid;
@@ -69,7 +69,7 @@ public class MixedPropertiesAndAdditionalPropertiesClass {
    * Get dateTime
    * @return dateTime
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public OffsetDateTime getDateTime() {
     return dateTime;
@@ -96,7 +96,7 @@ public class MixedPropertiesAndAdditionalPropertiesClass {
    * Get map
    * @return map
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Map<String, Animal> getMap() {
     return map;
diff --git a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/Model200Response.java b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/Model200Response.java
index bd3244dd57..39fabeeb6d 100644
--- a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/Model200Response.java
+++ b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/Model200Response.java
@@ -42,7 +42,7 @@ public class Model200Response {
    * Get name
    * @return name
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Integer getName() {
     return name;
@@ -61,7 +61,7 @@ public class Model200Response {
    * Get propertyClass
    * @return propertyClass
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getPropertyClass() {
     return propertyClass;
diff --git a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/ModelApiResponse.java b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/ModelApiResponse.java
index ed335cdca1..bb33412951 100644
--- a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/ModelApiResponse.java
+++ b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/ModelApiResponse.java
@@ -44,7 +44,7 @@ public class ModelApiResponse {
    * Get code
    * @return code
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Integer getCode() {
     return code;
@@ -63,7 +63,7 @@ public class ModelApiResponse {
    * Get type
    * @return type
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getType() {
     return type;
@@ -82,7 +82,7 @@ public class ModelApiResponse {
    * Get message
    * @return message
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getMessage() {
     return message;
diff --git a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/ModelReturn.java b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/ModelReturn.java
index 04c0bcd33f..9aafb13e04 100644
--- a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/ModelReturn.java
+++ b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/ModelReturn.java
@@ -39,7 +39,7 @@ public class ModelReturn {
    * Get _return
    * @return _return
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Integer getReturn() {
     return _return;
diff --git a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/Name.java b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/Name.java
index af27c6e45f..9518276dd6 100644
--- a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/Name.java
+++ b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/Name.java
@@ -48,7 +48,6 @@ public class Name {
    * Get name
    * @return name
   **/
-
   @ApiModelProperty(required = true, value = "")
   public Integer getName() {
     return name;
@@ -62,7 +61,7 @@ public class Name {
    * Get snakeCase
    * @return snakeCase
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Integer getSnakeCase() {
     return snakeCase;
@@ -77,7 +76,7 @@ public class Name {
    * Get property
    * @return property
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getProperty() {
     return property;
@@ -91,7 +90,7 @@ public class Name {
    * Get _123number
    * @return _123number
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Integer get123number() {
     return _123number;
diff --git a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/NumberOnly.java b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/NumberOnly.java
index 4e29c814cc..0245e8e210 100644
--- a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/NumberOnly.java
+++ b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/NumberOnly.java
@@ -39,7 +39,7 @@ public class NumberOnly {
    * Get justNumber
    * @return justNumber
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public BigDecimal getJustNumber() {
     return justNumber;
diff --git a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/Order.java b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/Order.java
index 9e935d606e..a9e2986a2f 100644
--- a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/Order.java
+++ b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/Order.java
@@ -91,7 +91,7 @@ public class Order {
    * Get id
    * @return id
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Long getId() {
     return id;
@@ -110,7 +110,7 @@ public class Order {
    * Get petId
    * @return petId
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Long getPetId() {
     return petId;
@@ -129,7 +129,7 @@ public class Order {
    * Get quantity
    * @return quantity
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Integer getQuantity() {
     return quantity;
@@ -148,7 +148,7 @@ public class Order {
    * Get shipDate
    * @return shipDate
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public OffsetDateTime getShipDate() {
     return shipDate;
@@ -167,7 +167,7 @@ public class Order {
    * Order Status
    * @return status
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "Order Status")
   public StatusEnum getStatus() {
     return status;
@@ -186,7 +186,7 @@ public class Order {
    * Get complete
    * @return complete
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Boolean getComplete() {
     return complete;
diff --git a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/OuterComposite.java b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/OuterComposite.java
index f6515126a8..c8bd99011c 100644
--- a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/OuterComposite.java
+++ b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/OuterComposite.java
@@ -45,7 +45,7 @@ public class OuterComposite {
    * Get myNumber
    * @return myNumber
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public BigDecimal getMyNumber() {
     return myNumber;
@@ -64,7 +64,7 @@ public class OuterComposite {
    * Get myString
    * @return myString
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getMyString() {
     return myString;
@@ -83,7 +83,7 @@ public class OuterComposite {
    * Get myBoolean
    * @return myBoolean
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Boolean getMyBoolean() {
     return myBoolean;
diff --git a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/Pet.java b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/Pet.java
index 63e9b4ff5d..a7d92129d7 100644
--- a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/Pet.java
+++ b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/Pet.java
@@ -94,7 +94,7 @@ public class Pet {
    * Get id
    * @return id
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Long getId() {
     return id;
@@ -113,7 +113,7 @@ public class Pet {
    * Get category
    * @return category
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Category getCategory() {
     return category;
@@ -132,7 +132,6 @@ public class Pet {
    * Get name
    * @return name
   **/
-
   @ApiModelProperty(example = "doggie", required = true, value = "")
   public String getName() {
     return name;
@@ -156,7 +155,6 @@ public class Pet {
    * Get photoUrls
    * @return photoUrls
   **/
-
   @ApiModelProperty(required = true, value = "")
   public List<String> getPhotoUrls() {
     return photoUrls;
@@ -183,7 +181,7 @@ public class Pet {
    * Get tags
    * @return tags
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public List<Tag> getTags() {
     return tags;
@@ -202,7 +200,7 @@ public class Pet {
    * pet status in the store
    * @return status
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "pet status in the store")
   public StatusEnum getStatus() {
     return status;
diff --git a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/ReadOnlyFirst.java b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/ReadOnlyFirst.java
index a2c9e99699..1379ee09ea 100644
--- a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/ReadOnlyFirst.java
+++ b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/ReadOnlyFirst.java
@@ -36,7 +36,7 @@ public class ReadOnlyFirst {
    * Get bar
    * @return bar
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getBar() {
     return bar;
@@ -51,7 +51,7 @@ public class ReadOnlyFirst {
    * Get baz
    * @return baz
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getBaz() {
     return baz;
diff --git a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/SpecialModelName.java b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/SpecialModelName.java
index a5ddb0b638..869771afad 100644
--- a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/SpecialModelName.java
+++ b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/SpecialModelName.java
@@ -38,7 +38,7 @@ public class SpecialModelName {
    * Get $specialPropertyName
    * @return $specialPropertyName
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Long get$SpecialPropertyName() {
     return $specialPropertyName;
diff --git a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/Tag.java b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/Tag.java
index 8255ad8298..4bb498aff4 100644
--- a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/Tag.java
+++ b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/Tag.java
@@ -41,7 +41,7 @@ public class Tag {
    * Get id
    * @return id
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Long getId() {
     return id;
@@ -60,7 +60,7 @@ public class Tag {
    * Get name
    * @return name
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getName() {
     return name;
diff --git a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/TypeHolderDefault.java b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/TypeHolderDefault.java
index d8c7b3efdd..9d0f5b2fbe 100644
--- a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/TypeHolderDefault.java
+++ b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/TypeHolderDefault.java
@@ -53,7 +53,6 @@ public class TypeHolderDefault {
    * Get stringItem
    * @return stringItem
   **/
-
   @ApiModelProperty(required = true, value = "")
   public String getStringItem() {
     return stringItem;
@@ -72,7 +71,6 @@ public class TypeHolderDefault {
    * Get numberItem
    * @return numberItem
   **/
-
   @ApiModelProperty(required = true, value = "")
   public BigDecimal getNumberItem() {
     return numberItem;
@@ -91,7 +89,6 @@ public class TypeHolderDefault {
    * Get integerItem
    * @return integerItem
   **/
-
   @ApiModelProperty(required = true, value = "")
   public Integer getIntegerItem() {
     return integerItem;
@@ -110,7 +107,6 @@ public class TypeHolderDefault {
    * Get boolItem
    * @return boolItem
   **/
-
   @ApiModelProperty(required = true, value = "")
   public Boolean getBoolItem() {
     return boolItem;
@@ -134,7 +130,6 @@ public class TypeHolderDefault {
    * Get arrayItem
    * @return arrayItem
   **/
-
   @ApiModelProperty(required = true, value = "")
   public List<Integer> getArrayItem() {
     return arrayItem;
diff --git a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/TypeHolderExample.java b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/TypeHolderExample.java
index c1d5ea30f8..94d3c57b6f 100644
--- a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/TypeHolderExample.java
+++ b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/TypeHolderExample.java
@@ -53,7 +53,6 @@ public class TypeHolderExample {
    * Get stringItem
    * @return stringItem
   **/
-
   @ApiModelProperty(example = "what", required = true, value = "")
   public String getStringItem() {
     return stringItem;
@@ -72,7 +71,6 @@ public class TypeHolderExample {
    * Get numberItem
    * @return numberItem
   **/
-
   @ApiModelProperty(example = "1.234", required = true, value = "")
   public BigDecimal getNumberItem() {
     return numberItem;
@@ -91,7 +89,6 @@ public class TypeHolderExample {
    * Get integerItem
    * @return integerItem
   **/
-
   @ApiModelProperty(example = "-2", required = true, value = "")
   public Integer getIntegerItem() {
     return integerItem;
@@ -110,7 +107,6 @@ public class TypeHolderExample {
    * Get boolItem
    * @return boolItem
   **/
-
   @ApiModelProperty(example = "true", required = true, value = "")
   public Boolean getBoolItem() {
     return boolItem;
@@ -134,7 +130,6 @@ public class TypeHolderExample {
    * Get arrayItem
    * @return arrayItem
   **/
-
   @ApiModelProperty(example = "[0, 1, 2, 3]", required = true, value = "")
   public List<Integer> getArrayItem() {
     return arrayItem;
diff --git a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/User.java b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/User.java
index 6e6c4ac102..73164c3ee2 100644
--- a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/User.java
+++ b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/User.java
@@ -59,7 +59,7 @@ public class User {
    * Get id
    * @return id
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Long getId() {
     return id;
@@ -78,7 +78,7 @@ public class User {
    * Get username
    * @return username
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getUsername() {
     return username;
@@ -97,7 +97,7 @@ public class User {
    * Get firstName
    * @return firstName
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getFirstName() {
     return firstName;
@@ -116,7 +116,7 @@ public class User {
    * Get lastName
    * @return lastName
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getLastName() {
     return lastName;
@@ -135,7 +135,7 @@ public class User {
    * Get email
    * @return email
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getEmail() {
     return email;
@@ -154,7 +154,7 @@ public class User {
    * Get password
    * @return password
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getPassword() {
     return password;
@@ -173,7 +173,7 @@ public class User {
    * Get phone
    * @return phone
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getPhone() {
     return phone;
@@ -192,7 +192,7 @@ public class User {
    * User Status
    * @return userStatus
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "User Status")
   public Integer getUserStatus() {
     return userStatus;
diff --git a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/XmlItem.java b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/XmlItem.java
index ce4af3e8b9..9032c23424 100644
--- a/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/XmlItem.java
+++ b/samples/client/petstore/java/resttemplate/src/main/java/org/openapitools/client/model/XmlItem.java
@@ -125,7 +125,7 @@ public class XmlItem {
    * Get attributeString
    * @return attributeString
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(example = "string", value = "")
   public String getAttributeString() {
     return attributeString;
@@ -144,7 +144,7 @@ public class XmlItem {
    * Get attributeNumber
    * @return attributeNumber
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(example = "1.234", value = "")
   public BigDecimal getAttributeNumber() {
     return attributeNumber;
@@ -163,7 +163,7 @@ public class XmlItem {
    * Get attributeInteger
    * @return attributeInteger
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(example = "-2", value = "")
   public Integer getAttributeInteger() {
     return attributeInteger;
@@ -182,7 +182,7 @@ public class XmlItem {
    * Get attributeBoolean
    * @return attributeBoolean
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(example = "true", value = "")
   public Boolean getAttributeBoolean() {
     return attributeBoolean;
@@ -209,7 +209,7 @@ public class XmlItem {
    * Get wrappedArray
    * @return wrappedArray
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public List<Integer> getWrappedArray() {
     return wrappedArray;
@@ -228,7 +228,7 @@ public class XmlItem {
    * Get nameString
    * @return nameString
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(example = "string", value = "")
   public String getNameString() {
     return nameString;
@@ -247,7 +247,7 @@ public class XmlItem {
    * Get nameNumber
    * @return nameNumber
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(example = "1.234", value = "")
   public BigDecimal getNameNumber() {
     return nameNumber;
@@ -266,7 +266,7 @@ public class XmlItem {
    * Get nameInteger
    * @return nameInteger
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(example = "-2", value = "")
   public Integer getNameInteger() {
     return nameInteger;
@@ -285,7 +285,7 @@ public class XmlItem {
    * Get nameBoolean
    * @return nameBoolean
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(example = "true", value = "")
   public Boolean getNameBoolean() {
     return nameBoolean;
@@ -312,7 +312,7 @@ public class XmlItem {
    * Get nameArray
    * @return nameArray
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public List<Integer> getNameArray() {
     return nameArray;
@@ -339,7 +339,7 @@ public class XmlItem {
    * Get nameWrappedArray
    * @return nameWrappedArray
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public List<Integer> getNameWrappedArray() {
     return nameWrappedArray;
@@ -358,7 +358,7 @@ public class XmlItem {
    * Get prefixString
    * @return prefixString
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(example = "string", value = "")
   public String getPrefixString() {
     return prefixString;
@@ -377,7 +377,7 @@ public class XmlItem {
    * Get prefixNumber
    * @return prefixNumber
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(example = "1.234", value = "")
   public BigDecimal getPrefixNumber() {
     return prefixNumber;
@@ -396,7 +396,7 @@ public class XmlItem {
    * Get prefixInteger
    * @return prefixInteger
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(example = "-2", value = "")
   public Integer getPrefixInteger() {
     return prefixInteger;
@@ -415,7 +415,7 @@ public class XmlItem {
    * Get prefixBoolean
    * @return prefixBoolean
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(example = "true", value = "")
   public Boolean getPrefixBoolean() {
     return prefixBoolean;
@@ -442,7 +442,7 @@ public class XmlItem {
    * Get prefixArray
    * @return prefixArray
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public List<Integer> getPrefixArray() {
     return prefixArray;
@@ -469,7 +469,7 @@ public class XmlItem {
    * Get prefixWrappedArray
    * @return prefixWrappedArray
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public List<Integer> getPrefixWrappedArray() {
     return prefixWrappedArray;
@@ -488,7 +488,7 @@ public class XmlItem {
    * Get namespaceString
    * @return namespaceString
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(example = "string", value = "")
   public String getNamespaceString() {
     return namespaceString;
@@ -507,7 +507,7 @@ public class XmlItem {
    * Get namespaceNumber
    * @return namespaceNumber
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(example = "1.234", value = "")
   public BigDecimal getNamespaceNumber() {
     return namespaceNumber;
@@ -526,7 +526,7 @@ public class XmlItem {
    * Get namespaceInteger
    * @return namespaceInteger
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(example = "-2", value = "")
   public Integer getNamespaceInteger() {
     return namespaceInteger;
@@ -545,7 +545,7 @@ public class XmlItem {
    * Get namespaceBoolean
    * @return namespaceBoolean
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(example = "true", value = "")
   public Boolean getNamespaceBoolean() {
     return namespaceBoolean;
@@ -572,7 +572,7 @@ public class XmlItem {
    * Get namespaceArray
    * @return namespaceArray
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public List<Integer> getNamespaceArray() {
     return namespaceArray;
@@ -599,7 +599,7 @@ public class XmlItem {
    * Get namespaceWrappedArray
    * @return namespaceWrappedArray
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public List<Integer> getNamespaceWrappedArray() {
     return namespaceWrappedArray;
@@ -618,7 +618,7 @@ public class XmlItem {
    * Get prefixNsString
    * @return prefixNsString
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(example = "string", value = "")
   public String getPrefixNsString() {
     return prefixNsString;
@@ -637,7 +637,7 @@ public class XmlItem {
    * Get prefixNsNumber
    * @return prefixNsNumber
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(example = "1.234", value = "")
   public BigDecimal getPrefixNsNumber() {
     return prefixNsNumber;
@@ -656,7 +656,7 @@ public class XmlItem {
    * Get prefixNsInteger
    * @return prefixNsInteger
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(example = "-2", value = "")
   public Integer getPrefixNsInteger() {
     return prefixNsInteger;
@@ -675,7 +675,7 @@ public class XmlItem {
    * Get prefixNsBoolean
    * @return prefixNsBoolean
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(example = "true", value = "")
   public Boolean getPrefixNsBoolean() {
     return prefixNsBoolean;
@@ -702,7 +702,7 @@ public class XmlItem {
    * Get prefixNsArray
    * @return prefixNsArray
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public List<Integer> getPrefixNsArray() {
     return prefixNsArray;
@@ -729,7 +729,7 @@ public class XmlItem {
    * Get prefixNsWrappedArray
    * @return prefixNsWrappedArray
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public List<Integer> getPrefixNsWrappedArray() {
     return prefixNsWrappedArray;
diff --git a/samples/client/petstore/java/retrofit/src/main/java/org/openapitools/client/model/AdditionalPropertiesAnyType.java b/samples/client/petstore/java/retrofit/src/main/java/org/openapitools/client/model/AdditionalPropertiesAnyType.java
index e98f74f8ae..6639252ccb 100644
--- a/samples/client/petstore/java/retrofit/src/main/java/org/openapitools/client/model/AdditionalPropertiesAnyType.java
+++ b/samples/client/petstore/java/retrofit/src/main/java/org/openapitools/client/model/AdditionalPropertiesAnyType.java
@@ -44,7 +44,7 @@ public class AdditionalPropertiesAnyType extends HashMap<String, Object> {
    * Get name
    * @return name
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getName() {
     return name;
diff --git a/samples/client/petstore/java/retrofit/src/main/java/org/openapitools/client/model/AdditionalPropertiesArray.java b/samples/client/petstore/java/retrofit/src/main/java/org/openapitools/client/model/AdditionalPropertiesArray.java
index 1d86faad3e..2c3f2ca0a4 100644
--- a/samples/client/petstore/java/retrofit/src/main/java/org/openapitools/client/model/AdditionalPropertiesArray.java
+++ b/samples/client/petstore/java/retrofit/src/main/java/org/openapitools/client/model/AdditionalPropertiesArray.java
@@ -45,7 +45,7 @@ public class AdditionalPropertiesArray extends HashMap<String, List> {
    * Get name
    * @return name
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getName() {
     return name;
diff --git a/samples/client/petstore/java/retrofit/src/main/java/org/openapitools/client/model/AdditionalPropertiesBoolean.java b/samples/client/petstore/java/retrofit/src/main/java/org/openapitools/client/model/AdditionalPropertiesBoolean.java
index a3b37161da..7c4a5248c0 100644
--- a/samples/client/petstore/java/retrofit/src/main/java/org/openapitools/client/model/AdditionalPropertiesBoolean.java
+++ b/samples/client/petstore/java/retrofit/src/main/java/org/openapitools/client/model/AdditionalPropertiesBoolean.java
@@ -44,7 +44,7 @@ public class AdditionalPropertiesBoolean extends HashMap<String, Boolean> {
    * Get name
    * @return name
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getName() {
     return name;
diff --git a/samples/client/petstore/java/retrofit/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java b/samples/client/petstore/java/retrofit/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java
index 8819f4a024..b016f1f377 100644
--- a/samples/client/petstore/java/retrofit/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java
+++ b/samples/client/petstore/java/retrofit/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java
@@ -94,7 +94,7 @@ public class AdditionalPropertiesClass {
    * Get mapString
    * @return mapString
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Map<String, String> getMapString() {
     return mapString;
@@ -121,7 +121,7 @@ public class AdditionalPropertiesClass {
    * Get mapNumber
    * @return mapNumber
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Map<String, BigDecimal> getMapNumber() {
     return mapNumber;
@@ -148,7 +148,7 @@ public class AdditionalPropertiesClass {
    * Get mapInteger
    * @return mapInteger
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Map<String, Integer> getMapInteger() {
     return mapInteger;
@@ -175,7 +175,7 @@ public class AdditionalPropertiesClass {
    * Get mapBoolean
    * @return mapBoolean
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Map<String, Boolean> getMapBoolean() {
     return mapBoolean;
@@ -202,7 +202,7 @@ public class AdditionalPropertiesClass {
    * Get mapArrayInteger
    * @return mapArrayInteger
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Map<String, List<Integer>> getMapArrayInteger() {
     return mapArrayInteger;
@@ -229,7 +229,7 @@ public class AdditionalPropertiesClass {
    * Get mapArrayAnytype
    * @return mapArrayAnytype
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Map<String, List<Object>> getMapArrayAnytype() {
     return mapArrayAnytype;
@@ -256,7 +256,7 @@ public class AdditionalPropertiesClass {
    * Get mapMapString
    * @return mapMapString
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Map<String, Map<String, String>> getMapMapString() {
     return mapMapString;
@@ -283,7 +283,7 @@ public class AdditionalPropertiesClass {
    * Get mapMapAnytype
    * @return mapMapAnytype
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Map<String, Map<String, Object>> getMapMapAnytype() {
     return mapMapAnytype;
@@ -302,7 +302,7 @@ public class AdditionalPropertiesClass {
    * Get anytype1
    * @return anytype1
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Object getAnytype1() {
     return anytype1;
@@ -321,7 +321,7 @@ public class AdditionalPropertiesClass {
    * Get anytype2
    * @return anytype2
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Object getAnytype2() {
     return anytype2;
@@ -340,7 +340,7 @@ public class AdditionalPropertiesClass {
    * Get anytype3
    * @return anytype3
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Object getAnytype3() {
     return anytype3;
diff --git a/samples/client/petstore/java/retrofit/src/main/java/org/openapitools/client/model/AdditionalPropertiesInteger.java b/samples/client/petstore/java/retrofit/src/main/java/org/openapitools/client/model/AdditionalPropertiesInteger.java
index b8f956cbed..10df3df74c 100644
--- a/samples/client/petstore/java/retrofit/src/main/java/org/openapitools/client/model/AdditionalPropertiesInteger.java
+++ b/samples/client/petstore/java/retrofit/src/main/java/org/openapitools/client/model/AdditionalPropertiesInteger.java
@@ -44,7 +44,7 @@ public class AdditionalPropertiesInteger extends HashMap<String, Integer> {
    * Get name
    * @return name
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getName() {
     return name;
diff --git a/samples/client/petstore/java/retrofit/src/main/java/org/openapitools/client/model/AdditionalPropertiesNumber.java b/samples/client/petstore/java/retrofit/src/main/java/org/openapitools/client/model/AdditionalPropertiesNumber.java
index 03d923ab1d..33719cab26 100644
--- a/samples/client/petstore/java/retrofit/src/main/java/org/openapitools/client/model/AdditionalPropertiesNumber.java
+++ b/samples/client/petstore/java/retrofit/src/main/java/org/openapitools/client/model/AdditionalPropertiesNumber.java
@@ -45,7 +45,7 @@ public class AdditionalPropertiesNumber extends HashMap<String, BigDecimal> {
    * Get name
    * @return name
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getName() {
     return name;
diff --git a/samples/client/petstore/java/retrofit/src/main/java/org/openapitools/client/model/AdditionalPropertiesObject.java b/samples/client/petstore/java/retrofit/src/main/java/org/openapitools/client/model/AdditionalPropertiesObject.java
index c0e696dbd5..e37e04b01a 100644
--- a/samples/client/petstore/java/retrofit/src/main/java/org/openapitools/client/model/AdditionalPropertiesObject.java
+++ b/samples/client/petstore/java/retrofit/src/main/java/org/openapitools/client/model/AdditionalPropertiesObject.java
@@ -44,7 +44,7 @@ public class AdditionalPropertiesObject extends HashMap<String, Map> {
    * Get name
    * @return name
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getName() {
     return name;
diff --git a/samples/client/petstore/java/retrofit/src/main/java/org/openapitools/client/model/AdditionalPropertiesString.java b/samples/client/petstore/java/retrofit/src/main/java/org/openapitools/client/model/AdditionalPropertiesString.java
index 67e597e3cf..cfbf74f5b3 100644
--- a/samples/client/petstore/java/retrofit/src/main/java/org/openapitools/client/model/AdditionalPropertiesString.java
+++ b/samples/client/petstore/java/retrofit/src/main/java/org/openapitools/client/model/AdditionalPropertiesString.java
@@ -44,7 +44,7 @@ public class AdditionalPropertiesString extends HashMap<String, String> {
    * Get name
    * @return name
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getName() {
     return name;
diff --git a/samples/client/petstore/java/retrofit/src/main/java/org/openapitools/client/model/Animal.java b/samples/client/petstore/java/retrofit/src/main/java/org/openapitools/client/model/Animal.java
index 1738bdaf47..0a02419dbf 100644
--- a/samples/client/petstore/java/retrofit/src/main/java/org/openapitools/client/model/Animal.java
+++ b/samples/client/petstore/java/retrofit/src/main/java/org/openapitools/client/model/Animal.java
@@ -50,7 +50,6 @@ public class Animal {
    * Get className
    * @return className
   **/
-
   @ApiModelProperty(required = true, value = "")
   public String getClassName() {
     return className;
@@ -69,7 +68,7 @@ public class Animal {
    * Get color
    * @return color
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getColor() {
     return color;
diff --git a/samples/client/petstore/java/retrofit/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java b/samples/client/petstore/java/retrofit/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java
index 69c0cacb05..4f016503d4 100644
--- a/samples/client/petstore/java/retrofit/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java
+++ b/samples/client/petstore/java/retrofit/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java
@@ -53,7 +53,7 @@ public class ArrayOfArrayOfNumberOnly {
    * Get arrayArrayNumber
    * @return arrayArrayNumber
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public List<List<BigDecimal>> getArrayArrayNumber() {
     return arrayArrayNumber;
diff --git a/samples/client/petstore/java/retrofit/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java b/samples/client/petstore/java/retrofit/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java
index a85aa96af7..15d27a21f2 100644
--- a/samples/client/petstore/java/retrofit/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java
+++ b/samples/client/petstore/java/retrofit/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java
@@ -53,7 +53,7 @@ public class ArrayOfNumberOnly {
    * Get arrayNumber
    * @return arrayNumber
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public List<BigDecimal> getArrayNumber() {
     return arrayNumber;
diff --git a/samples/client/petstore/java/retrofit/src/main/java/org/openapitools/client/model/ArrayTest.java b/samples/client/petstore/java/retrofit/src/main/java/org/openapitools/client/model/ArrayTest.java
index 986ac5aa17..7f6d476044 100644
--- a/samples/client/petstore/java/retrofit/src/main/java/org/openapitools/client/model/ArrayTest.java
+++ b/samples/client/petstore/java/retrofit/src/main/java/org/openapitools/client/model/ArrayTest.java
@@ -61,7 +61,7 @@ public class ArrayTest {
    * Get arrayOfString
    * @return arrayOfString
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public List<String> getArrayOfString() {
     return arrayOfString;
@@ -88,7 +88,7 @@ public class ArrayTest {
    * Get arrayArrayOfInteger
    * @return arrayArrayOfInteger
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public List<List<Long>> getArrayArrayOfInteger() {
     return arrayArrayOfInteger;
@@ -115,7 +115,7 @@ public class ArrayTest {
    * Get arrayArrayOfModel
    * @return arrayArrayOfModel
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public List<List<ReadOnlyFirst>> getArrayArrayOfModel() {
     return arrayArrayOfModel;
diff --git a/samples/client/petstore/java/retrofit/src/main/java/org/openapitools/client/model/Capitalization.java b/samples/client/petstore/java/retrofit/src/main/java/org/openapitools/client/model/Capitalization.java
index 36f8853e1c..ef40fe949f 100644
--- a/samples/client/petstore/java/retrofit/src/main/java/org/openapitools/client/model/Capitalization.java
+++ b/samples/client/petstore/java/retrofit/src/main/java/org/openapitools/client/model/Capitalization.java
@@ -62,7 +62,7 @@ public class Capitalization {
    * Get smallCamel
    * @return smallCamel
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getSmallCamel() {
     return smallCamel;
@@ -81,7 +81,7 @@ public class Capitalization {
    * Get capitalCamel
    * @return capitalCamel
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getCapitalCamel() {
     return capitalCamel;
@@ -100,7 +100,7 @@ public class Capitalization {
    * Get smallSnake
    * @return smallSnake
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getSmallSnake() {
     return smallSnake;
@@ -119,7 +119,7 @@ public class Capitalization {
    * Get capitalSnake
    * @return capitalSnake
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getCapitalSnake() {
     return capitalSnake;
@@ -138,7 +138,7 @@ public class Capitalization {
    * Get scAETHFlowPoints
    * @return scAETHFlowPoints
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getScAETHFlowPoints() {
     return scAETHFlowPoints;
@@ -157,7 +157,7 @@ public class Capitalization {
    * Name of the pet 
    * @return ATT_NAME
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "Name of the pet ")
   public String getATTNAME() {
     return ATT_NAME;
diff --git a/samples/client/petstore/java/retrofit/src/main/java/org/openapitools/client/model/Cat.java b/samples/client/petstore/java/retrofit/src/main/java/org/openapitools/client/model/Cat.java
index 965461a8be..c600502f71 100644
--- a/samples/client/petstore/java/retrofit/src/main/java/org/openapitools/client/model/Cat.java
+++ b/samples/client/petstore/java/retrofit/src/main/java/org/openapitools/client/model/Cat.java
@@ -44,7 +44,7 @@ public class Cat extends Animal {
    * Get declawed
    * @return declawed
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Boolean getDeclawed() {
     return declawed;
diff --git a/samples/client/petstore/java/retrofit/src/main/java/org/openapitools/client/model/CatAllOf.java b/samples/client/petstore/java/retrofit/src/main/java/org/openapitools/client/model/CatAllOf.java
index 124db9b8ba..29b3658551 100644
--- a/samples/client/petstore/java/retrofit/src/main/java/org/openapitools/client/model/CatAllOf.java
+++ b/samples/client/petstore/java/retrofit/src/main/java/org/openapitools/client/model/CatAllOf.java
@@ -42,7 +42,7 @@ public class CatAllOf {
    * Get declawed
    * @return declawed
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Boolean getDeclawed() {
     return declawed;
diff --git a/samples/client/petstore/java/retrofit/src/main/java/org/openapitools/client/model/Category.java b/samples/client/petstore/java/retrofit/src/main/java/org/openapitools/client/model/Category.java
index d4e121847a..1968763722 100644
--- a/samples/client/petstore/java/retrofit/src/main/java/org/openapitools/client/model/Category.java
+++ b/samples/client/petstore/java/retrofit/src/main/java/org/openapitools/client/model/Category.java
@@ -46,7 +46,7 @@ public class Category {
    * Get id
    * @return id
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Long getId() {
     return id;
@@ -65,7 +65,6 @@ public class Category {
    * Get name
    * @return name
   **/
-
   @ApiModelProperty(required = true, value = "")
   public String getName() {
     return name;
diff --git a/samples/client/petstore/java/retrofit/src/main/java/org/openapitools/client/model/ClassModel.java b/samples/client/petstore/java/retrofit/src/main/java/org/openapitools/client/model/ClassModel.java
index cbdd8f317b..52245d7050 100644
--- a/samples/client/petstore/java/retrofit/src/main/java/org/openapitools/client/model/ClassModel.java
+++ b/samples/client/petstore/java/retrofit/src/main/java/org/openapitools/client/model/ClassModel.java
@@ -43,7 +43,7 @@ public class ClassModel {
    * Get propertyClass
    * @return propertyClass
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getPropertyClass() {
     return propertyClass;
diff --git a/samples/client/petstore/java/retrofit/src/main/java/org/openapitools/client/model/Client.java b/samples/client/petstore/java/retrofit/src/main/java/org/openapitools/client/model/Client.java
index 5d9c5c4a71..e5ece3536d 100644
--- a/samples/client/petstore/java/retrofit/src/main/java/org/openapitools/client/model/Client.java
+++ b/samples/client/petstore/java/retrofit/src/main/java/org/openapitools/client/model/Client.java
@@ -42,7 +42,7 @@ public class Client {
    * Get client
    * @return client
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getClient() {
     return client;
diff --git a/samples/client/petstore/java/retrofit/src/main/java/org/openapitools/client/model/Dog.java b/samples/client/petstore/java/retrofit/src/main/java/org/openapitools/client/model/Dog.java
index 4da9ba4364..d877eb2f37 100644
--- a/samples/client/petstore/java/retrofit/src/main/java/org/openapitools/client/model/Dog.java
+++ b/samples/client/petstore/java/retrofit/src/main/java/org/openapitools/client/model/Dog.java
@@ -44,7 +44,7 @@ public class Dog extends Animal {
    * Get breed
    * @return breed
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getBreed() {
     return breed;
diff --git a/samples/client/petstore/java/retrofit/src/main/java/org/openapitools/client/model/DogAllOf.java b/samples/client/petstore/java/retrofit/src/main/java/org/openapitools/client/model/DogAllOf.java
index e505d1dbc3..54483f2227 100644
--- a/samples/client/petstore/java/retrofit/src/main/java/org/openapitools/client/model/DogAllOf.java
+++ b/samples/client/petstore/java/retrofit/src/main/java/org/openapitools/client/model/DogAllOf.java
@@ -42,7 +42,7 @@ public class DogAllOf {
    * Get breed
    * @return breed
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getBreed() {
     return breed;
diff --git a/samples/client/petstore/java/retrofit/src/main/java/org/openapitools/client/model/EnumArrays.java b/samples/client/petstore/java/retrofit/src/main/java/org/openapitools/client/model/EnumArrays.java
index 8748c9fa37..a5aba01d53 100644
--- a/samples/client/petstore/java/retrofit/src/main/java/org/openapitools/client/model/EnumArrays.java
+++ b/samples/client/petstore/java/retrofit/src/main/java/org/openapitools/client/model/EnumArrays.java
@@ -142,7 +142,7 @@ public class EnumArrays {
    * Get justSymbol
    * @return justSymbol
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public JustSymbolEnum getJustSymbol() {
     return justSymbol;
@@ -169,7 +169,7 @@ public class EnumArrays {
    * Get arrayEnum
    * @return arrayEnum
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public List<ArrayEnumEnum> getArrayEnum() {
     return arrayEnum;
diff --git a/samples/client/petstore/java/retrofit/src/main/java/org/openapitools/client/model/EnumTest.java b/samples/client/petstore/java/retrofit/src/main/java/org/openapitools/client/model/EnumTest.java
index 1960c24ac2..679584204f 100644
--- a/samples/client/petstore/java/retrofit/src/main/java/org/openapitools/client/model/EnumTest.java
+++ b/samples/client/petstore/java/retrofit/src/main/java/org/openapitools/client/model/EnumTest.java
@@ -251,7 +251,7 @@ public class EnumTest {
    * Get enumString
    * @return enumString
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public EnumStringEnum getEnumString() {
     return enumString;
@@ -270,7 +270,6 @@ public class EnumTest {
    * Get enumStringRequired
    * @return enumStringRequired
   **/
-
   @ApiModelProperty(required = true, value = "")
   public EnumStringRequiredEnum getEnumStringRequired() {
     return enumStringRequired;
@@ -289,7 +288,7 @@ public class EnumTest {
    * Get enumInteger
    * @return enumInteger
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public EnumIntegerEnum getEnumInteger() {
     return enumInteger;
@@ -308,7 +307,7 @@ public class EnumTest {
    * Get enumNumber
    * @return enumNumber
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public EnumNumberEnum getEnumNumber() {
     return enumNumber;
@@ -327,7 +326,7 @@ public class EnumTest {
    * Get outerEnum
    * @return outerEnum
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public OuterEnum getOuterEnum() {
     return outerEnum;
diff --git a/samples/client/petstore/java/retrofit/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java b/samples/client/petstore/java/retrofit/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java
index 3c7fcaabdf..181141b92d 100644
--- a/samples/client/petstore/java/retrofit/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java
+++ b/samples/client/petstore/java/retrofit/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java
@@ -48,7 +48,7 @@ public class FileSchemaTestClass {
    * Get file
    * @return file
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public java.io.File getFile() {
     return file;
@@ -75,7 +75,7 @@ public class FileSchemaTestClass {
    * Get files
    * @return files
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public List<java.io.File> getFiles() {
     return files;
diff --git a/samples/client/petstore/java/retrofit/src/main/java/org/openapitools/client/model/FormatTest.java b/samples/client/petstore/java/retrofit/src/main/java/org/openapitools/client/model/FormatTest.java
index 15f02e32f7..71556d37db 100644
--- a/samples/client/petstore/java/retrofit/src/main/java/org/openapitools/client/model/FormatTest.java
+++ b/samples/client/petstore/java/retrofit/src/main/java/org/openapitools/client/model/FormatTest.java
@@ -97,7 +97,7 @@ public class FormatTest {
    * maximum: 100
    * @return integer
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Integer getInteger() {
     return integer;
@@ -118,7 +118,7 @@ public class FormatTest {
    * maximum: 200
    * @return int32
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Integer getInt32() {
     return int32;
@@ -137,7 +137,7 @@ public class FormatTest {
    * Get int64
    * @return int64
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Long getInt64() {
     return int64;
@@ -158,7 +158,6 @@ public class FormatTest {
    * maximum: 543.2
    * @return number
   **/
-
   @ApiModelProperty(required = true, value = "")
   public BigDecimal getNumber() {
     return number;
@@ -179,7 +178,7 @@ public class FormatTest {
    * maximum: 987.6
    * @return _float
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Float getFloat() {
     return _float;
@@ -200,7 +199,7 @@ public class FormatTest {
    * maximum: 123.4
    * @return _double
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Double getDouble() {
     return _double;
@@ -219,7 +218,7 @@ public class FormatTest {
    * Get string
    * @return string
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getString() {
     return string;
@@ -238,7 +237,6 @@ public class FormatTest {
    * Get _byte
    * @return _byte
   **/
-
   @ApiModelProperty(required = true, value = "")
   public byte[] getByte() {
     return _byte;
@@ -257,7 +255,7 @@ public class FormatTest {
    * Get binary
    * @return binary
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public File getBinary() {
     return binary;
@@ -276,7 +274,6 @@ public class FormatTest {
    * Get date
    * @return date
   **/
-
   @ApiModelProperty(required = true, value = "")
   public LocalDate getDate() {
     return date;
@@ -295,7 +292,7 @@ public class FormatTest {
    * Get dateTime
    * @return dateTime
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public DateTime getDateTime() {
     return dateTime;
@@ -314,7 +311,7 @@ public class FormatTest {
    * Get uuid
    * @return uuid
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(example = "72f98069-206d-4f12-9f12-3d1e525a8e84", value = "")
   public UUID getUuid() {
     return uuid;
@@ -333,7 +330,6 @@ public class FormatTest {
    * Get password
    * @return password
   **/
-
   @ApiModelProperty(required = true, value = "")
   public String getPassword() {
     return password;
diff --git a/samples/client/petstore/java/retrofit/src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java b/samples/client/petstore/java/retrofit/src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java
index 72fcaa8993..02225d278c 100644
--- a/samples/client/petstore/java/retrofit/src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java
+++ b/samples/client/petstore/java/retrofit/src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java
@@ -41,7 +41,7 @@ public class HasOnlyReadOnly {
    * Get bar
    * @return bar
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getBar() {
     return bar;
@@ -51,7 +51,7 @@ public class HasOnlyReadOnly {
    * Get foo
    * @return foo
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getFoo() {
     return foo;
diff --git a/samples/client/petstore/java/retrofit/src/main/java/org/openapitools/client/model/MapTest.java b/samples/client/petstore/java/retrofit/src/main/java/org/openapitools/client/model/MapTest.java
index 43f0d2e998..329cb4c87b 100644
--- a/samples/client/petstore/java/retrofit/src/main/java/org/openapitools/client/model/MapTest.java
+++ b/samples/client/petstore/java/retrofit/src/main/java/org/openapitools/client/model/MapTest.java
@@ -112,7 +112,7 @@ public class MapTest {
    * Get mapMapOfString
    * @return mapMapOfString
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Map<String, Map<String, String>> getMapMapOfString() {
     return mapMapOfString;
@@ -139,7 +139,7 @@ public class MapTest {
    * Get mapOfEnumString
    * @return mapOfEnumString
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Map<String, InnerEnum> getMapOfEnumString() {
     return mapOfEnumString;
@@ -166,7 +166,7 @@ public class MapTest {
    * Get directMap
    * @return directMap
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Map<String, Boolean> getDirectMap() {
     return directMap;
@@ -193,7 +193,7 @@ public class MapTest {
    * Get indirectMap
    * @return indirectMap
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Map<String, Boolean> getIndirectMap() {
     return indirectMap;
diff --git a/samples/client/petstore/java/retrofit/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/client/petstore/java/retrofit/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java
index 2377586030..dd905fbaed 100644
--- a/samples/client/petstore/java/retrofit/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java
+++ b/samples/client/petstore/java/retrofit/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java
@@ -56,7 +56,7 @@ public class MixedPropertiesAndAdditionalPropertiesClass {
    * Get uuid
    * @return uuid
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public UUID getUuid() {
     return uuid;
@@ -75,7 +75,7 @@ public class MixedPropertiesAndAdditionalPropertiesClass {
    * Get dateTime
    * @return dateTime
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public DateTime getDateTime() {
     return dateTime;
@@ -102,7 +102,7 @@ public class MixedPropertiesAndAdditionalPropertiesClass {
    * Get map
    * @return map
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Map<String, Animal> getMap() {
     return map;
diff --git a/samples/client/petstore/java/retrofit/src/main/java/org/openapitools/client/model/Model200Response.java b/samples/client/petstore/java/retrofit/src/main/java/org/openapitools/client/model/Model200Response.java
index 0c0fc9710d..3167560a9d 100644
--- a/samples/client/petstore/java/retrofit/src/main/java/org/openapitools/client/model/Model200Response.java
+++ b/samples/client/petstore/java/retrofit/src/main/java/org/openapitools/client/model/Model200Response.java
@@ -47,7 +47,7 @@ public class Model200Response {
    * Get name
    * @return name
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Integer getName() {
     return name;
@@ -66,7 +66,7 @@ public class Model200Response {
    * Get propertyClass
    * @return propertyClass
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getPropertyClass() {
     return propertyClass;
diff --git a/samples/client/petstore/java/retrofit/src/main/java/org/openapitools/client/model/ModelApiResponse.java b/samples/client/petstore/java/retrofit/src/main/java/org/openapitools/client/model/ModelApiResponse.java
index 777b1a8a7c..84d2fcc4d3 100644
--- a/samples/client/petstore/java/retrofit/src/main/java/org/openapitools/client/model/ModelApiResponse.java
+++ b/samples/client/petstore/java/retrofit/src/main/java/org/openapitools/client/model/ModelApiResponse.java
@@ -50,7 +50,7 @@ public class ModelApiResponse {
    * Get code
    * @return code
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Integer getCode() {
     return code;
@@ -69,7 +69,7 @@ public class ModelApiResponse {
    * Get type
    * @return type
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getType() {
     return type;
@@ -88,7 +88,7 @@ public class ModelApiResponse {
    * Get message
    * @return message
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getMessage() {
     return message;
diff --git a/samples/client/petstore/java/retrofit/src/main/java/org/openapitools/client/model/ModelReturn.java b/samples/client/petstore/java/retrofit/src/main/java/org/openapitools/client/model/ModelReturn.java
index 225df7f4e8..c13f1babe5 100644
--- a/samples/client/petstore/java/retrofit/src/main/java/org/openapitools/client/model/ModelReturn.java
+++ b/samples/client/petstore/java/retrofit/src/main/java/org/openapitools/client/model/ModelReturn.java
@@ -43,7 +43,7 @@ public class ModelReturn {
    * Get _return
    * @return _return
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Integer getReturn() {
     return _return;
diff --git a/samples/client/petstore/java/retrofit/src/main/java/org/openapitools/client/model/Name.java b/samples/client/petstore/java/retrofit/src/main/java/org/openapitools/client/model/Name.java
index c5a5691688..221821d4e1 100644
--- a/samples/client/petstore/java/retrofit/src/main/java/org/openapitools/client/model/Name.java
+++ b/samples/client/petstore/java/retrofit/src/main/java/org/openapitools/client/model/Name.java
@@ -55,7 +55,6 @@ public class Name {
    * Get name
    * @return name
   **/
-
   @ApiModelProperty(required = true, value = "")
   public Integer getName() {
     return name;
@@ -69,7 +68,7 @@ public class Name {
    * Get snakeCase
    * @return snakeCase
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Integer getSnakeCase() {
     return snakeCase;
@@ -84,7 +83,7 @@ public class Name {
    * Get property
    * @return property
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getProperty() {
     return property;
@@ -98,7 +97,7 @@ public class Name {
    * Get _123number
    * @return _123number
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Integer get123number() {
     return _123number;
diff --git a/samples/client/petstore/java/retrofit/src/main/java/org/openapitools/client/model/NumberOnly.java b/samples/client/petstore/java/retrofit/src/main/java/org/openapitools/client/model/NumberOnly.java
index 00ffd2f67e..9a068c2e1e 100644
--- a/samples/client/petstore/java/retrofit/src/main/java/org/openapitools/client/model/NumberOnly.java
+++ b/samples/client/petstore/java/retrofit/src/main/java/org/openapitools/client/model/NumberOnly.java
@@ -43,7 +43,7 @@ public class NumberOnly {
    * Get justNumber
    * @return justNumber
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public BigDecimal getJustNumber() {
     return justNumber;
diff --git a/samples/client/petstore/java/retrofit/src/main/java/org/openapitools/client/model/Order.java b/samples/client/petstore/java/retrofit/src/main/java/org/openapitools/client/model/Order.java
index 2fe536b25f..e79f323720 100644
--- a/samples/client/petstore/java/retrofit/src/main/java/org/openapitools/client/model/Order.java
+++ b/samples/client/petstore/java/retrofit/src/main/java/org/openapitools/client/model/Order.java
@@ -112,7 +112,7 @@ public class Order {
    * Get id
    * @return id
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Long getId() {
     return id;
@@ -131,7 +131,7 @@ public class Order {
    * Get petId
    * @return petId
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Long getPetId() {
     return petId;
@@ -150,7 +150,7 @@ public class Order {
    * Get quantity
    * @return quantity
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Integer getQuantity() {
     return quantity;
@@ -169,7 +169,7 @@ public class Order {
    * Get shipDate
    * @return shipDate
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public DateTime getShipDate() {
     return shipDate;
@@ -188,7 +188,7 @@ public class Order {
    * Order Status
    * @return status
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "Order Status")
   public StatusEnum getStatus() {
     return status;
@@ -207,7 +207,7 @@ public class Order {
    * Get complete
    * @return complete
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Boolean getComplete() {
     return complete;
diff --git a/samples/client/petstore/java/retrofit/src/main/java/org/openapitools/client/model/OuterComposite.java b/samples/client/petstore/java/retrofit/src/main/java/org/openapitools/client/model/OuterComposite.java
index 9e2a78d57f..690b6bde4b 100644
--- a/samples/client/petstore/java/retrofit/src/main/java/org/openapitools/client/model/OuterComposite.java
+++ b/samples/client/petstore/java/retrofit/src/main/java/org/openapitools/client/model/OuterComposite.java
@@ -51,7 +51,7 @@ public class OuterComposite {
    * Get myNumber
    * @return myNumber
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public BigDecimal getMyNumber() {
     return myNumber;
@@ -70,7 +70,7 @@ public class OuterComposite {
    * Get myString
    * @return myString
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getMyString() {
     return myString;
@@ -89,7 +89,7 @@ public class OuterComposite {
    * Get myBoolean
    * @return myBoolean
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Boolean getMyBoolean() {
     return myBoolean;
diff --git a/samples/client/petstore/java/retrofit/src/main/java/org/openapitools/client/model/Pet.java b/samples/client/petstore/java/retrofit/src/main/java/org/openapitools/client/model/Pet.java
index 5ac8165f7f..59fe8406f4 100644
--- a/samples/client/petstore/java/retrofit/src/main/java/org/openapitools/client/model/Pet.java
+++ b/samples/client/petstore/java/retrofit/src/main/java/org/openapitools/client/model/Pet.java
@@ -115,7 +115,7 @@ public class Pet {
    * Get id
    * @return id
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Long getId() {
     return id;
@@ -134,7 +134,7 @@ public class Pet {
    * Get category
    * @return category
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Category getCategory() {
     return category;
@@ -153,7 +153,6 @@ public class Pet {
    * Get name
    * @return name
   **/
-
   @ApiModelProperty(example = "doggie", required = true, value = "")
   public String getName() {
     return name;
@@ -177,7 +176,6 @@ public class Pet {
    * Get photoUrls
    * @return photoUrls
   **/
-
   @ApiModelProperty(required = true, value = "")
   public List<String> getPhotoUrls() {
     return photoUrls;
@@ -204,7 +202,7 @@ public class Pet {
    * Get tags
    * @return tags
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public List<Tag> getTags() {
     return tags;
@@ -223,7 +221,7 @@ public class Pet {
    * pet status in the store
    * @return status
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "pet status in the store")
   public StatusEnum getStatus() {
     return status;
diff --git a/samples/client/petstore/java/retrofit/src/main/java/org/openapitools/client/model/ReadOnlyFirst.java b/samples/client/petstore/java/retrofit/src/main/java/org/openapitools/client/model/ReadOnlyFirst.java
index 23ec5576c0..84780d763a 100644
--- a/samples/client/petstore/java/retrofit/src/main/java/org/openapitools/client/model/ReadOnlyFirst.java
+++ b/samples/client/petstore/java/retrofit/src/main/java/org/openapitools/client/model/ReadOnlyFirst.java
@@ -41,7 +41,7 @@ public class ReadOnlyFirst {
    * Get bar
    * @return bar
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getBar() {
     return bar;
@@ -56,7 +56,7 @@ public class ReadOnlyFirst {
    * Get baz
    * @return baz
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getBaz() {
     return baz;
diff --git a/samples/client/petstore/java/retrofit/src/main/java/org/openapitools/client/model/SpecialModelName.java b/samples/client/petstore/java/retrofit/src/main/java/org/openapitools/client/model/SpecialModelName.java
index f4a7d343a7..c6ccd2c33f 100644
--- a/samples/client/petstore/java/retrofit/src/main/java/org/openapitools/client/model/SpecialModelName.java
+++ b/samples/client/petstore/java/retrofit/src/main/java/org/openapitools/client/model/SpecialModelName.java
@@ -42,7 +42,7 @@ public class SpecialModelName {
    * Get $specialPropertyName
    * @return $specialPropertyName
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Long get$SpecialPropertyName() {
     return $specialPropertyName;
diff --git a/samples/client/petstore/java/retrofit/src/main/java/org/openapitools/client/model/Tag.java b/samples/client/petstore/java/retrofit/src/main/java/org/openapitools/client/model/Tag.java
index bce1fc934d..504c51cc3e 100644
--- a/samples/client/petstore/java/retrofit/src/main/java/org/openapitools/client/model/Tag.java
+++ b/samples/client/petstore/java/retrofit/src/main/java/org/openapitools/client/model/Tag.java
@@ -46,7 +46,7 @@ public class Tag {
    * Get id
    * @return id
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Long getId() {
     return id;
@@ -65,7 +65,7 @@ public class Tag {
    * Get name
    * @return name
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getName() {
     return name;
diff --git a/samples/client/petstore/java/retrofit/src/main/java/org/openapitools/client/model/TypeHolderDefault.java b/samples/client/petstore/java/retrofit/src/main/java/org/openapitools/client/model/TypeHolderDefault.java
index 8c7e1fa55d..8fc321bc0a 100644
--- a/samples/client/petstore/java/retrofit/src/main/java/org/openapitools/client/model/TypeHolderDefault.java
+++ b/samples/client/petstore/java/retrofit/src/main/java/org/openapitools/client/model/TypeHolderDefault.java
@@ -61,7 +61,6 @@ public class TypeHolderDefault {
    * Get stringItem
    * @return stringItem
   **/
-
   @ApiModelProperty(required = true, value = "")
   public String getStringItem() {
     return stringItem;
@@ -80,7 +79,6 @@ public class TypeHolderDefault {
    * Get numberItem
    * @return numberItem
   **/
-
   @ApiModelProperty(required = true, value = "")
   public BigDecimal getNumberItem() {
     return numberItem;
@@ -99,7 +97,6 @@ public class TypeHolderDefault {
    * Get integerItem
    * @return integerItem
   **/
-
   @ApiModelProperty(required = true, value = "")
   public Integer getIntegerItem() {
     return integerItem;
@@ -118,7 +115,6 @@ public class TypeHolderDefault {
    * Get boolItem
    * @return boolItem
   **/
-
   @ApiModelProperty(required = true, value = "")
   public Boolean getBoolItem() {
     return boolItem;
@@ -142,7 +138,6 @@ public class TypeHolderDefault {
    * Get arrayItem
    * @return arrayItem
   **/
-
   @ApiModelProperty(required = true, value = "")
   public List<Integer> getArrayItem() {
     return arrayItem;
diff --git a/samples/client/petstore/java/retrofit/src/main/java/org/openapitools/client/model/TypeHolderExample.java b/samples/client/petstore/java/retrofit/src/main/java/org/openapitools/client/model/TypeHolderExample.java
index 8315f422ea..d9496cbd79 100644
--- a/samples/client/petstore/java/retrofit/src/main/java/org/openapitools/client/model/TypeHolderExample.java
+++ b/samples/client/petstore/java/retrofit/src/main/java/org/openapitools/client/model/TypeHolderExample.java
@@ -61,7 +61,6 @@ public class TypeHolderExample {
    * Get stringItem
    * @return stringItem
   **/
-
   @ApiModelProperty(example = "what", required = true, value = "")
   public String getStringItem() {
     return stringItem;
@@ -80,7 +79,6 @@ public class TypeHolderExample {
    * Get numberItem
    * @return numberItem
   **/
-
   @ApiModelProperty(example = "1.234", required = true, value = "")
   public BigDecimal getNumberItem() {
     return numberItem;
@@ -99,7 +97,6 @@ public class TypeHolderExample {
    * Get integerItem
    * @return integerItem
   **/
-
   @ApiModelProperty(example = "-2", required = true, value = "")
   public Integer getIntegerItem() {
     return integerItem;
@@ -118,7 +115,6 @@ public class TypeHolderExample {
    * Get boolItem
    * @return boolItem
   **/
-
   @ApiModelProperty(example = "true", required = true, value = "")
   public Boolean getBoolItem() {
     return boolItem;
@@ -142,7 +138,6 @@ public class TypeHolderExample {
    * Get arrayItem
    * @return arrayItem
   **/
-
   @ApiModelProperty(example = "[0, 1, 2, 3]", required = true, value = "")
   public List<Integer> getArrayItem() {
     return arrayItem;
diff --git a/samples/client/petstore/java/retrofit/src/main/java/org/openapitools/client/model/User.java b/samples/client/petstore/java/retrofit/src/main/java/org/openapitools/client/model/User.java
index 3f9eb4bb8a..1aedd044b5 100644
--- a/samples/client/petstore/java/retrofit/src/main/java/org/openapitools/client/model/User.java
+++ b/samples/client/petstore/java/retrofit/src/main/java/org/openapitools/client/model/User.java
@@ -70,7 +70,7 @@ public class User {
    * Get id
    * @return id
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Long getId() {
     return id;
@@ -89,7 +89,7 @@ public class User {
    * Get username
    * @return username
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getUsername() {
     return username;
@@ -108,7 +108,7 @@ public class User {
    * Get firstName
    * @return firstName
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getFirstName() {
     return firstName;
@@ -127,7 +127,7 @@ public class User {
    * Get lastName
    * @return lastName
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getLastName() {
     return lastName;
@@ -146,7 +146,7 @@ public class User {
    * Get email
    * @return email
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getEmail() {
     return email;
@@ -165,7 +165,7 @@ public class User {
    * Get password
    * @return password
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getPassword() {
     return password;
@@ -184,7 +184,7 @@ public class User {
    * Get phone
    * @return phone
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getPhone() {
     return phone;
@@ -203,7 +203,7 @@ public class User {
    * User Status
    * @return userStatus
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "User Status")
   public Integer getUserStatus() {
     return userStatus;
diff --git a/samples/client/petstore/java/retrofit/src/main/java/org/openapitools/client/model/XmlItem.java b/samples/client/petstore/java/retrofit/src/main/java/org/openapitools/client/model/XmlItem.java
index 67910352a7..ea15cdba33 100644
--- a/samples/client/petstore/java/retrofit/src/main/java/org/openapitools/client/model/XmlItem.java
+++ b/samples/client/petstore/java/retrofit/src/main/java/org/openapitools/client/model/XmlItem.java
@@ -157,7 +157,7 @@ public class XmlItem {
    * Get attributeString
    * @return attributeString
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(example = "string", value = "")
   public String getAttributeString() {
     return attributeString;
@@ -176,7 +176,7 @@ public class XmlItem {
    * Get attributeNumber
    * @return attributeNumber
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(example = "1.234", value = "")
   public BigDecimal getAttributeNumber() {
     return attributeNumber;
@@ -195,7 +195,7 @@ public class XmlItem {
    * Get attributeInteger
    * @return attributeInteger
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(example = "-2", value = "")
   public Integer getAttributeInteger() {
     return attributeInteger;
@@ -214,7 +214,7 @@ public class XmlItem {
    * Get attributeBoolean
    * @return attributeBoolean
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(example = "true", value = "")
   public Boolean getAttributeBoolean() {
     return attributeBoolean;
@@ -241,7 +241,7 @@ public class XmlItem {
    * Get wrappedArray
    * @return wrappedArray
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public List<Integer> getWrappedArray() {
     return wrappedArray;
@@ -260,7 +260,7 @@ public class XmlItem {
    * Get nameString
    * @return nameString
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(example = "string", value = "")
   public String getNameString() {
     return nameString;
@@ -279,7 +279,7 @@ public class XmlItem {
    * Get nameNumber
    * @return nameNumber
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(example = "1.234", value = "")
   public BigDecimal getNameNumber() {
     return nameNumber;
@@ -298,7 +298,7 @@ public class XmlItem {
    * Get nameInteger
    * @return nameInteger
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(example = "-2", value = "")
   public Integer getNameInteger() {
     return nameInteger;
@@ -317,7 +317,7 @@ public class XmlItem {
    * Get nameBoolean
    * @return nameBoolean
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(example = "true", value = "")
   public Boolean getNameBoolean() {
     return nameBoolean;
@@ -344,7 +344,7 @@ public class XmlItem {
    * Get nameArray
    * @return nameArray
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public List<Integer> getNameArray() {
     return nameArray;
@@ -371,7 +371,7 @@ public class XmlItem {
    * Get nameWrappedArray
    * @return nameWrappedArray
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public List<Integer> getNameWrappedArray() {
     return nameWrappedArray;
@@ -390,7 +390,7 @@ public class XmlItem {
    * Get prefixString
    * @return prefixString
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(example = "string", value = "")
   public String getPrefixString() {
     return prefixString;
@@ -409,7 +409,7 @@ public class XmlItem {
    * Get prefixNumber
    * @return prefixNumber
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(example = "1.234", value = "")
   public BigDecimal getPrefixNumber() {
     return prefixNumber;
@@ -428,7 +428,7 @@ public class XmlItem {
    * Get prefixInteger
    * @return prefixInteger
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(example = "-2", value = "")
   public Integer getPrefixInteger() {
     return prefixInteger;
@@ -447,7 +447,7 @@ public class XmlItem {
    * Get prefixBoolean
    * @return prefixBoolean
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(example = "true", value = "")
   public Boolean getPrefixBoolean() {
     return prefixBoolean;
@@ -474,7 +474,7 @@ public class XmlItem {
    * Get prefixArray
    * @return prefixArray
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public List<Integer> getPrefixArray() {
     return prefixArray;
@@ -501,7 +501,7 @@ public class XmlItem {
    * Get prefixWrappedArray
    * @return prefixWrappedArray
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public List<Integer> getPrefixWrappedArray() {
     return prefixWrappedArray;
@@ -520,7 +520,7 @@ public class XmlItem {
    * Get namespaceString
    * @return namespaceString
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(example = "string", value = "")
   public String getNamespaceString() {
     return namespaceString;
@@ -539,7 +539,7 @@ public class XmlItem {
    * Get namespaceNumber
    * @return namespaceNumber
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(example = "1.234", value = "")
   public BigDecimal getNamespaceNumber() {
     return namespaceNumber;
@@ -558,7 +558,7 @@ public class XmlItem {
    * Get namespaceInteger
    * @return namespaceInteger
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(example = "-2", value = "")
   public Integer getNamespaceInteger() {
     return namespaceInteger;
@@ -577,7 +577,7 @@ public class XmlItem {
    * Get namespaceBoolean
    * @return namespaceBoolean
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(example = "true", value = "")
   public Boolean getNamespaceBoolean() {
     return namespaceBoolean;
@@ -604,7 +604,7 @@ public class XmlItem {
    * Get namespaceArray
    * @return namespaceArray
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public List<Integer> getNamespaceArray() {
     return namespaceArray;
@@ -631,7 +631,7 @@ public class XmlItem {
    * Get namespaceWrappedArray
    * @return namespaceWrappedArray
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public List<Integer> getNamespaceWrappedArray() {
     return namespaceWrappedArray;
@@ -650,7 +650,7 @@ public class XmlItem {
    * Get prefixNsString
    * @return prefixNsString
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(example = "string", value = "")
   public String getPrefixNsString() {
     return prefixNsString;
@@ -669,7 +669,7 @@ public class XmlItem {
    * Get prefixNsNumber
    * @return prefixNsNumber
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(example = "1.234", value = "")
   public BigDecimal getPrefixNsNumber() {
     return prefixNsNumber;
@@ -688,7 +688,7 @@ public class XmlItem {
    * Get prefixNsInteger
    * @return prefixNsInteger
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(example = "-2", value = "")
   public Integer getPrefixNsInteger() {
     return prefixNsInteger;
@@ -707,7 +707,7 @@ public class XmlItem {
    * Get prefixNsBoolean
    * @return prefixNsBoolean
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(example = "true", value = "")
   public Boolean getPrefixNsBoolean() {
     return prefixNsBoolean;
@@ -734,7 +734,7 @@ public class XmlItem {
    * Get prefixNsArray
    * @return prefixNsArray
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public List<Integer> getPrefixNsArray() {
     return prefixNsArray;
@@ -761,7 +761,7 @@ public class XmlItem {
    * Get prefixNsWrappedArray
    * @return prefixNsWrappedArray
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public List<Integer> getPrefixNsWrappedArray() {
     return prefixNsWrappedArray;
diff --git a/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/model/AdditionalPropertiesAnyType.java b/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/model/AdditionalPropertiesAnyType.java
index 3c28034de7..3957e297c7 100644
--- a/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/model/AdditionalPropertiesAnyType.java
+++ b/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/model/AdditionalPropertiesAnyType.java
@@ -42,7 +42,7 @@ public class AdditionalPropertiesAnyType extends HashMap<String, Object> {
    * Get name
    * @return name
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getName() {
     return name;
diff --git a/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/model/AdditionalPropertiesArray.java b/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/model/AdditionalPropertiesArray.java
index a1b662902c..2c04404bbc 100644
--- a/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/model/AdditionalPropertiesArray.java
+++ b/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/model/AdditionalPropertiesArray.java
@@ -43,7 +43,7 @@ public class AdditionalPropertiesArray extends HashMap<String, List> {
    * Get name
    * @return name
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getName() {
     return name;
diff --git a/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/model/AdditionalPropertiesBoolean.java b/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/model/AdditionalPropertiesBoolean.java
index 0f73cf6b2b..b8a5822631 100644
--- a/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/model/AdditionalPropertiesBoolean.java
+++ b/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/model/AdditionalPropertiesBoolean.java
@@ -42,7 +42,7 @@ public class AdditionalPropertiesBoolean extends HashMap<String, Boolean> {
    * Get name
    * @return name
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getName() {
     return name;
diff --git a/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java b/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java
index b39b92f916..5587bce61c 100644
--- a/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java
+++ b/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java
@@ -82,7 +82,7 @@ public class AdditionalPropertiesClass {
    * Get mapString
    * @return mapString
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Map<String, String> getMapString() {
     return mapString;
@@ -109,7 +109,7 @@ public class AdditionalPropertiesClass {
    * Get mapNumber
    * @return mapNumber
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @Valid
   @ApiModelProperty(value = "")
   public Map<String, BigDecimal> getMapNumber() {
@@ -137,7 +137,7 @@ public class AdditionalPropertiesClass {
    * Get mapInteger
    * @return mapInteger
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Map<String, Integer> getMapInteger() {
     return mapInteger;
@@ -164,7 +164,7 @@ public class AdditionalPropertiesClass {
    * Get mapBoolean
    * @return mapBoolean
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Map<String, Boolean> getMapBoolean() {
     return mapBoolean;
@@ -191,7 +191,7 @@ public class AdditionalPropertiesClass {
    * Get mapArrayInteger
    * @return mapArrayInteger
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @Valid
   @ApiModelProperty(value = "")
   public Map<String, List<Integer>> getMapArrayInteger() {
@@ -219,7 +219,7 @@ public class AdditionalPropertiesClass {
    * Get mapArrayAnytype
    * @return mapArrayAnytype
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @Valid
   @ApiModelProperty(value = "")
   public Map<String, List<Object>> getMapArrayAnytype() {
@@ -247,7 +247,7 @@ public class AdditionalPropertiesClass {
    * Get mapMapString
    * @return mapMapString
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @Valid
   @ApiModelProperty(value = "")
   public Map<String, Map<String, String>> getMapMapString() {
@@ -275,7 +275,7 @@ public class AdditionalPropertiesClass {
    * Get mapMapAnytype
    * @return mapMapAnytype
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @Valid
   @ApiModelProperty(value = "")
   public Map<String, Map<String, Object>> getMapMapAnytype() {
@@ -295,7 +295,7 @@ public class AdditionalPropertiesClass {
    * Get anytype1
    * @return anytype1
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @Valid
   @ApiModelProperty(value = "")
   public Object getAnytype1() {
@@ -315,7 +315,7 @@ public class AdditionalPropertiesClass {
    * Get anytype2
    * @return anytype2
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @Valid
   @ApiModelProperty(value = "")
   public Object getAnytype2() {
@@ -335,7 +335,7 @@ public class AdditionalPropertiesClass {
    * Get anytype3
    * @return anytype3
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @Valid
   @ApiModelProperty(value = "")
   public Object getAnytype3() {
diff --git a/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/model/AdditionalPropertiesInteger.java b/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/model/AdditionalPropertiesInteger.java
index eafdd58e5d..f9e8b853c2 100644
--- a/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/model/AdditionalPropertiesInteger.java
+++ b/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/model/AdditionalPropertiesInteger.java
@@ -42,7 +42,7 @@ public class AdditionalPropertiesInteger extends HashMap<String, Integer> {
    * Get name
    * @return name
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getName() {
     return name;
diff --git a/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/model/AdditionalPropertiesNumber.java b/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/model/AdditionalPropertiesNumber.java
index c166cbef6d..854dc4c82a 100644
--- a/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/model/AdditionalPropertiesNumber.java
+++ b/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/model/AdditionalPropertiesNumber.java
@@ -43,7 +43,7 @@ public class AdditionalPropertiesNumber extends HashMap<String, BigDecimal> {
    * Get name
    * @return name
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getName() {
     return name;
diff --git a/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/model/AdditionalPropertiesObject.java b/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/model/AdditionalPropertiesObject.java
index 6f7169d2eb..722dc937bb 100644
--- a/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/model/AdditionalPropertiesObject.java
+++ b/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/model/AdditionalPropertiesObject.java
@@ -42,7 +42,7 @@ public class AdditionalPropertiesObject extends HashMap<String, Map> {
    * Get name
    * @return name
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getName() {
     return name;
diff --git a/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/model/AdditionalPropertiesString.java b/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/model/AdditionalPropertiesString.java
index 1404d12db6..7681ad996c 100644
--- a/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/model/AdditionalPropertiesString.java
+++ b/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/model/AdditionalPropertiesString.java
@@ -42,7 +42,7 @@ public class AdditionalPropertiesString extends HashMap<String, String> {
    * Get name
    * @return name
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getName() {
     return name;
diff --git a/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/model/Animal.java b/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/model/Animal.java
index 72b233aa45..5354367c55 100644
--- a/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/model/Animal.java
+++ b/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/model/Animal.java
@@ -51,7 +51,6 @@ public class Animal {
    * Get className
    * @return className
   **/
-
   @NotNull
   @ApiModelProperty(required = true, value = "")
   public String getClassName() {
@@ -71,7 +70,7 @@ public class Animal {
    * Get color
    * @return color
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getColor() {
     return color;
diff --git a/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java b/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java
index dcf7fc9f48..a7c82bc354 100644
--- a/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java
+++ b/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java
@@ -51,7 +51,7 @@ public class ArrayOfArrayOfNumberOnly {
    * Get arrayArrayNumber
    * @return arrayArrayNumber
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @Valid
   @ApiModelProperty(value = "")
   public List<List<BigDecimal>> getArrayArrayNumber() {
diff --git a/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java b/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java
index 520a394d26..4e77327cd6 100644
--- a/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java
+++ b/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java
@@ -51,7 +51,7 @@ public class ArrayOfNumberOnly {
    * Get arrayNumber
    * @return arrayNumber
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @Valid
   @ApiModelProperty(value = "")
   public List<BigDecimal> getArrayNumber() {
diff --git a/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/model/ArrayTest.java b/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/model/ArrayTest.java
index 7ac5804445..6ddf0e1025 100644
--- a/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/model/ArrayTest.java
+++ b/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/model/ArrayTest.java
@@ -57,7 +57,7 @@ public class ArrayTest {
    * Get arrayOfString
    * @return arrayOfString
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public List<String> getArrayOfString() {
     return arrayOfString;
@@ -84,7 +84,7 @@ public class ArrayTest {
    * Get arrayArrayOfInteger
    * @return arrayArrayOfInteger
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @Valid
   @ApiModelProperty(value = "")
   public List<List<Long>> getArrayArrayOfInteger() {
@@ -112,7 +112,7 @@ public class ArrayTest {
    * Get arrayArrayOfModel
    * @return arrayArrayOfModel
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @Valid
   @ApiModelProperty(value = "")
   public List<List<ReadOnlyFirst>> getArrayArrayOfModel() {
diff --git a/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/model/Capitalization.java b/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/model/Capitalization.java
index 473052d303..7711c16a39 100644
--- a/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/model/Capitalization.java
+++ b/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/model/Capitalization.java
@@ -55,7 +55,7 @@ public class Capitalization {
    * Get smallCamel
    * @return smallCamel
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getSmallCamel() {
     return smallCamel;
@@ -74,7 +74,7 @@ public class Capitalization {
    * Get capitalCamel
    * @return capitalCamel
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getCapitalCamel() {
     return capitalCamel;
@@ -93,7 +93,7 @@ public class Capitalization {
    * Get smallSnake
    * @return smallSnake
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getSmallSnake() {
     return smallSnake;
@@ -112,7 +112,7 @@ public class Capitalization {
    * Get capitalSnake
    * @return capitalSnake
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getCapitalSnake() {
     return capitalSnake;
@@ -131,7 +131,7 @@ public class Capitalization {
    * Get scAETHFlowPoints
    * @return scAETHFlowPoints
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getScAETHFlowPoints() {
     return scAETHFlowPoints;
@@ -150,7 +150,7 @@ public class Capitalization {
    * Name of the pet 
    * @return ATT_NAME
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "Name of the pet ")
   public String getATTNAME() {
     return ATT_NAME;
diff --git a/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/model/Cat.java b/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/model/Cat.java
index a0b8ca3385..19f9190ee9 100644
--- a/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/model/Cat.java
+++ b/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/model/Cat.java
@@ -42,7 +42,7 @@ public class Cat extends Animal {
    * Get declawed
    * @return declawed
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Boolean getDeclawed() {
     return declawed;
diff --git a/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/model/CatAllOf.java b/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/model/CatAllOf.java
index 997a3ef2f4..c99b9a3398 100644
--- a/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/model/CatAllOf.java
+++ b/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/model/CatAllOf.java
@@ -40,7 +40,7 @@ public class CatAllOf {
    * Get declawed
    * @return declawed
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Boolean getDeclawed() {
     return declawed;
diff --git a/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/model/Category.java b/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/model/Category.java
index 6db06530c3..31476c70b7 100644
--- a/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/model/Category.java
+++ b/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/model/Category.java
@@ -43,7 +43,7 @@ public class Category {
    * Get id
    * @return id
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Long getId() {
     return id;
@@ -62,7 +62,6 @@ public class Category {
    * Get name
    * @return name
   **/
-
   @NotNull
   @ApiModelProperty(required = true, value = "")
   public String getName() {
diff --git a/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/model/ClassModel.java b/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/model/ClassModel.java
index 41049c9bee..4067f2eaf4 100644
--- a/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/model/ClassModel.java
+++ b/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/model/ClassModel.java
@@ -41,7 +41,7 @@ public class ClassModel {
    * Get propertyClass
    * @return propertyClass
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getPropertyClass() {
     return propertyClass;
diff --git a/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/model/Client.java b/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/model/Client.java
index 83962ddde1..fd0084ed14 100644
--- a/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/model/Client.java
+++ b/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/model/Client.java
@@ -40,7 +40,7 @@ public class Client {
    * Get client
    * @return client
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getClient() {
     return client;
diff --git a/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/model/Dog.java b/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/model/Dog.java
index 845c7aa339..251c2381ab 100644
--- a/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/model/Dog.java
+++ b/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/model/Dog.java
@@ -42,7 +42,7 @@ public class Dog extends Animal {
    * Get breed
    * @return breed
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getBreed() {
     return breed;
diff --git a/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/model/DogAllOf.java b/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/model/DogAllOf.java
index 1aa1423a91..15821bf9b6 100644
--- a/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/model/DogAllOf.java
+++ b/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/model/DogAllOf.java
@@ -40,7 +40,7 @@ public class DogAllOf {
    * Get breed
    * @return breed
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getBreed() {
     return breed;
diff --git a/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/model/EnumArrays.java b/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/model/EnumArrays.java
index 398db61223..85899b20ff 100644
--- a/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/model/EnumArrays.java
+++ b/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/model/EnumArrays.java
@@ -115,7 +115,7 @@ public class EnumArrays {
    * Get justSymbol
    * @return justSymbol
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public JustSymbolEnum getJustSymbol() {
     return justSymbol;
@@ -142,7 +142,7 @@ public class EnumArrays {
    * Get arrayEnum
    * @return arrayEnum
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public List<ArrayEnumEnum> getArrayEnum() {
     return arrayEnum;
diff --git a/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/model/EnumTest.java b/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/model/EnumTest.java
index 88f0ab2b6e..5c0a43e659 100644
--- a/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/model/EnumTest.java
+++ b/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/model/EnumTest.java
@@ -197,7 +197,7 @@ public class EnumTest {
    * Get enumString
    * @return enumString
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public EnumStringEnum getEnumString() {
     return enumString;
@@ -216,7 +216,6 @@ public class EnumTest {
    * Get enumStringRequired
    * @return enumStringRequired
   **/
-
   @NotNull
   @ApiModelProperty(required = true, value = "")
   public EnumStringRequiredEnum getEnumStringRequired() {
@@ -236,7 +235,7 @@ public class EnumTest {
    * Get enumInteger
    * @return enumInteger
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public EnumIntegerEnum getEnumInteger() {
     return enumInteger;
@@ -255,7 +254,7 @@ public class EnumTest {
    * Get enumNumber
    * @return enumNumber
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public EnumNumberEnum getEnumNumber() {
     return enumNumber;
@@ -274,7 +273,7 @@ public class EnumTest {
    * Get outerEnum
    * @return outerEnum
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @Valid
   @ApiModelProperty(value = "")
   public OuterEnum getOuterEnum() {
diff --git a/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java b/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java
index 78595f7854..c68dcd5667 100644
--- a/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java
+++ b/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java
@@ -45,7 +45,7 @@ public class FileSchemaTestClass {
    * Get file
    * @return file
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @Valid
   @ApiModelProperty(value = "")
   public java.io.File getFile() {
@@ -73,7 +73,7 @@ public class FileSchemaTestClass {
    * Get files
    * @return files
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @Valid
   @ApiModelProperty(value = "")
   public List<java.io.File> getFiles() {
diff --git a/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/model/FormatTest.java b/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/model/FormatTest.java
index cbd2563773..1a7a30289b 100644
--- a/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/model/FormatTest.java
+++ b/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/model/FormatTest.java
@@ -83,7 +83,7 @@ public class FormatTest {
    * maximum: 100
    * @return integer
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
  @Min(10) @Max(100)  @ApiModelProperty(value = "")
   public Integer getInteger() {
     return integer;
@@ -104,7 +104,7 @@ public class FormatTest {
    * maximum: 200
    * @return int32
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
  @Min(20) @Max(200)  @ApiModelProperty(value = "")
   public Integer getInt32() {
     return int32;
@@ -123,7 +123,7 @@ public class FormatTest {
    * Get int64
    * @return int64
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Long getInt64() {
     return int64;
@@ -144,7 +144,6 @@ public class FormatTest {
    * maximum: 543.2
    * @return number
   **/
-
   @NotNull
   @Valid
  @DecimalMin("32.1") @DecimalMax("543.2")  @ApiModelProperty(required = true, value = "")
@@ -167,7 +166,7 @@ public class FormatTest {
    * maximum: 987.6
    * @return _float
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
  @DecimalMin("54.3") @DecimalMax("987.6")  @ApiModelProperty(value = "")
   public Float getFloat() {
     return _float;
@@ -188,7 +187,7 @@ public class FormatTest {
    * maximum: 123.4
    * @return _double
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
  @DecimalMin("67.8") @DecimalMax("123.4")  @ApiModelProperty(value = "")
   public Double getDouble() {
     return _double;
@@ -207,7 +206,7 @@ public class FormatTest {
    * Get string
    * @return string
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
  @Pattern(regexp="/[a-z]/i")  @ApiModelProperty(value = "")
   public String getString() {
     return string;
@@ -226,7 +225,6 @@ public class FormatTest {
    * Get _byte
    * @return _byte
   **/
-
   @NotNull
  @Pattern(regexp="^(?:[A-Za-z0-9+/]{4})*(?:[A-Za-z0-9+/]{2}==|[A-Za-z0-9+/]{3}=)?$")  @ApiModelProperty(required = true, value = "")
   public byte[] getByte() {
@@ -246,7 +244,7 @@ public class FormatTest {
    * Get binary
    * @return binary
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @Valid
   @ApiModelProperty(value = "")
   public File getBinary() {
@@ -266,7 +264,6 @@ public class FormatTest {
    * Get date
    * @return date
   **/
-
   @NotNull
   @Valid
   @ApiModelProperty(required = true, value = "")
@@ -287,7 +284,7 @@ public class FormatTest {
    * Get dateTime
    * @return dateTime
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @Valid
   @ApiModelProperty(value = "")
   public OffsetDateTime getDateTime() {
@@ -307,7 +304,7 @@ public class FormatTest {
    * Get uuid
    * @return uuid
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @Valid
   @ApiModelProperty(example = "72f98069-206d-4f12-9f12-3d1e525a8e84", value = "")
   public UUID getUuid() {
@@ -327,7 +324,6 @@ public class FormatTest {
    * Get password
    * @return password
   **/
-
   @NotNull
  @Size(min=10,max=64)  @ApiModelProperty(required = true, value = "")
   public String getPassword() {
diff --git a/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java b/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java
index 17fb98f8e7..0f8354388a 100644
--- a/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java
+++ b/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java
@@ -38,7 +38,7 @@ public class HasOnlyReadOnly {
    * Get bar
    * @return bar
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getBar() {
     return bar;
@@ -48,7 +48,7 @@ public class HasOnlyReadOnly {
    * Get foo
    * @return foo
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getFoo() {
     return foo;
diff --git a/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/model/MapTest.java b/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/model/MapTest.java
index 920717d212..7dcfedc599 100644
--- a/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/model/MapTest.java
+++ b/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/model/MapTest.java
@@ -95,7 +95,7 @@ public class MapTest {
    * Get mapMapOfString
    * @return mapMapOfString
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @Valid
   @ApiModelProperty(value = "")
   public Map<String, Map<String, String>> getMapMapOfString() {
@@ -123,7 +123,7 @@ public class MapTest {
    * Get mapOfEnumString
    * @return mapOfEnumString
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Map<String, InnerEnum> getMapOfEnumString() {
     return mapOfEnumString;
@@ -150,7 +150,7 @@ public class MapTest {
    * Get directMap
    * @return directMap
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Map<String, Boolean> getDirectMap() {
     return directMap;
@@ -177,7 +177,7 @@ public class MapTest {
    * Get indirectMap
    * @return indirectMap
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Map<String, Boolean> getIndirectMap() {
     return indirectMap;
diff --git a/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java
index fc1d3af28e..f3e7b506de 100644
--- a/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java
+++ b/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java
@@ -52,7 +52,7 @@ public class MixedPropertiesAndAdditionalPropertiesClass {
    * Get uuid
    * @return uuid
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @Valid
   @ApiModelProperty(value = "")
   public UUID getUuid() {
@@ -72,7 +72,7 @@ public class MixedPropertiesAndAdditionalPropertiesClass {
    * Get dateTime
    * @return dateTime
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @Valid
   @ApiModelProperty(value = "")
   public OffsetDateTime getDateTime() {
@@ -100,7 +100,7 @@ public class MixedPropertiesAndAdditionalPropertiesClass {
    * Get map
    * @return map
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @Valid
   @ApiModelProperty(value = "")
   public Map<String, Animal> getMap() {
diff --git a/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/model/Model200Response.java b/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/model/Model200Response.java
index ea07d5c6a8..2652b3f75d 100644
--- a/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/model/Model200Response.java
+++ b/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/model/Model200Response.java
@@ -44,7 +44,7 @@ public class Model200Response {
    * Get name
    * @return name
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Integer getName() {
     return name;
@@ -63,7 +63,7 @@ public class Model200Response {
    * Get propertyClass
    * @return propertyClass
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getPropertyClass() {
     return propertyClass;
diff --git a/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/model/ModelApiResponse.java b/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/model/ModelApiResponse.java
index b30186ae73..1439048114 100644
--- a/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/model/ModelApiResponse.java
+++ b/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/model/ModelApiResponse.java
@@ -46,7 +46,7 @@ public class ModelApiResponse {
    * Get code
    * @return code
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Integer getCode() {
     return code;
@@ -65,7 +65,7 @@ public class ModelApiResponse {
    * Get type
    * @return type
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getType() {
     return type;
@@ -84,7 +84,7 @@ public class ModelApiResponse {
    * Get message
    * @return message
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getMessage() {
     return message;
diff --git a/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/model/ModelReturn.java b/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/model/ModelReturn.java
index a8010bb637..864b466565 100644
--- a/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/model/ModelReturn.java
+++ b/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/model/ModelReturn.java
@@ -41,7 +41,7 @@ public class ModelReturn {
    * Get _return
    * @return _return
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Integer getReturn() {
     return _return;
diff --git a/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/model/Name.java b/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/model/Name.java
index 8f2864ef8f..085892f4d4 100644
--- a/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/model/Name.java
+++ b/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/model/Name.java
@@ -50,7 +50,6 @@ public class Name {
    * Get name
    * @return name
   **/
-
   @NotNull
   @ApiModelProperty(required = true, value = "")
   public Integer getName() {
@@ -65,7 +64,7 @@ public class Name {
    * Get snakeCase
    * @return snakeCase
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Integer getSnakeCase() {
     return snakeCase;
@@ -80,7 +79,7 @@ public class Name {
    * Get property
    * @return property
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getProperty() {
     return property;
@@ -94,7 +93,7 @@ public class Name {
    * Get _123number
    * @return _123number
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Integer get123number() {
     return _123number;
diff --git a/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/model/NumberOnly.java b/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/model/NumberOnly.java
index 6ebb9d5231..3c04811b8f 100644
--- a/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/model/NumberOnly.java
+++ b/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/model/NumberOnly.java
@@ -41,7 +41,7 @@ public class NumberOnly {
    * Get justNumber
    * @return justNumber
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @Valid
   @ApiModelProperty(value = "")
   public BigDecimal getJustNumber() {
diff --git a/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/model/Order.java b/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/model/Order.java
index b276dea919..a42495c55d 100644
--- a/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/model/Order.java
+++ b/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/model/Order.java
@@ -93,7 +93,7 @@ public class Order {
    * Get id
    * @return id
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Long getId() {
     return id;
@@ -112,7 +112,7 @@ public class Order {
    * Get petId
    * @return petId
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Long getPetId() {
     return petId;
@@ -131,7 +131,7 @@ public class Order {
    * Get quantity
    * @return quantity
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Integer getQuantity() {
     return quantity;
@@ -150,7 +150,7 @@ public class Order {
    * Get shipDate
    * @return shipDate
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @Valid
   @ApiModelProperty(value = "")
   public OffsetDateTime getShipDate() {
@@ -170,7 +170,7 @@ public class Order {
    * Order Status
    * @return status
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "Order Status")
   public StatusEnum getStatus() {
     return status;
@@ -189,7 +189,7 @@ public class Order {
    * Get complete
    * @return complete
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Boolean getComplete() {
     return complete;
diff --git a/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/model/OuterComposite.java b/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/model/OuterComposite.java
index 709bad5916..eb24ea692b 100644
--- a/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/model/OuterComposite.java
+++ b/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/model/OuterComposite.java
@@ -47,7 +47,7 @@ public class OuterComposite {
    * Get myNumber
    * @return myNumber
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @Valid
   @ApiModelProperty(value = "")
   public BigDecimal getMyNumber() {
@@ -67,7 +67,7 @@ public class OuterComposite {
    * Get myString
    * @return myString
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getMyString() {
     return myString;
@@ -86,7 +86,7 @@ public class OuterComposite {
    * Get myBoolean
    * @return myBoolean
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Boolean getMyBoolean() {
     return myBoolean;
diff --git a/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/model/Pet.java b/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/model/Pet.java
index a77cad038b..6c7bc70b5d 100644
--- a/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/model/Pet.java
+++ b/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/model/Pet.java
@@ -96,7 +96,7 @@ public class Pet {
    * Get id
    * @return id
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Long getId() {
     return id;
@@ -115,7 +115,7 @@ public class Pet {
    * Get category
    * @return category
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @Valid
   @ApiModelProperty(value = "")
   public Category getCategory() {
@@ -135,7 +135,6 @@ public class Pet {
    * Get name
    * @return name
   **/
-
   @NotNull
   @ApiModelProperty(example = "doggie", required = true, value = "")
   public String getName() {
@@ -160,7 +159,6 @@ public class Pet {
    * Get photoUrls
    * @return photoUrls
   **/
-
   @NotNull
   @ApiModelProperty(required = true, value = "")
   public List<String> getPhotoUrls() {
@@ -188,7 +186,7 @@ public class Pet {
    * Get tags
    * @return tags
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @Valid
   @ApiModelProperty(value = "")
   public List<Tag> getTags() {
@@ -208,7 +206,7 @@ public class Pet {
    * pet status in the store
    * @return status
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "pet status in the store")
   public StatusEnum getStatus() {
     return status;
diff --git a/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/model/ReadOnlyFirst.java b/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/model/ReadOnlyFirst.java
index b8ec9b5b58..c6f758922c 100644
--- a/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/model/ReadOnlyFirst.java
+++ b/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/model/ReadOnlyFirst.java
@@ -38,7 +38,7 @@ public class ReadOnlyFirst {
    * Get bar
    * @return bar
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getBar() {
     return bar;
@@ -53,7 +53,7 @@ public class ReadOnlyFirst {
    * Get baz
    * @return baz
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getBaz() {
     return baz;
diff --git a/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/model/SpecialModelName.java b/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/model/SpecialModelName.java
index 37405452a3..7d8bc5e833 100644
--- a/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/model/SpecialModelName.java
+++ b/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/model/SpecialModelName.java
@@ -40,7 +40,7 @@ public class SpecialModelName {
    * Get $specialPropertyName
    * @return $specialPropertyName
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Long get$SpecialPropertyName() {
     return $specialPropertyName;
diff --git a/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/model/Tag.java b/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/model/Tag.java
index 78c198db1f..6c20df9d7e 100644
--- a/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/model/Tag.java
+++ b/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/model/Tag.java
@@ -43,7 +43,7 @@ public class Tag {
    * Get id
    * @return id
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Long getId() {
     return id;
@@ -62,7 +62,7 @@ public class Tag {
    * Get name
    * @return name
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getName() {
     return name;
diff --git a/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/model/TypeHolderDefault.java b/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/model/TypeHolderDefault.java
index 499efa34b5..6f1c423706 100644
--- a/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/model/TypeHolderDefault.java
+++ b/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/model/TypeHolderDefault.java
@@ -55,7 +55,6 @@ public class TypeHolderDefault {
    * Get stringItem
    * @return stringItem
   **/
-
   @NotNull
   @ApiModelProperty(required = true, value = "")
   public String getStringItem() {
@@ -75,7 +74,6 @@ public class TypeHolderDefault {
    * Get numberItem
    * @return numberItem
   **/
-
   @NotNull
   @Valid
   @ApiModelProperty(required = true, value = "")
@@ -96,7 +94,6 @@ public class TypeHolderDefault {
    * Get integerItem
    * @return integerItem
   **/
-
   @NotNull
   @ApiModelProperty(required = true, value = "")
   public Integer getIntegerItem() {
@@ -116,7 +113,6 @@ public class TypeHolderDefault {
    * Get boolItem
    * @return boolItem
   **/
-
   @NotNull
   @ApiModelProperty(required = true, value = "")
   public Boolean getBoolItem() {
@@ -141,7 +137,6 @@ public class TypeHolderDefault {
    * Get arrayItem
    * @return arrayItem
   **/
-
   @NotNull
   @ApiModelProperty(required = true, value = "")
   public List<Integer> getArrayItem() {
diff --git a/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/model/TypeHolderExample.java b/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/model/TypeHolderExample.java
index 70c0b65d80..f1e1e7792a 100644
--- a/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/model/TypeHolderExample.java
+++ b/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/model/TypeHolderExample.java
@@ -55,7 +55,6 @@ public class TypeHolderExample {
    * Get stringItem
    * @return stringItem
   **/
-
   @NotNull
   @ApiModelProperty(example = "what", required = true, value = "")
   public String getStringItem() {
@@ -75,7 +74,6 @@ public class TypeHolderExample {
    * Get numberItem
    * @return numberItem
   **/
-
   @NotNull
   @Valid
   @ApiModelProperty(example = "1.234", required = true, value = "")
@@ -96,7 +94,6 @@ public class TypeHolderExample {
    * Get integerItem
    * @return integerItem
   **/
-
   @NotNull
   @ApiModelProperty(example = "-2", required = true, value = "")
   public Integer getIntegerItem() {
@@ -116,7 +113,6 @@ public class TypeHolderExample {
    * Get boolItem
    * @return boolItem
   **/
-
   @NotNull
   @ApiModelProperty(example = "true", required = true, value = "")
   public Boolean getBoolItem() {
@@ -141,7 +137,6 @@ public class TypeHolderExample {
    * Get arrayItem
    * @return arrayItem
   **/
-
   @NotNull
   @ApiModelProperty(example = "[0, 1, 2, 3]", required = true, value = "")
   public List<Integer> getArrayItem() {
diff --git a/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/model/User.java b/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/model/User.java
index 6baf32249c..3782d8dd84 100644
--- a/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/model/User.java
+++ b/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/model/User.java
@@ -61,7 +61,7 @@ public class User {
    * Get id
    * @return id
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Long getId() {
     return id;
@@ -80,7 +80,7 @@ public class User {
    * Get username
    * @return username
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getUsername() {
     return username;
@@ -99,7 +99,7 @@ public class User {
    * Get firstName
    * @return firstName
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getFirstName() {
     return firstName;
@@ -118,7 +118,7 @@ public class User {
    * Get lastName
    * @return lastName
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getLastName() {
     return lastName;
@@ -137,7 +137,7 @@ public class User {
    * Get email
    * @return email
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getEmail() {
     return email;
@@ -156,7 +156,7 @@ public class User {
    * Get password
    * @return password
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getPassword() {
     return password;
@@ -175,7 +175,7 @@ public class User {
    * Get phone
    * @return phone
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getPhone() {
     return phone;
@@ -194,7 +194,7 @@ public class User {
    * User Status
    * @return userStatus
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "User Status")
   public Integer getUserStatus() {
     return userStatus;
diff --git a/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/model/XmlItem.java b/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/model/XmlItem.java
index 71f0e18c5a..e07171cd7c 100644
--- a/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/model/XmlItem.java
+++ b/samples/client/petstore/java/retrofit2-play24/src/main/java/org/openapitools/client/model/XmlItem.java
@@ -127,7 +127,7 @@ public class XmlItem {
    * Get attributeString
    * @return attributeString
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(example = "string", value = "")
   public String getAttributeString() {
     return attributeString;
@@ -146,7 +146,7 @@ public class XmlItem {
    * Get attributeNumber
    * @return attributeNumber
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @Valid
   @ApiModelProperty(example = "1.234", value = "")
   public BigDecimal getAttributeNumber() {
@@ -166,7 +166,7 @@ public class XmlItem {
    * Get attributeInteger
    * @return attributeInteger
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(example = "-2", value = "")
   public Integer getAttributeInteger() {
     return attributeInteger;
@@ -185,7 +185,7 @@ public class XmlItem {
    * Get attributeBoolean
    * @return attributeBoolean
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(example = "true", value = "")
   public Boolean getAttributeBoolean() {
     return attributeBoolean;
@@ -212,7 +212,7 @@ public class XmlItem {
    * Get wrappedArray
    * @return wrappedArray
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public List<Integer> getWrappedArray() {
     return wrappedArray;
@@ -231,7 +231,7 @@ public class XmlItem {
    * Get nameString
    * @return nameString
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(example = "string", value = "")
   public String getNameString() {
     return nameString;
@@ -250,7 +250,7 @@ public class XmlItem {
    * Get nameNumber
    * @return nameNumber
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @Valid
   @ApiModelProperty(example = "1.234", value = "")
   public BigDecimal getNameNumber() {
@@ -270,7 +270,7 @@ public class XmlItem {
    * Get nameInteger
    * @return nameInteger
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(example = "-2", value = "")
   public Integer getNameInteger() {
     return nameInteger;
@@ -289,7 +289,7 @@ public class XmlItem {
    * Get nameBoolean
    * @return nameBoolean
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(example = "true", value = "")
   public Boolean getNameBoolean() {
     return nameBoolean;
@@ -316,7 +316,7 @@ public class XmlItem {
    * Get nameArray
    * @return nameArray
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public List<Integer> getNameArray() {
     return nameArray;
@@ -343,7 +343,7 @@ public class XmlItem {
    * Get nameWrappedArray
    * @return nameWrappedArray
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public List<Integer> getNameWrappedArray() {
     return nameWrappedArray;
@@ -362,7 +362,7 @@ public class XmlItem {
    * Get prefixString
    * @return prefixString
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(example = "string", value = "")
   public String getPrefixString() {
     return prefixString;
@@ -381,7 +381,7 @@ public class XmlItem {
    * Get prefixNumber
    * @return prefixNumber
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @Valid
   @ApiModelProperty(example = "1.234", value = "")
   public BigDecimal getPrefixNumber() {
@@ -401,7 +401,7 @@ public class XmlItem {
    * Get prefixInteger
    * @return prefixInteger
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(example = "-2", value = "")
   public Integer getPrefixInteger() {
     return prefixInteger;
@@ -420,7 +420,7 @@ public class XmlItem {
    * Get prefixBoolean
    * @return prefixBoolean
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(example = "true", value = "")
   public Boolean getPrefixBoolean() {
     return prefixBoolean;
@@ -447,7 +447,7 @@ public class XmlItem {
    * Get prefixArray
    * @return prefixArray
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public List<Integer> getPrefixArray() {
     return prefixArray;
@@ -474,7 +474,7 @@ public class XmlItem {
    * Get prefixWrappedArray
    * @return prefixWrappedArray
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public List<Integer> getPrefixWrappedArray() {
     return prefixWrappedArray;
@@ -493,7 +493,7 @@ public class XmlItem {
    * Get namespaceString
    * @return namespaceString
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(example = "string", value = "")
   public String getNamespaceString() {
     return namespaceString;
@@ -512,7 +512,7 @@ public class XmlItem {
    * Get namespaceNumber
    * @return namespaceNumber
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @Valid
   @ApiModelProperty(example = "1.234", value = "")
   public BigDecimal getNamespaceNumber() {
@@ -532,7 +532,7 @@ public class XmlItem {
    * Get namespaceInteger
    * @return namespaceInteger
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(example = "-2", value = "")
   public Integer getNamespaceInteger() {
     return namespaceInteger;
@@ -551,7 +551,7 @@ public class XmlItem {
    * Get namespaceBoolean
    * @return namespaceBoolean
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(example = "true", value = "")
   public Boolean getNamespaceBoolean() {
     return namespaceBoolean;
@@ -578,7 +578,7 @@ public class XmlItem {
    * Get namespaceArray
    * @return namespaceArray
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public List<Integer> getNamespaceArray() {
     return namespaceArray;
@@ -605,7 +605,7 @@ public class XmlItem {
    * Get namespaceWrappedArray
    * @return namespaceWrappedArray
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public List<Integer> getNamespaceWrappedArray() {
     return namespaceWrappedArray;
@@ -624,7 +624,7 @@ public class XmlItem {
    * Get prefixNsString
    * @return prefixNsString
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(example = "string", value = "")
   public String getPrefixNsString() {
     return prefixNsString;
@@ -643,7 +643,7 @@ public class XmlItem {
    * Get prefixNsNumber
    * @return prefixNsNumber
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @Valid
   @ApiModelProperty(example = "1.234", value = "")
   public BigDecimal getPrefixNsNumber() {
@@ -663,7 +663,7 @@ public class XmlItem {
    * Get prefixNsInteger
    * @return prefixNsInteger
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(example = "-2", value = "")
   public Integer getPrefixNsInteger() {
     return prefixNsInteger;
@@ -682,7 +682,7 @@ public class XmlItem {
    * Get prefixNsBoolean
    * @return prefixNsBoolean
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(example = "true", value = "")
   public Boolean getPrefixNsBoolean() {
     return prefixNsBoolean;
@@ -709,7 +709,7 @@ public class XmlItem {
    * Get prefixNsArray
    * @return prefixNsArray
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public List<Integer> getPrefixNsArray() {
     return prefixNsArray;
@@ -736,7 +736,7 @@ public class XmlItem {
    * Get prefixNsWrappedArray
    * @return prefixNsWrappedArray
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public List<Integer> getPrefixNsWrappedArray() {
     return prefixNsWrappedArray;
diff --git a/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/model/AdditionalPropertiesAnyType.java b/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/model/AdditionalPropertiesAnyType.java
index 3c28034de7..3957e297c7 100644
--- a/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/model/AdditionalPropertiesAnyType.java
+++ b/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/model/AdditionalPropertiesAnyType.java
@@ -42,7 +42,7 @@ public class AdditionalPropertiesAnyType extends HashMap<String, Object> {
    * Get name
    * @return name
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getName() {
     return name;
diff --git a/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/model/AdditionalPropertiesArray.java b/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/model/AdditionalPropertiesArray.java
index a1b662902c..2c04404bbc 100644
--- a/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/model/AdditionalPropertiesArray.java
+++ b/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/model/AdditionalPropertiesArray.java
@@ -43,7 +43,7 @@ public class AdditionalPropertiesArray extends HashMap<String, List> {
    * Get name
    * @return name
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getName() {
     return name;
diff --git a/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/model/AdditionalPropertiesBoolean.java b/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/model/AdditionalPropertiesBoolean.java
index 0f73cf6b2b..b8a5822631 100644
--- a/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/model/AdditionalPropertiesBoolean.java
+++ b/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/model/AdditionalPropertiesBoolean.java
@@ -42,7 +42,7 @@ public class AdditionalPropertiesBoolean extends HashMap<String, Boolean> {
    * Get name
    * @return name
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getName() {
     return name;
diff --git a/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java b/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java
index b39b92f916..5587bce61c 100644
--- a/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java
+++ b/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java
@@ -82,7 +82,7 @@ public class AdditionalPropertiesClass {
    * Get mapString
    * @return mapString
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Map<String, String> getMapString() {
     return mapString;
@@ -109,7 +109,7 @@ public class AdditionalPropertiesClass {
    * Get mapNumber
    * @return mapNumber
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @Valid
   @ApiModelProperty(value = "")
   public Map<String, BigDecimal> getMapNumber() {
@@ -137,7 +137,7 @@ public class AdditionalPropertiesClass {
    * Get mapInteger
    * @return mapInteger
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Map<String, Integer> getMapInteger() {
     return mapInteger;
@@ -164,7 +164,7 @@ public class AdditionalPropertiesClass {
    * Get mapBoolean
    * @return mapBoolean
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Map<String, Boolean> getMapBoolean() {
     return mapBoolean;
@@ -191,7 +191,7 @@ public class AdditionalPropertiesClass {
    * Get mapArrayInteger
    * @return mapArrayInteger
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @Valid
   @ApiModelProperty(value = "")
   public Map<String, List<Integer>> getMapArrayInteger() {
@@ -219,7 +219,7 @@ public class AdditionalPropertiesClass {
    * Get mapArrayAnytype
    * @return mapArrayAnytype
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @Valid
   @ApiModelProperty(value = "")
   public Map<String, List<Object>> getMapArrayAnytype() {
@@ -247,7 +247,7 @@ public class AdditionalPropertiesClass {
    * Get mapMapString
    * @return mapMapString
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @Valid
   @ApiModelProperty(value = "")
   public Map<String, Map<String, String>> getMapMapString() {
@@ -275,7 +275,7 @@ public class AdditionalPropertiesClass {
    * Get mapMapAnytype
    * @return mapMapAnytype
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @Valid
   @ApiModelProperty(value = "")
   public Map<String, Map<String, Object>> getMapMapAnytype() {
@@ -295,7 +295,7 @@ public class AdditionalPropertiesClass {
    * Get anytype1
    * @return anytype1
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @Valid
   @ApiModelProperty(value = "")
   public Object getAnytype1() {
@@ -315,7 +315,7 @@ public class AdditionalPropertiesClass {
    * Get anytype2
    * @return anytype2
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @Valid
   @ApiModelProperty(value = "")
   public Object getAnytype2() {
@@ -335,7 +335,7 @@ public class AdditionalPropertiesClass {
    * Get anytype3
    * @return anytype3
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @Valid
   @ApiModelProperty(value = "")
   public Object getAnytype3() {
diff --git a/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/model/AdditionalPropertiesInteger.java b/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/model/AdditionalPropertiesInteger.java
index eafdd58e5d..f9e8b853c2 100644
--- a/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/model/AdditionalPropertiesInteger.java
+++ b/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/model/AdditionalPropertiesInteger.java
@@ -42,7 +42,7 @@ public class AdditionalPropertiesInteger extends HashMap<String, Integer> {
    * Get name
    * @return name
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getName() {
     return name;
diff --git a/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/model/AdditionalPropertiesNumber.java b/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/model/AdditionalPropertiesNumber.java
index c166cbef6d..854dc4c82a 100644
--- a/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/model/AdditionalPropertiesNumber.java
+++ b/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/model/AdditionalPropertiesNumber.java
@@ -43,7 +43,7 @@ public class AdditionalPropertiesNumber extends HashMap<String, BigDecimal> {
    * Get name
    * @return name
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getName() {
     return name;
diff --git a/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/model/AdditionalPropertiesObject.java b/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/model/AdditionalPropertiesObject.java
index 6f7169d2eb..722dc937bb 100644
--- a/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/model/AdditionalPropertiesObject.java
+++ b/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/model/AdditionalPropertiesObject.java
@@ -42,7 +42,7 @@ public class AdditionalPropertiesObject extends HashMap<String, Map> {
    * Get name
    * @return name
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getName() {
     return name;
diff --git a/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/model/AdditionalPropertiesString.java b/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/model/AdditionalPropertiesString.java
index 1404d12db6..7681ad996c 100644
--- a/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/model/AdditionalPropertiesString.java
+++ b/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/model/AdditionalPropertiesString.java
@@ -42,7 +42,7 @@ public class AdditionalPropertiesString extends HashMap<String, String> {
    * Get name
    * @return name
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getName() {
     return name;
diff --git a/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/model/Animal.java b/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/model/Animal.java
index 72b233aa45..5354367c55 100644
--- a/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/model/Animal.java
+++ b/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/model/Animal.java
@@ -51,7 +51,6 @@ public class Animal {
    * Get className
    * @return className
   **/
-
   @NotNull
   @ApiModelProperty(required = true, value = "")
   public String getClassName() {
@@ -71,7 +70,7 @@ public class Animal {
    * Get color
    * @return color
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getColor() {
     return color;
diff --git a/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java b/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java
index dcf7fc9f48..a7c82bc354 100644
--- a/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java
+++ b/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java
@@ -51,7 +51,7 @@ public class ArrayOfArrayOfNumberOnly {
    * Get arrayArrayNumber
    * @return arrayArrayNumber
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @Valid
   @ApiModelProperty(value = "")
   public List<List<BigDecimal>> getArrayArrayNumber() {
diff --git a/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java b/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java
index 520a394d26..4e77327cd6 100644
--- a/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java
+++ b/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java
@@ -51,7 +51,7 @@ public class ArrayOfNumberOnly {
    * Get arrayNumber
    * @return arrayNumber
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @Valid
   @ApiModelProperty(value = "")
   public List<BigDecimal> getArrayNumber() {
diff --git a/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/model/ArrayTest.java b/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/model/ArrayTest.java
index 7ac5804445..6ddf0e1025 100644
--- a/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/model/ArrayTest.java
+++ b/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/model/ArrayTest.java
@@ -57,7 +57,7 @@ public class ArrayTest {
    * Get arrayOfString
    * @return arrayOfString
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public List<String> getArrayOfString() {
     return arrayOfString;
@@ -84,7 +84,7 @@ public class ArrayTest {
    * Get arrayArrayOfInteger
    * @return arrayArrayOfInteger
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @Valid
   @ApiModelProperty(value = "")
   public List<List<Long>> getArrayArrayOfInteger() {
@@ -112,7 +112,7 @@ public class ArrayTest {
    * Get arrayArrayOfModel
    * @return arrayArrayOfModel
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @Valid
   @ApiModelProperty(value = "")
   public List<List<ReadOnlyFirst>> getArrayArrayOfModel() {
diff --git a/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/model/Capitalization.java b/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/model/Capitalization.java
index 473052d303..7711c16a39 100644
--- a/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/model/Capitalization.java
+++ b/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/model/Capitalization.java
@@ -55,7 +55,7 @@ public class Capitalization {
    * Get smallCamel
    * @return smallCamel
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getSmallCamel() {
     return smallCamel;
@@ -74,7 +74,7 @@ public class Capitalization {
    * Get capitalCamel
    * @return capitalCamel
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getCapitalCamel() {
     return capitalCamel;
@@ -93,7 +93,7 @@ public class Capitalization {
    * Get smallSnake
    * @return smallSnake
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getSmallSnake() {
     return smallSnake;
@@ -112,7 +112,7 @@ public class Capitalization {
    * Get capitalSnake
    * @return capitalSnake
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getCapitalSnake() {
     return capitalSnake;
@@ -131,7 +131,7 @@ public class Capitalization {
    * Get scAETHFlowPoints
    * @return scAETHFlowPoints
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getScAETHFlowPoints() {
     return scAETHFlowPoints;
@@ -150,7 +150,7 @@ public class Capitalization {
    * Name of the pet 
    * @return ATT_NAME
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "Name of the pet ")
   public String getATTNAME() {
     return ATT_NAME;
diff --git a/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/model/Cat.java b/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/model/Cat.java
index a0b8ca3385..19f9190ee9 100644
--- a/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/model/Cat.java
+++ b/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/model/Cat.java
@@ -42,7 +42,7 @@ public class Cat extends Animal {
    * Get declawed
    * @return declawed
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Boolean getDeclawed() {
     return declawed;
diff --git a/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/model/CatAllOf.java b/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/model/CatAllOf.java
index 997a3ef2f4..c99b9a3398 100644
--- a/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/model/CatAllOf.java
+++ b/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/model/CatAllOf.java
@@ -40,7 +40,7 @@ public class CatAllOf {
    * Get declawed
    * @return declawed
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Boolean getDeclawed() {
     return declawed;
diff --git a/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/model/Category.java b/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/model/Category.java
index 6db06530c3..31476c70b7 100644
--- a/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/model/Category.java
+++ b/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/model/Category.java
@@ -43,7 +43,7 @@ public class Category {
    * Get id
    * @return id
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Long getId() {
     return id;
@@ -62,7 +62,6 @@ public class Category {
    * Get name
    * @return name
   **/
-
   @NotNull
   @ApiModelProperty(required = true, value = "")
   public String getName() {
diff --git a/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/model/ClassModel.java b/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/model/ClassModel.java
index 41049c9bee..4067f2eaf4 100644
--- a/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/model/ClassModel.java
+++ b/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/model/ClassModel.java
@@ -41,7 +41,7 @@ public class ClassModel {
    * Get propertyClass
    * @return propertyClass
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getPropertyClass() {
     return propertyClass;
diff --git a/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/model/Client.java b/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/model/Client.java
index 83962ddde1..fd0084ed14 100644
--- a/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/model/Client.java
+++ b/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/model/Client.java
@@ -40,7 +40,7 @@ public class Client {
    * Get client
    * @return client
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getClient() {
     return client;
diff --git a/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/model/Dog.java b/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/model/Dog.java
index 845c7aa339..251c2381ab 100644
--- a/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/model/Dog.java
+++ b/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/model/Dog.java
@@ -42,7 +42,7 @@ public class Dog extends Animal {
    * Get breed
    * @return breed
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getBreed() {
     return breed;
diff --git a/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/model/DogAllOf.java b/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/model/DogAllOf.java
index 1aa1423a91..15821bf9b6 100644
--- a/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/model/DogAllOf.java
+++ b/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/model/DogAllOf.java
@@ -40,7 +40,7 @@ public class DogAllOf {
    * Get breed
    * @return breed
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getBreed() {
     return breed;
diff --git a/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/model/EnumArrays.java b/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/model/EnumArrays.java
index 398db61223..85899b20ff 100644
--- a/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/model/EnumArrays.java
+++ b/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/model/EnumArrays.java
@@ -115,7 +115,7 @@ public class EnumArrays {
    * Get justSymbol
    * @return justSymbol
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public JustSymbolEnum getJustSymbol() {
     return justSymbol;
@@ -142,7 +142,7 @@ public class EnumArrays {
    * Get arrayEnum
    * @return arrayEnum
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public List<ArrayEnumEnum> getArrayEnum() {
     return arrayEnum;
diff --git a/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/model/EnumTest.java b/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/model/EnumTest.java
index 88f0ab2b6e..5c0a43e659 100644
--- a/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/model/EnumTest.java
+++ b/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/model/EnumTest.java
@@ -197,7 +197,7 @@ public class EnumTest {
    * Get enumString
    * @return enumString
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public EnumStringEnum getEnumString() {
     return enumString;
@@ -216,7 +216,6 @@ public class EnumTest {
    * Get enumStringRequired
    * @return enumStringRequired
   **/
-
   @NotNull
   @ApiModelProperty(required = true, value = "")
   public EnumStringRequiredEnum getEnumStringRequired() {
@@ -236,7 +235,7 @@ public class EnumTest {
    * Get enumInteger
    * @return enumInteger
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public EnumIntegerEnum getEnumInteger() {
     return enumInteger;
@@ -255,7 +254,7 @@ public class EnumTest {
    * Get enumNumber
    * @return enumNumber
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public EnumNumberEnum getEnumNumber() {
     return enumNumber;
@@ -274,7 +273,7 @@ public class EnumTest {
    * Get outerEnum
    * @return outerEnum
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @Valid
   @ApiModelProperty(value = "")
   public OuterEnum getOuterEnum() {
diff --git a/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java b/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java
index 78595f7854..c68dcd5667 100644
--- a/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java
+++ b/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java
@@ -45,7 +45,7 @@ public class FileSchemaTestClass {
    * Get file
    * @return file
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @Valid
   @ApiModelProperty(value = "")
   public java.io.File getFile() {
@@ -73,7 +73,7 @@ public class FileSchemaTestClass {
    * Get files
    * @return files
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @Valid
   @ApiModelProperty(value = "")
   public List<java.io.File> getFiles() {
diff --git a/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/model/FormatTest.java b/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/model/FormatTest.java
index 7ec52a2c7f..8398173042 100644
--- a/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/model/FormatTest.java
+++ b/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/model/FormatTest.java
@@ -83,7 +83,7 @@ public class FormatTest {
    * maximum: 100
    * @return integer
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
  @Min(10) @Max(100)  @ApiModelProperty(value = "")
   public Integer getInteger() {
     return integer;
@@ -104,7 +104,7 @@ public class FormatTest {
    * maximum: 200
    * @return int32
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
  @Min(20) @Max(200)  @ApiModelProperty(value = "")
   public Integer getInt32() {
     return int32;
@@ -123,7 +123,7 @@ public class FormatTest {
    * Get int64
    * @return int64
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Long getInt64() {
     return int64;
@@ -144,7 +144,6 @@ public class FormatTest {
    * maximum: 543.2
    * @return number
   **/
-
   @NotNull
   @Valid
  @DecimalMin("32.1") @DecimalMax("543.2")  @ApiModelProperty(required = true, value = "")
@@ -167,7 +166,7 @@ public class FormatTest {
    * maximum: 987.6
    * @return _float
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
  @DecimalMin("54.3") @DecimalMax("987.6")  @ApiModelProperty(value = "")
   public Float getFloat() {
     return _float;
@@ -188,7 +187,7 @@ public class FormatTest {
    * maximum: 123.4
    * @return _double
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
  @DecimalMin("67.8") @DecimalMax("123.4")  @ApiModelProperty(value = "")
   public Double getDouble() {
     return _double;
@@ -207,7 +206,7 @@ public class FormatTest {
    * Get string
    * @return string
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
  @Pattern(regexp="/[a-z]/i")  @ApiModelProperty(value = "")
   public String getString() {
     return string;
@@ -226,7 +225,6 @@ public class FormatTest {
    * Get _byte
    * @return _byte
   **/
-
   @NotNull
  @Pattern(regexp="^(?:[A-Za-z0-9+/]{4})*(?:[A-Za-z0-9+/]{2}==|[A-Za-z0-9+/]{3}=)?$")  @ApiModelProperty(required = true, value = "")
   public byte[] getByte() {
@@ -246,7 +244,7 @@ public class FormatTest {
    * Get binary
    * @return binary
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @Valid
   @ApiModelProperty(value = "")
   public File getBinary() {
@@ -266,7 +264,6 @@ public class FormatTest {
    * Get date
    * @return date
   **/
-
   @NotNull
   @Valid
   @ApiModelProperty(required = true, value = "")
@@ -287,7 +284,7 @@ public class FormatTest {
    * Get dateTime
    * @return dateTime
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @Valid
   @ApiModelProperty(value = "")
   public OffsetDateTime getDateTime() {
@@ -307,7 +304,7 @@ public class FormatTest {
    * Get uuid
    * @return uuid
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @Valid
   @ApiModelProperty(example = "72f98069-206d-4f12-9f12-3d1e525a8e84", value = "")
   public UUID getUuid() {
@@ -327,7 +324,6 @@ public class FormatTest {
    * Get password
    * @return password
   **/
-
   @NotNull
  @Size(min=10,max=64)  @ApiModelProperty(required = true, value = "")
   public String getPassword() {
diff --git a/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java b/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java
index 17fb98f8e7..0f8354388a 100644
--- a/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java
+++ b/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java
@@ -38,7 +38,7 @@ public class HasOnlyReadOnly {
    * Get bar
    * @return bar
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getBar() {
     return bar;
@@ -48,7 +48,7 @@ public class HasOnlyReadOnly {
    * Get foo
    * @return foo
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getFoo() {
     return foo;
diff --git a/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/model/MapTest.java b/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/model/MapTest.java
index 920717d212..7dcfedc599 100644
--- a/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/model/MapTest.java
+++ b/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/model/MapTest.java
@@ -95,7 +95,7 @@ public class MapTest {
    * Get mapMapOfString
    * @return mapMapOfString
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @Valid
   @ApiModelProperty(value = "")
   public Map<String, Map<String, String>> getMapMapOfString() {
@@ -123,7 +123,7 @@ public class MapTest {
    * Get mapOfEnumString
    * @return mapOfEnumString
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Map<String, InnerEnum> getMapOfEnumString() {
     return mapOfEnumString;
@@ -150,7 +150,7 @@ public class MapTest {
    * Get directMap
    * @return directMap
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Map<String, Boolean> getDirectMap() {
     return directMap;
@@ -177,7 +177,7 @@ public class MapTest {
    * Get indirectMap
    * @return indirectMap
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Map<String, Boolean> getIndirectMap() {
     return indirectMap;
diff --git a/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java
index 870ceb97f9..29958bbf94 100644
--- a/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java
+++ b/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java
@@ -52,7 +52,7 @@ public class MixedPropertiesAndAdditionalPropertiesClass {
    * Get uuid
    * @return uuid
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @Valid
   @ApiModelProperty(value = "")
   public UUID getUuid() {
@@ -72,7 +72,7 @@ public class MixedPropertiesAndAdditionalPropertiesClass {
    * Get dateTime
    * @return dateTime
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @Valid
   @ApiModelProperty(value = "")
   public OffsetDateTime getDateTime() {
@@ -100,7 +100,7 @@ public class MixedPropertiesAndAdditionalPropertiesClass {
    * Get map
    * @return map
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @Valid
   @ApiModelProperty(value = "")
   public Map<String, Animal> getMap() {
diff --git a/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/model/Model200Response.java b/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/model/Model200Response.java
index ea07d5c6a8..2652b3f75d 100644
--- a/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/model/Model200Response.java
+++ b/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/model/Model200Response.java
@@ -44,7 +44,7 @@ public class Model200Response {
    * Get name
    * @return name
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Integer getName() {
     return name;
@@ -63,7 +63,7 @@ public class Model200Response {
    * Get propertyClass
    * @return propertyClass
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getPropertyClass() {
     return propertyClass;
diff --git a/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/model/ModelApiResponse.java b/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/model/ModelApiResponse.java
index b30186ae73..1439048114 100644
--- a/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/model/ModelApiResponse.java
+++ b/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/model/ModelApiResponse.java
@@ -46,7 +46,7 @@ public class ModelApiResponse {
    * Get code
    * @return code
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Integer getCode() {
     return code;
@@ -65,7 +65,7 @@ public class ModelApiResponse {
    * Get type
    * @return type
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getType() {
     return type;
@@ -84,7 +84,7 @@ public class ModelApiResponse {
    * Get message
    * @return message
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getMessage() {
     return message;
diff --git a/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/model/ModelReturn.java b/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/model/ModelReturn.java
index a8010bb637..864b466565 100644
--- a/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/model/ModelReturn.java
+++ b/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/model/ModelReturn.java
@@ -41,7 +41,7 @@ public class ModelReturn {
    * Get _return
    * @return _return
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Integer getReturn() {
     return _return;
diff --git a/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/model/Name.java b/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/model/Name.java
index 8f2864ef8f..085892f4d4 100644
--- a/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/model/Name.java
+++ b/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/model/Name.java
@@ -50,7 +50,6 @@ public class Name {
    * Get name
    * @return name
   **/
-
   @NotNull
   @ApiModelProperty(required = true, value = "")
   public Integer getName() {
@@ -65,7 +64,7 @@ public class Name {
    * Get snakeCase
    * @return snakeCase
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Integer getSnakeCase() {
     return snakeCase;
@@ -80,7 +79,7 @@ public class Name {
    * Get property
    * @return property
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getProperty() {
     return property;
@@ -94,7 +93,7 @@ public class Name {
    * Get _123number
    * @return _123number
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Integer get123number() {
     return _123number;
diff --git a/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/model/NumberOnly.java b/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/model/NumberOnly.java
index 6ebb9d5231..3c04811b8f 100644
--- a/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/model/NumberOnly.java
+++ b/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/model/NumberOnly.java
@@ -41,7 +41,7 @@ public class NumberOnly {
    * Get justNumber
    * @return justNumber
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @Valid
   @ApiModelProperty(value = "")
   public BigDecimal getJustNumber() {
diff --git a/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/model/Order.java b/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/model/Order.java
index 1f009a45cf..db957a8f0e 100644
--- a/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/model/Order.java
+++ b/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/model/Order.java
@@ -93,7 +93,7 @@ public class Order {
    * Get id
    * @return id
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Long getId() {
     return id;
@@ -112,7 +112,7 @@ public class Order {
    * Get petId
    * @return petId
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Long getPetId() {
     return petId;
@@ -131,7 +131,7 @@ public class Order {
    * Get quantity
    * @return quantity
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Integer getQuantity() {
     return quantity;
@@ -150,7 +150,7 @@ public class Order {
    * Get shipDate
    * @return shipDate
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @Valid
   @ApiModelProperty(value = "")
   public OffsetDateTime getShipDate() {
@@ -170,7 +170,7 @@ public class Order {
    * Order Status
    * @return status
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "Order Status")
   public StatusEnum getStatus() {
     return status;
@@ -189,7 +189,7 @@ public class Order {
    * Get complete
    * @return complete
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Boolean getComplete() {
     return complete;
diff --git a/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/model/OuterComposite.java b/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/model/OuterComposite.java
index 709bad5916..eb24ea692b 100644
--- a/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/model/OuterComposite.java
+++ b/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/model/OuterComposite.java
@@ -47,7 +47,7 @@ public class OuterComposite {
    * Get myNumber
    * @return myNumber
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @Valid
   @ApiModelProperty(value = "")
   public BigDecimal getMyNumber() {
@@ -67,7 +67,7 @@ public class OuterComposite {
    * Get myString
    * @return myString
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getMyString() {
     return myString;
@@ -86,7 +86,7 @@ public class OuterComposite {
    * Get myBoolean
    * @return myBoolean
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Boolean getMyBoolean() {
     return myBoolean;
diff --git a/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/model/Pet.java b/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/model/Pet.java
index a77cad038b..6c7bc70b5d 100644
--- a/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/model/Pet.java
+++ b/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/model/Pet.java
@@ -96,7 +96,7 @@ public class Pet {
    * Get id
    * @return id
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Long getId() {
     return id;
@@ -115,7 +115,7 @@ public class Pet {
    * Get category
    * @return category
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @Valid
   @ApiModelProperty(value = "")
   public Category getCategory() {
@@ -135,7 +135,6 @@ public class Pet {
    * Get name
    * @return name
   **/
-
   @NotNull
   @ApiModelProperty(example = "doggie", required = true, value = "")
   public String getName() {
@@ -160,7 +159,6 @@ public class Pet {
    * Get photoUrls
    * @return photoUrls
   **/
-
   @NotNull
   @ApiModelProperty(required = true, value = "")
   public List<String> getPhotoUrls() {
@@ -188,7 +186,7 @@ public class Pet {
    * Get tags
    * @return tags
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @Valid
   @ApiModelProperty(value = "")
   public List<Tag> getTags() {
@@ -208,7 +206,7 @@ public class Pet {
    * pet status in the store
    * @return status
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "pet status in the store")
   public StatusEnum getStatus() {
     return status;
diff --git a/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/model/ReadOnlyFirst.java b/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/model/ReadOnlyFirst.java
index b8ec9b5b58..c6f758922c 100644
--- a/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/model/ReadOnlyFirst.java
+++ b/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/model/ReadOnlyFirst.java
@@ -38,7 +38,7 @@ public class ReadOnlyFirst {
    * Get bar
    * @return bar
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getBar() {
     return bar;
@@ -53,7 +53,7 @@ public class ReadOnlyFirst {
    * Get baz
    * @return baz
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getBaz() {
     return baz;
diff --git a/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/model/SpecialModelName.java b/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/model/SpecialModelName.java
index 37405452a3..7d8bc5e833 100644
--- a/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/model/SpecialModelName.java
+++ b/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/model/SpecialModelName.java
@@ -40,7 +40,7 @@ public class SpecialModelName {
    * Get $specialPropertyName
    * @return $specialPropertyName
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Long get$SpecialPropertyName() {
     return $specialPropertyName;
diff --git a/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/model/Tag.java b/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/model/Tag.java
index 78c198db1f..6c20df9d7e 100644
--- a/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/model/Tag.java
+++ b/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/model/Tag.java
@@ -43,7 +43,7 @@ public class Tag {
    * Get id
    * @return id
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Long getId() {
     return id;
@@ -62,7 +62,7 @@ public class Tag {
    * Get name
    * @return name
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getName() {
     return name;
diff --git a/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/model/TypeHolderDefault.java b/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/model/TypeHolderDefault.java
index 499efa34b5..6f1c423706 100644
--- a/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/model/TypeHolderDefault.java
+++ b/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/model/TypeHolderDefault.java
@@ -55,7 +55,6 @@ public class TypeHolderDefault {
    * Get stringItem
    * @return stringItem
   **/
-
   @NotNull
   @ApiModelProperty(required = true, value = "")
   public String getStringItem() {
@@ -75,7 +74,6 @@ public class TypeHolderDefault {
    * Get numberItem
    * @return numberItem
   **/
-
   @NotNull
   @Valid
   @ApiModelProperty(required = true, value = "")
@@ -96,7 +94,6 @@ public class TypeHolderDefault {
    * Get integerItem
    * @return integerItem
   **/
-
   @NotNull
   @ApiModelProperty(required = true, value = "")
   public Integer getIntegerItem() {
@@ -116,7 +113,6 @@ public class TypeHolderDefault {
    * Get boolItem
    * @return boolItem
   **/
-
   @NotNull
   @ApiModelProperty(required = true, value = "")
   public Boolean getBoolItem() {
@@ -141,7 +137,6 @@ public class TypeHolderDefault {
    * Get arrayItem
    * @return arrayItem
   **/
-
   @NotNull
   @ApiModelProperty(required = true, value = "")
   public List<Integer> getArrayItem() {
diff --git a/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/model/TypeHolderExample.java b/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/model/TypeHolderExample.java
index 70c0b65d80..f1e1e7792a 100644
--- a/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/model/TypeHolderExample.java
+++ b/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/model/TypeHolderExample.java
@@ -55,7 +55,6 @@ public class TypeHolderExample {
    * Get stringItem
    * @return stringItem
   **/
-
   @NotNull
   @ApiModelProperty(example = "what", required = true, value = "")
   public String getStringItem() {
@@ -75,7 +74,6 @@ public class TypeHolderExample {
    * Get numberItem
    * @return numberItem
   **/
-
   @NotNull
   @Valid
   @ApiModelProperty(example = "1.234", required = true, value = "")
@@ -96,7 +94,6 @@ public class TypeHolderExample {
    * Get integerItem
    * @return integerItem
   **/
-
   @NotNull
   @ApiModelProperty(example = "-2", required = true, value = "")
   public Integer getIntegerItem() {
@@ -116,7 +113,6 @@ public class TypeHolderExample {
    * Get boolItem
    * @return boolItem
   **/
-
   @NotNull
   @ApiModelProperty(example = "true", required = true, value = "")
   public Boolean getBoolItem() {
@@ -141,7 +137,6 @@ public class TypeHolderExample {
    * Get arrayItem
    * @return arrayItem
   **/
-
   @NotNull
   @ApiModelProperty(example = "[0, 1, 2, 3]", required = true, value = "")
   public List<Integer> getArrayItem() {
diff --git a/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/model/User.java b/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/model/User.java
index 6baf32249c..3782d8dd84 100644
--- a/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/model/User.java
+++ b/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/model/User.java
@@ -61,7 +61,7 @@ public class User {
    * Get id
    * @return id
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Long getId() {
     return id;
@@ -80,7 +80,7 @@ public class User {
    * Get username
    * @return username
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getUsername() {
     return username;
@@ -99,7 +99,7 @@ public class User {
    * Get firstName
    * @return firstName
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getFirstName() {
     return firstName;
@@ -118,7 +118,7 @@ public class User {
    * Get lastName
    * @return lastName
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getLastName() {
     return lastName;
@@ -137,7 +137,7 @@ public class User {
    * Get email
    * @return email
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getEmail() {
     return email;
@@ -156,7 +156,7 @@ public class User {
    * Get password
    * @return password
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getPassword() {
     return password;
@@ -175,7 +175,7 @@ public class User {
    * Get phone
    * @return phone
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getPhone() {
     return phone;
@@ -194,7 +194,7 @@ public class User {
    * User Status
    * @return userStatus
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "User Status")
   public Integer getUserStatus() {
     return userStatus;
diff --git a/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/model/XmlItem.java b/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/model/XmlItem.java
index 71f0e18c5a..e07171cd7c 100644
--- a/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/model/XmlItem.java
+++ b/samples/client/petstore/java/retrofit2-play25/src/main/java/org/openapitools/client/model/XmlItem.java
@@ -127,7 +127,7 @@ public class XmlItem {
    * Get attributeString
    * @return attributeString
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(example = "string", value = "")
   public String getAttributeString() {
     return attributeString;
@@ -146,7 +146,7 @@ public class XmlItem {
    * Get attributeNumber
    * @return attributeNumber
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @Valid
   @ApiModelProperty(example = "1.234", value = "")
   public BigDecimal getAttributeNumber() {
@@ -166,7 +166,7 @@ public class XmlItem {
    * Get attributeInteger
    * @return attributeInteger
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(example = "-2", value = "")
   public Integer getAttributeInteger() {
     return attributeInteger;
@@ -185,7 +185,7 @@ public class XmlItem {
    * Get attributeBoolean
    * @return attributeBoolean
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(example = "true", value = "")
   public Boolean getAttributeBoolean() {
     return attributeBoolean;
@@ -212,7 +212,7 @@ public class XmlItem {
    * Get wrappedArray
    * @return wrappedArray
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public List<Integer> getWrappedArray() {
     return wrappedArray;
@@ -231,7 +231,7 @@ public class XmlItem {
    * Get nameString
    * @return nameString
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(example = "string", value = "")
   public String getNameString() {
     return nameString;
@@ -250,7 +250,7 @@ public class XmlItem {
    * Get nameNumber
    * @return nameNumber
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @Valid
   @ApiModelProperty(example = "1.234", value = "")
   public BigDecimal getNameNumber() {
@@ -270,7 +270,7 @@ public class XmlItem {
    * Get nameInteger
    * @return nameInteger
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(example = "-2", value = "")
   public Integer getNameInteger() {
     return nameInteger;
@@ -289,7 +289,7 @@ public class XmlItem {
    * Get nameBoolean
    * @return nameBoolean
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(example = "true", value = "")
   public Boolean getNameBoolean() {
     return nameBoolean;
@@ -316,7 +316,7 @@ public class XmlItem {
    * Get nameArray
    * @return nameArray
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public List<Integer> getNameArray() {
     return nameArray;
@@ -343,7 +343,7 @@ public class XmlItem {
    * Get nameWrappedArray
    * @return nameWrappedArray
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public List<Integer> getNameWrappedArray() {
     return nameWrappedArray;
@@ -362,7 +362,7 @@ public class XmlItem {
    * Get prefixString
    * @return prefixString
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(example = "string", value = "")
   public String getPrefixString() {
     return prefixString;
@@ -381,7 +381,7 @@ public class XmlItem {
    * Get prefixNumber
    * @return prefixNumber
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @Valid
   @ApiModelProperty(example = "1.234", value = "")
   public BigDecimal getPrefixNumber() {
@@ -401,7 +401,7 @@ public class XmlItem {
    * Get prefixInteger
    * @return prefixInteger
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(example = "-2", value = "")
   public Integer getPrefixInteger() {
     return prefixInteger;
@@ -420,7 +420,7 @@ public class XmlItem {
    * Get prefixBoolean
    * @return prefixBoolean
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(example = "true", value = "")
   public Boolean getPrefixBoolean() {
     return prefixBoolean;
@@ -447,7 +447,7 @@ public class XmlItem {
    * Get prefixArray
    * @return prefixArray
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public List<Integer> getPrefixArray() {
     return prefixArray;
@@ -474,7 +474,7 @@ public class XmlItem {
    * Get prefixWrappedArray
    * @return prefixWrappedArray
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public List<Integer> getPrefixWrappedArray() {
     return prefixWrappedArray;
@@ -493,7 +493,7 @@ public class XmlItem {
    * Get namespaceString
    * @return namespaceString
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(example = "string", value = "")
   public String getNamespaceString() {
     return namespaceString;
@@ -512,7 +512,7 @@ public class XmlItem {
    * Get namespaceNumber
    * @return namespaceNumber
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @Valid
   @ApiModelProperty(example = "1.234", value = "")
   public BigDecimal getNamespaceNumber() {
@@ -532,7 +532,7 @@ public class XmlItem {
    * Get namespaceInteger
    * @return namespaceInteger
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(example = "-2", value = "")
   public Integer getNamespaceInteger() {
     return namespaceInteger;
@@ -551,7 +551,7 @@ public class XmlItem {
    * Get namespaceBoolean
    * @return namespaceBoolean
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(example = "true", value = "")
   public Boolean getNamespaceBoolean() {
     return namespaceBoolean;
@@ -578,7 +578,7 @@ public class XmlItem {
    * Get namespaceArray
    * @return namespaceArray
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public List<Integer> getNamespaceArray() {
     return namespaceArray;
@@ -605,7 +605,7 @@ public class XmlItem {
    * Get namespaceWrappedArray
    * @return namespaceWrappedArray
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public List<Integer> getNamespaceWrappedArray() {
     return namespaceWrappedArray;
@@ -624,7 +624,7 @@ public class XmlItem {
    * Get prefixNsString
    * @return prefixNsString
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(example = "string", value = "")
   public String getPrefixNsString() {
     return prefixNsString;
@@ -643,7 +643,7 @@ public class XmlItem {
    * Get prefixNsNumber
    * @return prefixNsNumber
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @Valid
   @ApiModelProperty(example = "1.234", value = "")
   public BigDecimal getPrefixNsNumber() {
@@ -663,7 +663,7 @@ public class XmlItem {
    * Get prefixNsInteger
    * @return prefixNsInteger
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(example = "-2", value = "")
   public Integer getPrefixNsInteger() {
     return prefixNsInteger;
@@ -682,7 +682,7 @@ public class XmlItem {
    * Get prefixNsBoolean
    * @return prefixNsBoolean
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(example = "true", value = "")
   public Boolean getPrefixNsBoolean() {
     return prefixNsBoolean;
@@ -709,7 +709,7 @@ public class XmlItem {
    * Get prefixNsArray
    * @return prefixNsArray
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public List<Integer> getPrefixNsArray() {
     return prefixNsArray;
@@ -736,7 +736,7 @@ public class XmlItem {
    * Get prefixNsWrappedArray
    * @return prefixNsWrappedArray
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public List<Integer> getPrefixNsWrappedArray() {
     return prefixNsWrappedArray;
diff --git a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/AdditionalPropertiesAnyType.java b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/AdditionalPropertiesAnyType.java
index 3c28034de7..3957e297c7 100644
--- a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/AdditionalPropertiesAnyType.java
+++ b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/AdditionalPropertiesAnyType.java
@@ -42,7 +42,7 @@ public class AdditionalPropertiesAnyType extends HashMap<String, Object> {
    * Get name
    * @return name
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getName() {
     return name;
diff --git a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/AdditionalPropertiesArray.java b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/AdditionalPropertiesArray.java
index a1b662902c..2c04404bbc 100644
--- a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/AdditionalPropertiesArray.java
+++ b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/AdditionalPropertiesArray.java
@@ -43,7 +43,7 @@ public class AdditionalPropertiesArray extends HashMap<String, List> {
    * Get name
    * @return name
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getName() {
     return name;
diff --git a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/AdditionalPropertiesBoolean.java b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/AdditionalPropertiesBoolean.java
index 0f73cf6b2b..b8a5822631 100644
--- a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/AdditionalPropertiesBoolean.java
+++ b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/AdditionalPropertiesBoolean.java
@@ -42,7 +42,7 @@ public class AdditionalPropertiesBoolean extends HashMap<String, Boolean> {
    * Get name
    * @return name
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getName() {
     return name;
diff --git a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java
index b39b92f916..5587bce61c 100644
--- a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java
+++ b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java
@@ -82,7 +82,7 @@ public class AdditionalPropertiesClass {
    * Get mapString
    * @return mapString
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Map<String, String> getMapString() {
     return mapString;
@@ -109,7 +109,7 @@ public class AdditionalPropertiesClass {
    * Get mapNumber
    * @return mapNumber
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @Valid
   @ApiModelProperty(value = "")
   public Map<String, BigDecimal> getMapNumber() {
@@ -137,7 +137,7 @@ public class AdditionalPropertiesClass {
    * Get mapInteger
    * @return mapInteger
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Map<String, Integer> getMapInteger() {
     return mapInteger;
@@ -164,7 +164,7 @@ public class AdditionalPropertiesClass {
    * Get mapBoolean
    * @return mapBoolean
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Map<String, Boolean> getMapBoolean() {
     return mapBoolean;
@@ -191,7 +191,7 @@ public class AdditionalPropertiesClass {
    * Get mapArrayInteger
    * @return mapArrayInteger
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @Valid
   @ApiModelProperty(value = "")
   public Map<String, List<Integer>> getMapArrayInteger() {
@@ -219,7 +219,7 @@ public class AdditionalPropertiesClass {
    * Get mapArrayAnytype
    * @return mapArrayAnytype
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @Valid
   @ApiModelProperty(value = "")
   public Map<String, List<Object>> getMapArrayAnytype() {
@@ -247,7 +247,7 @@ public class AdditionalPropertiesClass {
    * Get mapMapString
    * @return mapMapString
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @Valid
   @ApiModelProperty(value = "")
   public Map<String, Map<String, String>> getMapMapString() {
@@ -275,7 +275,7 @@ public class AdditionalPropertiesClass {
    * Get mapMapAnytype
    * @return mapMapAnytype
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @Valid
   @ApiModelProperty(value = "")
   public Map<String, Map<String, Object>> getMapMapAnytype() {
@@ -295,7 +295,7 @@ public class AdditionalPropertiesClass {
    * Get anytype1
    * @return anytype1
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @Valid
   @ApiModelProperty(value = "")
   public Object getAnytype1() {
@@ -315,7 +315,7 @@ public class AdditionalPropertiesClass {
    * Get anytype2
    * @return anytype2
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @Valid
   @ApiModelProperty(value = "")
   public Object getAnytype2() {
@@ -335,7 +335,7 @@ public class AdditionalPropertiesClass {
    * Get anytype3
    * @return anytype3
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @Valid
   @ApiModelProperty(value = "")
   public Object getAnytype3() {
diff --git a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/AdditionalPropertiesInteger.java b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/AdditionalPropertiesInteger.java
index eafdd58e5d..f9e8b853c2 100644
--- a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/AdditionalPropertiesInteger.java
+++ b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/AdditionalPropertiesInteger.java
@@ -42,7 +42,7 @@ public class AdditionalPropertiesInteger extends HashMap<String, Integer> {
    * Get name
    * @return name
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getName() {
     return name;
diff --git a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/AdditionalPropertiesNumber.java b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/AdditionalPropertiesNumber.java
index c166cbef6d..854dc4c82a 100644
--- a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/AdditionalPropertiesNumber.java
+++ b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/AdditionalPropertiesNumber.java
@@ -43,7 +43,7 @@ public class AdditionalPropertiesNumber extends HashMap<String, BigDecimal> {
    * Get name
    * @return name
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getName() {
     return name;
diff --git a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/AdditionalPropertiesObject.java b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/AdditionalPropertiesObject.java
index 6f7169d2eb..722dc937bb 100644
--- a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/AdditionalPropertiesObject.java
+++ b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/AdditionalPropertiesObject.java
@@ -42,7 +42,7 @@ public class AdditionalPropertiesObject extends HashMap<String, Map> {
    * Get name
    * @return name
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getName() {
     return name;
diff --git a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/AdditionalPropertiesString.java b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/AdditionalPropertiesString.java
index 1404d12db6..7681ad996c 100644
--- a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/AdditionalPropertiesString.java
+++ b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/AdditionalPropertiesString.java
@@ -42,7 +42,7 @@ public class AdditionalPropertiesString extends HashMap<String, String> {
    * Get name
    * @return name
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getName() {
     return name;
diff --git a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/Animal.java b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/Animal.java
index 72b233aa45..5354367c55 100644
--- a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/Animal.java
+++ b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/Animal.java
@@ -51,7 +51,6 @@ public class Animal {
    * Get className
    * @return className
   **/
-
   @NotNull
   @ApiModelProperty(required = true, value = "")
   public String getClassName() {
@@ -71,7 +70,7 @@ public class Animal {
    * Get color
    * @return color
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getColor() {
     return color;
diff --git a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java
index dcf7fc9f48..a7c82bc354 100644
--- a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java
+++ b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java
@@ -51,7 +51,7 @@ public class ArrayOfArrayOfNumberOnly {
    * Get arrayArrayNumber
    * @return arrayArrayNumber
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @Valid
   @ApiModelProperty(value = "")
   public List<List<BigDecimal>> getArrayArrayNumber() {
diff --git a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java
index 520a394d26..4e77327cd6 100644
--- a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java
+++ b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java
@@ -51,7 +51,7 @@ public class ArrayOfNumberOnly {
    * Get arrayNumber
    * @return arrayNumber
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @Valid
   @ApiModelProperty(value = "")
   public List<BigDecimal> getArrayNumber() {
diff --git a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/ArrayTest.java b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/ArrayTest.java
index 7ac5804445..6ddf0e1025 100644
--- a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/ArrayTest.java
+++ b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/ArrayTest.java
@@ -57,7 +57,7 @@ public class ArrayTest {
    * Get arrayOfString
    * @return arrayOfString
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public List<String> getArrayOfString() {
     return arrayOfString;
@@ -84,7 +84,7 @@ public class ArrayTest {
    * Get arrayArrayOfInteger
    * @return arrayArrayOfInteger
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @Valid
   @ApiModelProperty(value = "")
   public List<List<Long>> getArrayArrayOfInteger() {
@@ -112,7 +112,7 @@ public class ArrayTest {
    * Get arrayArrayOfModel
    * @return arrayArrayOfModel
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @Valid
   @ApiModelProperty(value = "")
   public List<List<ReadOnlyFirst>> getArrayArrayOfModel() {
diff --git a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/Capitalization.java b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/Capitalization.java
index 473052d303..7711c16a39 100644
--- a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/Capitalization.java
+++ b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/Capitalization.java
@@ -55,7 +55,7 @@ public class Capitalization {
    * Get smallCamel
    * @return smallCamel
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getSmallCamel() {
     return smallCamel;
@@ -74,7 +74,7 @@ public class Capitalization {
    * Get capitalCamel
    * @return capitalCamel
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getCapitalCamel() {
     return capitalCamel;
@@ -93,7 +93,7 @@ public class Capitalization {
    * Get smallSnake
    * @return smallSnake
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getSmallSnake() {
     return smallSnake;
@@ -112,7 +112,7 @@ public class Capitalization {
    * Get capitalSnake
    * @return capitalSnake
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getCapitalSnake() {
     return capitalSnake;
@@ -131,7 +131,7 @@ public class Capitalization {
    * Get scAETHFlowPoints
    * @return scAETHFlowPoints
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getScAETHFlowPoints() {
     return scAETHFlowPoints;
@@ -150,7 +150,7 @@ public class Capitalization {
    * Name of the pet 
    * @return ATT_NAME
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "Name of the pet ")
   public String getATTNAME() {
     return ATT_NAME;
diff --git a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/Cat.java b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/Cat.java
index a0b8ca3385..19f9190ee9 100644
--- a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/Cat.java
+++ b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/Cat.java
@@ -42,7 +42,7 @@ public class Cat extends Animal {
    * Get declawed
    * @return declawed
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Boolean getDeclawed() {
     return declawed;
diff --git a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/CatAllOf.java b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/CatAllOf.java
index 997a3ef2f4..c99b9a3398 100644
--- a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/CatAllOf.java
+++ b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/CatAllOf.java
@@ -40,7 +40,7 @@ public class CatAllOf {
    * Get declawed
    * @return declawed
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Boolean getDeclawed() {
     return declawed;
diff --git a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/Category.java b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/Category.java
index 6db06530c3..31476c70b7 100644
--- a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/Category.java
+++ b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/Category.java
@@ -43,7 +43,7 @@ public class Category {
    * Get id
    * @return id
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Long getId() {
     return id;
@@ -62,7 +62,6 @@ public class Category {
    * Get name
    * @return name
   **/
-
   @NotNull
   @ApiModelProperty(required = true, value = "")
   public String getName() {
diff --git a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/ClassModel.java b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/ClassModel.java
index 41049c9bee..4067f2eaf4 100644
--- a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/ClassModel.java
+++ b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/ClassModel.java
@@ -41,7 +41,7 @@ public class ClassModel {
    * Get propertyClass
    * @return propertyClass
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getPropertyClass() {
     return propertyClass;
diff --git a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/Client.java b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/Client.java
index 83962ddde1..fd0084ed14 100644
--- a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/Client.java
+++ b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/Client.java
@@ -40,7 +40,7 @@ public class Client {
    * Get client
    * @return client
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getClient() {
     return client;
diff --git a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/Dog.java b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/Dog.java
index 845c7aa339..251c2381ab 100644
--- a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/Dog.java
+++ b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/Dog.java
@@ -42,7 +42,7 @@ public class Dog extends Animal {
    * Get breed
    * @return breed
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getBreed() {
     return breed;
diff --git a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/DogAllOf.java b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/DogAllOf.java
index 1aa1423a91..15821bf9b6 100644
--- a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/DogAllOf.java
+++ b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/DogAllOf.java
@@ -40,7 +40,7 @@ public class DogAllOf {
    * Get breed
    * @return breed
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getBreed() {
     return breed;
diff --git a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/EnumArrays.java b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/EnumArrays.java
index 398db61223..85899b20ff 100644
--- a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/EnumArrays.java
+++ b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/EnumArrays.java
@@ -115,7 +115,7 @@ public class EnumArrays {
    * Get justSymbol
    * @return justSymbol
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public JustSymbolEnum getJustSymbol() {
     return justSymbol;
@@ -142,7 +142,7 @@ public class EnumArrays {
    * Get arrayEnum
    * @return arrayEnum
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public List<ArrayEnumEnum> getArrayEnum() {
     return arrayEnum;
diff --git a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/EnumTest.java b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/EnumTest.java
index 88f0ab2b6e..5c0a43e659 100644
--- a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/EnumTest.java
+++ b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/EnumTest.java
@@ -197,7 +197,7 @@ public class EnumTest {
    * Get enumString
    * @return enumString
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public EnumStringEnum getEnumString() {
     return enumString;
@@ -216,7 +216,6 @@ public class EnumTest {
    * Get enumStringRequired
    * @return enumStringRequired
   **/
-
   @NotNull
   @ApiModelProperty(required = true, value = "")
   public EnumStringRequiredEnum getEnumStringRequired() {
@@ -236,7 +235,7 @@ public class EnumTest {
    * Get enumInteger
    * @return enumInteger
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public EnumIntegerEnum getEnumInteger() {
     return enumInteger;
@@ -255,7 +254,7 @@ public class EnumTest {
    * Get enumNumber
    * @return enumNumber
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public EnumNumberEnum getEnumNumber() {
     return enumNumber;
@@ -274,7 +273,7 @@ public class EnumTest {
    * Get outerEnum
    * @return outerEnum
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @Valid
   @ApiModelProperty(value = "")
   public OuterEnum getOuterEnum() {
diff --git a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java
index 78595f7854..c68dcd5667 100644
--- a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java
+++ b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java
@@ -45,7 +45,7 @@ public class FileSchemaTestClass {
    * Get file
    * @return file
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @Valid
   @ApiModelProperty(value = "")
   public java.io.File getFile() {
@@ -73,7 +73,7 @@ public class FileSchemaTestClass {
    * Get files
    * @return files
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @Valid
   @ApiModelProperty(value = "")
   public List<java.io.File> getFiles() {
diff --git a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/FormatTest.java b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/FormatTest.java
index 7ec52a2c7f..8398173042 100644
--- a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/FormatTest.java
+++ b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/FormatTest.java
@@ -83,7 +83,7 @@ public class FormatTest {
    * maximum: 100
    * @return integer
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
  @Min(10) @Max(100)  @ApiModelProperty(value = "")
   public Integer getInteger() {
     return integer;
@@ -104,7 +104,7 @@ public class FormatTest {
    * maximum: 200
    * @return int32
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
  @Min(20) @Max(200)  @ApiModelProperty(value = "")
   public Integer getInt32() {
     return int32;
@@ -123,7 +123,7 @@ public class FormatTest {
    * Get int64
    * @return int64
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Long getInt64() {
     return int64;
@@ -144,7 +144,6 @@ public class FormatTest {
    * maximum: 543.2
    * @return number
   **/
-
   @NotNull
   @Valid
  @DecimalMin("32.1") @DecimalMax("543.2")  @ApiModelProperty(required = true, value = "")
@@ -167,7 +166,7 @@ public class FormatTest {
    * maximum: 987.6
    * @return _float
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
  @DecimalMin("54.3") @DecimalMax("987.6")  @ApiModelProperty(value = "")
   public Float getFloat() {
     return _float;
@@ -188,7 +187,7 @@ public class FormatTest {
    * maximum: 123.4
    * @return _double
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
  @DecimalMin("67.8") @DecimalMax("123.4")  @ApiModelProperty(value = "")
   public Double getDouble() {
     return _double;
@@ -207,7 +206,7 @@ public class FormatTest {
    * Get string
    * @return string
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
  @Pattern(regexp="/[a-z]/i")  @ApiModelProperty(value = "")
   public String getString() {
     return string;
@@ -226,7 +225,6 @@ public class FormatTest {
    * Get _byte
    * @return _byte
   **/
-
   @NotNull
  @Pattern(regexp="^(?:[A-Za-z0-9+/]{4})*(?:[A-Za-z0-9+/]{2}==|[A-Za-z0-9+/]{3}=)?$")  @ApiModelProperty(required = true, value = "")
   public byte[] getByte() {
@@ -246,7 +244,7 @@ public class FormatTest {
    * Get binary
    * @return binary
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @Valid
   @ApiModelProperty(value = "")
   public File getBinary() {
@@ -266,7 +264,6 @@ public class FormatTest {
    * Get date
    * @return date
   **/
-
   @NotNull
   @Valid
   @ApiModelProperty(required = true, value = "")
@@ -287,7 +284,7 @@ public class FormatTest {
    * Get dateTime
    * @return dateTime
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @Valid
   @ApiModelProperty(value = "")
   public OffsetDateTime getDateTime() {
@@ -307,7 +304,7 @@ public class FormatTest {
    * Get uuid
    * @return uuid
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @Valid
   @ApiModelProperty(example = "72f98069-206d-4f12-9f12-3d1e525a8e84", value = "")
   public UUID getUuid() {
@@ -327,7 +324,6 @@ public class FormatTest {
    * Get password
    * @return password
   **/
-
   @NotNull
  @Size(min=10,max=64)  @ApiModelProperty(required = true, value = "")
   public String getPassword() {
diff --git a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java
index 17fb98f8e7..0f8354388a 100644
--- a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java
+++ b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java
@@ -38,7 +38,7 @@ public class HasOnlyReadOnly {
    * Get bar
    * @return bar
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getBar() {
     return bar;
@@ -48,7 +48,7 @@ public class HasOnlyReadOnly {
    * Get foo
    * @return foo
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getFoo() {
     return foo;
diff --git a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/MapTest.java b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/MapTest.java
index 920717d212..7dcfedc599 100644
--- a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/MapTest.java
+++ b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/MapTest.java
@@ -95,7 +95,7 @@ public class MapTest {
    * Get mapMapOfString
    * @return mapMapOfString
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @Valid
   @ApiModelProperty(value = "")
   public Map<String, Map<String, String>> getMapMapOfString() {
@@ -123,7 +123,7 @@ public class MapTest {
    * Get mapOfEnumString
    * @return mapOfEnumString
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Map<String, InnerEnum> getMapOfEnumString() {
     return mapOfEnumString;
@@ -150,7 +150,7 @@ public class MapTest {
    * Get directMap
    * @return directMap
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Map<String, Boolean> getDirectMap() {
     return directMap;
@@ -177,7 +177,7 @@ public class MapTest {
    * Get indirectMap
    * @return indirectMap
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Map<String, Boolean> getIndirectMap() {
     return indirectMap;
diff --git a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java
index 870ceb97f9..29958bbf94 100644
--- a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java
+++ b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java
@@ -52,7 +52,7 @@ public class MixedPropertiesAndAdditionalPropertiesClass {
    * Get uuid
    * @return uuid
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @Valid
   @ApiModelProperty(value = "")
   public UUID getUuid() {
@@ -72,7 +72,7 @@ public class MixedPropertiesAndAdditionalPropertiesClass {
    * Get dateTime
    * @return dateTime
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @Valid
   @ApiModelProperty(value = "")
   public OffsetDateTime getDateTime() {
@@ -100,7 +100,7 @@ public class MixedPropertiesAndAdditionalPropertiesClass {
    * Get map
    * @return map
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @Valid
   @ApiModelProperty(value = "")
   public Map<String, Animal> getMap() {
diff --git a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/Model200Response.java b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/Model200Response.java
index ea07d5c6a8..2652b3f75d 100644
--- a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/Model200Response.java
+++ b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/Model200Response.java
@@ -44,7 +44,7 @@ public class Model200Response {
    * Get name
    * @return name
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Integer getName() {
     return name;
@@ -63,7 +63,7 @@ public class Model200Response {
    * Get propertyClass
    * @return propertyClass
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getPropertyClass() {
     return propertyClass;
diff --git a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/ModelApiResponse.java b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/ModelApiResponse.java
index b30186ae73..1439048114 100644
--- a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/ModelApiResponse.java
+++ b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/ModelApiResponse.java
@@ -46,7 +46,7 @@ public class ModelApiResponse {
    * Get code
    * @return code
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Integer getCode() {
     return code;
@@ -65,7 +65,7 @@ public class ModelApiResponse {
    * Get type
    * @return type
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getType() {
     return type;
@@ -84,7 +84,7 @@ public class ModelApiResponse {
    * Get message
    * @return message
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getMessage() {
     return message;
diff --git a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/ModelReturn.java b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/ModelReturn.java
index a8010bb637..864b466565 100644
--- a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/ModelReturn.java
+++ b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/ModelReturn.java
@@ -41,7 +41,7 @@ public class ModelReturn {
    * Get _return
    * @return _return
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Integer getReturn() {
     return _return;
diff --git a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/Name.java b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/Name.java
index 8f2864ef8f..085892f4d4 100644
--- a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/Name.java
+++ b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/Name.java
@@ -50,7 +50,6 @@ public class Name {
    * Get name
    * @return name
   **/
-
   @NotNull
   @ApiModelProperty(required = true, value = "")
   public Integer getName() {
@@ -65,7 +64,7 @@ public class Name {
    * Get snakeCase
    * @return snakeCase
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Integer getSnakeCase() {
     return snakeCase;
@@ -80,7 +79,7 @@ public class Name {
    * Get property
    * @return property
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getProperty() {
     return property;
@@ -94,7 +93,7 @@ public class Name {
    * Get _123number
    * @return _123number
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Integer get123number() {
     return _123number;
diff --git a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/NumberOnly.java b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/NumberOnly.java
index 6ebb9d5231..3c04811b8f 100644
--- a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/NumberOnly.java
+++ b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/NumberOnly.java
@@ -41,7 +41,7 @@ public class NumberOnly {
    * Get justNumber
    * @return justNumber
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @Valid
   @ApiModelProperty(value = "")
   public BigDecimal getJustNumber() {
diff --git a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/Order.java b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/Order.java
index 1f009a45cf..db957a8f0e 100644
--- a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/Order.java
+++ b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/Order.java
@@ -93,7 +93,7 @@ public class Order {
    * Get id
    * @return id
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Long getId() {
     return id;
@@ -112,7 +112,7 @@ public class Order {
    * Get petId
    * @return petId
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Long getPetId() {
     return petId;
@@ -131,7 +131,7 @@ public class Order {
    * Get quantity
    * @return quantity
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Integer getQuantity() {
     return quantity;
@@ -150,7 +150,7 @@ public class Order {
    * Get shipDate
    * @return shipDate
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @Valid
   @ApiModelProperty(value = "")
   public OffsetDateTime getShipDate() {
@@ -170,7 +170,7 @@ public class Order {
    * Order Status
    * @return status
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "Order Status")
   public StatusEnum getStatus() {
     return status;
@@ -189,7 +189,7 @@ public class Order {
    * Get complete
    * @return complete
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Boolean getComplete() {
     return complete;
diff --git a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/OuterComposite.java b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/OuterComposite.java
index 709bad5916..eb24ea692b 100644
--- a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/OuterComposite.java
+++ b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/OuterComposite.java
@@ -47,7 +47,7 @@ public class OuterComposite {
    * Get myNumber
    * @return myNumber
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @Valid
   @ApiModelProperty(value = "")
   public BigDecimal getMyNumber() {
@@ -67,7 +67,7 @@ public class OuterComposite {
    * Get myString
    * @return myString
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getMyString() {
     return myString;
@@ -86,7 +86,7 @@ public class OuterComposite {
    * Get myBoolean
    * @return myBoolean
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Boolean getMyBoolean() {
     return myBoolean;
diff --git a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/Pet.java b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/Pet.java
index a77cad038b..6c7bc70b5d 100644
--- a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/Pet.java
+++ b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/Pet.java
@@ -96,7 +96,7 @@ public class Pet {
    * Get id
    * @return id
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Long getId() {
     return id;
@@ -115,7 +115,7 @@ public class Pet {
    * Get category
    * @return category
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @Valid
   @ApiModelProperty(value = "")
   public Category getCategory() {
@@ -135,7 +135,6 @@ public class Pet {
    * Get name
    * @return name
   **/
-
   @NotNull
   @ApiModelProperty(example = "doggie", required = true, value = "")
   public String getName() {
@@ -160,7 +159,6 @@ public class Pet {
    * Get photoUrls
    * @return photoUrls
   **/
-
   @NotNull
   @ApiModelProperty(required = true, value = "")
   public List<String> getPhotoUrls() {
@@ -188,7 +186,7 @@ public class Pet {
    * Get tags
    * @return tags
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @Valid
   @ApiModelProperty(value = "")
   public List<Tag> getTags() {
@@ -208,7 +206,7 @@ public class Pet {
    * pet status in the store
    * @return status
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "pet status in the store")
   public StatusEnum getStatus() {
     return status;
diff --git a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/ReadOnlyFirst.java b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/ReadOnlyFirst.java
index b8ec9b5b58..c6f758922c 100644
--- a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/ReadOnlyFirst.java
+++ b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/ReadOnlyFirst.java
@@ -38,7 +38,7 @@ public class ReadOnlyFirst {
    * Get bar
    * @return bar
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getBar() {
     return bar;
@@ -53,7 +53,7 @@ public class ReadOnlyFirst {
    * Get baz
    * @return baz
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getBaz() {
     return baz;
diff --git a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/SpecialModelName.java b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/SpecialModelName.java
index 37405452a3..7d8bc5e833 100644
--- a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/SpecialModelName.java
+++ b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/SpecialModelName.java
@@ -40,7 +40,7 @@ public class SpecialModelName {
    * Get $specialPropertyName
    * @return $specialPropertyName
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Long get$SpecialPropertyName() {
     return $specialPropertyName;
diff --git a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/Tag.java b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/Tag.java
index 78c198db1f..6c20df9d7e 100644
--- a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/Tag.java
+++ b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/Tag.java
@@ -43,7 +43,7 @@ public class Tag {
    * Get id
    * @return id
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Long getId() {
     return id;
@@ -62,7 +62,7 @@ public class Tag {
    * Get name
    * @return name
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getName() {
     return name;
diff --git a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/TypeHolderDefault.java b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/TypeHolderDefault.java
index 499efa34b5..6f1c423706 100644
--- a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/TypeHolderDefault.java
+++ b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/TypeHolderDefault.java
@@ -55,7 +55,6 @@ public class TypeHolderDefault {
    * Get stringItem
    * @return stringItem
   **/
-
   @NotNull
   @ApiModelProperty(required = true, value = "")
   public String getStringItem() {
@@ -75,7 +74,6 @@ public class TypeHolderDefault {
    * Get numberItem
    * @return numberItem
   **/
-
   @NotNull
   @Valid
   @ApiModelProperty(required = true, value = "")
@@ -96,7 +94,6 @@ public class TypeHolderDefault {
    * Get integerItem
    * @return integerItem
   **/
-
   @NotNull
   @ApiModelProperty(required = true, value = "")
   public Integer getIntegerItem() {
@@ -116,7 +113,6 @@ public class TypeHolderDefault {
    * Get boolItem
    * @return boolItem
   **/
-
   @NotNull
   @ApiModelProperty(required = true, value = "")
   public Boolean getBoolItem() {
@@ -141,7 +137,6 @@ public class TypeHolderDefault {
    * Get arrayItem
    * @return arrayItem
   **/
-
   @NotNull
   @ApiModelProperty(required = true, value = "")
   public List<Integer> getArrayItem() {
diff --git a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/TypeHolderExample.java b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/TypeHolderExample.java
index 70c0b65d80..f1e1e7792a 100644
--- a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/TypeHolderExample.java
+++ b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/TypeHolderExample.java
@@ -55,7 +55,6 @@ public class TypeHolderExample {
    * Get stringItem
    * @return stringItem
   **/
-
   @NotNull
   @ApiModelProperty(example = "what", required = true, value = "")
   public String getStringItem() {
@@ -75,7 +74,6 @@ public class TypeHolderExample {
    * Get numberItem
    * @return numberItem
   **/
-
   @NotNull
   @Valid
   @ApiModelProperty(example = "1.234", required = true, value = "")
@@ -96,7 +94,6 @@ public class TypeHolderExample {
    * Get integerItem
    * @return integerItem
   **/
-
   @NotNull
   @ApiModelProperty(example = "-2", required = true, value = "")
   public Integer getIntegerItem() {
@@ -116,7 +113,6 @@ public class TypeHolderExample {
    * Get boolItem
    * @return boolItem
   **/
-
   @NotNull
   @ApiModelProperty(example = "true", required = true, value = "")
   public Boolean getBoolItem() {
@@ -141,7 +137,6 @@ public class TypeHolderExample {
    * Get arrayItem
    * @return arrayItem
   **/
-
   @NotNull
   @ApiModelProperty(example = "[0, 1, 2, 3]", required = true, value = "")
   public List<Integer> getArrayItem() {
diff --git a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/User.java b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/User.java
index 6baf32249c..3782d8dd84 100644
--- a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/User.java
+++ b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/User.java
@@ -61,7 +61,7 @@ public class User {
    * Get id
    * @return id
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Long getId() {
     return id;
@@ -80,7 +80,7 @@ public class User {
    * Get username
    * @return username
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getUsername() {
     return username;
@@ -99,7 +99,7 @@ public class User {
    * Get firstName
    * @return firstName
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getFirstName() {
     return firstName;
@@ -118,7 +118,7 @@ public class User {
    * Get lastName
    * @return lastName
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getLastName() {
     return lastName;
@@ -137,7 +137,7 @@ public class User {
    * Get email
    * @return email
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getEmail() {
     return email;
@@ -156,7 +156,7 @@ public class User {
    * Get password
    * @return password
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getPassword() {
     return password;
@@ -175,7 +175,7 @@ public class User {
    * Get phone
    * @return phone
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getPhone() {
     return phone;
@@ -194,7 +194,7 @@ public class User {
    * User Status
    * @return userStatus
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "User Status")
   public Integer getUserStatus() {
     return userStatus;
diff --git a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/XmlItem.java b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/XmlItem.java
index 71f0e18c5a..e07171cd7c 100644
--- a/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/XmlItem.java
+++ b/samples/client/petstore/java/retrofit2-play26/src/main/java/org/openapitools/client/model/XmlItem.java
@@ -127,7 +127,7 @@ public class XmlItem {
    * Get attributeString
    * @return attributeString
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(example = "string", value = "")
   public String getAttributeString() {
     return attributeString;
@@ -146,7 +146,7 @@ public class XmlItem {
    * Get attributeNumber
    * @return attributeNumber
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @Valid
   @ApiModelProperty(example = "1.234", value = "")
   public BigDecimal getAttributeNumber() {
@@ -166,7 +166,7 @@ public class XmlItem {
    * Get attributeInteger
    * @return attributeInteger
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(example = "-2", value = "")
   public Integer getAttributeInteger() {
     return attributeInteger;
@@ -185,7 +185,7 @@ public class XmlItem {
    * Get attributeBoolean
    * @return attributeBoolean
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(example = "true", value = "")
   public Boolean getAttributeBoolean() {
     return attributeBoolean;
@@ -212,7 +212,7 @@ public class XmlItem {
    * Get wrappedArray
    * @return wrappedArray
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public List<Integer> getWrappedArray() {
     return wrappedArray;
@@ -231,7 +231,7 @@ public class XmlItem {
    * Get nameString
    * @return nameString
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(example = "string", value = "")
   public String getNameString() {
     return nameString;
@@ -250,7 +250,7 @@ public class XmlItem {
    * Get nameNumber
    * @return nameNumber
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @Valid
   @ApiModelProperty(example = "1.234", value = "")
   public BigDecimal getNameNumber() {
@@ -270,7 +270,7 @@ public class XmlItem {
    * Get nameInteger
    * @return nameInteger
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(example = "-2", value = "")
   public Integer getNameInteger() {
     return nameInteger;
@@ -289,7 +289,7 @@ public class XmlItem {
    * Get nameBoolean
    * @return nameBoolean
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(example = "true", value = "")
   public Boolean getNameBoolean() {
     return nameBoolean;
@@ -316,7 +316,7 @@ public class XmlItem {
    * Get nameArray
    * @return nameArray
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public List<Integer> getNameArray() {
     return nameArray;
@@ -343,7 +343,7 @@ public class XmlItem {
    * Get nameWrappedArray
    * @return nameWrappedArray
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public List<Integer> getNameWrappedArray() {
     return nameWrappedArray;
@@ -362,7 +362,7 @@ public class XmlItem {
    * Get prefixString
    * @return prefixString
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(example = "string", value = "")
   public String getPrefixString() {
     return prefixString;
@@ -381,7 +381,7 @@ public class XmlItem {
    * Get prefixNumber
    * @return prefixNumber
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @Valid
   @ApiModelProperty(example = "1.234", value = "")
   public BigDecimal getPrefixNumber() {
@@ -401,7 +401,7 @@ public class XmlItem {
    * Get prefixInteger
    * @return prefixInteger
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(example = "-2", value = "")
   public Integer getPrefixInteger() {
     return prefixInteger;
@@ -420,7 +420,7 @@ public class XmlItem {
    * Get prefixBoolean
    * @return prefixBoolean
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(example = "true", value = "")
   public Boolean getPrefixBoolean() {
     return prefixBoolean;
@@ -447,7 +447,7 @@ public class XmlItem {
    * Get prefixArray
    * @return prefixArray
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public List<Integer> getPrefixArray() {
     return prefixArray;
@@ -474,7 +474,7 @@ public class XmlItem {
    * Get prefixWrappedArray
    * @return prefixWrappedArray
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public List<Integer> getPrefixWrappedArray() {
     return prefixWrappedArray;
@@ -493,7 +493,7 @@ public class XmlItem {
    * Get namespaceString
    * @return namespaceString
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(example = "string", value = "")
   public String getNamespaceString() {
     return namespaceString;
@@ -512,7 +512,7 @@ public class XmlItem {
    * Get namespaceNumber
    * @return namespaceNumber
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @Valid
   @ApiModelProperty(example = "1.234", value = "")
   public BigDecimal getNamespaceNumber() {
@@ -532,7 +532,7 @@ public class XmlItem {
    * Get namespaceInteger
    * @return namespaceInteger
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(example = "-2", value = "")
   public Integer getNamespaceInteger() {
     return namespaceInteger;
@@ -551,7 +551,7 @@ public class XmlItem {
    * Get namespaceBoolean
    * @return namespaceBoolean
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(example = "true", value = "")
   public Boolean getNamespaceBoolean() {
     return namespaceBoolean;
@@ -578,7 +578,7 @@ public class XmlItem {
    * Get namespaceArray
    * @return namespaceArray
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public List<Integer> getNamespaceArray() {
     return namespaceArray;
@@ -605,7 +605,7 @@ public class XmlItem {
    * Get namespaceWrappedArray
    * @return namespaceWrappedArray
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public List<Integer> getNamespaceWrappedArray() {
     return namespaceWrappedArray;
@@ -624,7 +624,7 @@ public class XmlItem {
    * Get prefixNsString
    * @return prefixNsString
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(example = "string", value = "")
   public String getPrefixNsString() {
     return prefixNsString;
@@ -643,7 +643,7 @@ public class XmlItem {
    * Get prefixNsNumber
    * @return prefixNsNumber
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @Valid
   @ApiModelProperty(example = "1.234", value = "")
   public BigDecimal getPrefixNsNumber() {
@@ -663,7 +663,7 @@ public class XmlItem {
    * Get prefixNsInteger
    * @return prefixNsInteger
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(example = "-2", value = "")
   public Integer getPrefixNsInteger() {
     return prefixNsInteger;
@@ -682,7 +682,7 @@ public class XmlItem {
    * Get prefixNsBoolean
    * @return prefixNsBoolean
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(example = "true", value = "")
   public Boolean getPrefixNsBoolean() {
     return prefixNsBoolean;
@@ -709,7 +709,7 @@ public class XmlItem {
    * Get prefixNsArray
    * @return prefixNsArray
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public List<Integer> getPrefixNsArray() {
     return prefixNsArray;
@@ -736,7 +736,7 @@ public class XmlItem {
    * Get prefixNsWrappedArray
    * @return prefixNsWrappedArray
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public List<Integer> getPrefixNsWrappedArray() {
     return prefixNsWrappedArray;
diff --git a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/AdditionalPropertiesAnyType.java b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/AdditionalPropertiesAnyType.java
index e98f74f8ae..6639252ccb 100644
--- a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/AdditionalPropertiesAnyType.java
+++ b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/AdditionalPropertiesAnyType.java
@@ -44,7 +44,7 @@ public class AdditionalPropertiesAnyType extends HashMap<String, Object> {
    * Get name
    * @return name
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getName() {
     return name;
diff --git a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/AdditionalPropertiesArray.java b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/AdditionalPropertiesArray.java
index 1d86faad3e..2c3f2ca0a4 100644
--- a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/AdditionalPropertiesArray.java
+++ b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/AdditionalPropertiesArray.java
@@ -45,7 +45,7 @@ public class AdditionalPropertiesArray extends HashMap<String, List> {
    * Get name
    * @return name
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getName() {
     return name;
diff --git a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/AdditionalPropertiesBoolean.java b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/AdditionalPropertiesBoolean.java
index a3b37161da..7c4a5248c0 100644
--- a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/AdditionalPropertiesBoolean.java
+++ b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/AdditionalPropertiesBoolean.java
@@ -44,7 +44,7 @@ public class AdditionalPropertiesBoolean extends HashMap<String, Boolean> {
    * Get name
    * @return name
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getName() {
     return name;
diff --git a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java
index 8819f4a024..b016f1f377 100644
--- a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java
+++ b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java
@@ -94,7 +94,7 @@ public class AdditionalPropertiesClass {
    * Get mapString
    * @return mapString
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Map<String, String> getMapString() {
     return mapString;
@@ -121,7 +121,7 @@ public class AdditionalPropertiesClass {
    * Get mapNumber
    * @return mapNumber
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Map<String, BigDecimal> getMapNumber() {
     return mapNumber;
@@ -148,7 +148,7 @@ public class AdditionalPropertiesClass {
    * Get mapInteger
    * @return mapInteger
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Map<String, Integer> getMapInteger() {
     return mapInteger;
@@ -175,7 +175,7 @@ public class AdditionalPropertiesClass {
    * Get mapBoolean
    * @return mapBoolean
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Map<String, Boolean> getMapBoolean() {
     return mapBoolean;
@@ -202,7 +202,7 @@ public class AdditionalPropertiesClass {
    * Get mapArrayInteger
    * @return mapArrayInteger
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Map<String, List<Integer>> getMapArrayInteger() {
     return mapArrayInteger;
@@ -229,7 +229,7 @@ public class AdditionalPropertiesClass {
    * Get mapArrayAnytype
    * @return mapArrayAnytype
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Map<String, List<Object>> getMapArrayAnytype() {
     return mapArrayAnytype;
@@ -256,7 +256,7 @@ public class AdditionalPropertiesClass {
    * Get mapMapString
    * @return mapMapString
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Map<String, Map<String, String>> getMapMapString() {
     return mapMapString;
@@ -283,7 +283,7 @@ public class AdditionalPropertiesClass {
    * Get mapMapAnytype
    * @return mapMapAnytype
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Map<String, Map<String, Object>> getMapMapAnytype() {
     return mapMapAnytype;
@@ -302,7 +302,7 @@ public class AdditionalPropertiesClass {
    * Get anytype1
    * @return anytype1
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Object getAnytype1() {
     return anytype1;
@@ -321,7 +321,7 @@ public class AdditionalPropertiesClass {
    * Get anytype2
    * @return anytype2
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Object getAnytype2() {
     return anytype2;
@@ -340,7 +340,7 @@ public class AdditionalPropertiesClass {
    * Get anytype3
    * @return anytype3
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Object getAnytype3() {
     return anytype3;
diff --git a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/AdditionalPropertiesInteger.java b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/AdditionalPropertiesInteger.java
index b8f956cbed..10df3df74c 100644
--- a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/AdditionalPropertiesInteger.java
+++ b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/AdditionalPropertiesInteger.java
@@ -44,7 +44,7 @@ public class AdditionalPropertiesInteger extends HashMap<String, Integer> {
    * Get name
    * @return name
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getName() {
     return name;
diff --git a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/AdditionalPropertiesNumber.java b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/AdditionalPropertiesNumber.java
index 03d923ab1d..33719cab26 100644
--- a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/AdditionalPropertiesNumber.java
+++ b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/AdditionalPropertiesNumber.java
@@ -45,7 +45,7 @@ public class AdditionalPropertiesNumber extends HashMap<String, BigDecimal> {
    * Get name
    * @return name
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getName() {
     return name;
diff --git a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/AdditionalPropertiesObject.java b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/AdditionalPropertiesObject.java
index c0e696dbd5..e37e04b01a 100644
--- a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/AdditionalPropertiesObject.java
+++ b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/AdditionalPropertiesObject.java
@@ -44,7 +44,7 @@ public class AdditionalPropertiesObject extends HashMap<String, Map> {
    * Get name
    * @return name
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getName() {
     return name;
diff --git a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/AdditionalPropertiesString.java b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/AdditionalPropertiesString.java
index 67e597e3cf..cfbf74f5b3 100644
--- a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/AdditionalPropertiesString.java
+++ b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/AdditionalPropertiesString.java
@@ -44,7 +44,7 @@ public class AdditionalPropertiesString extends HashMap<String, String> {
    * Get name
    * @return name
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getName() {
     return name;
diff --git a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/Animal.java b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/Animal.java
index 1738bdaf47..0a02419dbf 100644
--- a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/Animal.java
+++ b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/Animal.java
@@ -50,7 +50,6 @@ public class Animal {
    * Get className
    * @return className
   **/
-
   @ApiModelProperty(required = true, value = "")
   public String getClassName() {
     return className;
@@ -69,7 +68,7 @@ public class Animal {
    * Get color
    * @return color
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getColor() {
     return color;
diff --git a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java
index 69c0cacb05..4f016503d4 100644
--- a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java
+++ b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java
@@ -53,7 +53,7 @@ public class ArrayOfArrayOfNumberOnly {
    * Get arrayArrayNumber
    * @return arrayArrayNumber
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public List<List<BigDecimal>> getArrayArrayNumber() {
     return arrayArrayNumber;
diff --git a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java
index a85aa96af7..15d27a21f2 100644
--- a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java
+++ b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java
@@ -53,7 +53,7 @@ public class ArrayOfNumberOnly {
    * Get arrayNumber
    * @return arrayNumber
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public List<BigDecimal> getArrayNumber() {
     return arrayNumber;
diff --git a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/ArrayTest.java b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/ArrayTest.java
index 986ac5aa17..7f6d476044 100644
--- a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/ArrayTest.java
+++ b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/ArrayTest.java
@@ -61,7 +61,7 @@ public class ArrayTest {
    * Get arrayOfString
    * @return arrayOfString
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public List<String> getArrayOfString() {
     return arrayOfString;
@@ -88,7 +88,7 @@ public class ArrayTest {
    * Get arrayArrayOfInteger
    * @return arrayArrayOfInteger
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public List<List<Long>> getArrayArrayOfInteger() {
     return arrayArrayOfInteger;
@@ -115,7 +115,7 @@ public class ArrayTest {
    * Get arrayArrayOfModel
    * @return arrayArrayOfModel
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public List<List<ReadOnlyFirst>> getArrayArrayOfModel() {
     return arrayArrayOfModel;
diff --git a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/Capitalization.java b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/Capitalization.java
index 36f8853e1c..ef40fe949f 100644
--- a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/Capitalization.java
+++ b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/Capitalization.java
@@ -62,7 +62,7 @@ public class Capitalization {
    * Get smallCamel
    * @return smallCamel
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getSmallCamel() {
     return smallCamel;
@@ -81,7 +81,7 @@ public class Capitalization {
    * Get capitalCamel
    * @return capitalCamel
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getCapitalCamel() {
     return capitalCamel;
@@ -100,7 +100,7 @@ public class Capitalization {
    * Get smallSnake
    * @return smallSnake
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getSmallSnake() {
     return smallSnake;
@@ -119,7 +119,7 @@ public class Capitalization {
    * Get capitalSnake
    * @return capitalSnake
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getCapitalSnake() {
     return capitalSnake;
@@ -138,7 +138,7 @@ public class Capitalization {
    * Get scAETHFlowPoints
    * @return scAETHFlowPoints
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getScAETHFlowPoints() {
     return scAETHFlowPoints;
@@ -157,7 +157,7 @@ public class Capitalization {
    * Name of the pet 
    * @return ATT_NAME
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "Name of the pet ")
   public String getATTNAME() {
     return ATT_NAME;
diff --git a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/Cat.java b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/Cat.java
index 965461a8be..c600502f71 100644
--- a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/Cat.java
+++ b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/Cat.java
@@ -44,7 +44,7 @@ public class Cat extends Animal {
    * Get declawed
    * @return declawed
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Boolean getDeclawed() {
     return declawed;
diff --git a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/CatAllOf.java b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/CatAllOf.java
index 124db9b8ba..29b3658551 100644
--- a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/CatAllOf.java
+++ b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/CatAllOf.java
@@ -42,7 +42,7 @@ public class CatAllOf {
    * Get declawed
    * @return declawed
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Boolean getDeclawed() {
     return declawed;
diff --git a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/Category.java b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/Category.java
index d4e121847a..1968763722 100644
--- a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/Category.java
+++ b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/Category.java
@@ -46,7 +46,7 @@ public class Category {
    * Get id
    * @return id
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Long getId() {
     return id;
@@ -65,7 +65,6 @@ public class Category {
    * Get name
    * @return name
   **/
-
   @ApiModelProperty(required = true, value = "")
   public String getName() {
     return name;
diff --git a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/ClassModel.java b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/ClassModel.java
index cbdd8f317b..52245d7050 100644
--- a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/ClassModel.java
+++ b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/ClassModel.java
@@ -43,7 +43,7 @@ public class ClassModel {
    * Get propertyClass
    * @return propertyClass
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getPropertyClass() {
     return propertyClass;
diff --git a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/Client.java b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/Client.java
index 5d9c5c4a71..e5ece3536d 100644
--- a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/Client.java
+++ b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/Client.java
@@ -42,7 +42,7 @@ public class Client {
    * Get client
    * @return client
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getClient() {
     return client;
diff --git a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/Dog.java b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/Dog.java
index 4da9ba4364..d877eb2f37 100644
--- a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/Dog.java
+++ b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/Dog.java
@@ -44,7 +44,7 @@ public class Dog extends Animal {
    * Get breed
    * @return breed
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getBreed() {
     return breed;
diff --git a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/DogAllOf.java b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/DogAllOf.java
index e505d1dbc3..54483f2227 100644
--- a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/DogAllOf.java
+++ b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/DogAllOf.java
@@ -42,7 +42,7 @@ public class DogAllOf {
    * Get breed
    * @return breed
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getBreed() {
     return breed;
diff --git a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/EnumArrays.java b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/EnumArrays.java
index 8748c9fa37..a5aba01d53 100644
--- a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/EnumArrays.java
+++ b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/EnumArrays.java
@@ -142,7 +142,7 @@ public class EnumArrays {
    * Get justSymbol
    * @return justSymbol
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public JustSymbolEnum getJustSymbol() {
     return justSymbol;
@@ -169,7 +169,7 @@ public class EnumArrays {
    * Get arrayEnum
    * @return arrayEnum
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public List<ArrayEnumEnum> getArrayEnum() {
     return arrayEnum;
diff --git a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/EnumTest.java b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/EnumTest.java
index 1960c24ac2..679584204f 100644
--- a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/EnumTest.java
+++ b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/EnumTest.java
@@ -251,7 +251,7 @@ public class EnumTest {
    * Get enumString
    * @return enumString
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public EnumStringEnum getEnumString() {
     return enumString;
@@ -270,7 +270,6 @@ public class EnumTest {
    * Get enumStringRequired
    * @return enumStringRequired
   **/
-
   @ApiModelProperty(required = true, value = "")
   public EnumStringRequiredEnum getEnumStringRequired() {
     return enumStringRequired;
@@ -289,7 +288,7 @@ public class EnumTest {
    * Get enumInteger
    * @return enumInteger
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public EnumIntegerEnum getEnumInteger() {
     return enumInteger;
@@ -308,7 +307,7 @@ public class EnumTest {
    * Get enumNumber
    * @return enumNumber
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public EnumNumberEnum getEnumNumber() {
     return enumNumber;
@@ -327,7 +326,7 @@ public class EnumTest {
    * Get outerEnum
    * @return outerEnum
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public OuterEnum getOuterEnum() {
     return outerEnum;
diff --git a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java
index 3c7fcaabdf..181141b92d 100644
--- a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java
+++ b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java
@@ -48,7 +48,7 @@ public class FileSchemaTestClass {
    * Get file
    * @return file
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public java.io.File getFile() {
     return file;
@@ -75,7 +75,7 @@ public class FileSchemaTestClass {
    * Get files
    * @return files
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public List<java.io.File> getFiles() {
     return files;
diff --git a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/FormatTest.java b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/FormatTest.java
index e7b28a4737..583b12a0eb 100644
--- a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/FormatTest.java
+++ b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/FormatTest.java
@@ -97,7 +97,7 @@ public class FormatTest {
    * maximum: 100
    * @return integer
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Integer getInteger() {
     return integer;
@@ -118,7 +118,7 @@ public class FormatTest {
    * maximum: 200
    * @return int32
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Integer getInt32() {
     return int32;
@@ -137,7 +137,7 @@ public class FormatTest {
    * Get int64
    * @return int64
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Long getInt64() {
     return int64;
@@ -158,7 +158,6 @@ public class FormatTest {
    * maximum: 543.2
    * @return number
   **/
-
   @ApiModelProperty(required = true, value = "")
   public BigDecimal getNumber() {
     return number;
@@ -179,7 +178,7 @@ public class FormatTest {
    * maximum: 987.6
    * @return _float
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Float getFloat() {
     return _float;
@@ -200,7 +199,7 @@ public class FormatTest {
    * maximum: 123.4
    * @return _double
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Double getDouble() {
     return _double;
@@ -219,7 +218,7 @@ public class FormatTest {
    * Get string
    * @return string
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getString() {
     return string;
@@ -238,7 +237,6 @@ public class FormatTest {
    * Get _byte
    * @return _byte
   **/
-
   @ApiModelProperty(required = true, value = "")
   public byte[] getByte() {
     return _byte;
@@ -257,7 +255,7 @@ public class FormatTest {
    * Get binary
    * @return binary
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public File getBinary() {
     return binary;
@@ -276,7 +274,6 @@ public class FormatTest {
    * Get date
    * @return date
   **/
-
   @ApiModelProperty(required = true, value = "")
   public LocalDate getDate() {
     return date;
@@ -295,7 +292,7 @@ public class FormatTest {
    * Get dateTime
    * @return dateTime
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public OffsetDateTime getDateTime() {
     return dateTime;
@@ -314,7 +311,7 @@ public class FormatTest {
    * Get uuid
    * @return uuid
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(example = "72f98069-206d-4f12-9f12-3d1e525a8e84", value = "")
   public UUID getUuid() {
     return uuid;
@@ -333,7 +330,6 @@ public class FormatTest {
    * Get password
    * @return password
   **/
-
   @ApiModelProperty(required = true, value = "")
   public String getPassword() {
     return password;
diff --git a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java
index 72fcaa8993..02225d278c 100644
--- a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java
+++ b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java
@@ -41,7 +41,7 @@ public class HasOnlyReadOnly {
    * Get bar
    * @return bar
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getBar() {
     return bar;
@@ -51,7 +51,7 @@ public class HasOnlyReadOnly {
    * Get foo
    * @return foo
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getFoo() {
     return foo;
diff --git a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/MapTest.java b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/MapTest.java
index 43f0d2e998..329cb4c87b 100644
--- a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/MapTest.java
+++ b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/MapTest.java
@@ -112,7 +112,7 @@ public class MapTest {
    * Get mapMapOfString
    * @return mapMapOfString
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Map<String, Map<String, String>> getMapMapOfString() {
     return mapMapOfString;
@@ -139,7 +139,7 @@ public class MapTest {
    * Get mapOfEnumString
    * @return mapOfEnumString
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Map<String, InnerEnum> getMapOfEnumString() {
     return mapOfEnumString;
@@ -166,7 +166,7 @@ public class MapTest {
    * Get directMap
    * @return directMap
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Map<String, Boolean> getDirectMap() {
     return directMap;
@@ -193,7 +193,7 @@ public class MapTest {
    * Get indirectMap
    * @return indirectMap
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Map<String, Boolean> getIndirectMap() {
     return indirectMap;
diff --git a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java
index 78d80bd7f0..1826c8b064 100644
--- a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java
+++ b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java
@@ -56,7 +56,7 @@ public class MixedPropertiesAndAdditionalPropertiesClass {
    * Get uuid
    * @return uuid
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public UUID getUuid() {
     return uuid;
@@ -75,7 +75,7 @@ public class MixedPropertiesAndAdditionalPropertiesClass {
    * Get dateTime
    * @return dateTime
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public OffsetDateTime getDateTime() {
     return dateTime;
@@ -102,7 +102,7 @@ public class MixedPropertiesAndAdditionalPropertiesClass {
    * Get map
    * @return map
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Map<String, Animal> getMap() {
     return map;
diff --git a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/Model200Response.java b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/Model200Response.java
index 0c0fc9710d..3167560a9d 100644
--- a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/Model200Response.java
+++ b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/Model200Response.java
@@ -47,7 +47,7 @@ public class Model200Response {
    * Get name
    * @return name
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Integer getName() {
     return name;
@@ -66,7 +66,7 @@ public class Model200Response {
    * Get propertyClass
    * @return propertyClass
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getPropertyClass() {
     return propertyClass;
diff --git a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/ModelApiResponse.java b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/ModelApiResponse.java
index 777b1a8a7c..84d2fcc4d3 100644
--- a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/ModelApiResponse.java
+++ b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/ModelApiResponse.java
@@ -50,7 +50,7 @@ public class ModelApiResponse {
    * Get code
    * @return code
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Integer getCode() {
     return code;
@@ -69,7 +69,7 @@ public class ModelApiResponse {
    * Get type
    * @return type
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getType() {
     return type;
@@ -88,7 +88,7 @@ public class ModelApiResponse {
    * Get message
    * @return message
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getMessage() {
     return message;
diff --git a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/ModelReturn.java b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/ModelReturn.java
index 225df7f4e8..c13f1babe5 100644
--- a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/ModelReturn.java
+++ b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/ModelReturn.java
@@ -43,7 +43,7 @@ public class ModelReturn {
    * Get _return
    * @return _return
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Integer getReturn() {
     return _return;
diff --git a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/Name.java b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/Name.java
index c5a5691688..221821d4e1 100644
--- a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/Name.java
+++ b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/Name.java
@@ -55,7 +55,6 @@ public class Name {
    * Get name
    * @return name
   **/
-
   @ApiModelProperty(required = true, value = "")
   public Integer getName() {
     return name;
@@ -69,7 +68,7 @@ public class Name {
    * Get snakeCase
    * @return snakeCase
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Integer getSnakeCase() {
     return snakeCase;
@@ -84,7 +83,7 @@ public class Name {
    * Get property
    * @return property
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getProperty() {
     return property;
@@ -98,7 +97,7 @@ public class Name {
    * Get _123number
    * @return _123number
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Integer get123number() {
     return _123number;
diff --git a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/NumberOnly.java b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/NumberOnly.java
index 00ffd2f67e..9a068c2e1e 100644
--- a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/NumberOnly.java
+++ b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/NumberOnly.java
@@ -43,7 +43,7 @@ public class NumberOnly {
    * Get justNumber
    * @return justNumber
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public BigDecimal getJustNumber() {
     return justNumber;
diff --git a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/Order.java b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/Order.java
index cfb3d04776..9ee41b5b8a 100644
--- a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/Order.java
+++ b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/Order.java
@@ -112,7 +112,7 @@ public class Order {
    * Get id
    * @return id
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Long getId() {
     return id;
@@ -131,7 +131,7 @@ public class Order {
    * Get petId
    * @return petId
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Long getPetId() {
     return petId;
@@ -150,7 +150,7 @@ public class Order {
    * Get quantity
    * @return quantity
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Integer getQuantity() {
     return quantity;
@@ -169,7 +169,7 @@ public class Order {
    * Get shipDate
    * @return shipDate
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public OffsetDateTime getShipDate() {
     return shipDate;
@@ -188,7 +188,7 @@ public class Order {
    * Order Status
    * @return status
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "Order Status")
   public StatusEnum getStatus() {
     return status;
@@ -207,7 +207,7 @@ public class Order {
    * Get complete
    * @return complete
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Boolean getComplete() {
     return complete;
diff --git a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/OuterComposite.java b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/OuterComposite.java
index 9e2a78d57f..690b6bde4b 100644
--- a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/OuterComposite.java
+++ b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/OuterComposite.java
@@ -51,7 +51,7 @@ public class OuterComposite {
    * Get myNumber
    * @return myNumber
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public BigDecimal getMyNumber() {
     return myNumber;
@@ -70,7 +70,7 @@ public class OuterComposite {
    * Get myString
    * @return myString
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getMyString() {
     return myString;
@@ -89,7 +89,7 @@ public class OuterComposite {
    * Get myBoolean
    * @return myBoolean
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Boolean getMyBoolean() {
     return myBoolean;
diff --git a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/Pet.java b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/Pet.java
index 5ac8165f7f..59fe8406f4 100644
--- a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/Pet.java
+++ b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/Pet.java
@@ -115,7 +115,7 @@ public class Pet {
    * Get id
    * @return id
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Long getId() {
     return id;
@@ -134,7 +134,7 @@ public class Pet {
    * Get category
    * @return category
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Category getCategory() {
     return category;
@@ -153,7 +153,6 @@ public class Pet {
    * Get name
    * @return name
   **/
-
   @ApiModelProperty(example = "doggie", required = true, value = "")
   public String getName() {
     return name;
@@ -177,7 +176,6 @@ public class Pet {
    * Get photoUrls
    * @return photoUrls
   **/
-
   @ApiModelProperty(required = true, value = "")
   public List<String> getPhotoUrls() {
     return photoUrls;
@@ -204,7 +202,7 @@ public class Pet {
    * Get tags
    * @return tags
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public List<Tag> getTags() {
     return tags;
@@ -223,7 +221,7 @@ public class Pet {
    * pet status in the store
    * @return status
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "pet status in the store")
   public StatusEnum getStatus() {
     return status;
diff --git a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/ReadOnlyFirst.java b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/ReadOnlyFirst.java
index 23ec5576c0..84780d763a 100644
--- a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/ReadOnlyFirst.java
+++ b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/ReadOnlyFirst.java
@@ -41,7 +41,7 @@ public class ReadOnlyFirst {
    * Get bar
    * @return bar
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getBar() {
     return bar;
@@ -56,7 +56,7 @@ public class ReadOnlyFirst {
    * Get baz
    * @return baz
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getBaz() {
     return baz;
diff --git a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/SpecialModelName.java b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/SpecialModelName.java
index f4a7d343a7..c6ccd2c33f 100644
--- a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/SpecialModelName.java
+++ b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/SpecialModelName.java
@@ -42,7 +42,7 @@ public class SpecialModelName {
    * Get $specialPropertyName
    * @return $specialPropertyName
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Long get$SpecialPropertyName() {
     return $specialPropertyName;
diff --git a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/Tag.java b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/Tag.java
index bce1fc934d..504c51cc3e 100644
--- a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/Tag.java
+++ b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/Tag.java
@@ -46,7 +46,7 @@ public class Tag {
    * Get id
    * @return id
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Long getId() {
     return id;
@@ -65,7 +65,7 @@ public class Tag {
    * Get name
    * @return name
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getName() {
     return name;
diff --git a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/TypeHolderDefault.java b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/TypeHolderDefault.java
index 8c7e1fa55d..8fc321bc0a 100644
--- a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/TypeHolderDefault.java
+++ b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/TypeHolderDefault.java
@@ -61,7 +61,6 @@ public class TypeHolderDefault {
    * Get stringItem
    * @return stringItem
   **/
-
   @ApiModelProperty(required = true, value = "")
   public String getStringItem() {
     return stringItem;
@@ -80,7 +79,6 @@ public class TypeHolderDefault {
    * Get numberItem
    * @return numberItem
   **/
-
   @ApiModelProperty(required = true, value = "")
   public BigDecimal getNumberItem() {
     return numberItem;
@@ -99,7 +97,6 @@ public class TypeHolderDefault {
    * Get integerItem
    * @return integerItem
   **/
-
   @ApiModelProperty(required = true, value = "")
   public Integer getIntegerItem() {
     return integerItem;
@@ -118,7 +115,6 @@ public class TypeHolderDefault {
    * Get boolItem
    * @return boolItem
   **/
-
   @ApiModelProperty(required = true, value = "")
   public Boolean getBoolItem() {
     return boolItem;
@@ -142,7 +138,6 @@ public class TypeHolderDefault {
    * Get arrayItem
    * @return arrayItem
   **/
-
   @ApiModelProperty(required = true, value = "")
   public List<Integer> getArrayItem() {
     return arrayItem;
diff --git a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/TypeHolderExample.java b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/TypeHolderExample.java
index 8315f422ea..d9496cbd79 100644
--- a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/TypeHolderExample.java
+++ b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/TypeHolderExample.java
@@ -61,7 +61,6 @@ public class TypeHolderExample {
    * Get stringItem
    * @return stringItem
   **/
-
   @ApiModelProperty(example = "what", required = true, value = "")
   public String getStringItem() {
     return stringItem;
@@ -80,7 +79,6 @@ public class TypeHolderExample {
    * Get numberItem
    * @return numberItem
   **/
-
   @ApiModelProperty(example = "1.234", required = true, value = "")
   public BigDecimal getNumberItem() {
     return numberItem;
@@ -99,7 +97,6 @@ public class TypeHolderExample {
    * Get integerItem
    * @return integerItem
   **/
-
   @ApiModelProperty(example = "-2", required = true, value = "")
   public Integer getIntegerItem() {
     return integerItem;
@@ -118,7 +115,6 @@ public class TypeHolderExample {
    * Get boolItem
    * @return boolItem
   **/
-
   @ApiModelProperty(example = "true", required = true, value = "")
   public Boolean getBoolItem() {
     return boolItem;
@@ -142,7 +138,6 @@ public class TypeHolderExample {
    * Get arrayItem
    * @return arrayItem
   **/
-
   @ApiModelProperty(example = "[0, 1, 2, 3]", required = true, value = "")
   public List<Integer> getArrayItem() {
     return arrayItem;
diff --git a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/User.java b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/User.java
index 3f9eb4bb8a..1aedd044b5 100644
--- a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/User.java
+++ b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/User.java
@@ -70,7 +70,7 @@ public class User {
    * Get id
    * @return id
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Long getId() {
     return id;
@@ -89,7 +89,7 @@ public class User {
    * Get username
    * @return username
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getUsername() {
     return username;
@@ -108,7 +108,7 @@ public class User {
    * Get firstName
    * @return firstName
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getFirstName() {
     return firstName;
@@ -127,7 +127,7 @@ public class User {
    * Get lastName
    * @return lastName
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getLastName() {
     return lastName;
@@ -146,7 +146,7 @@ public class User {
    * Get email
    * @return email
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getEmail() {
     return email;
@@ -165,7 +165,7 @@ public class User {
    * Get password
    * @return password
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getPassword() {
     return password;
@@ -184,7 +184,7 @@ public class User {
    * Get phone
    * @return phone
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getPhone() {
     return phone;
@@ -203,7 +203,7 @@ public class User {
    * User Status
    * @return userStatus
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "User Status")
   public Integer getUserStatus() {
     return userStatus;
diff --git a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/XmlItem.java b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/XmlItem.java
index 67910352a7..ea15cdba33 100644
--- a/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/XmlItem.java
+++ b/samples/client/petstore/java/retrofit2/src/main/java/org/openapitools/client/model/XmlItem.java
@@ -157,7 +157,7 @@ public class XmlItem {
    * Get attributeString
    * @return attributeString
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(example = "string", value = "")
   public String getAttributeString() {
     return attributeString;
@@ -176,7 +176,7 @@ public class XmlItem {
    * Get attributeNumber
    * @return attributeNumber
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(example = "1.234", value = "")
   public BigDecimal getAttributeNumber() {
     return attributeNumber;
@@ -195,7 +195,7 @@ public class XmlItem {
    * Get attributeInteger
    * @return attributeInteger
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(example = "-2", value = "")
   public Integer getAttributeInteger() {
     return attributeInteger;
@@ -214,7 +214,7 @@ public class XmlItem {
    * Get attributeBoolean
    * @return attributeBoolean
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(example = "true", value = "")
   public Boolean getAttributeBoolean() {
     return attributeBoolean;
@@ -241,7 +241,7 @@ public class XmlItem {
    * Get wrappedArray
    * @return wrappedArray
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public List<Integer> getWrappedArray() {
     return wrappedArray;
@@ -260,7 +260,7 @@ public class XmlItem {
    * Get nameString
    * @return nameString
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(example = "string", value = "")
   public String getNameString() {
     return nameString;
@@ -279,7 +279,7 @@ public class XmlItem {
    * Get nameNumber
    * @return nameNumber
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(example = "1.234", value = "")
   public BigDecimal getNameNumber() {
     return nameNumber;
@@ -298,7 +298,7 @@ public class XmlItem {
    * Get nameInteger
    * @return nameInteger
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(example = "-2", value = "")
   public Integer getNameInteger() {
     return nameInteger;
@@ -317,7 +317,7 @@ public class XmlItem {
    * Get nameBoolean
    * @return nameBoolean
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(example = "true", value = "")
   public Boolean getNameBoolean() {
     return nameBoolean;
@@ -344,7 +344,7 @@ public class XmlItem {
    * Get nameArray
    * @return nameArray
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public List<Integer> getNameArray() {
     return nameArray;
@@ -371,7 +371,7 @@ public class XmlItem {
    * Get nameWrappedArray
    * @return nameWrappedArray
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public List<Integer> getNameWrappedArray() {
     return nameWrappedArray;
@@ -390,7 +390,7 @@ public class XmlItem {
    * Get prefixString
    * @return prefixString
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(example = "string", value = "")
   public String getPrefixString() {
     return prefixString;
@@ -409,7 +409,7 @@ public class XmlItem {
    * Get prefixNumber
    * @return prefixNumber
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(example = "1.234", value = "")
   public BigDecimal getPrefixNumber() {
     return prefixNumber;
@@ -428,7 +428,7 @@ public class XmlItem {
    * Get prefixInteger
    * @return prefixInteger
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(example = "-2", value = "")
   public Integer getPrefixInteger() {
     return prefixInteger;
@@ -447,7 +447,7 @@ public class XmlItem {
    * Get prefixBoolean
    * @return prefixBoolean
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(example = "true", value = "")
   public Boolean getPrefixBoolean() {
     return prefixBoolean;
@@ -474,7 +474,7 @@ public class XmlItem {
    * Get prefixArray
    * @return prefixArray
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public List<Integer> getPrefixArray() {
     return prefixArray;
@@ -501,7 +501,7 @@ public class XmlItem {
    * Get prefixWrappedArray
    * @return prefixWrappedArray
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public List<Integer> getPrefixWrappedArray() {
     return prefixWrappedArray;
@@ -520,7 +520,7 @@ public class XmlItem {
    * Get namespaceString
    * @return namespaceString
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(example = "string", value = "")
   public String getNamespaceString() {
     return namespaceString;
@@ -539,7 +539,7 @@ public class XmlItem {
    * Get namespaceNumber
    * @return namespaceNumber
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(example = "1.234", value = "")
   public BigDecimal getNamespaceNumber() {
     return namespaceNumber;
@@ -558,7 +558,7 @@ public class XmlItem {
    * Get namespaceInteger
    * @return namespaceInteger
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(example = "-2", value = "")
   public Integer getNamespaceInteger() {
     return namespaceInteger;
@@ -577,7 +577,7 @@ public class XmlItem {
    * Get namespaceBoolean
    * @return namespaceBoolean
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(example = "true", value = "")
   public Boolean getNamespaceBoolean() {
     return namespaceBoolean;
@@ -604,7 +604,7 @@ public class XmlItem {
    * Get namespaceArray
    * @return namespaceArray
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public List<Integer> getNamespaceArray() {
     return namespaceArray;
@@ -631,7 +631,7 @@ public class XmlItem {
    * Get namespaceWrappedArray
    * @return namespaceWrappedArray
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public List<Integer> getNamespaceWrappedArray() {
     return namespaceWrappedArray;
@@ -650,7 +650,7 @@ public class XmlItem {
    * Get prefixNsString
    * @return prefixNsString
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(example = "string", value = "")
   public String getPrefixNsString() {
     return prefixNsString;
@@ -669,7 +669,7 @@ public class XmlItem {
    * Get prefixNsNumber
    * @return prefixNsNumber
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(example = "1.234", value = "")
   public BigDecimal getPrefixNsNumber() {
     return prefixNsNumber;
@@ -688,7 +688,7 @@ public class XmlItem {
    * Get prefixNsInteger
    * @return prefixNsInteger
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(example = "-2", value = "")
   public Integer getPrefixNsInteger() {
     return prefixNsInteger;
@@ -707,7 +707,7 @@ public class XmlItem {
    * Get prefixNsBoolean
    * @return prefixNsBoolean
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(example = "true", value = "")
   public Boolean getPrefixNsBoolean() {
     return prefixNsBoolean;
@@ -734,7 +734,7 @@ public class XmlItem {
    * Get prefixNsArray
    * @return prefixNsArray
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public List<Integer> getPrefixNsArray() {
     return prefixNsArray;
@@ -761,7 +761,7 @@ public class XmlItem {
    * Get prefixNsWrappedArray
    * @return prefixNsWrappedArray
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public List<Integer> getPrefixNsWrappedArray() {
     return prefixNsWrappedArray;
diff --git a/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/model/AdditionalPropertiesAnyType.java b/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/model/AdditionalPropertiesAnyType.java
index e98f74f8ae..6639252ccb 100644
--- a/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/model/AdditionalPropertiesAnyType.java
+++ b/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/model/AdditionalPropertiesAnyType.java
@@ -44,7 +44,7 @@ public class AdditionalPropertiesAnyType extends HashMap<String, Object> {
    * Get name
    * @return name
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getName() {
     return name;
diff --git a/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/model/AdditionalPropertiesArray.java b/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/model/AdditionalPropertiesArray.java
index 1d86faad3e..2c3f2ca0a4 100644
--- a/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/model/AdditionalPropertiesArray.java
+++ b/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/model/AdditionalPropertiesArray.java
@@ -45,7 +45,7 @@ public class AdditionalPropertiesArray extends HashMap<String, List> {
    * Get name
    * @return name
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getName() {
     return name;
diff --git a/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/model/AdditionalPropertiesBoolean.java b/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/model/AdditionalPropertiesBoolean.java
index a3b37161da..7c4a5248c0 100644
--- a/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/model/AdditionalPropertiesBoolean.java
+++ b/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/model/AdditionalPropertiesBoolean.java
@@ -44,7 +44,7 @@ public class AdditionalPropertiesBoolean extends HashMap<String, Boolean> {
    * Get name
    * @return name
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getName() {
     return name;
diff --git a/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java b/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java
index 8819f4a024..b016f1f377 100644
--- a/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java
+++ b/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java
@@ -94,7 +94,7 @@ public class AdditionalPropertiesClass {
    * Get mapString
    * @return mapString
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Map<String, String> getMapString() {
     return mapString;
@@ -121,7 +121,7 @@ public class AdditionalPropertiesClass {
    * Get mapNumber
    * @return mapNumber
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Map<String, BigDecimal> getMapNumber() {
     return mapNumber;
@@ -148,7 +148,7 @@ public class AdditionalPropertiesClass {
    * Get mapInteger
    * @return mapInteger
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Map<String, Integer> getMapInteger() {
     return mapInteger;
@@ -175,7 +175,7 @@ public class AdditionalPropertiesClass {
    * Get mapBoolean
    * @return mapBoolean
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Map<String, Boolean> getMapBoolean() {
     return mapBoolean;
@@ -202,7 +202,7 @@ public class AdditionalPropertiesClass {
    * Get mapArrayInteger
    * @return mapArrayInteger
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Map<String, List<Integer>> getMapArrayInteger() {
     return mapArrayInteger;
@@ -229,7 +229,7 @@ public class AdditionalPropertiesClass {
    * Get mapArrayAnytype
    * @return mapArrayAnytype
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Map<String, List<Object>> getMapArrayAnytype() {
     return mapArrayAnytype;
@@ -256,7 +256,7 @@ public class AdditionalPropertiesClass {
    * Get mapMapString
    * @return mapMapString
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Map<String, Map<String, String>> getMapMapString() {
     return mapMapString;
@@ -283,7 +283,7 @@ public class AdditionalPropertiesClass {
    * Get mapMapAnytype
    * @return mapMapAnytype
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Map<String, Map<String, Object>> getMapMapAnytype() {
     return mapMapAnytype;
@@ -302,7 +302,7 @@ public class AdditionalPropertiesClass {
    * Get anytype1
    * @return anytype1
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Object getAnytype1() {
     return anytype1;
@@ -321,7 +321,7 @@ public class AdditionalPropertiesClass {
    * Get anytype2
    * @return anytype2
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Object getAnytype2() {
     return anytype2;
@@ -340,7 +340,7 @@ public class AdditionalPropertiesClass {
    * Get anytype3
    * @return anytype3
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Object getAnytype3() {
     return anytype3;
diff --git a/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/model/AdditionalPropertiesInteger.java b/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/model/AdditionalPropertiesInteger.java
index b8f956cbed..10df3df74c 100644
--- a/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/model/AdditionalPropertiesInteger.java
+++ b/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/model/AdditionalPropertiesInteger.java
@@ -44,7 +44,7 @@ public class AdditionalPropertiesInteger extends HashMap<String, Integer> {
    * Get name
    * @return name
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getName() {
     return name;
diff --git a/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/model/AdditionalPropertiesNumber.java b/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/model/AdditionalPropertiesNumber.java
index 03d923ab1d..33719cab26 100644
--- a/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/model/AdditionalPropertiesNumber.java
+++ b/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/model/AdditionalPropertiesNumber.java
@@ -45,7 +45,7 @@ public class AdditionalPropertiesNumber extends HashMap<String, BigDecimal> {
    * Get name
    * @return name
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getName() {
     return name;
diff --git a/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/model/AdditionalPropertiesObject.java b/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/model/AdditionalPropertiesObject.java
index c0e696dbd5..e37e04b01a 100644
--- a/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/model/AdditionalPropertiesObject.java
+++ b/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/model/AdditionalPropertiesObject.java
@@ -44,7 +44,7 @@ public class AdditionalPropertiesObject extends HashMap<String, Map> {
    * Get name
    * @return name
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getName() {
     return name;
diff --git a/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/model/AdditionalPropertiesString.java b/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/model/AdditionalPropertiesString.java
index 67e597e3cf..cfbf74f5b3 100644
--- a/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/model/AdditionalPropertiesString.java
+++ b/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/model/AdditionalPropertiesString.java
@@ -44,7 +44,7 @@ public class AdditionalPropertiesString extends HashMap<String, String> {
    * Get name
    * @return name
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getName() {
     return name;
diff --git a/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/model/Animal.java b/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/model/Animal.java
index 1738bdaf47..0a02419dbf 100644
--- a/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/model/Animal.java
+++ b/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/model/Animal.java
@@ -50,7 +50,6 @@ public class Animal {
    * Get className
    * @return className
   **/
-
   @ApiModelProperty(required = true, value = "")
   public String getClassName() {
     return className;
@@ -69,7 +68,7 @@ public class Animal {
    * Get color
    * @return color
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getColor() {
     return color;
diff --git a/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java b/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java
index 69c0cacb05..4f016503d4 100644
--- a/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java
+++ b/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java
@@ -53,7 +53,7 @@ public class ArrayOfArrayOfNumberOnly {
    * Get arrayArrayNumber
    * @return arrayArrayNumber
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public List<List<BigDecimal>> getArrayArrayNumber() {
     return arrayArrayNumber;
diff --git a/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java b/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java
index a85aa96af7..15d27a21f2 100644
--- a/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java
+++ b/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java
@@ -53,7 +53,7 @@ public class ArrayOfNumberOnly {
    * Get arrayNumber
    * @return arrayNumber
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public List<BigDecimal> getArrayNumber() {
     return arrayNumber;
diff --git a/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/model/ArrayTest.java b/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/model/ArrayTest.java
index 986ac5aa17..7f6d476044 100644
--- a/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/model/ArrayTest.java
+++ b/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/model/ArrayTest.java
@@ -61,7 +61,7 @@ public class ArrayTest {
    * Get arrayOfString
    * @return arrayOfString
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public List<String> getArrayOfString() {
     return arrayOfString;
@@ -88,7 +88,7 @@ public class ArrayTest {
    * Get arrayArrayOfInteger
    * @return arrayArrayOfInteger
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public List<List<Long>> getArrayArrayOfInteger() {
     return arrayArrayOfInteger;
@@ -115,7 +115,7 @@ public class ArrayTest {
    * Get arrayArrayOfModel
    * @return arrayArrayOfModel
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public List<List<ReadOnlyFirst>> getArrayArrayOfModel() {
     return arrayArrayOfModel;
diff --git a/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/model/Capitalization.java b/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/model/Capitalization.java
index 36f8853e1c..ef40fe949f 100644
--- a/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/model/Capitalization.java
+++ b/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/model/Capitalization.java
@@ -62,7 +62,7 @@ public class Capitalization {
    * Get smallCamel
    * @return smallCamel
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getSmallCamel() {
     return smallCamel;
@@ -81,7 +81,7 @@ public class Capitalization {
    * Get capitalCamel
    * @return capitalCamel
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getCapitalCamel() {
     return capitalCamel;
@@ -100,7 +100,7 @@ public class Capitalization {
    * Get smallSnake
    * @return smallSnake
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getSmallSnake() {
     return smallSnake;
@@ -119,7 +119,7 @@ public class Capitalization {
    * Get capitalSnake
    * @return capitalSnake
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getCapitalSnake() {
     return capitalSnake;
@@ -138,7 +138,7 @@ public class Capitalization {
    * Get scAETHFlowPoints
    * @return scAETHFlowPoints
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getScAETHFlowPoints() {
     return scAETHFlowPoints;
@@ -157,7 +157,7 @@ public class Capitalization {
    * Name of the pet 
    * @return ATT_NAME
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "Name of the pet ")
   public String getATTNAME() {
     return ATT_NAME;
diff --git a/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/model/Cat.java b/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/model/Cat.java
index 965461a8be..c600502f71 100644
--- a/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/model/Cat.java
+++ b/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/model/Cat.java
@@ -44,7 +44,7 @@ public class Cat extends Animal {
    * Get declawed
    * @return declawed
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Boolean getDeclawed() {
     return declawed;
diff --git a/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/model/CatAllOf.java b/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/model/CatAllOf.java
index 124db9b8ba..29b3658551 100644
--- a/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/model/CatAllOf.java
+++ b/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/model/CatAllOf.java
@@ -42,7 +42,7 @@ public class CatAllOf {
    * Get declawed
    * @return declawed
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Boolean getDeclawed() {
     return declawed;
diff --git a/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/model/Category.java b/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/model/Category.java
index d4e121847a..1968763722 100644
--- a/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/model/Category.java
+++ b/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/model/Category.java
@@ -46,7 +46,7 @@ public class Category {
    * Get id
    * @return id
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Long getId() {
     return id;
@@ -65,7 +65,6 @@ public class Category {
    * Get name
    * @return name
   **/
-
   @ApiModelProperty(required = true, value = "")
   public String getName() {
     return name;
diff --git a/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/model/ClassModel.java b/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/model/ClassModel.java
index cbdd8f317b..52245d7050 100644
--- a/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/model/ClassModel.java
+++ b/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/model/ClassModel.java
@@ -43,7 +43,7 @@ public class ClassModel {
    * Get propertyClass
    * @return propertyClass
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getPropertyClass() {
     return propertyClass;
diff --git a/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/model/Client.java b/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/model/Client.java
index 5d9c5c4a71..e5ece3536d 100644
--- a/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/model/Client.java
+++ b/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/model/Client.java
@@ -42,7 +42,7 @@ public class Client {
    * Get client
    * @return client
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getClient() {
     return client;
diff --git a/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/model/Dog.java b/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/model/Dog.java
index 4da9ba4364..d877eb2f37 100644
--- a/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/model/Dog.java
+++ b/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/model/Dog.java
@@ -44,7 +44,7 @@ public class Dog extends Animal {
    * Get breed
    * @return breed
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getBreed() {
     return breed;
diff --git a/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/model/DogAllOf.java b/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/model/DogAllOf.java
index e505d1dbc3..54483f2227 100644
--- a/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/model/DogAllOf.java
+++ b/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/model/DogAllOf.java
@@ -42,7 +42,7 @@ public class DogAllOf {
    * Get breed
    * @return breed
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getBreed() {
     return breed;
diff --git a/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/model/EnumArrays.java b/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/model/EnumArrays.java
index 8748c9fa37..a5aba01d53 100644
--- a/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/model/EnumArrays.java
+++ b/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/model/EnumArrays.java
@@ -142,7 +142,7 @@ public class EnumArrays {
    * Get justSymbol
    * @return justSymbol
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public JustSymbolEnum getJustSymbol() {
     return justSymbol;
@@ -169,7 +169,7 @@ public class EnumArrays {
    * Get arrayEnum
    * @return arrayEnum
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public List<ArrayEnumEnum> getArrayEnum() {
     return arrayEnum;
diff --git a/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/model/EnumTest.java b/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/model/EnumTest.java
index 1960c24ac2..679584204f 100644
--- a/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/model/EnumTest.java
+++ b/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/model/EnumTest.java
@@ -251,7 +251,7 @@ public class EnumTest {
    * Get enumString
    * @return enumString
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public EnumStringEnum getEnumString() {
     return enumString;
@@ -270,7 +270,6 @@ public class EnumTest {
    * Get enumStringRequired
    * @return enumStringRequired
   **/
-
   @ApiModelProperty(required = true, value = "")
   public EnumStringRequiredEnum getEnumStringRequired() {
     return enumStringRequired;
@@ -289,7 +288,7 @@ public class EnumTest {
    * Get enumInteger
    * @return enumInteger
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public EnumIntegerEnum getEnumInteger() {
     return enumInteger;
@@ -308,7 +307,7 @@ public class EnumTest {
    * Get enumNumber
    * @return enumNumber
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public EnumNumberEnum getEnumNumber() {
     return enumNumber;
@@ -327,7 +326,7 @@ public class EnumTest {
    * Get outerEnum
    * @return outerEnum
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public OuterEnum getOuterEnum() {
     return outerEnum;
diff --git a/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java b/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java
index 3c7fcaabdf..181141b92d 100644
--- a/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java
+++ b/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java
@@ -48,7 +48,7 @@ public class FileSchemaTestClass {
    * Get file
    * @return file
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public java.io.File getFile() {
     return file;
@@ -75,7 +75,7 @@ public class FileSchemaTestClass {
    * Get files
    * @return files
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public List<java.io.File> getFiles() {
     return files;
diff --git a/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/model/FormatTest.java b/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/model/FormatTest.java
index e7b28a4737..583b12a0eb 100644
--- a/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/model/FormatTest.java
+++ b/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/model/FormatTest.java
@@ -97,7 +97,7 @@ public class FormatTest {
    * maximum: 100
    * @return integer
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Integer getInteger() {
     return integer;
@@ -118,7 +118,7 @@ public class FormatTest {
    * maximum: 200
    * @return int32
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Integer getInt32() {
     return int32;
@@ -137,7 +137,7 @@ public class FormatTest {
    * Get int64
    * @return int64
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Long getInt64() {
     return int64;
@@ -158,7 +158,6 @@ public class FormatTest {
    * maximum: 543.2
    * @return number
   **/
-
   @ApiModelProperty(required = true, value = "")
   public BigDecimal getNumber() {
     return number;
@@ -179,7 +178,7 @@ public class FormatTest {
    * maximum: 987.6
    * @return _float
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Float getFloat() {
     return _float;
@@ -200,7 +199,7 @@ public class FormatTest {
    * maximum: 123.4
    * @return _double
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Double getDouble() {
     return _double;
@@ -219,7 +218,7 @@ public class FormatTest {
    * Get string
    * @return string
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getString() {
     return string;
@@ -238,7 +237,6 @@ public class FormatTest {
    * Get _byte
    * @return _byte
   **/
-
   @ApiModelProperty(required = true, value = "")
   public byte[] getByte() {
     return _byte;
@@ -257,7 +255,7 @@ public class FormatTest {
    * Get binary
    * @return binary
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public File getBinary() {
     return binary;
@@ -276,7 +274,6 @@ public class FormatTest {
    * Get date
    * @return date
   **/
-
   @ApiModelProperty(required = true, value = "")
   public LocalDate getDate() {
     return date;
@@ -295,7 +292,7 @@ public class FormatTest {
    * Get dateTime
    * @return dateTime
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public OffsetDateTime getDateTime() {
     return dateTime;
@@ -314,7 +311,7 @@ public class FormatTest {
    * Get uuid
    * @return uuid
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(example = "72f98069-206d-4f12-9f12-3d1e525a8e84", value = "")
   public UUID getUuid() {
     return uuid;
@@ -333,7 +330,6 @@ public class FormatTest {
    * Get password
    * @return password
   **/
-
   @ApiModelProperty(required = true, value = "")
   public String getPassword() {
     return password;
diff --git a/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java b/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java
index 72fcaa8993..02225d278c 100644
--- a/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java
+++ b/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java
@@ -41,7 +41,7 @@ public class HasOnlyReadOnly {
    * Get bar
    * @return bar
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getBar() {
     return bar;
@@ -51,7 +51,7 @@ public class HasOnlyReadOnly {
    * Get foo
    * @return foo
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getFoo() {
     return foo;
diff --git a/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/model/MapTest.java b/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/model/MapTest.java
index 43f0d2e998..329cb4c87b 100644
--- a/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/model/MapTest.java
+++ b/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/model/MapTest.java
@@ -112,7 +112,7 @@ public class MapTest {
    * Get mapMapOfString
    * @return mapMapOfString
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Map<String, Map<String, String>> getMapMapOfString() {
     return mapMapOfString;
@@ -139,7 +139,7 @@ public class MapTest {
    * Get mapOfEnumString
    * @return mapOfEnumString
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Map<String, InnerEnum> getMapOfEnumString() {
     return mapOfEnumString;
@@ -166,7 +166,7 @@ public class MapTest {
    * Get directMap
    * @return directMap
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Map<String, Boolean> getDirectMap() {
     return directMap;
@@ -193,7 +193,7 @@ public class MapTest {
    * Get indirectMap
    * @return indirectMap
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Map<String, Boolean> getIndirectMap() {
     return indirectMap;
diff --git a/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java
index 78d80bd7f0..1826c8b064 100644
--- a/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java
+++ b/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java
@@ -56,7 +56,7 @@ public class MixedPropertiesAndAdditionalPropertiesClass {
    * Get uuid
    * @return uuid
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public UUID getUuid() {
     return uuid;
@@ -75,7 +75,7 @@ public class MixedPropertiesAndAdditionalPropertiesClass {
    * Get dateTime
    * @return dateTime
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public OffsetDateTime getDateTime() {
     return dateTime;
@@ -102,7 +102,7 @@ public class MixedPropertiesAndAdditionalPropertiesClass {
    * Get map
    * @return map
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Map<String, Animal> getMap() {
     return map;
diff --git a/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/model/Model200Response.java b/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/model/Model200Response.java
index 0c0fc9710d..3167560a9d 100644
--- a/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/model/Model200Response.java
+++ b/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/model/Model200Response.java
@@ -47,7 +47,7 @@ public class Model200Response {
    * Get name
    * @return name
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Integer getName() {
     return name;
@@ -66,7 +66,7 @@ public class Model200Response {
    * Get propertyClass
    * @return propertyClass
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getPropertyClass() {
     return propertyClass;
diff --git a/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/model/ModelApiResponse.java b/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/model/ModelApiResponse.java
index 777b1a8a7c..84d2fcc4d3 100644
--- a/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/model/ModelApiResponse.java
+++ b/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/model/ModelApiResponse.java
@@ -50,7 +50,7 @@ public class ModelApiResponse {
    * Get code
    * @return code
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Integer getCode() {
     return code;
@@ -69,7 +69,7 @@ public class ModelApiResponse {
    * Get type
    * @return type
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getType() {
     return type;
@@ -88,7 +88,7 @@ public class ModelApiResponse {
    * Get message
    * @return message
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getMessage() {
     return message;
diff --git a/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/model/ModelReturn.java b/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/model/ModelReturn.java
index 225df7f4e8..c13f1babe5 100644
--- a/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/model/ModelReturn.java
+++ b/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/model/ModelReturn.java
@@ -43,7 +43,7 @@ public class ModelReturn {
    * Get _return
    * @return _return
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Integer getReturn() {
     return _return;
diff --git a/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/model/Name.java b/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/model/Name.java
index c5a5691688..221821d4e1 100644
--- a/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/model/Name.java
+++ b/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/model/Name.java
@@ -55,7 +55,6 @@ public class Name {
    * Get name
    * @return name
   **/
-
   @ApiModelProperty(required = true, value = "")
   public Integer getName() {
     return name;
@@ -69,7 +68,7 @@ public class Name {
    * Get snakeCase
    * @return snakeCase
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Integer getSnakeCase() {
     return snakeCase;
@@ -84,7 +83,7 @@ public class Name {
    * Get property
    * @return property
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getProperty() {
     return property;
@@ -98,7 +97,7 @@ public class Name {
    * Get _123number
    * @return _123number
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Integer get123number() {
     return _123number;
diff --git a/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/model/NumberOnly.java b/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/model/NumberOnly.java
index 00ffd2f67e..9a068c2e1e 100644
--- a/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/model/NumberOnly.java
+++ b/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/model/NumberOnly.java
@@ -43,7 +43,7 @@ public class NumberOnly {
    * Get justNumber
    * @return justNumber
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public BigDecimal getJustNumber() {
     return justNumber;
diff --git a/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/model/Order.java b/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/model/Order.java
index cfb3d04776..9ee41b5b8a 100644
--- a/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/model/Order.java
+++ b/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/model/Order.java
@@ -112,7 +112,7 @@ public class Order {
    * Get id
    * @return id
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Long getId() {
     return id;
@@ -131,7 +131,7 @@ public class Order {
    * Get petId
    * @return petId
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Long getPetId() {
     return petId;
@@ -150,7 +150,7 @@ public class Order {
    * Get quantity
    * @return quantity
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Integer getQuantity() {
     return quantity;
@@ -169,7 +169,7 @@ public class Order {
    * Get shipDate
    * @return shipDate
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public OffsetDateTime getShipDate() {
     return shipDate;
@@ -188,7 +188,7 @@ public class Order {
    * Order Status
    * @return status
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "Order Status")
   public StatusEnum getStatus() {
     return status;
@@ -207,7 +207,7 @@ public class Order {
    * Get complete
    * @return complete
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Boolean getComplete() {
     return complete;
diff --git a/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/model/OuterComposite.java b/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/model/OuterComposite.java
index 9e2a78d57f..690b6bde4b 100644
--- a/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/model/OuterComposite.java
+++ b/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/model/OuterComposite.java
@@ -51,7 +51,7 @@ public class OuterComposite {
    * Get myNumber
    * @return myNumber
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public BigDecimal getMyNumber() {
     return myNumber;
@@ -70,7 +70,7 @@ public class OuterComposite {
    * Get myString
    * @return myString
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getMyString() {
     return myString;
@@ -89,7 +89,7 @@ public class OuterComposite {
    * Get myBoolean
    * @return myBoolean
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Boolean getMyBoolean() {
     return myBoolean;
diff --git a/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/model/Pet.java b/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/model/Pet.java
index 5ac8165f7f..59fe8406f4 100644
--- a/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/model/Pet.java
+++ b/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/model/Pet.java
@@ -115,7 +115,7 @@ public class Pet {
    * Get id
    * @return id
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Long getId() {
     return id;
@@ -134,7 +134,7 @@ public class Pet {
    * Get category
    * @return category
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Category getCategory() {
     return category;
@@ -153,7 +153,6 @@ public class Pet {
    * Get name
    * @return name
   **/
-
   @ApiModelProperty(example = "doggie", required = true, value = "")
   public String getName() {
     return name;
@@ -177,7 +176,6 @@ public class Pet {
    * Get photoUrls
    * @return photoUrls
   **/
-
   @ApiModelProperty(required = true, value = "")
   public List<String> getPhotoUrls() {
     return photoUrls;
@@ -204,7 +202,7 @@ public class Pet {
    * Get tags
    * @return tags
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public List<Tag> getTags() {
     return tags;
@@ -223,7 +221,7 @@ public class Pet {
    * pet status in the store
    * @return status
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "pet status in the store")
   public StatusEnum getStatus() {
     return status;
diff --git a/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/model/ReadOnlyFirst.java b/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/model/ReadOnlyFirst.java
index 23ec5576c0..84780d763a 100644
--- a/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/model/ReadOnlyFirst.java
+++ b/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/model/ReadOnlyFirst.java
@@ -41,7 +41,7 @@ public class ReadOnlyFirst {
    * Get bar
    * @return bar
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getBar() {
     return bar;
@@ -56,7 +56,7 @@ public class ReadOnlyFirst {
    * Get baz
    * @return baz
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getBaz() {
     return baz;
diff --git a/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/model/SpecialModelName.java b/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/model/SpecialModelName.java
index f4a7d343a7..c6ccd2c33f 100644
--- a/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/model/SpecialModelName.java
+++ b/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/model/SpecialModelName.java
@@ -42,7 +42,7 @@ public class SpecialModelName {
    * Get $specialPropertyName
    * @return $specialPropertyName
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Long get$SpecialPropertyName() {
     return $specialPropertyName;
diff --git a/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/model/Tag.java b/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/model/Tag.java
index bce1fc934d..504c51cc3e 100644
--- a/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/model/Tag.java
+++ b/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/model/Tag.java
@@ -46,7 +46,7 @@ public class Tag {
    * Get id
    * @return id
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Long getId() {
     return id;
@@ -65,7 +65,7 @@ public class Tag {
    * Get name
    * @return name
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getName() {
     return name;
diff --git a/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/model/TypeHolderDefault.java b/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/model/TypeHolderDefault.java
index 8c7e1fa55d..8fc321bc0a 100644
--- a/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/model/TypeHolderDefault.java
+++ b/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/model/TypeHolderDefault.java
@@ -61,7 +61,6 @@ public class TypeHolderDefault {
    * Get stringItem
    * @return stringItem
   **/
-
   @ApiModelProperty(required = true, value = "")
   public String getStringItem() {
     return stringItem;
@@ -80,7 +79,6 @@ public class TypeHolderDefault {
    * Get numberItem
    * @return numberItem
   **/
-
   @ApiModelProperty(required = true, value = "")
   public BigDecimal getNumberItem() {
     return numberItem;
@@ -99,7 +97,6 @@ public class TypeHolderDefault {
    * Get integerItem
    * @return integerItem
   **/
-
   @ApiModelProperty(required = true, value = "")
   public Integer getIntegerItem() {
     return integerItem;
@@ -118,7 +115,6 @@ public class TypeHolderDefault {
    * Get boolItem
    * @return boolItem
   **/
-
   @ApiModelProperty(required = true, value = "")
   public Boolean getBoolItem() {
     return boolItem;
@@ -142,7 +138,6 @@ public class TypeHolderDefault {
    * Get arrayItem
    * @return arrayItem
   **/
-
   @ApiModelProperty(required = true, value = "")
   public List<Integer> getArrayItem() {
     return arrayItem;
diff --git a/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/model/TypeHolderExample.java b/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/model/TypeHolderExample.java
index 8315f422ea..d9496cbd79 100644
--- a/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/model/TypeHolderExample.java
+++ b/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/model/TypeHolderExample.java
@@ -61,7 +61,6 @@ public class TypeHolderExample {
    * Get stringItem
    * @return stringItem
   **/
-
   @ApiModelProperty(example = "what", required = true, value = "")
   public String getStringItem() {
     return stringItem;
@@ -80,7 +79,6 @@ public class TypeHolderExample {
    * Get numberItem
    * @return numberItem
   **/
-
   @ApiModelProperty(example = "1.234", required = true, value = "")
   public BigDecimal getNumberItem() {
     return numberItem;
@@ -99,7 +97,6 @@ public class TypeHolderExample {
    * Get integerItem
    * @return integerItem
   **/
-
   @ApiModelProperty(example = "-2", required = true, value = "")
   public Integer getIntegerItem() {
     return integerItem;
@@ -118,7 +115,6 @@ public class TypeHolderExample {
    * Get boolItem
    * @return boolItem
   **/
-
   @ApiModelProperty(example = "true", required = true, value = "")
   public Boolean getBoolItem() {
     return boolItem;
@@ -142,7 +138,6 @@ public class TypeHolderExample {
    * Get arrayItem
    * @return arrayItem
   **/
-
   @ApiModelProperty(example = "[0, 1, 2, 3]", required = true, value = "")
   public List<Integer> getArrayItem() {
     return arrayItem;
diff --git a/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/model/User.java b/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/model/User.java
index 3f9eb4bb8a..1aedd044b5 100644
--- a/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/model/User.java
+++ b/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/model/User.java
@@ -70,7 +70,7 @@ public class User {
    * Get id
    * @return id
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Long getId() {
     return id;
@@ -89,7 +89,7 @@ public class User {
    * Get username
    * @return username
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getUsername() {
     return username;
@@ -108,7 +108,7 @@ public class User {
    * Get firstName
    * @return firstName
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getFirstName() {
     return firstName;
@@ -127,7 +127,7 @@ public class User {
    * Get lastName
    * @return lastName
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getLastName() {
     return lastName;
@@ -146,7 +146,7 @@ public class User {
    * Get email
    * @return email
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getEmail() {
     return email;
@@ -165,7 +165,7 @@ public class User {
    * Get password
    * @return password
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getPassword() {
     return password;
@@ -184,7 +184,7 @@ public class User {
    * Get phone
    * @return phone
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getPhone() {
     return phone;
@@ -203,7 +203,7 @@ public class User {
    * User Status
    * @return userStatus
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "User Status")
   public Integer getUserStatus() {
     return userStatus;
diff --git a/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/model/XmlItem.java b/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/model/XmlItem.java
index 67910352a7..ea15cdba33 100644
--- a/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/model/XmlItem.java
+++ b/samples/client/petstore/java/retrofit2rx/src/main/java/org/openapitools/client/model/XmlItem.java
@@ -157,7 +157,7 @@ public class XmlItem {
    * Get attributeString
    * @return attributeString
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(example = "string", value = "")
   public String getAttributeString() {
     return attributeString;
@@ -176,7 +176,7 @@ public class XmlItem {
    * Get attributeNumber
    * @return attributeNumber
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(example = "1.234", value = "")
   public BigDecimal getAttributeNumber() {
     return attributeNumber;
@@ -195,7 +195,7 @@ public class XmlItem {
    * Get attributeInteger
    * @return attributeInteger
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(example = "-2", value = "")
   public Integer getAttributeInteger() {
     return attributeInteger;
@@ -214,7 +214,7 @@ public class XmlItem {
    * Get attributeBoolean
    * @return attributeBoolean
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(example = "true", value = "")
   public Boolean getAttributeBoolean() {
     return attributeBoolean;
@@ -241,7 +241,7 @@ public class XmlItem {
    * Get wrappedArray
    * @return wrappedArray
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public List<Integer> getWrappedArray() {
     return wrappedArray;
@@ -260,7 +260,7 @@ public class XmlItem {
    * Get nameString
    * @return nameString
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(example = "string", value = "")
   public String getNameString() {
     return nameString;
@@ -279,7 +279,7 @@ public class XmlItem {
    * Get nameNumber
    * @return nameNumber
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(example = "1.234", value = "")
   public BigDecimal getNameNumber() {
     return nameNumber;
@@ -298,7 +298,7 @@ public class XmlItem {
    * Get nameInteger
    * @return nameInteger
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(example = "-2", value = "")
   public Integer getNameInteger() {
     return nameInteger;
@@ -317,7 +317,7 @@ public class XmlItem {
    * Get nameBoolean
    * @return nameBoolean
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(example = "true", value = "")
   public Boolean getNameBoolean() {
     return nameBoolean;
@@ -344,7 +344,7 @@ public class XmlItem {
    * Get nameArray
    * @return nameArray
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public List<Integer> getNameArray() {
     return nameArray;
@@ -371,7 +371,7 @@ public class XmlItem {
    * Get nameWrappedArray
    * @return nameWrappedArray
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public List<Integer> getNameWrappedArray() {
     return nameWrappedArray;
@@ -390,7 +390,7 @@ public class XmlItem {
    * Get prefixString
    * @return prefixString
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(example = "string", value = "")
   public String getPrefixString() {
     return prefixString;
@@ -409,7 +409,7 @@ public class XmlItem {
    * Get prefixNumber
    * @return prefixNumber
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(example = "1.234", value = "")
   public BigDecimal getPrefixNumber() {
     return prefixNumber;
@@ -428,7 +428,7 @@ public class XmlItem {
    * Get prefixInteger
    * @return prefixInteger
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(example = "-2", value = "")
   public Integer getPrefixInteger() {
     return prefixInteger;
@@ -447,7 +447,7 @@ public class XmlItem {
    * Get prefixBoolean
    * @return prefixBoolean
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(example = "true", value = "")
   public Boolean getPrefixBoolean() {
     return prefixBoolean;
@@ -474,7 +474,7 @@ public class XmlItem {
    * Get prefixArray
    * @return prefixArray
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public List<Integer> getPrefixArray() {
     return prefixArray;
@@ -501,7 +501,7 @@ public class XmlItem {
    * Get prefixWrappedArray
    * @return prefixWrappedArray
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public List<Integer> getPrefixWrappedArray() {
     return prefixWrappedArray;
@@ -520,7 +520,7 @@ public class XmlItem {
    * Get namespaceString
    * @return namespaceString
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(example = "string", value = "")
   public String getNamespaceString() {
     return namespaceString;
@@ -539,7 +539,7 @@ public class XmlItem {
    * Get namespaceNumber
    * @return namespaceNumber
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(example = "1.234", value = "")
   public BigDecimal getNamespaceNumber() {
     return namespaceNumber;
@@ -558,7 +558,7 @@ public class XmlItem {
    * Get namespaceInteger
    * @return namespaceInteger
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(example = "-2", value = "")
   public Integer getNamespaceInteger() {
     return namespaceInteger;
@@ -577,7 +577,7 @@ public class XmlItem {
    * Get namespaceBoolean
    * @return namespaceBoolean
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(example = "true", value = "")
   public Boolean getNamespaceBoolean() {
     return namespaceBoolean;
@@ -604,7 +604,7 @@ public class XmlItem {
    * Get namespaceArray
    * @return namespaceArray
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public List<Integer> getNamespaceArray() {
     return namespaceArray;
@@ -631,7 +631,7 @@ public class XmlItem {
    * Get namespaceWrappedArray
    * @return namespaceWrappedArray
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public List<Integer> getNamespaceWrappedArray() {
     return namespaceWrappedArray;
@@ -650,7 +650,7 @@ public class XmlItem {
    * Get prefixNsString
    * @return prefixNsString
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(example = "string", value = "")
   public String getPrefixNsString() {
     return prefixNsString;
@@ -669,7 +669,7 @@ public class XmlItem {
    * Get prefixNsNumber
    * @return prefixNsNumber
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(example = "1.234", value = "")
   public BigDecimal getPrefixNsNumber() {
     return prefixNsNumber;
@@ -688,7 +688,7 @@ public class XmlItem {
    * Get prefixNsInteger
    * @return prefixNsInteger
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(example = "-2", value = "")
   public Integer getPrefixNsInteger() {
     return prefixNsInteger;
@@ -707,7 +707,7 @@ public class XmlItem {
    * Get prefixNsBoolean
    * @return prefixNsBoolean
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(example = "true", value = "")
   public Boolean getPrefixNsBoolean() {
     return prefixNsBoolean;
@@ -734,7 +734,7 @@ public class XmlItem {
    * Get prefixNsArray
    * @return prefixNsArray
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public List<Integer> getPrefixNsArray() {
     return prefixNsArray;
@@ -761,7 +761,7 @@ public class XmlItem {
    * Get prefixNsWrappedArray
    * @return prefixNsWrappedArray
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public List<Integer> getPrefixNsWrappedArray() {
     return prefixNsWrappedArray;
diff --git a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/AdditionalPropertiesAnyType.java b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/AdditionalPropertiesAnyType.java
index e98f74f8ae..6639252ccb 100644
--- a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/AdditionalPropertiesAnyType.java
+++ b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/AdditionalPropertiesAnyType.java
@@ -44,7 +44,7 @@ public class AdditionalPropertiesAnyType extends HashMap<String, Object> {
    * Get name
    * @return name
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getName() {
     return name;
diff --git a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/AdditionalPropertiesArray.java b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/AdditionalPropertiesArray.java
index 1d86faad3e..2c3f2ca0a4 100644
--- a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/AdditionalPropertiesArray.java
+++ b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/AdditionalPropertiesArray.java
@@ -45,7 +45,7 @@ public class AdditionalPropertiesArray extends HashMap<String, List> {
    * Get name
    * @return name
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getName() {
     return name;
diff --git a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/AdditionalPropertiesBoolean.java b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/AdditionalPropertiesBoolean.java
index a3b37161da..7c4a5248c0 100644
--- a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/AdditionalPropertiesBoolean.java
+++ b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/AdditionalPropertiesBoolean.java
@@ -44,7 +44,7 @@ public class AdditionalPropertiesBoolean extends HashMap<String, Boolean> {
    * Get name
    * @return name
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getName() {
     return name;
diff --git a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java
index 8819f4a024..b016f1f377 100644
--- a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java
+++ b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java
@@ -94,7 +94,7 @@ public class AdditionalPropertiesClass {
    * Get mapString
    * @return mapString
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Map<String, String> getMapString() {
     return mapString;
@@ -121,7 +121,7 @@ public class AdditionalPropertiesClass {
    * Get mapNumber
    * @return mapNumber
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Map<String, BigDecimal> getMapNumber() {
     return mapNumber;
@@ -148,7 +148,7 @@ public class AdditionalPropertiesClass {
    * Get mapInteger
    * @return mapInteger
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Map<String, Integer> getMapInteger() {
     return mapInteger;
@@ -175,7 +175,7 @@ public class AdditionalPropertiesClass {
    * Get mapBoolean
    * @return mapBoolean
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Map<String, Boolean> getMapBoolean() {
     return mapBoolean;
@@ -202,7 +202,7 @@ public class AdditionalPropertiesClass {
    * Get mapArrayInteger
    * @return mapArrayInteger
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Map<String, List<Integer>> getMapArrayInteger() {
     return mapArrayInteger;
@@ -229,7 +229,7 @@ public class AdditionalPropertiesClass {
    * Get mapArrayAnytype
    * @return mapArrayAnytype
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Map<String, List<Object>> getMapArrayAnytype() {
     return mapArrayAnytype;
@@ -256,7 +256,7 @@ public class AdditionalPropertiesClass {
    * Get mapMapString
    * @return mapMapString
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Map<String, Map<String, String>> getMapMapString() {
     return mapMapString;
@@ -283,7 +283,7 @@ public class AdditionalPropertiesClass {
    * Get mapMapAnytype
    * @return mapMapAnytype
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Map<String, Map<String, Object>> getMapMapAnytype() {
     return mapMapAnytype;
@@ -302,7 +302,7 @@ public class AdditionalPropertiesClass {
    * Get anytype1
    * @return anytype1
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Object getAnytype1() {
     return anytype1;
@@ -321,7 +321,7 @@ public class AdditionalPropertiesClass {
    * Get anytype2
    * @return anytype2
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Object getAnytype2() {
     return anytype2;
@@ -340,7 +340,7 @@ public class AdditionalPropertiesClass {
    * Get anytype3
    * @return anytype3
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Object getAnytype3() {
     return anytype3;
diff --git a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/AdditionalPropertiesInteger.java b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/AdditionalPropertiesInteger.java
index b8f956cbed..10df3df74c 100644
--- a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/AdditionalPropertiesInteger.java
+++ b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/AdditionalPropertiesInteger.java
@@ -44,7 +44,7 @@ public class AdditionalPropertiesInteger extends HashMap<String, Integer> {
    * Get name
    * @return name
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getName() {
     return name;
diff --git a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/AdditionalPropertiesNumber.java b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/AdditionalPropertiesNumber.java
index 03d923ab1d..33719cab26 100644
--- a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/AdditionalPropertiesNumber.java
+++ b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/AdditionalPropertiesNumber.java
@@ -45,7 +45,7 @@ public class AdditionalPropertiesNumber extends HashMap<String, BigDecimal> {
    * Get name
    * @return name
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getName() {
     return name;
diff --git a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/AdditionalPropertiesObject.java b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/AdditionalPropertiesObject.java
index c0e696dbd5..e37e04b01a 100644
--- a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/AdditionalPropertiesObject.java
+++ b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/AdditionalPropertiesObject.java
@@ -44,7 +44,7 @@ public class AdditionalPropertiesObject extends HashMap<String, Map> {
    * Get name
    * @return name
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getName() {
     return name;
diff --git a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/AdditionalPropertiesString.java b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/AdditionalPropertiesString.java
index 67e597e3cf..cfbf74f5b3 100644
--- a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/AdditionalPropertiesString.java
+++ b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/AdditionalPropertiesString.java
@@ -44,7 +44,7 @@ public class AdditionalPropertiesString extends HashMap<String, String> {
    * Get name
    * @return name
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getName() {
     return name;
diff --git a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/Animal.java b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/Animal.java
index 1738bdaf47..0a02419dbf 100644
--- a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/Animal.java
+++ b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/Animal.java
@@ -50,7 +50,6 @@ public class Animal {
    * Get className
    * @return className
   **/
-
   @ApiModelProperty(required = true, value = "")
   public String getClassName() {
     return className;
@@ -69,7 +68,7 @@ public class Animal {
    * Get color
    * @return color
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getColor() {
     return color;
diff --git a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java
index 69c0cacb05..4f016503d4 100644
--- a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java
+++ b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java
@@ -53,7 +53,7 @@ public class ArrayOfArrayOfNumberOnly {
    * Get arrayArrayNumber
    * @return arrayArrayNumber
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public List<List<BigDecimal>> getArrayArrayNumber() {
     return arrayArrayNumber;
diff --git a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java
index a85aa96af7..15d27a21f2 100644
--- a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java
+++ b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java
@@ -53,7 +53,7 @@ public class ArrayOfNumberOnly {
    * Get arrayNumber
    * @return arrayNumber
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public List<BigDecimal> getArrayNumber() {
     return arrayNumber;
diff --git a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/ArrayTest.java b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/ArrayTest.java
index 986ac5aa17..7f6d476044 100644
--- a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/ArrayTest.java
+++ b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/ArrayTest.java
@@ -61,7 +61,7 @@ public class ArrayTest {
    * Get arrayOfString
    * @return arrayOfString
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public List<String> getArrayOfString() {
     return arrayOfString;
@@ -88,7 +88,7 @@ public class ArrayTest {
    * Get arrayArrayOfInteger
    * @return arrayArrayOfInteger
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public List<List<Long>> getArrayArrayOfInteger() {
     return arrayArrayOfInteger;
@@ -115,7 +115,7 @@ public class ArrayTest {
    * Get arrayArrayOfModel
    * @return arrayArrayOfModel
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public List<List<ReadOnlyFirst>> getArrayArrayOfModel() {
     return arrayArrayOfModel;
diff --git a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/Capitalization.java b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/Capitalization.java
index 36f8853e1c..ef40fe949f 100644
--- a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/Capitalization.java
+++ b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/Capitalization.java
@@ -62,7 +62,7 @@ public class Capitalization {
    * Get smallCamel
    * @return smallCamel
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getSmallCamel() {
     return smallCamel;
@@ -81,7 +81,7 @@ public class Capitalization {
    * Get capitalCamel
    * @return capitalCamel
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getCapitalCamel() {
     return capitalCamel;
@@ -100,7 +100,7 @@ public class Capitalization {
    * Get smallSnake
    * @return smallSnake
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getSmallSnake() {
     return smallSnake;
@@ -119,7 +119,7 @@ public class Capitalization {
    * Get capitalSnake
    * @return capitalSnake
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getCapitalSnake() {
     return capitalSnake;
@@ -138,7 +138,7 @@ public class Capitalization {
    * Get scAETHFlowPoints
    * @return scAETHFlowPoints
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getScAETHFlowPoints() {
     return scAETHFlowPoints;
@@ -157,7 +157,7 @@ public class Capitalization {
    * Name of the pet 
    * @return ATT_NAME
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "Name of the pet ")
   public String getATTNAME() {
     return ATT_NAME;
diff --git a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/Cat.java b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/Cat.java
index 965461a8be..c600502f71 100644
--- a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/Cat.java
+++ b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/Cat.java
@@ -44,7 +44,7 @@ public class Cat extends Animal {
    * Get declawed
    * @return declawed
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Boolean getDeclawed() {
     return declawed;
diff --git a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/CatAllOf.java b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/CatAllOf.java
index 124db9b8ba..29b3658551 100644
--- a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/CatAllOf.java
+++ b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/CatAllOf.java
@@ -42,7 +42,7 @@ public class CatAllOf {
    * Get declawed
    * @return declawed
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Boolean getDeclawed() {
     return declawed;
diff --git a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/Category.java b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/Category.java
index d4e121847a..1968763722 100644
--- a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/Category.java
+++ b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/Category.java
@@ -46,7 +46,7 @@ public class Category {
    * Get id
    * @return id
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Long getId() {
     return id;
@@ -65,7 +65,6 @@ public class Category {
    * Get name
    * @return name
   **/
-
   @ApiModelProperty(required = true, value = "")
   public String getName() {
     return name;
diff --git a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/ClassModel.java b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/ClassModel.java
index cbdd8f317b..52245d7050 100644
--- a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/ClassModel.java
+++ b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/ClassModel.java
@@ -43,7 +43,7 @@ public class ClassModel {
    * Get propertyClass
    * @return propertyClass
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getPropertyClass() {
     return propertyClass;
diff --git a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/Client.java b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/Client.java
index 5d9c5c4a71..e5ece3536d 100644
--- a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/Client.java
+++ b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/Client.java
@@ -42,7 +42,7 @@ public class Client {
    * Get client
    * @return client
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getClient() {
     return client;
diff --git a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/Dog.java b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/Dog.java
index 4da9ba4364..d877eb2f37 100644
--- a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/Dog.java
+++ b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/Dog.java
@@ -44,7 +44,7 @@ public class Dog extends Animal {
    * Get breed
    * @return breed
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getBreed() {
     return breed;
diff --git a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/DogAllOf.java b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/DogAllOf.java
index e505d1dbc3..54483f2227 100644
--- a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/DogAllOf.java
+++ b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/DogAllOf.java
@@ -42,7 +42,7 @@ public class DogAllOf {
    * Get breed
    * @return breed
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getBreed() {
     return breed;
diff --git a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/EnumArrays.java b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/EnumArrays.java
index 8748c9fa37..a5aba01d53 100644
--- a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/EnumArrays.java
+++ b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/EnumArrays.java
@@ -142,7 +142,7 @@ public class EnumArrays {
    * Get justSymbol
    * @return justSymbol
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public JustSymbolEnum getJustSymbol() {
     return justSymbol;
@@ -169,7 +169,7 @@ public class EnumArrays {
    * Get arrayEnum
    * @return arrayEnum
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public List<ArrayEnumEnum> getArrayEnum() {
     return arrayEnum;
diff --git a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/EnumTest.java b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/EnumTest.java
index 1960c24ac2..679584204f 100644
--- a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/EnumTest.java
+++ b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/EnumTest.java
@@ -251,7 +251,7 @@ public class EnumTest {
    * Get enumString
    * @return enumString
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public EnumStringEnum getEnumString() {
     return enumString;
@@ -270,7 +270,6 @@ public class EnumTest {
    * Get enumStringRequired
    * @return enumStringRequired
   **/
-
   @ApiModelProperty(required = true, value = "")
   public EnumStringRequiredEnum getEnumStringRequired() {
     return enumStringRequired;
@@ -289,7 +288,7 @@ public class EnumTest {
    * Get enumInteger
    * @return enumInteger
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public EnumIntegerEnum getEnumInteger() {
     return enumInteger;
@@ -308,7 +307,7 @@ public class EnumTest {
    * Get enumNumber
    * @return enumNumber
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public EnumNumberEnum getEnumNumber() {
     return enumNumber;
@@ -327,7 +326,7 @@ public class EnumTest {
    * Get outerEnum
    * @return outerEnum
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public OuterEnum getOuterEnum() {
     return outerEnum;
diff --git a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java
index 3c7fcaabdf..181141b92d 100644
--- a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java
+++ b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java
@@ -48,7 +48,7 @@ public class FileSchemaTestClass {
    * Get file
    * @return file
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public java.io.File getFile() {
     return file;
@@ -75,7 +75,7 @@ public class FileSchemaTestClass {
    * Get files
    * @return files
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public List<java.io.File> getFiles() {
     return files;
diff --git a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/FormatTest.java b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/FormatTest.java
index e7b28a4737..583b12a0eb 100644
--- a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/FormatTest.java
+++ b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/FormatTest.java
@@ -97,7 +97,7 @@ public class FormatTest {
    * maximum: 100
    * @return integer
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Integer getInteger() {
     return integer;
@@ -118,7 +118,7 @@ public class FormatTest {
    * maximum: 200
    * @return int32
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Integer getInt32() {
     return int32;
@@ -137,7 +137,7 @@ public class FormatTest {
    * Get int64
    * @return int64
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Long getInt64() {
     return int64;
@@ -158,7 +158,6 @@ public class FormatTest {
    * maximum: 543.2
    * @return number
   **/
-
   @ApiModelProperty(required = true, value = "")
   public BigDecimal getNumber() {
     return number;
@@ -179,7 +178,7 @@ public class FormatTest {
    * maximum: 987.6
    * @return _float
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Float getFloat() {
     return _float;
@@ -200,7 +199,7 @@ public class FormatTest {
    * maximum: 123.4
    * @return _double
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Double getDouble() {
     return _double;
@@ -219,7 +218,7 @@ public class FormatTest {
    * Get string
    * @return string
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getString() {
     return string;
@@ -238,7 +237,6 @@ public class FormatTest {
    * Get _byte
    * @return _byte
   **/
-
   @ApiModelProperty(required = true, value = "")
   public byte[] getByte() {
     return _byte;
@@ -257,7 +255,7 @@ public class FormatTest {
    * Get binary
    * @return binary
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public File getBinary() {
     return binary;
@@ -276,7 +274,6 @@ public class FormatTest {
    * Get date
    * @return date
   **/
-
   @ApiModelProperty(required = true, value = "")
   public LocalDate getDate() {
     return date;
@@ -295,7 +292,7 @@ public class FormatTest {
    * Get dateTime
    * @return dateTime
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public OffsetDateTime getDateTime() {
     return dateTime;
@@ -314,7 +311,7 @@ public class FormatTest {
    * Get uuid
    * @return uuid
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(example = "72f98069-206d-4f12-9f12-3d1e525a8e84", value = "")
   public UUID getUuid() {
     return uuid;
@@ -333,7 +330,6 @@ public class FormatTest {
    * Get password
    * @return password
   **/
-
   @ApiModelProperty(required = true, value = "")
   public String getPassword() {
     return password;
diff --git a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java
index 72fcaa8993..02225d278c 100644
--- a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java
+++ b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java
@@ -41,7 +41,7 @@ public class HasOnlyReadOnly {
    * Get bar
    * @return bar
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getBar() {
     return bar;
@@ -51,7 +51,7 @@ public class HasOnlyReadOnly {
    * Get foo
    * @return foo
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getFoo() {
     return foo;
diff --git a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/MapTest.java b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/MapTest.java
index 43f0d2e998..329cb4c87b 100644
--- a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/MapTest.java
+++ b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/MapTest.java
@@ -112,7 +112,7 @@ public class MapTest {
    * Get mapMapOfString
    * @return mapMapOfString
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Map<String, Map<String, String>> getMapMapOfString() {
     return mapMapOfString;
@@ -139,7 +139,7 @@ public class MapTest {
    * Get mapOfEnumString
    * @return mapOfEnumString
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Map<String, InnerEnum> getMapOfEnumString() {
     return mapOfEnumString;
@@ -166,7 +166,7 @@ public class MapTest {
    * Get directMap
    * @return directMap
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Map<String, Boolean> getDirectMap() {
     return directMap;
@@ -193,7 +193,7 @@ public class MapTest {
    * Get indirectMap
    * @return indirectMap
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Map<String, Boolean> getIndirectMap() {
     return indirectMap;
diff --git a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java
index 78d80bd7f0..1826c8b064 100644
--- a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java
+++ b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java
@@ -56,7 +56,7 @@ public class MixedPropertiesAndAdditionalPropertiesClass {
    * Get uuid
    * @return uuid
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public UUID getUuid() {
     return uuid;
@@ -75,7 +75,7 @@ public class MixedPropertiesAndAdditionalPropertiesClass {
    * Get dateTime
    * @return dateTime
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public OffsetDateTime getDateTime() {
     return dateTime;
@@ -102,7 +102,7 @@ public class MixedPropertiesAndAdditionalPropertiesClass {
    * Get map
    * @return map
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Map<String, Animal> getMap() {
     return map;
diff --git a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/Model200Response.java b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/Model200Response.java
index 0c0fc9710d..3167560a9d 100644
--- a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/Model200Response.java
+++ b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/Model200Response.java
@@ -47,7 +47,7 @@ public class Model200Response {
    * Get name
    * @return name
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Integer getName() {
     return name;
@@ -66,7 +66,7 @@ public class Model200Response {
    * Get propertyClass
    * @return propertyClass
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getPropertyClass() {
     return propertyClass;
diff --git a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/ModelApiResponse.java b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/ModelApiResponse.java
index 777b1a8a7c..84d2fcc4d3 100644
--- a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/ModelApiResponse.java
+++ b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/ModelApiResponse.java
@@ -50,7 +50,7 @@ public class ModelApiResponse {
    * Get code
    * @return code
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Integer getCode() {
     return code;
@@ -69,7 +69,7 @@ public class ModelApiResponse {
    * Get type
    * @return type
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getType() {
     return type;
@@ -88,7 +88,7 @@ public class ModelApiResponse {
    * Get message
    * @return message
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getMessage() {
     return message;
diff --git a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/ModelReturn.java b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/ModelReturn.java
index 225df7f4e8..c13f1babe5 100644
--- a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/ModelReturn.java
+++ b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/ModelReturn.java
@@ -43,7 +43,7 @@ public class ModelReturn {
    * Get _return
    * @return _return
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Integer getReturn() {
     return _return;
diff --git a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/Name.java b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/Name.java
index c5a5691688..221821d4e1 100644
--- a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/Name.java
+++ b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/Name.java
@@ -55,7 +55,6 @@ public class Name {
    * Get name
    * @return name
   **/
-
   @ApiModelProperty(required = true, value = "")
   public Integer getName() {
     return name;
@@ -69,7 +68,7 @@ public class Name {
    * Get snakeCase
    * @return snakeCase
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Integer getSnakeCase() {
     return snakeCase;
@@ -84,7 +83,7 @@ public class Name {
    * Get property
    * @return property
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getProperty() {
     return property;
@@ -98,7 +97,7 @@ public class Name {
    * Get _123number
    * @return _123number
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Integer get123number() {
     return _123number;
diff --git a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/NumberOnly.java b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/NumberOnly.java
index 00ffd2f67e..9a068c2e1e 100644
--- a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/NumberOnly.java
+++ b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/NumberOnly.java
@@ -43,7 +43,7 @@ public class NumberOnly {
    * Get justNumber
    * @return justNumber
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public BigDecimal getJustNumber() {
     return justNumber;
diff --git a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/Order.java b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/Order.java
index cfb3d04776..9ee41b5b8a 100644
--- a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/Order.java
+++ b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/Order.java
@@ -112,7 +112,7 @@ public class Order {
    * Get id
    * @return id
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Long getId() {
     return id;
@@ -131,7 +131,7 @@ public class Order {
    * Get petId
    * @return petId
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Long getPetId() {
     return petId;
@@ -150,7 +150,7 @@ public class Order {
    * Get quantity
    * @return quantity
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Integer getQuantity() {
     return quantity;
@@ -169,7 +169,7 @@ public class Order {
    * Get shipDate
    * @return shipDate
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public OffsetDateTime getShipDate() {
     return shipDate;
@@ -188,7 +188,7 @@ public class Order {
    * Order Status
    * @return status
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "Order Status")
   public StatusEnum getStatus() {
     return status;
@@ -207,7 +207,7 @@ public class Order {
    * Get complete
    * @return complete
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Boolean getComplete() {
     return complete;
diff --git a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/OuterComposite.java b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/OuterComposite.java
index 9e2a78d57f..690b6bde4b 100644
--- a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/OuterComposite.java
+++ b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/OuterComposite.java
@@ -51,7 +51,7 @@ public class OuterComposite {
    * Get myNumber
    * @return myNumber
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public BigDecimal getMyNumber() {
     return myNumber;
@@ -70,7 +70,7 @@ public class OuterComposite {
    * Get myString
    * @return myString
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getMyString() {
     return myString;
@@ -89,7 +89,7 @@ public class OuterComposite {
    * Get myBoolean
    * @return myBoolean
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Boolean getMyBoolean() {
     return myBoolean;
diff --git a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/Pet.java b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/Pet.java
index 5ac8165f7f..59fe8406f4 100644
--- a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/Pet.java
+++ b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/Pet.java
@@ -115,7 +115,7 @@ public class Pet {
    * Get id
    * @return id
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Long getId() {
     return id;
@@ -134,7 +134,7 @@ public class Pet {
    * Get category
    * @return category
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Category getCategory() {
     return category;
@@ -153,7 +153,6 @@ public class Pet {
    * Get name
    * @return name
   **/
-
   @ApiModelProperty(example = "doggie", required = true, value = "")
   public String getName() {
     return name;
@@ -177,7 +176,6 @@ public class Pet {
    * Get photoUrls
    * @return photoUrls
   **/
-
   @ApiModelProperty(required = true, value = "")
   public List<String> getPhotoUrls() {
     return photoUrls;
@@ -204,7 +202,7 @@ public class Pet {
    * Get tags
    * @return tags
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public List<Tag> getTags() {
     return tags;
@@ -223,7 +221,7 @@ public class Pet {
    * pet status in the store
    * @return status
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "pet status in the store")
   public StatusEnum getStatus() {
     return status;
diff --git a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/ReadOnlyFirst.java b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/ReadOnlyFirst.java
index 23ec5576c0..84780d763a 100644
--- a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/ReadOnlyFirst.java
+++ b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/ReadOnlyFirst.java
@@ -41,7 +41,7 @@ public class ReadOnlyFirst {
    * Get bar
    * @return bar
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getBar() {
     return bar;
@@ -56,7 +56,7 @@ public class ReadOnlyFirst {
    * Get baz
    * @return baz
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getBaz() {
     return baz;
diff --git a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/SpecialModelName.java b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/SpecialModelName.java
index f4a7d343a7..c6ccd2c33f 100644
--- a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/SpecialModelName.java
+++ b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/SpecialModelName.java
@@ -42,7 +42,7 @@ public class SpecialModelName {
    * Get $specialPropertyName
    * @return $specialPropertyName
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Long get$SpecialPropertyName() {
     return $specialPropertyName;
diff --git a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/Tag.java b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/Tag.java
index bce1fc934d..504c51cc3e 100644
--- a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/Tag.java
+++ b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/Tag.java
@@ -46,7 +46,7 @@ public class Tag {
    * Get id
    * @return id
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Long getId() {
     return id;
@@ -65,7 +65,7 @@ public class Tag {
    * Get name
    * @return name
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getName() {
     return name;
diff --git a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/TypeHolderDefault.java b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/TypeHolderDefault.java
index 8c7e1fa55d..8fc321bc0a 100644
--- a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/TypeHolderDefault.java
+++ b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/TypeHolderDefault.java
@@ -61,7 +61,6 @@ public class TypeHolderDefault {
    * Get stringItem
    * @return stringItem
   **/
-
   @ApiModelProperty(required = true, value = "")
   public String getStringItem() {
     return stringItem;
@@ -80,7 +79,6 @@ public class TypeHolderDefault {
    * Get numberItem
    * @return numberItem
   **/
-
   @ApiModelProperty(required = true, value = "")
   public BigDecimal getNumberItem() {
     return numberItem;
@@ -99,7 +97,6 @@ public class TypeHolderDefault {
    * Get integerItem
    * @return integerItem
   **/
-
   @ApiModelProperty(required = true, value = "")
   public Integer getIntegerItem() {
     return integerItem;
@@ -118,7 +115,6 @@ public class TypeHolderDefault {
    * Get boolItem
    * @return boolItem
   **/
-
   @ApiModelProperty(required = true, value = "")
   public Boolean getBoolItem() {
     return boolItem;
@@ -142,7 +138,6 @@ public class TypeHolderDefault {
    * Get arrayItem
    * @return arrayItem
   **/
-
   @ApiModelProperty(required = true, value = "")
   public List<Integer> getArrayItem() {
     return arrayItem;
diff --git a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/TypeHolderExample.java b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/TypeHolderExample.java
index 8315f422ea..d9496cbd79 100644
--- a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/TypeHolderExample.java
+++ b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/TypeHolderExample.java
@@ -61,7 +61,6 @@ public class TypeHolderExample {
    * Get stringItem
    * @return stringItem
   **/
-
   @ApiModelProperty(example = "what", required = true, value = "")
   public String getStringItem() {
     return stringItem;
@@ -80,7 +79,6 @@ public class TypeHolderExample {
    * Get numberItem
    * @return numberItem
   **/
-
   @ApiModelProperty(example = "1.234", required = true, value = "")
   public BigDecimal getNumberItem() {
     return numberItem;
@@ -99,7 +97,6 @@ public class TypeHolderExample {
    * Get integerItem
    * @return integerItem
   **/
-
   @ApiModelProperty(example = "-2", required = true, value = "")
   public Integer getIntegerItem() {
     return integerItem;
@@ -118,7 +115,6 @@ public class TypeHolderExample {
    * Get boolItem
    * @return boolItem
   **/
-
   @ApiModelProperty(example = "true", required = true, value = "")
   public Boolean getBoolItem() {
     return boolItem;
@@ -142,7 +138,6 @@ public class TypeHolderExample {
    * Get arrayItem
    * @return arrayItem
   **/
-
   @ApiModelProperty(example = "[0, 1, 2, 3]", required = true, value = "")
   public List<Integer> getArrayItem() {
     return arrayItem;
diff --git a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/User.java b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/User.java
index 3f9eb4bb8a..1aedd044b5 100644
--- a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/User.java
+++ b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/User.java
@@ -70,7 +70,7 @@ public class User {
    * Get id
    * @return id
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Long getId() {
     return id;
@@ -89,7 +89,7 @@ public class User {
    * Get username
    * @return username
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getUsername() {
     return username;
@@ -108,7 +108,7 @@ public class User {
    * Get firstName
    * @return firstName
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getFirstName() {
     return firstName;
@@ -127,7 +127,7 @@ public class User {
    * Get lastName
    * @return lastName
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getLastName() {
     return lastName;
@@ -146,7 +146,7 @@ public class User {
    * Get email
    * @return email
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getEmail() {
     return email;
@@ -165,7 +165,7 @@ public class User {
    * Get password
    * @return password
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getPassword() {
     return password;
@@ -184,7 +184,7 @@ public class User {
    * Get phone
    * @return phone
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getPhone() {
     return phone;
@@ -203,7 +203,7 @@ public class User {
    * User Status
    * @return userStatus
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "User Status")
   public Integer getUserStatus() {
     return userStatus;
diff --git a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/XmlItem.java b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/XmlItem.java
index 67910352a7..ea15cdba33 100644
--- a/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/XmlItem.java
+++ b/samples/client/petstore/java/retrofit2rx2/src/main/java/org/openapitools/client/model/XmlItem.java
@@ -157,7 +157,7 @@ public class XmlItem {
    * Get attributeString
    * @return attributeString
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(example = "string", value = "")
   public String getAttributeString() {
     return attributeString;
@@ -176,7 +176,7 @@ public class XmlItem {
    * Get attributeNumber
    * @return attributeNumber
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(example = "1.234", value = "")
   public BigDecimal getAttributeNumber() {
     return attributeNumber;
@@ -195,7 +195,7 @@ public class XmlItem {
    * Get attributeInteger
    * @return attributeInteger
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(example = "-2", value = "")
   public Integer getAttributeInteger() {
     return attributeInteger;
@@ -214,7 +214,7 @@ public class XmlItem {
    * Get attributeBoolean
    * @return attributeBoolean
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(example = "true", value = "")
   public Boolean getAttributeBoolean() {
     return attributeBoolean;
@@ -241,7 +241,7 @@ public class XmlItem {
    * Get wrappedArray
    * @return wrappedArray
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public List<Integer> getWrappedArray() {
     return wrappedArray;
@@ -260,7 +260,7 @@ public class XmlItem {
    * Get nameString
    * @return nameString
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(example = "string", value = "")
   public String getNameString() {
     return nameString;
@@ -279,7 +279,7 @@ public class XmlItem {
    * Get nameNumber
    * @return nameNumber
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(example = "1.234", value = "")
   public BigDecimal getNameNumber() {
     return nameNumber;
@@ -298,7 +298,7 @@ public class XmlItem {
    * Get nameInteger
    * @return nameInteger
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(example = "-2", value = "")
   public Integer getNameInteger() {
     return nameInteger;
@@ -317,7 +317,7 @@ public class XmlItem {
    * Get nameBoolean
    * @return nameBoolean
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(example = "true", value = "")
   public Boolean getNameBoolean() {
     return nameBoolean;
@@ -344,7 +344,7 @@ public class XmlItem {
    * Get nameArray
    * @return nameArray
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public List<Integer> getNameArray() {
     return nameArray;
@@ -371,7 +371,7 @@ public class XmlItem {
    * Get nameWrappedArray
    * @return nameWrappedArray
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public List<Integer> getNameWrappedArray() {
     return nameWrappedArray;
@@ -390,7 +390,7 @@ public class XmlItem {
    * Get prefixString
    * @return prefixString
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(example = "string", value = "")
   public String getPrefixString() {
     return prefixString;
@@ -409,7 +409,7 @@ public class XmlItem {
    * Get prefixNumber
    * @return prefixNumber
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(example = "1.234", value = "")
   public BigDecimal getPrefixNumber() {
     return prefixNumber;
@@ -428,7 +428,7 @@ public class XmlItem {
    * Get prefixInteger
    * @return prefixInteger
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(example = "-2", value = "")
   public Integer getPrefixInteger() {
     return prefixInteger;
@@ -447,7 +447,7 @@ public class XmlItem {
    * Get prefixBoolean
    * @return prefixBoolean
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(example = "true", value = "")
   public Boolean getPrefixBoolean() {
     return prefixBoolean;
@@ -474,7 +474,7 @@ public class XmlItem {
    * Get prefixArray
    * @return prefixArray
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public List<Integer> getPrefixArray() {
     return prefixArray;
@@ -501,7 +501,7 @@ public class XmlItem {
    * Get prefixWrappedArray
    * @return prefixWrappedArray
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public List<Integer> getPrefixWrappedArray() {
     return prefixWrappedArray;
@@ -520,7 +520,7 @@ public class XmlItem {
    * Get namespaceString
    * @return namespaceString
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(example = "string", value = "")
   public String getNamespaceString() {
     return namespaceString;
@@ -539,7 +539,7 @@ public class XmlItem {
    * Get namespaceNumber
    * @return namespaceNumber
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(example = "1.234", value = "")
   public BigDecimal getNamespaceNumber() {
     return namespaceNumber;
@@ -558,7 +558,7 @@ public class XmlItem {
    * Get namespaceInteger
    * @return namespaceInteger
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(example = "-2", value = "")
   public Integer getNamespaceInteger() {
     return namespaceInteger;
@@ -577,7 +577,7 @@ public class XmlItem {
    * Get namespaceBoolean
    * @return namespaceBoolean
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(example = "true", value = "")
   public Boolean getNamespaceBoolean() {
     return namespaceBoolean;
@@ -604,7 +604,7 @@ public class XmlItem {
    * Get namespaceArray
    * @return namespaceArray
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public List<Integer> getNamespaceArray() {
     return namespaceArray;
@@ -631,7 +631,7 @@ public class XmlItem {
    * Get namespaceWrappedArray
    * @return namespaceWrappedArray
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public List<Integer> getNamespaceWrappedArray() {
     return namespaceWrappedArray;
@@ -650,7 +650,7 @@ public class XmlItem {
    * Get prefixNsString
    * @return prefixNsString
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(example = "string", value = "")
   public String getPrefixNsString() {
     return prefixNsString;
@@ -669,7 +669,7 @@ public class XmlItem {
    * Get prefixNsNumber
    * @return prefixNsNumber
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(example = "1.234", value = "")
   public BigDecimal getPrefixNsNumber() {
     return prefixNsNumber;
@@ -688,7 +688,7 @@ public class XmlItem {
    * Get prefixNsInteger
    * @return prefixNsInteger
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(example = "-2", value = "")
   public Integer getPrefixNsInteger() {
     return prefixNsInteger;
@@ -707,7 +707,7 @@ public class XmlItem {
    * Get prefixNsBoolean
    * @return prefixNsBoolean
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(example = "true", value = "")
   public Boolean getPrefixNsBoolean() {
     return prefixNsBoolean;
@@ -734,7 +734,7 @@ public class XmlItem {
    * Get prefixNsArray
    * @return prefixNsArray
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public List<Integer> getPrefixNsArray() {
     return prefixNsArray;
@@ -761,7 +761,7 @@ public class XmlItem {
    * Get prefixNsWrappedArray
    * @return prefixNsWrappedArray
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public List<Integer> getPrefixNsWrappedArray() {
     return prefixNsWrappedArray;
diff --git a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/AdditionalPropertiesAnyType.java b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/AdditionalPropertiesAnyType.java
index 1abb2d8a64..69d6a81729 100644
--- a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/AdditionalPropertiesAnyType.java
+++ b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/AdditionalPropertiesAnyType.java
@@ -40,7 +40,7 @@ public class AdditionalPropertiesAnyType extends HashMap<String, Object> {
    * Get name
    * @return name
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getName() {
     return name;
diff --git a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/AdditionalPropertiesArray.java b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/AdditionalPropertiesArray.java
index 1821c243e1..0147a592b7 100644
--- a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/AdditionalPropertiesArray.java
+++ b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/AdditionalPropertiesArray.java
@@ -41,7 +41,7 @@ public class AdditionalPropertiesArray extends HashMap<String, List> {
    * Get name
    * @return name
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getName() {
     return name;
diff --git a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/AdditionalPropertiesBoolean.java b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/AdditionalPropertiesBoolean.java
index 78f7ac79b2..89aa511c2a 100644
--- a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/AdditionalPropertiesBoolean.java
+++ b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/AdditionalPropertiesBoolean.java
@@ -40,7 +40,7 @@ public class AdditionalPropertiesBoolean extends HashMap<String, Boolean> {
    * Get name
    * @return name
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getName() {
     return name;
diff --git a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java
index fc52759bc8..ecb4e102ea 100644
--- a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java
+++ b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java
@@ -80,7 +80,7 @@ public class AdditionalPropertiesClass {
    * Get mapString
    * @return mapString
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Map<String, String> getMapString() {
     return mapString;
@@ -107,7 +107,7 @@ public class AdditionalPropertiesClass {
    * Get mapNumber
    * @return mapNumber
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Map<String, BigDecimal> getMapNumber() {
     return mapNumber;
@@ -134,7 +134,7 @@ public class AdditionalPropertiesClass {
    * Get mapInteger
    * @return mapInteger
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Map<String, Integer> getMapInteger() {
     return mapInteger;
@@ -161,7 +161,7 @@ public class AdditionalPropertiesClass {
    * Get mapBoolean
    * @return mapBoolean
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Map<String, Boolean> getMapBoolean() {
     return mapBoolean;
@@ -188,7 +188,7 @@ public class AdditionalPropertiesClass {
    * Get mapArrayInteger
    * @return mapArrayInteger
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Map<String, List<Integer>> getMapArrayInteger() {
     return mapArrayInteger;
@@ -215,7 +215,7 @@ public class AdditionalPropertiesClass {
    * Get mapArrayAnytype
    * @return mapArrayAnytype
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Map<String, List<Object>> getMapArrayAnytype() {
     return mapArrayAnytype;
@@ -242,7 +242,7 @@ public class AdditionalPropertiesClass {
    * Get mapMapString
    * @return mapMapString
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Map<String, Map<String, String>> getMapMapString() {
     return mapMapString;
@@ -269,7 +269,7 @@ public class AdditionalPropertiesClass {
    * Get mapMapAnytype
    * @return mapMapAnytype
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Map<String, Map<String, Object>> getMapMapAnytype() {
     return mapMapAnytype;
@@ -288,7 +288,7 @@ public class AdditionalPropertiesClass {
    * Get anytype1
    * @return anytype1
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Object getAnytype1() {
     return anytype1;
@@ -307,7 +307,7 @@ public class AdditionalPropertiesClass {
    * Get anytype2
    * @return anytype2
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Object getAnytype2() {
     return anytype2;
@@ -326,7 +326,7 @@ public class AdditionalPropertiesClass {
    * Get anytype3
    * @return anytype3
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Object getAnytype3() {
     return anytype3;
diff --git a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/AdditionalPropertiesInteger.java b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/AdditionalPropertiesInteger.java
index 6e5159d404..f27ff011de 100644
--- a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/AdditionalPropertiesInteger.java
+++ b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/AdditionalPropertiesInteger.java
@@ -40,7 +40,7 @@ public class AdditionalPropertiesInteger extends HashMap<String, Integer> {
    * Get name
    * @return name
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getName() {
     return name;
diff --git a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/AdditionalPropertiesNumber.java b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/AdditionalPropertiesNumber.java
index ddc8146dea..479696fdce 100644
--- a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/AdditionalPropertiesNumber.java
+++ b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/AdditionalPropertiesNumber.java
@@ -41,7 +41,7 @@ public class AdditionalPropertiesNumber extends HashMap<String, BigDecimal> {
    * Get name
    * @return name
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getName() {
     return name;
diff --git a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/AdditionalPropertiesObject.java b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/AdditionalPropertiesObject.java
index cc29400029..bd569b0da3 100644
--- a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/AdditionalPropertiesObject.java
+++ b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/AdditionalPropertiesObject.java
@@ -40,7 +40,7 @@ public class AdditionalPropertiesObject extends HashMap<String, Map> {
    * Get name
    * @return name
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getName() {
     return name;
diff --git a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/AdditionalPropertiesString.java b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/AdditionalPropertiesString.java
index fb3368dfed..27e03a2313 100644
--- a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/AdditionalPropertiesString.java
+++ b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/AdditionalPropertiesString.java
@@ -40,7 +40,7 @@ public class AdditionalPropertiesString extends HashMap<String, String> {
    * Get name
    * @return name
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getName() {
     return name;
diff --git a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/Animal.java b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/Animal.java
index 53a0eec339..dc16717ac3 100644
--- a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/Animal.java
+++ b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/Animal.java
@@ -49,7 +49,6 @@ public class Animal {
    * Get className
    * @return className
   **/
-
   @ApiModelProperty(required = true, value = "")
   public String getClassName() {
     return className;
@@ -68,7 +67,7 @@ public class Animal {
    * Get color
    * @return color
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getColor() {
     return color;
diff --git a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java
index 49b5c55250..66e9fba5d7 100644
--- a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java
+++ b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java
@@ -49,7 +49,7 @@ public class ArrayOfArrayOfNumberOnly {
    * Get arrayArrayNumber
    * @return arrayArrayNumber
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public List<List<BigDecimal>> getArrayArrayNumber() {
     return arrayArrayNumber;
diff --git a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java
index ef2555974d..9f5b467a31 100644
--- a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java
+++ b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java
@@ -49,7 +49,7 @@ public class ArrayOfNumberOnly {
    * Get arrayNumber
    * @return arrayNumber
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public List<BigDecimal> getArrayNumber() {
     return arrayNumber;
diff --git a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/ArrayTest.java b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/ArrayTest.java
index b6b98aa275..7ac6788089 100644
--- a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/ArrayTest.java
+++ b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/ArrayTest.java
@@ -55,7 +55,7 @@ public class ArrayTest {
    * Get arrayOfString
    * @return arrayOfString
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public List<String> getArrayOfString() {
     return arrayOfString;
@@ -82,7 +82,7 @@ public class ArrayTest {
    * Get arrayArrayOfInteger
    * @return arrayArrayOfInteger
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public List<List<Long>> getArrayArrayOfInteger() {
     return arrayArrayOfInteger;
@@ -109,7 +109,7 @@ public class ArrayTest {
    * Get arrayArrayOfModel
    * @return arrayArrayOfModel
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public List<List<ReadOnlyFirst>> getArrayArrayOfModel() {
     return arrayArrayOfModel;
diff --git a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/Capitalization.java b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/Capitalization.java
index bb83be97fe..3f3df29d5d 100644
--- a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/Capitalization.java
+++ b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/Capitalization.java
@@ -53,7 +53,7 @@ public class Capitalization {
    * Get smallCamel
    * @return smallCamel
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getSmallCamel() {
     return smallCamel;
@@ -72,7 +72,7 @@ public class Capitalization {
    * Get capitalCamel
    * @return capitalCamel
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getCapitalCamel() {
     return capitalCamel;
@@ -91,7 +91,7 @@ public class Capitalization {
    * Get smallSnake
    * @return smallSnake
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getSmallSnake() {
     return smallSnake;
@@ -110,7 +110,7 @@ public class Capitalization {
    * Get capitalSnake
    * @return capitalSnake
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getCapitalSnake() {
     return capitalSnake;
@@ -129,7 +129,7 @@ public class Capitalization {
    * Get scAETHFlowPoints
    * @return scAETHFlowPoints
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getScAETHFlowPoints() {
     return scAETHFlowPoints;
@@ -148,7 +148,7 @@ public class Capitalization {
    * Name of the pet 
    * @return ATT_NAME
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "Name of the pet ")
   public String getATTNAME() {
     return ATT_NAME;
diff --git a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/Cat.java b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/Cat.java
index ce456c8647..a8108d6f15 100644
--- a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/Cat.java
+++ b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/Cat.java
@@ -40,7 +40,7 @@ public class Cat extends Animal {
    * Get declawed
    * @return declawed
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Boolean getDeclawed() {
     return declawed;
diff --git a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/CatAllOf.java b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/CatAllOf.java
index 224c08671c..42e9614610 100644
--- a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/CatAllOf.java
+++ b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/CatAllOf.java
@@ -38,7 +38,7 @@ public class CatAllOf {
    * Get declawed
    * @return declawed
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Boolean getDeclawed() {
     return declawed;
diff --git a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/Category.java b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/Category.java
index 03efdd4be8..3eccd2cd92 100644
--- a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/Category.java
+++ b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/Category.java
@@ -41,7 +41,7 @@ public class Category {
    * Get id
    * @return id
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Long getId() {
     return id;
@@ -60,7 +60,6 @@ public class Category {
    * Get name
    * @return name
   **/
-
   @ApiModelProperty(required = true, value = "")
   public String getName() {
     return name;
diff --git a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/ClassModel.java b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/ClassModel.java
index def421a670..2aaed27fff 100644
--- a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/ClassModel.java
+++ b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/ClassModel.java
@@ -39,7 +39,7 @@ public class ClassModel {
    * Get propertyClass
    * @return propertyClass
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getPropertyClass() {
     return propertyClass;
diff --git a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/Client.java b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/Client.java
index c0bd0743e5..458e812960 100644
--- a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/Client.java
+++ b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/Client.java
@@ -38,7 +38,7 @@ public class Client {
    * Get client
    * @return client
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getClient() {
     return client;
diff --git a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/Dog.java b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/Dog.java
index 6b79c59606..83f5cb0e27 100644
--- a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/Dog.java
+++ b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/Dog.java
@@ -40,7 +40,7 @@ public class Dog extends Animal {
    * Get breed
    * @return breed
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getBreed() {
     return breed;
diff --git a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/DogAllOf.java b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/DogAllOf.java
index 1a4496d8f0..d1e1402789 100644
--- a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/DogAllOf.java
+++ b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/DogAllOf.java
@@ -38,7 +38,7 @@ public class DogAllOf {
    * Get breed
    * @return breed
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getBreed() {
     return breed;
diff --git a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/EnumArrays.java b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/EnumArrays.java
index fff7f65c72..a3bd1af472 100644
--- a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/EnumArrays.java
+++ b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/EnumArrays.java
@@ -113,7 +113,7 @@ public class EnumArrays {
    * Get justSymbol
    * @return justSymbol
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public JustSymbolEnum getJustSymbol() {
     return justSymbol;
@@ -140,7 +140,7 @@ public class EnumArrays {
    * Get arrayEnum
    * @return arrayEnum
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public List<ArrayEnumEnum> getArrayEnum() {
     return arrayEnum;
diff --git a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/EnumTest.java b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/EnumTest.java
index d4b36798ee..b365a8a56f 100644
--- a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/EnumTest.java
+++ b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/EnumTest.java
@@ -195,7 +195,7 @@ public class EnumTest {
    * Get enumString
    * @return enumString
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public EnumStringEnum getEnumString() {
     return enumString;
@@ -214,7 +214,6 @@ public class EnumTest {
    * Get enumStringRequired
    * @return enumStringRequired
   **/
-
   @ApiModelProperty(required = true, value = "")
   public EnumStringRequiredEnum getEnumStringRequired() {
     return enumStringRequired;
@@ -233,7 +232,7 @@ public class EnumTest {
    * Get enumInteger
    * @return enumInteger
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public EnumIntegerEnum getEnumInteger() {
     return enumInteger;
@@ -252,7 +251,7 @@ public class EnumTest {
    * Get enumNumber
    * @return enumNumber
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public EnumNumberEnum getEnumNumber() {
     return enumNumber;
@@ -271,7 +270,7 @@ public class EnumTest {
    * Get outerEnum
    * @return outerEnum
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public OuterEnum getOuterEnum() {
     return outerEnum;
diff --git a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java
index ebbb0fb9f3..ad8cf751e1 100644
--- a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java
+++ b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java
@@ -43,7 +43,7 @@ public class FileSchemaTestClass {
    * Get file
    * @return file
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public java.io.File getFile() {
     return file;
@@ -70,7 +70,7 @@ public class FileSchemaTestClass {
    * Get files
    * @return files
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public List<java.io.File> getFiles() {
     return files;
diff --git a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/FormatTest.java b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/FormatTest.java
index 4c976d9981..b08bc944dd 100644
--- a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/FormatTest.java
+++ b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/FormatTest.java
@@ -81,7 +81,7 @@ public class FormatTest {
    * maximum: 100
    * @return integer
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Integer getInteger() {
     return integer;
@@ -102,7 +102,7 @@ public class FormatTest {
    * maximum: 200
    * @return int32
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Integer getInt32() {
     return int32;
@@ -121,7 +121,7 @@ public class FormatTest {
    * Get int64
    * @return int64
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Long getInt64() {
     return int64;
@@ -142,7 +142,6 @@ public class FormatTest {
    * maximum: 543.2
    * @return number
   **/
-
   @ApiModelProperty(required = true, value = "")
   public BigDecimal getNumber() {
     return number;
@@ -163,7 +162,7 @@ public class FormatTest {
    * maximum: 987.6
    * @return _float
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Float getFloat() {
     return _float;
@@ -184,7 +183,7 @@ public class FormatTest {
    * maximum: 123.4
    * @return _double
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Double getDouble() {
     return _double;
@@ -203,7 +202,7 @@ public class FormatTest {
    * Get string
    * @return string
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getString() {
     return string;
@@ -222,7 +221,6 @@ public class FormatTest {
    * Get _byte
    * @return _byte
   **/
-
   @ApiModelProperty(required = true, value = "")
   public byte[] getByte() {
     return _byte;
@@ -241,7 +239,7 @@ public class FormatTest {
    * Get binary
    * @return binary
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public AsyncFile getBinary() {
     return binary;
@@ -260,7 +258,6 @@ public class FormatTest {
    * Get date
    * @return date
   **/
-
   @ApiModelProperty(required = true, value = "")
   public LocalDate getDate() {
     return date;
@@ -279,7 +276,7 @@ public class FormatTest {
    * Get dateTime
    * @return dateTime
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public OffsetDateTime getDateTime() {
     return dateTime;
@@ -298,7 +295,7 @@ public class FormatTest {
    * Get uuid
    * @return uuid
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(example = "72f98069-206d-4f12-9f12-3d1e525a8e84", value = "")
   public UUID getUuid() {
     return uuid;
@@ -317,7 +314,6 @@ public class FormatTest {
    * Get password
    * @return password
   **/
-
   @ApiModelProperty(required = true, value = "")
   public String getPassword() {
     return password;
diff --git a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java
index 44159e08e8..e9453bb6cc 100644
--- a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java
+++ b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java
@@ -36,7 +36,7 @@ public class HasOnlyReadOnly {
    * Get bar
    * @return bar
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getBar() {
     return bar;
@@ -46,7 +46,7 @@ public class HasOnlyReadOnly {
    * Get foo
    * @return foo
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getFoo() {
     return foo;
diff --git a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/MapTest.java b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/MapTest.java
index 2caabbea07..b0d3e04bb6 100644
--- a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/MapTest.java
+++ b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/MapTest.java
@@ -93,7 +93,7 @@ public class MapTest {
    * Get mapMapOfString
    * @return mapMapOfString
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Map<String, Map<String, String>> getMapMapOfString() {
     return mapMapOfString;
@@ -120,7 +120,7 @@ public class MapTest {
    * Get mapOfEnumString
    * @return mapOfEnumString
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Map<String, InnerEnum> getMapOfEnumString() {
     return mapOfEnumString;
@@ -147,7 +147,7 @@ public class MapTest {
    * Get directMap
    * @return directMap
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Map<String, Boolean> getDirectMap() {
     return directMap;
@@ -174,7 +174,7 @@ public class MapTest {
    * Get indirectMap
    * @return indirectMap
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Map<String, Boolean> getIndirectMap() {
     return indirectMap;
diff --git a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java
index 8d97329c31..fed78a2162 100644
--- a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java
+++ b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java
@@ -50,7 +50,7 @@ public class MixedPropertiesAndAdditionalPropertiesClass {
    * Get uuid
    * @return uuid
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public UUID getUuid() {
     return uuid;
@@ -69,7 +69,7 @@ public class MixedPropertiesAndAdditionalPropertiesClass {
    * Get dateTime
    * @return dateTime
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public OffsetDateTime getDateTime() {
     return dateTime;
@@ -96,7 +96,7 @@ public class MixedPropertiesAndAdditionalPropertiesClass {
    * Get map
    * @return map
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Map<String, Animal> getMap() {
     return map;
diff --git a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/Model200Response.java b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/Model200Response.java
index bd3244dd57..39fabeeb6d 100644
--- a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/Model200Response.java
+++ b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/Model200Response.java
@@ -42,7 +42,7 @@ public class Model200Response {
    * Get name
    * @return name
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Integer getName() {
     return name;
@@ -61,7 +61,7 @@ public class Model200Response {
    * Get propertyClass
    * @return propertyClass
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getPropertyClass() {
     return propertyClass;
diff --git a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/ModelApiResponse.java b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/ModelApiResponse.java
index ed335cdca1..bb33412951 100644
--- a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/ModelApiResponse.java
+++ b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/ModelApiResponse.java
@@ -44,7 +44,7 @@ public class ModelApiResponse {
    * Get code
    * @return code
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Integer getCode() {
     return code;
@@ -63,7 +63,7 @@ public class ModelApiResponse {
    * Get type
    * @return type
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getType() {
     return type;
@@ -82,7 +82,7 @@ public class ModelApiResponse {
    * Get message
    * @return message
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getMessage() {
     return message;
diff --git a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/ModelReturn.java b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/ModelReturn.java
index 04c0bcd33f..9aafb13e04 100644
--- a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/ModelReturn.java
+++ b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/ModelReturn.java
@@ -39,7 +39,7 @@ public class ModelReturn {
    * Get _return
    * @return _return
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Integer getReturn() {
     return _return;
diff --git a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/Name.java b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/Name.java
index af27c6e45f..9518276dd6 100644
--- a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/Name.java
+++ b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/Name.java
@@ -48,7 +48,6 @@ public class Name {
    * Get name
    * @return name
   **/
-
   @ApiModelProperty(required = true, value = "")
   public Integer getName() {
     return name;
@@ -62,7 +61,7 @@ public class Name {
    * Get snakeCase
    * @return snakeCase
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Integer getSnakeCase() {
     return snakeCase;
@@ -77,7 +76,7 @@ public class Name {
    * Get property
    * @return property
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getProperty() {
     return property;
@@ -91,7 +90,7 @@ public class Name {
    * Get _123number
    * @return _123number
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Integer get123number() {
     return _123number;
diff --git a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/NumberOnly.java b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/NumberOnly.java
index 4e29c814cc..0245e8e210 100644
--- a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/NumberOnly.java
+++ b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/NumberOnly.java
@@ -39,7 +39,7 @@ public class NumberOnly {
    * Get justNumber
    * @return justNumber
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public BigDecimal getJustNumber() {
     return justNumber;
diff --git a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/Order.java b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/Order.java
index 1735b41d31..594c76e484 100644
--- a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/Order.java
+++ b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/Order.java
@@ -91,7 +91,7 @@ public class Order {
    * Get id
    * @return id
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Long getId() {
     return id;
@@ -110,7 +110,7 @@ public class Order {
    * Get petId
    * @return petId
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Long getPetId() {
     return petId;
@@ -129,7 +129,7 @@ public class Order {
    * Get quantity
    * @return quantity
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Integer getQuantity() {
     return quantity;
@@ -148,7 +148,7 @@ public class Order {
    * Get shipDate
    * @return shipDate
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public OffsetDateTime getShipDate() {
     return shipDate;
@@ -167,7 +167,7 @@ public class Order {
    * Order Status
    * @return status
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "Order Status")
   public StatusEnum getStatus() {
     return status;
@@ -186,7 +186,7 @@ public class Order {
    * Get complete
    * @return complete
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Boolean getComplete() {
     return complete;
diff --git a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/OuterComposite.java b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/OuterComposite.java
index f6515126a8..c8bd99011c 100644
--- a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/OuterComposite.java
+++ b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/OuterComposite.java
@@ -45,7 +45,7 @@ public class OuterComposite {
    * Get myNumber
    * @return myNumber
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public BigDecimal getMyNumber() {
     return myNumber;
@@ -64,7 +64,7 @@ public class OuterComposite {
    * Get myString
    * @return myString
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getMyString() {
     return myString;
@@ -83,7 +83,7 @@ public class OuterComposite {
    * Get myBoolean
    * @return myBoolean
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Boolean getMyBoolean() {
     return myBoolean;
diff --git a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/Pet.java b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/Pet.java
index ace85c42aa..08f3773756 100644
--- a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/Pet.java
+++ b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/Pet.java
@@ -94,7 +94,7 @@ public class Pet {
    * Get id
    * @return id
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Long getId() {
     return id;
@@ -113,7 +113,7 @@ public class Pet {
    * Get category
    * @return category
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Category getCategory() {
     return category;
@@ -132,7 +132,6 @@ public class Pet {
    * Get name
    * @return name
   **/
-
   @ApiModelProperty(example = "doggie", required = true, value = "")
   public String getName() {
     return name;
@@ -156,7 +155,6 @@ public class Pet {
    * Get photoUrls
    * @return photoUrls
   **/
-
   @ApiModelProperty(required = true, value = "")
   public List<String> getPhotoUrls() {
     return photoUrls;
@@ -183,7 +181,7 @@ public class Pet {
    * Get tags
    * @return tags
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public List<Tag> getTags() {
     return tags;
@@ -202,7 +200,7 @@ public class Pet {
    * pet status in the store
    * @return status
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "pet status in the store")
   public StatusEnum getStatus() {
     return status;
diff --git a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/ReadOnlyFirst.java b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/ReadOnlyFirst.java
index a2c9e99699..1379ee09ea 100644
--- a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/ReadOnlyFirst.java
+++ b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/ReadOnlyFirst.java
@@ -36,7 +36,7 @@ public class ReadOnlyFirst {
    * Get bar
    * @return bar
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getBar() {
     return bar;
@@ -51,7 +51,7 @@ public class ReadOnlyFirst {
    * Get baz
    * @return baz
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getBaz() {
     return baz;
diff --git a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/SpecialModelName.java b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/SpecialModelName.java
index a5ddb0b638..869771afad 100644
--- a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/SpecialModelName.java
+++ b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/SpecialModelName.java
@@ -38,7 +38,7 @@ public class SpecialModelName {
    * Get $specialPropertyName
    * @return $specialPropertyName
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Long get$SpecialPropertyName() {
     return $specialPropertyName;
diff --git a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/Tag.java b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/Tag.java
index 8255ad8298..4bb498aff4 100644
--- a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/Tag.java
+++ b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/Tag.java
@@ -41,7 +41,7 @@ public class Tag {
    * Get id
    * @return id
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Long getId() {
     return id;
@@ -60,7 +60,7 @@ public class Tag {
    * Get name
    * @return name
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getName() {
     return name;
diff --git a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/TypeHolderDefault.java b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/TypeHolderDefault.java
index 786a681fb3..3c6488d270 100644
--- a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/TypeHolderDefault.java
+++ b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/TypeHolderDefault.java
@@ -53,7 +53,6 @@ public class TypeHolderDefault {
    * Get stringItem
    * @return stringItem
   **/
-
   @ApiModelProperty(required = true, value = "")
   public String getStringItem() {
     return stringItem;
@@ -72,7 +71,6 @@ public class TypeHolderDefault {
    * Get numberItem
    * @return numberItem
   **/
-
   @ApiModelProperty(required = true, value = "")
   public BigDecimal getNumberItem() {
     return numberItem;
@@ -91,7 +89,6 @@ public class TypeHolderDefault {
    * Get integerItem
    * @return integerItem
   **/
-
   @ApiModelProperty(required = true, value = "")
   public Integer getIntegerItem() {
     return integerItem;
@@ -110,7 +107,6 @@ public class TypeHolderDefault {
    * Get boolItem
    * @return boolItem
   **/
-
   @ApiModelProperty(required = true, value = "")
   public Boolean getBoolItem() {
     return boolItem;
@@ -134,7 +130,6 @@ public class TypeHolderDefault {
    * Get arrayItem
    * @return arrayItem
   **/
-
   @ApiModelProperty(required = true, value = "")
   public List<Integer> getArrayItem() {
     return arrayItem;
diff --git a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/TypeHolderExample.java b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/TypeHolderExample.java
index 701e4db843..812b5839aa 100644
--- a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/TypeHolderExample.java
+++ b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/TypeHolderExample.java
@@ -53,7 +53,6 @@ public class TypeHolderExample {
    * Get stringItem
    * @return stringItem
   **/
-
   @ApiModelProperty(example = "what", required = true, value = "")
   public String getStringItem() {
     return stringItem;
@@ -72,7 +71,6 @@ public class TypeHolderExample {
    * Get numberItem
    * @return numberItem
   **/
-
   @ApiModelProperty(example = "1.234", required = true, value = "")
   public BigDecimal getNumberItem() {
     return numberItem;
@@ -91,7 +89,6 @@ public class TypeHolderExample {
    * Get integerItem
    * @return integerItem
   **/
-
   @ApiModelProperty(example = "-2", required = true, value = "")
   public Integer getIntegerItem() {
     return integerItem;
@@ -110,7 +107,6 @@ public class TypeHolderExample {
    * Get boolItem
    * @return boolItem
   **/
-
   @ApiModelProperty(example = "true", required = true, value = "")
   public Boolean getBoolItem() {
     return boolItem;
@@ -134,7 +130,6 @@ public class TypeHolderExample {
    * Get arrayItem
    * @return arrayItem
   **/
-
   @ApiModelProperty(example = "[0, 1, 2, 3]", required = true, value = "")
   public List<Integer> getArrayItem() {
     return arrayItem;
diff --git a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/User.java b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/User.java
index 6e6c4ac102..73164c3ee2 100644
--- a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/User.java
+++ b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/User.java
@@ -59,7 +59,7 @@ public class User {
    * Get id
    * @return id
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Long getId() {
     return id;
@@ -78,7 +78,7 @@ public class User {
    * Get username
    * @return username
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getUsername() {
     return username;
@@ -97,7 +97,7 @@ public class User {
    * Get firstName
    * @return firstName
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getFirstName() {
     return firstName;
@@ -116,7 +116,7 @@ public class User {
    * Get lastName
    * @return lastName
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getLastName() {
     return lastName;
@@ -135,7 +135,7 @@ public class User {
    * Get email
    * @return email
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getEmail() {
     return email;
@@ -154,7 +154,7 @@ public class User {
    * Get password
    * @return password
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getPassword() {
     return password;
@@ -173,7 +173,7 @@ public class User {
    * Get phone
    * @return phone
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getPhone() {
     return phone;
@@ -192,7 +192,7 @@ public class User {
    * User Status
    * @return userStatus
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "User Status")
   public Integer getUserStatus() {
     return userStatus;
diff --git a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/XmlItem.java b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/XmlItem.java
index 2af459e5ae..aa7ff22ccd 100644
--- a/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/XmlItem.java
+++ b/samples/client/petstore/java/vertx/src/main/java/org/openapitools/client/model/XmlItem.java
@@ -125,7 +125,7 @@ public class XmlItem {
    * Get attributeString
    * @return attributeString
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(example = "string", value = "")
   public String getAttributeString() {
     return attributeString;
@@ -144,7 +144,7 @@ public class XmlItem {
    * Get attributeNumber
    * @return attributeNumber
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(example = "1.234", value = "")
   public BigDecimal getAttributeNumber() {
     return attributeNumber;
@@ -163,7 +163,7 @@ public class XmlItem {
    * Get attributeInteger
    * @return attributeInteger
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(example = "-2", value = "")
   public Integer getAttributeInteger() {
     return attributeInteger;
@@ -182,7 +182,7 @@ public class XmlItem {
    * Get attributeBoolean
    * @return attributeBoolean
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(example = "true", value = "")
   public Boolean getAttributeBoolean() {
     return attributeBoolean;
@@ -209,7 +209,7 @@ public class XmlItem {
    * Get wrappedArray
    * @return wrappedArray
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public List<Integer> getWrappedArray() {
     return wrappedArray;
@@ -228,7 +228,7 @@ public class XmlItem {
    * Get nameString
    * @return nameString
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(example = "string", value = "")
   public String getNameString() {
     return nameString;
@@ -247,7 +247,7 @@ public class XmlItem {
    * Get nameNumber
    * @return nameNumber
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(example = "1.234", value = "")
   public BigDecimal getNameNumber() {
     return nameNumber;
@@ -266,7 +266,7 @@ public class XmlItem {
    * Get nameInteger
    * @return nameInteger
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(example = "-2", value = "")
   public Integer getNameInteger() {
     return nameInteger;
@@ -285,7 +285,7 @@ public class XmlItem {
    * Get nameBoolean
    * @return nameBoolean
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(example = "true", value = "")
   public Boolean getNameBoolean() {
     return nameBoolean;
@@ -312,7 +312,7 @@ public class XmlItem {
    * Get nameArray
    * @return nameArray
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public List<Integer> getNameArray() {
     return nameArray;
@@ -339,7 +339,7 @@ public class XmlItem {
    * Get nameWrappedArray
    * @return nameWrappedArray
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public List<Integer> getNameWrappedArray() {
     return nameWrappedArray;
@@ -358,7 +358,7 @@ public class XmlItem {
    * Get prefixString
    * @return prefixString
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(example = "string", value = "")
   public String getPrefixString() {
     return prefixString;
@@ -377,7 +377,7 @@ public class XmlItem {
    * Get prefixNumber
    * @return prefixNumber
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(example = "1.234", value = "")
   public BigDecimal getPrefixNumber() {
     return prefixNumber;
@@ -396,7 +396,7 @@ public class XmlItem {
    * Get prefixInteger
    * @return prefixInteger
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(example = "-2", value = "")
   public Integer getPrefixInteger() {
     return prefixInteger;
@@ -415,7 +415,7 @@ public class XmlItem {
    * Get prefixBoolean
    * @return prefixBoolean
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(example = "true", value = "")
   public Boolean getPrefixBoolean() {
     return prefixBoolean;
@@ -442,7 +442,7 @@ public class XmlItem {
    * Get prefixArray
    * @return prefixArray
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public List<Integer> getPrefixArray() {
     return prefixArray;
@@ -469,7 +469,7 @@ public class XmlItem {
    * Get prefixWrappedArray
    * @return prefixWrappedArray
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public List<Integer> getPrefixWrappedArray() {
     return prefixWrappedArray;
@@ -488,7 +488,7 @@ public class XmlItem {
    * Get namespaceString
    * @return namespaceString
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(example = "string", value = "")
   public String getNamespaceString() {
     return namespaceString;
@@ -507,7 +507,7 @@ public class XmlItem {
    * Get namespaceNumber
    * @return namespaceNumber
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(example = "1.234", value = "")
   public BigDecimal getNamespaceNumber() {
     return namespaceNumber;
@@ -526,7 +526,7 @@ public class XmlItem {
    * Get namespaceInteger
    * @return namespaceInteger
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(example = "-2", value = "")
   public Integer getNamespaceInteger() {
     return namespaceInteger;
@@ -545,7 +545,7 @@ public class XmlItem {
    * Get namespaceBoolean
    * @return namespaceBoolean
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(example = "true", value = "")
   public Boolean getNamespaceBoolean() {
     return namespaceBoolean;
@@ -572,7 +572,7 @@ public class XmlItem {
    * Get namespaceArray
    * @return namespaceArray
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public List<Integer> getNamespaceArray() {
     return namespaceArray;
@@ -599,7 +599,7 @@ public class XmlItem {
    * Get namespaceWrappedArray
    * @return namespaceWrappedArray
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public List<Integer> getNamespaceWrappedArray() {
     return namespaceWrappedArray;
@@ -618,7 +618,7 @@ public class XmlItem {
    * Get prefixNsString
    * @return prefixNsString
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(example = "string", value = "")
   public String getPrefixNsString() {
     return prefixNsString;
@@ -637,7 +637,7 @@ public class XmlItem {
    * Get prefixNsNumber
    * @return prefixNsNumber
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(example = "1.234", value = "")
   public BigDecimal getPrefixNsNumber() {
     return prefixNsNumber;
@@ -656,7 +656,7 @@ public class XmlItem {
    * Get prefixNsInteger
    * @return prefixNsInteger
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(example = "-2", value = "")
   public Integer getPrefixNsInteger() {
     return prefixNsInteger;
@@ -675,7 +675,7 @@ public class XmlItem {
    * Get prefixNsBoolean
    * @return prefixNsBoolean
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(example = "true", value = "")
   public Boolean getPrefixNsBoolean() {
     return prefixNsBoolean;
@@ -702,7 +702,7 @@ public class XmlItem {
    * Get prefixNsArray
    * @return prefixNsArray
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public List<Integer> getPrefixNsArray() {
     return prefixNsArray;
@@ -729,7 +729,7 @@ public class XmlItem {
    * Get prefixNsWrappedArray
    * @return prefixNsWrappedArray
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public List<Integer> getPrefixNsWrappedArray() {
     return prefixNsWrappedArray;
diff --git a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/AdditionalPropertiesAnyType.java b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/AdditionalPropertiesAnyType.java
index 1abb2d8a64..69d6a81729 100644
--- a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/AdditionalPropertiesAnyType.java
+++ b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/AdditionalPropertiesAnyType.java
@@ -40,7 +40,7 @@ public class AdditionalPropertiesAnyType extends HashMap<String, Object> {
    * Get name
    * @return name
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getName() {
     return name;
diff --git a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/AdditionalPropertiesArray.java b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/AdditionalPropertiesArray.java
index 1821c243e1..0147a592b7 100644
--- a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/AdditionalPropertiesArray.java
+++ b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/AdditionalPropertiesArray.java
@@ -41,7 +41,7 @@ public class AdditionalPropertiesArray extends HashMap<String, List> {
    * Get name
    * @return name
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getName() {
     return name;
diff --git a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/AdditionalPropertiesBoolean.java b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/AdditionalPropertiesBoolean.java
index 78f7ac79b2..89aa511c2a 100644
--- a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/AdditionalPropertiesBoolean.java
+++ b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/AdditionalPropertiesBoolean.java
@@ -40,7 +40,7 @@ public class AdditionalPropertiesBoolean extends HashMap<String, Boolean> {
    * Get name
    * @return name
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getName() {
     return name;
diff --git a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java
index fc52759bc8..ecb4e102ea 100644
--- a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java
+++ b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java
@@ -80,7 +80,7 @@ public class AdditionalPropertiesClass {
    * Get mapString
    * @return mapString
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Map<String, String> getMapString() {
     return mapString;
@@ -107,7 +107,7 @@ public class AdditionalPropertiesClass {
    * Get mapNumber
    * @return mapNumber
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Map<String, BigDecimal> getMapNumber() {
     return mapNumber;
@@ -134,7 +134,7 @@ public class AdditionalPropertiesClass {
    * Get mapInteger
    * @return mapInteger
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Map<String, Integer> getMapInteger() {
     return mapInteger;
@@ -161,7 +161,7 @@ public class AdditionalPropertiesClass {
    * Get mapBoolean
    * @return mapBoolean
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Map<String, Boolean> getMapBoolean() {
     return mapBoolean;
@@ -188,7 +188,7 @@ public class AdditionalPropertiesClass {
    * Get mapArrayInteger
    * @return mapArrayInteger
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Map<String, List<Integer>> getMapArrayInteger() {
     return mapArrayInteger;
@@ -215,7 +215,7 @@ public class AdditionalPropertiesClass {
    * Get mapArrayAnytype
    * @return mapArrayAnytype
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Map<String, List<Object>> getMapArrayAnytype() {
     return mapArrayAnytype;
@@ -242,7 +242,7 @@ public class AdditionalPropertiesClass {
    * Get mapMapString
    * @return mapMapString
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Map<String, Map<String, String>> getMapMapString() {
     return mapMapString;
@@ -269,7 +269,7 @@ public class AdditionalPropertiesClass {
    * Get mapMapAnytype
    * @return mapMapAnytype
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Map<String, Map<String, Object>> getMapMapAnytype() {
     return mapMapAnytype;
@@ -288,7 +288,7 @@ public class AdditionalPropertiesClass {
    * Get anytype1
    * @return anytype1
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Object getAnytype1() {
     return anytype1;
@@ -307,7 +307,7 @@ public class AdditionalPropertiesClass {
    * Get anytype2
    * @return anytype2
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Object getAnytype2() {
     return anytype2;
@@ -326,7 +326,7 @@ public class AdditionalPropertiesClass {
    * Get anytype3
    * @return anytype3
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Object getAnytype3() {
     return anytype3;
diff --git a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/AdditionalPropertiesInteger.java b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/AdditionalPropertiesInteger.java
index 6e5159d404..f27ff011de 100644
--- a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/AdditionalPropertiesInteger.java
+++ b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/AdditionalPropertiesInteger.java
@@ -40,7 +40,7 @@ public class AdditionalPropertiesInteger extends HashMap<String, Integer> {
    * Get name
    * @return name
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getName() {
     return name;
diff --git a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/AdditionalPropertiesNumber.java b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/AdditionalPropertiesNumber.java
index ddc8146dea..479696fdce 100644
--- a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/AdditionalPropertiesNumber.java
+++ b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/AdditionalPropertiesNumber.java
@@ -41,7 +41,7 @@ public class AdditionalPropertiesNumber extends HashMap<String, BigDecimal> {
    * Get name
    * @return name
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getName() {
     return name;
diff --git a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/AdditionalPropertiesObject.java b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/AdditionalPropertiesObject.java
index cc29400029..bd569b0da3 100644
--- a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/AdditionalPropertiesObject.java
+++ b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/AdditionalPropertiesObject.java
@@ -40,7 +40,7 @@ public class AdditionalPropertiesObject extends HashMap<String, Map> {
    * Get name
    * @return name
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getName() {
     return name;
diff --git a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/AdditionalPropertiesString.java b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/AdditionalPropertiesString.java
index fb3368dfed..27e03a2313 100644
--- a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/AdditionalPropertiesString.java
+++ b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/AdditionalPropertiesString.java
@@ -40,7 +40,7 @@ public class AdditionalPropertiesString extends HashMap<String, String> {
    * Get name
    * @return name
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getName() {
     return name;
diff --git a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/Animal.java b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/Animal.java
index 53a0eec339..dc16717ac3 100644
--- a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/Animal.java
+++ b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/Animal.java
@@ -49,7 +49,6 @@ public class Animal {
    * Get className
    * @return className
   **/
-
   @ApiModelProperty(required = true, value = "")
   public String getClassName() {
     return className;
@@ -68,7 +67,7 @@ public class Animal {
    * Get color
    * @return color
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getColor() {
     return color;
diff --git a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java
index 49b5c55250..66e9fba5d7 100644
--- a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java
+++ b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java
@@ -49,7 +49,7 @@ public class ArrayOfArrayOfNumberOnly {
    * Get arrayArrayNumber
    * @return arrayArrayNumber
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public List<List<BigDecimal>> getArrayArrayNumber() {
     return arrayArrayNumber;
diff --git a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java
index ef2555974d..9f5b467a31 100644
--- a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java
+++ b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java
@@ -49,7 +49,7 @@ public class ArrayOfNumberOnly {
    * Get arrayNumber
    * @return arrayNumber
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public List<BigDecimal> getArrayNumber() {
     return arrayNumber;
diff --git a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/ArrayTest.java b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/ArrayTest.java
index b6b98aa275..7ac6788089 100644
--- a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/ArrayTest.java
+++ b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/ArrayTest.java
@@ -55,7 +55,7 @@ public class ArrayTest {
    * Get arrayOfString
    * @return arrayOfString
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public List<String> getArrayOfString() {
     return arrayOfString;
@@ -82,7 +82,7 @@ public class ArrayTest {
    * Get arrayArrayOfInteger
    * @return arrayArrayOfInteger
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public List<List<Long>> getArrayArrayOfInteger() {
     return arrayArrayOfInteger;
@@ -109,7 +109,7 @@ public class ArrayTest {
    * Get arrayArrayOfModel
    * @return arrayArrayOfModel
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public List<List<ReadOnlyFirst>> getArrayArrayOfModel() {
     return arrayArrayOfModel;
diff --git a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/Capitalization.java b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/Capitalization.java
index bb83be97fe..3f3df29d5d 100644
--- a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/Capitalization.java
+++ b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/Capitalization.java
@@ -53,7 +53,7 @@ public class Capitalization {
    * Get smallCamel
    * @return smallCamel
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getSmallCamel() {
     return smallCamel;
@@ -72,7 +72,7 @@ public class Capitalization {
    * Get capitalCamel
    * @return capitalCamel
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getCapitalCamel() {
     return capitalCamel;
@@ -91,7 +91,7 @@ public class Capitalization {
    * Get smallSnake
    * @return smallSnake
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getSmallSnake() {
     return smallSnake;
@@ -110,7 +110,7 @@ public class Capitalization {
    * Get capitalSnake
    * @return capitalSnake
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getCapitalSnake() {
     return capitalSnake;
@@ -129,7 +129,7 @@ public class Capitalization {
    * Get scAETHFlowPoints
    * @return scAETHFlowPoints
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getScAETHFlowPoints() {
     return scAETHFlowPoints;
@@ -148,7 +148,7 @@ public class Capitalization {
    * Name of the pet 
    * @return ATT_NAME
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "Name of the pet ")
   public String getATTNAME() {
     return ATT_NAME;
diff --git a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/Cat.java b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/Cat.java
index ce456c8647..a8108d6f15 100644
--- a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/Cat.java
+++ b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/Cat.java
@@ -40,7 +40,7 @@ public class Cat extends Animal {
    * Get declawed
    * @return declawed
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Boolean getDeclawed() {
     return declawed;
diff --git a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/CatAllOf.java b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/CatAllOf.java
index 224c08671c..42e9614610 100644
--- a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/CatAllOf.java
+++ b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/CatAllOf.java
@@ -38,7 +38,7 @@ public class CatAllOf {
    * Get declawed
    * @return declawed
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Boolean getDeclawed() {
     return declawed;
diff --git a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/Category.java b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/Category.java
index 03efdd4be8..3eccd2cd92 100644
--- a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/Category.java
+++ b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/Category.java
@@ -41,7 +41,7 @@ public class Category {
    * Get id
    * @return id
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Long getId() {
     return id;
@@ -60,7 +60,6 @@ public class Category {
    * Get name
    * @return name
   **/
-
   @ApiModelProperty(required = true, value = "")
   public String getName() {
     return name;
diff --git a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/ClassModel.java b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/ClassModel.java
index def421a670..2aaed27fff 100644
--- a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/ClassModel.java
+++ b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/ClassModel.java
@@ -39,7 +39,7 @@ public class ClassModel {
    * Get propertyClass
    * @return propertyClass
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getPropertyClass() {
     return propertyClass;
diff --git a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/Client.java b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/Client.java
index c0bd0743e5..458e812960 100644
--- a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/Client.java
+++ b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/Client.java
@@ -38,7 +38,7 @@ public class Client {
    * Get client
    * @return client
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getClient() {
     return client;
diff --git a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/Dog.java b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/Dog.java
index 6b79c59606..83f5cb0e27 100644
--- a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/Dog.java
+++ b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/Dog.java
@@ -40,7 +40,7 @@ public class Dog extends Animal {
    * Get breed
    * @return breed
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getBreed() {
     return breed;
diff --git a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/DogAllOf.java b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/DogAllOf.java
index 1a4496d8f0..d1e1402789 100644
--- a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/DogAllOf.java
+++ b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/DogAllOf.java
@@ -38,7 +38,7 @@ public class DogAllOf {
    * Get breed
    * @return breed
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getBreed() {
     return breed;
diff --git a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/EnumArrays.java b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/EnumArrays.java
index fff7f65c72..a3bd1af472 100644
--- a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/EnumArrays.java
+++ b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/EnumArrays.java
@@ -113,7 +113,7 @@ public class EnumArrays {
    * Get justSymbol
    * @return justSymbol
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public JustSymbolEnum getJustSymbol() {
     return justSymbol;
@@ -140,7 +140,7 @@ public class EnumArrays {
    * Get arrayEnum
    * @return arrayEnum
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public List<ArrayEnumEnum> getArrayEnum() {
     return arrayEnum;
diff --git a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/EnumTest.java b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/EnumTest.java
index d4b36798ee..b365a8a56f 100644
--- a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/EnumTest.java
+++ b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/EnumTest.java
@@ -195,7 +195,7 @@ public class EnumTest {
    * Get enumString
    * @return enumString
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public EnumStringEnum getEnumString() {
     return enumString;
@@ -214,7 +214,6 @@ public class EnumTest {
    * Get enumStringRequired
    * @return enumStringRequired
   **/
-
   @ApiModelProperty(required = true, value = "")
   public EnumStringRequiredEnum getEnumStringRequired() {
     return enumStringRequired;
@@ -233,7 +232,7 @@ public class EnumTest {
    * Get enumInteger
    * @return enumInteger
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public EnumIntegerEnum getEnumInteger() {
     return enumInteger;
@@ -252,7 +251,7 @@ public class EnumTest {
    * Get enumNumber
    * @return enumNumber
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public EnumNumberEnum getEnumNumber() {
     return enumNumber;
@@ -271,7 +270,7 @@ public class EnumTest {
    * Get outerEnum
    * @return outerEnum
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public OuterEnum getOuterEnum() {
     return outerEnum;
diff --git a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java
index ebbb0fb9f3..ad8cf751e1 100644
--- a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java
+++ b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java
@@ -43,7 +43,7 @@ public class FileSchemaTestClass {
    * Get file
    * @return file
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public java.io.File getFile() {
     return file;
@@ -70,7 +70,7 @@ public class FileSchemaTestClass {
    * Get files
    * @return files
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public List<java.io.File> getFiles() {
     return files;
diff --git a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/FormatTest.java b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/FormatTest.java
index 518432caff..8d075e26ba 100644
--- a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/FormatTest.java
+++ b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/FormatTest.java
@@ -81,7 +81,7 @@ public class FormatTest {
    * maximum: 100
    * @return integer
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Integer getInteger() {
     return integer;
@@ -102,7 +102,7 @@ public class FormatTest {
    * maximum: 200
    * @return int32
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Integer getInt32() {
     return int32;
@@ -121,7 +121,7 @@ public class FormatTest {
    * Get int64
    * @return int64
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Long getInt64() {
     return int64;
@@ -142,7 +142,6 @@ public class FormatTest {
    * maximum: 543.2
    * @return number
   **/
-
   @ApiModelProperty(required = true, value = "")
   public BigDecimal getNumber() {
     return number;
@@ -163,7 +162,7 @@ public class FormatTest {
    * maximum: 987.6
    * @return _float
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Float getFloat() {
     return _float;
@@ -184,7 +183,7 @@ public class FormatTest {
    * maximum: 123.4
    * @return _double
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Double getDouble() {
     return _double;
@@ -203,7 +202,7 @@ public class FormatTest {
    * Get string
    * @return string
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getString() {
     return string;
@@ -222,7 +221,6 @@ public class FormatTest {
    * Get _byte
    * @return _byte
   **/
-
   @ApiModelProperty(required = true, value = "")
   public byte[] getByte() {
     return _byte;
@@ -241,7 +239,7 @@ public class FormatTest {
    * Get binary
    * @return binary
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public File getBinary() {
     return binary;
@@ -260,7 +258,6 @@ public class FormatTest {
    * Get date
    * @return date
   **/
-
   @ApiModelProperty(required = true, value = "")
   public LocalDate getDate() {
     return date;
@@ -279,7 +276,7 @@ public class FormatTest {
    * Get dateTime
    * @return dateTime
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public OffsetDateTime getDateTime() {
     return dateTime;
@@ -298,7 +295,7 @@ public class FormatTest {
    * Get uuid
    * @return uuid
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(example = "72f98069-206d-4f12-9f12-3d1e525a8e84", value = "")
   public UUID getUuid() {
     return uuid;
@@ -317,7 +314,6 @@ public class FormatTest {
    * Get password
    * @return password
   **/
-
   @ApiModelProperty(required = true, value = "")
   public String getPassword() {
     return password;
diff --git a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java
index 44159e08e8..e9453bb6cc 100644
--- a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java
+++ b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java
@@ -36,7 +36,7 @@ public class HasOnlyReadOnly {
    * Get bar
    * @return bar
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getBar() {
     return bar;
@@ -46,7 +46,7 @@ public class HasOnlyReadOnly {
    * Get foo
    * @return foo
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getFoo() {
     return foo;
diff --git a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/MapTest.java b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/MapTest.java
index 2caabbea07..b0d3e04bb6 100644
--- a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/MapTest.java
+++ b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/MapTest.java
@@ -93,7 +93,7 @@ public class MapTest {
    * Get mapMapOfString
    * @return mapMapOfString
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Map<String, Map<String, String>> getMapMapOfString() {
     return mapMapOfString;
@@ -120,7 +120,7 @@ public class MapTest {
    * Get mapOfEnumString
    * @return mapOfEnumString
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Map<String, InnerEnum> getMapOfEnumString() {
     return mapOfEnumString;
@@ -147,7 +147,7 @@ public class MapTest {
    * Get directMap
    * @return directMap
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Map<String, Boolean> getDirectMap() {
     return directMap;
@@ -174,7 +174,7 @@ public class MapTest {
    * Get indirectMap
    * @return indirectMap
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Map<String, Boolean> getIndirectMap() {
     return indirectMap;
diff --git a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java
index 8d97329c31..fed78a2162 100644
--- a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java
+++ b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java
@@ -50,7 +50,7 @@ public class MixedPropertiesAndAdditionalPropertiesClass {
    * Get uuid
    * @return uuid
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public UUID getUuid() {
     return uuid;
@@ -69,7 +69,7 @@ public class MixedPropertiesAndAdditionalPropertiesClass {
    * Get dateTime
    * @return dateTime
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public OffsetDateTime getDateTime() {
     return dateTime;
@@ -96,7 +96,7 @@ public class MixedPropertiesAndAdditionalPropertiesClass {
    * Get map
    * @return map
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Map<String, Animal> getMap() {
     return map;
diff --git a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/Model200Response.java b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/Model200Response.java
index bd3244dd57..39fabeeb6d 100644
--- a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/Model200Response.java
+++ b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/Model200Response.java
@@ -42,7 +42,7 @@ public class Model200Response {
    * Get name
    * @return name
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Integer getName() {
     return name;
@@ -61,7 +61,7 @@ public class Model200Response {
    * Get propertyClass
    * @return propertyClass
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getPropertyClass() {
     return propertyClass;
diff --git a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/ModelApiResponse.java b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/ModelApiResponse.java
index ed335cdca1..bb33412951 100644
--- a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/ModelApiResponse.java
+++ b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/ModelApiResponse.java
@@ -44,7 +44,7 @@ public class ModelApiResponse {
    * Get code
    * @return code
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Integer getCode() {
     return code;
@@ -63,7 +63,7 @@ public class ModelApiResponse {
    * Get type
    * @return type
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getType() {
     return type;
@@ -82,7 +82,7 @@ public class ModelApiResponse {
    * Get message
    * @return message
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getMessage() {
     return message;
diff --git a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/ModelReturn.java b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/ModelReturn.java
index 04c0bcd33f..9aafb13e04 100644
--- a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/ModelReturn.java
+++ b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/ModelReturn.java
@@ -39,7 +39,7 @@ public class ModelReturn {
    * Get _return
    * @return _return
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Integer getReturn() {
     return _return;
diff --git a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/Name.java b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/Name.java
index af27c6e45f..9518276dd6 100644
--- a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/Name.java
+++ b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/Name.java
@@ -48,7 +48,6 @@ public class Name {
    * Get name
    * @return name
   **/
-
   @ApiModelProperty(required = true, value = "")
   public Integer getName() {
     return name;
@@ -62,7 +61,7 @@ public class Name {
    * Get snakeCase
    * @return snakeCase
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Integer getSnakeCase() {
     return snakeCase;
@@ -77,7 +76,7 @@ public class Name {
    * Get property
    * @return property
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getProperty() {
     return property;
@@ -91,7 +90,7 @@ public class Name {
    * Get _123number
    * @return _123number
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Integer get123number() {
     return _123number;
diff --git a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/NumberOnly.java b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/NumberOnly.java
index 4e29c814cc..0245e8e210 100644
--- a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/NumberOnly.java
+++ b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/NumberOnly.java
@@ -39,7 +39,7 @@ public class NumberOnly {
    * Get justNumber
    * @return justNumber
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public BigDecimal getJustNumber() {
     return justNumber;
diff --git a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/Order.java b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/Order.java
index 1735b41d31..594c76e484 100644
--- a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/Order.java
+++ b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/Order.java
@@ -91,7 +91,7 @@ public class Order {
    * Get id
    * @return id
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Long getId() {
     return id;
@@ -110,7 +110,7 @@ public class Order {
    * Get petId
    * @return petId
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Long getPetId() {
     return petId;
@@ -129,7 +129,7 @@ public class Order {
    * Get quantity
    * @return quantity
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Integer getQuantity() {
     return quantity;
@@ -148,7 +148,7 @@ public class Order {
    * Get shipDate
    * @return shipDate
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public OffsetDateTime getShipDate() {
     return shipDate;
@@ -167,7 +167,7 @@ public class Order {
    * Order Status
    * @return status
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "Order Status")
   public StatusEnum getStatus() {
     return status;
@@ -186,7 +186,7 @@ public class Order {
    * Get complete
    * @return complete
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Boolean getComplete() {
     return complete;
diff --git a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/OuterComposite.java b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/OuterComposite.java
index f6515126a8..c8bd99011c 100644
--- a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/OuterComposite.java
+++ b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/OuterComposite.java
@@ -45,7 +45,7 @@ public class OuterComposite {
    * Get myNumber
    * @return myNumber
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public BigDecimal getMyNumber() {
     return myNumber;
@@ -64,7 +64,7 @@ public class OuterComposite {
    * Get myString
    * @return myString
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getMyString() {
     return myString;
@@ -83,7 +83,7 @@ public class OuterComposite {
    * Get myBoolean
    * @return myBoolean
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Boolean getMyBoolean() {
     return myBoolean;
diff --git a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/Pet.java b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/Pet.java
index ace85c42aa..08f3773756 100644
--- a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/Pet.java
+++ b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/Pet.java
@@ -94,7 +94,7 @@ public class Pet {
    * Get id
    * @return id
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Long getId() {
     return id;
@@ -113,7 +113,7 @@ public class Pet {
    * Get category
    * @return category
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Category getCategory() {
     return category;
@@ -132,7 +132,6 @@ public class Pet {
    * Get name
    * @return name
   **/
-
   @ApiModelProperty(example = "doggie", required = true, value = "")
   public String getName() {
     return name;
@@ -156,7 +155,6 @@ public class Pet {
    * Get photoUrls
    * @return photoUrls
   **/
-
   @ApiModelProperty(required = true, value = "")
   public List<String> getPhotoUrls() {
     return photoUrls;
@@ -183,7 +181,7 @@ public class Pet {
    * Get tags
    * @return tags
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public List<Tag> getTags() {
     return tags;
@@ -202,7 +200,7 @@ public class Pet {
    * pet status in the store
    * @return status
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "pet status in the store")
   public StatusEnum getStatus() {
     return status;
diff --git a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/ReadOnlyFirst.java b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/ReadOnlyFirst.java
index a2c9e99699..1379ee09ea 100644
--- a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/ReadOnlyFirst.java
+++ b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/ReadOnlyFirst.java
@@ -36,7 +36,7 @@ public class ReadOnlyFirst {
    * Get bar
    * @return bar
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getBar() {
     return bar;
@@ -51,7 +51,7 @@ public class ReadOnlyFirst {
    * Get baz
    * @return baz
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getBaz() {
     return baz;
diff --git a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/SpecialModelName.java b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/SpecialModelName.java
index a5ddb0b638..869771afad 100644
--- a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/SpecialModelName.java
+++ b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/SpecialModelName.java
@@ -38,7 +38,7 @@ public class SpecialModelName {
    * Get $specialPropertyName
    * @return $specialPropertyName
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Long get$SpecialPropertyName() {
     return $specialPropertyName;
diff --git a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/Tag.java b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/Tag.java
index 8255ad8298..4bb498aff4 100644
--- a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/Tag.java
+++ b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/Tag.java
@@ -41,7 +41,7 @@ public class Tag {
    * Get id
    * @return id
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Long getId() {
     return id;
@@ -60,7 +60,7 @@ public class Tag {
    * Get name
    * @return name
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getName() {
     return name;
diff --git a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/TypeHolderDefault.java b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/TypeHolderDefault.java
index 786a681fb3..3c6488d270 100644
--- a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/TypeHolderDefault.java
+++ b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/TypeHolderDefault.java
@@ -53,7 +53,6 @@ public class TypeHolderDefault {
    * Get stringItem
    * @return stringItem
   **/
-
   @ApiModelProperty(required = true, value = "")
   public String getStringItem() {
     return stringItem;
@@ -72,7 +71,6 @@ public class TypeHolderDefault {
    * Get numberItem
    * @return numberItem
   **/
-
   @ApiModelProperty(required = true, value = "")
   public BigDecimal getNumberItem() {
     return numberItem;
@@ -91,7 +89,6 @@ public class TypeHolderDefault {
    * Get integerItem
    * @return integerItem
   **/
-
   @ApiModelProperty(required = true, value = "")
   public Integer getIntegerItem() {
     return integerItem;
@@ -110,7 +107,6 @@ public class TypeHolderDefault {
    * Get boolItem
    * @return boolItem
   **/
-
   @ApiModelProperty(required = true, value = "")
   public Boolean getBoolItem() {
     return boolItem;
@@ -134,7 +130,6 @@ public class TypeHolderDefault {
    * Get arrayItem
    * @return arrayItem
   **/
-
   @ApiModelProperty(required = true, value = "")
   public List<Integer> getArrayItem() {
     return arrayItem;
diff --git a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/TypeHolderExample.java b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/TypeHolderExample.java
index 701e4db843..812b5839aa 100644
--- a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/TypeHolderExample.java
+++ b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/TypeHolderExample.java
@@ -53,7 +53,6 @@ public class TypeHolderExample {
    * Get stringItem
    * @return stringItem
   **/
-
   @ApiModelProperty(example = "what", required = true, value = "")
   public String getStringItem() {
     return stringItem;
@@ -72,7 +71,6 @@ public class TypeHolderExample {
    * Get numberItem
    * @return numberItem
   **/
-
   @ApiModelProperty(example = "1.234", required = true, value = "")
   public BigDecimal getNumberItem() {
     return numberItem;
@@ -91,7 +89,6 @@ public class TypeHolderExample {
    * Get integerItem
    * @return integerItem
   **/
-
   @ApiModelProperty(example = "-2", required = true, value = "")
   public Integer getIntegerItem() {
     return integerItem;
@@ -110,7 +107,6 @@ public class TypeHolderExample {
    * Get boolItem
    * @return boolItem
   **/
-
   @ApiModelProperty(example = "true", required = true, value = "")
   public Boolean getBoolItem() {
     return boolItem;
@@ -134,7 +130,6 @@ public class TypeHolderExample {
    * Get arrayItem
    * @return arrayItem
   **/
-
   @ApiModelProperty(example = "[0, 1, 2, 3]", required = true, value = "")
   public List<Integer> getArrayItem() {
     return arrayItem;
diff --git a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/User.java b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/User.java
index 6e6c4ac102..73164c3ee2 100644
--- a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/User.java
+++ b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/User.java
@@ -59,7 +59,7 @@ public class User {
    * Get id
    * @return id
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Long getId() {
     return id;
@@ -78,7 +78,7 @@ public class User {
    * Get username
    * @return username
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getUsername() {
     return username;
@@ -97,7 +97,7 @@ public class User {
    * Get firstName
    * @return firstName
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getFirstName() {
     return firstName;
@@ -116,7 +116,7 @@ public class User {
    * Get lastName
    * @return lastName
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getLastName() {
     return lastName;
@@ -135,7 +135,7 @@ public class User {
    * Get email
    * @return email
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getEmail() {
     return email;
@@ -154,7 +154,7 @@ public class User {
    * Get password
    * @return password
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getPassword() {
     return password;
@@ -173,7 +173,7 @@ public class User {
    * Get phone
    * @return phone
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getPhone() {
     return phone;
@@ -192,7 +192,7 @@ public class User {
    * User Status
    * @return userStatus
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "User Status")
   public Integer getUserStatus() {
     return userStatus;
diff --git a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/XmlItem.java b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/XmlItem.java
index 2af459e5ae..aa7ff22ccd 100644
--- a/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/XmlItem.java
+++ b/samples/client/petstore/java/webclient/src/main/java/org/openapitools/client/model/XmlItem.java
@@ -125,7 +125,7 @@ public class XmlItem {
    * Get attributeString
    * @return attributeString
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(example = "string", value = "")
   public String getAttributeString() {
     return attributeString;
@@ -144,7 +144,7 @@ public class XmlItem {
    * Get attributeNumber
    * @return attributeNumber
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(example = "1.234", value = "")
   public BigDecimal getAttributeNumber() {
     return attributeNumber;
@@ -163,7 +163,7 @@ public class XmlItem {
    * Get attributeInteger
    * @return attributeInteger
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(example = "-2", value = "")
   public Integer getAttributeInteger() {
     return attributeInteger;
@@ -182,7 +182,7 @@ public class XmlItem {
    * Get attributeBoolean
    * @return attributeBoolean
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(example = "true", value = "")
   public Boolean getAttributeBoolean() {
     return attributeBoolean;
@@ -209,7 +209,7 @@ public class XmlItem {
    * Get wrappedArray
    * @return wrappedArray
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public List<Integer> getWrappedArray() {
     return wrappedArray;
@@ -228,7 +228,7 @@ public class XmlItem {
    * Get nameString
    * @return nameString
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(example = "string", value = "")
   public String getNameString() {
     return nameString;
@@ -247,7 +247,7 @@ public class XmlItem {
    * Get nameNumber
    * @return nameNumber
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(example = "1.234", value = "")
   public BigDecimal getNameNumber() {
     return nameNumber;
@@ -266,7 +266,7 @@ public class XmlItem {
    * Get nameInteger
    * @return nameInteger
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(example = "-2", value = "")
   public Integer getNameInteger() {
     return nameInteger;
@@ -285,7 +285,7 @@ public class XmlItem {
    * Get nameBoolean
    * @return nameBoolean
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(example = "true", value = "")
   public Boolean getNameBoolean() {
     return nameBoolean;
@@ -312,7 +312,7 @@ public class XmlItem {
    * Get nameArray
    * @return nameArray
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public List<Integer> getNameArray() {
     return nameArray;
@@ -339,7 +339,7 @@ public class XmlItem {
    * Get nameWrappedArray
    * @return nameWrappedArray
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public List<Integer> getNameWrappedArray() {
     return nameWrappedArray;
@@ -358,7 +358,7 @@ public class XmlItem {
    * Get prefixString
    * @return prefixString
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(example = "string", value = "")
   public String getPrefixString() {
     return prefixString;
@@ -377,7 +377,7 @@ public class XmlItem {
    * Get prefixNumber
    * @return prefixNumber
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(example = "1.234", value = "")
   public BigDecimal getPrefixNumber() {
     return prefixNumber;
@@ -396,7 +396,7 @@ public class XmlItem {
    * Get prefixInteger
    * @return prefixInteger
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(example = "-2", value = "")
   public Integer getPrefixInteger() {
     return prefixInteger;
@@ -415,7 +415,7 @@ public class XmlItem {
    * Get prefixBoolean
    * @return prefixBoolean
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(example = "true", value = "")
   public Boolean getPrefixBoolean() {
     return prefixBoolean;
@@ -442,7 +442,7 @@ public class XmlItem {
    * Get prefixArray
    * @return prefixArray
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public List<Integer> getPrefixArray() {
     return prefixArray;
@@ -469,7 +469,7 @@ public class XmlItem {
    * Get prefixWrappedArray
    * @return prefixWrappedArray
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public List<Integer> getPrefixWrappedArray() {
     return prefixWrappedArray;
@@ -488,7 +488,7 @@ public class XmlItem {
    * Get namespaceString
    * @return namespaceString
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(example = "string", value = "")
   public String getNamespaceString() {
     return namespaceString;
@@ -507,7 +507,7 @@ public class XmlItem {
    * Get namespaceNumber
    * @return namespaceNumber
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(example = "1.234", value = "")
   public BigDecimal getNamespaceNumber() {
     return namespaceNumber;
@@ -526,7 +526,7 @@ public class XmlItem {
    * Get namespaceInteger
    * @return namespaceInteger
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(example = "-2", value = "")
   public Integer getNamespaceInteger() {
     return namespaceInteger;
@@ -545,7 +545,7 @@ public class XmlItem {
    * Get namespaceBoolean
    * @return namespaceBoolean
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(example = "true", value = "")
   public Boolean getNamespaceBoolean() {
     return namespaceBoolean;
@@ -572,7 +572,7 @@ public class XmlItem {
    * Get namespaceArray
    * @return namespaceArray
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public List<Integer> getNamespaceArray() {
     return namespaceArray;
@@ -599,7 +599,7 @@ public class XmlItem {
    * Get namespaceWrappedArray
    * @return namespaceWrappedArray
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public List<Integer> getNamespaceWrappedArray() {
     return namespaceWrappedArray;
@@ -618,7 +618,7 @@ public class XmlItem {
    * Get prefixNsString
    * @return prefixNsString
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(example = "string", value = "")
   public String getPrefixNsString() {
     return prefixNsString;
@@ -637,7 +637,7 @@ public class XmlItem {
    * Get prefixNsNumber
    * @return prefixNsNumber
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(example = "1.234", value = "")
   public BigDecimal getPrefixNsNumber() {
     return prefixNsNumber;
@@ -656,7 +656,7 @@ public class XmlItem {
    * Get prefixNsInteger
    * @return prefixNsInteger
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(example = "-2", value = "")
   public Integer getPrefixNsInteger() {
     return prefixNsInteger;
@@ -675,7 +675,7 @@ public class XmlItem {
    * Get prefixNsBoolean
    * @return prefixNsBoolean
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(example = "true", value = "")
   public Boolean getPrefixNsBoolean() {
     return prefixNsBoolean;
@@ -702,7 +702,7 @@ public class XmlItem {
    * Get prefixNsArray
    * @return prefixNsArray
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public List<Integer> getPrefixNsArray() {
     return prefixNsArray;
@@ -729,7 +729,7 @@ public class XmlItem {
    * Get prefixNsWrappedArray
    * @return prefixNsWrappedArray
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public List<Integer> getPrefixNsWrappedArray() {
     return prefixNsWrappedArray;

From d5d8b7a118e2af6da949ebf79e32f0f4e008936e Mon Sep 17 00:00:00 2001
From: Erik Seliger <erikseliger@me.com>
Date: Fri, 26 Jul 2019 07:54:40 +0200
Subject: [PATCH 60/62] fix(typescript-angular): use correct package with
 http-client (#3465)

---
 .../main/resources/typescript-angular/package.mustache    | 8 ++++----
 .../petstore/typescript-angular-v4.3/npm/package.json     | 2 --
 .../builds/with-npm/package.json                          | 2 --
 .../builds/with-npm/package.json                          | 2 --
 .../builds/with-npm/package.json                          | 2 --
 .../builds/with-npm/package.json                          | 2 --
 6 files changed, 4 insertions(+), 14 deletions(-)

diff --git a/modules/openapi-generator/src/main/resources/typescript-angular/package.mustache b/modules/openapi-generator/src/main/resources/typescript-angular/package.mustache
index 0caee1c44c..867114a179 100644
--- a/modules/openapi-generator/src/main/resources/typescript-angular/package.mustache
+++ b/modules/openapi-generator/src/main/resources/typescript-angular/package.mustache
@@ -22,8 +22,8 @@
   },
   {{/useNgPackagr}}
   "peerDependencies": {
-    "@angular/core": "^{{ngVersion}}",
-    "@angular/http": "^{{ngVersion}}",
+    "@angular/core": "^{{ngVersion}}",{{^useHttpClient}}
+    "@angular/http": "^{{ngVersion}}",{{/useHttpClient}}
     "@angular/common": "^{{ngVersion}}",
     "@angular/compiler": "^{{ngVersion}}",
     "core-js": "^2.4.0",
@@ -34,8 +34,8 @@
     "@angular/common": "^{{ngVersion}}",
     "@angular/compiler": "^{{ngVersion}}",
     "@angular/compiler-cli": "^{{ngVersion}}",
-    "@angular/core": "^{{ngVersion}}",
-    "@angular/http": "^{{ngVersion}}",
+    "@angular/core": "^{{ngVersion}}",{{^useHttpClient}}
+    "@angular/http": "^{{ngVersion}}",{{/useHttpClient}}
     "@angular/platform-browser": "^{{ngVersion}}",{{#useNgPackagr}}
     "ng-packagr": "^{{ngPackagrVersion}}",{{/useNgPackagr}}
     "reflect-metadata": "^0.1.3",
diff --git a/samples/client/petstore/typescript-angular-v4.3/npm/package.json b/samples/client/petstore/typescript-angular-v4.3/npm/package.json
index 96ae1d1330..55560fbce9 100644
--- a/samples/client/petstore/typescript-angular-v4.3/npm/package.json
+++ b/samples/client/petstore/typescript-angular-v4.3/npm/package.json
@@ -13,7 +13,6 @@
   },
   "peerDependencies": {
     "@angular/core": "^4.3.0",
-    "@angular/http": "^4.3.0",
     "@angular/common": "^4.3.0",
     "@angular/compiler": "^4.3.0",
     "core-js": "^2.4.0",
@@ -25,7 +24,6 @@
     "@angular/compiler": "^4.3.0",
     "@angular/compiler-cli": "^4.3.0",
     "@angular/core": "^4.3.0",
-    "@angular/http": "^4.3.0",
     "@angular/platform-browser": "^4.3.0",
     "ng-packagr": "^1.6.0",
     "reflect-metadata": "^0.1.3",
diff --git a/samples/client/petstore/typescript-angular-v6-not-provided-in-root/builds/with-npm/package.json b/samples/client/petstore/typescript-angular-v6-not-provided-in-root/builds/with-npm/package.json
index 033ab86836..f34a77cec8 100644
--- a/samples/client/petstore/typescript-angular-v6-not-provided-in-root/builds/with-npm/package.json
+++ b/samples/client/petstore/typescript-angular-v6-not-provided-in-root/builds/with-npm/package.json
@@ -13,7 +13,6 @@
   },
   "peerDependencies": {
     "@angular/core": "^6.0.0",
-    "@angular/http": "^6.0.0",
     "@angular/common": "^6.0.0",
     "@angular/compiler": "^6.0.0",
     "core-js": "^2.4.0",
@@ -25,7 +24,6 @@
     "@angular/compiler": "^6.0.0",
     "@angular/compiler-cli": "^6.0.0",
     "@angular/core": "^6.0.0",
-    "@angular/http": "^6.0.0",
     "@angular/platform-browser": "^6.0.0",
     "ng-packagr": "^3.0.6",
     "reflect-metadata": "^0.1.3",
diff --git a/samples/client/petstore/typescript-angular-v6-provided-in-root/builds/with-npm/package.json b/samples/client/petstore/typescript-angular-v6-provided-in-root/builds/with-npm/package.json
index 033ab86836..f34a77cec8 100644
--- a/samples/client/petstore/typescript-angular-v6-provided-in-root/builds/with-npm/package.json
+++ b/samples/client/petstore/typescript-angular-v6-provided-in-root/builds/with-npm/package.json
@@ -13,7 +13,6 @@
   },
   "peerDependencies": {
     "@angular/core": "^6.0.0",
-    "@angular/http": "^6.0.0",
     "@angular/common": "^6.0.0",
     "@angular/compiler": "^6.0.0",
     "core-js": "^2.4.0",
@@ -25,7 +24,6 @@
     "@angular/compiler": "^6.0.0",
     "@angular/compiler-cli": "^6.0.0",
     "@angular/core": "^6.0.0",
-    "@angular/http": "^6.0.0",
     "@angular/platform-browser": "^6.0.0",
     "ng-packagr": "^3.0.6",
     "reflect-metadata": "^0.1.3",
diff --git a/samples/client/petstore/typescript-angular-v7-not-provided-in-root/builds/with-npm/package.json b/samples/client/petstore/typescript-angular-v7-not-provided-in-root/builds/with-npm/package.json
index 5d7151427a..82e8dc5eb3 100644
--- a/samples/client/petstore/typescript-angular-v7-not-provided-in-root/builds/with-npm/package.json
+++ b/samples/client/petstore/typescript-angular-v7-not-provided-in-root/builds/with-npm/package.json
@@ -13,7 +13,6 @@
   },
   "peerDependencies": {
     "@angular/core": "^7.0.0",
-    "@angular/http": "^7.0.0",
     "@angular/common": "^7.0.0",
     "@angular/compiler": "^7.0.0",
     "core-js": "^2.4.0",
@@ -25,7 +24,6 @@
     "@angular/compiler": "^7.0.0",
     "@angular/compiler-cli": "^7.0.0",
     "@angular/core": "^7.0.0",
-    "@angular/http": "^7.0.0",
     "@angular/platform-browser": "^7.0.0",
     "ng-packagr": "^5.1.0",
     "reflect-metadata": "^0.1.3",
diff --git a/samples/client/petstore/typescript-angular-v7-provided-in-root/builds/with-npm/package.json b/samples/client/petstore/typescript-angular-v7-provided-in-root/builds/with-npm/package.json
index 5d7151427a..82e8dc5eb3 100644
--- a/samples/client/petstore/typescript-angular-v7-provided-in-root/builds/with-npm/package.json
+++ b/samples/client/petstore/typescript-angular-v7-provided-in-root/builds/with-npm/package.json
@@ -13,7 +13,6 @@
   },
   "peerDependencies": {
     "@angular/core": "^7.0.0",
-    "@angular/http": "^7.0.0",
     "@angular/common": "^7.0.0",
     "@angular/compiler": "^7.0.0",
     "core-js": "^2.4.0",
@@ -25,7 +24,6 @@
     "@angular/compiler": "^7.0.0",
     "@angular/compiler-cli": "^7.0.0",
     "@angular/core": "^7.0.0",
-    "@angular/http": "^7.0.0",
     "@angular/platform-browser": "^7.0.0",
     "ng-packagr": "^5.1.0",
     "reflect-metadata": "^0.1.3",

From 93cb215531e4fc82e5990d3ce39b27e5f0eb37fa Mon Sep 17 00:00:00 2001
From: William Cheng <wing328hk@gmail.com>
Date: Fri, 26 Jul 2019 15:21:23 +0800
Subject: [PATCH 61/62] update java native 11 samples

---
 .../model/AdditionalPropertiesAnyType.java    |  2 +-
 .../model/AdditionalPropertiesArray.java      |  2 +-
 .../model/AdditionalPropertiesBoolean.java    |  2 +-
 .../model/AdditionalPropertiesClass.java      | 22 +++----
 .../model/AdditionalPropertiesInteger.java    |  2 +-
 .../model/AdditionalPropertiesNumber.java     |  2 +-
 .../model/AdditionalPropertiesObject.java     |  2 +-
 .../model/AdditionalPropertiesString.java     |  2 +-
 .../org/openapitools/client/model/Animal.java |  3 +-
 .../model/ArrayOfArrayOfNumberOnly.java       |  2 +-
 .../client/model/ArrayOfNumberOnly.java       |  2 +-
 .../openapitools/client/model/ArrayTest.java  |  6 +-
 .../client/model/Capitalization.java          | 12 ++--
 .../org/openapitools/client/model/Cat.java    |  2 +-
 .../openapitools/client/model/CatAllOf.java   |  2 +-
 .../openapitools/client/model/Category.java   |  3 +-
 .../openapitools/client/model/ClassModel.java |  2 +-
 .../org/openapitools/client/model/Client.java |  2 +-
 .../org/openapitools/client/model/Dog.java    |  2 +-
 .../openapitools/client/model/DogAllOf.java   |  2 +-
 .../openapitools/client/model/EnumArrays.java |  4 +-
 .../openapitools/client/model/EnumTest.java   |  9 ++-
 .../client/model/FileSchemaTestClass.java     |  4 +-
 .../openapitools/client/model/FormatTest.java | 22 +++----
 .../client/model/HasOnlyReadOnly.java         |  4 +-
 .../openapitools/client/model/MapTest.java    |  8 +--
 ...ropertiesAndAdditionalPropertiesClass.java |  6 +-
 .../client/model/Model200Response.java        |  4 +-
 .../client/model/ModelApiResponse.java        |  6 +-
 .../client/model/ModelReturn.java             |  2 +-
 .../org/openapitools/client/model/Name.java   |  7 +--
 .../openapitools/client/model/NumberOnly.java |  2 +-
 .../org/openapitools/client/model/Order.java  | 12 ++--
 .../client/model/OuterComposite.java          |  6 +-
 .../org/openapitools/client/model/Pet.java    | 10 ++--
 .../client/model/ReadOnlyFirst.java           |  4 +-
 .../client/model/SpecialModelName.java        |  2 +-
 .../org/openapitools/client/model/Tag.java    |  4 +-
 .../client/model/TypeHolderDefault.java       |  5 --
 .../client/model/TypeHolderExample.java       |  5 --
 .../org/openapitools/client/model/User.java   | 16 ++---
 .../openapitools/client/model/XmlItem.java    | 58 +++++++++----------
 42 files changed, 128 insertions(+), 148 deletions(-)

diff --git a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/AdditionalPropertiesAnyType.java b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/AdditionalPropertiesAnyType.java
index 1abb2d8a64..69d6a81729 100644
--- a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/AdditionalPropertiesAnyType.java
+++ b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/AdditionalPropertiesAnyType.java
@@ -40,7 +40,7 @@ public class AdditionalPropertiesAnyType extends HashMap<String, Object> {
    * Get name
    * @return name
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getName() {
     return name;
diff --git a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/AdditionalPropertiesArray.java b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/AdditionalPropertiesArray.java
index 1821c243e1..0147a592b7 100644
--- a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/AdditionalPropertiesArray.java
+++ b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/AdditionalPropertiesArray.java
@@ -41,7 +41,7 @@ public class AdditionalPropertiesArray extends HashMap<String, List> {
    * Get name
    * @return name
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getName() {
     return name;
diff --git a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/AdditionalPropertiesBoolean.java b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/AdditionalPropertiesBoolean.java
index 78f7ac79b2..89aa511c2a 100644
--- a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/AdditionalPropertiesBoolean.java
+++ b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/AdditionalPropertiesBoolean.java
@@ -40,7 +40,7 @@ public class AdditionalPropertiesBoolean extends HashMap<String, Boolean> {
    * Get name
    * @return name
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getName() {
     return name;
diff --git a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java
index fc52759bc8..ecb4e102ea 100644
--- a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java
+++ b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/AdditionalPropertiesClass.java
@@ -80,7 +80,7 @@ public class AdditionalPropertiesClass {
    * Get mapString
    * @return mapString
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Map<String, String> getMapString() {
     return mapString;
@@ -107,7 +107,7 @@ public class AdditionalPropertiesClass {
    * Get mapNumber
    * @return mapNumber
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Map<String, BigDecimal> getMapNumber() {
     return mapNumber;
@@ -134,7 +134,7 @@ public class AdditionalPropertiesClass {
    * Get mapInteger
    * @return mapInteger
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Map<String, Integer> getMapInteger() {
     return mapInteger;
@@ -161,7 +161,7 @@ public class AdditionalPropertiesClass {
    * Get mapBoolean
    * @return mapBoolean
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Map<String, Boolean> getMapBoolean() {
     return mapBoolean;
@@ -188,7 +188,7 @@ public class AdditionalPropertiesClass {
    * Get mapArrayInteger
    * @return mapArrayInteger
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Map<String, List<Integer>> getMapArrayInteger() {
     return mapArrayInteger;
@@ -215,7 +215,7 @@ public class AdditionalPropertiesClass {
    * Get mapArrayAnytype
    * @return mapArrayAnytype
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Map<String, List<Object>> getMapArrayAnytype() {
     return mapArrayAnytype;
@@ -242,7 +242,7 @@ public class AdditionalPropertiesClass {
    * Get mapMapString
    * @return mapMapString
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Map<String, Map<String, String>> getMapMapString() {
     return mapMapString;
@@ -269,7 +269,7 @@ public class AdditionalPropertiesClass {
    * Get mapMapAnytype
    * @return mapMapAnytype
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Map<String, Map<String, Object>> getMapMapAnytype() {
     return mapMapAnytype;
@@ -288,7 +288,7 @@ public class AdditionalPropertiesClass {
    * Get anytype1
    * @return anytype1
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Object getAnytype1() {
     return anytype1;
@@ -307,7 +307,7 @@ public class AdditionalPropertiesClass {
    * Get anytype2
    * @return anytype2
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Object getAnytype2() {
     return anytype2;
@@ -326,7 +326,7 @@ public class AdditionalPropertiesClass {
    * Get anytype3
    * @return anytype3
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Object getAnytype3() {
     return anytype3;
diff --git a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/AdditionalPropertiesInteger.java b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/AdditionalPropertiesInteger.java
index 6e5159d404..f27ff011de 100644
--- a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/AdditionalPropertiesInteger.java
+++ b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/AdditionalPropertiesInteger.java
@@ -40,7 +40,7 @@ public class AdditionalPropertiesInteger extends HashMap<String, Integer> {
    * Get name
    * @return name
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getName() {
     return name;
diff --git a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/AdditionalPropertiesNumber.java b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/AdditionalPropertiesNumber.java
index ddc8146dea..479696fdce 100644
--- a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/AdditionalPropertiesNumber.java
+++ b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/AdditionalPropertiesNumber.java
@@ -41,7 +41,7 @@ public class AdditionalPropertiesNumber extends HashMap<String, BigDecimal> {
    * Get name
    * @return name
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getName() {
     return name;
diff --git a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/AdditionalPropertiesObject.java b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/AdditionalPropertiesObject.java
index cc29400029..bd569b0da3 100644
--- a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/AdditionalPropertiesObject.java
+++ b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/AdditionalPropertiesObject.java
@@ -40,7 +40,7 @@ public class AdditionalPropertiesObject extends HashMap<String, Map> {
    * Get name
    * @return name
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getName() {
     return name;
diff --git a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/AdditionalPropertiesString.java b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/AdditionalPropertiesString.java
index fb3368dfed..27e03a2313 100644
--- a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/AdditionalPropertiesString.java
+++ b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/AdditionalPropertiesString.java
@@ -40,7 +40,7 @@ public class AdditionalPropertiesString extends HashMap<String, String> {
    * Get name
    * @return name
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getName() {
     return name;
diff --git a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/Animal.java b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/Animal.java
index 53a0eec339..dc16717ac3 100644
--- a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/Animal.java
+++ b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/Animal.java
@@ -49,7 +49,6 @@ public class Animal {
    * Get className
    * @return className
   **/
-
   @ApiModelProperty(required = true, value = "")
   public String getClassName() {
     return className;
@@ -68,7 +67,7 @@ public class Animal {
    * Get color
    * @return color
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getColor() {
     return color;
diff --git a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java
index 49b5c55250..66e9fba5d7 100644
--- a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java
+++ b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java
@@ -49,7 +49,7 @@ public class ArrayOfArrayOfNumberOnly {
    * Get arrayArrayNumber
    * @return arrayArrayNumber
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public List<List<BigDecimal>> getArrayArrayNumber() {
     return arrayArrayNumber;
diff --git a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java
index ef2555974d..9f5b467a31 100644
--- a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java
+++ b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java
@@ -49,7 +49,7 @@ public class ArrayOfNumberOnly {
    * Get arrayNumber
    * @return arrayNumber
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public List<BigDecimal> getArrayNumber() {
     return arrayNumber;
diff --git a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/ArrayTest.java b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/ArrayTest.java
index b6b98aa275..7ac6788089 100644
--- a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/ArrayTest.java
+++ b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/ArrayTest.java
@@ -55,7 +55,7 @@ public class ArrayTest {
    * Get arrayOfString
    * @return arrayOfString
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public List<String> getArrayOfString() {
     return arrayOfString;
@@ -82,7 +82,7 @@ public class ArrayTest {
    * Get arrayArrayOfInteger
    * @return arrayArrayOfInteger
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public List<List<Long>> getArrayArrayOfInteger() {
     return arrayArrayOfInteger;
@@ -109,7 +109,7 @@ public class ArrayTest {
    * Get arrayArrayOfModel
    * @return arrayArrayOfModel
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public List<List<ReadOnlyFirst>> getArrayArrayOfModel() {
     return arrayArrayOfModel;
diff --git a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/Capitalization.java b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/Capitalization.java
index bb83be97fe..3f3df29d5d 100644
--- a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/Capitalization.java
+++ b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/Capitalization.java
@@ -53,7 +53,7 @@ public class Capitalization {
    * Get smallCamel
    * @return smallCamel
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getSmallCamel() {
     return smallCamel;
@@ -72,7 +72,7 @@ public class Capitalization {
    * Get capitalCamel
    * @return capitalCamel
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getCapitalCamel() {
     return capitalCamel;
@@ -91,7 +91,7 @@ public class Capitalization {
    * Get smallSnake
    * @return smallSnake
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getSmallSnake() {
     return smallSnake;
@@ -110,7 +110,7 @@ public class Capitalization {
    * Get capitalSnake
    * @return capitalSnake
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getCapitalSnake() {
     return capitalSnake;
@@ -129,7 +129,7 @@ public class Capitalization {
    * Get scAETHFlowPoints
    * @return scAETHFlowPoints
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getScAETHFlowPoints() {
     return scAETHFlowPoints;
@@ -148,7 +148,7 @@ public class Capitalization {
    * Name of the pet 
    * @return ATT_NAME
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "Name of the pet ")
   public String getATTNAME() {
     return ATT_NAME;
diff --git a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/Cat.java b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/Cat.java
index ce456c8647..a8108d6f15 100644
--- a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/Cat.java
+++ b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/Cat.java
@@ -40,7 +40,7 @@ public class Cat extends Animal {
    * Get declawed
    * @return declawed
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Boolean getDeclawed() {
     return declawed;
diff --git a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/CatAllOf.java b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/CatAllOf.java
index 224c08671c..42e9614610 100644
--- a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/CatAllOf.java
+++ b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/CatAllOf.java
@@ -38,7 +38,7 @@ public class CatAllOf {
    * Get declawed
    * @return declawed
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Boolean getDeclawed() {
     return declawed;
diff --git a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/Category.java b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/Category.java
index 03efdd4be8..3eccd2cd92 100644
--- a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/Category.java
+++ b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/Category.java
@@ -41,7 +41,7 @@ public class Category {
    * Get id
    * @return id
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Long getId() {
     return id;
@@ -60,7 +60,6 @@ public class Category {
    * Get name
    * @return name
   **/
-
   @ApiModelProperty(required = true, value = "")
   public String getName() {
     return name;
diff --git a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/ClassModel.java b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/ClassModel.java
index def421a670..2aaed27fff 100644
--- a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/ClassModel.java
+++ b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/ClassModel.java
@@ -39,7 +39,7 @@ public class ClassModel {
    * Get propertyClass
    * @return propertyClass
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getPropertyClass() {
     return propertyClass;
diff --git a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/Client.java b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/Client.java
index c0bd0743e5..458e812960 100644
--- a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/Client.java
+++ b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/Client.java
@@ -38,7 +38,7 @@ public class Client {
    * Get client
    * @return client
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getClient() {
     return client;
diff --git a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/Dog.java b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/Dog.java
index 6b79c59606..83f5cb0e27 100644
--- a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/Dog.java
+++ b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/Dog.java
@@ -40,7 +40,7 @@ public class Dog extends Animal {
    * Get breed
    * @return breed
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getBreed() {
     return breed;
diff --git a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/DogAllOf.java b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/DogAllOf.java
index 1a4496d8f0..d1e1402789 100644
--- a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/DogAllOf.java
+++ b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/DogAllOf.java
@@ -38,7 +38,7 @@ public class DogAllOf {
    * Get breed
    * @return breed
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getBreed() {
     return breed;
diff --git a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/EnumArrays.java b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/EnumArrays.java
index fff7f65c72..a3bd1af472 100644
--- a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/EnumArrays.java
+++ b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/EnumArrays.java
@@ -113,7 +113,7 @@ public class EnumArrays {
    * Get justSymbol
    * @return justSymbol
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public JustSymbolEnum getJustSymbol() {
     return justSymbol;
@@ -140,7 +140,7 @@ public class EnumArrays {
    * Get arrayEnum
    * @return arrayEnum
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public List<ArrayEnumEnum> getArrayEnum() {
     return arrayEnum;
diff --git a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/EnumTest.java b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/EnumTest.java
index d4b36798ee..b365a8a56f 100644
--- a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/EnumTest.java
+++ b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/EnumTest.java
@@ -195,7 +195,7 @@ public class EnumTest {
    * Get enumString
    * @return enumString
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public EnumStringEnum getEnumString() {
     return enumString;
@@ -214,7 +214,6 @@ public class EnumTest {
    * Get enumStringRequired
    * @return enumStringRequired
   **/
-
   @ApiModelProperty(required = true, value = "")
   public EnumStringRequiredEnum getEnumStringRequired() {
     return enumStringRequired;
@@ -233,7 +232,7 @@ public class EnumTest {
    * Get enumInteger
    * @return enumInteger
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public EnumIntegerEnum getEnumInteger() {
     return enumInteger;
@@ -252,7 +251,7 @@ public class EnumTest {
    * Get enumNumber
    * @return enumNumber
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public EnumNumberEnum getEnumNumber() {
     return enumNumber;
@@ -271,7 +270,7 @@ public class EnumTest {
    * Get outerEnum
    * @return outerEnum
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public OuterEnum getOuterEnum() {
     return outerEnum;
diff --git a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java
index ebbb0fb9f3..ad8cf751e1 100644
--- a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java
+++ b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/FileSchemaTestClass.java
@@ -43,7 +43,7 @@ public class FileSchemaTestClass {
    * Get file
    * @return file
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public java.io.File getFile() {
     return file;
@@ -70,7 +70,7 @@ public class FileSchemaTestClass {
    * Get files
    * @return files
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public List<java.io.File> getFiles() {
     return files;
diff --git a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/FormatTest.java b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/FormatTest.java
index 518432caff..8d075e26ba 100644
--- a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/FormatTest.java
+++ b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/FormatTest.java
@@ -81,7 +81,7 @@ public class FormatTest {
    * maximum: 100
    * @return integer
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Integer getInteger() {
     return integer;
@@ -102,7 +102,7 @@ public class FormatTest {
    * maximum: 200
    * @return int32
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Integer getInt32() {
     return int32;
@@ -121,7 +121,7 @@ public class FormatTest {
    * Get int64
    * @return int64
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Long getInt64() {
     return int64;
@@ -142,7 +142,6 @@ public class FormatTest {
    * maximum: 543.2
    * @return number
   **/
-
   @ApiModelProperty(required = true, value = "")
   public BigDecimal getNumber() {
     return number;
@@ -163,7 +162,7 @@ public class FormatTest {
    * maximum: 987.6
    * @return _float
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Float getFloat() {
     return _float;
@@ -184,7 +183,7 @@ public class FormatTest {
    * maximum: 123.4
    * @return _double
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Double getDouble() {
     return _double;
@@ -203,7 +202,7 @@ public class FormatTest {
    * Get string
    * @return string
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getString() {
     return string;
@@ -222,7 +221,6 @@ public class FormatTest {
    * Get _byte
    * @return _byte
   **/
-
   @ApiModelProperty(required = true, value = "")
   public byte[] getByte() {
     return _byte;
@@ -241,7 +239,7 @@ public class FormatTest {
    * Get binary
    * @return binary
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public File getBinary() {
     return binary;
@@ -260,7 +258,6 @@ public class FormatTest {
    * Get date
    * @return date
   **/
-
   @ApiModelProperty(required = true, value = "")
   public LocalDate getDate() {
     return date;
@@ -279,7 +276,7 @@ public class FormatTest {
    * Get dateTime
    * @return dateTime
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public OffsetDateTime getDateTime() {
     return dateTime;
@@ -298,7 +295,7 @@ public class FormatTest {
    * Get uuid
    * @return uuid
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(example = "72f98069-206d-4f12-9f12-3d1e525a8e84", value = "")
   public UUID getUuid() {
     return uuid;
@@ -317,7 +314,6 @@ public class FormatTest {
    * Get password
    * @return password
   **/
-
   @ApiModelProperty(required = true, value = "")
   public String getPassword() {
     return password;
diff --git a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java
index 44159e08e8..e9453bb6cc 100644
--- a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java
+++ b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/HasOnlyReadOnly.java
@@ -36,7 +36,7 @@ public class HasOnlyReadOnly {
    * Get bar
    * @return bar
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getBar() {
     return bar;
@@ -46,7 +46,7 @@ public class HasOnlyReadOnly {
    * Get foo
    * @return foo
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getFoo() {
     return foo;
diff --git a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/MapTest.java b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/MapTest.java
index 2caabbea07..b0d3e04bb6 100644
--- a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/MapTest.java
+++ b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/MapTest.java
@@ -93,7 +93,7 @@ public class MapTest {
    * Get mapMapOfString
    * @return mapMapOfString
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Map<String, Map<String, String>> getMapMapOfString() {
     return mapMapOfString;
@@ -120,7 +120,7 @@ public class MapTest {
    * Get mapOfEnumString
    * @return mapOfEnumString
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Map<String, InnerEnum> getMapOfEnumString() {
     return mapOfEnumString;
@@ -147,7 +147,7 @@ public class MapTest {
    * Get directMap
    * @return directMap
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Map<String, Boolean> getDirectMap() {
     return directMap;
@@ -174,7 +174,7 @@ public class MapTest {
    * Get indirectMap
    * @return indirectMap
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Map<String, Boolean> getIndirectMap() {
     return indirectMap;
diff --git a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java
index 8d97329c31..fed78a2162 100644
--- a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java
+++ b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/MixedPropertiesAndAdditionalPropertiesClass.java
@@ -50,7 +50,7 @@ public class MixedPropertiesAndAdditionalPropertiesClass {
    * Get uuid
    * @return uuid
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public UUID getUuid() {
     return uuid;
@@ -69,7 +69,7 @@ public class MixedPropertiesAndAdditionalPropertiesClass {
    * Get dateTime
    * @return dateTime
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public OffsetDateTime getDateTime() {
     return dateTime;
@@ -96,7 +96,7 @@ public class MixedPropertiesAndAdditionalPropertiesClass {
    * Get map
    * @return map
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Map<String, Animal> getMap() {
     return map;
diff --git a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/Model200Response.java b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/Model200Response.java
index bd3244dd57..39fabeeb6d 100644
--- a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/Model200Response.java
+++ b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/Model200Response.java
@@ -42,7 +42,7 @@ public class Model200Response {
    * Get name
    * @return name
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Integer getName() {
     return name;
@@ -61,7 +61,7 @@ public class Model200Response {
    * Get propertyClass
    * @return propertyClass
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getPropertyClass() {
     return propertyClass;
diff --git a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/ModelApiResponse.java b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/ModelApiResponse.java
index ed335cdca1..bb33412951 100644
--- a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/ModelApiResponse.java
+++ b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/ModelApiResponse.java
@@ -44,7 +44,7 @@ public class ModelApiResponse {
    * Get code
    * @return code
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Integer getCode() {
     return code;
@@ -63,7 +63,7 @@ public class ModelApiResponse {
    * Get type
    * @return type
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getType() {
     return type;
@@ -82,7 +82,7 @@ public class ModelApiResponse {
    * Get message
    * @return message
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getMessage() {
     return message;
diff --git a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/ModelReturn.java b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/ModelReturn.java
index 04c0bcd33f..9aafb13e04 100644
--- a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/ModelReturn.java
+++ b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/ModelReturn.java
@@ -39,7 +39,7 @@ public class ModelReturn {
    * Get _return
    * @return _return
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Integer getReturn() {
     return _return;
diff --git a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/Name.java b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/Name.java
index af27c6e45f..9518276dd6 100644
--- a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/Name.java
+++ b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/Name.java
@@ -48,7 +48,6 @@ public class Name {
    * Get name
    * @return name
   **/
-
   @ApiModelProperty(required = true, value = "")
   public Integer getName() {
     return name;
@@ -62,7 +61,7 @@ public class Name {
    * Get snakeCase
    * @return snakeCase
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Integer getSnakeCase() {
     return snakeCase;
@@ -77,7 +76,7 @@ public class Name {
    * Get property
    * @return property
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getProperty() {
     return property;
@@ -91,7 +90,7 @@ public class Name {
    * Get _123number
    * @return _123number
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Integer get123number() {
     return _123number;
diff --git a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/NumberOnly.java b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/NumberOnly.java
index 4e29c814cc..0245e8e210 100644
--- a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/NumberOnly.java
+++ b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/NumberOnly.java
@@ -39,7 +39,7 @@ public class NumberOnly {
    * Get justNumber
    * @return justNumber
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public BigDecimal getJustNumber() {
     return justNumber;
diff --git a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/Order.java b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/Order.java
index 1735b41d31..594c76e484 100644
--- a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/Order.java
+++ b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/Order.java
@@ -91,7 +91,7 @@ public class Order {
    * Get id
    * @return id
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Long getId() {
     return id;
@@ -110,7 +110,7 @@ public class Order {
    * Get petId
    * @return petId
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Long getPetId() {
     return petId;
@@ -129,7 +129,7 @@ public class Order {
    * Get quantity
    * @return quantity
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Integer getQuantity() {
     return quantity;
@@ -148,7 +148,7 @@ public class Order {
    * Get shipDate
    * @return shipDate
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public OffsetDateTime getShipDate() {
     return shipDate;
@@ -167,7 +167,7 @@ public class Order {
    * Order Status
    * @return status
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "Order Status")
   public StatusEnum getStatus() {
     return status;
@@ -186,7 +186,7 @@ public class Order {
    * Get complete
    * @return complete
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Boolean getComplete() {
     return complete;
diff --git a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/OuterComposite.java b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/OuterComposite.java
index f6515126a8..c8bd99011c 100644
--- a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/OuterComposite.java
+++ b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/OuterComposite.java
@@ -45,7 +45,7 @@ public class OuterComposite {
    * Get myNumber
    * @return myNumber
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public BigDecimal getMyNumber() {
     return myNumber;
@@ -64,7 +64,7 @@ public class OuterComposite {
    * Get myString
    * @return myString
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getMyString() {
     return myString;
@@ -83,7 +83,7 @@ public class OuterComposite {
    * Get myBoolean
    * @return myBoolean
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Boolean getMyBoolean() {
     return myBoolean;
diff --git a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/Pet.java b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/Pet.java
index ace85c42aa..08f3773756 100644
--- a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/Pet.java
+++ b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/Pet.java
@@ -94,7 +94,7 @@ public class Pet {
    * Get id
    * @return id
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Long getId() {
     return id;
@@ -113,7 +113,7 @@ public class Pet {
    * Get category
    * @return category
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Category getCategory() {
     return category;
@@ -132,7 +132,6 @@ public class Pet {
    * Get name
    * @return name
   **/
-
   @ApiModelProperty(example = "doggie", required = true, value = "")
   public String getName() {
     return name;
@@ -156,7 +155,6 @@ public class Pet {
    * Get photoUrls
    * @return photoUrls
   **/
-
   @ApiModelProperty(required = true, value = "")
   public List<String> getPhotoUrls() {
     return photoUrls;
@@ -183,7 +181,7 @@ public class Pet {
    * Get tags
    * @return tags
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public List<Tag> getTags() {
     return tags;
@@ -202,7 +200,7 @@ public class Pet {
    * pet status in the store
    * @return status
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "pet status in the store")
   public StatusEnum getStatus() {
     return status;
diff --git a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/ReadOnlyFirst.java b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/ReadOnlyFirst.java
index a2c9e99699..1379ee09ea 100644
--- a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/ReadOnlyFirst.java
+++ b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/ReadOnlyFirst.java
@@ -36,7 +36,7 @@ public class ReadOnlyFirst {
    * Get bar
    * @return bar
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getBar() {
     return bar;
@@ -51,7 +51,7 @@ public class ReadOnlyFirst {
    * Get baz
    * @return baz
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getBaz() {
     return baz;
diff --git a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/SpecialModelName.java b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/SpecialModelName.java
index a5ddb0b638..869771afad 100644
--- a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/SpecialModelName.java
+++ b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/SpecialModelName.java
@@ -38,7 +38,7 @@ public class SpecialModelName {
    * Get $specialPropertyName
    * @return $specialPropertyName
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Long get$SpecialPropertyName() {
     return $specialPropertyName;
diff --git a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/Tag.java b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/Tag.java
index 8255ad8298..4bb498aff4 100644
--- a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/Tag.java
+++ b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/Tag.java
@@ -41,7 +41,7 @@ public class Tag {
    * Get id
    * @return id
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Long getId() {
     return id;
@@ -60,7 +60,7 @@ public class Tag {
    * Get name
    * @return name
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getName() {
     return name;
diff --git a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/TypeHolderDefault.java b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/TypeHolderDefault.java
index 786a681fb3..3c6488d270 100644
--- a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/TypeHolderDefault.java
+++ b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/TypeHolderDefault.java
@@ -53,7 +53,6 @@ public class TypeHolderDefault {
    * Get stringItem
    * @return stringItem
   **/
-
   @ApiModelProperty(required = true, value = "")
   public String getStringItem() {
     return stringItem;
@@ -72,7 +71,6 @@ public class TypeHolderDefault {
    * Get numberItem
    * @return numberItem
   **/
-
   @ApiModelProperty(required = true, value = "")
   public BigDecimal getNumberItem() {
     return numberItem;
@@ -91,7 +89,6 @@ public class TypeHolderDefault {
    * Get integerItem
    * @return integerItem
   **/
-
   @ApiModelProperty(required = true, value = "")
   public Integer getIntegerItem() {
     return integerItem;
@@ -110,7 +107,6 @@ public class TypeHolderDefault {
    * Get boolItem
    * @return boolItem
   **/
-
   @ApiModelProperty(required = true, value = "")
   public Boolean getBoolItem() {
     return boolItem;
@@ -134,7 +130,6 @@ public class TypeHolderDefault {
    * Get arrayItem
    * @return arrayItem
   **/
-
   @ApiModelProperty(required = true, value = "")
   public List<Integer> getArrayItem() {
     return arrayItem;
diff --git a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/TypeHolderExample.java b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/TypeHolderExample.java
index 701e4db843..812b5839aa 100644
--- a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/TypeHolderExample.java
+++ b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/TypeHolderExample.java
@@ -53,7 +53,6 @@ public class TypeHolderExample {
    * Get stringItem
    * @return stringItem
   **/
-
   @ApiModelProperty(example = "what", required = true, value = "")
   public String getStringItem() {
     return stringItem;
@@ -72,7 +71,6 @@ public class TypeHolderExample {
    * Get numberItem
    * @return numberItem
   **/
-
   @ApiModelProperty(example = "1.234", required = true, value = "")
   public BigDecimal getNumberItem() {
     return numberItem;
@@ -91,7 +89,6 @@ public class TypeHolderExample {
    * Get integerItem
    * @return integerItem
   **/
-
   @ApiModelProperty(example = "-2", required = true, value = "")
   public Integer getIntegerItem() {
     return integerItem;
@@ -110,7 +107,6 @@ public class TypeHolderExample {
    * Get boolItem
    * @return boolItem
   **/
-
   @ApiModelProperty(example = "true", required = true, value = "")
   public Boolean getBoolItem() {
     return boolItem;
@@ -134,7 +130,6 @@ public class TypeHolderExample {
    * Get arrayItem
    * @return arrayItem
   **/
-
   @ApiModelProperty(example = "[0, 1, 2, 3]", required = true, value = "")
   public List<Integer> getArrayItem() {
     return arrayItem;
diff --git a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/User.java b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/User.java
index 6e6c4ac102..73164c3ee2 100644
--- a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/User.java
+++ b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/User.java
@@ -59,7 +59,7 @@ public class User {
    * Get id
    * @return id
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public Long getId() {
     return id;
@@ -78,7 +78,7 @@ public class User {
    * Get username
    * @return username
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getUsername() {
     return username;
@@ -97,7 +97,7 @@ public class User {
    * Get firstName
    * @return firstName
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getFirstName() {
     return firstName;
@@ -116,7 +116,7 @@ public class User {
    * Get lastName
    * @return lastName
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getLastName() {
     return lastName;
@@ -135,7 +135,7 @@ public class User {
    * Get email
    * @return email
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getEmail() {
     return email;
@@ -154,7 +154,7 @@ public class User {
    * Get password
    * @return password
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getPassword() {
     return password;
@@ -173,7 +173,7 @@ public class User {
    * Get phone
    * @return phone
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public String getPhone() {
     return phone;
@@ -192,7 +192,7 @@ public class User {
    * User Status
    * @return userStatus
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "User Status")
   public Integer getUserStatus() {
     return userStatus;
diff --git a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/XmlItem.java b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/XmlItem.java
index 2af459e5ae..aa7ff22ccd 100644
--- a/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/XmlItem.java
+++ b/samples/client/petstore/java/native/src/main/java/org/openapitools/client/model/XmlItem.java
@@ -125,7 +125,7 @@ public class XmlItem {
    * Get attributeString
    * @return attributeString
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(example = "string", value = "")
   public String getAttributeString() {
     return attributeString;
@@ -144,7 +144,7 @@ public class XmlItem {
    * Get attributeNumber
    * @return attributeNumber
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(example = "1.234", value = "")
   public BigDecimal getAttributeNumber() {
     return attributeNumber;
@@ -163,7 +163,7 @@ public class XmlItem {
    * Get attributeInteger
    * @return attributeInteger
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(example = "-2", value = "")
   public Integer getAttributeInteger() {
     return attributeInteger;
@@ -182,7 +182,7 @@ public class XmlItem {
    * Get attributeBoolean
    * @return attributeBoolean
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(example = "true", value = "")
   public Boolean getAttributeBoolean() {
     return attributeBoolean;
@@ -209,7 +209,7 @@ public class XmlItem {
    * Get wrappedArray
    * @return wrappedArray
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public List<Integer> getWrappedArray() {
     return wrappedArray;
@@ -228,7 +228,7 @@ public class XmlItem {
    * Get nameString
    * @return nameString
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(example = "string", value = "")
   public String getNameString() {
     return nameString;
@@ -247,7 +247,7 @@ public class XmlItem {
    * Get nameNumber
    * @return nameNumber
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(example = "1.234", value = "")
   public BigDecimal getNameNumber() {
     return nameNumber;
@@ -266,7 +266,7 @@ public class XmlItem {
    * Get nameInteger
    * @return nameInteger
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(example = "-2", value = "")
   public Integer getNameInteger() {
     return nameInteger;
@@ -285,7 +285,7 @@ public class XmlItem {
    * Get nameBoolean
    * @return nameBoolean
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(example = "true", value = "")
   public Boolean getNameBoolean() {
     return nameBoolean;
@@ -312,7 +312,7 @@ public class XmlItem {
    * Get nameArray
    * @return nameArray
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public List<Integer> getNameArray() {
     return nameArray;
@@ -339,7 +339,7 @@ public class XmlItem {
    * Get nameWrappedArray
    * @return nameWrappedArray
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public List<Integer> getNameWrappedArray() {
     return nameWrappedArray;
@@ -358,7 +358,7 @@ public class XmlItem {
    * Get prefixString
    * @return prefixString
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(example = "string", value = "")
   public String getPrefixString() {
     return prefixString;
@@ -377,7 +377,7 @@ public class XmlItem {
    * Get prefixNumber
    * @return prefixNumber
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(example = "1.234", value = "")
   public BigDecimal getPrefixNumber() {
     return prefixNumber;
@@ -396,7 +396,7 @@ public class XmlItem {
    * Get prefixInteger
    * @return prefixInteger
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(example = "-2", value = "")
   public Integer getPrefixInteger() {
     return prefixInteger;
@@ -415,7 +415,7 @@ public class XmlItem {
    * Get prefixBoolean
    * @return prefixBoolean
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(example = "true", value = "")
   public Boolean getPrefixBoolean() {
     return prefixBoolean;
@@ -442,7 +442,7 @@ public class XmlItem {
    * Get prefixArray
    * @return prefixArray
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public List<Integer> getPrefixArray() {
     return prefixArray;
@@ -469,7 +469,7 @@ public class XmlItem {
    * Get prefixWrappedArray
    * @return prefixWrappedArray
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public List<Integer> getPrefixWrappedArray() {
     return prefixWrappedArray;
@@ -488,7 +488,7 @@ public class XmlItem {
    * Get namespaceString
    * @return namespaceString
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(example = "string", value = "")
   public String getNamespaceString() {
     return namespaceString;
@@ -507,7 +507,7 @@ public class XmlItem {
    * Get namespaceNumber
    * @return namespaceNumber
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(example = "1.234", value = "")
   public BigDecimal getNamespaceNumber() {
     return namespaceNumber;
@@ -526,7 +526,7 @@ public class XmlItem {
    * Get namespaceInteger
    * @return namespaceInteger
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(example = "-2", value = "")
   public Integer getNamespaceInteger() {
     return namespaceInteger;
@@ -545,7 +545,7 @@ public class XmlItem {
    * Get namespaceBoolean
    * @return namespaceBoolean
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(example = "true", value = "")
   public Boolean getNamespaceBoolean() {
     return namespaceBoolean;
@@ -572,7 +572,7 @@ public class XmlItem {
    * Get namespaceArray
    * @return namespaceArray
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public List<Integer> getNamespaceArray() {
     return namespaceArray;
@@ -599,7 +599,7 @@ public class XmlItem {
    * Get namespaceWrappedArray
    * @return namespaceWrappedArray
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public List<Integer> getNamespaceWrappedArray() {
     return namespaceWrappedArray;
@@ -618,7 +618,7 @@ public class XmlItem {
    * Get prefixNsString
    * @return prefixNsString
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(example = "string", value = "")
   public String getPrefixNsString() {
     return prefixNsString;
@@ -637,7 +637,7 @@ public class XmlItem {
    * Get prefixNsNumber
    * @return prefixNsNumber
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(example = "1.234", value = "")
   public BigDecimal getPrefixNsNumber() {
     return prefixNsNumber;
@@ -656,7 +656,7 @@ public class XmlItem {
    * Get prefixNsInteger
    * @return prefixNsInteger
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(example = "-2", value = "")
   public Integer getPrefixNsInteger() {
     return prefixNsInteger;
@@ -675,7 +675,7 @@ public class XmlItem {
    * Get prefixNsBoolean
    * @return prefixNsBoolean
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(example = "true", value = "")
   public Boolean getPrefixNsBoolean() {
     return prefixNsBoolean;
@@ -702,7 +702,7 @@ public class XmlItem {
    * Get prefixNsArray
    * @return prefixNsArray
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public List<Integer> getPrefixNsArray() {
     return prefixNsArray;
@@ -729,7 +729,7 @@ public class XmlItem {
    * Get prefixNsWrappedArray
    * @return prefixNsWrappedArray
   **/
-  @javax.annotation.Nullable 
+  @javax.annotation.Nullable
   @ApiModelProperty(value = "")
   public List<Integer> getPrefixNsWrappedArray() {
     return prefixNsWrappedArray;

From 652b14c28f6827e03416d9889162aab5f1d978d7 Mon Sep 17 00:00:00 2001
From: William Cheng <wing328hk@gmail.com>
Date: Fri, 26 Jul 2019 20:21:38 +0800
Subject: [PATCH 62/62] Add drone.io CI for Java 11 test (#3472)

* add drone.yml

* use maven wrapper instead

* break the build

* Revert "break the build"

This reverts commit 69769d6cadd4c25ea5e8c5ed2bc5115ec29b0ecb.

* add drone.io badge to README

* update wording
---
 CI/.drone.yml |  9 +++++++++
 README.md     |  2 ++
 pom.xml       | 14 ++++++++++++++
 3 files changed, 25 insertions(+)
 create mode 100644 CI/.drone.yml

diff --git a/CI/.drone.yml b/CI/.drone.yml
new file mode 100644
index 0000000000..d45a1a431e
--- /dev/null
+++ b/CI/.drone.yml
@@ -0,0 +1,9 @@
+kind: pipeline
+name: default
+
+steps:
+- name: test
+  image: hirokimatsumoto/alpine-openjdk-11	
+  commands:
+  - ./mvnw clean install
+  - ./mvnw --quiet verify -Psamples.droneio
diff --git a/README.md b/README.md
index 8638a77f80..e56010617b 100644
--- a/README.md
+++ b/README.md
@@ -6,11 +6,13 @@
 [![Integration Test2](https://circleci.com/gh/OpenAPITools/openapi-generator.svg?style=shield)](https://circleci.com/gh/OpenAPITools/openapi-generator)
 [![Run Status](https://api.shippable.com/projects/5af6bf74e790f4070084a115/badge?branch=master)](https://app.shippable.com/github/OpenAPITools/openapi-generator)
 [![Windows Test](https://ci.appveyor.com/api/projects/status/github/openapitools/openapi-generator?branch=master&svg=true&passingText=Windows%20Test%20-%20OK&failingText=Windows%20Test%20-%20Fails)](https://ci.appveyor.com/project/WilliamCheng/openapi-generator-wh2wu)
+[![JDK11 Build](https://cloud.drone.io/api/badges/OpenAPITools/openapi-generator/status.svg?ref=refs/heads/master)](https://cloud.drone.io/OpenAPITools/openapi-generator)
 
 [`5.0.x`](https://github.com/OpenAPITools/openapi-generator/tree/5.0.x) branch: [![Build Status](https://img.shields.io/travis/OpenAPITools/openapi-generator/5.0.x.svg?label=Integration%20Test)](https://travis-ci.org/OpenAPITools/openapi-generator)
 [![Integration Test2](https://circleci.com/gh/OpenAPITools/openapi-generator/tree/5.0.x.svg?style=shield)](https://circleci.com/gh/OpenAPITools/openapi-generator)
 [![Run Status](https://api.shippable.com/projects/5af6bf74e790f4070084a115/badge?branch=5.0.x)](https://app.shippable.com/github/OpenAPITools/openapi-generator)
 [![Windows Test](https://ci.appveyor.com/api/projects/status/github/openapitools/openapi-generator?branch=5.0.x&svg=true&passingText=Windows%20Test%20-%20OK&failingText=Windows%20Test%20-%20Fails)](https://ci.appveyor.com/project/WilliamCheng/openapi-generator-wh2wu)
+[![JDK11 Build](https://cloud.drone.io/api/badges/OpenAPITools/openapi-generator/status.svg?ref=refs/heads/5.0.x)](https://cloud.drone.io/OpenAPITools/openapi-generator)
 </div>
 
 <div align="center">
diff --git a/pom.xml b/pom.xml
index 0f999b90f0..1a3522d83f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1244,6 +1244,20 @@
                 <module>samples/server/petstore/spring-mvc-j8-localdatetime</module>
             </modules>
         </profile>
+        <!-- test with JDK11 in drone.io -->
+        <profile>
+            <id>samples.droneio</id>
+            <activation>
+                <property>
+                    <name>env</name>
+                    <value>samples.droneio</value>
+                </property>
+            </activation>
+            <modules>
+                <!-- clients -->
+                <module>samples/client/petstore/java/native</module>
+            </modules>
+        </profile>
         <!-- test with Haskell -->
         <profile>
             <id>samples.misc</id>