Add serialVersionUID and readResolve method to service factories. Updated tests.

Author: mziccard

gcloud-java-datastore/src/main/java/com/google/gcloud/datastore/DatastoreFactory.java

@@ -17,18 +17,28 @@
 package com.google.gcloud.datastore;
 
 import com.google.gcloud.ServiceFactory;
+import java.io.ObjectStreamException;
 
 /**
  * A base class for Datastore factories.
  */
 public abstract class DatastoreFactory implements ServiceFactory<Datastore, DatastoreOptions> {
 
+  private static final long serialVersionUID = 5037190305022535983L;
+
   private static final DatastoreFactory INSTANCE = new DatastoreFactory() {
-      @Override
-      public Datastore get(DatastoreOptions options) {
-        return new DatastoreImpl(options, this);
-      }
-    };
+
+    private static final long serialVersionUID = 5893914895344559491L;
+
+    @Override
+    public Datastore get(DatastoreOptions options) {
+      return new DatastoreImpl(options, this);
+    }
+
+    private Object readResolve() throws ObjectStreamException {
+      return INSTANCE;
+    }
+  };
 
   /**
    * Returns the default factory instance.

gcloud-java-datastore/src/test/java/com/google/gcloud/datastore/SerializationTest.java

@@ -135,7 +135,8 @@ public class SerializationTest {
   @Test
   public void testStorageFactory() throws Exception {
     DatastoreFactory serializedCopy = serializeAndDeserialize(DATASTORE_FACTORY);
-    assertNotSame(DATASTORE_FACTORY, serializedCopy);
+    assertEquals(DATASTORE_FACTORY, serializedCopy);
+    assertEquals(DATASTORE_FACTORY.hashCode(), serializedCopy.hashCode());
   }
 
   @Test

gcloud-java-storage/src/main/java/com/google/gcloud/storage/StorageFactory.java

@@ -17,17 +17,27 @@
 package com.google.gcloud.storage;
 
 import com.google.gcloud.ServiceFactory;
+import java.io.ObjectStreamException;
 
 /**
  * A base class for Storage factories.
  */
 public abstract class StorageFactory implements ServiceFactory<Storage, StorageOptions> {
 
+  private static final long serialVersionUID = 1866883249985063753L;
+
   private static final StorageFactory INSTANCE = new StorageFactory() {
+
+    private static final long serialVersionUID = -7985210081064222485L;
+
     @Override
     public Storage get(StorageOptions options) {
       return new StorageImpl(options, this);
     }
+
+    private Object readResolve() throws ObjectStreamException {
+      return INSTANCE;
+    }
   };
 
   /**

gcloud-java-storage/src/test/java/com/google/gcloud/storage/SerializationTest.java

@@ -69,7 +69,8 @@ public class SerializationTest {
   @Test
   public void testStorageFactory() throws Exception {
     StorageFactory serializedCopy = serializeAndDeserialize(STORAGE_FACTORY);
-    assertNotSame(STORAGE_FACTORY, serializedCopy);
+    assertEquals(STORAGE_FACTORY, serializedCopy);
+    assertEquals(STORAGE_FACTORY.hashCode(), serializedCopy.hashCode());
   }
 
   @Test