Merge pull request #1727 from arunans23/fixdm

Fix mapFunction constant with correct syntax
wso2 · Jul 15, 2024 · 70d7c96 · 70d7c96
2 parents 30ce6bc + 04280ce
commit 70d7c96
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/...src/main/java/org/wso2/carbon/mediator/datamapper/engine/core/mapper/MappingResource.java b/...src/main/java/org/wso2/carbon/mediator/datamapper/engine/core/mapper/MappingResource.java
@@ -149,7 +149,7 @@ private JSFunction createFunction(InputStream mappingConfig, String outputType)
  propertiesList.add(match.group(2) + "['" + match.group(3) + "']");
  }
 
- if (jsFunctionBody.contains(MAP_FUNCTION_NAME)) {
+ if (!jsFunctionBody.contains(fnName) && jsFunctionBody.contains(MAP_FUNCTION_NAME)) {
  fnName = MAP_FUNCTION;
  }
 

diff --git a/...main/java/org/wso2/carbon/mediator/datamapper/engine/utils/DataMapperEngineConstants.java b/...main/java/org/wso2/carbon/mediator/datamapper/engine/utils/DataMapperEngineConstants.java
@@ -57,7 +57,7 @@ public class DataMapperEngineConstants {
  public static final String FUNCTION_NAME_CONST_2 = "_S_";
  public static final String INPUT_VARIABLE_IDENTIFIER = "inputVariables";
  public static final String MAP_FUNCTION_NAME = "mapFunction";
- public static final String MAP_FUNCTION = "mapFunction(JSON.parse(" + INPUT_VARIABLE_IDENTIFIER + ")";
+ public static final String MAP_FUNCTION = "mapFunction(JSON.parse(" + INPUT_VARIABLE_IDENTIFIER + "))";
  public static final String NAME_SEPERATOR = "_Separat0r_";
  public static final String ENCODE_CHAR_HYPHEN = "_EnC0DeCHaRHyPh3n_";
  public static final String HYPHEN = "-";