templates/goshared: Support nullable GoGo types

TheThingsIndustries · Feb 26, 2019 · 228ba7a · 228ba7a
1 parent f5dfc51
commit 228ba7a
Showing 1 changed file with 14 additions and 3 deletions.
diff --git a/templates/goshared/register.go b/templates/goshared/register.go
@@ -91,11 +91,22 @@ func (fns goSharedFuncs) accessor(ctx shared.RuleContext) string {
 	if ctx.AccessorOverride != "" {
 		return ctx.AccessorOverride
 	}
-	name := fns.Name(ctx.Field)
+
+	name := fns.Name(ctx.Field).String()
+	if name != "" && ctx.Gogo.Nullable {
+		return fmt.Sprintf("m.Get%s()", name)
+	}
+
 	if name == "" {
-		return fmt.Sprintf("m.%s", fns.Type(ctx.Field).Value())
+		name = fmt.Sprintf("m.%s", fns.Type(ctx.Field).Value())
+	} else {
+		name = fmt.Sprintf("m.%s", name)
+	}
+
+	if !ctx.Gogo.Nullable && !ctx.Field.Type().IsRepeated() && !ctx.Field.Type().IsMap() {
+		return fmt.Sprintf("&%s", name)
 	}
-	return fmt.Sprintf("m.Get%s()", name)
+	return name
 }
 
 func (fns goSharedFuncs) errName(m pgs.Message) pgs.Name {