softwaremill#124 - Remove wrong copyright headers

simong · Mar 13, 2018 · fb60904 · fb60904
1 parent 84e6f9d
commit fb60904
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 24 deletions.
diff --git a/rest/rest-sqs/src/main/scala/org/elasticmq/rest/sqs/model/RedrivePolicy.scala b/rest/rest-sqs/src/main/scala/org/elasticmq/rest/sqs/model/RedrivePolicy.scala
@@ -1,11 +1,3 @@
-/*
- * All right reserved - Fronteer LTD
- */
 package org.elasticmq.rest.sqs.model
 
-
-case class RedrivePolicy(
-  queueName: String,
-  maxReceiveCount: Int
-)
-
+case class RedrivePolicy(queueName: String, maxReceiveCount: Int)
diff --git a/rest/rest-sqs/src/main/scala/org/elasticmq/rest/sqs/model/RedrivePolicyJson.scala b/rest/rest-sqs/src/main/scala/org/elasticmq/rest/sqs/model/RedrivePolicyJson.scala
@@ -1,6 +1,3 @@
-/*
- * All right reserved - Fronteer LTD
- */
 package org.elasticmq.rest.sqs.model
 
 import spray.json.{DefaultJsonProtocol, JsNumber, JsObject, JsString, JsValue, JsonFormat, RootJsonFormat, deserializationError}

diff --git a/rest/rest-sqs/src/test/scala/org/elasticmq/rest/sqs/RedrivePolicyJsonTest.scala b/rest/rest-sqs/src/test/scala/org/elasticmq/rest/sqs/RedrivePolicyJsonTest.scala
@@ -6,23 +6,18 @@ import org.scalatest.{FlatSpec, Matchers}
 import spray.json._
 
 class RedrivePolicyJsonTest extends FlatSpec with Matchers with ScalatestRouteTest {
-  "redrive policy json format" should "extract object from json" in {
+  "redrive policy json format" should "extract from and serialize to json" in {
     import org.elasticmq.rest.sqs.model.RedrivePolicyJson._
 
-    val json =
-      """
-        |{
-        |  "deadLetterTargetArn":"arn:aws:sqs:elasticmq:000000000000:dlq1",
-        |  "maxReceiveCount":"4"
-        |}
-      """.stripMargin
+    val json = """{"deadLetterTargetArn":"arn:aws:sqs:elasticmq:000000000000:dlq1","maxReceiveCount":4}"""
+    val expectedRedrivePolicy = RedrivePolicy(queueName = "dlq1", maxReceiveCount = 4)
 
+    // Verify the policy can be derrived from a JSON string
     val rd = json.parseJson.convertTo[RedrivePolicy]
+    rd should be(expectedRedrivePolicy)
 
-    rd should be(RedrivePolicy(
-      queueName = "dlq1",
-      maxReceiveCount = 4
-    ))
+    // Verify serializing the policy to JSON results in the expected JSON string
+    rd.toJson.compactPrint should be(json)
   }
 
   "redrive policy json format" should "support int receive count" in {