Spring/spring-data-redis
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:SpringSource/spring-data-keyvalue

Browse Source
This commit is contained in:
Costin Leau
2010-11-30 12:42:47 +02:00
parent 32bd95e030 3af5d014d5
commit 64d4173fb9
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
spring-data-riak/src/main/java/org/springframework/data/riak/core/RiakTemplate.java
View File

@@ -47,10 +47,7 @@ import javax.mail.BodyPart;
import javax.mail.MessagingException;
import javax.mail.internet.MimeMultipart;
import javax.mail.util.ByteArrayDataSource;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
import java.io.InputStream;
import java.io.StringWriter;
import java.io.*;
import java.lang.annotation.Annotation;
import java.text.ParseException;
import java.text.SimpleDateFormat;
@@ -312,6 +309,8 @@ public class RiakTemplate extends RestGatewaySupport implements KeyValueStoreOpe
if (e.getStatusCode() != HttpStatus.NOT_FOUND) {
throw new DataStoreOperationException(e.getMessage(), e);
}
} catch (EOFException eof) {
// IGNORE this one
} catch (IOException e) {
log.error(e.getMessage(), e);
}

9
spring-data-riak/src/test/groovy/org/springframework/data/riak/core/RiakTemplateSpec.groovy
View File

@@ -182,15 +182,16 @@ class RiakTemplateSpec extends Specification {
given:
MapReduceJob job = riak.createMapReduceJob()
def mapJs = new JavascriptMapReduceOperation("function(v){ return [1]; }")
def mapJs = new JavascriptMapReduceOperation("function(v){ var o=Riak.mapValuesJson(v); return [1]; }")
def mapPhase = new RiakMapReducePhase("map", "javascript", mapJs)
def reduceJs = new JavascriptMapReduceOperation("function(v){ return [v.length]; }")
def reduceJs = new JavascriptMapReduceOperation("Riak.reduceSum")
def reducePhase = new RiakMapReducePhase("reduce", "javascript", reduceJs)
job.addInputs(["test"]).
addPhase(mapPhase).
addPhase(reducePhase)
println job.toJson()
when:
def result = riak.execute(job, Integer)
@@ -204,10 +205,10 @@ class RiakTemplateSpec extends Specification {
given:
MapReduceJob job = riak.createMapReduceJob()
def mapJs = new JavascriptMapReduceOperation("function(v){ return [1]; }")
def mapJs = new JavascriptMapReduceOperation("function(v){ var o=Riak.mapValuesJson(v); return [1]; }")
def mapPhase = new RiakMapReducePhase("map", "javascript", mapJs)
def reduceJs = new JavascriptMapReduceOperation("function(v){ return [v.length]; }")
def reduceJs = new JavascriptMapReduceOperation("Riak.reduceSum")
def reducePhase = new RiakMapReducePhase("reduce", "javascript", reduceJs)
job.addInputs(["test"]).