Merge remote-tracking branch 'origin/master' into release

Author: dynabic-billing-team

README.md

@@ -16,6 +16,10 @@ Feel free to explore the [Developer's Guide](https://docs.aspose.cloud/display/w
 - Add & remove watermarks and protection.
 - Read & write access to Document Object Model.
 
+## Enhancements in Version 21.11
+
+
+
 ## Enhancements in Version 21.10
 
 - Removed 'GraphicsQualityOptions' image save option as it no longer supported.
@@ -204,27 +208,35 @@ Config.json file:
 Go code:
 
 ```
-	// Start README example
-
-	// init words cloud api
-	config, _ := models.NewConfiguration(configFilePath)
-	wordsApi, ctx, _ := api.CreateWordsApi(config)
-
-	// upload test.docx to a cloud
-	// remote.docx is a name in the cloud
-	file, _ := os.Open(localFilePath)
-	wordsApi.UploadFile(ctx, file, remotePath, nil)
-
-	// get a text for the first paragraph of the first section
-	options := map[string]interface{}{
-		"folder": remoteFolder,
-	}
-
-	result, _, _ := wordsApi.GetParagraphs(ctx, remoteName, options)
-
-	fmt.Println(result.Paragraphs.ParagraphLinkList[0].Text)
-
-	// End README example
+    // Start README example
+
+    // init words cloud api
+    config, _ := models.NewConfiguration(configFilePath)
+    wordsApi, ctx, _ := api.CreateWordsApi(config)
+
+    // upload test.docx to a cloud
+    // remote.docx is a name in the cloud
+        file, _ := os.Open(localFilePath)
+    uploadRequest := &models.UploadFileRequest{
+        FileContent: file,
+        Path: &remotePath,
+    }
+    wordsApi.UploadFile(ctx, uploadRequest)
+
+    // get a text for the first paragraph of the first section
+    options := map[string]interface{}{
+        "folder": remoteFolder,
+    }
+    request := &models.GetParagraphsRequest{
+        Name: &remoteName,
+        Optionals: options,
+    }
+
+    result, _, _ := wordsApi.GetParagraphs(ctx, request)
+
+    fmt.Println(result.Paragraphs.ParagraphLinkList[0].Text)
+
+    // End README example
 ```
 
 [Product Page](https://products.aspose.cloud/words/go) | [Documentation](https://docs.aspose.cloud/display/wordscloud/Home) | [API Reference](https://apireference.aspose.cloud/words/) | [Code Samples](https://github.com/aspose-words-cloud/aspose-words-cloud-go) | [Blog](https://blog.aspose.cloud/category/words/) | [Free Support](https://forum.aspose.cloud/c/words) | [Free Trial](https://dashboard.aspose.cloud/#/apps)

dev/api/api_client.go

@@ -65,7 +65,7 @@ var (
     xmlCheck = regexp.MustCompile("(?i:[application|text]/xml)")
 )
 
-// APIClient manages communication with the Aspose.Words for Cloud API Reference API v21.10
+// APIClient manages communication with the Aspose.Words for Cloud API Reference API v21.11
 // In most cases there should be only one, shared, APIClient.
 type APIClient struct {
     cfg 	*models.Configuration

dev/api/models/configuration.go

@@ -94,7 +94,7 @@ func NewConfiguration(configFilePath string) (pConfig *Configuration, err error)
 	cfg := Configuration{
 		BaseUrl:       "https://api.aspose.cloud",
 		DebugMode:     false,
-		DefaultHeader: map[string]string{"x-aspose-client": "go sdk", "x-aspose-client-version": "21.10"},
+		DefaultHeader: map[string]string{"x-aspose-client": "go sdk", "x-aspose-client-version": "21.11"},
 	}
 	err = json.Unmarshal(data, &cfg)
 

dev/api/words_api.go

@@ -14802,11 +14802,27 @@ func (a *WordsApiService) UploadFile(ctx context.Context, data *models.UploadFil
 }
 
 
+/* WordsApiService Batch request.
+ * @param ctx context.Context for authentication, logging, tracing, etc.
+ * @requests to be called as one call.
+@return array of results */
 /* WordsApiService Batch request.
  * @param ctx context.Context for authentication, logging, tracing, etc.
  * @requests to be called as one call.
 @return array of results */
 func (a *WordsApiService) Batch(ctx context.Context, requests ...models.BatchPartRequest) ([]interface{}, *http.Response, error) {
+	return a.batch(ctx, false, requests)
+}
+
+/* WordsApiService Batch request without intermediate results.
+ * @param ctx context.Context for authentication, logging, tracing, etc.
+ * @requests to be called as one call.
+@return array with one element (a result of last executed request). */
+func (a *WordsApiService) BatchWithoutIntermidiateResults(ctx context.Context, requests ...models.BatchPartRequest) ([]interface{}, *http.Response, error) {
+	return a.batch(ctx, true, requests)
+}
+
+func (a *WordsApiService) batch(ctx context.Context, withoutIntermediateResults bool, requests []models.BatchPartRequest) ([]interface{}, *http.Response, error) {
 
 	if requests == nil || len(requests) == 0 {
 		return nil, nil, errors.New("The Batch method requires one or more requests.")
@@ -14880,7 +14896,12 @@ func (a *WordsApiService) Batch(ctx context.Context, requests ...models.BatchPar
 		writer.Close()
 	}()
 
-	request, err := http.NewRequest("PUT", a.client.cfg.BaseUrl+"/words/batch", reader)
+    url := a.client.cfg.BaseUrl+"/words/batch"
+    if withoutIntermediateResults {
+        url = url + "?displayIntermediateResults=false"
+    }
+
+	request, err := http.NewRequest("PUT", url, reader)
 	if err != nil {
 		return nil, nil, err
 	}

dev/tests/batch_test.go

@@ -109,6 +109,74 @@ func Test_BatchRequest(t *testing.T) {
 	assert.Equal(t, "Reader", reflect.TypeOf(actual[4]).Elem().Name(), "Validate BuildReportOnline response.")
 }
 
+func Test_BatchRequestWithoutIntermediateResults(t *testing.T) {
+	config := ReadConfiguration(t)
+	client, ctx := PrepareTest(t, config)
+
+	remoteDataFolder := remoteBaseTestDataFolder + "/DocumentElements/Paragraphs"
+	localFile := "Common/test_multi_pages.docx"
+	reportingFolder := "DocumentActions/Reporting"
+	remoteFileName := "TestGetDocumentParagraphByIndex.docx"
+
+	localDocumentFile := "ReportTemplate.docx"
+	localDataFile := reportingFolder + "/ReportData.json"
+
+	UploadNextFileToStorage(t, ctx, client, GetLocalFile(localFile), remoteDataFolder+"/"+remoteFileName)
+
+	options := map[string]interface{}{
+		"nodePath": "sections/0",
+		"folder":   remoteDataFolder,
+	}
+
+	request1 := *models.NewBatchPartRequest(&models.GetParagraphsRequest{
+		Name:      ToStringPointer(remoteFileName),
+		Optionals: options,
+	})
+
+	request2 := *models.NewBatchPartRequest(&models.GetParagraphRequest{
+		Name:      ToStringPointer(remoteFileName),
+		Index:     ToInt32Pointer(0),
+		Optionals: options,
+	})
+
+	request3 := *models.NewBatchPartRequest(&models.InsertParagraphRequest{
+		Name: ToStringPointer(remoteFileName),
+		Paragraph: models.ParagraphInsert{
+			Text: ToStringPointer("This is a new paragraph for your document"),
+		},
+		Optionals: options,
+	})
+
+	request4 := *models.NewBatchPartRequest(&models.DeleteParagraphRequest{
+		Name:  ToStringPointer(remoteFileName),
+		Index: ToInt32Pointer(0),
+		Optionals: map[string]interface{}{
+			"nodePath": "",
+			"folder":   remoteDataFolder,
+		},
+	})
+
+	templateFile, err := os.Open(GetLocalFile(reportingFolder + "/" + localDocumentFile))
+	if err != nil {
+		t.Error(err)
+	}
+
+	request5 := *models.NewBatchPartRequest(&models.BuildReportOnlineRequest{
+		Template: templateFile,
+		Data:     ToStringPointer(ReadFile(t, localDataFile)),
+		ReportEngineSettings: models.ReportEngineSettings{
+			DataSourceType: ToStringPointer("Json"),
+			DataSourceName: ToStringPointer("persons"),
+		},
+	})
+
+	actual, _, err := client.WordsApi.BatchWithoutIntermidiateResults(ctx, request1, request2, request3, request4, request5)
+
+	assert.Nil(t, err, err)
+	assert.True(t, len(actual) == 1)
+	assert.Equal(t, "Reader", reflect.TypeOf(actual[0]).Elem().Name(), "Validate BuildReportOnline response.")
+}
+
 func Test_Batch_With_Reversed_Order(t *testing.T) {
 	config := ReadConfiguration(t)
 	client, ctx := PrepareTest(t, config)

v2111/.vscode/launch.json

@@ -0,0 +1,17 @@
+{
+    // Use IntelliSense to learn about possible attributes.
+    // Hover to view descriptions of existing attributes.
+    // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
+    "version": "0.2.0",
+    "configurations": [
+        {
+            "name": "Launch",
+            "type": "go",
+            "request": "launch",
+            "mode": "auto",
+            "program": "${fileDirname}",
+            "env": {},
+            "args": []
+        }
+    ]
+}

v2111/LICENSE.md

@@ -0,0 +1,7 @@
+Copyright 2020 Aspose
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.