Skip to content
This repository has been archived by the owner on Feb 24, 2021. It is now read-only.

Deprecate arrow.fx.coroutines.Duration #366

Merged
merged 2 commits into from Jan 4, 2021
Merged

Deprecate arrow.fx.coroutines.Duration #366

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
984c802
add deprecation message
i-walker Dec 30, 2020
45c9513
Update arrow-fx-coroutines/src/main/kotlin/arrow/fx/coroutines/Durati…
i-walker Dec 30, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
31 changes: 28 additions & 3 deletions arrow-fx-coroutines/src/main/kotlin/arrow/fx/coroutines/Duration.kt
View file
Open in desktop
Expand Up @@ -2,18 +2,24 @@ package arrow.fx.coroutines

import java.util.concurrent.TimeUnit

// TODO replace with kotlin.time
@Deprecated(DeprecateDuration, ReplaceWith("timeUnit.toNanos(amount).nanoseconds", "kotlin.time.nanoseconds"))
data class Duration(val amount: Long, val timeUnit: TimeUnit) {
@Deprecated("Redundant property please use `inNanoseconds` in kotlin.time.Duration")
val nanoseconds: Long by lazy { timeUnit.toNanos(amount) }

@Deprecated("Redundant property please use `inNanoseconds` in kotlin.time.Duration")
val millis: Long by lazy { timeUnit.toMillis(amount) }

companion object {
// Actually limited to 9223372036854775807 days, so unless you are very patient, it is unlimited ;-)
val INFINITE = Duration(amount = Long.MAX_VALUE, timeUnit = TimeUnit.DAYS)
@Deprecated(DeprecateDuration, ReplaceWith("kotlin.time.Duration.INFINITE", "kotlin.time.Duration"))
val INFINITE: Duration = Duration(amount = Long.MAX_VALUE, timeUnit = TimeUnit.DAYS)
}

operator fun times(i: Int) = Duration(amount * i, timeUnit)
@Deprecated(DeprecateDuration)
operator fun times(i: Int): Duration = Duration(amount * i, timeUnit)

@Deprecated(DeprecateDuration)
operator fun plus(d: Duration): Duration = run {
val comp = timeUnit.compareTo(d.timeUnit)
when {
Expand All @@ -23,6 +29,7 @@ data class Duration(val amount: Long, val timeUnit: TimeUnit) {
}
}

@Deprecated(DeprecateDuration)
operator fun compareTo(d: Duration): Int = run {
val comp = timeUnit.compareTo(d.timeUnit)
when {
Expand All @@ -33,46 +40,64 @@ data class Duration(val amount: Long, val timeUnit: TimeUnit) {
}
}

@Deprecated(DeprecateDuration)
operator fun Int.times(d: Duration) = d * this

@Deprecated(DeprecateDuration, ReplaceWith("days", "kotlin.time.days"))
val Long.days: Duration
get() = Duration(this, TimeUnit.DAYS)

@Deprecated(DeprecateDuration, ReplaceWith("days", "kotlin.time.days"))
val Int.days: Duration
get() = Duration(this.toLong(), TimeUnit.DAYS)

@Deprecated(DeprecateDuration, ReplaceWith("hours", "kotlin.time.hours"))
val Long.hours: Duration
get() = Duration(this, TimeUnit.HOURS)

@Deprecated(DeprecateDuration, ReplaceWith("hours", "kotlin.time.hours"))
val Int.hours: Duration
get() = Duration(this.toLong(), TimeUnit.HOURS)

@Deprecated(DeprecateDuration, ReplaceWith("microseconds", "kotlin.time.microseconds"))
val Long.microseconds: Duration
get() = Duration(this, TimeUnit.MICROSECONDS)

@Deprecated(DeprecateDuration, ReplaceWith("microseconds", "kotlin.time.microseconds"))
val Int.microseconds: Duration
get() = Duration(this.toLong(), TimeUnit.MICROSECONDS)

@Deprecated(DeprecateDuration, ReplaceWith("minutes", "kotlin.time.minutes"))
val Long.minutes: Duration
get() = Duration(this, TimeUnit.MINUTES)

@Deprecated(DeprecateDuration, ReplaceWith("minutes", "kotlin.time.minutes"))
val Int.minutes: Duration
get() = Duration(this.toLong(), TimeUnit.MINUTES)

@Deprecated(DeprecateDuration, ReplaceWith("milliseconds", "kotlin.time.milliseconds"))
val Long.milliseconds: Duration
get() = Duration(this, TimeUnit.MILLISECONDS)

@Deprecated(DeprecateDuration, ReplaceWith("milliseconds", "kotlin.time.milliseconds"))
val Int.milliseconds: Duration
get() = Duration(this.toLong(), TimeUnit.MILLISECONDS)

@Deprecated(DeprecateDuration, ReplaceWith("nanoseconds", "kotlin.time.nanoseconds"))
val Long.nanoseconds: Duration
get() = Duration(this, TimeUnit.NANOSECONDS)

@Deprecated(DeprecateDuration, ReplaceWith("nanoseconds", "kotlin.time.nanoseconds"))
val Int.nanoseconds: Duration
get() = Duration(this.toLong(), TimeUnit.NANOSECONDS)

@Deprecated(DeprecateDuration, ReplaceWith("seconds", "kotlin.time.seconds"))
val Long.seconds: Duration
get() = Duration(this, TimeUnit.SECONDS)

@Deprecated(DeprecateDuration, ReplaceWith("seconds", "kotlin.time.seconds"))
val Int.seconds: Duration
get() = Duration(this.toLong(), TimeUnit.SECONDS)

const val DeprecateDuration: String =
"arrow.fx.coroutines.Duration is deprecated and will be removed in 0.13.0 in favor of kotlin.time.Duration"