You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@unomi.apache.org by dr...@apache.org on 2017/11/02 13:54:43 UTC
[2/9] incubator-unomi git commit: UNOMI-129 : review
UNOMI-129 : review
Project: http://git-wip-us.apache.org/repos/asf/incubator-unomi/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-unomi/commit/728296e6
Tree: http://git-wip-us.apache.org/repos/asf/incubator-unomi/tree/728296e6
Diff: http://git-wip-us.apache.org/repos/asf/incubator-unomi/diff/728296e6
Branch: refs/heads/scores-filters
Commit: 728296e6a015274a33a271210a0381859689eba5
Parents: d8df65f
Author: Abdelkader Midani <am...@apache.org>
Authored: Tue Oct 31 11:15:30 2017 +0100
Committer: Abdelkader Midani <am...@apache.org>
Committed: Tue Oct 31 11:15:30 2017 +0100
----------------------------------------------------------------------
.../actions/UpdatePropertiesAction.java | 22 +++-----------------
1 file changed, 3 insertions(+), 19 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/728296e6/plugins/baseplugin/src/main/java/org/apache/unomi/plugins/baseplugin/actions/UpdatePropertiesAction.java
----------------------------------------------------------------------
diff --git a/plugins/baseplugin/src/main/java/org/apache/unomi/plugins/baseplugin/actions/UpdatePropertiesAction.java b/plugins/baseplugin/src/main/java/org/apache/unomi/plugins/baseplugin/actions/UpdatePropertiesAction.java
index 4c7e796..98d7408 100644
--- a/plugins/baseplugin/src/main/java/org/apache/unomi/plugins/baseplugin/actions/UpdatePropertiesAction.java
+++ b/plugins/baseplugin/src/main/java/org/apache/unomi/plugins/baseplugin/actions/UpdatePropertiesAction.java
@@ -37,13 +37,9 @@ import java.util.Map;
public class UpdatePropertiesAction implements ActionExecutor {
- public static final String PROPS_TO_ADD = "propertiesToAdd";
- public static final String PROPS_TO_UPDATE = "propertiesToUpdate";
- public static final String PROPS_TO_DELETE = "propertiesToDelete";
-
- public static final String SYS_PROPS_TO_ADD = "systemPropertiesToAdd";
- public static final String SYS_PROPS_TO_UPDATE = "systemPropertiesToUpdate";
- public static final String SYS_PROPS_TO_DELETE = "systemPropertiesToDelete";
+ public static final String PROPS_TO_ADD = "add";
+ public static final String PROPS_TO_UPDATE = "update";
+ public static final String PROPS_TO_DELETE = "delete";
public static final String TARGET_ID_KEY = "targetId";
public static final String TARGET_TYPE_KEY = "targetType";
@@ -73,12 +69,8 @@ public class UpdatePropertiesAction implements ActionExecutor {
boolean isProfileOrPersonaUpdated = false;
Map<String, Object> propsToAdd = (HashMap<String, Object>) event.getProperties().get(PROPS_TO_ADD);
- HashMap<String, Object> sysPropsToAdd = (HashMap<String, Object>) event.getProperties().get(SYS_PROPS_TO_ADD);
if (propsToAdd != null) {
- if(sysPropsToAdd != null) {
- propsToAdd.putAll(sysPropsToAdd);
- }
for (String prop : propsToAdd.keySet()) {
PropertyType propType = null;
if (prop.startsWith("properties.")) {
@@ -93,11 +85,7 @@ public class UpdatePropertiesAction implements ActionExecutor {
}
Map<String, Object> propsToUpdate = (HashMap<String, Object>) event.getProperties().get(PROPS_TO_UPDATE);
- Map<String, Object> sysPropsToUpdate = (HashMap<String, Object>) event.getProperties().get(SYS_PROPS_TO_UPDATE);
if (propsToUpdate != null) {
- if (sysPropsToUpdate != null) {
- propsToUpdate.putAll(sysPropsToUpdate);
- }
for (String prop : propsToUpdate.keySet()) {
PropertyType propType = null;
if (prop.startsWith("properties.")) {
@@ -112,11 +100,7 @@ public class UpdatePropertiesAction implements ActionExecutor {
}
List<String> propsToDelete = (List<String>) event.getProperties().get(PROPS_TO_DELETE);
- List<String> sysPropsToDelete = (List<String>) event.getProperties().get(SYS_PROPS_TO_DELETE);
if (propsToDelete != null) {
- if (sysPropsToDelete != null) {
- propsToDelete.addAll(sysPropsToDelete);
- }
for (String prop : propsToDelete) {
isProfileOrPersonaUpdated |= PropertyHelper.setProperty(target, prop, null, "remove");
}