Fix relocated source files

Author: captainsafia

src/Http/Http.Extensions/gen/StaticRouteHandler/Emitters/EndpointEmitter.cs

@@ -85,10 +85,6 @@ public static void EmitRequestHandler(this Endpoint endpoint, CodeWriter codeWri
         {
             return;
         }
-        if (!endpoint.Response.HasNoResponse && endpoint.Response is { ContentType: { } contentType })
-        {
-            codeWriter.WriteLine($@"httpContext.Response.ContentType ??= ""{contentType}"";");
-        }
         if (!endpoint.Response.HasNoResponse)
         {
             codeWriter.Write("var result = ");
@@ -98,6 +94,9 @@ public static void EmitRequestHandler(this Endpoint endpoint, CodeWriter codeWri
             codeWriter.Write("await ");
         }
         codeWriter.WriteLine($"handler({endpoint.EmitArgumentList()});");
+
+        endpoint.Response.EmitHttpResponseContentType(codeWriter);
+
         if (!endpoint.Response.HasNoResponse)
         {
             codeWriter.WriteLine(endpoint.Response.EmitResponseWritingCall(endpoint.IsAwaitable));

src/Http/Http.Extensions/gen/StaticRouteHandler/Emitters/EndpointResponseEmitter.cs

@@ -11,7 +11,7 @@ internal static void EmitJsonPreparation(this EndpointResponse endpointResponse,
     {
         if (endpointResponse.IsSerializableJsonResponse(out var responseType))
         {
-            var typeName = responseType.ToDisplayString(EmitterConstants.DisplayFormat);
+            var typeName = responseType.ToDisplayString(EmitterConstants.DisplayFormatWithoutNullability);
 
             codeWriter.WriteLine("var serializerOptions = serviceProvider?.GetService<IOptions<JsonOptions>>()?.Value.SerializerOptions ?? new JsonOptions().SerializerOptions;");
             codeWriter.WriteLine($"var jsonTypeInfo =  (JsonTypeInfo<{typeName}>)serializerOptions.GetTypeInfo(typeof({typeName}));");
@@ -73,7 +73,7 @@ internal static void EmitBuiltinResponseTypeMetadata(this Endpoint endpoint, Cod
         }
         else
         {
-            codeWriter.WriteLine($"options.EndpointBuilder.Metadata.Add(new GeneratedProducesResponseTypeMetadata(type: typeof({responseType.ToDisplayString(EmitterConstants.DisplayFormat)}), statusCode: StatusCodes.Status200OK, contentTypes: GeneratedMetadataConstants.JsonContentType));");
+            codeWriter.WriteLine($"options.EndpointBuilder.Metadata.Add(new GeneratedProducesResponseTypeMetadata(type: typeof({responseType.ToDisplayString(EmitterConstants.DisplayFormatWithoutNullability)}), statusCode: StatusCodes.Status200OK, contentTypes: GeneratedMetadataConstants.JsonContentType));");
         }
     }
 
@@ -89,4 +89,21 @@ internal static void EmitCallToMetadataProviderForResponse(this Endpoint endpoin
             codeWriter.WriteLine($"PopulateMetadataForEndpoint<{responseType.ToDisplayString(EmitterConstants.DisplayFormat)}>(methodInfo, options.EndpointBuilder);");
         }
     }
+
+    internal static void EmitHttpResponseContentType(this EndpointResponse endpointResponse, CodeWriter codeWriter)
+    {
+        if (!endpointResponse.HasNoResponse
+            && endpointResponse.ResponseType is { } responseType
+            && (responseType.SpecialType == SpecialType.System_Object || responseType.SpecialType == SpecialType.System_String))
+        {
+            codeWriter.WriteLine("if (result is string)");
+            codeWriter.StartBlock();
+            codeWriter.WriteLine($@"httpContext.Response.ContentType ??= ""text/plain; charset=utf-8"";");
+            codeWriter.EndBlock();
+            codeWriter.WriteLine("else");
+            codeWriter.StartBlock();
+            codeWriter.WriteLine($@"httpContext.Response.ContentType ??= ""application/json; charset=utf-8"";");
+            codeWriter.EndBlock();
+        }
+    }
 }