From 3b9950e91c86dec9a3f0ab9c4cb785cdce36dd08 Mon Sep 17 00:00:00 2001
From: Rosen Silva <rosen@live.com>
Date: Sun, 22 Sep 2024 21:51:57 +0530
Subject: [PATCH] add media type support to redis HGet

---
 .connector-store/meta.json            |  2 +-
 pom.xml                               |  2 +-
 src/main/resources/hashes/hGet.xml    | 46 +++++++++++++++++++++------
 src/main/resources/uischema/hGet.json | 16 ++++++++++
 4 files changed, 54 insertions(+), 12 deletions(-)

diff --git a/.connector-store/meta.json b/.connector-store/meta.json
index 18e03a5..1b6a45d 100644
--- a/.connector-store/meta.json
+++ b/.connector-store/meta.json
@@ -10,7 +10,7 @@
     ],
     "releases": [
         {
-            "tagName": "v3.1.1",
+            "tagName": "v3.1.2",
             "products": [
                 "MI 1.2.0",
                 "MI 4.x.x"
diff --git a/pom.xml b/pom.xml
index a3f68b1..6cb7cd6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -23,7 +23,7 @@
     <groupId>org.wso2.carbon.connector</groupId>
     <artifactId>org.wso2.carbon.connector.redis</artifactId>
     <packaging>jar</packaging>
-    <version>3.1.2-SNAPSHOT</version>
+    <version>3.1.3-SNAPSHOT</version>
     <name>WSO2 Carbon - Mediation Library Connector For Redis</name>
     <url>http://wso2.org</url>
     <properties>
diff --git a/src/main/resources/hashes/hGet.xml b/src/main/resources/hashes/hGet.xml
index 32ece6c..5504225 100644
--- a/src/main/resources/hashes/hGet.xml
+++ b/src/main/resources/hashes/hGet.xml
@@ -20,16 +20,42 @@
 <template xmlns="http://ws.apache.org/ns/synapse" name="hGet">
     <parameter name="redisKey" description="the name of the key"/>
     <parameter name="redisField" description="the value of the field"/>
+    <parameter name="mediaType" description="the media type of the data"/>
     <sequence>
-        <property name="redisKey" expression="$func:redisKey"/>
-        <property name="redisField" expression="$func:redisField"/>
-        <class name="org.wso2.carbon.connector.operations.HGet"/>
-        <property name="redisResponse" expression="$ctx:result"/>
-        <payloadFactory media-type="text">
-            <format>$1</format>
-            <args>
-                <arg evaluator="xml" expression="$ctx:redisResponse"/>
-            </args>
-        </payloadFactory>
+        <property name="redisKey" expression="$func:redisKey" />
+        <property name="redisField" expression="$func:redisField" />
+        <property name="mediaType" expression="$func:mediaType" />
+        <class name="org.wso2.carbon.connector.operations.HGet" />
+        <property name="redisResponse" expression="$ctx:result" />
+        <switch source="$ctx:mediaType">
+            <case regex="json">
+                <payloadFactory media-type="json">
+                    <format>$1</format>
+                    <args>
+                        <arg evaluator="xml" expression="$ctx:redisResponse" />
+                    </args>
+                </payloadFactory>
+            </case>
+            <case regex="xml">
+                <payloadFactory media-type="xml">
+                    <format>
+                        <soapenv:Envelope xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/">
+                            <soapenv:Body>$1</soapenv:Body>
+                        </soapenv:Envelope>
+                    </format>
+                    <args>
+                        <arg evaluator="xml" expression="$ctx:redisResponse" />
+                    </args>
+                </payloadFactory>
+            </case>
+            <default>
+                <payloadFactory media-type="text">
+                    <format>$1</format>
+                    <args>
+                        <arg evaluator="xml" expression="$ctx:redisResponse" />
+                    </args>
+                </payloadFactory>
+            </default>
+        </switch>
     </sequence>
 </template>
\ No newline at end of file
diff --git a/src/main/resources/uischema/hGet.json b/src/main/resources/uischema/hGet.json
index 6475df7..8f43342 100644
--- a/src/main/resources/uischema/hGet.json
+++ b/src/main/resources/uischema/hGet.json
@@ -50,6 +50,22 @@
                     "required": "true",
                     "helpTip": "Redis Field"
                   }
+                },
+                {
+                  "type": "attribute",
+                  "value": {
+                    "name": "mediaType",
+                    "displayName": "Media Type",
+                    "inputType": "comboOrExpression",
+                    "comboValues": [
+                      "text",
+                      "json",
+                      "xml"
+                    ],
+                    "defaultValue": "text",
+                    "required": "false",
+                    "helpTip": "Media type of the redis data"
+                  }
                 }
               ]
             }