Fix missing metadata on dataset decryption phase

KnowageLabs · Mar 5, 2024 · fab3c24 · fab3c24
1 parent af3797e
commit fab3c24
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/knowageutils/src/main/java/it/eng/knowage/encryption/DecryptionDataStoreTransformer.java b/knowageutils/src/main/java/it/eng/knowage/encryption/DecryptionDataStoreTransformer.java
@@ -13,11 +13,13 @@
 import org.jasypt.exceptions.EncryptionInitializationException;
 import org.jasypt.exceptions.EncryptionOperationNotPossibleException;
 
+import it.eng.spagobi.tools.dataset.bo.IDataSet;
 import it.eng.spagobi.tools.dataset.common.datastore.IDataStore;
 import it.eng.spagobi.tools.dataset.common.datastore.IField;
 import it.eng.spagobi.tools.dataset.common.datastore.IRecord;
 import it.eng.spagobi.tools.dataset.common.metadata.IFieldMetaData;
 import it.eng.spagobi.tools.dataset.common.metadata.IMetaData;
+import it.eng.spagobi.tools.dataset.common.metadata.MetaData;
 import it.eng.spagobi.tools.dataset.common.transformer.AbstractDataStoreTransformer;
 
 public class DecryptionDataStoreTransformer extends AbstractDataStoreTransformer {
@@ -29,6 +31,10 @@ public class DecryptionDataStoreTransformer extends AbstractDataStoreTransformer
 	private PBEStringEncryptor encryptor;
 	private final IMetaData dataStoreMetadata;
 
+	public DecryptionDataStoreTransformer(IDataSet dataSet) {
+		this(dataSet.getDsMetadata() != null ? dataSet.getMetadata() : new MetaData());
+	}
+
 	public DecryptionDataStoreTransformer(IDataStore dataStore) {
 		this(dataStore.getMetaData());
 	}

diff --git a/knowageutils/src/main/java/it/eng/spagobi/tools/dataset/bo/ConfigurableDataSet.java b/knowageutils/src/main/java/it/eng/spagobi/tools/dataset/bo/ConfigurableDataSet.java
@@ -152,7 +152,7 @@ public void loadData(int offset, int fetchSize, int maxResults) {
 
 			dataStore = dataProxy.load(dataReader);
 
-			addDataStoreTransformer(new DecryptionDataStoreTransformer(dataStore));
+			addDataStoreTransformer(new DecryptionDataStoreTransformer(this));
 			addDataStoreTransformer(new PrivacyManagerDataStoreTransformer(this));
 			addDataStoreTransformer(new DataStoreStatsTransformer());