Merge pull request #5069 from microsoft/develop.next_merge_release

Merge branch 'release-3.51.0' 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.51.0](#3510)
   - [3.50.0](#3500)
   - [3.49.0](#3490)
   - [3.48.0](#3480)
@@ -65,6 +66,27 @@ All notable changes to "Azure Toolkit for IntelliJ IDEA" will be documented in t
   - [3.0.7](#307)
   - [3.0.6](#306)
 
+## 3.51.0
+### Added
+- Add support for IntelliJ 2021.1 EAP
+- Add Azure SDK reference book for spring
+
+### Changed
+- Improve resource list performance with cache and preload
+- Update Azure related run configuration icons
+- Continue with warning for multi-tenant issues while getting subscriptions
+- Remove preview label for function and spring cloud
+
+### Fixed
+- [#5008](https://github.com/microsoft/azure-tools-for-java/issues/5008) IndexOutOfBoundsException while create MySQL connection
+- [PR #4987](https://github.com/microsoft/azure-tools-for-java/pull/4987) InvalidParameterException occurs when close a streaming log
+- [PR #4987](https://github.com/microsoft/azure-tools-for-java/pull/4987) Failed when select file to deploy to Azure Web App 
+- [PR #4998](https://github.com/microsoft/azure-tools-for-java/pull/4998) Fix IDEA203 regression of Spark failure debug in local
+- [PR #5006](https://github.com/microsoft/azure-tools-for-java/pull/5006) Fix NPE of exploring ADLS Gen2 FS in Spark job conf
+- [PR #5009](https://github.com/microsoft/azure-tools-for-java/pull/5009) Fix bundle build JCEF issue
+- [PR #5014](https://github.com/microsoft/azure-tools-for-java/pull/5014) Failed to create MySQL instance as resource provider is not registered 
+- [PR #5055](https://github.com/microsoft/azure-tools-for-java/pull/5055) Can't deploy to Azure Web App when there is "Connect Azure Resource" in before launch
+
 ## 3.50.0
 
 ### Added

PluginsAndFeatures/AddLibrary/AzureLibraries/pom.xml

@@ -28,7 +28,7 @@
     <parent>
     <groupId>com.microsoft.azuretools</groupId>
     <artifactId>utils</artifactId>
-    <version>3.51.0-SNAPSHOT</version>
+    <version>3.51.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-SNAPSHOT</azuretool.version>
+        <azuretool.version>3.51.0</azuretool.version>
         <azuretool.sdk.version>3.25.0.qualifier</azuretool.sdk.version>
     </properties>
     <dependencies>

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

@@ -0,0 +1,22 @@
+/*
+ * 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.preload;
+
+import com.intellij.openapi.application.ApplicationManager;
+import com.intellij.openapi.application.PreloadingActivity;
+import com.intellij.openapi.progress.ProgressIndicator;
+import com.microsoft.azure.toolkit.lib.common.cache.Preloader;
+import lombok.extern.java.Log;
+
+@Log
+public class AzurePreloadingActivity extends PreloadingActivity {
+
+    @Override
+    public void preload(@org.jetbrains.annotations.NotNull final ProgressIndicator indicator) {
+        // Using progress manager as azure task manager is not initialized
+        ApplicationManager.getApplication().executeOnPooledThread(Preloader::load);
+    }
+}

PluginsAndFeatures/azure-toolkit-for-intellij/azure-intellij-plugin-lib/src/main/resources/META-INF/azure-intellij-plugin-lib.xml

@@ -2,6 +2,7 @@
     <extensionPoints>
     </extensionPoints>
     <extensions defaultExtensionNs="com.intellij">
+        <preloadingActivity implementation="com.microsoft.azure.toolkit.intellij.common.preload.AzurePreloadingActivity"/>
     </extensions>
     <actions>
     </actions>

PluginsAndFeatures/azure-toolkit-for-intellij/azure-sdk-reference-book/build.gradle

@@ -1,6 +1,7 @@
 plugins {
     id 'java'
     id "org.jetbrains.intellij"
+    id "io.freefair.aspectj.post-compile-weaving"
 }
 
 group 'com.microsoft.azuretools'
@@ -22,10 +23,14 @@ dependencies {
     annotationProcessor 'org.projectlombok:lombok:1.18.8'
 
     compileOnly 'org.jetbrains:annotations:20.1.0'
+    implementation 'com.fasterxml.jackson.dataformat:jackson-dataformat-csv:2.11.2', {
+        exclude group: "com.fasterxml.jackson", module: "jackson-bom"
+    }
     implementation 'com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.11.2', {
         exclude group: "com.fasterxml.jackson", module: "jackson-bom"
     }
+    compile project(':azure-intellij-plugin-lib')
+    compile "com.microsoft.azure:azure-toolkit-common-lib:0.5.0-SNAPSHOT"
 
-    implementation project(':azure-intellij-plugin-lib')
-    implementation "com.microsoft.azure:azure-toolkit-common-lib:0.5.0-SNAPSHOT"
+    aspect "com.microsoft.azure:azure-toolkit-common-lib:0.5.0-SNAPSHOT"
 }

PluginsAndFeatures/azure-toolkit-for-intellij/azure-sdk-reference-book/src/main/java/com/microsoft/azure/toolkit/intellij/azuresdk/dependencesurvey/activity/AzurePreloadingActivity.java

@@ -0,0 +1,63 @@
+/*
+ * 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.azuresdk.dependencesurvey.activity;
+
+import com.intellij.openapi.application.ApplicationManager;
+import com.intellij.openapi.application.ReadAction;
+import com.intellij.openapi.project.Project;
+import com.intellij.openapi.roots.OrderEnumerator;
+import com.intellij.openapi.startup.StartupActivity;
+import com.microsoft.azure.toolkit.intellij.azuresdk.service.WorkspaceTaggingService;
+import com.microsoft.azure.toolkit.lib.common.telemetry.AzureTelemeter;
+import com.microsoft.azure.toolkit.lib.common.telemetry.Telemetry;
+import org.apache.commons.lang.StringUtils;
+import org.jetbrains.annotations.NotNull;
+
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Set;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+public class WorkspaceTaggingActivity implements StartupActivity.DumbAware {
+    private static final Pattern PATTERN = Pattern.compile("(Gradle|Maven): (.+):(.+):(.+)");
+    private static final String WORKSPACE_TAGGING = "workspace-tagging";
+    private static final String OPERATION_NAME = "operationName";
+    private static final String SERVICE_NAME = "serviceName";
+    private static final String SYSTEM = "system";
+    private static final String TAG = "tag";
+
+    @Override
+    public void runActivity(@NotNull final Project project) {
+        ApplicationManager.getApplication().executeOnPooledThread(() -> ReadAction.nonBlocking(() -> trackProjectDependencies(project)).executeSynchronously());
+    }
+
+    private void trackProjectDependencies(@NotNull final Project project) {
+        final Set<String> tagSet = new java.util.HashSet<>();
+        OrderEnumerator.orderEntries(project).forEachLibrary(library -> {
+            if (StringUtils.isEmpty(library.getName())) {
+                return true;
+            }
+            final Matcher matcher = PATTERN.matcher(library.getName());
+            if (matcher.matches()) {
+                final String tag = WorkspaceTaggingService.getWorkspaceTag(matcher.group(2), matcher.group(3));
+                if (StringUtils.isNotEmpty(tag)) {
+                    tagSet.add(tag);
+                }
+            }
+            return true;
+        });
+        sendWorkspaceTaggingTelemetry(tagSet);
+    }
+
+    private void sendWorkspaceTaggingTelemetry(final Set<String> tagSet) {
+        final Map<String, String> properties = new HashMap<>();
+        properties.put(SERVICE_NAME, SYSTEM);
+        properties.put(OPERATION_NAME, WORKSPACE_TAGGING);
+        properties.put(TAG, StringUtils.join(tagSet, ","));
+        AzureTelemeter.log(Telemetry.Type.INFO, properties);
+    }
+}

PluginsAndFeatures/azure-toolkit-for-intellij/azure-sdk-reference-book/src/main/java/com/microsoft/azure/toolkit/intellij/azuresdk/dependencesurvey/activity/WorkspaceTaggingActivity.java

@@ -0,0 +1,45 @@
+/*
+ * 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.azuresdk.model;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.ToString;
+
+@ToString
+@Getter
+@NoArgsConstructor
+public class AzureJavaSdkEntity {
+    @JsonProperty("Package")
+    private String packageName;
+    @JsonProperty("GroupId")
+    private String groupId;
+    @JsonProperty("VersionGA")
+    private String versionGA;
+    @JsonProperty("VersionPreview")
+    private String versionPreview;
+    @JsonProperty("DisplayName")
+    private String displayName;
+    @JsonProperty("ServiceName")
+    private String serviceName;
+    @JsonProperty("RepoPath")
+    private String repoPath;
+    @JsonProperty("MSDocs")
+    private String msDocs;
+    @JsonProperty("GHDocs")
+    private String ghDocs;
+    @JsonProperty("Type")
+    private String type;
+    @JsonProperty("New")
+    private Boolean isNew; // New
+    @JsonProperty("PlannedVersions")
+    private String plannedVersions;
+    @JsonProperty(value = "Hide")
+    private Boolean isHide;
+    @JsonProperty("Notes")
+    private String notes;
+}

PluginsAndFeatures/azure-toolkit-for-intellij/azure-sdk-reference-book/src/main/java/com/microsoft/azure/toolkit/intellij/azuresdk/model/AzureJavaSdkEntity.java

@@ -0,0 +1,19 @@
+/*
+ * 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.azuresdk.model;
+
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.ToString;
+
+@ToString
+@Getter
+@NoArgsConstructor
+public class WorkspaceTagEntity {
+    private String groupId;
+    private String artifactId;
+    private String tag;
+}

PluginsAndFeatures/azure-toolkit-for-intellij/azure-sdk-reference-book/src/main/java/com/microsoft/azure/toolkit/intellij/azuresdk/model/WorkspaceTagEntity.java

@@ -95,11 +95,9 @@ private void filter(final String text) {
         this.loadData(this.services, filters);
     }
 
-    public void refresh() {
-        final AzureSdkLibraryService service = AzureSdkLibraryService.getInstance();
+    public void refresh(boolean... force) {
         try {
-            service.reloadAzureSDKArtifacts();
-            this.services = service.getServices();
+            this.services = AzureSdkLibraryService.loadAzureSdkServices(force);
             this.filter.debounce();
             Optional.ofNullable(this.lastNodePath).ifPresent(p -> TreeUtil.selectPath(this.tree, p));
         } catch (final IOException e) {
@@ -176,7 +174,7 @@ public final void actionPerformed(@NotNull final AnActionEvent e) {
             this.loading = true;
             ActivityTracker.getInstance().inc();
             AzureTaskManager.getInstance().runLater(() -> {
-                AzureSdkTreePanel.this.refresh();
+                AzureSdkTreePanel.this.refresh(true);
                 this.loading = false;
             });
         }