[unomi] branch unomi-1.5.x updated: Fix unstable integration tests

[shuber]

This is an automated email from the ASF dual-hosted git repository.

shuber pushed a commit to branch unomi-1.5.x
in repository https://gitbox.apache.org/repos/asf/unomi.git


The following commit(s) were added to refs/heads/unomi-1.5.x by this push:
     new 3aa35b2  Fix unstable integration tests
3aa35b2 is described below

commit 3aa35b2a06e3c0356f04f4abddd8b71378b8612f
Author: Serge Huber <shu...@apache.org>
AuthorDate: Wed May 13 18:56:30 2020 +0200

    Fix unstable integration tests
---
 .../router/core/processor/LineSplitProcessor.java     | 19 +++++++------------
 .../route/ProfileImportFromSourceRouteBuilder.java    |  3 +--
 .../core/route/ProfileImportOneShotRouteBuilder.java  |  2 +-
 3 files changed, 9 insertions(+), 15 deletions(-)

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 4b6c246..289ae39 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
@@ -33,10 +33,7 @@ import 
org.apache.unomi.router.api.exceptions.BadProfileDataFormatException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.UUID;
+import java.util.*;
 
 /**
  * Created by amidani on 29/12/2016.
@@ -56,7 +53,7 @@ public class LineSplitProcessor implements Processor {
     private String multiValueSeparator;
     private String multiValueDelimiter;
 
-    private ProfileService profileService;
+    private Collection<PropertyType> profilePropertyTypes;
 
     @Override
     public void process(Exchange exchange) throws Exception {
@@ -103,7 +100,7 @@ public class LineSplitProcessor implements Processor {
             logger.debug("$$$$ : LineSplitProcessor : MAPPING : " + 
fieldsMapping.keySet());
             Map<String, Object> properties = new HashMap<>();
             for (String fieldMappingKey : fieldsMapping.keySet()) {
-                PropertyType propertyType = 
RouterUtils.getPropertyTypeById(profileService.getTargetPropertyTypes("profiles"),
 fieldMappingKey);
+                PropertyType propertyType = 
RouterUtils.getPropertyTypeById(profilePropertyTypes, fieldMappingKey);
 
                 if (fieldMappingKey != null && 
fieldsMapping.get(fieldMappingKey) != null && profileData != null && 
profileData[fieldsMapping.get(fieldMappingKey)] != null) {
                     logger.debug("$$$$ : LineSplitProcessor : PropType value : 
{}", profileData[fieldsMapping.get(fieldMappingKey)].trim());
@@ -237,12 +234,10 @@ public class LineSplitProcessor implements Processor {
     }
 
     /**
-     * Sets the Profile service.
-     *
-     * @param profileService Profile service
+     * Sets the profile property types to use for the field mappings
+     * @param profilePropertyTypes the collection of property types to use
      */
-    public void setProfileService(ProfileService profileService) {
-        this.profileService = profileService;
+    public void setProfilePropertyTypes(Collection<PropertyType> 
profilePropertyTypes) {
+        this.profilePropertyTypes = profilePropertyTypes;
     }
-
 }
diff --git 
a/extensions/router/router-core/src/main/java/org/apache/unomi/router/core/route/ProfileImportFromSourceRouteBuilder.java
 
b/extensions/router/router-core/src/main/java/org/apache/unomi/router/core/route/ProfileImportFromSourceRouteBuilder.java
index 058cba6..8c28cae 100644
--- 
a/extensions/router/router-core/src/main/java/org/apache/unomi/router/core/route/ProfileImportFromSourceRouteBuilder.java
+++ 
b/extensions/router/router-core/src/main/java/org/apache/unomi/router/core/route/ProfileImportFromSourceRouteBuilder.java
@@ -89,8 +89,7 @@ public class ProfileImportFromSourceRouteBuilder extends 
RouterAbstractRouteBuil
                 
lineSplitProcessor.setHasDeleteColumn(importConfiguration.isHasDeleteColumn());
                 
lineSplitProcessor.setMultiValueDelimiter(importConfiguration.getMultiValueDelimiter());
                 
lineSplitProcessor.setMultiValueSeparator(importConfiguration.getMultiValueSeparator());
-
-                lineSplitProcessor.setProfileService(profileService);
+                
lineSplitProcessor.setProfilePropertyTypes(profileService.getTargetPropertyTypes("profiles"));
 
                 String endpoint = (String) 
importConfiguration.getProperties().get("source");
                 endpoint += "&moveFailed=.error";
diff --git 
a/extensions/router/router-core/src/main/java/org/apache/unomi/router/core/route/ProfileImportOneShotRouteBuilder.java
 
b/extensions/router/router-core/src/main/java/org/apache/unomi/router/core/route/ProfileImportOneShotRouteBuilder.java
index 99e53e6..5b4d1e2 100644
--- 
a/extensions/router/router-core/src/main/java/org/apache/unomi/router/core/route/ProfileImportOneShotRouteBuilder.java
+++ 
b/extensions/router/router-core/src/main/java/org/apache/unomi/router/core/route/ProfileImportOneShotRouteBuilder.java
@@ -62,7 +62,7 @@ public class ProfileImportOneShotRouteBuilder extends 
RouterAbstractRouteBuilder
         }
 
         LineSplitProcessor lineSplitProcessor = new LineSplitProcessor();
-        lineSplitProcessor.setProfileService(profileService);
+        
lineSplitProcessor.setProfilePropertyTypes(profileService.getTargetPropertyTypes("profiles"));
 
         ProcessorDefinition prDef = from("file://" + uploadDir + 
"?moveFailed=.error&include=.*.csv&consumer.delay=1m")
                 .routeId(RouterConstants.IMPORT_ONESHOT_ROUTE_ID)