Browse Source

DATAMONGO-1465 - Polishing.

Replace boolean flag in convertAndJoinScriptArgs with literal. Joined args are rendered to JavaScript and require always string quotation.

Original pull request: #383.
pull/663/head
Mark Paluch 9 years ago
parent
commit
2026097be8
  1. 6
      spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/DefaultScriptOperations.java

6
spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/DefaultScriptOperations.java

@ -116,7 +116,7 @@ class DefaultScriptOperations implements ScriptOperations { @@ -116,7 +116,7 @@ class DefaultScriptOperations implements ScriptOperations {
@Override
public Object doInDB(DB db) throws MongoException, DataAccessException {
return db.eval(String.format("%s(%s)", scriptName, convertAndJoinScriptArgs(true, args)));
return db.eval(String.format("%s(%s)", scriptName, convertAndJoinScriptArgs(args)));
}
});
}
@ -171,8 +171,8 @@ class DefaultScriptOperations implements ScriptOperations { @@ -171,8 +171,8 @@ class DefaultScriptOperations implements ScriptOperations {
return convertedValues.toArray();
}
private String convertAndJoinScriptArgs(boolean quote, Object... args) {
return ObjectUtils.isEmpty(args) ? "" : StringUtils.arrayToCommaDelimitedString(convertScriptArgs(quote, args));
private String convertAndJoinScriptArgs(Object... args) {
return ObjectUtils.isEmpty(args) ? "" : StringUtils.arrayToCommaDelimitedString(convertScriptArgs(true, args));
}
/**

Loading…
Cancel
Save