Proto2 migration

PiperOrigin-RevId: 846864416
Change-Id: I82597bb129303e4cdece7ee7c25684c7da8fcc99

Author: ludoch

TRYLATESTBITSINPROD.md

@@ -49,7 +49,7 @@ top of your web application and change the entrypoint to boot with these jars in
  ./mvnw clean install
 ```
 
-Let's assume the current build version is `3.0.4-SNAPSHOT`.
+Let's assume the current build version is `4.0.0-SNAPSHOT`.
 
 See the output of the runtime deployment module which contains all the jars needed by the runtime:
 
@@ -70,7 +70,7 @@ Add the dependency for the GAE runtime jars in your application pom.xml file:
 
 ```
  <properties>
-        <appengine.runtime.version>3.0.4-SNAPSHOT</appengine.runtime.version>
+        <appengine.runtime.version>4.0.0-SNAPSHOT</appengine.runtime.version>
         <appengine.runtime.location>target/${project.artifactId}-${project.version}</appengine.runtime.location>
  <properties>
  ...

api/pom.xml

@@ -21,7 +21,7 @@
   <parent>
     <groupId>com.google.appengine</groupId>
     <artifactId>parent</artifactId>
-    <version>3.0.4-SNAPSHOT</version>
+    <version>4.0.0-SNAPSHOT</version>
   </parent>
   <properties>
     <maven.deploy.skip>true</maven.deploy.skip>
@@ -43,10 +43,7 @@
       <groupId>com.google.api-client</groupId>
       <artifactId>google-api-client</artifactId>
     </dependency>
-    <dependency>
-      <groupId>com.google.appengine</groupId>
-      <artifactId>proto1</artifactId>
-    </dependency>
+
     <dependency>
       <groupId>com.google.appengine</groupId>
       <artifactId>appengine-utils</artifactId>

api/src/main/java/com/google/appengine/api/datastore/AdminDatastoreService.java

@@ -23,10 +23,10 @@
 import com.google.appengine.api.datastore.Index.IndexState;
 import com.google.appengine.api.datastore.Query.FilterPredicate;
 import com.google.apphosting.api.AppEngineInternal;
-import com.google.apphosting.datastore.DatastoreV3Pb;
+import com.google.apphosting.datastore_bytes.proto2api.DatastoreV3Pb;
 import com.google.common.collect.Iterables;
 import com.google.common.collect.Lists;
-import com.google.storage.onestore.v3.OnestoreEntity;
+import com.google.storage.onestore.v3_bytes.proto2api.OnestoreEntity;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;
@@ -264,7 +264,7 @@ public Set<Index> compositeIndexesForQuery(Query query) {
         convertQueryToPbs(query, FetchOptions.Builder.withDefaults());
     Set<Index> resultSet = new HashSet<Index>();
     for (DatastoreV3Pb.Query queryProto : pbQueries) {
-      IndexComponentsOnlyQuery indexQuery = new IndexComponentsOnlyQuery(queryProto);
+      IndexComponentsOnlyQuery indexQuery = new IndexComponentsOnlyQuery(queryProto.toBuilder());
 
       OnestoreEntity.Index index =
           factory.getCompositeIndexManager().compositeIndexForQuery(indexQuery);
@@ -291,7 +291,7 @@ public Set<Index> minimumCompositeIndexesForQuery(Query query, Collection<Index>
 
     Set<Index> resultSet = new HashSet<Index>();
     for (DatastoreV3Pb.Query queryProto : pbQueries) {
-      IndexComponentsOnlyQuery indexQuery = new IndexComponentsOnlyQuery(queryProto);
+      IndexComponentsOnlyQuery indexQuery = new IndexComponentsOnlyQuery(queryProto.toBuilder());
 
       OnestoreEntity.Index index =
           factory.getCompositeIndexManager().minimumCompositeIndexForQuery(indexQuery, indexPbs);
@@ -310,7 +310,7 @@ private static List<DatastoreV3Pb.Query> convertQueryToPbs(
     // All Filters should be in queriesToRun
     query.setFilter(null);
     query.getFilterPredicates().clear();
-    List<DatastoreV3Pb.Query> resultQueries = new ArrayList<DatastoreV3Pb.Query>();
+    List<DatastoreV3Pb.Query> resultQueries = new ArrayList<>();
     for (MultiQueryBuilder multiQuery : queriesToRun) {
       for (List<List<FilterPredicate>> parallelQueries : multiQuery) {
         for (List<FilterPredicate> singleQuery : parallelQueries) {

api/src/main/java/com/google/appengine/api/datastore/AsyncCloudDatastoreV1ServiceImpl.java

@@ -45,6 +45,7 @@
 import com.google.datastore.v1.ReadOptions;
 import com.google.datastore.v1.TransactionOptions.ReadOnly;
 import com.google.datastore.v1.TransactionOptions.ReadWrite;
+import com.google.protobuf.CodedOutputStream;
 import com.google.protobuf.InvalidProtocolBufferException;
 import com.google.protobuf.Message;
 import java.util.ArrayList;
@@ -117,6 +118,11 @@ final Object getGroup(Key key) {
         final Mutation toPb(Key value) {
           return Mutation.newBuilder().setDelete(DataTypeTranslator.toV1Key(value)).build();
         }
+
+        @Override
+        protected int getEmbeddedSize(Mutation value) {
+          return CodedOutputStream.computeMessageSize(CommitRequest.MUTATIONS_FIELD_NUMBER, value);
+        }
       };
 
   private final V1Batcher<LookupResponse, LookupRequest.Builder, Key, com.google.datastore.v1.Key>
@@ -146,6 +152,11 @@ final Object getGroup(Key key) {
             final com.google.datastore.v1.Key toPb(Key value) {
               return DataTypeTranslator.toV1Key(value).build();
             }
+
+            @Override
+            protected int getEmbeddedSize(com.google.datastore.v1.Key value) {
+              return CodedOutputStream.computeMessageSize(LookupRequest.KEYS_FIELD_NUMBER, value);
+            }
           };
 
   private final V1Batcher<
@@ -183,6 +194,11 @@ final Object getGroup(com.google.datastore.v1.Key key) {
             final com.google.datastore.v1.Key toPb(com.google.datastore.v1.Key value) {
               return value;
             }
+
+            @Override
+            protected int getEmbeddedSize(com.google.datastore.v1.Key value) {
+              return CodedOutputStream.computeMessageSize(LookupRequest.KEYS_FIELD_NUMBER, value);
+            }
           };
 
   private final V1Batcher<CommitResponse, CommitRequest.Builder, Entity, Mutation> putBatcher =
@@ -215,6 +231,11 @@ final Object getGroup(Entity value) {
         final Mutation toPb(Entity value) {
           return Mutation.newBuilder().setUpsert(DataTypeTranslator.toV1Entity(value)).build();
         }
+
+        @Override
+        protected int getEmbeddedSize(Mutation value) {
+          return CodedOutputStream.computeMessageSize(CommitRequest.MUTATIONS_FIELD_NUMBER, value);
+        }
       };
 
   private final V1Batcher<
@@ -254,6 +275,12 @@ final Object getGroup(Key key) {
             final com.google.datastore.v1.Key toPb(Key value) {
               return DataTypeTranslator.toV1Key(value).build();
             }
+
+            @Override
+            protected int getEmbeddedSize(com.google.datastore.v1.Key value) {
+              return CodedOutputStream.computeMessageSize(
+                  AllocateIdsRequest.KEYS_FIELD_NUMBER, value);
+            }
           };
 
   private final CloudDatastoreV1Client datastoreProxy;