From e2fc4a75e8ca452187e869e140a92d8acad86197 Mon Sep 17 00:00:00 2001 From: Hari Shreedharan Date: Wed, 2 Dec 2015 12:04:58 -0800 Subject: [PATCH] SQOOP-2710. Sqoop2: Move user from context classes to parent TransferableContext (Jarcec via Hari) --- .../apache/sqoop/job/etl/DestroyerContext.java | 13 +------------ .../apache/sqoop/job/etl/ExtractorContext.java | 14 +------------- .../apache/sqoop/job/etl/InitializerContext.java | 13 +------------ .../org/apache/sqoop/job/etl/LoaderContext.java | 15 +-------------- .../apache/sqoop/job/etl/PartitionerContext.java | 14 +------------- .../apache/sqoop/job/etl/TransferableContext.java | 12 +++++++++++- 6 files changed, 16 insertions(+), 65 deletions(-) diff --git a/common/src/main/java/org/apache/sqoop/job/etl/DestroyerContext.java b/common/src/main/java/org/apache/sqoop/job/etl/DestroyerContext.java index 38d94db9..759431ed 100644 --- a/common/src/main/java/org/apache/sqoop/job/etl/DestroyerContext.java +++ b/common/src/main/java/org/apache/sqoop/job/etl/DestroyerContext.java @@ -35,13 +35,10 @@ public class DestroyerContext extends TransferableContext { private Schema schema; - private String user; - public DestroyerContext(ImmutableContext context, boolean success, Schema schema, String user) { - super(context); + super(context, user); this.success = success; this.schema = schema; - this.user = user; } /** @@ -62,12 +59,4 @@ public Schema getSchema() { return schema; } - /** - * Return user associated with this step. - * - * @return - */ - public String getUser() { - return user; - } } diff --git a/common/src/main/java/org/apache/sqoop/job/etl/ExtractorContext.java b/common/src/main/java/org/apache/sqoop/job/etl/ExtractorContext.java index 748bdfb3..89b02302 100644 --- a/common/src/main/java/org/apache/sqoop/job/etl/ExtractorContext.java +++ b/common/src/main/java/org/apache/sqoop/job/etl/ExtractorContext.java @@ -36,13 +36,10 @@ public class ExtractorContext extends TransferableContext { private final Schema schema; - private final String user; - public ExtractorContext(ImmutableContext context, DataWriter writer, Schema schema, String user) { - super(context); + super(context, user); this.writer = writer; this.schema = schema; - this.user = user; } /** @@ -61,13 +58,4 @@ public DataWriter getDataWriter() { public Schema getSchema() { return schema; } - /** - * Return the user - * - * @return - */ - public String getUser() { - return user; - } - } diff --git a/common/src/main/java/org/apache/sqoop/job/etl/InitializerContext.java b/common/src/main/java/org/apache/sqoop/job/etl/InitializerContext.java index 7ad0d709..6212f435 100644 --- a/common/src/main/java/org/apache/sqoop/job/etl/InitializerContext.java +++ b/common/src/main/java/org/apache/sqoop/job/etl/InitializerContext.java @@ -31,11 +31,8 @@ @InterfaceStability.Unstable public class InitializerContext extends TransferableContext { - private String user; - public InitializerContext(MutableContext context, String user) { - super(context); - this.user = user; + super(context, user); } /** @@ -51,12 +48,4 @@ public MutableContext getContext() { return (MutableContext)super.getContext(); } - /** - * Return the user - * - * @return - */ - public String getUser() { - return user; - } } diff --git a/common/src/main/java/org/apache/sqoop/job/etl/LoaderContext.java b/common/src/main/java/org/apache/sqoop/job/etl/LoaderContext.java index f0f2e38c..48f8e029 100644 --- a/common/src/main/java/org/apache/sqoop/job/etl/LoaderContext.java +++ b/common/src/main/java/org/apache/sqoop/job/etl/LoaderContext.java @@ -36,13 +36,10 @@ public class LoaderContext extends TransferableContext { private final Schema schema; - private final String user; - public LoaderContext(ImmutableContext context, DataReader reader, Schema schema, String user) { - super(context); + super(context, user); this.reader = reader; this.schema = schema; - this.user = user; } /** @@ -62,14 +59,4 @@ public DataReader getDataReader() { public Schema getSchema() { return schema; } - - /** - * Return the String representing the user. - * - * @return - */ - public String getUser() { - return user; - } - } diff --git a/common/src/main/java/org/apache/sqoop/job/etl/PartitionerContext.java b/common/src/main/java/org/apache/sqoop/job/etl/PartitionerContext.java index b39497ba..df31cae9 100644 --- a/common/src/main/java/org/apache/sqoop/job/etl/PartitionerContext.java +++ b/common/src/main/java/org/apache/sqoop/job/etl/PartitionerContext.java @@ -37,13 +37,10 @@ public class PartitionerContext extends TransferableContext { private boolean skipMaxPartitionCheck = false; - private String user; - public PartitionerContext(ImmutableContext context, long maxPartitions, Schema schema, String user) { - super(context); + super(context, user); this.maxPartitions = maxPartitions; this.schema = schema; - this.user = user; } /** @@ -92,13 +89,4 @@ public boolean getSkipMaxPartitionCheck() { public Schema getSchema() { return schema; } - - /** - * Return user that submitted job - * - * @return - */ - public String getUser() { - return user; - } } diff --git a/common/src/main/java/org/apache/sqoop/job/etl/TransferableContext.java b/common/src/main/java/org/apache/sqoop/job/etl/TransferableContext.java index ad18e299..eccb93ee 100644 --- a/common/src/main/java/org/apache/sqoop/job/etl/TransferableContext.java +++ b/common/src/main/java/org/apache/sqoop/job/etl/TransferableContext.java @@ -30,8 +30,11 @@ public abstract class TransferableContext { ImmutableContext context; - public TransferableContext(ImmutableContext context) { + private String user; + + public TransferableContext(ImmutableContext context, String user) { this.context = context; + this.user = user; } /** @@ -77,4 +80,11 @@ public int getInt(String key, int defaultValue) { public boolean getBoolean(String key, boolean defaultValue) { return context.getBoolean(key, defaultValue); } + + /** + * Return user who started this job (e.g. the one who run "start job" in shell) + */ + public String getUser() { + return user; + } }