Merge pull request #5428 from microsoft/fix-function

wangmingliang-ms · web-flow · commit 411ff5c545c9 · 2021-06-24T10:14:12.000+08:00
Migrate to use cache in library for app service
diff --git a/PluginsAndFeatures/azure-toolkit-for-intellij/src/com/microsoft/azure/toolkit/intellij/webapp/WebAppComboBox.java b/PluginsAndFeatures/azure-toolkit-for-intellij/src/com/microsoft/azure/toolkit/intellij/webapp/WebAppComboBox.java
@@ -7,12 +7,13 @@
 
 import com.intellij.openapi.project.Project;
 import com.microsoft.azure.toolkit.intellij.appservice.AppServiceComboBox;
+import com.microsoft.azure.toolkit.lib.Azure;
+import com.microsoft.azure.toolkit.lib.appservice.AzureAppService;
 import com.microsoft.azure.toolkit.lib.appservice.model.JavaVersion;
 import com.microsoft.azure.toolkit.lib.appservice.service.IWebApp;
 import com.microsoft.azure.toolkit.lib.common.operation.AzureOperation;
 import com.microsoft.azure.toolkit.lib.webapp.WebAppService;
 import com.microsoft.azuretools.azurecommons.helpers.NotNull;
-import com.microsoft.azuretools.core.mvp.model.webapp.AzureWebAppMvpModel;
 import com.microsoft.tooling.msservices.components.DefaultLoader;
 
 import java.util.List;
@@ -47,7 +48,7 @@ protected void createResource() {
         type = AzureOperation.Type.SERVICE
     )
     protected List<WebAppComboBoxModel> loadAppServiceModels() {
-        final List<IWebApp> webApps = AzureWebAppMvpModel.getInstance().listAzureWebApps(false);
+        final List<IWebApp> webApps = Azure.az(AzureAppService.class).webapps(false);
         return webApps.stream()
                       .filter(webApp -> webApp.getRuntime().getJavaVersion() != null && webApp.getRuntime().getJavaVersion() != JavaVersion.OFF)
                       .sorted((a, b) -> a.name().compareToIgnoreCase(b.name()))
diff --git a/PluginsAndFeatures/azure-toolkit-for-intellij/src/com/microsoft/azure/toolkit/intellij/webapp/docker/webapponlinux/WebAppOnLinuxDeployState.java b/PluginsAndFeatures/azure-toolkit-for-intellij/src/com/microsoft/azure/toolkit/intellij/webapp/docker/webapponlinux/WebAppOnLinuxDeployState.java
@@ -123,12 +123,9 @@ protected Operation createOperation() {
         type = AzureOperation.Type.TASK
     )
     protected void onSuccess(IAppService result, @NotNull RunProcessHandler processHandler) {
-        processHandler.setText("Updating cache ... ");
-        AzureWebAppMvpModel.getInstance().listAzureWebApps(true); // todo: replace with cache framework
-        processHandler.setText("Job done");
         processHandler.notifyComplete();
         if (deployModel.isCreatingNewWebAppOnLinux() && AzureUIRefreshCore.listeners != null) {
-            AzureUIRefreshCore.execute(new AzureUIRefreshEvent(AzureUIRefreshEvent.EventType.REFRESH, null));
+            AzureUIRefreshCore.execute(new AzureUIRefreshEvent(AzureUIRefreshEvent.EventType.REFRESH, result));
         }
     }
 
diff --git a/PluginsAndFeatures/azure-toolkit-for-intellij/src/com/microsoft/azure/toolkit/intellij/webapp/runner/webappconfig/WebAppRunState.java b/PluginsAndFeatures/azure-toolkit-for-intellij/src/com/microsoft/azure/toolkit/intellij/webapp/runner/webappconfig/WebAppRunState.java
@@ -115,7 +115,7 @@ protected Operation createOperation() {
     @AzureOperation(name = "webapp.complete_starting.state", type = AzureOperation.Type.ACTION)
     protected void onSuccess(IAppService result, @NotNull RunProcessHandler processHandler) {
         if (webAppSettingModel.isCreatingNew() && AzureUIRefreshCore.listeners != null) {
-            AzureUIRefreshCore.execute(new AzureUIRefreshEvent(AzureUIRefreshEvent.EventType.REFRESH, null));
+            AzureUIRefreshCore.execute(new AzureUIRefreshEvent(AzureUIRefreshEvent.EventType.REFRESH, result));
         }
         updateConfigurationDataModel(result);
         int indexOfDot = webAppSettingModel.getTargetName().lastIndexOf(".");
diff --git a/Utils/azure-explorer-common/src/com/microsoft/tooling/msservices/serviceexplorer/azure/container/WebAppOnLinuxDeployPresenter.java b/Utils/azure-explorer-common/src/com/microsoft/tooling/msservices/serviceexplorer/azure/container/WebAppOnLinuxDeployPresenter.java
@@ -12,7 +12,6 @@
 import com.microsoft.azure.toolkit.lib.appservice.service.IWebApp;
 import com.microsoft.azure.toolkit.lib.auth.AzureAccount;
 import com.microsoft.azuretools.core.mvp.model.AzureMvpModel;
-import com.microsoft.azuretools.core.mvp.model.webapp.AzureWebAppMvpModel;
 import com.microsoft.azuretools.core.mvp.ui.base.MvpPresenter;
 import com.microsoft.tooling.msservices.components.DefaultLoader;
 import reactor.core.publisher.Flux;
@@ -34,7 +33,7 @@ public class WebAppOnLinuxDeployPresenter<V extends WebAppOnLinuxDeployView> ext
     private static final String CANNOT_LIST_APP_SERVICE_PLAN = "Failed to list app service plan.";
 
     private List<IWebApp> retrieveListOfWebAppOnLinux(boolean force) {
-        return AzureWebAppMvpModel.getInstance().listAzureWebApps(force).stream()
+        return Azure.az(AzureAppService.class).webapps(force).stream()
                 .filter(iWebApp -> iWebApp.getRuntime().getOperatingSystem() != OperatingSystem.WINDOWS) // docker and linux
                 .collect(Collectors.toList());
     }
diff --git a/Utils/azure-explorer-common/src/com/microsoft/tooling/msservices/serviceexplorer/azure/function/FunctionAppNode.java b/Utils/azure-explorer-common/src/com/microsoft/tooling/msservices/serviceexplorer/azure/function/FunctionAppNode.java
@@ -5,8 +5,6 @@
 
 package com.microsoft.tooling.msservices.serviceexplorer.azure.function;
 
-import com.microsoft.azure.toolkit.lib.Azure;
-import com.microsoft.azure.toolkit.lib.appservice.AzureAppService;
 import com.microsoft.azure.toolkit.lib.appservice.service.IFunctionApp;
 import com.microsoft.azure.toolkit.lib.common.operation.AzureOperation;
 import com.microsoft.azuretools.azurecommons.helpers.Nullable;
@@ -29,7 +27,7 @@ public class FunctionAppNode extends WebAppBaseNode {
 
     private static final String FUNCTION_LABEL = "Function";
 
-    private IFunctionApp functionApp;
+    private final IFunctionApp functionApp;
 
     public FunctionAppNode(@Nonnull AzureRefreshableNode parent, @Nonnull IFunctionApp functionApp) {
         super(parent, FUNCTION_LABEL, functionApp);
diff --git a/Utils/azure-explorer-common/src/com/microsoft/tooling/msservices/serviceexplorer/azure/function/FunctionModule.java b/Utils/azure-explorer-common/src/com/microsoft/tooling/msservices/serviceexplorer/azure/function/FunctionModule.java
@@ -44,7 +44,7 @@ public void removeNode(String sid, String id, Node node) {
     @Override
     @AzureOperation(name = "function.reload_all", type = AzureOperation.Type.ACTION)
     protected void refreshItems() {
-        Azure.az(AzureAppService.class).functionApps()
+        Azure.az(AzureAppService.class).functionApps(true)
                 .stream().map(functionApp -> new FunctionAppNode(FunctionModule.this, functionApp))
                 .forEach(this::addChildNode);
     }
diff --git a/Utils/azure-explorer-common/src/com/microsoft/tooling/msservices/serviceexplorer/azure/webapp/WebAppModule.java b/Utils/azure-explorer-common/src/com/microsoft/tooling/msservices/serviceexplorer/azure/webapp/WebAppModule.java
@@ -9,12 +9,9 @@
 import com.microsoft.azure.toolkit.lib.common.operation.AzureOperation;
 import com.microsoft.azuretools.azurecommons.helpers.NotNull;
 import com.microsoft.azuretools.azurecommons.helpers.Nullable;
-import com.microsoft.azuretools.core.mvp.model.webapp.AzureWebAppMvpModel;
 import com.microsoft.azuretools.utils.AzureUIRefreshCore;
 import com.microsoft.azuretools.utils.AzureUIRefreshEvent;
 import com.microsoft.azuretools.utils.AzureUIRefreshListener;
-import com.microsoft.azuretools.utils.WebAppUtils;
-import com.microsoft.tooling.msservices.components.DefaultLoader;
 import com.microsoft.tooling.msservices.serviceexplorer.AzureIconSymbol;
 import com.microsoft.tooling.msservices.serviceexplorer.AzureRefreshableNode;
 import com.microsoft.tooling.msservices.serviceexplorer.Node;
@@ -68,12 +65,12 @@ public void run() {
                 if (event.opsType == AzureUIRefreshEvent.EventType.SIGNIN || event.opsType == AzureUIRefreshEvent
                         .EventType.SIGNOUT) {
                     removeAllChildNodes();
-                } else if (event.object == null && (event.opsType == AzureUIRefreshEvent.EventType.UPDATE || event
+                } else if (event.object instanceof IWebApp && (event.opsType == AzureUIRefreshEvent.EventType.UPDATE || event
                         .opsType == AzureUIRefreshEvent.EventType.REMOVE)) {
                     if (hasChildNodes()) {
                         load(true);
                     }
-                } else if (event.object == null && event.opsType == AzureUIRefreshEvent.EventType.REFRESH) {
+                } else if (event.object instanceof IWebApp && event.opsType == AzureUIRefreshEvent.EventType.REFRESH) {
                     load(true);
                 }
             }
@@ -88,4 +85,5 @@ public void renderChildren(@NotNull final List<IWebApp> resourceExes) {
                 .map(webApp -> new WebAppNode(this, webApp))
                 .forEach(this::addChildNode);
     }
+
 }
diff --git a/Utils/azure-explorer-common/src/com/microsoft/tooling/msservices/serviceexplorer/azure/webapp/WebAppModulePresenter.java b/Utils/azure-explorer-common/src/com/microsoft/tooling/msservices/serviceexplorer/azure/webapp/WebAppModulePresenter.java
@@ -5,6 +5,8 @@
 
 package com.microsoft.tooling.msservices.serviceexplorer.azure.webapp;
 
+import com.microsoft.azure.toolkit.lib.Azure;
+import com.microsoft.azure.toolkit.lib.appservice.AzureAppService;
 import com.microsoft.azuretools.core.mvp.model.webapp.AzureWebAppMvpModel;
 import com.microsoft.azuretools.core.mvp.ui.base.MvpPresenter;
 
@@ -15,7 +17,7 @@ public class WebAppModulePresenter<V extends WebAppModuleView> extends MvpPresen
     public void onModuleRefresh() {
         final WebAppModuleView view = getMvpView();
         if (view != null) {
-            view.renderChildren(AzureWebAppMvpModel.getInstance().listAzureWebApps(true));
+            view.renderChildren(Azure.az(AzureAppService.class).webapps(true));
         }
     }
 
diff --git a/Utils/azuretools-core/src/com/microsoft/azuretools/core/mvp/model/webapp/AzureWebAppMvpModel.java b/Utils/azuretools-core/src/com/microsoft/azuretools/core/mvp/model/webapp/AzureWebAppMvpModel.java
@@ -19,8 +19,6 @@
 import com.microsoft.azure.toolkit.lib.appservice.service.IWebAppBase;
 import com.microsoft.azure.toolkit.lib.appservice.service.IWebAppDeploymentSlot;
 import com.microsoft.azure.toolkit.lib.appservice.service.impl.WebAppDeploymentSlot;
-import com.microsoft.azure.toolkit.lib.auth.AzureAccount;
-import com.microsoft.azure.toolkit.lib.common.cache.Cacheable;
 import com.microsoft.azure.toolkit.lib.common.exception.AzureToolkitRuntimeException;
 import com.microsoft.azure.toolkit.lib.common.operation.AzureOperation;
 import com.microsoft.azuretools.azurecommons.helpers.NotNull;
@@ -30,11 +28,7 @@
 import org.apache.commons.lang3.StringUtils;
 
 import java.io.File;
-import java.util.List;
 import java.util.Map;
-import java.util.stream.Collectors;
-
-import static com.microsoft.azure.toolkit.lib.Azure.az;
 
 // todo: Refactor to tasks in app service library
 @Deprecated
@@ -128,31 +122,6 @@ public IWebApp updateWebAppOnDocker(String webAppId, ImageSetting imageSetting)
         return app;
     }
 
-    /**
-     * List all the Web Apps in selected subscriptions.
-     * todo: move to app service library
-     */
-    @AzureOperation(
-            name = "webapp.list.subscription|selected",
-            type = AzureOperation.Type.SERVICE
-    )
-    public List<IWebApp> listAzureWebApps(final boolean force) {
-        return az(AzureAccount.class).account().getSelectedSubscriptions().stream()
-                .flatMap(sub -> listAzureWebAppsBySubscription(sub.getId(), force).stream())
-                .collect(Collectors.toList());
-    }
-
-    @NotNull
-    @AzureOperation(
-            name = "webapp.list.subscription",
-            params = {"subscriptionId"},
-            type = AzureOperation.Type.SERVICE
-    )
-    @Cacheable(cacheName = "subscription-webapps-track2", key = "$subscriptionId", condition = "!(force&&force[0])")
-    public List<IWebApp> listAzureWebAppsBySubscription(final String subscriptionId, final boolean... force) {
-        return com.microsoft.azure.toolkit.lib.Azure.az(AzureAppService.class).subscription(subscriptionId).webapps();
-    }
-
     /**
      * API to create new Web App by setting model.
      */

Original file line number	Diff line number	Diff line change
`@@ -123,12 +123,9 @@ protected Operation createOperation() {`
`123`	`123`	`type = AzureOperation.Type.TASK`
`124`	`124`	`)`
`125`	`125`	`protected void onSuccess(IAppService result, @NotNull RunProcessHandler processHandler) {`
`126`		`- processHandler.setText("Updating cache ... ");`
`127`		`- AzureWebAppMvpModel.getInstance().listAzureWebApps(true); // todo: replace with cache framework`
`128`		`- processHandler.setText("Job done");`
`129`	`126`	`processHandler.notifyComplete();`
`130`	`127`	`if (deployModel.isCreatingNewWebAppOnLinux() && AzureUIRefreshCore.listeners != null) {`
`131`		`- AzureUIRefreshCore.execute(new AzureUIRefreshEvent(AzureUIRefreshEvent.EventType.REFRESH, null));`
	`128`	`+ AzureUIRefreshCore.execute(new AzureUIRefreshEvent(AzureUIRefreshEvent.EventType.REFRESH, result));`
`132`	`129`	`}`
`133`	`130`	`}`
`134`	`131`
Original file line number	Diff line number	Diff line change
`@@ -115,7 +115,7 @@ protected Operation createOperation() {`
`115`	`115`	`@AzureOperation(name = "webapp.complete_starting.state", type = AzureOperation.Type.ACTION)`
`116`	`116`	`protected void onSuccess(IAppService result, @NotNull RunProcessHandler processHandler) {`
`117`	`117`	`if (webAppSettingModel.isCreatingNew() && AzureUIRefreshCore.listeners != null) {`
`118`		`- AzureUIRefreshCore.execute(new AzureUIRefreshEvent(AzureUIRefreshEvent.EventType.REFRESH, null));`
	`118`	`+ AzureUIRefreshCore.execute(new AzureUIRefreshEvent(AzureUIRefreshEvent.EventType.REFRESH, result));`
`119`	`119`	`}`
`120`	`120`	`updateConfigurationDataModel(result);`
`121`	`121`	`int indexOfDot = webAppSettingModel.getTargetName().lastIndexOf(".");`
Original file line number	Diff line number	Diff line change
`@@ -44,7 +44,7 @@ public void removeNode(String sid, String id, Node node) {`
`44`	`44`	`@Override`
`45`	`45`	`@AzureOperation(name = "function.reload_all", type = AzureOperation.Type.ACTION)`
`46`	`46`	`protected void refreshItems() {`
`47`		`- Azure.az(AzureAppService.class).functionApps()`
	`47`	`+ Azure.az(AzureAppService.class).functionApps(true)`
`48`	`48`	`.stream().map(functionApp -> new FunctionAppNode(FunctionModule.this, functionApp))`
`49`	`49`	`.forEach(this::addChildNode);`
`50`	`50`	`}`
Original file line number	Diff line number	Diff line change
`@@ -5,6 +5,8 @@`
`5`	`5`
`6`	`6`	`package com.microsoft.tooling.msservices.serviceexplorer.azure.webapp;`
`7`	`7`
	`8`	`+import com.microsoft.azure.toolkit.lib.Azure;`
	`9`	`+import com.microsoft.azure.toolkit.lib.appservice.AzureAppService;`
`8`	`10`	`import com.microsoft.azuretools.core.mvp.model.webapp.AzureWebAppMvpModel;`
`9`	`11`	`import com.microsoft.azuretools.core.mvp.ui.base.MvpPresenter;`
`10`	`12`
`@@ -15,7 +17,7 @@ public class WebAppModulePresenter<V extends WebAppModuleView> extends MvpPresen`
`15`	`17`	`public void onModuleRefresh() {`
`16`	`18`	`final WebAppModuleView view = getMvpView();`
`17`	`19`	`if (view != null) {`
`18`		`- view.renderChildren(AzureWebAppMvpModel.getInstance().listAzureWebApps(true));`
	`20`	`+ view.renderChildren(Azure.az(AzureAppService.class).webapps(true));`
`19`	`21`	`}`
`20`	`22`	`}`
`21`	`23`