- * 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.dao.DataAccessResourceFailureException;
-import org.springframework.data.keyvalue.riak.DataStoreOperationException;
-import org.springframework.data.keyvalue.riak.mapreduce.AsyncMapReduceOperations;
-import org.springframework.data.keyvalue.riak.mapreduce.MapReduceJob;
-import org.springframework.http.HttpEntity;
-import org.springframework.http.HttpHeaders;
-import org.springframework.http.MediaType;
-import org.springframework.http.ResponseEntity;
-import org.springframework.http.client.ClientHttpRequestFactory;
-import org.springframework.util.Assert;
-import org.springframework.web.client.ResourceAccessException;
-import org.springframework.web.client.RestTemplate;
-
-import java.io.IOException;
-import java.net.URI;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-import java.util.concurrent.Callable;
-import java.util.concurrent.ExecutionException;
-import java.util.concurrent.Future;
-
-/**
- * An implementation of {@link AsyncBucketKeyValueStoreOperations} and {@link
- * AsyncMapReduceOperations} for the Riak datastore.
- *
- * To use the AsyncRiakTemplate, create a singleton in your Spring application-context.xml:
- *
- * <bean id="riak" class="org.springframework.data.keyvalue.riak.core.AsyncRiakTemplate"
- * 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 callback = [
- * completed: { v, meta ->
- * ... do something with results ...
- * },
- * failed: { err ->
- * }
- * ] as AsyncKeyValueStoreOperation
- * def obj = new TestObject(name: "My Name", age: 40)
- * def future = riak.set("mybucket", "mykey", obj, callback)
- * ... this runs asynchronously, so do other work ...
- * def name = future.get().name
- * println "Hello $name!"
- *
- *
- * @author J. Brisbin
- */
-public class AsyncRiakTemplate extends AbstractRiakTemplate implements AsyncBucketKeyValueStoreOperations, AsyncMapReduceOperations {
-
- protected AsyncKeyValueStoreOperation defaultErrorHandler = new LoggingErrorHandler();
-
- public AsyncRiakTemplate() {
- super();
- }
-
- public AsyncRiakTemplate(ClientHttpRequestFactory requestFactory) {
- super(requestFactory);
- }
-
- public AsyncKeyValueStoreOperation getDefaultErrorHandler() {
- return defaultErrorHandler;
- }
-
- public void setDefaultErrorHandler(
- AsyncKeyValueStoreOperation defaultErrorHandler) {
- this.defaultErrorHandler = defaultErrorHandler;
- }
-
- public Future set(B bucket, K key, V value,
- AsyncKeyValueStoreOperation callback) {
- return setWithMetaData(bucket, key, value, null, null, callback);
- }
-
- public Future set(B bucket, K key, V value, QosParameters qosParams,
- AsyncKeyValueStoreOperation callback) {
- return setWithMetaData(bucket, key, value, null, qosParams, callback);
- }
-
- public Future setAsBytes(B bucket, K key, byte[] value,
- AsyncKeyValueStoreOperation callback) {
- return setWithMetaData(bucket, key, value, null, null, callback);
- }
-
- @SuppressWarnings({"unchecked"})
- public Future setWithMetaData(B bucket, K key, V value,
- Map metaData,
- QosParameters qosParams,
- AsyncKeyValueStoreOperation callback) {
- String bucketName = (null != bucket ? bucket.toString() : value.getClass().getName());
- // Get a key name that may or may not include the QOS parameters.
- Assert.notNull(key, "Cannot use a key.");
- String keyName = (null != qosParams ? key.toString() + extractQosParameters(qosParams) : key
- .toString());
-
- KeyValueStoreMetaData origMeta = getMetaData(bucket, keyName);
- String vclock = null;
- if (null != origMeta) {
- Map mprops = origMeta.getProperties();
- if (null != mprops) {
- Object o = mprops.get(RIAK_VCLOCK);
- if (null != o) {
- vclock = o.toString();
- }
- }
- }
-
- HttpHeaders headers = defaultHeaders(metaData);
- headers.setContentType(extractMediaType(value));
- if (null != vclock) {
- headers.set(RIAK_VCLOCK, vclock);
- }
- headers.set(RIAK_META_CLASSNAME, value.getClass().getName());
- HttpEntity entity = new HttpEntity(value, headers);
- return (Future) workerPool.submit(new AsyncPost(bucketName,
- keyName,
- entity,
- callback));
- }
-
- public Future put(B bucket, V value,
- AsyncKeyValueStoreOperation callback) {
- return put(bucket, value, null, null, callback);
- }
-
- public Future put(B bucket, V value, Map metaData,
- AsyncKeyValueStoreOperation callback) {
- return put(bucket, value, metaData, null, callback);
- }
-
- @SuppressWarnings({"unchecked"})
- public Future put(B bucket, V value, Map metaData,
- QosParameters qosParams,
- AsyncKeyValueStoreOperation callback) {
- Assert.notNull(bucket, "Bucket cannot be null");
- String bucketName = (null != qosParams ? bucket.toString() + extractQosParameters(
- qosParams) : bucket
- .toString());
-
- HttpHeaders headers = defaultHeaders(metaData);
- headers.setContentType(extractMediaType(value));
- headers.set(RIAK_META_CLASSNAME, value.getClass().getName());
- HttpEntity entity = new HttpEntity(value, headers);
- return (Future) workerPool.submit(new AsyncPut(bucketName, entity, callback));
- }
-
- public Future get(B bucket, K key,
- AsyncKeyValueStoreOperation callback) {
- return getWithMetaData(bucket, key, null, callback);
- }
-
- public RiakMetaData getMetaData(B bucket, K key) {
- RestTemplate restTemplate = getRestTemplate();
- HttpHeaders headers;
- try {
- headers = restTemplate.headForHeaders(defaultUri, bucket, key);
- RiakMetaData meta = extractMetaData(headers);
- meta.setBucket((null != bucket ? bucket.toString() : null));
- meta.setKey((null != key ? key.toString() : null));
- return meta;
- } catch (ResourceAccessException e) {
- } catch (IOException e) {
- throw new DataAccessResourceFailureException(e.getMessage(), e);
- }
- return null;
- }
-
- @SuppressWarnings({"unchecked"})
- public Future getBucketSchema(B bucket, QosParameters qosParams,
- final AsyncKeyValueStoreOperation, R> callback) {
- Assert.notNull(bucket, "Bucket cannot be null");
- Assert.notNull(callback, "Callback cannot be null");
-
- String bucketName = (null != qosParams ? bucket.toString() + extractQosParameters(
- qosParams) : bucket
- .toString());
-
- return workerPool.submit(new AsyncGet(bucketName,
- "?keys=true",
- Map.class,
- new AsyncKeyValueStoreOperation() {
- @SuppressWarnings({"unchecked"})
- public Object completed(KeyValueStoreMetaData meta, Object result) {
- return callback.completed(meta, (Map) result);
- }
-
- public Object failed(Throwable error) {
- return callback.failed(error);
- }
- }));
- }
-
- @SuppressWarnings({"unchecked"})
- public Future getWithMetaData(B bucket, K key, Class requiredType,
- AsyncKeyValueStoreOperation callback) {
- Assert.notNull(key, "Cannot use a null key.");
- Assert.notNull(callback, "Callback cannot be null");
-
- String bucketName = (null != bucket ? bucket.toString() : requiredType.getName());
-
- if (null == requiredType) {
- requiredType = (Class) getType(bucketName, key.toString());
- }
- return workerPool.submit(new AsyncGet(bucketName,
- key.toString(),
- requiredType,
- callback));
- }
-
- public Future getAsBytes(B bucket, K key,
- AsyncKeyValueStoreOperation callback) {
- return getWithMetaData(bucket, key, byte[].class, callback);
- }
-
- public Future getAsType(B bucket, K key, Class requiredType,
- AsyncKeyValueStoreOperation callback) {
- return getWithMetaData(bucket, key, requiredType, callback);
- }
-
- public Future getAndSet(final B bucket, final K key, final V value,
- final AsyncKeyValueStoreOperation callback) {
- final List> futures = new ArrayList>();
- try {
- getWithMetaData(bucket, key, null, new AsyncKeyValueStoreOperation() {
- @SuppressWarnings({"unchecked"})
- public Object completed(KeyValueStoreMetaData meta, Object result) {
- futures.add(setWithMetaData(bucket, key, value, null, null, null));
- return callback.completed(meta, (V) result);
- }
-
- public Object failed(Throwable error) {
- return callback.failed(error);
- }
- }).get();
- } catch (InterruptedException e) {
- log.error(e.getMessage(), e);
- } catch (ExecutionException e) {
- log.error(e.getMessage(), e);
- }
- return futures.size() > 0 ? futures.get(0) : null;
- }
-
- public Future getAndSetAsBytes(B bucket, K key, byte[] value,
- AsyncKeyValueStoreOperation callback) {
- return getAndSet(bucket, key, value, callback);
- }
-
- public Future getAndSetAsType(final B bucket, final K key, final V value,
- final Class requiredType,
- final AsyncKeyValueStoreOperation callback) {
- final List> futures = new ArrayList>();
- getWithMetaData(bucket, key, requiredType, new AsyncKeyValueStoreOperation() {
- @SuppressWarnings({"unchecked"})
- public R completed(KeyValueStoreMetaData meta, T result) {
- try {
- setWithMetaData(bucket, key, value, null, null, null).get();
- return callback.completed(meta, result);
- } catch (InterruptedException e) {
- return callback.failed(e);
- } catch (ExecutionException e) {
- return callback.failed(e);
- }
- }
-
- public R failed(Throwable error) {
- return callback.failed(error);
- }
- });
- return futures.size() > 0 ? futures.get(0) : null;
- }
-
- public Future setIfKeyNonExistent(final B bucket, final K key, final V value,
- final AsyncKeyValueStoreOperation callback) {
- return containsKey(bucket, key, new AsyncKeyValueStoreOperation() {
- public Object completed(KeyValueStoreMetaData meta, Boolean result) {
- if (!result) {
- return setWithMetaData(bucket, key, value, null, null, callback);
- } else {
- return null;
- }
- }
-
- public Object failed(Throwable error) {
- return callback.failed(error);
- }
- });
- }
-
- public Future setIfKeyNonExistentAsBytes(final B bucket, final K key,
- final byte[] value,
- final AsyncKeyValueStoreOperation callback) {
- return containsKey(bucket, key, new AsyncKeyValueStoreOperation() {
- public Object completed(KeyValueStoreMetaData meta, Boolean result) {
- if (!result) {
- return setWithMetaData(bucket, key, value, null, null, callback);
- } else {
- return null;
- }
- }
-
- public Object failed(Throwable error) {
- return callback.failed(error);
- }
- });
- }
-
- @SuppressWarnings({"unchecked"})
- public Future containsKey(B bucket, K key,
- final AsyncKeyValueStoreOperation callback) {
- Assert.notNull(bucket, "Bucket cannot be null when checking for existence.");
- Assert.notNull(key, "Key cannot be null when checking for existence");
- return workerPool.submit(new AsyncHead(bucket.toString(),
- key.toString(),
- new AsyncKeyValueStoreOperation() {
- public Object completed(KeyValueStoreMetaData meta, HttpHeaders result) {
- return callback.completed(null, (null != result));
- }
-
- public Object failed(Throwable error) {
- return callback.failed(error);
- }
- }));
- }
-
- @SuppressWarnings({"unchecked"})
- public Future delete(B bucket, K key,
- AsyncKeyValueStoreOperation callback) {
- Assert.notNull(bucket, "Bucket cannot be null when deleting.");
- Assert.notNull(key, "Key cannot be null when deleting.");
- return workerPool.submit(new AsyncDelete(bucket.toString(), key.toString(), callback));
- }
-
- public Future setAsBytes(B bucket, K key, byte[] value, QosParameters qosParams,
- AsyncKeyValueStoreOperation callback) {
- return setWithMetaData(bucket, key, value, null, qosParams, callback);
- }
-
- public Future setWithMetaData(B bucket, K key, V value,
- Map metaData,
- AsyncKeyValueStoreOperation callback) {
- return setWithMetaData(bucket, key, value, metaData, null, callback);
- }
-
- /* ---------------- Map/Reduce ---------------- */
-
- @SuppressWarnings({"unchecked"})
- public Future execute(MapReduceJob job,
- AsyncKeyValueStoreOperation, R> callback) {
- HttpHeaders headers = defaultHeaders(null);
- headers.setContentType(MediaType.APPLICATION_JSON);
- HttpEntity json = new HttpEntity(job.toJson(), headers);
- return workerPool.submit(new AsyncMapReduce(json, callback));
- }
-
- /* ---------------- Runnable helpers ---------------- */
-
- protected class AsyncPut implements Callable {
-
- private String bucket;
- private HttpEntity entity = null;
- private AsyncKeyValueStoreOperation callback = null;
-
- public AsyncPut(String bucket, HttpEntity entity,
- AsyncKeyValueStoreOperation callback) {
- this.bucket = bucket;
- this.entity = entity;
- this.callback = callback;
- }
-
- public R call() throws Exception {
- try {
- URI location = getRestTemplate().postForLocation(defaultUri, entity, bucket, "");
- String path = location.getPath();
- String key = path.substring(path.lastIndexOf("/") + 1);
-
- HttpHeaders headers = getRestTemplate().headForHeaders(defaultUri, bucket, key);
- if (null != callback) {
- RiakMetaData meta = extractMetaData(headers);
- meta.setBucket((null != bucket ? bucket.toString() : null));
- meta.setKey((null != key ? key.toString() : null));
- return callback.completed(meta, entity.getBody());
- }
- } catch (Throwable t) {
- DataStoreOperationException dsoe = new DataStoreOperationException(t.getMessage(), t);
- if (null != callback) {
- return callback.failed(dsoe);
- } else {
- defaultErrorHandler.failed(dsoe);
- }
- }
- return null;
- }
-
- }
-
- protected class AsyncPost implements Callable {
-
- private String bucket;
- private String key;
- private HttpEntity entity = null;
- private AsyncKeyValueStoreOperation callback = null;
-
- public AsyncPost(String bucket, String key, HttpEntity entity,
- AsyncKeyValueStoreOperation callback) {
- this.bucket = bucket;
- this.key = key;
- this.entity = entity;
- this.callback = callback;
- }
-
- @SuppressWarnings({"unchecked"})
- public R call() throws Exception {
- try {
- HttpEntity result = getRestTemplate().postForEntity(defaultUri,
- entity,
- (entity.getBody() instanceof byte[] ? byte[].class : entity.getBody().getClass()),
- bucket,
- key + "?returnbody=true");
- if (log.isDebugEnabled()) {
- log.debug(String.format("PUT object: bucket=%s, key=%s, value=%s",
- bucket,
- key,
- entity));
- }
- if (null != callback) {
- RiakMetaData meta = extractMetaData(result.getHeaders());
- meta.setBucket((null != bucket ? bucket.toString() : null));
- meta.setKey((null != key ? key.toString() : null));
- return callback.completed(meta, (V) result.getBody());
- }
- } catch (Throwable t) {
- DataStoreOperationException dsoe = new DataStoreOperationException(t.getMessage(), t);
- if (null != callback) {
- return callback.failed(dsoe);
- } else {
- defaultErrorHandler.failed(dsoe);
- }
- }
- return null;
- }
-
- }
-
- protected class AsyncMapReduce implements Callable {
-
- private HttpEntity entity = null;
- private AsyncKeyValueStoreOperation, R> callback = null;
-
- public AsyncMapReduce(HttpEntity entity,
- AsyncKeyValueStoreOperation, R> callback) {
- this.entity = entity;
- this.callback = callback;
- }
-
- @SuppressWarnings({"unchecked"})
- public R call() throws Exception {
- try {
- HttpEntity result = getRestTemplate().postForEntity(mapReduceUri,
- entity,
- List.class);
- if (log.isDebugEnabled()) {
- log.debug(String.format("M/R: json=%s", entity.getBody()));
- }
- if (null != callback) {
- RiakMetaData meta = extractMetaData(result.getHeaders());
- return callback.completed(meta, result.getBody());
- }
- } catch (Throwable t) {
- DataStoreOperationException dsoe = new DataStoreOperationException(t.getMessage(), t);
- if (null != callback) {
- return callback.failed(dsoe);
- } else {
- defaultErrorHandler.failed(dsoe);
- }
- }
- return null;
- }
-
- }
-
- protected class AsyncGet implements Callable {
-
- private String bucket;
- private String key;
- private Class requiredType;
- private AsyncKeyValueStoreOperation callback = null;
-
- public AsyncGet(String bucket, String key, Class requiredType,
- AsyncKeyValueStoreOperation callback) {
- this.bucket = bucket;
- this.key = key;
- this.requiredType = requiredType;
- this.callback = callback;
- }
-
- public R call() throws Exception {
- try {
- ResponseEntity result = getRestTemplate().getForEntity(defaultUri,
- requiredType,
- bucket,
- key);
- if (result.hasBody()) {
- RiakMetaData meta = extractMetaData(result.getHeaders());
- meta.setBucket((null != bucket ? bucket.toString() : null));
- meta.setKey((null != key ? key.toString() : null));
- RiakValue val = new RiakValue(result.getBody(), meta);
- if (useCache) {
- cache.put(new SimpleBucketKeyPair(bucket, key), val);
- }
- if (null != callback) {
- return callback.completed(meta, val.get());
- }
- if (log.isDebugEnabled()) {
- log.debug(String.format("GET object: bucket=%s, key=%s, type=%s",
- bucket,
- key,
- requiredType.getName()));
- }
- }
- } catch (Throwable t) {
- DataStoreOperationException dsoe = new DataStoreOperationException(t.getMessage(), t);
- if (null != callback) {
- return callback.failed(dsoe);
- } else {
- defaultErrorHandler.failed(dsoe);
- }
- }
- return null;
- }
- }
-
- protected class AsyncHead implements Callable {
-
- private String bucket;
- private String key;
- private AsyncKeyValueStoreOperation callback = null;
-
- public AsyncHead(String bucket, String key,
- AsyncKeyValueStoreOperation callback) {
- this.bucket = bucket;
- this.key = key;
- this.callback = callback;
- }
-
- public R call() throws Exception {
- try {
- HttpHeaders headers = getRestTemplate().headForHeaders(defaultUri, bucket, key);
- if (null != headers) {
- if (null != callback) {
- return callback.completed(null, headers);
- }
- }
- } catch (Throwable t) {
- DataStoreOperationException dsoe = new DataStoreOperationException(t.getMessage(), t);
- if (null != callback) {
- return callback.failed(dsoe);
- } else {
- defaultErrorHandler.failed(dsoe);
- }
- }
- return null;
- }
- }
-
- protected class AsyncDelete implements Callable {
-
- private String bucket;
- private String key;
- private AsyncKeyValueStoreOperation callback = null;
-
- public AsyncDelete(String bucket, String key,
- AsyncKeyValueStoreOperation callback) {
- this.bucket = bucket;
- this.key = key;
- this.callback = callback;
- }
-
- public R call() throws Exception {
- try {
- getRestTemplate().delete(defaultUri, bucket, key);
- if (null != callback) {
- return callback.completed(null, true);
- }
- } catch (Throwable t) {
- DataStoreOperationException dsoe = new DataStoreOperationException(t.getMessage(), t);
- if (null != callback) {
- return callback.failed(dsoe);
- } else {
- defaultErrorHandler.failed(dsoe);
- }
- }
- return null;
- }
- }
-
- protected class LoggingErrorHandler implements AsyncKeyValueStoreOperation {
- public Object completed(KeyValueStoreMetaData meta, Throwable result) {
- return null;
- }
-
- public Object failed(Throwable error) {
- log.error(error.getMessage(), error);
- return null;
- }
- }
-
-}
diff --git a/spring-data-riak/src/main/java/org/springframework/data/keyvalue/riak/core/BucketKeyPair.java b/spring-data-riak/src/main/java/org/springframework/data/keyvalue/riak/core/BucketKeyPair.java
deleted file mode 100644
index 4fe4be165..000000000
--- a/spring-data-riak/src/main/java/org/springframework/data/keyvalue/riak/core/BucketKeyPair.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * 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;
-
-/**
- * A generic interface for representing composite keys in data stores that use a
- * bucket and key pair.
- *
- * @author J. Brisbin
- */
-public interface BucketKeyPair {
-
- /**
- * Get the bucket representation.
- *
- * @return
- */
- B getBucket();
-
- /**
- * Get the key representation.
- *
- * @return
- */
- K getKey();
-
-}
diff --git a/spring-data-riak/src/main/java/org/springframework/data/keyvalue/riak/core/BucketKeyResolver.java b/spring-data-riak/src/main/java/org/springframework/data/keyvalue/riak/core/BucketKeyResolver.java
deleted file mode 100644
index 722b5f575..000000000
--- a/spring-data-riak/src/main/java/org/springframework/data/keyvalue/riak/core/BucketKeyResolver.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
- * 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;
-
-/**
- * A generic interface to a resolver to turn a single object into a {@link
- * org.springframework.data.keyvalue.riak.core.BucketKeyPair}.
- *
- * @author J. Brisbin
- */
-public interface BucketKeyResolver {
-
- /**
- * Can this resolver deal with the given object?
- *
- * @param o
- * @param
- * @return
- */
- boolean canResolve(V o);
-
- /**
- * Turn the given object into a BucketKeyPair.
- *
- * @param o
- * @return
- */
- BucketKeyPair resolve(V o);
-}
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
deleted file mode 100644
index 23f370518..000000000
--- a/spring-data-riak/src/main/java/org/springframework/data/keyvalue/riak/core/BucketKeyValueStoreOperations.java
+++ /dev/null
@@ -1,205 +0,0 @@
-/*
- * 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
deleted file mode 100644
index 4773811cd..000000000
--- a/spring-data-riak/src/main/java/org/springframework/data/keyvalue/riak/core/KeyValueStoreMetaData.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * 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.http.MediaType;
-
-import java.util.Map;
-
-/**
- * A generic interface to MetaData provided by Key/Value data stores.
- *
- * @author J. Brisbin
- */
-public interface KeyValueStoreMetaData {
-
- String getBucket();
-
- String getKey();
-
- /**
- * Get the Content-Type of this object.
- *
- * @return
- */
- MediaType getContentType();
-
- long getLastModified();
-
- /**
- * Get the arbitrary properties for this object.
- *
- * @return
- */
- Map getProperties();
-
-}
diff --git a/spring-data-riak/src/main/java/org/springframework/data/keyvalue/riak/core/KeyValueStoreOperations.java b/spring-data-riak/src/main/java/org/springframework/data/keyvalue/riak/core/KeyValueStoreOperations.java
deleted file mode 100644
index b618bcda6..000000000
--- a/spring-data-riak/src/main/java/org/springframework/data/keyvalue/riak/core/KeyValueStoreOperations.java
+++ /dev/null
@@ -1,271 +0,0 @@
-/*
- * 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.List;
-import java.util.Map;
-
-/**
- * Generic abstraction for Key/Value stores. Contains most operations that generic K/V stores
- * might expose.
- */
-public interface KeyValueStoreOperations {
-
- // Set operations
-
- /**
- * Set a value at a specified key.
- *
- * @param key
- * @param value
- * @return This template interface
- */
- KeyValueStoreOperations set(K key, V value);
-
- /**
- * Variation on set() that allows the user to specify {@link org.springframework.data.keyvalue.riak.core.QosParameters}.
- *
- * @param key
- * @param value
- * @param qosParams
- * @param
- * @param
- * @return
- */
- KeyValueStoreOperations set(K key, V value, QosParameters qosParams);
-
- /**
- * Set a value as a byte array at a specified key.
- *
- * @param key
- * @param value
- * @return This template interface
- */
- KeyValueStoreOperations setAsBytes(K key, byte[] value);
-
- /**
- * Variation on setWithMetaData() that allows the user to pass {@link
- * org.springframework.data.keyvalue.riak.core.QosParameters}.
- *
- * @param key
- * @param value
- * @param metaData
- * @param qosParams
- * @param
- * @param
- * @return
- */
- KeyValueStoreOperations setWithMetaData(K key, V value, Map metaData, QosParameters qosParams);
-
- // Get operations
-
- /**
- * Get a value at the specified key, trying to infer the type from either the bucket in which
- * the value was stored, or (by default) as a java.util.Map.
- *
- * @param key
- * @return The converted value, or null if not found.
- */
- V get(K key);
-
- /**
- * Get the value at the specified key as a byte array.
- *
- * @param key
- * @return The byte array of data, or null if not found.
- */
- byte[] getAsBytes(K key);
-
- /**
- * Get the value at the specified key and convert it into an instance of the specified type.
- *
- * @param key
- * @param requiredType
- * @return The converted value, or null if not found.
- */
- T getAsType(K key, Class requiredType);
-
- // Get and Set operations
-
- /**
- * Get the old value at the specified key and replace it with the given value.
- *
- * @param key
- * @param value
- * @return The old value (before it was overwritten).
- */
- V getAndSet(K key, V value);
-
- /**
- * Get the old value at the specified key as a byte array and replace it with the given
- * bytes.
- *
- * @param key
- * @param value
- * @return The old byte array (before it was overwritten).
- */
- byte[] getAndSetAsBytes(K key, byte[] value);
-
- /**
- * Get the old value at the specified key and replace it with the given value, converting it
- * to an instance of the given type.
- *
- * @param key
- * @param value
- * @param requiredType The type to convert the value to.
- * @return The old value (before it was overwritten).
- */
- T getAndSetAsType(K key, V value, Class requiredType);
-
- // Multi-get operations
-
- /**
- * Get all the values at the specified keys.
- *
- * @param keys
- * @return A list of the values retrieved or an empty list if none were found.
- */
- List getValues(List