address comments

neozwu · neozwu · commit e0aa253aaaff · 2017-04-18T14:42:47.000-07:00
diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/DatastoreImpl.java b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/DatastoreImpl.java
@@ -47,6 +47,8 @@ final class DatastoreImpl extends BaseService<DatastoreOptions> implements Datas
 
   private final DatastoreRpc datastoreRpc;
   private final RetrySettings retrySettings;
+  private static final ExceptionHandler TRANSACTION_EXCEPTION_HANDLER =
+      TransactionExceptionHandler.build();
 
   DatastoreImpl(DatastoreOptions options) {
     super(options);
@@ -67,7 +69,6 @@ public Transaction newTransaction() {
 
   @Override
   public <T> T runInTransaction(final TransactionCallable<T> callable) {
-    ExceptionHandler TRANSACTION_EXCEPTION_HANDLER = TransactionExceptionHandler.build();
     final DatastoreImpl self = this;
     try {
       return RetryHelper.runWithRetries(
diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/TransactionExceptionHandler.java b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/TransactionExceptionHandler.java
@@ -22,6 +22,9 @@
 public class TransactionExceptionHandler {
   public static final Interceptor TRANSACTION_EXCEPTION_HANDLER_INTERCEPTOR =
       new Interceptor() {
+
+        private static final long serialVersionUID = -1240723093072535978L;
+
         private static final int ABORTED_CODE = 10;
 
         @Override
diff --git a/google-cloud-datastore/src/test/java/com/google/cloud/datastore/it/ITDatastoreTest.java b/google-cloud-datastore/src/test/java/com/google/cloud/datastore/it/ITDatastoreTest.java
@@ -735,11 +735,11 @@ public void testDelete() {
   public void testRunInTransaction() {
     Datastore.TransactionCallable<Integer> callable1 =
         new Datastore.TransactionCallable<Integer>() {
-          private Integer attempts = 0;
+          private Integer attempts = 1;
 
           public Integer run(DatastoreReaderWriter transaction) {
             transaction.get(KEY1);
-            if (attempts < 1) {
+            if (attempts < 2) {
               ++attempts;
               throw new DatastoreException(10, "", "ABORTED", false, null);
             }
@@ -749,15 +749,15 @@ public Integer run(DatastoreReaderWriter transaction) {
         };
 
     int result = DATASTORE.runInTransaction(callable1);
-    assertEquals(result, 1);
+    assertEquals(result, 2);
 
     Datastore.TransactionCallable<Integer> callable2 =
         new Datastore.TransactionCallable<Integer>() {
-          private Integer attempts = 0;
+          private Integer attempts = 1;
 
           public Integer run(DatastoreReaderWriter transaction) {
             transaction.get(KEY1);
-            if (attempts < 1) {
+            if (attempts < 2) {
               ++attempts;
               throw new DatastoreException(4, "", "DEADLINE_EXCEEDED", false, null);
             }
