incubator-unomi git commit: UNOMI-102 : Line separator must be a char not a string

[amidani]

Repository: incubator-unomi
Updated Branches:
  refs/heads/master fde293249 -> bb96940da


UNOMI-102 : Line separator must be a char not a string


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

Branch: refs/heads/master
Commit: bb96940dabbd90481594f84774a06b16f0f402c7
Parents: fde2932
Author: Abdelkader Midani 
Authored: Thu Jul 6 17:40:22 2017 +0200
Committer: Abdelkader Midani 
Committed: Thu Jul 6 17:40:22 2017 +0200

--
 .../router/core/strategy/StringLinesAggregationStrategy.java  | 7 +--
 1 file changed, 5 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/bb96940d/extensions/router/router-core/src/main/java/org/apache/unomi/router/core/strategy/StringLinesAggregationStrategy.java
--
diff --git 
a/extensions/router/router-core/src/main/java/org/apache/unomi/router/core/strategy/StringLinesAggregationStrategy.java
 
b/extensions/router/router-core/src/main/java/org/apache/unomi/router/core/strategy/StringLinesAggregationStrategy.java
index 5a69001..d01859f 100644
--- 
a/extensions/router/router-core/src/main/java/org/apache/unomi/router/core/strategy/StringLinesAggregationStrategy.java
+++ 
b/extensions/router/router-core/src/main/java/org/apache/unomi/router/core/strategy/StringLinesAggregationStrategy.java
@@ -19,6 +19,7 @@ package org.apache.unomi.router.core.strategy;
 import org.apache.camel.Exchange;
 import org.apache.camel.processor.aggregate.AggregationStrategy;
 import org.apache.unomi.router.api.ExportConfiguration;
+import org.apache.unomi.router.api.RouterUtils;
 
 /**
  * Created by amidani on 29/06/2017.
@@ -29,9 +30,11 @@ public class StringLinesAggregationStrategy implements 
AggregationStrategy {
 Object newBody = newExchange.getIn().getBody(String.class);
 String lineSeparator = newExchange.getIn().getHeader("exportConfig", 
ExportConfiguration.class).getLineSeparator();
 if (oldExchange != null) {
-String fileContent = oldExchange.getIn().getBody(String.class);
+StringBuilder fileContent = new StringBuilder();
+fileContent.append(oldExchange.getIn().getBody(String.class));
+
fileContent.append(RouterUtils.getCharFromLineSeparator(lineSeparator));
+fileContent.append(newBody);
 
-fileContent += lineSeparator + newBody;
 oldExchange.getIn().setBody(fileContent);
 return oldExchange;
 } else {

incubator-unomi git commit: UNOMI-102 : Line separator must be a char not a string

[amidani]

Repository: incubator-unomi
Updated Branches:
  refs/heads/master be379f8ec -> fde293249


UNOMI-102 : Line separator must be a char not a string


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

Branch: refs/heads/master
Commit: fde2932497fdba2b2739b6b85da6e9582a27223a
Parents: be379f8
Author: Abdelkader Midani 
Authored: Thu Jul 6 15:00:59 2017 +0200
Committer: Abdelkader Midani 
Committed: Thu Jul 6 15:00:59 2017 +0200

--
 .../main/java/org/apache/unomi/router/api/RouterUtils.java  | 8 
 .../unomi/router/services/ProfileExportServiceImpl.java | 9 -
 2 files changed, 12 insertions(+), 5 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/fde29324/extensions/router/router-api/src/main/java/org/apache/unomi/router/api/RouterUtils.java
--
diff --git 
a/extensions/router/router-api/src/main/java/org/apache/unomi/router/api/RouterUtils.java
 
b/extensions/router/router-api/src/main/java/org/apache/unomi/router/api/RouterUtils.java
index ebfdabf..fc31883 100644
--- 
a/extensions/router/router-api/src/main/java/org/apache/unomi/router/api/RouterUtils.java
+++ 
b/extensions/router/router-api/src/main/java/org/apache/unomi/router/api/RouterUtils.java
@@ -39,4 +39,12 @@ public class RouterUtils {
 configuration.getExecutions().add(execution);
 return configuration;
 }
+
+public static char getCharFromLineSeparator(String lineSeparator) {
+char charLineSep = '\n';
+if("\r".equals(lineSeparator)) {
+charLineSep = '\r';
+}
+return charLineSep;
+}
 }

http://git-wip-us.apache.org/repos/asf/incubator-unomi/blob/fde29324/extensions/router/router-service/src/main/java/org/apache/unomi/router/services/ProfileExportServiceImpl.java
--
diff --git 
a/extensions/router/router-service/src/main/java/org/apache/unomi/router/services/ProfileExportServiceImpl.java
 
b/extensions/router/router-service/src/main/java/org/apache/unomi/router/services/ProfileExportServiceImpl.java
index 0713050..efed8c4 100644
--- 
a/extensions/router/router-service/src/main/java/org/apache/unomi/router/services/ProfileExportServiceImpl.java
+++ 
b/extensions/router/router-service/src/main/java/org/apache/unomi/router/services/ProfileExportServiceImpl.java
@@ -21,7 +21,6 @@ import org.apache.unomi.api.services.ConfigSharingService;
 import org.apache.unomi.router.api.ExportConfiguration;
 import org.apache.unomi.router.api.RouterConstants;
 import org.apache.unomi.router.api.RouterUtils;
-import org.apache.unomi.router.api.services.ImportExportConfigurationService;
 import org.apache.unomi.router.api.services.ProfileExportService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -42,10 +41,10 @@ public class ProfileExportServiceImpl extends 
AbstractCustomServiceImpl implemen
 
 public String extractProfilesBySegment(ExportConfiguration 
exportConfiguration) {
 List profileList = persistenceService.query("segments", 
(String) exportConfiguration.getProperty("segment"), null, Profile.class);
-String csvContent = "";
+StringBuilder csvContent = new StringBuilder();
 for (Profile profile : profileList) {
-csvContent += convertProfileToCSVLine(profile, 
exportConfiguration);
-csvContent += exportConfiguration.getLineSeparator();
+csvContent.append(convertProfileToCSVLine(profile, 
exportConfiguration));
+
csvContent.append(RouterUtils.getCharFromLineSeparator(exportConfiguration.getLineSeparator()));
 }
 logger.debug("Exporting {} extracted profiles.", profileList.size());
 Map returnMap = new HashMap();
@@ -60,7 +59,7 @@ public class ProfileExportServiceImpl extends 
AbstractCustomServiceImpl implemen
 returnMap.put(RouterConstants.KEY_CSV_CONTENT, csvContent);
 returnMap.put(RouterConstants.KEY_EXECS, execution);
 
-return csvContent;
+return csvContent.toString();
 }
 
 public String convertProfileToCSVLine(Profile profile, ExportConfiguration 
exportConfiguration) {