[beam] branch master updated: change return type of 2 methods

[pa...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

pabloem pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/beam.git


The following commit(s) were added to refs/heads/master by this push:
     new 22e761c  change return type of 2 methods
     new ba35c86  Merge pull request #16196 from [BEAM-13408][Playground] Change return type of 2 methods
22e761c is described below

commit 22e761c7af32c48027e82004e6fe49a50a83b365
Author: daria-malkova <da...@akvelon.com>
AuthorDate: Fri Dec 10 16:45:53 2021 +0300

    change return type of 2 methods
---
 playground/backend/cmd/server/controller.go                |  4 ++--
 .../backend/internal/cloud_bucket/precompiled_objects.go   | 14 +++++++-------
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/playground/backend/cmd/server/controller.go b/playground/backend/cmd/server/controller.go
index 64f2d3d..706613b 100644
--- a/playground/backend/cmd/server/controller.go
+++ b/playground/backend/cmd/server/controller.go
@@ -226,7 +226,7 @@ func (controller *playgroundController) GetPrecompiledObjectCode(ctx context.Con
 		logger.Errorf("GetPrecompiledObject(): cloud storage error: %s", err.Error())
 		return nil, errors.InternalError("GetPrecompiledObjects(): ", err.Error())
 	}
-	response := pb.GetPrecompiledObjectCodeResponse{Code: *codeString}
+	response := pb.GetPrecompiledObjectCodeResponse{Code: codeString}
 	return &response, nil
 }
 
@@ -238,6 +238,6 @@ func (controller *playgroundController) GetPrecompiledObjectOutput(ctx context.C
 		logger.Errorf("GetPrecompiledObjectOutput(): cloud storage error: %s", err.Error())
 		return nil, errors.InternalError("GetPrecompiledObjectOutput(): ", err.Error())
 	}
-	response := pb.GetRunOutputResponse{Output: *output}
+	response := pb.GetRunOutputResponse{Output: output}
 	return &response, nil
 }
diff --git a/playground/backend/internal/cloud_bucket/precompiled_objects.go b/playground/backend/internal/cloud_bucket/precompiled_objects.go
index 8b612c6..c9265f9 100644
--- a/playground/backend/internal/cloud_bucket/precompiled_objects.go
+++ b/playground/backend/internal/cloud_bucket/precompiled_objects.go
@@ -93,27 +93,27 @@ func New() *CloudStorage {
 }
 
 // GetPrecompiledObject returns the source code of the example
-func (cd *CloudStorage) GetPrecompiledObject(ctx context.Context, precompiledObjectPath string) (*string, error) {
+func (cd *CloudStorage) GetPrecompiledObject(ctx context.Context, precompiledObjectPath string) (string, error) {
 	extension, err := getFileExtensionBySdk(precompiledObjectPath)
 	if err != nil {
-		return nil, err
+		return "", err
 	}
 	data, err := cd.getFileFromBucket(ctx, precompiledObjectPath, extension)
 	if err != nil {
-		return nil, err
+		return "", err
 	}
 	result := string(data)
-	return &result, nil
+	return result, nil
 }
 
 // GetPrecompiledObjectOutput returns the run output of the example
-func (cd *CloudStorage) GetPrecompiledObjectOutput(ctx context.Context, precompiledObjectPath string) (*string, error) {
+func (cd *CloudStorage) GetPrecompiledObjectOutput(ctx context.Context, precompiledObjectPath string) (string, error) {
 	data, err := cd.getFileFromBucket(ctx, precompiledObjectPath, OutputExtension)
 	if err != nil {
-		return nil, err
+		return "", err
 	}
 	result := string(data)
-	return &result, nil
+	return result, nil
 }
 
 // GetPrecompiledObjects returns stored at the cloud storage bucket precompiled objects for the target category