From 61e435e543ee747400138decfa35ad3de6ed03c1 Mon Sep 17 00:00:00 2001
From: Milosz Rembisz <r3mbol@gmail.com>
Date: Wed, 2 Dec 2015 12:56:51 +0100
Subject: [PATCH] review fixes

---
 .../accurest/builder/MockMvcSpockMethodBodyBuilder.groovy   | 2 +-
 .../codearte/accurest/builder/SpockMethodBodyBuilder.groovy | 2 +-
 .../groovy/io/codearte/accurest/dsl/internal/Common.groovy  | 2 +-
 .../io/codearte/accurest/dsl/internal/Multipart.groovy      | 2 +-
 .../io/codearte/accurest/dsl/internal/NamedProperty.groovy  | 6 ++++++
 .../groovy/io/codearte/accurest/dsl/internal/Request.groovy | 4 ----
 6 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/accurest-core/src/main/groovy/io/codearte/accurest/builder/MockMvcSpockMethodBodyBuilder.groovy b/accurest-core/src/main/groovy/io/codearte/accurest/builder/MockMvcSpockMethodBodyBuilder.groovy
index 8e8b7a9f4b..64cf5e4afc 100644
--- a/accurest-core/src/main/groovy/io/codearte/accurest/builder/MockMvcSpockMethodBodyBuilder.groovy
+++ b/accurest-core/src/main/groovy/io/codearte/accurest/builder/MockMvcSpockMethodBodyBuilder.groovy
@@ -30,7 +30,7 @@ class MockMvcSpockMethodBodyBuilder extends SpockMethodBodyBuilder {
 			bb.addLine(".body('''$bodyAsString''')")
 		}
 		if (request.multipart) {
-			multipartParameters.each { entry -> bb.addLine(getMultipartParameterLine(entry)) }
+			multipartParameters?.each { Map.Entry<String, Object> entry -> bb.addLine(getMultipartParameterLine(entry)) }
 		}
 		bb.unindent()
 	}
diff --git a/accurest-core/src/main/groovy/io/codearte/accurest/builder/SpockMethodBodyBuilder.groovy b/accurest-core/src/main/groovy/io/codearte/accurest/builder/SpockMethodBodyBuilder.groovy
index 8bbd5a0a07..ecff2bc043 100644
--- a/accurest-core/src/main/groovy/io/codearte/accurest/builder/SpockMethodBodyBuilder.groovy
+++ b/accurest-core/src/main/groovy/io/codearte/accurest/builder/SpockMethodBodyBuilder.groovy
@@ -123,7 +123,7 @@ abstract class SpockMethodBodyBuilder {
 	}
 
 	protected Map<String, Object> getMultipartParameters() {
-		return (Map<String, Object>)request.multipart.serverValue
+		return (Map<String, Object>)request?.multipart?.serverValue
 	}
 
 	protected String getMultipartParameterLine(Map.Entry<String, Object> parameter) {
diff --git a/accurest-core/src/main/groovy/io/codearte/accurest/dsl/internal/Common.groovy b/accurest-core/src/main/groovy/io/codearte/accurest/dsl/internal/Common.groovy
index cdf6d3db1f..a6d86e080b 100644
--- a/accurest-core/src/main/groovy/io/codearte/accurest/dsl/internal/Common.groovy
+++ b/accurest-core/src/main/groovy/io/codearte/accurest/dsl/internal/Common.groovy
@@ -53,7 +53,7 @@ class Common {
 	}
 
 	NamedProperty named(Map<String, DslProperty> namedMap){
-		return new NamedProperty(namedMap.get('name'), namedMap.get('content'))
+		return new NamedProperty(namedMap)
 	}
 
 	DslProperty value(ClientDslProperty client, ServerDslProperty server) {
diff --git a/accurest-core/src/main/groovy/io/codearte/accurest/dsl/internal/Multipart.groovy b/accurest-core/src/main/groovy/io/codearte/accurest/dsl/internal/Multipart.groovy
index b11bd85db2..1ebc06e1e7 100644
--- a/accurest-core/src/main/groovy/io/codearte/accurest/dsl/internal/Multipart.groovy
+++ b/accurest-core/src/main/groovy/io/codearte/accurest/dsl/internal/Multipart.groovy
@@ -14,7 +14,7 @@ class Multipart extends DslProperty {
     }
 
     private static Map<String, Object> extractValue(Map<String, DslProperty> multipart, Closure valueProvider) {
-        multipart.collectEntries { Map.Entry<String, DslProperty> entry ->
+        return multipart.collectEntries { Map.Entry<String, DslProperty> entry ->
             [(entry.key): valueProvider(entry.value)]
         } as Map<String, Object>
     }
diff --git a/accurest-core/src/main/groovy/io/codearte/accurest/dsl/internal/NamedProperty.groovy b/accurest-core/src/main/groovy/io/codearte/accurest/dsl/internal/NamedProperty.groovy
index b02a6a2c3f..70c6d30879 100644
--- a/accurest-core/src/main/groovy/io/codearte/accurest/dsl/internal/NamedProperty.groovy
+++ b/accurest-core/src/main/groovy/io/codearte/accurest/dsl/internal/NamedProperty.groovy
@@ -9,6 +9,8 @@ import groovy.transform.ToString
 @CompileStatic
 class NamedProperty {
 
+    private static final String NAME = 'name'
+    private static final String CONTENT = 'content'
     DslProperty name
     DslProperty value
 
@@ -16,4 +18,8 @@ class NamedProperty {
         this.name = name
         this.value = value
     }
+    
+    NamedProperty(Map<String, DslProperty> namedMap) {
+        this(namedMap?.get(NAME), namedMap?.get(CONTENT))
+    }
 }
diff --git a/accurest-core/src/main/groovy/io/codearte/accurest/dsl/internal/Request.groovy b/accurest-core/src/main/groovy/io/codearte/accurest/dsl/internal/Request.groovy
index 0ddff73bdc..54d57e8c53 100644
--- a/accurest-core/src/main/groovy/io/codearte/accurest/dsl/internal/Request.groovy
+++ b/accurest-core/src/main/groovy/io/codearte/accurest/dsl/internal/Request.groovy
@@ -118,10 +118,6 @@ class Request extends Common {
 		this.multipart = new Multipart(multipartAsValue)
 	}
 
-	Multipart getMultipart() {
-		return multipart
-	}
-
 	MatchingStrategy equalTo(Object value) {
 		return new MatchingStrategy(value, MatchingStrategy.Type.EQUAL_TO)
 	}