Repository: incubator-unomi Updated Branches: refs/heads/master b62084681 -> 875b6eb54
UNOMI-102 : PropertyType validation get recently added propertyTypes Project: http://git-wip-us.apache.org/repos/asf/incubator-unomi/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-unomi/commit/875b6eb5 Tree: http://git-wip-us.apache.org/repos/asf/incubator-unomi/tree/875b6eb5 Diff: http://git-wip-us.apache.org/repos/asf/incubator-unomi/diff/875b6eb5 Branch: refs/heads/master Commit: 875b6eb54bb2b5d950eb8e4d30313ae9b0c00950 Parents: b620846 Author: Abdelkader Midani <amid...@apache.org> Authored: Thu Jul 13 16:31:12 2017 +0200 Committer: Abdelkader Midani <amid...@apache.org> Committed: Thu Jul 13 16:31:12 2017 +0200 ---------------------------------------------------------------------- .../ImportRouteCompletionProcessor.java | 8 +++--- .../core/processor/LineSplitProcessor.java | 26 +++++++++++--------- .../core/processor/UnomiStorageProcessor.java | 2 +- .../ProfileImportFromSourceRouteBuilder.java | 3 +-- .../route/ProfileImportOneShotRouteBuilder.java | 4 +-- .../route/ProfileImportToUnomiRouteBuilder.java | 2 +- 6 files changed, 24 insertions(+), 21 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/875b6eb5/extensions/router/router-core/src/main/java/org/apache/unomi/router/core/processor/ImportRouteCompletionProcessor.java ---------------------------------------------------------------------- diff --git a/extensions/router/router-core/src/main/java/org/apache/unomi/router/core/processor/ImportRouteCompletionProcessor.java b/extensions/router/router-core/src/main/java/org/apache/unomi/router/core/processor/ImportRouteCompletionProcessor.java index 325aec4..efefe6b 100644 --- a/extensions/router/router-core/src/main/java/org/apache/unomi/router/core/processor/ImportRouteCompletionProcessor.java +++ b/extensions/router/router-core/src/main/java/org/apache/unomi/router/core/processor/ImportRouteCompletionProcessor.java @@ -55,7 +55,7 @@ public class ImportRouteCompletionProcessor implements Processor { successCount++; } else if (line instanceof ImportLineError) { failureCount++; - if(errors.size() < execErrReportSize) { + if (errors.size() < execErrReportSize) { errors.add(((ImportLineError) line)); } } else { @@ -64,7 +64,7 @@ public class ImportRouteCompletionProcessor implements Processor { } Integer nbTotal = (Integer) exchange.getProperty("CamelSplitSize"); - if(importConfiguration.isHasHeader()) { + if (importConfiguration.isHasHeader()) { nbTotal--; } @@ -75,7 +75,7 @@ public class ImportRouteCompletionProcessor implements Processor { execution.put("failureCount", failureCount); execution.put("errors", errors); - importConfiguration = (ImportConfiguration) RouterUtils.addExecutionEntry(importConfiguration, execution,executionsHistorySize); + importConfiguration = (ImportConfiguration) RouterUtils.addExecutionEntry(importConfiguration, execution, executionsHistorySize); //Set running to false, route is complete if (failureCount > 0 && successCount > 0) { @@ -86,7 +86,7 @@ public class ImportRouteCompletionProcessor implements Processor { importConfiguration.setStatus(RouterConstants.CONFIG_STATUS_COMPLETE_SUCCESS); } importConfigurationService.save(importConfiguration); - logger.info("Processing route {} completed.", exchange.getFromRouteId()); + logger.info("Processing route {} completed. completion date: {}.", exchange.getFromRouteId(), new Date()); } public void setImportConfigurationService(ImportExportConfigurationService<ImportConfiguration> importConfigurationService) { http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/875b6eb5/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 df203e3..3dbbf13 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 @@ -22,6 +22,7 @@ import org.apache.camel.component.kafka.KafkaConstants; import org.apache.commons.lang3.BooleanUtils; import org.apache.commons.lang3.StringUtils; import org.apache.unomi.api.PropertyType; +import org.apache.unomi.api.services.ProfileService; import org.apache.unomi.router.api.ImportConfiguration; import org.apache.unomi.router.api.ProfileToImport; import org.apache.unomi.router.api.RouterConstants; @@ -30,7 +31,10 @@ import org.apache.unomi.router.core.exception.BadProfileDataFormatException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import java.util.*; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.UUID; /** * Created by amidani on 29/12/2016. @@ -50,7 +54,7 @@ public class LineSplitProcessor implements Processor { private String multiValueSeparator; private String multiValueDelimiter; - private Collection<PropertyType> propertiesDef; + private ProfileService profileService; @Override public void process(Exchange exchange) throws Exception { @@ -87,17 +91,17 @@ public class LineSplitProcessor implements Processor { } Map<String, Object> properties = new HashMap<>(); for (String fieldMappingKey : fieldsMapping.keySet()) { - PropertyType propertyType = RouterUtils.getPropertyTypeById(propertiesDef, fieldMappingKey); + PropertyType propertyType = RouterUtils.getPropertyTypeById(profileService.getAllPropertyTypes("profiles"), fieldMappingKey); if (profileData.length > fieldsMapping.get(fieldMappingKey)) { try { - if (propertyType.getValueTypeId().equals("string") || propertyType.getValueTypeId().equals("email")) { + if (propertyType.getValueTypeId().equals("string") || propertyType.getValueTypeId().equals("email")) { if (BooleanUtils.isTrue(propertyType.isMultivalued())) { String multivalueArray = profileData[fieldsMapping.get(fieldMappingKey)].trim(); - if(StringUtils.isNoneBlank(multiValueDelimiter) && multiValueDelimiter.length() == 2) { - multivalueArray = multivalueArray.replaceAll("\\"+multiValueDelimiter.charAt(0),"").replaceAll("\\"+multiValueDelimiter.charAt(1), ""); + if (StringUtils.isNoneBlank(multiValueDelimiter) && multiValueDelimiter.length() == 2) { + multivalueArray = multivalueArray.replaceAll("\\" + multiValueDelimiter.charAt(0), "").replaceAll("\\" + multiValueDelimiter.charAt(1), ""); } - String[] valuesArray = multivalueArray.split("\\"+multiValueSeparator); + String[] valuesArray = multivalueArray.split("\\" + multiValueSeparator); properties.put(fieldMappingKey, valuesArray); } else { properties.put(fieldMappingKey, profileData[fieldsMapping.get(fieldMappingKey)].trim()); @@ -193,12 +197,12 @@ public class LineSplitProcessor implements Processor { } /** - * Sets the Property definitions list. + * Sets the Profile service. * - * @param propertiesDef Property definitions list + * @param profileService Profile service */ - public void setPropertiesDef(Collection<PropertyType> propertiesDef) { - this.propertiesDef = propertiesDef; + public void setProfileService(ProfileService profileService) { + this.profileService = profileService; } } http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/875b6eb5/extensions/router/router-core/src/main/java/org/apache/unomi/router/core/processor/UnomiStorageProcessor.java ---------------------------------------------------------------------- diff --git a/extensions/router/router-core/src/main/java/org/apache/unomi/router/core/processor/UnomiStorageProcessor.java b/extensions/router/router-core/src/main/java/org/apache/unomi/router/core/processor/UnomiStorageProcessor.java index d5c1b22..94737b5 100644 --- a/extensions/router/router-core/src/main/java/org/apache/unomi/router/core/processor/UnomiStorageProcessor.java +++ b/extensions/router/router-core/src/main/java/org/apache/unomi/router/core/processor/UnomiStorageProcessor.java @@ -43,7 +43,7 @@ public class UnomiStorageProcessor implements Processor { ProfileToImport profileToImport = (ProfileToImport) message.getBody(); - if(!profileToImport.isProfileToDelete()) { + if (!profileToImport.isProfileToDelete()) { SegmentsAndScores segmentsAndScoringForProfile = segmentService.getSegmentsAndScoresForProfile(profileToImport); Set<String> segments = segmentsAndScoringForProfile.getSegments(); if (!segments.equals(profileToImport.getSegments())) { http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/875b6eb5/extensions/router/router-core/src/main/java/org/apache/unomi/router/core/route/ProfileImportFromSourceRouteBuilder.java ---------------------------------------------------------------------- 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 5e51c6d..13c3474 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 @@ -86,7 +86,7 @@ public class ProfileImportFromSourceRouteBuilder extends RouterAbstractRouteBuil lineSplitProcessor.setMultiValueDelimiter(importConfiguration.getMultiValueDelimiter()); lineSplitProcessor.setMultiValueSeparator(importConfiguration.getMultiValueSeparator()); - lineSplitProcessor.setPropertiesDef(profileService.getAllPropertyTypes("profiles")); + lineSplitProcessor.setProfileService(profileService); String endpoint = (String) importConfiguration.getProperties().get("source"); @@ -112,7 +112,6 @@ public class ProfileImportFromSourceRouteBuilder extends RouterAbstractRouteBuil .setHeader(RouterConstants.HEADER_CONFIG_TYPE, constant(configType)) .process(lineSplitProcessor) .log(LoggingLevel.DEBUG, "Split IDX ${exchangeProperty.CamelSplitIndex} record") - .to("log:org.apache.unomi.router?level=DEBUG") .marshal(jacksonDataFormat) .convertBodyTo(String.class); http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/875b6eb5/extensions/router/router-core/src/main/java/org/apache/unomi/router/core/route/ProfileImportOneShotRouteBuilder.java ---------------------------------------------------------------------- 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 0b60671..8a3702f 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 @@ -59,7 +59,7 @@ public class ProfileImportOneShotRouteBuilder extends RouterAbstractRouteBuilder } LineSplitProcessor lineSplitProcessor = new LineSplitProcessor(); - lineSplitProcessor.setPropertiesDef(profileService.getAllPropertyTypes("profiles")); + lineSplitProcessor.setProfileService(profileService); ProcessorDefinition prDef = from("file://" + uploadDir + "?include=.*.csv&consumer.delay=1m") .routeId(RouterConstants.IMPORT_ONESHOT_ROUTE_ID) @@ -68,7 +68,7 @@ public class ProfileImportOneShotRouteBuilder extends RouterAbstractRouteBuilder .split(bodyAs(String.class).tokenize("${in.header.importConfigOneShot.getLineSeparator}")) .setHeader(RouterConstants.HEADER_CONFIG_TYPE, constant(configType)) .process(lineSplitProcessor) - .to("log:org.apache.unomi.router?level=INFO") + .to("log:org.apache.unomi.router?level=DEBUG") .marshal(jacksonDataFormat) .convertBodyTo(String.class); if (RouterConstants.CONFIG_TYPE_KAFKA.equals(configType)) { http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/875b6eb5/extensions/router/router-core/src/main/java/org/apache/unomi/router/core/route/ProfileImportToUnomiRouteBuilder.java ---------------------------------------------------------------------- diff --git a/extensions/router/router-core/src/main/java/org/apache/unomi/router/core/route/ProfileImportToUnomiRouteBuilder.java b/extensions/router/router-core/src/main/java/org/apache/unomi/router/core/route/ProfileImportToUnomiRouteBuilder.java index 759dde4..9c5a876 100644 --- a/extensions/router/router-core/src/main/java/org/apache/unomi/router/core/route/ProfileImportToUnomiRouteBuilder.java +++ b/extensions/router/router-core/src/main/java/org/apache/unomi/router/core/route/ProfileImportToUnomiRouteBuilder.java @@ -64,7 +64,7 @@ public class ProfileImportToUnomiRouteBuilder extends RouterAbstractRouteBuilder .completionPredicate(exchangeProperty("CamelSplitComplete").isEqualTo("true")) .eagerCheckCompletion() .process(importRouteCompletionProcessor) - .to("log:org.apache.unomi.router?level=INFO"); + .to("log:org.apache.unomi.router?level=DEBUG"); } public void setUnomiStorageProcessor(UnomiStorageProcessor unomiStorageProcessor) {
