You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@atlas.apache.org by ma...@apache.org on 2018/02/17 22:53:59 UTC
atlas git commit: ATLAS-2235: code improvements suggested by static
code analysis
Repository: atlas
Updated Branches:
refs/heads/master 3fd57d753 -> 92b966573
ATLAS-2235: code improvements suggested by static code analysis
Signed-off-by: Madhan Neethiraj <ma...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/atlas/repo
Commit: http://git-wip-us.apache.org/repos/asf/atlas/commit/92b96657
Tree: http://git-wip-us.apache.org/repos/asf/atlas/tree/92b96657
Diff: http://git-wip-us.apache.org/repos/asf/atlas/diff/92b96657
Branch: refs/heads/master
Commit: 92b966573227e85a7739afc6d707d88c1b428607
Parents: 3fd57d7
Author: rmani <rm...@hortonworks.com>
Authored: Sat Feb 17 13:32:55 2018 -0800
Committer: Madhan Neethiraj <ma...@apache.org>
Committed: Sat Feb 17 14:49:54 2018 -0800
----------------------------------------------------------------------
.../atlas/hbase/bridge/HBaseAtlasHook.java | 24 ++++++++++++-----
.../apache/atlas/hbase/HBaseAtlasHookIT.java | 28 ++++++++++++++------
2 files changed, 38 insertions(+), 14 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/atlas/blob/92b96657/addons/hbase-bridge/src/main/java/org/apache/atlas/hbase/bridge/HBaseAtlasHook.java
----------------------------------------------------------------------
diff --git a/addons/hbase-bridge/src/main/java/org/apache/atlas/hbase/bridge/HBaseAtlasHook.java b/addons/hbase-bridge/src/main/java/org/apache/atlas/hbase/bridge/HBaseAtlasHook.java
index 8d02f8d..f165e98 100644
--- a/addons/hbase-bridge/src/main/java/org/apache/atlas/hbase/bridge/HBaseAtlasHook.java
+++ b/addons/hbase-bridge/src/main/java/org/apache/atlas/hbase/bridge/HBaseAtlasHook.java
@@ -374,7 +374,11 @@ public class HBaseAtlasHook extends AtlasHook {
* @return Unique qualified name to identify the Table instance in Atlas.
*/
public static String getColumnFamilyQualifiedName(String clusterName, String nameSpace, String tableName, String columnFamily) {
- return String.format("%s.%s.%s@%s", nameSpace.toLowerCase(), stripNameSpace(tableName.toLowerCase()), columnFamily.toLowerCase(), clusterName);
+ if (clusterName == null || nameSpace == null || tableName == null || columnFamily == null) {
+ return null;
+ } else {
+ return String.format("%s.%s.%s@%s", nameSpace.toLowerCase(), stripNameSpace(tableName.toLowerCase()), columnFamily.toLowerCase(), clusterName);
+ }
}
/**
@@ -386,7 +390,11 @@ public class HBaseAtlasHook extends AtlasHook {
* @return Unique qualified name to identify the Table instance in Atlas.
*/
public static String getTableQualifiedName(String clusterName, String nameSpace, String tableName) {
- return String.format("%s.%s@%s", nameSpace.toLowerCase(), stripNameSpace(tableName.toLowerCase()), clusterName);
+ if (clusterName == null || nameSpace == null || tableName == null) {
+ return null;
+ } else {
+ return String.format("%s.%s@%s", nameSpace.toLowerCase(), stripNameSpace(tableName.toLowerCase()), clusterName);
+ }
}
/**
@@ -397,7 +405,11 @@ public class HBaseAtlasHook extends AtlasHook {
* @return Unique qualified name to identify the HBase NameSpace instance in Atlas.
*/
public static String getNameSpaceQualifiedName(String clusterName, String nameSpace) {
- return String.format("%s@%s", nameSpace.toLowerCase(), clusterName);
+ if (clusterName == null || nameSpace == null) {
+ return null;
+ } else {
+ return String.format("%s@%s", nameSpace.toLowerCase(), clusterName);
+ }
}
private static String stripNameSpace(String tableName) {
@@ -765,7 +777,7 @@ public class HBaseAtlasHook extends AtlasHook {
UserGroupInformation ugi = getUGI();
User user = getActiveUser();
- String userName = user.getShortName();
+ String userName = (user != null) ? user.getShortName() : null;
HBaseOperationContext hbaseOperationContext = new HBaseOperationContext(namespaceDescriptor, nameSpace, operation, ugi, userName, userName);
createAtlasInstances(hbaseOperationContext);
@@ -784,7 +796,7 @@ public class HBaseAtlasHook extends AtlasHook {
UserGroupInformation ugi = getUGI();
User user = getActiveUser();
- String userName = user.getShortName();
+ String userName = (user != null) ? user.getShortName() : null;
Map<String, String> hbaseConf = null;
String owner = null;
String tableNameSpace = null;
@@ -827,7 +839,7 @@ public class HBaseAtlasHook extends AtlasHook {
UserGroupInformation ugi = getUGI();
User user = getActiveUser();
- String userName = user.getShortName();
+ String userName = (user != null) ? user.getShortName() : null;
String owner = userName;
Map<String, String> hbaseConf = null;
http://git-wip-us.apache.org/repos/asf/atlas/blob/92b96657/addons/hbase-bridge/src/test/java/org/apache/atlas/hbase/HBaseAtlasHookIT.java
----------------------------------------------------------------------
diff --git a/addons/hbase-bridge/src/test/java/org/apache/atlas/hbase/HBaseAtlasHookIT.java b/addons/hbase-bridge/src/test/java/org/apache/atlas/hbase/HBaseAtlasHookIT.java
index db5c78e..c0d0318 100644
--- a/addons/hbase-bridge/src/test/java/org/apache/atlas/hbase/HBaseAtlasHookIT.java
+++ b/addons/hbase-bridge/src/test/java/org/apache/atlas/hbase/HBaseAtlasHookIT.java
@@ -90,11 +90,17 @@ public class HBaseAtlasHookIT {
admin.createNamespace(ns);
//assert on qualified name
- String nameSpace = assertNameSpaceIsRegistered(ns.getName());
- AtlasEntityWithExtInfo nameSpaceRef = getAtlasClient().getEntityByGuid(nameSpace);
- String nameSpaceQualifiedName = HBaseAtlasHook.getNameSpaceQualifiedName(CLUSTER_NAME, ns.getName());
+ String nameSpace = assertNameSpaceIsRegistered(ns.getName());
+ AtlasClientV2 atlasClient = getAtlasClient();
- Assert.assertEquals(nameSpaceRef.getEntity().getAttribute(AtlasClient.REFERENCEABLE_ATTRIBUTE_NAME), nameSpaceQualifiedName);
+ if (atlasClient != null) {
+ AtlasEntityWithExtInfo nameSpaceRef = atlasClient.getEntityByGuid(nameSpace);
+ String nameSpaceQualifiedName = HBaseAtlasHook.getNameSpaceQualifiedName(CLUSTER_NAME, ns.getName());
+
+ Assert.assertEquals(nameSpaceRef.getEntity().getAttribute(AtlasClient.REFERENCEABLE_ATTRIBUTE_NAME), nameSpaceQualifiedName);
+ } else {
+ Assert.fail("Unable to create AtlasClient for Testing");
+ }
}
@Test
@@ -124,11 +130,17 @@ public class HBaseAtlasHookIT {
}
//assert on qualified name
- String table = assertTableIsRegistered(namespace, tablename);
- AtlasEntityWithExtInfo tableRef = getAtlasClient().getEntityByGuid(table);
- String entityName = HBaseAtlasHook.getTableQualifiedName(CLUSTER_NAME, namespace, tablename);
+ String table = assertTableIsRegistered(namespace, tablename);
+ AtlasClientV2 atlasClient = getAtlasClient();
- Assert.assertEquals(tableRef.getEntity().getAttribute(AtlasClient.REFERENCEABLE_ATTRIBUTE_NAME), entityName);
+ if (atlasClient != null) {
+ AtlasEntityWithExtInfo tableRef = atlasClient.getEntityByGuid(table);
+ String entityName = HBaseAtlasHook.getTableQualifiedName(CLUSTER_NAME, namespace, tablename);
+
+ Assert.assertEquals(tableRef.getEntity().getAttribute(AtlasClient.REFERENCEABLE_ATTRIBUTE_NAME), entityName);
+ } else {
+ Assert.fail("Unable to create AtlasClient for Testing");
+ }
}
// Methods for creating HBase