Add handling empty groups

nats-io · piotrpio · Jan 12, 2023 · Jan 4, 2023 · Jan 9, 2023 · Jan 10, 2023
commit 7ce2839ec4402c6a36b9abde04295fbc628e11f1
diff --git a/micro/service.go b/micro/service.go
@@ -746,14 +746,26 @@ func (g *group) AddEndpoint(name string, handler Handler, opts ...EndpointOpt) e
 	if options.subject != "" {
 		subject = options.subject
 	}
-	subject = fmt.Sprintf("%s.%s", g.prefix, subject)
-	return addEndpoint(g.service, name, subject, handler)
+	endpointSubject := fmt.Sprintf("%s.%s", g.prefix, subject)
+	if g.prefix == "" {
+		endpointSubject = subject
+	}
+	return addEndpoint(g.service, name, endpointSubject, handler)
 }
 
 func (g *group) AddGroup(name string) Group {
+	parts := make([]string, 0, 2)
+	if g.prefix != "" {
+		parts = append(parts, g.prefix)
+	}
+	if name != "" {
+		parts = append(parts, name)
+	}
+	prefix := strings.Join(parts, ".")
+
 	return &group{
 		service: g.service,
-		prefix:  fmt.Sprintf("%s.%s", g.prefix, name),
+		prefix:  prefix,
 	}
 }
 

diff --git a/micro/test/service_test.go b/micro/test/service_test.go
@@ -653,6 +653,18 @@ func TestGroups(t *testing.T) {
 			groups:          []string{"g1"},
 			expectedSubject: "g1.foo",
 		},
+		{
+			name:            "single empty group",
+			endpointName:    "foo",
+			groups:          []string{""},
+			expectedSubject: "foo",
+		},
+		{
+			name:            "empty groups",
+			endpointName:    "foo",
+			groups:          []string{"", "g1", ""},
+			expectedSubject: "g1.foo",
+		},
 		{
 			name:            "multiple groups",
 			endpointName:    "foo",