Skip to content

Commit 61a0ef2

Browse files
shomatanshomatan
authored
Merge pull request #42 from nulab/update/scalafmt-core-2.5.3
Update scalafmt-core to 2.5.3
2 parents f73c1d8 + c7ebea7 commit 61a0ef2

File tree

71 files changed

+1373
-564
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

71 files changed

+1373
-564
lines changed

‎.github/workflows/build.yml‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
name: Build
22

3-
on: [push]
3+
on:
4+
push:
5+
branches: [ master ]
46

57
jobs:
68

‎.scalafmt.conf‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
include "common/.scalafmt.conf"
1+
include "common/.scalafmt.conf"

‎build.sbt‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,8 @@ lazy val commonSettings = Seq(
2525

2626
lazy val common = (project in file("common")).settings(commonSettings: _*)
2727

28-
lazy val redmine = (project in file("redmine")).settings(commonSettings: _*).dependsOn(common)
28+
lazy val redmine =
29+
(project in file("redmine")).settings(commonSettings: _*).dependsOn(common)
2930

3031
lazy val root = (project in file("."))
3132
.settings(commonSettings: _*)
@@ -39,7 +40,11 @@ lazy val root = (project in file("."))
3940
},
4041
Test / testOptions ++= Seq(
4142
Tests.Argument(TestFrameworks.ScalaTest, "-u", "target/test-reports"),
42-
Tests.Argument(TestFrameworks.ScalaTest, "-f", "target/test-reports/output.txt")
43+
Tests.Argument(
44+
TestFrameworks.ScalaTest,
45+
"-f",
46+
"target/test-reports/output.txt"
47+
)
4348
),
4449
assembly / test := {}
4550
)

‎redmine/build.sbt‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
21
libraryDependencies ++= Seq(
32
"com.taskadapter" % "redmine-java-api" % "2.4.0"
4-
)
3+
)

‎redmine/src/main/scala/com/nulabinc/backlog/r2b/redmine/conf/RedmineConstantValue.scala‎

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -6,37 +6,37 @@ package com.nulabinc.backlog.r2b.redmine.conf
66
object RedmineConstantValue {
77

88
object FieldFormat {
9-
val TEXT: String = "text"
10-
val STRING: String = "string"
11-
val LINK: String = "link"
12-
val INT: String = "int"
13-
val FLOAT: String = "float"
14-
val DATE: String = "date"
15-
val BOOL: String = "bool"
16-
val LIST: String = "list"
9+
val TEXT: String = "text"
10+
val STRING: String = "string"
11+
val LINK: String = "link"
12+
val INT: String = "int"
13+
val FLOAT: String = "float"
14+
val DATE: String = "date"
15+
val BOOL: String = "bool"
16+
val LIST: String = "list"
1717
val VERSION: String = "version"
18-
val USER: String = "user"
19-
val ENUMERATION: String = "enumeration"
18+
val USER: String = "user"
19+
val ENUMERATION: String = "enumeration"
2020
}
2121

22-
val ATTACHMENT: String = "attachment"
22+
val ATTACHMENT: String = "attachment"
2323
val CUSTOM_FIELD: String = "cf"
24-
val ATTR: String = "attr"
25-
val RELATION: String = "relation"
24+
val ATTR: String = "attr"
25+
val RELATION: String = "relation"
2626

2727
object Attr {
28-
val SUBJECT: String = "subject"
29-
val DESCRIPTION: String = "description"
30-
val TRACKER: String = "tracker_id"
31-
val STATUS: String = "status_id"
32-
val PRIORITY: String = "priority_id"
33-
val ASSIGNED: String = "assigned_to_id"
34-
val VERSION: String = "fixed_version_id"
35-
val PARENT: String = "parent_id"
36-
val START_DATE: String = "start_date"
37-
val DUE_DATE: String = "due_date"
28+
val SUBJECT: String = "subject"
29+
val DESCRIPTION: String = "description"
30+
val TRACKER: String = "tracker_id"
31+
val STATUS: String = "status_id"
32+
val PRIORITY: String = "priority_id"
33+
val ASSIGNED: String = "assigned_to_id"
34+
val VERSION: String = "fixed_version_id"
35+
val PARENT: String = "parent_id"
36+
val START_DATE: String = "start_date"
37+
val DUE_DATE: String = "due_date"
3838
val ESTIMATED_HOURS: String = "estimated_hours"
39-
val CATEGORY: String = "category_id"
39+
val CATEGORY: String = "category_id"
4040
}
4141

4242
}

‎redmine/src/main/scala/com/nulabinc/backlog/r2b/redmine/domain/PropertyValue.scala‎

Lines changed: 30 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,9 @@ case class PropertyValue(
2121
optValue match {
2222
case Some(value) =>
2323
StringUtil.safeStringToInt(value) match {
24-
case Some(intValue) => versions.find(version => version.getId.intValue() == intValue)
25-
case _ => None
24+
case Some(intValue) =>
25+
versions.find(version => version.getId.intValue() == intValue)
26+
case _ => None
2627
}
2728
case _ => None
2829
}
@@ -31,8 +32,9 @@ case class PropertyValue(
3132
optValue match {
3233
case Some(value) =>
3334
StringUtil.safeStringToInt(value) match {
34-
case Some(intValue) => priorities.find(priority => priority.getId.intValue() == intValue)
35-
case _ => None
35+
case Some(intValue) =>
36+
priorities.find(priority => priority.getId.intValue() == intValue)
37+
case _ => None
3638
}
3739
case _ => None
3840
}
@@ -41,8 +43,9 @@ case class PropertyValue(
4143
optValue match {
4244
case Some(value) =>
4345
StringUtil.safeStringToInt(value) match {
44-
case Some(intValue) => users.find(user => user.getId.intValue() == intValue)
45-
case _ => None
46+
case Some(intValue) =>
47+
users.find(user => user.getId.intValue() == intValue)
48+
case _ => None
4649
}
4750
case _ => None
4851
}
@@ -57,8 +60,9 @@ case class PropertyValue(
5760
optValue match {
5861
case Some(value) =>
5962
StringUtil.safeStringToInt(value) match {
60-
case Some(intValue) => users.find(user => user.getId.intValue() == intValue)
61-
case _ => None
63+
case Some(intValue) =>
64+
users.find(user => user.getId.intValue() == intValue)
65+
case _ => None
6266
}
6367
case _ => None
6468
}
@@ -67,8 +71,9 @@ case class PropertyValue(
6771
optValue match {
6872
case Some(value) =>
6973
StringUtil.safeStringToInt(value) match {
70-
case Some(intValue) => categories.find(category => category.getId.intValue() == intValue)
71-
case _ => None
74+
case Some(intValue) =>
75+
categories.find(category => category.getId.intValue() == intValue)
76+
case _ => None
7277
}
7378
case _ => None
7479
}
@@ -77,22 +82,31 @@ case class PropertyValue(
7782
optValue match {
7883
case Some(value) =>
7984
StringUtil.safeStringToInt(value) match {
80-
case Some(intValue) => trackers.find(tracker => tracker.getId.intValue() == intValue)
81-
case _ => None
85+
case Some(intValue) =>
86+
trackers.find(tracker => tracker.getId.intValue() == intValue)
87+
case _ => None
8288
}
8389
case _ => None
8490
}
8591

86-
def customFieldDefinitionOfId(strId: String): Option[RedmineCustomFieldDefinition] = {
92+
def customFieldDefinitionOfId(
93+
strId: String
94+
): Option[RedmineCustomFieldDefinition] = {
8795
StringUtil.safeStringToInt(strId) match {
8896
case Some(id) =>
89-
customFieldDefinitions.find(customFieldDefinition => customFieldDefinition.id == id)
97+
customFieldDefinitions.find(customFieldDefinition =>
98+
customFieldDefinition.id == id
99+
)
90100
case _ => None
91101
}
92102
}
93103

94-
def customFieldDefinitionOfName(name: String): Option[RedmineCustomFieldDefinition] = {
95-
customFieldDefinitions.find(customFieldDefinition => customFieldDefinition.name == name)
104+
def customFieldDefinitionOfName(
105+
name: String
106+
): Option[RedmineCustomFieldDefinition] = {
107+
customFieldDefinitions.find(customFieldDefinition =>
108+
customFieldDefinition.name == name
109+
)
96110
}
97111

98112
}

‎redmine/src/main/scala/com/nulabinc/backlog/r2b/redmine/domain/Redmine.scala‎

Lines changed: 18 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,27 @@
11
package com.nulabinc.backlog.r2b.redmine.domain
22

3-
import com.nulabinc.backlog.migration.common.domain.support.{Identifier, Undefined}
3+
import com.nulabinc.backlog.migration.common.domain.support.{
4+
Identifier,
5+
Undefined
6+
}
47

58
/**
69
* @author uchida
710
*/
8-
case class RedmineCustomFieldDefinition(id: Int,
9-
name: String,
10-
customizedType: String,
11-
fieldFormat: String,
12-
optRegexp: Option[String],
13-
optMinLength: Option[Int],
14-
optMaxLength: Option[Int],
15-
isRequired: Boolean,
16-
isMultiple: Boolean,
17-
optDefaultValue: Option[String],
18-
trackers: Seq[RedmineTracker],
19-
possibleValues: Seq[String])
11+
case class RedmineCustomFieldDefinition(
12+
id: Int,
13+
name: String,
14+
customizedType: String,
15+
fieldFormat: String,
16+
optRegexp: Option[String],
17+
optMinLength: Option[Int],
18+
optMaxLength: Option[Int],
19+
isRequired: Boolean,
20+
isMultiple: Boolean,
21+
optDefaultValue: Option[String],
22+
trackers: Seq[RedmineTracker],
23+
possibleValues: Seq[String]
24+
)
2025

2126
case class RedmineTracker(id: Int, name: String)
2227

0 commit comments

Comments
 (0)