Repository: atlas Updated Branches: refs/heads/master 36656ea75 -> 84371bccc
ATLAS-2968: Update model files to include service-type for each entityDef - #2 Project: http://git-wip-us.apache.org/repos/asf/atlas/repo Commit: http://git-wip-us.apache.org/repos/asf/atlas/commit/84371bcc Tree: http://git-wip-us.apache.org/repos/asf/atlas/tree/84371bcc Diff: http://git-wip-us.apache.org/repos/asf/atlas/diff/84371bcc Branch: refs/heads/master Commit: 84371bccc6bcfe8dec61508b4d52e28796d85370 Parents: 36656ea Author: Madhan Neethiraj <mad...@apache.org> Authored: Mon Nov 19 15:04:32 2018 -0800 Committer: Madhan Neethiraj <mad...@apache.org> Committed: Mon Nov 19 15:27:08 2018 -0800 ---------------------------------------------------------------------- .../repository/store/graph/v2/AtlasTypeDefGraphStoreV2.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/atlas/blob/84371bcc/repository/src/main/java/org/apache/atlas/repository/store/graph/v2/AtlasTypeDefGraphStoreV2.java ---------------------------------------------------------------------- diff --git a/repository/src/main/java/org/apache/atlas/repository/store/graph/v2/AtlasTypeDefGraphStoreV2.java b/repository/src/main/java/org/apache/atlas/repository/store/graph/v2/AtlasTypeDefGraphStoreV2.java index 418ce49..c6cf2a0 100644 --- a/repository/src/main/java/org/apache/atlas/repository/store/graph/v2/AtlasTypeDefGraphStoreV2.java +++ b/repository/src/main/java/org/apache/atlas/repository/store/graph/v2/AtlasTypeDefGraphStoreV2.java @@ -184,7 +184,11 @@ public class AtlasTypeDefGraphStoreV2 extends AtlasTypeDefGraphStore { ret.setProperty(Constants.TYPENAME_PROPERTY_KEY, typeDef.getName()); ret.setProperty(Constants.TYPEDESCRIPTION_PROPERTY_KEY, StringUtils.isNotBlank(typeDef.getDescription()) ? typeDef.getDescription() : typeDef.getName()); - ret.setProperty(Constants.TYPESERVICETYPE_PROPERTY_KEY, typeDef.getServiceType()); + + if (StringUtils.isNotEmpty(typeDef.getServiceType())) { + ret.setProperty(Constants.TYPESERVICETYPE_PROPERTY_KEY, typeDef.getServiceType()); + } + ret.setProperty(Constants.TYPEVERSION_PROPERTY_KEY, typeDef.getTypeVersion()); ret.setProperty(Constants.GUID_PROPERTY_KEY, typeDef.getGuid()); ret.setProperty(Constants.CREATED_BY_KEY, getCurrentUser());