Skip to content

Commit

Permalink
feat(protocol): remove extra json tag
Browse files Browse the repository at this point in the history
- delete json tag in internal/request.go

Closes apache#278
  • Loading branch information
xujianhai666 committed Nov 4, 2019
1 parent b14d435 commit 0656a85
Showing 1 changed file with 48 additions and 48 deletions.
96 changes: 48 additions & 48 deletions internal/request.go
Original file line number Diff line number Diff line change
Expand Up @@ -46,16 +46,16 @@ const (
)

type SendMessageRequest struct {
ProducerGroup string `json:"producerGroup"`
Topic string `json:"topic"`
QueueId int `json:"queueId"`
SysFlag int `json:"sysFlag"`
BornTimestamp int64 `json:"bornTimestamp"`
Flag int32 `json:"flag"`
Properties string `json:"properties"`
ReconsumeTimes int `json:"reconsumeTimes"`
UnitMode bool `json:"unitMode"`
MaxReconsumeTimes int `json:"maxReconsumeTimes"`
ProducerGroup string
Topic string
QueueId int
SysFlag int
BornTimestamp int64
Flag int32
Properties string
ReconsumeTimes int
UnitMode bool
MaxReconsumeTimes int
Batch bool
}

Expand Down Expand Up @@ -83,13 +83,13 @@ func (request *SendMessageRequest) Decode(properties map[string]string) error {
}

type EndTransactionRequestHeader struct {
ProducerGroup string `json:"producerGroup"`
TranStateTableOffset int64 `json:"tranStateTableOffset"`
CommitLogOffset int64 `json:"commitLogOffset"`
CommitOrRollback int `json:"commitOrRollback"`
FromTransactionCheck bool `json:"fromTransactionCheck"`
MsgID string `json:"msgId"`
TransactionId string `json:"transactionId"`
ProducerGroup string
TranStateTableOffset int64
CommitLogOffset int64
CommitOrRollback int
FromTransactionCheck bool
MsgID string
TransactionId string
}

func (request *EndTransactionRequestHeader) Encode() map[string]string {
Expand Down Expand Up @@ -145,13 +145,13 @@ func (request *CheckTransactionStateRequestHeader) Decode(ext map[string]string)
}

type ConsumerSendMsgBackRequest struct {
Group string `json:"group"`
Offset int64 `json:"offset"`
DelayLevel int `json:"delayLevel"`
OriginMsgId string `json:"originMsgId"`
OriginTopic string `json:"originTopic"`
UnitMode bool `json:"unitMode"`
MaxReconsumeTimes int32 `json:"maxReconsumeTimes"`
Group string
Offset int64
DelayLevel int
OriginMsgId string
OriginTopic string
UnitMode bool
MaxReconsumeTimes int32
}

func (request *ConsumerSendMsgBackRequest) Encode() map[string]string {
Expand All @@ -168,17 +168,17 @@ func (request *ConsumerSendMsgBackRequest) Encode() map[string]string {
}

type PullMessageRequest struct {
ConsumerGroup string `json:"consumerGroup"`
Topic string `json:"topic"`
QueueId int32 `json:"queueId"`
QueueOffset int64 `json:"queueOffset"`
MaxMsgNums int32 `json:"maxMsgNums"`
SysFlag int32 `json:"sysFlag"`
CommitOffset int64 `json:"commitOffset"`
SuspendTimeoutMillis time.Duration `json:"suspendTimeoutMillis"`
SubExpression string `json:"subscription"`
SubVersion int64 `json:"subVersion"`
ExpressionType string `json:"expressionType"`
ConsumerGroup string
Topic string
QueueId int32
QueueOffset int64
MaxMsgNums int32
SysFlag int32
CommitOffset int64
SuspendTimeoutMillis time.Duration
SubExpression string
SubVersion int64
ExpressionType string
}

func (request *PullMessageRequest) Encode() map[string]string {
Expand Down Expand Up @@ -208,8 +208,8 @@ func (request *GetConsumerList) Encode() map[string]string {
}

type GetMaxOffsetRequest struct {
Topic string `json:"topic"`
QueueId int `json:"queueId"`
Topic string
QueueId int
}

func (request *GetMaxOffsetRequest) Encode() map[string]string {
Expand All @@ -220,9 +220,9 @@ func (request *GetMaxOffsetRequest) Encode() map[string]string {
}

type QueryConsumerOffsetRequest struct {
ConsumerGroup string `json:"consumerGroup"`
Topic string `json:"topic"`
QueueId int `json:"queueId"`
ConsumerGroup string
Topic string
QueueId int
}

func (request *QueryConsumerOffsetRequest) Encode() map[string]string {
Expand All @@ -234,9 +234,9 @@ func (request *QueryConsumerOffsetRequest) Encode() map[string]string {
}

type SearchOffsetRequest struct {
Topic string `json:"topic"`
QueueId int `json:"queueId"`
Timestamp int64 `json:"timestamp"`
Topic string
QueueId int
Timestamp int64
}

func (request *SearchOffsetRequest) Encode() map[string]string {
Expand All @@ -248,10 +248,10 @@ func (request *SearchOffsetRequest) Encode() map[string]string {
}

type UpdateConsumerOffsetRequest struct {
ConsumerGroup string `json:"consumerGroup"`
Topic string `json:"topic"`
QueueId int `json:"queueId"`
CommitOffset int64 `json:"commitOffset"`
ConsumerGroup string
Topic string
QueueId int
CommitOffset int64
}

func (request *UpdateConsumerOffsetRequest) Encode() map[string]string {
Expand All @@ -264,7 +264,7 @@ func (request *UpdateConsumerOffsetRequest) Encode() map[string]string {
}

type GetRouteInfoRequest struct {
Topic string `json:"topic"`
Topic string
}

func (request *GetRouteInfoRequest) Encode() map[string]string {
Expand Down

0 comments on commit 0656a85

Please sign in to comment.