Create request after validation, remove string escaping in tests

Author: Dirk Hoekstra

client.go

@@ -59,10 +59,10 @@ func (c *Client) request(v interface{}, path string, data interface{}) error {
 	var jsonEncoded []byte
 	if data != nil {
 		jsonEncoded, err = json.Marshal(data)
-		method = "POST"
 		if err != nil {
 			return err
 		}
+		method = "POST"
 	}
 
 	request, err := http.NewRequest(method, uri.String(), bytes.NewBuffer(jsonEncoded))
@@ -73,7 +73,7 @@ func (c *Client) request(v interface{}, path string, data interface{}) error {
 	request.Header.Set("Content-Type", "application/json")
 	request.Header.Set("Accept", "application/json")
 	request.Header.Set("Authorization", "AccessKey "+c.AccessKey)
-	request.Header.Add("User-Agent", "MessageBird/ApiClient/"+ClientVersion+" Go/"+runtime.Version())
+	request.Header.Set("User-Agent", "MessageBird/ApiClient/"+ClientVersion+" Go/"+runtime.Version())
 
 	if c.DebugLog != nil {
 		if data != nil {

hlr.go

@@ -26,17 +26,17 @@ type hlrRequest struct {
 }
 
 func requestDataForHLR(msisdn string, reference string) (*hlrRequest, error) {
-	request := &hlrRequest{}
-
 	if msisdn == "" {
 		return nil, errors.New("msisdn is required")
 	}
 	if reference == "" {
 		return nil, errors.New("reference is required")
 	}
 
-	request.MSISDN = msisdn
-	request.Reference = reference
+	request := &hlrRequest{
+		MSISDN:    msisdn,
+		Reference: reference,
+	}
 
 	return request, nil
 }

lookup.go

@@ -1,8 +1,6 @@
 package messagebird
 
-import (
-	"net/url"
-)
+import "net/url"
 
 // Formats represents phone number in multiple formats.
 type Formats struct {

message.go

@@ -55,8 +55,6 @@ type messageRequest struct {
 }
 
 func requestDataForMessage(originator string, recipients []string, body string, params *MessageParams) (*messageRequest, error) {
-	request := &messageRequest{}
-
 	if originator == "" {
 		return nil, errors.New("originator is required")
 	}
@@ -66,9 +64,12 @@ func requestDataForMessage(originator string, recipients []string, body string,
 	if body == "" {
 		return nil, errors.New("body is required")
 	}
-	request.Originator = originator
-	request.Recipients = recipients
-	request.Body = body
+
+	request := &messageRequest{
+		Originator: originator,
+		Recipients: recipients,
+		Body:       body,
+	}
 
 	if params == nil {
 		return request, nil

message_test.go

@@ -7,7 +7,7 @@ import (
 
 var messageObject = []byte(`{
   "id":"6fe65f90454aa61536e6a88b88972670",
-  "href":"https:\/\/rest.messagebird.com\/messages\/6fe65f90454aa61536e6a88b88972670",
+  "href":"https://rest.messagebird.com/messages/6fe65f90454aa61536e6a88b88972670",
   "direction":"mt",
   "type":"sms",
   "originator":"TestName",
@@ -149,7 +149,7 @@ func TestNewMessageError(t *testing.T) {
 
 var messageWithParamsObject = []byte(`{
   "id":"6fe65f90454aa61536e6a88b88972670",
-  "href":"https:\/\/rest.messagebird.com\/messages\/6fe65f90454aa61536e6a88b88972670",
+  "href":"https://rest.messagebird.com/messages/6fe65f90454aa61536e6a88b88972670",
   "direction":"mt",
   "type":"sms",
   "originator":"TestName",
@@ -218,7 +218,7 @@ func TestNewMessageWithParams(t *testing.T) {
 
 var binaryMessageObject = []byte(`{
   "id":"6fe65f90454aa61536e6a88b88972670",
-  "href":"https:\/\/rest.messagebird.com\/messages\/6fe65f90454aa61536e6a88b88972670",
+  "href":"https://rest.messagebird.com/messages/6fe65f90454aa61536e6a88b88972670",
   "direction":"mt",
   "type":"binary",
   "originator":"TestName",
@@ -276,7 +276,7 @@ func TestNewMessageWithBinaryType(t *testing.T) {
 
 var premiumMessageObject = []byte(`{
   "id":"6fe65f90454aa61536e6a88b88972670",
-  "href":"https:\/\/rest.messagebird.com\/messages\/6fe65f90454aa61536e6a88b88972670",
+  "href":"https://rest.messagebird.com/messages/6fe65f90454aa61536e6a88b88972670",
   "direction":"mt",
   "type":"premium",
   "originator":"TestName",
@@ -344,7 +344,7 @@ func TestNewMessageWithPremiumType(t *testing.T) {
 
 var flashMessageObject = []byte(`{
   "id":"6fe65f90454aa61536e6a88b88972670",
-  "href":"https:\/\/rest.messagebird.com\/messages\/6fe65f90454aa61536e6a88b88972670",
+  "href":"https://rest.messagebird.com/messages/6fe65f90454aa61536e6a88b88972670",
   "direction":"mt",
   "type":"flash",
   "originator":"TestName",
@@ -391,7 +391,7 @@ func TestNewMessageWithFlashType(t *testing.T) {
 
 var messageObjectWithCreatedDatetime = []byte(`{
   "id":"6fe65f90454aa61536e6a88b88972670",
-  "href":"https:\/\/rest.messagebird.com\/messages\/6fe65f90454aa61536e6a88b88972670",
+  "href":"https://rest.messagebird.com/messages/6fe65f90454aa61536e6a88b88972670",
   "direction":"mt",
   "type":"sms",
   "originator":"TestName",

verify.go

@@ -45,12 +45,13 @@ type verifyRequest struct {
 }
 
 func requestDataForVerify(recipient string, params *VerifyParams) (*verifyRequest, error) {
-	request := &verifyRequest{}
-
 	if recipient == "" {
 		return nil, errors.New("recipient is required")
 	}
-	request.Recipient = recipient
+
+	request := &verifyRequest{
+		Recipient: recipient,
+	}
 
 	if params == nil {
 		return request, nil

voice_message.go

@@ -47,16 +47,17 @@ type voiceMessageRequest struct {
 }
 
 func requestDataForVoiceMessage(recipients []string, body string, params *VoiceMessageParams) (*voiceMessageRequest, error) {
-	request := &voiceMessageRequest{}
-
 	if len(recipients) == 0 {
 		return nil, errors.New("at least 1 recipient is required")
 	}
 	if body == "" {
 		return nil, errors.New("body is required")
 	}
-	request.Recipients = recipients
-	request.Body = body
+
+	request := &voiceMessageRequest{
+		Recipients: recipients,
+		Body:       body,
+	}
 
 	if params == nil {
 		return request, nil