[KNOWAGE-8577] The user cannot create csv dataset

KnowageLabs · Oct 3, 2024 · fe0034c · fe0034c
1 parent a1fded1
commit fe0034c
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 6 deletions.
diff --git a/knowageutils/src/main/java/it/eng/knowage/encryption/DecryptionDataStoreTransformer.java b/knowageutils/src/main/java/it/eng/knowage/encryption/DecryptionDataStoreTransformer.java
@@ -32,7 +32,8 @@ public class DecryptionDataStoreTransformer extends AbstractDataStoreTransformer
 	private final IMetaData dataStoreMetadata;
 
 	public DecryptionDataStoreTransformer(IDataSet dataSet) {
-		this(dataSet.getDsMetadata() != null ? dataSet.getMetadata() : new MetaData());
+		this(dataSet.getDsMetadata() != null && !dataSet.getDsMetadata().equals("") && !dataSet.getDsMetadata().equals("[]")
+				&& !dataSet.getDsMetadata().startsWith("{") ? dataSet.getMetadata() : new MetaData());
 	}
 
 	public DecryptionDataStoreTransformer(IDataStore dataStore) {

diff --git a/...utils/src/main/java/it/eng/knowage/privacymanager/PrivacyManagerDataStoreTransformer.java b/...utils/src/main/java/it/eng/knowage/privacymanager/PrivacyManagerDataStoreTransformer.java
@@ -44,7 +44,8 @@ public class PrivacyManagerDataStoreTransformer extends AbstractDataStoreTransfo
 	private final Map paramsMap = new LinkedHashMap<>();
 
 	public PrivacyManagerDataStoreTransformer(IDataSet dataSet) {
-		this(dataSet.getDsMetadata() != null ? dataSet.getMetadata() : new MetaData(), dataSet.getParamsMap());
+		this(dataSet.getDsMetadata() != null && !dataSet.getDsMetadata().equals("") && !dataSet.getDsMetadata().equals("[]")
+				&& !dataSet.getDsMetadata().startsWith("{") ? dataSet.getMetadata() : new MetaData(), dataSet.getParamsMap());
 	}
 
 	public PrivacyManagerDataStoreTransformer(IDataStore dataStore, Map paramsMap) {

diff --git a/knowageutils/src/main/java/it/eng/spagobi/tools/dataset/bo/AbstractDataSet.java b/knowageutils/src/main/java/it/eng/spagobi/tools/dataset/bo/AbstractDataSet.java
@@ -313,7 +313,7 @@ public void setDsMetadata(String dsMetadata) {
 	public IMetaData getMetadata() {
 		IMetaData toReturn = null;
 		String xmlMetadata = this.getDsMetadata();
-		if (xmlMetadata == null || xmlMetadata.trim().equals("")) {
+		if (xmlMetadata == null || xmlMetadata.trim().equals("") || xmlMetadata.trim().equals("[]") || xmlMetadata.trim().startsWith("{")) {
 			logger.error("This dataset has no metadata");
 			throw new SpagoBIRuntimeException("This dataset has no metadata");
 		}
@@ -457,13 +457,15 @@ private List<String> encapsulateValues(JSONObject parameter, String[] values) {
 						String newValuesFromArray = "";
 						for (int i = 0; i < valuesArray.length; i++) {
 							String temp = valuesArray[i];
-							if (!delim.isEmpty() && temp.startsWith(delim) && temp.endsWith(delim))
+							if (!delim.isEmpty() && temp.startsWith(delim) && temp.endsWith(delim)) {
 								temp = temp.substring(1, temp.length() - 1);
+							}
 							temp = temp.replaceAll("'", "''");
-							if (i == 0)
+							if (i == 0) {
 								newValuesFromArray = (delim + temp + delim);
-							else
+							} else {
 								newValuesFromArray = newValuesFromArray + "," + (delim + temp + delim);
+							}
 
 						}
 						newValues.add(newValuesFromArray);