googleapis
diff --git a/‎src/main/java/com/google/gcloud/datastore/CompleteKey.java‎
Lines changed: 0 additions & 104 deletions b/‎src/main/java/com/google/gcloud/datastore/CompleteKey.java‎
Lines changed: 0 additions & 104 deletions
diff --git a/‎src/main/java/com/google/gcloud/datastore/DatastoreService.java‎
Lines changed: 65 additions & 7 deletions b/‎src/main/java/com/google/gcloud/datastore/DatastoreService.java‎
Lines changed: 65 additions & 7 deletions
diff --git a/‎src/main/java/com/google/gcloud/datastore/DatastoreServiceImpl.java‎
Lines changed: 2 additions & 23 deletions b/‎src/main/java/com/google/gcloud/datastore/DatastoreServiceImpl.java‎
Lines changed: 2 additions & 23 deletions
@@ -1,20 +1,78 @@
 package com.google.gcloud.datastore;
 
+import java.util.Iterator;
 import java.util.Map;
 
 public interface DatastoreService {
 
-  DatastoreServiceOptions getOptions();
+  interface DatastoreReader {
+
+    Map<String, Property<?, ?, ?>> get(Key key);
+
+    // return the result in the given order
+    Iterator<Map<String, Property<?, ?, ?>>> get(Iterator<Key> key);
+
+    // query result item is a tuple of (key, value...) where values may be empty
+    //QueryResult runQuery(Query query);
+  }
+
+
+  interface DatastoreWriter {
+
+    Key add(IncompleteKey key, Map<String, Property<?, ?, ?>> values);
+
+    void update(Key key , Map<String, Property<?, ?, ?>> values);
+
+    Key put(IncompleteKey key, Map<String, Property<?, ?, ?>> values);
+
+    void delete(Key key);
+  }
+
+
+  public interface Transaction extends DatastoreReader, DatastoreWriter {
+
+    void commit();
 
-  CompleteKey put(Key key, Map<String, Property> values);
+    void rollback();
+  }
+
+  public interface TransactionOptions {
+
+    enum IsolationLevel {
+      SERIALIZABLE, SNAPSHOT;
+    }
+
+    IsolationLevel getIsolationLevel();
+  }
+
+  public interface Batch extends DatastoreWriter {
+
+    @Override
+    void add(Key key, Map<String, Property<?, ?, ?>> values);
+
+    @Override
+    void update(Key key , Map<String, Property<?, ?, ?>> values);
+
+    @Override
+    void put(Key key, Map<String, Property<?, ?, ?>> values);
+
+    void submit();
+  }
+
+  public interface BatchOptions {
+
+  }
+
+  DatastoreServiceOptions getOptions();
 
-  Map<String, Property> get(CompleteKey key);
+  Transaction newTransaction(TransactionOptions tsOptions);
 
-  void delete(CompleteKey... key);
+  Batch newBatch();
 
-  void allocateIds(Key... key);
+  P
 
-  // query result item is a tuple of (key, value...) where values may be empty
-  //QueryResult runQuery(Query query);
+  Key allocateId(IncompleteKey key);
 
+  // results are returned in request order
+  Iterator<Key> allocateIds(Iterator<IncompleteKey> key);
 }
@@ -1,6 +1,5 @@
 package com.google.gcloud.datastore;
 
-import java.util.Map;
 
 final class DatastoreServiceImpl implements DatastoreService {
 
@@ -10,28 +9,8 @@ final class DatastoreServiceImpl implements DatastoreService {
     this.options = options;
   }
 
+  @Override
   public DatastoreServiceOptions getOptions() {
-    // TODO Auto-generated method stub
-    return null;
-  }
-
-  public CompleteKey put(Key key, Map<String, Property> values) {
-    // TODO Auto-generated method stub
-    return null;
-  }
-
-  public Map<String, Property> get(CompleteKey key) {
-    // TODO Auto-generated method stub
-    return null;
-  }
-
-  public void delete(CompleteKey... key) {
-    // TODO Auto-generated method stub
-
-  }
-
-  public void allocateIds(Key... key) {
-    // TODO Auto-generated method stub
-
+    return options;
   }
 }