remove all references to deprecated handler package

99designs · Nov 11, 2019 · e5cc6ed · e5cc6ed
1 parent dc62234
commit e5cc6ed
Show file tree

Hide file tree

Showing 48 changed files with 319 additions and 298 deletions.
diff --git a/.golangci.yml b/.golangci.yml
@@ -29,7 +29,6 @@ linters:
     - staticcheck
     - structcheck
     - stylecheck
-    - typecheck
     - unconvert
     - unused
     - varcheck

diff --git a/cmd/root.go b/cmd/root.go
@@ -10,6 +10,7 @@ import (
 	"github.com/urfave/cli"
 
 	// Required since otherwise dep will prune away these unused packages before codegen has a chance to run
+	_ "github.com/99designs/gqlgen/graphql/handler"
 	_ "github.com/99designs/gqlgen/handler"
 )
 

diff --git a/codegen/testserver/complexity_test.go b/codegen/testserver/complexity_test.go
@@ -5,14 +5,17 @@ import (
 	"testing"
 
 	"github.com/99designs/gqlgen/client"
-	"github.com/99designs/gqlgen/handler"
+	"github.com/99designs/gqlgen/graphql/handler"
+	"github.com/99designs/gqlgen/graphql/handler/extension"
 	"github.com/stretchr/testify/require"
 )
 
 func TestComplexityCollisions(t *testing.T) {
 	resolvers := &Stub{}
 
-	c := client.New(handler.GraphQL(NewExecutableSchema(Config{Resolvers: resolvers})))
+	srv := handler.NewDefaultServer(NewExecutableSchema(Config{Resolvers: resolvers}))
+
+	c := client.New(srv)
 
 	resolvers.QueryResolver.Overlapping = func(ctx context.Context) (fields *OverlappingFields, e error) {
 		return &OverlappingFields{
@@ -48,7 +51,9 @@ func TestComplexityFuncs(t *testing.T) {
 	cfg.Complexity.OverlappingFields.Foo = func(childComplexity int) int { return 1000 }
 	cfg.Complexity.OverlappingFields.NewFoo = func(childComplexity int) int { return 5 }
 
-	c := client.New(handler.GraphQL(NewExecutableSchema(cfg), handler.ComplexityLimit(10)))
+	srv := handler.NewDefaultServer(NewExecutableSchema(cfg))
+	srv.Use(extension.FixedComplexityLimit(10))
+	c := client.New(srv)
 
 	resolvers.QueryResolver.Overlapping = func(ctx context.Context) (fields *OverlappingFields, e error) {
 		return &OverlappingFields{

diff --git a/codegen/testserver/directive_test.go b/codegen/testserver/directive_test.go
@@ -7,7 +7,7 @@ import (
 
 	"github.com/99designs/gqlgen/client"
 	"github.com/99designs/gqlgen/graphql"
-	"github.com/99designs/gqlgen/handler"
+	"github.com/99designs/gqlgen/graphql/handler"
 	"github.com/stretchr/testify/require"
 )
 
@@ -85,96 +85,95 @@ func TestDirectives(t *testing.T) {
 	resolvers.SubscriptionResolver.DirectiveUnimplemented = func(ctx context.Context) (<-chan *string, error) {
 		return okchan()
 	}
+	srv := handler.NewDefaultServer(NewExecutableSchema(Config{
+		Resolvers: resolvers,
+		Directives: DirectiveRoot{
+			Length: func(ctx context.Context, obj interface{}, next graphql.Resolver, min int, max *int, message *string) (interface{}, error) {
+				e := func(msg string) error {
+					if message == nil {
+						return fmt.Errorf(msg)
+					}
+					return fmt.Errorf(*message)
+				}
+				res, err := next(ctx)
+				if err != nil {
+					return nil, err
+				}
+
+				s := res.(string)
+				if len(s) < min {
+					return nil, e("too short")
+				}
+				if max != nil && len(s) > *max {
+					return nil, e("too long")
+				}
+				return res, nil
+			},
+			Range: func(ctx context.Context, obj interface{}, next graphql.Resolver, min *int, max *int) (interface{}, error) {
+				res, err := next(ctx)
+				if err != nil {
+					return nil, err
+				}
+
+				switch res := res.(type) {
+				case int:
+					if min != nil && res < *min {
+						return nil, fmt.Errorf("too small")
+					}
+					if max != nil && res > *max {
+						return nil, fmt.Errorf("too large")
+					}
+					return next(ctx)
+
+				case int64:
+					if min != nil && int(res) < *min {
+						return nil, fmt.Errorf("too small")
+					}
+					if max != nil && int(res) > *max {
+						return nil, fmt.Errorf("too large")
+					}
+					return next(ctx)
+
+				case *int:
+					if min != nil && *res < *min {
+						return nil, fmt.Errorf("too small")
+					}
+					if max != nil && *res > *max {
+						return nil, fmt.Errorf("too large")
+					}
+					return next(ctx)
+				}
+				return nil, fmt.Errorf("unsupported type %T", res)
+			},
+			Custom: func(ctx context.Context, obj interface{}, next graphql.Resolver) (interface{}, error) {
+				return next(ctx)
+			},
+			Logged: func(ctx context.Context, obj interface{}, next graphql.Resolver, id string) (interface{}, error) {
+				return next(context.WithValue(ctx, "request_id", &id))
+			},
+			ToNull: func(ctx context.Context, obj interface{}, next graphql.Resolver) (interface{}, error) {
+				return nil, nil
+			},
+			Directive1: func(ctx context.Context, obj interface{}, next graphql.Resolver) (res interface{}, err error) {
+				return next(ctx)
+			},
+			Directive2: func(ctx context.Context, obj interface{}, next graphql.Resolver) (res interface{}, err error) {
+				return next(ctx)
+			},
+			Unimplemented: nil,
+		},
+	}))
+
+	srv.AroundFields(func(ctx context.Context, next graphql.Resolver) (res interface{}, err error) {
+		path, _ := ctx.Value("path").([]int)
+		return next(context.WithValue(ctx, "path", append(path, 1)))
+	})
+
+	srv.AroundFields(func(ctx context.Context, next graphql.Resolver) (res interface{}, err error) {
+		path, _ := ctx.Value("path").([]int)
+		return next(context.WithValue(ctx, "path", append(path, 2)))
+	})
 
-	srv :=
-		handler.GraphQL(
-			NewExecutableSchema(Config{
-				Resolvers: resolvers,
-				Directives: DirectiveRoot{
-					Length: func(ctx context.Context, obj interface{}, next graphql.Resolver, min int, max *int, message *string) (interface{}, error) {
-						e := func(msg string) error {
-							if message == nil {
-								return fmt.Errorf(msg)
-							}
-							return fmt.Errorf(*message)
-						}
-						res, err := next(ctx)
-						if err != nil {
-							return nil, err
-						}
-
-						s := res.(string)
-						if len(s) < min {
-							return nil, e("too short")
-						}
-						if max != nil && len(s) > *max {
-							return nil, e("too long")
-						}
-						return res, nil
-					},
-					Range: func(ctx context.Context, obj interface{}, next graphql.Resolver, min *int, max *int) (interface{}, error) {
-						res, err := next(ctx)
-						if err != nil {
-							return nil, err
-						}
-
-						switch res := res.(type) {
-						case int:
-							if min != nil && res < *min {
-								return nil, fmt.Errorf("too small")
-							}
-							if max != nil && res > *max {
-								return nil, fmt.Errorf("too large")
-							}
-							return next(ctx)
-
-						case int64:
-							if min != nil && int(res) < *min {
-								return nil, fmt.Errorf("too small")
-							}
-							if max != nil && int(res) > *max {
-								return nil, fmt.Errorf("too large")
-							}
-							return next(ctx)
-
-						case *int:
-							if min != nil && *res < *min {
-								return nil, fmt.Errorf("too small")
-							}
-							if max != nil && *res > *max {
-								return nil, fmt.Errorf("too large")
-							}
-							return next(ctx)
-						}
-						return nil, fmt.Errorf("unsupported type %T", res)
-					},
-					Custom: func(ctx context.Context, obj interface{}, next graphql.Resolver) (interface{}, error) {
-						return next(ctx)
-					},
-					Logged: func(ctx context.Context, obj interface{}, next graphql.Resolver, id string) (interface{}, error) {
-						return next(context.WithValue(ctx, "request_id", &id))
-					},
-					ToNull: func(ctx context.Context, obj interface{}, next graphql.Resolver) (interface{}, error) {
-						return nil, nil
-					},
-					Directive1: func(ctx context.Context, obj interface{}, next graphql.Resolver) (res interface{}, err error) {
-						return next(ctx)
-					},
-					Directive2: func(ctx context.Context, obj interface{}, next graphql.Resolver) (res interface{}, err error) {
-						return next(ctx)
-					},
-					Unimplemented: nil,
-				},
-			}),
-			handler.ResolverMiddleware(func(ctx context.Context, next graphql.Resolver) (res interface{}, err error) {
-				path, _ := ctx.Value("path").([]int)
-				return next(context.WithValue(ctx, "path", append(path, 1)))
-			}),
-			handler.ResolverMiddleware(func(ctx context.Context, next graphql.Resolver) (res interface{}, err error) {
-				path, _ := ctx.Value("path").([]int)
-				return next(context.WithValue(ctx, "path", append(path, 2)))
-			}),
-		)
 	c := client.New(srv)
 
 	t.Run("arg directives", func(t *testing.T) {

diff --git a/codegen/testserver/generated_test.go b/codegen/testserver/generated_test.go
@@ -5,21 +5,14 @@ package testserver
 
 import (
 	"context"
-	"net/http"
 	"reflect"
 	"testing"
 
 	"github.com/99designs/gqlgen/client"
-	"github.com/99designs/gqlgen/handler"
+	"github.com/99designs/gqlgen/graphql/handler"
 	"github.com/stretchr/testify/require"
 )
 
-func TestGeneratedResolversAreValid(t *testing.T) {
-	http.Handle("/query", handler.GraphQL(NewExecutableSchema(Config{
-		Resolvers: &Resolver{},
-	})))
-}
-
 func TestForcedResolverFieldIsPointer(t *testing.T) {
 	field, ok := reflect.TypeOf((*ForcedResolverResolver)(nil)).Elem().MethodByName("Field")
 	require.True(t, ok)
@@ -39,7 +32,8 @@ func TestUnionFragments(t *testing.T) {
 		return &Circle{Radius: 32}, nil
 	}
 
-	c := client.New(handler.GraphQL(NewExecutableSchema(Config{Resolvers: resolvers})))
+	srv := handler.NewDefaultServer(NewExecutableSchema(Config{Resolvers: resolvers}))
+	c := client.New(srv)
 
 	t.Run("inline fragment on union", func(t *testing.T) {
 		var resp struct {

diff --git a/codegen/testserver/input_test.go b/codegen/testserver/input_test.go
@@ -5,14 +5,14 @@ import (
 	"testing"
 
 	"github.com/99designs/gqlgen/client"
-	"github.com/99designs/gqlgen/handler"
+	"github.com/99designs/gqlgen/graphql/handler"
 	"github.com/stretchr/testify/require"
 )
 
 func TestInput(t *testing.T) {
 	resolvers := &Stub{}
-
-	c := client.New(handler.GraphQL(NewExecutableSchema(Config{Resolvers: resolvers})))
+	srv := handler.NewDefaultServer(NewExecutableSchema(Config{Resolvers: resolvers}))
+	c := client.New(srv)
 
 	t.Run("when function errors on directives", func(t *testing.T) {
 		resolvers.QueryResolver.InputSlice = func(ctx context.Context, arg []string) (b bool, e error) {

diff --git a/codegen/testserver/interfaces_test.go b/codegen/testserver/interfaces_test.go
@@ -7,7 +7,7 @@ import (
 
 	"github.com/99designs/gqlgen/client"
 	"github.com/99designs/gqlgen/graphql"
-	"github.com/99designs/gqlgen/handler"
+	"github.com/99designs/gqlgen/graphql/handler"
 	"github.com/stretchr/testify/require"
 )
 
@@ -24,7 +24,7 @@ func TestInterfaces(t *testing.T) {
 			return nil, nil
 		}
 
-		srv := handler.GraphQL(
+		srv := handler.NewDefaultServer(
 			NewExecutableSchema(Config{
 				Resolvers: resolvers,
 				Directives: DirectiveRoot{

diff --git a/codegen/testserver/introspection_test.go b/codegen/testserver/introspection_test.go
@@ -6,19 +6,19 @@ import (
 
 	"github.com/99designs/gqlgen/client"
 	"github.com/99designs/gqlgen/graphql"
+	"github.com/99designs/gqlgen/graphql/handler"
+	"github.com/99designs/gqlgen/graphql/handler/transport"
 	"github.com/99designs/gqlgen/graphql/introspection"
-	"github.com/99designs/gqlgen/handler"
 	"github.com/stretchr/testify/require"
 )
 
 func TestIntrospection(t *testing.T) {
-	t.Run("disabled", func(t *testing.T) {
+	t.Run("disabled when creating your own server", func(t *testing.T) {
 		resolvers := &Stub{}
 
-		c := client.New(handler.GraphQL(
-			NewExecutableSchema(Config{Resolvers: resolvers}),
-			handler.IntrospectionEnabled(false),
-		))
+		srv := handler.New(NewExecutableSchema(Config{Resolvers: resolvers}))
+		srv.AddTransport(transport.POST{})
+		c := client.New(srv)
 
 		var resp interface{}
 		err := c.Post(introspection.Query, &resp)
@@ -28,7 +28,7 @@ func TestIntrospection(t *testing.T) {
 	t.Run("enabled by default", func(t *testing.T) {
 		resolvers := &Stub{}
 
-		c := client.New(handler.GraphQL(
+		c := client.New(handler.NewDefaultServer(
 			NewExecutableSchema(Config{Resolvers: resolvers}),
 		))
 
@@ -65,14 +65,12 @@ func TestIntrospection(t *testing.T) {
 	t.Run("disabled by middleware", func(t *testing.T) {
 		resolvers := &Stub{}
 
-		c := client.New(handler.GraphQL(
-			NewExecutableSchema(Config{Resolvers: resolvers}),
-			handler.RequestMiddleware(func(ctx context.Context, next graphql.ResponseHandler) *graphql.Response {
-				graphql.GetOperationContext(ctx).DisableIntrospection = true
-
-				return next(ctx)
-			}),
-		))
+		srv := handler.NewDefaultServer(NewExecutableSchema(Config{Resolvers: resolvers}))
+		srv.AroundOperations(func(ctx context.Context, next graphql.OperationHandler) graphql.ResponseHandler {
+			graphql.GetOperationContext(ctx).DisableIntrospection = true
+			return next(ctx)
+		})
+		c := client.New(srv)
 
 		var resp interface{}
 		err := c.Post(introspection.Query, &resp)

diff --git a/codegen/testserver/maps_test.go b/codegen/testserver/maps_test.go
@@ -5,7 +5,7 @@ import (
 	"testing"
 
 	"github.com/99designs/gqlgen/client"
-	"github.com/99designs/gqlgen/handler"
+	"github.com/99designs/gqlgen/graphql/handler"
 	"github.com/stretchr/testify/require"
 )
 
@@ -21,7 +21,7 @@ func TestMaps(t *testing.T) {
 		return in.Map, nil
 	}
 
-	c := client.New(handler.GraphQL(
+	c := client.New(handler.NewDefaultServer(
 		NewExecutableSchema(Config{Resolvers: resolver}),
 	))
 	t.Run("unset", func(t *testing.T) {