Skip to content

Commit 88147d3

Browse files
rsobiesrsobies
committed
inline extension functions added
1 parent 3e2a510 commit 88147d3

File tree

2 files changed

+47
-47
lines changed

2 files changed

+47
-47
lines changed

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

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,7 @@ inline fun <reified R, reified Q> QueryGateway.queryOptional(queryName: String,
135135
* @since 0.2.0
136136
*/
137137
inline fun <reified R, reified Q> QueryGateway.scatterGather(query: Q, timeout: Long,
138-
timeUnit: TimeUnit): Stream<R> {
138+
timeUnit: TimeUnit): Stream<R> {
139139
return this.scatterGather(query, ResponseTypes.instanceOf(R::class.java), timeout, timeUnit)
140140
}
141141

@@ -154,7 +154,7 @@ inline fun <reified R, reified Q> QueryGateway.scatterGather(query: Q, timeout:
154154
* @since 0.2.0
155155
*/
156156
inline fun <reified R, reified Q> QueryGateway.scatterGather(queryName: String, query: Q, timeout: Long,
157-
timeUnit: TimeUnit): Stream<R> {
157+
timeUnit: TimeUnit): Stream<R> {
158158
return this.scatterGather(queryName, query, ResponseTypes.instanceOf(R::class.java), timeout, timeUnit)
159159
}
160160

@@ -172,7 +172,7 @@ inline fun <reified R, reified Q> QueryGateway.scatterGather(queryName: String,
172172
* @since 0.2.0
173173
*/
174174
inline fun <reified R, reified Q> QueryGateway.scatterGatherMany(query: Q, timeout: Long,
175-
timeUnit: TimeUnit): Stream<List<R>> {
175+
timeUnit: TimeUnit): Stream<List<R>> {
176176
return this.scatterGather(query, ResponseTypes.multipleInstancesOf(R::class.java), timeout, timeUnit)
177177
}
178178

@@ -191,7 +191,7 @@ inline fun <reified R, reified Q> QueryGateway.scatterGatherMany(query: Q, timeo
191191
* @since 0.2.0
192192
*/
193193
inline fun <reified R, reified Q> QueryGateway.scatterGatherMany(queryName: String, query: Q, timeout: Long,
194-
timeUnit: TimeUnit): Stream<List<R>> {
194+
timeUnit: TimeUnit): Stream<List<R>> {
195195
return this.scatterGather(queryName, query, ResponseTypes.multipleInstancesOf(R::class.java), timeout, timeUnit)
196196
}
197197

@@ -209,7 +209,7 @@ inline fun <reified R, reified Q> QueryGateway.scatterGatherMany(queryName: Stri
209209
* @since 0.2.0
210210
*/
211211
inline fun <reified R, reified Q> QueryGateway.scatterGatherOptional(query: Q, timeout: Long,
212-
timeUnit: TimeUnit): Stream<Optional<R>> {
212+
timeUnit: TimeUnit): Stream<Optional<R>> {
213213
return this.scatterGather(query, ResponseTypes.optionalInstanceOf(R::class.java), timeout, timeUnit)
214214
}
215215

@@ -228,7 +228,7 @@ inline fun <reified R, reified Q> QueryGateway.scatterGatherOptional(query: Q, t
228228
* @since 0.2.0
229229
*/
230230
inline fun <reified R, reified Q> QueryGateway.scatterGatherOptional(queryName: String, query: Q, timeout: Long,
231-
timeUnit: TimeUnit): Stream<Optional<R>> {
231+
timeUnit: TimeUnit): Stream<Optional<R>> {
232232
return this.scatterGather(queryName, query, ResponseTypes.optionalInstanceOf(R::class.java), timeout, timeUnit)
233233
}
234234

@@ -245,7 +245,7 @@ inline fun <reified R, reified Q> QueryGateway.scatterGatherOptional(queryName:
245245
* @since 0.1.0
246246
*/
247247
inline fun <reified Q, reified I, reified U> QueryGateway.subscriptionQuery(query: Q): SubscriptionQueryResult<I, U> =
248-
this.subscriptionQuery(query, ResponseTypes.instanceOf(I::class.java), ResponseTypes.instanceOf(U::class.java))
248+
this.subscriptionQuery(query, ResponseTypes.instanceOf(I::class.java), ResponseTypes.instanceOf(U::class.java))
249249

250250
/**
251251
* Reified version of [QueryGateway.subscriptionQuery]
@@ -261,4 +261,4 @@ inline fun <reified Q, reified I, reified U> QueryGateway.subscriptionQuery(quer
261261
* @since 0.1.0
262262
*/
263263
inline fun <reified Q, reified I, reified U> QueryGateway.subscriptionQuery(queryName: String, query: Q): SubscriptionQueryResult<I, U> =
264-
this.subscriptionQuery(queryName, query, ResponseTypes.instanceOf(I::class.java), ResponseTypes.instanceOf(U::class.java))
264+
this.subscriptionQuery(queryName, query, ResponseTypes.instanceOf(I::class.java), ResponseTypes.instanceOf(U::class.java))

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

Lines changed: 39 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -65,10 +65,10 @@ internal class QueryGatewayExtensionsTest {
6565
every { subjectGateway.subscriptionQuery(exampleQuery, matchInstanceResponseType<InitialResponseType>(), matchInstanceResponseType<UpdateResponseType>()) } returns subscriptionQueryResult
6666
every {
6767
subjectGateway.subscriptionQuery(
68-
queryName,
69-
exampleQuery,
70-
matchInstanceResponseType<InitialResponseType>(),
71-
matchInstanceResponseType<UpdateResponseType>()
68+
queryName,
69+
exampleQuery,
70+
matchInstanceResponseType<InitialResponseType>(),
71+
matchInstanceResponseType<UpdateResponseType>()
7272
)
7373
} returns subscriptionQueryResult
7474
}
@@ -206,9 +206,9 @@ internal class QueryGatewayExtensionsTest {
206206
@Test
207207
fun `ScatterGather for Single should invoke scatterGather method with correct generic parameters`() {
208208
val result = subjectGateway.scatterGather<String, ExampleQuery>(
209-
query = exampleQuery,
210-
timeout = timeout,
211-
timeUnit = timeUnit
209+
query = exampleQuery,
210+
timeout = timeout,
211+
timeUnit = timeUnit
212212
)
213213

214214
assertSame(result, streamInstanceReturnValue)
@@ -218,9 +218,9 @@ internal class QueryGatewayExtensionsTest {
218218
@Test
219219
fun `ScatterGather for Multiple should invoke scatterGather method with correct generic parameters`() {
220220
val result = subjectGateway.scatterGatherMany<String, ExampleQuery>(
221-
query = exampleQuery,
222-
timeout = timeout,
223-
timeUnit = timeUnit
221+
query = exampleQuery,
222+
timeout = timeout,
223+
timeUnit = timeUnit
224224
)
225225

226226
assertSame(result, streamMultipleReturnValue)
@@ -230,9 +230,9 @@ internal class QueryGatewayExtensionsTest {
230230
@Test
231231
fun `ScatterGather for Optional should invoke scatterGather method with correct generic parameters`() {
232232
val result = subjectGateway.scatterGatherOptional<String, ExampleQuery>(
233-
query = exampleQuery,
234-
timeout = timeout,
235-
timeUnit = timeUnit
233+
query = exampleQuery,
234+
timeout = timeout,
235+
timeUnit = timeUnit
236236
)
237237

238238
assertSame(result, streamOptionalReturnValue)
@@ -242,10 +242,10 @@ internal class QueryGatewayExtensionsTest {
242242
@Test
243243
fun `ScatterGather for Single should invoke scatterGather method with explicit query name`() {
244244
val result = subjectGateway.scatterGather<String, ExampleQuery>(
245-
queryName = queryName,
246-
query = exampleQuery,
247-
timeout = timeout,
248-
timeUnit = timeUnit
245+
queryName = queryName,
246+
query = exampleQuery,
247+
timeout = timeout,
248+
timeUnit = timeUnit
249249
)
250250

251251
assertSame(result, streamInstanceReturnValue)
@@ -255,10 +255,10 @@ internal class QueryGatewayExtensionsTest {
255255
@Test
256256
fun `ScatterGather for Multiple should invoke scatterGather method with explicit query name`() {
257257
val result = subjectGateway.scatterGatherMany<String, ExampleQuery>(
258-
queryName = queryName,
259-
query = exampleQuery,
260-
timeout = timeout,
261-
timeUnit = timeUnit
258+
queryName = queryName,
259+
query = exampleQuery,
260+
timeout = timeout,
261+
timeUnit = timeUnit
262262
)
263263

264264
assertSame(result, streamMultipleReturnValue)
@@ -268,10 +268,10 @@ internal class QueryGatewayExtensionsTest {
268268
@Test
269269
fun `ScatterGather for Optional should invoke scatterGather method with explicit query name`() {
270270
val result = subjectGateway.scatterGatherOptional<String, ExampleQuery>(
271-
queryName = queryName,
272-
query = exampleQuery,
273-
timeout = timeout,
274-
timeUnit = timeUnit
271+
queryName = queryName,
272+
query = exampleQuery,
273+
timeout = timeout,
274+
timeUnit = timeUnit
275275
)
276276

277277
assertSame(result, streamOptionalReturnValue)
@@ -284,9 +284,9 @@ internal class QueryGatewayExtensionsTest {
284284
assertSame(queryResult, subscriptionQueryResult)
285285
verify(exactly = 1) {
286286
subjectGateway.subscriptionQuery(
287-
exampleQuery,
288-
matchExpectedResponseType(InitialResponseType::class.java),
289-
matchExpectedResponseType(UpdateResponseType::class.java)
287+
exampleQuery,
288+
matchExpectedResponseType(InitialResponseType::class.java),
289+
matchExpectedResponseType(UpdateResponseType::class.java)
290290
)
291291
}
292292
}
@@ -297,9 +297,9 @@ internal class QueryGatewayExtensionsTest {
297297
assertSame(queryResult, subscriptionQueryResult)
298298
verify(exactly = 1) {
299299
subjectGateway.subscriptionQuery(
300-
exampleQuery,
301-
matchExpectedResponseType(InitialResponseType::class.java),
302-
matchExpectedResponseType(UpdateResponseType::class.java)
300+
exampleQuery,
301+
matchExpectedResponseType(InitialResponseType::class.java),
302+
matchExpectedResponseType(UpdateResponseType::class.java)
303303
)
304304
}
305305
}
@@ -310,10 +310,10 @@ internal class QueryGatewayExtensionsTest {
310310
assertSame(queryResult, subscriptionQueryResult)
311311
verify(exactly = 1) {
312312
subjectGateway.subscriptionQuery(
313-
queryName,
314-
exampleQuery,
315-
matchExpectedResponseType(InitialResponseType::class.java),
316-
matchExpectedResponseType(UpdateResponseType::class.java)
313+
queryName,
314+
exampleQuery,
315+
matchExpectedResponseType(InitialResponseType::class.java),
316+
matchExpectedResponseType(UpdateResponseType::class.java)
317317
)
318318
}
319319
}
@@ -324,10 +324,10 @@ internal class QueryGatewayExtensionsTest {
324324
assertSame(queryResult, subscriptionQueryResult)
325325
verify(exactly = 1) {
326326
subjectGateway.subscriptionQuery(
327-
queryName,
328-
exampleQuery,
329-
matchExpectedResponseType(InitialResponseType::class.java),
330-
matchExpectedResponseType(UpdateResponseType::class.java)
327+
queryName,
328+
exampleQuery,
329+
matchExpectedResponseType(InitialResponseType::class.java),
330+
matchExpectedResponseType(UpdateResponseType::class.java)
331331
)
332332
}
333333
}

0 commit comments

Comments
 (0)