BREAKING: add WithRequestContentType to Engine from Server

Author: dylanhitt

engine.go

@@ -59,6 +59,12 @@ var defaultOpenAPIConfig = OpenAPIConfig{
 	JSONFilePath: "doc/openapi.json",
 }
 
+// WithRequestContentType sets the accepted content types for the engine.
+// By default, the accepted content types is */*.
+func WithRequestContentType(consumes ...string) func(*Engine) {
+	return func(e *Engine) { e.acceptedContentTypes = consumes }
+}
+
 func WithOpenAPIConfig(config OpenAPIConfig) func(*Engine) {
 	return func(e *Engine) {
 		if config.JSONFilePath != "" {

engine_test.go

@@ -38,3 +38,31 @@ func TestWithErrorHandler(t *testing.T) {
 		})
 	})
 }
+
+func TestWithRequestContentType(t *testing.T) {
+	t.Run("base", func(t *testing.T) {
+		e := NewEngine()
+		require.Nil(t, e.acceptedContentTypes)
+	})
+
+	t.Run("input", func(t *testing.T) {
+		arr := []string{"application/json", "application/xml"}
+		e := NewEngine(WithRequestContentType("application/json", "application/xml"))
+		require.ElementsMatch(t, arr, e.acceptedContentTypes)
+	})
+
+	t.Run("ensure applied to route", func(t *testing.T) {
+		s := NewServer(WithEngineOptions(
+			WithRequestContentType("application/json", "application/xml")),
+		)
+		route := Post(s, "/test", dummyController)
+
+		content := route.Operation.RequestBody.Value.Content
+		require.NotNil(t, content.Get("application/json"))
+		require.NotNil(t, content.Get("application/xml"))
+		require.Equal(t, "#/components/schemas/ReqBody", content.Get("application/json").Schema.Ref)
+		require.Equal(t, "#/components/schemas/ReqBody", content.Get("application/xml").Schema.Ref)
+		_, ok := s.OpenAPI.Description().Components.RequestBodies["ReqBody"]
+		require.False(t, ok)
+	})
+}

option_test.go

@@ -376,7 +376,9 @@ func TestRequestContentType(t *testing.T) {
 	})
 
 	t.Run("override server", func(t *testing.T) {
-		s := fuego.NewServer(fuego.WithRequestContentType("application/json", "application/xml"))
+		s := fuego.NewServer(fuego.WithEngineOptions(
+			fuego.WithRequestContentType("application/json", "application/xml"),
+		))
 		route := fuego.Post(
 			s, "/test", dummyController,
 			fuego.OptionRequestContentType("my/content-type"),

server.go

@@ -336,12 +336,6 @@ func WithLogHandler(handler slog.Handler) func(*Server) {
 	}
 }
 
-// WithRequestContentType sets the accepted content types for the server.
-// By default, the accepted content types is */*.
-func WithRequestContentType(consumes ...string) func(*Server) {
-	return func(s *Server) { s.acceptedContentTypes = consumes }
-}
-
 // WithSerializer sets a custom serializer of type Sender that overrides the default one.
 // Please send a PR if you think the default serializer should be improved, instead of jumping to this option.
 func WithSerializer(serializer Sender) func(*Server) {

server_test.go

@@ -320,32 +320,6 @@ func dummyController(_ ContextWithBody[ReqBody]) (Resp, error) {
 	return Resp{Message: "hello world"}, nil
 }
 
-func TestWithRequestContentType(t *testing.T) {
-	t.Run("base", func(t *testing.T) {
-		s := NewServer()
-		require.Nil(t, s.acceptedContentTypes)
-	})
-
-	t.Run("input", func(t *testing.T) {
-		arr := []string{"application/json", "application/xml"}
-		s := NewServer(WithRequestContentType("application/json", "application/xml"))
-		require.ElementsMatch(t, arr, s.acceptedContentTypes)
-	})
-
-	t.Run("ensure applied to route", func(t *testing.T) {
-		s := NewServer(WithRequestContentType("application/json", "application/xml"))
-		route := Post(s, "/test", dummyController)
-
-		content := route.Operation.RequestBody.Value.Content
-		require.NotNil(t, content.Get("application/json"))
-		require.NotNil(t, content.Get("application/xml"))
-		require.Equal(t, "#/components/schemas/ReqBody", content.Get("application/json").Schema.Ref)
-		require.Equal(t, "#/components/schemas/ReqBody", content.Get("application/xml").Schema.Ref)
-		_, ok := s.OpenAPI.Description().Components.RequestBodies["ReqBody"]
-		require.False(t, ok)
-	})
-}
-
 func TestCustomSerialization(t *testing.T) {
 	s := NewServer(
 		WithSerializer(func(w http.ResponseWriter, r *http.Request, a any) error {