diff --git a/src/main/scala/de/tobias/playpad/server/account/Session.scala b/src/main/scala/de/tobias/playpad/server/account/Session.scala index dbece99539b83ae64bdbae7b631c351573dbf2c2..e3cbb653b4414f174403754dae1b6d29fbc15d06 100644 --- a/src/main/scala/de/tobias/playpad/server/account/Session.scala +++ b/src/main/scala/de/tobias/playpad/server/account/Session.scala @@ -26,6 +26,22 @@ import scala.util.Random def getId: Int = id def getAccount: Account = account + + + def canEqual(other: Any): Boolean = other.isInstanceOf[Session] + + override def equals(other: Any): Boolean = other match { + case that: Session => + (that canEqual this) && + id == that.id && + key == that.key + case _ => false + } + + override def hashCode(): Int = { + val state = Seq(id, key) + state.map(_.hashCode()).foldLeft(0)((a, b) => 31 * a + b) + } } object Session { diff --git a/src/main/scala/de/tobias/playpad/server/server/account/SessionGet.scala b/src/main/scala/de/tobias/playpad/server/server/account/SessionGet.scala index 24849960815b6cc081c8dbeaca84a0883f65fbce..9ffe9e4dc490bbd3a925bc9c51acc0ec28007e5e 100644 --- a/src/main/scala/de/tobias/playpad/server/server/account/SessionGet.scala +++ b/src/main/scala/de/tobias/playpad/server/server/account/SessionGet.scala @@ -28,7 +28,7 @@ class SessionGet(accountDao: Dao[Account, Int]) extends Route { jsonObj.addProperty("createDate", session.createDate.getTime) array.add(jsonObj) }) - return array.toString + return array } } diff --git a/src/main/scala/de/tobias/playpad/server/transformer/JsonTransformer.scala b/src/main/scala/de/tobias/playpad/server/transformer/JsonTransformer.scala index d482bf5c6f4e0828bd7c4db32d7aea2751ef4472..1480a1183973026fe525d81c0103e4df0b2efc7b 100644 --- a/src/main/scala/de/tobias/playpad/server/transformer/JsonTransformer.scala +++ b/src/main/scala/de/tobias/playpad/server/transformer/JsonTransformer.scala @@ -1,6 +1,6 @@ package de.tobias.playpad.server.transformer -import com.google.gson.Gson +import com.google.gson.{Gson, JsonObject} import spark.ResponseTransformer /** @@ -11,6 +11,10 @@ class JsonTransformer extends ResponseTransformer { val gson = new Gson() override def render(o: scala.Any): String = { - gson.toJson(o) + if (!o.isInstanceOf[JsonObject]) { + gson.toJson(o) + } else { + o.toString + } } }