- aligns set content from parsable parameters order to changes from #…

…480
microsoft · Aug 16, 2021 · cd4db01 · cd4db01
1 parent 5f1eca1
commit cd4db01
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 4 deletions.
diff --git a/abstractions/go/request_info.go b/abstractions/go/request_info.go
@@ -52,11 +52,13 @@ func (request *RequestInfo) SetStreamContent(content []byte) {
 	request.Content = content
 	request.Headers[contentTypeHeader] = binaryContentType
 }
-func (request *RequestInfo) SetContentFromParsable(item s.Parsable, coreService HttpCore, contentType string) error {
+func (request *RequestInfo) SetContentFromParsable(coreService HttpCore, contentType string, items ...s.Parsable) error {
 	if contentType == "" {
 		return errors.New("content type cannot be empty")
 	} else if coreService == nil {
 		return errors.New("coreService cannot be nil")
+	} else if items == nil || len(items) == 0 {
+		return errors.New("items cannot be nil or empty")
 	}
 	factory, err := coreService.GetSerializationWriterFactory()
 	if err != nil {
@@ -71,7 +73,12 @@ func (request *RequestInfo) SetContentFromParsable(item s.Parsable, coreService
 		return errors.New("writer cannot be nil")
 	}
 	defer writer.Close()
-	writeErr := writer.WriteObjectValue("", item)
+	var writeErr error
+	if len(items) == 1 {
+		writeErr = writer.WriteObjectValue("", items[0])
+	} else {
+		writeErr = writer.WriteCollectionOfObjectValues("", items)
+	}
 	if writeErr != nil {
 		return writeErr
 	}

diff --git a/src/Kiota.Builder/Writers/Go/CodeMethodWriter.cs b/src/Kiota.Builder/Writers/Go/CodeMethodWriter.cs
@@ -331,7 +331,7 @@ private void WriteRequestGeneratorBody(CodeMethod codeElement, CodeParameter req
                 if(requestBodyParam.Type.Name.Equals("binary", StringComparison.OrdinalIgnoreCase))
                     writer.WriteLine($"{rInfoVarName}.SetStreamContent({requestBodyParam.Name})");
                 else
-                    writer.WriteLine($"{rInfoVarName}.SetContentFromParsable({requestBodyParam.Name}, m.{conventions.HttpCorePropertyName}, \"{codeElement.ContentType}\")");
+                    writer.WriteLine($"{rInfoVarName}.SetContentFromParsable(m.{conventions.HttpCorePropertyName}, \"{codeElement.ContentType}\", {requestBodyParam.Name})");
             if(queryStringParam != null) {
                 var httpMethodPrefix = codeElement.HttpMethod.ToString().ToFirstCharacterUpperCase();
                 writer.WriteLine($"if {queryStringParam.Name} != nil {{");

diff --git a/tests/Kiota.Builder.Tests/Writers/Go/CodeMethodWriterTests.cs b/tests/Kiota.Builder.Tests/Writers/Go/CodeMethodWriterTests.cs
@@ -178,7 +178,7 @@ public void WritesRequestGeneratorBody() {
             Assert.Contains("qParams.AddQueryParameters(requestInfo.QueryParameters)", result);
             Assert.Contains("o != nil", result);
             Assert.Contains("requestInfo.AddMiddlewareOptions(o)", result);
-            Assert.Contains("requestInfo.SetContentFromParsable(b, m.httpCore", result);
+            Assert.Contains("requestInfo.SetContentFromParsable(m.httpCore", result);
             Assert.Contains("return requestInfo, err", result);
             AssertExtensions.CurlyBracesAreClosed(result);
         }