From 611cc6075bfd569485b314aadefc18404342e7d8 Mon Sep 17 00:00:00 2001 From: Tony Tam Date: Sun, 23 Sep 2012 16:34:59 -0700 Subject: [PATCH] moved to client dir --- .../{ => client}/petstore/java/JavaPetstoreCodegen.scala | 8 ++++---- samples/{ => client}/petstore/java/pom.xml | 2 +- .../src/main/java/com/wordnik/client/ApiException.java | 0 .../src/main/java/com/wordnik/client/ApiInvoker.java | 9 ++++++--- .../src/main/java/com/wordnik/petstore/api/PetApi.java | 0 .../src/main/java/com/wordnik/petstore/api/StoreApi.java | 0 .../src/main/java/com/wordnik/petstore/api/UserApi.java | 0 .../main/java/com/wordnik/petstore/model/Category.java | 0 .../src/main/java/com/wordnik/petstore/model/Order.java | 0 .../src/main/java/com/wordnik/petstore/model/Pet.java | 0 .../src/main/java/com/wordnik/petstore/model/Tag.java | 0 .../src/main/java/com/wordnik/petstore/model/User.java | 0 12 files changed, 11 insertions(+), 8 deletions(-) rename samples/{ => client}/petstore/java/JavaPetstoreCodegen.scala (61%) rename samples/{ => client}/petstore/java/pom.xml (98%) rename samples/{ => client}/petstore/java/src/main/java/com/wordnik/client/ApiException.java (100%) rename samples/{ => client}/petstore/java/src/main/java/com/wordnik/client/ApiInvoker.java (92%) rename samples/{ => client}/petstore/java/src/main/java/com/wordnik/petstore/api/PetApi.java (100%) rename samples/{ => client}/petstore/java/src/main/java/com/wordnik/petstore/api/StoreApi.java (100%) rename samples/{ => client}/petstore/java/src/main/java/com/wordnik/petstore/api/UserApi.java (100%) rename samples/{ => client}/petstore/java/src/main/java/com/wordnik/petstore/model/Category.java (100%) rename samples/{ => client}/petstore/java/src/main/java/com/wordnik/petstore/model/Order.java (100%) rename samples/{ => client}/petstore/java/src/main/java/com/wordnik/petstore/model/Pet.java (100%) rename samples/{ => client}/petstore/java/src/main/java/com/wordnik/petstore/model/Tag.java (100%) rename samples/{ => client}/petstore/java/src/main/java/com/wordnik/petstore/model/User.java (100%) diff --git a/samples/petstore/java/JavaPetstoreCodegen.scala b/samples/client/petstore/java/JavaPetstoreCodegen.scala similarity index 61% rename from samples/petstore/java/JavaPetstoreCodegen.scala rename to samples/client/petstore/java/JavaPetstoreCodegen.scala index 4c697b25cba..532da57d7fa 100644 --- a/samples/petstore/java/JavaPetstoreCodegen.scala +++ b/samples/client/petstore/java/JavaPetstoreCodegen.scala @@ -11,7 +11,7 @@ object JavaPetstoreCodegen extends BasicJavaGenerator { override def templateDir = "Java" // where to write generated code - override def destinationDir = "samples/petstore/java/src/main/java" + override def destinationDir = "samples/client/petstore/java/src/main/java" // package for models override def modelPackage = Some("com.wordnik.petstore.model") @@ -22,7 +22,7 @@ object JavaPetstoreCodegen extends BasicJavaGenerator { // supporting classes override def supportingFiles = List( - ("apiInvoker.mustache", "samples/petstore/java/src/main/java/com/wordnik/client", "ApiInvoker.java"), - ("apiException.mustache", "samples/petstore/java/src/main/java/com/wordnik/client", "ApiException.java"), - ("pom.mustache", "samples/petstore/java", "pom.xml")) + ("apiInvoker.mustache", "samples/client/petstore/java/src/main/java/com/wordnik/client", "ApiInvoker.java"), + ("apiException.mustache", "samples/client/petstore/java/src/main/java/com/wordnik/client", "ApiException.java"), + ("pom.mustache", "samples/client/petstore/java", "pom.xml")) } \ No newline at end of file diff --git a/samples/petstore/java/pom.xml b/samples/client/petstore/java/pom.xml similarity index 98% rename from samples/petstore/java/pom.xml rename to samples/client/petstore/java/pom.xml index eb5ef7fe761..d5cf5b6024b 100644 --- a/samples/petstore/java/pom.xml +++ b/samples/client/petstore/java/pom.xml @@ -213,7 +213,7 @@ 1.7 - 1.02-SNAPSHOT + 1.1.0 2.9.1-1 4.8.1 1.0.0 diff --git a/samples/petstore/java/src/main/java/com/wordnik/client/ApiException.java b/samples/client/petstore/java/src/main/java/com/wordnik/client/ApiException.java similarity index 100% rename from samples/petstore/java/src/main/java/com/wordnik/client/ApiException.java rename to samples/client/petstore/java/src/main/java/com/wordnik/client/ApiException.java diff --git a/samples/petstore/java/src/main/java/com/wordnik/client/ApiInvoker.java b/samples/client/petstore/java/src/main/java/com/wordnik/client/ApiInvoker.java similarity index 92% rename from samples/petstore/java/src/main/java/com/wordnik/client/ApiInvoker.java rename to samples/client/petstore/java/src/main/java/com/wordnik/client/ApiInvoker.java index 00e6d766a60..d80b7818ad4 100644 --- a/samples/petstore/java/src/main/java/com/wordnik/client/ApiInvoker.java +++ b/samples/client/petstore/java/src/main/java/com/wordnik/client/ApiInvoker.java @@ -2,7 +2,10 @@ package com.wordnik.client; import com.wordnik.swagger.core.util.JsonUtil; -import org.codehaus.jackson.type.JavaType; +import com.fasterxml.jackson.core.JsonGenerator.Feature; +import com.fasterxml.jackson.databind.*; +import com.fasterxml.jackson.annotation.*; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.sun.jersey.api.client.Client; import com.sun.jersey.api.client.ClientResponse; @@ -38,7 +41,7 @@ public class ApiInvoker { public static Object deserialize(String json, String containerType, Class cls) throws ApiException { try{ if("List".equals(containerType)) { - JavaType typeInfo = org.codehaus.jackson.map.type.TypeFactory.collectionType(List.class, cls); + JavaType typeInfo = JsonUtil.getJsonMapper().getTypeFactory().constructCollectionType(List.class, cls); List response = (List) JsonUtil.getJsonMapper().readValue(json, typeInfo); return response; } @@ -128,4 +131,4 @@ public class ApiInvoker { } return hostMap.get(host); } -} +} \ No newline at end of file diff --git a/samples/petstore/java/src/main/java/com/wordnik/petstore/api/PetApi.java b/samples/client/petstore/java/src/main/java/com/wordnik/petstore/api/PetApi.java similarity index 100% rename from samples/petstore/java/src/main/java/com/wordnik/petstore/api/PetApi.java rename to samples/client/petstore/java/src/main/java/com/wordnik/petstore/api/PetApi.java diff --git a/samples/petstore/java/src/main/java/com/wordnik/petstore/api/StoreApi.java b/samples/client/petstore/java/src/main/java/com/wordnik/petstore/api/StoreApi.java similarity index 100% rename from samples/petstore/java/src/main/java/com/wordnik/petstore/api/StoreApi.java rename to samples/client/petstore/java/src/main/java/com/wordnik/petstore/api/StoreApi.java diff --git a/samples/petstore/java/src/main/java/com/wordnik/petstore/api/UserApi.java b/samples/client/petstore/java/src/main/java/com/wordnik/petstore/api/UserApi.java similarity index 100% rename from samples/petstore/java/src/main/java/com/wordnik/petstore/api/UserApi.java rename to samples/client/petstore/java/src/main/java/com/wordnik/petstore/api/UserApi.java diff --git a/samples/petstore/java/src/main/java/com/wordnik/petstore/model/Category.java b/samples/client/petstore/java/src/main/java/com/wordnik/petstore/model/Category.java similarity index 100% rename from samples/petstore/java/src/main/java/com/wordnik/petstore/model/Category.java rename to samples/client/petstore/java/src/main/java/com/wordnik/petstore/model/Category.java diff --git a/samples/petstore/java/src/main/java/com/wordnik/petstore/model/Order.java b/samples/client/petstore/java/src/main/java/com/wordnik/petstore/model/Order.java similarity index 100% rename from samples/petstore/java/src/main/java/com/wordnik/petstore/model/Order.java rename to samples/client/petstore/java/src/main/java/com/wordnik/petstore/model/Order.java diff --git a/samples/petstore/java/src/main/java/com/wordnik/petstore/model/Pet.java b/samples/client/petstore/java/src/main/java/com/wordnik/petstore/model/Pet.java similarity index 100% rename from samples/petstore/java/src/main/java/com/wordnik/petstore/model/Pet.java rename to samples/client/petstore/java/src/main/java/com/wordnik/petstore/model/Pet.java diff --git a/samples/petstore/java/src/main/java/com/wordnik/petstore/model/Tag.java b/samples/client/petstore/java/src/main/java/com/wordnik/petstore/model/Tag.java similarity index 100% rename from samples/petstore/java/src/main/java/com/wordnik/petstore/model/Tag.java rename to samples/client/petstore/java/src/main/java/com/wordnik/petstore/model/Tag.java diff --git a/samples/petstore/java/src/main/java/com/wordnik/petstore/model/User.java b/samples/client/petstore/java/src/main/java/com/wordnik/petstore/model/User.java similarity index 100% rename from samples/petstore/java/src/main/java/com/wordnik/petstore/model/User.java rename to samples/client/petstore/java/src/main/java/com/wordnik/petstore/model/User.java