java.util.Date from the Last-Modified header.
*/
protected static SimpleDateFormat httpDate = new SimpleDateFormat(
"EEE, d MMM yyyy HH:mm:ss z");
- protected final Logger log = LoggerFactory.getLogger(getClass());
+ protected final Log log = LogFactory.getLog(getClass());
/**
* Client ID used by Riak to correlate updates.
@@ -124,8 +125,14 @@ public abstract class AbstractRiakTemplate extends RestGatewaySupport implements
* {@link java.util.concurrent.ExecutorService} to use for running asynchronous jobs.
*/
protected ExecutorService workerPool = Executors.newCachedThreadPool();
-
+ /**
+ * Default type to use when trying to deserialize objects and we can't otherwise tell what to
+ * do.
+ */
protected Class defaultType = String.class;
+ /**
+ * ClassLoader to use for saving/loading objects using the automatic converters.
+ */
protected ClassLoader classLoader = null;
/**
@@ -133,7 +140,6 @@ public abstract class AbstractRiakTemplate extends RestGatewaySupport implements
*/
public AbstractRiakTemplate() {
setRestTemplate(new RestTemplate());
- bucketKeyResolvers.add(new SimpleBucketKeyResolver());
}
/**
@@ -144,7 +150,6 @@ public abstract class AbstractRiakTemplate extends RestGatewaySupport implements
public AbstractRiakTemplate(ClientHttpRequestFactory requestFactory) {
super(requestFactory);
setRestTemplate(new RestTemplate());
- bucketKeyResolvers.add(new SimpleBucketKeyResolver());
}
public ConversionService getConversionService() {
@@ -219,21 +224,7 @@ public abstract class AbstractRiakTemplate extends RestGatewaySupport implements
this.defaultType = defaultType;
}
- /**
- * Get the {@link ClassLoader} to use when trying to load objects from the store.
- *
- * @return
- */
- public ClassLoader getClassLoader() {
- return classLoader;
- }
-
- /**
- * Set the {@link ClassLoader} to use when trying to load objects from the store.
- *
- * @param classLoader
- */
- public void setClassLoader(ClassLoader classLoader) {
+ public void setBeanClassLoader(ClassLoader classLoader) {
this.classLoader = classLoader;
}
@@ -285,6 +276,7 @@ public abstract class AbstractRiakTemplate extends RestGatewaySupport implements
}
}
}
+
/*----------------- Utilities -----------------*/
@SuppressWarnings({"unchecked"})
@@ -296,26 +288,24 @@ public abstract class AbstractRiakTemplate extends RestGatewaySupport implements
break;
}
}
- BucketKeyPair bucketKeyPair;
- if (null != resolver) {
- bucketKeyPair = resolver.resolve(key);
- if (null == bucketKeyPair.getBucket() && null != val) {
- // No bucket specified, check for an annotation that specified bucket name.
- Annotation meta = (val instanceof Class ? (Class) val : val.getClass()).getAnnotation(
- org.springframework.data.keyvalue.riak.convert.KeyValueStoreMetaData.class);
- if (null != meta) {
- String bucket = ((KeyValueStoreMetaData) meta).bucket();
- if (null != bucket) {
- return new SimpleBucketKeyPair+ Utilities for working with resources stored in Riak as standard java.io objects. Opening a RiakInputStream to a resource will allow code that doesn't + know anything about Key/Value datastores to access resources stored within them. +
+ ++ Alternatively, writing data to a RiakOutputStream will + create a resources in Riak without exposing any of the underlying data access code to the + calling application. +
+ + \ No newline at end of file diff --git a/spring-data-riak/src/main/java/org/springframework/data/keyvalue/riak/core/overview.html b/spring-data-riak/src/main/java/org/springframework/data/keyvalue/riak/core/overview.html new file mode 100644 index 000000000..dc82cc087 --- /dev/null +++ b/spring-data-riak/src/main/java/org/springframework/data/keyvalue/riak/core/overview.html @@ -0,0 +1,7 @@ + + ++ Root package for the core utilities that make up the Riak data access library. +
+ + \ No newline at end of file diff --git a/spring-data-riak/src/main/java/org/springframework/data/keyvalue/riak/groovy/RiakBuilder.java b/spring-data-riak/src/main/java/org/springframework/data/keyvalue/riak/groovy/RiakBuilder.java index 13ca114cd..381465e7d 100644 --- a/spring-data-riak/src/main/java/org/springframework/data/keyvalue/riak/groovy/RiakBuilder.java +++ b/spring-data-riak/src/main/java/org/springframework/data/keyvalue/riak/groovy/RiakBuilder.java @@ -20,8 +20,8 @@ package org.springframework.data.keyvalue.riak.groovy; import groovy.lang.Closure; import groovy.util.BuilderSupport; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.keyvalue.riak.DataStoreOperationException; import org.springframework.data.keyvalue.riak.core.AsyncRiakTemplate; @@ -60,7 +60,7 @@ public class RiakBuilder extends BuilderSupport { CALL, FOREACH, MAPREDUCE, QUERY, MAP, REDUCE, INPUTS, LANGUAGE, SOURCE, KEEP, ARG, COMPLETED, FAILED } - protected final Logger log = LoggerFactory.getLogger(getClass()); + protected final Log log = LogFactory.getLog(getClass()); @Autowired(required = false) protected AsyncRiakTemplate riak; @Autowired(required = false) diff --git a/spring-data-riak/src/main/java/org/springframework/data/keyvalue/riak/groovy/RiakMapReduceOperation.java b/spring-data-riak/src/main/java/org/springframework/data/keyvalue/riak/groovy/RiakMapReduceOperation.java index e00fc69d1..6690e94b1 100644 --- a/spring-data-riak/src/main/java/org/springframework/data/keyvalue/riak/groovy/RiakMapReduceOperation.java +++ b/spring-data-riak/src/main/java/org/springframework/data/keyvalue/riak/groovy/RiakMapReduceOperation.java @@ -19,8 +19,8 @@ package org.springframework.data.keyvalue.riak.groovy; import groovy.lang.Closure; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; import org.springframework.data.keyvalue.riak.core.AsyncKeyValueStoreOperation; import org.springframework.data.keyvalue.riak.core.AsyncRiakTemplate; import org.springframework.data.keyvalue.riak.core.KeyValueStoreMetaData; @@ -36,7 +36,7 @@ import java.util.concurrent.TimeUnit; */ public class RiakMapReduceOperation implements Callable { - protected final Logger log = LoggerFactory.getLogger(getClass()); + protected final Log log = LogFactory.getLog(getClass()); protected AsyncRiakTemplate riak; protected AsyncRiakMapReduceJob job; diff --git a/spring-data-riak/src/main/java/org/springframework/data/keyvalue/riak/groovy/RiakOperation.java b/spring-data-riak/src/main/java/org/springframework/data/keyvalue/riak/groovy/RiakOperation.java index acdf21308..0ce166410 100644 --- a/spring-data-riak/src/main/java/org/springframework/data/keyvalue/riak/groovy/RiakOperation.java +++ b/spring-data-riak/src/main/java/org/springframework/data/keyvalue/riak/groovy/RiakOperation.java @@ -19,8 +19,8 @@ package org.springframework.data.keyvalue.riak.groovy; import groovy.lang.Closure; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; import org.springframework.data.keyvalue.riak.DataStoreOperationException; import org.springframework.data.keyvalue.riak.core.AsyncKeyValueStoreOperation; import org.springframework.data.keyvalue.riak.core.AsyncRiakTemplate; @@ -42,7 +42,7 @@ public class RiakOperation+ Utilities for making Riak data access easier in Groovy. The RiakBuilder + provides a Groovy DSL for interacting with Riak. +
+ + \ No newline at end of file diff --git a/spring-data-riak/src/main/java/org/springframework/data/keyvalue/riak/mapreduce/AbstractRiakMapReduceJob.java b/spring-data-riak/src/main/java/org/springframework/data/keyvalue/riak/mapreduce/AbstractRiakMapReduceJob.java index 7de70e631..fc41e66db 100644 --- a/spring-data-riak/src/main/java/org/springframework/data/keyvalue/riak/mapreduce/AbstractRiakMapReduceJob.java +++ b/spring-data-riak/src/main/java/org/springframework/data/keyvalue/riak/mapreduce/AbstractRiakMapReduceJob.java @@ -18,11 +18,11 @@ package org.springframework.data.keyvalue.riak.mapreduce; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; import org.codehaus.jackson.JsonFactory; import org.codehaus.jackson.JsonGenerator; import org.codehaus.jackson.map.ObjectMapper; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; import org.springframework.data.keyvalue.riak.core.BucketKeyPair; import java.io.IOException; @@ -40,7 +40,7 @@ import java.util.Map; @SuppressWarnings({"unchecked"}) public abstract class AbstractRiakMapReduceJob implements MapReduceJob { - protected final Logger log = LoggerFactory.getLogger(getClass()); + protected final Log log = LogFactory.getLog(getClass()); protected List