From 9ae106affdaaedc92f761a1663fa674abb8dd4c1 Mon Sep 17 00:00:00 2001 From: Tony Tam Date: Tue, 17 Feb 2015 21:37:51 -0800 Subject: [PATCH] rebuilt clients --- .../java/io/swagger/client/model/Pet.java | 2 +- .../java/io/swagger/client/ApiInvoker.java | 5 ++- .../java/io/swagger/client/model/Pet.java | 2 +- samples/client/petstore/objc/client/SWGPet.h | 2 +- .../client/petstore/tizen/client/SamiOrder.h | 4 +- .../client/petstore/tizen/client/SamiPet.h | 2 +- .../client/petstore/tizen/client/SamiUser.h | 2 +- .../dynamic-html/docs/assets/images/logo.png | Bin 25796 -> 25467 bytes samples/dynamic-html/docs/index.html | 38 +++++++++--------- .../src/main/java/io/swagger/model/Pet.java | 2 +- 10 files changed, 31 insertions(+), 28 deletions(-) diff --git a/samples/client/petstore/android-java/src/main/java/io/swagger/client/model/Pet.java b/samples/client/petstore/android-java/src/main/java/io/swagger/client/model/Pet.java index 22f198533b..297e1360c7 100644 --- a/samples/client/petstore/android-java/src/main/java/io/swagger/client/model/Pet.java +++ b/samples/client/petstore/android-java/src/main/java/io/swagger/client/model/Pet.java @@ -1,8 +1,8 @@ package io.swagger.client.model; import io.swagger.client.model.Category; -import java.util.*; import io.swagger.client.model.Tag; +import java.util.*; import com.wordnik.swagger.annotations.*; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/samples/client/petstore/java/src/main/java/io/swagger/client/ApiInvoker.java b/samples/client/petstore/java/src/main/java/io/swagger/client/ApiInvoker.java index 30f7e83c97..966a141c03 100644 --- a/samples/client/petstore/java/src/main/java/io/swagger/client/ApiInvoker.java +++ b/samples/client/petstore/java/src/main/java/io/swagger/client/ApiInvoker.java @@ -51,8 +51,11 @@ public class ApiInvoker { } public static Object deserialize(String json, String containerType, Class cls) throws ApiException { + if(null != containerType) { + containerType = containerType.toLowerCase(); + } try{ - if("List".equals(containerType)) { + if("list".equals(containerType) || "array".equals(containerType)) { JavaType typeInfo = JsonUtil.getJsonMapper().getTypeFactory().constructCollectionType(List.class, cls); List response = (List) JsonUtil.getJsonMapper().readValue(json, typeInfo); return response; diff --git a/samples/client/petstore/java/src/main/java/io/swagger/client/model/Pet.java b/samples/client/petstore/java/src/main/java/io/swagger/client/model/Pet.java index 22f198533b..297e1360c7 100644 --- a/samples/client/petstore/java/src/main/java/io/swagger/client/model/Pet.java +++ b/samples/client/petstore/java/src/main/java/io/swagger/client/model/Pet.java @@ -1,8 +1,8 @@ package io.swagger.client.model; import io.swagger.client.model.Category; -import java.util.*; import io.swagger.client.model.Tag; +import java.util.*; import com.wordnik.swagger.annotations.*; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/samples/client/petstore/objc/client/SWGPet.h b/samples/client/petstore/objc/client/SWGPet.h index b6339cf127..f16fa74cf1 100644 --- a/samples/client/petstore/objc/client/SWGPet.h +++ b/samples/client/petstore/objc/client/SWGPet.h @@ -1,7 +1,7 @@ #import #import "SWGObject.h" -#import "SWGCategory.h" #import "SWGTag.h" +#import "SWGCategory.h" @interface SWGPet : SWGObject diff --git a/samples/client/petstore/tizen/client/SamiOrder.h b/samples/client/petstore/tizen/client/SamiOrder.h index d93510f48a..88dcda6739 100644 --- a/samples/client/petstore/tizen/client/SamiOrder.h +++ b/samples/client/petstore/tizen/client/SamiOrder.h @@ -17,11 +17,11 @@ using namespace Tizen::Web::Json; -using Tizen::Base::Integer; using Tizen::Base::Long; +using Tizen::Base::DateTime; using Tizen::Base::String; using Tizen::Base::Boolean; -using Tizen::Base::DateTime; +using Tizen::Base::Integer; namespace Swagger { diff --git a/samples/client/petstore/tizen/client/SamiPet.h b/samples/client/petstore/tizen/client/SamiPet.h index b1f912bd91..9e3ab43bdc 100644 --- a/samples/client/petstore/tizen/client/SamiPet.h +++ b/samples/client/petstore/tizen/client/SamiPet.h @@ -17,9 +17,9 @@ using namespace Tizen::Web::Json; +#include "SamiCategory.h" using Tizen::Base::Long; using Tizen::Base::String; -#include "SamiCategory.h" #include "SamiTag.h" using Tizen::Base::Collection::IList; diff --git a/samples/client/petstore/tizen/client/SamiUser.h b/samples/client/petstore/tizen/client/SamiUser.h index 585f52d4a0..dd24429dba 100644 --- a/samples/client/petstore/tizen/client/SamiUser.h +++ b/samples/client/petstore/tizen/client/SamiUser.h @@ -17,9 +17,9 @@ using namespace Tizen::Web::Json; -using Tizen::Base::Integer; using Tizen::Base::Long; using Tizen::Base::String; +using Tizen::Base::Integer; namespace Swagger { diff --git a/samples/dynamic-html/docs/assets/images/logo.png b/samples/dynamic-html/docs/assets/images/logo.png index 9ad1ffa77ff9d3df5e56d35f683b9fa16adde4c9..7a217967d009167cd41969270ef075ab07d8d3c7 100644 GIT binary patch delta 393 zcmWMiPe{{o9Od)<=}=P1+-QvXra0*y5TqhT?j%w4 zE*fNXC_BmEU7OVi(IV&&ddYzx(Lw0qDKCEEy~}&=!{_n7?#bDXq^E>4vLMK*5NeHD z#EcaF81L~suZEdCyW(%tXW^TIY(C>9zZAWtE`>zdN4U&kJ~C^i|8kXZ$@)T2Xq)D; zEh#VU(_FOg3wtXHMLIZI`BZRJwaU3G7FFQ<_bH<>g*AtRUmQ;aoz-3@tIdKn=RtnG z_KNxVddy(X)o!q&ZpGlc#&t!1^F6`V&A(i4$qHg^*O+Rv2w%JX!eft3Aihr1us&b7 zfIi*dNllThD||U0%U_pr79Y`rlFaRhWXCNC!Pq&(q+JVx~tg;_SU> zz#SgLM)(J3`~DlaKd=k;;9DFHrZ5>v;AiAJHimXF6TN{~(Q=7!JNiJ-Fk)qBq)ZjX lZa+-uCPkXVSiW<@#N7j7U`z>n#HJ%=lfPCjw8D86yN6JB>!>KJcWQS|NUP>6ZwvEj`!&+g4<#%#x|4qRS>mJ<)0?PMm{&fxE8jTr3dnm-g&}~8W zV2qB|MnNFFYMWgVBiEbaM!2MTsy(iGzhg?%+x1BC#gR#YzxxOOc2@*%qiy^i4G1@T z62fS&CCKz8J;q!xbz!%8@VIZ9hx((6#aOQ*;%VWxqYuPsGy_f?iwR~DIc+za36rBf z*@{T=8J3d+ZZovw*qU!}L2)HDZhqjnSK~ywjJfnzUOo9o^kinSmbrt`>;$UW z&v=+yL@|H({~g@QTf5AfoW1I4{=C@t&`=06T=1))X$(q3*UlQ+$zK~{X!s|)imSr9 Wl1u0wsi=S6kE73Vshr1$GPeP)YT04{ diff --git a/samples/dynamic-html/docs/index.html b/samples/dynamic-html/docs/index.html index 1b7ba98feb..22ed5d50b6 100644 --- a/samples/dynamic-html/docs/index.html +++ b/samples/dynamic-html/docs/index.html @@ -58,25 +58,6 @@ -
-
- StoreApi -
- -
-
PetApi @@ -104,6 +85,25 @@
+
+
+ StoreApi +
+ +
+
diff --git a/samples/server/petstore/jaxrs/src/main/java/io/swagger/model/Pet.java b/samples/server/petstore/jaxrs/src/main/java/io/swagger/model/Pet.java index 9596181628..5a5cc2c8fb 100644 --- a/samples/server/petstore/jaxrs/src/main/java/io/swagger/model/Pet.java +++ b/samples/server/petstore/jaxrs/src/main/java/io/swagger/model/Pet.java @@ -1,8 +1,8 @@ package io.swagger.model; import io.swagger.model.Category; -import java.util.*; import io.swagger.model.Tag; +import java.util.*; import com.wordnik.swagger.annotations.*; import com.fasterxml.jackson.annotation.JsonProperty;