From a3233c4d46a54775682d08012cb8bd285a748bc8 Mon Sep 17 00:00:00 2001
From: GIRARDOT Raphael <raphael.girardot@synchrotron-soleil.fr>
Date: Wed, 7 May 2025 15:31:17 +0200
Subject: [PATCH] use the same separator to revert adapt data (JAVAAPI-647)
---
.../data/adapter/AbstractMatrixToStringAdapter.java | 12 +++++++-----
1 file changed, 7 insertions(+), 5 deletions(-)
diff --git a/DataConnectionManagement/src/main/java/fr/soleil/data/adapter/AbstractMatrixToStringAdapter.java b/DataConnectionManagement/src/main/java/fr/soleil/data/adapter/AbstractMatrixToStringAdapter.java
index 367527041..67582c775 100644
--- a/DataConnectionManagement/src/main/java/fr/soleil/data/adapter/AbstractMatrixToStringAdapter.java
+++ b/DataConnectionManagement/src/main/java/fr/soleil/data/adapter/AbstractMatrixToStringAdapter.java
@@ -31,6 +31,7 @@ import fr.soleil.data.container.matrix.StringMatrix;
import fr.soleil.data.exception.DataAdaptationException;
import fr.soleil.data.mediator.Mediator;
import fr.soleil.data.target.IFormatableTarget;
+import fr.soleil.lib.project.ObjectUtils;
/**
* A {@link DataToStringAdapter} that adapts some {@link Number}s to {@link String} values
@@ -84,21 +85,22 @@ public class AbstractMatrixToStringAdapter<N> extends DataToStringAdapter<Abstra
} else if (firstType.isAssignableFrom(BigInteger.class)) {
result = (AbstractMatrix<N>) new BigIntegerMatrix();
}
-
- String[] values = data.split(COMMA);
-
+ String[] values;
+ if (data.indexOf(ObjectUtils.NEW_LINE) > -1) {
+ values = data.split(ObjectUtils.NEW_LINE);
+ } else {
+ values = data.split(COMMA);
+ }
try {
result.setValue(result.initValue(1, values.length));
} catch (UnsupportedDataTypeException e) {
throw new DataAdaptationException("Unexpected data conversion exception", e);
}
-
int index = 0;
for (String valueToSet : values) {
result.setValueFromStringAt(valueToSet, 0, index);
index++;
}
-
}
return result;
}
--
GitLab