Reverted serialization from Sting to Object values returning the

Document as Map

CHANGELOG.md

@@ -4,6 +4,12 @@
 All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [v2.0.2-SNAPSHOT] - 2022-02-02
+
+#### Enhancements
+
+- [#24432] Reverted serialization from Sting to Object values returning the Document as Map
+
 ## [v2.0.1] - 2022-01-19
 
 #### Bug fixes

pom.xml

@@ -10,7 +10,7 @@
 
 	<groupId>org.gcube.application</groupId>
 	<artifactId>geoportal-data-common</artifactId>
-	<version>2.0.1</version>
+	<version>2.0.2-SNAPSHOT</version>
 	<description>GeoPortal Data Common is common library used by  GUI components developed for GeoNA</description>
 
 	<scm>

src/main/java/org/gcube/application/geoportalcommon/ConvertToDataValueObjectModel.java

@@ -867,7 +867,7 @@ public class ConvertToDataValueObjectModel {
 		}
 
 		if (listDocumentKeys != null && !getFullMap) {
-			LinkedHashMap<String, String> documentAsMap = new LinkedHashMap<String, String>(listDocumentKeys.size());
+			LinkedHashMap<String, Object> documentAsMap = new LinkedHashMap<String, Object>(listDocumentKeys.size());
 			for (String key : listDocumentKeys) {
 
 				documentAsMap = fillMapValue(document, key, documentAsMap);
@@ -877,7 +877,7 @@ public class ConvertToDataValueObjectModel {
 
 		if (getFullMap) {
 			Set<String> keySet = document.keySet();
-			LinkedHashMap<String, String> documentAsMap = new LinkedHashMap<String, String>(keySet.size());
+			LinkedHashMap<String, Object> documentAsMap = new LinkedHashMap<String, Object>(keySet.size());
 			for (String key : keySet) {
 				// documentAsMap.put(key, document.get(key));
 				documentAsMap = fillMapValue(document, key, documentAsMap);
@@ -979,8 +979,8 @@ public class ConvertToDataValueObjectModel {
 	 * @param documentAsMap the document as map
 	 * @return the linked hash map
 	 */
-	public static LinkedHashMap<String, String> fillMapValue(Document document, String key,
+	public static LinkedHashMap<String, Object> fillMapValue(Document document, String key,
-			LinkedHashMap<String, String> documentAsMap) {
+			LinkedHashMap<String, Object> documentAsMap) {
 
 		Object value = document.get(key);
 		String keyLower = key.toLowerCase();
@@ -1000,7 +1000,7 @@ public class ConvertToDataValueObjectModel {
 			}
 		}
 
-		documentAsMap.put(key, value!=null?value.toString():null);
+		documentAsMap.put(key, value);
 		return documentAsMap;
 	}
 

src/main/java/org/gcube/application/geoportalcommon/shared/geoportal/DocumentDV.java

@@ -10,7 +10,7 @@ public class DocumentDV implements Serializable {
 	 * 
 	 */
 	private static final long serialVersionUID = 4978517506036855883L;
-	protected LinkedHashMap<String, String> documentAsMap;
+	protected LinkedHashMap<String, Object> documentAsMap;
 	private String documentAsJSON;
 	private ConfigurationDV<?> configuration;
 
@@ -19,11 +19,11 @@ public class DocumentDV implements Serializable {
 	public DocumentDV() {
 	}
 
-	public LinkedHashMap<String, String> getDocumentAsMap() {
+	public LinkedHashMap<String, Object> getDocumentAsMap() {
 		return documentAsMap;
 	}
 
-	public Entry<String, String> getFirstEntryOfMap() {
+	public Entry<String, Object> getFirstEntryOfMap() {
 		if (documentAsMap != null && documentAsMap.size() >= 1) {
 			return documentAsMap.entrySet().iterator().next();
 		}
@@ -43,7 +43,7 @@ public class DocumentDV implements Serializable {
 		return documentAsJSON;
 	}
 
-	public void setDocumentAsMap(LinkedHashMap<String, String> documentAsMap) {
+	public void setDocumentAsMap(LinkedHashMap<String, Object> documentAsMap) {
 		this.documentAsMap = documentAsMap;
 	}
 

src/main/java/org/gcube/application/geoportalcommon/shared/geoportal/ResultDocumentDV.java

@@ -49,9 +49,9 @@ public class ResultDocumentDV extends DocumentDV implements Serializable {
 	public void addItemToMap(String property, Object value) {
 
 		if (documentAsMap == null)
-			documentAsMap = new LinkedHashMap<String, String>();
+			documentAsMap = new LinkedHashMap<String, Object>();
 
-		documentAsMap.put(property, value!=null?value.toString():null);
+		documentAsMap.put(property, value);
 	}
 
 	public BasicLifecycleInformationDV getLifecycleInfo() {

src/test/java/org/gcube/application/Project_Tests.java

@@ -80,7 +80,7 @@ public class Project_Tests {
 		ProjectDV projectDV = ConvertToDataValueObjectModel.toProjectDV(project, projectBuilder);
 		System.out.println(projectDV);
 
-		LinkedHashMap<String, String> theMap = projectDV.getTheDocument().getDocumentAsMap();
+		LinkedHashMap<String, Object> theMap = projectDV.getTheDocument().getDocumentAsMap();
 		for (String key : theMap.keySet()) {
 			Object theValue = theMap.get(key);
 			System.out.println("The key: " + key + " has value: " + theValue);