Remove duplicated code for StatObject() (#1584)

Clean up duplicate internal functions. fixes #1583
minio · Nov 15, 2021 · fd3932c · fd3932c
1 parent f18c9fc
commit fd3932c
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 22 deletions.
diff --git a/api-compose-object.go b/api-compose-object.go
@@ -398,7 +398,7 @@ func (c *Client) ComposeObject(ctx context.Context, dst CopyDestOptions, srcs ..
 	var err error
 	for i, src := range srcs {
 		opts := StatObjectOptions{ServerSideEncryption: encrypt.SSE(src.Encryption), VersionID: src.VersionID}
-		srcObjectInfos[i], err = c.statObject(context.Background(), src.Bucket, src.Object, opts)
+		srcObjectInfos[i], err = c.StatObject(context.Background(), src.Bucket, src.Object, opts)
 		if err != nil {
 			return UploadInfo{}, err
 		}

diff --git a/api-get-object-acl.go b/api-get-object-acl.go
@@ -75,7 +75,7 @@ func (c *Client) GetObjectACL(ctx context.Context, bucketName, objectName string
 		return nil, err
 	}
 
-	objInfo, err := c.statObject(ctx, bucketName, objectName, StatObjectOptions{})
+	objInfo, err := c.StatObject(ctx, bucketName, objectName, StatObjectOptions{})
 	if err != nil {
 		return nil, err
 	}

diff --git a/api-get-object.go b/api-get-object.go
@@ -139,7 +139,7 @@ func (c *Client) GetObject(ctx context.Context, bucketName, objectName string, o
 
 						// Remove range header if already set, for stat Operations to get original file size.
 						delete(opts.headers, "Range")
-						objectInfo, err = c.statObject(ctx, bucketName, objectName, StatObjectOptions(opts))
+						objectInfo, err = c.StatObject(ctx, bucketName, objectName, StatObjectOptions(opts))
 						if err != nil {
 							resCh <- getResponse{
 								Error: err,
@@ -162,7 +162,7 @@ func (c *Client) GetObject(ctx context.Context, bucketName, objectName string, o
 					if etag != "" && !snowball {
 						opts.SetMatchETag(etag)
 					}
-					objectInfo, err := c.statObject(ctx, bucketName, objectName, StatObjectOptions(opts))
+					objectInfo, err := c.StatObject(ctx, bucketName, objectName, StatObjectOptions(opts))
 					if err != nil {
 						resCh <- getResponse{
 							Error: err,

diff --git a/api-stat.go b/api-stat.go
@@ -59,18 +59,6 @@ func (c *Client) BucketExists(ctx context.Context, bucketName string) (bool, err
 
 // StatObject verifies if object exists and you have permission to access.
 func (c *Client) StatObject(ctx context.Context, bucketName, objectName string, opts StatObjectOptions) (ObjectInfo, error) {
-	// Input validation.
-	if err := s3utils.CheckValidBucketName(bucketName); err != nil {
-		return ObjectInfo{}, err
-	}
-	if err := s3utils.CheckValidObjectName(objectName); err != nil {
-		return ObjectInfo{}, err
-	}
-	return c.statObject(ctx, bucketName, objectName, opts)
-}
-
-// Lower level API for statObject supporting pre-conditions and range headers.
-func (c *Client) statObject(ctx context.Context, bucketName, objectName string, opts StatObjectOptions) (ObjectInfo, error) {
 	// Input validation.
 	if err := s3utils.CheckValidBucketName(bucketName); err != nil {
 		return ObjectInfo{}, err

diff --git a/core.go b/core.go
@@ -125,9 +125,3 @@ func (c Core) PutBucketPolicy(ctx context.Context, bucket, bucketPolicy string)
 func (c Core) GetObject(ctx context.Context, bucketName, objectName string, opts GetObjectOptions) (io.ReadCloser, ObjectInfo, http.Header, error) {
 	return c.getObject(ctx, bucketName, objectName, opts)
 }
-
-// StatObject is a lower level API implemented to support special
-// conditions matching etag, modtime on a request.
-func (c Core) StatObject(ctx context.Context, bucketName, objectName string, opts StatObjectOptions) (ObjectInfo, error) {
-	return c.statObject(ctx, bucketName, objectName, opts)
-}