Make it possible to use json marshallers ✨

Author: Tochemey

core/lagompb-core/src/main/scala/io/superflat/lagompb/ApiSerializer.scala

@@ -31,8 +31,7 @@ sealed trait GenericSerializers[A <: GeneratedMessage] {
   def deserializer(implicit
       A: GeneratedMessageCompanion[A]
   ): NegotiatedDeserializer[A, ByteString] = { (wire: ByteString) =>
-
-    ProtosRegistry.parser.fromJsonString(wire.utf8String)
+    ProtosRegistry.fromJson(wire.utf8String)
   }
 
   def negotiateResponse(
@@ -57,7 +56,7 @@ sealed trait GenericSerializers[A <: GeneratedMessage] {
         MessageProtocol(Some("application/json"))
 
       override def serialize(message: A): ByteString =
-        ByteString(ProtosRegistry.printer.print(message))
+        ByteString(ProtosRegistry.toJson(message))
     }
 
   def serializerProtobuf: NegotiatedSerializer[A, ByteString] =

core/lagompb-core/src/main/scala/io/superflat/lagompb/ProtosRegistry.scala

@@ -54,11 +54,36 @@ object ProtosRegistry {
     new Parser().withTypeRegistry(typeRegistry)
 
   private[lagompb] lazy val printer: Printer =
-    new Printer().includingDefaultValueFields
+    new Printer().includingDefaultValueFields.formattingLongAsNumber
       .withTypeRegistry(typeRegistry)
 
+  /**
+   * Converts a scalapb GeneratedMessage to printable Json string using the available
+   * registry
+   * @param message the proto message
+   * @return the json string
+   */
+  def toJson(message: GeneratedMessage): String = {
+    printer.print(message)
+  }
+
+  /**
+   * Converts a json string to a scalapb message
+   *
+   * @param jsonString the json string
+   * @param A the scalapb message
+   * @tparam A the scala type of the proto message to parse the json string into
+   * @return the scalapb message parsed from the json string
+   */
+  def fromJson[A <: GeneratedMessage](
+      jsonString: String
+  )(implicit A: GeneratedMessageCompanion[A]): A = {
+    parser.fromJsonString(jsonString)
+  }
+
   /**
    * Gets the maybe scalapb GeneratedMessageCompanion object defining an Any protobuf message
+   *
    * @param any the protobuf message
    * @return the maybe scalapb GeneratedMessageCompanion object
    */

core/lagompb-core/src/test/scala/io/superflat/lagompb/ProtosRegistrySpec.scala

@@ -8,28 +8,41 @@ import scalapb.{GeneratedMessage, GeneratedMessageCompanion}
 
 class ProtosRegistrySpec extends BaseSpec {
 
-  "Loading GeneratedFileObject" should {
+  "The Protos registry" should {
 
-    "succeed" in {
+    "load protos definitions as expected" in {
       val fos = ProtosRegistry.registry
       fos.size should be >= 1
       fos should contain(CoreProto)
     }
 
-    "should be loaded" in {
+    "load message companions as expected" in {
       val size: Int = ProtosRegistry.companions.size
       size should be >= 1
     }
 
-    "Contains the companions" in {
+    "help build the message companions map as expected" in {
       val map: Map[String, GeneratedMessageCompanion[_ <: GeneratedMessage]] =
         ProtosRegistry.companionsMap
       map.keySet should contain("lagompb.v1.TestCommand")
     }
 
-    "Gets scalapb GeneratedMessageCompanion object" in {
+    "help get scalapb GeneratedMessageCompanion object" in {
       val any = Any.pack(TestCommand.defaultInstance)
       ProtosRegistry.getCompanion(any) should be(Symbol("defined"))
     }
+
+    "help convert a proto message to json" in {
+      val testCommand = TestCommand.defaultInstance.withCompanyUuid("123").withName("test")
+      val json = ProtosRegistry.toJson(testCommand)
+      json shouldBe """{"companyUuid":"123","name":"test"}""".stripMargin
+    }
+
+    "help convert a json string to a proto message" in {
+      val jsonString = """{"companyUuid":"123","name":"test"}""".stripMargin
+      val testCommand = ProtosRegistry.fromJson[TestCommand](jsonString)
+      testCommand.companyUuid shouldBe "123"
+      testCommand.name shouldBe "test"
+    }
   }
 }