incubator-unomi git commit: UNOMI-118 : Surfers overwrite test, profile import

2017-08-13 Thread amidani 
Repository: incubator-unomi
Updated Branches:
  refs/heads/master a8de6e1f7 -> 2c32e4f5d


UNOMI-118 : Surfers overwrite test, profile import


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

Branch: refs/heads/master
Commit: 2c32e4f5dfca5709eb13e5deb7c64df48e027d8e
Parents: a8de6e1
Author: Abdelkader Midani 
Authored: Mon Aug 14 02:39:57 2017 +0200
Committer: Abdelkader Midani 
Committed: Mon Aug 14 02:39:57 2017 +0200

--
 .../java/org/apache/unomi/itests/AllITs.java|   1 +
 .../java/org/apache/unomi/itests/BaseIT.java|  10 +-
 .../unomi/itests/ProfileImportBasicIT.java  |   2 +-
 .../unomi/itests/ProfileImportRankingIT.java|  14 +-
 .../itests/ProfileImportSurfersDeleteIT.java|  10 +-
 .../unomi/itests/ProfileImportSurfersIT.java|   2 +-
 .../itests/ProfileImportSurfersOverwriteIT.java | 154 +++
 .../test/resources/3-surfers-delete-test.csv|  37 -
 .../test/resources/3-surfers-overwrite-test.csv |  37 +
 itests/src/test/resources/4-ranking-test.csv|  26 
 .../test/resources/4-surfers-delete-test.csv|  37 +
 itests/src/test/resources/5-ranking-test.csv|  26 
 12 files changed, 275 insertions(+), 81 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/2c32e4f5/itests/src/test/java/org/apache/unomi/itests/AllITs.java
--
diff --git a/itests/src/test/java/org/apache/unomi/itests/AllITs.java 
b/itests/src/test/java/org/apache/unomi/itests/AllITs.java
index 3673289..8251816 100644
--- a/itests/src/test/java/org/apache/unomi/itests/AllITs.java
+++ b/itests/src/test/java/org/apache/unomi/itests/AllITs.java
@@ -35,6 +35,7 @@ import org.junit.runners.Suite.SuiteClasses;
 ProfileServiceIT.class,
 ProfileImportBasicIT.class,
 ProfileImportSurfersIT.class,
+ProfileImportSurfersOverwriteIT.class,
 ProfileImportSurfersDeleteIT.class,
 ProfileImportRankingIT.class
 })

http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/2c32e4f5/itests/src/test/java/org/apache/unomi/itests/BaseIT.java
--
diff --git a/itests/src/test/java/org/apache/unomi/itests/BaseIT.java 
b/itests/src/test/java/org/apache/unomi/itests/BaseIT.java
index 8f70f2f..ae43a60 100644
--- a/itests/src/test/java/org/apache/unomi/itests/BaseIT.java
+++ b/itests/src/test/java/org/apache/unomi/itests/BaseIT.java
@@ -99,10 +99,12 @@ public abstract class BaseIT {
 "src/test/resources/1-basic-test.csv")),
 
replaceConfigurationFile("data/tmp/recurrent_import/2-surfers-test.csv", new 
File(
 "src/test/resources/2-surfers-test.csv")),
-
replaceConfigurationFile("data/tmp/recurrent_import/3-surfers-delete-test.csv", 
new File(
-"src/test/resources/3-surfers-delete-test.csv")),
-
replaceConfigurationFile("data/tmp/recurrent_import/4-ranking-test.csv", new 
File(
-"src/test/resources/4-ranking-test.csv")),
+
replaceConfigurationFile("data/tmp/recurrent_import/3-surfers-overwrite-test.csv",
 new File(
+"src/test/resources/3-surfers-overwrite-test.csv")),
+
replaceConfigurationFile("data/tmp/recurrent_import/4-surfers-delete-test.csv", 
new File(
+"src/test/resources/4-surfers-delete-test.csv")),
+
replaceConfigurationFile("data/tmp/recurrent_import/5-ranking-test.csv", new 
File(
+"src/test/resources/5-ranking-test.csv")),
 keepRuntimeFolder(),
 configureConsole().ignoreLocalConsole(),
 logLevel(LogLevel.INFO),

http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/2c32e4f5/itests/src/test/java/org/apache/unomi/itests/ProfileImportBasicIT.java
--
diff --git 
a/itests/src/test/java/org/apache/unomi/itests/ProfileImportBasicIT.java 
b/itests/src/test/java/org/apache/unomi/itests/ProfileImportBasicIT.java
index a147029..c51f102 100644
--- a/itests/src/test/java/org/apache/unomi/itests/ProfileImportBasicIT.java
+++ b/itests/src/test/java/org/apache/unomi/itests/ProfileImportBasicIT.java
@@ -86,7 +86,7 @@ public class ProfileImportBasicIT extends BaseIT {
 }
 
 @Test
-public void testImport1Basic() throws IOException, InterruptedException {
+public void testImportBasic()

incubator-unomi git commit: UNOMI-118 : Ranking test, profile import

2017-08-13 Thread amidani 
Repository: incubator-unomi
Updated Branches:
  refs/heads/master 777b13e95 -> a8de6e1f7


UNOMI-118 : Ranking test, profile import


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

Branch: refs/heads/master
Commit: a8de6e1f73c05229a27fd82aa6e340d852c84a63
Parents: 777b13e
Author: Abdelkader Midani 
Authored: Mon Aug 14 01:18:49 2017 +0200
Committer: Abdelkader Midani 
Committed: Mon Aug 14 01:18:49 2017 +0200

--
 .../services/ProfileImportServiceImpl.java  |  69 +++
 .../java/org/apache/unomi/itests/AllITs.java|   3 +-
 .../java/org/apache/unomi/itests/BaseIT.java|   2 +
 .../unomi/itests/ProfileImportRankingIT.java| 180 +++
 .../itests/ProfileImportSurfersDeleteIT.java|   6 +-
 .../unomi/itests/ProfileImportSurfersIT.java|   6 +-
 itests/src/test/resources/4-ranking-test.csv|  26 +++
 7 files changed, 253 insertions(+), 39 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/a8de6e1f/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 b7ab45a..4ca2a09 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
@@ -34,43 +34,48 @@ public class ProfileImportServiceImpl extends 
AbstractCustomServiceImpl implemen
 private static final Logger logger = 
LoggerFactory.getLogger(ProfileImportServiceImpl.class.getName());
 
 public boolean saveMergeDeleteImportedProfile(ProfileToImport 
profileToImport) throws InvocationTargetException, IllegalAccessException {
-logger.debug("Importing profile with ID : {}", 
profileToImport.getItemId());
+logger.info("Importing profile with ID : {}", 
profileToImport.getItemId());
 Profile existingProfile = new Profile();
-List existingProfiles = 
persistenceService.query("properties." + profileToImport.getMergingProperty(), 
profileToImport.getProperties().get(profileToImport.getMergingProperty()).toString(),
 null, Profile.class);
-logger.debug("Query existing profile with mergingProperty: {}. Found: 
{}", profileToImport.getMergingProperty(), existingProfiles.size());
+
if(profileToImport.getProperties().get(profileToImport.getMergingProperty()) != 
null) {
+List existingProfiles = 
persistenceService.query("properties." + profileToImport.getMergingProperty(), 
profileToImport.getProperties().get(profileToImport.getMergingProperty()).toString(),
 null, Profile.class);
+logger.info("Query existing profile with mergingProperty: {}. 
Found: {}", profileToImport.getMergingProperty(), existingProfiles.size());
 
-//Profile already exist, and import config allow to overwrite profiles
-if (existingProfiles.size() == 1) {
-existingProfile = existingProfiles.get(0);
-if (profileToImport.isProfileToDelete()) {
-logger.debug("Profile is to delete!");
-persistenceService.remove(existingProfile.getItemId(), 
Profile.class);
-return true;
-}
-List propertiesToOverwrite = 
profileToImport.getPropertiesToOverwrite();
-if (profileToImport.isOverwriteExistingProfiles() && 
propertiesToOverwrite != null && propertiesToOverwrite.size() > 0) { // We 
overwrite only properties marked to overwrite
-logger.debug("Properties to overwrite: {}", 
propertiesToOverwrite);
-for (String propName : propertiesToOverwrite) {
-existingProfile.getProperties().put(propName, 
profileToImport.getProperties().get(propName));
+//Profile already exist, and import config allow to overwrite 
profiles
+if (existingProfiles.size() == 1) {
+existingProfile = existingProfiles.get(0);
+if (profileToImport.isProfileToDelete()) {
+logger.info("Profile is to delete!");
+persistenceService.remove(existingProfile.getItemId(), 
Profile.class);
+return true;
+}
+List propertiesToOverwrite =