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 2017/11/12 22:40:13 UTC
[1/2] atlas git commit: ATLAS-1836: fixed incorrect json in Area0
model
Repository: atlas
Updated Branches:
refs/heads/master 435fe3fba -> 6a1c4f4df
ATLAS-1836: fixed incorrect json in Area0 model
Project: http://git-wip-us.apache.org/repos/asf/atlas/repo
Commit: http://git-wip-us.apache.org/repos/asf/atlas/commit/41e5404f
Tree: http://git-wip-us.apache.org/repos/asf/atlas/tree/41e5404f
Diff: http://git-wip-us.apache.org/repos/asf/atlas/diff/41e5404f
Branch: refs/heads/master
Commit: 41e5404f96395c8fc3f1f8045ba921f283a49cce
Parents: 435fe3f
Author: Madhan Neethiraj <ma...@apache.org>
Authored: Sun Nov 12 14:37:40 2017 -0800
Committer: Madhan Neethiraj <ma...@apache.org>
Committed: Sun Nov 12 14:37:40 2017 -0800
----------------------------------------------------------------------
addons/models/0000-Area0/0020-PropertyFacets_model.json | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/atlas/blob/41e5404f/addons/models/0000-Area0/0020-PropertyFacets_model.json
----------------------------------------------------------------------
diff --git a/addons/models/0000-Area0/0020-PropertyFacets_model.json b/addons/models/0000-Area0/0020-PropertyFacets_model.json
index 0acdf48..fe92e26 100644
--- a/addons/models/0000-Area0/0020-PropertyFacets_model.json
+++ b/addons/models/0000-Area0/0020-PropertyFacets_model.json
@@ -70,7 +70,8 @@
"isIndexable": true,
"isOptional": true,
"isUnique": false
- },
+ }
+ ]
}
]
}
[2/2] atlas git commit: ATLAS-2251: fixed NPE in V1 to V2 entity
conversion
Posted by ma...@apache.org.
ATLAS-2251: fixed NPE in V1 to V2 entity conversion
Project: http://git-wip-us.apache.org/repos/asf/atlas/repo
Commit: http://git-wip-us.apache.org/repos/asf/atlas/commit/6a1c4f4d
Tree: http://git-wip-us.apache.org/repos/asf/atlas/tree/6a1c4f4d
Diff: http://git-wip-us.apache.org/repos/asf/atlas/diff/6a1c4f4d
Branch: refs/heads/master
Commit: 6a1c4f4df2b906673a8cedd6abbd20761fcfb183
Parents: 41e5404
Author: Madhan Neethiraj <ma...@apache.org>
Authored: Sun Nov 12 14:39:13 2017 -0800
Committer: Madhan Neethiraj <ma...@apache.org>
Committed: Sun Nov 12 14:39:13 2017 -0800
----------------------------------------------------------------------
.../converters/AtlasEntityFormatConverter.java | 12 ++++++++----
1 file changed, 8 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/atlas/blob/6a1c4f4d/repository/src/main/java/org/apache/atlas/repository/converters/AtlasEntityFormatConverter.java
----------------------------------------------------------------------
diff --git a/repository/src/main/java/org/apache/atlas/repository/converters/AtlasEntityFormatConverter.java b/repository/src/main/java/org/apache/atlas/repository/converters/AtlasEntityFormatConverter.java
index a529dc1..2229ece 100644
--- a/repository/src/main/java/org/apache/atlas/repository/converters/AtlasEntityFormatConverter.java
+++ b/repository/src/main/java/org/apache/atlas/repository/converters/AtlasEntityFormatConverter.java
@@ -66,10 +66,14 @@ public class AtlasEntityFormatConverter extends AtlasStructFormatConverter {
entity.setGuid(entRef.getId().getId());
entity.setStatus(convertState(entRef.getId().getState()));
- entity.setCreatedBy(entRef.getSystemAttributes().getCreatedBy());
- entity.setCreateTime(entRef.getSystemAttributes().getCreatedTime());
- entity.setUpdatedBy(entRef.getSystemAttributes().getModifiedBy());
- entity.setUpdateTime(entRef.getSystemAttributes().getModifiedTime());
+
+ if (entRef.getSystemAttributes() != null) {
+ entity.setCreatedBy(entRef.getSystemAttributes().getCreatedBy());
+ entity.setCreateTime(entRef.getSystemAttributes().getCreatedTime());
+ entity.setUpdatedBy(entRef.getSystemAttributes().getModifiedBy());
+ entity.setUpdateTime(entRef.getSystemAttributes().getModifiedTime());
+ }
+
entity.setVersion((long) entRef.getId().getVersion());
if (CollectionUtils.isNotEmpty(entRef.getTraitNames())) {