fix: merge conflict

Author: AgraVator

xds/src/main/java/io/grpc/xds/GrpcXdsTransportFactory.java

@@ -54,9 +54,8 @@
 final class GrpcXdsTransportFactory implements XdsTransportFactory {
 
   private final CallCredentials callCredentials;
-<<<<<<< child-channel-plugin
   private final ChannelConfigurer channelConfigurer;
-=======
+
   // The map of xDS server info to its corresponding gRPC xDS transport.
   // This enables reusing and sharing the same underlying gRPC channel.
   //
@@ -65,8 +64,6 @@ final class GrpcXdsTransportFactory implements XdsTransportFactory {
   // for reference counting of each GrpcXdsTransport instance.
   private static final Map<Bootstrapper.ServerInfo, GrpcXdsTransport> xdsServerInfoToTransportMap =
       new ConcurrentHashMap<>();
->>>>>>> master
-
 
   GrpcXdsTransportFactory(CallCredentials callCredentials,
                           ChannelConfigurer channelConfigurer) {
@@ -76,19 +73,15 @@ final class GrpcXdsTransportFactory implements XdsTransportFactory {
 
   @Override
   public XdsTransport create(Bootstrapper.ServerInfo serverInfo) {
-<<<<<<< child-channel-plugin
-    return new GrpcXdsTransport(serverInfo, callCredentials, channelConfigurer);
-=======
     return xdsServerInfoToTransportMap.compute(
         serverInfo,
         (info, transport) -> {
           if (transport == null) {
-            transport = new GrpcXdsTransport(serverInfo, callCredentials);
+            transport = new GrpcXdsTransport(serverInfo, callCredentials, channelConfigurer);
           }
           ++transport.refCount;
           return transport;
         });
->>>>>>> master
   }
 
   @VisibleForTesting
@@ -136,6 +129,7 @@ public GrpcXdsTransport(Bootstrapper.ServerInfo serverInfo,
       }
       this.channel = channelBuilder.build();
       this.callCredentials = callCredentials;
+      this.serverInfo = serverInfo;
     }
 
     @VisibleForTesting

xds/src/test/java/io/grpc/xds/GrpcXdsTransportFactoryTest.java

@@ -136,7 +136,7 @@ public void refCountedXdsTransport_sameXdsServerAddress_returnsExistingTransport
     Bootstrapper.ServerInfo xdsServerInfo =
         Bootstrapper.ServerInfo.create(
             "localhost:" + server.getPort(), InsecureChannelCredentials.create());
-    GrpcXdsTransportFactory xdsTransportFactory = new GrpcXdsTransportFactory(null);
+    GrpcXdsTransportFactory xdsTransportFactory = new GrpcXdsTransportFactory(null, null);
     // Calling create() for the first time creates a new GrpcXdsTransport instance.
     // The ref count was previously 0 and now is 1.
     XdsTransportFactory.XdsTransport transport1 = xdsTransportFactory.create(xdsServerInfo);
@@ -168,7 +168,7 @@ public void refCountedXdsTransport_differentXdsServerAddress_returnsDifferentTra
     Bootstrapper.ServerInfo xdsServerInfo2 =
         Bootstrapper.ServerInfo.create(
             "localhost:" + server2.getPort(), InsecureChannelCredentials.create());
-    GrpcXdsTransportFactory xdsTransportFactory = new GrpcXdsTransportFactory(null);
+    GrpcXdsTransportFactory xdsTransportFactory = new GrpcXdsTransportFactory(null, null);
     // Calling create() to the first xDS server creates a new GrpcXdsTransport instance.
     // The ref count was previously 0 and now is 1.
     XdsTransportFactory.XdsTransport transport1 = xdsTransportFactory.create(xdsServerInfo1);

xds/src/test/java/io/grpc/xds/XdsNameResolverTest.java

@@ -2946,10 +2946,10 @@ void deliverErrorStatus() {
   }
 
   @Test
-  public void start_passesParentChannelToClientPoolFactory() {
+  public void start_passesChannelConfigurerToClientPoolFactory() {
     ChannelConfigurer mockChannelConfigurer = mock(ChannelConfigurer.class);
 
-    // Build NameResolver.Args containing the child channel configurer
+    // Build NameResolver.Args containing the channel configurer
     NameResolver.Args args = NameResolver.Args.newBuilder()
         .setDefaultPort(8080)
         .setProxyDetector(mock(ProxyDetector.class))
@@ -2975,7 +2975,7 @@ public void start_passesParentChannelToClientPoolFactory() {
         .thenReturn(mockObjectPool);
 
     XdsNameResolver resolver = new XdsNameResolver(
-        URI.create(AUTHORITY),
+        targetUri,
         null, // targetAuthority (nullable)
         AUTHORITY, // name
         null, // overrideAuthority (nullable)

xds/src/test/java/io/grpc/xds/XdsServerBuilderTest.java

@@ -330,7 +330,7 @@ public void testOverrideBootstrap() throws Exception {
   }
 
   @Test
-  public void start_passesParentServerToClientPoolFactory() throws Exception {
+  public void start_passesChannelConfigurerToClientPoolFactory() throws Exception {
     ChannelConfigurer mockConfigurer = mock(ChannelConfigurer.class);
     XdsClientPoolFactory mockPoolFactory = mock(XdsClientPoolFactory.class);
     @SuppressWarnings("unchecked")
@@ -345,7 +345,7 @@ public void start_passesParentServerToClientPoolFactory() throws Exception {
 
     Future<?> unused = startServerAsync();
 
-    // Verify getOrCreate called with the server instance
+    // Verify getOrCreate called with the ChannelConfigurer instance
     verify(mockPoolFactory).getOrCreate(
         any(), any(), any(), org.mockito.ArgumentMatchers.eq(mockConfigurer));
   }