mindol1004/spring-data-mongodb
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

DATAMONGO-1465 - Fix String quotation in DefaultScriptOperations.execute().

Browse Source 
This change prevents Strings from being quoted prior to sending them as args of a script.

Original pull request: #383.
This commit is contained in:
Christoph Strobl
2016-08-23 14:05:41 +02:00
committed by Mark Paluch
parent be549b3d23
commit 2006804133
2 changed files with 17 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/DefaultScriptOperations.java
View File

@@ -1,5 +1,5 @@
/* /*
* Copyright 2014-2015 the original author or authors. * Copyright 2014-2016 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@@ -98,7 +98,7 @@ class DefaultScriptOperations implements ScriptOperations {
@Override @Override
public Object doInDB(DB db) throws MongoException, DataAccessException { public Object doInDB(DB db) throws MongoException, DataAccessException {
return db.eval(script.getCode(), convertScriptArgs(args)); return db.eval(script.getCode(), convertScriptArgs(false, args));
} }
}); });
} }
@@ -116,7 +116,7 @@ class DefaultScriptOperations implements ScriptOperations {
@Override @Override
public Object doInDB(DB db) throws MongoException, DataAccessException { public Object doInDB(DB db) throws MongoException, DataAccessException {
return db.eval(String.format("%s(%s)", scriptName, convertAndJoinScriptArgs(args))); return db.eval(String.format("%s(%s)", scriptName, convertAndJoinScriptArgs(true, args)));
} }
}); });
} }
@@ -155,7 +155,7 @@ class DefaultScriptOperations implements ScriptOperations {
return scriptNames; return scriptNames;
} }
private Object[] convertScriptArgs(Object... args) { private Object[] convertScriptArgs(boolean quote, Object... args) {
if (ObjectUtils.isEmpty(args)) { if (ObjectUtils.isEmpty(args)) {
return args; return args;
@@ -164,15 +164,15 @@ class DefaultScriptOperations implements ScriptOperations {
List<Object> convertedValues = new ArrayList<Object>(args.length); List<Object> convertedValues = new ArrayList<Object>(args.length);
for (Object arg : args) { for (Object arg : args) {
convertedValues.add(arg instanceof String ? String.format("'%s'", arg) : this.mongoOperations.getConverter() convertedValues.add(arg instanceof String && quote ? String.format("'%s'", arg)
.convertToMongoType(arg)); : this.mongoOperations.getConverter().convertToMongoType(arg));
} }
return convertedValues.toArray(); return convertedValues.toArray();
} }
private String convertAndJoinScriptArgs(Object... args) { private String convertAndJoinScriptArgs(boolean quote, Object... args) {
return ObjectUtils.isEmpty(args) ? "" : StringUtils.arrayToCommaDelimitedString(convertScriptArgs(args)); return ObjectUtils.isEmpty(args) ? "" : StringUtils.arrayToCommaDelimitedString(convertScriptArgs(quote, args));
} }
/** /**

10
spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/DefaultScriptOperationsTests.java
View File

@@ -1,5 +1,5 @@
/* /*
* Copyright 2014-2015 the original author or authors. * Copyright 2014-2016 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@@ -190,4 +190,12 @@ public class DefaultScriptOperationsTests {
public void scriptNamesShouldReturnEmptySetWhenNoScriptRegistered() { public void scriptNamesShouldReturnEmptySetWhenNoScriptRegistered() {
assertThat(scriptOps.getScriptNames(), is(empty())); assertThat(scriptOps.getScriptNames(), is(empty()));
} }
/**
* @see DATAMONGO-1465
*/
@Test
public void executeShouldNotQuoteStrings() {
assertThat(scriptOps.execute(EXECUTABLE_SCRIPT, "spring-data"), is((Object) "spring-data"));
}
} }