Sort PulseSchedule values a single time (#156)

Author: kevincianfarini

api/cardiologist.api

@@ -28,12 +28,12 @@ public final class io/github/kevincianfarini/cardiologist/PulseBackpressureStrat
 public final class io/github/kevincianfarini/cardiologist/PulseSchedule {
 	public fun <init> (Ljava/util/Set;Ljava/util/Set;Ljava/util/Set;Ljava/util/Set;Ljava/util/Set;Ljava/util/Set;)V
 	public fun equals (Ljava/lang/Object;)Z
-	public final fun getAtHours ()Ljava/util/Set;
-	public final fun getAtMinutes ()Ljava/util/Set;
-	public final fun getAtSeconds ()Ljava/util/Set;
-	public final fun getInMonths ()Ljava/util/Set;
-	public final fun getOnDaysOfMonth ()Ljava/util/Set;
-	public final fun getOnDaysOfWeek ()Ljava/util/Set;
+	public final fun getAtHours ()Ljava/util/List;
+	public final fun getAtMinutes ()Ljava/util/List;
+	public final fun getAtSeconds ()Ljava/util/List;
+	public final fun getInMonths ()Ljava/util/List;
+	public final fun getOnDaysOfMonth ()Ljava/util/List;
+	public final fun getOnDaysOfWeek ()Ljava/util/List;
 	public fun hashCode ()I
 	public fun toString ()Ljava/lang/String;
 }

api/cardiologist.klib.api

@@ -23,17 +23,17 @@ final class io.github.kevincianfarini.cardiologist/PulseSchedule { // io.github.
     constructor <init>(kotlin.collections/Set<kotlin/Int>, kotlin.collections/Set<kotlin/Int>, kotlin.collections/Set<kotlin/Int>, kotlin.collections/Set<kotlin/Int>, kotlin.collections/Set<kotlinx.datetime/Month>, kotlin.collections/Set<kotlinx.datetime/DayOfWeek>) // io.github.kevincianfarini.cardiologist/PulseSchedule.<init>|<init>(kotlin.collections.Set<kotlin.Int>;kotlin.collections.Set<kotlin.Int>;kotlin.collections.Set<kotlin.Int>;kotlin.collections.Set<kotlin.Int>;kotlin.collections.Set<kotlinx.datetime.Month>;kotlin.collections.Set<kotlinx.datetime.DayOfWeek>){}[0]
 
     final val atHours // io.github.kevincianfarini.cardiologist/PulseSchedule.atHours|{}atHours[0]
-        final fun <get-atHours>(): kotlin.collections/Set<kotlin/Int> // io.github.kevincianfarini.cardiologist/PulseSchedule.atHours.<get-atHours>|<get-atHours>(){}[0]
+        final fun <get-atHours>(): kotlin.collections/List<kotlin/Int> // io.github.kevincianfarini.cardiologist/PulseSchedule.atHours.<get-atHours>|<get-atHours>(){}[0]
     final val atMinutes // io.github.kevincianfarini.cardiologist/PulseSchedule.atMinutes|{}atMinutes[0]
-        final fun <get-atMinutes>(): kotlin.collections/Set<kotlin/Int> // io.github.kevincianfarini.cardiologist/PulseSchedule.atMinutes.<get-atMinutes>|<get-atMinutes>(){}[0]
+        final fun <get-atMinutes>(): kotlin.collections/List<kotlin/Int> // io.github.kevincianfarini.cardiologist/PulseSchedule.atMinutes.<get-atMinutes>|<get-atMinutes>(){}[0]
     final val atSeconds // io.github.kevincianfarini.cardiologist/PulseSchedule.atSeconds|{}atSeconds[0]
-        final fun <get-atSeconds>(): kotlin.collections/Set<kotlin/Int> // io.github.kevincianfarini.cardiologist/PulseSchedule.atSeconds.<get-atSeconds>|<get-atSeconds>(){}[0]
+        final fun <get-atSeconds>(): kotlin.collections/List<kotlin/Int> // io.github.kevincianfarini.cardiologist/PulseSchedule.atSeconds.<get-atSeconds>|<get-atSeconds>(){}[0]
     final val inMonths // io.github.kevincianfarini.cardiologist/PulseSchedule.inMonths|{}inMonths[0]
-        final fun <get-inMonths>(): kotlin.collections/Set<kotlinx.datetime/Month> // io.github.kevincianfarini.cardiologist/PulseSchedule.inMonths.<get-inMonths>|<get-inMonths>(){}[0]
+        final fun <get-inMonths>(): kotlin.collections/List<kotlinx.datetime/Month> // io.github.kevincianfarini.cardiologist/PulseSchedule.inMonths.<get-inMonths>|<get-inMonths>(){}[0]
     final val onDaysOfMonth // io.github.kevincianfarini.cardiologist/PulseSchedule.onDaysOfMonth|{}onDaysOfMonth[0]
-        final fun <get-onDaysOfMonth>(): kotlin.collections/Set<kotlin/Int> // io.github.kevincianfarini.cardiologist/PulseSchedule.onDaysOfMonth.<get-onDaysOfMonth>|<get-onDaysOfMonth>(){}[0]
+        final fun <get-onDaysOfMonth>(): kotlin.collections/List<kotlin/Int> // io.github.kevincianfarini.cardiologist/PulseSchedule.onDaysOfMonth.<get-onDaysOfMonth>|<get-onDaysOfMonth>(){}[0]
     final val onDaysOfWeek // io.github.kevincianfarini.cardiologist/PulseSchedule.onDaysOfWeek|{}onDaysOfWeek[0]
-        final fun <get-onDaysOfWeek>(): kotlin.collections/Set<kotlinx.datetime/DayOfWeek> // io.github.kevincianfarini.cardiologist/PulseSchedule.onDaysOfWeek.<get-onDaysOfWeek>|<get-onDaysOfWeek>(){}[0]
+        final fun <get-onDaysOfWeek>(): kotlin.collections/List<kotlinx.datetime/DayOfWeek> // io.github.kevincianfarini.cardiologist/PulseSchedule.onDaysOfWeek.<get-onDaysOfWeek>|<get-onDaysOfWeek>(){}[0]
 
     final fun equals(kotlin/Any?): kotlin/Boolean // io.github.kevincianfarini.cardiologist/PulseSchedule.equals|equals(kotlin.Any?){}[0]
     final fun hashCode(): kotlin/Int // io.github.kevincianfarini.cardiologist/PulseSchedule.hashCode|hashCode(){}[0]

src/commonMain/kotlin/io/github/kevincianfarini/cardiologist/PulseSchedule.kt

@@ -8,21 +8,41 @@ import kotlinx.datetime.number
 
 /**
  * A [Pulse] schedule that can be used with [schedulePulse] to define complex schedules.
- *
- * @constructor Creates a new PulseSchedule. Second values must be in range 0..59, minute values must be in range 0..59,
- *              hour values must be in range 0..23, and day of month values must be in range 1..31. This constructor also
- *              requires that seconds, minutes, hours, days of month, and months cannot be empty sets.
- * @throws IllegalArgumentException if the constructor is called with any of our bounds value or an improperly empty set.
  */
 @Poko
-public class PulseSchedule(
-    public val atSeconds: Set<Int>,
-    public val atMinutes: Set<Int>,
-    public val atHours: Set<Int>,
-    public val onDaysOfMonth: Set<Int>,
-    public val inMonths: Set<Month>,
-    public val onDaysOfWeek: Set<DayOfWeek>,
+public class PulseSchedule internal constructor(
+    public val atSeconds: List<Int>,
+    public val atMinutes: List<Int>,
+    public val atHours: List<Int>,
+    public val onDaysOfMonth: List<Int>,
+    public val inMonths: List<Month>,
+    public val onDaysOfWeek: List<DayOfWeek>,
 ) {
+
+    /**
+     * Creates a new PulseSchedule. Second values must be in range 0..59, minute values must be in range 0..59,
+     * hour values must be in range 0..23, and day of month values must be in range 1..31. This constructor also
+     * requires that seconds, minutes, hours, days of month, and months cannot be empty sets.
+     *
+     * @throws IllegalArgumentException if the constructor is called with any of our bounds value or an improperly empty
+     *                                  set.
+     */
+    public constructor(
+        atSeconds: Set<Int>,
+        atMinutes: Set<Int>,
+        atHours: Set<Int>,
+        onDaysOfMonth: Set<Int>,
+        inMonths: Set<Month>,
+        onDaysOfWeek: Set<DayOfWeek>,
+    ) : this(
+        atSeconds = atSeconds.sorted(),
+        atMinutes = atMinutes.sorted(),
+        atHours = atHours.sorted(),
+        onDaysOfMonth = onDaysOfMonth.sorted(),
+        inMonths = inMonths.sorted(),
+        onDaysOfWeek = onDaysOfWeek.sorted()
+    )
+
     init {
         require(!atSeconds.any { it !in 0..59 }) { "Seconds has an out of bound value: $atSeconds" }
         require(atSeconds.isNotEmpty()) { "Seconds cannot be empty!" }

src/commonMain/kotlin/io/github/kevincianfarini/cardiologist/impl/LocalDateTime.kt

@@ -18,20 +18,20 @@ internal fun LocalDateTime.nextMatch(schedule: PulseSchedule): LocalDateTime {
     val time = if (matches(schedule)) copy(nanosecond = 1) else this
     return with(schedule) {
         time.nextMonth(inMonths)
-            .nextDay(onDaysOfMonth, onDaysOfWeek,inMonths)
+            .nextDay(onDaysOfMonth, onDaysOfWeek, inMonths)
             .nextHour(atHours, onDaysOfMonth, onDaysOfWeek, inMonths)
             .nextMinute(atMinutes, atHours, onDaysOfMonth, onDaysOfWeek, inMonths)
             .nextSecond(atSeconds, atMinutes, atHours, onDaysOfMonth, onDaysOfWeek, inMonths)
     }
 }
 
 private fun LocalDateTime.nextMonth(
-    inMonths: Set<Month>,
+    inMonths: List<Month>,
     increment: Boolean = false,
 ): LocalDateTime {
     val incrementedMonth = if (increment) month.inc() else month
-    val minMonth = inMonths.minOrNull()!!
-    val maxMonth = inMonths.maxOrNull()!!
+    val minMonth = inMonths.first()
+    val maxMonth = inMonths.last()
     return when {
         incrementedMonth < month -> copy(year = year + 1, month = incrementedMonth.number)
         incrementedMonth in inMonths -> copy(month = incrementedMonth.number)
@@ -53,7 +53,7 @@ private fun LocalDateTime.nextMonth(
             nanosecond = 0
         )
         else -> copy(
-            month = inMonths.sorted().first { it > incrementedMonth }.number,
+            month = inMonths.first { it > incrementedMonth }.number,
             day = 1,
             hour = 0,
             minute = 0,
@@ -64,9 +64,9 @@ private fun LocalDateTime.nextMonth(
 }
 
 private fun LocalDateTime.nextDay(
-    onDaysOfMonth: Set<Int>,
-    onDaysOfWeek: Set<DayOfWeek>,
-    inMonths: Set<Month>,
+    onDaysOfMonth: List<Int>,
+    onDaysOfWeek: List<DayOfWeek>,
+    inMonths: List<Month>,
     increment: Boolean = false,
 ): LocalDateTime = when {
     onDaysOfMonth != WILDCARD_DAYS_OF_MONTH && onDaysOfWeek.isNotEmpty() -> {
@@ -83,12 +83,12 @@ private fun LocalDateTime.nextDay(
 }
 
 private fun LocalDateTime.nextDayOfMonth(
-    onDaysOfMonth: Set<Int>,
-    inMonths: Set<Month>,
+    onDaysOfMonth: List<Int>,
+    inMonths: List<Month>,
     increment: Boolean = false,
 ): LocalDateTime {
-    val minDayOfMonth = onDaysOfMonth.minOrNull()!!
-    val maxDayOfMonth = onDaysOfMonth.maxOrNull()!!
+    val minDayOfMonth = onDaysOfMonth.first()
+    val maxDayOfMonth = onDaysOfMonth.last()
     val incrementedDay = when {
         increment && day + 1 <= month.numberOfDays(year) -> day + 1
         increment -> 1
@@ -108,7 +108,7 @@ private fun LocalDateTime.nextDayOfMonth(
             nextMonth(inMonths, increment = true).nextDayOfMonth(onDaysOfMonth, inMonths)
         }
         else -> copy(
-            day = onDaysOfMonth.sorted().first { it > incrementedDay },
+            day = onDaysOfMonth.first { it > incrementedDay },
             hour = 0,
             minute = 0,
             second = 0,
@@ -118,8 +118,8 @@ private fun LocalDateTime.nextDayOfMonth(
 }
 
 private fun LocalDateTime.nextDayOfWeek(
-    onDaysOfWeek: Set<DayOfWeek>,
-    inMonths: Set<Month>,
+    onDaysOfWeek: List<DayOfWeek>,
+    inMonths: List<Month>,
     increment: Boolean = false,
 ): LocalDateTime {
     return when {
@@ -153,14 +153,14 @@ private fun LocalDateTime.nextDayOfWeek(
 }
 
 private fun LocalDateTime.nextHour(
-    atHours: Set<Int>,
-    onDaysOfMonth: Set<Int>,
-    onDaysOfWeek: Set<DayOfWeek>,
-    inMonths: Set<Month>,
+    atHours: List<Int>,
+    onDaysOfMonth: List<Int>,
+    onDaysOfWeek: List<DayOfWeek>,
+    inMonths: List<Month>,
     increment: Boolean = false,
 ): LocalDateTime {
-    val minHour = atHours.minOrNull()!!
-    val maxHour = atHours.maxOrNull()!!
+    val minHour = atHours.first()
+    val maxHour = atHours.last()
     val incrementedHour = if (increment) (hour + 1) % 24 else hour
     return when {
         incrementedHour < hour -> nextDay(onDaysOfMonth, onDaysOfWeek, inMonths, increment = true).copy(hour = incrementedHour)
@@ -173,7 +173,7 @@ private fun LocalDateTime.nextHour(
             nanosecond = 0,
         )
         else -> copy(
-            hour = atHours.sorted().first { it > incrementedHour },
+            hour = atHours.first { it > incrementedHour },
             minute = 0,
             second = 0,
             nanosecond = 0,
@@ -182,15 +182,15 @@ private fun LocalDateTime.nextHour(
 }
 
 private fun LocalDateTime.nextMinute(
-    atMinutes: Set<Int>,
-    atHours: Set<Int>,
-    onDaysOfMonth: Set<Int>,
-    onDaysOfWeek: Set<DayOfWeek>,
-    inMonths: Set<Month>,
+    atMinutes: List<Int>,
+    atHours: List<Int>,
+    onDaysOfMonth: List<Int>,
+    onDaysOfWeek: List<DayOfWeek>,
+    inMonths: List<Month>,
     increment: Boolean = false,
 ): LocalDateTime {
-    val minMinute = atMinutes.minOrNull()!!
-    val maxMinute = atMinutes.maxOrNull()!!
+    val minMinute = atMinutes.first()
+    val maxMinute = atMinutes.last()
     val incrementedMinute = if (increment) (minute + 1) % 60 else minute
     return when {
         incrementedMinute < minute -> nextHour(atHours, onDaysOfMonth, onDaysOfWeek, inMonths, increment = true).copy(
@@ -204,23 +204,23 @@ private fun LocalDateTime.nextMinute(
             nanosecond = 0,
         )
         else -> copy(
-            minute = atMinutes.sorted().first { it > incrementedMinute },
+            minute = atMinutes.first { it > incrementedMinute },
             second = 0,
             nanosecond = 0,
         )
     }
 }
 
 private fun LocalDateTime.nextSecond(
-    atSeconds: Set<Int>,
-    atMinutes: Set<Int>,
-    atHours: Set<Int>,
-    onDaysOfMonth: Set<Int>,
-    onDaysOfWeek: Set<DayOfWeek>,
-    inMonths: Set<Month>,
+    atSeconds: List<Int>,
+    atMinutes: List<Int>,
+    atHours: List<Int>,
+    onDaysOfMonth: List<Int>,
+    onDaysOfWeek: List<DayOfWeek>,
+    inMonths: List<Month>,
 ): LocalDateTime {
-    val minSecond = atSeconds.minOrNull()!!
-    val maxSeconds = atSeconds.maxOrNull()!!
+    val minSecond = atSeconds.first()
+    val maxSeconds = atSeconds.last()
     val incrementedSecond = if (nanosecond > 0) (second + 1) % 60 else second
     return when {
         incrementedSecond < second -> nextMinute(atMinutes, atHours, onDaysOfMonth, onDaysOfWeek, inMonths, increment = true).copy(
@@ -236,7 +236,7 @@ private fun LocalDateTime.nextSecond(
             inMonths,
             increment = true,
         ).copy(second = minSecond)
-        else -> copy(second = atSeconds.sorted().first { it > incrementedSecond })
+        else -> copy(second = atSeconds.first { it > incrementedSecond })
     }.copy(nanosecond = 0)
 }
 
@@ -299,11 +299,11 @@ private fun DayOfWeek.daysUntil(other: DayOfWeek): Int = when {
     else -> 7 - (ordinal - other.ordinal)
 }
 
-private fun DayOfWeek.incrementUntilMatch(matches: Set<DayOfWeek>): DayOfWeek {
+private fun DayOfWeek.incrementUntilMatch(matches: List<DayOfWeek>): DayOfWeek {
     var day = this
     while (day !in matches) { day++ }
     return day
 }
 
 private val DISTANT_LOCAL_FUTURE = LocalDateTime(100_000, 1, 1, 0, 0)
-private val WILDCARD_DAYS_OF_MONTH: Set<Int> = (1..31).toSet()
+private val WILDCARD_DAYS_OF_MONTH: List<Int> = (1..31).toList()