RewriteType does not work with multiple rewrites (#2607)

src/HotChocolate/Stitching/src/Stitching/Extensions/ContextDataExtensions.cs

@@ -339,6 +339,8 @@ internal static class ContextDataExtensions
                 if (current is IDictionary<(NameString, NameString), NameString> dict)
                 {
                     dict[(newTypeName, schemaName)] = originalTypeName;
+
+                    return dict;
                 }
 
                 return new Dictionary<(NameString, NameString), NameString>

src/HotChocolate/Stitching/test/Stitching.Tests/Configuration/ContextDataExtensionsTest.cs

@@ -0,0 +1,75 @@
+using System.Collections.Generic;
+using HotChocolate.Configuration;
+using HotChocolate.Types;
+using HotChocolate.Types.Descriptors;
+using HotChocolate.Types.Descriptors.Definitions;
+using Xunit;
+
+namespace HotChocolate.Stitching.Configuration
+{
+    public class ContextDataExtensionsTest
+    {
+        [Fact]
+        public void AddNameLookup_Single()
+        {
+            // arrange
+            ISchemaBuilder schemaBuilder = SchemaBuilder.New().AddQueryType<CustomQueryType>();
+
+            // act
+            schemaBuilder.AddNameLookup("OriginalType1", "NewType1", "Schema1");
+            schemaBuilder.AddNameLookup("OriginalType2", "NewType2", "Schema2");
+
+            // assert
+            IReadOnlyDictionary<(NameString, NameString), NameString> lookup =
+                schemaBuilder
+                    .Create()
+                    .GetType<CustomQueryType>(nameof(CustomQueryType))
+                    .Context
+                    .GetNameLookup();
+            Assert.Equal("OriginalType1", lookup[("NewType1", "Schema1")]);
+            Assert.Equal("OriginalType2", lookup[("NewType2", "Schema2")]);
+        }
+
+        [Fact]
+        public void AddNameLookup_Multiple()
+        {
+            // arrange
+            ISchemaBuilder schemaBuilder = SchemaBuilder.New().AddQueryType<CustomQueryType>();
+            var dict = new Dictionary<(NameString, NameString), NameString>
+            {
+                { ("NewType1", "Schema1"), "OriginalType1" },
+                { ("NewType2", "Schema2"), "OriginalType2" }
+            };
+
+            // act
+            schemaBuilder.AddNameLookup(dict);
+
+            // assert
+            IReadOnlyDictionary<(NameString, NameString), NameString> lookup =
+                schemaBuilder
+                    .Create()
+                    .GetType<CustomQueryType>(nameof(CustomQueryType))
+                    .Context
+                    .GetNameLookup();
+            Assert.Equal("OriginalType1", lookup[("NewType1", "Schema1")]);
+            Assert.Equal("OriginalType2", lookup[("NewType2", "Schema2")]);
+        }
+
+        public class CustomQueryType : ObjectType
+        {
+            public IDescriptorContext Context { get; set; }
+
+            protected override void Configure(IObjectTypeDescriptor descriptor)
+            {
+                descriptor.Field("foo").Resolve("bar");
+            }
+
+            protected override ObjectTypeDefinition CreateDefinition(ITypeDiscoveryContext context)
+            {
+                Context = context.DescriptorContext;
+
+                return base.CreateDefinition(context);
+            }
+        }
+    }
+}

src/HotChocolate/Stitching/test/Stitching.Tests/Configuration/HotChocolateStitchingRequestExecutorExtensionsTests.cs

@@ -0,0 +1,55 @@
+using System.Collections.Generic;
+using System.Threading.Tasks;
+using HotChocolate.Configuration;
+using HotChocolate.Execution;
+using HotChocolate.Execution.Configuration;
+using HotChocolate.Types;
+using HotChocolate.Types.Descriptors;
+using HotChocolate.Types.Descriptors.Definitions;
+using Microsoft.Extensions.DependencyInjection;
+using Xunit;
+
+namespace HotChocolate.Stitching.Configuration
+{
+    public class HotChocolateStitchingRequestExecutorExtensionsTests
+    {
+        [Fact]
+        public async Task RewriteType()
+        {
+            // arrange
+            IRequestExecutorBuilder executorBuilder =
+                new ServiceCollection().AddGraphQL().AddQueryType<CustomQueryType>();
+
+            // act
+            executorBuilder.RewriteType("OriginalType1", "NewType1", "Schema1");
+            executorBuilder.RewriteType("OriginalType2", "NewType2", "Schema2");
+
+            // assert
+            ISchema schema = await executorBuilder.BuildSchemaAsync();
+            IReadOnlyDictionary<(NameString, NameString), NameString> lookup =
+                schema
+                    .GetType<CustomQueryType>(nameof(CustomQueryType))
+                    .Context
+                    .GetNameLookup();
+            Assert.Equal("OriginalType1", lookup[("NewType1", "Schema1")]);
+            Assert.Equal("OriginalType2", lookup[("NewType2", "Schema2")]);
+        }
+    }
+
+    public class CustomQueryType : ObjectType
+    {
+        public IDescriptorContext Context { get; set; }
+
+        protected override void Configure(IObjectTypeDescriptor descriptor)
+        {
+            descriptor.Field("foo").Resolve("bar");
+        }
+
+        protected override ObjectTypeDefinition CreateDefinition(ITypeDiscoveryContext context)
+        {
+            Context = context.DescriptorContext;
+
+            return base.CreateDefinition(context);
+        }
+    }
+}