From c94d2c9fe12afe0fbe504efc02db306c68ec851e Mon Sep 17 00:00:00 2001 From: "J. Brisbin" Date: Wed, 8 Dec 2010 16:13:58 -0600 Subject: [PATCH 1/6] Split template into two variants, added tests back in, minor tweaks. --- spring-data-riak/pom.xml | 3 +- .../riak/core/AbstractRiakTemplate.java | 359 +++++++++++ .../core/BucketKeyValueStoreOperations.java | 204 +++++++ .../riak/core/KeyValueStoreMetaData.java | 2 + .../riak/core/RiakKeyValueTemplate.java | 349 +++++++++++ .../data/keyvalue/riak/core/RiakMetaData.java | 5 + .../data/keyvalue/riak/core/RiakTemplate.java | 558 ++++-------------- .../riak/core/RiakTemplateSpec.groovy | 12 +- .../data/RiakTemplateTests.xml | 3 +- 9 files changed, 1039 insertions(+), 456 deletions(-) create mode 100644 spring-data-riak/src/main/java/org/springframework/data/keyvalue/riak/core/AbstractRiakTemplate.java create mode 100644 spring-data-riak/src/main/java/org/springframework/data/keyvalue/riak/core/BucketKeyValueStoreOperations.java create mode 100644 spring-data-riak/src/main/java/org/springframework/data/keyvalue/riak/core/RiakKeyValueTemplate.java diff --git a/spring-data-riak/pom.xml b/spring-data-riak/pom.xml index a6813e788..5b352a9ea 100644 --- a/spring-data-riak/pom.xml +++ b/spring-data-riak/pom.xml @@ -126,7 +126,7 @@ com.springsource.bundlor com.springsource.bundlor.maven - org.spockframework spock-maven @@ -168,7 +168,6 @@ - --> diff --git a/spring-data-riak/src/main/java/org/springframework/data/keyvalue/riak/core/AbstractRiakTemplate.java b/spring-data-riak/src/main/java/org/springframework/data/keyvalue/riak/core/AbstractRiakTemplate.java new file mode 100644 index 000000000..abf45a9fd --- /dev/null +++ b/spring-data-riak/src/main/java/org/springframework/data/keyvalue/riak/core/AbstractRiakTemplate.java @@ -0,0 +1,359 @@ +/* + * Copyright (c) 2010 by J. Brisbin + * Portions (c) 2010 by NPC International, Inc. or the + * original author(s). + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.springframework.data.keyvalue.riak.core; + +import org.codehaus.groovy.runtime.GStringImpl; +import org.codehaus.jackson.map.ObjectMapper; +import org.codehaus.jackson.map.ser.CustomSerializerFactory; +import org.codehaus.jackson.map.ser.ToStringSerializer; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.InitializingBean; +import org.springframework.core.convert.ConversionService; +import org.springframework.core.convert.support.ConversionServiceFactory; +import org.springframework.data.keyvalue.riak.DataStoreOperationException; +import org.springframework.data.keyvalue.riak.convert.KeyValueStoreMetaData; +import org.springframework.http.HttpHeaders; +import org.springframework.http.MediaType; +import org.springframework.http.client.ClientHttpRequestFactory; +import org.springframework.http.converter.HttpMessageConverter; +import org.springframework.http.converter.json.MappingJacksonHttpMessageConverter; +import org.springframework.util.Assert; +import org.springframework.util.ClassUtils; +import org.springframework.util.StringUtils; +import org.springframework.web.client.RestTemplate; +import org.springframework.web.client.support.RestGatewaySupport; + +import java.io.IOException; +import java.lang.annotation.Annotation; +import java.text.ParseException; +import java.text.SimpleDateFormat; +import java.util.*; +import java.util.concurrent.ConcurrentSkipListMap; +import java.util.concurrent.ExecutorService; +import java.util.concurrent.Executors; +import java.util.regex.Matcher; +import java.util.regex.Pattern; + +/** + * Base class for RiakTemplates that defines basic behaviour common to both kinds of templates + * (Key/Value and Bucket/Key/Value). + * + * @author J. Brisbin + */ +public abstract class AbstractRiakTemplate extends RestGatewaySupport implements InitializingBean { + + /** + * Client ID used by Riak to correlate updates. + */ + protected static final String RIAK_CLIENT_ID = "org.springframework.data.keyvalue.riak.core.RiakTemplate/1.0"; + /** + * Regex used to extract host, port, and prefix from the given URI. + */ + protected static final Pattern prefix = Pattern.compile( + "http[s]?://(\\S+):([0-9]+)/(\\S+)/\\{bucket\\}(\\S+)"); + /** + * Do we need to handle Groovy strings in the Jackson JSON processor? + */ + protected static final boolean groovyPresent = ClassUtils.isPresent( + "org.codehaus.groovy.runtime.GStringImpl", + RiakTemplate.class.getClassLoader()); + /** + * For getting a 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()); + /** + * For converting objects to/from other kinds of objects. + */ + protected ConversionService conversionService = ConversionServiceFactory.createDefaultConversionService(); + /** + * For caching objects based on ETags. + */ + protected ConcurrentSkipListMap> cache = new ConcurrentSkipListMap>(); + /** + * Whether or not to use the ETag-based cache. + */ + protected boolean useCache = true; + /** + * {@link java.util.concurrent.ExecutorService} to use for running asynchronous jobs. + */ + protected ExecutorService executorService = Executors.newCachedThreadPool(); + /** + * The URI to use inside the RestTemplate. + */ + protected String defaultUri = "http://localhost:8098/riak/{bucket}/{key}"; + /** + * The URI for the Riak Map/Reduce API. + */ + protected String mapReduceUri = "http://localhost:8098/mapred"; + /** + * A list of resolvers to turn a single object into a {@link BucketKeyPair}. + */ + protected List bucketKeyResolvers; + /** + * The default QosParameters to use for all operations through this template. + */ + protected QosParameters defaultQosParameters = null; + + /** + * Take all the defaults. + */ + public AbstractRiakTemplate() { + setRestTemplate(new RestTemplate()); + } + + /** + * Use the specified {@link org.springframework.http.client.ClientHttpRequestFactory}. + * + * @param requestFactory + */ + public AbstractRiakTemplate(ClientHttpRequestFactory requestFactory) { + super(requestFactory); + setRestTemplate(new RestTemplate()); + } + + public ConversionService getConversionService() { + return conversionService; + } + + /** + * Specify the conversion service to use. + * + * @param conversionService + */ + public void setConversionService(ConversionService conversionService) { + this.conversionService = conversionService; + } + + public String getDefaultUri() { + return defaultUri; + } + + public void setDefaultUri(String defaultUri) { + this.defaultUri = defaultUri; + } + + public String getMapReduceUri() { + return mapReduceUri; + } + + public void setMapReduceUri(String mapReduceUri) { + this.mapReduceUri = mapReduceUri; + } + + public boolean isUseCache() { + return useCache; + } + + public void setUseCache(boolean useCache) { + this.useCache = useCache; + } + + /** + * Extract the prefix from the URI for use in creating links. + * + * @return + */ + public String getPrefix() { + Matcher m = prefix.matcher(defaultUri); + if (m.matches()) { + return "/" + m.group(3); + } + return "/riak"; + } + + public ExecutorService getExecutorService() { + return executorService; + } + + public void setExecutorService(ExecutorService executorService) { + this.executorService = executorService; + } + + public void afterPropertiesSet() throws Exception { + Assert.notNull(conversionService, + "Must specify a valid ConversionService."); + if (null == bucketKeyResolvers) { + bucketKeyResolvers = new ArrayList(); + bucketKeyResolvers.add(new SimpleBucketKeyResolver()); + } + + List> converters = getRestTemplate().getMessageConverters(); + ObjectMapper mapper = new ObjectMapper(); + CustomSerializerFactory fac = new CustomSerializerFactory(); + if (groovyPresent) { + // Native conversion for Groovy GString objects + fac.addSpecificMapping(GStringImpl.class, ToStringSerializer.instance); + } + mapper.setSerializerFactory(fac); + for (HttpMessageConverter converter : converters) { + if (converter instanceof MappingJacksonHttpMessageConverter) { + ((MappingJacksonHttpMessageConverter) converter).setObjectMapper( + mapper); + } + } + } + /*----------------- Utilities -----------------*/ + + @SuppressWarnings({"unchecked"}) + protected BucketKeyPair resolveBucketKeyPair(Object key, Object val) { + BucketKeyResolver resolver = null; + for (BucketKeyResolver r : bucketKeyResolvers) { + if (r.canResolve(key)) { + resolver = r; + 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(bucket, + bucketKeyPair.getKey()); + } + } + } + return bucketKeyPair; + } + throw new DataStoreOperationException(String.format( + "No resolvers available to resolve bucket/key pair from %s", + key)); + } + + protected MediaType extractMediaType(Object value) { + MediaType mediaType = (value instanceof byte[] ? MediaType.APPLICATION_OCTET_STREAM : MediaType.APPLICATION_JSON); + if (value.getClass().getAnnotations().length > 0) { + KeyValueStoreMetaData meta = value.getClass() + .getAnnotation(KeyValueStoreMetaData.class); + if (null != meta) { + // Use the media type specified on the annotation. + mediaType = MediaType.parseMediaType(meta.mediaType()); + } + } + return mediaType; + } + + protected RiakMetaData extractMetaData(HttpHeaders headers) throws + IOException { + Map props = new LinkedHashMap(); + for (Map.Entry> entry : headers.entrySet()) { + List val = entry.getValue(); + Object prop = (1 == val.size() ? val.get(0) : val); + try { + if (entry.getKey().equals("Last-Modified") || entry.getKey() + .equals("Date")) { + prop = httpDate.parse(val.get(0)); + } + } catch (ParseException e) { + log.error(e.getMessage(), e); + } + + if (entry.getKey().equals("Link")) { + List links = new ArrayList(); + for (String link : entry.getValue()) { + String[] parts = link.split(","); + for (String part : parts) { + String s = part.replaceAll("<(.+)>; rel=\"(\\S+)\"[,]?", "").trim(); + if (!"".equals(s)) { + links.add(s); + } + } + } + props.put("Link", links); + } else { + props.put(entry.getKey().toString(), prop); + } + } + props.put("ETag", headers.getETag()); + RiakMetaData meta = new RiakMetaData(headers.getContentType(), props); + + return meta; + } + + @SuppressWarnings({"unchecked"}) + protected T checkCache(K key, Class requiredType) { + BucketKeyPair bucketKeyPair = resolveBucketKeyPair(key, requiredType); + RiakValue obj = cache.get(bucketKeyPair); + if (null != obj) { + String bucketName = (null != bucketKeyPair.getBucket() ? bucketKeyPair.getBucket() + .toString() : requiredType.getName()); + RestTemplate restTemplate = getRestTemplate(); + HttpHeaders resp = restTemplate.headForHeaders(defaultUri, + bucketName, + bucketKeyPair.getKey()); + if (!obj.getMetaData() + .getProperties() + .get("ETag") + .toString() + .equals(resp.getETag())) { + obj = null; + } else { + if (log.isDebugEnabled()) { + log.debug("Returning CACHED object: " + obj); + } + } + } + + if (null != obj && obj.getClass() == requiredType) { + return (T) obj.get(); + } else { + return null; + } + } + + /** + * Get a string that represents the QOS parameters, taken either from the specified object or + * from the template defaults. + * + * @param qosParams + * @return + */ + protected String extractQosParameters(QosParameters qosParams) { + List params = new LinkedList(); + if (null != qosParams.getReadThreshold()) { + params.add(String.format("r=%s", qosParams.getReadThreshold())); + } else if (null != defaultQosParameters && null != defaultQosParameters.getReadThreshold()) { + params.add(String.format("r=%s", defaultQosParameters.getReadThreshold())); + } + if (null != qosParams.getWriteThreshold()) { + params.add(String.format("w=%s", qosParams.getWriteThreshold())); + } else if (null != defaultQosParameters && null != defaultQosParameters.getWriteThreshold()) { + params.add(String.format("w=%s", defaultQosParameters.getWriteThreshold())); + } + if (null != qosParams.getDurableWriteThreshold()) { + params.add(String.format("dw=%s", qosParams.getDurableWriteThreshold())); + } else if (null != defaultQosParameters && null != defaultQosParameters.getDurableWriteThreshold()) { + params.add(String.format("dw=%s", defaultQosParameters.getDurableWriteThreshold())); + } + + return (params.size() > 0 ? "?" + StringUtils.collectionToDelimitedString( + params, + "&") : ""); + } + +} diff --git a/spring-data-riak/src/main/java/org/springframework/data/keyvalue/riak/core/BucketKeyValueStoreOperations.java b/spring-data-riak/src/main/java/org/springframework/data/keyvalue/riak/core/BucketKeyValueStoreOperations.java new file mode 100644 index 000000000..13398d08b --- /dev/null +++ b/spring-data-riak/src/main/java/org/springframework/data/keyvalue/riak/core/BucketKeyValueStoreOperations.java @@ -0,0 +1,204 @@ +/* + * Copyright (c) 2010 by J. Brisbin + * Portions (c) 2010 by NPC International, Inc. or the + * original author(s). + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.springframework.data.keyvalue.riak.core; + +import java.util.Map; + +/** + * @author J. Brisbin + */ +public interface BucketKeyValueStoreOperations { + + /** + * Variant of {@link org.springframework.data.keyvalue.riak.core.KeyValueStoreOperations#set(Object, + * Object)} that takes a discreet bucket and key pair. + * + * @param bucket + * @param key + * @param value + * @return + */ + BucketKeyValueStoreOperations set(B bucket, K key, V value); + + /** + * Variant of {@link org.springframework.data.keyvalue.riak.core.KeyValueStoreOperations#set(Object, + * Object, QosParameters)} that takes a discreet bucket and key pair. + * + * @param bucket + * @param key + * @param value + * @param qosParams + * @return + */ + BucketKeyValueStoreOperations set(B bucket, K key, V value, QosParameters qosParams); + + /** + * Variant of {@link org.springframework.data.keyvalue.riak.core.KeyValueStoreOperations#setAsBytes(Object, + * byte[])} that takes a discreet bucket and key pair. + * + * @param bucket + * @param key + * @param value + * @return + */ + BucketKeyValueStoreOperations setAsBytes(B bucket, K key, byte[] value); + + /** + * Variant of {@link org.springframework.data.keyvalue.riak.core.KeyValueStoreOperations#setWithMetaData(Object, + * Object, java.util.Map, QosParameters)} that takes a discreet bucket and key pair. + * + * @param bucket + * @param key + * @param value + * @param metaData + * @param qosParams + * @return + */ + BucketKeyValueStoreOperations setWithMetaData(B bucket, K key, V value, Map metaData, QosParameters qosParams); + + /** + * Variant of {@link org.springframework.data.keyvalue.riak.core.KeyValueStoreOperations#get(Object)} + * that takes a discreet bucket and key pair. + * + * @param bucket + * @param key + * @return + */ + V get(B bucket, K key); + + /** + * Variant of {@link org.springframework.data.keyvalue.riak.core.KeyValueStoreOperations#getAsBytes(Object)} + * that takes a discreet bucket and key pair. + * + * @param bucket + * @param key + * @return + */ + byte[] getAsBytes(B bucket, K key); + + /** + * Variant of {@link org.springframework.data.keyvalue.riak.core.KeyValueStoreOperations#getAsType(Object, + * Class)} that takes a discreet bucket and key pair. + * + * @param bucket + * @param key + * @param requiredType + * @return + */ + T getAsType(B bucket, K key, Class requiredType); + + /** + * Variant of {@link org.springframework.data.keyvalue.riak.core.KeyValueStoreOperations#getAndSet(Object, + * Object)} that takes a discreet bucket and key pair. + * + * @param bucket + * @param key + * @param value + * @return + */ + V getAndSet(B bucket, K key, V value); + + /** + * Variant of {@link org.springframework.data.keyvalue.riak.core.KeyValueStoreOperations#getAndSetAsBytes(Object, + * byte[])} that takes a discreet bucket and key pair. + * + * @param bucket + * @param key + * @param value + * @return + */ + byte[] getAndSetAsBytes(B bucket, K key, byte[] value); + + /** + * Variant of {@link org.springframework.data.keyvalue.riak.core.KeyValueStoreOperations#getAndSetAsType(Object, + * Object, Class)} that takes a discreet bucket and key pair. + * + * @param bucket + * @param key + * @param value + * @param requiredType + * @return + */ + T getAndSetAsType(B bucket, K key, V value, Class requiredType); + + /** + * Variant of {@link org.springframework.data.keyvalue.riak.core.KeyValueStoreOperations#setIfKeyNonExistent(Object, + * Object)} that takes a discreet bucket and key pair. + * + * @param bucket + * @param key + * @param value + * @return + */ + BucketKeyValueStoreOperations setIfKeyNonExistent(B bucket, K key, V value); + + /** + * Variant of {@link org.springframework.data.keyvalue.riak.core.KeyValueStoreOperations#setIfKeyNonExistentAsBytes(Object, + * byte[])} that takes a discreet bucket and key pair. + * + * @param bucket + * @param key + * @param value + * @return + */ + BucketKeyValueStoreOperations setIfKeyNonExistentAsBytes(B bucket, K key, byte[] value); + + /** + * Variant of {@link org.springframework.data.keyvalue.riak.core.KeyValueStoreOperations#containsKey(Object)} + * that takes a discreet bucket and key pair. + * + * @param bucket + * @param key + * @return + */ + boolean containsKey(B bucket, K key); + + /** + * Delete a specific entry from this data store. + * + * @param bucket + * @param key + * @return + */ + boolean delete(B bucket, K key); + + /** + * Variant of {@link org.springframework.data.keyvalue.riak.core.KeyValueStoreOperations#setAsBytes(Object, + * byte[], QosParameters)} that takes a discreet bucket and key pair. + * + * @param bucket + * @param key + * @param value + * @param qosParams + * @return + */ + BucketKeyValueStoreOperations setAsBytes(B bucket, K key, byte[] value, QosParameters qosParams); + + /** + * Variant of {@link org.springframework.data.keyvalue.riak.core.KeyValueStoreOperations#setWithMetaData(Object, + * Object, java.util.Map)} that takes a discreet bucket and key pair. + * + * @param bucket + * @param key + * @param value + * @param metaData + * @return + */ + BucketKeyValueStoreOperations setWithMetaData(B bucket, K key, V value, Map metaData); +} diff --git a/spring-data-riak/src/main/java/org/springframework/data/keyvalue/riak/core/KeyValueStoreMetaData.java b/spring-data-riak/src/main/java/org/springframework/data/keyvalue/riak/core/KeyValueStoreMetaData.java index e193fe41f..9a95c572c 100644 --- a/spring-data-riak/src/main/java/org/springframework/data/keyvalue/riak/core/KeyValueStoreMetaData.java +++ b/spring-data-riak/src/main/java/org/springframework/data/keyvalue/riak/core/KeyValueStoreMetaData.java @@ -36,6 +36,8 @@ public interface KeyValueStoreMetaData { */ MediaType getContentType(); + long getLastModified(); + /** * Get the arbitrary properties for this object. * diff --git a/spring-data-riak/src/main/java/org/springframework/data/keyvalue/riak/core/RiakKeyValueTemplate.java b/spring-data-riak/src/main/java/org/springframework/data/keyvalue/riak/core/RiakKeyValueTemplate.java new file mode 100644 index 000000000..edb9b4e44 --- /dev/null +++ b/spring-data-riak/src/main/java/org/springframework/data/keyvalue/riak/core/RiakKeyValueTemplate.java @@ -0,0 +1,349 @@ +/* + * Copyright (c) 2010 by J. Brisbin + * Portions (c) 2010 by NPC International, Inc. or the + * original author(s). + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.springframework.data.keyvalue.riak.core; + +import org.springframework.beans.factory.InitializingBean; +import org.springframework.data.keyvalue.riak.mapreduce.MapReduceJob; +import org.springframework.data.keyvalue.riak.mapreduce.MapReduceOperations; +import org.springframework.data.keyvalue.riak.mapreduce.RiakMapReduceJob; +import org.springframework.http.client.ClientHttpRequestFactory; +import org.springframework.util.Assert; +import org.springframework.web.client.RestTemplate; + +import java.util.ArrayList; +import java.util.List; +import java.util.Map; +import java.util.concurrent.Future; + +/** + * An implementation of {@link org.springframework.data.keyvalue.riak.core.KeyValueStoreOperations} + * and {@link org.springframework.data.keyvalue.riak.mapreduce.MapReduceOperations} for the Riak + * data store. + *

+ * To use the RiakTemplate, create a singleton in your Spring application-context.xml: + * 


+ * <bean id="riak" class="org.springframework.data.keyvalue.riak.core.RiakTemplate"
+ *     p:defaultUri="http://localhost:8098/riak/{bucket}/{key}"
+ *     p:mapReduceUri="http://localhost:8098/mapred"/>
+ *
+ * To store and retrieve objects in Riak, use the setXXX and getXXX methods (example in + * Groovy): + * 

+ * def obj = new TestObject(name: "My Name", age: 40)
+ * riak.set([bucket: "mybucket", key: "mykey"], obj)
+ * ...
+ * def name = riak.get([bucket: "mybucket", key: "mykey"]).name
+ * println "Hello $name!"
+ *
+ * You're key object should be one of:
  • A String encoding the bucket and key + * together, separated by a colon. e.g. "mybucket:mykey"
  • An implementation of + * BucketKeyPair (like {@link org.springframework.data.keyvalue.riak.core.SimpleBucketKeyPair})
    • + *
  • A Map with both a "bucket" and a "key" specified.
  • A + * String of only the key name, but specifying a bucket by using the {@link + * org.springframework.data.keyvalue.riak.convert.KeyValueStoreMetaData} annotation on the + * object you're storing.
+ * + * @author J. Brisbin + */ +public class RiakKeyValueTemplate extends AbstractRiakTemplate implements KeyValueStoreOperations, MapReduceOperations, InitializingBean { + + protected RiakTemplate riak; + + /** + * Take all the defaults. + */ + public RiakKeyValueTemplate() { + super(); + riak = new RiakTemplate(); + } + + /** + * Use the specified {@link org.springframework.http.client.ClientHttpRequestFactory}. + * + * @param requestFactory + */ + public RiakKeyValueTemplate(ClientHttpRequestFactory requestFactory) { + super(requestFactory); + riak = new RiakTemplate(requestFactory); + } + + /** + * Use the specified defaultUri and mapReduceUri. + * + * @param defaultUri + * @param mapReduceUri + */ + public RiakKeyValueTemplate(String defaultUri, String mapReduceUri) { + setRestTemplate(new RestTemplate()); + this.setDefaultUri(defaultUri); + this.mapReduceUri = mapReduceUri; + this.riak = new RiakTemplate(defaultUri, mapReduceUri); + } + + @Override + public void afterPropertiesSet() throws Exception { + super.afterPropertiesSet(); + riak.afterPropertiesSet(); + } + + /*----------------- Set Operations -----------------*/ + + public KeyValueStoreOperations set(K key, V value) { + return setWithMetaData(key, value, null, null); + } + + public KeyValueStoreOperations set(K key, V value, QosParameters qosParams) { + return setWithMetaData(key, value, null, qosParams); + } + + public KeyValueStoreOperations setAsBytes(K key, byte[] value) { + return setAsBytes(key, value, null); + } + + public KeyValueStoreOperations setAsBytes(K key, byte[] value, QosParameters qosParams) { + Assert.notNull(key, "Key cannot be null!"); + BucketKeyPair bucketKeyPair = resolveBucketKeyPair(key, value); + riak.setAsBytes(bucketKeyPair.getBucket(), bucketKeyPair.getKey(), value, qosParams); + return this; + } + + public KeyValueStoreOperations setWithMetaData(K key, V value, Map metaData, QosParameters qosParams) { + BucketKeyPair bucketKeyPair = resolveBucketKeyPair(key, value); + riak.setWithMetaData(bucketKeyPair.getBucket(), + bucketKeyPair.getKey(), + value, + metaData, + qosParams); + return this; + } + + public KeyValueStoreOperations setWithMetaData(K key, V value, Map metaData) { + BucketKeyPair bucketKeyPair = resolveBucketKeyPair(key, value); + riak.setWithMetaData(bucketKeyPair.getBucket(), + bucketKeyPair.getKey(), + value, + metaData, + null); + return this; + } + + /*----------------- Get Operations -----------------*/ + + public RiakMetaData getMetaData(K key) { + BucketKeyPair bucketKeyPair = resolveBucketKeyPair(key, null); + return riak.getMetaData(bucketKeyPair.getBucket(), bucketKeyPair.getKey()); + } + + public RiakValue getWithMetaData(K key, Class requiredType) { + BucketKeyPair bucketKeyPair = resolveBucketKeyPair(key, null); + return riak.getWithMetaData(bucketKeyPair.getBucket(), + bucketKeyPair.getKey(), + requiredType); + } + + @SuppressWarnings({"unchecked"}) + public V get(K key) { + BucketKeyPair bucketKeyPair = resolveBucketKeyPair(key, null); + return (V) riak.get(bucketKeyPair.getBucket(), bucketKeyPair.getKey()); + } + + public byte[] getAsBytes(K key) { + BucketKeyPair bucketKeyPair = resolveBucketKeyPair(key, null); + RiakValue obj = riak.getAsBytesWithMetaData(bucketKeyPair.getBucket(), + bucketKeyPair.getKey()); + return (null != obj ? obj.get() : null); + } + + public RiakValue getAsBytesWithMetaData(K key) { + BucketKeyPair bucketKeyPair = resolveBucketKeyPair(key, null); + return riak.getAsBytesWithMetaData(bucketKeyPair.getBucket(), bucketKeyPair.getKey()); + } + + public T getAsType(K key, Class requiredType) { + BucketKeyPair bucketKeyPair = resolveBucketKeyPair(key, null); + return riak.getAsType(bucketKeyPair.getBucket(), bucketKeyPair.getKey(), requiredType); + } + + public V getAndSet(K key, V value) { + BucketKeyPair bucketKeyPair = resolveBucketKeyPair(key, null); + return riak.getAndSet(bucketKeyPair.getBucket(), bucketKeyPair.getKey(), value); + } + + public byte[] getAndSetAsBytes(K key, byte[] value) { + BucketKeyPair bucketKeyPair = resolveBucketKeyPair(key, null); + return riak.getAndSetAsBytes(bucketKeyPair.getBucket(), bucketKeyPair.getKey(), value); + } + + public T getAndSetAsType(K key, V value, Class requiredType) { + BucketKeyPair bucketKeyPair = resolveBucketKeyPair(key, null); + return riak.getAndSetAsType(bucketKeyPair.getBucket(), + bucketKeyPair.getKey(), + value, + requiredType); + } + + @SuppressWarnings({"unchecked"}) + public List getValues(List keys) { + List results = new ArrayList(); + for (K key : keys) { + BucketKeyPair bkp = resolveBucketKeyPair(key, null); + results.add((V) riak.get(bkp.getBucket(), bkp.getKey())); + } + return results; + } + + public List getValues(K... keys) { + return getValues(keys); + } + + public List getValuesAsType(List keys, Class requiredType) { + List results = new ArrayList(); + for (K key : keys) { + BucketKeyPair bkp = resolveBucketKeyPair(key, null); + results.add(riak.getAsType(bkp.getBucket(), bkp.getKey(), requiredType)); + } + return results; + } + + public List getValuesAsType(Class requiredType, K... keys) { + return riak.getValuesAsType(requiredType, keys); + } + + /*----------------- Only-Set-Once Operations -----------------*/ + + public KeyValueStoreOperations setIfKeyNonExistent(K key, V value) { + BucketKeyPair bucketKeyPair = resolveBucketKeyPair(key, null); + riak.setIfKeyNonExistent(bucketKeyPair.getBucket(), bucketKeyPair.getKey(), value); + return this; + } + + public KeyValueStoreOperations setIfKeyNonExistentAsBytes(K key, byte[] value) { + BucketKeyPair bucketKeyPair = resolveBucketKeyPair(key, null); + riak.setIfKeyNonExistent(bucketKeyPair.getBucket(), bucketKeyPair.getKey(), value); + return this; + } + + /*----------------- Multiple Item Operations -----------------*/ + + public KeyValueStoreOperations setMultiple(Map keysAndValues) { + for (Map.Entry entry : keysAndValues.entrySet()) { + set(entry.getKey(), entry.getValue()); + } + return this; + } + + public KeyValueStoreOperations setMultipleAsBytes(Map keysAndValues) { + for (Map.Entry entry : keysAndValues.entrySet()) { + setAsBytes(entry.getKey(), entry.getValue()); + } + return this; + } + + public KeyValueStoreOperations setMultipleIfKeysNonExistent(Map keysAndValues) { + for (Map.Entry entry : keysAndValues.entrySet()) { + setIfKeyNonExistent(entry.getKey(), entry.getValue()); + } + return this; + } + + public KeyValueStoreOperations setMultipleAsBytesIfKeysNonExistent(Map keysAndValues) { + for (Map.Entry entry : keysAndValues.entrySet()) { + setIfKeyNonExistentAsBytes(entry.getKey(), entry.getValue()); + } + return this; + } + + /*----------------- Key Operations -----------------*/ + + public boolean containsKey(K key) { + BucketKeyPair bucketKeyPair = resolveBucketKeyPair(key, null); + return riak.containsKey(bucketKeyPair.getBucket(), bucketKeyPair.getKey()); + } + + public boolean deleteKeys(K... keys) { + return riak.deleteKeys(keys); + } + + /*----------------- Map/Reduce Operations -----------------*/ + + public RiakMapReduceJob createMapReduceJob() { + return new RiakMapReduceJob(riak); + } + + public Object execute(MapReduceJob job) { + return execute(job, List.class); + } + + public T execute(MapReduceJob job, Class targetType) { + return riak.execute(job, targetType); + } + + public Future> submit(MapReduceJob job) { + // Run this job asynchronously. + return riak.submit(job); + } + + /*----------------- Link Operations -----------------*/ + + /** + * Use Riak's native Link mechanism to link two entries together. + * + * @param destination Key to the child object + * @param source Key to the parent object + * @param tag The tag for this relationship + * @return This template interface + */ + public RiakKeyValueTemplate link(K1 destination, K2 source, String tag) { + BucketKeyPair bkpFrom = resolveBucketKeyPair(source, null); + BucketKeyPair bkpTo = resolveBucketKeyPair(destination, null); + riak.link(bkpTo.getBucket(), bkpTo.getKey(), bkpFrom.getBucket(), bkpFrom.getKey(), tag); + return this; + } + + /** + * Use Riak's link walking mechanism to retrieve a multipart message that will be decoded like + * they were individual objects (e.g. using the built-in HttpMessageConverters of + * RestTemplate). + * + * @param source + * @param tag + * @return + */ + @SuppressWarnings({"unchecked"}) + public T linkWalk(K source, String tag) { + BucketKeyPair bkpSource = resolveBucketKeyPair(source, null); + return (T) riak.linkWalk(bkpSource.getBucket(), bkpSource.getKey(), tag); + } + + /*----------------- Bucket Operations -----------------*/ + + public Map getBucketSchema(B bucket) { + return riak.getBucketSchema(bucket, false); + } + + public Map getBucketSchema(B bucket, boolean listKeys) { + return riak.getBucketSchema(bucket, listKeys); + } + + public KeyValueStoreOperations updateBucketSchema(B bucket, Map props) { + riak.updateBucketSchema(bucket, props); + return this; + } + +} diff --git a/spring-data-riak/src/main/java/org/springframework/data/keyvalue/riak/core/RiakMetaData.java b/spring-data-riak/src/main/java/org/springframework/data/keyvalue/riak/core/RiakMetaData.java index 69d3a6cd2..2c96eff21 100644 --- a/spring-data-riak/src/main/java/org/springframework/data/keyvalue/riak/core/RiakMetaData.java +++ b/spring-data-riak/src/main/java/org/springframework/data/keyvalue/riak/core/RiakMetaData.java @@ -20,6 +20,7 @@ package org.springframework.data.keyvalue.riak.core; import org.springframework.http.MediaType; +import java.util.Date; import java.util.Map; /** @@ -46,6 +47,10 @@ public class RiakMetaData implements KeyValueStoreMetaData { return mediaType; } + public long getLastModified() { + return ((Date) properties.get("Last-Modified")).getTime(); + } + public Map getProperties() { return this.properties; } diff --git a/spring-data-riak/src/main/java/org/springframework/data/keyvalue/riak/core/RiakTemplate.java b/spring-data-riak/src/main/java/org/springframework/data/keyvalue/riak/core/RiakTemplate.java index 723acd6d1..ec7d1df40 100644 --- a/spring-data-riak/src/main/java/org/springframework/data/keyvalue/riak/core/RiakTemplate.java +++ b/spring-data-riak/src/main/java/org/springframework/data/keyvalue/riak/core/RiakTemplate.java @@ -18,18 +18,9 @@ package org.springframework.data.keyvalue.riak.core; -import org.codehaus.groovy.runtime.GStringImpl; -import org.codehaus.jackson.map.ObjectMapper; -import org.codehaus.jackson.map.ser.CustomSerializerFactory; -import org.codehaus.jackson.map.ser.ToStringSerializer; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.beans.factory.InitializingBean; import org.springframework.core.convert.ConversionService; -import org.springframework.core.convert.support.ConversionServiceFactory; import org.springframework.dao.DataAccessResourceFailureException; import org.springframework.data.keyvalue.riak.DataStoreOperationException; -import org.springframework.data.keyvalue.riak.convert.KeyValueStoreMetaData; import org.springframework.data.keyvalue.riak.mapreduce.MapReduceJob; import org.springframework.data.keyvalue.riak.mapreduce.MapReduceOperations; import org.springframework.data.keyvalue.riak.mapreduce.RiakMapReduceJob; @@ -38,12 +29,9 @@ import org.springframework.http.client.ClientHttpRequest; import org.springframework.http.client.ClientHttpRequestFactory; import org.springframework.http.client.ClientHttpResponse; import org.springframework.http.converter.HttpMessageConverter; -import org.springframework.http.converter.json.MappingJacksonHttpMessageConverter; import org.springframework.util.Assert; -import org.springframework.util.ClassUtils; import org.springframework.util.StringUtils; import org.springframework.web.client.*; -import org.springframework.web.client.support.RestGatewaySupport; import javax.mail.BodyPart; import javax.mail.MessagingException; @@ -53,19 +41,11 @@ import java.io.ByteArrayOutputStream; import java.io.EOFException; import java.io.IOException; import java.io.InputStream; -import java.lang.annotation.Annotation; -import java.text.ParseException; -import java.text.SimpleDateFormat; import java.util.*; -import java.util.concurrent.ConcurrentSkipListMap; -import java.util.concurrent.ExecutorService; -import java.util.concurrent.Executors; import java.util.concurrent.Future; -import java.util.regex.Matcher; -import java.util.regex.Pattern; /** - * An implementation of {@link org.springframework.data.keyvalue.riak.core.KeyValueStoreOperations} + * An implementation of {@link org.springframework.data.keyvalue.riak.core.BucketKeyValueStoreOperations} * and {@link org.springframework.data.keyvalue.riak.mapreduce.MapReduceOperations} for the Riak * data store. *

@@ -79,84 +59,21 @@ import java.util.regex.Pattern; * Groovy): * 


  * def obj = new TestObject(name: "My Name", age: 40)
- * riak.set([bucket: "mybucket", key: "mykey"], obj)
+ * riak.set("mybucket", "mykey", obj)
  * ...
- * def name = riak.get([bucket: "mybucket", key: "mykey"]).name
+ * def name = riak.get("mybucket", "mykey").name
  * println "Hello $name!"
  *
- * You're key object should be one of:
  • A String encoding the bucket and key - * together, separated by a colon. e.g. "mybucket:mykey"
  • An implementation of - * BucketKeyPair (like {@link org.springframework.data.keyvalue.riak.core.SimpleBucketKeyPair})
    • - *
  • A Map with both a "bucket" and a "key" specified.
  • A - * String of only the key name, but specifying a bucket by using the {@link - * org.springframework.data.keyvalue.riak.convert.KeyValueStoreMetaData} annotation on the - * object you're storing.
* * @author J. Brisbin */ -@SuppressWarnings({"unchecked"}) -public class RiakTemplate extends RestGatewaySupport implements KeyValueStoreOperations, MapReduceOperations, InitializingBean { - - /** - * Client ID used by Riak to correlate updates. - */ - private static final String RIAK_CLIENT_ID = "org.springframework.data.keyvalue.riak.core.RiakTemplate/1.0"; - /** - * Regex used to extract host, port, and prefix from the given URI. - */ - private static final Pattern prefix = Pattern.compile( - "http[s]?://(\\S+):([0-9]+)/(\\S+)/\\{bucket\\}(\\S+)"); - /** - * Do we need to handle Groovy strings in the Jackson JSON processor? - */ - private static final boolean groovyPresent = ClassUtils.isPresent( - "org.codehaus.groovy.runtime.GStringImpl", - RiakTemplate.class.getClassLoader()); - /** - * For getting a java.util.Date from the Last-Modified header. - */ - private static SimpleDateFormat httpDate = new SimpleDateFormat( - "EEE, d MMM yyyy HH:mm:ss z"); - - protected final Logger log = LoggerFactory.getLogger(getClass()); - /** - * For converting objects to/from other kinds of objects. - */ - protected ConversionService conversionService = ConversionServiceFactory.createDefaultConversionService(); - /** - * For caching objects based on ETags. - */ - protected ConcurrentSkipListMap> cache = new ConcurrentSkipListMap>(); - /** - * Whether or not to use the ETag-based cache. - */ - protected boolean useCache = true; - /** - * {@link ExecutorService} to use for running asynchronous jobs. - */ - protected ExecutorService executorService = Executors.newCachedThreadPool(); - /** - * The URI to use inside the RestTemplate. - */ - protected String defaultUri = "http://localhost:8098/riak/{bucket}/{key}"; - /** - * The URI for the Riak Map/Reduce API. - */ - protected String mapReduceUri = "http://localhost:8098/mapred"; - /** - * A list of resolvers to turn a single object into a {@link BucketKeyPair}. - */ - protected List bucketKeyResolvers; - /** - * The default QosParameters to use for all operations through this template. - */ - protected QosParameters defaultQosParameters = null; +public class RiakTemplate extends AbstractRiakTemplate implements BucketKeyValueStoreOperations, MapReduceOperations { /** * Take all the defaults. */ public RiakTemplate() { - setRestTemplate(new RestTemplate()); + super(); } /** @@ -166,7 +83,6 @@ public class RiakTemplate extends RestGatewaySupport implements KeyValueStoreOpe */ public RiakTemplate(ClientHttpRequestFactory requestFactory) { super(requestFactory); - setRestTemplate(new RestTemplate()); } /** @@ -181,99 +97,27 @@ public class RiakTemplate extends RestGatewaySupport implements KeyValueStoreOpe this.mapReduceUri = mapReduceUri; } - public ConversionService getConversionService() { - return conversionService; - } - - /** - * Specify the conversion service to use. - * - * @param conversionService - */ - public void setConversionService(ConversionService conversionService) { - this.conversionService = conversionService; - } - - public String getDefaultUri() { - return defaultUri; - } - - public void setDefaultUri(String defaultUri) { - this.defaultUri = defaultUri; - } - - public String getMapReduceUri() { - return mapReduceUri; - } - - public void setMapReduceUri(String mapReduceUri) { - this.mapReduceUri = mapReduceUri; - } - - public List getBucketKeyResolvers() { - return bucketKeyResolvers; - } - - /** - * Set the list of BucketKeyResolvers to use. - * - * @param bucketKeyResolvers - */ - public void setBucketKeyResolvers(List bucketKeyResolvers) { - this.bucketKeyResolvers = bucketKeyResolvers; - } - - public boolean isUseCache() { - return useCache; - } - - public void setUseCache(boolean useCache) { - this.useCache = useCache; - } - - /** - * Extract the prefix from the URI for use in creating links. - * - * @return - */ - public String getPrefix() { - Matcher m = prefix.matcher(defaultUri); - if (m.matches()) { - return "/" + m.group(3); - } - return "/riak"; - } - - public ExecutorService getExecutorService() { - return executorService; - } - - public void setExecutorService(ExecutorService executorService) { - this.executorService = executorService; - } /*----------------- Set Operations -----------------*/ - public KeyValueStoreOperations set(K key, V value) { - return setWithMetaData(key, value, null); + public BucketKeyValueStoreOperations set(B bucket, K key, V value) { + return setWithMetaData(bucket, key, value, null, null); } - public KeyValueStoreOperations set(K key, V value, QosParameters qosParams) { - return setWithMetaData(key, value, null, qosParams); + public BucketKeyValueStoreOperations set(B bucket, K key, V value, QosParameters qosParams) { + return setWithMetaData(bucket, key, value, null, qosParams); } - public KeyValueStoreOperations setAsBytes(K key, byte[] value) { - return setAsBytes(key, value, null); + public BucketKeyValueStoreOperations setAsBytes(B bucket, K key, byte[] value) { + return setAsBytes(bucket, key, value, null); } - public KeyValueStoreOperations setAsBytes(K key, byte[] value, QosParameters qosParams) { - Assert.notNull(key, "Can't store an object with a NULL key."); - BucketKeyPair bucketKeyPair = resolveBucketKeyPair(key, value); + public BucketKeyValueStoreOperations setAsBytes(B bucket, K key, byte[] value, QosParameters qosParams) { + Assert.notNull(key, "Key cannot be null!"); // If I don't give a bucket name, since I don't have an object type, use 'bytes' - String bucketName = (null != bucketKeyPair.getBucket() ? bucketKeyPair.getBucket() - .toString() : "bytes"); + String bucketName = (null != bucket ? bucket.toString() : "bytes"); // Get a key name that may or may not include the QOS parameters. - String keyName = (null != qosParams ? bucketKeyPair.getKey() - .toString() + extractQosParameters(qosParams) : bucketKeyPair.getKey().toString()); + String keyName = (null != qosParams ? key.toString() + extractQosParameters(qosParams) : key + .toString()); RestTemplate restTemplate = getRestTemplate(); HttpHeaders headers = new HttpHeaders(); headers.set("X-Riak-ClientId", RIAK_CLIENT_ID); @@ -282,9 +126,7 @@ public class RiakTemplate extends RestGatewaySupport implements KeyValueStoreOpe try { restTemplate.put(defaultUri, entity, bucketName, keyName); if (log.isDebugEnabled()) { - log.debug(String.format("PUT byte[]: bucket=%s, key=%s", - bucketKeyPair.getBucket(), - bucketKeyPair.getKey())); + log.debug(String.format("PUT byte[]: bucket=%s, key=%s", bucketName, keyName)); } } catch (RestClientException e) { throw new DataStoreOperationException(e.getMessage(), e); @@ -292,11 +134,10 @@ public class RiakTemplate extends RestGatewaySupport implements KeyValueStoreOpe return this; } - public KeyValueStoreOperations setWithMetaData(K key, V value, Map metaData, QosParameters qosParams) { - BucketKeyPair bucketKeyPair = resolveBucketKeyPair(key, value); + public BucketKeyValueStoreOperations setWithMetaData(B bucket, K key, V value, Map metaData, QosParameters qosParams) { // Get a key name that may or may not include the QOS parameters. - String keyName = (null != qosParams ? bucketKeyPair.getKey() - .toString() + extractQosParameters(qosParams) : bucketKeyPair.getKey().toString()); + String keyName = (null != qosParams ? key.toString() + extractQosParameters(qosParams) : key + .toString()); RestTemplate restTemplate = getRestTemplate(); HttpHeaders headers = new HttpHeaders(); headers.set("X-Riak-ClientId", RIAK_CLIENT_ID); @@ -308,12 +149,9 @@ public class RiakTemplate extends RestGatewaySupport implements KeyValueStoreOpe } HttpEntity entity = new HttpEntity(value, headers); try { - restTemplate.put(defaultUri, entity, bucketKeyPair.getBucket(), keyName); + restTemplate.put(defaultUri, entity, bucket, keyName); if (log.isDebugEnabled()) { - log.debug(String.format("PUT object: bucket=%s, key=%s, value=%s", - bucketKeyPair.getBucket(), - bucketKeyPair.getKey(), - value)); + log.debug(String.format("PUT object: bucket=%s, key=%s, value=%s", bucket, key, value)); } } catch (RestClientException e) { throw new DataStoreOperationException(e.getMessage(), e); @@ -321,22 +159,33 @@ public class RiakTemplate extends RestGatewaySupport implements KeyValueStoreOpe return this; } - public KeyValueStoreOperations setWithMetaData(K key, V value, Map metaData) { - return setWithMetaData(key, value, metaData, null); + public BucketKeyValueStoreOperations setWithMetaData(B bucket, K key, V value, Map metaData) { + return setWithMetaData(bucket, key, value, metaData, null); } /*----------------- Get Operations -----------------*/ - public RiakValue getWithMetaData(K key, Class requiredType) { - BucketKeyPair bucketKeyPair = resolveBucketKeyPair(key, null); + public RiakMetaData getMetaData(B bucket, K key) { + RestTemplate restTemplate = getRestTemplate(); + HttpHeaders headers = null; + try { + headers = restTemplate.headForHeaders(defaultUri, bucket, key); + return extractMetaData(headers); + } catch (ResourceAccessException e) { + } catch (IOException e) { + throw new DataAccessResourceFailureException(e.getMessage(), e); + } + return null; + } + + public RiakValue getWithMetaData(B bucket, K key, Class requiredType) { // If no bucket name is given, infer it from the type name. - String bucketName = (null != bucketKeyPair.getBucket() ? bucketKeyPair.getBucket() - .toString() : requiredType.getName()); + String bucketName = (null != bucket ? bucket.toString() : requiredType.getName()); RestTemplate restTemplate = getRestTemplate(); if (log.isDebugEnabled()) { log.debug(String.format("GET object: bucket=%s, key=%s, type=%s", bucketName, - bucketKeyPair.getKey(), + key, requiredType.getName())); } @@ -344,12 +193,12 @@ public class RiakTemplate extends RestGatewaySupport implements KeyValueStoreOpe ResponseEntity result = restTemplate.getForEntity(defaultUri, requiredType, bucketName, - bucketKeyPair.getKey()); + key); if (result.hasBody()) { RiakMetaData meta = extractMetaData(result.getHeaders()); - RiakValue val = new RiakValue(result.getBody(), meta); + RiakValue val = new RiakValue(result.getBody(), meta); if (useCache) { - cache.put(bucketKeyPair, val); + cache.put(new SimpleBucketKeyPair(bucket, key), val); } return val; } @@ -367,32 +216,32 @@ public class RiakTemplate extends RestGatewaySupport implements KeyValueStoreOpe return null; } - public V get(K key) { - BucketKeyPair bucketKeyPair = resolveBucketKeyPair(key, null); + @SuppressWarnings({"unchecked"}) + public T get(B bucket, K key) { Class targetClass; try { // Since no type is specified, first try using the bucket name as the target class... - targetClass = Class.forName(bucketKeyPair.getBucket().toString()); + targetClass = Class.forName(bucket.toString()); } catch (Throwable ignored) { // ...if that doesn't work, just use a Map, which we know will work. targetClass = Map.class; } - RiakValue obj = getWithMetaData(bucketKeyPair, targetClass); + RiakValue obj = getWithMetaData(bucket, key, targetClass); return (null != obj ? obj.get() : null); } - public byte[] getAsBytes(K key) { - RiakValue obj = getAsBytesWithMetaData(key); + public byte[] getAsBytes(B bucket, K key) { + RiakValue obj = getAsBytesWithMetaData(bucket, key); return (null != obj ? obj.get() : null); } - public RiakValue getAsBytesWithMetaData(K key) { - BucketKeyPair bucketKeyPair = resolveBucketKeyPair(key, null); + @SuppressWarnings({"unchecked"}) + public RiakValue getAsBytesWithMetaData(B bucket, K key) { final RestTemplate restTemplate = getRestTemplate(); if (log.isDebugEnabled()) { log.debug(String.format("GET object: bucket=%s, key=%s, type=byte[]", - bucketKeyPair.getBucket(), - bucketKeyPair.getKey())); + bucket, + key)); } try { @@ -404,6 +253,7 @@ public class RiakTemplate extends RestGatewaySupport implements KeyValueStoreOpe IOException { List mediaTypes = new ArrayList(); mediaTypes.add(MediaType.APPLICATION_JSON); + mediaTypes.add(MediaType.APPLICATION_OCTET_STREAM); request.getHeaders().setAccept(mediaTypes); } }, @@ -425,10 +275,10 @@ public class RiakTemplate extends RestGatewaySupport implements KeyValueStoreOpe return val; } }, - bucketKeyPair.getBucket(), - bucketKeyPair.getKey()); + bucket, + key); if (useCache) { - cache.put(bucketKeyPair, bytes); + cache.put(new SimpleBucketKeyPair(bucket, key), bytes); } return bytes; } catch (HttpClientErrorException e) { @@ -441,40 +291,43 @@ public class RiakTemplate extends RestGatewaySupport implements KeyValueStoreOpe return null; } - public T getAsType(K key, Class requiredType) { + @SuppressWarnings({"unchecked"}) + public T getAsType(B bucket, K key, Class requiredType) { if (useCache) { - Object obj = checkCache(key, requiredType); + Object obj = checkCache(new SimpleBucketKeyPair(bucket, key), requiredType); if (null != obj) { return (T) obj; } } - RiakValue obj = getWithMetaData(key, requiredType); + RiakValue obj = getWithMetaData(bucket, key, requiredType); return (null != obj ? obj.get() : null); } - public V getAndSet(K key, V value) { - V old = (V) getAsType(key, value.getClass()); - set(key, value); + @SuppressWarnings({"unchecked"}) + public V getAndSet(B bucket, K key, V value) { + V old = (V) getAsType(bucket, key, value.getClass()); + set(bucket, key, value, null); return old; } - public byte[] getAndSetAsBytes(K key, byte[] value) { - byte[] old = getAsBytes(key); - setAsBytes(key, value); + public byte[] getAndSetAsBytes(B bucket, K key, byte[] value) { + byte[] old = getAsBytes(bucket, key); + setAsBytes(bucket, key, value); return old; } - public T getAndSetAsType(K key, V value, Class requiredType) { - T old = getAsType(key, requiredType); - set(key, value); + public T getAndSetAsType(B bucket, K key, V value, Class requiredType) { + T old = getAsType(bucket, key, requiredType); + set(bucket, key, value); return old; } + @SuppressWarnings({"unchecked"}) public List getValues(List keys) { List results = new ArrayList(); for (K key : keys) { BucketKeyPair bkp = resolveBucketKeyPair(key, null); - results.add((V) get(bkp)); + results.add((V) get(bkp.getBucket(), bkp.getKey())); } return results; } @@ -487,7 +340,7 @@ public class RiakTemplate extends RestGatewaySupport implements KeyValueStoreOpe List results = new ArrayList(); for (K key : keys) { BucketKeyPair bkp = resolveBucketKeyPair(key, null); - results.add(getAsType(bkp, requiredType)); + results.add(getAsType(bkp.getBucket(), bkp.getKey(), requiredType)); } return results; } @@ -499,9 +352,9 @@ public class RiakTemplate extends RestGatewaySupport implements KeyValueStoreOpe /*----------------- Only-Set-Once Operations -----------------*/ - public KeyValueStoreOperations setIfKeyNonExistent(K key, V value) { - if (!containsKey(key)) { - set(key, value); + public BucketKeyValueStoreOperations setIfKeyNonExistent(B bucket, K key, V value) { + if (!containsKey(bucket, key)) { + set(bucket, key, value); } else { if (log.isDebugEnabled()) { log.debug(String.format("key: %s already exists. Not adding %s", @@ -512,9 +365,9 @@ public class RiakTemplate extends RestGatewaySupport implements KeyValueStoreOpe return this; } - public KeyValueStoreOperations setIfKeyNonExistentAsBytes(K key, byte[] value) { - if (!containsKey(key)) { - setAsBytes(key, value); + public BucketKeyValueStoreOperations setIfKeyNonExistentAsBytes(B bucket, K key, byte[] value) { + if (!containsKey(bucket, key)) { + setAsBytes(bucket, key, value); } else { if (log.isDebugEnabled()) { log.debug(String.format("key: %s already exists. Not adding %s", @@ -525,51 +378,23 @@ public class RiakTemplate extends RestGatewaySupport implements KeyValueStoreOpe return this; } - /*----------------- Multiple Item Operations -----------------*/ - - public KeyValueStoreOperations setMultiple(Map keysAndValues) { - for (Map.Entry entry : keysAndValues.entrySet()) { - set(entry.getKey(), entry.getValue()); - } - return this; - } - - public KeyValueStoreOperations setMultipleAsBytes(Map keysAndValues) { - for (Map.Entry entry : keysAndValues.entrySet()) { - setAsBytes(entry.getKey(), entry.getValue()); - } - return this; - } - - public KeyValueStoreOperations setMultipleIfKeysNonExistent(Map keysAndValues) { - for (Map.Entry entry : keysAndValues.entrySet()) { - setIfKeyNonExistent(entry.getKey(), entry.getValue()); - } - return this; - } - - public KeyValueStoreOperations setMultipleAsBytesIfKeysNonExistent(Map keysAndValues) { - for (Map.Entry entry : keysAndValues.entrySet()) { - setIfKeyNonExistentAsBytes(entry.getKey(), entry.getValue()); - } - return this; - } - /*----------------- Key Operations -----------------*/ - public boolean containsKey(K key) { - BucketKeyPair bucketKeyPair = resolveBucketKeyPair(key, null); + public boolean containsKey(B bucket, K key) { RestTemplate restTemplate = getRestTemplate(); HttpHeaders headers = null; try { - headers = restTemplate.headForHeaders(defaultUri, - bucketKeyPair.getBucket(), - bucketKeyPair.getKey()); + headers = restTemplate.headForHeaders(defaultUri, bucket, key); } catch (ResourceAccessException e) { } return (null != headers); } + @SuppressWarnings({"unchecked"}) + public boolean delete(B bucket, K key) { + return deleteKeys(new SimpleBucketKeyPair(bucket, key)); + } + public boolean deleteKeys(K... keys) { boolean stillExists = false; RestTemplate restTemplate = getRestTemplate(); @@ -599,6 +424,7 @@ public class RiakTemplate extends RestGatewaySupport implements KeyValueStoreOpe return execute(job, List.class); } + @SuppressWarnings({"unchecked"}) public T execute(MapReduceJob job, Class targetType) { RestTemplate restTemplate = getRestTemplate(); try { @@ -634,6 +460,7 @@ public class RiakTemplate extends RestGatewaySupport implements KeyValueStoreOpe return null; } + @SuppressWarnings({"unchecked"}) public Future> submit(MapReduceJob job) { // Run this job asynchronously. return executorService.submit(job); @@ -644,21 +471,22 @@ public class RiakTemplate extends RestGatewaySupport implements KeyValueStoreOpe /** * Use Riak's native Link mechanism to link two entries together. * - * @param destination Key to the child object - * @param source Key to the parent object - * @param tag The tag for this relationship - * @return This template interface + * @param destBucket Bucket of child entry + * @param destKey Key of child entry + * @param sourceBucket Bucket of parent entry + * @param sourceKey Key of parent entry + * @param tag Tag for this relationship + * @return */ - public RiakTemplate link(K1 destination, K2 source, String tag) { - BucketKeyPair bkpFrom = resolveBucketKeyPair(source, null); - BucketKeyPair bkpTo = resolveBucketKeyPair(destination, null); + @SuppressWarnings({"unchecked"}) + public RiakTemplate link(B1 destBucket, K1 destKey, B2 sourceBucket, K2 sourceKey, String tag) { RestTemplate restTemplate = getRestTemplate(); // Skip all conversion on the data since all we care about is the Link header. - RiakValue fromObj = getAsBytesWithMetaData(source); + RiakValue fromObj = getAsBytesWithMetaData(sourceBucket, sourceKey); if (null == fromObj) { throw new DataStoreOperationException( - "Cannot link from a non-existent source: " + source); + "Cannot link from a non-existent source: " + sourceBucket + ":" + sourceKey); } HttpHeaders headers = new HttpHeaders(); headers.setContentType(fromObj.getMetaData().getContentType()); @@ -673,8 +501,8 @@ public class RiakTemplate extends RestGatewaySupport implements KeyValueStoreOpe // ...then add the link we're creating... links.add(String.format("<%s/%s/%s>; riaktag=\"%s\"", getPrefix(), - bkpTo.getBucket(), - bkpTo.getKey(), + destBucket, + destKey, tag)); String linkHeader = StringUtils.collectionToCommaDelimitedString(links); headers.set("Link", linkHeader); @@ -682,7 +510,7 @@ public class RiakTemplate extends RestGatewaySupport implements KeyValueStoreOpe // Basho at some point will likely add the ability to updated metadata separate // from the content. Until then, we have to transfer the body back-and-forth. HttpEntity entity = new HttpEntity(fromObj.get(), headers); - restTemplate.put(defaultUri, entity, bkpFrom.getBucket(), bkpFrom.getKey()); + restTemplate.put(defaultUri, entity, sourceBucket, sourceKey); return this; } @@ -692,12 +520,13 @@ public class RiakTemplate extends RestGatewaySupport implements KeyValueStoreOpe * they were individual objects (e.g. using the built-in HttpMessageConverters of * RestTemplate). * - * @param source + * @param bucket + * @param key * @param tag * @return */ - public T linkWalk(K source, String tag) { - BucketKeyPair bkpSource = resolveBucketKeyPair(source, null); + @SuppressWarnings({"unchecked"}) + public T linkWalk(B bucket, K key, String tag) { final RestTemplate restTemplate = getRestTemplate(); final List types = new ArrayList(); types.add(MediaType.ALL); @@ -711,6 +540,7 @@ public class RiakTemplate extends RestGatewaySupport implements KeyValueStoreOpe } }, new ResponseExtractor() { + @SuppressWarnings({"unchecked", "unchecked"}) public Object extractData(ClientHttpResponse response) throws IOException { String contentType = ((List) response.getHeaders().get("Content-Type")).get(0) @@ -788,8 +618,8 @@ public class RiakTemplate extends RestGatewaySupport implements KeyValueStoreOpe return null; } }, - bkpSource.getBucket(), - bkpSource.getKey(), + bucket, + key, tag); return returnObj; } @@ -800,6 +630,7 @@ public class RiakTemplate extends RestGatewaySupport implements KeyValueStoreOpe return getBucketSchema(bucket, false); } + @SuppressWarnings({"unchecked"}) public Map getBucketSchema(B bucket, boolean listKeys) { RestTemplate restTemplate = getRestTemplate(); ResponseEntity resp = restTemplate.getForEntity(defaultUri, @@ -814,7 +645,8 @@ public class RiakTemplate extends RestGatewaySupport implements KeyValueStoreOpe } } - public KeyValueStoreOperations updateBucketSchema(B bucket, Map props) { + @SuppressWarnings({"unchecked"}) + public BucketKeyValueStoreOperations updateBucketSchema(B bucket, Map props) { Map bucketProps = new LinkedHashMap(); bucketProps.put("props", props); RestTemplate restTemplate = getRestTemplate(); @@ -832,170 +664,4 @@ public class RiakTemplate extends RestGatewaySupport implements KeyValueStoreOpe return this; } - public void afterPropertiesSet() throws Exception { - Assert.notNull(conversionService, - "Must specify a valid ConversionService."); - if (null == bucketKeyResolvers) { - bucketKeyResolvers = new ArrayList(); - bucketKeyResolvers.add(new SimpleBucketKeyResolver()); - } - - List> converters = getRestTemplate().getMessageConverters(); - ObjectMapper mapper = new ObjectMapper(); - CustomSerializerFactory fac = new CustomSerializerFactory(); - if (groovyPresent) { - // Native conversion for Groovy GString objects - fac.addSpecificMapping(GStringImpl.class, ToStringSerializer.instance); - } - mapper.setSerializerFactory(fac); - for (HttpMessageConverter converter : converters) { - if (converter instanceof MappingJacksonHttpMessageConverter) { - ((MappingJacksonHttpMessageConverter) converter).setObjectMapper( - mapper); - } - } - } - - /*----------------- Utilities -----------------*/ - - protected BucketKeyPair resolveBucketKeyPair(Object key, Object val) { - BucketKeyResolver resolver = null; - for (BucketKeyResolver r : bucketKeyResolvers) { - if (r.canResolve(key)) { - resolver = r; - 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( - KeyValueStoreMetaData.class); - if (null != meta) { - String bucket = ((KeyValueStoreMetaData) meta).bucket(); - if (null != bucket) { - return new SimpleBucketKeyPair(bucket, - bucketKeyPair.getKey()); - } - } - } - return bucketKeyPair; - } - throw new DataStoreOperationException(String.format( - "No resolvers available to resolve bucket/key pair from %s", - key)); - } - - protected MediaType extractMediaType(Object value) { - MediaType mediaType = (value instanceof byte[] ? MediaType.APPLICATION_OCTET_STREAM : MediaType.APPLICATION_JSON); - if (value.getClass().getAnnotations().length > 0) { - KeyValueStoreMetaData meta = value.getClass() - .getAnnotation(KeyValueStoreMetaData.class); - if (null != meta) { - // Use the media type specified on the annotation. - mediaType = MediaType.parseMediaType(meta.mediaType()); - } - } - return mediaType; - } - - protected RiakMetaData extractMetaData(HttpHeaders headers) throws - IOException { - Map props = new LinkedHashMap(); - for (Map.Entry> entry : headers.entrySet()) { - List val = entry.getValue(); - Object prop = (1 == val.size() ? val.get(0) : val); - try { - if (entry.getKey().equals("Last-Modified") || entry.getKey() - .equals("Date")) { - prop = httpDate.parse(val.get(0)); - } - } catch (ParseException e) { - log.error(e.getMessage(), e); - } - - if (entry.getKey().equals("Link")) { - List links = new ArrayList(); - for (String link : entry.getValue()) { - String[] parts = link.split(","); - for (String part : parts) { - String s = part.replaceAll("<(.+)>; rel=\"(\\S+)\"[,]?", "").trim(); - if (!"".equals(s)) { - links.add(s); - } - } - } - props.put("Link", links); - } else { - props.put(entry.getKey().toString(), prop); - } - } - props.put("ETag", headers.getETag()); - RiakMetaData meta = new RiakMetaData(headers.getContentType(), props); - - return meta; - } - - protected T checkCache(K key, Class requiredType) { - BucketKeyPair bucketKeyPair = resolveBucketKeyPair(key, requiredType); - RiakValue obj = cache.get(bucketKeyPair); - if (null != obj) { - String bucketName = (null != bucketKeyPair.getBucket() ? bucketKeyPair.getBucket() - .toString() : requiredType.getName()); - RestTemplate restTemplate = getRestTemplate(); - HttpHeaders resp = restTemplate.headForHeaders(defaultUri, - bucketName, - bucketKeyPair.getKey()); - if (!obj.getMetaData() - .getProperties() - .get("ETag") - .toString() - .equals(resp.getETag())) { - obj = null; - } else { - if (log.isDebugEnabled()) { - log.debug("Returning CACHED object: " + obj); - } - } - } - - if (null != obj && obj.getClass() == requiredType) { - return (T) obj.get(); - } else { - return null; - } - } - - /** - * Get a string that represents the QOS parameters, taken either from the specified object or - * from the template defaults. - * - * @param qosParams - * @return - */ - protected String extractQosParameters(QosParameters qosParams) { - List params = new LinkedList(); - if (null != qosParams.getReadThreshold()) { - params.add(String.format("r=%s", qosParams.getReadThreshold())); - } else if (null != defaultQosParameters && null != defaultQosParameters.getReadThreshold()) { - params.add(String.format("r=%s", defaultQosParameters.getReadThreshold())); - } - if (null != qosParams.getWriteThreshold()) { - params.add(String.format("w=%s", qosParams.getWriteThreshold())); - } else if (null != defaultQosParameters && null != defaultQosParameters.getWriteThreshold()) { - params.add(String.format("w=%s", defaultQosParameters.getWriteThreshold())); - } - if (null != qosParams.getDurableWriteThreshold()) { - params.add(String.format("dw=%s", qosParams.getDurableWriteThreshold())); - } else if (null != defaultQosParameters && null != defaultQosParameters.getDurableWriteThreshold()) { - params.add(String.format("dw=%s", defaultQosParameters.getDurableWriteThreshold())); - } - - return (params.size() > 0 ? "?" + StringUtils.collectionToDelimitedString( - params, - "&") : ""); - } - } diff --git a/spring-data-riak/src/test/groovy/org/springframework/data/keyvalue/riak/core/RiakTemplateSpec.groovy b/spring-data-riak/src/test/groovy/org/springframework/data/keyvalue/riak/core/RiakTemplateSpec.groovy index 64a95932c..b5f7f9cb7 100644 --- a/spring-data-riak/src/test/groovy/org/springframework/data/keyvalue/riak/core/RiakTemplateSpec.groovy +++ b/spring-data-riak/src/test/groovy/org/springframework/data/keyvalue/riak/core/RiakTemplateSpec.groovy @@ -15,14 +15,12 @@ */ package org.springframework.data.keyvalue.riak.core -import org.junit.runner.RunWith import org.springframework.beans.factory.annotation.Autowired import org.springframework.context.ApplicationContext import org.springframework.data.keyvalue.riak.mapreduce.JavascriptMapReduceOperation import org.springframework.data.keyvalue.riak.mapreduce.MapReduceJob import org.springframework.data.keyvalue.riak.mapreduce.RiakMapReducePhase import org.springframework.test.context.ContextConfiguration -import org.springframework.test.context.junit4.SpringJUnit4ClassRunner import spock.lang.Specification /** @@ -34,7 +32,7 @@ class RiakTemplateSpec extends Specification { @Autowired ApplicationContext appCtx @Autowired - RiakTemplate riak + RiakKeyValueTemplate riak int run = 1 def "Test Map object"() { @@ -199,10 +197,10 @@ class RiakTemplateSpec extends Specification { given: MapReduceJob job = riak.createMapReduceJob() - def mapJs = new JavascriptMapReduceOperation("function(v){ var o=Riak.mapValuesJson(v); return [1]; }\n") + def mapJs = new JavascriptMapReduceOperation("function(v){ var o=Riak.mapValuesJson(v); return [1]; }") def mapPhase = new RiakMapReducePhase("map", "javascript", mapJs) - def reduceJs = new JavascriptMapReduceOperation("Riak.reduceSum") + def reduceJs = new JavascriptMapReduceOperation("function(v){ var s=Riak.reduceSum(v); return s; }") def reducePhase = new RiakMapReducePhase("reduce", "javascript", reduceJs) job.addInputs(["test"]). @@ -222,10 +220,10 @@ class RiakTemplateSpec extends Specification { given: MapReduceJob job = riak.createMapReduceJob() - def mapJs = new JavascriptMapReduceOperation("function(v){ var o=Riak.mapValuesJson(v); return [1]; }\n") + def mapJs = new JavascriptMapReduceOperation("function(v){ ejsLog('/tmp/mapred.log', 'map v: '+JSON.stringify(v)); var o=Riak.mapValuesJson(v); return [1]; }") def mapPhase = new RiakMapReducePhase("map", "javascript", mapJs) - def reduceJs = new JavascriptMapReduceOperation("Riak.reduceSum") + def reduceJs = new JavascriptMapReduceOperation("function(v){ ejsLog('/tmp/mapred.log', 'red v: '+JSON.stringify(v)); var s=Riak.reduceSum(v); return s; }") def reducePhase = new RiakMapReducePhase("reduce", "javascript", reduceJs) job.addInputs(["test"]). diff --git a/spring-data-riak/src/test/resources/org/springframework/data/RiakTemplateTests.xml b/spring-data-riak/src/test/resources/org/springframework/data/RiakTemplateTests.xml index 35917c089..9238a146e 100644 --- a/spring-data-riak/src/test/resources/org/springframework/data/RiakTemplateTests.xml +++ b/spring-data-riak/src/test/resources/org/springframework/data/RiakTemplateTests.xml @@ -5,6 +5,7 @@ - + From 892fd53900bacd7dab530952164761446f3c6a46 Mon Sep 17 00:00:00 2001 From: "J. Brisbin" Date: Wed, 8 Dec 2010 16:18:17 -0600 Subject: [PATCH 2/6] Turning off tests. --- spring-data-riak/pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/spring-data-riak/pom.xml b/spring-data-riak/pom.xml index 5b352a9ea..1ff0826b5 100644 --- a/spring-data-riak/pom.xml +++ b/spring-data-riak/pom.xml @@ -126,7 +126,7 @@ com.springsource.bundlor com.springsource.bundlor.maven - + From ae4af38c05c19ea680948f75c66e28ba1c0dc8bb Mon Sep 17 00:00:00 2001 From: "J. Brisbin" Date: Wed, 8 Dec 2010 16:42:41 -0600 Subject: [PATCH 3/6] Turning on tests, adding hooks to start and stop Riak server. --- spring-data-riak/pom.xml | 4 ++-- .../keyvalue/riak/core/RiakTemplateSpec.groovy | 18 ++++++++++++++++-- 2 files changed, 18 insertions(+), 4 deletions(-) diff --git a/spring-data-riak/pom.xml b/spring-data-riak/pom.xml index 1ff0826b5..5b352a9ea 100644 --- a/spring-data-riak/pom.xml +++ b/spring-data-riak/pom.xml @@ -126,7 +126,7 @@ com.springsource.bundlor com.springsource.bundlor.maven - org.spockframework spock-maven @@ -167,7 +167,7 @@ 2.7.7 - --> + diff --git a/spring-data-riak/src/test/groovy/org/springframework/data/keyvalue/riak/core/RiakTemplateSpec.groovy b/spring-data-riak/src/test/groovy/org/springframework/data/keyvalue/riak/core/RiakTemplateSpec.groovy index b5f7f9cb7..56e57bd28 100644 --- a/spring-data-riak/src/test/groovy/org/springframework/data/keyvalue/riak/core/RiakTemplateSpec.groovy +++ b/spring-data-riak/src/test/groovy/org/springframework/data/keyvalue/riak/core/RiakTemplateSpec.groovy @@ -21,6 +21,7 @@ import org.springframework.data.keyvalue.riak.mapreduce.JavascriptMapReduceOpera import org.springframework.data.keyvalue.riak.mapreduce.MapReduceJob import org.springframework.data.keyvalue.riak.mapreduce.RiakMapReducePhase import org.springframework.test.context.ContextConfiguration +import spock.lang.Shared import spock.lang.Specification /** @@ -34,6 +35,19 @@ class RiakTemplateSpec extends Specification { @Autowired RiakKeyValueTemplate riak int run = 1 + @Shared def riakBin = System.getenv("RIAK_BIN") + @Shared def p + + def setupSpec() { + p = "$riakBin start".execute() + p.waitFor() + Thread.sleep(2000) + } + + def cleanupSpec() { + "$riakBin stop".execute() + p.waitFor() + } def "Test Map object"() { @@ -126,10 +140,10 @@ class RiakTemplateSpec extends Specification { when: def val = riak.getWithMetaData("test:test", Map) - def result = val.metaData.properties["Link"].collect { it.contains("riaktag=\"test\"") } + def result = val.metaData.properties["Link"].find { it.contains("riaktag=\"test\"") } then: - 1 == result.size() + null != result } From d8649e881d42fc7b36b6db796a8c904efed31794 Mon Sep 17 00:00:00 2001 From: "J. Brisbin" Date: Wed, 8 Dec 2010 16:45:26 -0600 Subject: [PATCH 4/6] Change path to Riak exe. --- .../data/keyvalue/riak/core/RiakTemplateSpec.groovy | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/spring-data-riak/src/test/groovy/org/springframework/data/keyvalue/riak/core/RiakTemplateSpec.groovy b/spring-data-riak/src/test/groovy/org/springframework/data/keyvalue/riak/core/RiakTemplateSpec.groovy index 56e57bd28..85898e401 100644 --- a/spring-data-riak/src/test/groovy/org/springframework/data/keyvalue/riak/core/RiakTemplateSpec.groovy +++ b/spring-data-riak/src/test/groovy/org/springframework/data/keyvalue/riak/core/RiakTemplateSpec.groovy @@ -39,13 +39,13 @@ class RiakTemplateSpec extends Specification { @Shared def p def setupSpec() { - p = "$riakBin start".execute() + p = "/usr/sbin/riak start".execute() p.waitFor() Thread.sleep(2000) } def cleanupSpec() { - "$riakBin stop".execute() + "/usr/sbin/riak stop".execute() p.waitFor() } From 9182c78ac556d13362f215f2130645b283eee572 Mon Sep 17 00:00:00 2001 From: "J. Brisbin" Date: Wed, 8 Dec 2010 18:22:13 -0600 Subject: [PATCH 5/6] Triggering build. --- spring-data-riak/pom.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/spring-data-riak/pom.xml b/spring-data-riak/pom.xml index 5b352a9ea..0a0740739 100644 --- a/spring-data-riak/pom.xml +++ b/spring-data-riak/pom.xml @@ -126,6 +126,7 @@ com.springsource.bundlor com.springsource.bundlor.maven + org.spockframework From 6f1c4bbebbde97bf6adcfd26eda7a8e394e5ff9f Mon Sep 17 00:00:00 2001 From: "J. Brisbin" Date: Wed, 8 Dec 2010 18:23:59 -0600 Subject: [PATCH 6/6] Turned off tests. --- spring-data-riak/pom.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/spring-data-riak/pom.xml b/spring-data-riak/pom.xml index 0a0740739..38f65f763 100644 --- a/spring-data-riak/pom.xml +++ b/spring-data-riak/pom.xml @@ -126,8 +126,8 @@ com.springsource.bundlor com.springsource.bundlor.maven - - + +