Merge branch 'develop' into qianjin-sqlserver

Author: shenqianjin

Utils/azuretools-core/pom.xml

@@ -194,6 +194,10 @@
             <groupId>com.squareup.retrofit2</groupId>
             <artifactId>retrofit</artifactId>
         </dependency>
+        <dependency>
+            <groupId>log4j</groupId>
+            <artifactId>log4j</artifactId>
+        </dependency>
         <dependency>
             <groupId>com.microsoft.azure</groupId>
             <artifactId>azure</artifactId>

Utils/azuretools-core/src/com/microsoft/azuretools/authmanage/AuthMethodManager.java

@@ -6,6 +6,7 @@
 package com.microsoft.azuretools.authmanage;
 
 import com.azure.core.implementation.http.HttpClientProviders;
+import com.microsoft.aad.msal4j.PublicClientApplication;
 import com.microsoft.azure.management.Azure;
 import com.microsoft.azure.management.appplatform.v2020_07_01.implementation.AppPlatformManager;
 import com.microsoft.azure.management.mysql.v2020_01_01.implementation.MySQLManager;
@@ -28,8 +29,9 @@
 import com.microsoft.azuretools.telemetrywrapper.EventUtil;
 import com.microsoft.azuretools.utils.AzureUIRefreshCore;
 import com.microsoft.azuretools.utils.AzureUIRefreshEvent;
-import reactor.core.publisher.Mono;
-import reactor.core.scheduler.Schedulers;
+
+import org.apache.log4j.Level;
+import org.apache.log4j.Logger;
 
 import java.io.IOException;
 import java.nio.charset.StandardCharsets;
@@ -40,14 +42,21 @@
 import java.util.Set;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.ExecutionException;
-import java.util.logging.Logger;
 import java.util.stream.Collectors;
 
 import static com.microsoft.azuretools.Constants.FILE_NAME_AUTH_METHOD_DETAILS;
-import static com.microsoft.azuretools.telemetry.TelemetryConstants.*;
+import static com.microsoft.azuretools.telemetry.TelemetryConstants.ACCOUNT;
+import static com.microsoft.azuretools.telemetry.TelemetryConstants.AZURE_ENVIRONMENT;
+import static com.microsoft.azuretools.telemetry.TelemetryConstants.RESIGNIN;
+import static com.microsoft.azuretools.telemetry.TelemetryConstants.SIGNIN_METHOD;
+
+import reactor.core.publisher.Hooks;
+import reactor.core.publisher.Mono;
+import reactor.core.scheduler.Schedulers;
 
 public class AuthMethodManager {
-    private static final Logger LOGGER = Logger.getLogger(AuthMethodManager.class.getName());
+    private static final org.apache.log4j.Logger LOGGER =
+        org.apache.log4j.Logger.getLogger(PublicClientApplication.class);
     private AuthMethodDetails authMethodDetails;
     private final Set<Runnable> signInEventListeners = new HashSet<>();
     private final Set<Runnable> signOutEventListeners = new HashSet<>();
@@ -57,6 +66,7 @@ public class AuthMethodManager {
     static {
         // fix the class load problem for intellij plugin
         ClassLoader current = Thread.currentThread().getContextClassLoader();
+        Logger.getLogger(com.microsoft.aad.adal4j.AuthenticationContext.class).setLevel(Level.OFF);
         try {
             Thread.currentThread().setContextClassLoader(AuthMethodManager.class.getClassLoader());
             HttpClientProviders.createInstance();
@@ -83,7 +93,7 @@ private AuthMethodManager() {
             try {
                 initAuthMethodManagerFromSettings();
             } catch (Throwable ex) {
-                LOGGER.warning("Cannot restore login due to error: " + ex.getMessage());
+                LOGGER.warn("Cannot restore login due to error: " + ex.getMessage());
             }
             return true;
         }).subscribeOn(Schedulers.boundedElastic()).subscribe();
@@ -255,7 +265,7 @@ private void initAuthMethodManagerFromSettings() {
                         }
                         case AD:
                             // we don't support it now
-                            LOGGER.warning("The AD auth method is not supported now, ignore the credential.");
+                            LOGGER.warn("The AD auth method is not supported now, ignore the credential.");
                             break;
                         case SP:
                             targetAuthMethodDetails.setAuthType(AuthType.SERVICE_PRINCIPAL);