From c3d916ab20ca02c9d6b85bb51d6c31eb31aaff88 Mon Sep 17 00:00:00 2001
From: Szabolcs Vasas <vasas@apache.org>
Date: Thu, 9 Aug 2018 17:13:02 +0200
Subject: [PATCH] SQOOP-3357: Change MainframeImportTool to refer to
 MainframeManager class directly

(Nguyen Truong via Szabolcs Vasas)
---
 src/java/org/apache/sqoop/tool/MainframeImportTool.java     | 3 ++-
 src/test/org/apache/sqoop/manager/TestMainframeManager.java | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/java/org/apache/sqoop/tool/MainframeImportTool.java b/src/java/org/apache/sqoop/tool/MainframeImportTool.java
index 8883301d..cdd9d6d0 100644
--- a/src/java/org/apache/sqoop/tool/MainframeImportTool.java
+++ b/src/java/org/apache/sqoop/tool/MainframeImportTool.java
@@ -23,6 +23,7 @@
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.hadoop.util.ToolRunner;
+import org.apache.sqoop.manager.MainframeManager;
 import org.apache.sqoop.mapreduce.mainframe.MainframeConfiguration;
 
 import org.apache.sqoop.SqoopOptions;
@@ -148,7 +149,7 @@ public void applyOptions(CommandLine in, SqoopOptions out)
 
     if (!in.hasOption(CONN_MANAGER_CLASS_NAME)) {
        // set default ConnManager
-      out.setConnManagerClassName("org.apache.sqoop.manager.MainframeManager");
+      out.setConnManagerClassName(MainframeManager.class.getName());
     }
     if (in.hasOption(DS_ARG)) {
       out.setMainframeInputDatasetName(in.getOptionValue(DS_ARG));
diff --git a/src/test/org/apache/sqoop/manager/TestMainframeManager.java b/src/test/org/apache/sqoop/manager/TestMainframeManager.java
index 97e48e88..c84f05f6 100644
--- a/src/test/org/apache/sqoop/manager/TestMainframeManager.java
+++ b/src/test/org/apache/sqoop/manager/TestMainframeManager.java
@@ -67,7 +67,7 @@ public void setUp() {
     opts = getSqoopOptions(conf);
     opts.setConnectString("dummy.server");
     opts.setTableName("dummy.pds");
-    opts.setConnManagerClassName("org.apache.sqoop.manager.MainframeManager");
+    opts.setConnManagerClassName(MainframeManager.class.getName());
     context = new ImportJobContext(getTableName(), null, opts, null);
     ConnFactory f = new ConnFactory(conf);
     try {