Merge pull request #5647 from microsoft/endgame-july.next

Merge endgame.next branch to endgame, prepare for IntelliJ new release support

Author: Flanker32

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

@@ -79,7 +79,8 @@ public boolean execute(@NotNull DataContext dataContext, @NotNull RunConfigurati
     public static class MyRunConfigurationExtension extends RunConfigurationExtension {
 
         @Override
-        public <T extends RunConfigurationBase> void updateJavaParameters(@NotNull T configuration, @NotNull JavaParameters params, RunnerSettings settings) {
+        public <T extends RunConfigurationBase<?>> void updateJavaParameters(@NotNull T configuration, @NotNull JavaParameters params,
+                                                                             RunnerSettings settings) {
             final @NotNull List<?> beforeTasks = configuration.getBeforeRunTasks();
             beforeTasks.stream().filter(t -> t instanceof MyBeforeRunTask).map(t -> (MyBeforeRunTask) t)
                     .flatMap(t -> t.connections.stream())

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

@@ -1,6 +1,7 @@
 plugins {
     id "org.jetbrains.intellij" version "0.7.2"
-    id "org.jetbrains.kotlin.jvm" version "1.3.50"
+    id "org.jetbrains.kotlin.jvm" version "1.4.20"
+    id 'org.openjfx.javafxplugin' version '0.0.9'
     id "de.undercouch.download" version "4.1.1"
     id "com.github.ben-manes.versions" version "0.39.0"
     id "io.freefair.aspectj.post-compile-weaving" version "6.0.0-m2"
@@ -212,7 +213,7 @@ 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")
+    implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.4.20")
 
     // https://mvnrepository.com/artifact/org.projectlombok/lombok
     compileOnly 'org.projectlombok:lombok'

PluginsAndFeatures/azure-toolkit-for-intellij/gradle.properties

@@ -1,8 +1,8 @@
 javaVersion=11
 org.gradle.jvmargs='-Duser.language=en'
 sources=false
-intellij_version=IC-2020.3
-dep_plugins=org.intellij.scala:2020.3.8
+intellij_version=IC-2021.1
+dep_plugins=org.intellij.scala:2021.1.15
 applicationinsights.key=57cc111a-36a8-44b3-b044-25d293b8b77c
 updateVersionRange=true
-patchPluginXmlSinceBuild=203.5419.21
+patchPluginXmlSinceBuild=211.6693.14

PluginsAndFeatures/azure-toolkit-for-intellij/src/com/microsoft/azure/hdinsight/common/HDInsightHelperImpl.java

@@ -125,7 +125,7 @@ public String getDefaultExtension() {
             @Nullable
             @Override
             public Icon getIcon() {
-                return StreamUtil.getImageResourceFile(CommonConst.SPARK_JOBVIEW_ICONPATH);
+                return PluginUtil.getIcon(CommonConst.SPARK_JOBVIEW_ICONPATH);
             }
 
             @Override

PluginsAndFeatures/azure-toolkit-for-intellij/src/com/microsoft/azure/hdinsight/jobs/framework/JobViewEditor.java

@@ -143,4 +143,9 @@ public <T> T getUserData(@NotNull Key<T> key) {
     public <T> void putUserData(@NotNull Key<T> key, @Nullable T t) {
 
     }
+
+    @Override
+    public @org.jetbrains.annotations.Nullable VirtualFile getFile() {
+        return myVirtualFile;
+    }
 }

PluginsAndFeatures/azure-toolkit-for-intellij/src/com/microsoft/azure/hdinsight/projects/HDInsightProjectTemplate.java

@@ -10,6 +10,7 @@
 import com.intellij.platform.ProjectTemplate;
 import com.microsoft.azure.hdinsight.common.CommonConst;
 import com.microsoft.azure.hdinsight.common.StreamUtil;
+import com.microsoft.intellij.util.PluginUtil;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
@@ -58,14 +59,12 @@ public String getDescription() {
     @Override
     public Icon getIcon() {
         switch (this.templateType) {
-            case Java:
-                return StreamUtil.getImageResourceFile(CommonConst.JavaProjectIconPath);
             case Scala:
             case ScalaClusterSample:
             case ScalaFailureTaskDebugSample:
-                return StreamUtil.getImageResourceFile(CommonConst.ScalaProjectIconPath);
+                return PluginUtil.getIcon(CommonConst.ScalaProjectIconPath);
             default:
-                return StreamUtil.getImageResourceFile(CommonConst.JavaProjectIconPath);
+                return PluginUtil.getIcon(CommonConst.JavaProjectIconPath);
         }
     }
 

PluginsAndFeatures/azure-toolkit-for-intellij/src/com/microsoft/azure/hdinsight/spark/common/CosmosSparkSubmitModel.kt

@@ -44,7 +44,7 @@ open class CosmosSparkSubmitModel : SparkSubmitModel {
     constructor(project: Project, submissionParameter: SparkSubmissionParameter): super(project, submissionParameter)
 
     override fun getDefaultParameters(): Stream<Pair<String, out Any>> {
-        return listOf(
+        return listOf<Pair<String, out Any>>(
                 Pair(SparkSubmissionParameter.DriverMemory, SparkSubmissionParameter.DriverMemoryDefaultValue),
                 Pair(SparkSubmissionParameter.DriverCores, SparkSubmissionParameter.DriverCoresDefaultValue),
                 Pair(SparkSubmissionParameter.ExecutorMemory, SparkSubmissionParameter.ExecutorMemoryDefaultValue),

PluginsAndFeatures/azure-toolkit-for-intellij/src/com/microsoft/azure/hdinsight/spark/console/SparkExecuteInConsoleActionPromoter.kt

@@ -30,7 +30,7 @@ import com.microsoft.azure.hdinsight.common.logger.ILogger
 class SparkExecuteInConsoleActionPromoter : ActionPromoter, ILogger {
     private fun shouldPromote(anAction: AnAction): Boolean = anAction is SparkConsoleExecuteAction
 
-    override fun promote(actions: MutableList<AnAction>, context: DataContext): MutableList<AnAction> =
+    override fun promote(actions: MutableList<out AnAction>, context: DataContext): MutableList<AnAction> =
             actions.firstOrNull { shouldPromote(it) }
                     ?.let { mutableListOf(it) }
                     ?: mutableListOf()

PluginsAndFeatures/azure-toolkit-for-intellij/src/com/microsoft/azure/hdinsight/spark/run/SparkBatchJobDebugExecutor.java

@@ -10,6 +10,7 @@
 import com.intellij.icons.AllIcons;
 import com.microsoft.azure.hdinsight.common.StreamUtil;
 import com.microsoft.azuretools.azurecommons.helpers.Nullable;
+import com.microsoft.intellij.util.PluginUtil;
 import org.jetbrains.annotations.NonNls;
 import org.jetbrains.annotations.NotNull;
 
@@ -28,15 +29,15 @@ public String getToolWindowId() {
 
     @Override
     public Icon getToolWindowIcon() {
-        return Optional.ofNullable(StreamUtil.getImageResourceFile(com.microsoft.azure.hdinsight.common.CommonConst.ToolWindowSparkJobDebugIcon_13x_Path))
+        return Optional.ofNullable(PluginUtil.getIcon(com.microsoft.azure.hdinsight.common.CommonConst.ToolWindowSparkJobDebugIcon_13x_Path))
                 .map(Icon.class::cast)
                 .orElse(AllIcons.RunConfigurations.RemoteDebug);
     }
 
     @NotNull
     @Override
     public Icon getIcon() {
-        return Optional.ofNullable(StreamUtil.getImageResourceFile(com.microsoft.azure.hdinsight.common.CommonConst.ToolWindowSparkJobDebugIcon_16x_Path))
+        return Optional.ofNullable(PluginUtil.getIcon(com.microsoft.azure.hdinsight.common.CommonConst.ToolWindowSparkJobDebugIcon_16x_Path))
                 .map(Icon.class::cast)
                 .orElse(AllIcons.RunConfigurations.RemoteDebug);
     }

PluginsAndFeatures/azure-toolkit-for-intellij/src/com/microsoft/azure/hdinsight/spark/run/SparkBatchJobRunExecutor.java

@@ -8,6 +8,7 @@
 import com.intellij.execution.Executor;
 import com.intellij.icons.AllIcons;
 import com.microsoft.azure.hdinsight.common.StreamUtil;
+import com.microsoft.intellij.util.PluginUtil;
 import org.jetbrains.annotations.NonNls;
 import org.jetbrains.annotations.NotNull;
 
@@ -25,15 +26,15 @@ public String getToolWindowId() {
 
     @Override
     public Icon getToolWindowIcon() {
-        return Optional.ofNullable(StreamUtil.getImageResourceFile(com.microsoft.azure.hdinsight.common.CommonConst.ToolWindowSparkJobRunIcon_13x_Path))
+        return Optional.ofNullable(PluginUtil.getIcon(com.microsoft.azure.hdinsight.common.CommonConst.ToolWindowSparkJobRunIcon_13x_Path))
                 .map(Icon.class::cast)
                 .orElse(AllIcons.Actions.Upload);
     }
 
     @NotNull
     @Override
     public Icon getIcon() {
-        return Optional.ofNullable(StreamUtil.getImageResourceFile(com.microsoft.azure.hdinsight.common.CommonConst.ToolWindowSparkJobRunIcon_16x_Path))
+        return Optional.ofNullable(PluginUtil.getIcon(com.microsoft.azure.hdinsight.common.CommonConst.ToolWindowSparkJobRunIcon_16x_Path))
                 .map(Icon.class::cast)
                 .orElse(AllIcons.Actions.Upload);
     }