support jsr310 dates in feign client

See #2874

bin/java-petstore-feign.sh

@@ -26,6 +26,9 @@ fi
 
 # if you've executed sbt assembly previously it will use that instead.
 export JAVA_OPTS="${JAVA_OPTS} -XX:MaxPermSize=256M -Xmx1024M -DloggerPath=conf/log4j.properties"
-ags="$@ generate -i modules/swagger-codegen/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml -l java -c bin/java-petstore-feign.json -o samples/client/petstore/java/feign -DhideGenerationTimestamp=true"
+ags="$@ generate -t modules/swagger-codegen/src/main/resources/Java/libraries/feign -i modules/swagger-codegen/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml -l java -c bin/java-petstore-feign.json -o samples/client/petstore/java/feign -DhideGenerationTimestamp=true"
 
+echo "Removing files and folders under samples/client/petstore/java/feign/src/main"
+rm -rf samples/client/petstore/java/feign/src/main
+find samples/client/petstore/java/feign -maxdepth 1 -type f ! -name "README.md" -exec rm {} +
 java $JAVA_OPTS -jar $executable $ags

modules/swagger-codegen/src/main/resources/Java/libraries/feign/ApiClient.mustache

@@ -9,7 +9,12 @@ import org.apache.oltu.oauth2.client.request.OAuthClientRequest.TokenRequestBuil
 import com.fasterxml.jackson.databind.DeserializationFeature;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.SerializationFeature;
+{{^java8}}
 import com.fasterxml.jackson.datatype.joda.JodaModule;
+{{/java8}}
+{{#java8}}
+import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule;
+{{/java8}}
 
 import feign.Feign;
 import feign.RequestInterceptor;
@@ -131,7 +136,12 @@ public class ApiClient {
     objectMapper.enable(DeserializationFeature.READ_ENUMS_USING_TO_STRING);
     objectMapper.disable(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES);
     objectMapper.disable(SerializationFeature.WRITE_DATES_AS_TIMESTAMPS);
+    {{^java8}}
     objectMapper.registerModule(new JodaModule());
+    {{/java8}}
+    {{#java8}}
+    objectMapper.registerModule(new JavaTimeModule());
+    {{/java8}}
     return objectMapper;
   }
 

modules/swagger-codegen/src/main/resources/Java/libraries/feign/build.gradle.mustache

@@ -78,8 +78,8 @@ if(hasProperty('target') && target == 'android') {
     apply plugin: 'java'
     apply plugin: 'maven'
     
-    sourceCompatibility = JavaVersion.VERSION_1_7
+    sourceCompatibility = JavaVersion.VERSION_{{^java8}}1_7{{/java8}}{{#java8}}1_8{{/java8}}
-    targetCompatibility = JavaVersion.VERSION_1_7
+    targetCompatibility = JavaVersion.VERSION_{{^java8}}1_7{{/java8}}{{#java8}}1_8{{/java8}}
     
     install {
         repositories.mavenInstaller {
@@ -95,9 +95,8 @@ if(hasProperty('target') && target == 'android') {
 
 ext {
     swagger_annotations_version = "1.5.8"
-    jackson_version = "2.7.0"
+    jackson_version = "2.7.5"
     feign_version = "8.16.0"
-    jodatime_version = "2.9.3"
     junit_version = "4.12"
     oltu_version = "1.0.1"
 }
@@ -110,8 +109,7 @@ dependencies {
     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-joda:2.1.5"
+    compile "com.fasterxml.jackson.datatype:jackson-datatype-{{^java8}}joda{{/java8}}{{#java8}}jsr310{{/java8}}:$jackson_version"
-    compile "joda-time:joda-time:$jodatime_version"
     compile "org.apache.oltu.oauth2:org.apache.oltu.oauth2.client:$oltu_version"
     compile "com.brsanthu:migbase64:2.2"
     testCompile "junit:junit:$junit_version"

modules/swagger-codegen/src/main/resources/Java/libraries/feign/build.sbt.mustache

@@ -13,11 +13,10 @@ lazy val root = (project in file(".")).
       "com.netflix.feign" % "feign-core" % "8.16.0" % "compile",
       "com.netflix.feign" % "feign-jackson" % "8.16.0" % "compile",
       "com.netflix.feign" % "feign-slf4j" % "8.16.0" % "compile",
-      "com.fasterxml.jackson.core" % "jackson-core" % "2.7.0" % "compile",
+      "com.fasterxml.jackson.core" % "jackson-core" % "2.7.5" % "compile",
-      "com.fasterxml.jackson.core" % "jackson-annotations" % "2.7.0" % "compile",
+      "com.fasterxml.jackson.core" % "jackson-annotations" % "2.7.5" % "compile",
-      "com.fasterxml.jackson.core" % "jackson-databind" % "2.7.0" % "compile",
+      "com.fasterxml.jackson.core" % "jackson-databind" % "2.7.5" % "compile",
-      "com.fasterxml.jackson.datatype" % "jackson-datatype-joda" % "2.1.5" % "compile",
+      "com.fasterxml.jackson.datatype" % "jackson-datatype-{{^java8}}joda{{/java8}}{{#java8}}jsr310{{/java8}}" % "2.7.5" % "compile",
-      "joda-time" % "joda-time" % "2.9.3" % "compile",
       "org.apache.oltu.oauth2" % "org.apache.oltu.oauth2.client" % "1.0.1" % "compile",
       "com.brsanthu" % "migbase64" % "2.2" % "compile",
       "junit" % "junit" % "4.12" % "test",

modules/swagger-codegen/src/main/resources/Java/libraries/feign/pom.mustache

@@ -95,15 +95,6 @@
           </execution>
         </executions>
       </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-compiler-plugin</artifactId>
-        <version>2.3.2</version>
-        <configuration>
-          <source>1.7</source>
-          <target>1.7</target>
-        </configuration>
-      </plugin>
     </plugins>
   </build>
   <dependencies>
@@ -148,10 +139,9 @@
     </dependency>
     <dependency>
       <groupId>com.fasterxml.jackson.datatype</groupId>
-      <artifactId>jackson-datatype-joda</artifactId>
+      <artifactId>jackson-datatype-{{^java8}}joda{{/java8}}{{#java8}}jsr310{{/java8}}</artifactId>
       <version>${jackson-version}</version>
     </dependency>
-
     <dependency>
       <groupId>org.apache.oltu.oauth2</groupId>
       <artifactId>org.apache.oltu.oauth2.client</artifactId>
@@ -167,10 +157,12 @@
     </dependency>
   </dependencies>
   <properties>
+    <java.version>{{#java8}}1.8{{/java8}}{{^java8}}1.7{{/java8}}</java.version>
+    <maven.compiler.source>${java.version}</maven.compiler.source>
+    <maven.compiler.target>${java.version}</maven.compiler.target>
     <swagger-core-version>1.5.8</swagger-core-version>
     <feign-version>8.16.0</feign-version>
-    <jackson-version>2.7.0</jackson-version>
+    <jackson-version>2.7.5</jackson-version>
-    <jodatime-version>2.9.3</jodatime-version>
     <junit-version>4.12</junit-version>
     <maven-plugin-version>1.0.0</maven-plugin-version>
     <oltu-version>1.0.1</oltu-version>

samples/client/petstore/java/feign/.swagger-codegen-ignore

@@ -14,7 +14,7 @@
 
 # You can recursively match patterns against a directory, file or extension with a double asterisk (**):
 #foo/**/qux
-# Thsi matches foo/bar/qux, foo/baz/qux, and foo/bar/baz/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:

samples/client/petstore/java/feign/build.gradle

@@ -95,9 +95,8 @@ if(hasProperty('target') && target == 'android') {
 
 ext {
     swagger_annotations_version = "1.5.8"
-    jackson_version = "2.7.0"
+    jackson_version = "2.7.5"
     feign_version = "8.16.0"
-    jodatime_version = "2.9.3"
     junit_version = "4.12"
     oltu_version = "1.0.1"
 }
@@ -110,8 +109,7 @@ dependencies {
     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-joda:2.1.5"
+    compile "com.fasterxml.jackson.datatype:jackson-datatype-joda:$jackson_version"
-    compile "joda-time:joda-time:$jodatime_version"
     compile "org.apache.oltu.oauth2:org.apache.oltu.oauth2.client:$oltu_version"
     compile "com.brsanthu:migbase64:2.2"
     testCompile "junit:junit:$junit_version"

samples/client/petstore/java/feign/build.sbt

@@ -13,11 +13,10 @@ lazy val root = (project in file(".")).
       "com.netflix.feign" % "feign-core" % "8.16.0" % "compile",
       "com.netflix.feign" % "feign-jackson" % "8.16.0" % "compile",
       "com.netflix.feign" % "feign-slf4j" % "8.16.0" % "compile",
-      "com.fasterxml.jackson.core" % "jackson-core" % "2.7.0" % "compile",
+      "com.fasterxml.jackson.core" % "jackson-core" % "2.7.5" % "compile",
-      "com.fasterxml.jackson.core" % "jackson-annotations" % "2.7.0" % "compile",
+      "com.fasterxml.jackson.core" % "jackson-annotations" % "2.7.5" % "compile",
-      "com.fasterxml.jackson.core" % "jackson-databind" % "2.7.0" % "compile",
+      "com.fasterxml.jackson.core" % "jackson-databind" % "2.7.5" % "compile",
-      "com.fasterxml.jackson.datatype" % "jackson-datatype-joda" % "2.1.5" % "compile",
+      "com.fasterxml.jackson.datatype" % "jackson-datatype-joda" % "2.7.5" % "compile",
-      "joda-time" % "joda-time" % "2.9.3" % "compile",
       "org.apache.oltu.oauth2" % "org.apache.oltu.oauth2.client" % "1.0.1" % "compile",
       "com.brsanthu" % "migbase64" % "2.2" % "compile",
       "junit" % "junit" % "4.12" % "test",

samples/client/petstore/java/feign/pom.xml

@@ -95,15 +95,6 @@
           </execution>
         </executions>
       </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-compiler-plugin</artifactId>
-        <version>2.3.2</version>
-        <configuration>
-          <source>1.7</source>
-          <target>1.7</target>
-        </configuration>
-      </plugin>
     </plugins>
   </build>
   <dependencies>
@@ -151,7 +142,6 @@
       <artifactId>jackson-datatype-joda</artifactId>
       <version>${jackson-version}</version>
     </dependency>
-
     <dependency>
       <groupId>org.apache.oltu.oauth2</groupId>
       <artifactId>org.apache.oltu.oauth2.client</artifactId>
@@ -167,10 +157,12 @@
     </dependency>
   </dependencies>
   <properties>
+    <java.version>1.7</java.version>
+    <maven.compiler.source>${java.version}</maven.compiler.source>
+    <maven.compiler.target>${java.version}</maven.compiler.target>
     <swagger-core-version>1.5.8</swagger-core-version>
     <feign-version>8.16.0</feign-version>
-    <jackson-version>2.7.0</jackson-version>
+    <jackson-version>2.7.5</jackson-version>
-    <jodatime-version>2.9.3</jodatime-version>
     <junit-version>4.12</junit-version>
     <maven-plugin-version>1.0.0</maven-plugin-version>
     <oltu-version>1.0.1</oltu-version>

samples/client/petstore/java/feign/src/main/java/io/swagger/client/ApiClient.java

@@ -41,10 +41,10 @@ public class ApiClient {
     this();
     for(String authName : authNames) { 
       RequestInterceptor auth;
-      if (authName == "api_key") { 
+      if (authName == "petstore_auth") { 
-        auth = new ApiKeyAuth("header", "api_key");
-      } else if (authName == "petstore_auth") { 
         auth = new OAuth(OAuthFlow.implicit, "http://petstore.swagger.io/api/oauth/dialog", "", "write:pets, read:pets");
+      } else if (authName == "api_key") { 
+        auth = new ApiKeyAuth("header", "api_key");
       } else {
         throw new RuntimeException("auth name \"" + authName + "\" not found in available auth names");
       }

samples/client/petstore/java/feign/src/main/java/io/swagger/client/api/FakeApi.java

@@ -3,8 +3,8 @@ package io.swagger.client.api;
 import io.swagger.client.ApiClient;
 
 import org.joda.time.LocalDate;
-import org.joda.time.DateTime;
 import java.math.BigDecimal;
+import org.joda.time.DateTime;
 
 import java.util.ArrayList;
 import java.util.HashMap;

samples/client/petstore/java/feign/src/main/java/io/swagger/client/api/PetApi.java

@@ -3,8 +3,8 @@ package io.swagger.client.api;
 import io.swagger.client.ApiClient;
 
 import io.swagger.client.model.Pet;
-import java.io.File;
 import io.swagger.client.model.ModelApiResponse;
+import java.io.File;
 
 import java.util.ArrayList;
 import java.util.HashMap;

samples/client/petstore/java/feign/src/main/java/io/swagger/client/model/InlineResponse200.java

@@ -1,201 +0,0 @@
-package io.swagger.client.model;
-
-import java.util.Objects;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.fasterxml.jackson.annotation.JsonValue;
-import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
-import io.swagger.client.model.Tag;
-import java.util.ArrayList;
-import java.util.List;
-
-
-/**
- * InlineResponse200
- */
-@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaClientCodegen", date = "2016-04-12T23:06:03.099+08:00")
-public class InlineResponse200   {
-  
-  private List<String> photoUrls = new ArrayList<String>();
-  private String name = null;
-  private Long id = null;
-  private Object category = null;
-  private List<Tag> tags = new ArrayList<Tag>();
-
-  /**
-   * pet status in the store
-   */
-  public enum StatusEnum {
-    AVAILABLE("available"),
-    PENDING("pending"),
-    SOLD("sold");
-
-    private String value;
-
-    StatusEnum(String value) {
-      this.value = value;
-    }
-
-    @Override
-    @JsonValue
-    public String toString() {
-      return String.valueOf(value);
-    }
-  }
-
-  private StatusEnum status = null;
-
-  
-  /**
-   **/
-  public InlineResponse200 photoUrls(List<String> photoUrls) {
-    this.photoUrls = photoUrls;
-    return this;
-  }
-  
-  @ApiModelProperty(example = "null", value = "")
-  @JsonProperty("photoUrls")
-  public List<String> getPhotoUrls() {
-    return photoUrls;
-  }
-  public void setPhotoUrls(List<String> photoUrls) {
-    this.photoUrls = photoUrls;
-  }
-
-  
-  /**
-   **/
-  public InlineResponse200 name(String name) {
-    this.name = name;
-    return this;
-  }
-  
-  @ApiModelProperty(example = "doggie", value = "")
-  @JsonProperty("name")
-  public String getName() {
-    return name;
-  }
-  public void setName(String name) {
-    this.name = name;
-  }
-
-  
-  /**
-   **/
-  public InlineResponse200 id(Long id) {
-    this.id = id;
-    return this;
-  }
-  
-  @ApiModelProperty(example = "null", required = true, value = "")
-  @JsonProperty("id")
-  public Long getId() {
-    return id;
-  }
-  public void setId(Long id) {
-    this.id = id;
-  }
-
-  
-  /**
-   **/
-  public InlineResponse200 category(Object category) {
-    this.category = category;
-    return this;
-  }
-  
-  @ApiModelProperty(example = "null", value = "")
-  @JsonProperty("category")
-  public Object getCategory() {
-    return category;
-  }
-  public void setCategory(Object category) {
-    this.category = category;
-  }
-
-  
-  /**
-   **/
-  public InlineResponse200 tags(List<Tag> tags) {
-    this.tags = tags;
-    return this;
-  }
-  
-  @ApiModelProperty(example = "null", value = "")
-  @JsonProperty("tags")
-  public List<Tag> getTags() {
-    return tags;
-  }
-  public void setTags(List<Tag> tags) {
-    this.tags = tags;
-  }
-
-  
-  /**
-   * pet status in the store
-   **/
-  public InlineResponse200 status(StatusEnum status) {
-    this.status = status;
-    return this;
-  }
-  
-  @ApiModelProperty(example = "null", value = "pet status in the store")
-  @JsonProperty("status")
-  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;
-    }
-    InlineResponse200 inlineResponse200 = (InlineResponse200) o;
-    return Objects.equals(this.photoUrls, inlineResponse200.photoUrls) &&
-        Objects.equals(this.name, inlineResponse200.name) &&
-        Objects.equals(this.id, inlineResponse200.id) &&
-        Objects.equals(this.category, inlineResponse200.category) &&
-        Objects.equals(this.tags, inlineResponse200.tags) &&
-        Objects.equals(this.status, inlineResponse200.status);
-  }
-
-  @Override
-  public int hashCode() {
-    return Objects.hash(photoUrls, name, id, category, tags, status);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder();
-    sb.append("class InlineResponse200 {\n");
-    
-    sb.append("    photoUrls: ").append(toIndentedString(photoUrls)).append("\n");
-    sb.append("    name: ").append(toIndentedString(name)).append("\n");
-    sb.append("    id: ").append(toIndentedString(id)).append("\n");
-    sb.append("    category: ").append(toIndentedString(category)).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    ");
-  }
-}
-

samples/client/petstore/java/feign/src/test/java/io/swagger/client/api/PetApiTest.java

@@ -1,137 +1,200 @@
 package io.swagger.client.api;
 
+import io.swagger.TestUtils;
+
 import io.swagger.client.ApiClient;
-import io.swagger.client.model.Pet;
+import io.swagger.client.api.*;
-import io.swagger.client.model.ModelApiResponse;
+import io.swagger.client.model.*;
+
+import java.io.BufferedWriter;
 import java.io.File;
-import org.junit.Before;
+import java.io.FileWriter;
-import org.junit.Test;
-
 import java.util.ArrayList;
-import java.util.HashMap;
+import java.util.Arrays;
 import java.util.List;
-import java.util.Map;
 
-/**
+import org.junit.*;
- * API tests for PetApi
+import static org.junit.Assert.*;
- */
+
 public class PetApiTest {
-
+    ApiClient apiClient;
-    private PetApi api;
+    PetApi api;
 
     @Before
     public void setup() {
-        api = new ApiClient().buildClient(PetApi.class);
+        apiClient = new ApiClient();
+        api = apiClient.buildClient(PetApi.class);
     }
 
-    
-    /**
-     * Add a new pet to the store
-     *
-     * 
-     */
     @Test
-    public void addPetTest() {
+    public void testApiClient() {
-        Pet body = null;
+        // the default api client is used
-        // api.addPet(body);
+        assertEquals("http://petstore.swagger.io/v2", apiClient.getBasePath());
 
-        // TODO: test validations
+        ApiClient newClient = new ApiClient();
+        newClient.setBasePath("http://example.com");
+
+        assertEquals("http://example.com", newClient.getBasePath());
     }
-    
+
-    /**
-     * Deletes a pet
-     *
-     * 
-     */
     @Test
-    public void deletePetTest() {
+    public void testCreateAndGetPet() throws Exception {
-        Long petId = null;
+        Pet pet = createRandomPet();
-        String apiKey = null;
+        api.addPet(pet);
-        // api.deletePet(petId, apiKey);
 
-        // TODO: test validations
+        Pet fetched = api.getPetById(pet.getId());
+        assertNotNull(fetched);
+        assertEquals(pet.getId(), fetched.getId());
+        assertNotNull(fetched.getCategory());
+        assertEquals(fetched.getCategory().getName(), pet.getCategory().getName());
     }
-    
+
-    /**
-     * Finds Pets by status
-     *
-     * Multiple status values can be provided with comma separated strings
-     */
     @Test
-    public void findPetsByStatusTest() {
+    public void testUpdatePet() throws Exception {
-        List<String> status = null;
+        Pet pet = createRandomPet();
-        // List<Pet> response = api.findPetsByStatus(status);
+        pet.setName("programmer");
 
-        // TODO: test validations
+        api.updatePet(pet);
+
+        Pet fetched = api.getPetById(pet.getId());
+        assertNotNull(fetched);
+        assertEquals(pet.getId(), fetched.getId());
+        assertNotNull(fetched.getCategory());
+        assertEquals(fetched.getCategory().getName(), pet.getCategory().getName());
     }
-    
+
-    /**
-     * Finds Pets by tags
-     *
-     * Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3 for testing.
-     */
     @Test
-    public void findPetsByTagsTest() {
+    public void testFindPetsByStatus() throws Exception {
-        List<String> tags = null;
+        Pet pet = createRandomPet();
-        // List<Pet> response = api.findPetsByTags(tags);
+        pet.setName("programmer");
+        pet.setStatus(Pet.StatusEnum.AVAILABLE);
 
-        // TODO: test validations
+        api.updatePet(pet);
+
+        List<Pet> pets = api.findPetsByStatus(Arrays.asList(new String[]{"available"}));
+        assertNotNull(pets);
+
+        boolean found = false;
+        for (Pet fetched : pets) {
+            if (fetched.getId().equals(pet.getId())) {
+                found = true;
+                break;
+            }
+        }
+
+        assertTrue(found);
     }
-    
+
-    /**
-     * Find pet by ID
-     *
-     * Returns a single pet
-     */
     @Test
-    public void getPetByIdTest() {
+    public void testFindPetsByTags() throws Exception {
-        Long petId = null;
+        Pet pet = createRandomPet();
-        // Pet response = api.getPetById(petId);
+        pet.setName("monster");
+        pet.setStatus(Pet.StatusEnum.AVAILABLE);
 
-        // TODO: test validations
+        List<Tag> tags = new ArrayList<Tag>();
+        Tag tag1 = new Tag();
+        tag1.setName("friendly");
+        tags.add(tag1);
+        pet.setTags(tags);
+
+        api.updatePet(pet);
+
+        List<Pet> pets = api.findPetsByTags(Arrays.asList(new String[]{"friendly"}));
+        assertNotNull(pets);
+
+        boolean found = false;
+        for (Pet fetched : pets) {
+            if (fetched.getId().equals(pet.getId())) {
+                found = true;
+                break;
+            }
+        }
+        assertTrue(found);
     }
-    
+
-    /**
-     * Update an existing pet
-     *
-     * 
-     */
     @Test
-    public void updatePetTest() {
+    public void testUpdatePetWithForm() throws Exception {
-        Pet body = null;
+        Pet pet = createRandomPet();
-        // api.updatePet(body);
+        pet.setName("frank");
+        api.addPet(pet);
 
-        // TODO: test validations
+        Pet fetched = api.getPetById(pet.getId());
+
+        api.updatePetWithForm(fetched.getId(), "furt", null);
+        Pet updated = api.getPetById(fetched.getId());
+
+        assertEquals(updated.getName(), "furt");
     }
-    
+
-    /**
-     * Updates a pet in the store with form data
-     *
-     * 
-     */
     @Test
-    public void updatePetWithFormTest() {
+    public void testDeletePet() throws Exception {
-        Long petId = null;
+        Pet pet = createRandomPet();
-        String name = null;
+        api.addPet(pet);
-        String status = null;
-        // api.updatePetWithForm(petId, name, status);
 
-        // TODO: test validations
+        Pet fetched = api.getPetById(pet.getId());
+        api.deletePet(fetched.getId(), null);
+
+        try {
+            fetched = api.getPetById(fetched.getId());
+            fail("expected an error");
+        } catch (Exception e) {
+//            assertEquals(404, e.getCode());
+        }
     }
-    
+
-    /**
-     * uploads an image
-     *
-     * 
-     */
     @Test
-    public void uploadFileTest() {
+    public void testUploadFile() throws Exception {
-        Long petId = null;
+        Pet pet = createRandomPet();
-        String additionalMetadata = null;
+        api.addPet(pet);
-        File file = null;
-        // ModelApiResponse response = api.uploadFile(petId, additionalMetadata, file);
 
-        // TODO: test validations
+        File file = new File("hello.txt");
+        BufferedWriter writer = new BufferedWriter(new FileWriter(file));
+        writer.write("Hello world!");
+        writer.close();
+
+        api.uploadFile(pet.getId(), "a test file", new File(file.getAbsolutePath()));
+    }
+
+    @Test
+    public void testEqualsAndHashCode() {
+        Pet pet1 = new Pet();
+        Pet pet2 = new Pet();
+        assertTrue(pet1.equals(pet2));
+        assertTrue(pet2.equals(pet1));
+        assertTrue(pet1.hashCode() == pet2.hashCode());
+        assertTrue(pet1.equals(pet1));
+        assertTrue(pet1.hashCode() == pet1.hashCode());
+
+        pet2.setName("really-happy");
+        pet2.setPhotoUrls(Arrays.asList(new String[]{"http://foo.bar.com/1", "http://foo.bar.com/2"}));
+        assertFalse(pet1.equals(pet2));
+        assertFalse(pet2.equals(pet1));
+        assertFalse(pet1.hashCode() == (pet2.hashCode()));
+        assertTrue(pet2.equals(pet2));
+        assertTrue(pet2.hashCode() == pet2.hashCode());
+
+        pet1.setName("really-happy");
+        pet1.setPhotoUrls(Arrays.asList(new String[]{"http://foo.bar.com/1", "http://foo.bar.com/2"}));
+        assertTrue(pet1.equals(pet2));
+        assertTrue(pet2.equals(pet1));
+        assertTrue(pet1.hashCode() == pet2.hashCode());
+        assertTrue(pet1.equals(pet1));
+        assertTrue(pet1.hashCode() == pet1.hashCode());
+    }
+
+    private Pet createRandomPet() {
+        Pet pet = new Pet();
+        pet.setId(TestUtils.nextId());
+        pet.setName("gorilla");
+
+        Category category = new Category();
+        category.setName("really-happy");
+
+        pet.setCategory(category);
+        pet.setStatus(Pet.StatusEnum.AVAILABLE);
+        List<String> photos = Arrays.asList(new String[]{"http://foo.bar.com/1", "http://foo.bar.com/2"});
+        pet.setPhotoUrls(photos);
+
+        return pet;
     }
-    
 }

samples/client/petstore/java/feign/src/test/java/io/swagger/client/api/StoreApiTest.java

@@ -1,77 +1,80 @@
 package io.swagger.client.api;
 
-import io.swagger.client.ApiClient;
+import feign.FeignException;
-import io.swagger.client.model.Order;
-import org.junit.Before;
-import org.junit.Test;
 
-import java.util.ArrayList;
+import io.swagger.TestUtils;
-import java.util.HashMap;
+
-import java.util.List;
+import io.swagger.client.ApiClient;
+import io.swagger.client.model.*;
+
+import java.lang.reflect.Field;
 import java.util.Map;
 
-/**
+import org.junit.*;
- * API tests for StoreApi
+import static org.junit.Assert.*;
- */
-public class StoreApiTest {
 
-    private StoreApi api;
+public class StoreApiTest {
+    ApiClient apiClient;
+    StoreApi api;
 
     @Before
     public void setup() {
-        api = new ApiClient().buildClient(StoreApi.class);
+        apiClient = new ApiClient();
+        api = apiClient.buildClient(StoreApi.class);
     }
 
-    
-    /**
-     * Delete purchase order by ID
-     *
-     * For valid response try integer IDs with value < 1000. Anything above 1000 or nonintegers will generate API errors
-     */
     @Test
-    public void deleteOrderTest() {
+    public void testGetInventory() throws Exception {
-        String orderId = null;
+        Map<String, Integer> inventory = api.getInventory();
-        // api.deleteOrder(orderId);
+        assertTrue(inventory.keySet().size() > 0);
-
-        // TODO: test validations
     }
-    
+
-    /**
-     * Returns pet inventories by status
-     *
-     * Returns a map of status codes to quantities
-     */
     @Test
-    public void getInventoryTest() {
+    public void testPlaceOrder() throws Exception {
-        // Map<String, Integer> response = api.getInventory();
+        Order order = createOrder();
+        api.placeOrder(order);
 
-        // TODO: test validations
+        Order fetched = api.getOrderById(order.getId());
+        assertEquals(order.getId(), fetched.getId());
+        assertEquals(order.getPetId(), fetched.getPetId());
+        assertEquals(order.getQuantity(), fetched.getQuantity());
+        assertEquals(order.getShipDate().toInstant(), fetched.getShipDate().toInstant());
     }
-    
+
-    /**
-     * Find purchase order by ID
-     *
-     * For valid response try integer IDs with value &lt;&#x3D; 5 or &gt; 10. Other values will generated exceptions
-     */
     @Test
-    public void getOrderByIdTest() {
+    public void testDeleteOrder() throws Exception {
-        Long orderId = null;
+        Order order = createOrder();
-        // Order response = api.getOrderById(orderId);
+        api.placeOrder(order);
 
-        // TODO: test validations
+        Order fetched = api.getOrderById(order.getId());
-    }
+        assertEquals(fetched.getId(), order.getId());
-    
-    /**
-     * Place an order for a pet
-     *
-     * 
-     */
-    @Test
-    public void placeOrderTest() {
-        Order body = null;
-        // Order response = api.placeOrder(body);
 
-        // TODO: test validations
+        api.deleteOrder(order.getId().toString());
+
+        try {
+            api.getOrderById(order.getId());
+            fail("expected an error");
+        } catch (FeignException e) {
+            assertTrue(e.getMessage().startsWith("status 404 "));
+        }
+    }
+
+    private Order createOrder() {
+        Order order = new Order();
+        order.setPetId(new Long(200));
+        order.setQuantity(new Integer(13));
+        order.setShipDate(org.joda.time.DateTime.now());
+        order.setStatus(Order.StatusEnum.PLACED);
+        order.setComplete(true);
+
+        try {
+          Field idField = Order.class.getDeclaredField("id");
+          idField.setAccessible(true);
+          idField.set(order, TestUtils.nextId());
+        } catch (Exception e) {
+          throw new RuntimeException(e);
+        }
+
+        return order;
     }
-    
 }

samples/client/petstore/java/feign/src/test/java/io/swagger/client/api/UserApiTest.java

@@ -1,131 +1,89 @@
 package io.swagger.client.api;
 
+import io.swagger.TestUtils;
+
 import io.swagger.client.ApiClient;
-import io.swagger.client.model.User;
+import io.swagger.client.api.*;
-import org.junit.Before;
+import io.swagger.client.model.*;
-import org.junit.Test;
 
-import java.util.ArrayList;
+import java.util.Arrays;
-import java.util.HashMap;
+
-import java.util.List;
+import org.junit.*;
-import java.util.Map;
+import static org.junit.Assert.*;
 
-/**
- * API tests for UserApi
- */
 public class UserApiTest {
-
+    ApiClient apiClient;
-    private UserApi api;
+    UserApi api;
 
     @Before
     public void setup() {
-        api = new ApiClient().buildClient(UserApi.class);
+        apiClient = new ApiClient();
+        api = apiClient.buildClient(UserApi.class);
     }
 
-    
-    /**
-     * Create user
-     *
-     * This can only be done by the logged in user.
-     */
     @Test
-    public void createUserTest() {
+    public void testCreateUser() throws Exception {
-        User body = null;
+        User user = createUser();
-        // api.createUser(body);
 
-        // TODO: test validations
+        api.createUser(user);
+
+        User fetched = api.getUserByName(user.getUsername());
+        assertEquals(user.getId(), fetched.getId());
     }
-    
+
-    /**
-     * Creates list of users with given input array
-     *
-     * 
-     */
     @Test
-    public void createUsersWithArrayInputTest() {
+    public void testCreateUsersWithArray() throws Exception {
-        List<User> body = null;
+        User user1 = createUser();
-        // api.createUsersWithArrayInput(body);
+        user1.setUsername("user" + user1.getId());
+        User user2 = createUser();
+        user2.setUsername("user" + user2.getId());
 
-        // TODO: test validations
+        api.createUsersWithArrayInput(Arrays.asList(new User[]{user1, user2}));
+
+        User fetched = api.getUserByName(user1.getUsername());
+        assertEquals(user1.getId(), fetched.getId());
     }
-    
+
-    /**
-     * Creates list of users with given input array
-     *
-     * 
-     */
     @Test
-    public void createUsersWithListInputTest() {
+    public void testCreateUsersWithList() throws Exception {
-        List<User> body = null;
+        User user1 = createUser();
-        // api.createUsersWithListInput(body);
+        user1.setUsername("user" + user1.getId());
+        User user2 = createUser();
+        user2.setUsername("user" + user2.getId());
 
-        // TODO: test validations
+        api.createUsersWithListInput(Arrays.asList(new User[]{user1, user2}));
+
+        User fetched = api.getUserByName(user1.getUsername());
+        assertEquals(user1.getId(), fetched.getId());
     }
-    
+
-    /**
+    // ignore for the time being, please refer to the following for more info:
-     * Delete user
+    // https://github.com/swagger-api/swagger-codegen/issues/1660
-     *
+    @Ignore @Test
-     * This can only be done by the logged in user.
+    public void testLoginUser() throws Exception {
-     */
+        User user = createUser();
+        api.createUser(user);
+
+        String token = api.loginUser(user.getUsername(), user.getPassword());
+        assertTrue(token.startsWith("logged in user session:"));
+    }
+
     @Test
-    public void deleteUserTest() {
+    public void logoutUser() throws Exception {
-        String username = null;
+        api.logoutUser();
-        // api.deleteUser(username);
-
-        // TODO: test validations
     }
-    
-    /**
-     * Get user by user name
-     *
-     * 
-     */
-    @Test
-    public void getUserByNameTest() {
-        String username = null;
-        // User response = api.getUserByName(username);
 
-        // TODO: test validations
+    private User createUser() {
-    }
+        User user = new User();
-    
+        user.setId(TestUtils.nextId());
-    /**
+        user.setUsername("fred" + user.getId());
-     * Logs user into the system
+        user.setFirstName("Fred");
-     *
+        user.setLastName("Meyer");
-     * 
+        user.setEmail("fred@fredmeyer.com");
-     */
+        user.setPassword("xxXXxx");
-    @Test
+        user.setPhone("408-867-5309");
-    public void loginUserTest() {
+        user.setUserStatus(123);
-        String username = null;
-        String password = null;
-        // String response = api.loginUser(username, password);
 
-        // TODO: test validations
+        return user;
     }
-    
-    /**
-     * Logs out current logged in user session
-     *
-     * 
-     */
-    @Test
-    public void logoutUserTest() {
-        // api.logoutUser();
-
-        // TODO: test validations
-    }
-    
-    /**
-     * Updated user
-     *
-     * This can only be done by the logged in user.
-     */
-    @Test
-    public void updateUserTest() {
-        String username = null;
-        User body = null;
-        // api.updateUser(username, body);
-
-        // TODO: test validations
-    }
-    
 }

samples/client/petstore/java/feign/src/test/java/io/swagger/petstore/test/PetApiTest.java

@@ -1,200 +0,0 @@
-package io.swagger.petstore.test;
-
-import io.swagger.TestUtils;
-
-import io.swagger.client.ApiClient;
-import io.swagger.client.api.*;
-import io.swagger.client.model.*;
-
-import java.io.BufferedWriter;
-import java.io.File;
-import java.io.FileWriter;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-
-import org.junit.*;
-import static org.junit.Assert.*;
-
-public class PetApiTest {
-    ApiClient apiClient;
-    PetApi api;
-
-    @Before
-    public void setup() {
-        apiClient = new ApiClient();
-        api = apiClient.buildClient(PetApi.class);
-    }
-
-    @Test
-    public void testApiClient() {
-        // the default api client is used
-        assertEquals("http://petstore.swagger.io/v2", apiClient.getBasePath());
-
-        ApiClient newClient = new ApiClient();
-        newClient.setBasePath("http://example.com");
-
-        assertEquals("http://example.com", newClient.getBasePath());
-    }
-
-    @Test
-    public void testCreateAndGetPet() throws Exception {
-        Pet pet = createRandomPet();
-        api.addPet(pet);
-
-        Pet fetched = api.getPetById(pet.getId());
-        assertNotNull(fetched);
-        assertEquals(pet.getId(), fetched.getId());
-        assertNotNull(fetched.getCategory());
-        assertEquals(fetched.getCategory().getName(), pet.getCategory().getName());
-    }
-
-    @Test
-    public void testUpdatePet() throws Exception {
-        Pet pet = createRandomPet();
-        pet.setName("programmer");
-
-        api.updatePet(pet);
-
-        Pet fetched = api.getPetById(pet.getId());
-        assertNotNull(fetched);
-        assertEquals(pet.getId(), fetched.getId());
-        assertNotNull(fetched.getCategory());
-        assertEquals(fetched.getCategory().getName(), pet.getCategory().getName());
-    }
-
-    @Test
-    public void testFindPetsByStatus() throws Exception {
-        Pet pet = createRandomPet();
-        pet.setName("programmer");
-        pet.setStatus(Pet.StatusEnum.AVAILABLE);
-
-        api.updatePet(pet);
-
-        List<Pet> pets = api.findPetsByStatus(Arrays.asList(new String[]{"available"}));
-        assertNotNull(pets);
-
-        boolean found = false;
-        for (Pet fetched : pets) {
-            if (fetched.getId().equals(pet.getId())) {
-                found = true;
-                break;
-            }
-        }
-
-        assertTrue(found);
-    }
-
-    @Test
-    public void testFindPetsByTags() throws Exception {
-        Pet pet = createRandomPet();
-        pet.setName("monster");
-        pet.setStatus(Pet.StatusEnum.AVAILABLE);
-
-        List<Tag> tags = new ArrayList<Tag>();
-        Tag tag1 = new Tag();
-        tag1.setName("friendly");
-        tags.add(tag1);
-        pet.setTags(tags);
-
-        api.updatePet(pet);
-
-        List<Pet> pets = api.findPetsByTags(Arrays.asList(new String[]{"friendly"}));
-        assertNotNull(pets);
-
-        boolean found = false;
-        for (Pet fetched : pets) {
-            if (fetched.getId().equals(pet.getId())) {
-                found = true;
-                break;
-            }
-        }
-        assertTrue(found);
-    }
-
-    @Test
-    public void testUpdatePetWithForm() throws Exception {
-        Pet pet = createRandomPet();
-        pet.setName("frank");
-        api.addPet(pet);
-
-        Pet fetched = api.getPetById(pet.getId());
-
-        api.updatePetWithForm(fetched.getId(), "furt", null);
-        Pet updated = api.getPetById(fetched.getId());
-
-        assertEquals(updated.getName(), "furt");
-    }
-
-    @Test
-    public void testDeletePet() throws Exception {
-        Pet pet = createRandomPet();
-        api.addPet(pet);
-
-        Pet fetched = api.getPetById(pet.getId());
-        api.deletePet(fetched.getId(), null);
-
-        try {
-            fetched = api.getPetById(fetched.getId());
-            fail("expected an error");
-        } catch (Exception e) {
-//            assertEquals(404, e.getCode());
-        }
-    }
-
-    @Test
-    public void testUploadFile() throws Exception {
-        Pet pet = createRandomPet();
-        api.addPet(pet);
-
-        File file = new File("hello.txt");
-        BufferedWriter writer = new BufferedWriter(new FileWriter(file));
-        writer.write("Hello world!");
-        writer.close();
-
-        api.uploadFile(pet.getId(), "a test file", new File(file.getAbsolutePath()));
-    }
-
-    @Test
-    public void testEqualsAndHashCode() {
-        Pet pet1 = new Pet();
-        Pet pet2 = new Pet();
-        assertTrue(pet1.equals(pet2));
-        assertTrue(pet2.equals(pet1));
-        assertTrue(pet1.hashCode() == pet2.hashCode());
-        assertTrue(pet1.equals(pet1));
-        assertTrue(pet1.hashCode() == pet1.hashCode());
-
-        pet2.setName("really-happy");
-        pet2.setPhotoUrls(Arrays.asList(new String[]{"http://foo.bar.com/1", "http://foo.bar.com/2"}));
-        assertFalse(pet1.equals(pet2));
-        assertFalse(pet2.equals(pet1));
-        assertFalse(pet1.hashCode() == (pet2.hashCode()));
-        assertTrue(pet2.equals(pet2));
-        assertTrue(pet2.hashCode() == pet2.hashCode());
-
-        pet1.setName("really-happy");
-        pet1.setPhotoUrls(Arrays.asList(new String[]{"http://foo.bar.com/1", "http://foo.bar.com/2"}));
-        assertTrue(pet1.equals(pet2));
-        assertTrue(pet2.equals(pet1));
-        assertTrue(pet1.hashCode() == pet2.hashCode());
-        assertTrue(pet1.equals(pet1));
-        assertTrue(pet1.hashCode() == pet1.hashCode());
-    }
-
-    private Pet createRandomPet() {
-        Pet pet = new Pet();
-        pet.setId(TestUtils.nextId());
-        pet.setName("gorilla");
-
-        Category category = new Category();
-        category.setName("really-happy");
-
-        pet.setCategory(category);
-        pet.setStatus(Pet.StatusEnum.AVAILABLE);
-        List<String> photos = Arrays.asList(new String[]{"http://foo.bar.com/1", "http://foo.bar.com/2"});
-        pet.setPhotoUrls(photos);
-
-        return pet;
-    }
-}

samples/client/petstore/java/feign/src/test/java/io/swagger/petstore/test/StoreApiTest.java

@@ -1,82 +0,0 @@
-package io.swagger.petstore.test;
-
-import feign.FeignException;
-
-import io.swagger.TestUtils;
-
-import io.swagger.client.ApiClient;
-import io.swagger.client.api.*;
-import io.swagger.client.model.*;
-
-import java.lang.reflect.Field;
-import java.util.Map;
-
-import org.joda.time.DateTimeZone;
-import org.junit.*;
-import static org.junit.Assert.*;
-
-public class StoreApiTest {
-    ApiClient apiClient;
-    StoreApi api;
-
-    @Before
-    public void setup() {
-        apiClient = new ApiClient();
-        api = apiClient.buildClient(StoreApi.class);
-    }
-
-    @Test
-    public void testGetInventory() throws Exception {
-        Map<String, Integer> inventory = api.getInventory();
-        assertTrue(inventory.keySet().size() > 0);
-    }
-
-    @Test
-    public void testPlaceOrder() throws Exception {
-        Order order = createOrder();
-        api.placeOrder(order);
-
-        Order fetched = api.getOrderById(order.getId());
-        assertEquals(order.getId(), fetched.getId());
-        assertEquals(order.getPetId(), fetched.getPetId());
-        assertEquals(order.getQuantity(), fetched.getQuantity());
-        assertEquals(order.getShipDate().withZone(DateTimeZone.UTC), fetched.getShipDate().withZone(DateTimeZone.UTC));
-    }
-
-    @Test
-    public void testDeleteOrder() throws Exception {
-        Order order = createOrder();
-        api.placeOrder(order);
-
-        Order fetched = api.getOrderById(order.getId());
-        assertEquals(fetched.getId(), order.getId());
-
-        api.deleteOrder(order.getId().toString());
-
-        try {
-            api.getOrderById(order.getId());
-            fail("expected an error");
-        } catch (FeignException e) {
-            assertTrue(e.getMessage().startsWith("status 404 "));
-        }
-    }
-
-    private Order createOrder() {
-        Order order = new Order();
-        order.setPetId(new Long(200));
-        order.setQuantity(new Integer(13));
-        order.setShipDate(org.joda.time.DateTime.now());
-        order.setStatus(Order.StatusEnum.PLACED);
-        order.setComplete(true);
-
-        try {
-          Field idField = Order.class.getDeclaredField("id");
-          idField.setAccessible(true);
-          idField.set(order, TestUtils.nextId());
-        } catch (Exception e) {
-          throw new RuntimeException(e);
-        }
-
-        return order;
-    }
-}

samples/client/petstore/java/feign/src/test/java/io/swagger/petstore/test/UserApiTest.java

@@ -1,89 +0,0 @@
-package io.swagger.petstore.test;
-
-import io.swagger.TestUtils;
-
-import io.swagger.client.ApiClient;
-import io.swagger.client.api.*;
-import io.swagger.client.model.*;
-
-import java.util.Arrays;
-
-import org.junit.*;
-import static org.junit.Assert.*;
-
-public class UserApiTest {
-    ApiClient apiClient;
-    UserApi api;
-
-    @Before
-    public void setup() {
-        apiClient = new ApiClient();
-        api = apiClient.buildClient(UserApi.class);
-    }
-
-    @Test
-    public void testCreateUser() throws Exception {
-        User user = createUser();
-
-        api.createUser(user);
-
-        User fetched = api.getUserByName(user.getUsername());
-        assertEquals(user.getId(), fetched.getId());
-    }
-
-    @Test
-    public void testCreateUsersWithArray() throws Exception {
-        User user1 = createUser();
-        user1.setUsername("user" + user1.getId());
-        User user2 = createUser();
-        user2.setUsername("user" + user2.getId());
-
-        api.createUsersWithArrayInput(Arrays.asList(new User[]{user1, user2}));
-
-        User fetched = api.getUserByName(user1.getUsername());
-        assertEquals(user1.getId(), fetched.getId());
-    }
-
-    @Test
-    public void testCreateUsersWithList() throws Exception {
-        User user1 = createUser();
-        user1.setUsername("user" + user1.getId());
-        User user2 = createUser();
-        user2.setUsername("user" + user2.getId());
-
-        api.createUsersWithListInput(Arrays.asList(new User[]{user1, user2}));
-
-        User fetched = api.getUserByName(user1.getUsername());
-        assertEquals(user1.getId(), fetched.getId());
-    }
-
-    // ignore for the time being, please refer to the following for more info:
-    // https://github.com/swagger-api/swagger-codegen/issues/1660
-    @Ignore @Test
-    public void testLoginUser() throws Exception {
-        User user = createUser();
-        api.createUser(user);
-
-        String token = api.loginUser(user.getUsername(), user.getPassword());
-        assertTrue(token.startsWith("logged in user session:"));
-    }
-
-    @Test
-    public void logoutUser() throws Exception {
-        api.logoutUser();
-    }
-
-    private User createUser() {
-        User user = new User();
-        user.setId(TestUtils.nextId());
-        user.setUsername("fred" + user.getId());
-        user.setFirstName("Fred");
-        user.setLastName("Meyer");
-        user.setEmail("fred@fredmeyer.com");
-        user.setPassword("xxXXxx");
-        user.setPhone("408-867-5309");
-        user.setUserStatus(123);
-
-        return user;
-    }
-}