quantranhong1999 commented on code in PR #1561: URL: https://github.com/apache/james-project/pull/1561#discussion_r1198495872
########## server/protocols/jmap-rfc-8621/src/test/scala/org/apache/james/jmap/json/EmailSubmissionSetSerializerTest.scala: ########## @@ -0,0 +1,57 @@ +/**************************************************************** + * Licensed to the Apache Software Foundation (ASF) under one * + * or more contributor license agreements. See the NOTICE file * + * distributed with this work for additional information * + * regarding copyright ownership. The ASF licenses this file * + * to you under the Apache License, Version 2.0 (the * + * "License"); you may not use this file except in compliance * + * with the License. You may obtain a copy of the License at * + * * + * http://www.apache.org/licenses/LICENSE-2.0 * + * * + * Unless required by applicable law or agreed to in writing, * + * software distributed under the License is distributed on an * + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY * + * KIND, either express or implied. See the License for the * + * specific language governing permissions and limitations * + * under the License. * + ****************************************************************/ + +package org.apache.james.jmap.json + +import org.apache.james.mailbox.model.TestMessageId +import org.scalatest.matchers.should.Matchers +import org.scalatest.wordspec.AnyWordSpec +import play.api.libs.json.Json + +class EmailSubmissionSetSerializerTest extends AnyWordSpec with Matchers { + val serializer = new EmailSubmissionSetSerializer(new TestMessageId.Factory) + + "Deserialize PushSubscriptionSetRequest" should { Review Comment: EmailSubmissionCreationRequest ? ########## server/protocols/jmap-rfc-8621/src/main/scala/org/apache/james/jmap/json/EmailSubmissionSetSerializer.scala: ########## @@ -69,12 +69,25 @@ class EmailSubmissionSetSerializer @Inject()(messageIdFactory: MessageId.Factory private implicit val emailSubmissionIdWrites: Writes[EmailSubmissionId] = Json.valueWrites[EmailSubmissionId] - private implicit val emailSubmissionAddresReads: Reads[EmailSubmissionAddress] = Json.reads[EmailSubmissionAddress] + private implicit val parameterNameReads: Reads[ParameterName] = Json.valueReads[ParameterName] + private implicit val parameterValueReads: Reads[ParameterValue] = Json.valueReads[ParameterValue] + private implicit val parameterValueOptionReads: Reads[Option[ParameterValue]] = { + case JsString(value) => JsSuccess(Some(ParameterValue(value))) + case _ => JsError("JsonPath objects are represented by JsonString") + } + + private implicit val parametersReads: Reads[Map[ParameterName, Option[ParameterValue]]] = + Reads.mapReads[ParameterName, Option[ParameterValue]](k => JsSuccess(ParameterName(k)))(parameterValueOptionReads) + + private implicit val emailSubmissionAddresReads: Reads[EmailSubmissionAddress] = { + Json.reads[EmailSubmissionAddress] + } private implicit val envelopeReads: Reads[Envelope] = Json.reads[Envelope] - private implicit val parametersReads: Reads[Parameters] = Json.reads[Parameters] implicit val emailSubmissionCreationRequestReads: Reads[EmailSubmissionCreationRequest] = Json.reads[EmailSubmissionCreationRequest] + def test(input: JsValue): JsResult[EmailSubmissionCreationRequest] = Json.fromJson[EmailSubmissionCreationRequest](input) Review Comment: Better name than `test`? BTW do we need this method for production code? ########## server/protocols/jmap-rfc-8621/src/test/scala/org/apache/james/jmap/json/EmailSubmissionSetSerializerTest.scala: ########## @@ -0,0 +1,57 @@ +/**************************************************************** + * Licensed to the Apache Software Foundation (ASF) under one * + * or more contributor license agreements. See the NOTICE file * + * distributed with this work for additional information * + * regarding copyright ownership. The ASF licenses this file * + * to you under the Apache License, Version 2.0 (the * + * "License"); you may not use this file except in compliance * + * with the License. You may obtain a copy of the License at * + * * + * http://www.apache.org/licenses/LICENSE-2.0 * + * * + * Unless required by applicable law or agreed to in writing, * + * software distributed under the License is distributed on an * + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY * + * KIND, either express or implied. See the License for the * + * specific language governing permissions and limitations * + * under the License. * + ****************************************************************/ + +package org.apache.james.jmap.json + +import org.apache.james.mailbox.model.TestMessageId +import org.scalatest.matchers.should.Matchers +import org.scalatest.wordspec.AnyWordSpec +import play.api.libs.json.Json + +class EmailSubmissionSetSerializerTest extends AnyWordSpec with Matchers { + val serializer = new EmailSubmissionSetSerializer(new TestMessageId.Factory) + + "Deserialize PushSubscriptionSetRequest" should { + var json = Json.parse( + """{ + | "emailId": "1", + | "envelope": { + | "mailFrom": { + | "email": "[email protected]", + | "parameters": { + | "holdFor": "86400" + | } + | }, + | "rcptTo": [ + | { + | "email": "[email protected]", + | "parameters": null + | } + | ] + | } + |}""".stripMargin) + "Request should be success" in { + val setRequestActual = serializer.test(json) + + print(setRequestActual) Review Comment: debug spotted (any other places) -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: [email protected] For queries about this service, please contact Infrastructure at: [email protected] --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
