From a8642dbdfc1f6d29cc755084db5884ec2b9b1f59 Mon Sep 17 00:00:00 2001 From: Maxim Zinchenko <32897132+MZinchenko@users.noreply.github.com> Date: Mon, 27 Nov 2017 13:30:39 +0300 Subject: [PATCH] [Java][Spring][Server] Issue #4680 (#6890) * Issue #4680 correct values for enum with escaped double quotes * Issue #4680 regenerate samples * Issue #4680 remove new lines * Issue #4680 fixed scripts * Issue #4680 update samples under CentOS --- bin/windows/java-petstore-okhttp-gson.bat | 2 +- bin/windows/java-petstore.bat | 2 +- .../java-play-framework-petstore-server.bat | 2 +- .../java-vertx-async-petstore-server.bat | 2 +- bin/windows/java-vertx-rx-petstore-server.bat | 2 +- .../spring-mvc-petstore-j8-async-server.bat | 2 +- bin/windows/spring-mvc-petstore-server.bat | 2 +- bin/windows/springboot-petstore-server.bat | 2 +- .../resources/JavaSpring/pathParams.mustache | 2 +- .../docs/images/interoperating_containers.png | Bin 35971 -> 36121 bytes .../docs/images/priority.png | Bin 22949 -> 23031 bytes .../docs/images/side_by_side_containers.png | Bin 22519 -> 22624 bytes .../public/swagger.json | 4 +- .../public/swagger.json | 16 ++++---- .../public/swagger.json | 4 +- .../public/swagger.json | 4 +- .../public/swagger.json | 4 +- .../public/swagger.json | 4 +- .../java-play-framework/public/swagger.json | 4 +- .../java-vertx/async/.swagger-codegen/VERSION | 2 +- .../io/swagger/server/api/model/Order.java | 2 +- .../java/io/swagger/server/api/model/Pet.java | 4 +- .../async/src/main/resources/swagger.json | 7 ++-- .../java-vertx/rx/.swagger-codegen/VERSION | 2 +- .../io/swagger/server/api/model/Order.java | 2 +- .../java/io/swagger/server/api/model/Pet.java | 4 +- .../rx/src/main/resources/swagger.json | 7 ++-- .../docs/images/interoperating_containers.png | Bin 35971 -> 36121 bytes .../docs/images/priority.png | Bin 22949 -> 23031 bytes .../docs/images/side_by_side_containers.png | Bin 22519 -> 22624 bytes .../src/main/java/io/swagger/model/Order.java | 2 +- .../src/main/resources/config/swagger.json | 36 ++++++++++-------- 32 files changed, 66 insertions(+), 60 deletions(-) diff --git a/bin/windows/java-petstore-okhttp-gson.bat b/bin/windows/java-petstore-okhttp-gson.bat index 58b3edef39e..2b61d1decbd 100755 --- a/bin/windows/java-petstore-okhttp-gson.bat +++ b/bin/windows/java-petstore-okhttp-gson.bat @@ -5,6 +5,6 @@ If Not Exist %executable% ( ) REM set JAVA_OPTS=%JAVA_OPTS% -Xmx1024M -set ags=generate -i modules\swagger-codegen\src\test\resources\2_0\petstore.yaml -l java -o samples\client\petstore\java --library=okhttp-gson -DdateLibrary=joda,hideGenerationTimestamp=true +set ags=generate -i modules\swagger-codegen\src\test\resources\2_0\petstore-with-fake-endpoints-models-for-testing.yaml -l java -o samples\client\petstore\java --library=okhttp-gson -DdateLibrary=joda -DhideGenerationTimestamp=true java %JAVA_OPTS% -jar %executable% %ags% diff --git a/bin/windows/java-petstore.bat b/bin/windows/java-petstore.bat index e68f7219914..dfcb8393335 100755 --- a/bin/windows/java-petstore.bat +++ b/bin/windows/java-petstore.bat @@ -5,6 +5,6 @@ If Not Exist %executable% ( ) REM set JAVA_OPTS=%JAVA_OPTS% -Xmx1024M -set ags=generate -i modules\swagger-codegen\src\test\resources\2_0\petstore.yaml -l java -o samples\client\petstore\java -DdateLibrary=joda,hideGenerationTimestamp=true +set ags=generate -i modules\swagger-codegen\src\test\resources\2_0\petstore-with-fake-endpoints-models-for-testing.yaml -l java -o samples\client\petstore\java -DdateLibrary=joda -DhideGenerationTimestamp=true java %JAVA_OPTS% -jar %executable% %ags% diff --git a/bin/windows/java-play-framework-petstore-server.bat b/bin/windows/java-play-framework-petstore-server.bat index 058e54e5e79..f0011360a52 100644 --- a/bin/windows/java-play-framework-petstore-server.bat +++ b/bin/windows/java-play-framework-petstore-server.bat @@ -5,6 +5,6 @@ If Not Exist %executable% ( ) REM set JAVA_OPTS=%JAVA_OPTS% -Xmx1024M -set ags=generate -i modules\swagger-codegen\src\test\resources\2_0\petstore.yaml -l java-play-framework -o samples\server\petstore\java-play-framework +set ags=generate -i modules\swagger-codegen\src\test\resources\2_0\petstore.yaml -l java-play-framework -o samples\server\petstore\java-play-framework -DhideGenerationTimestamp=true java %JAVA_OPTS% -jar %executable% %ags% diff --git a/bin/windows/java-vertx-async-petstore-server.bat b/bin/windows/java-vertx-async-petstore-server.bat index 105eaa23687..8195b0664a4 100644 --- a/bin/windows/java-vertx-async-petstore-server.bat +++ b/bin/windows/java-vertx-async-petstore-server.bat @@ -5,6 +5,6 @@ If Not Exist %executable% ( ) REM set JAVA_OPTS=%JAVA_OPTS% -Xmx1024M -set ags=generate -i modules\swagger-codegen\src\test\resources\2_0\petstore.yaml -l java-vertx -o samples\server\petstore\java-vertx\async -DvertxSwaggerRouterVersion=1.2.0 +set ags=generate -i modules\swagger-codegen\src\test\resources\2_0\petstore.yaml -l java-vertx -o samples\server\petstore\java-vertx\async -DvertxSwaggerRouterVersion=1.2.0 -DhideGenerationTimestamp=true java %JAVA_OPTS% -jar %executable% %ags% diff --git a/bin/windows/java-vertx-rx-petstore-server.bat b/bin/windows/java-vertx-rx-petstore-server.bat index fc7b2397547..ee45c09eeae 100644 --- a/bin/windows/java-vertx-rx-petstore-server.bat +++ b/bin/windows/java-vertx-rx-petstore-server.bat @@ -5,6 +5,6 @@ If Not Exist %executable% ( ) REM set JAVA_OPTS=%JAVA_OPTS% -Xmx1024M -set ags=generate -i modules\swagger-codegen\src\test\resources\2_0\petstore.yaml -l java-vertx -o samples\server\petstore\java-vertx\rx -DvertxSwaggerRouterVersion=1.2.0,rxInterface=true +set ags=generate -i modules\swagger-codegen\src\test\resources\2_0\petstore.yaml -l java-vertx -o samples\server\petstore\java-vertx\rx -DvertxSwaggerRouterVersion=1.2.0 -DrxInterface=true java %JAVA_OPTS% -jar %executable% %ags% diff --git a/bin/windows/spring-mvc-petstore-j8-async-server.bat b/bin/windows/spring-mvc-petstore-j8-async-server.bat index b9c9745e8d9..9fc1c4e20d1 100644 --- a/bin/windows/spring-mvc-petstore-j8-async-server.bat +++ b/bin/windows/spring-mvc-petstore-j8-async-server.bat @@ -5,6 +5,6 @@ If Not Exist %executable% ( ) REM set JAVA_OPTS=%JAVA_OPTS% -Xmx1024M -set ags=generate -i modules\swagger-codegen\src\test\resources\2_0\petstore.yaml -l spring --library=spring-mvc -o samples\server\petstore\spring-mvc-j8-async -c bin\spring-mvc-petstore-j8-async.json +set ags=generate -i modules\swagger-codegen\src\test\resources\2_0\petstore-with-fake-endpoints-models-for-testing.yaml -l spring --library=spring-mvc -o samples\server\petstore\spring-mvc-j8-async -c bin\spring-mvc-petstore-j8-async.json -DhideGenerationTimestamp=true java %JAVA_OPTS% -jar %executable% %ags% diff --git a/bin/windows/spring-mvc-petstore-server.bat b/bin/windows/spring-mvc-petstore-server.bat index 18975dead96..ebac66c3c15 100644 --- a/bin/windows/spring-mvc-petstore-server.bat +++ b/bin/windows/spring-mvc-petstore-server.bat @@ -5,6 +5,6 @@ If Not Exist %executable% ( ) REM set JAVA_OPTS=%JAVA_OPTS% -Xmx1024M -set ags=generate -i modules\swagger-codegen\src\test\resources\2_0\petstore.yaml -l spring --library=spring-mvc -o samples\server\petstore\spring-mvc +set ags=generate -i modules\swagger-codegen\src\test\resources\2_0\petstore-with-fake-endpoints-models-for-testing.yaml -c bin\spring-mvc-petstore-server.json -l spring --library=spring-mvc -o samples\server\petstore\spring-mvc -DhideGenerationTimestamp=true java %JAVA_OPTS% -jar %executable% %ags% diff --git a/bin/windows/springboot-petstore-server.bat b/bin/windows/springboot-petstore-server.bat index 4a9ca037c3b..886c6204371 100644 --- a/bin/windows/springboot-petstore-server.bat +++ b/bin/windows/springboot-petstore-server.bat @@ -5,6 +5,6 @@ If Not Exist %executable% ( ) REM set JAVA_OPTS=%JAVA_OPTS% -Xmx1024M -set ags=generate -i modules\swagger-codegen\src\test\resources\2_0\petstore.yaml -l spring -o samples\server\petstore\springboot +set ags=generate -i modules\swagger-codegen\src\test\resources\2_0\petstore-with-fake-endpoints-models-for-testing.yaml -l spring -o samples\server\petstore\springboot -DhideGenerationTimestamp=true java %JAVA_OPTS% -jar %executable% %ags% diff --git a/modules/swagger-codegen/src/main/resources/JavaSpring/pathParams.mustache b/modules/swagger-codegen/src/main/resources/JavaSpring/pathParams.mustache index f2b5c5b2ea8..e433fa121a8 100644 --- a/modules/swagger-codegen/src/main/resources/JavaSpring/pathParams.mustache +++ b/modules/swagger-codegen/src/main/resources/JavaSpring/pathParams.mustache @@ -1 +1 @@ -{{#isPathParam}}{{#useBeanValidation}}{{>beanValidationPathParams}}{{/useBeanValidation}}@ApiParam(value = "{{{description}}}"{{#required}},required=true{{/required}}{{#allowableValues}}, allowableValues = "{{#values}}{{{.}}}{{^-last}}, {{/-last}}{{#-last}}{{/-last}}{{/values}}"{{/allowableValues}}{{#defaultValue}}, defaultValue="{{{defaultValue}}}"{{/defaultValue}}) @PathVariable("{{baseName}}") {{>optionalDataType}} {{paramName}}{{/isPathParam}} \ No newline at end of file +{{#isPathParam}}{{#useBeanValidation}}{{>beanValidationPathParams}}{{/useBeanValidation}}@ApiParam(value = "{{{description}}}"{{#required}},required=true{{/required}}{{#allowableValues}}, allowableValues = "{{#enumVars}}{{#lambdaEscapeDoubleQuote}}{{{value}}}{{/lambdaEscapeDoubleQuote}}{{^-last}}, {{/-last}}{{#-last}}{{/-last}}{{/enumVars}}"{{/allowableValues}}{{#defaultValue}}, defaultValue="{{{defaultValue}}}"{{/defaultValue}}) @PathVariable("{{baseName}}") {{>optionalDataType}} {{paramName}}{{/isPathParam}} \ No newline at end of file diff --git a/samples/server/petstore-security-test/slim/vendor/container-interop/container-interop/docs/images/interoperating_containers.png b/samples/server/petstore-security-test/slim/vendor/container-interop/container-interop/docs/images/interoperating_containers.png index 9c672e16c72a08708ea5bdeb51757c2951d3ee66..eddc8a52906d53746438e09c9bdf2bc503902b6e 100644 GIT binary patch delta 1117 zcmW-gdrVVz6vxM_z%4(Dbk0)j)?Q%<)LEEd-9-?sAcaB8!o!IRMTA)7y;-{&-3kH~ z72Q>%5)32E#0L&@$%1Tu_*jN1YUT*qfy)+=WGsQrk!&*?W8bs;$LHicf9IV0`?Z|& zKX=|g#AC_NW}KQ`53cm{V^WP@ls`mkzyvgLd(a4|l%*_Z+(lpMXLovE^%n0uHn;Ta zkH)`dn7Bi>8~&TJ2Ba8*qbMaOBo90t@)UH0E`slK)!-CI_Bi<^@LPF07#`*ZPlOr4 zyJ2=Pne73)Sqb<%bAmPDS>W~XY$fCN<$cl7vAVZ$^+~rzT*LEB3{^b9!H*StsPj$B zexmcW%1W?R84J@Tr9i_xTfQOy;%`+MiISCTDZEXS3{4!?N>FNa8DzW6FOcYoi6wD6 z)=Ck|_%0}Y@tLrR(+SOBapDlj>8;=ny#Suk$ABaHqhQvWaWLwQC8Vj=#!*^^;U7>) zngO-R(QpXK`^h1_c_4;yv-Ym9s>iN8@?MKG{gPB`VjSbV>cJUH(4^|NVw-G$i3RJv zL%1&GOXNODF;jo9uTP~CWyS-b&o~c$vjIz!GTt(fqh9zBoE3Obo>m1mrqO;U(|Tl# ztGoI=6I~nCFr41l4I0vOKxcY;B;%gFGGW_fkEy%x@U_LldmT)Q$WUXGVnXH_)W4aj zBxQU{J(SI+cxt9*YZwVf*6u)vC+2y-08Al`+HD8#0o3*bH(aWG0rul|HwA>_3&KQsi%*kD+6`f z{??b7XfAw#!?wI*p}#B^S!n9%;zM9XNjo@OVgt>kEpXp2)lq}<+cgv{FIz!<^5vmq zOtf{8ab#CF%~e#@59LKw5V`)X4klZWeI2;L?tp2~-bo%|Z$5K z>Z8e#*f0S48WzB@#~O}PkKYP#|N_1h=#jQj0S?%W@C-v|9sQ;PM|4R1#u zpKzFl3;BiIBa+RYi96`PP|_z3BNg`Ur}vcPEC)|IQxuGwQZ$dG3d-il$le4djXT{G zR^-|X-f|g``P}s<4fylHhcwKMk58;*+^RObA->O0;p2~J?@!+vU0Mu$_js{tCmMC* ztxBJ}y%g;{{1}R*?I4Ou584Z;w#IW2${kN21&nqML@gK delta 889 zcmWO4jZ@Qg90%~ezm2Ca4+~~6h9C@fNTLGCm<&+30l@$_JcS61aUil_B0EJM3LOgL zN#x$Bnc*R!cShK}k9A~rJz#-IomLn@o+NP{6q0dg4;PWIzu|TEO`-9u;MAheN_FS* ztIoxYDwwZ8&7uj00*C96IYvwQrODij!@U7xy9+uNSC<~B|C&RQV+lqbD`~5fFT+mf z4D>obM5D_Jj`C8>^9-n5FJs0v0qfkX=yOwJ+RcO%_cGYsbKvYz1FJ_0Zh547@253KL9`eUO)fndqk^oOL3QNHI4L%g&YeNrWjN;LwBy?sQq);C{7HETCBy6hh% z!jFMOCxf;zx}#WTbTdTBXhCTZAugs&qyrF)D_))b;S) z`UuXkHDryAU?5E`HpMAmh}(;yxH2f>djh!m-5^40mqM)b^UVVv{9O@I&@MS{tv;1f83FCHCi23~8bt~E9HhN{7TtIE&Y4S{x3Q%hI(%cth$%|AynSq?zsb$J{}-{eBGnm4nDWu#A+dH}Ig!fJlpuUbB2CLQJ(L zkpJGGTYO@gJlO9$Es2?}%=9}kQLP=yRxImU$!JPMcXb1;Ijm;LtSQC&HHGl5jdthL z63ca!Mr!f$>V2N_YOM_S>&lT{A3=5Xe+p!2xGNypdQ#4Vo1X4e^hFd+Dp~`-n*D5K zbw!+aVz;aSkF6P$&^RW*rRjV6sp)k_g|;0G_LfVO(<&B_-##eeiu7lmN=wetUP&sn F{tpO$aoYd@ diff --git a/samples/server/petstore-security-test/slim/vendor/container-interop/container-interop/docs/images/priority.png b/samples/server/petstore-security-test/slim/vendor/container-interop/container-interop/docs/images/priority.png index 5760dc71b557fea7ec5bd5699adfd1c228b9cdec..d2ae7942a64fc82cea3b0569d1efffd8d884a269 100644 GIT binary patch delta 565 zcmZ3wneqE(Mvl$^KX+a(Dc+6jJDC`HCm&$C2PEe)rvph=mTio@n|HG$G6E?Xw!a`s zl7kbdY_k#<4-+#l7w=|$9#&?cQWO4EAUTs?3n+J(pAD#T@=1XsKu)h>_#9bRIU@mxu>8GBv}<(fI^*$@{C|(S1SDinXypt8+A`rAONnT&FPWS&ttQ0S=90Y*7qF2N~tS|(hHlRMq=^?m<=A1opA zRvgu_v8x}4$ns8JXi^VUuV5MsR9|d*4HO=p<|ZJA)>;6AYO=BAKA_M?%S#}c!`8Yi zK(P<@Pk@{&4y7P_J)O6J?EUMS2_)0pmI6s`cTi9lx&H)`*&aGTMbkahKta0Kdlok@ zm+#+ixl)xcm-0?d@UaDo&h;q*D&hCN1+w*}A22W`{|qoBiPQ@G2vjc}R0<>~1SJ8D m`xJB( delta 371 zcmaLO%`3xk90%~e-_4$yMx5qxi_O*~Yl}@|sBL8%CPOaB8pQ!kDRSYklfyd)BE&9M zYJK$6N*dY8g{>$nCkGA=Bt|Lz0*BY}^+_y7Od9R+y9*WSge=K%!5^?E3PUayC?y_c zq?PuQs(3kDiSnN8RdAZ z)@}qs0_K!c>B^$wkWg zaZWQ00!N*B3hU+pdNHRMjx6Q4vMi&^+DALqTSoIu7KV7UfHB({Y3vzB?=AIWXq}HF zZI5tT>OAH!yC$*ailM_D#-aNQ2ObmMcyuDSZLb44?=1O!_Y8*a sB-(o$|25b9iclbeTwsh^`_hcW{aOZnFpg~SiB1PH3~NK3$PU%~0zYSyr2qf` diff --git a/samples/server/petstore-security-test/slim/vendor/container-interop/container-interop/docs/images/side_by_side_containers.png b/samples/server/petstore-security-test/slim/vendor/container-interop/container-interop/docs/images/side_by_side_containers.png index 24ca03c7cfd77afd6bd70094bcd532e4aef9f8e9..f24d4b16b65eb4f86631d20e1ca03b154bc7b358 100644 GIT binary patch delta 792 zcmaiy?MqW(7{)m}rg`k1X2)>mY@2JoolRYCQ>QtnTP)vSlZk1GWd)HLvLTcrVt#PU zo?wtg(hCd;oGha3lh7B@#PuNvGfjwEfzwnZ1nYkK2m126&UL?BJkP_~on%&h%)#O6 z%G1Clz-UB21EY6BJaG0vAn!HS>&i`JMRWAORkCw9JZzc zu_wE5;d`2L9$070u{REkn+y4k7E(=2_stFH7&Gt+5Op zaxtS6$qO=Mj&K$ENH8A(?p)%Msb#RRc6q2T)DhF}2J%ZN!n0+ob-3)msEMJ{letP? zrcwI@h5XJrMzeHF$dJy8)ai}L>-yK>!0`=(K-2~a7OaM}qrlZv49rW$Ma|ul^;;J9 z-Jj)c1CRj&J;S=ejImj{r8M?teytQZv)JSEoXT@7?8V))Z+>*GX}sP`7u*Vk0?3zq z9>;g`x9MSmg?0331x03h%Uh;&G+vW~8kuikfbyixCT~%r1T6u&B sXa4u;@2WD=#pl&{S+ZWO$1G)y7Jod_SbqZ9TR(#=Xc)o9Y=cJh7uWRk<^TWy delta 601 zcmZ9`Pe{{Y7{GDfcRKSmr(3^b{+n}c)9KIICfm%RoAXbs>1nh!eobHJw=IS1YyGhZJnL?m7YXO9^256Bz!|d!&1Y+_c z)aK|3bSh#;*vUeF(D=yWb#-(G*s&b-;jp+S54=YwAVH~zQY8<)%4@K#lp#}D2{_ah z;8(jLqV{T-_0L3W@abIo!kv!Q=zxwde!soLMiMKhetvB0dTZ8l+PdJ-aC{tI&s7t+ zpXY#Ro)3mKuLwhD{$&C$3k*|y6;$(b=;8a|9d8q}vzhDGw$U>8hHqr2JGCnSxrG+& zEi@3E)us|$EQ(OPp}$Krn7wvIzTG1hiwEO{n$TS6$_B4cC@h;&4b&Ufp}<%J{YEn^ z8lS{5u4xo5n9{&!(!jEbgBPYg(3jY7u%wDYsMHO~<_wOxU$3pqJUH`h&oJ{N;_(Fb zIV?B-rdV9wK+tEg?JryNanI@{aM8Am@=7TYGVY+O!Uy6q6`reVA`q%>#zQsj0>WU> zejJwUC5(B8y1Q>(`Yh", "$" ] + "enum" : [ ">", "$" ], + "default" : "$" } }, { "name" : "enum_form_string", @@ -741,8 +741,8 @@ "type" : "array", "items" : { "type" : "string", - "default" : "$", - "enum" : [ ">", "$" ] + "enum" : [ ">", "$" ], + "default" : "$" } }, { "name" : "enum_header_string", @@ -760,8 +760,8 @@ "type" : "array", "items" : { "type" : "string", - "default" : "$", - "enum" : [ ">", "$" ] + "enum" : [ ">", "$" ], + "default" : "$" } }, { "name" : "enum_query_string", diff --git a/samples/server/petstore/java-play-framework-no-bean-validation/public/swagger.json b/samples/server/petstore/java-play-framework-no-bean-validation/public/swagger.json index 7b8017053a1..c54baaa89cf 100644 --- a/samples/server/petstore/java-play-framework-no-bean-validation/public/swagger.json +++ b/samples/server/petstore/java-play-framework-no-bean-validation/public/swagger.json @@ -112,8 +112,8 @@ "type" : "array", "items" : { "type" : "string", - "default" : "available", - "enum" : [ "available", "pending", "sold" ] + "enum" : [ "available", "pending", "sold" ], + "default" : "available" }, "collectionFormat" : "csv" } ], diff --git a/samples/server/petstore/java-play-framework-no-exception-handling/public/swagger.json b/samples/server/petstore/java-play-framework-no-exception-handling/public/swagger.json index 7b8017053a1..c54baaa89cf 100644 --- a/samples/server/petstore/java-play-framework-no-exception-handling/public/swagger.json +++ b/samples/server/petstore/java-play-framework-no-exception-handling/public/swagger.json @@ -112,8 +112,8 @@ "type" : "array", "items" : { "type" : "string", - "default" : "available", - "enum" : [ "available", "pending", "sold" ] + "enum" : [ "available", "pending", "sold" ], + "default" : "available" }, "collectionFormat" : "csv" } ], diff --git a/samples/server/petstore/java-play-framework-no-interface/public/swagger.json b/samples/server/petstore/java-play-framework-no-interface/public/swagger.json index 7b8017053a1..c54baaa89cf 100644 --- a/samples/server/petstore/java-play-framework-no-interface/public/swagger.json +++ b/samples/server/petstore/java-play-framework-no-interface/public/swagger.json @@ -112,8 +112,8 @@ "type" : "array", "items" : { "type" : "string", - "default" : "available", - "enum" : [ "available", "pending", "sold" ] + "enum" : [ "available", "pending", "sold" ], + "default" : "available" }, "collectionFormat" : "csv" } ], diff --git a/samples/server/petstore/java-play-framework-no-wrap-calls/public/swagger.json b/samples/server/petstore/java-play-framework-no-wrap-calls/public/swagger.json index 7b8017053a1..c54baaa89cf 100644 --- a/samples/server/petstore/java-play-framework-no-wrap-calls/public/swagger.json +++ b/samples/server/petstore/java-play-framework-no-wrap-calls/public/swagger.json @@ -112,8 +112,8 @@ "type" : "array", "items" : { "type" : "string", - "default" : "available", - "enum" : [ "available", "pending", "sold" ] + "enum" : [ "available", "pending", "sold" ], + "default" : "available" }, "collectionFormat" : "csv" } ], diff --git a/samples/server/petstore/java-play-framework/public/swagger.json b/samples/server/petstore/java-play-framework/public/swagger.json index 7b8017053a1..c54baaa89cf 100644 --- a/samples/server/petstore/java-play-framework/public/swagger.json +++ b/samples/server/petstore/java-play-framework/public/swagger.json @@ -112,8 +112,8 @@ "type" : "array", "items" : { "type" : "string", - "default" : "available", - "enum" : [ "available", "pending", "sold" ] + "enum" : [ "available", "pending", "sold" ], + "default" : "available" }, "collectionFormat" : "csv" } ], diff --git a/samples/server/petstore/java-vertx/async/.swagger-codegen/VERSION b/samples/server/petstore/java-vertx/async/.swagger-codegen/VERSION index 7fea99011a6..f9f7450d135 100644 --- a/samples/server/petstore/java-vertx/async/.swagger-codegen/VERSION +++ b/samples/server/petstore/java-vertx/async/.swagger-codegen/VERSION @@ -1 +1 @@ -2.2.3-SNAPSHOT \ No newline at end of file +2.3.0-SNAPSHOT \ No newline at end of file diff --git a/samples/server/petstore/java-vertx/async/src/main/java/io/swagger/server/api/model/Order.java b/samples/server/petstore/java-vertx/async/src/main/java/io/swagger/server/api/model/Order.java index 9e7d41ff04c..0eaaa46f352 100644 --- a/samples/server/petstore/java-vertx/async/src/main/java/io/swagger/server/api/model/Order.java +++ b/samples/server/petstore/java-vertx/async/src/main/java/io/swagger/server/api/model/Order.java @@ -99,7 +99,7 @@ public class Order { @JsonProperty("complete") - public Boolean getComplete() { + public Boolean isComplete() { return complete; } public void setComplete(Boolean complete) { diff --git a/samples/server/petstore/java-vertx/async/src/main/java/io/swagger/server/api/model/Pet.java b/samples/server/petstore/java-vertx/async/src/main/java/io/swagger/server/api/model/Pet.java index 8b3181be26e..e975a8dc2b2 100644 --- a/samples/server/petstore/java-vertx/async/src/main/java/io/swagger/server/api/model/Pet.java +++ b/samples/server/petstore/java-vertx/async/src/main/java/io/swagger/server/api/model/Pet.java @@ -18,8 +18,8 @@ public class Pet { private Long id = null; private Category category = null; private String name = null; - private List photoUrls = new ArrayList(); - private List tags = new ArrayList(); + private List photoUrls = new ArrayList<>(); + private List tags = new ArrayList<>(); public enum StatusEnum { diff --git a/samples/server/petstore/java-vertx/async/src/main/resources/swagger.json b/samples/server/petstore/java-vertx/async/src/main/resources/swagger.json index 25192459c61..fb60866f1b8 100644 --- a/samples/server/petstore/java-vertx/async/src/main/resources/swagger.json +++ b/samples/server/petstore/java-vertx/async/src/main/resources/swagger.json @@ -9,7 +9,7 @@ "email" : "apiteam@swagger.io" }, "license" : { - "name" : "Apache 2.0", + "name" : "Apache-2.0", "url" : "http://www.apache.org/licenses/LICENSE-2.0.html" } }, @@ -112,8 +112,8 @@ "type" : "array", "items" : { "type" : "string", - "default" : "available", - "enum" : [ "available", "pending", "sold" ] + "enum" : [ "available", "pending", "sold" ], + "default" : "available" }, "collectionFormat" : "csv" } ], @@ -173,6 +173,7 @@ "security" : [ { "petstore_auth" : [ "write:pets", "read:pets" ] } ], + "deprecated" : true, "x-contentType" : "application/json", "x-accepts" : "application/json" } diff --git a/samples/server/petstore/java-vertx/rx/.swagger-codegen/VERSION b/samples/server/petstore/java-vertx/rx/.swagger-codegen/VERSION index 7fea99011a6..f9f7450d135 100644 --- a/samples/server/petstore/java-vertx/rx/.swagger-codegen/VERSION +++ b/samples/server/petstore/java-vertx/rx/.swagger-codegen/VERSION @@ -1 +1 @@ -2.2.3-SNAPSHOT \ No newline at end of file +2.3.0-SNAPSHOT \ No newline at end of file diff --git a/samples/server/petstore/java-vertx/rx/src/main/java/io/swagger/server/api/model/Order.java b/samples/server/petstore/java-vertx/rx/src/main/java/io/swagger/server/api/model/Order.java index 9e7d41ff04c..0eaaa46f352 100644 --- a/samples/server/petstore/java-vertx/rx/src/main/java/io/swagger/server/api/model/Order.java +++ b/samples/server/petstore/java-vertx/rx/src/main/java/io/swagger/server/api/model/Order.java @@ -99,7 +99,7 @@ public class Order { @JsonProperty("complete") - public Boolean getComplete() { + public Boolean isComplete() { return complete; } public void setComplete(Boolean complete) { diff --git a/samples/server/petstore/java-vertx/rx/src/main/java/io/swagger/server/api/model/Pet.java b/samples/server/petstore/java-vertx/rx/src/main/java/io/swagger/server/api/model/Pet.java index 8b3181be26e..e975a8dc2b2 100644 --- a/samples/server/petstore/java-vertx/rx/src/main/java/io/swagger/server/api/model/Pet.java +++ b/samples/server/petstore/java-vertx/rx/src/main/java/io/swagger/server/api/model/Pet.java @@ -18,8 +18,8 @@ public class Pet { private Long id = null; private Category category = null; private String name = null; - private List photoUrls = new ArrayList(); - private List tags = new ArrayList(); + private List photoUrls = new ArrayList<>(); + private List tags = new ArrayList<>(); public enum StatusEnum { diff --git a/samples/server/petstore/java-vertx/rx/src/main/resources/swagger.json b/samples/server/petstore/java-vertx/rx/src/main/resources/swagger.json index 25192459c61..fb60866f1b8 100644 --- a/samples/server/petstore/java-vertx/rx/src/main/resources/swagger.json +++ b/samples/server/petstore/java-vertx/rx/src/main/resources/swagger.json @@ -9,7 +9,7 @@ "email" : "apiteam@swagger.io" }, "license" : { - "name" : "Apache 2.0", + "name" : "Apache-2.0", "url" : "http://www.apache.org/licenses/LICENSE-2.0.html" } }, @@ -112,8 +112,8 @@ "type" : "array", "items" : { "type" : "string", - "default" : "available", - "enum" : [ "available", "pending", "sold" ] + "enum" : [ "available", "pending", "sold" ], + "default" : "available" }, "collectionFormat" : "csv" } ], @@ -173,6 +173,7 @@ "security" : [ { "petstore_auth" : [ "write:pets", "read:pets" ] } ], + "deprecated" : true, "x-contentType" : "application/json", "x-accepts" : "application/json" } diff --git a/samples/server/petstore/slim/vendor/container-interop/container-interop/docs/images/interoperating_containers.png b/samples/server/petstore/slim/vendor/container-interop/container-interop/docs/images/interoperating_containers.png index 9c672e16c72a08708ea5bdeb51757c2951d3ee66..eddc8a52906d53746438e09c9bdf2bc503902b6e 100644 GIT binary patch delta 1117 zcmW-gdrVVz6vxM_z%4(Dbk0)j)?Q%<)LEEd-9-?sAcaB8!o!IRMTA)7y;-{&-3kH~ z72Q>%5)32E#0L&@$%1Tu_*jN1YUT*qfy)+=WGsQrk!&*?W8bs;$LHicf9IV0`?Z|& zKX=|g#AC_NW}KQ`53cm{V^WP@ls`mkzyvgLd(a4|l%*_Z+(lpMXLovE^%n0uHn;Ta zkH)`dn7Bi>8~&TJ2Ba8*qbMaOBo90t@)UH0E`slK)!-CI_Bi<^@LPF07#`*ZPlOr4 zyJ2=Pne73)Sqb<%bAmPDS>W~XY$fCN<$cl7vAVZ$^+~rzT*LEB3{^b9!H*StsPj$B zexmcW%1W?R84J@Tr9i_xTfQOy;%`+MiISCTDZEXS3{4!?N>FNa8DzW6FOcYoi6wD6 z)=Ck|_%0}Y@tLrR(+SOBapDlj>8;=ny#Suk$ABaHqhQvWaWLwQC8Vj=#!*^^;U7>) zngO-R(QpXK`^h1_c_4;yv-Ym9s>iN8@?MKG{gPB`VjSbV>cJUH(4^|NVw-G$i3RJv zL%1&GOXNODF;jo9uTP~CWyS-b&o~c$vjIz!GTt(fqh9zBoE3Obo>m1mrqO;U(|Tl# ztGoI=6I~nCFr41l4I0vOKxcY;B;%gFGGW_fkEy%x@U_LldmT)Q$WUXGVnXH_)W4aj zBxQU{J(SI+cxt9*YZwVf*6u)vC+2y-08Al`+HD8#0o3*bH(aWG0rul|HwA>_3&KQsi%*kD+6`f z{??b7XfAw#!?wI*p}#B^S!n9%;zM9XNjo@OVgt>kEpXp2)lq}<+cgv{FIz!<^5vmq zOtf{8ab#CF%~e#@59LKw5V`)X4klZWeI2;L?tp2~-bo%|Z$5K z>Z8e#*f0S48WzB@#~O}PkKYP#|N_1h=#jQj0S?%W@C-v|9sQ;PM|4R1#u zpKzFl3;BiIBa+RYi96`PP|_z3BNg`Ur}vcPEC)|IQxuGwQZ$dG3d-il$le4djXT{G zR^-|X-f|g``P}s<4fylHhcwKMk58;*+^RObA->O0;p2~J?@!+vU0Mu$_js{tCmMC* ztxBJ}y%g;{{1}R*?I4Ou584Z;w#IW2${kN21&nqML@gK delta 889 zcmWO4jZ@Qg90%~ezm2Ca4+~~6h9C@fNTLGCm<&+30l@$_JcS61aUil_B0EJM3LOgL zN#x$Bnc*R!cShK}k9A~rJz#-IomLn@o+NP{6q0dg4;PWIzu|TEO`-9u;MAheN_FS* ztIoxYDwwZ8&7uj00*C96IYvwQrODij!@U7xy9+uNSC<~B|C&RQV+lqbD`~5fFT+mf z4D>obM5D_Jj`C8>^9-n5FJs0v0qfkX=yOwJ+RcO%_cGYsbKvYz1FJ_0Zh547@253KL9`eUO)fndqk^oOL3QNHI4L%g&YeNrWjN;LwBy?sQq);C{7HETCBy6hh% z!jFMOCxf;zx}#WTbTdTBXhCTZAugs&qyrF)D_))b;S) z`UuXkHDryAU?5E`HpMAmh}(;yxH2f>djh!m-5^40mqM)b^UVVv{9O@I&@MS{tv;1f83FCHCi23~8bt~E9HhN{7TtIE&Y4S{x3Q%hI(%cth$%|AynSq?zsb$J{}-{eBGnm4nDWu#A+dH}Ig!fJlpuUbB2CLQJ(L zkpJGGTYO@gJlO9$Es2?}%=9}kQLP=yRxImU$!JPMcXb1;Ijm;LtSQC&HHGl5jdthL z63ca!Mr!f$>V2N_YOM_S>&lT{A3=5Xe+p!2xGNypdQ#4Vo1X4e^hFd+Dp~`-n*D5K zbw!+aVz;aSkF6P$&^RW*rRjV6sp)k_g|;0G_LfVO(<&B_-##eeiu7lmN=wetUP&sn F{tpO$aoYd@ diff --git a/samples/server/petstore/slim/vendor/container-interop/container-interop/docs/images/priority.png b/samples/server/petstore/slim/vendor/container-interop/container-interop/docs/images/priority.png index 5760dc71b557fea7ec5bd5699adfd1c228b9cdec..d2ae7942a64fc82cea3b0569d1efffd8d884a269 100644 GIT binary patch delta 565 zcmZ3wneqE(Mvl$^KX+a(Dc+6jJDC`HCm&$C2PEe)rvph=mTio@n|HG$G6E?Xw!a`s zl7kbdY_k#<4-+#l7w=|$9#&?cQWO4EAUTs?3n+J(pAD#T@=1XsKu)h>_#9bRIU@mxu>8GBv}<(fI^*$@{C|(S1SDinXypt8+A`rAONnT&FPWS&ttQ0S=90Y*7qF2N~tS|(hHlRMq=^?m<=A1opA zRvgu_v8x}4$ns8JXi^VUuV5MsR9|d*4HO=p<|ZJA)>;6AYO=BAKA_M?%S#}c!`8Yi zK(P<@Pk@{&4y7P_J)O6J?EUMS2_)0pmI6s`cTi9lx&H)`*&aGTMbkahKta0Kdlok@ zm+#+ixl)xcm-0?d@UaDo&h;q*D&hCN1+w*}A22W`{|qoBiPQ@G2vjc}R0<>~1SJ8D m`xJB( delta 371 zcmaLO%`3xk90%~e-_4$yMx5qxi_O*~Yl}@|sBL8%CPOaB8pQ!kDRSYklfyd)BE&9M zYJK$6N*dY8g{>$nCkGA=Bt|Lz0*BY}^+_y7Od9R+y9*WSge=K%!5^?E3PUayC?y_c zq?PuQs(3kDiSnN8RdAZ z)@}qs0_K!c>B^$wkWg zaZWQ00!N*B3hU+pdNHRMjx6Q4vMi&^+DALqTSoIu7KV7UfHB({Y3vzB?=AIWXq}HF zZI5tT>OAH!yC$*ailM_D#-aNQ2ObmMcyuDSZLb44?=1O!_Y8*a sB-(o$|25b9iclbeTwsh^`_hcW{aOZnFpg~SiB1PH3~NK3$PU%~0zYSyr2qf` diff --git a/samples/server/petstore/slim/vendor/container-interop/container-interop/docs/images/side_by_side_containers.png b/samples/server/petstore/slim/vendor/container-interop/container-interop/docs/images/side_by_side_containers.png index 24ca03c7cfd77afd6bd70094bcd532e4aef9f8e9..f24d4b16b65eb4f86631d20e1ca03b154bc7b358 100644 GIT binary patch delta 792 zcmaiy?MqW(7{)m}rg`k1X2)>mY@2JoolRYCQ>QtnTP)vSlZk1GWd)HLvLTcrVt#PU zo?wtg(hCd;oGha3lh7B@#PuNvGfjwEfzwnZ1nYkK2m126&UL?BJkP_~on%&h%)#O6 z%G1Clz-UB21EY6BJaG0vAn!HS>&i`JMRWAORkCw9JZzc zu_wE5;d`2L9$070u{REkn+y4k7E(=2_stFH7&Gt+5Op zaxtS6$qO=Mj&K$ENH8A(?p)%Msb#RRc6q2T)DhF}2J%ZN!n0+ob-3)msEMJ{letP? zrcwI@h5XJrMzeHF$dJy8)ai}L>-yK>!0`=(K-2~a7OaM}qrlZv49rW$Ma|ul^;;J9 z-Jj)c1CRj&J;S=ejImj{r8M?teytQZv)JSEoXT@7?8V))Z+>*GX}sP`7u*Vk0?3zq z9>;g`x9MSmg?0331x03h%Uh;&G+vW~8kuikfbyixCT~%r1T6u&B sXa4u;@2WD=#pl&{S+ZWO$1G)y7Jod_SbqZ9TR(#=Xc)o9Y=cJh7uWRk<^TWy delta 601 zcmZ9`Pe{{Y7{GDfcRKSmr(3^b{+n}c)9KIICfm%RoAXbs>1nh!eobHJw=IS1YyGhZJnL?m7YXO9^256Bz!|d!&1Y+_c z)aK|3bSh#;*vUeF(D=yWb#-(G*s&b-;jp+S54=YwAVH~zQY8<)%4@K#lp#}D2{_ah z;8(jLqV{T-_0L3W@abIo!kv!Q=zxwde!soLMiMKhetvB0dTZ8l+PdJ-aC{tI&s7t+ zpXY#Ro)3mKuLwhD{$&C$3k*|y6;$(b=;8a|9d8q}vzhDGw$U>8hHqr2JGCnSxrG+& zEi@3E)us|$EQ(OPp}$Krn7wvIzTG1hiwEO{n$TS6$_B4cC@h;&4b&Ufp}<%J{YEn^ z8lS{5u4xo5n9{&!(!jEbgBPYg(3jY7u%wDYsMHO~<_wOxU$3pqJUH`h&oJ{N;_(Fb zIV?B-rdV9wK+tEg?JryNanI@{aM8Am@=7TYGVY+O!Uy6q6`reVA`q%>#zQsj0>WU> zejJwUC5(B8y1Q>(`Yh