Skip to content

Commit 5af40c5

Browse files
hsenasilvahsenasilva
committed
refactoring extension names to new convention
1 parent 91e586f commit 5af40c5

File tree

2 files changed

+38
-32
lines changed

2 files changed

+38
-32
lines changed

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

Lines changed: 18 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,12 @@ import java.util.concurrent.CompletableFuture
2222
import java.util.concurrent.TimeUnit
2323
import java.util.stream.Stream
2424

25+
/**
26+
* Query Gateway extensions.
27+
*
28+
* @author Henrique Sena
29+
*/
30+
2531
/**
2632
* Reified version of [QueryGateway.query]
2733
* which expects a collection as a response using [org.axonframework.messaging.responsetypes.MultipleInstancesResponseType]
@@ -32,7 +38,7 @@ import java.util.stream.Stream
3238
* @see QueryGateway.query
3339
* @see ResponseTypes
3440
*/
35-
inline fun <reified R, reified Q> QueryGateway.queryForMultiple(query: Q): CompletableFuture<List<R>> {
41+
inline fun <reified R, reified Q> QueryGateway.queryMany(query: Q): CompletableFuture<List<R>> {
3642
return this.query(query, ResponseTypes.multipleInstancesOf(R::class.java))
3743
}
3844

@@ -47,7 +53,7 @@ inline fun <reified R, reified Q> QueryGateway.queryForMultiple(query: Q): Compl
4753
* @see QueryGateway.query
4854
* @see ResponseTypes
4955
*/
50-
inline fun <reified R, reified Q> QueryGateway.queryForMultiple(queryName: String, query: Q): CompletableFuture<List<R>> {
56+
inline fun <reified R, reified Q> QueryGateway.queryMany(queryName: String, query: Q): CompletableFuture<List<R>> {
5157
return this.query(queryName, query, ResponseTypes.multipleInstancesOf(R::class.java))
5258
}
5359

@@ -61,7 +67,7 @@ inline fun <reified R, reified Q> QueryGateway.queryForMultiple(queryName: Strin
6167
* @see QueryGateway.query
6268
* @see ResponseTypes
6369
*/
64-
inline fun <reified R, reified Q> QueryGateway.queryForSingle(query: Q): CompletableFuture<R> {
70+
inline fun <reified R, reified Q> QueryGateway.querySingle(query: Q): CompletableFuture<R> {
6571
return this.query(query, ResponseTypes.instanceOf(R::class.java))
6672
}
6773

@@ -76,7 +82,7 @@ inline fun <reified R, reified Q> QueryGateway.queryForSingle(query: Q): Complet
7682
* @see QueryGateway.query
7783
* @see ResponseTypes
7884
*/
79-
inline fun <reified R, reified Q> QueryGateway.queryForSingle(queryName: String, query: Q): CompletableFuture<R> {
85+
inline fun <reified R, reified Q> QueryGateway.querySingle(queryName: String, query: Q): CompletableFuture<R> {
8086
return this.query(queryName, query, ResponseTypes.instanceOf(R::class.java))
8187
}
8288

@@ -90,7 +96,7 @@ inline fun <reified R, reified Q> QueryGateway.queryForSingle(queryName: String,
9096
* @see QueryGateway.query
9197
* @see ResponseTypes
9298
*/
93-
inline fun <reified R, reified Q> QueryGateway.queryForOptional(query: Q): CompletableFuture<Optional<R>> {
99+
inline fun <reified R, reified Q> QueryGateway.queryOptional(query: Q): CompletableFuture<Optional<R>> {
94100
return this.query(query, ResponseTypes.optionalInstanceOf(R::class.java))
95101
}
96102

@@ -105,7 +111,7 @@ inline fun <reified R, reified Q> QueryGateway.queryForOptional(query: Q): Compl
105111
* @see QueryGateway.query
106112
* @see ResponseTypes
107113
*/
108-
inline fun <reified R, reified Q> QueryGateway.queryForOptional(queryName: String, query: Q): CompletableFuture<Optional<R>> {
114+
inline fun <reified R, reified Q> QueryGateway.queryOptional(queryName: String, query: Q): CompletableFuture<Optional<R>> {
109115
return this.query(queryName, query, ResponseTypes.optionalInstanceOf(R::class.java))
110116
}
111117

@@ -122,7 +128,7 @@ inline fun <reified R, reified Q> QueryGateway.queryForOptional(queryName: Strin
122128
* @see ResponseTypes
123129
* @since 0.2.0
124130
*/
125-
inline fun <reified R, reified Q> QueryGateway.scatterGatherForSingle(query: Q, timeout: Long,
131+
inline fun <reified R, reified Q> QueryGateway.scatterGather(query: Q, timeout: Long,
126132
timeUnit: TimeUnit): Stream<R> {
127133
return this.scatterGather(query, ResponseTypes.instanceOf(R::class.java), timeout, timeUnit)
128134
}
@@ -141,7 +147,7 @@ inline fun <reified R, reified Q> QueryGateway.scatterGatherForSingle(query: Q,
141147
* @see ResponseTypes
142148
* @since 0.2.0
143149
*/
144-
inline fun <reified R, reified Q> QueryGateway.scatterGatherForSingle(queryName: String, query: Q, timeout: Long,
150+
inline fun <reified R, reified Q> QueryGateway.scatterGather(queryName: String, query: Q, timeout: Long,
145151
timeUnit: TimeUnit): Stream<R> {
146152
return this.scatterGather(queryName, query, ResponseTypes.instanceOf(R::class.java), timeout, timeUnit)
147153
}
@@ -159,7 +165,7 @@ inline fun <reified R, reified Q> QueryGateway.scatterGatherForSingle(queryName:
159165
* @see ResponseTypes
160166
* @since 0.2.0
161167
*/
162-
inline fun <reified R, reified Q> QueryGateway.scatterGatherForMultiple(query: Q, timeout: Long,
168+
inline fun <reified R, reified Q> QueryGateway.scatterGatherMany(query: Q, timeout: Long,
163169
timeUnit: TimeUnit): Stream<List<R>> {
164170
return this.scatterGather(query, ResponseTypes.multipleInstancesOf(R::class.java), timeout, timeUnit)
165171
}
@@ -178,7 +184,7 @@ inline fun <reified R, reified Q> QueryGateway.scatterGatherForMultiple(query: Q
178184
* @see ResponseTypes
179185
* @since 0.2.0
180186
*/
181-
inline fun <reified R, reified Q> QueryGateway.scatterGatherForMultiple(queryName: String, query: Q, timeout: Long,
187+
inline fun <reified R, reified Q> QueryGateway.scatterGatherMany(queryName: String, query: Q, timeout: Long,
182188
timeUnit: TimeUnit): Stream<List<R>> {
183189
return this.scatterGather(queryName, query, ResponseTypes.multipleInstancesOf(R::class.java), timeout, timeUnit)
184190
}
@@ -196,7 +202,7 @@ inline fun <reified R, reified Q> QueryGateway.scatterGatherForMultiple(queryNam
196202
* @see ResponseTypes
197203
* @since 0.2.0
198204
*/
199-
inline fun <reified R, reified Q> QueryGateway.scatterGatherForOptional(query: Q, timeout: Long,
205+
inline fun <reified R, reified Q> QueryGateway.scatterGatherOptional(query: Q, timeout: Long,
200206
timeUnit: TimeUnit): Stream<Optional<R>> {
201207
return this.scatterGather(query, ResponseTypes.optionalInstanceOf(R::class.java), timeout, timeUnit)
202208
}
@@ -215,7 +221,7 @@ inline fun <reified R, reified Q> QueryGateway.scatterGatherForOptional(query: Q
215221
* @see ResponseTypes
216222
* @since 0.2.0
217223
*/
218-
inline fun <reified R, reified Q> QueryGateway.scatterGatherForOptional(queryName: String, query: Q, timeout: Long,
224+
inline fun <reified R, reified Q> QueryGateway.scatterGatherOptional(queryName: String, query: Q, timeout: Long,
219225
timeUnit: TimeUnit): Stream<Optional<R>> {
220226
return this.scatterGather(queryName, query, ResponseTypes.optionalInstanceOf(R::class.java), timeout, timeUnit)
221227
}

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

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ class QueryGatewayExtensionsTest {
7171

7272
@Test
7373
fun `Query without queryName for Single should invoke query method with correct generic parameters`() {
74-
val queryResult = subjectGateway.queryForSingle<String, ExampleQuery>(query = exampleQuery)
74+
val queryResult = subjectGateway.querySingle<String, ExampleQuery>(query = exampleQuery)
7575
assertSame(queryResult, instanceReturnValue)
7676
verify(exactly = 1) {
7777
subjectGateway.query(exampleQuery, matchExpectedResponseType(String::class.java))
@@ -80,7 +80,7 @@ class QueryGatewayExtensionsTest {
8080

8181
@Test
8282
fun `Query without queryName for Single should invoke query method and not require explicit generic types`() {
83-
val queryResult:CompletableFuture<String> = subjectGateway.queryForSingle(query = exampleQuery)
83+
val queryResult:CompletableFuture<String> = subjectGateway.querySingle(query = exampleQuery)
8484
assertSame(queryResult, instanceReturnValue)
8585
verify(exactly = 1) {
8686
subjectGateway.query(exampleQuery, matchExpectedResponseType(String::class.java))
@@ -89,31 +89,31 @@ class QueryGatewayExtensionsTest {
8989

9090
@Test
9191
fun `Query without queryName for Optional should invoke query method with correct generic parameters`() {
92-
val queryResult = subjectGateway.queryForOptional<String, ExampleQuery>(query = exampleQuery)
92+
val queryResult = subjectGateway.queryOptional<String, ExampleQuery>(query = exampleQuery)
9393

9494
assertSame(queryResult, optionalReturnValue)
9595
verify(exactly = 1) { subjectGateway.query(exampleQuery, matchExpectedResponseType(String::class.java)) }
9696
}
9797

9898
@Test
9999
fun `Query without queryName for Optional should invoke query method and not require explicit generic types`() {
100-
val queryResult: CompletableFuture<Optional<String>> = subjectGateway.queryForOptional(query = exampleQuery)
100+
val queryResult: CompletableFuture<Optional<String>> = subjectGateway.queryOptional(query = exampleQuery)
101101

102102
assertSame(queryResult, optionalReturnValue)
103103
verify(exactly = 1) { subjectGateway.query(exampleQuery, matchExpectedResponseType(String::class.java)) }
104104
}
105105

106106
@Test
107107
fun `Query without queryName for Multiple should invoke query method with correct generic parameters`() {
108-
val queryResult = subjectGateway.queryForMultiple<String, ExampleQuery>(query = exampleQuery)
108+
val queryResult = subjectGateway.queryMany<String, ExampleQuery>(query = exampleQuery)
109109

110110
assertSame(queryResult, listReturnValue)
111111
verify(exactly = 1) { subjectGateway.query(exampleQuery, matchExpectedResponseType(String::class.java)) }
112112
}
113113

114114
@Test
115115
fun `Query without queryName for Multiple should invoke query method and not require explicit generic types`() {
116-
val queryResult: CompletableFuture<List<String>> = subjectGateway.queryForMultiple(query = exampleQuery)
116+
val queryResult: CompletableFuture<List<String>> = subjectGateway.queryMany(query = exampleQuery)
117117

118118
assertSame(queryResult, listReturnValue)
119119
verify(exactly = 1) { subjectGateway.query(exampleQuery, matchExpectedResponseType(String::class.java)) }
@@ -126,7 +126,7 @@ class QueryGatewayExtensionsTest {
126126
every { query(exampleQuery, match { i: AbstractResponseType<String?> -> i is InstanceResponseType }) } returns nullInstanceReturnValue
127127
}
128128

129-
val queryResult = nullableQueryGateway.queryForSingle<String?, ExampleQuery>(query = exampleQuery)
129+
val queryResult = nullableQueryGateway.querySingle<String?, ExampleQuery>(query = exampleQuery)
130130

131131
assertSame(queryResult, nullInstanceReturnValue)
132132
assertEquals(nullInstanceReturnValue.get(), null)
@@ -136,47 +136,47 @@ class QueryGatewayExtensionsTest {
136136

137137
@Test
138138
fun `Query for Single should invoke query method with correct generic parameters`() {
139-
val queryResult = subjectGateway.queryForSingle<String, ExampleQuery>(queryName = queryName, query = exampleQuery)
139+
val queryResult = subjectGateway.querySingle<String, ExampleQuery>(queryName = queryName, query = exampleQuery)
140140

141141
assertSame(queryResult, instanceReturnValue)
142142
verify(exactly = 1) { subjectGateway.query(queryName, exampleQuery, matchExpectedResponseType(String::class.java)) }
143143
}
144144

145145
@Test
146146
fun `Query for Single should invoke query method and not require explicit generic types`() {
147-
val queryResult: CompletableFuture<String> = subjectGateway.queryForSingle(queryName = queryName, query = exampleQuery)
147+
val queryResult: CompletableFuture<String> = subjectGateway.querySingle(queryName = queryName, query = exampleQuery)
148148

149149
assertSame(queryResult, instanceReturnValue)
150150
verify(exactly = 1) { subjectGateway.query(queryName, exampleQuery, matchExpectedResponseType(String::class.java)) }
151151
}
152152

153153
@Test
154154
fun `Query for Optional should invoke query method with correct generic parameters`() {
155-
val queryResult = subjectGateway.queryForOptional<String, ExampleQuery>(queryName = queryName, query = exampleQuery)
155+
val queryResult = subjectGateway.queryOptional<String, ExampleQuery>(queryName = queryName, query = exampleQuery)
156156

157157
assertSame(queryResult, optionalReturnValue)
158158
verify(exactly = 1) { subjectGateway.query(queryName, exampleQuery, matchExpectedResponseType(String::class.java)) }
159159
}
160160

161161
@Test
162162
fun `Query for Optional should invoke query method and not require explicit generic types`() {
163-
val queryResult: CompletableFuture<Optional<String>> = subjectGateway.queryForOptional(queryName = queryName, query = exampleQuery)
163+
val queryResult: CompletableFuture<Optional<String>> = subjectGateway.queryOptional(queryName = queryName, query = exampleQuery)
164164

165165
assertSame(queryResult, optionalReturnValue)
166166
verify(exactly = 1) { subjectGateway.query(queryName, exampleQuery, matchExpectedResponseType(String::class.java)) }
167167
}
168168

169169
@Test
170170
fun `Query for Multiple should invoke query method with correct generic parameters`() {
171-
val queryResult = subjectGateway.queryForMultiple<String, ExampleQuery>(queryName = queryName, query = exampleQuery)
171+
val queryResult = subjectGateway.queryMany<String, ExampleQuery>(queryName = queryName, query = exampleQuery)
172172

173173
assertSame(queryResult, listReturnValue)
174174
verify(exactly = 1) { subjectGateway.query(queryName, exampleQuery, matchExpectedResponseType(String::class.java)) }
175175
}
176176

177177
@Test
178178
fun `Query for Multiple should invoke query method and not require explicit generic types`() {
179-
val queryResult: CompletableFuture<List<String>> = subjectGateway.queryForMultiple(queryName = queryName, query = exampleQuery)
179+
val queryResult: CompletableFuture<List<String>> = subjectGateway.queryMany(queryName = queryName, query = exampleQuery)
180180

181181
assertSame(queryResult, listReturnValue)
182182
verify(exactly = 1) { subjectGateway.query(queryName, exampleQuery, matchExpectedResponseType(String::class.java)) }
@@ -189,7 +189,7 @@ class QueryGatewayExtensionsTest {
189189
every { query(queryName, exampleQuery, match { i: AbstractResponseType<String?> -> i is InstanceResponseType }) } returns nullInstanceReturnValue
190190
}
191191

192-
val queryResult = nullableQueryGateway.queryForSingle<String?, ExampleQuery>(queryName = queryName, query = exampleQuery)
192+
val queryResult = nullableQueryGateway.querySingle<String?, ExampleQuery>(queryName = queryName, query = exampleQuery)
193193

194194
assertSame(queryResult, nullInstanceReturnValue)
195195
assertEquals(nullInstanceReturnValue.get(), null)
@@ -198,7 +198,7 @@ class QueryGatewayExtensionsTest {
198198

199199
@Test
200200
fun `ScatterGather for Single should invoke scatterGather method with correct generic parameters`() {
201-
val result = subjectGateway.scatterGatherForSingle<String, ExampleQuery>(
201+
val result = subjectGateway.scatterGather<String, ExampleQuery>(
202202
query = exampleQuery,
203203
timeout = timeout,
204204
timeUnit = timeUnit
@@ -210,7 +210,7 @@ class QueryGatewayExtensionsTest {
210210

211211
@Test
212212
fun `ScatterGather for Multiple should invoke scatterGather method with correct generic parameters`() {
213-
val result = subjectGateway.scatterGatherForMultiple<String, ExampleQuery>(
213+
val result = subjectGateway.scatterGatherMany<String, ExampleQuery>(
214214
query = exampleQuery,
215215
timeout = timeout,
216216
timeUnit = timeUnit
@@ -222,7 +222,7 @@ class QueryGatewayExtensionsTest {
222222

223223
@Test
224224
fun `ScatterGather for Optional should invoke scatterGather method with correct generic parameters`() {
225-
val result = subjectGateway.scatterGatherForOptional<String, ExampleQuery>(
225+
val result = subjectGateway.scatterGatherOptional<String, ExampleQuery>(
226226
query = exampleQuery,
227227
timeout = timeout,
228228
timeUnit = timeUnit
@@ -234,7 +234,7 @@ class QueryGatewayExtensionsTest {
234234

235235
@Test
236236
fun `ScatterGather for Single should invoke scatterGather method with explicit query name`() {
237-
val result = subjectGateway.scatterGatherForSingle<String, ExampleQuery>(
237+
val result = subjectGateway.scatterGather<String, ExampleQuery>(
238238
queryName = queryName,
239239
query = exampleQuery,
240240
timeout = timeout,
@@ -247,7 +247,7 @@ class QueryGatewayExtensionsTest {
247247

248248
@Test
249249
fun `ScatterGather for Multiple should invoke scatterGather method with explicit query name`() {
250-
val result = subjectGateway.scatterGatherForMultiple<String, ExampleQuery>(
250+
val result = subjectGateway.scatterGatherMany<String, ExampleQuery>(
251251
queryName = queryName,
252252
query = exampleQuery,
253253
timeout = timeout,
@@ -260,7 +260,7 @@ class QueryGatewayExtensionsTest {
260260

261261
@Test
262262
fun `ScatterGather for Optional should invoke scatterGather method with explicit query name`() {
263-
val result = subjectGateway.scatterGatherForOptional<String, ExampleQuery>(
263+
val result = subjectGateway.scatterGatherOptional<String, ExampleQuery>(
264264
queryName = queryName,
265265
query = exampleQuery,
266266
timeout = timeout,

0 commit comments

Comments
 (0)