You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@usergrid.apache.org by sn...@apache.org on 2014/01/16 18:30:10 UTC

[14/51] [abbrv] git commit: Minor format and import cleanups.

Minor format and import cleanups.


Project: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/commit/96473c98
Tree: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/tree/96473c98
Diff: http://git-wip-us.apache.org/repos/asf/incubator-usergrid/diff/96473c98

Branch: refs/heads/two-dot-o
Commit: 96473c989a500af4c6c78d25ea0c133cccc95646
Parents: a963549
Author: Dave Johnson <dm...@apigee.com>
Authored: Mon Jan 13 15:06:07 2014 -0500
Committer: Dave Johnson <dm...@apigee.com>
Committed: Mon Jan 13 15:06:07 2014 -0500

----------------------------------------------------------------------
 .../collection/mvcc/stage/write/WriteCommit.java  | 18 +++++++++---------
 .../UniqueValueSerializationStrategyImplTest.java |  3 ---
 2 files changed, 9 insertions(+), 12 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/96473c98/stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/mvcc/stage/write/WriteCommit.java
----------------------------------------------------------------------
diff --git a/stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/mvcc/stage/write/WriteCommit.java b/stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/mvcc/stage/write/WriteCommit.java
index acc4cf9..31212eb 100644
--- a/stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/mvcc/stage/write/WriteCommit.java
+++ b/stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/mvcc/stage/write/WriteCommit.java
@@ -61,17 +61,17 @@ public class WriteCommit implements Func1<CollectionIoEvent<MvccEntity>, Entity>
 
 
     @Inject
-    public WriteCommit( final MvccLogEntrySerializationStrategy logEntrySerializationStrategy,
-                        final MvccEntitySerializationStrategy entitySerializationStrategy,
-                        final UniqueValueSerializationStrategy uniqueValueSerializiationStrategy) {
+    public WriteCommit( final MvccLogEntrySerializationStrategy logStrat,
+                        final MvccEntitySerializationStrategy entryStrat,
+                        final UniqueValueSerializationStrategy uniqueValueStrat) {
 
-        Preconditions.checkNotNull( logEntrySerializationStrategy, "logEntrySerializationStrategy is required" );
-        Preconditions.checkNotNull( entitySerializationStrategy, "entitySerializationStrategy is required" );
+        Preconditions.checkNotNull( logStrat, "MvccLogEntrySerializationStrategy is required" );
+        Preconditions.checkNotNull( entryStrat, "MvccEntitySerializationStrategy is required" );
+        Preconditions.checkNotNull( uniqueValueStrat, "UniqueValueSerializationStrategy is required" );
 
-
-        this.logEntryStrat = logEntrySerializationStrategy;
-        this.entityStrat = entitySerializationStrategy;
-        this.uniqueValueStrat = uniqueValueSerializiationStrategy;
+        this.logEntryStrat = logStrat;
+        this.entityStrat = entryStrat;
+        this.uniqueValueStrat = uniqueValueStrat;
     }
 
 

http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/96473c98/stack/corepersistence/collection/src/test/java/org/apache/usergrid/persistence/collection/mvcc/stage/write/UniqueValueSerializationStrategyImplTest.java
----------------------------------------------------------------------
diff --git a/stack/corepersistence/collection/src/test/java/org/apache/usergrid/persistence/collection/mvcc/stage/write/UniqueValueSerializationStrategyImplTest.java b/stack/corepersistence/collection/src/test/java/org/apache/usergrid/persistence/collection/mvcc/stage/write/UniqueValueSerializationStrategyImplTest.java
index 075e4bb..10a70f9 100644
--- a/stack/corepersistence/collection/src/test/java/org/apache/usergrid/persistence/collection/mvcc/stage/write/UniqueValueSerializationStrategyImplTest.java
+++ b/stack/corepersistence/collection/src/test/java/org/apache/usergrid/persistence/collection/mvcc/stage/write/UniqueValueSerializationStrategyImplTest.java
@@ -17,9 +17,6 @@
  */
 package org.apache.usergrid.persistence.collection.mvcc.stage.write;
 
-import org.apache.usergrid.persistence.collection.mvcc.stage.write.UniqueValue;
-import org.apache.usergrid.persistence.collection.mvcc.stage.write.UniqueValueSerializationStrategy;
-import org.apache.usergrid.persistence.collection.mvcc.stage.write.UniqueValueImpl;
 import com.google.inject.Inject;
 import com.netflix.astyanax.connectionpool.exceptions.ConnectionException;
 import java.util.UUID;