From e1f7d84d9a762a7c1c105c41218b68ac21678dff Mon Sep 17 00:00:00 2001 From: kendzi Date: Thu, 23 Jan 2014 18:46:05 +0100 Subject: [PATCH] Fix for @JsonProperty annotation --- .../com/wordnik/swagger/converter/ModelPropertyParser.scala | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/modules/swagger-core/src/main/scala/com/wordnik/swagger/converter/ModelPropertyParser.scala b/modules/swagger-core/src/main/scala/com/wordnik/swagger/converter/ModelPropertyParser.scala index 30b7bab463..2d7b982730 100644 --- a/modules/swagger-core/src/main/scala/com/wordnik/swagger/converter/ModelPropertyParser.scala +++ b/modules/swagger-core/src/main/scala/com/wordnik/swagger/converter/ModelPropertyParser.scala @@ -110,8 +110,11 @@ class ModelPropertyParser(cls: Class[_], t: Map[String, String] = Map.empty) (im } try { - val fieldAnnotations = getDeclaredField(this.cls, name).getAnnotations() + val fieldAnnotations = getDeclaredField(this.cls, originalName).getAnnotations() var propAnnoOutput = processAnnotations(name, fieldAnnotations) + var fieldName = propAnnoOutput("name").asInstanceOf[String] + if (fieldName != null) name = fieldName + var propPosition = propAnnoOutput("position").asInstanceOf[Int] if(allowableValues == None)