Merge pull request #4 from aliyun/revert_add_api

Add some deleted interface

Author: zd-double

message.go

@@ -242,6 +242,12 @@ type Queues struct {
 	NextMarker string   `xml:"NextMarker" json:"next_marker"`
 }
 
+type QueueDetails struct {
+	XMLName    xml.Name         `xml:"Queues" json:"-"`
+	Attrs      []QueueAttribute `xml:"Queue" json:"queues"`
+	NextMarker string           `xml:"NextMarker" json:"next_marker"`
+}
+
 type Topic struct {
 	TopicURL string `xml:"TopicURL" json:"url"`
 }
@@ -252,6 +258,12 @@ type Topics struct {
 	NextMarker string   `xml:"NextMarker" json:"next_marker"`
 }
 
+type TopicDetails struct {
+	XMLName    xml.Name         `xml:"Topics" json:"-"`
+	Attrs      []TopicAttribute `xml:"Topic" json:"topics"`
+	NextMarker string           `xml:"NextMarker" json:"next_marker"`
+}
+
 type Subscription struct {
 	SubscriptionURL string `xml:"SubscriptionURL" json:"url"`
 }
@@ -261,3 +273,9 @@ type Subscriptions struct {
 	Subscriptions []Subscription `xml:"Subscription" json:"subscriptions"`
 	NextMarker    string         `xml:"NextMarker" json:"next_marker"`
 }
+
+type SubscriptionDetails struct {
+	XMLName    xml.Name                `xml:"Subscriptions" json:"-"`
+	Attrs      []SubscriptionAttribute `xml:"Subscription" json:"subscriptions"`
+	NextMarker string                  `xml:"NextMarker" json:"next_marker"`
+}

queue_manager.go

@@ -16,6 +16,7 @@ type AliQueueManager interface {
 	GetQueueAttributes(queueName string) (attr QueueAttribute, err error)
 	DeleteQueue(queueName string) (err error)
 	ListQueue(nextMarker string, retNumber int32, prefix string) (queues Queues, err error)
+	ListQueueDetail(nextMarker string, retNumber int32, prefix string) (queueDetails QueueDetails, err error)
 }
 
 type MNSQueueManager struct {
@@ -215,3 +216,35 @@ func (p *MNSQueueManager) ListQueue(nextMarker string, retNumber int32, prefix s
 
 	return
 }
+
+func (p *MNSQueueManager) ListQueueDetail(nextMarker string, retNumber int32, prefix string) (queueDetails QueueDetails, err error) {
+
+	header := map[string]string{}
+
+	marker := strings.TrimSpace(nextMarker)
+	if len(marker) > 0 {
+		if marker != "" {
+			header["x-mns-marker"] = marker
+		}
+	}
+
+	if retNumber > 0 {
+		if retNumber >= 1 && retNumber <= 1000 {
+			header["x-mns-ret-number"] = strconv.Itoa(int(retNumber))
+		} else {
+			err = ERR_MNS_RET_NUMBER_RANGE_ERROR.New()
+			return
+		}
+	}
+
+	prefix = strings.TrimSpace(prefix)
+	if prefix != "" {
+		header["x-mns-prefix"] = prefix
+	}
+
+	header["x-mns-with-meta"] = "true"
+
+	_, err = send(p.cli, p.decoder, GET, header, nil, "queues", &queueDetails)
+
+	return
+}

topic.go

@@ -21,6 +21,7 @@ type AliMNSTopic interface {
 	GetSubscriptionAttributes(subscriptionName string) (attr SubscriptionAttribute, err error)
 	Unsubscribe(subscriptionName string) (err error)
 	ListSubscriptionByTopic(nextMarker string, retNumber int32, prefix string) (subscriptions Subscriptions, err error)
+	ListSubscriptionDetailByTopic(nextMarker string, retNumber int32, prefix string) (subscriptionDetails SubscriptionDetails, err error)
 }
 
 type MNSTopic struct {
@@ -154,3 +155,34 @@ func (p *MNSTopic) ListSubscriptionByTopic(nextMarker string, retNumber int32, p
 
 	return
 }
+
+func (p *MNSTopic) ListSubscriptionDetailByTopic(nextMarker string, retNumber int32, prefix string) (subscriptionDetails SubscriptionDetails, err error) {
+	header := map[string]string{}
+
+	marker := strings.TrimSpace(nextMarker)
+	if len(marker) > 0 {
+		if marker != "" {
+			header["x-mns-marker"] = marker
+		}
+	}
+
+	if retNumber > 0 {
+		if retNumber >= 1 && retNumber <= 1000 {
+			header["x-mns-ret-number"] = strconv.Itoa(int(retNumber))
+		} else {
+			err = ERR_MNS_RET_NUMBER_RANGE_ERROR.New()
+			return
+		}
+	}
+
+	prefix = strings.TrimSpace(prefix)
+	if prefix != "" {
+		header["x-mns-prefix"] = prefix
+	}
+
+	header["x-mns-with-meta"] = "true"
+
+	_, err = send(p.client, p.decoder, GET, header, nil, fmt.Sprintf("topics/%s/subscriptions", p.name), &subscriptionDetails)
+
+	return
+}

topic_manager.go

@@ -16,6 +16,7 @@ type AliTopicManager interface {
 	GetTopicAttributes(topicName string) (attr TopicAttribute, err error)
 	DeleteTopic(topicName string) (err error)
 	ListTopic(nextMarker string, retNumber int32, prefix string) (topics Topics, err error)
+	ListTopicDetail(nextMarker string, retNumber int32, prefix string) (topicDetails TopicDetails, err error)
 }
 
 type MNSTopicManager struct {
@@ -142,3 +143,35 @@ func (p *MNSTopicManager) ListTopic(nextMarker string, retNumber int32, prefix s
 
 	return
 }
+
+func (p *MNSTopicManager) ListTopicDetail(nextMarker string, retNumber int32, prefix string) (topicDetails TopicDetails, err error) {
+
+	header := map[string]string{}
+
+	marker := strings.TrimSpace(nextMarker)
+	if len(marker) > 0 {
+		if marker != "" {
+			header["x-mns-marker"] = marker
+		}
+	}
+
+	if retNumber > 0 {
+		if retNumber >= 1 && retNumber <= 1000 {
+			header["x-mns-ret-number"] = strconv.Itoa(int(retNumber))
+		} else {
+			err = ERR_MNS_RET_NUMBER_RANGE_ERROR.New()
+			return
+		}
+	}
+
+	prefix = strings.TrimSpace(prefix)
+	if prefix != "" {
+		header["x-mns-prefix"] = prefix
+	}
+
+	header["x-mns-with-meta"] = "true"
+
+	_, err = send(p.cli, p.decoder, GET, header, nil, "topics", &topicDetails)
+
+	return
+}