Merge pull request #942 from sachithKay/jsonproperty-8.0.0

Add JSON data type to property mediator.

Author: sachithKay

components/esb-tools/plugins/org.wso2.integrationstudio.gmf.esb.persistence/src/org/wso2/integrationstudio/gmf/esb/internal/persistence/PropertyMediatorTransformer.java

@@ -160,6 +160,9 @@ public static org.apache.synapse.mediators.builtin.PropertyMediator createProper
                     case STRING:
                         propMediator.setValue(visualProp.getValue(), XMLConfigConstants.DATA_TYPES.STRING.toString());
                         break;
+                    case JSON:
+                        propMediator.setValue(visualProp.getValue(), XMLConfigConstants.DATA_TYPES.JSON.toString());
+                        break;
                     }
                 } else {
                     if (visualProp.getValueExpression() != null) {
@@ -210,6 +213,9 @@ public static org.apache.synapse.mediators.builtin.PropertyMediator createProper
                         case STRING:
                             propMediator.setExpression(xpath, XMLConfigConstants.DATA_TYPES.STRING.toString());
                             break;
+                        case JSON:
+                            propMediator.setExpression(xpath, XMLConfigConstants.DATA_TYPES.JSON.toString());
+                            break;
                         }
                     }
                 }

components/esb-tools/plugins/org.wso2.integrationstudio.gmf.esb/model/esb.ecore

@@ -713,6 +713,7 @@
     <eLiterals name="LONG" value="5"/>
     <eLiterals name="SHORT" value="6"/>
     <eLiterals name="OM" value="7"/>
+    <eLiterals name="JSON" value="8"/>
   </eClassifiers>
   <eClassifiers xsi:type="ecore:EEnum" name="PropertyAction">
     <eLiterals name="SET" literal="set"/>

components/esb-tools/plugins/org.wso2.integrationstudio.gmf.esb/model/esb.genmodel

@@ -160,6 +160,7 @@
       <genEnumLiterals ecoreEnumLiteral="esb.ecore#//PropertyDataType/LONG"/>
       <genEnumLiterals ecoreEnumLiteral="esb.ecore#//PropertyDataType/SHORT"/>
       <genEnumLiterals ecoreEnumLiteral="esb.ecore#//PropertyDataType/OM"/>
+      <genEnumLiterals ecoreEnumLiteral="esb.ecore#//PropertyDataType/JSON"/>
     </genEnums>
     <genEnums typeSafeEnumCompatible="false" ecoreEnum="esb.ecore#//PropertyAction">
       <genEnumLiterals ecoreEnumLiteral="esb.ecore#//PropertyAction/SET"/>

components/esb-tools/plugins/org.wso2.integrationstudio.gmf.esb/src/org/wso2/integrationstudio/gmf/esb/PropertyDataType.java

@@ -100,7 +100,15 @@ public enum PropertyDataType implements Enumerator {
      * @generated
      * @ordered
      */
-    OM(7, "OM", "OM");
+    OM(7, "OM", "OM"), /**
+	 * The '<em><b>JSON</b></em>' literal object.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #JSON_VALUE
+	 * @generated
+	 * @ordered
+	 */
+	JSON(8, "JSON", "JSON");
 
     /**
      * The '<em><b>STRING</b></em>' literal value.
@@ -222,6 +230,17 @@ public enum PropertyDataType implements Enumerator {
      */
     public static final int OM_VALUE = 7;
 
+    /**
+	 * The '<em><b>JSON</b></em>' literal value.
+	 * <!-- begin-user-doc -->
+	 * <!-- end-user-doc -->
+	 * @see #JSON
+	 * @model
+	 * @generated
+	 * @ordered
+	 */
+	public static final int JSON_VALUE = 8;
+
     /**
      * An array of all the '<em><b>Property Data Type</b></em>' enumerators.
      * <!-- begin-user-doc -->

components/esb-tools/plugins/org.wso2.integrationstudio.gmf.esb/src/org/wso2/integrationstudio/gmf/esb/impl/EsbPackageImpl.java

@@ -25165,6 +25165,7 @@ public void initializePackageContents() {
         addEEnumLiteral(propertyDataTypeEEnum, PropertyDataType.LONG);
         addEEnumLiteral(propertyDataTypeEEnum, PropertyDataType.SHORT);
         addEEnumLiteral(propertyDataTypeEEnum, PropertyDataType.OM);
+		addEEnumLiteral(propertyDataTypeEEnum, PropertyDataType.JSON);
 
         initEEnum(propertyActionEEnum, PropertyAction.class, "PropertyAction");
         addEEnumLiteral(propertyActionEEnum, PropertyAction.SET);