From ba179e13c4392de7f4175c37fb28c2c86a24ad75 Mon Sep 17 00:00:00 2001 From: Kun Huang Date: Tue, 22 Jan 2019 13:25:08 +0800 Subject: [PATCH] Fix wording when account is missing in a cosmos serverless config (#2691) --- .../run/configuration/CosmosServerlessSparkConfiguration.kt | 2 ++ .../configuration/LivySparkBatchJobRunConfiguration.java | 6 +++++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/PluginsAndFeatures/azure-toolkit-for-intellij/src/com/microsoft/azure/hdinsight/spark/run/configuration/CosmosServerlessSparkConfiguration.kt b/PluginsAndFeatures/azure-toolkit-for-intellij/src/com/microsoft/azure/hdinsight/spark/run/configuration/CosmosServerlessSparkConfiguration.kt index db7c6caf26..445773b3a7 100644 --- a/PluginsAndFeatures/azure-toolkit-for-intellij/src/com/microsoft/azure/hdinsight/spark/run/configuration/CosmosServerlessSparkConfiguration.kt +++ b/PluginsAndFeatures/azure-toolkit-for-intellij/src/com/microsoft/azure/hdinsight/spark/run/configuration/CosmosServerlessSparkConfiguration.kt @@ -14,6 +14,8 @@ class CosmosServerlessSparkConfiguration(name: String, override val module: Cosm override fun getSuggestedNamePrefix() : String = "[Spark on Cosmos Serverless]" + override fun getErrorMessageClusterNull(): String = "The account should be selected as the target for Spark application submission" + @Throws(RuntimeConfigurationException::class) override fun checkSubmissionConfigurationBeforeRun(runner: SparkSubmissionRunner) { super.checkSubmissionConfigurationBeforeRun(runner) diff --git a/PluginsAndFeatures/azure-toolkit-for-intellij/src/com/microsoft/azure/hdinsight/spark/run/configuration/LivySparkBatchJobRunConfiguration.java b/PluginsAndFeatures/azure-toolkit-for-intellij/src/com/microsoft/azure/hdinsight/spark/run/configuration/LivySparkBatchJobRunConfiguration.java index bfb5540180..70e37ce737 100644 --- a/PluginsAndFeatures/azure-toolkit-for-intellij/src/com/microsoft/azure/hdinsight/spark/run/configuration/LivySparkBatchJobRunConfiguration.java +++ b/PluginsAndFeatures/azure-toolkit-for-intellij/src/com/microsoft/azure/hdinsight/spark/run/configuration/LivySparkBatchJobRunConfiguration.java @@ -158,10 +158,14 @@ protected void checkBuildSparkJobBeforeRun(@NotNull SparkSubmissionRunner runner } } + protected String getErrorMessageClusterNull() { + return "The cluster should be selected as the target for Spark application submission"; + } + protected void checkSubmissionConfigurationBeforeRun(@NotNull SparkSubmissionRunner runner) throws RuntimeConfigurationException { SparkSubmissionParameter parameter = getSubmitModel().getSubmissionParameter(); if (StringUtils.isBlank(parameter.getClusterName())) { - throw new RuntimeConfigurationError("The cluster should be selected as the target for Spark application submission"); + throw new RuntimeConfigurationError(this.getErrorMessageClusterNull()); } if (!parameter.isLocalArtifact()) {