Add correct log message

Author: gthea

src/main/java/io/split/android/client/SplitClientConfig.java

@@ -1298,11 +1298,15 @@ private HttpProxy parseProxyHost(String proxyUri, ProxyConfiguration proxyConfig
                 return legacyProxyBehavior(proxyUri);
             }
 
+            if (mProxyHost != null || mProxyAuthenticator != null) {
+                Logger.w("Both the deprecated proxy configuration methods (proxyHost, proxyAuthenticator) and the new ProxyConfiguration builder are being used. ProxyConfiguration will take precedence.");
+            }
+
             // Initialize internal config with null url. This will be verified when building the factory.
             HttpProxy.Builder builder = HttpProxy.newBuilder(null, -1);
             if (proxyConfiguration.getUrl() != null) {
                 builder = HttpProxy.newBuilder(proxyConfiguration.getUrl().getHost(), proxyConfiguration.getUrl().getPort())
-                        .mtlsAuth(proxyConfiguration.getClientCert(), proxyConfiguration.getClientPk())
+                        .mtls(proxyConfiguration.getClientCert(), proxyConfiguration.getClientPk())
                         .proxyCacert(proxyConfiguration.getCaCert())
                         .credentialsProvider(proxyConfiguration.getCredentialsProvider());
             }

src/main/java/io/split/android/client/network/HttpProxy.java

@@ -90,7 +90,7 @@ public Builder proxyCacert(@NonNull InputStream caCertStream) {
             return this;
         }
 
-        public Builder mtlsAuth(@NonNull InputStream clientCertStream, @NonNull InputStream keyStream) {
+        public Builder mtls(@NonNull InputStream clientCertStream, @NonNull InputStream keyStream) {
             mClientCertStream = clientCertStream;
             mClientKeyStream = keyStream;
             return this;

src/test/java/io/split/android/client/SplitClientConfigTest.java

@@ -6,6 +6,7 @@
 import static junit.framework.TestCase.assertTrue;
 
 import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
 
 import org.junit.Test;
 
@@ -14,6 +15,9 @@
 import java.util.concurrent.TimeUnit;
 
 import io.split.android.client.network.CertificatePinningConfiguration;
+import io.split.android.client.network.ProxyConfiguration;
+import io.split.android.client.network.SplitAuthenticatedRequest;
+import io.split.android.client.network.SplitAuthenticator;
 import io.split.android.client.utils.logger.LogPrinter;
 import io.split.android.client.utils.logger.Logger;
 import io.split.android.client.utils.logger.SplitLogLevel;
@@ -256,6 +260,47 @@ public void nullRolloutCacheConfigurationSetsDefault() {
         assertEquals(1, logMessages.size());
     }
 
+    @Test
+    public void proxyHostAndProxyConfigurationSetLogWarning() {
+        Queue<String> logMessages = getLogMessagesQueue();
+        SplitClientConfig.builder()
+                .logLevel(SplitLogLevel.WARNING)
+                .proxyHost("proxyHost")
+                .proxyConfiguration(ProxyConfiguration.builder().url("http://proxy.url").build())
+                .build();
+        assertEquals(1, logMessages.size());
+        assertEquals("Both the deprecated proxy configuration methods (proxyHost, proxyAuthenticator) and the new ProxyConfiguration builder are being used. ProxyConfiguration will take precedence.", logMessages.poll());
+    }
+
+    @Test
+    public void proxyAuthenticatorAndProxyConfigurationSetLogWarning() {
+        Queue<String> logMessages = getLogMessagesQueue();
+        SplitClientConfig.builder()
+                .logLevel(SplitLogLevel.WARNING)
+                .proxyAuthenticator(new SplitAuthenticator() {
+                    @Nullable
+                    @Override
+                    public SplitAuthenticatedRequest authenticate(@NonNull SplitAuthenticatedRequest request) {
+                        return null;
+                    }
+                })
+                .proxyConfiguration(ProxyConfiguration.builder().url("http://proxy.url").build())
+                .build();
+        assertEquals(1, logMessages.size());
+        assertEquals("Both the deprecated proxy configuration methods (proxyHost, proxyAuthenticator) and the new ProxyConfiguration builder are being used. ProxyConfiguration will take precedence.", logMessages.poll());
+    }
+
+    @Test
+    public void proxyConfigurationWithNoUrlSetLogWarning() {
+        Queue<String> logMessages = getLogMessagesQueue();
+        SplitClientConfig.builder()
+                .logLevel(SplitLogLevel.WARNING)
+                .proxyConfiguration(ProxyConfiguration.builder().build())
+                .build();
+        assertEquals(1, logMessages.size());
+        assertEquals("Proxy configuration with no URL. This will prevent SplitFactory from working.", logMessages.poll());
+    }
+
     @NonNull
     private static Queue<String> getLogMessagesQueue() {
         Queue<String> logMessages = new LinkedList<>();

src/test/java/io/split/android/client/network/HttpClientTunnellingProxyTest.java

@@ -388,7 +388,7 @@ public MockResponse dispatch(RecordedRequest request) {
 
         // 4. Configure HttpProxy with mTLS (client cert, key, and CA)
         HttpProxy proxy = HttpProxy.newBuilder("localhost", assignedProxyPort)
-                .mtlsAuth(
+                .mtls(
                     Files.newInputStream(clientCertFile.toPath()),
                     Files.newInputStream(clientKeyFile.toPath())
                 )