Merge branch 'develop.next' into hanxiao/eap

Author: Flanker32

PluginsAndFeatures/AddLibrary/AzureLibraries/pom.xml

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

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

@@ -0,0 +1,24 @@
+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-SNAPSHOT"
+}

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

@@ -0,0 +1,33 @@
+/*
+ * 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 com.microsoft.azure.toolkit.lib.common.exception.AzureToolkitRuntimeException;
+import com.microsoft.azure.toolkit.lib.common.form.AzureForm;
+import com.microsoft.azure.toolkit.lib.common.form.AzureFormInput;
+
+import java.util.Collections;
+import java.util.List;
+
+public interface AzureFormPanel<T> extends AzureForm<T> {
+    default void setVisible(boolean visible) {
+        // do nothing
+    }
+
+    @Override
+    default T getData() {
+        throw new AzureToolkitRuntimeException("method not implemeted");
+    }
+
+    @Override
+    default List<AzureFormInput<?>> getInputs() {
+        return Collections.emptyList();
+    }
+
+    // CHECKSTYLE IGNORE check FOR NEXT 1 LINES
+    default void $$$setupUI$$$() {
+    }
+}

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

@@ -0,0 +1,8 @@
+<idea-plugin>
+    <extensionPoints>
+    </extensionPoints>
+    <extensions defaultExtensionNs="com.intellij">
+    </extensions>
+    <actions>
+    </actions>
+</idea-plugin>

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

@@ -0,0 +1,31 @@
+plugins {
+    id 'java'
+    id "org.jetbrains.intellij"
+}
+
+group 'com.microsoft.azuretools'
+
+intellij {
+    version = intellij_version
+    downloadSources = Boolean.valueOf(true)
+    plugins = ['java', 'maven', 'gradle']
+}
+
+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'
+
+    compileOnly 'org.jetbrains:annotations:20.1.0'
+    implementation 'com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.11.2', {
+        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"
+}

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

@@ -0,0 +1,32 @@
+/*
+ * 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.PreloadingActivity;
+import com.intellij.openapi.progress.ProgressIndicator;
+import com.microsoft.azure.toolkit.intellij.azuresdk.service.AzureSdkLibraryService;
+import org.codehaus.plexus.util.ExceptionUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.io.IOException;
+
+public class AzurePreloadingActivity extends PreloadingActivity {
+    private static final Logger logger = LoggerFactory.getLogger(AzurePreloadingActivity.class);
+
+    @Override
+    public void preload(@org.jetbrains.annotations.NotNull final ProgressIndicator indicator) {
+        // Using progress manager as azure task manager is not initialized
+        ApplicationManager.getApplication().executeOnPooledThread(() -> {
+            try {
+                AzureSdkLibraryService.getInstance().reloadAzureSDKArtifacts();
+            } catch (IOException e) {
+                logger.warn(ExceptionUtils.getStackTrace(e)); // preload exception should not block plugin
+            }
+        });
+    }
+}