Repository: incubator-unomi Updated Branches: refs/heads/master d3b1e950d -> 26ce3c174
UNOMI-217: improve namings Project: http://git-wip-us.apache.org/repos/asf/incubator-unomi/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-unomi/commit/26ce3c17 Tree: http://git-wip-us.apache.org/repos/asf/incubator-unomi/tree/26ce3c17 Diff: http://git-wip-us.apache.org/repos/asf/incubator-unomi/diff/26ce3c17 Branch: refs/heads/master Commit: 26ce3c1746632ff2180f490e1f2b32b0e588af94 Parents: d3b1e95 Author: Kevan <ke...@jahia.com> Authored: Fri Jan 4 14:31:11 2019 +0100 Committer: Kevan <ke...@jahia.com> Committed: Fri Jan 4 14:31:11 2019 +0100 ---------------------------------------------------------------------- .../services/services/ProfileServiceImpl.java | 34 ++++++++++---------- 1 file changed, 17 insertions(+), 17 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/26ce3c17/services/src/main/java/org/apache/unomi/services/services/ProfileServiceImpl.java ---------------------------------------------------------------------- diff --git a/services/src/main/java/org/apache/unomi/services/services/ProfileServiceImpl.java b/services/src/main/java/org/apache/unomi/services/services/ProfileServiceImpl.java index 1e79c68..9f023e3 100644 --- a/services/src/main/java/org/apache/unomi/services/services/ProfileServiceImpl.java +++ b/services/src/main/java/org/apache/unomi/services/services/ProfileServiceImpl.java @@ -1016,38 +1016,38 @@ public class ProfileServiceImpl implements ProfileService, SynchronousBundleList return changed; } - private boolean mergeSystemProperties(Map<String, Object> targetProperties, Map<String, Object> toBeMergeProperties) { + private boolean mergeSystemProperties(Map<String, Object> targetProperties, Map<String, Object> sourceProperties) { boolean changed = false; - for (Map.Entry<String, Object> toBeMergeProperty : toBeMergeProperties.entrySet()) { - if (toBeMergeProperty.getValue() != null) { - if (!targetProperties.containsKey(toBeMergeProperty.getKey())) { - targetProperties.put(toBeMergeProperty.getKey(), toBeMergeProperty.getValue()); + for (Map.Entry<String, Object> sourceProperty : sourceProperties.entrySet()) { + if (sourceProperty.getValue() != null) { + if (!targetProperties.containsKey(sourceProperty.getKey())) { + targetProperties.put(sourceProperty.getKey(), sourceProperty.getValue()); changed = true; } else { - Object targetProperty = targetProperties.get(toBeMergeProperty.getKey()); + Object targetProperty = targetProperties.get(sourceProperty.getKey()); - if (targetProperty instanceof Map && toBeMergeProperty.getValue() instanceof Map) { + if (targetProperty instanceof Map && sourceProperty.getValue() instanceof Map) { // merge Maps like "goals", "campaigns" @SuppressWarnings("unchecked") - Map<String, Object> mapToBeMergeProp = (Map<String, Object>) toBeMergeProperty.getValue(); + Map<String, Object> mapSourceProp = (Map<String, Object>) sourceProperty.getValue(); @SuppressWarnings("unchecked") Map<String, Object> mapTargetProp = (Map<String, Object>) targetProperty; - for (Map.Entry<String, ?> mapToBeMergeEntry : mapToBeMergeProp.entrySet()) { - if (!mapTargetProp.containsKey(mapToBeMergeEntry.getKey())) { - mapTargetProp.put(mapToBeMergeEntry.getKey(), mapToBeMergeEntry.getValue()); + for (Map.Entry<String, ?> mapSourceEntry : mapSourceProp.entrySet()) { + if (!mapTargetProp.containsKey(mapSourceEntry.getKey())) { + mapTargetProp.put(mapSourceEntry.getKey(), mapSourceEntry.getValue()); changed = true; } } - } else if (targetProperty instanceof Collection && toBeMergeProperty.getValue() instanceof Collection) { + } else if (targetProperty instanceof Collection && sourceProperty.getValue() instanceof Collection) { // merge Collections like "lists" - Collection collectionToBeMerge = (Collection) toBeMergeProperty.getValue(); - Collection collectionTarget = (Collection) targetProperty; + Collection sourceCollection = (Collection) sourceProperty.getValue(); + Collection targetCollection = (Collection) targetProperty; - for (Object itemToBeMerge : collectionToBeMerge) { - if (!collectionTarget.contains(itemToBeMerge)) { + for (Object sourceItem : sourceCollection) { + if (!targetCollection.contains(sourceItem)) { try { - collectionTarget.add(itemToBeMerge); + targetCollection.add(sourceItem); changed = true; } catch (Exception e) { // may be Collection type issue
