Repository: atlas Updated Branches: refs/heads/branch-0.8 325859ab8 -> 250d93217
http://git-wip-us.apache.org/repos/asf/atlas/blob/250d9321/repository/src/main/java/org/apache/atlas/repository/store/graph/v1/SoftDeleteHandlerV1.java ---------------------------------------------------------------------- diff --git a/repository/src/main/java/org/apache/atlas/repository/store/graph/v1/SoftDeleteHandlerV1.java b/repository/src/main/java/org/apache/atlas/repository/store/graph/v1/SoftDeleteHandlerV1.java index 49c9e0c..89f1909 100644 --- a/repository/src/main/java/org/apache/atlas/repository/store/graph/v1/SoftDeleteHandlerV1.java +++ b/repository/src/main/java/org/apache/atlas/repository/store/graph/v1/SoftDeleteHandlerV1.java @@ -22,7 +22,6 @@ import org.apache.atlas.RequestContextV1; import org.apache.atlas.annotation.ConditionalOnAtlasProperty; import org.apache.atlas.exception.AtlasBaseException; import org.apache.atlas.model.instance.AtlasEntity; -import org.apache.atlas.repository.graph.GraphHelper; import org.apache.atlas.repository.graphdb.AtlasEdge; import org.apache.atlas.repository.graphdb.AtlasVertex; import org.apache.atlas.type.AtlasTypeRegistry; @@ -50,10 +49,10 @@ public class SoftDeleteHandlerV1 extends DeleteHandlerV1 { } else { AtlasEntity.Status state = AtlasGraphUtilsV1.getState(instanceVertex); if (state != AtlasEntity.Status.DELETED) { - GraphHelper.setProperty(instanceVertex, STATE_PROPERTY_KEY, AtlasEntity.Status.DELETED.name()); - GraphHelper.setProperty(instanceVertex, MODIFICATION_TIMESTAMP_PROPERTY_KEY, + AtlasGraphUtilsV1.setEncodedProperty(instanceVertex, STATE_PROPERTY_KEY, AtlasEntity.Status.DELETED.name()); + AtlasGraphUtilsV1.setEncodedProperty(instanceVertex, MODIFICATION_TIMESTAMP_PROPERTY_KEY, RequestContextV1.get().getRequestTime()); - GraphHelper.setProperty(instanceVertex, MODIFIED_BY_KEY, RequestContextV1.get().getUser()); + AtlasGraphUtilsV1.setEncodedProperty(instanceVertex, MODIFIED_BY_KEY, RequestContextV1.get().getUser()); } } } @@ -65,10 +64,9 @@ public class SoftDeleteHandlerV1 extends DeleteHandlerV1 { } else { AtlasEntity.Status state = AtlasGraphUtilsV1.getState(edge); if (state != AtlasEntity.Status.DELETED) { - GraphHelper.setProperty(edge, STATE_PROPERTY_KEY, AtlasEntity.Status.DELETED.name()); - GraphHelper - .setProperty(edge, MODIFICATION_TIMESTAMP_PROPERTY_KEY, RequestContextV1.get().getRequestTime()); - GraphHelper.setProperty(edge, MODIFIED_BY_KEY, RequestContextV1.get().getUser()); + AtlasGraphUtilsV1.setEncodedProperty(edge, STATE_PROPERTY_KEY, AtlasEntity.Status.DELETED.name()); + AtlasGraphUtilsV1.setEncodedProperty(edge, MODIFICATION_TIMESTAMP_PROPERTY_KEY, RequestContextV1.get().getRequestTime()); + AtlasGraphUtilsV1.setEncodedProperty(edge, MODIFIED_BY_KEY, RequestContextV1.get().getUser()); } } } http://git-wip-us.apache.org/repos/asf/atlas/blob/250d9321/repository/src/main/java/org/apache/atlas/repository/typestore/GraphBackedTypeStore.java ---------------------------------------------------------------------- diff --git a/repository/src/main/java/org/apache/atlas/repository/typestore/GraphBackedTypeStore.java b/repository/src/main/java/org/apache/atlas/repository/typestore/GraphBackedTypeStore.java index 1525d7b..9e6ad18 100644 --- a/repository/src/main/java/org/apache/atlas/repository/typestore/GraphBackedTypeStore.java +++ b/repository/src/main/java/org/apache/atlas/repository/typestore/GraphBackedTypeStore.java @@ -31,6 +31,7 @@ import org.apache.atlas.repository.graphdb.AtlasEdge; import org.apache.atlas.repository.graphdb.AtlasEdgeDirection; import org.apache.atlas.repository.graphdb.AtlasGraph; import org.apache.atlas.repository.graphdb.AtlasVertex; +import org.apache.atlas.repository.store.graph.v1.AtlasGraphUtilsV1; import org.apache.atlas.typesystem.TypesDef; import org.apache.atlas.typesystem.types.*; import org.apache.atlas.typesystem.types.DataTypes.TypeCategory; @@ -50,7 +51,6 @@ import java.util.List; import java.util.Map; import java.util.Set; -import static org.apache.atlas.repository.graph.GraphHelper.setProperty; @Singleton @Component @@ -251,9 +251,9 @@ public class GraphBackedTypeStore implements ITypeStore { while (vertices.hasNext()) { AtlasVertex vertex = vertices.next(); - DataTypes.TypeCategory typeCategory = GraphHelper.getSingleValuedProperty(vertex, Constants.TYPE_CATEGORY_PROPERTY_KEY, TypeCategory.class); - String typeName = GraphHelper.getSingleValuedProperty(vertex, Constants.TYPENAME_PROPERTY_KEY, String.class); - String typeDescription = GraphHelper.getSingleValuedProperty(vertex, Constants.TYPEDESCRIPTION_PROPERTY_KEY, String.class); + DataTypes.TypeCategory typeCategory = AtlasGraphUtilsV1.getEncodedProperty(vertex, Constants.TYPE_CATEGORY_PROPERTY_KEY, TypeCategory.class); + String typeName = AtlasGraphUtilsV1.getEncodedProperty(vertex, Constants.TYPENAME_PROPERTY_KEY, String.class); + String typeDescription = AtlasGraphUtilsV1.getEncodedProperty(vertex, Constants.TYPEDESCRIPTION_PROPERTY_KEY, String.class); LOG.info("Restoring type {}.{}.{}", typeCategory, typeName, typeDescription); switch (typeCategory) { case ENUM: @@ -289,13 +289,13 @@ public class GraphBackedTypeStore implements ITypeStore { } private EnumTypeDefinition getEnumType(AtlasVertex vertex) throws AtlasException { - String typeName = GraphHelper.getSingleValuedProperty(vertex, Constants.TYPENAME_PROPERTY_KEY, String.class); - String typeDescription = GraphHelper.getSingleValuedProperty(vertex, Constants.TYPEDESCRIPTION_PROPERTY_KEY, String.class); + String typeName = AtlasGraphUtilsV1.getEncodedProperty(vertex, Constants.TYPENAME_PROPERTY_KEY, String.class); + String typeDescription = AtlasGraphUtilsV1.getEncodedProperty(vertex, Constants.TYPEDESCRIPTION_PROPERTY_KEY, String.class); List<EnumValue> enumValues = new ArrayList<>(); List<String> values = GraphHelper.getListProperty(vertex, getPropertyKey(typeName)); for (String value : values) { String valueProperty = getPropertyKey(typeName, value); - enumValues.add(new EnumValue(value, GraphHelper.getSingleValuedProperty(vertex, valueProperty, Integer.class))); + enumValues.add(new EnumValue(value, AtlasGraphUtilsV1.getEncodedProperty(vertex, valueProperty, Integer.class))); } return new EnumTypeDefinition(typeName, typeDescription, enumValues.toArray(new EnumValue[enumValues.size()])); } @@ -314,7 +314,7 @@ public class GraphBackedTypeStore implements ITypeStore { if (attrNames != null) { for (String attrName : attrNames) { try { - String encodedPropertyKey = GraphHelper.encodePropertyKey(getPropertyKey(typeName, attrName)); + String encodedPropertyKey = AtlasGraphUtilsV1.encodePropertyKey(getPropertyKey(typeName, attrName)); AttributeDefinition attrValue = AttributeInfo.fromJson((String) vertex.getJsonProperty(encodedPropertyKey)); if (attrValue != null) { @@ -378,15 +378,15 @@ public class GraphBackedTypeStore implements ITypeStore { if (! GraphHelper.elementExists(vertex)) { LOG.debug("Adding vertex {}{}", PROPERTY_PREFIX, info.getTypeName()); vertex = graph.addVertex(); - setProperty(vertex, Constants.VERTEX_TYPE_PROPERTY_KEY, VERTEX_TYPE); // Mark as type AtlasVertex - setProperty(vertex, Constants.TYPE_CATEGORY_PROPERTY_KEY, info.getCategory()); - setProperty(vertex, Constants.TYPENAME_PROPERTY_KEY, info.getTypeName()); + AtlasGraphUtilsV1.setEncodedProperty(vertex, Constants.VERTEX_TYPE_PROPERTY_KEY, VERTEX_TYPE); // Mark as type AtlasVertex + AtlasGraphUtilsV1.setEncodedProperty(vertex, Constants.TYPE_CATEGORY_PROPERTY_KEY, info.getCategory()); + AtlasGraphUtilsV1.setEncodedProperty(vertex, Constants.TYPENAME_PROPERTY_KEY, info.getTypeName()); } String newDescription = info.getTypeDescription(); if (newDescription != null) { String oldDescription = getPropertyKey(Constants.TYPEDESCRIPTION_PROPERTY_KEY); if (!newDescription.equals(oldDescription)) { - setProperty(vertex, Constants.TYPEDESCRIPTION_PROPERTY_KEY, newDescription); + AtlasGraphUtilsV1.setEncodedProperty(vertex, Constants.TYPEDESCRIPTION_PROPERTY_KEY, newDescription); } } else { LOG.debug(" type description is null "); http://git-wip-us.apache.org/repos/asf/atlas/blob/250d9321/repository/src/main/java/org/apache/atlas/repository/typestore/TypePersistenceVisitor.java ---------------------------------------------------------------------- diff --git a/repository/src/main/java/org/apache/atlas/repository/typestore/TypePersistenceVisitor.java b/repository/src/main/java/org/apache/atlas/repository/typestore/TypePersistenceVisitor.java index bfb1bfc..7440800 100644 --- a/repository/src/main/java/org/apache/atlas/repository/typestore/TypePersistenceVisitor.java +++ b/repository/src/main/java/org/apache/atlas/repository/typestore/TypePersistenceVisitor.java @@ -17,7 +17,6 @@ */ package org.apache.atlas.repository.typestore; -import static org.apache.atlas.repository.graph.GraphHelper.setProperty; import java.util.ArrayList; import java.util.List; @@ -25,9 +24,9 @@ import java.util.Map; import org.apache.atlas.AtlasException; import org.apache.atlas.repository.Constants; -import org.apache.atlas.repository.RepositoryException; import org.apache.atlas.repository.graph.GraphHelper; import org.apache.atlas.repository.graphdb.AtlasVertex; +import org.apache.atlas.repository.store.graph.v1.AtlasGraphUtilsV1; import org.apache.atlas.typesystem.types.AttributeInfo; import org.apache.atlas.typesystem.types.DataTypes.TypeCategory; import org.apache.atlas.typesystem.types.EnumType; @@ -68,16 +67,16 @@ public class TypePersistenceVisitor implements TypeVisitor { List<String> values = new ArrayList<>(dataType.values().size()); for (EnumValue enumValue : dataType.values()) { String key = GraphBackedTypeStore.getPropertyKey(dataType.getName(), enumValue.value); - setProperty(vertex, key, enumValue.ordinal); + AtlasGraphUtilsV1.setProperty(vertex, key, enumValue.ordinal); values.add(enumValue.value); } - setProperty(vertex, GraphBackedTypeStore.getPropertyKey(dataType.getName()), values); + AtlasGraphUtilsV1.setProperty(vertex, GraphBackedTypeStore.getPropertyKey(dataType.getName()), values); } @Override public void visitAttributeDataType(String typeName, AttributeInfo attribute, IDataType attrType) throws AtlasException { AtlasVertex vertex = typeVertices.get(typeName); - String vertexTypeName = GraphHelper.getSingleValuedProperty(vertex, Constants.TYPENAME_PROPERTY_KEY, String.class); + String vertexTypeName = AtlasGraphUtilsV1.getEncodedProperty(vertex, Constants.TYPENAME_PROPERTY_KEY, String.class); AtlasVertex attrVertex = typeVertices.get(attrType.getName()); String label = GraphBackedTypeStore.getEdgeLabel(vertexTypeName, attribute.name); graphHelper.getOrCreateEdge(vertex, attrVertex, label); @@ -93,8 +92,7 @@ public class TypePersistenceVisitor implements TypeVisitor { @Override public void visitAttributeNames(String typeName, List<String> attrNames) throws AtlasException { AtlasVertex vertex = typeVertices.get(typeName); - setProperty(vertex, GraphBackedTypeStore.getPropertyKey(typeName), attrNames); - + AtlasGraphUtilsV1.setProperty(vertex, GraphBackedTypeStore.getPropertyKey(typeName), attrNames); } @Override @@ -102,7 +100,7 @@ public class TypePersistenceVisitor implements TypeVisitor { AtlasVertex vertex = typeVertices.get(typeName); String propertyKey = GraphBackedTypeStore.getPropertyKey(typeName, attribute.name); try { - setProperty(vertex, propertyKey, attribute.toJson()); + AtlasGraphUtilsV1.setProperty(vertex, propertyKey, attribute.toJson()); } catch (JSONException e) { throw new StorageException(typeName, e); } http://git-wip-us.apache.org/repos/asf/atlas/blob/250d9321/repository/src/test/java/org/apache/atlas/repository/graph/GraphBackedMetadataRepositoryDeleteTestBase.java ---------------------------------------------------------------------- diff --git a/repository/src/test/java/org/apache/atlas/repository/graph/GraphBackedMetadataRepositoryDeleteTestBase.java b/repository/src/test/java/org/apache/atlas/repository/graph/GraphBackedMetadataRepositoryDeleteTestBase.java index 0834601..b3dab51 100644 --- a/repository/src/test/java/org/apache/atlas/repository/graph/GraphBackedMetadataRepositoryDeleteTestBase.java +++ b/repository/src/test/java/org/apache/atlas/repository/graph/GraphBackedMetadataRepositoryDeleteTestBase.java @@ -32,6 +32,7 @@ import org.apache.atlas.repository.MetadataRepository; import org.apache.atlas.repository.RepositoryException; import org.apache.atlas.repository.graphdb.AtlasGraph; import org.apache.atlas.repository.graphdb.AtlasVertex; +import org.apache.atlas.repository.store.graph.v1.AtlasGraphUtilsV1; import org.apache.atlas.type.AtlasTypeRegistry; import org.apache.atlas.typesystem.IReferenceableInstance; import org.apache.atlas.typesystem.IStruct; @@ -410,10 +411,10 @@ public abstract class GraphBackedMetadataRepositoryDeleteTestBase { ITypedReferenceableInstance max = repositoryService.getEntityDefinition(nameGuidMap.get("Max")); String maxGuid = max.getId()._getId(); AtlasVertex vertex = GraphHelper.getInstance().getVertexForGUID(maxGuid); - Long creationTimestamp = GraphHelper.getSingleValuedProperty(vertex, Constants.TIMESTAMP_PROPERTY_KEY, Long.class); + Long creationTimestamp = AtlasGraphUtilsV1.getEncodedProperty(vertex, Constants.TIMESTAMP_PROPERTY_KEY, Long.class); Assert.assertNotNull(creationTimestamp); - Long modificationTimestampPreUpdate = GraphHelper.getSingleValuedProperty(vertex, Constants.MODIFICATION_TIMESTAMP_PROPERTY_KEY, Long.class); + Long modificationTimestampPreUpdate = AtlasGraphUtilsV1.getEncodedProperty(vertex, Constants.MODIFICATION_TIMESTAMP_PROPERTY_KEY, Long.class); Assert.assertNotNull(modificationTimestampPreUpdate); ITypedReferenceableInstance jane = repositoryService.getEntityDefinition(nameGuidMap.get("Jane")); @@ -434,7 +435,7 @@ public abstract class GraphBackedMetadataRepositoryDeleteTestBase { // Verify modification timestamp was updated. vertex = GraphHelper.getInstance().getVertexForGUID(maxGuid); - Long modificationTimestampPostUpdate = GraphHelper.getSingleValuedProperty(vertex, Constants.MODIFICATION_TIMESTAMP_PROPERTY_KEY, Long.class); + Long modificationTimestampPostUpdate = AtlasGraphUtilsV1.getEncodedProperty(vertex, Constants.MODIFICATION_TIMESTAMP_PROPERTY_KEY, Long.class); Assert.assertNotNull(modificationTimestampPostUpdate); Assert.assertTrue(creationTimestamp < modificationTimestampPostUpdate); @@ -451,7 +452,7 @@ public abstract class GraphBackedMetadataRepositoryDeleteTestBase { // Verify modification timestamp was updated. vertex = GraphHelper.getInstance().getVertexForGUID(maxGuid); - Long modificationTimestampPost2ndUpdate = GraphHelper.getSingleValuedProperty(vertex, Constants.MODIFICATION_TIMESTAMP_PROPERTY_KEY, Long.class); + Long modificationTimestampPost2ndUpdate = AtlasGraphUtilsV1.getEncodedProperty(vertex, Constants.MODIFICATION_TIMESTAMP_PROPERTY_KEY, Long.class); Assert.assertNotNull(modificationTimestampPost2ndUpdate); Assert.assertTrue(modificationTimestampPostUpdate < modificationTimestampPost2ndUpdate); http://git-wip-us.apache.org/repos/asf/atlas/blob/250d9321/repository/src/test/java/org/apache/atlas/repository/graph/GraphBackedMetadataRepositoryTest.java ---------------------------------------------------------------------- diff --git a/repository/src/test/java/org/apache/atlas/repository/graph/GraphBackedMetadataRepositoryTest.java b/repository/src/test/java/org/apache/atlas/repository/graph/GraphBackedMetadataRepositoryTest.java index eb779ff..e817f7f 100755 --- a/repository/src/test/java/org/apache/atlas/repository/graph/GraphBackedMetadataRepositoryTest.java +++ b/repository/src/test/java/org/apache/atlas/repository/graph/GraphBackedMetadataRepositoryTest.java @@ -37,6 +37,7 @@ import org.apache.atlas.repository.graphdb.AtlasGraph; import org.apache.atlas.repository.graphdb.AtlasGraphQuery; import org.apache.atlas.repository.graphdb.AtlasGraphQuery.ComparisionOperator; import org.apache.atlas.repository.graphdb.AtlasVertex; +import org.apache.atlas.repository.store.graph.v1.AtlasGraphUtilsV1; import org.apache.atlas.type.AtlasTypeRegistry; import org.apache.atlas.typesystem.IStruct; import org.apache.atlas.typesystem.ITypedReferenceableInstance; @@ -476,7 +477,7 @@ public class GraphBackedMetadataRepositoryTest { public void testAddTrait() throws Exception { final String aGUID = getGUID(); AtlasVertex AtlasVertex = GraphHelper.getInstance().getVertexForGUID(aGUID); - Long modificationTimestampPreUpdate = GraphHelper.getSingleValuedProperty(AtlasVertex, Constants.MODIFICATION_TIMESTAMP_PROPERTY_KEY, Long.class); + Long modificationTimestampPreUpdate = AtlasGraphUtilsV1.getEncodedProperty(AtlasVertex, Constants.MODIFICATION_TIMESTAMP_PROPERTY_KEY, Long.class); Assert.assertNotNull(modificationTimestampPreUpdate); List<String> traitNames = repositoryService.getTraitNames(aGUID); @@ -498,7 +499,7 @@ public class GraphBackedMetadataRepositoryTest { // Verify modification timestamp was updated. GraphHelper.getInstance().getVertexForGUID(aGUID); - Long modificationTimestampPostUpdate = GraphHelper.getSingleValuedProperty(AtlasVertex, Constants.MODIFICATION_TIMESTAMP_PROPERTY_KEY, Long.class); + Long modificationTimestampPostUpdate = AtlasGraphUtilsV1.getEncodedProperty(AtlasVertex, Constants.MODIFICATION_TIMESTAMP_PROPERTY_KEY, Long.class); Assert.assertNotNull(modificationTimestampPostUpdate); } @@ -548,7 +549,7 @@ public class GraphBackedMetadataRepositoryTest { public void testDeleteTrait() throws Exception { final String aGUID = getGUID(); AtlasVertex AtlasVertex = GraphHelper.getInstance().getVertexForGUID(aGUID); - Long modificationTimestampPreUpdate = GraphHelper.getSingleValuedProperty(AtlasVertex, Constants.MODIFICATION_TIMESTAMP_PROPERTY_KEY, Long.class); + Long modificationTimestampPreUpdate = AtlasGraphUtilsV1.getEncodedProperty(AtlasVertex, Constants.MODIFICATION_TIMESTAMP_PROPERTY_KEY, Long.class); Assert.assertNotNull(modificationTimestampPreUpdate); List<String> traitNames = repositoryService.getTraitNames(aGUID); @@ -567,7 +568,7 @@ public class GraphBackedMetadataRepositoryTest { // Verify modification timestamp was updated. GraphHelper.getInstance().getVertexForGUID(aGUID); - Long modificationTimestampPostUpdate = GraphHelper.getSingleValuedProperty(AtlasVertex, Constants.MODIFICATION_TIMESTAMP_PROPERTY_KEY, Long.class); + Long modificationTimestampPostUpdate = AtlasGraphUtilsV1.getEncodedProperty(AtlasVertex, Constants.MODIFICATION_TIMESTAMP_PROPERTY_KEY, Long.class); Assert.assertNotNull(modificationTimestampPostUpdate); Assert.assertTrue(modificationTimestampPostUpdate > modificationTimestampPreUpdate); } @@ -590,12 +591,12 @@ public class GraphBackedMetadataRepositoryTest { public void testGetIdFromVertex() throws Exception { AtlasVertex tableVertex = getTableEntityVertex(); - String guid = GraphHelper.getSingleValuedProperty(tableVertex, Constants.GUID_PROPERTY_KEY, String.class); + String guid = AtlasGraphUtilsV1.getEncodedProperty(tableVertex, Constants.GUID_PROPERTY_KEY, String.class); if (guid == null) { Assert.fail(); } - Id expected = new Id(guid, GraphHelper.getSingleValuedProperty(tableVertex, Constants.VERSION_PROPERTY_KEY, Integer.class), TestUtils.TABLE_TYPE); + Id expected = new Id(guid, AtlasGraphUtilsV1.getEncodedProperty(tableVertex, Constants.VERSION_PROPERTY_KEY, Integer.class), TestUtils.TABLE_TYPE); Assert.assertEquals(GraphHelper.getIdFromVertex(TestUtils.TABLE_TYPE, tableVertex), expected); } @@ -774,7 +775,7 @@ public class GraphBackedMetadataRepositoryTest { String getGUID() { AtlasVertex tableVertex = getTableEntityVertex(); - String guid = GraphHelper.getSingleValuedProperty(tableVertex, Constants.GUID_PROPERTY_KEY, String.class); + String guid = AtlasGraphUtilsV1.getEncodedProperty(tableVertex, Constants.GUID_PROPERTY_KEY, String.class); if (guid == null) { Assert.fail(); } http://git-wip-us.apache.org/repos/asf/atlas/blob/250d9321/repository/src/test/java/org/apache/atlas/repository/graph/GraphBackedRepositorySoftDeleteTest.java ---------------------------------------------------------------------- diff --git a/repository/src/test/java/org/apache/atlas/repository/graph/GraphBackedRepositorySoftDeleteTest.java b/repository/src/test/java/org/apache/atlas/repository/graph/GraphBackedRepositorySoftDeleteTest.java index 8c86235..53f8295 100644 --- a/repository/src/test/java/org/apache/atlas/repository/graph/GraphBackedRepositorySoftDeleteTest.java +++ b/repository/src/test/java/org/apache/atlas/repository/graph/GraphBackedRepositorySoftDeleteTest.java @@ -23,6 +23,7 @@ import org.apache.atlas.AtlasException; import org.apache.atlas.TestUtils; import org.apache.atlas.repository.Constants; import org.apache.atlas.repository.graphdb.AtlasVertex; +import org.apache.atlas.repository.store.graph.v1.AtlasGraphUtilsV1; import org.apache.atlas.typesystem.IReferenceableInstance; import org.apache.atlas.typesystem.IStruct; import org.apache.atlas.typesystem.ITypedReferenceableInstance; @@ -117,7 +118,7 @@ public class GraphBackedRepositorySoftDeleteTest extends GraphBackedMetadataRepo @Override protected void assertVerticesDeleted(List<AtlasVertex> vertices) { for (AtlasVertex vertex : vertices) { - assertEquals(GraphHelper.getSingleValuedProperty(vertex, Constants.STATE_PROPERTY_KEY, String.class), Id.EntityState.DELETED.name()); + assertEquals(AtlasGraphUtilsV1.getEncodedProperty(vertex, Constants.STATE_PROPERTY_KEY, String.class), Id.EntityState.DELETED.name()); } } http://git-wip-us.apache.org/repos/asf/atlas/blob/250d9321/repository/src/test/java/org/apache/atlas/repository/graph/GraphHelperTest.java ---------------------------------------------------------------------- diff --git a/repository/src/test/java/org/apache/atlas/repository/graph/GraphHelperTest.java b/repository/src/test/java/org/apache/atlas/repository/graph/GraphHelperTest.java index e64c2c8..a99de7f 100644 --- a/repository/src/test/java/org/apache/atlas/repository/graph/GraphHelperTest.java +++ b/repository/src/test/java/org/apache/atlas/repository/graph/GraphHelperTest.java @@ -25,6 +25,7 @@ import org.apache.atlas.repository.graph.GraphHelper.VertexInfo; import org.apache.atlas.repository.graphdb.AtlasEdge; import org.apache.atlas.repository.graphdb.AtlasGraph; import org.apache.atlas.repository.graphdb.AtlasVertex; +import org.apache.atlas.repository.store.graph.v1.AtlasGraphUtilsV1; import org.apache.atlas.services.MetadataService; import org.apache.atlas.type.AtlasTypeRegistry; import org.apache.atlas.typesystem.ITypedReferenceableInstance; @@ -174,10 +175,10 @@ public class GraphHelperTest { @Test(dataProvider = "encodeDecodeTestData") public void testEncodeDecode(String str, String expectedEncodedStr) throws Exception { - String encodedStr = GraphHelper.encodePropertyKey(str); + String encodedStr = AtlasGraphUtilsV1.encodePropertyKey(str); assertEquals(encodedStr, expectedEncodedStr); - String decodedStr = GraphHelper.decodePropertyKey(encodedStr); + String decodedStr = AtlasGraphUtilsV1.decodePropertyKey(encodedStr); assertEquals(decodedStr, str); } http://git-wip-us.apache.org/repos/asf/atlas/blob/250d9321/repository/src/test/java/org/apache/atlas/repository/store/graph/v1/AtlasDeleteHandlerV1Test.java ---------------------------------------------------------------------- diff --git a/repository/src/test/java/org/apache/atlas/repository/store/graph/v1/AtlasDeleteHandlerV1Test.java b/repository/src/test/java/org/apache/atlas/repository/store/graph/v1/AtlasDeleteHandlerV1Test.java index 575bb9e..0f082dc 100644 --- a/repository/src/test/java/org/apache/atlas/repository/store/graph/v1/AtlasDeleteHandlerV1Test.java +++ b/repository/src/test/java/org/apache/atlas/repository/store/graph/v1/AtlasDeleteHandlerV1Test.java @@ -347,10 +347,10 @@ public abstract class AtlasDeleteHandlerV1Test { ITypedReferenceableInstance max = metadataService.getEntityDefinition(maxEmployeeCreated.getGuid()); String maxGuid = max.getId()._getId(); AtlasVertex vertex = GraphHelper.getInstance().getVertexForGUID(maxGuid); - Long creationTimestamp = GraphHelper.getSingleValuedProperty(vertex, Constants.TIMESTAMP_PROPERTY_KEY, Long.class); + Long creationTimestamp = AtlasGraphUtilsV1.getEncodedProperty(vertex, Constants.TIMESTAMP_PROPERTY_KEY, Long.class); Assert.assertNotNull(creationTimestamp); - Long modificationTimestampPreUpdate = GraphHelper.getSingleValuedProperty(vertex, Constants.MODIFICATION_TIMESTAMP_PROPERTY_KEY, Long.class); + Long modificationTimestampPreUpdate = AtlasGraphUtilsV1.getEncodedProperty(vertex, Constants.MODIFICATION_TIMESTAMP_PROPERTY_KEY, Long.class); Assert.assertNotNull(modificationTimestampPreUpdate); AtlasEntity maxEmployee = getEmployeeByName(hrDept, "Max"); @@ -371,7 +371,7 @@ public abstract class AtlasDeleteHandlerV1Test { // Verify modification timestamp was updated. vertex = GraphHelper.getInstance().getVertexForGUID(maxGuid); - Long modificationTimestampPostUpdate = GraphHelper.getSingleValuedProperty(vertex, Constants.MODIFICATION_TIMESTAMP_PROPERTY_KEY, Long.class); + Long modificationTimestampPostUpdate = AtlasGraphUtilsV1.getEncodedProperty(vertex, Constants.MODIFICATION_TIMESTAMP_PROPERTY_KEY, Long.class); Assert.assertNotNull(modificationTimestampPostUpdate); Assert.assertTrue(creationTimestamp < modificationTimestampPostUpdate); @@ -389,7 +389,7 @@ public abstract class AtlasDeleteHandlerV1Test { // Verify modification timestamp was updated. vertex = GraphHelper.getInstance().getVertexForGUID(maxGuid); - Long modificationTimestampPost2ndUpdate = GraphHelper.getSingleValuedProperty(vertex, Constants.MODIFICATION_TIMESTAMP_PROPERTY_KEY, Long.class); + Long modificationTimestampPost2ndUpdate = AtlasGraphUtilsV1.getEncodedProperty(vertex, Constants.MODIFICATION_TIMESTAMP_PROPERTY_KEY, Long.class); Assert.assertNotNull(modificationTimestampPost2ndUpdate); Assert.assertTrue(modificationTimestampPostUpdate < modificationTimestampPost2ndUpdate); http://git-wip-us.apache.org/repos/asf/atlas/blob/250d9321/repository/src/test/java/org/apache/atlas/repository/store/graph/v1/SoftDeleteHandlerV1Test.java ---------------------------------------------------------------------- diff --git a/repository/src/test/java/org/apache/atlas/repository/store/graph/v1/SoftDeleteHandlerV1Test.java b/repository/src/test/java/org/apache/atlas/repository/store/graph/v1/SoftDeleteHandlerV1Test.java index 3f1ed03..ddef193 100644 --- a/repository/src/test/java/org/apache/atlas/repository/store/graph/v1/SoftDeleteHandlerV1Test.java +++ b/repository/src/test/java/org/apache/atlas/repository/store/graph/v1/SoftDeleteHandlerV1Test.java @@ -209,7 +209,7 @@ public class SoftDeleteHandlerV1Test extends AtlasDeleteHandlerV1Test { @Override protected void assertVerticesDeleted(List<AtlasVertex> vertices) { for (AtlasVertex vertex : vertices) { - assertEquals(GraphHelper.getSingleValuedProperty(vertex, Constants.STATE_PROPERTY_KEY, String.class), Id.EntityState.DELETED.name()); + assertEquals(AtlasGraphUtilsV1.getEncodedProperty(vertex, Constants.STATE_PROPERTY_KEY, String.class), Id.EntityState.DELETED.name()); } } }
