Merge branch 'release/0.2.0b1'

nulab · May 7, 2018 · e1814d9 · e1814d9
2 parents 1a5cd82 + 9a53fad
commit e1814d9
Show file tree

Hide file tree

Showing 57 changed files with 303 additions and 204 deletions.
diff --git a/README.md b/README.md
@@ -25,7 +25,7 @@ Download
 
 Please download the jar file from this link, and run from the command line as follows.
 
-https://github.com/nulab/BacklogMigration-Jira/releases/download/0.1.0b3/backlog-migration-jira-0.1.0b3.jar
+https://github.com/nulab/BacklogMigration-Jira/releases/download/0.2.0b1/backlog-migration-jira-0.2.0b1.jar
 
     java -jar backlog-migration-jira-[latest version].jar
 
@@ -242,7 +242,7 @@ https://github.com/nulab/BacklogMigration-Jira/releases
 
 こちらのリンクからjarファイルをダウンロードし、以下のようにコマンドラインから実行します。
 
-https://github.com/nulab/BacklogMigration-Jira/releases/download/0.1.0b3/backlog-migration-jira-0.1.0b3.jar
+https://github.com/nulab/BacklogMigration-Jira/releases/download/0.2.0b1/backlog-migration-jira-0.2.0b1.jar
 
     java -jar backlog-migration-jira-[最新バージョン].jar
 

diff --git a/build.sbt b/build.sbt
@@ -1,11 +1,13 @@
 import sbt.Keys._
 
-lazy val projectVersion = "0.1.0b3"
+scapegoatVersion in ThisBuild := "1.3.3"
+
+lazy val projectVersion = "0.2.0b1"
 
 lazy val commonSettings = Seq(
   organization := "com.nulabinc",
   version := projectVersion,
-  scalaVersion := "2.11.6",
+  scalaVersion := "2.12.6",
   scalacOptions ++= Seq(
     "-language:reflectiveCalls",
     "-language:postfixOps",
@@ -20,23 +22,22 @@ lazy val commonSettings = Seq(
   ),
   resolvers ++= Seq("snapshots", "releases").map(Resolver.sonatypeRepo),
   libraryDependencies ++= Seq(
-    "com.osinka.i18n"               %  "scala-i18n_2.11"        % "1.0.0",
-    "ch.qos.logback"                %  "logback-classic"        % "1.1.3",
-    "io.spray"                      %  "spray-json_2.11"        % "1.3.2",
-    "com.github.scala-incubator.io" %  "scala-io-core_2.11"     % "0.4.3",
-    "com.github.scala-incubator.io" %  "scala-io-file_2.11"     % "0.4.3",
-    "com.typesafe"                  %  "config"                 % "1.3.0",
-    "joda-time"                     %  "joda-time"              % "2.3",
-    "org.joda"                      %  "joda-convert"           % "1.6",
-    "com.google.inject"             %  "guice"                  % "4.1.0",
-    "com.netaporter"                %% "scala-uri"              % "0.4.16",
-    "org.fusesource.jansi"          %  "jansi"                  % "1.11",
-    "com.mixpanel"                  %  "mixpanel-java"          % "1.4.4",
-    "org.scalatest"                 %% "scalatest"              % "3.0.1"   % "test",
-    "org.specs2"                    %% "specs2-core"            % "3.8.9"   % Test,
-    "org.specs2"                    %% "specs2-matcher"         % "3.8.9"   % Test,
-    "org.specs2"                    %% "specs2-matcher-extra"   % "3.8.9"   % Test,
-    "org.specs2"                    %% "specs2-mock"            % "3.8.9"   % Test
+    "com.osinka.i18n"       %% "scala-i18n"           % "1.0.2",
+    "ch.qos.logback"        %  "logback-classic"      % "1.1.3",
+    "com.github.pathikrit"  %% "better-files"         % "3.4.0",
+    "com.typesafe.akka"     %% "akka-actor"           % "2.5.9",
+    "com.typesafe.akka"     %% "akka-slf4j"           % "2.5.9",
+    "io.spray"              %% "spray-json"           % "1.3.3",
+    "com.typesafe"          %  "config"               % "1.3.3",
+    "com.google.inject"     %  "guice"                % "4.1.0",
+    "com.netaporter"        %% "scala-uri"            % "0.4.16",
+    "org.fusesource.jansi"  %  "jansi"                % "1.11",
+    "com.mixpanel"          %  "mixpanel-java"        % "1.4.4",
+    "org.scalatest"         %% "scalatest"            % "3.0.1"   % "test",
+    "org.specs2"            %% "specs2-core"          % "3.8.9"   % Test,
+    "org.specs2"            %% "specs2-matcher"       % "3.8.9"   % Test,
+    "org.specs2"            %% "specs2-matcher-extra" % "3.8.9"   % Test,
+    "org.specs2"            %% "specs2-mock"          % "3.8.9"   % Test
   ),
   javacOptions ++= Seq("-encoding", "UTF-8")
 )
@@ -46,15 +47,15 @@ lazy val common = (project in file("common"))
   .settings(
     name := "backlog-migration-common",
     unmanagedBase := baseDirectory.value / "libs",
-    scapegoatVersion := "1.1.0",
+    scapegoatVersion := "1.3.4",
     scapegoatDisabledInspections := Seq("NullParameter", "CatchThrowable", "NoOpOverride")
   )
 
 lazy val importer = (project in file("importer"))
   .settings(commonSettings: _*)
   .settings(
     name := "backlog-importer",
-    scapegoatVersion := "1.1.0",
+    scapegoatVersion := "1.3.4",
     scapegoatDisabledInspections := Seq("NullParameter", "CatchThrowable", "NoOpOverride")
   )
   .dependsOn(common % "test->test;compile->compile")
@@ -64,7 +65,7 @@ lazy val exporter = (project in file("exporter"))
   .settings(commonSettings: _*)
   .settings(
     name := "backlog-jira-exporter",
-    scapegoatVersion := "1.1.0",
+    scapegoatVersion := "1.3.4",
     scapegoatDisabledInspections := Seq(
       "NullParameter",
       "CatchThrowable",
@@ -77,7 +78,7 @@ lazy val jira = (project in file("jira"))
   .settings(commonSettings: _*)
   .settings(
     name := "jira",
-    scapegoatVersion := "1.1.0",
+    scapegoatVersion := "1.3.4",
     scapegoatDisabledInspections := Seq(
       "NullParameter",
       "CatchThrowable",
@@ -91,7 +92,7 @@ lazy val mappingBase = (project in file("mapping-base"))
   .settings(commonSettings: _*)
   .settings(
     name := "backlog-jira-mapping-base",
-    scapegoatVersion := "1.1.0",
+    scapegoatVersion := "1.3.4",
     scapegoatDisabledInspections := Seq(
       "NullParameter",
       "CatchThrowable",
@@ -104,7 +105,7 @@ lazy val mappingConverter = (project in file("mapping-converter"))
   .settings(commonSettings: _*)
   .settings(
     name := "backlog-jira-mapping-converter",
-    scapegoatVersion := "1.1.0",
+    scapegoatVersion := "1.3.4",
     scapegoatDisabledInspections := Seq(
       "NullParameter",
       "CatchThrowable",
@@ -117,7 +118,7 @@ lazy val mappingCollector = (project in file("mapping-collector"))
   .settings(commonSettings: _*)
   .settings(
     name := "backlog-jira-mapping-collector",
-    scapegoatVersion := "1.1.0",
+    scapegoatVersion := "1.3.4",
     scapegoatDisabledInspections := Seq(
       "NullParameter",
       "CatchThrowable",
@@ -130,7 +131,7 @@ lazy val mappingFile = (project in file("mapping-file"))
   .settings(commonSettings: _*)
   .settings(
     name := "backlog-jira-mapping-file",
-    scapegoatVersion := "1.1.0",
+    scapegoatVersion := "1.3.4",
     scapegoatDisabledInspections := Seq(
       "NullParameter",
       "CatchThrowable",
@@ -143,7 +144,7 @@ lazy val writer = (project in file("project-writer"))
   .settings(commonSettings: _*)
   .settings(
     name := "backlog-jira-project-writer",
-    scapegoatVersion := "1.1.0",
+    scapegoatVersion := "1.3.4",
     scapegoatDisabledInspections := Seq(
       "NullParameter",
       "CatchThrowable",
@@ -157,9 +158,9 @@ lazy val client = (project in file("jira-client"))
   .settings(
     name := "backlog-jira-client",
     libraryDependencies ++= Seq(
-      "org.apache.httpcomponents" %  "httpclient" % "4.5.3"
+      "org.apache.httpcomponents" % "httpclient" % "4.5.3"
     ),
-    scapegoatVersion := "1.1.0",
+    scapegoatVersion := "1.3.4",
     scapegoatDisabledInspections := Seq(
       "NullParameter",
       "CatchThrowable",
@@ -168,13 +169,11 @@ lazy val client = (project in file("jira-client"))
   )
 
 lazy val root = (project in file("."))
-  .enablePlugins(BuildInfoPlugin)
   .settings(commonSettings: _*)
   .settings(
     name := "backlog-migration-jira",
     libraryDependencies ++= Seq(
-      "org.scalatest" %% "scalatest"     % "3.0.1"   % "test",
-      "org.rogach"    %  "scallop_2.11"  % "2.0.5"
+      "org.rogach" %% "scallop" % "3.1.2"
     ),
     assemblyJarName in assembly := {
       s"${name.value}-${version.value}.jar"
@@ -184,10 +183,8 @@ lazy val root = (project in file("."))
       Tests.Argument(TestFrameworks.ScalaTest, "-f", "target/test-reports/output.txt")
     ),
     test in assembly := {},
-    scapegoatVersion := "1.1.0",
+    scapegoatVersion := "1.3.4",
     scapegoatDisabledInspections := Seq("NullParameter", "CatchThrowable", "NoOpOverride"),
-    buildInfoKeys := Seq[BuildInfoKey](name, version, scalaVersion, sbtVersion),
-    buildInfoPackage := "com.nulabinc.backlog.j2b.buildinfo"
   )
   .dependsOn(common % "test->test;compile->compile", importer, exporter, writer, client, jira, mappingFile, mappingConverter, mappingCollector)
   .aggregate(common, importer, exporter, writer, client, jira, mappingFile, mappingConverter)
diff --git a/exporter/src/main/scala/com/nulabinc/backlog/j2b/exporter/ChangeLogReducer.scala b/exporter/src/main/scala/com/nulabinc/backlog/j2b/exporter/ChangeLogReducer.scala
@@ -1,5 +1,6 @@
 package com.nulabinc.backlog.j2b.exporter
 
+import better.files.{File => Path}
 import com.nulabinc.backlog.j2b.jira.service.IssueService
 import com.nulabinc.backlog.migration.common.conf.{BacklogConstantValue, BacklogPaths}
 import com.nulabinc.backlog.migration.common.domain._
@@ -9,8 +10,6 @@ import com.nulabinc.jira.client.domain.Attachment
 import com.nulabinc.jira.client.domain.changeLog._
 import com.osinka.i18n.Messages
 
-import scalax.file.Path
-
 private [exporter] class ChangeLogReducer(issueDirPath: Path,
                                           backlogPaths: BacklogPaths,
                                           issue: BacklogIssue,

diff --git a/exporter/src/main/scala/com/nulabinc/backlog/j2b/exporter/CommentFileWriter.scala b/exporter/src/main/scala/com/nulabinc/backlog/j2b/exporter/CommentFileWriter.scala
@@ -21,8 +21,8 @@ class CommentFileWriter @Inject()(implicit val commentWrites: CommentWrites,
                                   issueService: IssueService) extends CommentWriter {
 
   override def write(backlogIssue: BacklogIssue, comments: Seq[Comment], changeLogs: Seq[ChangeLog], attachments: Seq[Attachment]) = {
-    val backlogChangeLogsAsComment = changeLogs.map(c => (Convert.toBacklog(c), c.createdAt.toDate))
-    val backlogCommentsAsComment   = comments.map(c => (Convert.toBacklog(c), c.createdAt.toDate))
+    val backlogChangeLogsAsComment = changeLogs.map(c => (Convert.toBacklog(c), c.createdAt))
+    val backlogCommentsAsComment   = comments.map(c => (Convert.toBacklog(c), c.createdAt))
     val backlogComments            = backlogChangeLogsAsComment ++ backlogCommentsAsComment // TODO: sort?
     val reducedComments            = backlogComments.zipWithIndex.map {
       case (comment, index) =>

diff --git a/exporter/src/main/scala/com/nulabinc/backlog/j2b/exporter/Exporter.scala b/exporter/src/main/scala/com/nulabinc/backlog/j2b/exporter/Exporter.scala
@@ -10,7 +10,7 @@ import com.nulabinc.backlog.j2b.jira.domain.{CollectData, FieldConverter, IssueF
 import com.nulabinc.backlog.j2b.jira.service._
 import com.nulabinc.backlog.j2b.jira.utils.DateChangeLogConverter
 import com.nulabinc.backlog.j2b.jira.writer._
-import com.nulabinc.backlog.migration.common.utils.{ConsoleOut, Logging, ProgressBar}
+import com.nulabinc.backlog.migration.common.utils.{ConsoleOut, Logging}
 import com.nulabinc.jira.client.domain._
 import com.nulabinc.jira.client.domain.changeLog.{AssigneeFieldId, ComponentChangeLogItemField, CustomFieldFieldId, FixVersion}
 import com.nulabinc.jira.client.domain.issue._
@@ -157,7 +157,7 @@ class Exporter @Inject()(projectKey: JiraProjectKey,
             issueFields             = filteredIssueFields,
             comments                = comments
           )
-          issueWriter.write(initializedBacklogIssue, issue.createdAt.toDate)
+          issueWriter.write(initializedBacklogIssue, issue.createdAt)
 
           // export issue comments
           val categoryPlayedChangeLogs  = ChangeLogsPlayer.play(ComponentChangeLogItemField, initializedBacklogIssue.categoryNames, issueWithFilteredChangeLogs.changeLogs)

diff --git a/exporter/src/main/scala/com/nulabinc/backlog/j2b/exporter/IssueFileWriter.scala b/exporter/src/main/scala/com/nulabinc/backlog/j2b/exporter/IssueFileWriter.scala
@@ -25,7 +25,7 @@ class IssueFileWriter @Inject()(implicit val issueWrites: IssueWrites,
       IOUtil.createDirectory(dir)
       val path = backlogPaths.issueAttachmentPath(dir, attachment.name)
       attachment.optId.map { id =>
-        issueService.downloadAttachments(id, path, attachment.name)
+        issueService.downloadAttachments(id, path.path, attachment.name)
       }
     }
 

diff --git a/...ter/src/main/scala/com/nulabinc/backlog/j2b/exporter/service/JiraClientIssueService.scala b/...ter/src/main/scala/com/nulabinc/backlog/j2b/exporter/service/JiraClientIssueService.scala
@@ -1,7 +1,7 @@
 package com.nulabinc.backlog.j2b.exporter.service
 
+import better.files.{File => Path}
 import javax.inject.Inject
-
 import com.nulabinc.backlog.j2b.jira.conf.JiraApiConfiguration
 import com.nulabinc.backlog.j2b.jira.domain.JiraProjectKey
 import com.nulabinc.backlog.j2b.jira.service.IssueService
@@ -11,8 +11,6 @@ import com.nulabinc.jira.client.domain.changeLog.ChangeLog
 import com.nulabinc.jira.client.{DownloadResult, JiraRestClient}
 import com.nulabinc.jira.client.domain.issue.Issue
 
-import scalax.file.Path
-
 class JiraClientIssueService @Inject()(apiConfig: JiraApiConfiguration,
                                        projectKey: JiraProjectKey,
                                        jira: JiraRestClient,
@@ -55,7 +53,7 @@ class JiraClientIssueService @Inject()(apiConfig: JiraApiConfiguration,
 
   override def downloadAttachments(attachmentId: Long, saveDirectory: Path, fileName: String): DownloadResult = {
     // content = https://(workspace name).atlassian.net/secure/attachment/(attachment ID)/(file name)
-    jira.httpClient.download(jira.url + s"/secure/attachment/$attachmentId/$fileName", saveDirectory.path)
+    jira.httpClient.download(jira.url + s"/secure/attachment/$attachmentId/$fileName", saveDirectory.toString)
   }
 
 }
diff --git a/exporter/src/test/scala/com/nulabinc/backlog/j2b/exporter/AttachmentFilterSpec.scala b/exporter/src/test/scala/com/nulabinc/backlog/j2b/exporter/AttachmentFilterSpec.scala
@@ -1,9 +1,10 @@
 package com.nulabinc.backlog.j2b.exporter
 
+import java.util.Date
+
 import com.nulabinc.jira.client.domain._
 import com.nulabinc.jira.client.domain.changeLog.ChangeLog
 import com.nulabinc.jira.client.domain.issue._
-import org.joda.time.DateTime
 import org.specs2.mutable.Specification
 
 class AttachmentFilterSpec extends Specification {
@@ -31,15 +32,15 @@ class AttachmentFilterSpec extends Specification {
       status = Status("1", "status"),
       priority = Priority("priority"),
       creator = User(Some("key"), "name", "display", "mail"),
-      createdAt =  DateTime.now,
-      updatedAt =  DateTime.now,
+      createdAt =  new Date(),
+      updatedAt =  new Date(),
       changeLogs = Seq.empty[ChangeLog],
       attachments = Seq(
         Attachment(
           id = 1,
           fileName = "file1.txt",
           author = User(Some("key1"), "user1", "user1", "mail1"),
-          createdAt = DateTime.now,
+          createdAt = new Date(),
           size = 100,
           mimeType = "mine",
           content = "data"
@@ -48,7 +49,7 @@ class AttachmentFilterSpec extends Specification {
           id = 2,
           fileName = "file2.txt",
           author = User(Some("key2"), "user2", "user2", "mail2"),
-          createdAt = DateTime.now,
+          createdAt = new Date(),
           size = 200,
           mimeType = "mine",
           content = "data"
@@ -57,7 +58,7 @@ class AttachmentFilterSpec extends Specification {
           id = 3,
           fileName = "file3.txt",
           author = User(Some("key3") ,"user3", "user3", "mail3"),
-          createdAt = DateTime.now,
+          createdAt = new Date(),
           size = 300,
           mimeType = "mine",
           content = "data"
@@ -70,7 +71,7 @@ class AttachmentFilterSpec extends Specification {
         id = 1,
         body = "test1 body [^file2.txt] ",
         author = User(Some("aaa"), "aaa", "aaa", "mmm"),
-        createdAt = DateTime.now
+        createdAt = new Date()
       )
     )
 

diff --git a/importer b/importer
+5 −6		src/main/scala/com/nulabinc/backlog/migration/importer/service/IssuesImporter.scala
+19 −12		src/main/scala/com/nulabinc/backlog/migration/importer/service/ProjectImporter.scala
+3 −4		src/main/scala/com/nulabinc/backlog/migration/importer/service/WikisImporter.scala