Merge branch 'develop' into temeletry/operation

Author: Flanker32

PluginsAndFeatures/azure-toolkit-for-intellij/.idea/misc.xml

@@ -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/java/com/microsoft/azure/toolkit/intellij/common/preload/AzurePreloadingActivity.java

@@ -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-intellij-plugin-lib/src/main/resources/META-INF/azure-intellij-plugin-lib.xml

@@ -1,6 +1,7 @@
 plugins {
     id 'java'
     id "org.jetbrains.intellij"
+    id "io.freefair.aspectj.post-compile-weaving"
 }
 
 group 'com.microsoft.azuretools'
@@ -26,6 +27,8 @@ dependencies {
         exclude group: "com.fasterxml.jackson", module: "jackson-bom"
     }
 
-    implementation project(':azure-intellij-plugin-lib')
-    implementation "com.microsoft.azure:azure-toolkit-common-lib:0.5.0-SNAPSHOT"
+    compile project(':azure-intellij-plugin-lib')
+    compile "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/build.gradle

@@ -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;
             });
         }

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

@@ -11,36 +11,23 @@
 import com.fasterxml.jackson.databind.ObjectReader;
 import com.fasterxml.jackson.dataformat.yaml.YAMLMapper;
 import com.microsoft.azure.toolkit.intellij.azuresdk.model.AzureSdkServiceEntity;
+import com.microsoft.azure.toolkit.lib.common.cache.Cacheable;
+import com.microsoft.azure.toolkit.lib.common.cache.Preload;
 
 import java.io.IOException;
 import java.net.URL;
-import java.util.ArrayList;
-import java.util.Collections;
 import java.util.List;
 
 public class AzureSdkLibraryService {
     private static final ObjectMapper mapper = new YAMLMapper().configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
     private static final String SDK_METADATA_URL = "https://raw.githubusercontent.com/Azure/azure-sdk-for-java/master/sdk/spring/spring-reference.yml";
-    private List<AzureSdkServiceEntity> services = new ArrayList<>();
 
-    public static AzureSdkLibraryService getInstance() {
-        return Holder.instance;
-    }
-
-    public List<AzureSdkServiceEntity> getServices() {
-        return Collections.unmodifiableList(services);
-    }
-
-    public void reloadAzureSDKArtifacts() throws IOException {
+    @Preload
+    @Cacheable(value = "sdk-services", condition = "!(force&&force[0])")
+    public static List<AzureSdkServiceEntity> loadAzureSdkServices(boolean... force) throws IOException {
         final URL destination = new URL(SDK_METADATA_URL);
         final ObjectReader reader = mapper.readerFor(AzureSdkServiceEntity.class);
         final MappingIterator<AzureSdkServiceEntity> data = reader.readValues(destination);
-        synchronized (this) {
-            this.services = data.readAll();
-        }
-    }
-
-    private static class Holder {
-        private static final AzureSdkLibraryService instance = new AzureSdkLibraryService();
+        return data.readAll();
     }
 }

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

@@ -1,9 +1,6 @@
 <idea-plugin>
     <extensionPoints>
     </extensionPoints>
-    <extensions defaultExtensionNs="com.intellij">
-        <preloadingActivity implementation="com.microsoft.azure.toolkit.intellij.azuresdk.dependencesurvey.activity.AzurePreloadingActivity"/>
-    </extensions>
     <actions>
         <action id="AzureToolkit.OpenSdkReferenceBook"
                 class="com.microsoft.azure.toolkit.intellij.azuresdk.referencebook.OpenReferenceBookAction"

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

@@ -1,8 +1,9 @@
 plugins {
-    id "org.jetbrains.intellij" version "0.4.21"
-    id "org.jetbrains.kotlin.jvm" version "1.3.41"
+    id "org.jetbrains.intellij" version "0.5.0"
+    id "org.jetbrains.kotlin.jvm" version "1.3.72"
     id "de.undercouch.download" version "4.0.4"
     id "com.github.ben-manes.versions" version "0.28.0"
+    id 'org.openjfx.javafxplugin' version '0.0.9'
     id "io.freefair.aspectj.post-compile-weaving" version "5.3.0"
     id "com.github.spotbugs" version "4.6.0"
 }
@@ -43,6 +44,11 @@ compileTestKotlin {
     kotlinOptions.jvmTarget = javaVersion
 }
 
+javafx {
+    version = '11'
+    modules = [ 'javafx.controls', 'javafx.fxml', 'javafx.web',  'javafx.swing']
+}
+
 tasks.withType(JavaCompile) { options.encoding = 'UTF-8' }
 
 //apply plugin: 'checkstyle'
@@ -57,8 +63,8 @@ intellij {
     pluginName = 'azure-toolkit-for-intellij'
     version = intellij_version
     updateSinceUntilBuild = Boolean.valueOf(updateVersionRange)
-    plugins = ['java', 'maven', 'gradle', dep_plugins, "properties", 'markdown', 'terminal']
-	downloadSources = Boolean.valueOf(true)
+    plugins = ['java', 'maven', 'maven-model', 'gradle', dep_plugins, "properties", 'markdown', 'terminal']
+	downloadSources = Boolean.valueOf(sources)
 }
 
 sourceSets {
@@ -98,8 +104,8 @@ configurations {
 apply plugin: 'java'
 
 dependencies {
-    implementation project(':azure-intellij-plugin-lib')
-    implementation project(':azure-sdk-reference-book')
+    compile project(':azure-intellij-plugin-lib')
+    compile project(':azure-sdk-reference-book')
     compile 'com.microsoft.sqlserver:mssql-jdbc:6.4.0.jre8'
     compile 'commons-io:commons-io:2.7'
     compile group: 'org.apache.commons', name: 'commons-text', version: '1.8'
@@ -136,6 +142,8 @@ dependencies {
     compile group: 'jaxen', name: 'jaxen', version: '1.2.0'
     compile group: 'commons-beanutils', name: 'commons-beanutils', version: '1.9.4'
 
+    implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.3.72")
+
     // https://mvnrepository.com/artifact/org.projectlombok/lombok
     compileOnly 'org.projectlombok:lombok:1.18.8'
     annotationProcessor 'org.projectlombok:lombok:1.18.8'

PluginsAndFeatures/azure-toolkit-for-intellij/azure-sdk-reference-book/src/main/resources/META-INF/azure-sdk-reference-book.xml

@@ -1,8 +1,8 @@
-javaVersion=1.8
+javaVersion=11
 org.gradle.jvmargs='-Duser.language=en'
 sources=false
-intellij_version=IC-2020.2
-dep_plugins=org.intellij.scala:2020.2.14
+intellij_version=IC-LATEST-EAP-SNAPSHOT
+dep_plugins=org.intellij.scala:2020.3.8
 applicationinsights.key=57cc111a-36a8-44b3-b044-25d293b8b77c
 updateVersionRange=true
-patchPluginXmlSinceBuild=202.6397.94
+patchPluginXmlSinceBuild=203.5419.21