SQOOP-2309: Sqoop2: Add to link id in show job --all command
(Richard Zhou via Abraham Elmahrek)
diff --git a/shell/src/main/java/org/apache/sqoop/shell/ShowJobFunction.java b/shell/src/main/java/org/apache/sqoop/shell/ShowJobFunction.java
index 70c2a76..fab99db 100644
--- a/shell/src/main/java/org/apache/sqoop/shell/ShowJobFunction.java
+++ b/shell/src/main/java/org/apache/sqoop/shell/ShowJobFunction.java
@@ -130,14 +130,14 @@
job.getLastUpdateUser(),
formatter.format(job.getLastUpdateDate())
);
- printlnResource(Constants.RES_SHOW_PROMPT_JOB_LID_CID_INFO,
- job.getFromLinkId(),
- job.getFromConnectorId());
-
+ displayConfig(job.getDriverConfig().getConfigs(),
+ client.getDriverConfigBundle());
+ printlnResource(Constants.RES_SHOW_PROMPT_JOB_FROM_LID_INFO,
+ job.getFromLinkId());
displayConfig(job.getFromJobConfig().getConfigs(),
client.getConnectorConfigBundle(job.getFromConnectorId()));
- displayConfig(job.getDriverConfig().getConfigs(),
- client.getDriverConfigBundle());
+ printlnResource(Constants.RES_SHOW_PROMPT_JOB_TO_LID_INFO,
+ job.getToLinkId());
displayConfig(job.getToJobConfig().getConfigs(),
client.getConnectorConfigBundle(job.getToConnectorId()));
}
diff --git a/shell/src/main/java/org/apache/sqoop/shell/core/Constants.java b/shell/src/main/java/org/apache/sqoop/shell/core/Constants.java
index d15d812..40ed9fc 100644
--- a/shell/src/main/java/org/apache/sqoop/shell/core/Constants.java
+++ b/shell/src/main/java/org/apache/sqoop/shell/core/Constants.java
@@ -296,8 +296,10 @@
"show.prompt_jobs_to_show";
public static final String RES_SHOW_PROMPT_JOB_INFO =
"show.prompt_job_info";
- public static final String RES_SHOW_PROMPT_JOB_LID_CID_INFO =
- "show.prompt_job_lid_cid_info";
+ public static final String RES_SHOW_PROMPT_JOB_FROM_LID_INFO =
+ "show.prompt_job_from_lid_info";
+ public static final String RES_SHOW_PROMPT_JOB_TO_LID_INFO =
+ "show.prompt_job_to_lid_info";
public static final String RES_SHOW_PROMPT_DISPLAY_ALL_SUBMISSIONS =
"show.prompt_display_all_submissions";
diff --git a/shell/src/main/resources/shell-resource.properties b/shell/src/main/resources/shell-resource.properties
index 271ee90..62bbbeb 100644
--- a/shell/src/main/resources/shell-resource.properties
+++ b/shell/src/main/resources/shell-resource.properties
@@ -153,7 +153,8 @@
show.job_usage = Usage: show job
show.prompt_jobs_to_show = @|bold {0} job(s) to show: |@
show.prompt_job_info = Job with id {0} and name {1} (Enabled: {2}, Created by {3} at {4}, Updated by {5} at {6})
-show.prompt_job_lid_cid_info = Using link id {0} and Connector id {1}
+show.prompt_job_from_lid_info = From link: {0}
+show.prompt_job_to_lid_info = To link: {0}
show.prompt_display_all_submissions = Display all submissions
show.prompt_display_all_submissions_jid = Display all submissions given jid
