From e5d218a2d2167964eccf25c6ef2c510aab4dd5c5 Mon Sep 17 00:00:00 2001
From: Marcin Grzejszczak <marcin.grzejszczak@4finance.com>
Date: Thu, 12 Feb 2015 16:01:22 +0100
Subject: [PATCH] [#5] Minor refactoring

---
 .../accurest/dsl/WiremockResponseStubStrategy.groovy      | 4 ++--
 .../groovy/io/coderate/accurest/dsl/internal/Body.groovy  | 8 ++++++--
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/accurest-core/src/main/groovy/io/coderate/accurest/dsl/WiremockResponseStubStrategy.groovy b/accurest-core/src/main/groovy/io/coderate/accurest/dsl/WiremockResponseStubStrategy.groovy
index 76f7f38a3b..ab62663b51 100644
--- a/accurest-core/src/main/groovy/io/coderate/accurest/dsl/WiremockResponseStubStrategy.groovy
+++ b/accurest-core/src/main/groovy/io/coderate/accurest/dsl/WiremockResponseStubStrategy.groovy
@@ -26,13 +26,13 @@ class WiremockResponseStubStrategy extends BaseWiremockStubStrategy {
 
     private Map<String, Object> buildResponseContent(ClientResponse response) {
         return [status : response?.status?.clientValue,
-                body   : response?.getBody()?.forClientSide(),
+                body   : response?.body?.forClientSide(),
                 headers: buildClientHeadersSection(response.headers)].findAll { it.value }
     }
 
     private Map<String, Object> buildResponseContent(ServerResponse response) {
         return [status : response?.status?.serverValue,
-                body   : response?.getBody()?.forServerSide(),
+                body   : response?.body?.forServerSide(),
                 headers: buildServerHeadersSection(response.headers)].findAll { it.value }
     }
 
diff --git a/accurest-core/src/main/groovy/io/coderate/accurest/dsl/internal/Body.groovy b/accurest-core/src/main/groovy/io/coderate/accurest/dsl/internal/Body.groovy
index 8d395ee2be..90ae62d726 100644
--- a/accurest-core/src/main/groovy/io/coderate/accurest/dsl/internal/Body.groovy
+++ b/accurest-core/src/main/groovy/io/coderate/accurest/dsl/internal/Body.groovy
@@ -15,10 +15,14 @@ class Body {
     }
 
     Map<String, Object> forClientSide() {
-        return body.collectEntries { Map.Entry<String, DslProperty> entry -> [(entry.key) : entry.value.clientValue] } as Map<String, Object>
+        return body.collectEntries {
+            Map.Entry<String, DslProperty> entry -> [(entry.key) : entry.value.clientValue]
+        } as Map<String, Object>
     }
 
     Map<String, Object> forServerSide() {
-        return body.collectEntries { Map.Entry<String, DslProperty> entry -> [(entry.key) : entry.value.serverValue] } as Map<String, Object>
+        return body.collectEntries {
+            Map.Entry<String, DslProperty> entry -> [(entry.key) : entry.value.serverValue]
+        } as Map<String, Object>
     }
 }