Skip to content

Commit c8eb557

Browse files
addressed comments
1 parent 56f7b47 commit c8eb557

File tree

2 files changed

+4
-3
lines changed

2 files changed

+4
-3
lines changed

gobblin-service/src/test/java/org/apache/gobblin/service/modules/orchestration/proc/DagProcUtilsTest.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,7 @@
4646
import org.apache.gobblin.service.modules.spec.JobExecutionPlan;
4747
import org.apache.gobblin.util.ConfigUtils;
4848
import org.mockito.Mockito;
49+
import org.testcontainers.shaded.org.apache.commons.lang3.StringUtils;
4950
import org.testng.Assert;
5051
import org.testng.annotations.BeforeMethod;
5152
import org.testng.annotations.Test;
@@ -92,8 +93,8 @@ public void testGaaSJobExecutionIdInjection() throws URISyntaxException, IOExcep
9293
DagProcUtils.submitNextNodes(dagManagementStateStore, dag, dagId);
9394
// Assertion to test that GaaS job execution Id has been successfully injected
9495
for(JobExecutionPlan jobExecutionPlan : jobExecutionPlans) {
95-
final String gaasJobExecutionId = ConfigUtils.getString(jobExecutionPlan.getJobSpec().getConfig(),ConfigurationKeys.GAAS_JOB_EXEC_ID,"");
96-
final Long gaasJobExecutionIdHash = Long.parseLong(ConfigUtils.getString(jobExecutionPlan.getJobSpec().getConfig(),ConfigurationKeys.GAAS_JOB_EXEC_ID_HASH,""));
96+
final String gaasJobExecutionId = ConfigUtils.getString(jobExecutionPlan.getJobSpec().getConfig(), ConfigurationKeys.GAAS_JOB_EXEC_ID, StringUtils.EMPTY);
97+
final Long gaasJobExecutionIdHash = Long.parseLong(ConfigUtils.getString(jobExecutionPlan.getJobSpec().getConfig(), ConfigurationKeys.GAAS_JOB_EXEC_ID_HASH, StringUtils.EMPTY));
9798

9899
Assert.assertNotNull(gaasJobExecutionId);
99100
Assert.assertEquals(gaasJobExecutionId.length(), 36);

gobblin-utility/src/main/java/org/apache/gobblin/util/AzkabanTags.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ public class AzkabanTags {
3838
.put(ConfigurationKeys.AZKABAN_FLOW_ID, "azkabanFlowId")
3939
.put(ConfigurationKeys.AZKABAN_JOB_ID, "azkabanJobId")
4040
.put(ConfigurationKeys.AZKABAN_EXEC_ID, "azkabanExecId")
41-
.put(ConfigurationKeys.GAAS_JOB_EXEC_ID,"gaasJobExecId")
41+
.put(ConfigurationKeys.GAAS_JOB_EXEC_ID, "gaasJobExecId")
4242
.put(ConfigurationKeys.AZKABAN_URL, "azkabanURL")
4343
.put(ConfigurationKeys.AZKABAN_FLOW_URL, "azkabanFlowURL")
4444
.put(ConfigurationKeys.AZKABAN_JOB_URL, "azkabanJobURL")

0 commit comments

Comments
 (0)