You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@usergrid.apache.org by sf...@apache.org on 2014/10/10 17:50:28 UTC

[21/43] git commit: adding method for get fields

adding method for get fields


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

Branch: refs/heads/two-dot-o-events
Commit: c8fe1564fded77cf6f47bc0e8d6d28dcc21f0a30
Parents: 63094ab
Author: Shawn Feldman <sf...@apache.org>
Authored: Thu Oct 9 13:29:20 2014 -0600
Committer: Shawn Feldman <sf...@apache.org>
Committed: Thu Oct 9 13:29:20 2014 -0600

----------------------------------------------------------------------
 .../impl/EntityCollectionManagerImpl.java       | 20 ++++++++++++++++----
 1 file changed, 16 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-usergrid/blob/c8fe1564/stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/impl/EntityCollectionManagerImpl.java
----------------------------------------------------------------------
diff --git a/stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/impl/EntityCollectionManagerImpl.java b/stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/impl/EntityCollectionManagerImpl.java
index 5fe2fbb..61f436f 100644
--- a/stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/impl/EntityCollectionManagerImpl.java
+++ b/stack/corepersistence/collection/src/main/java/org/apache/usergrid/persistence/collection/impl/EntityCollectionManagerImpl.java
@@ -19,9 +19,10 @@
 package org.apache.usergrid.persistence.collection.impl;
 
 
-import java.util.Collection;
-import java.util.Collections;
+import java.util.*;
 
+import org.apache.usergrid.persistence.collection.serialization.UniqueValueSerializationStrategy;
+import org.apache.usergrid.persistence.model.field.Field;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -54,7 +55,6 @@ import org.apache.usergrid.persistence.model.util.UUIDGenerator;
 import com.google.common.base.Preconditions;
 import com.google.inject.Inject;
 import com.google.inject.assistedinject.Assisted;
-import java.util.UUID;
 
 import rx.Observable;
 import rx.functions.Action1;
@@ -83,7 +83,6 @@ public class EntityCollectionManagerImpl implements EntityCollectionManager {
     private final WriteOptimisticVerify writeOptimisticVerify;
     private final WriteCommit writeCommit;
     private final RollbackAction rollback;
-    private final GetVersion getVersion;
 
 
     //delete stages
@@ -93,6 +92,7 @@ public class EntityCollectionManagerImpl implements EntityCollectionManager {
     private final TaskExecutor taskExecutor;
 
     private final MvccEntitySerializationStrategy entitySerializationStrategy;
+    private UniqueValueSerializationStrategy uniqueValueSerializationStrategy;
 
     @Inject
     public EntityCollectionManagerImpl( final UUIDService uuidService, @Write final WriteStart writeStart,
@@ -102,9 +102,12 @@ public class EntityCollectionManagerImpl implements EntityCollectionManager {
                                         final WriteCommit writeCommit, final RollbackAction rollback,
                                         final MarkStart markStart, final MarkCommit markCommit,
                                         final MvccEntitySerializationStrategy entitySerializationStrategy,
+                                        final UniqueValueSerializationStrategy uniqueValueSerializationStrategy,
                                         @CollectionTaskExecutor final TaskExecutor taskExecutor,
                                         @Assisted final CollectionScope collectionScope
                                          ) {
+        this.uniqueValueSerializationStrategy = uniqueValueSerializationStrategy;
+        this.entitySerializationStrategy = entitySerializationStrategy;
 
 
         Preconditions.checkNotNull( uuidService, "uuidService must be defined" );
@@ -217,6 +220,15 @@ public class EntityCollectionManagerImpl implements EntityCollectionManager {
         return Observable.just( results );
     }
 
+    @Override
+       public Observable<Id> getIdField(Field field){
+        List<Field> fields = new ArrayList<>(1);
+        fields.add(field);
+        List list = Collections.singletonList(field);
+        rx.Observable.from(list).su
+        return null;
+    }
+
 
     @Override
     public Observable<Entity> update( final Entity entity ) {