BUG-39239 Not storing arrays and maps in type system

repository/src/main/java/org/apache/atlas/repository/typestore/GraphBackedTypeStore.java

@@ -76,32 +76,29 @@ public class GraphBackedTypeStore implements ITypeStore {
     @Override
     @GraphTransaction
     public void store(TypeSystem typeSystem, ImmutableList<String> typeNames) throws AtlasException {
-        ImmutableList<String> coreTypes = typeSystem.getCoreTypes();
         for (String typeName : typeNames) {
-            if (!coreTypes.contains(typeName)) {
-                IDataType dataType = typeSystem.getDataType(IDataType.class, typeName);
-                LOG.debug("Processing {}.{} in type store", dataType.getTypeCategory(), dataType.getName());
-                switch (dataType.getTypeCategory()) {
-                    case ENUM:
-                        storeInGraph((EnumType)dataType);
-                        break;
-
-                    case STRUCT:
-                        StructType structType = (StructType) dataType;
-                        storeInGraph(typeSystem, dataType.getTypeCategory(), dataType.getName(),
-                                ImmutableList.copyOf(structType.infoToNameMap.keySet()), ImmutableList.<String>of());
-                        break;
-
-                    case TRAIT:
-                    case CLASS:
-                        HierarchicalType type = (HierarchicalType) dataType;
-                        storeInGraph(typeSystem, dataType.getTypeCategory(), dataType.getName(),
-                                type.immediateAttrs, type.superTypes);
-                        break;
-
-                    default:    //Ignore primitive/collection types as they are covered under references
-                        break;
-                }
+            IDataType dataType = typeSystem.getDataType(IDataType.class, typeName);
+            LOG.debug("Processing {}.{} in type store", dataType.getTypeCategory(), dataType.getName());
+            switch (dataType.getTypeCategory()) {
+                case ENUM:
+                    storeInGraph((EnumType)dataType);
+                    break;
+
+                case STRUCT:
+                    StructType structType = (StructType) dataType;
+                    storeInGraph(typeSystem, dataType.getTypeCategory(), dataType.getName(),
+                            ImmutableList.copyOf(structType.infoToNameMap.keySet()), ImmutableList.<String>of());
+                    break;
+
+                case TRAIT:
+                case CLASS:
+                    HierarchicalType type = (HierarchicalType) dataType;
+                    storeInGraph(typeSystem, dataType.getTypeCategory(), dataType.getName(),
+                            type.immediateAttrs, type.superTypes);
+                    break;
+
+                default:    //Ignore primitive/collection types as they are covered under references
+                    break;
             }
         }
     }
@@ -209,7 +206,7 @@ public class GraphBackedTypeStore implements ITypeStore {
     }
 
     private void addEdge(Vertex fromVertex, Vertex toVertex, String label) {
-        LOG.debug("Adding edge from {} to {} with label {}" + toString(fromVertex), toString(toVertex), label);
+        LOG.debug("Adding edge from {} to {} with label {}", toString(fromVertex), toString(toVertex), label);
         titanGraph.addEdge(null, fromVertex, toVertex, label);
     }
 
@@ -297,7 +294,7 @@ public class GraphBackedTypeStore implements ITypeStore {
     }
 
     private String toString(Vertex vertex) {
-        return PROPERTY_PREFIX + "." + vertex.getProperty(Constants.TYPENAME_PROPERTY_KEY);
+        return PROPERTY_PREFIX + vertex.getProperty(Constants.TYPENAME_PROPERTY_KEY);
     }
 
     /**

tools/src/main/scala/org/apache/atlas/tools/dsl/package.scala

@@ -69,7 +69,7 @@ package object dsl {
         new AttributeDefinition(name, dT.getName, m, isComposite, reverseAttributeName)
     }
 
-    def listTypes = (ts.getTypeNames -- ts.getCoreTypes).sorted.toList.mkString("[", ",", "]")
+    def listTypes = ts.getTypeNames.sorted.toList.mkString("[", ",", "]")
 
     def ts = TypeSystem.getInstance
 

tools/src/test/scala/org/apache/atlas/tools/dsl/DSLTest.scala

@@ -85,7 +85,7 @@ class DSLTest {
             attrDef("o", mapType(STRING_TYPE, DOUBLE_TYPE)))
 
         // 2. 'mytype' available as a a Type
-        Assert.assertEquals(s"${listTypes}", "[array<bigdecimal>,array<int>,map<string,double>,mytype,t1,t2]")
+        Assert.assertEquals(s"${listTypes}", "[mytype,t1,t2]")
 
         // 3. Create a 'mytype' instance from Json
         val i = createInstance("mytype", """
@@ -125,7 +125,7 @@ class DSLTest {
     @Test def test2 {
 
         // 1. Existing Types in System
-        Assert.assertEquals(s"${listTypes}", "[array<bigdecimal>,array<int>,map<string,double>,t1,t2]")
+        Assert.assertEquals(s"${listTypes}", "[t1,t2]")
 
         val addrType = defineStructType("addressType",
             attrDef("houseNum", INT_TYPE, ATTR_REQUIRED),
@@ -143,7 +143,7 @@ class DSLTest {
         )
 
         // 2. updated Types in System
-        Assert.assertEquals(s"${listTypes}", "[addressType,array<bigdecimal>,array<int>,map<string,double>,personType,t1,t2]")
+        Assert.assertEquals(s"${listTypes}", "[addressType,personType,t1,t2]")
 
 
         // 3. Construct a Person in Code

typesystem/src/main/java/org/apache/atlas/typesystem/types/TypeSystem.java

@@ -85,7 +85,9 @@ public class TypeSystem {
     }
 
     public ImmutableList<String> getTypeNames() {
-        return ImmutableList.copyOf(types.keySet());
+        List<String> typeNames = new ArrayList<>(types.keySet());
+        typeNames.removeAll(getCoreTypes());
+        return ImmutableList.copyOf(typeNames);
     }
 
     public ImmutableList<String> getTypeNamesByCategory(DataTypes.TypeCategory typeCategory) {
@@ -259,8 +261,8 @@ public class TypeSystem {
     public DataTypes.ArrayType defineArrayType(IDataType elemType) throws AtlasException {
         assert elemType != null;
         DataTypes.ArrayType dT = new DataTypes.ArrayType(elemType);
-        types.put(dT.getName(), dT);
-        typeCategoriesToTypeNamesMap.put(DataTypes.TypeCategory.ARRAY, dT.getName());
+//        types.put(dT.getName(), dT);
+//        typeCategoriesToTypeNamesMap.put(DataTypes.TypeCategory.ARRAY, dT.getName());
         return dT;
     }
 
@@ -269,8 +271,8 @@ public class TypeSystem {
         assert keyType != null;
         assert valueType != null;
         DataTypes.MapType dT = new DataTypes.MapType(keyType, valueType);
-        types.put(dT.getName(), dT);
-        typeCategoriesToTypeNamesMap.put(DataTypes.TypeCategory.MAP, dT.getName());
+//        types.put(dT.getName(), dT);
+//        typeCategoriesToTypeNamesMap.put(DataTypes.TypeCategory.MAP, dT.getName());
         return dT;
     }
 

webapp/src/test/java/org/apache/atlas/web/resources/TypesJerseyResourceIT.java

@@ -157,6 +157,11 @@ public class TypesJerseyResourceIT extends BaseResourceIT {
 
         final JSONArray list = response.getJSONArray(AtlasClient.RESULTS);
         Assert.assertNotNull(list);
+
+        //Verify that primitive and core types are not returned
+        String typesString = list.join(" ");
+        Assert.assertFalse(typesString.contains(" \"__IdType\" "));
+        Assert.assertFalse(typesString.contains(" \"string\" "));
     }
 
     @Test