Protei/PromucFlow_constructor
2
0
Fork 0
Code Issues Pull Requests Actions 4 Packages Projects Releases Wiki Activity

Merge branch 'hotfix/undo-logs-debug' into 'release'

Browse Source 
Undo the logs added for pagination

See merge request theappsmith/internal-tools-server!181
This commit is contained in:
Trisha Anand 2020-01-29 10:51:20 +00:00
commit a83bf9844c
1 changed files with 0 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/server/appsmith-server/src/main/java/com/appsmith/server/services/ActionServiceImpl.java
View File

@ -286,7 +286,6 @@ public class ActionServiceImpl extends BaseService<ActionRepository, Action, Str
List<Param> params = executeActionDTO.getParams();
if (params != null && !params.isEmpty()) {
for (Param param : params) {
log.debug("param key {}, value {}", param.getKey(), param.getValue());
if (param.getKey() == null || param.getKey().isEmpty()) {
continue;
}
@ -366,7 +365,6 @@ public class ActionServiceImpl extends BaseService<ActionRepository, Action, Str
datasourceConfigurationTemp = (DatasourceConfiguration) variableSubstitution(datasource.getDatasourceConfiguration(), replaceParamsMap);
actionConfigurationTemp = (ActionConfiguration) variableSubstitution(action.getActionConfiguration(), replaceParamsMap);
log.debug("After replacement, datasource is : {}", datasourceConfigurationTemp);
// If the action has a body (for RestAPI), then unescape HTML in the string.
if (actionConfigurationTemp.getBody() != null) {
actionConfigurationTemp.setBody(StringEscapeUtils.unescapeHtml(actionConfigurationTemp.getBody()));
@ -472,7 +470,6 @@ public class ActionServiceImpl extends BaseService<ActionRepository, Action, Str
Pattern pattern = Pattern.compile("&#61;");
Matcher matcher = pattern.matcher(objectInJsonString);
String res = matcher.replaceAll("=");
log.debug("After replacement, the value is : {}", res);
return objectMapper.readValue(res, configuration.getClass());
} catch (Exception e) {
log.error("Exception caught while substituting values in mustache template.", e);
@ -544,14 +541,12 @@ public class ActionServiceImpl extends BaseService<ActionRepository, Action, Str
actionConfiguration.setPath("");
actionConfiguration.setQueryParameters(null);
}
log.debug("Action configuration after pagination update is : {}", actionConfiguration);
return actionConfiguration;
}
private DatasourceConfiguration updateDatasourceConfigurationForPagination(ActionConfiguration actionConfiguration,
DatasourceConfiguration datasourceConfiguration,
PaginationField paginationField) {
log.debug("datasource config before update is : {}", datasourceConfiguration);
if (PaginationField.NEXT.equals(paginationField)) {
try {
datasourceConfiguration.setUrl(URLDecoder.decode(actionConfiguration.getNext(), "UTF-8"));
@ -561,7 +556,6 @@ public class ActionServiceImpl extends BaseService<ActionRepository, Action, Str
} else if (PaginationField.PREV.equals(paginationField)) {
datasourceConfiguration.setUrl(actionConfiguration.getPrev());
}
log.debug("datasource config after pagination update is : {}", datasourceConfiguration);
return datasourceConfiguration;
}
}