Fix issues founded in end game (#4800)

* Bump azure version in config files, fixes #1797902

* Clear combo box when fill items, fixes #1797587

* Always get latest app service status, fixes #1797916

* Exclude unused dependency from dom4j, fixes #1797591, #1797900,#1797913,#1797914

* Wrapper web app deployment within AzureTaskManager and add empty check in AzureOperationsContext, fixes #1797882

Author: Flanker32

PluginsAndFeatures/AddLibrary/AppInsights/com.microsoft.applicationinsights.ui/src/main/java/com/microsoft/applicationinsights/ui/config/messages.properties

@@ -14,7 +14,7 @@ depLocation=dependencies/
 excp=Exception in getClasspathEntries
 azureSDKcontainerID=com.microsoft.azuretools.SDK_CONTAINER
 sdkID=com.microsoft.azuretools.sdk
-sdkJar=dependencies/azure-1.36.3.jar
+sdkJar=dependencies/azure-1.38.0.jar
 jstDep=org.eclipse.jst.component.dependency
 aiCheckBoxTxt=Enable telemetry with Application Insights
 webxmlPath=WebContent/WEB-INF/web.xml

PluginsAndFeatures/AddLibrary/AzureLibraries/com.microsoft.azuretools.wasdkjava.ui/src/main/java/com/microsoft/azuretools/wasdkjava/ui/classpath/messages.properties

@@ -7,7 +7,7 @@ lblVersion=Version :
 libNotAvail=Library is not available.
 notFound=Not found
 sdkID=com.microsoft.azuretools.sdk
-sdkJar=dependencies/azure-1.36.3.jar
+sdkJar=dependencies/azure-1.38.0.jar
 title=Microsoft Azure Libraries for Java
 verNotAvail=The selected version is not available.
 version1=Microsoft Azure Libraries for Java, version %s.%s.%s

PluginsAndFeatures/azure-toolkit-for-eclipse/com.microsoft.azuretools.core/src/com/microsoft/azuretools/core/utils/messages.properties

@@ -56,7 +56,7 @@ err=Error
 prefFileName=WAEclipsePlugin
 bundleName=org.eclipse.core.runtime
 sdkLibBundleName=com.microsoftopentechnologies.windowsazure.tools.sdk
-sdkLibBaseJar=dependencies/azure-1.36.3.jar
+sdkLibBaseJar=dependencies/azure-1.38.0.jar
 SDKLocErrMsg=Error occurred while retrieving path of Azure libraries
 resCLExWkspRfrsh=Exception while refresh of workspace.
 cmhLblStrgAcc=Storage Accounts

PluginsAndFeatures/azure-toolkit-for-intellij/build.gradle

@@ -122,7 +122,12 @@ dependencies {
     compile group: 'com.microsoft.azure', name: 'azure-auth-helper', version: '0.6.0'
     compile 'com.microsoft.azure:azure-tools-common:0.10.0'
     compile group: 'com.microsoft.azure.appplatform.v2019_05_01_preview', name: 'azure-mgmt-appplatform', version: '1.0.0-beta-2'
-    compile group: 'org.dom4j', name: 'dom4j', version: '2.1.3'
+    compile group: 'org.dom4j', name: 'dom4j', version: '2.1.3', {
+        exclude group: "javax.xml.stream", module: "stax-api"
+        exclude group: "xpp3", module: "xpp3"
+        exclude group: "pull-parser", module: "pull-parser"
+        exclude group: "net.java.dev.msv", module: "xsdlib"
+    }
     compile group: 'jaxen', name: 'jaxen', version: '1.2.0'
     compile group: 'commons-beanutils', name: 'commons-beanutils', version: '1.9.4'
 

PluginsAndFeatures/azure-toolkit-for-intellij/src/com/microsoft/azure/toolkit/intellij/appservice/AppServiceComboBox.java

@@ -59,9 +59,12 @@ public synchronized void refreshItemsWithDefaultValue(@NotNull T defaultValue) {
         this.addItem(defaultValue);
         subscription = this.loadItemsAsync()
                            .subscribe(items -> DefaultLoader.getIdeHelper().invokeLater(() -> {
-                               items.forEach(this::addItem);
-                               this.resetDefaultValue(defaultValue);
-                               this.setLoading(false);
+                               synchronized (AppServiceComboBox.this) {
+                                   AppServiceComboBox.this.removeAllItems();
+                                   items.forEach(this::addItem);
+                                   this.resetDefaultValue(defaultValue);
+                                   this.setLoading(false);
+                               }
                            }), (e) -> {
                                    this.handleLoadingError(e);
                                });

PluginsAndFeatures/azure-toolkit-for-intellij/src/com/microsoft/azure/toolkit/intellij/webapp/action/CreateWebAppAction.java

@@ -63,7 +63,7 @@ public CreateWebAppAction(WebAppModule webappModule) {
     }
 
     @Override
-    @AzureOperation(value = "start to create a new web app", type = AzureOperation.Type.ACTION)
+    @AzureOperation(value = "create web app", type = AzureOperation.Type.ACTION)
     public void actionPerformed(NodeActionEvent e) {
         final Project project = (Project) webappModule.getProject();
         if (!AzureSignInAction.doSignIn(AuthMethodManager.getInstance(), project) ||
@@ -75,7 +75,6 @@ public void actionPerformed(NodeActionEvent e) {
         dialog.show();
     }
 
-    @AzureOperation(value = "create new web app", type = AzureOperation.Type.ACTION)
     private void createWebApp(final WebAppConfig config, Runnable callback, final Project project) {
         final AzureTask task = new AzureTask(null, message("webapp.create.task.title"), true, () -> {
             ProgressManager.getInstance().getProgressIndicator().setIndeterminate(true);
@@ -84,13 +83,13 @@ private void createWebApp(final WebAppConfig config, Runnable callback, final Pr
             refreshAzureExplorer();
             final Path application = config.getApplication();
             if (Objects.nonNull(application) && application.toFile().exists()) {
-                DefaultLoader.getIdeHelper().invokeLater(() -> deploy(webapp, application, project));
+                AzureTaskManager.getInstance().runLater(() -> deploy(webapp, application, project));
             }
         });
         AzureTaskManager.getInstance().runInModal(task);
     }
 
-    @AzureOperation(value = "deploy artifact to web app", type = AzureOperation.Type.ACTION)
+    @AzureOperation(value = "deploy artifact to web app", type = AzureOperation.Type.SERVICE)
     private void deploy(final WebApp webapp, final Path application, final Project project) {
         final AzureTask task = new AzureTask(null, message("webapp.deploy.task.title"), true, () -> {
             ProgressManager.getInstance().getProgressIndicator().setIndeterminate(true);

PluginsAndFeatures/azure-toolkit-for-intellij/src/com/microsoft/intellij/serviceexplorer/azure/appservice/ProfileFlightRecordAction.java

@@ -35,6 +35,8 @@
 import com.microsoft.azure.toolkit.lib.appservice.jfr.FlightRecorderStarterBase;
 import com.microsoft.azure.toolkit.lib.common.task.AzureTask;
 import com.microsoft.azure.toolkit.lib.common.task.AzureTaskManager;
+import com.microsoft.azuretools.core.mvp.model.AzureMvpModel;
+import com.microsoft.azuretools.core.mvp.model.webapp.AzureWebAppMvpModel;
 import com.microsoft.azuretools.telemetry.TelemetryConstants;
 import com.microsoft.azuretools.telemetrywrapper.EventUtil;
 import com.microsoft.intellij.util.PluginUtil;
@@ -60,7 +62,7 @@ public class ProfileFlightRecordAction extends NodeActionListener {
     private static final int ONE_SECOND = 1000;
     private static final int TWO_SECONDS = 2000;
     private final Project project;
-    private final WebAppBase appService;
+    private WebAppBase appService;
 
     public ProfileFlightRecordAction(WebAppNode webAppNode) {
         super();
@@ -77,11 +79,6 @@ protected void actionPerformed(NodeActionEvent nodeActionEvent) {
                                        String.format(message("webapp.flightRecord.error.notSupport.message"), appService.name()));
             return;
         }
-        if (!StringUtils.equalsIgnoreCase(appService.state(), "running")) {
-            notifyUserWithErrorMessage(message("webapp.flightRecord.error.notRunning.title"),
-                                       String.format(message("webapp.flightRecord.error.notRunning.message"), appService.name()));
-            return;
-        }
         EventUtil.executeWithLog(appService instanceof WebApp ? TelemetryConstants.WEBAPP : TelemetryConstants.FUNCTION,
                                  "start-flight-recorder", op -> {
                 final AzureTask task = new AzureTask(project, PROFILE_FLIGHT_RECORDER, true, this::doProfileFlightRecorderAll, AzureTask.Modality.ANY);
@@ -91,6 +88,14 @@ protected void actionPerformed(NodeActionEvent nodeActionEvent) {
 
     private void doProfileFlightRecorderAll() {
         try {
+            final String subscriptionId = AzureMvpModel.getSegment(appService.id(), "subscriptions");
+            // Always get latest app service status, workaround for https://dev.azure.com/mseng/VSJava/_workitems/edit/1797916
+            appService = AzureWebAppMvpModel.getInstance().getWebAppById(subscriptionId, appService.id());
+            if (!StringUtils.equalsIgnoreCase(appService.state(), "running")) {
+                notifyUserWithErrorMessage(message("webapp.flightRecord.error.notRunning.title"),
+                                           String.format(message("webapp.flightRecord.error.notRunning.message"), appService.name()));
+                return;
+            }
             ProgressIndicator progressIndicator = ProgressManager.getInstance().getProgressIndicator();
             progressIndicator.setText(String.format(message("webapp.flightRecord.task.startProfileWebApp.title"), appService.name()));
             CountDownLatch finishLatch = new CountDownLatch(1);

PluginsAndFeatures/azure-toolkit-for-intellij/src/com/microsoft/intellij/util/PluginHelper.java

@@ -29,7 +29,7 @@
 
 public class PluginHelper {
 
-    private static final String AZURE_ARTIFACT = "azure-1.36.3.jar";
+    private static final String AZURE_ARTIFACT = "azure-1.38.0.jar";
 
     /**
      * @return resource filename in plugin's directory

Utils/azuretools-core/src/com/microsoft/azure/toolkit/lib/common/operation/AzureOperationsContext.java

@@ -23,6 +23,7 @@
 package com.microsoft.azure.toolkit.lib.common.operation;
 
 import com.microsoft.azure.toolkit.lib.common.handler.AzureExceptionHandler;
+import org.apache.commons.collections4.CollectionUtils;
 import rx.Completable;
 import rx.Observable;
 import rx.Single;
@@ -58,7 +59,9 @@ public static Object execute(final AzureOperationRef operation, final OperationP
         try {
             return proceedable.proceed();
         } finally {
-            AzureOperationsContext.pop();
+            if (CollectionUtils.isNotEmpty(operations.get())) {
+                AzureOperationsContext.pop();
+            }
         }
     }