From ba2ccf788c9eb2bc953ed480fec29edc2dc8abfd Mon Sep 17 00:00:00 2001 From: Tony Tam Date: Sat, 4 Apr 2015 17:00:22 -0700 Subject: [PATCH] name rebuilds, tests --- .../swagger/codegen/DefaultGenerator.java | 9 ++++++++- .../languages/AndroidClientCodegen.java | 2 +- .../languages/AsyncScalaClientCodegen.java | 2 +- .../languages/CSharpClientCodegen.java | 2 +- .../codegen/languages/JavaClientCodegen.java | 2 +- .../codegen/languages/JaxRSServerCodegen.java | 2 +- .../codegen/languages/ScalaClientCodegen.java | 2 +- .../src/main/resources/JavaJaxRS/pom.mustache | 2 +- modules/swagger-generator/pom.xml | 2 +- samples/client/petstore/android-java/pom.xml | 4 ++-- .../java/io/swagger/client/api/PetApi.java | 8 ++++---- samples/client/petstore/java/pom.xml | 4 ++-- .../java/io/swagger/client/api/PetApi.java | 8 ++++---- samples/client/petstore/php/PetApi.php | 8 ++++---- samples/client/petstore/scala/pom.xml | 4 ++-- .../dynamic-html/docs/assets/images/logo.png | Bin 25467 -> 14577 bytes samples/html/index.html | 14 +++++++------- samples/server/petstore/jaxrs/pom.xml | 6 +++--- .../src/main/java/io/swagger/api/PetApi.java | 8 ++++---- 19 files changed, 48 insertions(+), 41 deletions(-) diff --git a/modules/swagger-codegen/src/main/java/com/wordnik/swagger/codegen/DefaultGenerator.java b/modules/swagger-codegen/src/main/java/com/wordnik/swagger/codegen/DefaultGenerator.java index 935ae8c103b..c3cc734e750 100644 --- a/modules/swagger-codegen/src/main/java/com/wordnik/swagger/codegen/DefaultGenerator.java +++ b/modules/swagger-codegen/src/main/java/com/wordnik/swagger/codegen/DefaultGenerator.java @@ -253,7 +253,14 @@ public class DefaultGenerator extends AbstractGenerator implements Generator { writeToFile(outputFilename, tmpl.execute(bundle)); files.add(new File(outputFilename)); } else { - InputStream in = new FileInputStream(config.templateDir() + File.separator + support.templateFile); + InputStream in = null; + + try { + in = new FileInputStream(config.templateDir() + File.separator + support.templateFile); + } + catch (Exception e) { + // continue + } if(in == null) { in = this.getClass().getClassLoader().getResourceAsStream(config.templateDir() + File.separator + support.templateFile); } diff --git a/modules/swagger-codegen/src/main/java/com/wordnik/swagger/codegen/languages/AndroidClientCodegen.java b/modules/swagger-codegen/src/main/java/com/wordnik/swagger/codegen/languages/AndroidClientCodegen.java index 3fda0a06d6c..b161814152c 100644 --- a/modules/swagger-codegen/src/main/java/com/wordnik/swagger/codegen/languages/AndroidClientCodegen.java +++ b/modules/swagger-codegen/src/main/java/com/wordnik/swagger/codegen/languages/AndroidClientCodegen.java @@ -9,7 +9,7 @@ import java.io.File; public class AndroidClientCodegen extends DefaultCodegen implements CodegenConfig { protected String invokerPackage = "io.swagger.client"; protected String groupId = "io.swagger"; - protected String artifactId = "swagger-client"; + protected String artifactId = "swagger-android-client"; protected String artifactVersion = "1.0.0"; protected String sourceFolder = "src/main/java"; diff --git a/modules/swagger-codegen/src/main/java/com/wordnik/swagger/codegen/languages/AsyncScalaClientCodegen.java b/modules/swagger-codegen/src/main/java/com/wordnik/swagger/codegen/languages/AsyncScalaClientCodegen.java index 19b9e0f2c76..d85fdc8f695 100644 --- a/modules/swagger-codegen/src/main/java/com/wordnik/swagger/codegen/languages/AsyncScalaClientCodegen.java +++ b/modules/swagger-codegen/src/main/java/com/wordnik/swagger/codegen/languages/AsyncScalaClientCodegen.java @@ -9,7 +9,7 @@ import java.io.File; public class AsyncScalaClientCodegen extends DefaultCodegen implements CodegenConfig { protected String invokerPackage = "io.swagger.client"; protected String groupId = "com.wordnik"; - protected String artifactId = "swagger-client"; + protected String artifactId = "swagger-async-scala-client"; protected String artifactVersion = "1.0.0"; protected String sourceFolder = "src/main/scala"; protected String clientName = "SwaggerClient"; diff --git a/modules/swagger-codegen/src/main/java/com/wordnik/swagger/codegen/languages/CSharpClientCodegen.java b/modules/swagger-codegen/src/main/java/com/wordnik/swagger/codegen/languages/CSharpClientCodegen.java index ffd2438de97..43a54f5478e 100644 --- a/modules/swagger-codegen/src/main/java/com/wordnik/swagger/codegen/languages/CSharpClientCodegen.java +++ b/modules/swagger-codegen/src/main/java/com/wordnik/swagger/codegen/languages/CSharpClientCodegen.java @@ -9,7 +9,7 @@ import java.io.File; public class CSharpClientCodegen extends DefaultCodegen implements CodegenConfig { protected String invokerPackage = "io.swagger.client"; protected String groupId = "io.swagger"; - protected String artifactId = "swagger-client"; + protected String artifactId = "swagger-csharp-client"; protected String artifactVersion = "1.0.0"; protected String sourceFolder = "src/main/csharp"; diff --git a/modules/swagger-codegen/src/main/java/com/wordnik/swagger/codegen/languages/JavaClientCodegen.java b/modules/swagger-codegen/src/main/java/com/wordnik/swagger/codegen/languages/JavaClientCodegen.java index 0e6abbc8f28..832f0a92329 100644 --- a/modules/swagger-codegen/src/main/java/com/wordnik/swagger/codegen/languages/JavaClientCodegen.java +++ b/modules/swagger-codegen/src/main/java/com/wordnik/swagger/codegen/languages/JavaClientCodegen.java @@ -9,7 +9,7 @@ import java.io.File; public class JavaClientCodegen extends DefaultCodegen implements CodegenConfig { protected String invokerPackage = "io.swagger.client"; protected String groupId = "io.swagger"; - protected String artifactId = "swagger-client"; + protected String artifactId = "swagger-java-client"; protected String artifactVersion = "1.0.0"; protected String sourceFolder = "src/main/java"; diff --git a/modules/swagger-codegen/src/main/java/com/wordnik/swagger/codegen/languages/JaxRSServerCodegen.java b/modules/swagger-codegen/src/main/java/com/wordnik/swagger/codegen/languages/JaxRSServerCodegen.java index f4aac0e74eb..e6447b9484b 100644 --- a/modules/swagger-codegen/src/main/java/com/wordnik/swagger/codegen/languages/JaxRSServerCodegen.java +++ b/modules/swagger-codegen/src/main/java/com/wordnik/swagger/codegen/languages/JaxRSServerCodegen.java @@ -12,7 +12,7 @@ import java.io.File; public class JaxRSServerCodegen extends JavaClientCodegen implements CodegenConfig { protected String invokerPackage = "io.swagger.api"; protected String groupId = "io.swagger"; - protected String artifactId = "swagger-server"; + protected String artifactId = "swagger-jaxrs-server"; protected String artifactVersion = "1.0.0"; protected String sourceFolder = "src/main/java"; protected String title = "Swagger Server"; diff --git a/modules/swagger-codegen/src/main/java/com/wordnik/swagger/codegen/languages/ScalaClientCodegen.java b/modules/swagger-codegen/src/main/java/com/wordnik/swagger/codegen/languages/ScalaClientCodegen.java index ffef50b76e4..36114982419 100644 --- a/modules/swagger-codegen/src/main/java/com/wordnik/swagger/codegen/languages/ScalaClientCodegen.java +++ b/modules/swagger-codegen/src/main/java/com/wordnik/swagger/codegen/languages/ScalaClientCodegen.java @@ -9,7 +9,7 @@ import java.io.File; public class ScalaClientCodegen extends DefaultCodegen implements CodegenConfig { protected String invokerPackage = "io.swagger.client"; protected String groupId = "com.wordnik"; - protected String artifactId = "swagger-client"; + protected String artifactId = "swagger-scala-client"; protected String artifactVersion = "1.0.0"; protected String sourceFolder = "src/main/scala"; protected String authScheme = ""; diff --git a/modules/swagger-codegen/src/main/resources/JavaJaxRS/pom.mustache b/modules/swagger-codegen/src/main/resources/JavaJaxRS/pom.mustache index dc11471b548..aa7ecf5ab48 100644 --- a/modules/swagger-codegen/src/main/resources/JavaJaxRS/pom.mustache +++ b/modules/swagger-codegen/src/main/resources/JavaJaxRS/pom.mustache @@ -129,7 +129,7 @@ - 1.5.3-M1-SNAPSHOT + 1.5.0-M2 9.2.9.v20150224 1.13 1.6.3 diff --git a/modules/swagger-generator/pom.xml b/modules/swagger-generator/pom.xml index 527dca732a6..5f99ae7cd72 100644 --- a/modules/swagger-generator/pom.xml +++ b/modules/swagger-generator/pom.xml @@ -95,7 +95,7 @@ 8079 stopit - 8002 + 8001 60000 diff --git a/samples/client/petstore/android-java/pom.xml b/samples/client/petstore/android-java/pom.xml index 003a4450b5b..7fbeb5245bd 100644 --- a/samples/client/petstore/android-java/pom.xml +++ b/samples/client/petstore/android-java/pom.xml @@ -2,9 +2,9 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> 4.0.0 io.swagger - swagger-client + swagger-android-client jar - swagger-client + swagger-android-client 1.0.0 scm:git:git@github.com:wordnik/swagger-mustache.git diff --git a/samples/client/petstore/android-java/src/main/java/io/swagger/client/api/PetApi.java b/samples/client/petstore/android-java/src/main/java/io/swagger/client/api/PetApi.java index 41e1427b3cd..2ecaae40c07 100644 --- a/samples/client/petstore/android-java/src/main/java/io/swagger/client/api/PetApi.java +++ b/samples/client/petstore/android-java/src/main/java/io/swagger/client/api/PetApi.java @@ -59,7 +59,7 @@ public class PetApi { String[] contentTypes = { - "application/json","application/xml" + "application/json","application/xml", }; String contentType = contentTypes.length > 0 ? contentTypes[0] : "application/json"; @@ -114,7 +114,7 @@ public class PetApi { String[] contentTypes = { - "application/json","application/xml" + "application/json","application/xml", }; String contentType = contentTypes.length > 0 ? contentTypes[0] : "application/json"; @@ -338,7 +338,7 @@ public class PetApi { String[] contentTypes = { - "application/x-www-form-urlencoded" + "application/x-www-form-urlencoded", }; String contentType = contentTypes.length > 0 ? contentTypes[0] : "application/json"; @@ -459,7 +459,7 @@ public class PetApi { String[] contentTypes = { - "multipart/form-data" + "multipart/form-data", }; String contentType = contentTypes.length > 0 ? contentTypes[0] : "application/json"; diff --git a/samples/client/petstore/java/pom.xml b/samples/client/petstore/java/pom.xml index efdc5f59dd2..82e70d8105b 100644 --- a/samples/client/petstore/java/pom.xml +++ b/samples/client/petstore/java/pom.xml @@ -2,9 +2,9 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> 4.0.0 io.swagger - swagger-client + swagger-java-client jar - swagger-client + swagger-java-client 1.0.0 scm:git:git@github.com:wordnik/swagger-mustache.git diff --git a/samples/client/petstore/java/src/main/java/io/swagger/client/api/PetApi.java b/samples/client/petstore/java/src/main/java/io/swagger/client/api/PetApi.java index 234cdadece2..842c080024a 100644 --- a/samples/client/petstore/java/src/main/java/io/swagger/client/api/PetApi.java +++ b/samples/client/petstore/java/src/main/java/io/swagger/client/api/PetApi.java @@ -57,7 +57,7 @@ public class PetApi { String[] contentTypes = { - "application/json","application/xml" + "application/json","application/xml", }; String contentType = contentTypes.length > 0 ? contentTypes[0] : "application/json"; @@ -107,7 +107,7 @@ public class PetApi { String[] contentTypes = { - "application/json","application/xml" + "application/json","application/xml", }; String contentType = contentTypes.length > 0 ? contentTypes[0] : "application/json"; @@ -315,7 +315,7 @@ public class PetApi { String[] contentTypes = { - "application/x-www-form-urlencoded" + "application/x-www-form-urlencoded", }; String contentType = contentTypes.length > 0 ? contentTypes[0] : "application/json"; @@ -429,7 +429,7 @@ public class PetApi { String[] contentTypes = { - "multipart/form-data" + "multipart/form-data", }; String contentType = contentTypes.length > 0 ? contentTypes[0] : "application/json"; diff --git a/samples/client/petstore/php/PetApi.php b/samples/client/petstore/php/PetApi.php index a972a5c995b..4cc555eeefc 100644 --- a/samples/client/petstore/php/PetApi.php +++ b/samples/client/petstore/php/PetApi.php @@ -47,7 +47,7 @@ class PetApi { if ($_header_accept !== '') { $headerParams['Accept'] = $_header_accept; } - $_header_content_type = array('application/json','application/xml'); + $_header_content_type = array('application/json','application/xml',); $headerParams['Content-Type'] = count($_header_content_type) > 0 ? $_header_content_type[0] : 'application/json'; @@ -96,7 +96,7 @@ class PetApi { if ($_header_accept !== '') { $headerParams['Accept'] = $_header_accept; } - $_header_content_type = array('application/json','application/xml'); + $_header_content_type = array('application/json','application/xml',); $headerParams['Content-Type'] = count($_header_content_type) > 0 ? $_header_content_type[0] : 'application/json'; @@ -310,7 +310,7 @@ class PetApi { if ($_header_accept !== '') { $headerParams['Accept'] = $_header_accept; } - $_header_content_type = array('application/x-www-form-urlencoded'); + $_header_content_type = array('application/x-www-form-urlencoded',); $headerParams['Content-Type'] = count($_header_content_type) > 0 ? $_header_content_type[0] : 'application/json'; @@ -420,7 +420,7 @@ class PetApi { if ($_header_accept !== '') { $headerParams['Accept'] = $_header_accept; } - $_header_content_type = array('multipart/form-data'); + $_header_content_type = array('multipart/form-data',); $headerParams['Content-Type'] = count($_header_content_type) > 0 ? $_header_content_type[0] : 'application/json'; diff --git a/samples/client/petstore/scala/pom.xml b/samples/client/petstore/scala/pom.xml index 0ccbebeb0df..b6dd4493a0b 100644 --- a/samples/client/petstore/scala/pom.xml +++ b/samples/client/petstore/scala/pom.xml @@ -2,9 +2,9 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> 4.0.0 com.wordnik - swagger-client + swagger-scala-client jar - swagger-client + swagger-scala-client 1.0.0 2.2.0 diff --git a/samples/dynamic-html/docs/assets/images/logo.png b/samples/dynamic-html/docs/assets/images/logo.png index 7a217967d009167cd41969270ef075ab07d8d3c7..209e5a473fc0fcb6dcda9eb4cb660f72008929fd 100644 GIT binary patch delta 14263 zcmV;oH%Q3)#sTqhA&F2 z93X%P&;TJILH3P~G_bR?0{`dreSZkD;Wa3?sq6ow{qGN${rsbS0YL2FV;{e0-*AZQ z06;hTMpCE%U^n%N?xjX<;!_Z_QlNnlmu}*~zi{Iw_W29&;bAe*Ut1SHywgXAI#|MQcIdY_U$Th<#GDYH z2=ceE`YkVuq#D})mNy4eEgT_cg`8(WG3HLc@pMe6lL5rMP`(zr$8wVo{ezSg3LR56>$&neqq!ZsYTJi~qLC6ugHX2>ioP ztX7;+T>I1hpAq9saK<=uoGDHUeH48Y-Gy#NKSDR78-O6X1>K15LEqiPzwP?d3mHl_ zy|U@yXkZDw=nrDHentH0??1d0^EczS1_o&cRbUTWMSxKFEPwd#9-OzV4*oAKF_7T{ zdkleG%fI9C+b)ba^sXw#5TgVA41J7Y$8ZBV%r@w81B@Pwfhv^#6UF}=jT{Kr@^KhObs40G+eGF_hRXbpW&Zg#`q_2;T}W zzz;-#B=m?fPy^aPADDn0z!o?HH?SM#a1aQG7Via#APJ;_3~&mZ0p~ywC;=7VD!2g} zKr?6souC`^f#+ZpOn^x+3+BOhu!bXQbP*H83b9Ar5N{+9 zi9lkIL?i{tK(di@$R(r_xsKdMT9HRcKk@>3gUle`kQEdfMUP@d@u9>~3MdVf0m>5P zi1I`QqM}d^KRWI?Q%ATnKI-E)#bi zSBtxk>&LyrE#dKaF1!q02XBif35 zrKzI1M>9Y(MYBrFL@P$CMQcmzM;lLjlD3q#iS{Y&B<(7JnIJ*XAvh932uXxILJgsV zFh*FQqoWh1)1=!;7fg4EE|2aS-9x%JbU*1?=%wk6=soCT=ugm>)8D6mLBBvG62*!7 zM1OZ8m3V?!No*&+BK}|?F~~DmF!(VXWGG;$XBc4k%t*^9#%RE}n=yegm+>a!Q^q+a zS|)KOBPKG_0j2_`+f2huOUxu@C1zXZaOOv7VKf{ zC)sbX53#Rs@NpP$_;VcNsNopkSmxy6)aUf)Oy{iSe9pPTCCFvM70Q*x)xb5*jp3H& z-pRd}`vP|d_Z$x^k2a4lPdd*Ho|n8RUTI!?-hI3!ygj^2eEfW7e35+leC>R5{D18H z`urjMIsEtdX9P$Bx&pxhIRY&L9|hS24Ftmk^8_CV&I|DhnG3}TT@vaQS{0TMb`nk& zt`!~^A&6**1c>B_w291%3W!>ZCW=;zz7(Ss(+~?1J1f>Dwk$3o?jn9fyg__gf>Xjm zB0-{BVoZ`KsV5mFSuFWX3MZu@6@MyqUaC(TC9NtQBwZl=R0buZCKD`kUZ!6bE2}9R zAzLgvEJrVAAQvlFE%!#AUEWGQS-wI3vx2CCyF!*im%=YaRmCvHQpHgv7Ns3Z$x2O1 z-;|}5eU%H8pQ#X4OjQo5G^%{vCbP|d+l6f-sw7ow)g!8Hs_Sa%Y815^wSO6PQFU+i zLiJ${Rt-CiOpS+{SWQFCgPP5nKeg1fs9HC)zG%y7hiX@8Pj8pl?!Ucs`#T+B9kR|P zoe5n*U2olsx)XXrdSty~y|?-z`hNOl`cno{1|bGl3_cqw8d3~z87>=X8SOW^Z;UoJ zGfp?|HDNJvGC61R%2e1i(0{brblyzWY@gYEbF8_gd6xOG1)qhlMWx034)q=TcRaA9 zw{);PXZhAj+KOV;WR0@kVSU^ie+(nHlF&11+@!ZXhE(QfYDVY}~oF?x}`ZhB+AUA(Kj*T}ZyV)BxY zg-@Z+yswe(S>IVdeZL&P8GjxBZ2zeMoq+6s=|G*p(}6QVdO^8CbHPTz=Yqe6n1>XF zEQi{LmWOVHxrEh*(|?3}hu@B1i3p8&u!nz7+@AhOnaH%ri72h8Gg0#tOG;TZ673n? zNM(gZZcmJ4%;A_fvAVGZu|M`Y@4Xqv92XJS6E7WqEPg7%G~x0-%s$_JZHYpONr`Xv z8|=Sy06E}upzWZ@!PJA3hs+LDBoUHAlb$3iCTAxvrnsaurGN6J9!h<8*z9n18bcZ- zZTN`xk)orRqrpdekEtBXKlUr#Fa2?bVn%MpTBdL2&&CvZMj8f31?%@PUKnTHRg-vpUPi57j*7< zfnh;yA#dTa!hhxSe&+`+=wGNQ;w#E1TDcf}apaQOrTSv=;@lEkNo>i7Qs>gH%Nmy} z%ec!j%GS#x$|ox9D;`v;S5{W>R-LRyRmW7%T=BTlch&f6V~t$RrCRpdjBDUp%(ai# zy{`}5u)NWBQ{!e$omgGrEz+&@dZa$Se!d~7VWQEkv48*ej@xZb+D*6a$lob%7HTfI z%XatVJ;J@zdmAkYElc+!@6WXcw!UlgY8!2LZGZM)=Y!r3%Z`Vgrk(9w23;)=bsjc9 z(t33JvBu+uZnf_E9@U;(PgI}W>Q(Elf2#hpu}`zFsegO_y#c*})Ele}xvzL%6~C5xT|1#Rarce!o1V80 zZ%5zxzMFj?{eEpS^#k!k?v%h(<+Sp2^Ni_C-^X1aCubvPSLf0`F@GxjEcvLuavJF-!d1t7Rnd5Ew(M$Exr04{(W^h{eK77kBXlfKf6|3R;E_>uHo16)}_{) zep&t++X&y-h$K_UTeSch-cbPo0DLQl`yw|0NPPeh82;KDZ82cEi$D&7>P7P^IjOHt?+uFI?V|1K!)%AGvQTlTR!-gG3w~Wh83Qe=k(#?}C_U)ir zMpy+~``h^0`q}yI46=`KpgQh%N^?Hpa(~vf$gSMHc2~VevuE4xPOon7r{qDOVc$`| zxBj04eg%<&WkbwE1Hz7mUy113vlzue(TH}V#>HgD7VNzecQ1Y*VI~o^pZ|c)L9at8 zNma>%DZdW$rzssVI_h#PJpD*UX=c~)FDLm<*=J>Dcjqvkamvjy?&bh zfq{ZSzi0B#em?IQ${r?_iNjaEh zU#DJ9KbmR&ST}op?%JoDpKHEU%wPT5{%w9yW2tbN|Hs{x=r!G6TpJrO{#aNmZU<4I z5g{PP$Wde%C4)*qO~Tr$4OYf2SS#!#?igMT|AFQ_tp`DfFh@5FGXO9WnSVr?HCXIP zRMsJ$Dh$}OfXzDpun@|aY;<{g^2rKe ziuOv|lu61{DmP&!n5i+Ty-+XK2-8&40$Pu>v$uQbi0gdOZPGic?`fc6$ZGh-s2gTO zs;Q5ezB!-yn#JgjCd+)QIDcz*8$DZbJEGmv&e!&j9U2@?Qf8wUsB5vf zy)1D&@j?j_`{WbV_Uj$6IOuf9H;I~@mQs*<<8XJ{%u$A8D(P++`+qZwk9VHST2Aem;oL8IAfM%&c!5r#%X#XB+@iY|r;6E1%t{mC{P(bYsuEWvUTt#4?`ld- zX>I4VnH$8L%60a)g6sD;WHpxFu5aqPGtxYL_h$>?K5wghn@YRb15yX*nCl$wYJFJ! zDCcovw||e#6OCTUr+-3yy!~7QT!Y-t_@9dmNe(NFsJ_s8sXuBuW;5>oD)e>AL@~^V z_4k^S`#*F|bIyc*Y@L(%bm@!I{M&Cg7t6ml|M&(59%tTQzA%0t0armwq3yzwB8;%2>K3~w9wDJ2@l*1aRD`sc^svl9 zSwY$Ra%6c#zEr_nVNNkyNmJ>Ka)ye!%G+%xRdrQo)y}FLs(;eR*EG?b*DBC9(_YwK zq+_M?L$_4VUVm>xzutgisBE}kRA(GxqGqye+F%xMu5G?*ad*c7OMNR~)n=V)V{S{d zeP&mne0qGZ_?_~P z32+P42@(p%2G4{%3B4Y6COkgEbB|%9OcWOdPg#n7OMiVD(-d2>HzO`8-YG$2A6Fuh zxN-nFNPCDSi91;&MJ83{uvVJ>5!0iV$L!KQGbouyj~AV|d9w4=aMon@m($BRYiEAt z{>mfdE1q*JNG+^6KU@SZN?fuorj+ECHeP;Fwo#!}=~s2Oy5}mW*;X5T?ZWlJoA|oz zx1#DVH-8M@rft%?6WV<4?!$YF_XS$b+oIa@9<+44?ZQ5kdSv@JzPqAlyqEjw?!L7S&|G<-h2u=w-gX8iv;BimdPaB2XQ6a(M_&q(a80VtIP zKuj5~A1wgb5dm=21Sqb2fV7jwjnhJQQDFmMv?8lQs|xQZAfp~z|ECh{Cv zMscI`P<}9*uAxTY-c1VafZmU;KtIC(j6B8zla6V^e8lo#t+7eiChQ_k5f_fTg8PJ5 z#K+=WXb3cJG}W{yS`XSg1U^CvoOyQ94bwZ(4-s97V+=kFGmKG;D@>`(jLZcrk}UNk z6Mxck)*#k3wrqB3_6HnZ9IKppT*vC}+yy=o{2mv66dZ;yM#}_E8fD4`>`LP2xz-N@Y2me?;tPeY$bR$bWGv zT&0Gyt8$8R@8mNSoVlQR(Wf}8w6koZQn&ix)z)j68)kLK>Wdn0H9cwm*g|YoZx8LL z?E3cDq~~JqLch^q#`EqG)JyrXov*?slHO*&zxbhZ`qRhnb8kLho%j5@xIkTe{at%G z^T)Fl=2eTe{p(e~hPLJpCZGV%v47&=*+B=Gg{K1BkpLtMse}9cUnnt@6)FZ*gnEQp zgnM=ybRxPMJ&K`&>&hNXF=hx$hc&>)W9zX?I5k{6?k*k+_tAy;IT{0+b2Q7eZnXCa zGK2y;M!Mtltn?R%GQ?&EJBBI7Bqjl-R%U+|B1;3wlNDhtXR~8lW3S?H=YJ$}wsY;{ zR^?vcxyeiAQ{`Lczax+&XfDJgG%8#!LKQUXZNH*ZsavjBre9`IZdhw{$M~Viu<4Z9 z4-3K$UP}cl18WDH0NXgbjDMZy?JFGW9NV1+ojidc3F<%nY(AL^2X2YDMX*oEAqaiS%1P_`m=1J;z?D@ zmAaamYgIQY>dNXf8zY__G2{cz?!r95jOW2s5IOL?RcEF61jb*Rh1>I8~@oGy~cI9gDt-evjeB zIAgLfPhi|Fu$kB)oG>m5*A7omqVWSX>NF*^?6g?~HbN1d65R-WDp8d<%}~VX%EZbv zz?{S4N)jS{W9?$Q#D0*&mvaY~8n-wP4=;&#o$mvGzd);CoqtfZaG6M{Xt~%`@dk-b z$q}hp=?z&{IVpKP1t-NYrNhcaDtER`sL`k^Yj|m%(7LBRuOp)CqL-=PX7IyE+IY7~ zu4$h+(ZXg&w&e?J5t}`>EjyX*Jsrv%7o3e<@?5{V+wH3J6xe;z8%s{|`Ru3RpAyg) zBoG`G(hhO$QWk7?h_9Ty$nyH76h)czj_0}j1Rc1#&MygP07=)q%? z8HSmcP9P`!PCd$2JY8^xHaFqym;AtU?+Sg+zbmr8c)wV&W>=a$`yp^PQ5r>i2r@2e;9*S9k2}Tz`F7@z}M8@TB8uQor87+OvkC zh!NozPe)_N*}91K8k01Qab;)n}P z&-C&7ef@vBU%!6cLw)M;_qg`2J;DKckI=bKCgH$7T6?J-?4z}h)?VVkUZQnhw)PTQ z>|P?aLM!E>D)+dl3YcH$_uA$Ya%&21zStvodj~BbMCq_-nyP4uieHzeXtJbfvi?NT zu~6|#QF@obFci&D6icxjZfKg(D4IOMdxDy#?Kywsx*9FQRr~{AHJ2)?#k?wuid@p9 zk|IeiMN(t{rs{u)K>*m45d&Gk28{8`vNXd|9OvTP4C`h%fpYs8JRx$qQN(8AZoTVD zwANd{OD?NYNh{^#VqOu8iY#ifs4A+<-8(^7>!iI zU&w@sZ$=kqdeGdhIXM~s6c;5b<-D3(6}f*U259-itS`iJUW|CUm~|6syN?z|enr+G zNx2oNkd`4#vRpO(o1tnB85^;U%rP)3vJ1mtxuE3IGDOWAWc*Ri8(?Ub?jAYYJ+yRr zf?k(TN!g^B&q`vMsCE`fvcYgCqo8=H3|&S=C%m>S`9e&nSMc;eMd^yZad*(d_=JD) zBbQM!i{*S;7Rwloj8Uno({mCB+j$vXrK+l>f=enYYiT7AW`cbJx<`s3`sXfQJB^mX zi(*zuFP3x5Qn?J}ZWpV+P0^UbDMck+Qgc})6yZVxJO(zTAw9ruTsw*uL`o^EtBX>4 zsa(!$XurEr<)+I-_pIcVR8d1W5bA&D!uxpy8dL#IexFRp(iq`j#7wa}!*vbs23g7q1_BC&dOOi^?gt#znoO3MjJ zA!{42mJ7pJa;}8hMnHL&&55 zPtBHKvLQ|cP6Or)TBtcRz@^zD93`BlutQw!V76ew(v5ODp#$bUhQTEYOwsVI9(J=>hF=UqFoMSXebv|XdGfraS*Wf&>~8p znw&1e5(xVCFEaEXm}448duVB{l^f;kin1?NW}GVbU`uvMN+(KAwdB^( zf`DW3H<{?})!z!|cIgHynaNo(w<^O~sC^PzLwA zdZRpC-r89SYZ@)^5O%PY8%4PU-P9Sdbaxsp;PH>fMo0R_eBJ;{a|T!d?}_JsoGz?6 z%DZ*Wqujnw^say7_hSEoj+RSOrCf1sc47KP>c(1e4bIoN+QVr*HD+L7n%jrH60O^O zn??)bluL@)RT=L8j#LBk6!He|IC97BNAKth#{=FF3nMnkoBV^nD?L*O0uT(!@v`ZWeeG^kdhi{rZ{>`6$eSUS(5x`uED>Ya0^fJ0%> z?fbJ+AG&|zmb-hy{VW`aYMKCP?VY@cicvF?fDD%9W8r}}-F(mc-}+I%+fy5-1)`um z=QGk;3aVL){X`RJp$Mg{z{>8FKa8v?cb&NJ4ae?s^WLp0@4OwmrlbbEa|_h%9HE~2wVK`5+l-e^g0Ir+AL;B!R0z&bdO=2lx=s<1t7Q7%;?9-Qc!96<|$ zH9jyoK6u!|BPfBFW?wl!b9N=OM4SawHIvUaX#SSuO$9MkNTyR?`_Y%M%av!@XsG|D z(PMuHM~-eN9qXBm#}AChCtjL9%Q4L~?kz~c3}JPl6zJtzSg^2*7Wf4lWnr!LKG#A# zy11$M0n6}?_WRTekA3Hv|5=5tMv?XXiCRg9qS0bUZzcxX?v= z{5|iz`%m9|{FGUVatr>+_<=LmUa}-_Er@@r7%o?T&j818PK}@tugnT|fnpkDDQBCY zE%u|EfZ~qLJWXc4W!Y%a0>=h@J(d`Y%d_x71n(@*cPxm$F)x<0c`I5y;a(V{Dk9h> zJ*XcRZ}Y274=c9Na>*(j+1n)1lH7mI2oNvJ!*q5T$6r_;?r;z-DV_OU0ZeYhLhJ6h%vf zW`j_y3u`KN7Byw4*&Z#l^+E=RRyetig%*VoqIS&2i3m=O4b8I89AAZvsQQ1RT{sfO z$^IFcK^1^YOLaNhglwSYa*_Q!PLjG#QwOr#rnYup*Xy4grxu-IJ|kl%j{R#pv|z>+ zwL(s|pJQ7wJ8TuSNgIYPn=#vpM$?6?)ReF6HfUjJ5%V};$$?dBOU2MsYg_BCs~856 z*lcT|7Qs4?Y9lrCglL9kwY+}@mkqngwuuOamT?>w-0+>g$T~<3ToTS-a=xf0NymsH zm#t}F6>xOiGV;d(I8firb`xv4)!}W>f@uUJVe5;X)rD0;=xG=hOIg;^;X}IXV1dYD zDPJMgxIxR}Sg1t~Q->}WC&bxjua#dGDiuX57iFzt2eQ0wJ*atc?p1%ye5*j%@P$%sYXyzag6QMmrBXq4a-yZvj{|6e{t!o7t(2KU z)^Uz(!>~H9sdR4D@|dORkT2-?unIB2(1o3PHhbAdXn|t6OpZdeklua}t4Sk$qa0tg zzAnikjHvtP$Dea6_~xaxB#r1-12< zqv_H9NsCsvnn|u?Q#-I&+?aF_u$)~xQ0e5*P>v^r0OK#q|uerv@Av^{p=-#C><4I5iNAuI5+s zrF>oYLNE?%yC)`3-2b|Fo;YwDl-cD>ikxd*PuW7YeWBjFZ+*+XC+{DM#54JHu9!1V z{?Hk&=F(Ar_|WJv6FIJszvt-qEzv+2=eqJ7$Fn?;YqK#!7&s3dA}*okqUzsQHE?Sb zR98PKx{-eXTGLp=;G;+If9#=8jPy_NEa!211rDnZW>8!gub=(FufGc~c=(@J(u1eB zA3XWN`~NZ)8AM};XVSfkSHJxI&s|PjwJeN5s(4=bz^M=2dHj@{cVnPEb^AM>IsL@H zKk;vnWlLGe_Sop*kG$jKL$NV9V!-?3)a?&^_0fONpP6~3GXI03fn&12|J)--#&4b) z-fYb%cVu9)FA{&->mPzp-dLLc%zu8mwunjs(0#}61vX}4kudBDeB^)6O z!SBT2;g3A{@!mkh+_Qn0M0)8fkA8k8anYOuB-ie` z>u-?5_OG@Qad7#UFa7+pkNm^Mxl6=3!jylLq>9H6+&0obY3`uV_79I9J2HCIi~&X+ z;P=L3ZwBj48MpxOohMH53}fa66r4k2N2i8wGD|1!Ck79lJa`h{aj4_~VnEU>H!ghk zTc7#W*{94Un&VXN+qto?W^RoZ8H&v{ZHJ!vX_Kpqk397s=Wkp?)_`_6PD5$@8ME^*@=5vq)!Yy>}YXNZ~DWIKjlmrT#YGuILoTexPIrj30;=2vJI zw@x1a@B@Dxi}ahHJA1!12G(*K#U#CfxqGsvwHrnrY_+~_q=fE(q3C1p`owF-ZpIg6 z%-L}ad*<>B*XAymAL9Pp^y%|+7tAt8rblA=sTY4@=?4@=`pNS@k~G;|L+F2v=dYi? zc>QHdwpZpZym0w^Hd`Dzx3VNo zCoT>248Wekv3#kVKRt0+OU^uZ z_8Ay^EZuk|6I(Z$OYkw_0b3e8)!+-dFaph-Uc-kF+Syo#4i(%CdIEn?-(kka4CemZ z9~>JzXs!wDnm_*Kx4-=87tt&#HP;6-Iu`0VFmx#7k1Ve)U7Wv|#j(*8d_*<@sN^GX z+*oXEd|(Rmj_HNVH*lVrEY`+E>%qf_KYVcTU^o=ZWK$RCE~fDz0epC9BU>_%sOrNH z{q23P{R0bBS7*;X_S=6SUYtFLDH@b`_~=&%Xzd2`jh;S!nH&t(boiZ$9~T$dfr2A2zez za;K!|Us~FDK?DsS&eE+`P*B0r2DBii&UwTp-)ur~BOB}gNj`{7Y+=NDL;@R9WkgjK z`As+9ZGj5i_&0xk`n4;I(}W&9|1Ar!7Pw7V-}Jmq9OHFEv@qo0s90P1*otJZ3Cwx% z@{8Bzt7e@@e`Nf)pU2GCYJ4Ny)UR#JsN`?qe%*u{xmtM+0{k8yEbf+6SLe>Zc=ZMJ z>g1|M*AlbYATQwiD7F$c!U8#P0_laEz0lXe;&&}^*^+AP5Ni zdPWB(EX7=$y^t;DHuWIO>o$VCw@MdnkW(YH0J!~(8kAA{3LLq%aD~{lOjk767Y)a1 z=U%2LJ8_FoR7L}lfVXN#1=#~Q^9o&W9?~XFs3X}z#>p{Urv+LUk2A?xyBuzW z7Ba+oli;s1jM}Vm<7j}Sh&8>MbFF=DpRPYPPThamw`iG|uv^N2nhAoz56km5gBS@o zANFrl$#H``w=15dJpMM0y4k8^=;g!#xN6)&T&zynC48%#op|nbTaOvQ+(1$s+iX~& z5zC$)d`@&b5GwJvi3m{@JT%7vuu2kVZtzjf+71>LCTDVQCl}~eEMF&sYMrP~gytVX z#lU}uMD6dn+XgMz*#sPs#nVFBUp+y-k0sb+@-RldCgv=~_oQa>%4JnH#wvH$kAi zK9MDtaS`D@;Mw0<_ zgYF=Um8}{cG|Fguv`A{s73ksZZiHx5-1!&?<6SrqZK7YWQBVs}&@+EU z0=<@mYx#8T?9dXYsUW(+5XP4#Rc%{nL3a)IvVv`MmL0l9Sx#q@mYDJ0Q7G|NiL*rN zWDpBF@X7Ie!ZYr?9U7=wXF?ekqC|} zmghllcsMd3SKALQaXK2ruB4&pP}F~4Wzt27i_7zH({M^x#266l<5}AaC6y}MLkrPq zD%2-9c)$r9AEpyC6*`O?n0(%K=li0;9;^rAPd_#gCXWsZ8-&Ry#VD~i7=729-{9~lT-UAP2)X>5OFGsn2= z#QlfHj-9)9I+2_$%OVbWeD>_qnNr?j6gMYn`5sWg+5Po5y#c;y0?QBfjUF98-X9&Z zWLPZaF3(>u`=MGQG!=we5e%}vAlE`iWfv_l7iahO#04D4;Yd?w7zXYu*ArJJhi@|1 z7K|H;jmIM+Fr?x+1nZ@lGiiUatH6miVlD}vqEppasP}^pKCC+^V&(&v8CY1Y1w!n=-kg~Znb`}J|88@#Y_mb4WrkoVZHzgH+1p~u#e+Vm6E1%H3LK!j_pcW(kM zh%g4mo=&LO--{Z)olVT zl19}+{hW`icvW&}{RXWSZT4Ru{o+r5`-4{ch1N^9l@coZ6TkWHmwxcMqF8oFu(Uvk z4ff%HR$BzrMzT9@87Y5(5ju>>h>$;5sLiW|C-_DQJTJfe!!NvW={NV>_V(e}NPlDq zu6~uQNN4Cs7gWiy`UWrv)kpVZ&)U+;{7iEC$=^Nx{KemvMG0%N)rndRVbw7@;>J;b z%^s&)DX)?DXC;#524XyOHkVDI8V+>jx|EWk$<1Ob!JupW^5tJ- z$(Be5%Cb}hrmv_kbn@`)43BpBrj=!Bt(Z-&EH2_Bo%nz;Dbt~XRadx=8#(4{=R2d5hm2V%vWiL|Tz?bi3XN9~%~094qVb7knY4=vp-C2{->b1r;gHzyl?06bFGO zdl$$*$Dq=ytHlQ0?hw}wRLG|lw2%xvS9D0g8QG3#^Ll;AkHJ36Z{=-=ZY;&EL+D^( zsw)uUBEzkJ8mK}`i)aBZTA+I;Jn)BX(vDmy`c-iQVPb!Hs(;GE2;?~VHm_FEf_T9& zA0_=^tLkW*l<$q?;BRc$?L{Bhti8Qn{aQy0xuHMo9d(ECNe(ASsYl)(f2L~Tehyl@ zQ`VTa&?5aIOAk!qOoFylojs1p7UZigcYpzNh}%H>ouFPwduV|SxLNs`p@SZ1sBJ1d zTU2^aJ_dg)Sb>fo@Ub4dyM64`vt6`M1_m%+go}^6q4w?rMi>Ikf}!G*9)F~DBU4@Q z96*cYi#<<6!oax4q3r6Cx@R6@@-{Hx4##=NhjVAxOS)wWMlhj&6jSCs!`2QFidGvL z79e4cbHW+4NVP#4MfHw*ps-?1_Ep#=qRJS$`-Xqry(2h*7L#n}ujXv<+n3K!u?aUw zP2M1%Aai^d?DhogQVi0gP_F(lPjnR3?+8?=nbT;YeX&&Egd69fC1&vT*3MDBOR&@{ zmQ<5=4NiI^LwrXo>@-@a3|bjYMaSF>N6%lwhZ-ES)7N9v?mq)mSl$_&@`U15M{sw7 zvJQWsWspfx;b8$LvV}{9GS0_zZhY(n7h2B~JEq+9;32Oc1|7$hiW;&yh8DVUxMC3> zM>=u2P{5~)oLIW7p?^0YK&t#bY<$Y&!CFKIG{D-rb+FBorlt`WpV4FfD12`a>U`^~ ztzjpgK;?xdffIj5kKvdxVs+b@nsrdNbg+L2uUI!7KjZ~$i_~>R1s}X?b`7VUmaPg}xFL*iQP|Er81O~2^2&mk zNr{j%5~mw<5Z!r!7pPE7z!|C-ZlQkx5_#Gsk*ct67i7yQn^c@&=7Nh|JitWbLONN_ zreu7G!*KNIn6a%=ck7MOzoA@DfDT3lsC>K^4r@f7j91nKJ09LOw2Yb>n4yQ^gG^rl zb~d$;mNQAQxTZ*Dc!H97O{ZZ45n;H(i$GXN51yO`9Irqne!8SL6+v^IZRr!Hrh znT7iKV2l%sYB4LXt;mI}jIX~L40Q@QXm=1_eF(y*R*C5d$5;Eqj5ow`5GG(mM$vAO zr%e{^ik4w6-h6M!8Tr)@ZsP+?u%E|woXS}_pH)hE1rW+Ocn!P#$cn_KR)UdkD-Fc} z#wZ2%L|Bj#M~(3ezRZJ3t}lPg;AkW`mEa+HX;>wUUn5yJ{dSFPRWn5wCITC@M_%Ck zeY_@XI3o|52)^4V<`jHkOcFH-A6>-Z(YVN1M?Mv1jCmXQk)01@2OaX^X=ryi3=l_D zu*j3AA;;MCL1akp@hHbX;aOcHM?zhS7U8{7Khn$zPhAWJ^MT;gd@g_Ns3F^2i6j7~ z61I8cv!=MiAG$Y^jtq8?J%)nNa2!pMEtX{X19<5Ah-B&=A%P0F z!;4=%k%8UN>-UNUj?=863YZnEpmFAYbSQ`ppaD|CxmR~U#iJm={*6buF%`v(Eb)el z0v9>=WQ51e$auDjQ?|=st5vk^8^7s<6)2+(C>8YoK6ma;j2tJrz;kMamw(r};L4O{ zLiBx%2$0A%q_gByu*L0M2VDY5igySR*FWC%ce_h(ea}`#V1Lb0g|ZAs8cVi67R0^o ztbl+pAMWEYT}HNivhBU681;$+maD*#%MHK$!|)s5wVCV^D)#$W;lZw7&@Z29;#a1F%1QI%WY2_s(QQB<$q zf)TK50a?>E#%AM-RA5eEhN|Vk1Q=%li)tOhyr&h5kIk#XzAGMKm99uNRVTcCkgnmg zH~C=D%D@$Gf>PSuEdCb1Pw!l*tEgs!hC#S5$4~DDtF*ttJqp}InhUi7jJYwMkAN3L zbl2m8z0Rm;&ZAD0lvM5*d9J83UqQ; zjJazs(;d9+XoOm*<1sEs>=d1lUwQ3^Vph+wPMjbv?692%b`rnB4CdArBOGi7tv~=( za+UA@@MK~w*tgz0&N*%#e)c24O=df@UI1>;t+fnnJHrq-<$-{N32rXelmX__0~q8_ zztIK;CN4cIMg){aOm+IKVN}db@{Hao8g^NU%Jkcf?3bH_-{u^g8QA0MJw}{Yp_0Uv ze^d^Gxp7oADSnN47IZ;abZS$unjjaS1PL1QD)X3*W=L&XJ-BYM1>6wUaR~J#Fq*6q z))rv>2_vT1x7vlX8mc|Ton3Dd1I+rl_5`RYsFk(GeE{sd8c5L=*FFFdltE2GIzD&^ z{Q1)-RZx}jzHfdVx^|Zxx(6{eEinoljzx2Sc_wBmCwwY-40<-03^YQLA#*YW^JWT= z2m7$2ANthXeX3ps3=GhKF`d;9ApkE;Oz-na`^Yqz` z&u2iUYC#DQpt&gm+|0~r^4aY=!x!$A1}=nT zb+BqxvSB5U%#W~GED+9F25C709nDyo7KL4O7BLvGWd*Yijf}ii^mZ9`QH~fncrsX4 ziQ=)xQ;Q`}?P6xU0|o=Y-aEeS3{OC05NBn+`OqKkegXXMH~0uoBu2Ck0{BC$PrCb- za${V0dL|!^J+1{;9q|FyM|Er!cyNNTV=*O#Bn+fOx4JPAF#)ODOkhVSXGo2RH%CMF zI&qZfm%hnsqk()wN?6QLdTDw?)@*c8T0a}R9%6R{$W7=KkxCpYh0j>9nCxCo}T3;`A>3=5kxWV>sd zHO9A(d-i#jLaX9|WooOrd^_~zzh~)x_yTCK2m~8?R@aUO%3z4^vHTq>6= z7`H$lK$y?O*PjA2JA>E159UOF3qNtKs43aW%%#Ari+9d~nabh4UjrvaG=SqFeDjS* z8G$kg%L*`mA&J8Q!{XY3;-Sy|6^QH8$3)+Hh!=qp2y37Q!aA6Qu;B9`f)!EYq7HJn zNnquGx0+=jeBoEn6aRDneRp=ic>g!rHCFaOg#{cA2|0-Xt8Cc7)KDqbwXfz?9k3Is zm?{SJUvGO&E`j|a>5v-?3ZT{p>!Yt-yMt%Y=lAmH=TX7$1aQ)Ei)mW|HzDK)DhN8>$+@ zkH9J<46YFq6#&1hgC z00x}PW|eR@*29GLPv?WMxG;gLJUU#8L5DnH0MdfNIpT*Eu*0%W%zTfx%t8|DqEZ;EEQ)mUov=V6gT9-KBfQ(Aex`&hXlfEMz$x zFyMj}&5Hc!`$HYvy@0Xcgc>?D>qJ$Tt>$673T6Y}e?=?i1KRoErH(rK!lB-fH+k@E!*>pPpwFrI)1Z{4o&2sqxW(63mH#stv|0_Jiy9QMP*=^or zQ*QkJ#S72e`t1&@f)zCj0ooy|D_GWSSuR3@{V_iVz%&c4#@_my#8GkGe4bmbx^lN_ zTMYOqVFZ15vyP+36MbNw1z%B<(qz1NJC8T!Hzgv6i`+h;(E1yTC9arDWLkK~0t8^jvJOGqjTaLEFnzqvV$L1qhCcdT;1QGtuH`ha zp5kZao`r!KKZ|Az>X}#1Yxf@V!_IvITsfr-a@Y$3tS4pJM-RZP6;CavyY?`XbSxf? zIgd)zF|RY;k%^!=2=G_;|J&{7#H&hwG^`clc5a&02$&&^Ns}Hl%`A?zvx)hDsp!xG zb>nFeun6IbRjOevA9qbcv8)82eiym`GCCX<#sry6X)Df*w@*wo80eY`PJn8zVh!K; zsVC2h3=<>8pY4K2RDfYK{m$HOc0-YSo=rB}n(-+xftt9Iyrs53Kk#V!FuwzbYD26L zSBTpP?`NxLLf9mfmRL3)pWT8m7=S8g8Mv`}faaUuX@crWEgENZfgDktSX?>`U`Ad8-^J&P7k9(ThSt>-+GQ~!Lc>|i8ix5J z-Bgh?3(E|NR6h~S({Y%w_x}CRfZ8uCMvU8bhUktXawAJZVdX-mA;5ZZPe=C*j35Xz zFGyc!R;pbYTR@$pup%JE5Qen~qM;ks0c4G90ay%^si2h*P#y$O*Y;qhv@lP=)*w?U z$l6!c!#k9l`M&id5LYN*(>0&22_uHmw?AQIc|-14Xl|Qd{?`{D347yvaBPcHyFPgipeVAy_G3}KHZ z9cx|#LsYR)GNS^*0C9D-Iq%-3-6KZDR@>%#cN{NiZiZaLYEjUo*G>}bW8Oe6L zYfNwqx1e4Dt6^EyA`@K*VfFFUWO)F~=U)c%@Yd&p@~^!Bc3oF5?5p*3%Bj~S#&SZ( z7|;M@sd%Se7umj^X`F2fTi# z=tWT}yF5`7@*~wccB8~EtO|eh=zzHsxURXwaP@TqJH3C0f#+T1PNIR|gH6adq}4yj zv4aUYZm}@+{zIUmxJ+(7rD`(D`X9JpZ`kM?51|tvr33MGiAETG5Wwf!<6;Px<*~*a zAgblqf&zX5rnC_Z{o?HDmnaU7G{|OJBb!@aG3=1p%y!_>EGQf~=E*=|4*E}9lM4p= z!cO-u9&iODtH|T?rn#d+Q0N4EXmSJOP&9LyJe4wE&dx_F=!Z1siC8dypNZ5n{_wI##xZKt*NnvX3o; z=s^GJHXJZw5(Unj0VsuJukj3KW`O`v!F(OSFHRyPe4u_^Je|k<8Vl-0wXu3WyAM>! zFmee7h7ZXO27D7>4Kp-m;9Cdk6uU~^n#<*p}d-}*xvzp(gE@E zF@q;P%01W|%ywEU=-qFE9MeIRc&3td91SUeEbVYP&fz2BP{95$Xt?IqIWE}HCQk4X z*J9>(&5reBTMeQBA+bye&uM->CLs(T1*q#Tzseekno6Cjfo3JMJb=#YKNF)CDj#w* zz%OK>v$3Fn)vM}Y%xE#D4IO5|BT)4_r#UL}=5l4Qzjuj6qk$(0z;lox8tNMeP$_4~ zHT>m;=V9-5?)dLgL$=0ur>S>>K-@)HJS&H_?pww}t&XxM;70rLDc z@BWpiPg`yY?r!ap7+ihWjEZ3BYC##Z4^%H1S6Nvat}~7kydo}DsTlY`TExkk1(<#T zD@()XYPm`wT$Sb{u=$XCd;9qSuo0r+uLfS6*XI3m+SMv&&9uAuZJT&^Z3tsDIR_k& z>clw?AUu~2cfz(}p+n0+XA#+&GvmVL7l@Z>XelljX1QlZa^fp@g7l&G;LZF?FRVZV zuB(_07LqZYl#x{f6Nsm$KTQUe#x2fb4D1>2 z6c4XLc+xhgQ>~3b5~v>e;?1nj(V5N_)1o@hFFq^xc`-P;kru}^`$gu1r`l<;$vtV| z(BU^9bAsZ@Ct!ZKIR;Ab`D2_c%>EC*{2lbMID_n&cLy0%yVW$j{s_YWa8@7^!jJ$9 zz97~;w_aLKW@XKvfB?4N>Dmsv6LjKl<4k(SJO(nr?gOS6naZ63@IO8BD${iqDYY_U z2zd*$#nu9vjF-ME7I@KEq`s#Z_sqx4KSku%c8v)1)e+u zx%R0LP%z}^^c2QO!xSw49T_%=diQ1RD&O_~eaDl-owP>zwP5%JTpPF9ta-%X8Rn_^ z?AjQgop2t_fJ>g}+E^An^N?ovSoLTzd#@{>d$5TB2~=J&D4qmmckmF&kZWM3AUl&Q z({-pywdcF?dENp84u#b|&`h<9CAABRaXBq&3;?w}88rLGTKF!WTmV;a{-I5lD+|Ba z%Zppwg#h*}mP!bh#aY)NJb~4hg?nNlw?nuNCf{?QPoJ`1=9mOK8zQJn<&;d*l^>@q z?(t0h;1y6Agt7k9j~)U8Gotts#r(dLBjyH7pHVCK}#WesCK@p$7+QG~UqMYq@uv&LoLrS1a zm$fSlG0RiX9?fvHmx1~WW=65FNUjKPLb+MqdyO3gaOWm5!PDKJd|L+13m-krTlyg% z-7h}jP0rBAXEr9A{r>M`_rEIs11RS9$_xFw;u*I7dGY#-G6K(cYvzsTHIuOj>S*9L zfKf9j+oI}Qd|)?pi*_4Mte+mEet#84@Y5;=mLF^1p3Ggsm|L>pw?%6HB?NHc};?|h!2!@Oeb%D!m zY;2+Cdre!Ww$_r#)#c3bsnv<;%)R9`{Eb)}8^c}+%;o8=@#wwfrIpQ+y|P&A9VM{o z&Weq;-m%F*lfS=qT+xw#p*BV%)aWovvdV`Vc=Ci!BX+Ud>7jrp~$`PG$Z&O1J_ zy1i8v8_O4I|C4o2@6DgSX=PJw3meShm8_i1>@00=JZhk~q;r06ddXBfzdXINiFcIe zI=Za^TF9c?D;mJaa`oX~^OR&TL4cW%VLlodZuG)|jAq1iG)Bp9TJ50l4uTs2I|%*^k-9tuc%v- zF)%>5Tn+pvgl2#kX#3FuFqik{Z`2}(uReicY*S`k_mmAR-~>`-bNxF$_WV{kiSyEP zJchc%Wd!zs%rK`si-HX?RP1b?MQVr5Fo7XR3y-w!CYAb$5gwgD`hsXK=F*eh-drf) z(J`sxsR_6^RD&nf7GXv~#tqCLpbp!Ky|?}jqZR&K3-AeGjK`4mSNs!we0|Cv@Bfhv ze_UX;7(aIxE;zG^G5weOzM95K_aOjtA0Giq_K3?hWbEki>hC>nBEd0|r^1|e)r?I4l` zQwG^$B)Ei*rcYQRK=Xv?oj|@GSmPHP;3_@L^>u2;C(*5sx2~_aLYd(g$IjHLQI2Vi}ue8S+J@VKy%{u0fe%$4b+ttSj1yGg`niv8riXKNG4*Agq2PK5kZ@WICG}2leDD>}T50N3M1wm|5(WiWQXA|tW=~>R zZ3OwaS?1fUe|xNjHNb-wI26@CvLgnVf#CLe3JJQ)Rcml%^M0%|0d;F@Uw ztS~drNgEds*YCOxs=vrzIOuqUd+;&0R1mPVpU}nP2g)Ed7aj+9Tz-&mifMOfw}-Yq zVEqpW7yz;1>d#KFYgqEUnR4}88w@<3nbYgQju3_isD$vHH9ViHSS{*8YYuE433?r? zV#a9!3>2HKpRfP=_Bjm9y2-iZAmd#4MEg2-D2QdC1*{BT?ik3*#hX-62tv^n9Ge$rdx91=>n`LX)dRZLxJez?dh)v6;lZmqe{0V~z)xY!V z_Ir=t`W+7>4HKFLqlK{=USHl}5Y(y%*Llc%{1OP5FDsZC;}&n;1@aXqUs%t!~Lv@UpjiT;av<$tCb+R)uE!Hq63i+xdu(!2v4Rbk*u(kigm* zWbV#_&T@5{F6DUX7cria8(3RFnp(~(?DNkwiSsmT80RjDbInV|%yPnKoJaGvbHnA5 za4f4R0>a1N|2aqxIjw&T3`wB4+8Rro#jl6A^R))Z{C__78}W7JiRQ-{n1rw+k7Ov^ zC8{S3nkNoW2H}%~ZXgxCT0ee})ENOwpi-Bj0uLvv2VmSjdnOeeAr3HWVv|(>L|8=s z<^FS=^NlBE=ys3@gH_+*H#g25WpdHL!lfT`@5&?;hbo2n`4f#5xR#>f8`<2rSG!BPw&8B(wPmik{t1;N4^Ea3j!qZ@GXZh z`#hjBIFZLVD@Pq~gC^Jleu*8!rd4t9v1)^M5r*yAf!N%YMNE}qbppUQsJa8@M8hhN zOt!3zHgQ3D8g21a^hv5LR z6Gs;FKFLtBDF7ZZdeIKn$qV?l`=Mp^$$f1CARePFo3i{T(3 z{>uGgxOl56wsu0`88t;dAp#b(Q}wP9#z{) zY%OBh}?+`csr*Ay=(VfO>_~wHHTX+x%R2OsO zz(mSu%ttR($-o3vXZ@{2W{_$wRp+CDsR4CqLEOLuV+*X5f%exyM#vGQ5&~p5i1uOa z_lbS}UeUr!GoqbU(7Trx9pU-lHtnYFs%^FTYxmi!^Ub?~r7YmK`0Aze&oaco){1Db z>IJtP*dH)+2Ze{=dd@QeX@zhC!7*FADb51^qU@OVSh)&j{RyqPL2b1LitTEQf8*KAHZt!o>1eXdC&8Z&Nr0LefTU-=iZkp|3c#~xa=BDgh zjW@n#o6eIE=qem7taW!*J+=o=$jxta9yUGmQlnB1Q_!5qMFM6B3xRp)V^Z=0Q*|Cu zI#@uoC@`bOQzKQ5{d!6W;B-5^6|p zp8oV{uFO~fdizljuyCmAQHH7&-0jO%OvSD7O5d8;ZU@$X(~AM;_vGj2vsXb;5J0tW zR2gh82jF{B+_R^XnP!1y7rMAW)eh`_$dMUTovq_`k`lQ?f%V?CFm24P02a->h3#R1 zeD><9<&yQkqpO85-aLSSJT(`OWI-2~Ey(fHYqn;vM6LfX0MOxYKW~8Is&Zh)CYu=PVn#@K77b2te4OK{KHgQx%M?c$H( zyEWtnhSW}CG<%gk22F#xeHb?9=NY-jFP*>(Y9F%82g|lWY&mZFjn^u`tB~n4$1aBd zc;9cp0Lwe4m`!ySUPm%|{|C^VS{?G@hLIR>kPpSuUg8=}Cu~nY$oYpr7Bzs?*$~&GKYaBr zFAwg2-_A}hpXJlMv(IlmFV|`hpwl47$BFA#9<}F&`NESEMyAN0RlfiMc%twF&JgzT zXl5GD!grl5opsjr=F2S@>R?3oql zK)wzrSQZUFT_*;NBZIs;T$vLHZ4Y4(eXOTKx``h({)_{#lm%&f%*fbsNYyIz<(Dr% zl@3iCIIW0Yv-;fa*23Q?mp7ptAUq{T#HI1@08DO<8#XeJdumdc0_$&VSUQ5`3N=Sm z863+!;tgX9r_S4svh#Xf`xpow8^aLZ!Y`yNTh97dHlZURz^o{+^*7j@x>Z~(9Nz%O zoX-j@JW2ZJ7`66DaoL}!nPgbXUMXPKH~2PIqkw)vSbZcb5a1$#zkKC~V3vh|EyYVg ztYBc>Lp|&+W5$sQ{1P^KcIL9A8rV`nCuC=T_45Mk3P?U=xCZpEzx)B1A)01|^W@~b zY=GUp#bcf0AAa={*in3S66+G+vR8Sy0Og#C2N&?+qo5{;39<_TYMIoC5B@<$exkr# zteb9EZ5*pvp6ze2tcQ;y|L5FK9_!hv;+=^Q=Q!;iz95ag17wwnW+*n9b}rA>IfKD> zZpwV~acJPP+b1~@puz{MNE~XZr5F_sg_npkzC9_E^+YcNhT6beLxQdUS3r9SenVUg{W%cZp-=-9z{O_UU4C@r z{9WGS;ofxtAddsPPN;Elt94=!6&_~b%NSfP^N+uN4GaW9(o^}fj&oiKi&vk$#XefTtpwBLRu@M^LJMq@xoX!b2HV$7qXgw7~7-0 zxws+bM}sOSi#Y7vd;8gjWipIn57JIy1MP{k--R1vX3LL3GvWpBoYscs8$Ph*-Sv=} z)b0~?mSJ@50eim_?KT)Zl(VK7tE`jFZ5~1CMSP4$Pz*y2IE&ieVpu7ukekne;?h7| zxj==4&szVYyLjWy-&HQw$r~>)WxC9dzYC?R1J?Wh5CP`X2i@~L4jbD(yPYfRkF5Cf zi?{dHglA&_ut2sUT&L=RonB9N`B|*;b=wyn&<8~oiho19JUR$-ugbwQ3i|3ZeVv_h ziGht4lSh6cWT|>Bjt~D|?Z7f`VV^nn%F*6LwwL2oqpfXs( zthP2*uE6?t6SsN(s6Cm6U|+w7CmmzUw`-Vz)oA^UYp#VO=KI56E?a+@$xt7EdIy&| zxUaK=ii~0$d;3A}y~f(%p8^ETtFM^RS)$nkz6BsV{hHms-^o+#EOs;2Ke-={$__)g z_*c}4j8U|U3;3YkIgxK1mh0dQ2;;88sZsz(a}Z+D|mN zOspvn(FO---o;?)Afuc7d|ZFL)3_K6gYz+~JCNvzR3|8)kP8MDAuim%V^QuAlqU;h zq>?4UOnvn8Ki|pQ7BclrI&h2Y;wGzeL5xf_1ju1L9S3=gaYZbLJsy56os3Z)BwKt<)6K`hfc4L^ z*B{a^scQ3qZ&@z6L*;ac4W6#(4^!!30tPY)d8TCrmM{yfY94xk%0M37gAMwP3s0~( z*!|H(Dil1a-hFv#6pGsc4D1bo^)HcZxg{0LPzBTa&zG%#?-FjNN1!6g6aj;tpj38+ z?Ur~{e`63D$^6Y7f*Ls|&qe`*^~GNyV4&+;ShRpr=3;L~gsbi9bZ6T0>UfF?m@oA* zSia&^ul0WGp+w{I&|K9n7baL{*+)R?2HH=*N^-3$8M;qw?rh52y+lUf!}AZSzEhcg z=ZEk*$aU_4Spm2pr!ujHnF-Z%9y|sC>-We7Mw*PPR`-f?qx&)N%2+Q6ed8D62D4;F zr$IboH1H5yYv%pI-r{8UyC;B{iyGF>JgubSJ+Nyy7w4B3!0oUU*nz5EU@`g5kdBH% z??h;w8}9)a4@yz6<>T*(3p_BbRy`&zF0og;%AQ%S>SoGLnB<@t`>LG`d!}y=5*6Yy zY=(9?nO~a9d;2Arg17D!y`w^&fnls}U!4`#9_hw-!oMhK9y*e*)KCPA2g5w8LLF6+ z5fvCjMS!ME40KwNl+M9h8wBbXpIN>Rf2-nYI4Pn;Z7)XKYqk zm4OfyB3N;8oEOkL{OQR@^0+_^g%g>sGU$OiZ5%K5U}-X2*d7vM;w8t+Pp=F&4Z{Ld zAH!N@^3eJ=iF~t5bL#k{!Wm_AFt5~*9%@c*aw`bg72{}OmSYM-2AfSVjsJ?9x zmoJ~@QU#2NX{S*JT)3y0eM4+u&R@C`k^<$!>br0^sDj;f`DY+5yWZ811tp-h24UfS z3HV8j+2Z?vMpjf~Q18Wa&`#OB(g0D1E-XRohGv#&*5?n_xiS_XeSOe_Y0pu8Vf`H> zV>-n33TD~(fYXFwlXb)Jh3dBc_{w+0FT7!aW}|qy98?#pT*)QANH98e@xeytcb@B2 zCmXz3r{^nsh7~leikvS>XKTelfSeTT|4E{eu>->NAkJO0n*rt#<_6KQ&(19A4PZ|J zUYrT|tN4tHPnerKr~z393Y{#_wMjOm>@1*%IpqSw3smJru)RWR2f<(bb845Uu)x9a zGtB;)t^BFEI+^-qU*izG!GNNqpW|6 z^%e5Ty>n0pmJ9bml|xn`%aE1yH=p6s$C%ADJ|27inUhfH>K4$PZ6+6bm}CG0OIPn5 z=2DF7_Tv+5eik{vA}WS36n$52iW;c8i5+L{&!Fq6_AK+ zxzMCb;uctq5wSk%ft+X%G?FnZi<7QHqv;=C3!#w zAdws_ry7QO4?4=7(o7fuQM@9i1?t1+&EQTar|eO2eu?etgY7QgCQj>0x8r*FL^xjv zlyxxBg13JN{U7(gG8@TiD9i@wAp39MwaM;e=%?N4=|1siC6z${oe!ulEF>_RapitO zAPi5H_5WKG#vuflU=tW2stJR|{poMxieWJ(OX8ur`4FfR;#$N++zohk#w#r0 z%MXb2i+?)Jy(Ay4dP5!k>1WSa|2_rh;FA4L>cK$H#P-ccptt$nEr<)mRAl}6!BJ(d z`1FNY!8W+w`uR&qP}bUl1~@0{8|bPMon3h0ReLe5e}57t?}%WnaOc65?BPX-E##!t zR5S(My4*X*wB+)nOuqg^gN}99rQeT;V!{07;b%O3p*8Ho>WAb(x;Rk|qY3a`9$Z#9 z6R`u)z`_K^AuM?TyCK_-5dcE0--p>6R$H7iyU+<@{r~&joHN#{kHf8JSp#R0#>xOZ zA>qvZGQ=w)iDO{WU;sO^-4}P1Pp-Iekui`pHKidK168N*u-BU)KpuA=X8rHS+&Vj_ zvlSEq30?u&`qG~O5v*8$L!68O+hOcqZu^Fri>QTEmkhl3)Rao@8XW)j@HuezF6hc@ zpy3XXuHF&MyMlC!d<>=C%NawQvZO$uynC7zTcjg&cM`aN$nT!XX~pZu+@h?@^1(>reNI zj}^`hod0GKc*8q!thOEog9o$){^vapj%UI;;-^b3z>8Py8E64R1Ptgw#^!xTHd*nW zO6i4r-grvAYbA|7_DnLPSZf0Lvc3Ti$h)^QG+E-9i&vEyvp;W2fNwNzfJlCqh`p*1+7X=Z^oOPzl_WS-5cn=&-Xk6y-N`D>6PJU! z#DxIP^~|37%EC%1+~kcLOg+$VJ^^!i{OkifQ2`qj2U{6h|Irv@QU+l#4u&J)S7IrnC`2Q`|IZOZm diff --git a/samples/html/index.html b/samples/html/index.html index 301c8b288d3..4869e0a255d 100644 --- a/samples/html/index.html +++ b/samples/html/index.html @@ -6,14 +6,14 @@

Swagger Petstore

-
This is a sample server Petstore server. You can find out more about Swagger at http://swagger.io or on irc.freenode.net, #swagger. For this sample, you can use the api key "special-key" to test the authorization filters for our Partner
+
This is a sample server Petstore server. You can find out more about Swagger at http://swagger.io or on irc.freenode.net, #swagger. For this sample, you can use the api key \"special-key\" to test the authorization filters for
Contact Info: apiteam@wordnik.com
Version: 1.0.0
Apache 2.0
http://www.apache.org/licenses/LICENSE-2.0.html

Access

-
Access to the API requires an api key to be provided by our Partner for all requests. The api key is passed as a header with the name `api_key` and the value provided by Reverb Technologies, Inc. Unless otherwise agreed upon, access to the Reverb API is intended solely for usage by our Partner and not third parties.
+
Customize this message as you see fit!

Methods

@@ -420,7 +420,7 @@

Example data

Content-Type: application/xml
- 
not implemented com.wordnik.swagger.models.properties.MapProperty@12e335ef
+ 
not implemented com.wordnik.swagger.models.properties.MapProperty@61797eca
@@ -444,11 +444,11 @@

Example data

Content-Type: application/json
- 
{\n  "id" : 123456789,\n  "petId" : 123456789,\n  "complete" : true,\n  "status" : "aeiou",\n  "quantity" : 123,\n  "shipDate" : "2015-03-31T23:09:59.239+0000"\n}
+ 
{\n  "id" : 123456789,\n  "petId" : 123456789,\n  "complete" : true,\n  "status" : "aeiou",\n  "quantity" : 123,\n  "shipDate" : "2015-04-04T23:36:32.265+0000"\n}

Example data

Content-Type: application/xml
- 
\n  123456\n  123456\n  0\n  2015-03-31T16:09:59.242Z\n  string\n  true\n
+ 
\n  123456\n  123456\n  0\n  2015-04-04T16:36:32.268Z\n  string\n  true\n
@@ -472,11 +472,11 @@

Example data

Content-Type: application/json
- 
{\n  "id" : 123456789,\n  "petId" : 123456789,\n  "complete" : true,\n  "status" : "aeiou",\n  "quantity" : 123,\n  "shipDate" : "2015-03-31T23:09:59.243+0000"\n}
+ 
{\n  "id" : 123456789,\n  "petId" : 123456789,\n  "complete" : true,\n  "status" : "aeiou",\n  "quantity" : 123,\n  "shipDate" : "2015-04-04T23:36:32.269+0000"\n}

Example data

Content-Type: application/xml
- 
\n  123456\n  123456\n  0\n  2015-03-31T16:09:59.243Z\n  string\n  true\n
+ 
\n  123456\n  123456\n  0\n  2015-04-04T16:36:32.270Z\n  string\n  true\n
diff --git a/samples/server/petstore/jaxrs/pom.xml b/samples/server/petstore/jaxrs/pom.xml index 7a9d813bc24..05764d01c0d 100644 --- a/samples/server/petstore/jaxrs/pom.xml +++ b/samples/server/petstore/jaxrs/pom.xml @@ -1,9 +1,9 @@ 4.0.0 io.swagger - swagger-server + swagger-jaxrs-server jar - swagger-server + swagger-jaxrs-server 1.0.0 src/main/java @@ -129,7 +129,7 @@ - 1.5.3-M1-SNAPSHOT + 1.5.0-M2 9.2.9.v20150224 1.13 1.6.3 diff --git a/samples/server/petstore/jaxrs/src/main/java/io/swagger/api/PetApi.java b/samples/server/petstore/jaxrs/src/main/java/io/swagger/api/PetApi.java index 736e1d764ed..8b3b9d40b06 100644 --- a/samples/server/petstore/jaxrs/src/main/java/io/swagger/api/PetApi.java +++ b/samples/server/petstore/jaxrs/src/main/java/io/swagger/api/PetApi.java @@ -26,7 +26,7 @@ public class PetApi { @PUT - @Consumes({ "application/json", "application/xml" }) + @Consumes({ "application/json", "application/xml", }) @Produces({ "application/json", "application/xml" }) @com.wordnik.swagger.annotations.ApiOperation(value = "Update an existing pet", notes = "", response = Void.class) @com.wordnik.swagger.annotations.ApiResponses(value = { @@ -45,7 +45,7 @@ public class PetApi { @POST - @Consumes({ "application/json", "application/xml" }) + @Consumes({ "application/json", "application/xml", }) @Produces({ "application/json", "application/xml" }) @com.wordnik.swagger.annotations.ApiOperation(value = "Add a new pet to the store", notes = "", response = Void.class) @com.wordnik.swagger.annotations.ApiResponses(value = { @@ -113,7 +113,7 @@ public class PetApi { @POST @Path("/{petId}") - @Consumes({ "application/x-www-form-urlencoded" }) + @Consumes({ "application/x-www-form-urlencoded", }) @Produces({ "application/json", "application/xml" }) @com.wordnik.swagger.annotations.ApiOperation(value = "Updates a pet in the store with form data", notes = "", response = Void.class) @com.wordnik.swagger.annotations.ApiResponses(value = { @@ -146,7 +146,7 @@ public class PetApi { @POST @Path("/{petId}/uploadImage") - @Consumes({ "multipart/form-data" }) + @Consumes({ "multipart/form-data", }) @Produces({ "application/json", "application/xml" }) @com.wordnik.swagger.annotations.ApiOperation(value = "uploads an image", notes = "", response = Void.class) @com.wordnik.swagger.annotations.ApiResponses(value = {