Merge pull request #10 from nulab/update-common-to-0.3.0

Update common to 0.3.0

project/build.properties

@@ -1 +1 @@
-sbt.version = 1.4.0
+sbt.version = 1.4.1

src/main/scala/com/nulabinc/backlog/j2b/cli/J2BCli.scala

@@ -35,10 +35,10 @@ import monix.execution.Scheduler
 
 object J2BCli extends BacklogConfiguration with Logging with HelpCommand with MappingValidator with MappingConsole with ProgressConsole {
 
-  import com.nulabinc.backlog.j2b.deserializers.JiraMappingDeserializer._
+  import com.nulabinc.backlog.j2b.codec.JiraMappingEncoder._
+  import com.nulabinc.backlog.j2b.codec.JiraMappingDecoder._
   import com.nulabinc.backlog.j2b.formatters.JiraFormatter._
   import com.nulabinc.backlog.j2b.mapping.JiraMappingHeader._
-  import com.nulabinc.backlog.j2b.serializers.JiraMappingSerializer._
   import com.nulabinc.backlog.migration.common.shared.syntax._
 
   private implicit val appDSL: AppDSL[Task]         = TaskAppDSL()

src/main/scala/com/nulabinc/backlog/j2b/deserializers/JiraMappingDeserializer.scala → src/main/scala/com/nulabinc/backlog/j2b/codec/JiraMappingDecoder.scala

@@ -1,12 +1,16 @@
-package com.nulabinc.backlog.j2b.deserializers
+package com.nulabinc.backlog.j2b.codec
 
 import com.nulabinc.backlog.j2b.jira.domain.mapping._
-import com.nulabinc.backlog.migration.common.deserializers.Deserializer
+import com.nulabinc.backlog.migration.common.codec.{
+  PriorityMappingDecoder,
+  StatusMappingDecoder,
+  UserMappingDecoder
+}
 import com.nulabinc.backlog.migration.common.domain.mappings._
 import org.apache.commons.csv.CSVRecord
 
-object JiraMappingDeserializer {
-  implicit val statusDeserializer: Deserializer[CSVRecord, StatusMapping[JiraStatusMappingItem]] =
+object JiraMappingDecoder {
+  implicit val statusDeserializer: StatusMappingDecoder[JiraStatusMappingItem] =
     (record: CSVRecord) =>
       new StatusMapping[JiraStatusMappingItem] {
         override val src: JiraStatusMappingItem =
@@ -16,7 +20,7 @@ object JiraMappingDeserializer {
           Option(record.get(1)).map(s => BacklogStatusMappingItem(s))
       }
 
-  implicit val priorityDeserializer: Deserializer[CSVRecord, PriorityMapping[JiraPriorityMappingItem]] =
+  implicit val priorityDeserializer: PriorityMappingDecoder[JiraPriorityMappingItem] =
     (record: CSVRecord) =>
       new PriorityMapping[JiraPriorityMappingItem] {
         override val src: JiraPriorityMappingItem = JiraPriorityMappingItem(
@@ -27,7 +31,7 @@ object JiraMappingDeserializer {
           Option(record.get(1)).map(p => BacklogPriorityMappingItem(p))
       }
 
-  implicit val userDeserializer: Deserializer[CSVRecord, UserMapping[JiraUserMappingItem]] =
+  implicit val userDeserializer: UserMappingDecoder[JiraUserMappingItem] =
     (record: CSVRecord) =>
       new UserMapping[JiraUserMappingItem] {
         override val src: JiraUserMappingItem =

src/main/scala/com/nulabinc/backlog/j2b/codec/JiraMappingEncoder.scala

@@ -0,0 +1,29 @@
+package com.nulabinc.backlog.j2b.codec
+
+import com.nulabinc.backlog.j2b.jira.domain.mapping._
+import com.nulabinc.backlog.migration.common.codec.{
+  PriorityMappingEncoder,
+  StatusMappingEncoder,
+  UserMappingEncoder
+}
+import com.nulabinc.backlog.migration.common.domain.mappings._
+
+object JiraMappingEncoder {
+  implicit val statusSerializer: StatusMappingEncoder[JiraStatusMappingItem] =
+    (mapping: StatusMapping[JiraStatusMappingItem]) =>
+      Seq(mapping.src.value, mapping.optDst.map(_.value).getOrElse(""))
+
+  implicit val prioritySerializer: PriorityMappingEncoder[JiraPriorityMappingItem] =
+    (mapping: PriorityMapping[JiraPriorityMappingItem]) =>
+      Seq(mapping.src.value, mapping.optDst.map(_.value).getOrElse(""))
+
+  implicit val userSerializer: UserMappingEncoder[JiraUserMappingItem] =
+    (mapping: UserMapping[JiraUserMappingItem]) =>
+      Seq(
+        mapping.src.accountId,                     // 0
+        mapping.src.displayName,                   // 1
+        mapping.optDst.map(_.value).getOrElse(""), // 2
+        mapping.mappingType                        // 3
+      )
+
+}

src/test/scala/integration/CompareSpec.scala

@@ -31,7 +31,7 @@ class CompareSpec
     with UserMatcher
     with DateMatcher {
 
-  import com.nulabinc.backlog.j2b.deserializers.JiraMappingDeserializer._
+  import com.nulabinc.backlog.j2b.codec.JiraMappingDecoder._
 
   val jiraCustomFieldDefinitions: Seq[Field] =
     FieldConverter.toExportField(jiraRestApi.fieldAPI.all().right.get)

src/test/scala/integration/helper/TestHelper.scala

@@ -27,7 +27,7 @@ import scala.collection.JavaConverters._
 import scala.util.matching.Regex
 
 trait TestHelper {
-  import com.nulabinc.backlog.j2b.deserializers.JiraMappingDeserializer._
+  import com.nulabinc.backlog.j2b.codec.JiraMappingDecoder._
   import com.nulabinc.backlog.migration.common.shared.syntax._
 
   implicit val appDSL: AppDSL[Task] = TaskAppDSL()