This is an automated email from the ASF dual-hosted git repository.
mandarambawane pushed a commit to branch atlas-2.5
in repository https://gitbox.apache.org/repos/asf/atlas.git
The following commit(s) were added to refs/heads/atlas-2.5 by this push:
new ebde2aa8d ATLAS-4976 : sqoop-bridge, sqoop-bridge-shim modules: update
for code readability improvement (#396)
ebde2aa8d is described below
commit ebde2aa8d09bb62d77130346346e083ee5243dcc
Author: Vinayak Marraiya
<[email protected]>
AuthorDate: Fri Jul 18 17:06:42 2025 +0530
ATLAS-4976 : sqoop-bridge, sqoop-bridge-shim modules: update for code
readability improvement (#396)
(cherry picked from commit 128f1e61935626539fc4e35316ebd89053cf2170)
---
.../java/org/apache/atlas/sqoop/hook/SqoopHook.java | 6 ++----
.../java/org/apache/atlas/sqoop/hook/SqoopHook.java | 21 +++++++--------------
.../apache/atlas/sqoop/model/SqoopDataTypes.java | 4 +---
.../org/apache/atlas/sqoop/hook/SqoopHookIT.java | 4 ++--
4 files changed, 12 insertions(+), 23 deletions(-)
diff --git
a/addons/sqoop-bridge-shim/src/main/java/org/apache/atlas/sqoop/hook/SqoopHook.java
b/addons/sqoop-bridge-shim/src/main/java/org/apache/atlas/sqoop/hook/SqoopHook.java
index 08b858728..e498a7f75 100644
---
a/addons/sqoop-bridge-shim/src/main/java/org/apache/atlas/sqoop/hook/SqoopHook.java
+++
b/addons/sqoop-bridge-shim/src/main/java/org/apache/atlas/sqoop/hook/SqoopHook.java
@@ -17,8 +17,6 @@
*/
package org.apache.atlas.sqoop.hook;
-
-
import org.apache.atlas.plugin.classloader.AtlasPluginClassLoader;
import org.apache.sqoop.SqoopJobDataPublisher;
import org.slf4j.Logger;
@@ -33,8 +31,8 @@ public class SqoopHook extends SqoopJobDataPublisher {
private static final String ATLAS_PLUGIN_TYPE = "sqoop";
private static final String ATLAS_SQOOP_HOOK_IMPL_CLASSNAME =
"org.apache.atlas.sqoop.hook.SqoopHook";
- private AtlasPluginClassLoader atlasPluginClassLoader = null;
- private SqoopJobDataPublisher sqoopHookImpl = null;
+ private AtlasPluginClassLoader atlasPluginClassLoader;
+ private SqoopJobDataPublisher sqoopHookImpl;
public SqoopHook() {
this.initialize();
diff --git
a/addons/sqoop-bridge/src/main/java/org/apache/atlas/sqoop/hook/SqoopHook.java
b/addons/sqoop-bridge/src/main/java/org/apache/atlas/sqoop/hook/SqoopHook.java
index 0a8cb9667..63ea2a524 100644
---
a/addons/sqoop-bridge/src/main/java/org/apache/atlas/sqoop/hook/SqoopHook.java
+++
b/addons/sqoop-bridge/src/main/java/org/apache/atlas/sqoop/hook/SqoopHook.java
@@ -17,8 +17,6 @@
*/
package org.apache.atlas.sqoop.hook;
-
-
import org.apache.atlas.ApplicationProperties;
import org.apache.atlas.AtlasClient;
import org.apache.atlas.AtlasConstants;
@@ -28,9 +26,9 @@ import org.apache.atlas.hook.AtlasHook;
import org.apache.atlas.hook.AtlasHookException;
import org.apache.atlas.model.instance.AtlasEntity;
import org.apache.atlas.model.instance.AtlasEntity.AtlasEntitiesWithExtInfo;
+import org.apache.atlas.model.instance.AtlasObjectId;
import org.apache.atlas.model.notification.HookNotification;
import
org.apache.atlas.model.notification.HookNotification.EntityCreateRequestV2;
-import org.apache.atlas.model.instance.AtlasObjectId;
import org.apache.atlas.sqoop.model.SqoopDataTypes;
import org.apache.atlas.type.AtlasTypeUtil;
import org.apache.atlas.utils.AtlasConfigurationUtil;
@@ -42,11 +40,11 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import java.util.Collections;
-import java.util.Map;
+import java.util.Date;
import java.util.HashMap;
-import java.util.Properties;
import java.util.List;
-import java.util.Date;
+import java.util.Map;
+import java.util.Properties;
import static org.apache.atlas.repository.Constants.SQOOP_SOURCE;
@@ -98,7 +96,6 @@ public class SqoopHook extends SqoopJobDataPublisher {
AtlasEntity entHiveTable = data.getHiveTable() != null ?
toHiveTableEntity(entHiveDb, data.getHiveTable()) : null;
AtlasEntity entProcess = toSqoopProcessEntity(entDbStore,
entHiveDb, entHiveTable, data, metadataNamespace);
-
AtlasEntitiesWithExtInfo entities = new
AtlasEntitiesWithExtInfo(entProcess);
entities.addReferredEntity(entDbStore);
@@ -110,9 +107,8 @@ public class SqoopHook extends SqoopJobDataPublisher {
HookNotification message = new
EntityCreateRequestV2(AtlasHook.getUser(), entities);
atlasHook.sendNotification(message);
- } catch(Exception e) {
+ } catch (Exception e) {
LOG.error("SqoopHook.publish() failed", e);
-
throw new AtlasHookException("SqoopHook.publish() failed.", e);
}
}
@@ -134,12 +130,11 @@ public class SqoopHook extends SqoopJobDataPublisher {
private AtlasEntity toHiveTableEntity(AtlasEntity entHiveDb, String
tableName) {
AtlasEntity entHiveTable = new
AtlasEntity(HiveDataTypes.HIVE_TABLE.getName());
- String qualifiedName =
HiveMetaStoreBridge.getTableQualifiedName((String)entHiveDb.getAttribute(AtlasConstants.CLUSTER_NAME_ATTRIBUTE),
(String)entHiveDb.getAttribute(AtlasClient.NAME), tableName);
+ String qualifiedName =
HiveMetaStoreBridge.getTableQualifiedName((String)
entHiveDb.getAttribute(AtlasConstants.CLUSTER_NAME_ATTRIBUTE), (String)
entHiveDb.getAttribute(AtlasClient.NAME), tableName);
entHiveTable.setAttribute(AtlasClient.NAME, tableName.toLowerCase());
entHiveTable.setAttribute(AtlasClient.REFERENCEABLE_ATTRIBUTE_NAME,
qualifiedName);
entHiveTable.setRelationshipAttribute(ATTRIBUTE_DB,
AtlasTypeUtil.getAtlasRelatedObjectId(entHiveDb, RELATIONSHIP_HIVE_TABLE_DB));
-
return entHiveTable;
}
@@ -177,13 +172,12 @@ public class SqoopHook extends SqoopJobDataPublisher {
Properties options = data.getOptions();
for (Object k : options.keySet()) {
- sqoopOptionsMap.put((String)k, (String) options.get(k));
+ sqoopOptionsMap.put((String) k, (String) options.get(k));
}
entProcess.setAttribute(AtlasClient.NAME, sqoopProcessName);
entProcess.setAttribute(AtlasClient.REFERENCEABLE_ATTRIBUTE_NAME,
sqoopProcessName);
entProcess.setAttribute(SqoopHook.OPERATION, data.getOperation());
-
List<AtlasObjectId> sqoopObjects =
Collections.singletonList(AtlasTypeUtil.getAtlasObjectId(entDbStore));
List<AtlasObjectId> hiveObjects =
Collections.singletonList(AtlasTypeUtil.getAtlasObjectId(entHiveTable != null ?
entHiveTable : entHiveDb));
@@ -246,7 +240,6 @@ public class SqoopHook extends SqoopJobDataPublisher {
}
private static class AtlasHookImpl extends AtlasHook {
-
public String getMessageSource() {
return SQOOP_SOURCE;
}
diff --git
a/addons/sqoop-bridge/src/main/java/org/apache/atlas/sqoop/model/SqoopDataTypes.java
b/addons/sqoop-bridge/src/main/java/org/apache/atlas/sqoop/model/SqoopDataTypes.java
index e71220ab9..f0f02ea2a 100644
---
a/addons/sqoop-bridge/src/main/java/org/apache/atlas/sqoop/model/SqoopDataTypes.java
+++
b/addons/sqoop-bridge/src/main/java/org/apache/atlas/sqoop/model/SqoopDataTypes.java
@@ -22,11 +22,9 @@ package org.apache.atlas.sqoop.model;
* Hive Data Types for model and bridge.
*/
public enum SqoopDataTypes {
-
// Classes
SQOOP_DBDATASTORE,
- SQOOP_PROCESS,
- ;
+ SQOOP_PROCESS;
public String getName() {
return name().toLowerCase();
diff --git
a/addons/sqoop-bridge/src/test/java/org/apache/atlas/sqoop/hook/SqoopHookIT.java
b/addons/sqoop-bridge/src/test/java/org/apache/atlas/sqoop/hook/SqoopHookIT.java
index 71a8779db..f73990b23 100644
---
a/addons/sqoop-bridge/src/test/java/org/apache/atlas/sqoop/hook/SqoopHookIT.java
+++
b/addons/sqoop-bridge/src/test/java/org/apache/atlas/sqoop/hook/SqoopHookIT.java
@@ -49,7 +49,7 @@ public class SqoopHookIT {
//Set-up sqoop session
Configuration configuration = ApplicationProperties.get();
if (!AuthenticationUtil.isKerberosAuthenticationEnabled()) {
- atlasClient = new
AtlasClient(configuration.getStringArray(HiveMetaStoreBridge.ATLAS_ENDPOINT),
new String[]{"admin", "admin"});
+ atlasClient = new
AtlasClient(configuration.getStringArray(HiveMetaStoreBridge.ATLAS_ENDPOINT),
new String[] {"admin", "admin"});
} else {
atlasClient = new
AtlasClient(configuration.getStringArray(HiveMetaStoreBridge.ATLAS_ENDPOINT));
}
@@ -132,7 +132,7 @@ public class SqoopHookIT {
try {
predicate.evaluate();
return;
- } catch(Error | Exception e) {
+ } catch (Error | Exception e) {
if (System.currentTimeMillis() >= mustEnd) {
fail("Assertions failed. Failing after waiting for timeout
" + timeout + " msecs", e);
}
