Avoid deprecated com.twitter.conversions

Problem In phab D249403 these conversions were deprecated. Solution Use the new versions. JIRA Issues: CSL-7356 Differential Revision: https://phabricator.twitter.biz/D254765
twitter · Dec 19, 2018 · c4c33a3 · c4c33a3
1 parent 9998019
commit c4c33a3
Show file tree

Hide file tree

Showing 61 changed files with 63 additions and 63 deletions.
diff --git a/README.md b/README.md
@@ -43,7 +43,7 @@ val collUtils = "com.twitter" %% "util-collection" % "18.12.0"
 ## Time
 
 ```scala
-import com.twitter.conversions.time._
+import com.twitter.conversions.DurationOps._
 
 val duration1 = 1.second
 val duration2 = 2.minutes
@@ -64,7 +64,7 @@ amount.inKilobytes // => 8192L
 A Non-actor re-implementation of Scala Futures.
 
 ```scala
-import com.twitter.conversions.time._
+import com.twitter.conversions.DurationOps._
 import com.twitter.util.{Await, Future, Promise}
 
 val f = new Promise[Int]

diff --git a/doc/src/sphinx/util-cookbook/basics.rst b/doc/src/sphinx/util-cookbook/basics.rst
@@ -85,7 +85,7 @@ Scala:
 
 .. code-block:: scala
 
-    import com.twitter.conversions.time._
+    import com.twitter.conversions.DurationOps._
     import com.twitter.util.{FuturePool, Time}
 
     val time = Time.fromMilliseconds(123456L)
@@ -135,7 +135,7 @@ Scala:
 
 .. code-block:: scala
 
-    import com.twitter.conversions.time._
+    import com.twitter.conversions.DurationOps._
     import com.twitter.util.{Future, MockTimer, Time}
 
     Time.withCurrentTimeFrozen { timeControl =>

diff --git a/util-app/src/main/scala/com/twitter/app/App.scala b/util-app/src/main/scala/com/twitter/app/App.scala
@@ -1,6 +1,6 @@
 package com.twitter.app
 
-import com.twitter.conversions.time._
+import com.twitter.conversions.DurationOps._
 import com.twitter.util._
 import java.lang.reflect.InvocationTargetException
 import java.util.concurrent.ConcurrentLinkedQueue

diff --git a/util-app/src/test/scala/com/twitter/app/AppTest.scala b/util-app/src/test/scala/com/twitter/app/AppTest.scala
@@ -1,7 +1,7 @@
 package com.twitter.app
 
 import com.twitter.app.LoadService.Binding
-import com.twitter.conversions.time._
+import com.twitter.conversions.DurationOps._
 import com.twitter.util._
 import java.util.concurrent.ConcurrentLinkedQueue
 import org.scalatest.FunSuite

diff --git a/util-app/src/test/scala/com/twitter/app/FlagTest.scala b/util-app/src/test/scala/com/twitter/app/FlagTest.scala
@@ -1,7 +1,7 @@
 package com.twitter.app
 
 import com.twitter.app.SolarSystemPlanets._
-import com.twitter.conversions.time._
+import com.twitter.conversions.DurationOps._
 import com.twitter.util.{Await, Awaitable}
 import org.scalatest.FunSuite
 import scala.collection.mutable

diff --git a/util-app/src/test/scala/com/twitter/app/LoadServiceTest.scala b/util-app/src/test/scala/com/twitter/app/LoadServiceTest.scala
@@ -1,7 +1,7 @@
 package com.twitter.app
 
 import com.twitter.app.LoadService.Binding
-import com.twitter.conversions.time._
+import com.twitter.conversions.DurationOps._
 import com.twitter.finagle.util.loadServiceDenied
 import com.twitter.util.registry.{Entry, GlobalRegistry, SimpleRegistry}
 import com.twitter.util.{Await, Future, FuturePool}

diff --git a/util-benchmark/src/main/scala/com/twitter/concurrent/AsyncStreamBenchmark.scala b/util-benchmark/src/main/scala/com/twitter/concurrent/AsyncStreamBenchmark.scala
@@ -1,6 +1,6 @@
 package com.twitter.concurrent
 
-import com.twitter.conversions.time._
+import com.twitter.conversions.DurationOps._
 import com.twitter.util.{Await, Future, StdBenchAnnotations}
 import org.openjdk.jmh.annotations._
 

diff --git a/util-benchmark/src/main/scala/com/twitter/util/TimerBenchmark.scala b/util-benchmark/src/main/scala/com/twitter/util/TimerBenchmark.scala
@@ -1,6 +1,6 @@
 package com.twitter.util
 
-import com.twitter.conversions.time._
+import com.twitter.conversions.DurationOps._
 import java.util.concurrent.TimeUnit
 import org.openjdk.jmh.annotations._
 

diff --git a/util-cache/src/main/scala/com/twitter/cache/Refresh.scala b/util-cache/src/main/scala/com/twitter/cache/Refresh.scala
@@ -17,7 +17,7 @@ import java.util.concurrent.atomic.AtomicReference
  *   def getData(): Future[T] = { ... }
  *
  * can be memoized with a TTL of 1 hour as follows:
- *   import com.twitter.conversions.time._
+ *   import com.twitter.conversions.DurationOps._
  *   import com.twitter.cache.Refresh
  *   val getData: () => Future[T] = Refresh.every(1.hour) { ... }
  */

diff --git a/util-cache/src/test/scala/com/twitter/cache/AbstractLoadingFutureCacheTest.scala b/util-cache/src/test/scala/com/twitter/cache/AbstractLoadingFutureCacheTest.scala
@@ -1,6 +1,6 @@
 package com.twitter.cache
 
-import com.twitter.conversions.time._
+import com.twitter.conversions.DurationOps._
 import com.twitter.util.{Await, Future}
 import org.scalatest.FunSuite
 

diff --git a/util-cache/src/test/scala/com/twitter/cache/RefreshTest.scala b/util-cache/src/test/scala/com/twitter/cache/RefreshTest.scala
@@ -1,6 +1,6 @@
 package com.twitter.cache
 
-import com.twitter.conversions.time._
+import com.twitter.conversions.DurationOps._
 import com.twitter.util.{Await, Future, Promise, Time}
 import org.mockito.Mockito._
 import org.scalatest._

diff --git a/util-collection/src/test/scala/com/twitter/collection/GenerationalQueueTest.scala b/util-collection/src/test/scala/com/twitter/collection/GenerationalQueueTest.scala
@@ -4,7 +4,7 @@ import org.junit.runner.RunWith
 import org.scalatest.FunSuite
 import org.scalatest.junit.JUnitRunner
 
-import com.twitter.conversions.time._
+import com.twitter.conversions.DurationOps._
 import com.twitter.util.{Duration, Time}
 
 @RunWith(classOf[JUnitRunner])

diff --git a/util-core/src/main/scala/com/twitter/util/Duration.scala b/util-core/src/main/scala/com/twitter/util/Duration.scala
@@ -289,7 +289,7 @@ private[util] object DurationBox {
  * using the time conversions:
  *
  * {{{
- * import com.twitter.conversions.time._
+ * import com.twitter.conversions.DurationOps._
  *
  * 3.days+4.nanoseconds
  * }}}

diff --git a/util-core/src/test/scala/com/twitter/concurrent/AsyncMeterTest.scala b/util-core/src/test/scala/com/twitter/concurrent/AsyncMeterTest.scala
@@ -1,7 +1,7 @@
 package com.twitter.concurrent
 
 import com.twitter.util._
-import com.twitter.conversions.time._
+import com.twitter.conversions.DurationOps._
 import java.util.concurrent.{RejectedExecutionException, CancellationException}
 import org.junit.runner.RunWith
 import org.scalatest.FunSuite

diff --git a/util-core/src/test/scala/com/twitter/concurrent/AsyncSemaphoreTest.scala b/util-core/src/test/scala/com/twitter/concurrent/AsyncSemaphoreTest.scala
@@ -1,6 +1,6 @@
 package com.twitter.concurrent
 
-import com.twitter.conversions.time._
+import com.twitter.conversions.DurationOps._
 import com.twitter.util._
 import java.util.concurrent.{ConcurrentLinkedQueue, RejectedExecutionException}
 import org.junit.runner.RunWith

diff --git a/util-core/src/test/scala/com/twitter/concurrent/AsyncStreamTest.scala b/util-core/src/test/scala/com/twitter/concurrent/AsyncStreamTest.scala
@@ -1,6 +1,6 @@
 package com.twitter.concurrent
 
-import com.twitter.conversions.time._
+import com.twitter.conversions.DurationOps._
 import com.twitter.util._
 import org.junit.runner.RunWith
 import org.scalacheck.{Arbitrary, Gen}

diff --git a/util-core/src/test/scala/com/twitter/concurrent/OfferTest.scala b/util-core/src/test/scala/com/twitter/concurrent/OfferTest.scala
@@ -8,7 +8,7 @@ import org.scalatest.WordSpec
 import org.scalatest.junit.JUnitRunner
 import org.scalatest.mockito.MockitoSugar
 
-import com.twitter.conversions.time._
+import com.twitter.conversions.DurationOps._
 import com.twitter.util.{Await, Future, MockTimer, Promise, Return, Time}
 
 class SimpleOffer[T](var futures: Stream[Future[Tx[T]]]) extends Offer[T] {

diff --git a/util-core/src/test/scala/com/twitter/concurrent/OnceTest.scala b/util-core/src/test/scala/com/twitter/concurrent/OnceTest.scala
@@ -1,6 +1,6 @@
 package com.twitter.concurrent
 
-import com.twitter.conversions.time._
+import com.twitter.conversions.DurationOps._
 import com.twitter.util.{Promise, Await}
 import org.junit.runner.RunWith
 import org.scalatest.FunSuite

diff --git a/util-core/src/test/scala/com/twitter/concurrent/PeriodTest.scala b/util-core/src/test/scala/com/twitter/concurrent/PeriodTest.scala
@@ -1,6 +1,6 @@
 package com.twitter.concurrent
 
-import com.twitter.conversions.time._
+import com.twitter.conversions.DurationOps._
 import org.junit.runner.RunWith
 import org.scalatest.FunSuite
 import org.scalatest.junit.JUnitRunner

diff --git a/util-core/src/test/scala/com/twitter/concurrent/SchedulerTest.scala b/util-core/src/test/scala/com/twitter/concurrent/SchedulerTest.scala
@@ -1,6 +1,6 @@
 package com.twitter.concurrent
 
-import com.twitter.conversions.time._
+import com.twitter.conversions.DurationOps._
 import com.twitter.util._
 import java.util.concurrent.{Executors, TimeUnit}
 import java.util.logging.{Handler, Level, LogRecord}

diff --git a/util-core/src/test/scala/com/twitter/concurrent/SpoolTest.scala b/util-core/src/test/scala/com/twitter/concurrent/SpoolTest.scala
@@ -1,7 +1,7 @@
 package com.twitter.concurrent
 
 import com.twitter.concurrent.Spool.{*::, seqToSpool}
-import com.twitter.conversions.time.intToTimeableNumber
+import com.twitter.conversions.DurationOps._
 import com.twitter.util.{Await, Future, Promise, Return, Throw}
 import java.io.EOFException
 import org.junit.runner.RunWith

diff --git a/util-core/src/test/scala/com/twitter/io/BufReaderTest.scala b/util-core/src/test/scala/com/twitter/io/BufReaderTest.scala
@@ -1,6 +1,6 @@
 package com.twitter.io
 
-import com.twitter.conversions.time._
+import com.twitter.conversions.DurationOps._
 import com.twitter.util.{Await, Future}
 import org.junit.runner.RunWith
 import org.scalatest.FunSuite

diff --git a/util-core/src/test/scala/com/twitter/io/InputStreamReaderTest.scala b/util-core/src/test/scala/com/twitter/io/InputStreamReaderTest.scala
@@ -1,6 +1,6 @@
 package com.twitter.io
 
-import com.twitter.conversions.time._
+import com.twitter.conversions.DurationOps._
 import com.twitter.util.{Await, FuturePool}
 import java.io.ByteArrayInputStream
 import org.junit.runner.RunWith

diff --git a/util-core/src/test/scala/com/twitter/io/PipeTest.scala b/util-core/src/test/scala/com/twitter/io/PipeTest.scala
@@ -1,6 +1,6 @@
 package com.twitter.io
 
-import com.twitter.conversions.time._
+import com.twitter.conversions.DurationOps._
 import com.twitter.io.ReaderDiscardedException
 import com.twitter.util.{Await, Future, Return}
 import org.scalatest.{FunSuite, Matchers}

diff --git a/util-core/src/test/scala/com/twitter/io/ReaderSemanticsTest.scala b/util-core/src/test/scala/com/twitter/io/ReaderSemanticsTest.scala
@@ -2,7 +2,7 @@ package com.twitter.io
 
 import com.twitter.concurrent.AsyncStream
 import com.twitter.conversions.StorageUnitOps._
-import com.twitter.conversions.time._
+import com.twitter.conversions.DurationOps._
 import com.twitter.util.{Future, Return, Await, Throw}
 import java.io.ByteArrayInputStream
 import org.scalatest.FunSuite

diff --git a/util-core/src/test/scala/com/twitter/io/ReaderTest.scala b/util-core/src/test/scala/com/twitter/io/ReaderTest.scala
@@ -1,7 +1,7 @@
 package com.twitter.io
 
 import com.twitter.concurrent.AsyncStream
-import com.twitter.conversions.time._
+import com.twitter.conversions.DurationOps._
 import com.twitter.conversions.StorageUnitOps._
 import com.twitter.util.{Await, Awaitable, Future, Promise}
 import java.io.{ByteArrayInputStream, ByteArrayOutputStream}

diff --git a/util-core/src/test/scala/com/twitter/io/WriterTest.scala b/util-core/src/test/scala/com/twitter/io/WriterTest.scala
@@ -1,6 +1,6 @@
 package com.twitter.io
 
-import com.twitter.conversions.time._
+import com.twitter.conversions.DurationOps._
 import com.twitter.util.{Await, Future, Promise}
 import java.io.{ByteArrayOutputStream, OutputStream}
 import org.scalatest.{FunSuite, Matchers}

diff --git a/util-core/src/test/scala/com/twitter/io/exp/ActivitySourceTest.scala b/util-core/src/test/scala/com/twitter/io/exp/ActivitySourceTest.scala
@@ -62,7 +62,7 @@ class ActivitySourceTest extends FunSuite with BeforeAndAfter {
 
   test("FilePollingActivitySource") {
     Time.withCurrentTimeFrozen { timeControl =>
-      import com.twitter.conversions.time._
+      import com.twitter.conversions.DurationOps._
       implicit val timer = new MockTimer
       val file = new FilePollingActivitySource(1.microsecond, FuturePool.immediatePool)
       val buf = file.get(tempFile)

diff --git a/util-core/src/test/scala/com/twitter/util/ClosableOnceTest.scala b/util-core/src/test/scala/com/twitter/util/ClosableOnceTest.scala
@@ -1,6 +1,6 @@
 package com.twitter.util
 
-import com.twitter.conversions.time._
+import com.twitter.conversions.DurationOps._
 import org.scalatest.FunSuite
 
 class ClosableOnceTest extends FunSuite {

diff --git a/util-core/src/test/scala/com/twitter/util/ClosableTest.scala b/util-core/src/test/scala/com/twitter/util/ClosableTest.scala
@@ -1,6 +1,6 @@
 package com.twitter.util
 
-import com.twitter.conversions.time.intToTimeableNumber
+import com.twitter.conversions.DurationOps._
 import org.junit.runner.RunWith
 import org.scalatest.FunSuite
 import org.scalatest.concurrent.{Eventually, IntegrationPatience}

diff --git a/util-core/src/test/scala/com/twitter/util/CloseAwaitablyTest.scala b/util-core/src/test/scala/com/twitter/util/CloseAwaitablyTest.scala
@@ -1,6 +1,6 @@
 package com.twitter.util
 
-import com.twitter.conversions.time._
+import com.twitter.conversions.DurationOps._
 import org.junit.runner.RunWith
 import org.scalatest.FunSuite
 import org.scalatest.junit.JUnitRunner

diff --git a/util-core/src/test/scala/com/twitter/util/DurationTest.scala b/util-core/src/test/scala/com/twitter/util/DurationTest.scala
@@ -16,7 +16,7 @@
 
 package com.twitter.util
 
-import com.twitter.conversions.time._
+import com.twitter.conversions.DurationOps._
 import java.util.concurrent.TimeUnit
 import org.junit.runner.RunWith
 import org.scalatest.junit.JUnitRunner

diff --git a/util-core/src/test/scala/com/twitter/util/FuturePoolTest.scala b/util-core/src/test/scala/com/twitter/util/FuturePoolTest.scala
@@ -1,6 +1,6 @@
 package com.twitter.util
 
-import com.twitter.conversions.time._
+import com.twitter.conversions.DurationOps._
 import java.util.concurrent.{Future => JFuture, _}
 import org.junit.runner.RunWith
 import org.scalatest.FunSuite

diff --git a/util-core/src/test/scala/com/twitter/util/FutureTest.scala b/util-core/src/test/scala/com/twitter/util/FutureTest.scala
@@ -1,6 +1,6 @@
 package com.twitter.util
 
-import com.twitter.conversions.time._
+import com.twitter.conversions.DurationOps._
 import java.util.concurrent.ConcurrentLinkedQueue
 import java.util.concurrent.atomic.AtomicInteger
 import org.mockito.Matchers.any

diff --git a/util-core/src/test/scala/com/twitter/util/MemoizeTest.scala b/util-core/src/test/scala/com/twitter/util/MemoizeTest.scala
@@ -1,6 +1,6 @@
 package com.twitter.util
 
-import com.twitter.conversions.time._
+import com.twitter.conversions.DurationOps._
 import java.util.concurrent.atomic.AtomicInteger
 import java.util.concurrent.{TimeUnit, CountDownLatch => JavaCountDownLatch}
 import org.junit.runner.RunWith

diff --git a/util-core/src/test/scala/com/twitter/util/PoolTest.scala b/util-core/src/test/scala/com/twitter/util/PoolTest.scala
@@ -6,7 +6,7 @@ import org.junit.runner.RunWith
 import org.scalatest.WordSpec
 import org.scalatest.junit.JUnitRunner
 
-import com.twitter.conversions.time._
+import com.twitter.conversions.DurationOps._
 
 @RunWith(classOf[JUnitRunner])
 class PoolTest extends WordSpec {

diff --git a/util-core/src/test/scala/com/twitter/util/PromiseTest.scala b/util-core/src/test/scala/com/twitter/util/PromiseTest.scala
@@ -1,6 +1,6 @@
 package com.twitter.util
 
-import com.twitter.conversions.time._
+import com.twitter.conversions.DurationOps._
 import org.junit.runner.RunWith
 import org.scalatest.FunSuite
 import org.scalatest.junit.JUnitRunner

diff --git a/util-core/src/test/scala/com/twitter/util/SlowProbeProxyTimerTest.scala b/util-core/src/test/scala/com/twitter/util/SlowProbeProxyTimerTest.scala
@@ -1,6 +1,6 @@
 package com.twitter.util
 
-import com.twitter.conversions.time._
+import com.twitter.conversions.DurationOps._
 import org.scalatest.FunSuite
 import scala.collection.mutable
 

diff --git a/util-core/src/test/scala/com/twitter/util/TimeTest.scala b/util-core/src/test/scala/com/twitter/util/TimeTest.scala
@@ -10,7 +10,7 @@ import org.scalatest.concurrent.{Eventually, IntegrationPatience}
 import org.scalatest.junit.JUnitRunner
 import org.scalatest.prop.GeneratorDrivenPropertyChecks
 
-import com.twitter.conversions.time._
+import com.twitter.conversions.DurationOps._
 
 trait TimeLikeSpec[T <: TimeLike[T]] extends WordSpec with GeneratorDrivenPropertyChecks {
   val ops: TimeLikeOps[T]

diff --git a/util-core/src/test/scala/com/twitter/util/TimerTest.scala b/util-core/src/test/scala/com/twitter/util/TimerTest.scala
@@ -1,6 +1,6 @@
 package com.twitter.util
 
-import com.twitter.conversions.time._
+import com.twitter.conversions.DurationOps._
 import java.util.concurrent.{CancellationException, ExecutorService}
 import java.util.concurrent.atomic.AtomicInteger
 import org.junit.runner.RunWith

diff --git a/util-core/src/test/scala/com/twitter/util/TokenBucketTest.scala b/util-core/src/test/scala/com/twitter/util/TokenBucketTest.scala
@@ -3,7 +3,7 @@ package com.twitter.util
 import org.junit.runner.RunWith
 import org.scalatest.FunSuite
 import org.scalatest.junit.JUnitRunner
-import com.twitter.conversions.time._
+import com.twitter.conversions.DurationOps._
 
 @RunWith(classOf[JUnitRunner])
 class TokenBucketTest extends FunSuite {

diff --git a/util-core/src/test/scala/com/twitter/util/WindowedAdderTest.scala b/util-core/src/test/scala/com/twitter/util/WindowedAdderTest.scala
@@ -1,6 +1,6 @@
 package com.twitter.util
 
-import com.twitter.conversions.time._
+import com.twitter.conversions.DurationOps._
 import org.junit.runner.RunWith
 import org.scalatest.FunSuite
 import org.scalatest.junit.JUnitRunner

diff --git a/util-jvm/src/main/scala/com/twitter/jvm/CpuProfile.scala b/util-jvm/src/main/scala/com/twitter/jvm/CpuProfile.scala
@@ -6,7 +6,7 @@ import java.nio.{ByteBuffer, ByteOrder}
 
 import scala.collection.mutable
 
-import com.twitter.conversions.time._
+import com.twitter.conversions.DurationOps._
 import com.twitter.util.{Duration, Future, Promise, Stopwatch, Time}
 
 /**

diff --git a/util-jvm/src/main/scala/com/twitter/jvm/GcPredictor.scala b/util-jvm/src/main/scala/com/twitter/jvm/GcPredictor.scala
@@ -1,6 +1,6 @@
 package com.twitter.jvm
 
-import com.twitter.conversions.time._
+import com.twitter.conversions.DurationOps._
 import com.twitter.util.{Duration, Time, Timer}
 
 /**

diff --git a/util-jvm/src/main/scala/com/twitter/jvm/Hotspot.scala b/util-jvm/src/main/scala/com/twitter/jvm/Hotspot.scala
@@ -1,7 +1,7 @@
 package com.twitter.jvm
 
 import com.twitter.conversions.StorageUnitOps._
-import com.twitter.conversions.time._
+import com.twitter.conversions.DurationOps._
 import com.twitter.util.Time
 import java.lang.management.ManagementFactory
 import java.util.logging.{Level, Logger}