From f10da06188ef2af4de8a7d718345200cf7ca2dd2 Mon Sep 17 00:00:00 2001
From: Tony Tam <fehguy@gmail.com>
Date: Sun, 15 Feb 2015 22:17:32 -0800
Subject: [PATCH] updated client

---
 .../io/swagger/client/api/AccountApi.java     |  2 +-
 .../java/io/swagger/client/api/WordApi.java   |  8 ++--
 .../java/io/swagger/client/api/WordsApi.java  |  4 +-
 .../swagger/client/model/ApiTokenStatus.java  | 24 +++++-------
 .../io/swagger/client/model/AudioFile.java    | 38 +++++++++----------
 .../io/swagger/client/model/AudioType.java    | 11 +++---
 .../client/model/AuthenticationToken.java     | 12 +++---
 .../java/io/swagger/client/model/Bigram.java  | 20 +++++-----
 .../io/swagger/client/model/Category.java     | 11 +++---
 .../io/swagger/client/model/Citation.java     |  8 +++-
 .../swagger/client/model/ContentProvider.java | 11 +++---
 .../io/swagger/client/model/Definition.java   | 35 ++++++++++++-----
 .../client/model/DefinitionSearchResults.java | 13 ++++---
 .../java/io/swagger/client/model/Example.java | 35 +++++++++--------
 .../client/model/ExampleSearchResults.java    | 10 +++--
 .../io/swagger/client/model/ExampleUsage.java |  7 +++-
 .../java/io/swagger/client/model/Facet.java   |  8 +++-
 .../io/swagger/client/model/FacetValue.java   | 11 +++---
 .../io/swagger/client/model/Frequency.java    | 14 +++----
 .../client/model/FrequencySummary.java        | 17 +++++----
 .../java/io/swagger/client/model/Label.java   |  8 +++-
 .../java/io/swagger/client/model/Note.java    | 13 ++++---
 .../io/swagger/client/model/PartOfSpeech.java |  9 ++++-
 .../java/io/swagger/client/model/Related.java | 13 ++++++-
 .../java/io/swagger/client/model/Root.java    | 12 +++---
 .../io/swagger/client/model/ScoredWord.java   | 35 ++++++++---------
 .../io/swagger/client/model/Sentence.java     | 21 +++++-----
 .../client/model/SimpleDefinition.java        | 10 ++++-
 .../swagger/client/model/SimpleExample.java   | 13 ++++---
 .../io/swagger/client/model/StringValue.java  |  7 +++-
 .../io/swagger/client/model/Syllable.java     | 12 +++---
 .../io/swagger/client/model/TextPron.java     | 12 +++---
 .../java/io/swagger/client/model/User.java    | 20 ++++++----
 .../io/swagger/client/model/WordList.java     | 26 +++++++------
 .../io/swagger/client/model/WordListWord.java | 25 ++++++------
 .../io/swagger/client/model/WordObject.java   | 15 +++++---
 .../io/swagger/client/model/WordOfTheDay.java | 29 +++++++++-----
 .../client/model/WordSearchResult.java        | 15 ++++----
 .../client/model/WordSearchResults.java       | 11 +++---
 39 files changed, 343 insertions(+), 262 deletions(-)

diff --git a/samples/client/wordnik/android-java/src/main/java/io/swagger/client/api/AccountApi.java b/samples/client/wordnik/android-java/src/main/java/io/swagger/client/api/AccountApi.java
index 9b593b8af50..e50be9645a6 100644
--- a/samples/client/wordnik/android-java/src/main/java/io/swagger/client/api/AccountApi.java
+++ b/samples/client/wordnik/android-java/src/main/java/io/swagger/client/api/AccountApi.java
@@ -7,9 +7,9 @@ import io.swagger.client.model.*;
 
 import java.util.*;
 
-import io.swagger.client.model.User;
 import io.swagger.client.model.ApiTokenStatus;
 import io.swagger.client.model.AuthenticationToken;
+import io.swagger.client.model.User;
 import io.swagger.client.model.WordList;
 
 import java.util.Map;
diff --git a/samples/client/wordnik/android-java/src/main/java/io/swagger/client/api/WordApi.java b/samples/client/wordnik/android-java/src/main/java/io/swagger/client/api/WordApi.java
index c5b9f219846..91f29610977 100644
--- a/samples/client/wordnik/android-java/src/main/java/io/swagger/client/api/WordApi.java
+++ b/samples/client/wordnik/android-java/src/main/java/io/swagger/client/api/WordApi.java
@@ -7,12 +7,12 @@ import io.swagger.client.model.*;
 
 import java.util.*;
 
-import io.swagger.client.model.Example;
-import io.swagger.client.model.AudioFile;
-import io.swagger.client.model.Bigram;
 import io.swagger.client.model.WordObject;
-import io.swagger.client.model.FrequencySummary;
+import io.swagger.client.model.AudioFile;
 import io.swagger.client.model.Definition;
+import io.swagger.client.model.FrequencySummary;
+import io.swagger.client.model.Bigram;
+import io.swagger.client.model.Example;
 
 import java.util.Map;
 import java.util.HashMap;
diff --git a/samples/client/wordnik/android-java/src/main/java/io/swagger/client/api/WordsApi.java b/samples/client/wordnik/android-java/src/main/java/io/swagger/client/api/WordsApi.java
index dc91ef981f4..7cc9da2c132 100644
--- a/samples/client/wordnik/android-java/src/main/java/io/swagger/client/api/WordsApi.java
+++ b/samples/client/wordnik/android-java/src/main/java/io/swagger/client/api/WordsApi.java
@@ -7,10 +7,10 @@ import io.swagger.client.model.*;
 
 import java.util.*;
 
+import io.swagger.client.model.WordObject;
+import io.swagger.client.model.DefinitionSearchResults;
 import io.swagger.client.model.WordSearchResults;
 import io.swagger.client.model.WordOfTheDay;
-import io.swagger.client.model.DefinitionSearchResults;
-import io.swagger.client.model.WordObject;
 
 import java.util.Map;
 import java.util.HashMap;
diff --git a/samples/client/wordnik/android-java/src/main/java/io/swagger/client/model/ApiTokenStatus.java b/samples/client/wordnik/android-java/src/main/java/io/swagger/client/model/ApiTokenStatus.java
index b8604ceefeb..5345aaeb0cc 100644
--- a/samples/client/wordnik/android-java/src/main/java/io/swagger/client/model/ApiTokenStatus.java
+++ b/samples/client/wordnik/android-java/src/main/java/io/swagger/client/model/ApiTokenStatus.java
@@ -2,33 +2,24 @@ package io.swagger.client.model;
 
 
 import com.wordnik.swagger.annotations.*;
+import com.fasterxml.jackson.annotation.JsonProperty;
 
 
 @ApiModel(description = "")
-public class ApiTokenStatus  { 
+public class ApiTokenStatus  {
+  
   private Boolean valid = null;
   private String token = null;
   private Long resetsInMillis = null;
-  
-  //public enum resetsInMillisEnum {  }; 
-  
   private Long remainingCalls = null;
-  
-  //public enum remainingCallsEnum {  }; 
-  
   private Long expiresInMillis = null;
-  
-  //public enum expiresInMillisEnum {  }; 
-  
   private Long totalRequests = null;
-  
-  //public enum totalRequestsEnum {  }; 
-  
-  
+
   
   /**
    **/
   @ApiModelProperty(required = false, value = "")
+  @JsonProperty("valid")
   public Boolean getValid() {
     return valid;
   }
@@ -40,6 +31,7 @@ public class ApiTokenStatus  {
   /**
    **/
   @ApiModelProperty(required = false, value = "")
+  @JsonProperty("token")
   public String getToken() {
     return token;
   }
@@ -51,6 +43,7 @@ public class ApiTokenStatus  {
   /**
    **/
   @ApiModelProperty(required = false, value = "")
+  @JsonProperty("resetsInMillis")
   public Long getResetsInMillis() {
     return resetsInMillis;
   }
@@ -62,6 +55,7 @@ public class ApiTokenStatus  {
   /**
    **/
   @ApiModelProperty(required = false, value = "")
+  @JsonProperty("remainingCalls")
   public Long getRemainingCalls() {
     return remainingCalls;
   }
@@ -73,6 +67,7 @@ public class ApiTokenStatus  {
   /**
    **/
   @ApiModelProperty(required = false, value = "")
+  @JsonProperty("expiresInMillis")
   public Long getExpiresInMillis() {
     return expiresInMillis;
   }
@@ -84,6 +79,7 @@ public class ApiTokenStatus  {
   /**
    **/
   @ApiModelProperty(required = false, value = "")
+  @JsonProperty("totalRequests")
   public Long getTotalRequests() {
     return totalRequests;
   }
diff --git a/samples/client/wordnik/android-java/src/main/java/io/swagger/client/model/AudioFile.java b/samples/client/wordnik/android-java/src/main/java/io/swagger/client/model/AudioFile.java
index 2bf220adf45..372ccfed7ed 100644
--- a/samples/client/wordnik/android-java/src/main/java/io/swagger/client/model/AudioFile.java
+++ b/samples/client/wordnik/android-java/src/main/java/io/swagger/client/model/AudioFile.java
@@ -3,47 +3,32 @@ package io.swagger.client.model;
 import java.util.Date;
 
 import com.wordnik.swagger.annotations.*;
+import com.fasterxml.jackson.annotation.JsonProperty;
 
 
 @ApiModel(description = "")
-public class AudioFile  { 
+public class AudioFile  {
+  
   private String attributionUrl = null;
   private Integer commentCount = null;
-  
-  //public enum commentCountEnum {  }; 
-  
   private Integer voteCount = null;
-  
-  //public enum voteCountEnum {  }; 
-  
   private String fileUrl = null;
   private String audioType = null;
   private Long id = null;
-  
-  //public enum idEnum {  }; 
-  
   private Double duration = null;
-  
-  //public enum durationEnum {  }; 
-  
   private String attributionText = null;
   private String createdBy = null;
   private String description = null;
   private Date createdAt = null;
   private Float voteWeightedAverage = null;
-  
-  //public enum voteWeightedAverageEnum {  }; 
-  
   private Float voteAverage = null;
-  
-  //public enum voteAverageEnum {  }; 
-  
   private String word = null;
-  
+
   
   /**
    **/
   @ApiModelProperty(required = false, value = "")
+  @JsonProperty("attributionUrl")
   public String getAttributionUrl() {
     return attributionUrl;
   }
@@ -55,6 +40,7 @@ public class AudioFile  {
   /**
    **/
   @ApiModelProperty(required = false, value = "")
+  @JsonProperty("commentCount")
   public Integer getCommentCount() {
     return commentCount;
   }
@@ -66,6 +52,7 @@ public class AudioFile  {
   /**
    **/
   @ApiModelProperty(required = false, value = "")
+  @JsonProperty("voteCount")
   public Integer getVoteCount() {
     return voteCount;
   }
@@ -77,6 +64,7 @@ public class AudioFile  {
   /**
    **/
   @ApiModelProperty(required = false, value = "")
+  @JsonProperty("fileUrl")
   public String getFileUrl() {
     return fileUrl;
   }
@@ -88,6 +76,7 @@ public class AudioFile  {
   /**
    **/
   @ApiModelProperty(required = false, value = "")
+  @JsonProperty("audioType")
   public String getAudioType() {
     return audioType;
   }
@@ -99,6 +88,7 @@ public class AudioFile  {
   /**
    **/
   @ApiModelProperty(required = false, value = "")
+  @JsonProperty("id")
   public Long getId() {
     return id;
   }
@@ -110,6 +100,7 @@ public class AudioFile  {
   /**
    **/
   @ApiModelProperty(required = false, value = "")
+  @JsonProperty("duration")
   public Double getDuration() {
     return duration;
   }
@@ -121,6 +112,7 @@ public class AudioFile  {
   /**
    **/
   @ApiModelProperty(required = false, value = "")
+  @JsonProperty("attributionText")
   public String getAttributionText() {
     return attributionText;
   }
@@ -132,6 +124,7 @@ public class AudioFile  {
   /**
    **/
   @ApiModelProperty(required = false, value = "")
+  @JsonProperty("createdBy")
   public String getCreatedBy() {
     return createdBy;
   }
@@ -143,6 +136,7 @@ public class AudioFile  {
   /**
    **/
   @ApiModelProperty(required = false, value = "")
+  @JsonProperty("description")
   public String getDescription() {
     return description;
   }
@@ -154,6 +148,7 @@ public class AudioFile  {
   /**
    **/
   @ApiModelProperty(required = false, value = "")
+  @JsonProperty("createdAt")
   public Date getCreatedAt() {
     return createdAt;
   }
@@ -165,6 +160,7 @@ public class AudioFile  {
   /**
    **/
   @ApiModelProperty(required = false, value = "")
+  @JsonProperty("voteWeightedAverage")
   public Float getVoteWeightedAverage() {
     return voteWeightedAverage;
   }
@@ -176,6 +172,7 @@ public class AudioFile  {
   /**
    **/
   @ApiModelProperty(required = false, value = "")
+  @JsonProperty("voteAverage")
   public Float getVoteAverage() {
     return voteAverage;
   }
@@ -187,6 +184,7 @@ public class AudioFile  {
   /**
    **/
   @ApiModelProperty(required = false, value = "")
+  @JsonProperty("word")
   public String getWord() {
     return word;
   }
diff --git a/samples/client/wordnik/android-java/src/main/java/io/swagger/client/model/AudioType.java b/samples/client/wordnik/android-java/src/main/java/io/swagger/client/model/AudioType.java
index 63f5ae5296d..c8ce06c0efd 100644
--- a/samples/client/wordnik/android-java/src/main/java/io/swagger/client/model/AudioType.java
+++ b/samples/client/wordnik/android-java/src/main/java/io/swagger/client/model/AudioType.java
@@ -2,20 +2,20 @@ package io.swagger.client.model;
 
 
 import com.wordnik.swagger.annotations.*;
+import com.fasterxml.jackson.annotation.JsonProperty;
 
 
 @ApiModel(description = "")
-public class AudioType  { 
+public class AudioType  {
+  
   private Integer id = null;
-  
-  //public enum idEnum {  }; 
-  
   private String name = null;
-  
+
   
   /**
    **/
   @ApiModelProperty(required = false, value = "")
+  @JsonProperty("id")
   public Integer getId() {
     return id;
   }
@@ -27,6 +27,7 @@ public class AudioType  {
   /**
    **/
   @ApiModelProperty(required = false, value = "")
+  @JsonProperty("name")
   public String getName() {
     return name;
   }
diff --git a/samples/client/wordnik/android-java/src/main/java/io/swagger/client/model/AuthenticationToken.java b/samples/client/wordnik/android-java/src/main/java/io/swagger/client/model/AuthenticationToken.java
index df1addd19fc..d047965b23f 100644
--- a/samples/client/wordnik/android-java/src/main/java/io/swagger/client/model/AuthenticationToken.java
+++ b/samples/client/wordnik/android-java/src/main/java/io/swagger/client/model/AuthenticationToken.java
@@ -2,21 +2,21 @@ package io.swagger.client.model;
 
 
 import com.wordnik.swagger.annotations.*;
+import com.fasterxml.jackson.annotation.JsonProperty;
 
 
 @ApiModel(description = "")
-public class AuthenticationToken  { 
+public class AuthenticationToken  {
+  
   private String token = null;
   private Long userId = null;
-  
-  //public enum userIdEnum {  }; 
-  
   private String userSignature = null;
-  
+
   
   /**
    **/
   @ApiModelProperty(required = false, value = "")
+  @JsonProperty("token")
   public String getToken() {
     return token;
   }
@@ -28,6 +28,7 @@ public class AuthenticationToken  {
   /**
    **/
   @ApiModelProperty(required = false, value = "")
+  @JsonProperty("userId")
   public Long getUserId() {
     return userId;
   }
@@ -39,6 +40,7 @@ public class AuthenticationToken  {
   /**
    **/
   @ApiModelProperty(required = false, value = "")
+  @JsonProperty("userSignature")
   public String getUserSignature() {
     return userSignature;
   }
diff --git a/samples/client/wordnik/android-java/src/main/java/io/swagger/client/model/Bigram.java b/samples/client/wordnik/android-java/src/main/java/io/swagger/client/model/Bigram.java
index 73f1c97bf67..d864b73c02e 100644
--- a/samples/client/wordnik/android-java/src/main/java/io/swagger/client/model/Bigram.java
+++ b/samples/client/wordnik/android-java/src/main/java/io/swagger/client/model/Bigram.java
@@ -2,29 +2,23 @@ package io.swagger.client.model;
 
 
 import com.wordnik.swagger.annotations.*;
+import com.fasterxml.jackson.annotation.JsonProperty;
 
 
 @ApiModel(description = "")
-public class Bigram  { 
+public class Bigram  {
+  
   private Long count = null;
-  
-  //public enum countEnum {  }; 
-  
   private String gram2 = null;
   private String gram1 = null;
   private Double wlmi = null;
-  
-  //public enum wlmiEnum {  }; 
-  
   private Double mi = null;
-  
-  //public enum miEnum {  }; 
-  
-  
+
   
   /**
    **/
   @ApiModelProperty(required = false, value = "")
+  @JsonProperty("count")
   public Long getCount() {
     return count;
   }
@@ -36,6 +30,7 @@ public class Bigram  {
   /**
    **/
   @ApiModelProperty(required = false, value = "")
+  @JsonProperty("gram2")
   public String getGram2() {
     return gram2;
   }
@@ -47,6 +42,7 @@ public class Bigram  {
   /**
    **/
   @ApiModelProperty(required = false, value = "")
+  @JsonProperty("gram1")
   public String getGram1() {
     return gram1;
   }
@@ -58,6 +54,7 @@ public class Bigram  {
   /**
    **/
   @ApiModelProperty(required = false, value = "")
+  @JsonProperty("wlmi")
   public Double getWlmi() {
     return wlmi;
   }
@@ -69,6 +66,7 @@ public class Bigram  {
   /**
    **/
   @ApiModelProperty(required = false, value = "")
+  @JsonProperty("mi")
   public Double getMi() {
     return mi;
   }
diff --git a/samples/client/wordnik/android-java/src/main/java/io/swagger/client/model/Category.java b/samples/client/wordnik/android-java/src/main/java/io/swagger/client/model/Category.java
index ee6fd792a98..3a7a84f89bb 100644
--- a/samples/client/wordnik/android-java/src/main/java/io/swagger/client/model/Category.java
+++ b/samples/client/wordnik/android-java/src/main/java/io/swagger/client/model/Category.java
@@ -2,20 +2,20 @@ package io.swagger.client.model;
 
 
 import com.wordnik.swagger.annotations.*;
+import com.fasterxml.jackson.annotation.JsonProperty;
 
 
 @ApiModel(description = "")
-public class Category  { 
+public class Category  {
+  
   private Long id = null;
-  
-  //public enum idEnum {  }; 
-  
   private String name = null;
-  
+
   
   /**
    **/
   @ApiModelProperty(required = false, value = "")
+  @JsonProperty("id")
   public Long getId() {
     return id;
   }
@@ -27,6 +27,7 @@ public class Category  {
   /**
    **/
   @ApiModelProperty(required = false, value = "")
+  @JsonProperty("name")
   public String getName() {
     return name;
   }
diff --git a/samples/client/wordnik/android-java/src/main/java/io/swagger/client/model/Citation.java b/samples/client/wordnik/android-java/src/main/java/io/swagger/client/model/Citation.java
index 1b77f27821a..f696895e6b5 100644
--- a/samples/client/wordnik/android-java/src/main/java/io/swagger/client/model/Citation.java
+++ b/samples/client/wordnik/android-java/src/main/java/io/swagger/client/model/Citation.java
@@ -2,17 +2,20 @@ package io.swagger.client.model;
 
 
 import com.wordnik.swagger.annotations.*;
+import com.fasterxml.jackson.annotation.JsonProperty;
 
 
 @ApiModel(description = "")
-public class Citation  { 
+public class Citation  {
+  
   private String cite = null;
   private String source = null;
-  
+
   
   /**
    **/
   @ApiModelProperty(required = false, value = "")
+  @JsonProperty("cite")
   public String getCite() {
     return cite;
   }
@@ -24,6 +27,7 @@ public class Citation  {
   /**
    **/
   @ApiModelProperty(required = false, value = "")
+  @JsonProperty("source")
   public String getSource() {
     return source;
   }
diff --git a/samples/client/wordnik/android-java/src/main/java/io/swagger/client/model/ContentProvider.java b/samples/client/wordnik/android-java/src/main/java/io/swagger/client/model/ContentProvider.java
index 1040459da4f..a069dad1a9f 100644
--- a/samples/client/wordnik/android-java/src/main/java/io/swagger/client/model/ContentProvider.java
+++ b/samples/client/wordnik/android-java/src/main/java/io/swagger/client/model/ContentProvider.java
@@ -2,20 +2,20 @@ package io.swagger.client.model;
 
 
 import com.wordnik.swagger.annotations.*;
+import com.fasterxml.jackson.annotation.JsonProperty;
 
 
 @ApiModel(description = "")
-public class ContentProvider  { 
+public class ContentProvider  {
+  
   private Integer id = null;
-  
-  //public enum idEnum {  }; 
-  
   private String name = null;
-  
+
   
   /**
    **/
   @ApiModelProperty(required = false, value = "")
+  @JsonProperty("id")
   public Integer getId() {
     return id;
   }
@@ -27,6 +27,7 @@ public class ContentProvider  {
   /**
    **/
   @ApiModelProperty(required = false, value = "")
+  @JsonProperty("name")
   public String getName() {
     return name;
   }
diff --git a/samples/client/wordnik/android-java/src/main/java/io/swagger/client/model/Definition.java b/samples/client/wordnik/android-java/src/main/java/io/swagger/client/model/Definition.java
index 5ebda05a888..e2e799d8b56 100644
--- a/samples/client/wordnik/android-java/src/main/java/io/swagger/client/model/Definition.java
+++ b/samples/client/wordnik/android-java/src/main/java/io/swagger/client/model/Definition.java
@@ -1,27 +1,26 @@
 package io.swagger.client.model;
 
-import io.swagger.client.model.ExampleUsage;
-import io.swagger.client.model.Label;
-import io.swagger.client.model.Note;
-import java.util.*;
 import io.swagger.client.model.Related;
-import io.swagger.client.model.Citation;
+import io.swagger.client.model.Note;
+import io.swagger.client.model.Label;
 import io.swagger.client.model.TextPron;
+import io.swagger.client.model.ExampleUsage;
+import java.util.*;
+import io.swagger.client.model.Citation;
 
 import com.wordnik.swagger.annotations.*;
+import com.fasterxml.jackson.annotation.JsonProperty;
 
 
 @ApiModel(description = "")
-public class Definition  { 
+public class Definition  {
+  
   private String extendedText = null;
   private String text = null;
   private String sourceDictionary = null;
   private List<Citation> citations = new ArrayList<Citation>() ;
   private List<Label> labels = new ArrayList<Label>() ;
   private Float score = null;
-  
-  //public enum scoreEnum {  }; 
-  
   private List<ExampleUsage> exampleUses = new ArrayList<ExampleUsage>() ;
   private String attributionUrl = null;
   private String seqString = null;
@@ -32,11 +31,12 @@ public class Definition  {
   private List<Note> notes = new ArrayList<Note>() ;
   private List<TextPron> textProns = new ArrayList<TextPron>() ;
   private String partOfSpeech = null;
-  
+
   
   /**
    **/
   @ApiModelProperty(required = false, value = "")
+  @JsonProperty("extendedText")
   public String getExtendedText() {
     return extendedText;
   }
@@ -48,6 +48,7 @@ public class Definition  {
   /**
    **/
   @ApiModelProperty(required = false, value = "")
+  @JsonProperty("text")
   public String getText() {
     return text;
   }
@@ -59,6 +60,7 @@ public class Definition  {
   /**
    **/
   @ApiModelProperty(required = false, value = "")
+  @JsonProperty("sourceDictionary")
   public String getSourceDictionary() {
     return sourceDictionary;
   }
@@ -70,6 +72,7 @@ public class Definition  {
   /**
    **/
   @ApiModelProperty(required = false, value = "")
+  @JsonProperty("citations")
   public List<Citation> getCitations() {
     return citations;
   }
@@ -81,6 +84,7 @@ public class Definition  {
   /**
    **/
   @ApiModelProperty(required = false, value = "")
+  @JsonProperty("labels")
   public List<Label> getLabels() {
     return labels;
   }
@@ -92,6 +96,7 @@ public class Definition  {
   /**
    **/
   @ApiModelProperty(required = false, value = "")
+  @JsonProperty("score")
   public Float getScore() {
     return score;
   }
@@ -103,6 +108,7 @@ public class Definition  {
   /**
    **/
   @ApiModelProperty(required = false, value = "")
+  @JsonProperty("exampleUses")
   public List<ExampleUsage> getExampleUses() {
     return exampleUses;
   }
@@ -114,6 +120,7 @@ public class Definition  {
   /**
    **/
   @ApiModelProperty(required = false, value = "")
+  @JsonProperty("attributionUrl")
   public String getAttributionUrl() {
     return attributionUrl;
   }
@@ -125,6 +132,7 @@ public class Definition  {
   /**
    **/
   @ApiModelProperty(required = false, value = "")
+  @JsonProperty("seqString")
   public String getSeqString() {
     return seqString;
   }
@@ -136,6 +144,7 @@ public class Definition  {
   /**
    **/
   @ApiModelProperty(required = false, value = "")
+  @JsonProperty("attributionText")
   public String getAttributionText() {
     return attributionText;
   }
@@ -147,6 +156,7 @@ public class Definition  {
   /**
    **/
   @ApiModelProperty(required = false, value = "")
+  @JsonProperty("relatedWords")
   public List<Related> getRelatedWords() {
     return relatedWords;
   }
@@ -158,6 +168,7 @@ public class Definition  {
   /**
    **/
   @ApiModelProperty(required = false, value = "")
+  @JsonProperty("sequence")
   public String getSequence() {
     return sequence;
   }
@@ -169,6 +180,7 @@ public class Definition  {
   /**
    **/
   @ApiModelProperty(required = false, value = "")
+  @JsonProperty("word")
   public String getWord() {
     return word;
   }
@@ -180,6 +192,7 @@ public class Definition  {
   /**
    **/
   @ApiModelProperty(required = false, value = "")
+  @JsonProperty("notes")
   public List<Note> getNotes() {
     return notes;
   }
@@ -191,6 +204,7 @@ public class Definition  {
   /**
    **/
   @ApiModelProperty(required = false, value = "")
+  @JsonProperty("textProns")
   public List<TextPron> getTextProns() {
     return textProns;
   }
@@ -202,6 +216,7 @@ public class Definition  {
   /**
    **/
   @ApiModelProperty(required = false, value = "")
+  @JsonProperty("partOfSpeech")
   public String getPartOfSpeech() {
     return partOfSpeech;
   }
diff --git a/samples/client/wordnik/android-java/src/main/java/io/swagger/client/model/DefinitionSearchResults.java b/samples/client/wordnik/android-java/src/main/java/io/swagger/client/model/DefinitionSearchResults.java
index 4045909b281..766d1aaafa3 100644
--- a/samples/client/wordnik/android-java/src/main/java/io/swagger/client/model/DefinitionSearchResults.java
+++ b/samples/client/wordnik/android-java/src/main/java/io/swagger/client/model/DefinitionSearchResults.java
@@ -1,23 +1,23 @@
 package io.swagger.client.model;
 
-import java.util.*;
 import io.swagger.client.model.Definition;
+import java.util.*;
 
 import com.wordnik.swagger.annotations.*;
+import com.fasterxml.jackson.annotation.JsonProperty;
 
 
 @ApiModel(description = "")
-public class DefinitionSearchResults  { 
+public class DefinitionSearchResults  {
+  
   private List<Definition> results = new ArrayList<Definition>() ;
   private Integer totalResults = null;
-  
-  //public enum totalResultsEnum {  }; 
-  
-  
+
   
   /**
    **/
   @ApiModelProperty(required = false, value = "")
+  @JsonProperty("results")
   public List<Definition> getResults() {
     return results;
   }
@@ -29,6 +29,7 @@ public class DefinitionSearchResults  {
   /**
    **/
   @ApiModelProperty(required = false, value = "")
+  @JsonProperty("totalResults")
   public Integer getTotalResults() {
     return totalResults;
   }
diff --git a/samples/client/wordnik/android-java/src/main/java/io/swagger/client/model/Example.java b/samples/client/wordnik/android-java/src/main/java/io/swagger/client/model/Example.java
index 6828aeeb5b9..13ce808ee37 100644
--- a/samples/client/wordnik/android-java/src/main/java/io/swagger/client/model/Example.java
+++ b/samples/client/wordnik/android-java/src/main/java/io/swagger/client/model/Example.java
@@ -1,22 +1,18 @@
 package io.swagger.client.model;
 
-import io.swagger.client.model.Sentence;
 import io.swagger.client.model.ContentProvider;
+import io.swagger.client.model.Sentence;
 import io.swagger.client.model.ScoredWord;
 
 import com.wordnik.swagger.annotations.*;
+import com.fasterxml.jackson.annotation.JsonProperty;
 
 
 @ApiModel(description = "")
-public class Example  { 
+public class Example  {
+  
   private Long id = null;
-  
-  //public enum idEnum {  }; 
-  
   private Long exampleId = null;
-  
-  //public enum exampleIdEnum {  }; 
-  
   private String title = null;
   private String text = null;
   private ScoredWord score = null;
@@ -24,23 +20,15 @@ public class Example  {
   private String word = null;
   private ContentProvider provider = null;
   private Integer year = null;
-  
-  //public enum yearEnum {  }; 
-  
   private Float rating = null;
-  
-  //public enum ratingEnum {  }; 
-  
   private Long documentId = null;
-  
-  //public enum documentIdEnum {  }; 
-  
   private String url = null;
-  
+
   
   /**
    **/
   @ApiModelProperty(required = false, value = "")
+  @JsonProperty("id")
   public Long getId() {
     return id;
   }
@@ -52,6 +40,7 @@ public class Example  {
   /**
    **/
   @ApiModelProperty(required = false, value = "")
+  @JsonProperty("exampleId")
   public Long getExampleId() {
     return exampleId;
   }
@@ -63,6 +52,7 @@ public class Example  {
   /**
    **/
   @ApiModelProperty(required = false, value = "")
+  @JsonProperty("title")
   public String getTitle() {
     return title;
   }
@@ -74,6 +64,7 @@ public class Example  {
   /**
    **/
   @ApiModelProperty(required = false, value = "")
+  @JsonProperty("text")
   public String getText() {
     return text;
   }
@@ -85,6 +76,7 @@ public class Example  {
   /**
    **/
   @ApiModelProperty(required = false, value = "")
+  @JsonProperty("score")
   public ScoredWord getScore() {
     return score;
   }
@@ -96,6 +88,7 @@ public class Example  {
   /**
    **/
   @ApiModelProperty(required = false, value = "")
+  @JsonProperty("sentence")
   public Sentence getSentence() {
     return sentence;
   }
@@ -107,6 +100,7 @@ public class Example  {
   /**
    **/
   @ApiModelProperty(required = false, value = "")
+  @JsonProperty("word")
   public String getWord() {
     return word;
   }
@@ -118,6 +112,7 @@ public class Example  {
   /**
    **/
   @ApiModelProperty(required = false, value = "")
+  @JsonProperty("provider")
   public ContentProvider getProvider() {
     return provider;
   }
@@ -129,6 +124,7 @@ public class Example  {
   /**
    **/
   @ApiModelProperty(required = false, value = "")
+  @JsonProperty("year")
   public Integer getYear() {
     return year;
   }
@@ -140,6 +136,7 @@ public class Example  {
   /**
    **/
   @ApiModelProperty(required = false, value = "")
+  @JsonProperty("rating")
   public Float getRating() {
     return rating;
   }
@@ -151,6 +148,7 @@ public class Example  {
   /**
    **/
   @ApiModelProperty(required = false, value = "")
+  @JsonProperty("documentId")
   public Long getDocumentId() {
     return documentId;
   }
@@ -162,6 +160,7 @@ public class Example  {
   /**
    **/
   @ApiModelProperty(required = false, value = "")
+  @JsonProperty("url")
   public String getUrl() {
     return url;
   }
diff --git a/samples/client/wordnik/android-java/src/main/java/io/swagger/client/model/ExampleSearchResults.java b/samples/client/wordnik/android-java/src/main/java/io/swagger/client/model/ExampleSearchResults.java
index cd1815f3374..f52d05ec7e8 100644
--- a/samples/client/wordnik/android-java/src/main/java/io/swagger/client/model/ExampleSearchResults.java
+++ b/samples/client/wordnik/android-java/src/main/java/io/swagger/client/model/ExampleSearchResults.java
@@ -1,21 +1,24 @@
 package io.swagger.client.model;
 
 import io.swagger.client.model.Example;
-import io.swagger.client.model.Facet;
 import java.util.*;
+import io.swagger.client.model.Facet;
 
 import com.wordnik.swagger.annotations.*;
+import com.fasterxml.jackson.annotation.JsonProperty;
 
 
 @ApiModel(description = "")
-public class ExampleSearchResults  { 
+public class ExampleSearchResults  {
+  
   private List<Facet> facets = new ArrayList<Facet>() ;
   private List<Example> examples = new ArrayList<Example>() ;
-  
+
   
   /**
    **/
   @ApiModelProperty(required = false, value = "")
+  @JsonProperty("facets")
   public List<Facet> getFacets() {
     return facets;
   }
@@ -27,6 +30,7 @@ public class ExampleSearchResults  {
   /**
    **/
   @ApiModelProperty(required = false, value = "")
+  @JsonProperty("examples")
   public List<Example> getExamples() {
     return examples;
   }
diff --git a/samples/client/wordnik/android-java/src/main/java/io/swagger/client/model/ExampleUsage.java b/samples/client/wordnik/android-java/src/main/java/io/swagger/client/model/ExampleUsage.java
index 0cd403f739d..c2ece249a49 100644
--- a/samples/client/wordnik/android-java/src/main/java/io/swagger/client/model/ExampleUsage.java
+++ b/samples/client/wordnik/android-java/src/main/java/io/swagger/client/model/ExampleUsage.java
@@ -2,16 +2,19 @@ package io.swagger.client.model;
 
 
 import com.wordnik.swagger.annotations.*;
+import com.fasterxml.jackson.annotation.JsonProperty;
 
 
 @ApiModel(description = "")
-public class ExampleUsage  { 
-  private String text = null;
+public class ExampleUsage  {
   
+  private String text = null;
+
   
   /**
    **/
   @ApiModelProperty(required = false, value = "")
+  @JsonProperty("text")
   public String getText() {
     return text;
   }
diff --git a/samples/client/wordnik/android-java/src/main/java/io/swagger/client/model/Facet.java b/samples/client/wordnik/android-java/src/main/java/io/swagger/client/model/Facet.java
index a8267bf9dd5..a18626e44c3 100644
--- a/samples/client/wordnik/android-java/src/main/java/io/swagger/client/model/Facet.java
+++ b/samples/client/wordnik/android-java/src/main/java/io/swagger/client/model/Facet.java
@@ -4,17 +4,20 @@ import io.swagger.client.model.FacetValue;
 import java.util.*;
 
 import com.wordnik.swagger.annotations.*;
+import com.fasterxml.jackson.annotation.JsonProperty;
 
 
 @ApiModel(description = "")
-public class Facet  { 
+public class Facet  {
+  
   private List<FacetValue> facetValues = new ArrayList<FacetValue>() ;
   private String name = null;
-  
+
   
   /**
    **/
   @ApiModelProperty(required = false, value = "")
+  @JsonProperty("facetValues")
   public List<FacetValue> getFacetValues() {
     return facetValues;
   }
@@ -26,6 +29,7 @@ public class Facet  {
   /**
    **/
   @ApiModelProperty(required = false, value = "")
+  @JsonProperty("name")
   public String getName() {
     return name;
   }
diff --git a/samples/client/wordnik/android-java/src/main/java/io/swagger/client/model/FacetValue.java b/samples/client/wordnik/android-java/src/main/java/io/swagger/client/model/FacetValue.java
index 16f9db92160..6f95d97180b 100644
--- a/samples/client/wordnik/android-java/src/main/java/io/swagger/client/model/FacetValue.java
+++ b/samples/client/wordnik/android-java/src/main/java/io/swagger/client/model/FacetValue.java
@@ -2,20 +2,20 @@ package io.swagger.client.model;
 
 
 import com.wordnik.swagger.annotations.*;
+import com.fasterxml.jackson.annotation.JsonProperty;
 
 
 @ApiModel(description = "")
-public class FacetValue  { 
+public class FacetValue  {
+  
   private Long count = null;
-  
-  //public enum countEnum {  }; 
-  
   private String value = null;
-  
+
   
   /**
    **/
   @ApiModelProperty(required = false, value = "")
+  @JsonProperty("count")
   public Long getCount() {
     return count;
   }
@@ -27,6 +27,7 @@ public class FacetValue  {
   /**
    **/
   @ApiModelProperty(required = false, value = "")
+  @JsonProperty("value")
   public String getValue() {
     return value;
   }
diff --git a/samples/client/wordnik/android-java/src/main/java/io/swagger/client/model/Frequency.java b/samples/client/wordnik/android-java/src/main/java/io/swagger/client/model/Frequency.java
index 111be656f82..410b04cf58c 100644
--- a/samples/client/wordnik/android-java/src/main/java/io/swagger/client/model/Frequency.java
+++ b/samples/client/wordnik/android-java/src/main/java/io/swagger/client/model/Frequency.java
@@ -2,23 +2,20 @@ package io.swagger.client.model;
 
 
 import com.wordnik.swagger.annotations.*;
+import com.fasterxml.jackson.annotation.JsonProperty;
 
 
 @ApiModel(description = "")
-public class Frequency  { 
+public class Frequency  {
+  
   private Long count = null;
-  
-  //public enum countEnum {  }; 
-  
   private Integer year = null;
-  
-  //public enum yearEnum {  }; 
-  
-  
+
   
   /**
    **/
   @ApiModelProperty(required = false, value = "")
+  @JsonProperty("count")
   public Long getCount() {
     return count;
   }
@@ -30,6 +27,7 @@ public class Frequency  {
   /**
    **/
   @ApiModelProperty(required = false, value = "")
+  @JsonProperty("year")
   public Integer getYear() {
     return year;
   }
diff --git a/samples/client/wordnik/android-java/src/main/java/io/swagger/client/model/FrequencySummary.java b/samples/client/wordnik/android-java/src/main/java/io/swagger/client/model/FrequencySummary.java
index 7e79d27f64d..845a4216b02 100644
--- a/samples/client/wordnik/android-java/src/main/java/io/swagger/client/model/FrequencySummary.java
+++ b/samples/client/wordnik/android-java/src/main/java/io/swagger/client/model/FrequencySummary.java
@@ -4,26 +4,23 @@ import io.swagger.client.model.Frequency;
 import java.util.*;
 
 import com.wordnik.swagger.annotations.*;
+import com.fasterxml.jackson.annotation.JsonProperty;
 
 
 @ApiModel(description = "")
-public class FrequencySummary  { 
+public class FrequencySummary  {
+  
   private Integer unknownYearCount = null;
-  
-  //public enum unknownYearCountEnum {  }; 
-  
   private Long totalCount = null;
-  
-  //public enum totalCountEnum {  }; 
-  
   private String frequencyString = null;
   private String word = null;
   private List<Frequency> frequency = new ArrayList<Frequency>() ;
-  
+
   
   /**
    **/
   @ApiModelProperty(required = false, value = "")
+  @JsonProperty("unknownYearCount")
   public Integer getUnknownYearCount() {
     return unknownYearCount;
   }
@@ -35,6 +32,7 @@ public class FrequencySummary  {
   /**
    **/
   @ApiModelProperty(required = false, value = "")
+  @JsonProperty("totalCount")
   public Long getTotalCount() {
     return totalCount;
   }
@@ -46,6 +44,7 @@ public class FrequencySummary  {
   /**
    **/
   @ApiModelProperty(required = false, value = "")
+  @JsonProperty("frequencyString")
   public String getFrequencyString() {
     return frequencyString;
   }
@@ -57,6 +56,7 @@ public class FrequencySummary  {
   /**
    **/
   @ApiModelProperty(required = false, value = "")
+  @JsonProperty("word")
   public String getWord() {
     return word;
   }
@@ -68,6 +68,7 @@ public class FrequencySummary  {
   /**
    **/
   @ApiModelProperty(required = false, value = "")
+  @JsonProperty("frequency")
   public List<Frequency> getFrequency() {
     return frequency;
   }
diff --git a/samples/client/wordnik/android-java/src/main/java/io/swagger/client/model/Label.java b/samples/client/wordnik/android-java/src/main/java/io/swagger/client/model/Label.java
index a1c3d23f9cc..5be4a1603ec 100644
--- a/samples/client/wordnik/android-java/src/main/java/io/swagger/client/model/Label.java
+++ b/samples/client/wordnik/android-java/src/main/java/io/swagger/client/model/Label.java
@@ -2,17 +2,20 @@ package io.swagger.client.model;
 
 
 import com.wordnik.swagger.annotations.*;
+import com.fasterxml.jackson.annotation.JsonProperty;
 
 
 @ApiModel(description = "")
-public class Label  { 
+public class Label  {
+  
   private String text = null;
   private String type = null;
-  
+
   
   /**
    **/
   @ApiModelProperty(required = false, value = "")
+  @JsonProperty("text")
   public String getText() {
     return text;
   }
@@ -24,6 +27,7 @@ public class Label  {
   /**
    **/
   @ApiModelProperty(required = false, value = "")
+  @JsonProperty("type")
   public String getType() {
     return type;
   }
diff --git a/samples/client/wordnik/android-java/src/main/java/io/swagger/client/model/Note.java b/samples/client/wordnik/android-java/src/main/java/io/swagger/client/model/Note.java
index c7364eb2b36..b8c3380c666 100644
--- a/samples/client/wordnik/android-java/src/main/java/io/swagger/client/model/Note.java
+++ b/samples/client/wordnik/android-java/src/main/java/io/swagger/client/model/Note.java
@@ -3,22 +3,22 @@ package io.swagger.client.model;
 import java.util.*;
 
 import com.wordnik.swagger.annotations.*;
+import com.fasterxml.jackson.annotation.JsonProperty;
 
 
 @ApiModel(description = "")
-public class Note  { 
+public class Note  {
+  
   private String noteType = null;
   private List<String> appliesTo = new ArrayList<String>() ;
   private String value = null;
   private Integer pos = null;
-  
-  //public enum posEnum {  }; 
-  
-  
+
   
   /**
    **/
   @ApiModelProperty(required = false, value = "")
+  @JsonProperty("noteType")
   public String getNoteType() {
     return noteType;
   }
@@ -30,6 +30,7 @@ public class Note  {
   /**
    **/
   @ApiModelProperty(required = false, value = "")
+  @JsonProperty("appliesTo")
   public List<String> getAppliesTo() {
     return appliesTo;
   }
@@ -41,6 +42,7 @@ public class Note  {
   /**
    **/
   @ApiModelProperty(required = false, value = "")
+  @JsonProperty("value")
   public String getValue() {
     return value;
   }
@@ -52,6 +54,7 @@ public class Note  {
   /**
    **/
   @ApiModelProperty(required = false, value = "")
+  @JsonProperty("pos")
   public Integer getPos() {
     return pos;
   }
diff --git a/samples/client/wordnik/android-java/src/main/java/io/swagger/client/model/PartOfSpeech.java b/samples/client/wordnik/android-java/src/main/java/io/swagger/client/model/PartOfSpeech.java
index 9e6514aada8..d44c3027203 100644
--- a/samples/client/wordnik/android-java/src/main/java/io/swagger/client/model/PartOfSpeech.java
+++ b/samples/client/wordnik/android-java/src/main/java/io/swagger/client/model/PartOfSpeech.java
@@ -5,18 +5,21 @@ import io.swagger.client.model.Root;
 import java.util.*;
 
 import com.wordnik.swagger.annotations.*;
+import com.fasterxml.jackson.annotation.JsonProperty;
 
 
 @ApiModel(description = "")
-public class PartOfSpeech  { 
+public class PartOfSpeech  {
+  
   private List<Root> roots = new ArrayList<Root>() ;
   private List<String> storageAbbr = new ArrayList<String>() ;
   private List<Category> allCategories = new ArrayList<Category>() ;
-  
+
   
   /**
    **/
   @ApiModelProperty(required = false, value = "")
+  @JsonProperty("roots")
   public List<Root> getRoots() {
     return roots;
   }
@@ -28,6 +31,7 @@ public class PartOfSpeech  {
   /**
    **/
   @ApiModelProperty(required = false, value = "")
+  @JsonProperty("storageAbbr")
   public List<String> getStorageAbbr() {
     return storageAbbr;
   }
@@ -39,6 +43,7 @@ public class PartOfSpeech  {
   /**
    **/
   @ApiModelProperty(required = false, value = "")
+  @JsonProperty("allCategories")
   public List<Category> getAllCategories() {
     return allCategories;
   }
diff --git a/samples/client/wordnik/android-java/src/main/java/io/swagger/client/model/Related.java b/samples/client/wordnik/android-java/src/main/java/io/swagger/client/model/Related.java
index fe6f8c057f3..1444493e902 100644
--- a/samples/client/wordnik/android-java/src/main/java/io/swagger/client/model/Related.java
+++ b/samples/client/wordnik/android-java/src/main/java/io/swagger/client/model/Related.java
@@ -3,10 +3,12 @@ package io.swagger.client.model;
 import java.util.*;
 
 import com.wordnik.swagger.annotations.*;
+import com.fasterxml.jackson.annotation.JsonProperty;
 
 
 @ApiModel(description = "")
-public class Related  { 
+public class Related  {
+  
   private String label1 = null;
   private String relationshipType = null;
   private String label2 = null;
@@ -14,11 +16,12 @@ public class Related  {
   private List<String> words = new ArrayList<String>() ;
   private String gram = null;
   private String label4 = null;
-  
+
   
   /**
    **/
   @ApiModelProperty(required = false, value = "")
+  @JsonProperty("label1")
   public String getLabel1() {
     return label1;
   }
@@ -30,6 +33,7 @@ public class Related  {
   /**
    **/
   @ApiModelProperty(required = false, value = "")
+  @JsonProperty("relationshipType")
   public String getRelationshipType() {
     return relationshipType;
   }
@@ -41,6 +45,7 @@ public class Related  {
   /**
    **/
   @ApiModelProperty(required = false, value = "")
+  @JsonProperty("label2")
   public String getLabel2() {
     return label2;
   }
@@ -52,6 +57,7 @@ public class Related  {
   /**
    **/
   @ApiModelProperty(required = false, value = "")
+  @JsonProperty("label3")
   public String getLabel3() {
     return label3;
   }
@@ -63,6 +69,7 @@ public class Related  {
   /**
    **/
   @ApiModelProperty(required = false, value = "")
+  @JsonProperty("words")
   public List<String> getWords() {
     return words;
   }
@@ -74,6 +81,7 @@ public class Related  {
   /**
    **/
   @ApiModelProperty(required = false, value = "")
+  @JsonProperty("gram")
   public String getGram() {
     return gram;
   }
@@ -85,6 +93,7 @@ public class Related  {
   /**
    **/
   @ApiModelProperty(required = false, value = "")
+  @JsonProperty("label4")
   public String getLabel4() {
     return label4;
   }
diff --git a/samples/client/wordnik/android-java/src/main/java/io/swagger/client/model/Root.java b/samples/client/wordnik/android-java/src/main/java/io/swagger/client/model/Root.java
index d6b630f6b72..af87820db3b 100644
--- a/samples/client/wordnik/android-java/src/main/java/io/swagger/client/model/Root.java
+++ b/samples/client/wordnik/android-java/src/main/java/io/swagger/client/model/Root.java
@@ -4,21 +4,21 @@ import io.swagger.client.model.Category;
 import java.util.*;
 
 import com.wordnik.swagger.annotations.*;
+import com.fasterxml.jackson.annotation.JsonProperty;
 
 
 @ApiModel(description = "")
-public class Root  { 
+public class Root  {
+  
   private Long id = null;
-  
-  //public enum idEnum {  }; 
-  
   private String name = null;
   private List<Category> categories = new ArrayList<Category>() ;
-  
+
   
   /**
    **/
   @ApiModelProperty(required = false, value = "")
+  @JsonProperty("id")
   public Long getId() {
     return id;
   }
@@ -30,6 +30,7 @@ public class Root  {
   /**
    **/
   @ApiModelProperty(required = false, value = "")
+  @JsonProperty("name")
   public String getName() {
     return name;
   }
@@ -41,6 +42,7 @@ public class Root  {
   /**
    **/
   @ApiModelProperty(required = false, value = "")
+  @JsonProperty("categories")
   public List<Category> getCategories() {
     return categories;
   }
diff --git a/samples/client/wordnik/android-java/src/main/java/io/swagger/client/model/ScoredWord.java b/samples/client/wordnik/android-java/src/main/java/io/swagger/client/model/ScoredWord.java
index 32ddd9c5ca5..9ba7c288c03 100644
--- a/samples/client/wordnik/android-java/src/main/java/io/swagger/client/model/ScoredWord.java
+++ b/samples/client/wordnik/android-java/src/main/java/io/swagger/client/model/ScoredWord.java
@@ -2,44 +2,29 @@ package io.swagger.client.model;
 
 
 import com.wordnik.swagger.annotations.*;
+import com.fasterxml.jackson.annotation.JsonProperty;
 
 
 @ApiModel(description = "")
-public class ScoredWord  { 
+public class ScoredWord  {
+  
   private Integer position = null;
-  
-  //public enum positionEnum {  }; 
-  
   private Long id = null;
-  
-  //public enum idEnum {  }; 
-  
   private Integer docTermCount = null;
-  
-  //public enum docTermCountEnum {  }; 
-  
   private String lemma = null;
   private String wordType = null;
   private Float score = null;
-  
-  //public enum scoreEnum {  }; 
-  
   private Long sentenceId = null;
-  
-  //public enum sentenceIdEnum {  }; 
-  
   private String word = null;
   private Boolean stopword = null;
   private Double baseWordScore = null;
-  
-  //public enum baseWordScoreEnum {  }; 
-  
   private String partOfSpeech = null;
-  
+
   
   /**
    **/
   @ApiModelProperty(required = false, value = "")
+  @JsonProperty("position")
   public Integer getPosition() {
     return position;
   }
@@ -51,6 +36,7 @@ public class ScoredWord  {
   /**
    **/
   @ApiModelProperty(required = false, value = "")
+  @JsonProperty("id")
   public Long getId() {
     return id;
   }
@@ -62,6 +48,7 @@ public class ScoredWord  {
   /**
    **/
   @ApiModelProperty(required = false, value = "")
+  @JsonProperty("docTermCount")
   public Integer getDocTermCount() {
     return docTermCount;
   }
@@ -73,6 +60,7 @@ public class ScoredWord  {
   /**
    **/
   @ApiModelProperty(required = false, value = "")
+  @JsonProperty("lemma")
   public String getLemma() {
     return lemma;
   }
@@ -84,6 +72,7 @@ public class ScoredWord  {
   /**
    **/
   @ApiModelProperty(required = false, value = "")
+  @JsonProperty("wordType")
   public String getWordType() {
     return wordType;
   }
@@ -95,6 +84,7 @@ public class ScoredWord  {
   /**
    **/
   @ApiModelProperty(required = false, value = "")
+  @JsonProperty("score")
   public Float getScore() {
     return score;
   }
@@ -106,6 +96,7 @@ public class ScoredWord  {
   /**
    **/
   @ApiModelProperty(required = false, value = "")
+  @JsonProperty("sentenceId")
   public Long getSentenceId() {
     return sentenceId;
   }
@@ -117,6 +108,7 @@ public class ScoredWord  {
   /**
    **/
   @ApiModelProperty(required = false, value = "")
+  @JsonProperty("word")
   public String getWord() {
     return word;
   }
@@ -128,6 +120,7 @@ public class ScoredWord  {
   /**
    **/
   @ApiModelProperty(required = false, value = "")
+  @JsonProperty("stopword")
   public Boolean getStopword() {
     return stopword;
   }
@@ -139,6 +132,7 @@ public class ScoredWord  {
   /**
    **/
   @ApiModelProperty(required = false, value = "")
+  @JsonProperty("baseWordScore")
   public Double getBaseWordScore() {
     return baseWordScore;
   }
@@ -150,6 +144,7 @@ public class ScoredWord  {
   /**
    **/
   @ApiModelProperty(required = false, value = "")
+  @JsonProperty("partOfSpeech")
   public String getPartOfSpeech() {
     return partOfSpeech;
   }
diff --git a/samples/client/wordnik/android-java/src/main/java/io/swagger/client/model/Sentence.java b/samples/client/wordnik/android-java/src/main/java/io/swagger/client/model/Sentence.java
index bdc248fce9c..f4712f7c55a 100644
--- a/samples/client/wordnik/android-java/src/main/java/io/swagger/client/model/Sentence.java
+++ b/samples/client/wordnik/android-java/src/main/java/io/swagger/client/model/Sentence.java
@@ -4,30 +4,24 @@ import java.util.*;
 import io.swagger.client.model.ScoredWord;
 
 import com.wordnik.swagger.annotations.*;
+import com.fasterxml.jackson.annotation.JsonProperty;
 
 
 @ApiModel(description = "")
-public class Sentence  { 
+public class Sentence  {
+  
   private Boolean hasScoredWords = null;
   private Long id = null;
-  
-  //public enum idEnum {  }; 
-  
   private List<ScoredWord> scoredWords = new ArrayList<ScoredWord>() ;
   private String display = null;
   private Integer rating = null;
-  
-  //public enum ratingEnum {  }; 
-  
   private Long documentMetadataId = null;
-  
-  //public enum documentMetadataIdEnum {  }; 
-  
-  
+
   
   /**
    **/
   @ApiModelProperty(required = false, value = "")
+  @JsonProperty("hasScoredWords")
   public Boolean getHasScoredWords() {
     return hasScoredWords;
   }
@@ -39,6 +33,7 @@ public class Sentence  {
   /**
    **/
   @ApiModelProperty(required = false, value = "")
+  @JsonProperty("id")
   public Long getId() {
     return id;
   }
@@ -50,6 +45,7 @@ public class Sentence  {
   /**
    **/
   @ApiModelProperty(required = false, value = "")
+  @JsonProperty("scoredWords")
   public List<ScoredWord> getScoredWords() {
     return scoredWords;
   }
@@ -61,6 +57,7 @@ public class Sentence  {
   /**
    **/
   @ApiModelProperty(required = false, value = "")
+  @JsonProperty("display")
   public String getDisplay() {
     return display;
   }
@@ -72,6 +69,7 @@ public class Sentence  {
   /**
    **/
   @ApiModelProperty(required = false, value = "")
+  @JsonProperty("rating")
   public Integer getRating() {
     return rating;
   }
@@ -83,6 +81,7 @@ public class Sentence  {
   /**
    **/
   @ApiModelProperty(required = false, value = "")
+  @JsonProperty("documentMetadataId")
   public Long getDocumentMetadataId() {
     return documentMetadataId;
   }
diff --git a/samples/client/wordnik/android-java/src/main/java/io/swagger/client/model/SimpleDefinition.java b/samples/client/wordnik/android-java/src/main/java/io/swagger/client/model/SimpleDefinition.java
index 3a73f7c5c87..4ad5011383c 100644
--- a/samples/client/wordnik/android-java/src/main/java/io/swagger/client/model/SimpleDefinition.java
+++ b/samples/client/wordnik/android-java/src/main/java/io/swagger/client/model/SimpleDefinition.java
@@ -2,19 +2,22 @@ package io.swagger.client.model;
 
 
 import com.wordnik.swagger.annotations.*;
+import com.fasterxml.jackson.annotation.JsonProperty;
 
 
 @ApiModel(description = "")
-public class SimpleDefinition  { 
+public class SimpleDefinition  {
+  
   private String text = null;
   private String source = null;
   private String note = null;
   private String partOfSpeech = null;
-  
+
   
   /**
    **/
   @ApiModelProperty(required = false, value = "")
+  @JsonProperty("text")
   public String getText() {
     return text;
   }
@@ -26,6 +29,7 @@ public class SimpleDefinition  {
   /**
    **/
   @ApiModelProperty(required = false, value = "")
+  @JsonProperty("source")
   public String getSource() {
     return source;
   }
@@ -37,6 +41,7 @@ public class SimpleDefinition  {
   /**
    **/
   @ApiModelProperty(required = false, value = "")
+  @JsonProperty("note")
   public String getNote() {
     return note;
   }
@@ -48,6 +53,7 @@ public class SimpleDefinition  {
   /**
    **/
   @ApiModelProperty(required = false, value = "")
+  @JsonProperty("partOfSpeech")
   public String getPartOfSpeech() {
     return partOfSpeech;
   }
diff --git a/samples/client/wordnik/android-java/src/main/java/io/swagger/client/model/SimpleExample.java b/samples/client/wordnik/android-java/src/main/java/io/swagger/client/model/SimpleExample.java
index 4c1850d2505..49fddce711d 100644
--- a/samples/client/wordnik/android-java/src/main/java/io/swagger/client/model/SimpleExample.java
+++ b/samples/client/wordnik/android-java/src/main/java/io/swagger/client/model/SimpleExample.java
@@ -2,22 +2,22 @@ package io.swagger.client.model;
 
 
 import com.wordnik.swagger.annotations.*;
+import com.fasterxml.jackson.annotation.JsonProperty;
 
 
 @ApiModel(description = "")
-public class SimpleExample  { 
+public class SimpleExample  {
+  
   private Long id = null;
-  
-  //public enum idEnum {  }; 
-  
   private String title = null;
   private String text = null;
   private String url = null;
-  
+
   
   /**
    **/
   @ApiModelProperty(required = false, value = "")
+  @JsonProperty("id")
   public Long getId() {
     return id;
   }
@@ -29,6 +29,7 @@ public class SimpleExample  {
   /**
    **/
   @ApiModelProperty(required = false, value = "")
+  @JsonProperty("title")
   public String getTitle() {
     return title;
   }
@@ -40,6 +41,7 @@ public class SimpleExample  {
   /**
    **/
   @ApiModelProperty(required = false, value = "")
+  @JsonProperty("text")
   public String getText() {
     return text;
   }
@@ -51,6 +53,7 @@ public class SimpleExample  {
   /**
    **/
   @ApiModelProperty(required = false, value = "")
+  @JsonProperty("url")
   public String getUrl() {
     return url;
   }
diff --git a/samples/client/wordnik/android-java/src/main/java/io/swagger/client/model/StringValue.java b/samples/client/wordnik/android-java/src/main/java/io/swagger/client/model/StringValue.java
index 52eb85a3ad8..3b0dad8d513 100644
--- a/samples/client/wordnik/android-java/src/main/java/io/swagger/client/model/StringValue.java
+++ b/samples/client/wordnik/android-java/src/main/java/io/swagger/client/model/StringValue.java
@@ -2,16 +2,19 @@ package io.swagger.client.model;
 
 
 import com.wordnik.swagger.annotations.*;
+import com.fasterxml.jackson.annotation.JsonProperty;
 
 
 @ApiModel(description = "")
-public class StringValue  { 
-  private String word = null;
+public class StringValue  {
   
+  private String word = null;
+
   
   /**
    **/
   @ApiModelProperty(required = false, value = "")
+  @JsonProperty("word")
   public String getWord() {
     return word;
   }
diff --git a/samples/client/wordnik/android-java/src/main/java/io/swagger/client/model/Syllable.java b/samples/client/wordnik/android-java/src/main/java/io/swagger/client/model/Syllable.java
index 6fd9cf5748b..ea20c14a6c8 100644
--- a/samples/client/wordnik/android-java/src/main/java/io/swagger/client/model/Syllable.java
+++ b/samples/client/wordnik/android-java/src/main/java/io/swagger/client/model/Syllable.java
@@ -2,21 +2,21 @@ package io.swagger.client.model;
 
 
 import com.wordnik.swagger.annotations.*;
+import com.fasterxml.jackson.annotation.JsonProperty;
 
 
 @ApiModel(description = "")
-public class Syllable  { 
+public class Syllable  {
+  
   private String text = null;
   private Integer seq = null;
-  
-  //public enum seqEnum {  }; 
-  
   private String type = null;
-  
+
   
   /**
    **/
   @ApiModelProperty(required = false, value = "")
+  @JsonProperty("text")
   public String getText() {
     return text;
   }
@@ -28,6 +28,7 @@ public class Syllable  {
   /**
    **/
   @ApiModelProperty(required = false, value = "")
+  @JsonProperty("seq")
   public Integer getSeq() {
     return seq;
   }
@@ -39,6 +40,7 @@ public class Syllable  {
   /**
    **/
   @ApiModelProperty(required = false, value = "")
+  @JsonProperty("type")
   public String getType() {
     return type;
   }
diff --git a/samples/client/wordnik/android-java/src/main/java/io/swagger/client/model/TextPron.java b/samples/client/wordnik/android-java/src/main/java/io/swagger/client/model/TextPron.java
index e2c42645ca1..8282d0059cb 100644
--- a/samples/client/wordnik/android-java/src/main/java/io/swagger/client/model/TextPron.java
+++ b/samples/client/wordnik/android-java/src/main/java/io/swagger/client/model/TextPron.java
@@ -2,21 +2,21 @@ package io.swagger.client.model;
 
 
 import com.wordnik.swagger.annotations.*;
+import com.fasterxml.jackson.annotation.JsonProperty;
 
 
 @ApiModel(description = "")
-public class TextPron  { 
+public class TextPron  {
+  
   private String raw = null;
   private Integer seq = null;
-  
-  //public enum seqEnum {  }; 
-  
   private String rawType = null;
-  
+
   
   /**
    **/
   @ApiModelProperty(required = false, value = "")
+  @JsonProperty("raw")
   public String getRaw() {
     return raw;
   }
@@ -28,6 +28,7 @@ public class TextPron  {
   /**
    **/
   @ApiModelProperty(required = false, value = "")
+  @JsonProperty("seq")
   public Integer getSeq() {
     return seq;
   }
@@ -39,6 +40,7 @@ public class TextPron  {
   /**
    **/
   @ApiModelProperty(required = false, value = "")
+  @JsonProperty("rawType")
   public String getRawType() {
     return rawType;
   }
diff --git a/samples/client/wordnik/android-java/src/main/java/io/swagger/client/model/User.java b/samples/client/wordnik/android-java/src/main/java/io/swagger/client/model/User.java
index 23b75c1ab53..9801cd27ea4 100644
--- a/samples/client/wordnik/android-java/src/main/java/io/swagger/client/model/User.java
+++ b/samples/client/wordnik/android-java/src/main/java/io/swagger/client/model/User.java
@@ -2,29 +2,26 @@ package io.swagger.client.model;
 
 
 import com.wordnik.swagger.annotations.*;
+import com.fasterxml.jackson.annotation.JsonProperty;
 
 
 @ApiModel(description = "")
-public class User  { 
+public class User  {
+  
   private Long id = null;
-  
-  //public enum idEnum {  }; 
-  
   private String username = null;
   private String email = null;
   private Integer status = null;
-  
-  //public enum statusEnum {  }; 
-  
   private String faceBookId = null;
   private String userName = null;
   private String displayName = null;
   private String password = null;
-  
+
   
   /**
    **/
   @ApiModelProperty(required = false, value = "")
+  @JsonProperty("id")
   public Long getId() {
     return id;
   }
@@ -36,6 +33,7 @@ public class User  {
   /**
    **/
   @ApiModelProperty(required = false, value = "")
+  @JsonProperty("username")
   public String getUsername() {
     return username;
   }
@@ -47,6 +45,7 @@ public class User  {
   /**
    **/
   @ApiModelProperty(required = false, value = "")
+  @JsonProperty("email")
   public String getEmail() {
     return email;
   }
@@ -58,6 +57,7 @@ public class User  {
   /**
    **/
   @ApiModelProperty(required = false, value = "")
+  @JsonProperty("status")
   public Integer getStatus() {
     return status;
   }
@@ -69,6 +69,7 @@ public class User  {
   /**
    **/
   @ApiModelProperty(required = false, value = "")
+  @JsonProperty("faceBookId")
   public String getFaceBookId() {
     return faceBookId;
   }
@@ -80,6 +81,7 @@ public class User  {
   /**
    **/
   @ApiModelProperty(required = false, value = "")
+  @JsonProperty("userName")
   public String getUserName() {
     return userName;
   }
@@ -91,6 +93,7 @@ public class User  {
   /**
    **/
   @ApiModelProperty(required = false, value = "")
+  @JsonProperty("displayName")
   public String getDisplayName() {
     return displayName;
   }
@@ -102,6 +105,7 @@ public class User  {
   /**
    **/
   @ApiModelProperty(required = false, value = "")
+  @JsonProperty("password")
   public String getPassword() {
     return password;
   }
diff --git a/samples/client/wordnik/android-java/src/main/java/io/swagger/client/model/WordList.java b/samples/client/wordnik/android-java/src/main/java/io/swagger/client/model/WordList.java
index 8d6b1b0206d..fa8621b0fb5 100644
--- a/samples/client/wordnik/android-java/src/main/java/io/swagger/client/model/WordList.java
+++ b/samples/client/wordnik/android-java/src/main/java/io/swagger/client/model/WordList.java
@@ -3,14 +3,13 @@ package io.swagger.client.model;
 import java.util.Date;
 
 import com.wordnik.swagger.annotations.*;
+import com.fasterxml.jackson.annotation.JsonProperty;
 
 
 @ApiModel(description = "")
-public class WordList  { 
+public class WordList  {
+  
   private Long id = null;
-  
-  //public enum idEnum {  }; 
-  
   private String permalink = null;
   private String name = null;
   private Date createdAt = null;
@@ -18,20 +17,15 @@ public class WordList  {
   private Date lastActivityAt = null;
   private String username = null;
   private Long userId = null;
-  
-  //public enum userIdEnum {  }; 
-  
   private String description = null;
   private Long numberWordsInList = null;
-  
-  //public enum numberWordsInListEnum {  }; 
-  
   private String type = null;
-  
+
   
   /**
    **/
   @ApiModelProperty(required = false, value = "")
+  @JsonProperty("id")
   public Long getId() {
     return id;
   }
@@ -43,6 +37,7 @@ public class WordList  {
   /**
    **/
   @ApiModelProperty(required = false, value = "")
+  @JsonProperty("permalink")
   public String getPermalink() {
     return permalink;
   }
@@ -54,6 +49,7 @@ public class WordList  {
   /**
    **/
   @ApiModelProperty(required = false, value = "")
+  @JsonProperty("name")
   public String getName() {
     return name;
   }
@@ -65,6 +61,7 @@ public class WordList  {
   /**
    **/
   @ApiModelProperty(required = false, value = "")
+  @JsonProperty("createdAt")
   public Date getCreatedAt() {
     return createdAt;
   }
@@ -76,6 +73,7 @@ public class WordList  {
   /**
    **/
   @ApiModelProperty(required = false, value = "")
+  @JsonProperty("updatedAt")
   public Date getUpdatedAt() {
     return updatedAt;
   }
@@ -87,6 +85,7 @@ public class WordList  {
   /**
    **/
   @ApiModelProperty(required = false, value = "")
+  @JsonProperty("lastActivityAt")
   public Date getLastActivityAt() {
     return lastActivityAt;
   }
@@ -98,6 +97,7 @@ public class WordList  {
   /**
    **/
   @ApiModelProperty(required = false, value = "")
+  @JsonProperty("username")
   public String getUsername() {
     return username;
   }
@@ -109,6 +109,7 @@ public class WordList  {
   /**
    **/
   @ApiModelProperty(required = false, value = "")
+  @JsonProperty("userId")
   public Long getUserId() {
     return userId;
   }
@@ -120,6 +121,7 @@ public class WordList  {
   /**
    **/
   @ApiModelProperty(required = false, value = "")
+  @JsonProperty("description")
   public String getDescription() {
     return description;
   }
@@ -131,6 +133,7 @@ public class WordList  {
   /**
    **/
   @ApiModelProperty(required = false, value = "")
+  @JsonProperty("numberWordsInList")
   public Long getNumberWordsInList() {
     return numberWordsInList;
   }
@@ -142,6 +145,7 @@ public class WordList  {
   /**
    **/
   @ApiModelProperty(required = false, value = "")
+  @JsonProperty("type")
   public String getType() {
     return type;
   }
diff --git a/samples/client/wordnik/android-java/src/main/java/io/swagger/client/model/WordListWord.java b/samples/client/wordnik/android-java/src/main/java/io/swagger/client/model/WordListWord.java
index c7af867bb57..61d4eed7de9 100644
--- a/samples/client/wordnik/android-java/src/main/java/io/swagger/client/model/WordListWord.java
+++ b/samples/client/wordnik/android-java/src/main/java/io/swagger/client/model/WordListWord.java
@@ -3,34 +3,25 @@ package io.swagger.client.model;
 import java.util.Date;
 
 import com.wordnik.swagger.annotations.*;
+import com.fasterxml.jackson.annotation.JsonProperty;
 
 
 @ApiModel(description = "")
-public class WordListWord  { 
+public class WordListWord  {
+  
   private Long id = null;
-  
-  //public enum idEnum {  }; 
-  
   private String word = null;
   private String username = null;
   private Long userId = null;
-  
-  //public enum userIdEnum {  }; 
-  
   private Date createdAt = null;
   private Long numberCommentsOnWord = null;
-  
-  //public enum numberCommentsOnWordEnum {  }; 
-  
   private Long numberLists = null;
-  
-  //public enum numberListsEnum {  }; 
-  
-  
+
   
   /**
    **/
   @ApiModelProperty(required = false, value = "")
+  @JsonProperty("id")
   public Long getId() {
     return id;
   }
@@ -42,6 +33,7 @@ public class WordListWord  {
   /**
    **/
   @ApiModelProperty(required = false, value = "")
+  @JsonProperty("word")
   public String getWord() {
     return word;
   }
@@ -53,6 +45,7 @@ public class WordListWord  {
   /**
    **/
   @ApiModelProperty(required = false, value = "")
+  @JsonProperty("username")
   public String getUsername() {
     return username;
   }
@@ -64,6 +57,7 @@ public class WordListWord  {
   /**
    **/
   @ApiModelProperty(required = false, value = "")
+  @JsonProperty("userId")
   public Long getUserId() {
     return userId;
   }
@@ -75,6 +69,7 @@ public class WordListWord  {
   /**
    **/
   @ApiModelProperty(required = false, value = "")
+  @JsonProperty("createdAt")
   public Date getCreatedAt() {
     return createdAt;
   }
@@ -86,6 +81,7 @@ public class WordListWord  {
   /**
    **/
   @ApiModelProperty(required = false, value = "")
+  @JsonProperty("numberCommentsOnWord")
   public Long getNumberCommentsOnWord() {
     return numberCommentsOnWord;
   }
@@ -97,6 +93,7 @@ public class WordListWord  {
   /**
    **/
   @ApiModelProperty(required = false, value = "")
+  @JsonProperty("numberLists")
   public Long getNumberLists() {
     return numberLists;
   }
diff --git a/samples/client/wordnik/android-java/src/main/java/io/swagger/client/model/WordObject.java b/samples/client/wordnik/android-java/src/main/java/io/swagger/client/model/WordObject.java
index 9324a2dd7be..bd660a41354 100644
--- a/samples/client/wordnik/android-java/src/main/java/io/swagger/client/model/WordObject.java
+++ b/samples/client/wordnik/android-java/src/main/java/io/swagger/client/model/WordObject.java
@@ -3,24 +3,24 @@ package io.swagger.client.model;
 import java.util.*;
 
 import com.wordnik.swagger.annotations.*;
+import com.fasterxml.jackson.annotation.JsonProperty;
 
 
 @ApiModel(description = "")
-public class WordObject  { 
+public class WordObject  {
+  
   private Long id = null;
-  
-  //public enum idEnum {  }; 
-  
   private String word = null;
   private String originalWord = null;
   private List<String> suggestions = new ArrayList<String>() ;
   private String canonicalForm = null;
   private String vulgar = null;
-  
+
   
   /**
    **/
   @ApiModelProperty(required = false, value = "")
+  @JsonProperty("id")
   public Long getId() {
     return id;
   }
@@ -32,6 +32,7 @@ public class WordObject  {
   /**
    **/
   @ApiModelProperty(required = false, value = "")
+  @JsonProperty("word")
   public String getWord() {
     return word;
   }
@@ -43,6 +44,7 @@ public class WordObject  {
   /**
    **/
   @ApiModelProperty(required = false, value = "")
+  @JsonProperty("originalWord")
   public String getOriginalWord() {
     return originalWord;
   }
@@ -54,6 +56,7 @@ public class WordObject  {
   /**
    **/
   @ApiModelProperty(required = false, value = "")
+  @JsonProperty("suggestions")
   public List<String> getSuggestions() {
     return suggestions;
   }
@@ -65,6 +68,7 @@ public class WordObject  {
   /**
    **/
   @ApiModelProperty(required = false, value = "")
+  @JsonProperty("canonicalForm")
   public String getCanonicalForm() {
     return canonicalForm;
   }
@@ -76,6 +80,7 @@ public class WordObject  {
   /**
    **/
   @ApiModelProperty(required = false, value = "")
+  @JsonProperty("vulgar")
   public String getVulgar() {
     return vulgar;
   }
diff --git a/samples/client/wordnik/android-java/src/main/java/io/swagger/client/model/WordOfTheDay.java b/samples/client/wordnik/android-java/src/main/java/io/swagger/client/model/WordOfTheDay.java
index 5431ceec138..4351ffd583c 100644
--- a/samples/client/wordnik/android-java/src/main/java/io/swagger/client/model/WordOfTheDay.java
+++ b/samples/client/wordnik/android-java/src/main/java/io/swagger/client/model/WordOfTheDay.java
@@ -1,20 +1,19 @@
 package io.swagger.client.model;
 
-import java.util.Date;
-import io.swagger.client.model.SimpleDefinition;
-import io.swagger.client.model.ContentProvider;
-import java.util.*;
 import io.swagger.client.model.SimpleExample;
+import io.swagger.client.model.ContentProvider;
+import io.swagger.client.model.SimpleDefinition;
+import java.util.*;
+import java.util.Date;
 
 import com.wordnik.swagger.annotations.*;
+import com.fasterxml.jackson.annotation.JsonProperty;
 
 
 @ApiModel(description = "")
-public class WordOfTheDay  { 
+public class WordOfTheDay  {
+  
   private Long id = null;
-  
-  //public enum idEnum {  }; 
-  
   private String parentId = null;
   private String category = null;
   private String createdBy = null;
@@ -26,11 +25,12 @@ public class WordOfTheDay  {
   private List<SimpleExample> examples = new ArrayList<SimpleExample>() ;
   private String note = null;
   private Date publishDate = null;
-  
+
   
   /**
    **/
   @ApiModelProperty(required = false, value = "")
+  @JsonProperty("id")
   public Long getId() {
     return id;
   }
@@ -42,6 +42,7 @@ public class WordOfTheDay  {
   /**
    **/
   @ApiModelProperty(required = false, value = "")
+  @JsonProperty("parentId")
   public String getParentId() {
     return parentId;
   }
@@ -53,6 +54,7 @@ public class WordOfTheDay  {
   /**
    **/
   @ApiModelProperty(required = false, value = "")
+  @JsonProperty("category")
   public String getCategory() {
     return category;
   }
@@ -64,6 +66,7 @@ public class WordOfTheDay  {
   /**
    **/
   @ApiModelProperty(required = false, value = "")
+  @JsonProperty("createdBy")
   public String getCreatedBy() {
     return createdBy;
   }
@@ -75,6 +78,7 @@ public class WordOfTheDay  {
   /**
    **/
   @ApiModelProperty(required = false, value = "")
+  @JsonProperty("createdAt")
   public Date getCreatedAt() {
     return createdAt;
   }
@@ -86,6 +90,7 @@ public class WordOfTheDay  {
   /**
    **/
   @ApiModelProperty(required = false, value = "")
+  @JsonProperty("contentProvider")
   public ContentProvider getContentProvider() {
     return contentProvider;
   }
@@ -97,6 +102,7 @@ public class WordOfTheDay  {
   /**
    **/
   @ApiModelProperty(required = false, value = "")
+  @JsonProperty("htmlExtra")
   public String getHtmlExtra() {
     return htmlExtra;
   }
@@ -108,6 +114,7 @@ public class WordOfTheDay  {
   /**
    **/
   @ApiModelProperty(required = false, value = "")
+  @JsonProperty("word")
   public String getWord() {
     return word;
   }
@@ -119,6 +126,7 @@ public class WordOfTheDay  {
   /**
    **/
   @ApiModelProperty(required = false, value = "")
+  @JsonProperty("definitions")
   public List<SimpleDefinition> getDefinitions() {
     return definitions;
   }
@@ -130,6 +138,7 @@ public class WordOfTheDay  {
   /**
    **/
   @ApiModelProperty(required = false, value = "")
+  @JsonProperty("examples")
   public List<SimpleExample> getExamples() {
     return examples;
   }
@@ -141,6 +150,7 @@ public class WordOfTheDay  {
   /**
    **/
   @ApiModelProperty(required = false, value = "")
+  @JsonProperty("note")
   public String getNote() {
     return note;
   }
@@ -152,6 +162,7 @@ public class WordOfTheDay  {
   /**
    **/
   @ApiModelProperty(required = false, value = "")
+  @JsonProperty("publishDate")
   public Date getPublishDate() {
     return publishDate;
   }
diff --git a/samples/client/wordnik/android-java/src/main/java/io/swagger/client/model/WordSearchResult.java b/samples/client/wordnik/android-java/src/main/java/io/swagger/client/model/WordSearchResult.java
index 59372b2b7d6..df48a7d6f47 100644
--- a/samples/client/wordnik/android-java/src/main/java/io/swagger/client/model/WordSearchResult.java
+++ b/samples/client/wordnik/android-java/src/main/java/io/swagger/client/model/WordSearchResult.java
@@ -2,24 +2,21 @@ package io.swagger.client.model;
 
 
 import com.wordnik.swagger.annotations.*;
+import com.fasterxml.jackson.annotation.JsonProperty;
 
 
 @ApiModel(description = "")
-public class WordSearchResult  { 
+public class WordSearchResult  {
+  
   private Long count = null;
-  
-  //public enum countEnum {  }; 
-  
   private Double lexicality = null;
-  
-  //public enum lexicalityEnum {  }; 
-  
   private String word = null;
-  
+
   
   /**
    **/
   @ApiModelProperty(required = false, value = "")
+  @JsonProperty("count")
   public Long getCount() {
     return count;
   }
@@ -31,6 +28,7 @@ public class WordSearchResult  {
   /**
    **/
   @ApiModelProperty(required = false, value = "")
+  @JsonProperty("lexicality")
   public Double getLexicality() {
     return lexicality;
   }
@@ -42,6 +40,7 @@ public class WordSearchResult  {
   /**
    **/
   @ApiModelProperty(required = false, value = "")
+  @JsonProperty("word")
   public String getWord() {
     return word;
   }
diff --git a/samples/client/wordnik/android-java/src/main/java/io/swagger/client/model/WordSearchResults.java b/samples/client/wordnik/android-java/src/main/java/io/swagger/client/model/WordSearchResults.java
index c6044a5db0c..2605e3058c0 100644
--- a/samples/client/wordnik/android-java/src/main/java/io/swagger/client/model/WordSearchResults.java
+++ b/samples/client/wordnik/android-java/src/main/java/io/swagger/client/model/WordSearchResults.java
@@ -4,20 +4,20 @@ import io.swagger.client.model.WordSearchResult;
 import java.util.*;
 
 import com.wordnik.swagger.annotations.*;
+import com.fasterxml.jackson.annotation.JsonProperty;
 
 
 @ApiModel(description = "")
-public class WordSearchResults  { 
+public class WordSearchResults  {
+  
   private List<WordSearchResult> searchResults = new ArrayList<WordSearchResult>() ;
   private Integer totalResults = null;
-  
-  //public enum totalResultsEnum {  }; 
-  
-  
+
   
   /**
    **/
   @ApiModelProperty(required = false, value = "")
+  @JsonProperty("searchResults")
   public List<WordSearchResult> getSearchResults() {
     return searchResults;
   }
@@ -29,6 +29,7 @@ public class WordSearchResults  {
   /**
    **/
   @ApiModelProperty(required = false, value = "")
+  @JsonProperty("totalResults")
   public Integer getTotalResults() {
     return totalResults;
   }