Merge pull request #18 from socrata/liveness

Pair of bugfixes
socrata-platform · Feb 24, 2015 · e3fb7ac · e3fb7ac
2 parents e81e417 + 59d192b
commit e3fb7ac
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/socrata-http-client/src/main/scala/com/socrata/http/client/RequestBuilder.scala b/socrata-http-client/src/main/scala/com/socrata/http/client/RequestBuilder.scala
@@ -174,7 +174,10 @@ final class RequestBuilder private (val host: String,
   def json(contents: Iterator[JsonEvent]) =
     new JsonHttpRequest(this.finish("POST"), contents)
 
-  def jsonValue[T : JsonEncode](contents: JValue) =
+  @deprecated(message = "Use \"jsonBody\" instead", since = "3.1.1")
+  def jsonValue[T : JsonEncode](contents: JValue) = jsonBody(contents)
+
+  def jsonBody[T : JsonEncode](contents: T) =
     new JsonHttpRequest(this.finish("POST"), JValueEventIterator(JsonEncode.toJValue(contents)))
 
   /**

diff --git a/socrata-http-common/src/main/scala/com/socrata/http/common/AuxiliaryData.scala b/socrata-http-common/src/main/scala/com/socrata/http/common/AuxiliaryData.scala
@@ -8,7 +8,7 @@ import org.codehaus.jackson.map.annotate.{JsonDeserialize, JsonSerialize}
 /** A class for storing in a curator service advertisement's payload field.
   * All fields of this class must be (de)serializable by Jackson. */
 class AuxiliaryData(var livenessCheckInfo: Option[LivenessCheckInfo], var json: JObject) {
-  def this(livenessCheckInfo: Option[LivenessCheckInfo]) = this(None, JObject.canonicalEmpty)
+  def this(livenessCheckInfo: Option[LivenessCheckInfo]) = this(livenessCheckInfo, JObject.canonicalEmpty)
 
   @deprecated(message = "This constructor is for Jackson's use, not yours", since = "forever")
   def this() = this(None, JObject.canonicalEmpty)