Refactor and remove QueueType

It is just a wrapper around TQueueType

Author: Zerpet

pkg/rabbitmqamqp/amqp_queue.go

@@ -92,9 +92,9 @@ func (a *AmqpQueue) Arguments(arguments map[string]any) {
 	a.arguments = arguments
 }
 
-func (a *AmqpQueue) QueueType(queueType QueueType) {
-	if len(queueType.String()) != 0 {
-		a.arguments["x-queue-type"] = queueType.String()
+func (a *AmqpQueue) QueueType(queueType TQueueType) {
+	if len(string(queueType)) != 0 {
+		a.arguments["x-queue-type"] = string(queueType)
 	}
 }
 

pkg/rabbitmqamqp/entities.go

@@ -12,22 +12,14 @@ const (
 	Stream  TQueueType = "stream"
 )
 
-type QueueType struct {
-	Type TQueueType
-}
-
-func (e QueueType) String() string {
-	return string(e.Type)
-}
-
 /*
 IQueueSpecification represents the specification of a queue
 */
 type IQueueSpecification interface {
 	name() string
 	isAutoDelete() bool
 	isExclusive() bool
-	queueType() QueueType
+	queueType() TQueueType
 	buildArguments() map[string]any
 }
 
@@ -107,8 +99,8 @@ func (q *QuorumQueueSpecification) isExclusive() bool {
 	return false
 }
 
-func (q *QuorumQueueSpecification) queueType() QueueType {
-	return QueueType{Type: Quorum}
+func (q *QuorumQueueSpecification) queueType() TQueueType {
+	return Quorum
 }
 
 func (q *QuorumQueueSpecification) buildArguments() map[string]any {
@@ -165,7 +157,7 @@ func (q *QuorumQueueSpecification) buildArguments() map[string]any {
 		result["x-quorum-initial-group-size"] = q.QuorumInitialGroupSize
 	}
 
-	result["x-queue-type"] = q.queueType().String()
+	result["x-queue-type"] = string(q.queueType())
 	return result
 }
 
@@ -201,8 +193,8 @@ func (q *ClassicQueueSpecification) isExclusive() bool {
 	return q.IsExclusive
 }
 
-func (q *ClassicQueueSpecification) queueType() QueueType {
-	return QueueType{Type: Classic}
+func (q *ClassicQueueSpecification) queueType() TQueueType {
+	return Classic
 }
 
 func (q *ClassicQueueSpecification) buildArguments() map[string]any {
@@ -251,7 +243,7 @@ func (q *ClassicQueueSpecification) buildArguments() map[string]any {
 		result["x-queue-leader-locator"] = q.LeaderLocator.leaderLocator()
 	}
 
-	result["x-queue-type"] = q.queueType().String()
+	result["x-queue-type"] = string(q.queueType())
 
 	return result
 }
@@ -281,8 +273,8 @@ func (a *AutoGeneratedQueueSpecification) isExclusive() bool {
 	return a.IsExclusive
 }
 
-func (a *AutoGeneratedQueueSpecification) queueType() QueueType {
-	return QueueType{Classic}
+func (a *AutoGeneratedQueueSpecification) queueType() TQueueType {
+	return Classic
 }
 
 func (a *AutoGeneratedQueueSpecification) buildArguments() map[string]any {
@@ -299,7 +291,7 @@ func (a *AutoGeneratedQueueSpecification) buildArguments() map[string]any {
 		result["x-max-length"] = a.MaxLength
 	}
 
-	result["x-queue-type"] = a.queueType().String()
+	result["x-queue-type"] = string(a.queueType())
 
 	return result
 }
@@ -323,8 +315,8 @@ func (s *StreamQueueSpecification) isExclusive() bool {
 	return false
 }
 
-func (s *StreamQueueSpecification) queueType() QueueType {
-	return QueueType{Type: Stream}
+func (s *StreamQueueSpecification) queueType() TQueueType {
+	return Stream
 }
 
 func (s *StreamQueueSpecification) buildArguments() map[string]any {
@@ -341,7 +333,7 @@ func (s *StreamQueueSpecification) buildArguments() map[string]any {
 		result["x-stream-initial-cluster-size"] = s.InitialClusterSize
 	}
 
-	result["x-queue-type"] = s.queueType().String()
+	result["x-queue-type"] = string(s.queueType())
 
 	return result
 }