incubator-unomi git commit: UNOMI-101 : Allow setting todelete column to true for unkown profiles

2017-07-26 Thread amidani 
Repository: incubator-unomi
Updated Branches:
  refs/heads/master 44b3e4a46 -> 4ee8adb1c


UNOMI-101 : Allow setting todelete column to true for unkown profiles


Project: http://git-wip-us.apache.org/repos/asf/incubator-unomi/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-unomi/commit/4ee8adb1
Tree: http://git-wip-us.apache.org/repos/asf/incubator-unomi/tree/4ee8adb1
Diff: http://git-wip-us.apache.org/repos/asf/incubator-unomi/diff/4ee8adb1

Branch: refs/heads/master
Commit: 4ee8adb1cd60936caca84fa7d39017a37fb20d34
Parents: 44b3e4a
Author: Abdelkader Midani 
Authored: Wed Jul 26 14:50:30 2017 +0200
Committer: Abdelkader Midani 
Committed: Wed Jul 26 14:50:30 2017 +0200

--
 .../org/apache/unomi/router/services/ProfileImportServiceImpl.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/4ee8adb1/extensions/router/router-service/src/main/java/org/apache/unomi/router/services/ProfileImportServiceImpl.java
--
diff --git 
a/extensions/router/router-service/src/main/java/org/apache/unomi/router/services/ProfileImportServiceImpl.java
 
b/extensions/router/router-service/src/main/java/org/apache/unomi/router/services/ProfileImportServiceImpl.java
index 63cfc56..e91ae7e 100644
--- 
a/extensions/router/router-service/src/main/java/org/apache/unomi/router/services/ProfileImportServiceImpl.java
+++ 
b/extensions/router/router-service/src/main/java/org/apache/unomi/router/services/ProfileImportServiceImpl.java
@@ -60,7 +60,7 @@ public class ProfileImportServiceImpl extends 
AbstractCustomServiceImpl implemen
 //update segments and scores
 existingProfile.setSegments(profileToImport.getSegments());
 existingProfile.setScores(profileToImport.getScores());
-} else if (existingProfiles.size() == 0) {
+} else if (existingProfiles.size() == 0 && 
!profileToImport.isProfileToDelete()) {
 logger.debug("New profile to add...");
 BeanUtils.copyProperties(existingProfile, profileToImport);
 } else {

incubator-unomi git commit: UNOMI-101 : Allow partial mapping

2017-07-26 Thread amidani 
Repository: incubator-unomi
Updated Branches:
  refs/heads/master 4e49d5c4f -> 44b3e4a46


UNOMI-101 : Allow partial mapping


Project: http://git-wip-us.apache.org/repos/asf/incubator-unomi/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-unomi/commit/44b3e4a4
Tree: http://git-wip-us.apache.org/repos/asf/incubator-unomi/tree/44b3e4a4
Diff: http://git-wip-us.apache.org/repos/asf/incubator-unomi/diff/44b3e4a4

Branch: refs/heads/master
Commit: 44b3e4a46f05118f0bfb05561f81ba7ed102b8ae
Parents: 4e49d5c
Author: Abdelkader Midani 
Authored: Wed Jul 26 09:51:51 2017 +0200
Committer: Abdelkader Midani 
Committed: Wed Jul 26 09:51:51 2017 +0200

--
 .../org/apache/unomi/router/core/processor/LineSplitProcessor.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/44b3e4a4/extensions/router/router-core/src/main/java/org/apache/unomi/router/core/processor/LineSplitProcessor.java
--
diff --git 
a/extensions/router/router-core/src/main/java/org/apache/unomi/router/core/processor/LineSplitProcessor.java
 
b/extensions/router/router-core/src/main/java/org/apache/unomi/router/core/processor/LineSplitProcessor.java
index 3dbbf13..9e0fb66 100644
--- 
a/extensions/router/router-core/src/main/java/org/apache/unomi/router/core/processor/LineSplitProcessor.java
+++ 
b/extensions/router/router-core/src/main/java/org/apache/unomi/router/core/processor/LineSplitProcessor.java
@@ -86,7 +86,7 @@ public class LineSplitProcessor implements Processor {
 profileToImport.setScope(RouterConstants.SYSTEM_SCOPE);
 
 if (profileData.length > 0 && StringUtils.isNotBlank(profileData[0])) {
-if (hasDeleteColumn && (fieldsMapping.size() != 
(profileData.length - 1))) {
+if (hasDeleteColumn && (fieldsMapping.size() > (profileData.length 
- 1))) {
 throw new BadProfileDataFormatException("The mapping does not 
match the number of column : line [" + ((Integer) 
exchange.getProperty("CamelSplitIndex") + 1) + "]", new 
Throwable("MAPPING_COLUMN_MATCH"));
 }
 Map properties = new HashMap<>();