-Refactor code

core-go · Jan 31, 2021 · b7e5cd5 · b7e5cd5
1 parent 2e83a97
commit b7e5cd5
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 8 deletions.
diff --git a/consumer.go b/consumer.go
@@ -28,7 +28,7 @@ func NewConsumer(client *sqs.SQS, queueURL string, ackOnConsume bool, visibility
 	return &Consumer{Client: client, QueueURL: &queueURL, AckOnConsume: ackOnConsume, VisibilityTimeout: visibilityTimeout, WaitTimeSeconds: waitTimeSeconds}
 }
 
-func (c *Consumer) Consume(ctx context.Context, caller mq.ConsumerCaller) {
+func (c *Consumer) Consume(ctx context.Context, handle func(context.Context, *mq.Message, error) error) {
 	result, er1 := c.Client.ReceiveMessage(&sqs.ReceiveMessageInput{
 		AttributeNames: []*string{
 			aws.String(sqs.MessageSystemAttributeNameSentTimestamp),
@@ -42,7 +42,7 @@ func (c *Consumer) Consume(ctx context.Context, caller mq.ConsumerCaller) {
 		WaitTimeSeconds:     aws.Int64(c.WaitTimeSeconds),
 	})
 	if er1 != nil {
-		caller.Call(ctx, nil, er1)
+		handle(ctx, nil, er1)
 	} else {
 		if len(result.Messages) > 0 {
 			m := result.Messages[0]
@@ -60,12 +60,12 @@ func (c *Consumer) Consume(ctx context.Context, caller mq.ConsumerCaller) {
 					ReceiptHandle: result.Messages[0].ReceiptHandle,
 				})
 				if er2 != nil {
-					caller.Call(ctx, nil, er2)
+					handle(ctx, nil, er2)
 				} else {
-					caller.Call(ctx, &message, nil)
+					handle(ctx, &message, nil)
 				}
 			} else {
-				caller.Call(ctx, &message, nil)
+				handle(ctx, &message, nil)
 			}
 		}
 	}

diff --git a/func.go b/func.go
@@ -15,10 +15,10 @@ func GetQueueUrl(client *sqs.SQS, queueName string) (string, error) {
 	return *result.QueueUrl, err
 }
 
-func MapToAttributes(messageAttributes *map[string]string) map[string]*sqs.MessageAttributeValue {
+func MapToAttributes(messageAttributes map[string]string) map[string]*sqs.MessageAttributeValue {
 	attributes := make(map[string]*sqs.MessageAttributeValue)
 	if messageAttributes != nil {
-		for k, v := range *messageAttributes {
+		for k, v := range messageAttributes {
 			x := sqs.MessageAttributeValue{
 				DataType:    aws.String("String"),
 				StringValue: aws.String(v),

diff --git a/producer.go b/producer.go
@@ -25,7 +25,7 @@ func NewProducer(client *sqs.SQS, queueURL string, delaySeconds *int64) *Produce
 	return &Producer{Client: client, QueueURL: &queueURL, DelaySeconds: delaySeconds}
 }
 
-func (p *Producer) Produce(ctx context.Context, data []byte, messageAttributes *map[string]string) (string, error) {
+func (p *Producer) Produce(ctx context.Context, data []byte, messageAttributes map[string]string) (string, error) {
 	attributes := MapToAttributes(messageAttributes)
 	s := string(data)
 	result, err := p.Client.SendMessage(&sqs.SendMessageInput{