[ISSUE apache#999] use structs as result sets for admin method

Author: yechun

admin/admin.go

@@ -33,9 +33,9 @@ import (
 type Admin interface {
 	CreateTopic(ctx context.Context, opts ...OptionCreate) error
 	DeleteTopic(ctx context.Context, opts ...OptionDelete) error
-	//TODO
-	GroupList(ctx context.Context, brokerAddr string) (*remote.RemotingCommand, error)
-	TopicList(ctx context.Context) (*remote.RemotingCommand, error)
+
+	GetAllSubscriptionGroup(ctx context.Context, brokerAddr string) (*SubscriptionGroupWrapper, error)
+	FetchAllTopicList(ctx context.Context) (*TopicList, error)
 	//GetBrokerClusterInfo(ctx context.Context) (*remote.RemotingCommand, error)
 	FetchPublishMessageQueues(ctx context.Context, topic string) ([]*primitive.MessageQueue, error)
 	Close() error
@@ -109,7 +109,7 @@ func NewAdmin(opts ...AdminOption) (*admin, error) {
 	}, nil
 }
 
-func (a *admin) GroupList(ctx context.Context, brokerAddr string) (*remote.RemotingCommand, error) {
+func (a *admin) GetAllSubscriptionGroup(ctx context.Context, brokerAddr string) (*SubscriptionGroupWrapper, error) {
 	cmd := remote.NewRemotingCommand(internal.ReqGetAllSubscriptionGroupConfig, nil, nil)
 	a.cli.RegisterACL()
 	response, err := a.cli.InvokeSync(ctx, brokerAddr, cmd, 3*time.Second)
@@ -121,25 +121,37 @@ func (a *admin) GroupList(ctx context.Context, brokerAddr string) (*remote.Remot
 	} else {
 		rlog.Info("Get all group list success", map[string]interface{}{})
 	}
-	rpsCmd := remote.NewRemotingCommand(internal.ReqGetAllSubscriptionGroupConfig, nil, response.Body)
-
-	return rpsCmd, nil
+	var subscriptionGroupWrapper SubscriptionGroupWrapper
+	_, err = subscriptionGroupWrapper.Decode(response.Body, &subscriptionGroupWrapper)
+	if err != nil {
+		rlog.Error("Get all group list decode error", map[string]interface{}{
+			rlog.LogKeyUnderlayError: err,
+		})
+		return nil, err
+	}
+	return &subscriptionGroupWrapper, nil
 }
 
-func (a *admin) TopicList(ctx context.Context) (*remote.RemotingCommand, error) {
+func (a *admin) FetchAllTopicList(ctx context.Context) (*TopicList, error) {
 	cmd := remote.NewRemotingCommand(internal.ReqGetAllTopicListFromNameServer, nil, nil)
 	response, err := a.cli.InvokeSync(ctx, a.cli.GetNameSrv().AddrList()[0], cmd, 3*time.Second)
 	if err != nil {
-		rlog.Error("Get all topic list error", map[string]interface{}{
+		rlog.Error("Fetch all topic list error", map[string]interface{}{
 			rlog.LogKeyUnderlayError: err,
 		})
 		return nil, err
 	} else {
-		rlog.Info("Get all topic list success", map[string]interface{}{})
+		rlog.Info("Fetch all topic list success", map[string]interface{}{})
 	}
-	rpsCmd := remote.NewRemotingCommand(internal.ReqGetAllTopicListFromNameServer, nil, response.Body)
-
-	return rpsCmd, nil
+	var topicList TopicList
+	_, err = topicList.Decode(response.Body, &topicList)
+	if err != nil {
+		rlog.Error("Fetch all topic list decode error", map[string]interface{}{
+			rlog.LogKeyUnderlayError: err,
+		})
+		return nil, err
+	}
+	return &topicList, nil
 }
 
 // CreateTopic create topic.

admin/response.go

@@ -0,0 +1,88 @@
+/*
+Licensed to the Apache Software Foundation (ASF) under one or more
+contributor license agreements.  See the NOTICE file distributed with
+this work for additional information regarding copyright ownership.
+The ASF licenses this file to You under the Apache License, Version 2.0
+(the "License"); you may not use this file except in compliance with
+the License.  You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package admin
+
+import "encoding/json"
+
+type RemotingSerializable struct {
+}
+
+func (r *RemotingSerializable) Encode(obj interface{}) ([]byte, error) {
+	jsonStr := r.ToJson(obj, false)
+	if jsonStr != "" {
+		return []byte(jsonStr), nil
+	}
+	return nil, nil
+}
+
+func (r *RemotingSerializable) ToJson(obj interface{}, prettyFormat bool) string {
+	if prettyFormat {
+		jsonBytes, err := json.MarshalIndent(obj, "", "  ")
+		if err != nil {
+			return ""
+		}
+		return string(jsonBytes)
+	} else {
+		jsonBytes, err := json.Marshal(obj)
+		if err != nil {
+			return ""
+		}
+		return string(jsonBytes)
+	}
+}
+func (r *RemotingSerializable) Decode(data []byte, classOfT interface{}) (interface{}, error) {
+	jsonStr := string(data)
+	return r.FromJson(jsonStr, classOfT)
+}
+
+func (r *RemotingSerializable) FromJson(jsonStr string, classOfT interface{}) (interface{}, error) {
+	err := json.Unmarshal([]byte(jsonStr), classOfT)
+	if err != nil {
+		return nil, err
+	}
+	return classOfT, nil
+}
+
+type TopicList struct {
+	TopicList  []string
+	BrokerAddr string
+	RemotingSerializable
+}
+
+type SubscriptionGroupWrapper struct {
+	SubscriptionGroupTable map[string]SubscriptionGroupConfig
+	DataVersion            DataVersion
+	RemotingSerializable
+}
+
+type DataVersion struct {
+	Timestamp int64
+	Counter   int32
+}
+
+type SubscriptionGroupConfig struct {
+	GroupName                      string
+	ConsumeEnable                  bool
+	ConsumeFromMinEnable           bool
+	ConsumeBroadcastEnable         bool
+	RetryMaxTimes                  int
+	RetryQueueNums                 int
+	BrokerId                       int
+	WhichBrokerWhenConsumeSlowly   int
+	NotifyConsumerIdsChangedEnable bool
+}

examples/admin/group/main.go

@@ -39,11 +39,11 @@ func main() {
 	)
 
 	// group list
-	groupList, err := testAdmin.GroupList(context.Background(), brokerAddr)
+	result, err := testAdmin.GetAllSubscriptionGroup(context.Background(), brokerAddr)
 	if err != nil {
-		fmt.Println("GroupList error:", err.Error())
+		fmt.Println("GetAllSubscriptionGroup error:", err.Error())
 	}
-	fmt.Println(string(groupList.Body))
+	fmt.Println(result.SubscriptionGroupTable)
 
 	err = testAdmin.Close()
 	if err != nil {

examples/admin/topic/main.go

@@ -40,11 +40,11 @@ func main() {
 	)
 
 	// topic list
-	topicList, err := testAdmin.TopicList(context.Background())
+	result, err := testAdmin.FetchAllTopicList(context.Background())
 	if err != nil {
-		fmt.Println("TopicList error:", err.Error())
+		fmt.Println("FetchAllTopicList error:", err.Error())
 	}
-	fmt.Println(string(topicList.Body))
+	fmt.Println(result.TopicList)
 
 	//create topic
 	err = testAdmin.CreateTopic(