Merge branch 'endgame-s186' into develop.next

Author: Flanker32

CHANGELOG.md

@@ -3,6 +3,7 @@
 All notable changes to "Azure Toolkit for IntelliJ IDEA" will be documented in this file.
 
 - [Change Log](#change-log)
+  - [3.52.0](#3520)
   - [3.51.0](#3510)
   - [3.50.0](#3500)
   - [3.49.0](#3490)
@@ -66,6 +67,18 @@ All notable changes to "Azure Toolkit for IntelliJ IDEA" will be documented in t
   - [3.0.7](#307)
   - [3.0.6](#306)
 
+## 3.52.0
+### Added
+- Support OAuth for authentication
+- Add support for management/client sdk in Azure SDK reference book
+
+### Changed
+- Improve UI for azure service connector
+
+### Fixed
+- [#5121](https://github.com/microsoft/azure-tools-for-java/issues/5121) Fix project disposed exception for workspace tagging
+- [PR #5163](https://github.com/microsoft/azure-tools-for-java/pull/5163) Fix enable local access may not work for Azure MySQL
+
 ## 3.51.0
 ### Added
 - Add support for IntelliJ 2021.1 EAP

PluginsAndFeatures/AddLibrary/AzureLibraries/pom.xml

@@ -28,7 +28,7 @@
     <parent>
     <groupId>com.microsoft.azuretools</groupId>
     <artifactId>utils</artifactId>
-    <version>3.51.0</version>
+    <version>3.52.0</version>
     </parent>
     <groupId>com.microsoft.azuretools</groupId>
     <artifactId>com.microsoft.azuretools.sdk.lib</artifactId>
@@ -38,7 +38,7 @@
     <organization><name>Microsoft Corp.</name></organization>
 
     <properties>
-        <azuretool.version>3.51.0</azuretool.version>
+        <azuretool.version>3.52.0</azuretool.version>
         <azuretool.sdk.version>3.25.0.qualifier</azuretool.sdk.version>
     </properties>
     <dependencies>

PluginsAndFeatures/azure-toolkit-for-intellij/.idea/codeStyles/codeStyleConfig.xml

@@ -1,24 +1 @@
-plugins {
-    id 'java'
-    id "org.jetbrains.intellij"
-}
-
-group 'com.microsoft.azuretools'
-
-intellij {
-    version = intellij_version
-    downloadSources = Boolean.valueOf(true)
-}
-
-repositories {
-    mavenLocal()
-    mavenCentral()
-}
-
-dependencies {
-    // https://mvnrepository.com/artifact/org.projectlombok/lombok
-    compileOnly 'org.projectlombok:lombok:1.18.8'
-    annotationProcessor 'org.projectlombok:lombok:1.18.8'
-
-    implementation "com.microsoft.azure:azure-toolkit-common-lib:0.5.0"
-}
+intellij{}

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

@@ -12,23 +12,21 @@
 import com.intellij.ui.SimpleListCellRenderer;
 import com.intellij.ui.components.fields.ExtendableTextComponent;
 import com.intellij.ui.components.fields.ExtendableTextField;
-import com.microsoft.azure.toolkit.lib.appservice.Draft;
 import com.microsoft.azure.toolkit.lib.common.exception.AzureExceptionHandler;
 import com.microsoft.azure.toolkit.lib.common.operation.AzureOperation;
+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.utils.TailingDebouncer;
-import com.microsoft.azuretools.azurecommons.helpers.NotNull;
-import com.microsoft.azuretools.azurecommons.helpers.Nullable;
-import com.microsoft.azuretools.core.mvp.ui.base.SchedulerProvider;
-import com.microsoft.azuretools.core.mvp.ui.base.SchedulerProviderFactory;
-import com.microsoft.tooling.msservices.components.DefaultLoader;
 import lombok.Getter;
 import lombok.Setter;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang.StringUtils;
 import org.apache.commons.lang3.exception.ExceptionUtils;
 import rx.Observable;
+import rx.schedulers.Schedulers;
 
 import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
 import javax.swing.*;
 import javax.swing.event.DocumentEvent;
 import javax.swing.event.PopupMenuEvent;
@@ -45,8 +43,6 @@
 import java.util.function.Function;
 import java.util.function.Predicate;
 
-import static com.microsoft.intellij.ui.messages.AzureBundle.message;
-
 public abstract class AzureComboBox<T> extends ComboBox<T> implements AzureFormInputComponent<T> {
     public static final String EMPTY_ITEM = StringUtils.EMPTY;
     private static final int DEBOUNCE_DELAY = 500;
@@ -58,8 +54,7 @@ public abstract class AzureComboBox<T> extends ComboBox<T> implements AzureFormI
     private boolean required;
     private Object value;
     private boolean valueNotSet = true;
-    @Setter
-    private boolean forceDisable;
+    private boolean valueFixed;
     private String label;
 
     public AzureComboBox() {
@@ -71,7 +66,7 @@ public AzureComboBox(boolean refresh) {
         this.init();
         this.refresher = new TailingDebouncer(this::doRefreshItems, DEBOUNCE_DELAY);
         if (refresh) {
-            DefaultLoader.getIdeHelper().invokeLater(this::refreshItems);
+            AzureTaskManager.getInstance().runLater(this::refreshItems, AzureTask.Modality.ANY);
         }
     }
 
@@ -87,7 +82,7 @@ protected void init() {
         this.setEditor(this.inputEditor);
         this.setRenderer(new SimpleListCellRenderer<T>() {
             @Override
-            public void customize(@NotNull final JList<? extends T> l, final T t, final int i, final boolean b,
+            public void customize(@Nonnull final JList<? extends T> l, final T t, final int i, final boolean b,
                                   final boolean b1) {
                 setText(getItemText(t));
                 setIcon(getItemIcon(t));
@@ -110,12 +105,24 @@ public T getValue() {
 
     @Override
     public void setValue(final T val) {
+        this.setValue(val, false);
+    }
+
+    public void setValue(final T val, final boolean fixed) {
+        this.valueFixed = fixed;
+        this.setEditable(!this.valueFixed);
         this.valueNotSet = false;
         this.value = val;
         this.refreshValue();
     }
 
     public void setValue(final ItemReference<T> val) {
+        this.setValue(val, false);
+    }
+
+    public void setValue(final ItemReference<T> val, final boolean fixed) {
+        this.valueFixed = fixed;
+        this.setEditable(!this.valueFixed);
         this.valueNotSet = false;
         this.value = val;
         this.refreshValue();
@@ -161,7 +168,7 @@ private void doRefreshItems() {
             this.setLoading(true);
             final List<? extends T> items = this.loadItems();
             this.setLoading(false);
-            DefaultLoader.getIdeHelper().invokeLater(() -> this.setItems(items));
+            AzureTaskManager.getInstance().runLater(() -> this.setItems(items), AzureTask.Modality.ANY);
         } catch (final Exception e) {
             final Throwable rootCause = ExceptionUtils.getRootCause(e);
             if (rootCause instanceof InterruptedIOException || rootCause instanceof InterruptedException) {
@@ -191,15 +198,15 @@ public void clear() {
     }
 
     protected void setLoading(final boolean loading) {
-        DefaultLoader.getIdeHelper().invokeLater(() -> {
+        AzureTaskManager.getInstance().runLater(() -> {
             if (loading) {
                 this.setEnabled(false);
                 this.setEditor(this.loadingSpinner);
             } else {
-                this.setEnabled(forceDisable ? false : true);
+                this.setEnabled(!valueFixed);
                 this.setEditor(this.inputEditor);
             }
-        });
+        }, AzureTask.Modality.ANY);
     }
 
     protected String getItemText(Object item) {
@@ -220,21 +227,17 @@ protected ExtendableTextComponent.Extension getExtension() {
     }
 
     protected Observable<? extends List<? extends T>> loadItemsAsync() {
-        return Observable.fromCallable(this::loadItems).subscribeOn(getSchedulerProvider().io());
+        return Observable.fromCallable(this::loadItems).subscribeOn(Schedulers.io());
     }
 
-    @NotNull
+    @Nonnull
     protected abstract List<? extends T> loadItems() throws Exception;
 
     @Nullable
     protected T getDefaultValue() {
         return null;
     }
 
-    protected SchedulerProvider getSchedulerProvider() {
-        return SchedulerProviderFactory.getInstance().getSchedulerProvider();
-    }
-
     protected void handleLoadingError(Throwable e) {
         AzureExceptionHandler.onRxException(e);
     }
@@ -272,6 +275,7 @@ protected JTextField createEditorComponent() {
             return textField;
         }
 
+        @Nullable
         protected ExtendableTextComponent.Extension getExtension() {
             final ExtendableTextComponent.Extension extension = AzureComboBox.this.getExtension();
             return extension == null ? null : ExtendableTextComponent.Extension.create(
@@ -289,7 +293,7 @@ public void setItem(Object item) {
             // do nothing: item can not be set on loading
             super.setItem(item);
             if (item == null) {
-                this.editor.setText(message("common.refreshing"));
+                this.editor.setText("Refreshing...");
             }
         }
 
@@ -347,16 +351,16 @@ public ComboFilterListener(List<? extends T> list, BiPredicate<? super T, ? supe
         }
 
         @Override
-        protected void textChanged(@NotNull final DocumentEvent documentEvent) {
-            DefaultLoader.getIdeHelper().invokeLater(() -> {
+        protected void textChanged(@Nonnull final DocumentEvent documentEvent) {
+            AzureTaskManager.getInstance().runLater(() -> {
                 try {
                     final String text = documentEvent.getDocument().getText(0, documentEvent.getDocument().getLength());
-                    list.stream().filter(item -> filter.test(item, text) && !getItems().contains(item)).forEach(item -> addItem(item));
-                    getItems().stream().filter(item -> !filter.test(item, text)).forEach(item -> removeItem(item));
+                    list.stream().filter(item -> filter.test(item, text) && !getItems().contains(item)).forEach(AzureComboBox.this::addItem);
+                    getItems().stream().filter(item -> !filter.test(item, text)).forEach(AzureComboBox.this::removeItem);
                 } catch (BadLocationException e) {
                     // swallow exception and show all items
                 }
-            });
+            }, AzureTask.Modality.ANY);
         }
     }
 

…olkit/intellij/common/AzureComboBox.java …olkit/intellij/common/AzureComboBox.javaPluginsAndFeatures/azure-toolkit-for-intellij/src/com/microsoft/azure/toolkit/intellij/common/AzureComboBox.java renamed to PluginsAndFeatures/azure-toolkit-for-intellij/azure-intellij-plugin-lib/src/main/java/com/microsoft/azure/toolkit/intellij/common/AzureComboBox.java PluginsAndFeatures/azure-toolkit-for-intellij/src/com/microsoft/azure/toolkit/intellij/common/AzureComboBox.java renamed to PluginsAndFeatures/azure-toolkit-for-intellij/azure-intellij-plugin-lib/src/main/java/com/microsoft/azure/toolkit/intellij/common/AzureComboBox.java

@@ -0,0 +1,31 @@
+/*
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for license information.
+ */
+
+package com.microsoft.azure.toolkit.intellij.common;
+
+import lombok.RequiredArgsConstructor;
+import lombok.Setter;
+
+import javax.annotation.Nonnull;
+import java.util.Collections;
+import java.util.List;
+import java.util.Objects;
+import java.util.function.Supplier;
+
+@RequiredArgsConstructor
+@Setter
+public class AzureComboBoxSimple<T> extends AzureComboBox<T> {
+
+    private final Supplier<? extends List<? extends T>> supplier;
+    private Validator validator;
+
+    @Nonnull
+    protected List<? extends T> loadItems() throws Exception {
+        if (Objects.nonNull(this.supplier)) {
+            return this.supplier.get();
+        }
+        return Collections.emptyList();
+    }
+}

PluginsAndFeatures/azure-toolkit-for-intellij/azure-intellij-plugin-lib/src/main/java/com/microsoft/azure/toolkit/intellij/common/AzureComboBoxSimple.java

@@ -5,11 +5,11 @@
 package com.microsoft.azure.toolkit.intellij.common;
 
 import com.intellij.openapi.project.Project;
+import com.intellij.openapi.ui.DialogWrapper;
 import com.intellij.openapi.ui.ValidationInfo;
 import com.microsoft.azure.toolkit.lib.common.form.AzureForm;
 import com.microsoft.azure.toolkit.lib.common.form.AzureFormInput;
 import com.microsoft.azure.toolkit.lib.common.form.AzureValidationInfo;
-import com.microsoft.intellij.ui.components.AzureDialogWrapper;
 import lombok.extern.java.Log;
 
 import javax.swing.*;
@@ -18,7 +18,7 @@
 import java.util.stream.Collectors;
 
 @Log
-public abstract class AzureDialog<T> extends AzureDialogWrapper {
+public abstract class AzureDialog<T> extends DialogWrapper {
     protected OkActionListener<T> okActionListener;
 
     public AzureDialog(Project project) {
@@ -52,12 +52,12 @@ protected List<ValidationInfo> doValidateAll() {
         final List<AzureValidationInfo> infos = this.getForm().validateData();
         this.setOKActionEnabled(infos.stream().noneMatch(
                 i -> i == AzureValidationInfo.PENDING || i.getType() == AzureValidationInfo.Type.ERROR || AzureValidationInfo.UNINITIALIZED.equals(i)));
-        List<ValidationInfo> resultList = infos.stream()
+        final List<ValidationInfo> resultList = infos.stream()
                     .filter(i -> i != AzureValidationInfo.PENDING && i != AzureValidationInfo.OK && !AzureValidationInfo.UNINITIALIZED.equals(i))
                     .map(AzureDialog::toIntellijValidationInfo)
                     .collect(Collectors.toList());
         // this is in order to let ok action disable if only there is any uninitialized filed.
-        if (infos.stream().filter(e -> AzureValidationInfo.UNINITIALIZED.equals(e)).count() > 0L) {
+        if (infos.stream().anyMatch(AzureValidationInfo.UNINITIALIZED::equals)) {
             setErrorInfoAll(resultList);
         }
         return resultList;

…toolkit/intellij/common/AzureDialog.java …toolkit/intellij/common/AzureDialog.javaPluginsAndFeatures/azure-toolkit-for-intellij/src/com/microsoft/azure/toolkit/intellij/common/AzureDialog.java renamed to PluginsAndFeatures/azure-toolkit-for-intellij/azure-intellij-plugin-lib/src/main/java/com/microsoft/azure/toolkit/intellij/common/AzureDialog.java PluginsAndFeatures/azure-toolkit-for-intellij/src/com/microsoft/azure/toolkit/intellij/common/AzureDialog.java renamed to PluginsAndFeatures/azure-toolkit-for-intellij/azure-intellij-plugin-lib/src/main/java/com/microsoft/azure/toolkit/intellij/common/AzureDialog.java

@@ -0,0 +1,7 @@
+package com.microsoft.azure.toolkit.intellij.common;
+
+import javax.swing.*;
+
+public interface AzureFormJPanel<T> extends AzureFormPanel<T> {
+    JPanel getContentPanel();
+}

PluginsAndFeatures/azure-toolkit-for-intellij/azure-intellij-plugin-lib/src/main/java/com/microsoft/azure/toolkit/intellij/common/AzureFormJPanel.java

@@ -3,7 +3,7 @@
  * Licensed under the MIT License. See License.txt in the project root for license information.
  */
 
-package com.microsoft.azure.toolkit.lib.appservice;
+package com.microsoft.azure.toolkit.intellij.common;
 
 public interface Draft {
     // marker interface