Merge pull request #6652 from microsoft/miller/endgame-fixes

fix miscellaneous bugs

Author: wangmingliang-ms

PluginsAndFeatures/azure-toolkit-for-eclipse/com.microsoft.azuretools.appservice/src/com/microsoft/azure/toolkit/eclipse/webapp/handlers/WebAppLogStreamingHandler.java

@@ -15,6 +15,9 @@
 import com.microsoft.azure.toolkit.lib.common.task.AzureTask;
 import com.microsoft.azure.toolkit.lib.common.task.AzureTaskManager;
 import com.microsoft.azure.toolkit.lib.common.bundle.AzureString;
+
+import java.util.Optional;
+
 import com.microsoft.azure.toolkit.eclipse.common.logstream.EclipseAzureLogStreamingManager;
 
 import reactor.core.publisher.Flux;
@@ -30,10 +33,8 @@ public static void stopLogStreaming(final WebAppBase<?, ?, ?> webApp) {
 
     public static void startLogStreaming(final WebAppBase<?, ?, ?> webApp) {
         if (!isLogStreamingEnabled(webApp)) {
-            final boolean enableLogging = AzureTaskManager.getInstance()
-                    .runAndWaitAsObservable(new AzureTask<>(() -> AzureMessager.getMessager()
-                            .confirm(AzureString.format(ENABLE_FILE_LOGGING, webApp.name()), ENABLE_LOGGING)))
-                    .toBlocking().single();
+            final boolean enableLogging = AzureMessager.getMessager()
+                    .confirm(AzureString.format(ENABLE_FILE_LOGGING, webApp.name()), ENABLE_LOGGING);
             if (enableLogging) {
                 enableLogStreaming(webApp);
             } else {
@@ -49,7 +50,7 @@ public static void startLogStreaming(final WebAppBase<?, ?, ?> webApp) {
     }
 
     private static boolean isLogStreamingEnabled(WebAppBase<?, ?, ?> webApp) {
-        return webApp.getDiagnosticConfig().isEnableWebServerLogging();
+        return Optional.ofNullable(webApp.getDiagnosticConfig()).map(DiagnosticConfig::isEnableWebServerLogging).orElse(false);
     }
 
     private static void enableLogStreaming(WebAppBase<?, ?, ?> webApp) {

PluginsAndFeatures/azure-toolkit-for-eclipse/com.microsoft.azuretools.azureexplorer/src/com/microsoft/azure/toolkit/eclipse/explorer/AzureTreeNode.java

@@ -162,7 +162,7 @@ private void applyActionGroupToMenu(@Nonnull IActionGroup actionGroup, @Nonnull
     private <T> Action toEclipseAction(com.microsoft.azure.toolkit.lib.common.action.Action<T> action,
             @Nullable T source) {
         final Label view = Optional.ofNullable(action).map(act -> act.getView(source)).orElse(null);
-        if (view == null) {
+        if (view == null || StringUtils.isBlank(view.getLabel())) {
             return null;
         }
         final ImageDescriptor imageDescriptor = StringUtils.isEmpty(view.getIconPath()) ? null

PluginsAndFeatures/azure-toolkit-for-eclipse/com.microsoft.azuretools.springcloud/src/main/java/com/microsoft/azure/toolkit/eclipse/springcloud/component/SpringCloudAppConfigPanel.java

@@ -240,7 +240,6 @@ private void setupUI() {
 		this.useJava8.setSelection(true);
 
 		this.useJava11 = new Button(grpConfiguration, SWT.RADIO);
-		this.useJava11.setLayoutData(new GridData(SWT.LEFT, SWT.CENTER, true, false, 1, 1));
 		this.useJava11.setText("Java 11");
 
 		this.useJava17 = new Button(grpConfiguration, SWT.RADIO);

PluginsAndFeatures/azure-toolkit-for-intellij/azure-intellij-resource-connector-lib/src/main/java/com/microsoft/azure/toolkit/intellij/connector/AzureServiceResource.java

@@ -10,6 +10,7 @@
 import com.intellij.openapi.project.Project;
 import com.microsoft.azure.toolkit.ide.common.action.ResourceCommonActionsContributor;
 import com.microsoft.azure.toolkit.lib.common.action.AzureActionManager;
+import com.microsoft.azure.toolkit.lib.common.exception.AzureToolkitRuntimeException;
 import com.microsoft.azure.toolkit.lib.common.model.AzResourceBase;
 import lombok.EqualsAndHashCode;
 import lombok.Getter;
@@ -54,6 +55,10 @@ public synchronized T getData() {
 
     @Override
     public Map<String, String> initEnv(Project project) {
+        final T resource = this.getData();
+        if (!resource.exists()) {
+            throw new AzureToolkitRuntimeException(String.format("'%s' doesn't exist.", resource));
+        }
         return this.definition.initEnv(this, project);
     }