Collect attributes from a method that actually has the interceptor ap…

…plied; import the correct user types packages when rendering service_interceptors.go; fix an ancient typo

codegen/service/interceptors.go

@@ -78,6 +78,7 @@ func interceptorFile(svc *Data, server bool) *codegen.File {
 		},
 	}
 	if len(interceptors) > 0 {
+		codegen.AddImport(sections[0], svc.UserTypeImports...)
 		sections = append(sections, &codegen.SectionTemplate{
 			Name:   "interceptor-types",
 			Source: readTemplate("interceptors_types"),

codegen/service/service.go

@@ -47,7 +47,7 @@ func Files(genpkg string, service *expr.ServiceExpr, userTypePkgs map[string][]s
 		if m.StreamingPayloadDef != "" {
 			if _, ok := seen[m.StreamingPayload]; !ok {
 				addTypeDefSection(payloadPath, m.StreamingPayload, &codegen.SectionTemplate{
-					Name:   "service-streamig-payload",
+					Name:   "service-streaming-payload",
 					Source: readTemplate("streaming_payload"),
 					Data:   m,
 				})

codegen/service/service_data.go

@@ -1226,27 +1226,7 @@ func buildInterceptorData(svc *expr.ServiceExpr, methods []*MethodData, i *expr.
 	if len(svc.Methods) == 0 {
 		return data
 	}
-	payload, result, streamingPayload := svc.Methods[0].Payload, svc.Methods[0].Result, svc.Methods[0].StreamingPayload
-	data.ReadPayload = collectAttributes(i.ReadPayload, payload, scope)
-	data.WritePayload = collectAttributes(i.WritePayload, payload, scope)
-	data.ReadResult = collectAttributes(i.ReadResult, result, scope)
-	data.WriteResult = collectAttributes(i.WriteResult, result, scope)
-	data.ReadStreamingPayload = collectAttributes(i.ReadStreamingPayload, streamingPayload, scope)
-	data.WriteStreamingPayload = collectAttributes(i.WriteStreamingPayload, streamingPayload, scope)
-	data.ReadStreamingResult = collectAttributes(i.ReadStreamingResult, result, scope)
-	data.WriteStreamingResult = collectAttributes(i.WriteStreamingResult, result, scope)
-	if len(data.ReadPayload) > 0 || len(data.WritePayload) > 0 {
-		data.HasPayloadAccess = true
-	}
-	if len(data.ReadResult) > 0 || len(data.WriteResult) > 0 {
-		data.HasResultAccess = true
-	}
-	if len(data.ReadStreamingPayload) > 0 || len(data.WriteStreamingPayload) > 0 {
-		data.HasStreamingPayloadAccess = true
-	}
-	if len(data.ReadStreamingResult) > 0 || len(data.WriteStreamingResult) > 0 {
-		data.HasStreamingResultAccess = true
-	}
+	attributesCollected := false
 	for _, m := range svc.Methods {
 		applies := false
 		intExprs := m.ServerInterceptors
@@ -1255,6 +1235,30 @@ func buildInterceptorData(svc *expr.ServiceExpr, methods []*MethodData, i *expr.
 		}
 		for _, in := range intExprs {
 			if in.Name == i.Name {
+				if !attributesCollected {
+					payload, result, streamingPayload := m.Payload, m.Result, m.StreamingPayload
+					data.ReadPayload = collectAttributes(i.ReadPayload, payload, scope)
+					data.WritePayload = collectAttributes(i.WritePayload, payload, scope)
+					data.ReadResult = collectAttributes(i.ReadResult, result, scope)
+					data.WriteResult = collectAttributes(i.WriteResult, result, scope)
+					data.ReadStreamingPayload = collectAttributes(i.ReadStreamingPayload, streamingPayload, scope)
+					data.WriteStreamingPayload = collectAttributes(i.WriteStreamingPayload, streamingPayload, scope)
+					data.ReadStreamingResult = collectAttributes(i.ReadStreamingResult, result, scope)
+					data.WriteStreamingResult = collectAttributes(i.WriteStreamingResult, result, scope)
+					if len(data.ReadPayload) > 0 || len(data.WritePayload) > 0 {
+						data.HasPayloadAccess = true
+					}
+					if len(data.ReadResult) > 0 || len(data.WriteResult) > 0 {
+						data.HasResultAccess = true
+					}
+					if len(data.ReadStreamingPayload) > 0 || len(data.WriteStreamingPayload) > 0 {
+						data.HasStreamingPayloadAccess = true
+					}
+					if len(data.ReadStreamingResult) > 0 || len(data.WriteStreamingResult) > 0 {
+						data.HasStreamingResultAccess = true
+					}
+					attributesCollected = true
+				}
 				applies = true
 				break
 			}