Merge branch 'release/0.3.0b3'

nulab · Jun 14, 2018 · 2b68bcb · 2b68bcb
2 parents a3c66df + 60ac3a2
commit 2b68bcb
Show file tree

Hide file tree

Showing 124 changed files with 60 additions and 244 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.3.0b2/backlog-migration-jira-0.3.0b2.jar
+https://github.com/nulab/BacklogMigration-Jira/releases/download/0.3.0b3/backlog-migration-jira-0.3.0b3.jar
 
     java -jar backlog-migration-jira-[latest version].jar
 
@@ -218,7 +218,7 @@ https://github.com/nulab/BacklogMigration-Jira/releases
 
 こちらのリンクからjarファイルをダウンロードし、以下のようにコマンドラインから実行します。
 
-https://github.com/nulab/BacklogMigration-Jira/releases/download/0.3.0b2/backlog-migration-jira-0.3.0b2.jar
+https://github.com/nulab/BacklogMigration-Jira/releases/download/0.3.0b3/backlog-migration-jira-0.3.0b3.jar
 
     java -jar backlog-migration-jira-[最新バージョン].jar
 

diff --git a/build.sbt b/build.sbt
@@ -2,7 +2,7 @@ import sbt.Keys._
 
 scapegoatVersion in ThisBuild := "1.3.3"
 
-lazy val projectVersion = "0.3.0b2"
+lazy val projectVersion = "0.3.0b3"
 
 lazy val commonSettings = Seq(
   organization := "com.nulabinc",
@@ -39,34 +39,6 @@ lazy val importer = (project in file("importer"))
   .settings(commonSettings)
   .dependsOn(common)
 
-lazy val exporter = (project in file("exporter"))
-  .settings(commonSettings)
-  .dependsOn(jira, client, writer)
-
-lazy val jira = (project in file("jira"))
-  .settings(commonSettings)
-  .dependsOn(common, client)
-
-lazy val mappingBase = (project in file("mapping-base"))
-  .settings(commonSettings)
-  .dependsOn(common, jira)
-
-lazy val mappingConverter = (project in file("mapping-converter"))
-  .settings(commonSettings)
-  .dependsOn(mappingBase, mappingFile)
-
-lazy val mappingCollector = (project in file("mapping-collector"))
-  .settings(commonSettings)
-  .dependsOn(jira, mappingBase)
-
-lazy val mappingFile = (project in file("mapping-file"))
-  .settings(commonSettings)
-  .dependsOn(jira, mappingBase, client)
-
-lazy val writer = (project in file("project-writer"))
-  .settings(commonSettings)
-  .dependsOn(jira, client)
-
 lazy val client = (project in file("jira-client"))
   .settings(commonSettings)
 
@@ -86,5 +58,5 @@ lazy val root = (project in file("."))
     ),
     test in assembly := {}
   )
-  .dependsOn(common % "test->test;compile->compile", importer, exporter, writer, client, jira, mappingFile, mappingConverter, mappingCollector)
-  .aggregate(common, importer, exporter, writer, client, jira, mappingFile, mappingConverter)
+  .dependsOn(common % "test->test;compile->compile", importer, client)
+  .aggregate(common, importer, client)
diff --git a/jira-client/build.sbt b/jira-client/build.sbt
@@ -5,6 +5,7 @@ libraryDependencies ++= Seq(
   "org.apache.httpcomponents" %  "httpclient"           % "4.5.3",
   "io.spray"                  %% "spray-json"           % "1.3.3",
   "com.netaporter"            %% "scala-uri"            % "0.4.16",
+  "org.slf4j"                 %  "slf4j-api"            % "1.7.25",
   "org.scalatest"             %% "scalatest"            % "3.0.5"   % "test",
   "org.specs2"                %% "specs2-core"          % "3.8.9"   % Test,
   "org.specs2"                %% "specs2-matcher"       % "3.8.9"   % Test,

diff --git a/jira-client/src/main/scala/com/nulabinc/jira/client/HttpClient.scala b/jira-client/src/main/scala/com/nulabinc/jira/client/HttpClient.scala
@@ -10,6 +10,7 @@ import org.apache.http.auth.{AuthScope, UsernamePasswordCredentials}
 import org.apache.http.client.config.RequestConfig
 import org.apache.http.client.methods.{CloseableHttpResponse, HttpGet}
 import org.apache.http.impl.client.{BasicCredentialsProvider, CloseableHttpClient, HttpClientBuilder, HttpClients}
+import org.slf4j.{Logger, LoggerFactory}
 import spray.json.{JsArray, JsonParser}
 
 import scala.io.Source
@@ -30,6 +31,8 @@ case object DownloadFailure extends DownloadResult
 
 class HttpClient(url: String, username: String, password: String) {
 
+  val logger: Logger = LoggerFactory.getLogger(getClass)
+
   private val auth: String              = username + ":" + password
   private val encodedAuth: Array[Byte]  = Base64.encodeBase64(auth.getBytes(Charset.forName("ISO-8859-1")))
   private val authHeader: String        = "Basic " + new String(encodedAuth)
@@ -148,8 +151,10 @@ class HttpClient(url: String, username: String, password: String) {
         .build()
     }).getOrElse(HttpClientBuilder.create().build())
 
-  private def createHttpGetRequest(path: String): HttpGet =
+  private def createHttpGetRequest(path: String): HttpGet = {
+    logger.info(s"Create HTTP request method: GET and uri: $path")
     new HttpGet(path)
+  }
 
   private def httpExecute(client: CloseableHttpClient, request: HttpGet): CloseableHttpResponse = {
     request.setHeader(HttpHeaders.AUTHORIZATION, authHeader)

diff --git a/mapping-converter/src/main/scala/com/nulabinc/backlog/j2b/mapping/converter/package.scala b/mapping-converter/src/main/scala/com/nulabinc/backlog/j2b/mapping/converter/package.scala
diff --git a/project-writer/src/main/scala/com/nulabinc/backlog/j2b/issue/writer/package.scala b/project-writer/src/main/scala/com/nulabinc/backlog/j2b/issue/writer/package.scala
diff --git a/...writer/src/test/scala/com/nulabinc/backlog/j2b/issue/writer/ComponentFileWriterSpec.scala b/...writer/src/test/scala/com/nulabinc/backlog/j2b/issue/writer/ComponentFileWriterSpec.scala
diff --git a/...ct-writer/src/test/scala/com/nulabinc/backlog/j2b/issue/writer/FileWriterTestHelper.scala b/...ct-writer/src/test/scala/com/nulabinc/backlog/j2b/issue/writer/FileWriterTestHelper.scala
diff --git a/...riter/src/test/scala/com/nulabinc/backlog/j2b/issue/writer/IssueTypesFileWriterSpec.scala b/...riter/src/test/scala/com/nulabinc/backlog/j2b/issue/writer/IssueTypesFileWriterSpec.scala
diff --git a/...t-writer/src/test/scala/com/nulabinc/backlog/j2b/issue/writer/ProjectFileWriterSpec.scala b/...t-writer/src/test/scala/com/nulabinc/backlog/j2b/issue/writer/ProjectFileWriterSpec.scala
diff --git a/...t-writer/src/test/scala/com/nulabinc/backlog/j2b/issue/writer/VersionFileWriterSpec.scala b/...t-writer/src/test/scala/com/nulabinc/backlog/j2b/issue/writer/VersionFileWriterSpec.scala
diff --git a/src/main/resources/application.conf b/src/main/resources/application.conf
@@ -1,6 +1,6 @@
 application {
   name = "Backlog Migration for Jira"
-  version = "0.3.0b2"
+  version = "0.3.0b3"
   title = ${application.name} ${application.version} (c) nulab.inc
   fileName = backlog-migration-jira-${application.version}.jar
   product = "jira"

diff --git a/...cklog/j2b/exporter/AttachmentFilter.scala → ...cklog/j2b/exporter/AttachmentFilter.scala b/...cklog/j2b/exporter/AttachmentFilter.scala → ...cklog/j2b/exporter/AttachmentFilter.scala
diff --git a/...acklog/j2b/exporter/ChangeLogFilter.scala → ...acklog/j2b/exporter/ChangeLogFilter.scala b/...acklog/j2b/exporter/ChangeLogFilter.scala → ...acklog/j2b/exporter/ChangeLogFilter.scala
@@ -2,8 +2,8 @@ package com.nulabinc.backlog.j2b.exporter
 
 import com.nulabinc.backlog.j2b.jira.domain.export.Field
 import com.nulabinc.backlog.j2b.jira.domain.export.FieldType.CustomLabels
-import com.nulabinc.jira.client.domain.{Component, Version}
 import com.nulabinc.jira.client.domain.changeLog._
+import com.nulabinc.jira.client.domain.{Component, Version}
 
 object ChangeLogFilter {
 

diff --git a/...xporter/ChangeLogIssueLinkConverter.scala → ...xporter/ChangeLogIssueLinkConverter.scala b/...xporter/ChangeLogIssueLinkConverter.scala → ...xporter/ChangeLogIssueLinkConverter.scala
diff --git a/...cklog/j2b/exporter/ChangeLogReducer.scala → ...cklog/j2b/exporter/ChangeLogReducer.scala b/...cklog/j2b/exporter/ChangeLogReducer.scala → ...cklog/j2b/exporter/ChangeLogReducer.scala
diff --git a/...b/exporter/ChangeLogStatusConverter.scala → ...b/exporter/ChangeLogStatusConverter.scala b/...b/exporter/ChangeLogStatusConverter.scala → ...b/exporter/ChangeLogStatusConverter.scala
diff --git a/...cklog/j2b/exporter/ChangeLogsPlayer.scala → ...cklog/j2b/exporter/ChangeLogsPlayer.scala b/...cklog/j2b/exporter/ChangeLogsPlayer.scala → ...cklog/j2b/exporter/ChangeLogsPlayer.scala
diff --git a/...klog/j2b/exporter/CommentFileWriter.scala → ...klog/j2b/exporter/CommentFileWriter.scala b/...klog/j2b/exporter/CommentFileWriter.scala → ...klog/j2b/exporter/CommentFileWriter.scala
@@ -1,7 +1,6 @@
 package com.nulabinc.backlog.j2b.exporter
 
 import java.util.Date
-import javax.inject.Inject
 
 import com.nulabinc.backlog.j2b.issue.writer.convert._
 import com.nulabinc.backlog.j2b.jira.service.IssueService
@@ -12,6 +11,7 @@ import com.nulabinc.backlog.migration.common.domain._
 import com.nulabinc.backlog.migration.common.utils.IOUtil
 import com.nulabinc.jira.client.domain._
 import com.nulabinc.jira.client.domain.changeLog.ChangeLog
+import javax.inject.Inject
 import spray.json._
 
 class CommentFileWriter @Inject()(implicit val commentWrites: CommentWrites,

diff --git a/...backlog/j2b/exporter/CommentReducer.scala → ...backlog/j2b/exporter/CommentReducer.scala b/...backlog/j2b/exporter/CommentReducer.scala → ...backlog/j2b/exporter/CommentReducer.scala
diff --git a/...abinc/backlog/j2b/exporter/Exporter.scala → ...abinc/backlog/j2b/exporter/Exporter.scala b/...abinc/backlog/j2b/exporter/Exporter.scala → ...abinc/backlog/j2b/exporter/Exporter.scala
@@ -1,7 +1,5 @@
 package com.nulabinc.backlog.j2b.exporter
 
-import javax.inject.Inject
-
 import com.nulabinc.backlog.j2b.exporter.console.RemainingTimeCalculator
 import com.nulabinc.backlog.j2b.jira.conf.JiraBacklogPaths
 import com.nulabinc.backlog.j2b.jira.domain.export._
@@ -15,6 +13,7 @@ import com.nulabinc.jira.client.domain._
 import com.nulabinc.jira.client.domain.changeLog.{AssigneeFieldId, ComponentChangeLogItemField, CustomFieldFieldId, FixVersion}
 import com.nulabinc.jira.client.domain.issue._
 import com.osinka.i18n.Messages
+import javax.inject.Inject
 
 class Exporter @Inject()(projectKey: JiraProjectKey,
                          projectService: ProjectService,

diff --git a/...cklog/j2b/exporter/IssueFieldFilter.scala → ...cklog/j2b/exporter/IssueFieldFilter.scala b/...cklog/j2b/exporter/IssueFieldFilter.scala → ...cklog/j2b/exporter/IssueFieldFilter.scala
diff --git a/...acklog/j2b/exporter/IssueFileWriter.scala → ...acklog/j2b/exporter/IssueFileWriter.scala b/...acklog/j2b/exporter/IssueFileWriter.scala → ...acklog/j2b/exporter/IssueFileWriter.scala
@@ -1,7 +1,6 @@
 package com.nulabinc.backlog.j2b.exporter
 
 import java.util.Date
-import javax.inject.Inject
 
 import com.nulabinc.backlog.j2b.issue.writer.convert.IssueWrites
 import com.nulabinc.backlog.j2b.jira.service.IssueService
@@ -10,6 +9,7 @@ import com.nulabinc.backlog.migration.common.conf.BacklogPaths
 import com.nulabinc.backlog.migration.common.domain.BacklogIssue
 import com.nulabinc.backlog.migration.common.domain.BacklogJsonProtocol._
 import com.nulabinc.backlog.migration.common.utils.IOUtil
+import javax.inject.Inject
 import spray.json._
 
 class IssueFileWriter @Inject()(implicit val issueWrites: IssueWrites,

diff --git a/...klog/j2b/exporter/IssueInitialValue.scala → ...klog/j2b/exporter/IssueInitialValue.scala b/...klog/j2b/exporter/IssueInitialValue.scala → ...klog/j2b/exporter/IssueInitialValue.scala
diff --git a/...cklog/j2b/exporter/IssueInitializer.scala → ...cklog/j2b/exporter/IssueInitializer.scala b/...cklog/j2b/exporter/IssueInitializer.scala → ...cklog/j2b/exporter/IssueInitializer.scala
@@ -1,7 +1,5 @@
 package com.nulabinc.backlog.j2b.exporter
 
-import javax.inject.Inject
-
 import com.nulabinc.backlog.j2b.issue.writer.convert._
 import com.nulabinc.backlog.j2b.jira.domain.export._
 import com.nulabinc.backlog.j2b.jira.domain.mapping.MappingCollectDatabase
@@ -13,6 +11,7 @@ import com.nulabinc.backlog.migration.common.utils._
 import com.nulabinc.jira.client.domain.Comment
 import com.nulabinc.jira.client.domain.changeLog._
 import com.nulabinc.jira.client.domain.issue.Issue
+import javax.inject.Inject
 
 class IssueInitializer @Inject()(implicit val issueWrites: IssueWrites,
                                  implicit val attachmentWrites: AttachmentWrites,

diff --git a/...log/j2b/exporter/MilestoneExtractor.scala → ...log/j2b/exporter/MilestoneExtractor.scala b/...log/j2b/exporter/MilestoneExtractor.scala → ...log/j2b/exporter/MilestoneExtractor.scala
diff --git a/...ter/console/RemainingTimeCalculator.scala → ...ter/console/RemainingTimeCalculator.scala b/...ter/console/RemainingTimeCalculator.scala → ...ter/console/RemainingTimeCalculator.scala
diff --git a/...labinc/backlog/j2b/exporter/package.scala → ...labinc/backlog/j2b/exporter/package.scala b/...labinc/backlog/j2b/exporter/package.scala → ...labinc/backlog/j2b/exporter/package.scala
diff --git a/...r/service/JiraClientCategoryService.scala → ...r/service/JiraClientCategoryService.scala b/...r/service/JiraClientCategoryService.scala → ...r/service/JiraClientCategoryService.scala
@@ -1,10 +1,9 @@
 package com.nulabinc.backlog.j2b.exporter.service
 
-import javax.inject.Inject
-
 import com.nulabinc.backlog.j2b.jira.domain.JiraProjectKey
 import com.nulabinc.backlog.j2b.jira.service.CategoryService
 import com.nulabinc.jira.client.JiraRestClient
+import javax.inject.Inject
 
 class JiraClientCategoryService @Inject()(jira: JiraRestClient,
                                           projectKey: JiraProjectKey) extends CategoryService {

diff --git a/...er/service/JiraClientCommentService.scala → ...er/service/JiraClientCommentService.scala b/...er/service/JiraClientCommentService.scala → ...er/service/JiraClientCommentService.scala
@@ -1,11 +1,10 @@
 package com.nulabinc.backlog.j2b.exporter.service
 
-import javax.inject.Inject
-
 import com.nulabinc.backlog.j2b.jira.service.CommentService
 import com.nulabinc.jira.client.JiraRestClient
 import com.nulabinc.jira.client.domain.Comment
 import com.nulabinc.jira.client.domain.issue.Issue
+import javax.inject.Inject
 
 class JiraClientCommentService @Inject()(jira: JiraRestClient) extends CommentService {
 

diff --git a/...rter/service/JiraClientFieldService.scala → ...rter/service/JiraClientFieldService.scala b/...rter/service/JiraClientFieldService.scala → ...rter/service/JiraClientFieldService.scala
@@ -1,9 +1,8 @@
 package com.nulabinc.backlog.j2b.exporter.service
 
-import javax.inject.Inject
-
 import com.nulabinc.backlog.j2b.jira.service.FieldService
 import com.nulabinc.jira.client.JiraRestClient
+import javax.inject.Inject
 
 class JiraClientFieldService @Inject()(jira: JiraRestClient) extends FieldService {