Repository: atlas Updated Branches: refs/heads/branch-0.8 5c3afa68b -> ccd417abc
ATLAS-2934: utility to detect and repair incorrect entity state - #2 Project: http://git-wip-us.apache.org/repos/asf/atlas/repo Commit: http://git-wip-us.apache.org/repos/asf/atlas/commit/ccd417ab Tree: http://git-wip-us.apache.org/repos/asf/atlas/tree/ccd417ab Diff: http://git-wip-us.apache.org/repos/asf/atlas/diff/ccd417ab Branch: refs/heads/branch-0.8 Commit: ccd417abc82485769982169f0b17c53070b7e0bc Parents: 5c3afa6 Author: Madhan Neethiraj <mad...@apache.org> Authored: Thu Oct 25 10:03:35 2018 -0700 Committer: Madhan Neethiraj <mad...@apache.org> Committed: Thu Oct 25 10:47:03 2018 -0700 ---------------------------------------------------------------------- .../store/graph/v1/EntityStateChecker.java | 33 ++++++++++---------- 1 file changed, 17 insertions(+), 16 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/atlas/blob/ccd417ab/repository/src/main/java/org/apache/atlas/repository/store/graph/v1/EntityStateChecker.java ---------------------------------------------------------------------- diff --git a/repository/src/main/java/org/apache/atlas/repository/store/graph/v1/EntityStateChecker.java b/repository/src/main/java/org/apache/atlas/repository/store/graph/v1/EntityStateChecker.java index 3f87f56..dd30969 100644 --- a/repository/src/main/java/org/apache/atlas/repository/store/graph/v1/EntityStateChecker.java +++ b/repository/src/main/java/org/apache/atlas/repository/store/graph/v1/EntityStateChecker.java @@ -42,6 +42,7 @@ import org.springframework.stereotype.Component; import javax.inject.Inject; import java.util.ArrayList; import java.util.Collection; +import java.util.Collections; import java.util.HashMap; import java.util.Iterator; import java.util.List; @@ -233,30 +234,30 @@ public final class EntityStateChecker { } } + if (traitVertexNames == null) { + traitVertexNames = Collections.emptyList(); + } + List<String> traitNamesToRemove = null; List<String> traitNamesToAdd = null; - if (traitNames != null) { - for (String traitName : traitNames) { - if (traitVertexNames == null || !traitVertexNames.contains(traitName)) { - if (traitNamesToRemove == null) { - traitNamesToRemove = new ArrayList<>(); - } - - traitNamesToRemove.add(traitName); + for (String traitName : traitNames) { + if (!traitVertexNames.contains(traitName)) { + if (traitNamesToRemove == null) { + traitNamesToRemove = new ArrayList<>(); } + + traitNamesToRemove.add(traitName); } } - if (traitVertexNames != null) { - for (String traitVertexName : traitVertexNames) { - if (traitNames == null || !traitNames.contains(traitVertexName)) { - if (traitNamesToAdd == null) { - traitNamesToAdd = new ArrayList<>(); - } - - traitNamesToAdd.add(traitVertexName); + for (String traitVertexName : traitVertexNames) { + if (!traitNames.contains(traitVertexName)) { + if (traitNamesToAdd == null) { + traitNamesToAdd = new ArrayList<>(); } + + traitNamesToAdd.add(traitVertexName); } }
