Skip to content

Commit adfa542

Browse files
committed
remove cats.data types from Mergify smart constructors
1 parent bc28493 commit adfa542

File tree

1 file changed

+10
-7
lines changed

1 file changed

+10
-7
lines changed

mergify/src/main/scala/org/typelevel/sbt/mergify/MergifyAction.scala

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -62,24 +62,27 @@ object MergifyAction {
6262
}
6363

6464
final class RequestReviews(
65-
val users: Either[Seq[String], Map[String, Int]],
65+
val users: Either[NonEmptyList[String], NonEmptyMap[String, Int]],
6666
val randomCount: Option[Int])
6767
extends MergifyAction {
6868
override private[mergify] def name = "request_reviews"
6969
}
7070

7171
object RequestReviews {
7272
def apply(user: String, users: String*) =
73-
new RequestReviews((user :: users.toList).asLeft, None)
73+
new RequestReviews(NonEmptyList.of(user, users: _*).asLeft, None)
7474

7575
def apply(weightedUser: (String, Int), weightedUsers: (String, Int)*) =
76-
new RequestReviews((weightedUser :: weightedUsers.toList).toMap.asRight, None)
76+
new RequestReviews(NonEmptyMap.of(weightedUser, weightedUsers: _*).asRight, None)
7777

78-
def apply(users: NonEmptyList[String], randomCount: Int) =
79-
new RequestReviews(users.toList.asLeft, Option(randomCount))
78+
def apply(randomCount: Int, user: String, users: String*) =
79+
new RequestReviews(NonEmptyList.of(user, users: _*).asLeft, Option(randomCount))
8080

81-
def apply(weightedUsers: NonEmptyMap[String, Int], randomCount: Int) =
82-
new RequestReviews(weightedUsers.toSortedMap.asRight, Option(randomCount))
81+
def apply(randomCount: Int, weightedUser: (String, Int), weightedUsers: (String, Int)*) =
82+
new RequestReviews(
83+
NonEmptyMap.of(weightedUser, weightedUsers: _*).asRight,
84+
Option(randomCount)
85+
)
8386

8487
implicit def encoder: Encoder[RequestReviews] =
8588
Encoder.forProduct2("users", "random_count") { requestReviews =>

0 commit comments

Comments
 (0)