* No need to have exported types and functions in common.go

* Simplify functions and remove `PercentCodec` type

Author: lukebakken

rabbitmq_amqp/amqp_queue.go

@@ -142,7 +142,7 @@ func (a *AmqpQueue) Declare(ctx context.Context) (IQueueInfo, error) {
 	}
 
 	if a.name == "" {
-		a.name = GenerateNameWithDefaultPrefix()
+		a.name = generateNameWithDefaultPrefix()
 	}
 
 	path := queuePath(a.name)

rabbitmq_amqp/common.go

@@ -9,10 +9,26 @@ import (
 	"strings"
 )
 
-type PercentCodec struct{}
+const (
+	responseCode200       = 200
+	responseCode201       = 201
+	responseCode204       = 204
+	responseCode409       = 409
+	commandPut            = "PUT"
+	commandGet            = "GET"
+	commandPost           = "POST"
+	commandDelete         = "DELETE"
+	commandReplyTo        = "$me"
+	managementNodeAddress = "/management"
+	linkPairName          = "management-link-pair"
+	exchanges = "exchanges"
+	key       = "key"
+	queues    = "queues"
+	bindings  = "bindings"
+)
 
-// Encode takes a string and returns its percent-encoded representation.
-func (pc *PercentCodec) Encode(input string) string {
+// encodePathSegments takes a string and returns its percent-encoded representation.
+func encodePathSegments(input string) string {
 	var encoded strings.Builder
 
 	// Iterate over each character in the input string
@@ -30,7 +46,7 @@ func (pc *PercentCodec) Encode(input string) string {
 }
 
 // Decode takes a percent-encoded string and returns its decoded representation.
-func (pc *PercentCodec) Decode(input string) (string, error) {
+func decode(input string) (string, error) {
 	// Use url.QueryUnescape which properly decodes percent-encoded strings
 	decoded, err := url.QueryUnescape(input)
 	if err != nil {
@@ -40,27 +56,6 @@ func (pc *PercentCodec) Decode(input string) (string, error) {
 	return decoded, nil
 }
 
-const (
-	responseCode200       = 200
-	responseCode201       = 201
-	responseCode204       = 204
-	responseCode409       = 409
-	commandPut            = "PUT"
-	commandGet            = "GET"
-	commandPost           = "POST"
-	commandDelete         = "DELETE"
-	commandReplyTo        = "$me"
-	managementNodeAddress = "/management"
-	linkPairName          = "management-link-pair"
-)
-
-const (
-	Exchanges = "exchanges"
-	Key       = "key"
-	Queues    = "queues"
-	Bindings  = "bindings"
-)
-
 // isUnreserved checks if a character is an unreserved character in percent encoding
 // Unreserved characters are: A-Z, a-z, 0-9, -, ., _, ~
 func isUnreserved(char rune) bool {
@@ -70,20 +65,16 @@ func isUnreserved(char rune) bool {
 		char == '-' || char == '.' || char == '_' || char == '~'
 }
 
-func encodePathSegments(pathSegments string) string {
-	return (&PercentCodec{}).Encode(pathSegments)
-}
-
 func queuePath(queueName string) string {
-	return "/" + Queues + "/" + encodePathSegments(queueName)
+	return "/" + queues + "/" + encodePathSegments(queueName)
 }
 
 func exchangePath(exchangeName string) string {
-	return "/" + Exchanges + "/" + encodePathSegments(exchangeName)
+	return "/" + exchanges + "/" + encodePathSegments(exchangeName)
 }
 
 func bindingPath() string {
-	return "/" + Bindings
+	return "/" + bindings
 }
 
 func bindingPathWithExchangeQueueKey(toQueue bool, sourceName, destinationName, key string) string {
@@ -95,7 +86,7 @@ func bindingPathWithExchangeQueueKey(toQueue bool, sourceName, destinationName,
 		destinationType = "dstq"
 	}
 	format := "/%s/src=%s;%s=%s;key=%s;args="
-	return fmt.Sprintf(format, Bindings, sourceNameEncoded, destinationType, destinationNameEncoded, keyEncoded)
+	return fmt.Sprintf(format, bindings, sourceNameEncoded, destinationType, destinationNameEncoded, keyEncoded)
 
 }
 
@@ -106,12 +97,12 @@ func validatePositive(label string, value int64) error {
 	return nil
 }
 
-func GenerateNameWithDefaultPrefix() string {
-	return GenerateName("client.gen-")
+func generateNameWithDefaultPrefix() string {
+	return generateName("client.gen-")
 }
 
-// GenerateName generates a unique name with the given prefix
-func GenerateName(prefix string) string {
+// generateName generates a unique name with the given prefix
+func generateName(prefix string) string {
 	uid := uuid.New()
 	uuidBytes := []byte(uid.String())
 	md5obj := md5.New()