cleanup

Author: devsergiy

v2/pkg/engine/datasource/graphql_datasource/graphql_datasource_defer_test.go

@@ -158,7 +158,7 @@ func TestGraphQLDataSourceDefer(t *testing.T) {
 						},
 					},
 					planConfiguration,
-					WithDefaultCustomPostProcessor(postprocess.DisableResolveInputTemplates(), postprocess.DisableCreateConcreteSingleFetchTypes(), postprocess.DisableCreateParallelNodes(), postprocess.DisableMergeFields(), postprocess.DisableDefer()),
+					WithDefaultCustomPostProcessor(postprocess.DisableResolveInputTemplates(), postprocess.DisableCreateConcreteSingleFetchTypes(), postprocess.DisableCreateParallelNodes(), postprocess.DisableMergeFields(), postprocess.DisableExtractDeferFetches()),
 					WithDefer(),
 					WithCalculateFieldDependencies(),
 				)
@@ -516,7 +516,7 @@ func TestGraphQLDataSourceDefer(t *testing.T) {
 						},
 					},
 					planConfiguration,
-					WithDefaultCustomPostProcessor(postprocess.DisableResolveInputTemplates(), postprocess.DisableCreateConcreteSingleFetchTypes(), postprocess.DisableCreateParallelNodes(), postprocess.DisableMergeFields(), postprocess.DisableDefer()),
+					WithDefaultCustomPostProcessor(postprocess.DisableResolveInputTemplates(), postprocess.DisableCreateConcreteSingleFetchTypes(), postprocess.DisableCreateParallelNodes(), postprocess.DisableMergeFields(), postprocess.DisableExtractDeferFetches()),
 					WithDefer(),
 					WithCalculateFieldDependencies(),
 				)

v2/pkg/engine/plan/plan.go

@@ -44,9 +44,9 @@ func (*SubscriptionResponsePlan) PlanKind() Kind {
 }
 
 type DeferResponsePlan struct {
-	Response *resolve.GraphQLResponse
-	Defers   []*resolve.DeferGraphQLResponse
-	FlushInterval   int64
+	Response      *resolve.GraphQLResponse
+	Defers        []*resolve.DeferGraphQLResponse
+	FlushInterval int64
 }
 
 func (d DeferResponsePlan) PlanKind() Kind {

v2/pkg/engine/postprocess/defer.go …ine/postprocess/extract_defer_fetches.gov2/pkg/engine/postprocess/defer.go renamed to v2/pkg/engine/postprocess/extract_defer_fetches.go v2/pkg/engine/postprocess/defer.go renamed to v2/pkg/engine/postprocess/extract_defer_fetches.go

@@ -8,11 +8,11 @@ import (
 	"github.com/wundergraph/graphql-go-tools/v2/pkg/engine/resolve"
 )
 
-type deferProcessor struct {
+type extractDeferFetches struct {
 	disable bool
 }
 
-func (d *deferProcessor) Process(deferPlan *plan.DeferResponsePlan) {
+func (d *extractDeferFetches) Process(deferPlan *plan.DeferResponsePlan) {
 	if d.disable {
 		return
 	}
@@ -40,7 +40,7 @@ func (d *deferProcessor) Process(deferPlan *plan.DeferResponsePlan) {
 	}
 }
 
-func (d *deferProcessor) fetchGroups(deferPlan *plan.DeferResponsePlan) (root []*resolve.FetchTreeNode, deffered map[string][]*resolve.FetchTreeNode) {
+func (d *extractDeferFetches) fetchGroups(deferPlan *plan.DeferResponsePlan) (root []*resolve.FetchTreeNode, deffered map[string][]*resolve.FetchTreeNode) {
 	fetchGroups := make(map[string][]*resolve.FetchTreeNode)
 
 	for _, fetch := range deferPlan.Response.Fetches.ChildNodes {

v2/pkg/engine/postprocess/postprocess.go

@@ -23,7 +23,7 @@ type Processor struct {
 	collectDataSourceInfo  bool
 	fetchTreeProcessors    *FetchTreeProcessors
 	responseTreeProcessors *ResponseTreeProcessors
-	deferProcessor         *deferProcessor
+	extractDeferFetches    *extractDeferFetches
 }
 
 type FetchTreeProcessors struct {
@@ -68,7 +68,7 @@ type processorOptions struct {
 	disableCreateParallelNodes            bool
 	disableAddMissingNestedDependencies   bool
 	collectDataSourceInfo                 bool
-	disableDefer                          bool
+	disableExtractDeferFetches            bool
 }
 
 type ProcessorOption func(*processorOptions)
@@ -122,9 +122,9 @@ func DisableAddMissingNestedDependencies() ProcessorOption {
 	}
 }
 
-func DisableDefer() ProcessorOption {
+func DisableExtractDeferFetches() ProcessorOption {
 	return func(o *processorOptions) {
-		o.disableDefer = true
+		o.disableExtractDeferFetches = true
 	}
 }
 
@@ -166,8 +166,8 @@ func NewProcessor(options ...ProcessorOption) *Processor {
 				disable: opts.disableMergeFields,
 			},
 		},
-		deferProcessor: &deferProcessor{
-			disable: opts.disableDefer,
+		extractDeferFetches: &extractDeferFetches{
+			disable: opts.disableExtractDeferFetches,
 		},
 	}
 }
@@ -191,7 +191,7 @@ func (p *Processor) Process(pre plan.Plan) {
 		p.fetchTreeProcessors.processFlatFetchTree(t.Response.Fetches)
 
 		// extract deferred fetches into their own fetch trees
-		p.deferProcessor.Process(t)
+		p.extractDeferFetches.Process(t)
 
 		// process the initial response fetch tree
 		p.fetchTreeProcessors.organizeFetchTree(t.Response.Fetches)