Skip to content

Commit

Permalink
Merge pull request #37 from nulab/BLG_INTG-358/reduce-retry-count
Browse files Browse the repository at this point in the history
Blg intg 358/reduce retry count
  • Loading branch information
nullberg88 authored Jan 19, 2022
2 parents 6019bd4 + fd2e919 commit 18b34fa
Show file tree
Hide file tree
Showing 6 changed files with 9 additions and 8 deletions.
2 changes: 1 addition & 1 deletion build.sbt
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
lazy val commonSettings = Seq(
organization := "com.nulabinc",
version := "0.6.4-SNAPSHOT",
version := "0.6.4-SNAPSHOT",
scalaVersion := "2.13.6",
scalacOptions ++= Seq(
"-deprecation",
Expand Down
2 changes: 1 addition & 1 deletion common
Submodule common updated 95 files
+1 −1 .scalafmt.conf
+15 −15 build.sbt
+4 −1 core/src/main/scala/com/nulabinc/backlog/migration/common/conf/BacklogConfiguration.scala
+2 −1 core/src/main/scala/com/nulabinc/backlog/migration/common/conf/BacklogConstantValue.scala
+2 −1 core/src/main/scala/com/nulabinc/backlog/migration/common/conf/BacklogPaths.scala
+2 −1 core/src/main/scala/com/nulabinc/backlog/migration/common/convert/BacklogUnmarshaller.scala
+2 −1 core/src/main/scala/com/nulabinc/backlog/migration/common/convert/Convert.scala
+2 −1 core/src/main/scala/com/nulabinc/backlog/migration/common/convert/writes/AttachmentInfoWrites.scala
+2 −1 core/src/main/scala/com/nulabinc/backlog/migration/common/convert/writes/AttachmentWrites.scala
+2 −1 core/src/main/scala/com/nulabinc/backlog/migration/common/convert/writes/AttributeInfoWrites.scala
+2 −1 core/src/main/scala/com/nulabinc/backlog/migration/common/convert/writes/CategoryNameWrites.scala
+2 −1 core/src/main/scala/com/nulabinc/backlog/migration/common/convert/writes/CategoryWrites.scala
+2 −1 core/src/main/scala/com/nulabinc/backlog/migration/common/convert/writes/ChangeLogWrites.scala
+2 −1 core/src/main/scala/com/nulabinc/backlog/migration/common/convert/writes/CommentWrites.scala
+2 −1 core/src/main/scala/com/nulabinc/backlog/migration/common/convert/writes/CustomFieldSettingWrites.scala
+2 −1 core/src/main/scala/com/nulabinc/backlog/migration/common/convert/writes/CustomFieldWrites.scala
+2 −1 core/src/main/scala/com/nulabinc/backlog/migration/common/convert/writes/GroupWrites.scala
+2 −1 core/src/main/scala/com/nulabinc/backlog/migration/common/convert/writes/IssueTypeNameWrites.scala
+2 −1 core/src/main/scala/com/nulabinc/backlog/migration/common/convert/writes/IssueTypeWrites.scala
+2 −1 core/src/main/scala/com/nulabinc/backlog/migration/common/convert/writes/IssueWrites.scala
+2 −1 core/src/main/scala/com/nulabinc/backlog/migration/common/convert/writes/NotificationWrites.scala
+2 −1 core/src/main/scala/com/nulabinc/backlog/migration/common/convert/writes/ProjectWrites.scala
+2 −1 core/src/main/scala/com/nulabinc/backlog/migration/common/convert/writes/SharedFileWrites.scala
+2 −1 core/src/main/scala/com/nulabinc/backlog/migration/common/convert/writes/SpaceWrites.scala
+2 −1 core/src/main/scala/com/nulabinc/backlog/migration/common/convert/writes/UserNameWrites.scala
+2 −1 core/src/main/scala/com/nulabinc/backlog/migration/common/convert/writes/UserWrites.scala
+2 −1 core/src/main/scala/com/nulabinc/backlog/migration/common/convert/writes/VersionNameWrites.scala
+2 −1 core/src/main/scala/com/nulabinc/backlog/migration/common/convert/writes/VersionWrites.scala
+2 −1 core/src/main/scala/com/nulabinc/backlog/migration/common/convert/writes/WikiWrites.scala
+2 −1 core/src/main/scala/com/nulabinc/backlog/migration/common/domain/Backlog.scala
+2 −1 core/src/main/scala/com/nulabinc/backlog/migration/common/domain/PropertyValue.scala
+2 −1 core/src/main/scala/com/nulabinc/backlog/migration/common/modules/DefaultModule.scala
+2 −1 core/src/main/scala/com/nulabinc/backlog/migration/common/modules/ServiceInjector.scala
+2 −1 core/src/main/scala/com/nulabinc/backlog/migration/common/service/AttachmentService.scala
+2 −1 core/src/main/scala/com/nulabinc/backlog/migration/common/service/AttachmentServiceImpl.scala
+2 −1 core/src/main/scala/com/nulabinc/backlog/migration/common/service/CommentService.scala
+4 −1 core/src/main/scala/com/nulabinc/backlog/migration/common/service/CommentServiceImpl.scala
+2 −1 core/src/main/scala/com/nulabinc/backlog/migration/common/service/CustomFieldSettingService.scala
+2 −1 core/src/main/scala/com/nulabinc/backlog/migration/common/service/CustomFieldSettingServiceImpl.scala
+2 −1 core/src/main/scala/com/nulabinc/backlog/migration/common/service/GroupService.scala
+2 −1 core/src/main/scala/com/nulabinc/backlog/migration/common/service/GroupServiceImpl.scala
+2 −1 core/src/main/scala/com/nulabinc/backlog/migration/common/service/IssueCategoryService.scala
+2 −1 core/src/main/scala/com/nulabinc/backlog/migration/common/service/IssueCategoryServiceImpl.scala
+2 −1 core/src/main/scala/com/nulabinc/backlog/migration/common/service/IssueService.scala
+6 −7 core/src/main/scala/com/nulabinc/backlog/migration/common/service/IssueServiceImpl.scala
+2 −1 core/src/main/scala/com/nulabinc/backlog/migration/common/service/IssueTypeService.scala
+2 −1 core/src/main/scala/com/nulabinc/backlog/migration/common/service/IssueTypeServiceImpl.scala
+2 −1 core/src/main/scala/com/nulabinc/backlog/migration/common/service/PriorityService.scala
+2 −1 core/src/main/scala/com/nulabinc/backlog/migration/common/service/PriorityServiceImpl.scala
+2 −1 core/src/main/scala/com/nulabinc/backlog/migration/common/service/ProjectService.scala
+2 −1 core/src/main/scala/com/nulabinc/backlog/migration/common/service/ProjectServiceImpl.scala
+2 −1 core/src/main/scala/com/nulabinc/backlog/migration/common/service/ProjectUserService.scala
+2 −1 core/src/main/scala/com/nulabinc/backlog/migration/common/service/ProjectUserServiceImpl.scala
+2 −1 core/src/main/scala/com/nulabinc/backlog/migration/common/service/PropertyResolver.scala
+2 −1 core/src/main/scala/com/nulabinc/backlog/migration/common/service/PropertyResolverImpl.scala
+2 −1 core/src/main/scala/com/nulabinc/backlog/migration/common/service/ResolutionService.scala
+2 −1 core/src/main/scala/com/nulabinc/backlog/migration/common/service/ResolutionServiceImpl.scala
+2 −1 core/src/main/scala/com/nulabinc/backlog/migration/common/service/SharedFileService.scala
+2 −1 core/src/main/scala/com/nulabinc/backlog/migration/common/service/SharedFileServiceImpl.scala
+2 −1 core/src/main/scala/com/nulabinc/backlog/migration/common/service/SpaceService.scala
+2 −1 core/src/main/scala/com/nulabinc/backlog/migration/common/service/SpaceServiceImpl.scala
+2 −1 core/src/main/scala/com/nulabinc/backlog/migration/common/service/StatusService.scala
+2 −1 core/src/main/scala/com/nulabinc/backlog/migration/common/service/StatusServiceImpl.scala
+2 −1 core/src/main/scala/com/nulabinc/backlog/migration/common/service/UserService.scala
+2 −1 core/src/main/scala/com/nulabinc/backlog/migration/common/service/UserServiceImpl.scala
+2 −1 core/src/main/scala/com/nulabinc/backlog/migration/common/service/VersionService.scala
+2 −1 core/src/main/scala/com/nulabinc/backlog/migration/common/service/VersionServiceImpl.scala
+2 −1 core/src/main/scala/com/nulabinc/backlog/migration/common/service/WikiService.scala
+4 −1 core/src/main/scala/com/nulabinc/backlog/migration/common/service/WikiServiceImpl.scala
+1 −1 core/src/main/scala/com/nulabinc/backlog/migration/common/services/PriorityMappingFileService.scala
+4 −4 core/src/main/scala/com/nulabinc/backlog/migration/common/services/StatusMappingFileService.scala
+1 −1 core/src/main/scala/com/nulabinc/backlog/migration/common/services/UserMappingFileService.scala
+2 −1 core/src/main/scala/com/nulabinc/backlog/migration/common/utils/ConsoleOut.scala
+2 −1 core/src/main/scala/com/nulabinc/backlog/migration/common/utils/DateUtil.scala
+2 −1 core/src/main/scala/com/nulabinc/backlog/migration/common/utils/FileUtil.scala
+2 −1 core/src/main/scala/com/nulabinc/backlog/migration/common/utils/IOUtil.scala
+2 −1 core/src/main/scala/com/nulabinc/backlog/migration/common/utils/IssueKeyUtil.scala
+2 −1 core/src/main/scala/com/nulabinc/backlog/migration/common/utils/Logging.scala
+2 −1 core/src/main/scala/com/nulabinc/backlog/migration/common/utils/ProgressBar.scala
+2 −1 core/src/main/scala/com/nulabinc/backlog/migration/common/utils/StringUtil.scala
+1 −0 core/src/test/resources/application.conf
+21 −20 core/src/test/scala/com/nulabinc/backlog/migration/SimpleFixture.scala
+2 −1 core/src/test/scala/com/nulabinc/backlog/migration/TestModule.scala
+2 −1 core/src/test/scala/com/nulabinc/backlog/migration/service/CommentServiceImplSpec.scala
+5 −4 core/src/test/scala/com/nulabinc/backlog/migration/service/IssueServiceImplSpec.scala
+2 −1 importer/src/main/scala/com/nulabinc/backlog/migration/importer/core/Boot.scala
+2 −1 importer/src/main/scala/com/nulabinc/backlog/migration/importer/modules/BacklogModule.scala
+2 −1 importer/src/main/scala/com/nulabinc/backlog/migration/importer/package.scala
+3 −2 importer/src/main/scala/com/nulabinc/backlog/migration/importer/service/IssueContext.scala
+3 −2 importer/src/main/scala/com/nulabinc/backlog/migration/importer/service/IssueProgressBar.scala
+9 −8 importer/src/main/scala/com/nulabinc/backlog/migration/importer/service/IssuesImporter.scala
+2 −1 importer/src/main/scala/com/nulabinc/backlog/migration/importer/service/ProjectImporter.scala
+2 −1 importer/src/main/scala/com/nulabinc/backlog/migration/importer/service/WikisImporter.scala
+1 −1 project/build.properties
+2 −2 project/plugins.sbt
1 change: 1 addition & 0 deletions src/main/resources/application.conf
Original file line number Diff line number Diff line change
Expand Up @@ -8,5 +8,6 @@ application {
export-limit-at-once = 100
language = default
akka.mailbox-pool = 100
defaultRetryCount = 3
iaah = ""
}
2 changes: 1 addition & 1 deletion src/main/scala/com/nulabinc/backlog/j2b/App.scala
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ object App extends BacklogConfiguration with Logging {
exit(1)
}

val config = ConfigParser.parse(args) match {
val config = ConfigParser.parse(args)(defaultRetryCount = defaultRetryCount) match {
case Some(c) =>
c.commandType match {
case Some(Config.ExportCommand) => c
Expand Down
2 changes: 1 addition & 1 deletion src/main/scala/com/nulabinc/backlog/j2b/Config.scala
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ case class Config(
jiraApiKey: String = "",
jiraUrl: String = "",
projectKey: String = "",
retryCount: Int = 20,
retryCount: Int,
iaah: Option[IAAH] = None,
commandType: Option[CommandType] = None
) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,11 @@ import com.osinka.i18n.Messages

object ConfigParser extends Logging {

def parse(args: Array[String]): Option[Config] =
parser.parse(args, Config())
def parse(args: Array[String])(defaultRetryCount: Int): Option[Config] =
parser.parse(args, Config(retryCount = defaultRetryCount))

def help(): Unit = {
parser.parse(Seq("--help"), Config()).getOrElse("")
def help()(defaultRetryCount: Int): Unit = {
parser.parse(Seq("--help"), Config(retryCount = defaultRetryCount)).getOrElse("")
}

private def parser =
Expand Down

0 comments on commit 18b34fa

Please sign in to comment.