Removed redundant method

Author: Zgoda91

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

@@ -21,6 +21,7 @@
 import io.grpc.CallCredentials;
 import io.grpc.ChannelCredentials;
 import io.grpc.CompositeCallCredentials;
+import io.grpc.CompositeChannelCredentials;
 import io.grpc.internal.GrpcUtil;
 import io.grpc.internal.JsonUtil;
 import io.grpc.xds.client.BootstrapperImpl;
@@ -98,9 +99,14 @@ protected String getJsonContent() throws XdsInitializationException, IOException
   }
 
   @Override
-  protected Object getImplSpecificChannelCredConfig(Map<String, ?> serverConfig, String serverUri)
+  protected Object getImplSpecificConfig(Map<String, ?> serverConfig, String serverUri)
       throws XdsInitializationException {
-    return getChannelCredentials(serverConfig, serverUri);
+    ChannelCredentials channelCreds = getChannelCredentials(serverConfig, serverUri);
+    CallCredentials callCreds = getCallCredentials(serverConfig, serverUri);
+    if (callCreds != null) {
+      channelCreds = CompositeChannelCredentials.create(channelCreds, callCreds);
+    }
+    return channelCreds;
   }
 
   private static ChannelCredentials getChannelCredentials(Map<String, ?> serverConfig,
@@ -144,12 +150,6 @@ private static ChannelCredentials parseChannelCredentials(List<Map<String, ?>> j
     return null;
   }
 
-  @Override
-  protected Object getImplSpecificCallCredConfig(Map<String, ?> serverConfig, String serverUri)
-      throws XdsInitializationException {
-    return getCallCredentials(serverConfig, serverUri);
-  }
-
   private static CallCredentials getCallCredentials(Map<String, ?> serverConfig,
                                                     String serverUri)
       throws XdsInitializationException {

xds/src/main/java/io/grpc/xds/client/BootstrapperImpl.java

@@ -19,9 +19,6 @@
 import com.google.common.annotations.VisibleForTesting;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
-import io.grpc.CallCredentials;
-import io.grpc.ChannelCredentials;
-import io.grpc.CompositeChannelCredentials;
 import io.grpc.Internal;
 import io.grpc.InternalLogId;
 import io.grpc.internal.GrpcUtil;
@@ -79,13 +76,9 @@ protected BootstrapperImpl() {
 
   protected abstract String getJsonContent() throws IOException, XdsInitializationException;
 
-  protected abstract Object getImplSpecificChannelCredConfig(
-      Map<String, ?> serverConfig, String serverUri)
+  protected abstract Object getImplSpecificConfig(Map<String, ?> serverConfig, String serverUri)
       throws XdsInitializationException;
 
-  protected abstract Object getImplSpecificCallCredConfig(
-      Map<String, ?> serverConfig, String serverUri)
-      throws XdsInitializationException;
 
   /**
    * Reads and parses bootstrap config. The config is expected to be in JSON format.
@@ -260,9 +253,7 @@ private List<ServerInfo> parseServerInfos(List<?> rawServerConfigs, XdsLogger lo
       }
       logger.log(XdsLogLevel.INFO, "xDS server URI: {0}", serverUri);
 
-      Object implSpecificChannelCredConfig =
-          getImplSpecificChannelCredConfig(serverConfig, serverUri);
-      Object implSpecificCallCredConfig = getImplSpecificCallCredConfig(serverConfig, serverUri);
+      Object implSpecificConfig = getImplSpecificConfig(serverConfig, serverUri);
 
       boolean resourceTimerIsTransientError = false;
       boolean ignoreResourceDeletion = false;
@@ -276,17 +267,10 @@ private List<ServerInfo> parseServerInfos(List<?> rawServerConfigs, XdsLogger lo
             && serverFeatures.contains(SERVER_FEATURE_RESOURCE_TIMER_IS_TRANSIENT_ERROR);
       }
       servers.add(
-          ServerInfo.create(
-            serverUri,
-            (implSpecificCallCredConfig != null)
-                ? CompositeChannelCredentials.create(
-                    (ChannelCredentials) implSpecificChannelCredConfig,
-                    (CallCredentials) implSpecificCallCredConfig)
-                : implSpecificChannelCredConfig,
-            ignoreResourceDeletion,
-            serverFeatures != null
-                && serverFeatures.contains(SERVER_FEATURE_TRUSTED_XDS_SERVER),
-            resourceTimerIsTransientError));
+          ServerInfo.create(serverUri, implSpecificConfig, ignoreResourceDeletion,
+              serverFeatures != null
+                  && serverFeatures.contains(SERVER_FEATURE_TRUSTED_XDS_SERVER),
+              resourceTimerIsTransientError));
     }
     return servers.build();
   }