From 2b2b514e8ed1e0f6f5b0423f0c1d1eadbd285c44 Mon Sep 17 00:00:00 2001 From: "J. Brisbin" Date: Fri, 3 Dec 2010 08:25:35 -0600 Subject: [PATCH] Renamed package --- .../DataStoreConnectionFailureException.java | 2 +- .../riak/DataStoreOperationException.java | 2 +- .../riak/convert/KeyValueStoreMetaData.java | 2 +- .../riak/core/AbstractAsyncOperation.java | 2 +- .../riak/core/BucketKeyPair.java | 2 +- .../riak/core/BucketKeyResolver.java | 4 ++-- .../riak/core/KeyValueStoreMetaData.java | 2 +- .../riak/core/KeyValueStoreOperations.java | 6 ++--- .../riak/core/KeyValueStoreValue.java | 2 +- .../riak/core/QosParameters.java | 2 +- .../riak/core/RiakMetaData.java | 4 ++-- .../riak/core/RiakQosParameters.java | 2 +- .../riak/core/RiakTemplate.java | 24 +++++++++---------- .../{ => keyvalue}/riak/core/RiakValue.java | 2 +- .../riak/core/SimpleBucketKeyPair.java | 2 +- .../riak/core/SimpleBucketKeyResolver.java | 2 +- .../mapreduce/ErlangMapReduceOperation.java | 4 ++-- .../JavascriptMapReduceOperation.java | 8 +++---- .../riak/mapreduce/MapReduceJob.java | 2 +- .../riak/mapreduce/MapReduceOperation.java | 2 +- .../riak/mapreduce/MapReduceOperations.java | 4 ++-- .../riak/mapreduce/MapReducePhase.java | 2 +- .../riak/mapreduce/RiakMapReduceJob.java | 8 +++---- .../riak/mapreduce/RiakMapReducePhase.java | 4 ++-- .../riak/core/RiakTemplateSpec.groovy | 12 +++++----- .../{ => keyvalue}/riak/core/TestObject.java | 2 +- .../data/RiakTemplateTests.xml | 2 +- spring-data-riak/template.mf | 2 +- 28 files changed, 57 insertions(+), 57 deletions(-) rename spring-data-riak/src/main/java/org/springframework/data/{ => keyvalue}/riak/DataStoreConnectionFailureException.java (95%) rename spring-data-riak/src/main/java/org/springframework/data/{ => keyvalue}/riak/DataStoreOperationException.java (95%) rename spring-data-riak/src/main/java/org/springframework/data/{ => keyvalue}/riak/convert/KeyValueStoreMetaData.java (95%) rename spring-data-riak/src/main/java/org/springframework/data/{ => keyvalue}/riak/core/AbstractAsyncOperation.java (96%) rename spring-data-riak/src/main/java/org/springframework/data/{ => keyvalue}/riak/core/BucketKeyPair.java (87%) rename spring-data-riak/src/main/java/org/springframework/data/{ => keyvalue}/riak/core/BucketKeyResolver.java (79%) rename spring-data-riak/src/main/java/org/springframework/data/{ => keyvalue}/riak/core/KeyValueStoreMetaData.java (89%) rename spring-data-riak/src/main/java/org/springframework/data/{ => keyvalue}/riak/core/KeyValueStoreOperations.java (94%) rename spring-data-riak/src/main/java/org/springframework/data/{ => keyvalue}/riak/core/KeyValueStoreValue.java (87%) rename spring-data-riak/src/main/java/org/springframework/data/{ => keyvalue}/riak/core/QosParameters.java (91%) rename spring-data-riak/src/main/java/org/springframework/data/{ => keyvalue}/riak/core/RiakMetaData.java (82%) rename spring-data-riak/src/main/java/org/springframework/data/{ => keyvalue}/riak/core/RiakQosParameters.java (94%) rename spring-data-riak/src/main/java/org/springframework/data/{ => keyvalue}/riak/core/RiakTemplate.java (97%) rename spring-data-riak/src/main/java/org/springframework/data/{ => keyvalue}/riak/core/RiakValue.java (89%) rename spring-data-riak/src/main/java/org/springframework/data/{ => keyvalue}/riak/core/SimpleBucketKeyPair.java (93%) rename spring-data-riak/src/main/java/org/springframework/data/{ => keyvalue}/riak/core/SimpleBucketKeyResolver.java (97%) rename spring-data-riak/src/main/java/org/springframework/data/{ => keyvalue}/riak/mapreduce/ErlangMapReduceOperation.java (86%) rename spring-data-riak/src/main/java/org/springframework/data/{ => keyvalue}/riak/mapreduce/JavascriptMapReduceOperation.java (77%) rename spring-data-riak/src/main/java/org/springframework/data/{ => keyvalue}/riak/mapreduce/MapReduceJob.java (96%) rename spring-data-riak/src/main/java/org/springframework/data/{ => keyvalue}/riak/mapreduce/MapReduceOperation.java (93%) rename spring-data-riak/src/main/java/org/springframework/data/{ => keyvalue}/riak/mapreduce/MapReduceOperations.java (90%) rename spring-data-riak/src/main/java/org/springframework/data/{ => keyvalue}/riak/mapreduce/MapReducePhase.java (95%) rename spring-data-riak/src/main/java/org/springframework/data/{ => keyvalue}/riak/mapreduce/RiakMapReduceJob.java (94%) rename spring-data-riak/src/main/java/org/springframework/data/{ => keyvalue}/riak/mapreduce/RiakMapReducePhase.java (91%) rename spring-data-riak/src/test/groovy/org/springframework/data/{ => keyvalue}/riak/core/RiakTemplateSpec.groovy (93%) rename spring-data-riak/src/test/java/org/springframework/data/{ => keyvalue}/riak/core/TestObject.java (94%) diff --git a/spring-data-riak/src/main/java/org/springframework/data/riak/DataStoreConnectionFailureException.java b/spring-data-riak/src/main/java/org/springframework/data/keyvalue/riak/DataStoreConnectionFailureException.java similarity index 95% rename from spring-data-riak/src/main/java/org/springframework/data/riak/DataStoreConnectionFailureException.java rename to spring-data-riak/src/main/java/org/springframework/data/keyvalue/riak/DataStoreConnectionFailureException.java index 7b098bb2c..f6f6a6089 100644 --- a/spring-data-riak/src/main/java/org/springframework/data/riak/DataStoreConnectionFailureException.java +++ b/spring-data-riak/src/main/java/org/springframework/data/keyvalue/riak/DataStoreConnectionFailureException.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.data.riak; +package org.springframework.data.keyvalue.riak; import org.springframework.dao.DataAccessResourceFailureException; diff --git a/spring-data-riak/src/main/java/org/springframework/data/riak/DataStoreOperationException.java b/spring-data-riak/src/main/java/org/springframework/data/keyvalue/riak/DataStoreOperationException.java similarity index 95% rename from spring-data-riak/src/main/java/org/springframework/data/riak/DataStoreOperationException.java rename to spring-data-riak/src/main/java/org/springframework/data/keyvalue/riak/DataStoreOperationException.java index 592512a5c..0d4ddc44e 100644 --- a/spring-data-riak/src/main/java/org/springframework/data/riak/DataStoreOperationException.java +++ b/spring-data-riak/src/main/java/org/springframework/data/keyvalue/riak/DataStoreOperationException.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.data.riak; +package org.springframework.data.keyvalue.riak; import org.springframework.dao.DataAccessException; diff --git a/spring-data-riak/src/main/java/org/springframework/data/riak/convert/KeyValueStoreMetaData.java b/spring-data-riak/src/main/java/org/springframework/data/keyvalue/riak/convert/KeyValueStoreMetaData.java similarity index 95% rename from spring-data-riak/src/main/java/org/springframework/data/riak/convert/KeyValueStoreMetaData.java rename to spring-data-riak/src/main/java/org/springframework/data/keyvalue/riak/convert/KeyValueStoreMetaData.java index 331f1cccb..54a4f163d 100644 --- a/spring-data-riak/src/main/java/org/springframework/data/riak/convert/KeyValueStoreMetaData.java +++ b/spring-data-riak/src/main/java/org/springframework/data/keyvalue/riak/convert/KeyValueStoreMetaData.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.data.riak.convert; +package org.springframework.data.keyvalue.riak.convert; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; diff --git a/spring-data-riak/src/main/java/org/springframework/data/riak/core/AbstractAsyncOperation.java b/spring-data-riak/src/main/java/org/springframework/data/keyvalue/riak/core/AbstractAsyncOperation.java similarity index 96% rename from spring-data-riak/src/main/java/org/springframework/data/riak/core/AbstractAsyncOperation.java rename to spring-data-riak/src/main/java/org/springframework/data/keyvalue/riak/core/AbstractAsyncOperation.java index 5e395c467..15ab148d7 100644 --- a/spring-data-riak/src/main/java/org/springframework/data/riak/core/AbstractAsyncOperation.java +++ b/spring-data-riak/src/main/java/org/springframework/data/keyvalue/riak/core/AbstractAsyncOperation.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.data.riak.core; +package org.springframework.data.keyvalue.riak.core; import org.springframework.beans.factory.InitializingBean; import org.springframework.util.Assert; diff --git a/spring-data-riak/src/main/java/org/springframework/data/riak/core/BucketKeyPair.java b/spring-data-riak/src/main/java/org/springframework/data/keyvalue/riak/core/BucketKeyPair.java similarity index 87% rename from spring-data-riak/src/main/java/org/springframework/data/riak/core/BucketKeyPair.java rename to spring-data-riak/src/main/java/org/springframework/data/keyvalue/riak/core/BucketKeyPair.java index b32cca31c..762a5a907 100644 --- a/spring-data-riak/src/main/java/org/springframework/data/riak/core/BucketKeyPair.java +++ b/spring-data-riak/src/main/java/org/springframework/data/keyvalue/riak/core/BucketKeyPair.java @@ -1,4 +1,4 @@ -package org.springframework.data.riak.core; +package org.springframework.data.keyvalue.riak.core; /** * A generic interface for representing composite keys in data stores that use a diff --git a/spring-data-riak/src/main/java/org/springframework/data/riak/core/BucketKeyResolver.java b/spring-data-riak/src/main/java/org/springframework/data/keyvalue/riak/core/BucketKeyResolver.java similarity index 79% rename from spring-data-riak/src/main/java/org/springframework/data/riak/core/BucketKeyResolver.java rename to spring-data-riak/src/main/java/org/springframework/data/keyvalue/riak/core/BucketKeyResolver.java index 6a1c157e0..4ddafb8ea 100644 --- a/spring-data-riak/src/main/java/org/springframework/data/riak/core/BucketKeyResolver.java +++ b/spring-data-riak/src/main/java/org/springframework/data/keyvalue/riak/core/BucketKeyResolver.java @@ -1,8 +1,8 @@ -package org.springframework.data.riak.core; +package org.springframework.data.keyvalue.riak.core; /** * A generic interface to a resolver to turn a single object into a {@link - * org.springframework.data.riak.core.BucketKeyPair}. + * org.springframework.data.keyvalue.riak.core.BucketKeyPair}. * * @author J. Brisbin */ diff --git a/spring-data-riak/src/main/java/org/springframework/data/riak/core/KeyValueStoreMetaData.java b/spring-data-riak/src/main/java/org/springframework/data/keyvalue/riak/core/KeyValueStoreMetaData.java similarity index 89% rename from spring-data-riak/src/main/java/org/springframework/data/riak/core/KeyValueStoreMetaData.java rename to spring-data-riak/src/main/java/org/springframework/data/keyvalue/riak/core/KeyValueStoreMetaData.java index 267b73a7f..b07e206f5 100644 --- a/spring-data-riak/src/main/java/org/springframework/data/riak/core/KeyValueStoreMetaData.java +++ b/spring-data-riak/src/main/java/org/springframework/data/keyvalue/riak/core/KeyValueStoreMetaData.java @@ -1,4 +1,4 @@ -package org.springframework.data.riak.core; +package org.springframework.data.keyvalue.riak.core; import org.springframework.http.MediaType; diff --git a/spring-data-riak/src/main/java/org/springframework/data/riak/core/KeyValueStoreOperations.java b/spring-data-riak/src/main/java/org/springframework/data/keyvalue/riak/core/KeyValueStoreOperations.java similarity index 94% rename from spring-data-riak/src/main/java/org/springframework/data/riak/core/KeyValueStoreOperations.java rename to spring-data-riak/src/main/java/org/springframework/data/keyvalue/riak/core/KeyValueStoreOperations.java index 799c6540f..845d93281 100644 --- a/spring-data-riak/src/main/java/org/springframework/data/riak/core/KeyValueStoreOperations.java +++ b/spring-data-riak/src/main/java/org/springframework/data/keyvalue/riak/core/KeyValueStoreOperations.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.riak.core; +package org.springframework.data.keyvalue.riak.core; import java.util.List; import java.util.Map; @@ -36,7 +36,7 @@ public interface KeyValueStoreOperations { KeyValueStoreOperations set(K key, V value); /** - * Variation on set() that allows the user to specify {@link org.springframework.data.riak.core.QosParameters}. + * Variation on set() that allows the user to specify {@link org.springframework.data.keyvalue.riak.core.QosParameters}. * * @param key * @param value @@ -58,7 +58,7 @@ public interface KeyValueStoreOperations { /** * Variation on setWithMetaData() that allows the user to pass {@link - * org.springframework.data.riak.core.QosParameters}. + * org.springframework.data.keyvalue.riak.core.QosParameters}. * * @param key * @param value diff --git a/spring-data-riak/src/main/java/org/springframework/data/riak/core/KeyValueStoreValue.java b/spring-data-riak/src/main/java/org/springframework/data/keyvalue/riak/core/KeyValueStoreValue.java similarity index 87% rename from spring-data-riak/src/main/java/org/springframework/data/riak/core/KeyValueStoreValue.java rename to spring-data-riak/src/main/java/org/springframework/data/keyvalue/riak/core/KeyValueStoreValue.java index 5b593d9fc..3df06128a 100644 --- a/spring-data-riak/src/main/java/org/springframework/data/riak/core/KeyValueStoreValue.java +++ b/spring-data-riak/src/main/java/org/springframework/data/keyvalue/riak/core/KeyValueStoreValue.java @@ -1,4 +1,4 @@ -package org.springframework.data.riak.core; +package org.springframework.data.keyvalue.riak.core; /** * A generic interface for dealing with values and their store metadata. diff --git a/spring-data-riak/src/main/java/org/springframework/data/riak/core/QosParameters.java b/spring-data-riak/src/main/java/org/springframework/data/keyvalue/riak/core/QosParameters.java similarity index 91% rename from spring-data-riak/src/main/java/org/springframework/data/riak/core/QosParameters.java rename to spring-data-riak/src/main/java/org/springframework/data/keyvalue/riak/core/QosParameters.java index f69c4ec02..86e9f6159 100644 --- a/spring-data-riak/src/main/java/org/springframework/data/riak/core/QosParameters.java +++ b/spring-data-riak/src/main/java/org/springframework/data/keyvalue/riak/core/QosParameters.java @@ -1,4 +1,4 @@ -package org.springframework.data.riak.core; +package org.springframework.data.keyvalue.riak.core; /** * Specify Quality Of Service parameters. diff --git a/spring-data-riak/src/main/java/org/springframework/data/riak/core/RiakMetaData.java b/spring-data-riak/src/main/java/org/springframework/data/keyvalue/riak/core/RiakMetaData.java similarity index 82% rename from spring-data-riak/src/main/java/org/springframework/data/riak/core/RiakMetaData.java rename to spring-data-riak/src/main/java/org/springframework/data/keyvalue/riak/core/RiakMetaData.java index 062940b95..c3f1b110a 100644 --- a/spring-data-riak/src/main/java/org/springframework/data/riak/core/RiakMetaData.java +++ b/spring-data-riak/src/main/java/org/springframework/data/keyvalue/riak/core/RiakMetaData.java @@ -1,11 +1,11 @@ -package org.springframework.data.riak.core; +package org.springframework.data.keyvalue.riak.core; import org.springframework.http.MediaType; import java.util.Map; /** - * An implementation of {@link org.springframework.data.riak.core.KeyValueStoreMetaData} + * An implementation of {@link org.springframework.data.keyvalue.riak.core.KeyValueStoreMetaData} * for Riak. * * @author J. Brisbin diff --git a/spring-data-riak/src/main/java/org/springframework/data/riak/core/RiakQosParameters.java b/spring-data-riak/src/main/java/org/springframework/data/keyvalue/riak/core/RiakQosParameters.java similarity index 94% rename from spring-data-riak/src/main/java/org/springframework/data/riak/core/RiakQosParameters.java rename to spring-data-riak/src/main/java/org/springframework/data/keyvalue/riak/core/RiakQosParameters.java index 8fbf14736..fdf3a0e06 100644 --- a/spring-data-riak/src/main/java/org/springframework/data/riak/core/RiakQosParameters.java +++ b/spring-data-riak/src/main/java/org/springframework/data/keyvalue/riak/core/RiakQosParameters.java @@ -1,4 +1,4 @@ -package org.springframework.data.riak.core; +package org.springframework.data.keyvalue.riak.core; /** * A generic class for specifying Quality Of Service parameters on operations. diff --git a/spring-data-riak/src/main/java/org/springframework/data/riak/core/RiakTemplate.java b/spring-data-riak/src/main/java/org/springframework/data/keyvalue/riak/core/RiakTemplate.java similarity index 97% rename from spring-data-riak/src/main/java/org/springframework/data/riak/core/RiakTemplate.java rename to spring-data-riak/src/main/java/org/springframework/data/keyvalue/riak/core/RiakTemplate.java index 0a7b2a578..72645f3ff 100644 --- a/spring-data-riak/src/main/java/org/springframework/data/riak/core/RiakTemplate.java +++ b/spring-data-riak/src/main/java/org/springframework/data/keyvalue/riak/core/RiakTemplate.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.data.riak.core; +package org.springframework.data.keyvalue.riak.core; import org.codehaus.groovy.runtime.GStringImpl; import org.codehaus.jackson.map.ObjectMapper; @@ -26,11 +26,11 @@ 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.riak.DataStoreOperationException; -import org.springframework.data.riak.convert.KeyValueStoreMetaData; -import org.springframework.data.riak.mapreduce.MapReduceJob; -import org.springframework.data.riak.mapreduce.MapReduceOperations; -import org.springframework.data.riak.mapreduce.RiakMapReduceJob; +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; import org.springframework.http.*; import org.springframework.http.client.ClientHttpRequest; import org.springframework.http.client.ClientHttpRequestFactory; @@ -60,12 +60,12 @@ import java.util.regex.Matcher; import java.util.regex.Pattern; /** - * An implementation of {@link org.springframework.data.riak.core.KeyValueStoreOperations} and - * {@link org.springframework.data.riak.mapreduce.MapReduceOperations} for the Riak data store. + * 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.riak.core.RiakTemplate"
+ * <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"/>
  *
@@ -80,10 +80,10 @@ import java.util.regex.Pattern; * * 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.riak.core.SimpleBucketKeyPair})
    • + * 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.riak.convert.KeyValueStoreMetaData} annotation on the object you're + * org.springframework.data.keyvalue.riak.convert.KeyValueStoreMetaData} annotation on the object you're * storing.
* * @author J. Brisbin @@ -94,7 +94,7 @@ public class RiakTemplate extends RestGatewaySupport implements KeyValueStoreOpe /** * Client ID used by Riak to correlate updates. */ - private static final String RIAK_CLIENT_ID = "org.springframework.data.riak.core.RiakTemplate/1.0"; + 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. */ diff --git a/spring-data-riak/src/main/java/org/springframework/data/riak/core/RiakValue.java b/spring-data-riak/src/main/java/org/springframework/data/keyvalue/riak/core/RiakValue.java similarity index 89% rename from spring-data-riak/src/main/java/org/springframework/data/riak/core/RiakValue.java rename to spring-data-riak/src/main/java/org/springframework/data/keyvalue/riak/core/RiakValue.java index 1b91c0957..16d2e3d3c 100644 --- a/spring-data-riak/src/main/java/org/springframework/data/riak/core/RiakValue.java +++ b/spring-data-riak/src/main/java/org/springframework/data/keyvalue/riak/core/RiakValue.java @@ -1,4 +1,4 @@ -package org.springframework.data.riak.core; +package org.springframework.data.keyvalue.riak.core; /** * @author J. Brisbin diff --git a/spring-data-riak/src/main/java/org/springframework/data/riak/core/SimpleBucketKeyPair.java b/spring-data-riak/src/main/java/org/springframework/data/keyvalue/riak/core/SimpleBucketKeyPair.java similarity index 93% rename from spring-data-riak/src/main/java/org/springframework/data/riak/core/SimpleBucketKeyPair.java rename to spring-data-riak/src/main/java/org/springframework/data/keyvalue/riak/core/SimpleBucketKeyPair.java index 56e087f03..a694848da 100644 --- a/spring-data-riak/src/main/java/org/springframework/data/riak/core/SimpleBucketKeyPair.java +++ b/spring-data-riak/src/main/java/org/springframework/data/keyvalue/riak/core/SimpleBucketKeyPair.java @@ -1,4 +1,4 @@ -package org.springframework.data.riak.core; +package org.springframework.data.keyvalue.riak.core; /** * @author J. Brisbin diff --git a/spring-data-riak/src/main/java/org/springframework/data/riak/core/SimpleBucketKeyResolver.java b/spring-data-riak/src/main/java/org/springframework/data/keyvalue/riak/core/SimpleBucketKeyResolver.java similarity index 97% rename from spring-data-riak/src/main/java/org/springframework/data/riak/core/SimpleBucketKeyResolver.java rename to spring-data-riak/src/main/java/org/springframework/data/keyvalue/riak/core/SimpleBucketKeyResolver.java index 86e147b63..da01c6bae 100644 --- a/spring-data-riak/src/main/java/org/springframework/data/riak/core/SimpleBucketKeyResolver.java +++ b/spring-data-riak/src/main/java/org/springframework/data/keyvalue/riak/core/SimpleBucketKeyResolver.java @@ -1,4 +1,4 @@ -package org.springframework.data.riak.core; +package org.springframework.data.keyvalue.riak.core; import org.codehaus.groovy.runtime.GStringImpl; import org.springframework.util.ClassUtils; diff --git a/spring-data-riak/src/main/java/org/springframework/data/riak/mapreduce/ErlangMapReduceOperation.java b/spring-data-riak/src/main/java/org/springframework/data/keyvalue/riak/mapreduce/ErlangMapReduceOperation.java similarity index 86% rename from spring-data-riak/src/main/java/org/springframework/data/riak/mapreduce/ErlangMapReduceOperation.java rename to spring-data-riak/src/main/java/org/springframework/data/keyvalue/riak/mapreduce/ErlangMapReduceOperation.java index 0d804ab71..db1f815c8 100644 --- a/spring-data-riak/src/main/java/org/springframework/data/riak/mapreduce/ErlangMapReduceOperation.java +++ b/spring-data-riak/src/main/java/org/springframework/data/keyvalue/riak/mapreduce/ErlangMapReduceOperation.java @@ -1,10 +1,10 @@ -package org.springframework.data.riak.mapreduce; +package org.springframework.data.keyvalue.riak.mapreduce; import java.util.LinkedHashMap; import java.util.Map; /** - * An implementation of {@link org.springframework.data.riak.mapreduce.MapReduceOperation} + * An implementation of {@link org.springframework.data.keyvalue.riak.mapreduce.MapReduceOperation} * to represent an Erlang M/R function, which must be already defined inside the * Riak server. * diff --git a/spring-data-riak/src/main/java/org/springframework/data/riak/mapreduce/JavascriptMapReduceOperation.java b/spring-data-riak/src/main/java/org/springframework/data/keyvalue/riak/mapreduce/JavascriptMapReduceOperation.java similarity index 77% rename from spring-data-riak/src/main/java/org/springframework/data/riak/mapreduce/JavascriptMapReduceOperation.java rename to spring-data-riak/src/main/java/org/springframework/data/keyvalue/riak/mapreduce/JavascriptMapReduceOperation.java index 8a31925b4..b15bb483d 100644 --- a/spring-data-riak/src/main/java/org/springframework/data/riak/mapreduce/JavascriptMapReduceOperation.java +++ b/spring-data-riak/src/main/java/org/springframework/data/keyvalue/riak/mapreduce/JavascriptMapReduceOperation.java @@ -1,9 +1,9 @@ -package org.springframework.data.riak.mapreduce; +package org.springframework.data.keyvalue.riak.mapreduce; -import org.springframework.data.riak.core.BucketKeyPair; +import org.springframework.data.keyvalue.riak.core.BucketKeyPair; /** - * An implementation of {@link org.springframework.data.riak.mapreduce.MapReduceOperation} + * An implementation of {@link org.springframework.data.keyvalue.riak.mapreduce.MapReduceOperation} * to describe a Javascript language M/R function. * * @author J. Brisbin @@ -39,7 +39,7 @@ public class JavascriptMapReduceOperation implements MapReduceOperation { } /** - * Set the {@link org.springframework.data.riak.core.BucketKeyPair} to + * Set the {@link org.springframework.data.keyvalue.riak.core.BucketKeyPair} to * point to for the Javascript to use in this M/R function. * * @param bucketKeyPair diff --git a/spring-data-riak/src/main/java/org/springframework/data/riak/mapreduce/MapReduceJob.java b/spring-data-riak/src/main/java/org/springframework/data/keyvalue/riak/mapreduce/MapReduceJob.java similarity index 96% rename from spring-data-riak/src/main/java/org/springframework/data/riak/mapreduce/MapReduceJob.java rename to spring-data-riak/src/main/java/org/springframework/data/keyvalue/riak/mapreduce/MapReduceJob.java index 694a88033..5d0ae10d9 100644 --- a/spring-data-riak/src/main/java/org/springframework/data/riak/mapreduce/MapReduceJob.java +++ b/spring-data-riak/src/main/java/org/springframework/data/keyvalue/riak/mapreduce/MapReduceJob.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.data.riak.mapreduce; +package org.springframework.data.keyvalue.riak.mapreduce; import java.util.List; import java.util.concurrent.Callable; diff --git a/spring-data-riak/src/main/java/org/springframework/data/riak/mapreduce/MapReduceOperation.java b/spring-data-riak/src/main/java/org/springframework/data/keyvalue/riak/mapreduce/MapReduceOperation.java similarity index 93% rename from spring-data-riak/src/main/java/org/springframework/data/riak/mapreduce/MapReduceOperation.java rename to spring-data-riak/src/main/java/org/springframework/data/keyvalue/riak/mapreduce/MapReduceOperation.java index a00b106dd..46845acc7 100644 --- a/spring-data-riak/src/main/java/org/springframework/data/riak/mapreduce/MapReduceOperation.java +++ b/spring-data-riak/src/main/java/org/springframework/data/keyvalue/riak/mapreduce/MapReduceOperation.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.data.riak.mapreduce; +package org.springframework.data.keyvalue.riak.mapreduce; /** * A generic interface to a Map/Reduce operation. diff --git a/spring-data-riak/src/main/java/org/springframework/data/riak/mapreduce/MapReduceOperations.java b/spring-data-riak/src/main/java/org/springframework/data/keyvalue/riak/mapreduce/MapReduceOperations.java similarity index 90% rename from spring-data-riak/src/main/java/org/springframework/data/riak/mapreduce/MapReduceOperations.java rename to spring-data-riak/src/main/java/org/springframework/data/keyvalue/riak/mapreduce/MapReduceOperations.java index 8ab1a67c3..1aa6a9c1d 100644 --- a/spring-data-riak/src/main/java/org/springframework/data/riak/mapreduce/MapReduceOperations.java +++ b/spring-data-riak/src/main/java/org/springframework/data/keyvalue/riak/mapreduce/MapReduceOperations.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.data.riak.mapreduce; +package org.springframework.data.keyvalue.riak.mapreduce; import java.util.List; import java.util.concurrent.Future; @@ -27,7 +27,7 @@ import java.util.concurrent.Future; public interface MapReduceOperations { /** - * Execute a {@link org.springframework.data.riak.mapreduce.MapReduceJob} + * Execute a {@link org.springframework.data.keyvalue.riak.mapreduce.MapReduceJob} * synchronously. * * @param job diff --git a/spring-data-riak/src/main/java/org/springframework/data/riak/mapreduce/MapReducePhase.java b/spring-data-riak/src/main/java/org/springframework/data/keyvalue/riak/mapreduce/MapReducePhase.java similarity index 95% rename from spring-data-riak/src/main/java/org/springframework/data/riak/mapreduce/MapReducePhase.java rename to spring-data-riak/src/main/java/org/springframework/data/keyvalue/riak/mapreduce/MapReducePhase.java index 09b0b180b..6c62bd0ed 100644 --- a/spring-data-riak/src/main/java/org/springframework/data/riak/mapreduce/MapReducePhase.java +++ b/spring-data-riak/src/main/java/org/springframework/data/keyvalue/riak/mapreduce/MapReducePhase.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.data.riak.mapreduce; +package org.springframework.data.keyvalue.riak.mapreduce; /** * A generic interface to the phases of Map/Reduce jobs. diff --git a/spring-data-riak/src/main/java/org/springframework/data/riak/mapreduce/RiakMapReduceJob.java b/spring-data-riak/src/main/java/org/springframework/data/keyvalue/riak/mapreduce/RiakMapReduceJob.java similarity index 94% rename from spring-data-riak/src/main/java/org/springframework/data/riak/mapreduce/RiakMapReduceJob.java rename to spring-data-riak/src/main/java/org/springframework/data/keyvalue/riak/mapreduce/RiakMapReduceJob.java index d0a06f04e..f4a37b9e0 100644 --- a/spring-data-riak/src/main/java/org/springframework/data/riak/mapreduce/RiakMapReduceJob.java +++ b/spring-data-riak/src/main/java/org/springframework/data/keyvalue/riak/mapreduce/RiakMapReduceJob.java @@ -14,14 +14,14 @@ * limitations under the License. */ -package org.springframework.data.riak.mapreduce; +package org.springframework.data.keyvalue.riak.mapreduce; import org.codehaus.jackson.JsonFactory; import org.codehaus.jackson.JsonGenerator; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.springframework.data.riak.core.BucketKeyPair; -import org.springframework.data.riak.core.RiakTemplate; +import org.springframework.data.keyvalue.riak.core.BucketKeyPair; +import org.springframework.data.keyvalue.riak.core.RiakTemplate; import java.io.IOException; import java.io.StringWriter; @@ -31,7 +31,7 @@ import java.util.List; import java.util.Map; /** - * An implementation of {@link org.springframework.data.riak.mapreduce.MapReduceJob} + * An implementation of {@link org.springframework.data.keyvalue.riak.mapreduce.MapReduceJob} * for the Riak data store. * * @author J. Brisbin diff --git a/spring-data-riak/src/main/java/org/springframework/data/riak/mapreduce/RiakMapReducePhase.java b/spring-data-riak/src/main/java/org/springframework/data/keyvalue/riak/mapreduce/RiakMapReducePhase.java similarity index 91% rename from spring-data-riak/src/main/java/org/springframework/data/riak/mapreduce/RiakMapReducePhase.java rename to spring-data-riak/src/main/java/org/springframework/data/keyvalue/riak/mapreduce/RiakMapReducePhase.java index 38386fb6f..1e8638592 100644 --- a/spring-data-riak/src/main/java/org/springframework/data/riak/mapreduce/RiakMapReducePhase.java +++ b/spring-data-riak/src/main/java/org/springframework/data/keyvalue/riak/mapreduce/RiakMapReducePhase.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package org.springframework.data.riak.mapreduce; +package org.springframework.data.keyvalue.riak.mapreduce; /** - * An implementation of {@link org.springframework.data.riak.mapreduce.MapReducePhase} + * An implementation of {@link org.springframework.data.keyvalue.riak.mapreduce.MapReducePhase} * for the Riak data store. * * @author J. Brisbin diff --git a/spring-data-riak/src/test/groovy/org/springframework/data/riak/core/RiakTemplateSpec.groovy b/spring-data-riak/src/test/groovy/org/springframework/data/keyvalue/riak/core/RiakTemplateSpec.groovy similarity index 93% rename from spring-data-riak/src/test/groovy/org/springframework/data/riak/core/RiakTemplateSpec.groovy rename to spring-data-riak/src/test/groovy/org/springframework/data/keyvalue/riak/core/RiakTemplateSpec.groovy index 8b7ac02ad..903887bd4 100644 --- a/spring-data-riak/src/test/groovy/org/springframework/data/riak/core/RiakTemplateSpec.groovy +++ b/spring-data-riak/src/test/groovy/org/springframework/data/keyvalue/riak/core/RiakTemplateSpec.groovy @@ -13,13 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.springframework.data.riak.core +package org.springframework.data.keyvalue.riak.core import org.springframework.beans.factory.annotation.Autowired import org.springframework.context.ApplicationContext -import org.springframework.data.riak.mapreduce.JavascriptMapReduceOperation -import org.springframework.data.riak.mapreduce.MapReduceJob -import org.springframework.data.riak.mapreduce.RiakMapReducePhase +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 spock.lang.Specification @@ -197,7 +197,7 @@ class RiakTemplateSpec extends Specification { given: MapReduceJob job = riak.createMapReduceJob() - def mapJs = new JavascriptMapReduceOperation("function(v){ var o=Riak.mapValuesJson(v); return [1]; }") + def mapJs = new JavascriptMapReduceOperation("function(v){ var o=Riak.mapValuesJson(v); return [1]; }\n") def mapPhase = new RiakMapReducePhase("map", "javascript", mapJs) def reduceJs = new JavascriptMapReduceOperation("Riak.reduceSum") @@ -220,7 +220,7 @@ class RiakTemplateSpec extends Specification { given: MapReduceJob job = riak.createMapReduceJob() - def mapJs = new JavascriptMapReduceOperation("function(v){ var o=Riak.mapValuesJson(v); return [1]; }") + def mapJs = new JavascriptMapReduceOperation("function(v){ var o=Riak.mapValuesJson(v); return [1]; }\n") def mapPhase = new RiakMapReducePhase("map", "javascript", mapJs) def reduceJs = new JavascriptMapReduceOperation("Riak.reduceSum") diff --git a/spring-data-riak/src/test/java/org/springframework/data/riak/core/TestObject.java b/spring-data-riak/src/test/java/org/springframework/data/keyvalue/riak/core/TestObject.java similarity index 94% rename from spring-data-riak/src/test/java/org/springframework/data/riak/core/TestObject.java rename to spring-data-riak/src/test/java/org/springframework/data/keyvalue/riak/core/TestObject.java index fb37ae547..ee9d5eb04 100644 --- a/spring-data-riak/src/test/java/org/springframework/data/riak/core/TestObject.java +++ b/spring-data-riak/src/test/java/org/springframework/data/keyvalue/riak/core/TestObject.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package org.springframework.data.riak.core; +package org.springframework.data.keyvalue.riak.core; /** * @author J. Brisbin 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 51394025e..35917c089 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,6 @@ - + diff --git a/spring-data-riak/template.mf b/spring-data-riak/template.mf index aba21f9d8..c62ac63b3 100644 --- a/spring-data-riak/template.mf +++ b/spring-data-riak/template.mf @@ -1,4 +1,4 @@ -Bundle-SymbolicName: org.springframework.data.riak +Bundle-SymbolicName: org.springframework.data.keyvalue.riak Bundle-Name: Spring data Riak Support Bundle-Vendor: SpringSource Bundle-ManifestVersion: 2