Merge branch 'azhawkes-master' into develop

Conflicts:
	modules/swagger-oauth2-auth-server/src/main/scala/com/wordnik/swagger/auth/service/AuthService.scala
	modules/swagger-oauth2-auth-server/src/main/scala/com/wordnik/swagger/auth/service/TokenScope.java

Author: fehguy

README.md

@@ -2,26 +2,30 @@
 
 [![Build Status](https://travis-ci.org/wordnik/swagger-core.png)](https://travis-ci.org/wordnik/swagger-core)
 
-## [See the Wiki!](https://github.com/wordnik/swagger-core/wiki)
-The [github wiki](https://github.com/wordnik/swagger-core/wiki) contains documentation, samples, etc.  Start there
+The goal of Swagger is to define a standard, language-agnostic interface to REST APIs which allows both humans and computers to discover and understand the capabilities of the service without access to source code, documentation, or through network traffic inspection. When properly defined via Swagger, a consumer can understand and interact with the remote service with a minimal amount of implementation logic. Similar to what interfaces have done for lower-level programming, Swager removes the guesswork in calling the service.
 
-## Where to get help!
-Search the [swagger google groups](https://groups.google.com/forum/#!forum/swagger-swaggersocket) for previously 
-asked questions.  Join #swagger on irc.freenode.net to talk to interesting human beings.  And if you find a bug,
-file it in github:
+Swagger-core is the Java/Scala implementation of Swagger. It supports *JAX-RS*, *plain Servlets*, and *Play Framework*.
+
+Check out [Swagger-Spec](https://github.com/wordnik/swagger-spec) for additional information about the Swagger project, including additional libraries with support for SpringMVC, other languages and more. 
+
+## See the Wiki!
+The [github wiki](https://github.com/wordnik/swagger-core/wiki) contains documentation, samples, etc.  Start there.
+
+## Support
+The following methods are available to obtain support for Swagger:
+
+- [The Swagger Google Group](https://groups.google.com/forum/#!forum/swagger-swaggersocket) - This would normally be your first stop to get support for Swagger. Here you can find previously asked question, and ask new ones. When asking a question, please provide as much information as you can regarding the environment you use (development language, library, versions.
+- The [Issues tab](https://github.com/wordnik/swagger-core/issues?state=open) - Please open feature requests and bugs here. If you're not sure you encountered a bug, or if it's a general usage question, please use the Google Group mentioned above.
+- IRC! you can find us on [freenode](irc://irc.freenode.net) in the channel #Swagger. You can talk with us directly there.
 
-* [Swagger core + server integrations](https://github.com/wordnik/swagger-core/issues) issues
-* [Swagger UI](https://github.com/wordnik/swagger-ui/issues)
-* [Swagger codegen](https://github.com/wordnik/swagger-codegen/issues)
 
 ## Get started with Swagger!
 See the guide on [getting started with swagger](https://github.com/wordnik/swagger-core/wiki/Adding-Swagger-to-your-API) to get started with adding swagger to your API.
 
 
 ## Overview
 This is a project to build the swagger-core library, which is required for the Wordnik 
-implementation of the Swagger spec.  You can find out more about both the spec and the
-framework at http://swagger.wordnik.com.  For more information about Wordnik's APIs, please
+implementation of the Swagger spec. For more information about Wordnik's APIs, please
 visit http://developer.wordnik.com.
 
 
@@ -36,9 +40,7 @@ You need the following installed and available in your $PATH:
 
 <li>- Apache maven 3.0.3 or greater (http://maven.apache.org/)
 
-<li>- Scala 2.9.1-1 [available here](http://www.scala-lang.org).  Note that 2.9.1 has a defect which causes problems with Jax-RS
-
-### To build from source (currently 1.3.0)
+### To build from source (currently 1.3.4)
 ```
 # first time building locally
 mvn -N
@@ -62,12 +64,6 @@ There are a number of sample apps in the `samples` folder:
 
 [scala-jaxrs](https://github.com/wordnik/swagger-core/tree/master/samples/scala-jaxrs/README.md) Scala-based swagger server with JAX-RS
 
-[java-alt-resource-listing](https://github.com/wordnik/swagger-core/tree/master/samples/java-alt-resource-listing/README.md) 
-Scala-based swagger server with JAX-RS with an alternate resource listing scheme
-
-[scala-alt-resource-listing](https://github.com/wordnik/swagger-core/tree/master/samples/scala-alt-resource-listing/README.md) 
-Scala-based swagger server with JAX-RS with an alternate resource listing scheme
-
 [scala-jaxrs-apm](https://github.com/wordnik/swagger-core/tree/master/samples/scala-jaxrs-apm/README.md) 
 Scala-based swagger server using wordnik-oss utils for Application Performance Monitoring (APM)
 
@@ -86,8 +82,6 @@ And the [Play2](http://playframework.org) samples:
 
 [scala-play2](https://github.com/wordnik/swagger-core/tree/master/samples/scala-play2) Scala-based Play2 sample app
 
-[scala-play2-no-format](https://github.com/wordnik/swagger-core/tree/master/samples/scala-play2-no-format) Scala-based Play2 sample app without the .{format} in resource listing
-
 To run the Play2 sample apps:
 
 ```
@@ -99,7 +93,7 @@ play run
 License
 -------
 
-Copyright 2013 Reverb Technologies, Inc.
+Copyright 2014 Reverb Technologies, Inc.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.

modules/swagger-core/src/main/scala/com/wordnik/swagger/converter/ModelPropertyParser.scala

@@ -5,7 +5,7 @@ import com.wordnik.swagger.core.{ SwaggerSpec, SwaggerTypes }
 import com.wordnik.swagger.core.util.TypeUtil
 import com.wordnik.swagger.annotations.ApiModelProperty
 
-import com.fasterxml.jackson.annotation.{JsonIgnore, JsonProperty}
+import com.fasterxml.jackson.annotation.{JsonIgnore, JsonProperty, JsonIgnoreProperties}
 
 import org.slf4j.LoggerFactory
 
@@ -35,14 +35,33 @@ class ModelPropertyParser(cls: Class[_], t: Map[String, String] = Map.empty) (im
   def parseRecursive(hostClass: Class[_]): Unit = {
     if(!hostClass.isEnum) {
       LOGGER.debug("processing class " + hostClass)
+
+      val ignoredProperties = parseIgnorePropertiesClassAnnotation(hostClass)
+
       for (method <- hostClass.getDeclaredMethods) {
-        if (Modifier.isPublic(method.getModifiers()) && !Modifier.isStatic(method.getModifiers()))
-          parseMethod(method)
+        if (Modifier.isPublic(method.getModifiers()) && !Modifier.isStatic(method.getModifiers())) {
+          val (fieldName, getter) = extractGetterProperty(method.getName)
+
+          LOGGER.debug("field name for method " + method.getName + " is " + fieldName)
+
+          if (ignoredProperties.contains(fieldName)) {
+            LOGGER.debug("ignoring property " + fieldName)
+          } else {
+            parseMethod(method)
+          }
+        }
       }
+
       for (field <- hostClass.getDeclaredFields) {
-        if (Modifier.isPublic(field.getModifiers()) && !Modifier.isStatic(field.getModifiers()))
-          parseField(field)
+        if (Modifier.isPublic(field.getModifiers()) && !Modifier.isStatic(field.getModifiers()) && !ignoredProperties.contains(field.getName)) {
+          if (ignoredProperties.contains(field.getName)) {
+            LOGGER.debug("ignoring property " + field.getName)
+          } else {
+            parseField(field)
+          }
+        }
       }
+
       Option(hostClass.getSuperclass).map(parseRecursive(_))
     }
     else {
@@ -78,6 +97,19 @@ class ModelPropertyParser(cls: Class[_], t: Map[String, String] = Map.empty) (im
     }
   }
 
+  def parseIgnorePropertiesClassAnnotation(returnClass: Class[_]) : Array[String] = {
+    var ignoredProperties = Array[String]()
+    val ignore = returnClass.getAnnotation(classOf[JsonIgnoreProperties])
+
+    if (ignore != null) {
+      ignoredProperties = ignore.value
+
+      LOGGER.debug("found @JsonIgnoreProperties on " + returnClass + " with value(s) " + ignoredProperties.mkString(","))
+    }
+
+    ignoredProperties
+  }
+
   def parsePropertyAnnotations(returnClass: Class[_], propertyName: String, propertyAnnotations: Array[Annotation], genericReturnType: Type, returnType: Type, isField: Boolean): Any = {
     val e = isField match {
       case true => (propertyName, false)

modules/swagger-core/src/test/scala/converter/JsonIgnorePropertiesModelTest.scala

@@ -0,0 +1,20 @@
+package converter
+
+import models._
+
+import com.wordnik.swagger.converter._
+
+import com.wordnik.swagger.core.util._
+
+import java.util.Date
+
+import org.junit.runner.RunWith
+import org.scalatest.junit.JUnitRunner
+import org.scalatest.FlatSpec
+import org.scalatest.matchers.ShouldMatchers
+
+@RunWith(classOf[JUnitRunner])
+class JsonIgnorePropertiesModelTest extends FlatSpec with ShouldMatchers {
+  val models = ModelConverters.readAll(classOf[ModelWithIgnorePropertiesAnnotation])
+  JsonSerializer.asJson(models) should be ("""[{"id":"ModelWithIgnorePropertiesAnnotation","properties":{"name":{"type":"string"},"favoriteAnimal":{"type":"string"}}}]""")
+}

modules/swagger-core/src/test/scala/converter/models/ModelWithIgnorePropertiesAnnotation.java

@@ -0,0 +1,33 @@
+package converter.models;
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+
+@JsonIgnoreProperties({"ignoredString", "middleName", "favoriteColor"})
+public class ModelWithIgnorePropertiesAnnotation {
+  private String name, ignoredString;
+
+  public String favoriteColor;
+  public String favoriteAnimal;
+
+  public String getName() {
+    return name;
+  }
+
+  public void setName(String name) {
+    this.name = name;
+  }
+
+  public String getIgnoredString() {
+    return ignoredString;
+  }
+
+  public void setIgnoredString(String ignoredString) {
+    this.ignoredString = ignoredString;
+  }
+
+  public String getMiddleName() {
+    return "ignore middle name";
+  }
+
+  public void setMiddleName(String name) {}
+}

modules/swagger-oauth2-auth-server/src/main/scala/com/wordnik/swagger/auth/service/TokenScope.java

@@ -7,8 +7,8 @@ public static void setUsername(String username) {
     userThreadLocal.set(username);
   }
 
-  public static Long getUsername() {
-    return (Long)userThreadLocal.get();
+  public static String getUsername() {
+    return (String)userThreadLocal.get();
   }
 
   public static void unsetUsername() {