remove GetUrl/GetQueries

sdk/requests/acs_request.go

@@ -59,8 +59,6 @@ type AcsRequest interface {
 	GetDomain() string
 	GetPort() string
 	GetRegionId() string
-	GetUrl() string
-	GetQueries() string
 	GetHeaders() map[string]string
 	GetQueryParams() map[string]string
 	GetFormParams() map[string]string

sdk/requests/acs_request_test.go

@@ -115,18 +115,10 @@ func (r AcsRequestTest) GetBodyReader() io.Reader {
 	return nil
 }
 
-func (r AcsRequestTest) GetQueries() string {
-	return ""
-}
-
 func (r AcsRequestTest) GetStyle() string {
 	return ""
 }
 
-func (r AcsRequestTest) GetUrl() string {
-	return ""
-}
-
 func (r AcsRequestTest) addPathParam(key, value string) {
 	return
 }

sdk/requests/common_request.go

@@ -3,9 +3,10 @@ package requests
 import (
 	"bytes"
 	"fmt"
-	"github.com/aliyun/alibaba-cloud-sdk-go/sdk/errors"
 	"io"
 	"strings"
+
+	"github.com/aliyun/alibaba-cloud-sdk-go/sdk/errors"
 )
 
 type CommonRequest struct {
@@ -33,8 +34,6 @@ func NewCommonRequest() (request *CommonRequest) {
 
 func (request *CommonRequest) String() string {
 	request.TransToAcsRequest()
-	request.BuildQueries()
-	request.BuildUrl()
 
 	resultBuilder := bytes.Buffer{}
 
@@ -48,7 +47,7 @@ func (request *CommonRequest) String() string {
 
 	// Request Line
 	resultBuilder.WriteString("\n")
-	resultBuilder.WriteString(fmt.Sprintf("%s %s %s/1.1\n", request.Method, request.GetQueries(), strings.ToUpper(request.Scheme)))
+	resultBuilder.WriteString(fmt.Sprintf("%s %s %s/1.1\n", request.Method, request.BuildQueries(), strings.ToUpper(request.Scheme)))
 
 	// Headers
 	resultBuilder.WriteString("Host" + ": " + request.Domain + "\n")
@@ -103,18 +102,6 @@ func (request *CommonRequest) BuildQueries() string {
 	return request.Ontology.BuildQueries()
 }
 
-func (request *CommonRequest) GetUrl() string {
-	if len(request.Port) > 0 {
-		return strings.ToLower(request.Scheme) + "://" + request.Domain + ":" + request.Port + request.GetQueries()
-	}
-
-	return strings.ToLower(request.Scheme) + "://" + request.Domain + request.GetQueries()
-}
-
-func (request *CommonRequest) GetQueries() string {
-	return request.Ontology.GetQueries()
-}
-
 func (request *CommonRequest) GetBodyReader() io.Reader {
 	return request.Ontology.GetBodyReader()
 }

sdk/requests/roa_request.go

@@ -45,10 +45,6 @@ func (request *RoaRequest) GetBodyReader() io.Reader {
 	}
 }
 
-func (request *RoaRequest) GetQueries() string {
-	return request.queries
-}
-
 // for sign method, need not url encoded
 func (request *RoaRequest) BuildQueries() string {
 	return request.buildQueries(false)
@@ -109,10 +105,6 @@ func popStandardUrlencode(stringToSign string) (result string) {
 	return
 }
 
-func (request *RoaRequest) GetUrl() string {
-	return strings.ToLower(request.Scheme) + "://" + request.Domain + ":" + request.Port + request.GetQueries()
-}
-
 func (request *RoaRequest) BuildUrl() string {
 	// for network trans, need url encoded
 	return strings.ToLower(request.Scheme) + "://" + request.Domain + ":" + request.Port + request.buildQueries(true)

sdk/requests/rpc_request.go

@@ -48,18 +48,10 @@ func (request *RpcRequest) BuildQueries() string {
 	return request.queries
 }
 
-func (request *RpcRequest) GetQueries() string {
-	return request.queries
-}
-
 func (request *RpcRequest) BuildUrl() string {
 	return strings.ToLower(request.Scheme) + "://" + request.Domain + ":" + request.Port + request.BuildQueries()
 }
 
-func (request *RpcRequest) GetUrl() string {
-	return strings.ToLower(request.Scheme) + "://" + request.Domain + request.GetQueries()
-}
-
 func (request *RpcRequest) GetVersion() string {
 	return request.version
 }

sdk/requests/rpc_request_test.go

@@ -0,0 +1,23 @@
+package requests
+
+import (
+	"testing"
+
+	"github.com/stretchr/testify/assert"
+)
+
+func Test_RpcRequest(t *testing.T) {
+	r := &RpcRequest{}
+	r.InitWithApiInfo("product", "version", "action", "serviceCode", "endpointType")
+	assert.NotNil(t, r)
+
+	assert.Equal(t, "POST", r.GetMethod())
+	assert.Equal(t, "RPC", r.GetStyle())
+	assert.Equal(t, "product", r.GetProduct())
+	assert.Equal(t, "version", r.GetVersion())
+	assert.Equal(t, "action", r.GetActionName())
+	assert.Equal(t, "serviceCode", r.GetLocationServiceCode())
+	assert.Equal(t, "endpointType", r.GetLocationEndpointType())
+
+	// url
+}