Skip to content

Commit 9d0518d

Browse files
HackAttackHackAttack
committed
Make all methods non-void
1 parent 89a2784 commit 9d0518d

File tree

3 files changed

+33
-22
lines changed

3 files changed

+33
-22
lines changed

‎src/main/groovy/com/mhackner/cloudflare/AsyncCloudFlareClient.groovy

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ class AsyncCloudFlareClient {
3737
})
3838
}
3939

40-
void deleteZone(String zoneId) {
40+
Future<Map> deleteZone(String zoneId) {
4141
http.request(Method.DELETE) { req ->
4242
uri.path = "zones/$zoneId"
4343
}
@@ -55,13 +55,13 @@ class AsyncCloudFlareClient {
5555
new ResultExtractor(http.post(path: "zones/$zoneId/dns_records", body: params, requestContentType: ContentType.JSON))
5656
}
5757

58-
void deleteRecord(String zoneId, String recordId) {
58+
Future<Map> deleteRecord(String zoneId, String recordId) {
5959
http.request(Method.DELETE) { req ->
6060
uri.path = "zones/$zoneId/dns_records/$recordId"
6161
}
6262
}
6363

64-
void updateRecord(Map record) {
64+
Future<Map> updateRecord(Map record) {
6565
http.request(Method.PUT) { req ->
6666
uri.path = "zones/$record.zone_id/dns_records/$record.id"
6767
body = record

‎src/main/groovy/com/mhackner/cloudflare/CloudFlareClient.groovy

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,8 @@ class CloudFlareClient {
3030
http.patch(path: "zones/$zoneId", body: [plan: [id: planId]]).data.result
3131
}
3232

33-
void deleteZone(String zoneId) {
34-
http.delete(path: "zones/$zoneId")
33+
Map deleteZone(String zoneId) {
34+
http.delete(path: "zones/$zoneId").data.result
3535
}
3636

3737
List<Map> getRecords(String zoneId, Map params = [:]) {
@@ -50,16 +50,16 @@ class CloudFlareClient {
5050
http.post(path: "zones/$zoneId/dns_records", body: params).data.result
5151
}
5252

53-
void deleteRecord(String zoneId, String recordId) {
54-
http.delete(path: "zones/$zoneId/dns_records/$recordId")
53+
Map deleteRecord(String zoneId, String recordId) {
54+
http.delete(path: "zones/$zoneId/dns_records/$recordId").data.result
5555
}
5656

57-
void deleteRecords(String zoneId, Map params = [:]) {
58-
getRecords(zoneId, params).each { deleteRecord(zoneId, it.id) }
57+
List<Map> deleteRecords(String zoneId, Map params = [:]) {
58+
getRecords(zoneId, params).collect { deleteRecord(zoneId, it.id) }
5959
}
6060

61-
void updateRecord(Map record) {
62-
http.put(path: "zones/$record.zone_id/dns_records/$record.id", body: record)
61+
Map updateRecord(Map record) {
62+
http.put(path: "zones/$record.zone_id/dns_records/$record.id", body: record).data.result
6363
}
6464

6565
}

‎src/test/groovy/com/mhackner/cloudflare/CloudFlareClientTest.groovy

Lines changed: 22 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -13,62 +13,71 @@ class CloudFlareClientTest {
1313
public WireMockRule wireMockRule = new WireMockRule()
1414

1515
private static final client = new CloudFlareClient('key', 'email', 'http://localhost:8080/')
16+
private static final asyncClient = new AsyncCloudFlareClient('key', 'email', 'http://localhost:8080/')
1617

1718
@Test
1819
void getZone() {
1920
client.getZone('example.com')
20-
verify(getRequestedFor(urlEqualTo('/zones?name=example.com')))
21+
asyncClient.getZone('example.com').get()
22+
verify(2, getRequestedFor(urlEqualTo('/zones?name=example.com')))
2123
}
2224

2325
@Test
2426
void createZone() {
2527
client.createZone('example.com')
26-
verify(postRequestedFor(urlEqualTo('/zones'))
28+
asyncClient.createZone('example.com').get()
29+
verify(2, postRequestedFor(urlEqualTo('/zones'))
2730
.withRequestBody(equalToJson('{"name": "example.com", "jump_start": false}')))
2831
}
2932

3033
@Test
3134
void createZoneInOrg() {
3235
client.createZone('example.com', '7c5dae5552338874e5053f2534d2767a')
33-
verify(postRequestedFor(urlEqualTo('/zones'))
36+
asyncClient.createZone('example.com', '7c5dae5552338874e5053f2534d2767a').get()
37+
verify(2, postRequestedFor(urlEqualTo('/zones'))
3438
.withRequestBody(equalToJson('{"name": "example.com", "jump_start": false, "organization": {"id": "7c5dae5552338874e5053f2534d2767a"}}')))
3539
}
3640

3741
@Test
3842
void updatePlanForZone() {
3943
client.updatePlanForZone('023e105f4ecef8ad9ca31a8372d0c353', 'e592fd9519420ba7405e1307bff33214')
40-
verify(patchRequestedFor(urlEqualTo('/zones/023e105f4ecef8ad9ca31a8372d0c353'))
44+
asyncClient.updatePlanForZone('023e105f4ecef8ad9ca31a8372d0c353', 'e592fd9519420ba7405e1307bff33214').get()
45+
verify(2, patchRequestedFor(urlEqualTo('/zones/023e105f4ecef8ad9ca31a8372d0c353'))
4146
.withRequestBody(equalToJson('{"plan": {"id": "e592fd9519420ba7405e1307bff33214"}}')))
4247
}
4348

4449
@Test
4550
void deleteZone() {
4651
client.deleteZone('023e105f4ecef8ad9ca31a8372d0c353')
47-
verify(deleteRequestedFor(urlEqualTo('/zones/023e105f4ecef8ad9ca31a8372d0c353')))
52+
asyncClient.deleteZone('023e105f4ecef8ad9ca31a8372d0c353').get()
53+
verify(2, deleteRequestedFor(urlEqualTo('/zones/023e105f4ecef8ad9ca31a8372d0c353')))
4854
}
4955

5056
@Test
5157
void getRecords() {
5258
client.getRecords('023e105f4ecef8ad9ca31a8372d0c353')
53-
verify(getRequestedFor(urlEqualTo('/zones/023e105f4ecef8ad9ca31a8372d0c353/dns_records?per_page=1000')))
59+
asyncClient.getRecords('023e105f4ecef8ad9ca31a8372d0c353').get()
60+
verify(2, getRequestedFor(urlEqualTo('/zones/023e105f4ecef8ad9ca31a8372d0c353/dns_records?per_page=1000')))
5461
}
5562

5663
@Test
5764
void createRecord() {
5865
client.createRecord('023e105f4ecef8ad9ca31a8372d0c353', 'A', 'example.com', '1.2.3.4')
59-
verify(postRequestedFor(urlEqualTo('/zones/023e105f4ecef8ad9ca31a8372d0c353/dns_records'))
66+
asyncClient.createRecord('023e105f4ecef8ad9ca31a8372d0c353', 'A', 'example.com', '1.2.3.4').get()
67+
verify(2, postRequestedFor(urlEqualTo('/zones/023e105f4ecef8ad9ca31a8372d0c353/dns_records'))
6068
.withRequestBody(equalToJson('{"type": "A", "name": "example.com", "content": "1.2.3.4"}')))
6169
}
6270

6371
@Test
6472
void deleteRecord() {
6573
client.deleteRecord('023e105f4ecef8ad9ca31a8372d0c353', '372e67954025e0ba6aaa6d586b9e0b59')
66-
verify(deleteRequestedFor(urlEqualTo('/zones/023e105f4ecef8ad9ca31a8372d0c353/dns_records/372e67954025e0ba6aaa6d586b9e0b59')))
74+
asyncClient.deleteRecord('023e105f4ecef8ad9ca31a8372d0c353', '372e67954025e0ba6aaa6d586b9e0b59').get()
75+
verify(2, deleteRequestedFor(urlEqualTo('/zones/023e105f4ecef8ad9ca31a8372d0c353/dns_records/372e67954025e0ba6aaa6d586b9e0b59')))
6776
}
6877

6978
@Test
7079
void updateRecord() {
71-
client.updateRecord([
80+
def record = [
7281
id: '372e67954025e0ba6aaa6d586b9e0b59',
7382
type: 'A',
7483
name: 'example.com',
@@ -82,8 +91,10 @@ class CloudFlareClientTest {
8291
created_on: '2014-01-01T05:20:00.12345Z',
8392
modified_on: '2014-01-01T05:20:00.12345Z',
8493
data: [:]
85-
])
86-
verify(putRequestedFor(urlEqualTo('/zones/023e105f4ecef8ad9ca31a8372d0c353/dns_records/372e67954025e0ba6aaa6d586b9e0b59'))
94+
]
95+
client.updateRecord(record)
96+
asyncClient.updateRecord(record)
97+
verify(2, putRequestedFor(urlEqualTo('/zones/023e105f4ecef8ad9ca31a8372d0c353/dns_records/372e67954025e0ba6aaa6d586b9e0b59'))
8798
.withRequestBody(equalToJson('''
8899
{
89100
"id": "372e67954025e0ba6aaa6d586b9e0b59",

0 commit comments

Comments
 (0)