Cherry pick branch 'genexuslabs:gamutils_eo' into beta

Author: sgrampone

gamutils/pom.xml

@@ -52,6 +52,17 @@
             <version>1.15</version>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>com.google.code.gson</groupId>
+            <artifactId>gson</artifactId>
+            <version>2.12.1</version>
+        </dependency>
+        <dependency>
+            <groupId>com.genexus</groupId>
+            <artifactId>gxclassR</artifactId>
+            <version>${project.version}</version>
+            <scope>compile</scope>
+        </dependency>
     </dependencies>
 
     <build>

gamutils/src/main/java/com/genexus/gam/utils/Dictionary.java

@@ -0,0 +1,93 @@
+package com.genexus.gam.utils;
+
+import com.genexus.GxUserType;
+import com.google.gson.Gson;
+import com.google.gson.GsonBuilder;
+import com.google.gson.JsonParser;
+import com.google.gson.JsonElement;
+import com.google.gson.JsonPrimitive;
+import com.google.gson.JsonSyntaxException;
+import com.google.gson.reflect.TypeToken;
+
+import java.lang.reflect.Type;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+
+public class Dictionary {
+
+	private final Map<String, Object> userMap;
+	private final Gson gson;
+
+	/********EXTERNAL OBJECT PUBLIC METHODS  - BEGIN ********/
+
+	public Dictionary() {
+		this.userMap = new LinkedHashMap<>();
+		this.gson = new GsonBuilder().serializeNulls().create();
+	}
+
+	public Object get(String key) {
+		return this.userMap.get(key);
+	}
+
+	public void set(String key, Object value) {
+		objectToMap(key, value);
+	}
+
+	public void remove(String key) {
+		this.userMap.remove(key);
+	}
+
+	public void clear() {
+		this.userMap.clear();
+	}
+
+	public String toJsonString() {
+		return this.gson.toJson(this.userMap);
+	}
+
+	/********EXTERNAL OBJECT PUBLIC METHODS  - END ********/
+
+	// Convert a JSON String to Map<String, Object>
+	private Map<String, Object> jsonStringToMap(String jsonString) {
+		Type type = new TypeToken<Map<String, Object>>() {}.getType();
+		return this.gson.fromJson(jsonString, type);
+	}
+
+	private void objectToMap(String key, Object value) {
+		if (value == null) {
+			this.userMap.put(key, null);
+		} else if (value instanceof Number || value instanceof Boolean || value instanceof Map || value instanceof List) {
+			this.userMap.put(key, value);
+		} else if (value instanceof GxUserType) {
+			this.userMap.put(key, jsonStringToMap(((GxUserType) value).toJSonString()));
+		} else if (value instanceof String) {
+			String str = (String) value;
+
+			// Try to parse as JSON
+			try {
+				JsonElement parsed = JsonParser.parseString(str);
+				if (parsed.isJsonObject()) {
+					this.userMap.put(key, this.gson.fromJson(parsed, Map.class));
+				} else if (parsed.isJsonArray()) {
+					this.userMap.put(key, this.gson.fromJson(parsed, List.class));
+				} else if (parsed.isJsonPrimitive()) {
+					JsonPrimitive primitive = parsed.getAsJsonPrimitive();
+					if (primitive.isBoolean()) {
+						this.userMap.put(key, primitive.getAsBoolean());
+					} else if (primitive.isNumber()) {
+						this.userMap.put(key, primitive.getAsNumber());
+					} else if (primitive.isString()) {
+						this.userMap.put(key, primitive.getAsString());
+					}
+				}
+			} catch (JsonSyntaxException e) {
+				// Invalid JSON: it is left as string
+				this.userMap.put(key, str);
+			}
+		} else {
+			// Any other object: it is converted to string
+			this.userMap.put(key, value.toString());
+		}
+	}
+}

gamutils/src/main/java/com/genexus/gam/utils/keys/PublicKeyUtil.java

@@ -108,7 +108,7 @@ private static String fixType(String input) {
 		logger.debug("fixType");
 		try {
 			String extension = FilenameUtils.getExtension(input);
-			if (extension.isEmpty()) {
+			if (extension.isEmpty() ||  extension.contains("}")) {
 				try {
 					Base64.decode(input);
 					logger.debug("b64");