Skip to content

Commit 5a92fed

Browse files
vnalawad-tibcovnalawad-tibco
committed
Renamed struct fields for better code reading
1 parent 44e3b47 commit 5a92fed

File tree

3 files changed

+33
-33
lines changed

3 files changed

+33
-33
lines changed

‎activity/soapclient/activity.go

+13-13
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,7 @@ func (a *Activity) Eval(ctx activity.Context) (done bool, err error) {
140140
return false, err
141141
}
142142

143-
headers := input.RequestHeaders
143+
headers := input.SOAPRequestHeaders
144144
if headers != nil {
145145
var headerBytes []byte
146146
if a.xmlPassThroughMode {
@@ -228,40 +228,40 @@ func (a *Activity) Eval(ctx activity.Context) (done bool, err error) {
228228

229229
if res.Env.Header() != nil {
230230
if a.xmlPassThroughMode {
231-
output.ResponseHeaders = string(res.Env.Header().Content)
231+
output.SOAPResponseHeaders = string(res.Env.Header().Content)
232232
} else {
233233
headers_xml, err := mxj.NewMapXml(res.Env.Header().Content, false)
234234
if err != nil {
235235
return false, err
236236
}
237-
output.ResponseHeaders = headers_xml.Old()
237+
output.SOAPResponseHeaders = headers_xml.Old()
238238
}
239239
}
240240

241241
if a.settings.SoapVersion == "1.1" {
242242
soap11ResponseBody := res.Env.Body().(*soap.Body11)
243243
if soap11ResponseBody.PayloadElem != nil {
244244
if a.xmlPassThroughMode {
245-
output.ResponsePayload = string(soap11ResponseBody.PayloadElem)
245+
output.SOAPResponsePayload = string(soap11ResponseBody.PayloadElem)
246246
} else {
247247
mv, err := mxj.NewMapXml(soap11ResponseBody.PayloadElem, false)
248248
if err != nil {
249249
return false, err
250250
}
251-
output.ResponsePayload = mv.Old()
251+
output.SOAPResponsePayload = mv.Old()
252252
}
253253
}
254254
} else {
255255
soap12ResponseBody := res.Env.Body().(*soap.Body12)
256256
if soap12ResponseBody.PayloadElem != nil {
257257
if a.xmlPassThroughMode {
258-
output.ResponsePayload = string(soap12ResponseBody.PayloadElem)
258+
output.SOAPResponsePayload = string(soap12ResponseBody.PayloadElem)
259259
} else {
260260
mv, err := mxj.NewMapXml(soap12ResponseBody.PayloadElem, false)
261261
if err != nil {
262262
return false, err
263263
}
264-
output.ResponsePayload = mv.Old()
264+
output.SOAPResponsePayload = mv.Old()
265265
}
266266
}
267267
}
@@ -274,13 +274,13 @@ func (a *Activity) Eval(ctx activity.Context) (done bool, err error) {
274274

275275
if res.Env.Header() != nil {
276276
if a.xmlPassThroughMode {
277-
output.ResponseHeaders = string(res.Env.Header().Content)
277+
output.SOAPResponseHeaders = string(res.Env.Header().Content)
278278
} else {
279279
headers_xml, err := mxj.NewMapXml(res.Env.Header().Content, false)
280280
if err != nil {
281281
return false, err
282282
}
283-
output.ResponseHeaders = headers_xml.Old()
283+
output.SOAPResponseHeaders = headers_xml.Old()
284284
}
285285
}
286286

@@ -291,7 +291,7 @@ func (a *Activity) Eval(ctx activity.Context) (done bool, err error) {
291291
fault := soap11ResponseBody.FaultElem
292292
if a.xmlPassThroughMode {
293293
xmlFault, _ := xml.Marshal(soap11ResponseBody.FaultElem)
294-
output.ResponseFault = string(xmlFault)
294+
output.SOAPResponseFault = string(xmlFault)
295295
} else {
296296
faultObj := make(map[string]interface{})
297297
faultObj["faultcode"] = fault.Code
@@ -304,7 +304,7 @@ func (a *Activity) Eval(ctx activity.Context) (done bool, err error) {
304304
}
305305
faultObj["detail"] = mv.Old()
306306
}
307-
output.ResponseFault = faultObj
307+
output.SOAPResponseFault = faultObj
308308
}
309309
}
310310
} else {
@@ -314,7 +314,7 @@ func (a *Activity) Eval(ctx activity.Context) (done bool, err error) {
314314
fault := soap12ResponseBody.FaultElem
315315
if a.xmlPassThroughMode {
316316
xmlFault, _ := xml.Marshal(soap12ResponseBody.FaultElem)
317-
output.ResponseFault = string(xmlFault)
317+
output.SOAPResponseFault = string(xmlFault)
318318
} else {
319319
faultObj := make(map[string]interface{})
320320
fc_bytes, err := xml.Marshal(fault.Code)
@@ -340,7 +340,7 @@ func (a *Activity) Eval(ctx activity.Context) (done bool, err error) {
340340
}
341341
faultObj["Detail"] = mv.Old()
342342
}
343-
output.ResponseFault = faultObj
343+
output.SOAPResponseFault = faultObj
344344
}
345345
}
346346
}

‎activity/soapclient/activity_test.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -43,8 +43,8 @@ func TestSOAPClientActivity(t *testing.T) {
4343
assert.NotNil(t, output)
4444
assert.Equal(t, 200, output.HttpStatus)
4545
assert.False(t, output.IsFault)
46-
assert.NotNil(t, output.ResponsePayload)
47-
res, err1 := coerce.ToObject(output.ResponsePayload)
46+
assert.NotNil(t, output.SOAPResponsePayload)
47+
res, err1 := coerce.ToObject(output.SOAPResponsePayload)
4848
assert.Nil(t, err1)
4949
resObj := res["NumberToWordsResponse"].(map[string]interface{})
5050
assert.Equal(t, "one hundred", resObj["NumberToWordsResult"])
@@ -69,5 +69,5 @@ func TestSOAPClientActivityFault(t *testing.T) {
6969
assert.NotNil(t, output)
7070
assert.Equal(t, 500, output.HttpStatus)
7171
assert.True(t, output.IsFault)
72-
assert.NotNil(t, output.ResponseFault)
72+
assert.NotNil(t, output.SOAPResponseFault)
7373
}

‎activity/soapclient/metadata.go

+17-17
Original file line numberDiff line numberDiff line change
@@ -15,52 +15,52 @@ type Settings struct {
1515
}
1616

1717
type Input struct {
18-
SoapAction string `md:"soapAction"`
19-
HttpQueryParams map[string]string `md:"httpQueryParams"` // The HTTP query parameters
20-
RequestHeaders interface{} `md:"soapRequestHeaders"` // The HTTP header parameters
21-
RequestBody interface{} `md:"soapRequestBody"` // The message content to send. This is only used in POST, PUT, and PATCH
18+
SoapAction string `md:"soapAction"`
19+
HttpQueryParams map[string]string `md:"httpQueryParams"` // The HTTP query parameters
20+
SOAPRequestHeaders interface{} `md:"soapRequestHeaders"` // The HTTP header parameters
21+
RequestBody interface{} `md:"soapRequestBody"` // The message content to send. This is only used in POST, PUT, and PATCH
2222
}
2323

2424
func (i *Input) ToMap() map[string]interface{} {
2525
return map[string]interface{}{
2626
"soapAction": i.SoapAction,
2727
"httpQueryParams": i.HttpQueryParams,
28-
"soapRequestHeaders": i.RequestHeaders,
28+
"soapRequestHeaders": i.SOAPRequestHeaders,
2929
"soapRequestBody": i.RequestBody,
3030
}
3131
}
3232

3333
func (i *Input) FromMap(values map[string]interface{}) error {
34-
i.RequestHeaders = values["soapRequestHeaders"]
34+
i.SOAPRequestHeaders = values["soapRequestHeaders"]
3535
i.RequestBody = values["soapRequestBody"]
3636
i.HttpQueryParams, _ = coerce.ToParams(values["httpQueryParams"])
3737
i.SoapAction, _ = values["soapAction"].(string)
3838
return nil
3939
}
4040

4141
type Output struct {
42-
HttpStatus int `md:"httpStatus"` // The HTTP status code
43-
IsFault bool `md:"isFault"` // True if the response is a fault
44-
ResponsePayload interface{} `md:"soapResponsePayload"` // The SOAP response content
45-
ResponseHeaders interface{} `md:"soapResponseHeaders"` // The SOAP response headers
46-
ResponseFault interface{} `md:"soapResponseFault"` // The SOAP fault content
42+
HttpStatus int `md:"httpStatus"` // The HTTP status code
43+
IsFault bool `md:"isFault"` // True if the response is a fault
44+
SOAPResponsePayload interface{} `md:"soapResponsePayload"` // The SOAP response content
45+
SOAPResponseHeaders interface{} `md:"soapResponseHeaders"` // The SOAP response headers
46+
SOAPResponseFault interface{} `md:"soapResponseFault"` // The SOAP fault content
4747
}
4848

4949
func (o *Output) ToMap() map[string]interface{} {
5050
return map[string]interface{}{
5151
"httpStatus": o.HttpStatus,
5252
"isFault": o.IsFault,
53-
"soapResponsePayload": o.ResponsePayload,
54-
"soapResponseHeaders": o.ResponseHeaders,
55-
"soapResponseFault": o.ResponseFault,
53+
"soapResponsePayload": o.SOAPResponsePayload,
54+
"soapResponseHeaders": o.SOAPResponseHeaders,
55+
"soapResponseFault": o.SOAPResponseFault,
5656
}
5757
}
5858

5959
func (o *Output) FromMap(values map[string]interface{}) error {
6060
o.IsFault, _ = values["isFault"].(bool)
61-
o.ResponsePayload = values["soapResponsePayload"]
62-
o.ResponseHeaders = values["soapResponseHeaders"]
63-
o.ResponseFault = values["soapResponseFault"]
61+
o.SOAPResponsePayload = values["soapResponsePayload"]
62+
o.SOAPResponseHeaders = values["soapResponseHeaders"]
63+
o.SOAPResponseFault = values["soapResponseFault"]
6464
o.HttpStatus, _ = values["httpStatus"].(int)
6565
return nil
6666
}

0 commit comments

Comments
 (0)