atlas-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From suma...@apache.org
Subject incubator-atlas git commit: ATLAS-1259 Fix Test and compilation failure caused bt ATLAS-1233 changes (apoorvnaik via sumasai)
Date Wed, 02 Nov 2016 01:40:29 GMT
Repository: incubator-atlas
Updated Branches:
  refs/heads/master 315b5d184 -> 9f643b5b9


ATLAS-1259 Fix Test and compilation failure caused bt ATLAS-1233 changes (apoorvnaik via sumasai)


Project: http://git-wip-us.apache.org/repos/asf/incubator-atlas/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-atlas/commit/9f643b5b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-atlas/tree/9f643b5b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-atlas/diff/9f643b5b

Branch: refs/heads/master
Commit: 9f643b5b916a97b8d39626d2d50aba4953a542fa
Parents: 315b5d1
Author: Suma Shivaprasad <sumasai.shivaprasad@gmail.com>
Authored: Tue Nov 1 18:40:20 2016 -0700
Committer: Suma Shivaprasad <sumasai.shivaprasad@gmail.com>
Committed: Tue Nov 1 18:40:20 2016 -0700

----------------------------------------------------------------------
 .../main/java/org/apache/atlas/type/AtlasTypeUtil.java    |  2 ++
 release-log.txt                                           |  1 +
 .../store/graph/AtlasTypeDefGraphStoreTest.java           | 10 ++++++++--
 3 files changed, 11 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/9f643b5b/intg/src/main/java/org/apache/atlas/type/AtlasTypeUtil.java
----------------------------------------------------------------------
diff --git a/intg/src/main/java/org/apache/atlas/type/AtlasTypeUtil.java b/intg/src/main/java/org/apache/atlas/type/AtlasTypeUtil.java
index 8bd472a..190364f 100644
--- a/intg/src/main/java/org/apache/atlas/type/AtlasTypeUtil.java
+++ b/intg/src/main/java/org/apache/atlas/type/AtlasTypeUtil.java
@@ -30,11 +30,13 @@ import org.apache.atlas.model.typedef.AtlasStructDef.AtlasAttributeDef.Cardinali
 import org.apache.atlas.model.typedef.AtlasTypesDef;
 import org.apache.commons.lang.StringUtils;
 
+import java.util.Arrays;
 import java.util.Collections;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
+import java.util.Arrays;
 
 import static org.apache.atlas.model.typedef.AtlasBaseTypeDef.ATLAS_TYPE_ARRAY_PREFIX;
 import static org.apache.atlas.model.typedef.AtlasBaseTypeDef.ATLAS_TYPE_ARRAY_SUFFIX;

http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/9f643b5b/release-log.txt
----------------------------------------------------------------------
diff --git a/release-log.txt b/release-log.txt
index fd8ee7b..7737109 100644
--- a/release-log.txt
+++ b/release-log.txt
@@ -9,6 +9,7 @@ ATLAS-1060 Add composite indexes for exact match performance improvements
for al
 ATLAS-1127 Modify creation and modification timestamps to Date instead of Long(sumasai)
 
 ALL CHANGES:
+ATLAS-1259 Fix Test and compilation failure caused bt ATLAS-1233 changes (apoorvnaik via
sumasai)
 ATLAS-1248 /bin/atlas_stop.py not killing the process and process is found alive even after
30 secs (zhangqiang2 via sumasai)
 ATLAS-1258 BugFix for Indexer NPE on StructDef lookup (apoorvnaik via sumasai)
 ATLAS-1233 UnitTests for the TypeDefStores (apoorvnaik via sumasai)

http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/9f643b5b/repository/src/test/java/org/apache/atlas/repository/store/graph/AtlasTypeDefGraphStoreTest.java
----------------------------------------------------------------------
diff --git a/repository/src/test/java/org/apache/atlas/repository/store/graph/AtlasTypeDefGraphStoreTest.java
b/repository/src/test/java/org/apache/atlas/repository/store/graph/AtlasTypeDefGraphStoreTest.java
index 2c720f3..3ffed90 100644
--- a/repository/src/test/java/org/apache/atlas/repository/store/graph/AtlasTypeDefGraphStoreTest.java
+++ b/repository/src/test/java/org/apache/atlas/repository/store/graph/AtlasTypeDefGraphStoreTest.java
@@ -342,7 +342,10 @@ public class AtlasTypeDefGraphStoreTest {
         // Test Classification with supertype
         List<AtlasClassificationDef> classificationDefs = TestUtilsV2.getClassificationWithValidSuperType();
 
-        AtlasTypesDef toCreate = new AtlasTypesDef(null, null, classificationDefs, null);
+        AtlasTypesDef toCreate = new AtlasTypesDef(Collections.<AtlasEnumDef>emptyList(),
+                Collections.<AtlasStructDef>emptyList(),
+                classificationDefs,
+                Collections.<AtlasEntityDef>emptyList());
         try {
             AtlasTypesDef created = typeDefStore.createTypesDef(toCreate);
             assertEquals(created.getClassificationDefs(), toCreate.getClassificationDefs(),
@@ -353,7 +356,10 @@ public class AtlasTypeDefGraphStoreTest {
 
         // Test Entity with supertype
         List<AtlasEntityDef> entityDefs = TestUtilsV2.getEntityWithValidSuperType();
-        toCreate = new AtlasTypesDef(null, null, null, entityDefs);
+        toCreate = new AtlasTypesDef(Collections.<AtlasEnumDef>emptyList(),
+                Collections.<AtlasStructDef>emptyList(),
+                Collections.<AtlasClassificationDef>emptyList(),
+                entityDefs);
         try {
             AtlasTypesDef created = typeDefStore.createTypesDef(toCreate);
             assertEquals(created.getEntityDefs(), toCreate.getEntityDefs(),


Mime
View raw message