change experimental Kotlin DurationUnit to Java TimeUnit

Author: hsenasilva

kotlin/src/main/kotlin/org/axonframework/extensions/kotlin/QueryGatewayExtensions.kt

@@ -19,9 +19,8 @@ import org.axonframework.messaging.responsetypes.ResponseTypes
 import org.axonframework.queryhandling.QueryGateway
 import java.util.*
 import java.util.concurrent.CompletableFuture
+import java.util.concurrent.TimeUnit
 import java.util.stream.Stream
-import kotlin.time.DurationUnit
-import kotlin.time.ExperimentalTime
 
 /**
  * Reified version of [QueryGateway.query]
@@ -115,18 +114,17 @@ inline fun <reified R, reified Q> QueryGateway.queryForOptional(queryName: Strin
  * which expects an Stream object as a response using [org.axonframework.messaging.responsetypes.InstanceResponseType]
  * @param query Query to send
  * @param timeout a timeout for the query
- * @param durationUnit the selected DurationUnit for the given timeout
+ * @param timeUnit the selected TimeUnit for the given timeout
  * @param [Q] the type of payload of the query
  * @param [R] the response class contained in the given responseType
  * @return [Stream] a stream of results
  * @see QueryGateway.scatterGather
  * @see ResponseTypes
  * @since 0.2.0
  */
-@ExperimentalTime
 inline fun <reified R, reified Q> QueryGateway.scatterGatherForSingle(query: Q, timeout: Long,
-                                                                      durationUnit: DurationUnit): Stream<R> {
-    return this.scatterGather(query, ResponseTypes.instanceOf(R::class.java), timeout, durationUnit)
+                                                                      timeUnit: TimeUnit): Stream<R> {
+    return this.scatterGather(query, ResponseTypes.instanceOf(R::class.java), timeout, timeUnit)
 }
 
 /**
@@ -135,37 +133,35 @@ inline fun <reified R, reified Q> QueryGateway.scatterGatherForSingle(query: Q,
  * @param query Query to send
  * @param queryName Name of the query
  * @param timeout a timeout for the query
- * @param durationUnit the selected DurationUnit for the given timeout
+ * @param timeUnit the selected TimeUnit for the given timeout
  * @param [Q] the type of payload of the query
  * @param [R] the response class contained in the given responseType
  * @return [Stream] a stream of results
  * @see QueryGateway.scatterGather
  * @see ResponseTypes
  * @since 0.2.0
  */
-@ExperimentalTime
 inline fun <reified R, reified Q> QueryGateway.scatterGatherForSingle(queryName: String, query: Q, timeout: Long,
-                                                                      durationUnit: DurationUnit): Stream<R> {
-    return this.scatterGather(queryName, query, ResponseTypes.instanceOf(R::class.java), timeout, durationUnit)
+                                                                      timeUnit: TimeUnit): Stream<R> {
+    return this.scatterGather(queryName, query, ResponseTypes.instanceOf(R::class.java), timeout, timeUnit)
 }
 
 /**
  * Reified version of [QueryGateway.scatterGather]
  * which expects a collection as a response using [org.axonframework.messaging.responsetypes.MultipleInstancesResponseType]
  * @param query Query to send
  * @param timeout a timeout for the query
- * @param durationUnit the selected DurationUnit for the given timeout
+ * @param timeUnit the selected TimeUnit for the given timeout
  * @param [Q] the type of payload of the query
  * @param [R] the response class contained in the given responseType
  * @return [Stream] a stream of results
  * @see QueryGateway.scatterGather
  * @see ResponseTypes
  * @since 0.2.0
  */
-@ExperimentalTime
 inline fun <reified R, reified Q> QueryGateway.scatterGatherForMultiple(query: Q, timeout: Long,
-                                                                        durationUnit: DurationUnit): Stream<List<R>> {
-    return this.scatterGather(query, ResponseTypes.multipleInstancesOf(R::class.java), timeout, durationUnit)
+                                                                        timeUnit: TimeUnit): Stream<List<R>> {
+    return this.scatterGather(query, ResponseTypes.multipleInstancesOf(R::class.java), timeout, timeUnit)
 }
 
 /**
@@ -174,37 +170,35 @@ inline fun <reified R, reified Q> QueryGateway.scatterGatherForMultiple(query: Q
  * @param query Query to send
  * @param queryName Name of the query
  * @param timeout a timeout for the query
- * @param durationUnit the selected DurationUnit for the given timeout
+ * @param timeUnit the selected TimeUnit for the given timeout
  * @param [Q] the type of payload of the query
  * @param [R] the response class contained in the given responseType
  * @return [Stream] a stream of results
  * @see QueryGateway.scatterGather
  * @see ResponseTypes
  * @since 0.2.0
  */
-@ExperimentalTime
 inline fun <reified R, reified Q> QueryGateway.scatterGatherForMultiple(queryName: String, query: Q, timeout: Long,
-                                                                        durationUnit: DurationUnit): Stream<List<R>> {
-    return this.scatterGather(queryName, query, ResponseTypes.multipleInstancesOf(R::class.java), timeout, durationUnit)
+                                                                        timeUnit: TimeUnit): Stream<List<R>> {
+    return this.scatterGather(queryName, query, ResponseTypes.multipleInstancesOf(R::class.java), timeout, timeUnit)
 }
 
 /**
  * Reified version of [QueryGateway.scatterGather]
  * which expects a collection as a response using [org.axonframework.messaging.responsetypes.OptionalResponseType]
  * @param query Query to send
  * @param timeout a timeout for the query
- * @param durationUnit the selected DurationUnit for the given timeout
+ * @param timeUnit the selected TimeUnit for the given timeout
  * @param [Q] the type of payload of the query
  * @param [R] the response class contained in the given responseType
  * @return [Stream] a stream of results
  * @see QueryGateway.scatterGather
  * @see ResponseTypes
  * @since 0.2.0
  */
-@ExperimentalTime
 inline fun <reified R, reified Q> QueryGateway.scatterGatherForOptional(query: Q, timeout: Long,
-                                                                        durationUnit: DurationUnit): Stream<Optional<R>> {
-    return this.scatterGather(query, ResponseTypes.optionalInstanceOf(R::class.java), timeout, durationUnit)
+                                                                        timeUnit: TimeUnit): Stream<Optional<R>> {
+    return this.scatterGather(query, ResponseTypes.optionalInstanceOf(R::class.java), timeout, timeUnit)
 }
 
 /**
@@ -213,16 +207,15 @@ inline fun <reified R, reified Q> QueryGateway.scatterGatherForOptional(query: Q
  * @param query Query to send
  * @param queryName Name of the query
  * @param timeout a timeout for the query
- * @param durationUnit the selected DurationUnit for the given timeout
+ * @param timeUnit the selected TimeUnit for the given timeout
  * @param [Q] the type of payload of the query
  * @param [R] the response class contained in the given responseType
  * @return [Stream] a stream of results
  * @see QueryGateway.scatterGather
  * @see ResponseTypes
  * @since 0.2.0
  */
-@ExperimentalTime
 inline fun <reified R, reified Q> QueryGateway.scatterGatherForOptional(queryName: String, query: Q, timeout: Long,
-                                                                        durationUnit: DurationUnit): Stream<Optional<R>> {
-    return this.scatterGather(queryName, query, ResponseTypes.optionalInstanceOf(R::class.java), timeout, durationUnit)
+                                                                        timeUnit: TimeUnit): Stream<Optional<R>> {
+    return this.scatterGather(queryName, query, ResponseTypes.optionalInstanceOf(R::class.java), timeout, timeUnit)
 }

kotlin/src/test/kotlin/org/axonframework/extensions/kotlin/QueryGatewayExtensionsTest.kt

@@ -27,8 +27,6 @@ import java.util.concurrent.CompletableFuture
 import java.util.concurrent.TimeUnit
 import java.util.stream.Stream
 import kotlin.test.*
-import kotlin.time.DurationUnit
-import kotlin.time.ExperimentalTime
 
 /**
  * Tests Query Gateway extensions.
@@ -45,13 +43,11 @@ class QueryGatewayExtensionsTest {
     private val listReturnValue: CompletableFuture<List<String>> = CompletableFuture.completedFuture(listOf("Value", "Second value"))
     private val subjectGateway = mockk<QueryGateway>()
     private val timeout: Long = 1000
-    @ExperimentalTime
-    private val durationUnit = DurationUnit.valueOf(TimeUnit.SECONDS.name)
+    private val timeUnit = TimeUnit.SECONDS
     private val streamInstanceReturnValue = Stream.of("Value")
     private val streamMultipleReturnValue = Stream.of(listOf("Value", "Second Value"))
     private val streamOptionalReturnValue = Stream.of(Optional.of("Value"))
 
-    @ExperimentalTime
     @BeforeTest
     fun before() {
         every { subjectGateway.query(exampleQuery, matchInstanceResponseType<String>()) } returns instanceReturnValue
@@ -60,12 +56,12 @@ class QueryGatewayExtensionsTest {
         every { subjectGateway.query(queryName, exampleQuery, matchInstanceResponseType<String>()) } returns instanceReturnValue
         every { subjectGateway.query(queryName, exampleQuery, matchOptionalResponseType<String>()) } returns optionalReturnValue
         every { subjectGateway.query(queryName, exampleQuery, matchMultipleInstancesResponseType<String>()) } returns listReturnValue
-        every { subjectGateway.scatterGather(exampleQuery, matchInstanceResponseType<String>(), timeout, durationUnit) } returns streamInstanceReturnValue
-        every { subjectGateway.scatterGather(exampleQuery, matchMultipleInstancesResponseType<String>(), timeout, durationUnit) } returns streamMultipleReturnValue
-        every { subjectGateway.scatterGather(exampleQuery, matchOptionalResponseType<String>(), timeout, durationUnit) } returns streamOptionalReturnValue
-        every { subjectGateway.scatterGather(queryName, exampleQuery, matchInstanceResponseType<String>(), timeout, durationUnit) } returns streamInstanceReturnValue
-        every { subjectGateway.scatterGather(queryName, exampleQuery, matchMultipleInstancesResponseType<String>(), timeout, durationUnit) } returns streamMultipleReturnValue
-        every { subjectGateway.scatterGather(queryName, exampleQuery, matchOptionalResponseType<String>(), timeout, durationUnit) } returns streamOptionalReturnValue
+        every { subjectGateway.scatterGather(exampleQuery, matchInstanceResponseType<String>(), timeout, timeUnit) } returns streamInstanceReturnValue
+        every { subjectGateway.scatterGather(exampleQuery, matchMultipleInstancesResponseType<String>(), timeout, timeUnit) } returns streamMultipleReturnValue
+        every { subjectGateway.scatterGather(exampleQuery, matchOptionalResponseType<String>(), timeout, timeUnit) } returns streamOptionalReturnValue
+        every { subjectGateway.scatterGather(queryName, exampleQuery, matchInstanceResponseType<String>(), timeout, timeUnit) } returns streamInstanceReturnValue
+        every { subjectGateway.scatterGather(queryName, exampleQuery, matchMultipleInstancesResponseType<String>(), timeout, timeUnit) } returns streamMultipleReturnValue
+        every { subjectGateway.scatterGather(queryName, exampleQuery, matchOptionalResponseType<String>(), timeout, timeUnit) } returns streamOptionalReturnValue
     }
 
     @AfterTest
@@ -200,85 +196,79 @@ class QueryGatewayExtensionsTest {
         verify(exactly = 1) { nullableQueryGateway.query(queryName, exampleQuery, matchExpectedResponseType(String::class.java)) }
     }
 
-        @ExperimentalTime
         @Test
         fun `ScatterGather for Single should invoke scatterGather method with correct generic parameters`() {
             val result = subjectGateway.scatterGatherForSingle<String, ExampleQuery>(
                     query = exampleQuery,
                     timeout = timeout,
-                    durationUnit = durationUnit
+                    timeUnit = timeUnit
             )
 
             assertSame(result, streamInstanceReturnValue)
-            verify(exactly = 1) { subjectGateway.scatterGather(exampleQuery, matchExpectedResponseType(String::class.java), timeout, durationUnit) }
+            verify(exactly = 1) { subjectGateway.scatterGather(exampleQuery, matchExpectedResponseType(String::class.java), timeout, timeUnit) }
         }
 
-        @ExperimentalTime
         @Test
         fun `ScatterGather for Multiple should invoke scatterGather method with correct generic parameters`() {
             val result = subjectGateway.scatterGatherForMultiple<String, ExampleQuery>(
                     query = exampleQuery,
                     timeout = timeout,
-                    durationUnit = durationUnit
+                    timeUnit = timeUnit
             )
 
             assertSame(result, streamMultipleReturnValue)
-            verify(exactly = 1) { subjectGateway.scatterGather(exampleQuery, matchMultipleInstancesResponseType<String>(), timeout, durationUnit) }
+            verify(exactly = 1) { subjectGateway.scatterGather(exampleQuery, matchMultipleInstancesResponseType<String>(), timeout, timeUnit) }
         }
 
-    @ExperimentalTime
     @Test
     fun `ScatterGather for Optional should invoke scatterGather method with correct generic parameters`() {
         val result = subjectGateway.scatterGatherForOptional<String, ExampleQuery>(
                 query = exampleQuery,
                 timeout = timeout,
-                durationUnit = durationUnit
+                timeUnit = timeUnit
         )
 
         assertSame(result, streamOptionalReturnValue)
-        verify(exactly = 1) { subjectGateway.scatterGather(exampleQuery, matchOptionalResponseType<String>(), timeout, durationUnit) }
+        verify(exactly = 1) { subjectGateway.scatterGather(exampleQuery, matchOptionalResponseType<String>(), timeout, timeUnit) }
     }
 
-    @ExperimentalTime
     @Test
     fun `ScatterGather for Single should invoke scatterGather method with explicit query name`() {
         val result = subjectGateway.scatterGatherForSingle<String, ExampleQuery>(
                 queryName = queryName,
                 query = exampleQuery,
                 timeout = timeout,
-                durationUnit = durationUnit
+                timeUnit = timeUnit
         )
 
         assertSame(result, streamInstanceReturnValue)
-        verify(exactly = 1) { subjectGateway.scatterGather(queryName, exampleQuery, matchExpectedResponseType(String::class.java), timeout, durationUnit) }
+        verify(exactly = 1) { subjectGateway.scatterGather(queryName, exampleQuery, matchExpectedResponseType(String::class.java), timeout, timeUnit) }
     }
 
-    @ExperimentalTime
     @Test
     fun `ScatterGather for Multiple should invoke scatterGather method with explicit query name`() {
         val result = subjectGateway.scatterGatherForMultiple<String, ExampleQuery>(
                 queryName = queryName,
                 query = exampleQuery,
                 timeout = timeout,
-                durationUnit = durationUnit
+                timeUnit = timeUnit
         )
 
         assertSame(result, streamMultipleReturnValue)
-        verify(exactly = 1) { subjectGateway.scatterGather(queryName, exampleQuery, matchMultipleInstancesResponseType<String>(), timeout, durationUnit) }
+        verify(exactly = 1) { subjectGateway.scatterGather(queryName, exampleQuery, matchMultipleInstancesResponseType<String>(), timeout, timeUnit) }
     }
 
-    @ExperimentalTime
     @Test
     fun `ScatterGather for Optional should invoke scatterGather method with explicit query name`() {
         val result = subjectGateway.scatterGatherForOptional<String, ExampleQuery>(
                 queryName = queryName,
                 query = exampleQuery,
                 timeout = timeout,
-                durationUnit = durationUnit
+                timeUnit = timeUnit
         )
 
         assertSame(result, streamOptionalReturnValue)
-        verify(exactly = 1) { subjectGateway.scatterGather(queryName, exampleQuery, matchOptionalResponseType<String>(), timeout, durationUnit) }
+        verify(exactly = 1) { subjectGateway.scatterGather(queryName, exampleQuery, matchOptionalResponseType<String>(), timeout, timeUnit) }
     }
 
 }